From a700d7875c7768eeaf99f9c13eecf7cde8e07bb3 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 6 Oct 2026 14:53:06 +0200
Subject: [PATCH 001/270] Stop the provider when archiving an ACP agent that
 never answers close (#6213)

* fix(acp): terminate the provider when close requests never return

Archive and delete wait on ACPAgentSession.close(). cancel() and
unstable_closeSession() had no timeout. The ACP SDK does not reject a
pending request when the provider never answers, so close() never
reached terminateProcess. The agent was already marked archived and the
provider process stayed alive.

Both calls now use the same 2s withTimeout as probe close. The existing
catch blocks still continue into terminateProcess.

Example:
- Input: archive an ACP session whose cancel and closeSession never settle
- Before: close() waits forever and the provider process stays alive
- After: both calls time out and terminateProcess runs

* test(acp): archive close terminates a real provider that never answers session/close

Spawn a real ACP provider process over stdio that advertises session
close and never replies to it, then close the session the way archive
does. Without the request bound, close() never returns and the provider
keeps running.

Co-authored-by: Ouyang Xingyuan <galaxyroaming@qq.com>

* test(acp): move the close wait and provider cleanup into helpers

Clear the race timer once close settles, and dispose the provider
process and temp directory in afterEach.

---------

Co-authored-by: Ouyang Xingyuan <galaxyroaming@qq.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../server/agent/providers/acp-agent.test.ts  | 152 +++++++++++++++++-
 .../src/server/agent/providers/acp-agent.ts   |  16 +-
 2 files changed, 165 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/server/agent/providers/acp-agent.test.ts b/packages/server/src/server/agent/providers/acp-agent.test.ts
index f847745d69..95d7e25a21 100644
--- a/packages/server/src/server/agent/providers/acp-agent.test.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.test.ts
@@ -1,8 +1,10 @@
 import { type ChildProcess, type ChildProcessWithoutNullStreams } from "node:child_process";
 import { EventEmitter } from "node:events";
-import { mkdtemp, rm } from "node:fs/promises";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import { pathToFileURL } from "node:url";
 import { afterEach, describe, expect, test, vi } from "vitest";
 import {
   AgentSideConnection,
@@ -3436,6 +3438,8 @@ interface ACPCloseInternals {
   child: ChildProcess | null;
   connection: unknown;
   sessionId: string | null;
+  activeForegroundTurnId: string | null;
+  agentCapabilities: { sessionCapabilities?: { close?: unknown } } | null;
 }
 
 async function startTerminal(
@@ -3502,6 +3506,38 @@ describe("ACPAgentSession close() tree-kill", () => {
     expect(child.kill).not.toHaveBeenCalled();
   });
 
+  test("close() terminates the provider when cancel and closeSession never settle", async () => {
+    vi.useFakeTimers();
+    try {
+      const terminator = new FakeTerminator();
+      const session = createSession({ terminateProcess: terminator.terminate });
+      const child = createTerminalChildStub();
+      const cancel = vi.fn(() => new Promise<void>(() => undefined));
+      const unstableCloseSession = vi.fn(() => new Promise<void>(() => undefined));
+      const internals = asInternals<ACPCloseInternals>(session);
+      internals.child = child;
+      internals.sessionId = "session-1";
+      internals.activeForegroundTurnId = "turn-1";
+      internals.agentCapabilities = { sessionCapabilities: { close: {} } };
+      internals.connection = { cancel, unstable_closeSession: unstableCloseSession };
+
+      let settled = false;
+      const closing = (async () => {
+        await session.close();
+        settled = true;
+      })();
+      await vi.advanceTimersByTimeAsync(5_000);
+
+      expect(settled).toBe(true);
+      expect(cancel).toHaveBeenCalledWith({ sessionId: "session-1" });
+      expect(unstableCloseSession).toHaveBeenCalledWith({ sessionId: "session-1" });
+      expect(terminator.terminated).toContain(child);
+      await closing;
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
   test("close() terminates running terminal child processes", async () => {
     const terminator = new FakeTerminator();
     const session = createSession({ terminateProcess: terminator.terminate });
@@ -4220,3 +4256,117 @@ describe("ACP session/load invariant — cwd and mcpServers always passed", () =
     });
   });
 });
+
+const SILENT_CLOSE_ACP_AGENT = `
+import { readFileSync, writeFileSync } from "node:fs";
+import { Readable, Writable } from "node:stream";
+const { AgentSideConnection, PROTOCOL_VERSION, ndJsonStream } = await import(process.env.ACP_SDK_URL);
+writeFileSync(process.env.ACP_PID_FILE, String(process.pid));
+new AgentSideConnection(
+  () => ({
+    async initialize() {
+      return {
+        protocolVersion: PROTOCOL_VERSION,
+        agentCapabilities: { sessionCapabilities: { close: {} } },
+      };
+    },
+    async newSession() {
+      return { sessionId: "silent-close-session" };
+    },
+    async authenticate() {},
+    async cancel() {},
+    unstable_closeSession() {
+      return new Promise(() => {});
+    },
+  }),
+  ndJsonStream(Writable.toWeb(process.stdout), Readable.toWeb(process.stdin)),
+);
+`;
+
+function isProcessAlive(pid: number): boolean {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+async function settlesWithin(promise: Promise<unknown>, timeoutMs: number): Promise<boolean> {
+  let timer: NodeJS.Timeout | undefined;
+  const timedOut = new Promise<false>((resolve) => {
+    timer = setTimeout(() => resolve(false), timeoutMs);
+  });
+  try {
+    return await Promise.race([promise.then(() => true), timedOut]);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+interface SilentCloseProvider {
+  session: ACPAgentSession;
+  readPid(): Promise<number>;
+  dispose(): Promise<void>;
+}
+
+async function startSilentCloseProvider(): Promise<SilentCloseProvider> {
+  const dir = await mkdtemp(path.join(tmpdir(), "paseo-acp-silent-close-"));
+  const agentScript = path.join(dir, "agent.mjs");
+  const pidFile = path.join(dir, "agent.pid");
+  await writeFile(agentScript, SILENT_CLOSE_ACP_AGENT);
+  const session = new ACPAgentSession(
+    { provider: "silent-close-acp", cwd: dir },
+    {
+      provider: "silent-close-acp",
+      logger: createTestLogger(),
+      defaultCommand: [process.execPath, agentScript],
+      defaultModes: [],
+      capabilities: {
+        supportsStreaming: true,
+        supportsSessionPersistence: true,
+        supportsDynamicModes: true,
+        supportsMcpServers: true,
+        supportsReasoningStream: true,
+        supportsToolInvocations: true,
+      },
+      launchEnv: {
+        ACP_SDK_URL: pathToFileURL(
+          createRequire(import.meta.url).resolve("@agentclientprotocol/sdk"),
+        ).href,
+        ACP_PID_FILE: pidFile,
+      },
+    },
+  );
+  const readPid = async () => Number(await readFile(pidFile, "utf8"));
+  return {
+    session,
+    readPid,
+    async dispose() {
+      const pid = await readPid().catch(() => null);
+      if (pid !== null && isProcessAlive(pid)) {
+        process.kill(pid, "SIGKILL");
+      }
+      await rm(dir, { recursive: true, force: true });
+    },
+  };
+}
+
+describe("ACPAgentSession close() with an unresponsive provider", () => {
+  let provider: SilentCloseProvider | null = null;
+
+  afterEach(async () => {
+    await provider?.dispose();
+    provider = null;
+  });
+
+  test("terminates a provider that never answers session/close", async () => {
+    provider = await startSilentCloseProvider();
+    await provider.session.initializeNewSession();
+    const pid = await provider.readPid();
+    expect(isProcessAlive(pid)).toBe(true);
+
+    expect(await settlesWithin(provider.session.close(), 8_000)).toBe(true);
+    expect(isProcessAlive(pid)).toBe(false);
+  }, 15_000);
+});
diff --git a/packages/server/src/server/agent/providers/acp-agent.ts b/packages/server/src/server/agent/providers/acp-agent.ts
index 1b47ccaccb..a647deb549 100644
--- a/packages/server/src/server/agent/providers/acp-agent.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.ts
@@ -301,6 +301,10 @@ export function buildACPClientCapabilities(
 const PROBE_ENV: Record<string, string> = { NO_BROWSER: "true" };
 const ACP_DIAGNOSTIC_PHASE_TIMEOUT_MS = 20_000;
 const ACP_PROBE_CLOSE_TIMEOUT_MS = 2_000;
+// Archive and delete await close(). The ACP SDK does not reject a pending
+// request when the provider never answers, so these calls must be bounded
+// or the provider process is never terminated.
+const ACP_CLOSE_REQUEST_TIMEOUT_MS = 2_000;
 const ACP_IMPORT_HISTORY_LOAD_TIMEOUT_MS = 30_000;
 const ACP_IMPORT_HISTORY_BUDGET_MS = 60_000;
 
@@ -2476,13 +2480,21 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     if (this.connection && this.sessionId) {
       try {
         if (this.activeForegroundTurnId) {
-          await this.connection.cancel({ sessionId: this.sessionId });
+          await withTimeout(
+            this.connection.cancel({ sessionId: this.sessionId }),
+            ACP_CLOSE_REQUEST_TIMEOUT_MS,
+            `ACP cancel timed out after ${ACP_CLOSE_REQUEST_TIMEOUT_MS}ms`,
+          );
         }
       } catch {}
 
       try {
         if (this.agentCapabilities?.sessionCapabilities?.close) {
-          await this.connection.unstable_closeSession({ sessionId: this.sessionId });
+          await withTimeout(
+            this.connection.unstable_closeSession({ sessionId: this.sessionId }),
+            ACP_CLOSE_REQUEST_TIMEOUT_MS,
+            `ACP closeSession timed out after ${ACP_CLOSE_REQUEST_TIMEOUT_MS}ms`,
+          );
         }
       } catch (error) {
         this.logger.debug({ err: error }, "ACP closeSession failed during shutdown");

From f5c55dfc551df42474d45f245aaa6ce3f88169b5 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 6 Oct 2026 16:25:59 +0200
Subject: [PATCH 002/270] fix(omp): reopened chats show a compaction row
 instead of "Unsupported history record" (#6215)

* fix(omp): reopened chats show a compaction row instead of "Unsupported history record"

OMP stores a compaction as a top-level session entry. History replay sent
it to the unknown-record fallback, so after a daemon restart the chat
showed a "Custom message" row reading "[compaction] Unsupported history
record". Replay now maps the entry to a completed compaction row.

Closes #6206

* test(omp): assert on the replayed custom-message rows directly

* test(omp): match only the unsupported-record row after restart

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../providers/omp/history-mapper.test.ts      | 58 ++++++++++++++++++
 .../src/server/agent/providers/omp/history.ts | 32 ++++++++--
 .../server/daemon-e2e/omp.real.e2e.test.ts    | 59 +++++++++++++++++++
 3 files changed, 144 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/server/agent/providers/omp/history-mapper.test.ts b/packages/server/src/server/agent/providers/omp/history-mapper.test.ts
index 61e6d0e73d..e64a93fd64 100644
--- a/packages/server/src/server/agent/providers/omp/history-mapper.test.ts
+++ b/packages/server/src/server/agent/providers/omp/history-mapper.test.ts
@@ -829,6 +829,64 @@ describe("OMP history mapper", () => {
     ]);
   });
 
+  test("replays a compaction entry as a completed compaction row", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "omp-compaction-history-"));
+    const sessionFile = join(dir, "session.jsonl");
+    writeFileSync(
+      sessionFile,
+      [
+        { type: "session", id: "root", parentId: null },
+        {
+          type: "message",
+          id: "answer-1",
+          parentId: "root",
+          message: {
+            role: "assistant",
+            content: [{ type: "text", text: "Before." }],
+            responseId: "resp-1",
+          },
+        },
+        {
+          type: "compaction",
+          id: "compaction-1",
+          parentId: "answer-1",
+          timestamp: "2026-10-05T04:31:19.537Z",
+          summary: "## Goal\nSummary",
+          shortSummary: "Summary",
+          firstKeptEntryId: "answer-1",
+          tokensBefore: 77611,
+          tokensAfter: 37526,
+          method: "snapcompact",
+          details: { readFiles: [], modifiedFiles: [] },
+          fromExtension: false,
+        },
+        {
+          type: "message",
+          id: "answer-2",
+          parentId: "compaction-1",
+          message: {
+            role: "assistant",
+            content: [{ type: "text", text: "After." }],
+            responseId: "resp-2",
+          },
+        },
+      ]
+        .map((entry) => JSON.stringify(entry))
+        .join("\n"),
+    );
+
+    const events: AgentStreamEvent[] = [];
+    for await (const event of streamOmpHistory({ sessionFile, provider: "omp" })) {
+      events.push(event);
+    }
+    expect(events.map((event) => event.item)).toEqual([
+      { type: "assistant_message", text: "Before.", messageId: "resp-1" },
+      { type: "compaction", status: "completed", preTokens: 77611 },
+      { type: "assistant_message", text: "After.", messageId: "resp-2" },
+    ]);
+    expect(events[1]).toMatchObject({ type: "timeline", timestamp: "2026-10-05T04:31:19.537Z" });
+  });
+
   test("maps omp 18.1 custom_message entries like live custom messages", async () => {
     const dir = mkdtempSync(join(tmpdir(), "omp-custom-message-history-"));
     const sessionFile = join(dir, "session.jsonl");
diff --git a/packages/server/src/server/agent/providers/omp/history.ts b/packages/server/src/server/agent/providers/omp/history.ts
index 2e86b9670c..2c818dfc5a 100644
--- a/packages/server/src/server/agent/providers/omp/history.ts
+++ b/packages/server/src/server/agent/providers/omp/history.ts
@@ -20,6 +20,10 @@ interface OmpSessionEntry {
   [key: string]: unknown;
 }
 
+type OmpReplayEntry =
+  | { entry: OmpSessionEntry; message: OmpAgentMessage }
+  | { entry: OmpSessionEntry; item: AgentTimelineItem };
+
 export async function readOmpHistoryTodoState(
   sessionFile: string,
 ): Promise<AgentTimelineItem | null> {
@@ -90,13 +94,17 @@ export async function* streamOmpHistory(input: {
     throw error;
   }
   const messages: OmpAgentMessage[] = [];
-  const messageEntries: OmpSessionEntry[] = [];
+  const replayEntries: OmpReplayEntry[] = [];
   const userEntries: OmpCapturedUserMessageEntry[] = [];
   for (const entry of entries) {
+    if (entry.type === "compaction") {
+      replayEntries.push({ entry, item: mapCompactionEntry(entry) });
+      continue;
+    }
     const mapped = mapEntryMessage(entry);
     if (!mapped) continue;
     messages.push(mapped);
-    messageEntries.push(entry);
+    replayEntries.push({ entry, message: mapped });
     if (mapped.role === "user" && entry.id) {
       userEntries.push({ id: entry.id, text: textOf(mapped.content) });
     }
@@ -107,9 +115,13 @@ export async function* streamOmpHistory(input: {
     OMP_HISTORY_MAPPER_HOOKS,
     input.bridgedTools,
   );
-  for (let index = 0; index < messages.length; index += 1) {
-    const timestamp = normalizeProviderReplayTimestamp(messageEntries[index]?.timestamp);
-    for (const event of mapper.mapMessages([messages[index]!])) {
+  for (const replayEntry of replayEntries) {
+    const timestamp = normalizeProviderReplayTimestamp(replayEntry.entry.timestamp);
+    const events: AgentStreamEvent[] =
+      "item" in replayEntry
+        ? [{ type: "timeline", provider: input.provider, item: replayEntry.item }]
+        : mapper.mapMessages([replayEntry.message]);
+    for (const event of events) {
       yield timestamp && event.type === "timeline" ? { ...event, timestamp } : event;
     }
   }
@@ -393,6 +405,16 @@ function mapEntryMessage(entry: OmpSessionEntry): OmpAgentMessage | null {
   return visibleFallback(entry.type, entry);
 }
 
+// OMP persists a compaction as a top-level entry; the live timeline shows it as a compaction row.
+// The entry does not record whether a manual /compact or auto-compaction produced it.
+function mapCompactionEntry(entry: OmpSessionEntry): AgentTimelineItem {
+  return {
+    type: "compaction",
+    status: "completed",
+    ...(typeof entry.tokensBefore === "number" ? { preTokens: entry.tokensBefore } : {}),
+  };
+}
+
 // omp 18.1+ persists injected rows (skill prompts, hub messages, job notices) as top-level
 // custom_message entries without a message object; replay them as live custom messages
 function mapCustomMessageEntry(entry: OmpSessionEntry): OmpAgentMessage | null {
diff --git a/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
index 510e8b384d..7149b16864 100644
--- a/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
@@ -131,6 +131,15 @@ async function timeline(client: DaemonClient, agentId: string): Promise<AgentTim
   return result.entries.map((entry) => entry.item);
 }
 
+function compactionFiller(): string {
+  const teas = ["assam", "darjeeling", "sencha", "oolong"];
+  return Array.from(
+    { length: 1200 },
+    (_, index) =>
+      `Record ${String(index).padStart(5, "0")}: tea=${teas[index % teas.length]} origin=region-${index % 37} notes=lorem ipsum dolor sit amet`,
+  ).join("\n");
+}
+
 function latestTools(items: AgentTimelineItem[]) {
   const latest = new Map<string, Extract<AgentTimelineItem, { type: "tool_call" }>>();
   for (const item of items) if (item.type === "tool_call") latest.set(item.callId, item);
@@ -510,6 +519,56 @@ describe("daemon E2E (real OMP)", () => {
     TIMEOUT_MS,
   );
 
+  test(
+    "a compaction shows as a compaction row after a daemon restart",
+    async () => {
+      const harness = await createHarness();
+      let restarted: TestPaseoDaemon | null = null;
+      let restartedClient: DaemonClient | null = null;
+      try {
+        const agent = await createAgent(harness, "compact-restart");
+        await promptAndFinish(
+          harness,
+          agent.id,
+          `${compactionFiller()}\n\nReply exactly OMP_COMPACT_FIRST`,
+        );
+        await promptAndFinish(harness, agent.id, "Reply exactly OMP_COMPACT_SECOND");
+        await harness.client.sendMessage(agent.id, "/compact");
+        await harness.client.waitForFinish(agent.id, TIMEOUT_MS);
+        await promptAndFinish(harness, agent.id, "Reply exactly OMP_COMPACT_THIRD");
+
+        await harness.client.close();
+        await harness.daemon.close();
+        restarted = await createTestPaseoDaemon({
+          agentClients: createRealProviderClients(["omp"], pino({ level: "silent" })),
+          providerOverrides: { omp: { enabled: true } },
+          logger: pino({ level: "silent" }),
+          paseoHomeRoot: harness.paseoHomeRoot,
+          staticDir: harness.staticDir,
+          cleanup: false,
+        });
+        restartedClient = new DaemonClient({ url: `ws://127.0.0.1:${restarted.port}/ws` });
+        await restartedClient.connect();
+        await restartedClient.fetchAgents({ subscribe: {} });
+        const replayed = await timeline(restartedClient, agent.id);
+
+        expect(
+          latestTools(replayed)
+            .map(toolResult)
+            .filter((text) => text.includes("Unsupported history record")),
+        ).toEqual([]);
+        expect(replayed.filter((item) => item.type === "compaction")).toEqual([
+          expect.objectContaining({ type: "compaction", status: "completed" }),
+        ]);
+      } finally {
+        await restartedClient?.close().catch(() => undefined);
+        await restarted?.close().catch(() => undefined);
+        await closeHarness(harness);
+      }
+    },
+    TIMEOUT_MS,
+  );
+
   test(
     "native branch rewinds conversation history and keeps the session usable",
     async () => {

From 396a2bc0b279f868a6c439ee1fe3b226c52ff707 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 15:34:15 +0100
Subject: [PATCH 003/270] fix(website): count a plugin install once per IP per
 hour (#6230)

Repeated install-intent resolves inflated plugin rankings. Deduplicate reports by plugin and hashed Cloudflare IP for one hour, and skip counting when the IP header is absent.
---
 packages/website/README.md                    |  22 ++++
 packages/website/src/plugins/installs.ts      |  20 ++++
 packages/website/src/plugins/published.ts     |   9 +-
 packages/website/src/plugins/registry.test.ts | 111 +++++++++++++++++-
 4 files changed, 156 insertions(+), 6 deletions(-)
 create mode 100644 packages/website/README.md

diff --git a/packages/website/README.md b/packages/website/README.md
new file mode 100644
index 0000000000..5a938ca2f4
--- /dev/null
+++ b/packages/website/README.md
@@ -0,0 +1,22 @@
+# Paseo website
+
+## Plugin install counts
+
+Clients report an install by resolving a plugin with `X-Paseo-Install: 1` or
+`?intent=install`, using `/api/plugins/resolve/<owner>/<slug>` or
+`/plugins/<owner>/<slug>.json`. Ordinary resolves do not count. These numbers
+measure install intent, not successful artifact installation or npm downloads.
+
+The worker requires Cloudflare's `CF-Connecting-IP` header to count a report.
+It stores the plugin ID plus a SHA-256 hash of the IP in a `WEBSITE_CACHE` KV key
+with a one hour TTL, never the raw IP. An existing key skips the count; repeats
+do not extend the hour. Missing or empty IP headers do not count.
+
+Accepted reports increment the existing all-time total and UTC daily buckets in
+`WEBSITE_CACHE`. Daily buckets retain 60 days and supply the website's seven-day
+and thirty-day rankings. `/api/plugins/installs` still returns plugin IDs mapped
+to all-time totals. The [registry build](https://github.com/getpaseo/plugins/blob/main/scripts/build.ts)
+reads that endpoint into the published plugin details and index; the website
+reads windowed counts from KV through its five-minute cache. Existing counts
+remain intact. The KV guard is advisory: concurrent requests and KV propagation
+are not serialized.
diff --git a/packages/website/src/plugins/installs.ts b/packages/website/src/plugins/installs.ts
index 01846e6797..78b4294639 100644
--- a/packages/website/src/plugins/installs.ts
+++ b/packages/website/src/plugins/installs.ts
@@ -12,6 +12,26 @@ const WINDOW_DAYS = { week: 7, month: 30 } as const;
 const totalKey = (id: string) => `plugin-installs:${id}`;
 const dailyKey = (id: string) => `plugin-installs-daily:${id}`;
 
+export async function recordClientInstall({
+  cache,
+  id,
+  ip,
+}: {
+  cache: KVNamespace;
+  id: string;
+  ip: string | null;
+}): Promise<void> {
+  if (!ip) return;
+  const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(ip));
+  const hash = Array.from(new Uint8Array(digest), (byte) =>
+    byte.toString(16).padStart(2, "0"),
+  ).join("");
+  const key = `plugin-installs-client:${id}:${hash}`;
+  if ((await cache.get(key)) !== null) return;
+  await cache.put(key, "1", { expirationTtl: 3600 });
+  await recordInstall(cache, id, new Date());
+}
+
 export async function recordInstall(cache: KVNamespace, id: string, now: Date): Promise<void> {
   const [total, daily] = await Promise.all([cache.get(totalKey(id)), readDaily(cache, id)]);
   await Promise.all([
diff --git a/packages/website/src/plugins/published.ts b/packages/website/src/plugins/published.ts
index 4d6826f11e..ebf7e5256b 100644
--- a/packages/website/src/plugins/published.ts
+++ b/packages/website/src/plugins/published.ts
@@ -5,7 +5,7 @@ import {
 } from "@getpaseo/protocol/plugin-registry";
 import { getBlockingColdCache, type WebsiteCacheContext } from "../github-cache";
 import { CATEGORIES } from "./categories";
-import { type InstallCounts, readInstallCounts, recordInstall } from "./installs";
+import { type InstallCounts, readInstallCounts, recordClientInstall } from "./installs";
 export interface RegistryEnvironment {
   PLUGINS_REGISTRY_URL?: string;
   WEBSITE_CACHE?: KVNamespace;
@@ -111,7 +111,12 @@ export async function handlePluginRegistryRequest(
     url.searchParams.get("intent") === "install"
   ) {
     const cache = context.cache;
-    if (cache) context.waitUntil(recordInstall(cache, id, new Date()).catch(() => undefined));
+    if (cache)
+      context.waitUntil(
+        recordClientInstall({ cache, id, ip: request.headers.get("CF-Connecting-IP") }).catch(
+          () => undefined,
+        ),
+      );
   }
   return Response.json(plugin);
 }
diff --git a/packages/website/src/plugins/registry.test.ts b/packages/website/src/plugins/registry.test.ts
index d5244fcb3f..bd2dce67ec 100644
--- a/packages/website/src/plugins/registry.test.ts
+++ b/packages/website/src/plugins/registry.test.ts
@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 import { createServer } from "node:http";
 import { describe, expect, it } from "vitest";
 import {
@@ -10,7 +11,7 @@ import {
   searchPlugins,
 } from "./registry";
 import { readInstallCounts, recordInstall } from "./installs";
-import { loadRegistryIndex, loadRegistryPlugin } from "./published";
+import { handlePluginRegistryRequest, loadRegistryIndex, loadRegistryPlugin } from "./published";
 const plugin: Plugin = {
   id: "acme/example",
   name: "Example",
@@ -94,6 +95,81 @@ describe("plugin registry", () => {
       Object.keys(JSON.parse((await cache.get("plugin-installs-daily:acme/example")) ?? "{}")),
     ).toEqual(["2026-09-10", "2026-09-30", "2026-10-04"]);
   });
+  it("counts repeated install reports from the same IP once per hour", async () => {
+    let now = Date.now();
+    const cache = memoryKv(() => now);
+    const headers = { "X-Paseo-Install": "1", "CF-Connecting-IP": "192.0.2.1" };
+    await resolvePlugin(cache, headers);
+    now += 3_599_000;
+    await resolvePlugin(cache, headers);
+    expect(await readInstallCounts(cache, [plugin.id], new Date())).toEqual({
+      [plugin.id]: { week: 1, month: 1, all: 1 },
+    });
+    now += 1_000;
+    await resolvePlugin(cache, headers);
+    expect(await readInstallCounts(cache, [plugin.id], new Date())).toEqual({
+      [plugin.id]: { week: 2, month: 2, all: 2 },
+    });
+  });
+  it("counts different IPs and plugins independently, including query install intent", async () => {
+    const cache = memoryKv();
+    const first = { "X-Paseo-Install": "1", "CF-Connecting-IP": "192.0.2.1" };
+    await resolvePlugin(cache, first);
+    await resolvePlugin(cache, { "CF-Connecting-IP": "2001:db8::1" }, { query: "?intent=install" });
+    await resolvePlugin(cache, first, { id: "acme/other" });
+    await resolvePlugin(cache, first, { query: "?intent=install" });
+    await resolvePlugin(cache, first, { id: "acme/other", staticDetail: true });
+    expect(await readInstallCounts(cache, [plugin.id, "acme/other"], new Date())).toEqual({
+      [plugin.id]: { week: 2, month: 2, all: 2 },
+      "acme/other": { week: 1, month: 1, all: 1 },
+    });
+    const hash = createHash("sha256").update(first["CF-Connecting-IP"]).digest("hex");
+    expect(await cache.get(`plugin-installs-client:${plugin.id}:${hash}`)).toBe("1");
+    expect(JSON.stringify([...cache.values])).not.toContain("192.0.2.1");
+    expect(JSON.stringify([...cache.values])).not.toContain("2001:db8::1");
+  });
+  it("does not count without a Cloudflare IP or install intent", async () => {
+    const cache = memoryKv();
+    await resolvePlugin(cache, { "X-Paseo-Install": "1", "X-Forwarded-For": "192.0.2.1" });
+    await resolvePlugin(cache, {}, { query: "?intent=install" });
+    await resolvePlugin(cache, { "X-Paseo-Install": "1", "CF-Connecting-IP": "" });
+    await resolvePlugin(cache, { "CF-Connecting-IP": "192.0.2.1" });
+    expect(await readInstallCounts(cache, [plugin.id], new Date())).toEqual({
+      [plugin.id]: { week: 0, month: 0, all: 0 },
+    });
+    expect([...cache.values.keys()].filter((key) => key.startsWith("plugin-installs"))).toEqual([]);
+  });
+  it("preserves historical totals and the installs endpoint response", async () => {
+    const cache = memoryKv();
+    await cache.put(`plugin-installs:${plugin.id}`, "40");
+    const headers = { "X-Paseo-Install": "1", "CF-Connecting-IP": "192.0.2.1" };
+    await resolvePlugin(cache, headers);
+    await resolvePlugin(cache, headers);
+    const base = "https://registry.example.test";
+    await cache.put(
+      `plugins:index:v1:${base}`,
+      JSON.stringify({
+        fetchedAt: Date.now(),
+        value: {
+          schemaVersion: 1,
+          registry: { name: "Internal", url: base },
+          categories: [],
+          plugins: [plugin],
+          generatedAt: "2026-10-03",
+        },
+      }),
+    );
+    const response = await handlePluginRegistryRequest(
+      new Request("https://paseo.sh/api/plugins/installs"),
+      { PLUGINS_REGISTRY_URL: base },
+      { cache, waitUntil: () => undefined },
+    );
+    expect(response?.status).toBe(200);
+    expect(await response?.json()).toEqual({ [plugin.id]: 41 });
+    expect(await readInstallCounts(cache, [plugin.id], new Date())).toEqual({
+      [plugin.id]: { week: 1, month: 1, all: 41 },
+    });
+  });
   it("searches name, description, ID, and author, ignoring case", () => {
     const other = {
       ...plugin,
@@ -125,16 +201,43 @@ describe("plugin registry", () => {
 });
 
 /** In-memory stand-in for the website KV namespace, covering the calls the counter makes. */
-function memoryKv(): KVNamespace {
+function memoryKv(now = Date.now): KVNamespace & { values: Map<string, string> } {
   const values = new Map<string, string>();
+  const expiresAt = new Map<string, number>();
   const kv = {
+    values,
     get: async (key: string, options?: { type?: string }) => {
+      if (now() >= (expiresAt.get(key) ?? Infinity)) values.delete(key);
       const value = values.get(key) ?? null;
       return options?.type === "json" && value !== null ? JSON.parse(value) : value;
     },
-    put: async (key: string, value: string) => {
+    put: async (key: string, value: string, options?: { expirationTtl?: number }) => {
       values.set(key, value);
+      expiresAt.set(key, options?.expirationTtl ? now() + options.expirationTtl * 1000 : Infinity);
     },
   };
-  return kv as unknown as KVNamespace;
+  return kv as unknown as KVNamespace & { values: Map<string, string> };
+}
+
+async function resolvePlugin(
+  cache: KVNamespace,
+  headers: HeadersInit,
+  { id = plugin.id, query = "", staticDetail = false } = {},
+): Promise<void> {
+  const base = "https://registry.example.test";
+  const detail = { ...plugin, id, readme: "# Example" };
+  await cache.put(
+    `plugins:detail:v1:${base}:${id}`,
+    JSON.stringify({ fetchedAt: Date.now(), value: detail }),
+  );
+  const pending: Promise<unknown>[] = [];
+  const path = staticDetail ? `/plugins/${id}.json` : `/api/plugins/resolve/${id}`;
+  const response = await handlePluginRegistryRequest(
+    new Request(`https://paseo.sh${path}${query}`, { headers }),
+    { PLUGINS_REGISTRY_URL: base },
+    { cache, waitUntil: (promise) => pending.push(promise) },
+  );
+  expect(response?.status).toBe(200);
+  expect(await response?.json()).toEqual(detail);
+  await Promise.all(pending);
 }

From 06bde1e57aabfbc37b20d52af0487e7c254c8155 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 15:58:26 +0100
Subject: [PATCH 004/270] Scaffold author overviews for plugin listings (#6226)

* feat(plugins): scaffold author listing overviews

* docs(plugins): refine the author overview contract

* docs(plugins): require repository overviews for registry listings

* docs(plugins): keep listing guidance focused on authors
---
 .../cli/src/commands/plugin/scaffold.test.ts  | 45 ++++++++++++++++++-
 packages/cli/src/commands/plugin/scaffold.ts  | 30 +++++++++++++
 public-docs/plugins/publishing.md             | 41 +++++++++++++++++
 skills/paseo-plugin/SKILL.md                  | 43 ++++++++++++++++++
 4 files changed, 158 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/plugin/scaffold.test.ts b/packages/cli/src/commands/plugin/scaffold.test.ts
index df0c13295b..c69ca4c197 100644
--- a/packages/cli/src/commands/plugin/scaffold.test.ts
+++ b/packages/cli/src/commands/plugin/scaffold.test.ts
@@ -1,4 +1,4 @@
-import { execFile } from "node:child_process";
+import { exec, execFile } from "node:child_process";
 import { mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import path from "node:path";
@@ -9,6 +9,7 @@ import { scaffoldPluginDirectory } from "./scaffold.js";
 
 const directories: string[] = [];
 const execFileAsync = promisify(execFile);
+const execAsync = promisify(exec);
 const tscPath = createRequire(import.meta.url).resolve("typescript/bin/tsc");
 
 async function typecheckPlugin(directory: string): Promise<void> {
@@ -28,6 +29,47 @@ afterEach(async () => {
 });
 
 describe("plugin scaffold", () => {
+  it("creates an author overview beside the manifest", async () => {
+    const parent = await mkdtemp(path.join(tmpdir(), "paseo-plugin-scaffold-"));
+    directories.push(parent);
+    const directory = path.join(parent, "hello-plugin");
+    await scaffoldPluginDirectory(directory);
+
+    const overview = await readFile(path.join(directory, "OVERVIEW.md"), "utf8");
+    const comments = overview.match(/<!--[\s\S]*?-->/g) ?? [];
+    expect(comments).toHaveLength(1);
+    expect(overview.replace(/<!--[\s\S]*?-->/g, "").trim()).toBe("");
+    expect(overview).toContain("required to list");
+    expect(overview).toContain("README");
+    expect(overview).toContain("choosing a plugin in Paseo");
+    expect(overview).toContain("Length follows complexity");
+    expect(overview).toContain("1. Describe what your plugin is and does");
+    expect(overview).toContain("2. Explain how it works only when it is not obvious");
+    expect(overview).toContain("3. Explain setup when needed");
+    expect(overview).toContain("4. Explain capabilities and settings");
+    expect(overview).toContain("permissions");
+    expect(overview).toContain("known limits");
+    expect(overview).not.toContain("This plugin entry was imported");
+    const packageJson = JSON.parse(await readFile(path.join(directory, "package.json"), "utf8"));
+    expect(packageJson.files).toContain("OVERVIEW.md");
+    expect(await readdir(directory)).toContain("paseo-plugin.json");
+  });
+
+  it("includes the author overview in the packed npm artifact", async () => {
+    const parent = await mkdtemp(path.join(tmpdir(), "paseo-plugin-scaffold-"));
+    directories.push(parent);
+    const directory = path.join(parent, "packed-plugin");
+    await scaffoldPluginDirectory(directory);
+
+    const { stdout } = await execAsync("npm pack --dry-run --ignore-scripts --json", {
+      cwd: directory,
+    });
+    const [artifact] = JSON.parse(stdout) as { files: { path: string }[] }[];
+    expect(artifact.files.map((file) => file.path)).toEqual(
+      expect.arrayContaining(["OVERVIEW.md", "paseo-plugin.json"]),
+    );
+  });
+
   it(
     "creates a standalone split-runtime project that typechecks",
     { timeout: 15_000 },
@@ -60,6 +102,7 @@ describe("plugin scaffold", () => {
         version: "0.0.0",
         files: [
           "paseo-plugin.json",
+          "OVERVIEW.md",
           "index.client.ts",
           "index.client.tsx",
           "index.server.ts",
diff --git a/packages/cli/src/commands/plugin/scaffold.ts b/packages/cli/src/commands/plugin/scaffold.ts
index 448aa956fa..f0f1fe3b93 100644
--- a/packages/cli/src/commands/plugin/scaffold.ts
+++ b/packages/cli/src/commands/plugin/scaffold.ts
@@ -3,6 +3,34 @@ import path from "node:path";
 import { PluginIdSchema } from "@getpaseo/protocol/messages";
 import { resolveCliVersion } from "../../version.js";
 
+const OVERVIEW = `<!--
+OVERVIEW.md is required to list your plugin in the registry. Keep it beside
+paseo-plugin.json in your repository at the pinned commit and in your npm package.
+Replace this comment with useful facts before publishing.
+
+This overview is for people choosing a plugin in Paseo, on the plugin page under
+its install command. README assumes a GitHub audience and includes technical
+details, installation instructions, and badges. Long, AI-generated READMEs leave
+people reading past that material to understand what the plugin does.
+
+Write these parts in order, including only what helps someone decide to install:
+
+1. Describe what your plugin is and does in plain terms first.
+2. Explain how it works only when it is not obvious.
+3. Explain setup when needed: settings, accounts, tokens, providers, tools, or
+   other plugins. Include applicable daemon version and operating system
+   requirements. Setup guidance is allowed; installation instructions are not.
+4. Explain capabilities and settings worth understanding, what each option does,
+   what the plugin reads or sends and where, permissions, and known limits.
+
+Length follows complexity; a theme needs one paragraph. Choose headings only
+when they help. Use sentence case and plain factual language, with no em dashes.
+Omit installation commands, badges, changelog, contributing or license sections,
+marketing, and unsupported claims. Avoid implementation filler such as empty
+cleanup functions, theme-token field lists, or lists of absent features.
+-->
+`;
+
 const TSCONFIG = {
   compilerOptions: {
     target: "ES2020",
@@ -155,6 +183,7 @@ export async function scaffoldPluginDirectory(
     version: "0.0.0",
     files: [
       "paseo-plugin.json",
+      "OVERVIEW.md",
       "index.client.ts",
       "index.client.tsx",
       "index.server.ts",
@@ -179,6 +208,7 @@ export async function scaffoldPluginDirectory(
       "paseo-plugin.json",
       `${JSON.stringify({ id, requirements: { paseo: `>=${version}` } }, null, 2)}\n`,
     ],
+    ["OVERVIEW.md", OVERVIEW],
     ["package.json", `${JSON.stringify(packageJson, null, 2)}\n`],
     ["tsconfig.json", `${JSON.stringify(TSCONFIG, null, 2)}\n`],
     ["index.client.tsx", CLIENT_ENTRY],
diff --git a/public-docs/plugins/publishing.md b/public-docs/plugins/publishing.md
index 0e7f2f89cf..a021bda644 100644
--- a/public-docs/plugins/publishing.md
+++ b/public-docs/plugins/publishing.md
@@ -56,6 +56,7 @@ The scaffold includes this `files` list in `package.json`:
 {
   "files": [
     "paseo-plugin.json",
+    "OVERVIEW.md",
     "index.client.ts",
     "index.client.tsx",
     "index.server.ts",
@@ -136,6 +137,46 @@ In the app, enter only the source identifier.
 
 :::
 
+## Your listing page
+
+Write `OVERVIEW.md` beside `paseo-plugin.json` for the plugin page inside Paseo.
+It helps someone decide whether to install your plugin; the install command is already at
+the top of that page. A README assumes a GitHub audience and carries installation
+instructions, technical details, and badges. Long, AI-generated READMEs make people read
+past that material to understand what a plugin does.
+
+`OVERVIEW.md` is required to list your plugin in the registry. Commit it beside
+`paseo-plugin.json` in the source repository at the pinned commit. The registry resolves it
+relative to the manifest, under `pluginPath` for monorepos. Include it in the published npm
+package too; the scaffold's `files` list includes it. Replace the scaffold's guidance comment
+with useful facts before publishing.
+
+The repository overview takes precedence over a registry import stopgap. Online validation
+fails when the pinned commit has no `OVERVIEW.md`, except for unchanged imported records
+that already carry `plugins/<owner>/<slug>.md` in the registry repository. Every version bump
+requires a repository overview and removes the stopgap in the same PR. A bump without the
+repository overview fails validation. Neither README files nor a `paseo-listing.json`
+`readme` override supplies the overview.
+
+Author overviews and registry stopgaps follow the same content contract, in this order.
+Choose headings only when they help; length follows complexity. A theme needs one paragraph.
+
+1. Explain what the plugin is and does in plain terms first.
+2. Explain how it works only when that is not obvious.
+3. Explain setup when needed: settings, accounts, tokens, providers, external tools, or other
+   plugins. Include applicable daemon version and operating system requirements. Setup
+   guidance is allowed; installation instructions are not.
+4. Explain capabilities and settings worth understanding, what each option does, what the
+   plugin reads or sends and where, permissions, and known limits.
+
+Use sentence case and plain factual language, with no em dashes. Omit installation commands,
+badges, changelog, contributing or license sections, marketing, and unsupported claims.
+Avoid implementation filler such as empty cleanup functions, catalogs of theme-token fields,
+or lists of absent features. Keep only what helps someone choose the plugin.
+
+If your plugin is an unchanged imported record, you can propose an author-written overview
+to replace the registry stopgap. Do not add import credit to your own `OVERVIEW.md`.
+
 ## Share through GitHub or Git
 
 Push the plugin project to a repository. Users can install it with:
diff --git a/skills/paseo-plugin/SKILL.md b/skills/paseo-plugin/SKILL.md
index 6fc8c90f87..f229bf7a3a 100644
--- a/skills/paseo-plugin/SKILL.md
+++ b/skills/paseo-plugin/SKILL.md
@@ -64,6 +64,7 @@ The generated project contains:
 ```text
 my-plugin/
   paseo-plugin.json
+  OVERVIEW.md
   package.json
   tsconfig.json
   index.client.tsx
@@ -638,6 +639,48 @@ Do not edit a local config when the target is a remote daemon. Perform the edit
 
 When the same screen or sidebar item exists on several connected hosts, Paseo shows it once. The screen header has a host picker; a sidebar item uses the host of the screen on display, else the host last picked in one of the plugin's screens. The selected host owns the bundle, SDK calls, RPCs, and query cache. An offline selected host does not fall through to another host. Attachment sources stay scoped to the composer's host.
 
+## Publishing a listing
+
+Write `OVERVIEW.md` beside `paseo-plugin.json` for the plugin page inside Paseo.
+It helps someone decide whether to install your plugin; the install command is already at
+the top of that page. A README assumes a GitHub audience and carries installation
+instructions, technical details, and badges. Long, AI-generated READMEs make people read
+past that material to understand what a plugin does.
+
+`OVERVIEW.md` is required to list your plugin in the registry. Commit it beside
+`paseo-plugin.json` in the source repository at the pinned commit. The registry resolves it
+relative to the manifest, under `pluginPath` for monorepos. Include it in the published npm
+package too; the scaffold's `files` list includes it. Replace the scaffold's guidance comment
+with useful facts before publishing.
+
+The repository overview takes precedence over a registry import stopgap. Online validation
+fails when the pinned commit has no `OVERVIEW.md`, except for unchanged imported records
+that already carry `plugins/<owner>/<slug>.md` in the registry repository. Every version bump
+requires a repository overview and removes the stopgap in the same PR. A bump without the
+repository overview fails validation. Neither README files nor a `paseo-listing.json`
+`readme` override supplies the overview.
+
+Author overviews and registry stopgaps follow the same content contract, in this order.
+Choose headings only when they help; length follows complexity. A theme needs one paragraph.
+
+1. Explain what the plugin is and does in plain terms first.
+2. Explain how it works only when that is not obvious.
+3. Explain setup when needed: settings, accounts, tokens, providers, external tools, or other
+   plugins. Include applicable daemon version and operating system requirements. Setup
+   guidance is allowed; installation instructions are not.
+4. Explain capabilities and settings worth understanding, what each option does, what the
+   plugin reads or sends and where, permissions, and known limits.
+
+Use sentence case and plain factual language, with no em dashes. Omit installation commands,
+badges, changelog, contributing or license sections, marketing, and unsupported claims.
+Avoid implementation filler such as empty cleanup functions, catalogs of theme-token fields,
+or lists of absent features. Keep only what helps someone choose the plugin.
+
+If your plugin is an unchanged imported record, you can propose an author-written overview
+to replace the registry stopgap. Do not add import credit to your own `OVERVIEW.md`.
+
+See [Your listing page](https://paseo.sh/docs/plugins/publishing.md#your-listing-page).
+
 ## Typecheck and manage
 
 When editing a plugin, typecheck its source before install or reload:

From 56d568074210f2a16c5ca7ef7578169e882612df Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 6 Oct 2026 17:03:17 +0200
Subject: [PATCH 005/270] fix(highlight): keep Astro expressions colored
 through nested template strings (#6219)

An Astro { } expression containing a template string inside ${} closed at
the first } in that nested string, leaving the rest of the expression
uncolored. Astro and Vue now share one scanner for embedded JavaScript,
which already skips template substitutions.

Closes #6209

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/__tests__/highlighter.test.ts         |  13 +++
 packages/highlight/src/astro/parser.ts        |  80 +-------------
 packages/highlight/src/js-scanner.ts          | 100 ++++++++++++++++++
 packages/highlight/src/vue/parser.ts          |  99 +----------------
 4 files changed, 116 insertions(+), 176 deletions(-)
 create mode 100644 packages/highlight/src/js-scanner.ts

diff --git a/packages/highlight/src/__tests__/highlighter.test.ts b/packages/highlight/src/__tests__/highlighter.test.ts
index 386b0c6364..c245d42da1 100644
--- a/packages/highlight/src/__tests__/highlighter.test.ts
+++ b/packages/highlight/src/__tests__/highlighter.test.ts
@@ -144,6 +144,19 @@ const title = "Hello";
     );
   });
 
+  it("keeps an Astro expression open through nested template strings", () => {
+    const code = "<p>{`a ${`}`} b`}</p>";
+
+    const tokens = highlightCode(code, "Nested.astro").flat();
+
+    expect(tokens).toEqual(
+      expect.arrayContaining([
+        { text: "`}`", style: "string" },
+        { text: " b`", style: "string" },
+      ]),
+    );
+  });
+
   it("highlights Vue SFCs across script, template, and style", () => {
     const code = [
       '<script lang="ts">',
diff --git a/packages/highlight/src/astro/parser.ts b/packages/highlight/src/astro/parser.ts
index 444235488f..202c921252 100644
--- a/packages/highlight/src/astro/parser.ts
+++ b/packages/highlight/src/astro/parser.ts
@@ -14,6 +14,7 @@ import {
 import { parser as cssParser } from "@lezer/css";
 import { parser as htmlParser } from "@lezer/html";
 import { parser as jsParser } from "@lezer/javascript";
+import { findClosingBrace } from "../js-scanner.js";
 
 interface Range {
   from: number;
@@ -23,88 +24,11 @@ interface Range {
 const jsxParser = jsParser.configure({ dialect: "ts jsx" });
 const typescriptParser = jsParser.configure({ dialect: "ts" });
 
-function isSpace(code: number): boolean {
-  return code === 32 || code === 9 || code === 10 || code === 13;
-}
-
-function isRegexStart(text: string, position: number): boolean {
-  let previous = position - 1;
-  while (previous >= 0 && isSpace(text.charCodeAt(previous))) previous--;
-  if (previous < 0) return true;
-
-  const character = text[previous];
-  if (/[)\]}<"'`\d]/.test(character)) return false;
-  const code = text.charCodeAt(previous);
-  if (code === 62) return previous > 0 && text.charCodeAt(previous - 1) === 61;
-  if (!/[A-Za-z_$]/.test(character)) return true;
-
-  let start = previous;
-  while (start >= 0 && /[A-Za-z0-9_$]/.test(text[start])) start--;
-  const keyword = text.slice(start + 1, previous + 1);
-  return /^(return|typeof|instanceof|in|of|new|void|delete|yield|await|case|do|else|throw|extends|assert|with)$/.test(
-    keyword,
-  );
-}
-
-function skipQuotedText(text: string, opening: number): number {
-  const quote = text.charCodeAt(opening);
-  for (let position = opening + 1; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 92) position++;
-    else if (code === quote) return position;
-  }
-  return text.length - 1;
-}
-
-function skipLineComment(text: string, opening: number): number {
-  const newline = text.indexOf("\n", opening + 2);
-  return newline >= 0 ? newline : text.length - 1;
-}
-
-function skipBlockComment(text: string, opening: number): number {
-  const closing = text.indexOf("*/", opening + 2);
-  return closing >= 0 ? closing + 1 : text.length - 1;
-}
-
-function skipRegex(text: string, opening: number): number {
-  let isInCharacterClass = false;
-  for (let position = opening + 1; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 10 || code === 13) return position;
-    if (code === 92) position++;
-    else if (isInCharacterClass && code === 93) isInCharacterClass = false;
-    else if (!isInCharacterClass && code === 91) isInCharacterClass = true;
-    else if (!isInCharacterClass && code === 47) return position;
-  }
-  return text.length - 1;
-}
-
-function findClosingBrace(text: string, opening: number): number {
-  let depth = 0;
-  for (let position = opening; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 47 && text.charCodeAt(position + 1) === 47) {
-      position = skipLineComment(text, position);
-    } else if (code === 47 && text.charCodeAt(position + 1) === 42) {
-      position = skipBlockComment(text, position);
-    } else if (code === 47 && isRegexStart(text, position)) {
-      position = skipRegex(text, position);
-    } else if (code === 34 || code === 39 || code === 96) {
-      position = skipQuotedText(text, position);
-    } else if (code === 123) {
-      depth++;
-    } else if (code === 125 && --depth === 0) {
-      return position;
-    }
-  }
-  return -1;
-}
-
 function findExpressions(text: string): Range[] {
   const ranges: Range[] = [];
   for (let position = 0; position < text.length; position++) {
     if (text.charCodeAt(position) !== 123) continue;
-    const closing = findClosingBrace(text, position);
+    const closing = findClosingBrace(text, position + 1);
     if (closing < 0) break;
     ranges.push({ from: position, to: closing });
     position = closing;
diff --git a/packages/highlight/src/js-scanner.ts b/packages/highlight/src/js-scanner.ts
new file mode 100644
index 0000000000..fb7f70ed77
--- /dev/null
+++ b/packages/highlight/src/js-scanner.ts
@@ -0,0 +1,100 @@
+// Scans JavaScript embedded in a template (Astro `{ }` expressions, Vue `{{ }}`
+// interpolations) for the brace that closes it, without parsing the code.
+
+function isSpace(code: number): boolean {
+  return code === 32 || code === 9 || code === 10 || code === 13;
+}
+
+function isRegexStart(text: string, position: number): boolean {
+  let previous = position - 1;
+  while (previous >= 0 && isSpace(text.charCodeAt(previous))) previous--;
+  if (previous < 0) return true;
+
+  const character = text[previous];
+  if (/[)\]}<"'`\d]/.test(character)) return false;
+  const code = text.charCodeAt(previous);
+  if (code === 62) return previous > 0 && text.charCodeAt(previous - 1) === 61;
+  if (!/[A-Za-z_$]/.test(character)) return true;
+
+  let start = previous;
+  while (start >= 0 && /[A-Za-z0-9_$]/.test(text[start])) start--;
+  const keyword = text.slice(start + 1, previous + 1);
+  return /^(return|typeof|instanceof|in|of|new|void|delete|yield|await|case|do|else|throw|extends|assert|with)$/.test(
+    keyword,
+  );
+}
+
+// Template strings nested deeper than this are treated as running to the end.
+const MAX_TEMPLATE_NESTING = 32;
+
+function skipQuotedText(text: string, opening: number, nesting = 0): number {
+  const quote = text.charCodeAt(opening);
+  for (let position = opening + 1; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 92) position++;
+    else if (code === quote) return position;
+    else if (quote === 96 && code === 36 && text.charCodeAt(position + 1) === 123) {
+      position = skipTemplateSubstitution(text, position + 2, nesting);
+    }
+  }
+  return text.length - 1;
+}
+
+function skipTemplateSubstitution(text: string, start: number, nesting: number): number {
+  if (nesting >= MAX_TEMPLATE_NESTING) return text.length - 1;
+  const closing = findClosingBrace(text, start, () => true, nesting + 1);
+  return closing >= 0 ? closing : text.length - 1;
+}
+
+function skipLineComment(text: string, opening: number): number {
+  const newline = text.indexOf("\n", opening + 2);
+  return newline >= 0 ? newline : text.length - 1;
+}
+
+function skipBlockComment(text: string, opening: number): number {
+  const closing = text.indexOf("*/", opening + 2);
+  return closing >= 0 ? closing + 1 : text.length - 1;
+}
+
+function skipRegex(text: string, opening: number): number {
+  let isInCharacterClass = false;
+  for (let position = opening + 1; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 10 || code === 13) return position;
+    if (code === 92) position++;
+    else if (isInCharacterClass && code === 93) isInCharacterClass = false;
+    else if (!isInCharacterClass && code === 91) isInCharacterClass = true;
+    else if (!isInCharacterClass && code === 47) return position;
+  }
+  return text.length - 1;
+}
+
+// Finds the first `}` outside nested braces, strings, comments, and regexes
+// for which `isEnd` holds.
+export function findClosingBrace(
+  text: string,
+  start: number,
+  isEnd: (position: number) => boolean = () => true,
+  nesting = 0,
+): number {
+  let depth = 0;
+  for (let position = start; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 47 && text.charCodeAt(position + 1) === 47) {
+      position = skipLineComment(text, position);
+    } else if (code === 47 && text.charCodeAt(position + 1) === 42) {
+      position = skipBlockComment(text, position);
+    } else if (code === 47 && isRegexStart(text, position)) {
+      position = skipRegex(text, position);
+    } else if (code === 34 || code === 39 || code === 96) {
+      position = skipQuotedText(text, position, nesting);
+    } else if (code === 123) {
+      depth++;
+    } else if (code === 125 && depth === 0) {
+      if (isEnd(position)) return position;
+    } else if (code === 125) {
+      depth--;
+    }
+  }
+  return -1;
+}
diff --git a/packages/highlight/src/vue/parser.ts b/packages/highlight/src/vue/parser.ts
index 05010665ca..5c54825b61 100644
--- a/packages/highlight/src/vue/parser.ts
+++ b/packages/highlight/src/vue/parser.ts
@@ -8,6 +8,7 @@ import {
 import { parser as cssParser } from "@lezer/css";
 import { parser as htmlParser } from "@lezer/html";
 import { parser as jsParser } from "@lezer/javascript";
+import { findClosingBrace } from "../js-scanner.js";
 
 interface Range {
   from: number;
@@ -17,104 +18,6 @@ interface Range {
 const typescriptParser = jsParser.configure({ dialect: "ts" });
 const expressionParser = jsParser.configure({ top: "SingleExpression" });
 
-function isSpace(code: number): boolean {
-  return code === 32 || code === 9 || code === 10 || code === 13;
-}
-
-function isRegexStart(text: string, position: number): boolean {
-  let previous = position - 1;
-  while (previous >= 0 && isSpace(text.charCodeAt(previous))) previous--;
-  if (previous < 0) return true;
-
-  const character = text[previous];
-  if (/[)\]}<"'`\d]/.test(character)) return false;
-  const code = text.charCodeAt(previous);
-  if (code === 62) return previous > 0 && text.charCodeAt(previous - 1) === 61;
-  if (!/[A-Za-z_$]/.test(character)) return true;
-
-  let start = previous;
-  while (start >= 0 && /[A-Za-z0-9_$]/.test(text[start])) start--;
-  const keyword = text.slice(start + 1, previous + 1);
-  return /^(return|typeof|instanceof|in|of|new|void|delete|yield|await|case|do|else|throw|extends|assert|with)$/.test(
-    keyword,
-  );
-}
-
-// Template strings nested deeper than this are treated as running to the end.
-const MAX_TEMPLATE_NESTING = 32;
-
-function skipQuotedText(text: string, opening: number, nesting = 0): number {
-  const quote = text.charCodeAt(opening);
-  for (let position = opening + 1; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 92) position++;
-    else if (code === quote) return position;
-    else if (quote === 96 && code === 36 && text.charCodeAt(position + 1) === 123) {
-      position = skipTemplateSubstitution(text, position + 2, nesting);
-    }
-  }
-  return text.length - 1;
-}
-
-function skipTemplateSubstitution(text: string, start: number, nesting: number): number {
-  if (nesting >= MAX_TEMPLATE_NESTING) return text.length - 1;
-  const closing = findClosingBrace(text, start, () => true, nesting + 1);
-  return closing >= 0 ? closing : text.length - 1;
-}
-
-function skipLineComment(text: string, opening: number): number {
-  const newline = text.indexOf("\n", opening + 2);
-  return newline >= 0 ? newline : text.length - 1;
-}
-
-function skipBlockComment(text: string, opening: number): number {
-  const closing = text.indexOf("*/", opening + 2);
-  return closing >= 0 ? closing + 1 : text.length - 1;
-}
-
-function skipRegex(text: string, opening: number): number {
-  let isInCharacterClass = false;
-  for (let position = opening + 1; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 10 || code === 13) return position;
-    if (code === 92) position++;
-    else if (isInCharacterClass && code === 93) isInCharacterClass = false;
-    else if (!isInCharacterClass && code === 91) isInCharacterClass = true;
-    else if (!isInCharacterClass && code === 47) return position;
-  }
-  return text.length - 1;
-}
-
-// Finds the first `}` outside nested braces, strings, comments, and regexes
-// for which `isEnd` holds.
-function findClosingBrace(
-  text: string,
-  start: number,
-  isEnd: (position: number) => boolean,
-  nesting = 0,
-): number {
-  let depth = 0;
-  for (let position = start; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 47 && text.charCodeAt(position + 1) === 47) {
-      position = skipLineComment(text, position);
-    } else if (code === 47 && text.charCodeAt(position + 1) === 42) {
-      position = skipBlockComment(text, position);
-    } else if (code === 47 && isRegexStart(text, position)) {
-      position = skipRegex(text, position);
-    } else if (code === 34 || code === 39 || code === 96) {
-      position = skipQuotedText(text, position, nesting);
-    } else if (code === 123) {
-      depth++;
-    } else if (code === 125 && depth === 0) {
-      if (isEnd(position)) return position;
-    } else if (code === 125) {
-      depth--;
-    }
-  }
-  return -1;
-}
-
 function findInterpolationEnd(text: string, start: number): number {
   return findClosingBrace(text, start, (position) => text.charCodeAt(position + 1) === 125);
 }

From 7fd469ae1908a1853cc3ec48eb84b81ff752c4a8 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 16:52:02 +0100
Subject: [PATCH 006/270] Enable plugin registry installs by default (#6224)

* feat(plugins): enable registry installs by default

* fix(plugins): explain explicit Git source for missing registry IDs

* fix(plugins): tailor missing registry guidance to installation

* test(app): sample footer geometry in one browser frame

* fix(plugins): make registry source resolution deterministic

Directory existence must not change the meaning of a registry identifier shared by CLI, RPC, and UI installs. Classify explicit host paths in the source parser and explain recovery from registry transport and revision-selection failures.

* fix(plugins): recognize dot and Windows directory sources

* test(cli): wait for readable daemon ownership before cancellation

The cancellation test raced PID-file creation against its first write and parsed empty JSON in CI. Use the public daemon-instance reader to wait for and capture the supervisor PID before asserting cancellation cleanup.

* test(app): expect missing directory install guidance
---
 CHANGELOG.md                                  |   2 +
 docs/plugins.md                               |  17 ++-
 .../app/e2e/browser/plugin-management.spec.ts |   2 +-
 .../support/helpers/sidebar-nav-settings.ts   |  17 +--
 packages/app/src/i18n/resources/en.ts         |   2 +-
 .../app/src/i18n/resources/plugin-settings.ts |  16 +--
 .../src/commands/daemon/lifecycle.e2e.test.ts |  15 ++-
 .../cli/src/commands/plugin/index.test.ts     |   4 +-
 packages/cli/src/commands/plugin/index.ts     |   6 +-
 .../src/plugin-source-reference.test.ts       |  34 +++++-
 .../protocol/src/plugin-source-reference.ts   |  14 ++-
 packages/server/src/server/bootstrap.ts       |   2 -
 .../server/src/server/config-environment.ts   |   1 -
 packages/server/src/server/config.test.ts     |  20 ++--
 packages/server/src/server/config.ts          |   4 -
 .../server/src/server/persisted-config.ts     |   1 +
 .../src/server/plugins/index.posix.test.ts    |  98 ++++++++++++++-
 packages/server/src/server/plugins/index.ts   |  16 +--
 .../plugins/managed-source.posix.test.ts      | 112 ++++++++++++++++--
 .../src/server/plugins/managed-source.ts      |  23 ++--
 .../server/plugins/managed-source/registry.ts |  27 +++--
 public-docs/plugins/index.md                  |  18 ++-
 public-docs/plugins/publishing.md             |  17 ++-
 public-docs/plugins/reference.md              |  35 +++---
 24 files changed, 385 insertions(+), 118 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d3c132e0c..3a4c3ab914 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,8 @@
 
 ### Changed
 
+- Enabled the plugin registry by default: `paseo plugin add owner/slug` installs a reviewed artifact even when a local directory matches; use explicit local paths (including `.`, `..`, and Windows drive or UNC paths), and use `github:owner/repository` for direct GitHub installs. Registry connection, missing-ID, and `--ref` errors include recovery steps.
+
 - Changed the context window details to show usage for the account the agent runs under, including custom `CLAUDE_CONFIG_DIR` and `CODEX_HOME` homes ([#5465](https://github.com/getpaseo/paseo/pull/5465))
 - Changed the context window details on desktop to a hover card with Refresh ([#5975](https://github.com/getpaseo/paseo/pull/5975))
 - Changed the context window meter to show before an agent's first turn ([#6089](https://github.com/getpaseo/paseo/pull/6089))
diff --git a/docs/plugins.md b/docs/plugins.md
index 7cabeeda84..e9d5a18a9e 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -117,12 +117,9 @@ the bundled integration; an entry with `extends` shadows it with a custom provid
 
 ## Install from a registry
 
-Registry installs are off by default. Set `pluginRegistryEnabled: true` in daemon config or
-`PASEO_PLUGIN_REGISTRY_ENABLED=1`, then restart the daemon. While they are off, bare
-`owner/repo` is GitHub shorthand and the daemon never contacts a registry.
-
-With registry installs on, `paseo plugin install owner/slug` installs the registry's reviewed
-artifact, and GitHub shorthand requires `github:`. Registry installs
+`paseo plugin add owner/slug` installs the registry's reviewed artifact by default.
+Browse published plugins at [paseo.sh/plugins](https://paseo.sh/plugins).
+Use `git:owner/repository` or a full Git URL for a Git source. Registry installs
 keep the registry URL and ID, so update checks use its approved pin. Explicit version/ref
 selection is unavailable for registry installs; install an explicit source to select your own.
 
@@ -138,13 +135,13 @@ owns static hosting, record shapes, pins, and advisory install counts.
 
 ## Install a Git source
 
-GitHub repositories use `owner/repository` or `github:owner/repository`. Other hosts use a Git
-URL. An existing directory still wins over source resolution.
+GitHub repositories use `git:owner/repository` or `github:owner/repository`. Other hosts use a Git
+URL.
 
 ```bash
-paseo plugin install owner/repository
+paseo plugin install git:owner/repository
 paseo plugin install https://gitlab.com/group/repository.git
-paseo plugin install owner/monorepo:plugins/review
+paseo plugin install git:owner/monorepo:plugins/review
 paseo plugin install github:owner/repository --ref main
 ```
 
diff --git a/packages/app/e2e/browser/plugin-management.spec.ts b/packages/app/e2e/browser/plugin-management.spec.ts
index 7e32f61350..05a2dd765e 100644
--- a/packages/app/e2e/browser/plugin-management.spec.ts
+++ b/packages/app/e2e/browser/plugin-management.spec.ts
@@ -557,7 +557,7 @@ async function retryGitInstallAndInspectRows(
 
   await installPlugin(page, missingSource);
   await expect(page.getByTestId("plugin-management-feedback")).toContainText(
-    "Plugin source is neither an existing directory nor a Git URL",
+    `Plugin directory does not exist: ${missingSource}`,
   );
   await expect(page.getByLabel("Plugin source")).toHaveValue(missingSource);
   await capturePluginInstallForm(page, testInfo, "compact-error");
diff --git a/packages/app/e2e/support/helpers/sidebar-nav-settings.ts b/packages/app/e2e/support/helpers/sidebar-nav-settings.ts
index b707abdae8..e3eff916e7 100644
--- a/packages/app/e2e/support/helpers/sidebar-nav-settings.ts
+++ b/packages/app/e2e/support/helpers/sidebar-nav-settings.ts
@@ -244,13 +244,16 @@ const FOOTER_GEOMETRY_TOLERANCE = 0.01;
  * Settings together at the end.
  */
 export async function expectFooterIconRow(page: Page): Promise<void> {
-  const boxes = (
-    await Promise.all(
-      FOOTER_ICON_TEST_IDS.map((testID) =>
-        page.locator(`[data-testid="${testID}"]:visible`).first().boundingBox(),
-      ),
-    )
-  ).map((box) => box!);
+  // Read one browser-frame snapshot: the compact drawer can translate between separate RPCs.
+  const boxes = await page
+    .locator(FOOTER_ICON_TEST_IDS.map((testID) => `[data-testid="${testID}"]:visible`).join(","))
+    .evaluateAll((elements) =>
+      elements.map((element) => {
+        const { x, y, width, height } = element.getBoundingClientRect();
+        return { testID: element.getAttribute("data-testid"), x, y, width, height };
+      }),
+    );
+  expect(boxes.map((box) => box.testID)).toEqual(FOOTER_ICON_TEST_IDS);
   const [first] = boxes;
   for (const box of boxes) {
     expect(Math.abs(box.y + box.height / 2 - first!.y - first!.height / 2)).toBeLessThan(2);
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 35230d4aaa..a1464907ce 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -2160,7 +2160,7 @@ export const en = {
       globalTitle: "Enable plugins",
       globalHint: "Global switch for every configured plugin",
       sourceLabel: "Plugin source",
-      sourcePlaceholder: "Directory, Git URL, or npm package",
+      sourcePlaceholder: "owner/slug, directory, Git URL, or npm package",
       docs: "Docs",
       install: "Install plugin",
       installing: "Installing…",
diff --git a/packages/app/src/i18n/resources/plugin-settings.ts b/packages/app/src/i18n/resources/plugin-settings.ts
index b3f0621df7..8146ad9747 100644
--- a/packages/app/src/i18n/resources/plugin-settings.ts
+++ b/packages/app/src/i18n/resources/plugin-settings.ts
@@ -27,7 +27,7 @@ export const pluginSettings = {
     globalTitle: "تفعيل الإضافات",
     globalHint: "مفتاح عام لكل الإضافات المضبوطة",
     sourceLabel: "مصدر الإضافة",
-    sourcePlaceholder: "مجلد أو رابط Git أو حزمة npm",
+    sourcePlaceholder: "owner/slug, مجلد أو رابط Git أو حزمة npm",
     docs: "الوثائق",
     install: "تثبيت الإضافة",
     installing: "جارٍ التثبيت…",
@@ -82,7 +82,7 @@ export const pluginSettings = {
     globalTitle: "Activar plugins",
     globalHint: "Interruptor global para todos los plugins configurados",
     sourceLabel: "Fuente del plugin",
-    sourcePlaceholder: "Directorio, URL de Git o paquete npm",
+    sourcePlaceholder: "owner/slug, Directorio, URL de Git o paquete npm",
     docs: "Documentación",
     install: "Instalar plugin",
     installing: "Instalando…",
@@ -137,7 +137,7 @@ export const pluginSettings = {
     globalTitle: "Activer les plugins",
     globalHint: "Interrupteur global pour tous les plugins configurés",
     sourceLabel: "Source du plugin",
-    sourcePlaceholder: "Dossier, URL Git ou paquet npm",
+    sourcePlaceholder: "owner/slug, Dossier, URL Git ou paquet npm",
     docs: "Documentation",
     install: "Installer le plugin",
     installing: "Installation…",
@@ -192,7 +192,7 @@ export const pluginSettings = {
     globalTitle: "プラグインを有効化",
     globalHint: "設定済みプラグインすべての共通スイッチ",
     sourceLabel: "プラグインソース",
-    sourcePlaceholder: "ディレクトリ、Git URL、npm パッケージ",
+    sourcePlaceholder: "owner/slug, ディレクトリ、Git URL、npm パッケージ",
     docs: "ドキュメント",
     install: "プラグインをインストール",
     installing: "インストール中…",
@@ -246,7 +246,7 @@ export const pluginSettings = {
     globalTitle: "플러그인 활성화",
     globalHint: "설정된 모든 플러그인의 전역 스위치",
     sourceLabel: "플러그인 소스",
-    sourcePlaceholder: "디렉터리, Git URL 또는 npm 패키지",
+    sourcePlaceholder: "owner/slug, 디렉터리, Git URL 또는 npm 패키지",
     docs: "문서",
     install: "플러그인 설치",
     installing: "설치 중…",
@@ -301,7 +301,7 @@ export const pluginSettings = {
     globalTitle: "Ativar plugins",
     globalHint: "Controle global para todos os plugins configurados",
     sourceLabel: "Fonte do plugin",
-    sourcePlaceholder: "Diretório, URL Git ou pacote npm",
+    sourcePlaceholder: "owner/slug, Diretório, URL Git ou pacote npm",
     docs: "Documentação",
     install: "Instalar plugin",
     installing: "Instalando…",
@@ -356,7 +356,7 @@ export const pluginSettings = {
     globalTitle: "Включить плагины",
     globalHint: "Общий переключатель для всех настроенных плагинов",
     sourceLabel: "Источник плагина",
-    sourcePlaceholder: "Каталог, URL Git или пакет npm",
+    sourcePlaceholder: "owner/slug, Каталог, URL Git или пакет npm",
     docs: "Документация",
     install: "Установить плагин",
     installing: "Установка…",
@@ -410,7 +410,7 @@ export const pluginSettings = {
     globalTitle: "启用插件",
     globalHint: "所有已配置插件的全局开关",
     sourceLabel: "插件来源",
-    sourcePlaceholder: "目录、Git URL 或 npm 包",
+    sourcePlaceholder: "owner/slug, 目录、Git URL 或 npm 包",
     docs: "文档",
     install: "安装插件",
     installing: "正在安装…",
diff --git a/packages/cli/src/commands/daemon/lifecycle.e2e.test.ts b/packages/cli/src/commands/daemon/lifecycle.e2e.test.ts
index cb42c0b0a5..fd7e845ecd 100644
--- a/packages/cli/src/commands/daemon/lifecycle.e2e.test.ts
+++ b/packages/cli/src/commands/daemon/lifecycle.e2e.test.ts
@@ -358,14 +358,21 @@ test.skipIf(process.platform === "win32").each([["start"], ["daemon", "run"]])(
         stdio: "ignore",
       });
       const exited = new Promise((resolve) => child!.once("exit", resolve));
+      // The lock file exists before its contents identify the supervisor.
+      let supervisorPid: number | undefined;
       await expect
-        .poll(async () => existsSync(path.join(home, "paseo.pid")), { timeout: 10_000 })
-        .toBe(true);
-      const lock = JSON.parse(await readFile(path.join(home, "paseo.pid"), "utf8"));
+        .poll(
+          async () => {
+            supervisorPid = (await readDaemonInstance(home))?.pid;
+            return supervisorPid;
+          },
+          { timeout: 10_000 },
+        )
+        .toBeTypeOf("number");
       await f.ok(["status", "--home", home]);
       child.kill("SIGINT");
       await exited;
-      expect(() => process.kill(lock.pid, 0)).toThrow();
+      expect(() => process.kill(supervisorPid!, 0)).toThrow();
       expect((await f.ok(["status", "--home", home])).localDaemon).toBe("stopped");
     } finally {
       child?.kill("SIGTERM");
diff --git a/packages/cli/src/commands/plugin/index.test.ts b/packages/cli/src/commands/plugin/index.test.ts
index bad3bc0436..8ea6de9dfb 100644
--- a/packages/cli/src/commands/plugin/index.test.ts
+++ b/packages/cli/src/commands/plugin/index.test.ts
@@ -255,12 +255,12 @@ describe("plugin management commands", () => {
     const stderr = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
     const command = createPluginCommand();
 
-    await command.parseAsync(["install", "owner/monorepo", "--path", "plugins/review"], {
+    await command.parseAsync(["install", "git:owner/monorepo", "--path", "plugins/review"], {
       from: "user",
     });
 
     expect(installPluginSource).toHaveBeenCalledWith({
-      source: "owner/monorepo:plugins/review",
+      source: "git:owner/monorepo:plugins/review",
     });
     stderr.mockRestore();
   });
diff --git a/packages/cli/src/commands/plugin/index.ts b/packages/cli/src/commands/plugin/index.ts
index 993c690f68..3a126752c9 100644
--- a/packages/cli/src/commands/plugin/index.ts
+++ b/packages/cli/src/commands/plugin/index.ts
@@ -215,10 +215,12 @@ export function createPluginCommand(): Command {
     plugin
       .command("install")
       .alias("add")
-      .description("Trust and install a plugin from a directory, Git repository, or npm package")
+      .description(
+        "Trust and install a plugin from a registry, directory, Git repository, or npm package",
+      )
       .argument(
         "<source>",
-        "Host directory, GitHub owner/repo, git: or npm: source, optionally followed by :plugin/path",
+        "Registry owner/slug or host/owner/slug, host directory, explicit git:owner/repo or Git URL, or npm: source",
       )
       .option("--id <id>", "Runtime plugin ID (defaults to paseo-plugin.json id)")
       .option("--ref <ref>", "Git branch, tag, or commit")
diff --git a/packages/protocol/src/plugin-source-reference.test.ts b/packages/protocol/src/plugin-source-reference.test.ts
index b8ce6e7346..83f41ce3df 100644
--- a/packages/protocol/src/plugin-source-reference.test.ts
+++ b/packages/protocol/src/plugin-source-reference.test.ts
@@ -3,6 +3,35 @@ import { describe, expect, it } from "vitest";
 import { parsePluginSourceReference } from "./plugin-source-reference.js";
 
 describe("plugin source references", () => {
+  it.each([
+    ".",
+    "..",
+    "./owner/slug",
+    "../owner/slug",
+    "/owner/slug",
+    "~/owner/slug",
+    "~",
+    "C:\\",
+    "C:/",
+    "D:\\plugins\\repository",
+    "D:/plugins/repository",
+    "\\\\server\\share",
+    "\\\\server\\share\\plugins\\review",
+    ".\\plugins\\review",
+    "..\\plugins\\review",
+  ])("recognizes the explicit directory %s by shape", (source) => {
+    expect(parsePluginSourceReference(source)).toEqual({
+      kind: "directory",
+      source,
+      pluginPath: undefined,
+    });
+    expect(parsePluginSourceReference(`${source}:plugins/review`)).toEqual({
+      kind: "directory",
+      source,
+      pluginPath: "plugins/review",
+    });
+  });
+
   it.each([
     ["npm:review@1.2.0:nested", "npm:review@1.2.0", "nested"],
     ["npm:review@^1.2.0", "npm:review@^1.2.0", undefined],
@@ -16,6 +45,7 @@ describe("plugin source references", () => {
     ["git:file:///repo:plugins/main", "git:file:///repo", "plugins/main"],
     ["plugins.example.com:8443/owner/slug", "plugins.example.com:8443/owner/slug", undefined],
     ["owner/repository", "owner/repository", undefined],
+    ["plugins/foo", "plugins/foo", undefined],
     ["owner/repository:plugins/review", "owner/repository", "plugins/review"],
     [
       "https://example.test:8443/owner/repository.git",
@@ -39,10 +69,8 @@ describe("plugin source references", () => {
       "file:///D:/plugins/repository",
       "plugins/review",
     ],
-    ["D:\\plugins\\repository", "D:\\plugins\\repository", undefined],
-    ["D:\\plugins\\repository:plugins/review", "D:\\plugins\\repository", "plugins/review"],
   ])("parses %s", (reference, source, pluginPath) => {
-    expect(parsePluginSourceReference(reference)).toEqual({ source, pluginPath });
+    expect(parsePluginSourceReference(reference)).toEqual({ kind: "managed", source, pluginPath });
   });
 });
 
diff --git a/packages/protocol/src/plugin-source-reference.ts b/packages/protocol/src/plugin-source-reference.ts
index 229dc1df88..15171531f0 100644
--- a/packages/protocol/src/plugin-source-reference.ts
+++ b/packages/protocol/src/plugin-source-reference.ts
@@ -1,19 +1,27 @@
 import { parsePluginRegistryReference } from "./plugin-registry.js";
 import type { PluginInstallation } from "./messages.js";
 export interface PluginSourceReference {
+  kind: "directory" | "managed";
   source: string;
   pluginPath: string | undefined;
 }
 
 export function parsePluginSourceReference(reference: string): PluginSourceReference {
-  if (parsePluginRegistryReference(reference)) return { source: reference, pluginPath: undefined };
   const prefix = /^(npm:|github:|git:(?!\/\/))/.exec(reference)?.[0];
   const source = prefix ? reference.slice(prefix.length) : reference;
   const parsed = splitPluginPath(source, { scp: prefix !== "npm:" });
-  return { ...parsed, source: `${prefix ?? ""}${parsed.source}` };
+  if (!prefix && /^(\.\.?(?:[/\\]|$)|\/|~|[A-Za-z]:[/\\]|\\\\)/.test(parsed.source)) {
+    return { kind: "directory", ...parsed };
+  }
+  if (parsePluginRegistryReference(reference))
+    return { kind: "managed", source: reference, pluginPath: undefined };
+  return { kind: "managed", ...parsed, source: `${prefix ?? ""}${parsed.source}` };
 }
 
-function splitPluginPath(reference: string, options: { scp: boolean }): PluginSourceReference {
+function splitPluginPath(
+  reference: string,
+  options: { scp: boolean },
+): Pick<PluginSourceReference, "source" | "pluginPath"> {
   const separator = reference.lastIndexOf(":");
   if (separator === -1) return { source: reference, pluginPath: undefined };
 
diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/server/bootstrap.ts
index e63ce89fb3..3f49f41a19 100644
--- a/packages/server/src/server/bootstrap.ts
+++ b/packages/server/src/server/bootstrap.ts
@@ -414,7 +414,6 @@ export interface PaseoDaemonConfig {
   plugins?: Record<string, PluginSource>;
   pluginRegistries?: PluginRegistries;
   pluginRegistryUrl?: string;
-  pluginRegistryEnabled?: boolean;
   staticDir: string;
   mcpDebug: boolean;
   isDev?: boolean;
@@ -625,7 +624,6 @@ export async function createPaseoDaemon(
       usageSession: (id) => agentManager.usageSession(id),
     },
     managedSources: new ManagedPluginSources(config.paseoHome, {
-      enabled: config.pluginRegistryEnabled ?? false,
       registries: config.pluginRegistries,
       defaultUrl: config.pluginRegistryUrl,
     }),
diff --git a/packages/server/src/server/config-environment.ts b/packages/server/src/server/config-environment.ts
index 2442ee5dc5..24134035de 100644
--- a/packages/server/src/server/config-environment.ts
+++ b/packages/server/src/server/config-environment.ts
@@ -30,7 +30,6 @@ export const DAEMON_SETTING_ENV_KEYS = [
   "PASEO_LOG_ROTATE_SIZE",
   "PASEO_PASSWORD",
   "PASEO_PLUGIN_REGISTRY",
-  "PASEO_PLUGIN_REGISTRY_ENABLED",
   "PASEO_RELAY_ENABLED",
   "PASEO_RELAY_ENDPOINT",
   "PASEO_RELAY_PUBLIC_ENDPOINT",
diff --git a/packages/server/src/server/config.test.ts b/packages/server/src/server/config.test.ts
index 02a315c9a5..fa49722304 100644
--- a/packages/server/src/server/config.test.ts
+++ b/packages/server/src/server/config.test.ts
@@ -205,21 +205,19 @@ test("loads private plugin registry settings through the configuration boundary"
   const home = await mkdtemp(path.join(os.tmpdir(), "paseo-registry-config-"));
   try {
     const pluginRegistries = { "plugins.example.test": { authorization: "Bearer fixture" } };
-    await writeFile(path.join(home, "config.json"), JSON.stringify({ pluginRegistries }));
+    await writeFile(
+      path.join(home, "config.json"),
+      JSON.stringify({ pluginRegistries, pluginRegistryEnabled: false }),
+    );
     const config = loadConfig(home, {
-      env: { PASEO_PLUGIN_REGISTRY: "https://plugins.example.test/internal" },
+      env: {
+        PASEO_PLUGIN_REGISTRY: "https://plugins.example.test/internal",
+        PASEO_PLUGIN_REGISTRY_ENABLED: "false",
+      },
     });
     expect(config.pluginRegistryUrl).toBe("https://plugins.example.test/internal");
     expect(config.pluginRegistries).toEqual(pluginRegistries);
-    expect(config.pluginRegistryEnabled).toBe(false);
-    await writeFile(
-      path.join(home, "config.json"),
-      JSON.stringify({ pluginRegistries, pluginRegistryEnabled: true }),
-    );
-    expect(loadConfig(home, { env: {} }).pluginRegistryEnabled).toBe(true);
-    expect(
-      loadConfig(home, { env: { PASEO_PLUGIN_REGISTRY_ENABLED: "false" } }).pluginRegistryEnabled,
-    ).toBe(false);
+    expect(config).not.toHaveProperty("pluginRegistryEnabled");
   } finally {
     await rm(home, { recursive: true, force: true });
   }
diff --git a/packages/server/src/server/config.ts b/packages/server/src/server/config.ts
index 61481ce1f9..7b2d06560e 100644
--- a/packages/server/src/server/config.ts
+++ b/packages/server/src/server/config.ts
@@ -628,10 +628,6 @@ export function resolveConfigFromPersisted(
     plugins: persisted.plugins,
     pluginRegistries: persisted.pluginRegistries,
     pluginRegistryUrl: env.PASEO_PLUGIN_REGISTRY,
-    pluginRegistryEnabled:
-      parseBooleanEnv(env.PASEO_PLUGIN_REGISTRY_ENABLED) ??
-      persisted.pluginRegistryEnabled ??
-      false,
     mcpDebug: env.MCP_DEBUG === "1",
     isDev: resolvePaseoNodeEnv(env) === "development",
     agentStoragePath: path.join(paseoHome, "agents"),
diff --git a/packages/server/src/server/persisted-config.ts b/packages/server/src/server/persisted-config.ts
index f924a88ebc..24ded0dec2 100644
--- a/packages/server/src/server/persisted-config.ts
+++ b/packages/server/src/server/persisted-config.ts
@@ -308,6 +308,7 @@ export const PersistedConfigSchema = z
 
     providers: ProvidersSchema.optional(),
     pluginRegistries: PluginRegistriesSchema.optional(),
+    // COMPAT(plugin-registry-gate): added in v0.11.0; accept the ignored startup key until 2027-04-06.
     pluginRegistryEnabled: z.boolean().optional(),
     pluginsEnabled: z.boolean().optional(),
     plugins: z.record(PluginIdSchema, PluginSourceSchema).optional(),
diff --git a/packages/server/src/server/plugins/index.posix.test.ts b/packages/server/src/server/plugins/index.posix.test.ts
index 544b609df5..464ad446f0 100644
--- a/packages/server/src/server/plugins/index.posix.test.ts
+++ b/packages/server/src/server/plugins/index.posix.test.ts
@@ -10,6 +10,7 @@ import {
   stat,
   writeFile,
 } from "node:fs/promises";
+import { createServer } from "node:http";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
@@ -451,7 +452,102 @@ describe("PluginService", () => {
     await service.stopAllPlugins();
   });
 
-  it("prefers an existing directory and installs its selected plugin subdirectory", async () => {
+  it("resolves a bare registry id even when a matching directory exists in the daemon cwd", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
+    const owner = path.join(process.cwd(), `registry-shadow-${randomUUID()}`);
+    await mkdir(owner);
+    roots.push(home, owner);
+    const source = `${path.basename(owner)}/example`;
+    const repository = await createPlugin("registry-example", "export default () => () => {};\n");
+    await mkdir(path.join(owner, "example"));
+    await cp(repository, path.join(owner, "example"), { recursive: true });
+    await runGitCommand(["init", "-b", "main"], { cwd: repository });
+    await runGitCommand(["add", "-A"], { cwd: repository });
+    await runGitCommand(
+      [
+        "-c",
+        "user.name=Paseo Tests",
+        "-c",
+        "user.email=paseo@example.test",
+        "commit",
+        "-m",
+        "fixture",
+      ],
+      { cwd: repository },
+    );
+    const { stdout } = await runGitCommand(["rev-parse", "HEAD"], { cwd: repository });
+    const requests: Array<string | undefined> = [];
+    const server = createServer((request, response) => {
+      requests.push(request.url);
+      response.setHeader("Content-Type", "application/json");
+      response.end(
+        JSON.stringify({
+          id: source,
+          name: "Example",
+          description: "Test",
+          categories: [],
+          author: { github: path.basename(owner) },
+          repository: { url: "https://github.com/fixture/example" },
+          artifact: {
+            kind: "git",
+            remote: pathToFileURL(repository).href,
+            commit: stdout.trim(),
+            pluginPath: ".",
+          },
+          screenshots: [],
+          submittedAt: "2026-10-03",
+          reviewedAt: "2026-10-03",
+          updatedAt: "2026-10-03",
+          publishedAt: "2026-10-03",
+          readme: "# Test",
+        }),
+      );
+    });
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Missing registry address");
+    const url = `http://127.0.0.1:${address.port}`;
+    const store = createStore(home);
+    store.patch({ pluginsEnabled: false });
+    const service = bindTestSessionHost(
+      new PluginService(pino({ level: "silent" }), store, "0.4.0", {
+        managedSources: new ManagedPluginSources(home, { defaultUrl: url }),
+      }),
+    );
+    try {
+      await service.start();
+      await expect(service.installSource({ source })).resolves.toMatchObject({
+        id: "registry-example",
+        status: "disabled",
+        installation: {
+          identity: { kind: "git", registry: { url, id: source } },
+          currentRevision: stdout.trim(),
+        },
+      });
+      expect(requests).toEqual([`/plugins/${source}.json`]);
+      await expect(
+        service.installSource({ source: `./${source}`, id: "local-example" }),
+      ).resolves.toMatchObject({
+        installation: { identity: { kind: "directory", path: path.join(owner, "example") } },
+      });
+      expect(requests).toEqual([`/plugins/${source}.json`]);
+    } finally {
+      await service.stopAllPlugins();
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  }, 30_000);
+
+  it("names a missing explicit directory instead of trying a managed source", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
+    roots.push(home);
+    const directory = path.join(home, "missing");
+    const service = createService(home);
+    await expect(service.installSource({ source: directory })).rejects.toThrow(
+      `Plugin directory does not exist: ${directory}`,
+    );
+  });
+
+  it("installs an explicit directory and its selected plugin subdirectory", async () => {
     const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
     roots.push(home);
     const repository = await mkdtemp(path.join(tmpdir(), "owner-repository-"));
diff --git a/packages/server/src/server/plugins/index.ts b/packages/server/src/server/plugins/index.ts
index 7f74c847df..5567e23dd5 100644
--- a/packages/server/src/server/plugins/index.ts
+++ b/packages/server/src/server/plugins/index.ts
@@ -21,6 +21,7 @@ import { BUILTIN_PROVIDER_IDS } from "@getpaseo/protocol/provider-manifest";
 import type { DaemonConfigStore } from "../daemon-config-store.js";
 import { type ManagedPluginCandidate, ManagedPluginSources } from "./managed-source.js";
 import { readPluginManifest } from "./manifest.js";
+import { expandTilde } from "../../utils/path.js";
 import { runPluginBuild } from "./preparation.js";
 import { PluginRuntime } from "./runtime.js";
 import { BuiltinPluginLoader, type BuiltinPlugin } from "./builtin/index.js";
@@ -286,16 +287,11 @@ export class PluginService {
     if (input.id && this.builtinPluginIds.has(input.id)) {
       throw new Error(`Plugin ID "${input.id}" is reserved for a built-in plugin`);
     }
-    const directDirectory = path.resolve(input.source);
-    const explicit = /^(npm:|github:|git:(?!\/\/))/.test(input.source);
-    const directInfo = await stat(directDirectory).catch(() => null);
-    const reference = directInfo?.isDirectory()
-      ? { source: input.source, pluginPath: undefined }
-      : parsePluginSourceReference(input.source);
-    const directory = path.resolve(reference.source);
-    let info = directInfo;
-    if (!info?.isDirectory() && !explicit) info = await stat(directory).catch(() => null);
-    if (info?.isDirectory()) {
+    const reference = parsePluginSourceReference(input.source);
+    if (reference.kind === "directory") {
+      const directory = path.resolve(expandTilde(reference.source));
+      const info = await stat(directory).catch(() => null);
+      if (!info?.isDirectory()) throw new Error(`Plugin directory does not exist: ${directory}`);
       if (input.ref) throw new Error("Plugin --ref is only valid for Git sources");
       const pluginDirectory = resolveLocalPluginPath(directory, reference.pluginPath);
       return this.installDirectory({ path: pluginDirectory, id: input.id });
diff --git a/packages/server/src/server/plugins/managed-source.posix.test.ts b/packages/server/src/server/plugins/managed-source.posix.test.ts
index 40878ae74e..ab9d6c50fb 100644
--- a/packages/server/src/server/plugins/managed-source.posix.test.ts
+++ b/packages/server/src/server/plugins/managed-source.posix.test.ts
@@ -280,7 +280,60 @@ describe("managed Git plugin sources", () => {
 });
 
 describe("registry plugin sources", () => {
-  it("treats owner/repository as GitHub shorthand without contacting the registry while registry installs are off", async () => {
+  it("explains how to choose a revision when --ref is used with a registry id", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-registry-ref-home-"));
+    roots.push(home);
+    const sources = new ManagedPluginSources(home);
+    await expect(
+      sources.prepareInstall({ source: "fixture/example", ref: "main" }),
+    ).rejects.toThrow(
+      "Registry installs pin the reviewed revision. Drop --ref, or install from an explicit github:owner/repository source to choose a revision.",
+    );
+  });
+
+  it("names the registry URL and recovery steps when the registry fetch fails", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-registry-offline-home-"));
+    roots.push(home);
+    const server = createServer((request) => request.socket.destroy());
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Missing registry address");
+    const url = `http://127.0.0.1:${address.port}`;
+    try {
+      const sources = new ManagedPluginSources(home, { defaultUrl: url });
+      await expect(sources.prepareInstall({ source: "fixture/example" })).rejects.toThrow(
+        `Could not reach plugin registry ${url}/plugins/fixture/example.json. Plugin fixture/example was not installed. Retry or use an explicit npm: or github: source.`,
+      );
+    } finally {
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  });
+
+  it("explains explicit local and GitHub sources when a registry ID is missing", async () => {
+    const home = await mkdtemp(path.join(tmpdir(), "paseo-registry-missing-home-"));
+    roots.push(home);
+    const requests: Array<string | undefined> = [];
+    const server = createServer((request, response) => {
+      requests.push(request.url);
+      response.writeHead(404).end();
+    });
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Missing registry address");
+    try {
+      const sources = new ManagedPluginSources(home, {
+        defaultUrl: `http://127.0.0.1:${address.port}`,
+      });
+      await expect(sources.prepareInstall({ source: "fixture/missing" })).rejects.toThrow(
+        "If you intended a local directory, use ./fixture/missing. If you intended a GitHub source, use git:fixture/missing, or a full Git URL for another Git host.",
+      );
+      expect(requests).toEqual(["/plugins/fixture/missing.json"]);
+    } finally {
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  });
+
+  it("keeps explicit Git sources and persisted Git installs independent of the registry", async () => {
     const repository = await createRepository();
     const home = await mkdtemp(path.join(tmpdir(), "paseo-registry-off-home-"));
     roots.push(home);
@@ -298,12 +351,34 @@ describe("registry plugin sources", () => {
         const sources = new ManagedPluginSources(home, {
           defaultUrl: `http://127.0.0.1:${address.port}`,
         });
-        const candidate = await sources.prepareInstall({ source: "fixture/repository" });
-        expect(candidate.record).toEqual({
-          kind: "git",
-          remote: "https://github.com/fixture/repository.git",
-        });
-        await sources.discard(candidate);
+        for (const source of [
+          "git:fixture/repository",
+          "https://github.com/fixture/repository.git",
+        ]) {
+          const candidate = await sources.place(
+            "managed-example",
+            await sources.prepareInstall({ source }),
+          );
+          expect(candidate.record).toEqual({
+            kind: "git",
+            remote: "https://github.com/fixture/repository.git",
+          });
+          sources.commit("managed-example", candidate.record);
+          const restarted = new ManagedPluginSources(home, {
+            defaultUrl: `http://127.0.0.1:${address.port}/changed`,
+          });
+          expect((await restarted.preview("managed-example", candidate.directory)).outcome).toBe(
+            "current",
+          );
+          expect(
+            (await restarted.describe("managed-example", candidate.directory)).identity,
+          ).toEqual({
+            kind: "git",
+            remote: "https://github.com/fixture/repository.git",
+            pluginPath: ".",
+          });
+          await sources.discard(candidate);
+        }
       });
       expect(requests).toEqual([]);
     } finally {
@@ -332,12 +407,17 @@ describe("registry plugin sources", () => {
       intent: string | string[] | undefined;
       authorization: string | undefined;
     }> = [];
+    let missing = false;
     const server = createServer((req, res) => {
       requests.push({
         path: req.url,
         intent: req.headers["x-paseo-install"],
         authorization: req.headers.authorization,
       });
+      if (missing) {
+        res.writeHead(404).end();
+        return;
+      }
       res.setHeader("Content-Type", "application/json");
       res.end(
         JSON.stringify({
@@ -369,7 +449,6 @@ describe("registry plugin sources", () => {
     const url = `http://${host}/internal`;
     try {
       const sources = new ManagedPluginSources(home, {
-        enabled: true,
         defaultUrl: url,
         registries: { [host]: { authorization: "Bearer test" } },
       });
@@ -380,7 +459,11 @@ describe("registry plugin sources", () => {
       ).toBe("managed-example");
       await sources.verifyCandidate("managed-example", candidate);
       sources.commit("managed-example", candidate.record);
-      const preview = await sources.preview("managed-example", candidate.directory);
+      const restarted = new ManagedPluginSources(home, {
+        defaultUrl: "http://127.0.0.1:1/changed",
+        registries: { [host]: { authorization: "Bearer test" } },
+      });
+      const preview = await restarted.preview("managed-example", candidate.directory);
       expect(preview.outcome).toBe("current");
       expect(preview.current?.identity).toEqual({
         kind: "git",
@@ -388,6 +471,10 @@ describe("registry plugin sources", () => {
         pluginPath: "packages/example",
         registry: { url, id: "acme/example" },
       });
+      missing = true;
+      await expect(restarted.preview("managed-example", candidate.directory)).rejects.toThrow(
+        "Check that the installed plugin is still published in this registry before updating",
+      );
       expect(requests).toEqual([
         { path: "/internal/plugins/acme/example.json", intent: "1", authorization: "Bearer test" },
         {
@@ -395,6 +482,11 @@ describe("registry plugin sources", () => {
           intent: undefined,
           authorization: "Bearer test",
         },
+        {
+          path: "/internal/plugins/acme/example.json",
+          intent: undefined,
+          authorization: "Bearer test",
+        },
       ]);
     } finally {
       await new Promise<void>((resolve, reject) =>
@@ -444,7 +536,7 @@ it("installs and updates only the npm artifacts pinned by the plugin registry",
   await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
   const address = server.address();
   if (!address || typeof address === "string") throw new Error("Missing registry address");
-  const options = { enabled: true, defaultUrl: `http://127.0.0.1:${address.port}` };
+  const options = { defaultUrl: `http://127.0.0.1:${address.port}` };
   try {
     const sources = new ManagedPluginSources(home, options);
     const candidate = await sources.place(
diff --git a/packages/server/src/server/plugins/managed-source.ts b/packages/server/src/server/plugins/managed-source.ts
index 8ee3b2b6f6..5373b7453a 100644
--- a/packages/server/src/server/plugins/managed-source.ts
+++ b/packages/server/src/server/plugins/managed-source.ts
@@ -147,11 +147,13 @@ export class ManagedPluginSources {
     input: InstallInput,
     target?: PluginUpdateTarget,
   ): Promise<ManagedPluginCandidate> {
-    const registry = this.registryOptions.enabled
-      ? parsePluginRegistryReference(input.source, this.registryOptions.defaultUrl)
-      : null;
+    const registry = parsePluginRegistryReference(input.source, this.registryOptions.defaultUrl);
     if (registry) {
-      if (input.ref || input.pluginPath)
+      if (input.ref)
+        throw new Error(
+          "Registry installs pin the reviewed revision. Drop --ref, or install from an explicit github:owner/repository source to choose a revision.",
+        );
+      if (input.pluginPath)
         throw new Error("Registry sources use their reviewed artifact path and revision");
       const resolved = await resolveRegistryPlugin(registry, this.registryOptions, true);
       const candidate = await this.prepareInstall(resolved.input, resolved.target);
@@ -175,7 +177,7 @@ export class ManagedPluginSources {
         sourceRoot = path.join(versionRoot, "node_modules", artifact.packageName);
         record = { kind: "npm" };
       } else {
-        const remote = normalizeGitSource(input.source, !this.registryOptions.enabled);
+        const remote = normalizeGitSource(input.source);
         sourceRoot = path.join(versionRoot, "checkout");
         await clone(remote, sourceRoot);
         const commit = await resolveRequestedRef(sourceRoot, input.ref);
@@ -227,7 +229,7 @@ export class ManagedPluginSources {
     const location = this.locate(pluginId, configuredPath);
     let target: PluginUpdateTarget;
     let outcome: PluginUpdatePreview["outcome"];
-    if (this.registryOptions.enabled && current.identity.registry) {
+    if (current.identity.registry) {
       if (selection) throw new Error("Registry updates use only the reviewed registry pin");
       const resolved = await resolveRegistryPlugin(
         current.identity.registry,
@@ -304,7 +306,7 @@ export class ManagedPluginSources {
     await this.assertCurrent(proposal, configuredPath);
     const identity = this.locate(proposal.id, configuredPath).identity;
     const record = this.records[proposal.id];
-    if (this.registryOptions.enabled && identity.kind !== "directory" && identity.registry) {
+    if (identity.kind !== "directory" && identity.registry) {
       const resolved = await resolveRegistryPlugin(identity.registry, this.registryOptions, false);
       assertRegistryArtifactIdentity(identity, resolved.artifact);
       if (!isDeepStrictEqual(resolved.target, proposal.target))
@@ -436,10 +438,9 @@ function reviewLinks(current: PluginInstallation, target: PluginUpdateTarget): s
   }
   return [];
 }
-/** Bare owner/repo is GitHub shorthand unless registry references own that syntax. */
-function normalizeGitSource(source: string, bareGitHubShorthand: boolean): string {
-  const expandsShorthand =
-    bareGitHubShorthand || source.startsWith("github:") || source.startsWith("git:");
+/** Only explicit Git prefixes expand GitHub shorthand. */
+function normalizeGitSource(source: string): string {
+  const expandsShorthand = source.startsWith("github:") || source.startsWith("git:");
   if (source.startsWith("github:")) {
     const shorthand = source.slice(7);
     if (!/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(shorthand)) {
diff --git a/packages/server/src/server/plugins/managed-source/registry.ts b/packages/server/src/server/plugins/managed-source/registry.ts
index 179bdc5da7..b57aac6c0c 100644
--- a/packages/server/src/server/plugins/managed-source/registry.ts
+++ b/packages/server/src/server/plugins/managed-source/registry.ts
@@ -6,8 +6,6 @@ import {
 import type { PluginUpdateTarget } from "@getpaseo/protocol/messages";
 
 export interface RegistryOptions {
-  /** Off: bare owner/repo is GitHub shorthand and no registry is contacted. */
-  enabled?: boolean;
   defaultUrl?: string;
   registries?: PluginRegistries;
 }
@@ -29,11 +27,26 @@ export async function resolveRegistryPlugin(
   const headers: Record<string, string> = {};
   if (authorization) headers.Authorization = authorization;
   if (install) headers["X-Paseo-Install"] = "1";
-  const response = await fetch(`${identity.url.replace(/\/+$/, "")}/plugins/${identity.id}.json`, {
-    headers,
-    redirect: "error",
-    signal: AbortSignal.timeout(30000),
-  });
+  const url = `${identity.url.replace(/\/+$/, "")}/plugins/${identity.id}.json`;
+  let response: Response;
+  try {
+    response = await fetch(url, {
+      headers,
+      redirect: "error",
+      signal: AbortSignal.timeout(30000),
+    });
+  } catch (cause) {
+    const guidance = install
+      ? `Plugin ${identity.id} was not installed. Retry or use an explicit npm: or github: source.`
+      : `Could not check updates for ${identity.id}. Retry later.`;
+    throw new Error(`Could not reach plugin registry ${url}. ${guidance}`, { cause });
+  }
+  if (response.status === 404) {
+    const guidance = install
+      ? `If you intended a local directory, use ./${identity.id}. If you intended a GitHub source, use git:${identity.id}, or a full Git URL for another Git host.`
+      : "Check that the installed plugin is still published in this registry before updating.";
+    throw new Error(`Plugin ${identity.id} was not found in registry ${base.host}. ${guidance}`);
+  }
   if (!response.ok)
     throw new Error(`Registry ${base.host} returned ${response.status} for ${identity.id}`);
   const plugin = PublishedPluginDetailSchema.parse(await response.json());
diff --git a/public-docs/plugins/index.md b/public-docs/plugins/index.md
index 033235b7f0..50d9be9826 100644
--- a/public-docs/plugins/index.md
+++ b/public-docs/plugins/index.md
@@ -21,6 +21,16 @@ A plugin is a TypeScript project installed into one Paseo daemon. It can add
 [connect a coding agent as a provider](/docs/plugins/providers). Client
 contributions run on every Paseo client connected to that daemon, including mobile.
 
+Browse [published plugins](https://paseo.sh/plugins), then install one on your daemon:
+
+```bash
+paseo plugin add owner/slug
+```
+
+Or paste `owner/slug` into **Settings → Plugins → Plugin source** and select **Install plugin**.
+Paseo installs the registry's reviewed artifact. Use `git:owner/repository` or a full Git URL
+when you want to install directly from a Git repository.
+
 This guide scaffolds a plugin, runs it, and adds a workspace panel to it.
 
 ## Create a plugin
@@ -246,13 +256,13 @@ reload use the installed files.
 See [plugin sources](/docs/plugins/reference#plugin-sources) for identifier syntax. To share your own plugin, follow
 [Publish a plugin](/docs/plugins/publishing).
 
-Plugins published in a Git repository install by shorthand or URL:
+Plugins published in a Git repository install by explicit Git shorthand or URL:
 
 ```bash
-paseo plugin add owner/repository
+paseo plugin add git:owner/repository
 paseo plugin add https://gitlab.com/group/repository.git
-paseo plugin add owner/monorepo:plugins/workspace
-paseo plugin add owner/repository --ref main
+paseo plugin add git:owner/monorepo:plugins/workspace
+paseo plugin add git:owner/repository --ref main
 ```
 
 Append `:relative/path` when the plugin lives below the repository root. `--ref` selects the initial
diff --git a/public-docs/plugins/publishing.md b/public-docs/plugins/publishing.md
index a021bda644..a32185a845 100644
--- a/public-docs/plugins/publishing.md
+++ b/public-docs/plugins/publishing.md
@@ -11,9 +11,24 @@ category: Plugins
 Publish your plugin so other people can install and use it in Paseo. Start with a working
 [plugin project](/docs/plugins), then choose where to share it:
 
+- [Plugin registry](#plugin-registry): share a reviewed artifact users install by `owner/slug`.
 - [npm](#publish-on-npm): publish a package on the public npm registry.
 - [GitHub or Git](#share-through-github-or-git): let users install from a repository.
 
+## Plugin registry
+
+Browse published plugins at [paseo.sh/plugins](https://paseo.sh/plugins).
+Users install the reviewed artifact with:
+
+```bash
+paseo plugin add owner/slug
+```
+
+Publish your artifact through npm or Git, then follow the
+[registry submission guide](https://github.com/getpaseo/plugins) to submit it for review.
+Registry installations and updates use the approved revision and plugin path.
+Direct Git installs use explicit `git:owner/repository` shorthand or a full Git URL.
+
 ## Publish on npm
 
 The scaffold prepares the package files and development dependencies. You choose the package name
@@ -182,7 +197,7 @@ to replace the registry stopgap. Do not add import credit to your own `OVERVIEW.
 Push the plugin project to a repository. Users can install it with:
 
 ```bash
-paseo plugin install github:acme/paseo-review
+paseo plugin add git:acme/paseo-review
 ```
 
 For another Git host:
diff --git a/public-docs/plugins/reference.md b/public-docs/plugins/reference.md
index da146de78d..d4d67fae9b 100644
--- a/public-docs/plugins/reference.md
+++ b/public-docs/plugins/reference.md
@@ -2259,15 +2259,16 @@ failures stay inside the plugin error boundary.
 Paste one of these source identifiers into **Settings → Plugins**, or pass it to
 `paseo plugin install`. `paseo plugin add <source>` and `paseo plugin install <source>` are aliases.
 Absolute host paths are recommended because relative paths resolve against the daemon's working
-directory. The app does not expand `~`; your shell may expand it before the CLI runs.
+directory. The daemon expands `~` to its home directory.
 
 | Source                     | Accepted form                                                              | Example                                       |
 | -------------------------- | -------------------------------------------------------------------------- | --------------------------------------------- |
+| Plugin registry            | `owner/slug` or `host/owner/slug`                                          | `acme/review`                                 |
 | Host directory             | Absolute or relative path on the daemon host                               | `/srv/paseo/plugins/review`                   |
-| GitHub repository          | `github:owner/repository` or `owner/repository`                            | `github:acme/paseo-review`                    |
+| GitHub repository          | `git:owner/repository` or `github:owner/repository`                        | `github:acme/paseo-review`                    |
 | Git repository             | `git:<URL or SCP source>`; the prefix is optional for URLs and SCP sources | `git:https://git.example.com/acme/review.git` |
 | npm package                | `npm:<name>[@<version, tag, or range>]`; `npm:` is optional                | `npm:@acme/paseo-review@^1.2.0`               |
-| Plugin below a source root | Append `:relative/plugin/path` to any source                               | `github:acme/monorepo:plugins/review`         |
+| Plugin below a source root | Append `:relative/plugin/path` to a directory, Git, or npm source          | `github:acme/monorepo:plugins/review`         |
 
 Git URLs use `https://`, `http://`, `ssh://`, `git://`, or `file://`. SCP sources use
 `user@host:path`. `file://` selects Git acquisition, not directory installation.
@@ -2283,24 +2284,27 @@ The package registry validates the selected version, tag, or range.
 
 Paseo resolves an identifier in this order:
 
-1. An existing directory matching the complete identifier on the daemon host wins, including a
-   literal directory containing `:`.
+1. A bare `owner/slug` is a registry id; local directory sources are `.` or `..`, or start with `./`, `../`, `.\`, `..\`, `/`, `~`, a Windows drive (`C:\` or `C:/`), or a UNC (`\\server\share`) prefix.
 2. Otherwise, recognize `npm:`, `github:`, or `git:` before interpreting a subdirectory suffix.
    `git://` is a Git URL scheme. An explicit prefix selects acquisition of that kind.
 3. Recognize a final `:relative/plugin/path` only when its suffix contains no empty, `.` or `..`
    segments. A lone `.` selects the source root. Both `/` and `\` separate suffix segments; use `/`
    across hosts. URL ports and the separator in an SCP source stay part of the source. A suffix
    that does not satisfy these rules stays part of the identifier.
-4. Without an explicit prefix, an existing directory matching the remaining source wins.
-5. Resolve Git URLs and SCP sources as Git; expand exact `owner/repository` shorthand to GitHub
-   HTTPS. `github:` requires that shorthand; `git:` accepts it as well as URLs and SCP sources.
-6. Resolve a remaining npm package name with its optional selector through the host's registry.
+4. Resolve bare `owner/slug` through the default plugin registry and `host/owner/slug` through
+   that registry host. Resolve Git URLs and SCP sources as Git. `github:` requires
+   `owner/repository` shorthand; `git:` accepts it as well as URLs and SCP sources.
+5. Resolve a remaining npm package name with its optional selector through the host's registry.
    Reject anything else.
 
-Plugin registry installs are off by default. When the daemon enables them with
-`pluginRegistryEnabled: true` or `PASEO_PLUGIN_REGISTRY_ENABLED=1`, bare `owner/slug` and
-`host/owner/slug` resolve through the plugin registry instead of GitHub, the registry record owns
-the revision and plugin path, and GitHub shorthand requires `github:`.
+The default registry is `https://plugins.paseo.sh`. Browse [published plugins](https://paseo.sh/plugins)
+and install with `paseo plugin add owner/slug`. Registry records own the revision and plugin path.
+Use `git:owner/repository` for explicit GitHub shorthand or a full Git URL.
+Set `PASEO_PLUGIN_REGISTRY` to use a self-hosted default URL, including a path prefix.
+Private registry credentials use `pluginRegistries: { "host": { "authorization": "Bearer token" } }`
+in daemon config. Restart the daemon after changing these startup settings. Credentials go only
+to that registry, never to artifact hosts or redirects. Installed plugins retain their recorded
+source and registry URL when defaults change.
 
 Directory lookup happens on the daemon host. The app uses the `paseo-plugin.json` ID; the CLI
 accepts `--id <runtime-id>` to override it. An existing installation ID is rejected without changing
@@ -2347,9 +2351,10 @@ deletes its managed files; removing a directory plugin keeps your source directo
 paseo plugin init /absolute/path/to/plugin
 paseo plugin install /absolute/path/to/plugin
 paseo plugin install /absolute/path/to/plugin --id another-runtime-id
-paseo plugin add owner/repository
+paseo plugin add owner/slug
+paseo plugin add git:owner/repository
 paseo plugin add https://git.example.com/owner/repository.git --ref main
-paseo plugin add owner/monorepo:plugins/review
+paseo plugin add git:owner/monorepo:plugins/review
 paseo plugin ls [id]
 paseo plugin update <id>
 paseo plugin update --all --check

From 48059aeae37151acf96e3930a074112ad986d397 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 6 Oct 2026 18:03:10 +0200
Subject: [PATCH 007/270] Show the PR panel's state, activity verbs, and thread
 badges in the app language (#6225)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(app): show PR panel state, activity verbs, and thread badges in the app language

The PR panel's state label, the verb after each activity author, and the
Resolved and Outdated thread badges were English literals, so they stayed
English in every other language. The state and verb translations already
existed and were unused; the badges get new keys in every locale.

Closes #6214

* fix(app): translate every PR panel verb and state, and phrase them after the author

The zh-CN state and review labels still held English ("Open", "Draft",
"已 review"), and the Spanish and Portuguese verbs were adjectives that
do not read after an author's name. The translation test now checks
each verb and state on its own, so one English label fails it.

Co-authored-by: Dillon <dillonzq@outlook.com>

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: Dillon <dillonzq@outlook.com>
---
 packages/app/e2e/support/helpers/pr-pane.ts   |  4 +-
 .../src/git/pull-request-panel/data.test.ts   | 56 +++++++++----------
 .../app/src/git/pull-request-panel/data.ts    | 22 ++++----
 .../app/src/git/pull-request-panel/pane.tsx   | 15 +++--
 packages/app/src/i18n/resources.test.ts       | 19 +++++++
 packages/app/src/i18n/resources/ar.ts         |  2 +
 packages/app/src/i18n/resources/en.ts         |  2 +
 packages/app/src/i18n/resources/es.ts         | 10 ++--
 packages/app/src/i18n/resources/fr.ts         |  2 +
 packages/app/src/i18n/resources/ja.ts         |  2 +
 packages/app/src/i18n/resources/ko.ts         |  2 +
 packages/app/src/i18n/resources/pt-BR.ts      |  6 +-
 packages/app/src/i18n/resources/ru.ts         |  2 +
 packages/app/src/i18n/resources/zh-CN.ts      | 10 ++--
 14 files changed, 98 insertions(+), 56 deletions(-)

diff --git a/packages/app/e2e/support/helpers/pr-pane.ts b/packages/app/e2e/support/helpers/pr-pane.ts
index 56f0ef444c..37fe719e0f 100644
--- a/packages/app/e2e/support/helpers/pr-pane.ts
+++ b/packages/app/e2e/support/helpers/pr-pane.ts
@@ -1,5 +1,5 @@
 import { expect, type Page } from "@playwright/test";
-import { getStateLabel } from "@/git/pull-request-panel/data";
+import { en } from "@/i18n/resources/en";
 import { openPullRequestPanel } from "./workspace-tabs";
 
 export async function openPrPane(page: Page): Promise<void> {
@@ -14,7 +14,7 @@ export async function expectPrPaneState(
   page: Page,
   state: "open" | "merged" | "closed" | "draft",
 ): Promise<void> {
-  await expect(page.getByTestId("pr-pane-state")).toHaveText(getStateLabel(state), {
+  await expect(page.getByTestId("pr-pane-state")).toHaveText(en.workspace.git.pr.states[state], {
     timeout: 15_000,
   });
 }
diff --git a/packages/app/src/git/pull-request-panel/data.test.ts b/packages/app/src/git/pull-request-panel/data.test.ts
index 21b145bedc..837433417e 100644
--- a/packages/app/src/git/pull-request-panel/data.test.ts
+++ b/packages/app/src/git/pull-request-panel/data.test.ts
@@ -9,12 +9,13 @@ import {
   isPipelineActiveStatus,
   mapPipelineStatus,
 } from "@/git/forges/gitlab";
+import { i18n } from "@/i18n/i18next";
 import { IDENTITY_COLOR_NAMES, identityColor } from "@/styles/identity-colors";
 import {
   deriveAvatarColor,
   formatAge,
-  getActivityVerb,
-  getStateLabel,
+  getActivityVerbKey,
+  getStateLabelKey,
   mapPrPaneData,
 } from "./data";
 
@@ -779,37 +780,34 @@ describe("formatAge", () => {
   });
 });
 
-describe("getStateLabel", () => {
+const english = i18n.getFixedT("en");
+const french = i18n.getFixedT("fr");
+
+describe("getStateLabelKey", () => {
   it.each([
-    ["open", "Open"],
-    ["draft", "Draft"],
-    ["merged", "Merged"],
-    ["closed", "Closed"],
-  ] as const)("maps %s → %s", (state, expected) => {
-    expect(getStateLabel(state)).toBe(expected);
+    ["open", "Open", "Ouverte"],
+    ["draft", "Draft", "Brouillon"],
+    ["merged", "Merged", "Fusionnée"],
+    ["closed", "Closed", "Fermée"],
+  ] as const)("labels %s as %s, and %s in French", (state, englishLabel, frenchLabel) => {
+    expect(english(getStateLabelKey(state))).toBe(englishLabel);
+    expect(french(getStateLabelKey(state))).toBe(frenchLabel);
   });
 });
 
-describe("getActivityVerb", () => {
-  it("returns Commented for comment kind", () => {
-    expect(getActivityVerb({ kind: "comment" })).toBe("Commented");
-  });
-
-  it("returns Approved for approved review", () => {
-    expect(getActivityVerb({ kind: "review", reviewState: "approved" })).toBe("Approved");
-  });
-
-  it("returns Requested changes for changes_requested review", () => {
-    expect(getActivityVerb({ kind: "review", reviewState: "changes_requested" })).toBe(
+describe("getActivityVerbKey", () => {
+  it.each([
+    [{ kind: "comment" }, "Commented", "A commenté"],
+    [{ kind: "review", reviewState: "approved" }, "Approved", "A approuvé"],
+    [
+      { kind: "review", reviewState: "changes_requested" },
       "Requested changes",
-    );
-  });
-
-  it("returns Reviewed for a commented review with body (generic case)", () => {
-    expect(getActivityVerb({ kind: "review", reviewState: "commented" })).toBe("Reviewed");
-  });
-
-  it("returns Reviewed when reviewState is undefined", () => {
-    expect(getActivityVerb({ kind: "review" })).toBe("Reviewed");
+      "A demandé des modifications",
+    ],
+    [{ kind: "review", reviewState: "commented" }, "Reviewed", "A relu"],
+    [{ kind: "review" }, "Reviewed", "A relu"],
+  ] as const)("labels %o as %s, and %s in French", (item, englishVerb, frenchVerb) => {
+    expect(english(getActivityVerbKey(item))).toBe(englishVerb);
+    expect(french(getActivityVerbKey(item))).toBe(frenchVerb);
   });
 });
diff --git a/packages/app/src/git/pull-request-panel/data.ts b/packages/app/src/git/pull-request-panel/data.ts
index 0f1e2014e9..d1275f2f1e 100644
--- a/packages/app/src/git/pull-request-panel/data.ts
+++ b/packages/app/src/git/pull-request-panel/data.ts
@@ -318,16 +318,18 @@ function parsePullRequestNumber(url: string): number | null {
   }
 }
 
-export function getStateLabel(state: PrState): string {
-  if (state === "draft") return "Draft";
-  if (state === "merged") return "Merged";
-  if (state === "closed") return "Closed";
-  return "Open";
+export function getStateLabelKey(state: PrState) {
+  if (state === "draft") return "workspace.git.pr.states.draft";
+  if (state === "merged") return "workspace.git.pr.states.merged";
+  if (state === "closed") return "workspace.git.pr.states.closed";
+  return "workspace.git.pr.states.open";
 }
 
-export function getActivityVerb(item: Pick<PrPaneActivity, "kind" | "reviewState">): string {
-  if (item.kind === "comment") return "Commented";
-  if (item.reviewState === "approved") return "Approved";
-  if (item.reviewState === "changes_requested") return "Requested changes";
-  return "Reviewed";
+export function getActivityVerbKey(item: Pick<PrPaneActivity, "kind" | "reviewState">) {
+  if (item.kind === "comment") return "workspace.git.pr.activity.commented";
+  if (item.reviewState === "approved") return "workspace.git.pr.activity.approved";
+  if (item.reviewState === "changes_requested") {
+    return "workspace.git.pr.activity.requestedChanges";
+  }
+  return "workspace.git.pr.activity.reviewed";
 }
diff --git a/packages/app/src/git/pull-request-panel/pane.tsx b/packages/app/src/git/pull-request-panel/pane.tsx
index 4b468e14e2..429dd2be0e 100644
--- a/packages/app/src/git/pull-request-panel/pane.tsx
+++ b/packages/app/src/git/pull-request-panel/pane.tsx
@@ -63,7 +63,7 @@ import {
   canAddPullRequestActivityToChat,
 } from "./context-attachment";
 import { ChecksSection, getCheckIdentity } from "./checks-section";
-import { getActivityVerb, getStateLabel } from "./data";
+import { getActivityVerbKey, getStateLabelKey } from "./data";
 import type { PrPaneActivity, PrPaneCheck, PrPaneData, PrState } from "./data";
 import type { ForgeSpecificStatusFacts } from "@/git/merge-capability";
 import { CheckPresentationIcon } from "@/git/check-presentation.view";
@@ -538,7 +538,7 @@ export function PullRequestPane({
               <View style={styles.metaLine}>
                 <StateIcon size={14} uniProps={statePresentation.iconColor} />
                 <Text style={stateLabelStyle(data.state)} testID="pr-pane-state">
-                  {getStateLabel(data.state)}
+                  {t(getStateLabelKey(data.state))}
                 </Text>
                 {nativeHeaderMeta}
                 {repoIdentity ? (
@@ -760,7 +760,8 @@ function ActivityAvatar({ activity, size }: { activity: PrPaneActivity; size: nu
 }
 
 function ActivityVerb({ activity }: { activity: PrPaneActivity }) {
-  const verb = getActivityVerb(activity).toLowerCase();
+  const { t } = useTranslation();
+  const verb = t(getActivityVerbKey(activity)).toLowerCase();
   if (activity.kind === "review" && activity.reviewState === "approved") {
     return (
       <View style={styles.verbGroup}>
@@ -1065,8 +1066,12 @@ function ThreadBlock({
             ? formatPullRequestThreadPath(thread.location)
             : t("workspace.git.pr.thread.discussion")}
         </Text>
-        {thread.isResolved ? <StatusBadge label="Resolved" variant="success" /> : null}
-        {thread.location?.isOutdated ? <StatusBadge label="Outdated" /> : null}
+        {thread.isResolved ? (
+          <StatusBadge label={t("workspace.git.pr.thread.resolved")} variant="success" />
+        ) : null}
+        {thread.location?.isOutdated ? (
+          <StatusBadge label={t("workspace.git.pr.thread.outdated")} />
+        ) : null}
         <View style={styles.headerTrailing}>
           {collapsed ? (
             <View style={styles.threadCount}>
diff --git a/packages/app/src/i18n/resources.test.ts b/packages/app/src/i18n/resources.test.ts
index 039242710e..bf42a3b61a 100644
--- a/packages/app/src/i18n/resources.test.ts
+++ b/packages/app/src/i18n/resources.test.ts
@@ -76,6 +76,7 @@ const untranslatedLocalFallbacks = [
 
 const pullRequestPanelSources = [
   "git/pull-request-panel/pane.tsx",
+  "git/pull-request-panel/data.ts",
   "git/pull-request-panel/checks-section.tsx",
   "components/sidebar/sidebar-status-list.tsx",
 ] as const;
@@ -87,6 +88,16 @@ const untranslatedPullRequestPanelLabels = [
   "Adding...",
   "Comment actions",
   "Thread actions",
+  "Commented",
+  "Approved",
+  "Requested changes",
+  "Reviewed",
+  "Draft",
+  "Merged",
+  "Closed",
+  "Open",
+  "Resolved",
+  "Outdated",
 ] as const;
 
 function findUntranslatedPullRequestPanelLabels(): string[] {
@@ -244,6 +255,14 @@ describe("translation resources", () => {
       expect(pr.actions.addingToChat).not.toBe(englishPr.actions.addingToChat);
       expect(pr.accessibility.commentActions).not.toBe(englishPr.accessibility.commentActions);
       expect(pr.accessibility.threadActions).not.toBe(englishPr.accessibility.threadActions);
+      for (const verb of Object.keys(englishPr.activity) as (keyof typeof englishPr.activity)[]) {
+        expect(pr.activity[verb]).not.toBe(englishPr.activity[verb]);
+      }
+      for (const state of Object.keys(englishPr.states) as (keyof typeof englishPr.states)[]) {
+        expect(pr.states[state]).not.toBe(englishPr.states[state]);
+      }
+      expect(pr.thread.resolved).not.toBe(englishPr.thread.resolved);
+      expect(pr.thread.outdated).not.toBe(englishPr.thread.outdated);
       expect(resource.sidebar.statusGroupAccessibility).not.toBe(
         en.sidebar.statusGroupAccessibility,
       );
diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index 5b684c4545..9ebd34c728 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -1070,6 +1070,8 @@ export const ar: TranslationResources = {
         },
         thread: {
           discussion: "سلسلة المناقشة",
+          resolved: "تم الحل",
+          outdated: "قديم",
         },
         errors: {
           statusLoadFailed: "غير قادر على تحميل حالة طلب السحب",
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index a1464907ce..5ddb309806 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -1078,6 +1078,8 @@ export const en = {
         },
         thread: {
           discussion: "Discussion thread",
+          resolved: "Resolved",
+          outdated: "Outdated",
         },
         errors: {
           statusLoadFailed: "Unable to load pull request status",
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index 18346ad126..896e2fe947 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -1093,16 +1093,18 @@ export const es: TranslationResources = {
           open: "Abierto",
         },
         activity: {
-          commented: "Comentado",
-          approved: "Aprobado",
-          requestedChanges: "Cambios solicitados",
-          reviewed: "Revisado",
+          commented: "Comentó",
+          approved: "Aprobó",
+          requestedChanges: "Solicitó cambios",
+          reviewed: "Revisó",
         },
         time: {
           justNow: "En este momento",
         },
         thread: {
           discussion: "Hilo de discusión",
+          resolved: "Resuelto",
+          outdated: "Desactualizado",
         },
         errors: {
           statusLoadFailed: "No se puede cargar el estado de la solicitud de extracción",
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index 6f21c9ad90..3d6466445c 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -1094,6 +1094,8 @@ export const fr: TranslationResources = {
         },
         thread: {
           discussion: "Fil de discussion",
+          resolved: "Résolu",
+          outdated: "Obsolète",
         },
         errors: {
           statusLoadFailed: "Impossible de charger le statut de la pull request",
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index 14fc6f2f69..30931c642b 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -1083,6 +1083,8 @@ export const ja: TranslationResources = {
         },
         thread: {
           discussion: "ディスカッションスレッド",
+          resolved: "解決済み",
+          outdated: "古い",
         },
         errors: {
           statusLoadFailed: "プルリクエストのステータスを読み込めません",
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index 95ac1e2bbd..d3b9688c44 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -1077,6 +1077,8 @@ export const ko: TranslationResources = {
         },
         thread: {
           discussion: "토론 스레드",
+          resolved: "해결됨",
+          outdated: "오래됨",
         },
         errors: {
           statusLoadFailed: "풀 리퀘스트 상태를 불러올 수 없습니다",
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index 626dec1e3c..aa426a4ce6 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -1084,15 +1084,17 @@ export const ptBR: TranslationResources = {
         },
         activity: {
           commented: "Comentou",
-          approved: "Aprovado",
+          approved: "Aprovou",
           requestedChanges: "Solicitou alterações",
-          reviewed: "Revisado",
+          reviewed: "Revisou",
         },
         time: {
           justNow: "agora mesmo",
         },
         thread: {
           discussion: "Tópico de discussão",
+          resolved: "Resolvido",
+          outdated: "Desatualizado",
         },
         errors: {
           statusLoadFailed: "Não foi possível carregar o status da pull request",
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index 59562e626b..a49fe1f9cb 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -1087,6 +1087,8 @@ export const ru: TranslationResources = {
         },
         thread: {
           discussion: "Ветка обсуждения",
+          resolved: "Решено",
+          outdated: "Устарело",
         },
         errors: {
           statusLoadFailed: "Не удалось загрузить статус PR",
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index deb75a2a92..f42e5a3e8c 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -1046,22 +1046,24 @@ export const zhCN: TranslationResources = {
           },
         },
         states: {
-          draft: "Draft",
-          merged: "已 merge",
+          draft: "草稿",
+          merged: "已合并",
           closed: "已关闭",
-          open: "Open",
+          open: "开放",
         },
         activity: {
           commented: "已评论",
           approved: "已批准",
           requestedChanges: "请求修改",
-          reviewed: "已 review",
+          reviewed: "已审查",
         },
         time: {
           justNow: "刚刚",
         },
         thread: {
           discussion: "讨论主题",
+          resolved: "已解决",
+          outdated: "已过时",
         },
         errors: {
           statusLoadFailed: "无法加载 Pull Request 状态",

From 64c9f263e88dcbe3db55225e3cd8a81738a28995 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 17:30:18 +0100
Subject: [PATCH 008/270] Thumbnail plugin card screenshots through Cloudflare
 image transformations (#6240)

* perf(website): thumbnail plugin card screenshots

* fix(website): preserve and sandbox plugin screenshot fallbacks
---
 packages/website/e2e/plugins.spec.ts          |  48 +++-
 packages/website/src/plugins/plugin-card.tsx  |   4 +-
 packages/website/src/plugins/published.ts     |   5 +
 .../website/src/plugins/thumbnails.test.ts    | 234 ++++++++++++++++++
 packages/website/src/plugins/thumbnails.ts    | 118 +++++++++
 5 files changed, 407 insertions(+), 2 deletions(-)
 create mode 100644 packages/website/src/plugins/thumbnails.test.ts
 create mode 100644 packages/website/src/plugins/thumbnails.ts

diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 92a48d0c84..910f14cc1b 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -1,4 +1,5 @@
-import { expect, test, type Page } from "playwright/test";
+import { expect, test, type Page, type Locator } from "playwright/test";
+import registry from "./registry.fixture.json" with { type: "json" };
 import { CATEGORIES } from "../src/plugins/categories";
 
 async function openPlugins(page: Page) {
@@ -306,6 +307,26 @@ test("keeps the directory unlinked until the coordinated announcement", async ({
 test.describe("registry fixture layout", () => {
   test.skip(Boolean(process.env.WEBSITE_TEST_URL), "Requires the local registry fixture");
 
+  test("uses density-aware card thumbnails and keeps detail screenshots original", async ({
+    page,
+  }) => {
+    const plugin = registry.plugins.find((entry) => entry.id === "alhassanaraouf/base2tone")!;
+    const source = plugin.screenshots[0];
+    await openPlugins(page);
+    await expectThumbnailCard(
+      page.getByRole("region", { name: "What’s new" }).getByRole("link", { name: /Base2Tone/ }),
+      source,
+      plugin.id,
+    );
+    await page.goto("/plugins/all");
+    const card = page.getByRole("main").getByRole("link", { name: /Base2Tone/ });
+    await expectThumbnailCard(card, source, plugin.id);
+    await card.click();
+    await expect(
+      page.getByRole("img", { name: "Base2Tone screenshot 1", exact: true }),
+    ).toHaveAttribute("src", source);
+  });
+
   test("lists the nine categories in order with counts, and the newest plugins first", async ({
     page,
   }) => {
@@ -320,3 +341,28 @@ test.describe("registry fixture layout", () => {
     ).toHaveText([/Base2Tone/, /Sayr/, /PromptKit/, /Defer/]);
   });
 });
+
+async function expectThumbnailCard(card: Locator, source: string, id: string) {
+  // Card screenshots are decorative and hidden from the accessibility tree.
+  const image = card.locator("img").first();
+  const path = (width: number) =>
+    `/plugins/thumb/${width}/${encodeURIComponent(source)}?plugin=${encodeURIComponent(id)}`;
+  await expect(image).toHaveAttribute("src", path(592));
+  await expect(image).toHaveAttribute("srcset", `${path(592)} 1x, ${path(1184)} 2x`);
+  await expect(image).toHaveAttribute("loading", "lazy");
+  await expect(image).toHaveAttribute("decoding", "async");
+  await image.scrollIntoViewIfNeeded();
+  await expect
+    .poll(
+      () =>
+        image.evaluate((element: HTMLImageElement) => element.complete && element.naturalWidth > 0),
+      { timeout: 15_000 },
+    )
+    .toBe(true);
+  const box = await image.evaluate((element) => {
+    const rect = element.parentElement!.getBoundingClientRect();
+    return { width: rect.width, height: rect.height };
+  });
+  expect(box.width).toBeGreaterThan(0);
+  expect(box.width / box.height).toBeCloseTo(1.6, 2);
+}
diff --git a/packages/website/src/plugins/plugin-card.tsx b/packages/website/src/plugins/plugin-card.tsx
index d8fdb01fc4..4df1d70d1d 100644
--- a/packages/website/src/plugins/plugin-card.tsx
+++ b/packages/website/src/plugins/plugin-card.tsx
@@ -1,4 +1,5 @@
 import { Download } from "lucide-react";
+import { pluginCardScreenshot } from "./thumbnails";
 import { pluginHref } from "./links";
 import { PluginTile } from "./plugin-tile";
 import { formatInstalls, getCategory, type Plugin } from "./registry";
@@ -16,9 +17,10 @@ function PluginShot({ plugin }: { plugin: Plugin }) {
     >
       {url ? (
         <img
-          src={url}
+          {...pluginCardScreenshot(plugin.id, url)}
           alt=""
           loading="lazy"
+          decoding="async"
           className="h-full w-full object-cover object-left-top"
         />
       ) : (
diff --git a/packages/website/src/plugins/published.ts b/packages/website/src/plugins/published.ts
index ebf7e5256b..b57d16ec2a 100644
--- a/packages/website/src/plugins/published.ts
+++ b/packages/website/src/plugins/published.ts
@@ -4,6 +4,7 @@ import {
   PublishedPluginDetailSchema,
 } from "@getpaseo/protocol/plugin-registry";
 import { getBlockingColdCache, type WebsiteCacheContext } from "../github-cache";
+import { handlePluginThumbnailRequest } from "./thumbnails";
 import { CATEGORIES } from "./categories";
 import { type InstallCounts, readInstallCounts, recordClientInstall } from "./installs";
 export interface RegistryEnvironment {
@@ -63,6 +64,10 @@ export async function handlePluginRegistryRequest(
   const url = new URL(request.url);
   if (request.method !== "GET") return null;
   const base = env.PLUGINS_REGISTRY_URL ?? "https://getpaseo.github.io/plugins";
+  if (url.pathname.startsWith("/plugins/thumb/")) {
+    const index = await loadRegistryIndex(base, context);
+    return handlePluginThumbnailRequest(request, index.plugins);
+  }
   if (url.hostname === "plugins.paseo.sh" && url.pathname === "/index.json")
     return Response.json(await loadRegistryIndex(base, context));
   if (url.pathname === "/sitemap-plugins.xml") {
diff --git a/packages/website/src/plugins/thumbnails.test.ts b/packages/website/src/plugins/thumbnails.test.ts
new file mode 100644
index 0000000000..ec089be62e
--- /dev/null
+++ b/packages/website/src/plugins/thumbnails.test.ts
@@ -0,0 +1,234 @@
+import { createElement } from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it } from "vitest";
+import { handlePluginThumbnailRequest, pluginCardScreenshot } from "./thumbnails";
+import { NewPluginCard, PluginCard } from "./plugin-card";
+import type { Plugin } from "./registry";
+
+const source = "https://cdn.jsdelivr.net/npm/paseo-example@1.2.3/preview.png";
+const plugin: Plugin = {
+  id: "acme/example",
+  name: "Example",
+  description: "An example",
+  categories: ["themes"],
+  author: { github: "acme" },
+  repository: { url: "https://github.com/acme/example" },
+  artifact: {
+    kind: "npm",
+    package: "paseo-example",
+    version: "1.2.3",
+    resolved: "https://registry.npmjs.org/example.tgz",
+    integrity: "sha512-YWJj",
+  },
+  screenshots: [source],
+  submittedAt: "2026-10-03",
+  reviewedAt: "2026-10-03",
+  updatedAt: "2026-10-03",
+  publishedAt: "2026-10-03",
+  installs: 42,
+};
+
+describe("plugin card thumbnails", () => {
+  it("keeps a screenshot on an unsupported host visible at its original URL", () => {
+    const screenshot = "https://example.com/preview.png";
+    const html = renderToStaticMarkup(
+      createElement(PluginCard, { plugin: { ...plugin, screenshots: [screenshot] } }),
+    );
+    expect(html).toContain(`src="${screenshot}"`);
+    expect(html).not.toContain("/plugins/thumb/");
+  });
+
+  it.each([PluginCard, NewPluginCard])(
+    "renders a thumbnail instead of downloading the original screenshot (%s)",
+    (Card) => {
+      const html = renderToStaticMarkup(createElement(Card, { plugin, added: "today" }));
+      expect(html).toContain(
+        `src="/plugins/thumb/592/${encodeURIComponent(source)}?plugin=acme%2Fexample"`,
+      );
+      expect(html).toContain(
+        `srcSet="/plugins/thumb/592/${encodeURIComponent(source)}?plugin=acme%2Fexample 1x, /plugins/thumb/1184/${encodeURIComponent(source)}?plugin=acme%2Fexample 2x"`,
+      );
+      expect(html).toContain('loading="lazy"');
+      expect(html).toContain('decoding="async"');
+    },
+  );
+});
+
+function thumbnailRequest(
+  sourceUrl = source,
+  width = 592,
+  id = plugin.id,
+  accept = "image/avif,image/webp",
+) {
+  return new Request(
+    `https://paseo.sh/plugins/thumb/${width}/${encodeURIComponent(sourceUrl)}?plugin=${encodeURIComponent(id)}`,
+    { headers: { accept } },
+  );
+}
+
+function imageResponse(body: string, headers: Record<string, string> = {}) {
+  return new Response(body, { headers: { "content-type": "image/png", ...headers } });
+}
+
+// A typed fetch dependency, returning real Responses without patching the global fetch.
+function imageFetch(...responses: (Response | Error)[]) {
+  const calls: { input: Parameters<typeof fetch>[0]; init: Parameters<typeof fetch>[1] }[] = [];
+  const fetchImage: typeof fetch = async (input, init) => {
+    calls.push({ input, init });
+    const response = responses.shift();
+    if (!response) throw new Error("Unexpected fetch");
+    if (response instanceof Error) throw response;
+    return response;
+  };
+  return { calls, fetchImage };
+}
+
+describe("thumbnail route", () => {
+  it("sandboxes an SVG fallback when opened as a document on the website origin", async () => {
+    const svg =
+      '<svg xmlns="http://www.w3.org/2000/svg"><script>alert(document.domain)</script></svg>';
+    const upstream = imageFetch(
+      new Response("unsupported", { status: 415 }),
+      imageResponse(svg, { "content-type": "image/svg+xml" }),
+    );
+    const response = await handlePluginThumbnailRequest(
+      thumbnailRequest(),
+      [plugin],
+      upstream.fetchImage,
+    );
+    expect(await response.text()).toBe(svg);
+    expect(response.headers.get("content-security-policy")).toBe("sandbox");
+    expect(response.headers.get("x-content-type-options")).toBe("nosniff");
+  });
+
+  it.each([
+    [592, source, "image/avif,image/webp", "avif"],
+    [592, source, "image/avif;q=0,image/webp", "webp"],
+    [592, source, "image/avif;q=0,image/webp;q=0", undefined],
+    [
+      1184,
+      "https://raw.githubusercontent.com/acme/example/abc123/preview.png",
+      "image/webp",
+      "webp",
+    ],
+    [592, source, "image/png,image/*;q=0.8", undefined],
+  ] as const)(
+    "transforms a registered screenshot at %s from %s for %s",
+    async (width, screenshot, accept, format) => {
+      const upstream = imageFetch(imageResponse("thumbnail"));
+      const response = await handlePluginThumbnailRequest(
+        thumbnailRequest(screenshot, width, plugin.id, accept),
+        [{ ...plugin, screenshots: [screenshot] }],
+        upstream.fetchImage,
+      );
+      expect(upstream.calls).toEqual([
+        {
+          input: screenshot,
+          init: {
+            cf: { image: { width, fit: "scale-down", format, quality: 80 } },
+          },
+        },
+      ]);
+      expect(response.status).toBe(200);
+      expect(await response.text()).toBe("thumbnail");
+      expect(response.headers.get("content-type")).toBe("image/png");
+      expect(response.headers.get("cache-control")).toBe("public, max-age=31536000, immutable");
+      expect(response.headers.get("vary")).toBe("Accept");
+    },
+  );
+
+  it.each([
+    ["Cloudflare error", () => new Response("error 9401", { status: 403 })],
+    [
+      "non-image success",
+      () => new Response("<html>unavailable</html>", { headers: { "content-type": "text/html" } }),
+    ],
+    ["Cf-Resized error", () => imageResponse("error", { "cf-resized": "err=9401" })],
+    ["network exception", () => new Error("Transform unavailable")],
+  ] as const)("proxies the original with immutable caching on %s", async (_, failure) => {
+    const upstream = imageFetch(failure(), imageResponse("original"));
+    const response = await handlePluginThumbnailRequest(
+      thumbnailRequest(),
+      [plugin],
+      upstream.fetchImage,
+    );
+    expect(upstream.calls.map((call) => call.input)).toEqual([source, source]);
+    expect(upstream.calls[1].init).toBeUndefined();
+    expect(response.status).toBe(200);
+    expect(await response.text()).toBe("original");
+    expect(response.headers.get("cache-control")).toBe("public, max-age=31536000, immutable");
+  });
+
+  it.each([
+    ["arbitrary width", thumbnailRequest(source, 593), [plugin], 400],
+    ["unlisted source on allowed host", thumbnailRequest(source + "?different"), [plugin], 404],
+    ["wrong plugin ID", thumbnailRequest(source, 592, "acme/other"), [plugin], 404],
+    [
+      "missing plugin ID",
+      new Request(`https://paseo.sh/plugins/thumb/592/${encodeURIComponent(source)}`),
+      [plugin],
+      404,
+    ],
+    ["removed plugin", thumbnailRequest(), [], 404],
+    ["malformed encoding", new Request("https://paseo.sh/plugins/thumb/592/%ZZ"), [plugin], 400],
+    ["malformed URL", thumbnailRequest("not a URL"), [plugin], 400],
+    ...[
+      "https://example.com/preview.png",
+      "https://cdn.jsdelivr.net.evil.test/preview.png",
+      "http://cdn.jsdelivr.net/preview.png",
+      "https://user:pass@cdn.jsdelivr.net/preview.png",
+      "https://cdn.jsdelivr.net:8080/preview.png",
+    ].map(
+      (url) =>
+        [
+          "disallowed registered source",
+          thumbnailRequest(url),
+          [{ ...plugin, screenshots: [url] }],
+          400,
+        ] satisfies [string, Request, Plugin[], number],
+    ),
+  ] satisfies [string, Request, Plugin[], number][])(
+    "rejects %s without fetching an image",
+    async (_, request, plugins, status) => {
+      const upstream = imageFetch();
+      const response = await handlePluginThumbnailRequest(
+        request,
+        [...plugins],
+        upstream.fetchImage,
+      );
+      expect(response.status).toBe(status);
+      expect(upstream.calls).toEqual([]);
+      expect(response.headers.get("cache-control")).toBeNull();
+    },
+  );
+
+  it.each([
+    () => new Response("missing", { status: 404 }),
+    () => new Response("<html>error</html>", { headers: { "content-type": "text/html" } }),
+    () => new Error("Origin unavailable"),
+  ])("does not cache a failed original for a year", async (failure) => {
+    const upstream = imageFetch(new Response("transform error", { status: 502 }), failure());
+    const response = await handlePluginThumbnailRequest(
+      thumbnailRequest(),
+      [plugin],
+      upstream.fetchImage,
+    );
+    expect(response.status).toBe(502);
+    expect(response.headers.get("cache-control")).toBe("no-store");
+  });
+
+  it("round-trips screenshot URL punctuation through the card URL", async () => {
+    const screenshot = source + "?name=a&other=b#preview";
+    const upstream = imageFetch(imageResponse("thumbnail"));
+    const request = new Request(
+      "https://paseo.sh" + pluginCardScreenshot(plugin.id, screenshot).src,
+    );
+    const response = await handlePluginThumbnailRequest(
+      request,
+      [{ ...plugin, screenshots: [screenshot] }],
+      upstream.fetchImage,
+    );
+    expect(response.status).toBe(200);
+    expect(upstream.calls[0].input).toBe(screenshot);
+  });
+});
diff --git a/packages/website/src/plugins/thumbnails.ts b/packages/website/src/plugins/thumbnails.ts
new file mode 100644
index 0000000000..755854d257
--- /dev/null
+++ b/packages/website/src/plugins/thumbnails.ts
@@ -0,0 +1,118 @@
+import type { Plugin } from "./registry";
+
+// The single-column grid reaches 591px just below sm (640px minus 48px padding).
+const CARD_WIDTH = 592;
+const WIDTHS = new Set([CARD_WIDTH, CARD_WIDTH * 2]);
+const SOURCE_HOSTS = new Set(["cdn.jsdelivr.net", "raw.githubusercontent.com"]);
+
+export function pluginCardScreenshot(id: string, source: string): { src: string; srcSet?: string } {
+  if (!parseSource(source)) return { src: source };
+  return {
+    src: pluginThumbnailUrl(id, source, 1),
+    srcSet: `${pluginThumbnailUrl(id, source, 1)} 1x, ${pluginThumbnailUrl(id, source, 2)} 2x`,
+  };
+}
+
+function pluginThumbnailUrl(id: string, source: string, scale: 1 | 2): string {
+  return `/plugins/thumb/${CARD_WIDTH * scale}/${encodeURIComponent(source)}?plugin=${encodeURIComponent(id)}`;
+}
+
+/** Only registry-listed screenshots are eligible for transformation or original fallback. */
+export async function handlePluginThumbnailRequest(
+  request: Request,
+  plugins: Plugin[],
+  fetchImage: typeof fetch = fetch,
+): Promise<Response> {
+  const url = new URL(request.url);
+  const match = /^\/plugins\/thumb\/(\d+)\/([^/]+)$/.exec(url.pathname);
+  if (!match || !WIDTHS.has(Number(match[1])))
+    return new Response("Invalid thumbnail width or source", { status: 400 });
+
+  let decoded: string;
+  try {
+    decoded = decodeURIComponent(match[2]);
+  } catch {
+    return new Response("Invalid thumbnail source", { status: 400 });
+  }
+  const source = parseSource(decoded);
+  if (!source) return new Response("Invalid thumbnail source", { status: 400 });
+
+  const plugin = plugins.find((entry) => entry.id === url.searchParams.get("plugin"));
+  if (!plugin?.screenshots.includes(source))
+    return new Response("Screenshot not found", { status: 404 });
+
+  const format = negotiatedFormat(request.headers.get("accept") ?? "");
+  let response: Response | undefined;
+  try {
+    response = await fetchImage(source, {
+      cf: { image: { width: Number(match[1]), fit: "scale-down", format, quality: 80 } },
+    });
+  } catch {
+    // An unavailable transformation must not prevent fetching the original.
+  }
+  if (!response || !isImage(response) || /err=/i.test(response.headers.get("cf-resized") ?? "")) {
+    await response?.body?.cancel();
+    try {
+      response = await fetchImage(source);
+    } catch {
+      return unavailableImage();
+    }
+  }
+  if (!isImage(response)) {
+    await response.body?.cancel();
+    return unavailableImage();
+  }
+  return new Response(response.body, {
+    headers: {
+      "content-type": response.headers.get("content-type")!,
+      "cache-control": "public, max-age=31536000, immutable",
+      vary: "Accept",
+      // Originals can be SVGs. Keep direct navigation from executing them on our origin.
+      "content-security-policy": "sandbox",
+      "x-content-type-options": "nosniff",
+    },
+  });
+}
+
+function isImage(response: Response): boolean {
+  return response.ok && /^image\//i.test(response.headers.get("content-type") ?? "");
+}
+
+function unavailableImage(): Response {
+  return new Response("Screenshot unavailable", {
+    status: 502,
+    headers: { "cache-control": "no-store" },
+  });
+}
+
+function parseSource(source: string): string | null {
+  try {
+    const url = new URL(source);
+    if (
+      url.protocol !== "https:" ||
+      !SOURCE_HOSTS.has(url.hostname) ||
+      url.username ||
+      url.password ||
+      url.port
+    )
+      return null;
+    return source;
+  } catch {
+    return null;
+  }
+}
+
+function negotiatedFormat(accept: string): "avif" | "webp" | undefined {
+  // The Worker API requires explicit negotiation; only the URL API accepts format=auto.
+  const accepted = new Map(
+    accept
+      .toLowerCase()
+      .split(",")
+      .map((range) => {
+        const [type, ...parameters] = range.split(";").map((part) => part.trim());
+        const quality = parameters.find((parameter) => parameter.startsWith("q="));
+        return [type, quality === undefined ? 1 : Number(quality.slice(2))] as const;
+      }),
+  );
+  return (["avif", "webp"] as const).find((format) => (accepted.get(`image/${format}`) ?? 0) > 0);
+}

From a292b402cf352c6a84e187928e4f9bd458485747 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 17:31:57 +0100
Subject: [PATCH 009/270] Resolve local plugin directories in the CLI's working
 directory (#6239)

* fix(cli): resolve local plugin directories from the caller's cwd

Relative plugin sources were sent unchanged, so a daemon started elsewhere inspected the wrong directory. Resolve directory sources and expand the caller's home before sending, preserving subdirectory suffixes and managed source identifiers.

* fix(cli): preserve absolute plugin paths across host platforms

A remote daemon may use another operating system. Recognize absolute POSIX and Windows directory sources before resolving relative paths on the CLI host.
---
 docs/plugins.md                               |  5 +-
 packages/cli/src/commands/plugin/index.ts     | 16 +++-
 .../cli/tests/e2e/plugin-lifecycle.test.ts    | 79 ++++++++++++++++++-
 public-docs/plugins/reference.md              |  7 +-
 4 files changed, 101 insertions(+), 6 deletions(-)

diff --git a/docs/plugins.md b/docs/plugins.md
index e9d5a18a9e..897bf29507 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -152,8 +152,9 @@ and ask for approval. `ls` reports the installed commit without contacting the r
 ## Managed source ownership
 
 The [public source reference](../public-docs/plugins/reference.md#plugin-sources) owns identifier
-syntax and npm prerequisites; the [publishing guide](../public-docs/plugins/publishing.md) owns distribution. Both clients send the source unchanged
-through `installPluginSource`; only the daemon resolves host paths and acquires sources.
+syntax and npm prerequisites; the [publishing guide](../public-docs/plugins/publishing.md) owns distribution. The CLI resolves directory sources before
+calling `installPluginSource`; see the public source reference for CLI and app path semantics.
+Only the daemon reads plugin files and acquires sources.
 
 `ManagedPluginSources` owns acquisition and offline source description. Config stores the active
 directory; sources.json stores managed kind and the Git acquisition remote. The remote is needed
diff --git a/packages/cli/src/commands/plugin/index.ts b/packages/cli/src/commands/plugin/index.ts
index 3a126752c9..86dc5889b8 100644
--- a/packages/cli/src/commands/plugin/index.ts
+++ b/packages/cli/src/commands/plugin/index.ts
@@ -1,9 +1,12 @@
+import path from "node:path";
+import { expandUserPath } from "../../classify.js";
 import { createInterface } from "node:readline/promises";
 import { reviewPluginUpdates, type UpdateOutcome } from "./update.js";
 import { Command } from "commander";
 import type { PluginListItem, PluginLogEntry } from "@getpaseo/protocol/messages";
 import {
   formatPluginSourceReference,
+  parsePluginSourceReference,
   formatPluginIdentity,
 } from "@getpaseo/protocol/plugin-source-reference";
 import type { CommandOptions, ListResult, OutputSchema, SingleResult } from "../../output/index.js";
@@ -125,7 +128,18 @@ export async function runPluginInstallCommand(
   process.stderr.write(
     "Trusting plugin code: server code and preparation commands run unsandboxed on the daemon host; client code runs inside Paseo. Dependencies and future updates are part of the codebase you trust.\n",
   );
-  const sourceReference = formatPluginSourceReference(source, options.path);
+  const reference = parsePluginSourceReference(source);
+  let resolvedSource = source;
+  if (reference.kind === "directory") {
+    const directory = expandUserPath(reference.source);
+    // An absolute path can target a daemon on a different operating system.
+    const absoluteDirectory =
+      path.posix.isAbsolute(directory) || path.win32.isAbsolute(directory)
+        ? directory
+        : path.resolve(directory);
+    resolvedSource = formatPluginSourceReference(absoluteDirectory, reference.pluginPath);
+  }
+  const sourceReference = formatPluginSourceReference(resolvedSource, options.path);
   const data = await withPluginSourceClient(options.daemonTarget, (client) =>
     client.installPluginSource({
       source: sourceReference,
diff --git a/packages/cli/tests/e2e/plugin-lifecycle.test.ts b/packages/cli/tests/e2e/plugin-lifecycle.test.ts
index ce509af8e1..3e71b6b608 100644
--- a/packages/cli/tests/e2e/plugin-lifecycle.test.ts
+++ b/packages/cli/tests/e2e/plugin-lifecycle.test.ts
@@ -8,11 +8,13 @@ import {
 } from "../../../../scripts/test-support/npm-registry.mjs";
 import assert from "node:assert/strict";
 import { execFile } from "node:child_process";
-import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { promisify } from "node:util";
+import { once } from "node:events";
+import { WebSocket, WebSocketServer } from "ws";
 import { connectToDaemon } from "../../src/utils/client.ts";
 import { createE2ETestContext } from "../helpers/test-daemon.ts";
 
@@ -45,6 +47,81 @@ async function main(): Promise<void> {
     );
     await writeFile(path.join(directory, "index.server.ts"), pluginSource);
 
+    // Observe real CLI requests while forwarding them to the isolated daemon.
+    const proxy = new WebSocketServer({ host: "127.0.0.1", port: 0 });
+    const sources: string[] = [];
+    proxy.on("connection", (socket, request) => {
+      const upstream = new WebSocket(`ws://127.0.0.1:${context.port}${request.url}`, {
+        headers: { authorization: request.headers.authorization ?? "" },
+      });
+      const ready = once(upstream, "open");
+      socket.on("message", async (data, isBinary) => {
+        const message = JSON.parse(data.toString());
+        if (
+          message.type === "session" &&
+          message.message.type === "plugin.source.install.request"
+        ) {
+          sources.push(message.message.source);
+        }
+        await ready;
+        upstream.send(data, { binary: isBinary });
+      });
+      upstream.on("message", (data, isBinary) => socket.send(data, { binary: isBinary }));
+      socket.on("close", () => upstream.close());
+      upstream.on("close", () => socket.close());
+    });
+    await once(proxy, "listening");
+    const address = proxy.address();
+    assert.ok(address && typeof address !== "string");
+    const sibling = path.join(context.workDir, "x");
+    const caller = path.join(context.workDir, "caller");
+    await mkdir(caller);
+    await mkdir(path.join(sibling, "sub"), { recursive: true });
+    for (const target of [caller, path.join(sibling, "sub"), context.paseoHome]) {
+      await writeFile(
+        path.join(target, "paseo-plugin.json"),
+        JSON.stringify({
+          id: "relative-cli",
+          requirements: { paseo: `>=${resolveCliVersion()}` },
+        }),
+      );
+      await writeFile(path.join(target, "index.server.ts"), pluginSource);
+    }
+    assert.notEqual(caller, process.cwd()); // The daemon inherits the test runner's cwd.
+    try {
+      for (const [source, expectedSource, expectedDirectory, extraArgs] of [
+        [".", caller, caller, []],
+        ["../x:sub", `${sibling}:sub`, path.join(sibling, "sub"), []],
+        ["../x", `${sibling}:sub`, path.join(sibling, "sub"), ["--path", "sub"]],
+        ["~", context.paseoHome, context.paseoHome, []],
+        ["~/.:.", `${context.paseoHome}:.`, context.paseoHome, []],
+      ] as const) {
+        sources.length = 0;
+        const result = await context.paseo(
+          ["plugin", "add", source, ...extraArgs, "--host", `127.0.0.1:${address.port}`, "--json"],
+          { cwd: caller },
+        );
+        assert.deepEqual(sources, [expectedSource]);
+        assert.equal(result.exitCode, 0, result.stderr);
+        assert.equal(JSON.parse(result.stdout).path, expectedDirectory);
+        const removed = await context.paseo(["plugin", "remove", "relative-cli", "--json"]);
+        assert.equal(removed.exitCode, 0, removed.stderr);
+      }
+      // An absolute path belongs to the daemon's platform, which can differ from the CLI's.
+      const windowsSource = `C:\\${path.basename(context.workDir)}\\missing:sub`;
+      sources.length = 0;
+      const missing = await context.paseo(
+        ["plugin", "add", windowsSource, "--host", `127.0.0.1:${address.port}`, "--json"],
+        { cwd: caller },
+      );
+      assert.deepEqual(sources, [windowsSource]);
+      assert.equal(missing.exitCode, 1);
+      assert.match(missing.stderr, /Plugin directory does not exist/);
+    } finally {
+      for (const socket of proxy.clients) socket.close();
+      await promisify(proxy.close.bind(proxy))();
+    }
+
     const install = await context.paseo(["plugin", "install", directory, "--json"]);
     assert.equal(install.exitCode, 0, install.stderr);
     assert.equal(JSON.parse(install.stdout).id, "cli-e2e");
diff --git a/public-docs/plugins/reference.md b/public-docs/plugins/reference.md
index d4d67fae9b..2a8714e4d7 100644
--- a/public-docs/plugins/reference.md
+++ b/public-docs/plugins/reference.md
@@ -2258,8 +2258,11 @@ failures stay inside the plugin error boundary.
 
 Paste one of these source identifiers into **Settings → Plugins**, or pass it to
 `paseo plugin install`. `paseo plugin add <source>` and `paseo plugin install <source>` are aliases.
-Absolute host paths are recommended because relative paths resolve against the daemon's working
-directory. The daemon expands `~` to its home directory.
+The CLI resolves relative directory paths from your current working directory and expands `~`
+to your local home directory, preserving any `:plugin/path` suffix. With `--host`, use an absolute
+path that exists on the daemon host; plugin files are read there and are never uploaded by the CLI.
+Paths entered in Settings resolve relative to the daemon's working directory, and `~` expands to
+the daemon's home directory.
 
 | Source                     | Accepted form                                                              | Example                                       |
 | -------------------------- | -------------------------------------------------------------------------- | --------------------------------------------- |

From a9fef4879afd810f4d3ff0b99d8422cc95e90a44 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 6 Oct 2026 18:54:59 +0200
Subject: [PATCH 010/270] Show an archived ACP agent's history after its
 worktree is removed (#6228)

* Show an archived ACP agent's history after its worktree is removed

Opening an archived ACP agent loads its history by resuming the provider
session for reading. The provider process was spawned in the agent's
stored working directory, so once that directory was removed (for
example when its worktree workspace was archived) the spawn failed with
ENOENT and the chat opened empty.

A history load now starts the provider process from the home directory
when the working directory is gone, and still names the original
directory in session/load. An interactive resume keeps requiring the
directory.

Closes #5449

* Only treat a missing working directory as gone for a history load

A stat failure other than a missing path, such as a permission error,
now reaches the caller instead of moving the provider to the home
directory.

* Start the history process from home when the stored path is not a directory

A file left where an archived agent's worktree was made the history load
spawn in it and fail with ENOTDIR.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/agent/providers/acp-agent.ts   |  31 +++-
 ...generic-acp-agent.archived-history.test.ts | 154 ++++++++++++++++++
 2 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 packages/server/src/server/agent/providers/generic-acp-agent.archived-history.test.ts

diff --git a/packages/server/src/server/agent/providers/acp-agent.ts b/packages/server/src/server/agent/providers/acp-agent.ts
index a647deb549..e5d1e4c48e 100644
--- a/packages/server/src/server/agent/providers/acp-agent.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.ts
@@ -76,6 +76,8 @@ import {
   type AgentPersistenceHandle,
   type AgentPromptContentBlock,
   type AgentPromptInput,
+  type AgentResumePurpose,
+  type AgentResumeSessionOptions,
   type AgentRunOptions,
   type AgentRunResult,
   type AgentRuntimeInfo,
@@ -148,6 +150,18 @@ function rejectOnSpawnError(child: ChildProcess, stderrChunks: string[]): Promis
   });
 }
 
+async function isDirectory(target: string): Promise<boolean> {
+  try {
+    return (await fs.stat(target)).isDirectory();
+  } catch (error) {
+    const code = (error as NodeJS.ErrnoException).code;
+    if (code === "ENOENT" || code === "ENOTDIR") {
+      return false;
+    }
+    throw error;
+  }
+}
+
 function isRecord(value: unknown): value is Record<string, unknown> {
   return value != null && typeof value === "object" && !Array.isArray(value);
 }
@@ -497,6 +511,7 @@ interface ACPAgentSessionOptions {
   capabilities: AgentCapabilityFlags;
   extensionCommandsParser?: ACPExtensionCommandsParser;
   handle?: AgentPersistenceHandle;
+  resumePurpose?: AgentResumePurpose;
   agentId?: string;
   launchEnv?: Record<string, string>;
   waitForInitialCommands?: boolean;
@@ -1006,6 +1021,7 @@ export class ACPAgentClient implements AgentClient {
     handle: AgentPersistenceHandle,
     overrides?: Partial<AgentSessionConfig>,
     launchContext?: AgentLaunchContext,
+    options?: AgentResumeSessionOptions,
   ): Promise<AgentSession> {
     if (handle.provider !== this.provider) {
       throw new Error(`Cannot resume ${handle.provider} handle with ${this.provider} provider`);
@@ -1047,6 +1063,7 @@ export class ACPAgentClient implements AgentClient {
           providerOptions.supportsMcpServers ?? this.capabilities.supportsMcpServers,
       },
       handle,
+      resumePurpose: options?.purpose,
       agentId: launchContext?.agentId,
       launchEnv: launchContext?.env,
       extensionCommandsParser: this.extensionCommandsParser,
@@ -1700,6 +1717,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
   private readonly terminalEntries = new Map<string, TerminalEntry>();
   private readonly persistedHistory: AgentTimelineItem[] = [];
   private readonly initialHandle?: AgentPersistenceHandle;
+  private readonly resumePurpose: AgentResumePurpose;
 
   private readonly config: AgentSessionConfig;
   private child: ChildProcessWithoutNullStreams | null = null;
@@ -1753,6 +1771,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     this.agentId = options.agentId;
     this.launchEnv = options.launchEnv;
     this.initialHandle = options.handle;
+    this.resumePurpose = options.resumePurpose ?? "interactive";
     this.config = { ...config, provider: options.provider };
     this.currentMode = config.modeId ?? null;
     this.currentModel = config.model ?? null;
@@ -2770,6 +2789,16 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     return {};
   }
 
+  // Loading an archived agent's history runs nothing in its working directory, which
+  // may have been removed with its worktree. session/load still names the original
+  // directory; only the process starts from the home directory.
+  private async resolveProcessCwd(): Promise<string> {
+    if (this.resumePurpose !== "history" || (await isDirectory(this.config.cwd))) {
+      return this.config.cwd;
+    }
+    return homedir();
+  }
+
   private async spawnProcess(): Promise<SpawnedACPProcess> {
     const prefix = await resolveProviderLaunch({
       commandConfig: this.runtimeSettings?.command,
@@ -2783,7 +2812,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     const command = prefix.command;
     const args = [...prefix.args, ...this.defaultCommand.slice(1)];
     const child = spawnProcess(command, args, {
-      cwd: this.config.cwd,
+      cwd: await this.resolveProcessCwd(),
       ...createProviderEnvSpec({
         runtimeSettings: this.runtimeSettings,
         overlays: [this.launchEnv],
diff --git a/packages/server/src/server/agent/providers/generic-acp-agent.archived-history.test.ts b/packages/server/src/server/agent/providers/generic-acp-agent.archived-history.test.ts
new file mode 100644
index 0000000000..ec17dd7ecf
--- /dev/null
+++ b/packages/server/src/server/agent/providers/generic-acp-agent.archived-history.test.ts
@@ -0,0 +1,154 @@
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { describe, expect, test } from "vitest";
+
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import type { AgentStreamEvent } from "../agent-sdk-types.js";
+import { GenericACPAgentClient } from "./generic-acp-agent.js";
+
+describe("GenericACPAgentClient archived history", () => {
+  test("replays an archived session whose working directory was removed", async () => {
+    await withFakeACPAgent(async ({ command, removedCwd, loadRequestsPath }) => {
+      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+
+      const session = await client.resumeSession(
+        { provider: "acp", sessionId: "archived-session", metadata: { cwd: removedCwd } },
+        undefined,
+        undefined,
+        { purpose: "history" },
+      );
+      try {
+        expect(await collectTimelineText(session.streamHistory())).toEqual([
+          "user_message:What is in the README?",
+          "assistant_message:It describes the project.",
+        ]);
+        const loadRequests = JSON.parse(await readFile(loadRequestsPath, "utf8"));
+        expect(loadRequests).toEqual([{ sessionId: "archived-session", cwd: removedCwd }]);
+      } finally {
+        await session.close();
+      }
+    });
+  });
+
+  test("replays an archived session whose working directory path is now a file", async () => {
+    await withFakeACPAgent(async ({ command, removedCwd }) => {
+      await writeFile(removedCwd, "not a directory", "utf8");
+      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+
+      const session = await client.resumeSession(
+        { provider: "acp", sessionId: "archived-session", metadata: { cwd: removedCwd } },
+        undefined,
+        undefined,
+        { purpose: "history" },
+      );
+      try {
+        expect(await collectTimelineText(session.streamHistory())).toEqual([
+          "user_message:What is in the README?",
+          "assistant_message:It describes the project.",
+        ]);
+      } finally {
+        await session.close();
+      }
+    });
+  });
+
+  test("still requires the working directory to resume a session that will run", async () => {
+    await withFakeACPAgent(async ({ command, removedCwd }) => {
+      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+
+      await expect(
+        client.resumeSession(
+          { provider: "acp", sessionId: "archived-session", metadata: { cwd: removedCwd } },
+          undefined,
+          undefined,
+          { purpose: "interactive" },
+        ),
+      ).rejects.toThrow("ENOENT");
+    });
+  });
+});
+
+async function collectTimelineText(events: AsyncGenerator<AgentStreamEvent>): Promise<string[]> {
+  const text: string[] = [];
+  for await (const event of events) {
+    if (event.type !== "timeline") {
+      continue;
+    }
+    if (event.item.type === "user_message" || event.item.type === "assistant_message") {
+      text.push(`${event.item.type}:${event.item.text}`);
+    }
+  }
+  return text;
+}
+
+async function withFakeACPAgent(
+  run: (input: {
+    command: [string, ...string[]];
+    removedCwd: string;
+    loadRequestsPath: string;
+  }) => Promise<void>,
+): Promise<void> {
+  const testDir = await mkdtemp(path.join(tmpdir(), "paseo-acp-archived-history-"));
+  try {
+    const scriptPath = path.join(testDir, "fake-acp-agent.cjs");
+    const loadRequestsPath = path.join(testDir, "load-requests.json");
+    await writeFile(scriptPath, fakeACPAgentScript, "utf8");
+    await run({
+      command: [process.execPath, scriptPath, loadRequestsPath],
+      removedCwd: path.join(testDir, "removed-worktree"),
+      loadRequestsPath,
+    });
+  } finally {
+    await rm(testDir, { recursive: true, force: true });
+  }
+}
+
+const fakeACPAgentScript = `
+const fs = require("node:fs");
+const readline = require("node:readline");
+
+const loadRequestsPath = process.argv[2];
+const loadRequests = [];
+const rl = readline.createInterface({ input: process.stdin });
+
+function write(message) {
+  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", ...message }) + "\\n");
+}
+
+function replay(sessionId, sessionUpdate, text) {
+  write({
+    method: "session/update",
+    params: { sessionId, update: { sessionUpdate, content: { type: "text", text } } },
+  });
+}
+
+rl.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") {
+    write({
+      id: message.id,
+      result: {
+        protocolVersion: message.params?.protocolVersion ?? 1,
+        agentCapabilities: { loadSession: true, sessionCapabilities: { close: {} } },
+      },
+    });
+    return;
+  }
+
+  if (message.method === "session/load") {
+    const { sessionId, cwd } = message.params;
+    loadRequests.push({ sessionId, cwd });
+    fs.writeFileSync(loadRequestsPath, JSON.stringify(loadRequests));
+    replay(sessionId, "user_message_chunk", "What is in the README?");
+    replay(sessionId, "agent_message_chunk", "It describes the project.");
+    write({ id: message.id, result: {} });
+    return;
+  }
+
+  if (message.id !== undefined) {
+    write({ id: message.id, result: {} });
+  }
+});
+`;

From fc3b2c4eb7a6e294b6e2761400fe48b9e0b0aee9 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 18:31:53 +0100
Subject: [PATCH 011/270] Sanitize plugin overview rendering: no raw HTML,
 https links only, no relative links (#6244)

* fix(plugins): restrict overview content to safe Markdown and HTTPS destinations

Registry overviews are author-controlled content read away from their repositories. Apply a shared presentation policy instead of the documentation renderer so relative links, non-HTTPS URLs, raw HTML, and author styles never become active overview content.

* fix(plugins): choose the first allowed screenshot for previews
---
 docs/plugins.md                               |    7 +
 package-lock.json                             |    1 +
 .../app/e2e/browser/plugin-management.spec.ts |   25 +
 packages/protocol/src/plugin-overview.test.ts |   42 +
 packages/protocol/src/plugin-overview.ts      |   49 +
 .../tests/fixtures/plugin-overview.json       | 1202 +++++++++++++++++
 packages/website/e2e/overview.fixture.json    |   32 +
 packages/website/e2e/plugins.spec.ts          |   74 +-
 packages/website/e2e/registry-server.mjs      |   13 +-
 packages/website/package.json                 |    1 +
 .../website/src/plugins/overview.test.tsx     |  138 ++
 packages/website/src/plugins/overview.tsx     |   56 +
 packages/website/src/plugins/plugin-card.tsx  |    5 +-
 packages/website/src/plugins/plugin-tile.tsx  |    3 +-
 .../website/src/routes/plugins/$owner.tsx     |   14 +-
 .../src/routes/plugins/$owner_.$slug.tsx      |   54 +-
 16 files changed, 1673 insertions(+), 43 deletions(-)
 create mode 100644 packages/protocol/src/plugin-overview.test.ts
 create mode 100644 packages/protocol/src/plugin-overview.ts
 create mode 100644 packages/protocol/tests/fixtures/plugin-overview.json
 create mode 100644 packages/website/e2e/overview.fixture.json
 create mode 100644 packages/website/src/plugins/overview.test.tsx
 create mode 100644 packages/website/src/plugins/overview.tsx

diff --git a/docs/plugins.md b/docs/plugins.md
index 897bf29507..866c74128e 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -123,6 +123,13 @@ Use `git:owner/repository` or a full Git URL for a Git source. Registry installs
 keep the registry URL and ID, so update checks use its approved pin. Explicit version/ref
 selection is unavailable for registry installs; install an explicit source to select your own.
 
+Registry overviews are untrusted author content, even before installation. Render them with
+`@getpaseo/protocol/plugin-overview`: no raw HTML, HTTPS-only links and images, no relative
+URLs, and isolated external links. The website adapter and corpus tests live in
+`packages/website/src/plugins/overview.tsx` and `overview.test.tsx`; the reusable corpus is
+`packages/protocol/tests/fixtures/plugin-overview.json`. A future app overview must share
+this policy. Installed-plugin descriptions in the app remain plain text.
+
 Use `host/owner/slug` for a registry at `https://host`, or set
 `PASEO_PLUGIN_REGISTRY` to change the default base (including a path prefix).
 Private registry credentials live in daemon config under
diff --git a/package-lock.json b/package-lock.json
index d03e712ee1..a2856c464a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40174,6 +40174,7 @@
         "@types/react": "^19.1.6",
         "@types/react-dom": "^19.1.5",
         "@vitejs/plugin-react": "^4.5.1",
+        "parse5": "^7.3.0",
         "typescript": "^5.9.3",
         "vite": "^7.3.3",
         "vite-tsconfig-paths": "^5.1.4",
diff --git a/packages/app/e2e/browser/plugin-management.spec.ts b/packages/app/e2e/browser/plugin-management.spec.ts
index 05a2dd765e..84b4cc63a2 100644
--- a/packages/app/e2e/browser/plugin-management.spec.ts
+++ b/packages/app/e2e/browser/plugin-management.spec.ts
@@ -1,3 +1,4 @@
+import overviewCorpus from "../../../protocol/tests/fixtures/plugin-overview.json";
 import { pluginRequirements } from "../support/helpers/plugin-fixture";
 import { execFileSync } from "node:child_process";
 import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
@@ -655,3 +656,27 @@ async function reloadAndRemoveNpmPlugin(page: Page) {
   await expect(page.getByText("Removed npm-review", { exact: true })).toBeVisible();
   await expect(page.getByLabel("npm-review running")).toHaveCount(0);
 }
+
+test("renders installed-plugin descriptions as plain text", async ({ page, pluginEnvironment }) => {
+  const description = overviewCorpus.map(({ markdown }) => markdown).join("\n\n");
+  await installPluginWithUntrustedDescription(pluginEnvironment, description);
+  await gotoAppShell(page);
+  await openPluginSettings(page);
+  const text = page.getByText(description, { exact: true });
+  await expect(text).toBeVisible();
+  // This field must remain a text node, with no Markdown links, images, or HTML children.
+  expect(await text.evaluate((element) => element.childElementCount)).toBe(0);
+});
+
+async function installPluginWithUntrustedDescription(
+  environment: PluginEnvironment,
+  description: string,
+) {
+  const directory = await createDirectoryPlugin(
+    environment.directory,
+    "plain-text-plugin",
+    description,
+    "Plain text plugin",
+  );
+  await environment.client.installPluginSource({ source: directory });
+}
diff --git a/packages/protocol/src/plugin-overview.test.ts b/packages/protocol/src/plugin-overview.test.ts
new file mode 100644
index 0000000000..c4023965da
--- /dev/null
+++ b/packages/protocol/src/plugin-overview.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, it } from "vitest";
+import { pluginOverviewUrl } from "./plugin-overview.js";
+
+describe("plugin overview destinations", () => {
+  it.each([
+    undefined,
+    "",
+    "./docs",
+    "../docs",
+    "/login",
+    "//example.com",
+    "#section",
+    "?login",
+    "http://example.com",
+    "mailto:hello@example.com",
+    "ftp://example.com",
+    "javascript:alert(1)",
+    "data:image/png;base64,AAAA",
+    "vbscript:msgbox(1)",
+    "javascript&#58;alert(1)",
+    "javascript%3Aalert(1)",
+    "javascript%253Aalert(1)",
+    "java\tscript:alert(1)",
+    " https://example.com",
+    "https://example.com\n",
+    "https:example.com",
+    "https:///example.com",
+    "https://paseo.sh@evil.example",
+    "https://example.com\\@evil.example",
+    "https://",
+  ])("leaves %s as text", (url) => {
+    expect(pluginOverviewUrl(url)).toBeUndefined();
+  });
+
+  it.each([
+    "https://example.com/path?q=a&b=c#section",
+    "HTTPS://example.com/path",
+    "https://example.com/%3Cscript%3E",
+  ])("allows %s without decoding it again", (url) => {
+    expect(pluginOverviewUrl(url)).toBe(url);
+  });
+});
diff --git a/packages/protocol/src/plugin-overview.ts b/packages/protocol/src/plugin-overview.ts
new file mode 100644
index 0000000000..2507b511b0
--- /dev/null
+++ b/packages/protocol/src/plugin-overview.ts
@@ -0,0 +1,49 @@
+/** Presentation contract for author-controlled registry content, independent of the UI runtime. */
+export const pluginOverviewPolicy = {
+  rawHtml: false,
+  elements: [
+    "p",
+    "br",
+    "hr",
+    "h1",
+    "h2",
+    "h3",
+    "h4",
+    "h5",
+    "h6",
+    "blockquote",
+    "ul",
+    "ol",
+    "li",
+    "strong",
+    "em",
+    "del",
+    "pre",
+    "code",
+    "a",
+    "img",
+    "table",
+    "thead",
+    "tbody",
+    "tr",
+    "th",
+    "td",
+  ],
+  link: { rel: "noopener noreferrer nofollow", target: "_blank" },
+} as const;
+
+/** Validate decoded Markdown destinations; never resolve against the reader's page or repository. */
+export function pluginOverviewUrl(value: string | undefined): string | undefined {
+  // URL parsers discard controls and normalize backslashes; reject those ambiguous spellings.
+  // eslint-disable-next-line no-control-regex
+  if (!value || !/^https:\/\/[^/?#]/i.test(value) || /[\u0000-\u0020\u007f\\]/.test(value))
+    return undefined;
+  try {
+    const url = new URL(value);
+    if (url.protocol !== "https:" || !url.hostname || url.username || url.password)
+      return undefined;
+    return value;
+  } catch {
+    return undefined;
+  }
+}
diff --git a/packages/protocol/tests/fixtures/plugin-overview.json b/packages/protocol/tests/fixtures/plugin-overview.json
new file mode 100644
index 0000000000..bbe8575ac8
--- /dev/null
+++ b/packages/protocol/tests/fixtures/plugin-overview.json
@@ -0,0 +1,1202 @@
+[
+  {
+    "name": "script",
+    "markdown": "<script>alert(1)</script>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "image event",
+    "markdown": "<img src=\"https://example.com/x\" onerror=\"alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "svg event",
+    "markdown": "<svg onload=\"alert(1)\"></svg>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "iframe",
+    "markdown": "<iframe src=\"https://example.com\"></iframe>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTML javascript link",
+    "markdown": "<a href=\"javascript:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTML block",
+    "markdown": "<div>\n<img src=x onerror=alert(1)>\n</div>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "comment",
+    "markdown": "<!-- <img src=x onerror=alert(1)> -->",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "meta refresh",
+    "markdown": "<meta http-equiv=\"refresh\" content=\"0;url=https://example.com\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "base",
+    "markdown": "<base href=\"https://example.com\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "form",
+    "markdown": "<form action=\"https://example.com\"><input name=\"password\"></form>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "style expression",
+    "markdown": "<p style=\"width:expression(alert(1));position:fixed\">click</p>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "style block",
+    "markdown": "<style>body{display:none}</style>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "closing script",
+    "markdown": "</script><script>alert(1)</script>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTML entities",
+    "markdown": "&lt;img src=x onerror=alert(1)&gt;",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested HTML entities",
+    "markdown": "&amp;lt;script&amp;gt;alert(1)&amp;lt;/script&amp;gt;",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript link",
+    "markdown": "[click](javascript:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript image",
+    "markdown": "![picture](javascript:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript reference link",
+    "markdown": "[click][ref]\n\n[ref]: javascript:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript reference image",
+    "markdown": "![picture][ref]\n\n[ref]: javascript:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript HTML link",
+    "markdown": "<a href=\"javascript:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript HTML image",
+    "markdown": "<img src=\"javascript:alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript link",
+    "markdown": "[click](JaVaScRiPt:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript image",
+    "markdown": "![picture](JaVaScRiPt:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript reference link",
+    "markdown": "[click][ref]\n\n[ref]: JaVaScRiPt:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript reference image",
+    "markdown": "![picture][ref]\n\n[ref]: JaVaScRiPt:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript HTML link",
+    "markdown": "<a href=\"JaVaScRiPt:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript HTML image",
+    "markdown": "<img src=\"JaVaScRiPt:alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML link",
+    "markdown": "[click](data:text/html;base64,PHNjcmlwdD4=)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML image",
+    "markdown": "![picture](data:text/html;base64,PHNjcmlwdD4=)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML reference link",
+    "markdown": "[click][ref]\n\n[ref]: data:text/html;base64,PHNjcmlwdD4=",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML reference image",
+    "markdown": "![picture][ref]\n\n[ref]: data:text/html;base64,PHNjcmlwdD4=",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML HTML link",
+    "markdown": "<a href=\"data:text/html;base64,PHNjcmlwdD4=\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML HTML image",
+    "markdown": "<img src=\"data:text/html;base64,PHNjcmlwdD4=\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image link",
+    "markdown": "[click](data:image/png;base64,AAAA)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image image",
+    "markdown": "![picture](data:image/png;base64,AAAA)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image reference link",
+    "markdown": "[click][ref]\n\n[ref]: data:image/png;base64,AAAA",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image reference image",
+    "markdown": "![picture][ref]\n\n[ref]: data:image/png;base64,AAAA",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image HTML link",
+    "markdown": "<a href=\"data:image/png;base64,AAAA\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image HTML image",
+    "markdown": "<img src=\"data:image/png;base64,AAAA\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript link",
+    "markdown": "[click](vbscript:msgbox(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript image",
+    "markdown": "![picture](vbscript:msgbox(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript reference link",
+    "markdown": "[click][ref]\n\n[ref]: vbscript:msgbox(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript reference image",
+    "markdown": "![picture][ref]\n\n[ref]: vbscript:msgbox(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript HTML link",
+    "markdown": "<a href=\"vbscript:msgbox(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript HTML image",
+    "markdown": "<img src=\"vbscript:msgbox(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http link",
+    "markdown": "[click](http://example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http image",
+    "markdown": "![picture](http://example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http reference link",
+    "markdown": "[click][ref]\n\n[ref]: http://example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http reference image",
+    "markdown": "![picture][ref]\n\n[ref]: http://example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http HTML link",
+    "markdown": "<a href=\"http://example.com/path\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http HTML image",
+    "markdown": "<img src=\"http://example.com/path\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp link",
+    "markdown": "[click](ftp://example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp image",
+    "markdown": "![picture](ftp://example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp reference link",
+    "markdown": "[click][ref]\n\n[ref]: ftp://example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp reference image",
+    "markdown": "![picture][ref]\n\n[ref]: ftp://example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp HTML link",
+    "markdown": "<a href=\"ftp://example.com/path\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp HTML image",
+    "markdown": "<img src=\"ftp://example.com/path\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto link",
+    "markdown": "[click](mailto:attacker@example.com)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto image",
+    "markdown": "![picture](mailto:attacker@example.com)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto reference link",
+    "markdown": "[click][ref]\n\n[ref]: mailto:attacker@example.com",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto reference image",
+    "markdown": "![picture][ref]\n\n[ref]: mailto:attacker@example.com",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto HTML link",
+    "markdown": "<a href=\"mailto:attacker@example.com\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto HTML image",
+    "markdown": "<img src=\"mailto:attacker@example.com\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative link",
+    "markdown": "[click](//example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative image",
+    "markdown": "![picture](//example.com/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative reference link",
+    "markdown": "[click][ref]\n\n[ref]: //example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative reference image",
+    "markdown": "![picture][ref]\n\n[ref]: //example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative HTML link",
+    "markdown": "<a href=\"//example.com/path\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "protocol relative HTML image",
+    "markdown": "<img src=\"//example.com/path\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative link",
+    "markdown": "[click](./image.png)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative image",
+    "markdown": "![picture](./image.png)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative reference link",
+    "markdown": "[click][ref]\n\n[ref]: ./image.png",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative reference image",
+    "markdown": "![picture][ref]\n\n[ref]: ./image.png",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative HTML link",
+    "markdown": "<a href=\"./image.png\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "relative HTML image",
+    "markdown": "<img src=\"./image.png\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative link",
+    "markdown": "[click](../login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative image",
+    "markdown": "![picture](../login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative reference link",
+    "markdown": "[click][ref]\n\n[ref]: ../login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative reference image",
+    "markdown": "![picture][ref]\n\n[ref]: ../login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative HTML link",
+    "markdown": "<a href=\"../login\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "parent relative HTML image",
+    "markdown": "<img src=\"../login\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative link",
+    "markdown": "[click](/login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative image",
+    "markdown": "![picture](/login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative reference link",
+    "markdown": "[click][ref]\n\n[ref]: /login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative reference image",
+    "markdown": "![picture][ref]\n\n[ref]: /login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative HTML link",
+    "markdown": "<a href=\"/login\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "root relative HTML image",
+    "markdown": "<img src=\"/login\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment link",
+    "markdown": "[click](#login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment image",
+    "markdown": "![picture](#login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment reference link",
+    "markdown": "[click][ref]\n\n[ref]: #login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment reference image",
+    "markdown": "![picture][ref]\n\n[ref]: #login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment HTML link",
+    "markdown": "<a href=\"#login\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "fragment HTML image",
+    "markdown": "<img src=\"#login\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query link",
+    "markdown": "[click](?login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query image",
+    "markdown": "![picture](?login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query reference link",
+    "markdown": "[click][ref]\n\n[ref]: ?login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query reference image",
+    "markdown": "![picture][ref]\n\n[ref]: ?login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query HTML link",
+    "markdown": "<a href=\"?login\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "query HTML image",
+    "markdown": "<img src=\"?login\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript link",
+    "markdown": "[click](javascript&#58;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript image",
+    "markdown": "![picture](javascript&#58;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript reference link",
+    "markdown": "[click][ref]\n\n[ref]: javascript&#58;alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript reference image",
+    "markdown": "![picture][ref]\n\n[ref]: javascript&#58;alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript HTML link",
+    "markdown": "<a href=\"javascript&#58;alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity javascript HTML image",
+    "markdown": "<img src=\"javascript&#58;alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter link",
+    "markdown": "[click](jav&#x61;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter image",
+    "markdown": "![picture](jav&#x61;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter reference link",
+    "markdown": "[click][ref]\n\n[ref]: jav&#x61;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter reference image",
+    "markdown": "![picture][ref]\n\n[ref]: jav&#x61;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter HTML link",
+    "markdown": "<a href=\"jav&#x61;script:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "entity letter HTML image",
+    "markdown": "<img src=\"jav&#x61;script:alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity link",
+    "markdown": "[click](javascript&amp;#58;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity image",
+    "markdown": "![picture](javascript&amp;#58;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity reference link",
+    "markdown": "[click][ref]\n\n[ref]: javascript&amp;#58;alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity reference image",
+    "markdown": "![picture][ref]\n\n[ref]: javascript&amp;#58;alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity HTML link",
+    "markdown": "<a href=\"javascript&amp;#58;alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested entity HTML image",
+    "markdown": "<img src=\"javascript&amp;#58;alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded link",
+    "markdown": "[click](javascript%3Aalert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded image",
+    "markdown": "![picture](javascript%3Aalert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded reference link",
+    "markdown": "[click][ref]\n\n[ref]: javascript%3Aalert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded reference image",
+    "markdown": "![picture][ref]\n\n[ref]: javascript%3Aalert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded HTML link",
+    "markdown": "<a href=\"javascript%3Aalert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "percent encoded HTML image",
+    "markdown": "<img src=\"javascript%3Aalert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded link",
+    "markdown": "[click](javascript%253Aalert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded image",
+    "markdown": "![picture](javascript%253Aalert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded reference link",
+    "markdown": "[click][ref]\n\n[ref]: javascript%253Aalert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded reference image",
+    "markdown": "![picture][ref]\n\n[ref]: javascript%253Aalert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded HTML link",
+    "markdown": "<a href=\"javascript%253Aalert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "nested percent encoded HTML image",
+    "markdown": "<img src=\"javascript%253Aalert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme link",
+    "markdown": "[click](java&#9;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme image",
+    "markdown": "![picture](java&#9;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme reference link",
+    "markdown": "[click][ref]\n\n[ref]: java&#9;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme reference image",
+    "markdown": "![picture][ref]\n\n[ref]: java&#9;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme HTML link",
+    "markdown": "<a href=\"java&#9;script:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tab scheme HTML image",
+    "markdown": "<img src=\"java&#9;script:alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme link",
+    "markdown": "[click](java&#10;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme image",
+    "markdown": "![picture](java&#10;script:alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme reference link",
+    "markdown": "[click][ref]\n\n[ref]: java&#10;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme reference image",
+    "markdown": "![picture][ref]\n\n[ref]: java&#10;script:alert(1)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme HTML link",
+    "markdown": "<a href=\"java&#10;script:alert(1)\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "newline scheme HTML image",
+    "markdown": "<img src=\"java&#10;script:alert(1)\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials link",
+    "markdown": "[click](https://paseo.sh@evil.example/login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials image",
+    "markdown": "![picture](https://paseo.sh@evil.example/login)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials reference link",
+    "markdown": "[click][ref]\n\n[ref]: https://paseo.sh@evil.example/login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials reference image",
+    "markdown": "![picture][ref]\n\n[ref]: https://paseo.sh@evil.example/login",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials HTML link",
+    "markdown": "<a href=\"https://paseo.sh@evil.example/login\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS credentials HTML image",
+    "markdown": "<img src=\"https://paseo.sh@evil.example/login\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash link",
+    "markdown": "[click](https:\\evil.example/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash image",
+    "markdown": "![picture](https:\\evil.example/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash reference link",
+    "markdown": "[click][ref]\n\n[ref]: https:\\evil.example/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash reference image",
+    "markdown": "![picture][ref]\n\n[ref]: https:\\evil.example/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash HTML link",
+    "markdown": "<a href=\"https:\\evil.example/path\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "backslash HTML image",
+    "markdown": "<img src=\"https:\\evil.example/path\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority link",
+    "markdown": "[click](https:evil.example/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority image",
+    "markdown": "![picture](https:evil.example/path)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority reference link",
+    "markdown": "[click][ref]\n\n[ref]: https:evil.example/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority reference image",
+    "markdown": "![picture][ref]\n\n[ref]: https:evil.example/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority HTML link",
+    "markdown": "<a href=\"https:evil.example/path\">click</a>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "missing authority HTML image",
+    "markdown": "<img src=\"https:evil.example/path\">",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "javascript autolink",
+    "markdown": "<javascript:alert(1)>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mixed case javascript autolink",
+    "markdown": "<JaVaScRiPt:alert(1)>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data HTML autolink",
+    "markdown": "<data:text/html;base64,PHNjcmlwdD4=>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "data image autolink",
+    "markdown": "<data:image/png;base64,AAAA>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "vbscript autolink",
+    "markdown": "<vbscript:msgbox(1)>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "http autolink",
+    "markdown": "<http://example.com/path>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "ftp autolink",
+    "markdown": "<ftp://example.com/path>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "mailto autolink",
+    "markdown": "<mailto:attacker@example.com>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "HTTPS link",
+    "markdown": "[click](https://example.com/path)",
+    "links": ["https://example.com/path"],
+    "images": []
+  },
+  {
+    "name": "HTTPS image",
+    "markdown": "![picture](https://example.com/image.png)",
+    "links": [],
+    "images": ["https://example.com/image.png"]
+  },
+  {
+    "name": "HTTPS autolink",
+    "markdown": "<https://example.com/path>",
+    "links": ["https://example.com/path"],
+    "images": []
+  },
+  {
+    "name": "bare HTTPS",
+    "markdown": "https://example.com/path",
+    "links": ["https://example.com/path"],
+    "images": []
+  },
+  {
+    "name": "bare HTTP",
+    "markdown": "http://example.com/path",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "deceptive RTL text",
+    "markdown": "[paseo.sh‮evil](https://example.com/path)",
+    "links": ["https://example.com/path"],
+    "images": []
+  },
+  {
+    "name": "title injection",
+    "markdown": "[click](https://example.com/path \"\\\" onmouseover=alert(1)\")",
+    "links": ["https://example.com/path"],
+    "images": []
+  },
+  {
+    "name": "table alignment",
+    "markdown": "| A |\n| :-: |\n| safe |",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "heading",
+    "markdown": "## Heading",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRC link",
+    "markdown": "[click](irc://example.com/channel)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRC image",
+    "markdown": "![picture](irc://example.com/channel)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRC autolink",
+    "markdown": "<irc://example.com/channel>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRCS link",
+    "markdown": "[click](ircs://example.com/channel)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRCS image",
+    "markdown": "![picture](ircs://example.com/channel)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "IRCS autolink",
+    "markdown": "<ircs://example.com/channel>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "XMPP link",
+    "markdown": "[click](xmpp:attacker@example.com)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "XMPP image",
+    "markdown": "![picture](xmpp:attacker@example.com)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "XMPP autolink",
+    "markdown": "<xmpp:attacker@example.com>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tel link",
+    "markdown": "[click](tel:12345)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tel image",
+    "markdown": "![picture](tel:12345)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "tel autolink",
+    "markdown": "<tel:12345>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "file link",
+    "markdown": "[click](file:///etc/passwd)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "file image",
+    "markdown": "![picture](file:///etc/passwd)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "file autolink",
+    "markdown": "<file:///etc/passwd>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "blob link",
+    "markdown": "[click](blob:https://example.com/id)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "blob image",
+    "markdown": "![picture](blob:https://example.com/id)",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "blob autolink",
+    "markdown": "<blob:https://example.com/id>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "named entity link",
+    "markdown": "[click](javascript&colon;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "named entity image",
+    "markdown": "![picture](javascript&colon;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "named entity autolink",
+    "markdown": "<javascript&colon;alert(1)>",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "double encoded entity link",
+    "markdown": "[click](javascript&amp;colon;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "double encoded entity image",
+    "markdown": "![picture](javascript&amp;colon;alert(1))",
+    "links": [],
+    "images": []
+  },
+  {
+    "name": "double encoded entity autolink",
+    "markdown": "<javascript&amp;colon;alert(1)>",
+    "links": [],
+    "images": []
+  }
+]
diff --git a/packages/website/e2e/overview.fixture.json b/packages/website/e2e/overview.fixture.json
new file mode 100644
index 0000000000..2d23fd0343
--- /dev/null
+++ b/packages/website/e2e/overview.fixture.json
@@ -0,0 +1,32 @@
+{
+  "id": "security/overview",
+  "name": "</script><script>globalThis.__overviewExecuted=1</script><img src=x onerror=\"globalThis.__overviewExecuted=1\">",
+  "description": "</script><script>globalThis.__overviewExecuted=1</script><img src=x onerror=\"globalThis.__overviewExecuted=1\">",
+  "artifact": {
+    "kind": "npm",
+    "package": "@alhassanaraouf/paseo-base2tone-theme",
+    "version": "0.1.2",
+    "resolved": "https://registry.npmjs.org/@alhassanaraouf/paseo-base2tone-theme/-/paseo-base2tone-theme-0.1.2.tgz",
+    "integrity": "sha512-baP+qh3MlPgwACvt72XjrULjbDHARofzHfxyGGVVl22iw6qVnMzyfBJXi4exgtplvD/yPqf/XlsqD8wTqHB+lg=="
+  },
+  "license": "MIT",
+  "repository": {
+    "url": "javascript:alert(1)"
+  },
+  "categories": ["themes"],
+  "author": {
+    "github": "security",
+    "name": "</script><script>globalThis.__overviewExecuted=1</script><img src=x onerror=\"globalThis.__overviewExecuted=1\">"
+  },
+  "screenshots": [
+    "data:image/svg+xml,<svg onload=\"globalThis.__overviewExecuted=1\"/>",
+    "http://example.com/image.png"
+  ],
+  "submittedAt": "2026-09-24T00:00:00.000Z",
+  "reviewedAt": "2026-10-03T00:00:00.000Z",
+  "publishedAt": "2026-09-24T17:12:05.467Z",
+  "updatedAt": "2026-10-03T00:00:00.000Z",
+  "installs": 0,
+  "readme": "## Overview security\n\n</script><script>globalThis.__overviewExecuted=1</script><img src=x onerror=\"globalThis.__overviewExecuted=1\">",
+  "icon": "data:image/png;base64,AAAA"
+}
diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 910f14cc1b..246e383b57 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -1,3 +1,4 @@
+import securityPlugin from "./overview.fixture.json" with { type: "json" };
 import { expect, test, type Page, type Locator } from "playwright/test";
 import registry from "./registry.fixture.json" with { type: "json" };
 import { CATEGORIES } from "../src/plugins/categories";
@@ -35,7 +36,7 @@ test("browses from the directory into a category, a plugin, and its author", asy
   await expect(page.getByRole("heading", { name: "Fresh Worktrees" })).toHaveCount(1);
   await expect(page.getByText("paseo plugin install omercnet/fresh-worktrees")).toHaveCount(1);
   await expect(
-    page.getByRole("heading", { level: 2, name: "Link to this section Behavior", exact: true }),
+    page.getByRole("heading", { level: 2, name: "Behavior", exact: true }),
   ).toBeVisible();
   await page.getByRole("button", { name: "Copy to clipboard" }).click();
   await expect
@@ -168,7 +169,7 @@ test.describe("search engine visits without JavaScript", () => {
     expect(response?.headers()["x-robots-tag"]).toBeUndefined();
     await expect(page.getByText("paseo plugin install omercnet/fresh-worktrees")).toBeVisible();
     await expect(
-      page.getByRole("heading", { level: 2, name: "Link to this section Behavior", exact: true }),
+      page.getByRole("heading", { level: 2, name: "Behavior", exact: true }),
     ).toBeVisible();
     await expectPageMetadata(
       page,
@@ -366,3 +367,72 @@ async function expectThumbnailCard(card: Locator, source: string, id: string) {
   expect(box.width).toBeGreaterThan(0);
   expect(box.width / box.height).toBeCloseTo(1.6, 2);
 }
+
+test("keeps author content inert through SSR and hydration", async ({
+  page,
+  request,
+}, testInfo) => {
+  await verifyPluginOverviewResponse(request);
+  await openUntrustedPlugin(page);
+  await expectPluginOverviewSafe(page);
+  await page.reload();
+  await expectPluginOverviewSafe(page);
+  await testInfo.attach("plugin-overview", {
+    body: await page.screenshot(),
+    contentType: "image/png",
+  });
+});
+
+async function verifyPluginOverviewResponse(request: import("playwright/test").APIRequestContext) {
+  const response = await request.get("/plugins/security/overview");
+  expect(response.status()).toBe(200);
+  const html = await response.text();
+  expect(html).not.toContain("<script>globalThis.__overviewExecuted=1</script>");
+  expect(html).toContain("\\x3C/script>");
+}
+
+async function openUntrustedPlugin(page: Page) {
+  await page.goto("/plugins/security/overview");
+  await expect(page.getByRole("heading", { name: "Overview security", exact: true })).toBeVisible();
+}
+
+async function expectPluginOverviewSafe(page: Page) {
+  expect(
+    await page.evaluate(() => (globalThis as { __overviewExecuted?: number }).__overviewExecuted),
+  ).toBeUndefined();
+  // Security assertions inspect every emitted attribute, including inaccessible injected elements.
+  const violations = await page.locator(".docs-prose").evaluate((root) => {
+    const bad: string[] = [];
+    for (const element of root.querySelectorAll("*")) {
+      if (
+        ["SCRIPT", "IFRAME", "SVG", "FORM", "INPUT", "META", "BASE", "STYLE"].includes(
+          element.tagName,
+        )
+      )
+        bad.push(element.tagName);
+      for (const attr of element.attributes) {
+        if (/^on|^style$|^srcdoc$/i.test(attr.name)) bad.push(attr.name);
+        if (["href", "src"].includes(attr.name) && !attr.value.startsWith("https://"))
+          bad.push(attr.value);
+      }
+      if (
+        element.tagName === "A" &&
+        (element.getAttribute("rel") !== "noopener noreferrer nofollow" ||
+          element.getAttribute("target") !== "_blank")
+      )
+        bad.push("unsafe anchor");
+    }
+    return bad;
+  });
+  expect(violations).toEqual([]);
+  await expect(page.getByRole("link", { name: "Source", exact: true })).toHaveCount(0);
+  await expect(page.getByRole("img", { name: /screenshot/ })).toHaveCount(0);
+  await expect(page.getByRole("heading", { level: 1 })).toHaveText(securityPlugin.name);
+  await expect(
+    page.getByRole("link", { name: securityPlugin.author.name, exact: true }),
+  ).toHaveAttribute("href", "/plugins/security");
+  await expect(page.locator('meta[name="description"]')).toHaveAttribute(
+    "content",
+    securityPlugin.description,
+  );
+}
diff --git a/packages/website/e2e/registry-server.mjs b/packages/website/e2e/registry-server.mjs
index 211fee9f38..228f3dd859 100644
--- a/packages/website/e2e/registry-server.mjs
+++ b/packages/website/e2e/registry-server.mjs
@@ -1,6 +1,15 @@
 import { createServer } from "node:http";
 import registry from "./registry.fixture.json" with { type: "json" };
 
+import securityPlugin from "./overview.fixture.json" with { type: "json" };
+
+import overviewCorpus from "../../protocol/tests/fixtures/plugin-overview.json" with { type: "json" };
+securityPlugin.readme +=
+  "\n\n" +
+  overviewCorpus
+    .map(({ markdown }) => markdown + "\n\n```html\n" + markdown + "\n```")
+    .join("\n\n");
+
 // Serve the published registry contract so SSR and browser navigation use the same data.
 createServer((request, response) => {
   response.setHeader("Content-Type", "application/json");
@@ -8,7 +17,9 @@ createServer((request, response) => {
     response.end(JSON.stringify(registry));
     return;
   }
-  const plugin = registry.plugins.find((entry) => request.url === `/plugins/${entry.id}.json`);
+  const plugin = [securityPlugin, ...registry.plugins].find(
+    (entry) => request.url === `/plugins/${entry.id}.json`,
+  );
   response.statusCode = plugin ? 200 : 404;
   response.end(JSON.stringify(plugin ?? { error: "Plugin not found" }));
 }).listen(8188, "127.0.0.1");
diff --git a/packages/website/package.json b/packages/website/package.json
index 3176fd25d5..bf40c0e1a6 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -38,6 +38,7 @@
     "@types/react": "^19.1.6",
     "@types/react-dom": "^19.1.5",
     "@vitejs/plugin-react": "^4.5.1",
+    "parse5": "^7.3.0",
     "typescript": "^5.9.3",
     "vite": "^7.3.3",
     "vite-tsconfig-paths": "^5.1.4",
diff --git a/packages/website/src/plugins/overview.test.tsx b/packages/website/src/plugins/overview.test.tsx
new file mode 100644
index 0000000000..89cf15a947
--- /dev/null
+++ b/packages/website/src/plugins/overview.test.tsx
@@ -0,0 +1,138 @@
+import registry from "../../e2e/registry.fixture.json";
+import { PluginTile } from "./plugin-tile";
+import { PluginCard } from "./plugin-card";
+import type { Plugin } from "./registry";
+import React, { createElement } from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { parseFragment, type DefaultTreeAdapterMap } from "parse5";
+import { describe, expect, it } from "vitest";
+import corpus from "../../../protocol/tests/fixtures/plugin-overview.json";
+import { PluginOverview } from "./overview";
+
+type Element = DefaultTreeAdapterMap["element"];
+function elements(html: string): Element[] {
+  const result: Element[] = [];
+  function visit(node: DefaultTreeAdapterMap["node"]) {
+    if ("tagName" in node) result.push(node);
+    if ("childNodes" in node) node.childNodes.forEach(visit);
+  }
+  visit(parseFragment(html));
+  return result;
+}
+function render(markdown: string) {
+  return renderToStaticMarkup(<PluginOverview>{markdown}</PluginOverview>);
+}
+function attribute(element: Element, name: string) {
+  return element.attrs.find((attr) => attr.name === name)?.value;
+}
+const allowedTags = new Set([
+  "div",
+  "p",
+  "br",
+  "hr",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+  "blockquote",
+  "ul",
+  "ol",
+  "li",
+  "strong",
+  "em",
+  "del",
+  "pre",
+  "code",
+  "a",
+  "img",
+  "table",
+  "thead",
+  "tbody",
+  "tr",
+  "th",
+  "td",
+]);
+
+describe("plugin overview security corpus", () => {
+  it.each(corpus)("$name", ({ markdown, links, images }) => {
+    const nodes = elements(render(markdown));
+    expect(
+      nodes.filter((node) => !allowedTags.has(node.tagName)).map((node) => node.tagName),
+    ).toEqual([]);
+    expect(
+      nodes.flatMap((node) => node.attrs).filter((attr) => /^on|^style$|^srcdoc$/i.test(attr.name)),
+    ).toEqual([]);
+    const anchors = nodes.filter((node) => node.tagName === "a");
+    expect(anchors.map((node) => attribute(node, "href"))).toEqual(links);
+    for (const anchor of anchors) {
+      expect(attribute(anchor, "rel")).toBe("noopener noreferrer nofollow");
+      expect(attribute(anchor, "target")).toBe("_blank");
+    }
+    expect(
+      nodes.filter((node) => node.tagName === "img").map((node) => attribute(node, "src")),
+    ).toEqual(images);
+  });
+
+  it.each(corpus)("preserves $name inside code spans and fences", ({ markdown }) => {
+    for (const code of [
+      `\`${markdown.replaceAll("\n", " ")}\``,
+      `\`\`\`html\n${markdown}\n\`\`\``,
+    ]) {
+      const nodes = elements(render(code));
+      expect(
+        nodes.filter((node) => ["a", "img", "script", "iframe", "svg"].includes(node.tagName)),
+      ).toEqual([]);
+      const text = nodes
+        .filter((node) => node.tagName === "code")
+        .flatMap((node) => node.childNodes)
+        .map((child) => ("value" in child ? child.value : ""))
+        .join("");
+      expect(text.trim()).toBe(
+        code.startsWith("```html") ? markdown : markdown.replaceAll("\n", " "),
+      );
+    }
+  });
+
+  it("keeps long untrusted input inert", () => {
+    const nodes = elements(
+      render("a".repeat(100_000) + "\n\n" + "[click](javascript:alert(1)) ".repeat(1_000)),
+    );
+    expect(nodes.filter((node) => ["a", "img", "script"].includes(node.tagName))).toEqual([]);
+  });
+});
+
+describe("registry images", () => {
+  it.each([
+    "http://example.com/x",
+    "data:image/png;base64,AAAA",
+    "javascript:alert(1)",
+    "vbscript:msgbox(1)",
+    "./icon.png",
+    "//example.com/x",
+  ])("does not load %s in cards or icons", (url) => {
+    const plugin = { ...registry.plugins[0], icon: url, screenshots: [url] } as Plugin;
+    for (const component of [
+      createElement(PluginTile, { plugin, size: "sm" }),
+      createElement(PluginCard, { plugin }),
+    ]) {
+      expect(
+        elements(renderToStaticMarkup(component)).filter((node) => node.tagName === "img"),
+      ).toEqual([]);
+    }
+  });
+});
+
+it("uses the first HTTPS screenshot when an earlier screenshot is rejected", () => {
+  const source = "https://example.com/screenshot.png";
+  const plugin = {
+    ...registry.plugins[0],
+    icon: undefined,
+    screenshots: ["data:image/png;base64,AAAA", source],
+  } as Plugin;
+  const nodes = elements(renderToStaticMarkup(createElement(PluginCard, { plugin })));
+  expect(
+    nodes.filter((node) => node.tagName === "img").map((node) => attribute(node, "src")),
+  ).toEqual([source]);
+});
diff --git a/packages/website/src/plugins/overview.tsx b/packages/website/src/plugins/overview.tsx
new file mode 100644
index 0000000000..8fc680f9a9
--- /dev/null
+++ b/packages/website/src/plugins/overview.tsx
@@ -0,0 +1,56 @@
+import type { ReactNode } from "react";
+import ReactMarkdown, { type Components } from "react-markdown";
+import remarkGfm from "remark-gfm";
+import { pluginOverviewPolicy, pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
+
+/** A rejected destination leaves its label as text, without even an empty anchor. */
+export function PluginContentLink({
+  href,
+  children,
+  className,
+}: {
+  href?: string;
+  children: ReactNode;
+  className?: string;
+}) {
+  const destination = pluginOverviewUrl(href);
+  return destination ? (
+    <a href={destination} {...pluginOverviewPolicy.link} className={className}>
+      {children}
+    </a>
+  ) : (
+    children
+  );
+}
+
+const allowedElements = [...pluginOverviewPolicy.elements];
+const remarkPlugins = [remarkGfm];
+
+const components: Components = {
+  a: ({ href, children }) => <PluginContentLink href={href}>{children}</PluginContentLink>,
+  img: ({ src, alt }) => {
+    const source = pluginOverviewUrl(typeof src === "string" ? src : undefined);
+    return source ? <img src={source} alt={alt ?? ""} loading="lazy" /> : alt;
+  },
+  // GFM alignment otherwise becomes an inline style in react-markdown.
+  th: ({ children }) => <th>{children}</th>,
+  td: ({ children }) => <td>{children}</td>,
+};
+
+/** Untrusted overviews do not inherit documentation directives, anchors, or HTML highlighters. */
+export function PluginOverview({ children }: { children: string }) {
+  return (
+    <div className="docs-prose">
+      <ReactMarkdown
+        skipHtml={!pluginOverviewPolicy.rawHtml}
+        allowedElements={allowedElements}
+        unwrapDisallowed
+        remarkPlugins={remarkPlugins}
+        urlTransform={pluginOverviewUrl}
+        components={components}
+      >
+        {children}
+      </ReactMarkdown>
+    </div>
+  );
+}
diff --git a/packages/website/src/plugins/plugin-card.tsx b/packages/website/src/plugins/plugin-card.tsx
index 4df1d70d1d..429937ab87 100644
--- a/packages/website/src/plugins/plugin-card.tsx
+++ b/packages/website/src/plugins/plugin-card.tsx
@@ -1,3 +1,4 @@
+import { pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
 import { Download } from "lucide-react";
 import { pluginCardScreenshot } from "./thumbnails";
 import { pluginHref } from "./links";
@@ -7,9 +8,9 @@ import { formatInstalls, getCategory, type Plugin } from "./registry";
 export const PLUGIN_GRID_CLASS =
   "grid gap-x-4 gap-y-8 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4";
 
-/** First screenshot, or the plugin tile on a quiet backdrop when there is none. */
+/** First allowed screenshot, or the plugin tile on a quiet backdrop when there is none. */
 function PluginShot({ plugin }: { plugin: Plugin }) {
-  const url = plugin.screenshots[0];
+  const url = plugin.screenshots.find(pluginOverviewUrl);
   return (
     <div
       aria-hidden
diff --git a/packages/website/src/plugins/plugin-tile.tsx b/packages/website/src/plugins/plugin-tile.tsx
index 01234ac8b8..c0fc81d483 100644
--- a/packages/website/src/plugins/plugin-tile.tsx
+++ b/packages/website/src/plugins/plugin-tile.tsx
@@ -1,3 +1,4 @@
+import { pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
 import type { Plugin } from "./registry";
 
 const SIZE_CLASS = {
@@ -12,7 +13,7 @@ export function PluginTile({ plugin, size }: { plugin: Plugin; size: keyof typeo
       aria-hidden
       className={`flex flex-shrink-0 items-center justify-center border border-white/10 bg-white/[0.06] font-medium text-white/80 ${SIZE_CLASS[size]}`}
     >
-      {plugin.icon ? (
+      {pluginOverviewUrl(plugin.icon) ? (
         <img src={plugin.icon} alt="" className="h-full w-full rounded-[inherit] object-cover" />
       ) : (
         plugin.name.charAt(0).toUpperCase()
diff --git a/packages/website/src/routes/plugins/$owner.tsx b/packages/website/src/routes/plugins/$owner.tsx
index e4db39a205..0345fa1355 100644
--- a/packages/website/src/routes/plugins/$owner.tsx
+++ b/packages/website/src/routes/plugins/$owner.tsx
@@ -1,3 +1,4 @@
+import { PluginContentLink } from "~/plugins/overview";
 import { createFileRoute, notFound } from "@tanstack/react-router";
 import { ExternalLink } from "lucide-react";
 import { useMemo } from "react";
@@ -64,21 +65,16 @@ function AuthorPage() {
           </p>
           <div className="flex items-center gap-4 pt-1">
             {authorNpmUrl(author) && (
-              <a
-                href={authorNpmUrl(author)}
-                target="_blank"
-                rel="noopener noreferrer"
-                className={LINK_CLASS}
-              >
+              <PluginContentLink href={authorNpmUrl(author)} className={LINK_CLASS}>
                 npm
                 <ExternalLink className="h-3 w-3" />
-              </a>
+              </PluginContentLink>
             )}
             {github && (
-              <a href={github} target="_blank" rel="noopener noreferrer" className={LINK_CLASS}>
+              <PluginContentLink href={github} className={LINK_CLASS}>
                 GitHub
                 <ExternalLink className="h-3 w-3" />
-              </a>
+              </PluginContentLink>
             )}
           </div>
         </div>
diff --git a/packages/website/src/routes/plugins/$owner_.$slug.tsx b/packages/website/src/routes/plugins/$owner_.$slug.tsx
index b70a13d9da..42529775f8 100644
--- a/packages/website/src/routes/plugins/$owner_.$slug.tsx
+++ b/packages/website/src/routes/plugins/$owner_.$slug.tsx
@@ -1,7 +1,8 @@
 import { createFileRoute, notFound } from "@tanstack/react-router";
 import { ExternalLink } from "lucide-react";
 import { CodeBlock } from "~/components/code-block";
-import { DocsMarkdown } from "~/components/docs-markdown";
+import { PluginOverview, PluginContentLink } from "~/plugins/overview";
+import { pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
 import { SiteShell } from "~/components/site-shell";
 import { pageMeta } from "~/meta";
 import {
@@ -34,7 +35,7 @@ export const Route = createFileRoute("/plugins/$owner_/$slug")({
       loaderData?.plugin ? `${loaderData.plugin.name} – Paseo plugin` : "Plugin not found – Paseo",
       loaderData?.plugin?.description ?? "Plugin not found.",
       `/plugins/${params.owner}/${params.slug}`,
-      loaderData?.plugin.screenshots[0],
+      loaderData?.plugin.screenshots.find(pluginOverviewUrl),
     ),
   component: PluginPage,
   notFoundComponent: () => (
@@ -75,46 +76,43 @@ function PluginPage() {
           )}
           <span className="tabular-nums">{formatInstalls(installs)} installs</span>
           <span className="font-mono">{pluginVersion(plugin)}</span>
-          <a
-            href={plugin.repository.url}
-            target="_blank"
-            rel="noopener noreferrer"
-            className={META_LINK_CLASS}
-          >
+          <PluginContentLink href={plugin.repository.url} className={META_LINK_CLASS}>
             Source
             <ExternalLink className="h-3 w-3" />
-          </a>
+          </PluginContentLink>
           {npm && (
-            <a href={npm} target="_blank" rel="noopener noreferrer" className={META_LINK_CLASS}>
+            <PluginContentLink href={npm} className={META_LINK_CLASS}>
               npm
               <ExternalLink className="h-3 w-3" />
-            </a>
+            </PluginContentLink>
           )}
         </div>
 
         {plugin.screenshots.length > 0 && (
           <div className="-mx-6 mt-10 flex gap-3 overflow-x-auto px-6 md:mx-0 md:px-0">
-            {plugin.screenshots.map((url, index) => (
-              <a
-                key={url}
-                href={url}
-                target="_blank"
-                rel="noopener noreferrer"
-                className="aspect-video w-[85%] flex-shrink-0 overflow-hidden rounded-xl border border-white/10 bg-white/[0.03] sm:w-[60%] md:w-[calc(50%-0.375rem)]"
-              >
-                <img
-                  src={url}
-                  alt={`${plugin.name} screenshot ${index + 1}`}
-                  loading="lazy"
-                  className="h-full w-full object-cover object-top"
-                />
-              </a>
-            ))}
+            {plugin.screenshots.map((url, index) =>
+              pluginOverviewUrl(url) ? (
+                <PluginContentLink
+                  key={url}
+                  href={url}
+                  className="aspect-video w-[85%] flex-shrink-0 overflow-hidden rounded-xl border border-white/10 bg-white/[0.03] sm:w-[60%] md:w-[calc(50%-0.375rem)]"
+                >
+                  <img
+                    src={url}
+                    alt={`${plugin.name} screenshot ${index + 1}`}
+                    loading="lazy"
+                    className="h-full w-full object-cover object-top"
+                  />
+                </PluginContentLink>
+              ) : (
+                <p key={url}>{url}</p>
+              ),
+            )}
           </div>
         )}
 
         <div className="mt-10 border-t border-white/10 pt-10">
-          <DocsMarkdown>{readmeBody(plugin.readme)}</DocsMarkdown>
+          <PluginOverview>{readmeBody(plugin.readme)}</PluginOverview>
         </div>
       </div>
     </SiteShell>

From 13d21f60f1b7888a6105d8c20d044483e6475452 Mon Sep 17 00:00:00 2001
From: "paseo-ai[bot]" <266920839+paseo-ai[bot]@users.noreply.github.com>
Date: Tue, 6 Oct 2026 17:40:48 +0000
Subject: [PATCH 012/270] fix: update lockfile signatures and Nix hash [skip
 ci]

---
 nix/npm-deps.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/npm-deps.hash b/nix/npm-deps.hash
index d41138cbb1..32aedbf346 100644
--- a/nix/npm-deps.hash
+++ b/nix/npm-deps.hash
@@ -1 +1 @@
-sha256-mQOyGIvwVt45hldUnYuZTKJg4mLPm7d8jXXNlSQnExE=
+sha256-zL3+gbScK8eMkjQUtKDX4UJTXt4BMeqMSyeWB017MA4=

From 05637a7f052630a35f07e1264c95646d414ef33a Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:54:16 +0200
Subject: [PATCH 013/270] Show a Claude subagent's auto-mode report as markdown
 instead of a raw SubagentHandback card (#6248)

* Show a Claude subagent's handback report as its final message

Since Claude Code 2.1.271, a subagent in auto mode delivers its report
through a SubagentHandback tool call instead of its final text. Paseo
showed that call as a generic tool card with the report as escaped JSON.
Live sidechain frames and replayed history now map the call to the
subagent's final assistant message and hide its acknowledgement.

Closes #6241

* Keep a handback report's leading whitespace and hide its acknowledgement by call id

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../claude/agent.sub-agent-replay.test.ts     | 52 ++++++++++++++++
 .../agent.subagent-handback.real.e2e.test.ts  | 56 +++++++++++++++++
 .../server/agent/providers/claude/agent.ts    | 22 ++++++-
 .../claude/sidechain-tracker.test.ts          | 60 +++++++++++++++++++
 .../providers/claude/sidechain-tracker.ts     | 29 ++++++++-
 .../providers/claude/subagent-handback.ts     | 27 +++++++++
 6 files changed, 243 insertions(+), 3 deletions(-)
 create mode 100644 packages/server/src/server/agent/providers/claude/agent.subagent-handback.real.e2e.test.ts
 create mode 100644 packages/server/src/server/agent/providers/claude/subagent-handback.ts

diff --git a/packages/server/src/server/agent/providers/claude/agent.sub-agent-replay.test.ts b/packages/server/src/server/agent/providers/claude/agent.sub-agent-replay.test.ts
index 8701ab87ec..48ddab5973 100644
--- a/packages/server/src/server/agent/providers/claude/agent.sub-agent-replay.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.sub-agent-replay.test.ts
@@ -712,4 +712,56 @@ describe("ClaudeAgentSession persisted subagent replay", () => {
     expect(timeline.length).toBeGreaterThan(0);
     expect(timeline[0]).toMatchObject({ id: TOOL_USE_ID });
   });
+
+  test("replays a SubagentHandback report as the subagent's final message", async () => {
+    const handbackId = "toolu_handback";
+    const report = "## Verdict\n\n- **Coherent**";
+    writeSession({
+      parentLines: [taskToolUse(), taskToolResult()],
+      meta: JSON.stringify({ toolUseId: TOOL_USE_ID }),
+      sidechainLines: [
+        JSON.stringify({
+          type: "assistant",
+          isSidechain: true,
+          agentId: AGENT_ID,
+          message: {
+            role: "assistant",
+            content: [
+              {
+                type: "tool_use",
+                id: handbackId,
+                name: "SubagentHandback",
+                input: { message: report },
+              },
+            ],
+          },
+        }),
+        JSON.stringify({
+          type: "user",
+          isSidechain: true,
+          agentId: AGENT_ID,
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: handbackId,
+                content: [
+                  {
+                    type: "text",
+                    text: '{"success":true,"message":"Report delivered to your caller."}',
+                  },
+                ],
+              },
+            ],
+          },
+        }),
+      ],
+    });
+
+    const items = (await replayDescriptors()).flatMap((event) =>
+      event.event.type === "timeline" ? [event.event.item] : [],
+    );
+    expect(items).toEqual([{ type: "assistant_message", text: report }]);
+  });
 });
diff --git a/packages/server/src/server/agent/providers/claude/agent.subagent-handback.real.e2e.test.ts b/packages/server/src/server/agent/providers/claude/agent.subagent-handback.real.e2e.test.ts
new file mode 100644
index 0000000000..e5e8d117a4
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/agent.subagent-handback.real.e2e.test.ts
@@ -0,0 +1,56 @@
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import pino from "pino";
+import { expect, test } from "vitest";
+
+import type { AgentStreamEvent, AgentTimelineItem } from "../../agent-sdk-types.js";
+import { collectSessionTurnEvents } from "../test-utils/session-stream-adapter.js";
+import { ClaudeAgentClient } from "./agent.js";
+
+const ROOT_PROMPT = `Use Claude Code's native Agent tool exactly once, never Paseo tools, with this complete task:
+
+Do not use any tools. Reply with exactly this markdown report and nothing else:
+## HANDBACK_HEADING
+- **HANDBACK_BOLD** item
+
+Then reply exactly ROOT_DONE.`;
+
+function subagentItems(events: AgentStreamEvent[]): AgentTimelineItem[] {
+  return events.flatMap((event) =>
+    event.type === "provider_subagent" && event.event.type === "timeline" ? [event.event.item] : [],
+  );
+}
+
+function expectHandbackAsReport(items: AgentTimelineItem[]): void {
+  expect(items.filter((item) => item.type === "tool_call")).toEqual([]);
+  expect(
+    items.flatMap((item) => (item.type === "assistant_message" ? [item.text] : [])).join(""),
+  ).toContain("## HANDBACK_HEADING\n- **HANDBACK_BOLD** item");
+}
+
+test("an auto-mode Claude subagent's handback report shows as its final message", async () => {
+  const cwd = mkdtempSync(path.join(tmpdir(), "paseo-claude-subagent-handback-"));
+  const client = new ClaudeAgentClient({ logger: pino({ level: "warn" }) });
+  const session = await client.createSession({ provider: "claude", cwd, modeId: "auto" });
+  try {
+    const events = await collectSessionTurnEvents(session, ROOT_PROMPT);
+    expectHandbackAsReport(subagentItems(events));
+
+    const persistence = session.describePersistence();
+    expect(persistence).not.toBeNull();
+    await session.close();
+    const restored = await client.resumeSession(persistence!, { cwd });
+    try {
+      const replayed: AgentStreamEvent[] = [];
+      for await (const event of restored.streamHistory()) replayed.push(event);
+      expectHandbackAsReport(subagentItems(replayed));
+    } finally {
+      await restored.close();
+    }
+  } finally {
+    await session.close();
+    rmSync(cwd, { recursive: true, force: true });
+  }
+}, 240_000);
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index aa60e40462..f9f79862ad 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -44,6 +44,7 @@ import {
 } from "./model-manifest.js";
 import { parsePartialJsonObject } from "./partial-json.js";
 import { ClaudeSidechainTracker } from "./sidechain-tracker.js";
+import { readClaudeSubagentHandback } from "./subagent-handback.js";
 import { ClaudeTaskState } from "./task-state.js";
 import {
   ClaudeTaskProtocolSource,
@@ -2084,6 +2085,7 @@ class ClaudeAgentSession implements AgentSession {
   private toolUseCache = new Map<string, ToolUseCacheEntry>();
   private toolUseIndexToId = new Map<number, string>();
   private toolUseInputBuffers = new Map<string, string>();
+  private subagentHandbackIds = new Set<string>();
   private pendingPermissions = new Map<string, PendingPermission>();
   private activeForegroundTurnId: string | null = null;
   private autonomousTurn: AutonomousTurnState | null = null;
@@ -5184,7 +5186,7 @@ class ClaudeAgentSession implements AgentSession {
     // User SDK entries can arrive as multiple text blocks, but Paseo treats them as one message.
     const userTextParts: string[] = [];
     for (const block of content) {
-      if (!isClaudeContentChunk(block)) {
+      if (!isClaudeContentChunk(block) || this.mapSubagentHandbackBlock(block, items)) {
         continue;
       }
       this.mapBlockToTimeline(block, {
@@ -5272,6 +5274,24 @@ class ClaudeAgentSession implements AgentSession {
     }
   }
 
+  // A subagent's handback call is its final message, and the call's result is only an
+  // acknowledgement, so neither becomes a tool call.
+  private mapSubagentHandbackBlock(block: ClaudeContentChunk, items: AgentTimelineItem[]): boolean {
+    if (typeof block.tool_use_id === "string" && this.subagentHandbackIds.has(block.tool_use_id)) {
+      this.subagentHandbackIds.delete(block.tool_use_id);
+      return true;
+    }
+    const handback = readClaudeSubagentHandback(block);
+    if (!handback) {
+      return false;
+    }
+    this.subagentHandbackIds.add(handback.callId);
+    if (handback.report) {
+      items.push({ type: "assistant_message", text: handback.report });
+    }
+    return true;
+  }
+
   private handleToolUseStart(block: ClaudeContentChunk, items: AgentTimelineItem[]): void {
     const entry = this.upsertToolUseEntry(block);
     if (!entry) {
diff --git a/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts b/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts
index 615ca81f3a..f762557879 100644
--- a/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts
+++ b/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts
@@ -35,4 +35,64 @@ describe("ClaudeSidechainTracker", () => {
       },
     });
   });
+
+  it("shows a SubagentHandback report as the subagent's final message", () => {
+    const tracker = new ClaudeSidechainTracker({ getToolInput: () => null });
+    const report = "    indented code\n\n## Verdict\n\n- **Coherent**";
+    const frames = [
+      {
+        type: "stream_event",
+        parent_tool_use_id: "task-1",
+        event: {
+          type: "content_block_start",
+          index: 0,
+          content_block: {
+            type: "tool_use",
+            id: "handback-1",
+            name: "SubagentHandback",
+            input: {},
+          },
+        },
+      },
+      {
+        type: "assistant",
+        parent_tool_use_id: "task-1",
+        message: {
+          id: "msg-1",
+          content: [
+            {
+              type: "tool_use",
+              id: "handback-1",
+              name: "SubagentHandback",
+              input: { message: report },
+            },
+          ],
+        },
+      },
+      {
+        type: "user",
+        parent_tool_use_id: "task-1",
+        message: {
+          content: [
+            {
+              type: "tool_result",
+              tool_use_id: "handback-1",
+              tool_name: "SubagentHandback",
+              content: [{ type: "text", text: '{"success":true}' }],
+            },
+          ],
+        },
+      },
+    ];
+
+    const childItems = frames
+      .flatMap((frame) => tracker.handleMessage(frame as unknown as SDKMessage, "task-1"))
+      .flatMap((event) =>
+        event.type === "provider_subagent" && event.event.type === "timeline"
+          ? [event.event.item]
+          : [],
+      );
+
+    expect(childItems).toEqual([{ type: "assistant_message", text: report, messageId: "msg-1" }]);
+  });
 });
diff --git a/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts b/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
index 6973d1db5d..195e21f857 100644
--- a/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
+++ b/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
@@ -6,6 +6,10 @@ import {
   mapClaudeRunningToolCall,
 } from "./tool-call-mapper.js";
 import { buildToolCallDisplayModel } from "@getpaseo/protocol/tool-call-display";
+import {
+  isClaudeSubagentHandbackToolName,
+  readClaudeSubagentHandback,
+} from "./subagent-handback.js";
 
 import type { AgentMetadata, AgentStreamEvent, AgentTimelineItem } from "../../agent-sdk-types.js";
 
@@ -91,7 +95,7 @@ export class ClaudeSidechainTracker {
     const contextUpdated = this.updateSubAgentContextFromTaskInput(state, parentToolUseId);
     const actionCandidates = this.extractSubAgentActionCandidates(message);
     const childTimelineItems = [
-      ...this.extractSubAgentTimelineItems(message),
+      ...this.extractSubAgentTimelineItems(message, state),
       ...this.extractSubAgentToolResults(message, state),
     ];
     let actionUpdated = false;
@@ -233,7 +237,10 @@ export class ClaudeSidechainTracker {
     this.activeSidechains.clear();
   }
 
-  private extractSubAgentTimelineItems(message: SDKMessage): AgentTimelineItem[] {
+  private extractSubAgentTimelineItems(
+    message: SDKMessage,
+    state: SubAgentActivityState,
+  ): AgentTimelineItem[] {
     if (message.type !== "assistant" || !Array.isArray(message.message?.content)) {
       return [];
     }
@@ -253,6 +260,18 @@ export class ClaudeSidechainTracker {
       } else if (block.type === "thinking") {
         const text = readTrimmedString(block.thinking);
         if (text) items.push({ type: "reasoning", text });
+      } else {
+        const handback = readClaudeSubagentHandback(block);
+        if (!handback) continue;
+        // The handback's result is only an acknowledgement, never a tool card.
+        state.completedActionKeys.add(handback.callId);
+        if (handback.report) {
+          items.push({
+            type: "assistant_message",
+            text: handback.report,
+            ...(messageId ? { messageId } : {}),
+          });
+        }
       }
     }
     return items;
@@ -391,6 +410,12 @@ export class ClaudeSidechainTracker {
   }
 
   private extractSubAgentActionCandidates(message: SDKMessage): SubAgentActionCandidate[] {
+    return this.extractToolActionCandidates(message).filter(
+      (action) => !isClaudeSubagentHandbackToolName(action.toolName),
+    );
+  }
+
+  private extractToolActionCandidates(message: SDKMessage): SubAgentActionCandidate[] {
     if (message.type === "assistant") {
       return this.extractAssistantMessageActions(message);
     }
diff --git a/packages/server/src/server/agent/providers/claude/subagent-handback.ts b/packages/server/src/server/agent/providers/claude/subagent-handback.ts
new file mode 100644
index 0000000000..2a8613ed31
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/subagent-handback.ts
@@ -0,0 +1,27 @@
+/**
+ * Since Claude Code 2.1.271, a subagent in auto mode delivers its report to its caller through a
+ * `SubagentHandback` tool call instead of its final text. The report is the subagent's final
+ * message, so Paseo shows it as one and hides the call and its acknowledgement.
+ */
+const SUBAGENT_HANDBACK_TOOL_NAME = "SubagentHandback";
+
+export interface ClaudeSubagentHandback {
+  callId: string;
+  /** Null while the call is still streaming its input. */
+  report: string | null;
+}
+
+export function isClaudeSubagentHandbackToolName(name: unknown): boolean {
+  return name === SUBAGENT_HANDBACK_TOOL_NAME;
+}
+
+export function readClaudeSubagentHandback(block: {
+  type: string;
+  [key: string]: unknown;
+}): ClaudeSubagentHandback | null {
+  if (block.type !== "tool_use" || !isClaudeSubagentHandbackToolName(block.name)) return null;
+  if (typeof block.id !== "string" || block.id.length === 0) return null;
+  const input = block.input as { message?: unknown } | null | undefined;
+  const report = typeof input?.message === "string" ? input.message : "";
+  return { callId: block.id, report: report.trim().length > 0 ? report : null };
+}

From 3c478e59673e77a4d82ca18dfa3ea6e03119a83e Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 20:53:34 +0100
Subject: [PATCH 014/270] website: plugins page spacing, featured section,
 media with video, and viewer (#6254)

* website: match left and right edge padding on ranked plugin rows

The rank sat right-aligned in a fixed 16px column and the row had 8px of
padding, so a single digit started ~15.6px from the row edge while the
install count ended 8px from it. The rank now sits at the row's padding,
which is 16px on both sides, and the list's negative margin matches so
the rank still lines up with the section heading. Tabular figures keep
the tile column aligned without the fixed width.

* website: give plugins section headings room above their content

Section headings sat 16px above their cards while sections sat 56px
apart, so a heading read as closer to the section above it. A shared
PluginSection now owns the header-to-content gap (32px), used by the
index sections and by the browse results under the sort tabs.

* website: center the Build your own plugin card

The heading, description, and buttons were left-aligned in a full-width
card, leaving most of it empty. Center them and keep the description at
its readable measure.

* website: order What's new by first-listing date

newestFirst and addedAgo read submittedAt. The registry publishes the
first-listing date as publishedAt, so What's new now sorts and dates by
it. The fixture's publishedAt values become first-listing dates.

* website: plugin media with video tiles and a click-to-view viewer

The registry's published screenshots field becomes media and may hold
mp4 and webm videos. Cards and link previews use the first image, the
thumbnail route serves only image entries, and the detail gallery shows
videos as tiles alongside images. Any tile opens one viewer. An image
fits the viewport but never exceeds its natural size. A video plays with
controls and scales to the largest size that fits, small sources included.

The daemon resolver now validates only the ID and artifact it installs.

* server: drop the unreleased pluginRegistryEnabled config key

The key only existed in unreleased betas and nothing reads it. The
config schema is strict, so a config that still sets it now fails
validation and names the key.

* website: Featured section on the plugins index

The registry index gains a required featured list of plugin IDs. The
index shows those plugins above What's new, in the registry's order,
skipping IDs that are not listed, and hides the section when none are.
The index sections now share one container for their spacing.
---
 packages/protocol/src/plugin-registry.test.ts |  18 ++
 packages/protocol/src/plugin-registry.ts      |  12 +-
 packages/server/src/server/config.test.ts     |  11 +-
 .../server/src/server/persisted-config.ts     |   2 -
 .../src/server/plugins/index.posix.test.ts    |   2 +-
 .../plugins/managed-source.posix.test.ts      |  14 +-
 .../server/plugins/managed-source/registry.ts |  12 +-
 packages/website/e2e/overview.fixture.json    |   2 +-
 packages/website/e2e/plugins.spec.ts          |  98 ++++++++++-
 packages/website/e2e/registry.fixture.json    |  81 +++++----
 packages/website/src/plugins/browse-page.tsx  |  67 ++++----
 .../website/src/plugins/contribute-links.tsx  |   6 +-
 packages/website/src/plugins/loader.ts        |   9 +-
 .../website/src/plugins/media-gallery.tsx     | 158 ++++++++++++++++++
 .../website/src/plugins/overview.test.tsx     |   4 +-
 packages/website/src/plugins/plugin-card.tsx  |  13 +-
 packages/website/src/plugins/registry.test.ts |  48 +++++-
 packages/website/src/plugins/registry.ts      |  20 ++-
 packages/website/src/plugins/section.tsx      |  35 ++++
 .../website/src/plugins/thumbnails.test.ts    |  29 +++-
 packages/website/src/plugins/thumbnails.ts    |   5 +-
 .../src/routes/plugins/$owner_.$slug.tsx      |  28 +---
 packages/website/src/routes/plugins/index.tsx | 158 ++++++++++--------
 23 files changed, 610 insertions(+), 222 deletions(-)
 create mode 100644 packages/protocol/src/plugin-registry.test.ts
 create mode 100644 packages/website/src/plugins/media-gallery.tsx
 create mode 100644 packages/website/src/plugins/section.tsx

diff --git a/packages/protocol/src/plugin-registry.test.ts b/packages/protocol/src/plugin-registry.test.ts
new file mode 100644
index 0000000000..5692c4c56e
--- /dev/null
+++ b/packages/protocol/src/plugin-registry.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from "vitest";
+import { pluginMediaKind } from "./plugin-registry.js";
+
+describe("plugin media kind", () => {
+  it.each([
+    ["https://cdn.example.com/a/preview.png", "image"],
+    ["https://cdn.example.com/a/preview.JPG", "image"],
+    ["https://cdn.example.com/a/preview.jpeg", "image"],
+    ["https://cdn.example.com/a/preview.webp", "image"],
+    ["https://cdn.example.com/a/preview.gif", "image"],
+    ["https://cdn.example.com/a/demo.mp4", "video"],
+    ["https://cdn.example.com/a/demo.WebM", "video"],
+    ["https://cdn.example.com/a/demo.mp4?raw=true#t=2", "video"],
+    ["https://cdn.example.com/mp4/preview.png?format=mp4", "image"],
+  ] as const)("reads %s as %s from its path extension", (url, kind) => {
+    expect(pluginMediaKind(url)).toBe(kind);
+  });
+});
diff --git a/packages/protocol/src/plugin-registry.ts b/packages/protocol/src/plugin-registry.ts
index 36c5354c88..90854962ba 100644
--- a/packages/protocol/src/plugin-registry.ts
+++ b/packages/protocol/src/plugin-registry.ts
@@ -39,13 +39,21 @@ export const PublishedPluginSchema = z.object({
   repository: z.object({ url: z.string().url(), commit: z.string().optional() }),
   artifact: PluginRegistryArtifactSchema,
   icon: z.string().url().optional(),
-  screenshots: z.array(z.string().url()),
+  /** Images and videos in display order; see `pluginMediaKind`. */
+  media: z.array(z.string().url()),
   submittedAt: z.string(),
   reviewedAt: z.string(),
   updatedAt: z.string(),
   publishedAt: z.string(),
   installs: z.number().int().nonnegative().optional(),
 });
+const VIDEO_EXTENSIONS = new Set(["mp4", "webm"]);
+
+/** Whether a registry media entry is a video or an image, from its path extension. */
+export function pluginMediaKind(url: string): "image" | "video" {
+  const extension = new URL(url).pathname.split(".").pop()?.toLowerCase() ?? "";
+  return VIDEO_EXTENSIONS.has(extension) ? "video" : "image";
+}
 export const PublishedPluginDetailSchema = PublishedPluginSchema.extend({ readme: z.string() });
 export const PluginRegistryIndexSchema = z.object({
   schemaVersion: z.literal(1),
@@ -54,6 +62,8 @@ export const PluginRegistryIndexSchema = z.object({
     z.object({ slug: z.string(), label: z.string(), description: z.string().optional() }),
   ),
   plugins: z.array(PublishedPluginSchema),
+  /** Plugin IDs the maintainer features, in display order. An ID may name a plugin that is not listed. */
+  featured: z.array(z.string()),
   generatedAt: z.string(),
 });
 export type PluginRegistryIdentity = z.infer<typeof PluginRegistryIdentitySchema>;
diff --git a/packages/server/src/server/config.test.ts b/packages/server/src/server/config.test.ts
index fa49722304..a71b5621e8 100644
--- a/packages/server/src/server/config.test.ts
+++ b/packages/server/src/server/config.test.ts
@@ -205,19 +205,12 @@ test("loads private plugin registry settings through the configuration boundary"
   const home = await mkdtemp(path.join(os.tmpdir(), "paseo-registry-config-"));
   try {
     const pluginRegistries = { "plugins.example.test": { authorization: "Bearer fixture" } };
-    await writeFile(
-      path.join(home, "config.json"),
-      JSON.stringify({ pluginRegistries, pluginRegistryEnabled: false }),
-    );
+    await writeFile(path.join(home, "config.json"), JSON.stringify({ pluginRegistries }));
     const config = loadConfig(home, {
-      env: {
-        PASEO_PLUGIN_REGISTRY: "https://plugins.example.test/internal",
-        PASEO_PLUGIN_REGISTRY_ENABLED: "false",
-      },
+      env: { PASEO_PLUGIN_REGISTRY: "https://plugins.example.test/internal" },
     });
     expect(config.pluginRegistryUrl).toBe("https://plugins.example.test/internal");
     expect(config.pluginRegistries).toEqual(pluginRegistries);
-    expect(config).not.toHaveProperty("pluginRegistryEnabled");
   } finally {
     await rm(home, { recursive: true, force: true });
   }
diff --git a/packages/server/src/server/persisted-config.ts b/packages/server/src/server/persisted-config.ts
index 24ded0dec2..79e3d97218 100644
--- a/packages/server/src/server/persisted-config.ts
+++ b/packages/server/src/server/persisted-config.ts
@@ -308,8 +308,6 @@ export const PersistedConfigSchema = z
 
     providers: ProvidersSchema.optional(),
     pluginRegistries: PluginRegistriesSchema.optional(),
-    // COMPAT(plugin-registry-gate): added in v0.11.0; accept the ignored startup key until 2027-04-06.
-    pluginRegistryEnabled: z.boolean().optional(),
     pluginsEnabled: z.boolean().optional(),
     plugins: z.record(PluginIdSchema, PluginSourceSchema).optional(),
     worktrees: WorktreesConfigSchema.optional(),
diff --git a/packages/server/src/server/plugins/index.posix.test.ts b/packages/server/src/server/plugins/index.posix.test.ts
index 464ad446f0..f9592597f1 100644
--- a/packages/server/src/server/plugins/index.posix.test.ts
+++ b/packages/server/src/server/plugins/index.posix.test.ts
@@ -494,7 +494,7 @@ describe("PluginService", () => {
             commit: stdout.trim(),
             pluginPath: ".",
           },
-          screenshots: [],
+          media: [],
           submittedAt: "2026-10-03",
           reviewedAt: "2026-10-03",
           updatedAt: "2026-10-03",
diff --git a/packages/server/src/server/plugins/managed-source.posix.test.ts b/packages/server/src/server/plugins/managed-source.posix.test.ts
index ab9d6c50fb..466780b79a 100644
--- a/packages/server/src/server/plugins/managed-source.posix.test.ts
+++ b/packages/server/src/server/plugins/managed-source.posix.test.ts
@@ -433,7 +433,7 @@ describe("registry plugin sources", () => {
             commit,
             pluginPath: "packages/example",
           },
-          screenshots: [],
+          media: [],
           submittedAt: "2026-10-03",
           reviewedAt: "2026-10-03",
           updatedAt: "2026-10-03",
@@ -516,20 +516,10 @@ it("installs and updates only the npm artifacts pinned by the plugin registry",
   const server = createServer((request, response) => {
     intents.push(request.headers["x-paseo-install"]);
     response.end(
+      // Install reads only the ID and artifact, so the document omits the directory's display fields.
       JSON.stringify({
         id: "acme/example",
-        name: "Example",
-        description: "Test",
-        categories: [],
-        author: { github: "acme" },
-        repository: { url: "https://github.com/acme/example" },
         artifact: { kind: "npm", package: "paseo-fixture-plugin", ...pin },
-        screenshots: [],
-        submittedAt: "2026-10-03",
-        reviewedAt: "2026-10-03",
-        updatedAt: "2026-10-03",
-        publishedAt: "2026-10-03",
-        readme: "# Example",
       }),
     );
   });
diff --git a/packages/server/src/server/plugins/managed-source/registry.ts b/packages/server/src/server/plugins/managed-source/registry.ts
index b57aac6c0c..009cac5a68 100644
--- a/packages/server/src/server/plugins/managed-source/registry.ts
+++ b/packages/server/src/server/plugins/managed-source/registry.ts
@@ -1,9 +1,17 @@
 import {
-  PublishedPluginDetailSchema,
+  PluginRegistryArtifactSchema,
+  PluginRegistryIdSchema,
   type PluginRegistries,
   type PluginRegistryIdentity,
 } from "@getpaseo/protocol/plugin-registry";
 import type { PluginUpdateTarget } from "@getpaseo/protocol/messages";
+import { z } from "zod";
+
+// Install reads only these fields; the rest of a published plugin is the directory's display data.
+const RegistryInstallDocumentSchema = z.object({
+  id: PluginRegistryIdSchema,
+  artifact: PluginRegistryArtifactSchema,
+});
 
 export interface RegistryOptions {
   defaultUrl?: string;
@@ -49,7 +57,7 @@ export async function resolveRegistryPlugin(
   }
   if (!response.ok)
     throw new Error(`Registry ${base.host} returned ${response.status} for ${identity.id}`);
-  const plugin = PublishedPluginDetailSchema.parse(await response.json());
+  const plugin = RegistryInstallDocumentSchema.parse(await response.json());
   if (plugin.id !== identity.id) throw new Error("Registry returned a different plugin ID");
   const artifact = plugin.artifact;
   const target: PluginUpdateTarget =
diff --git a/packages/website/e2e/overview.fixture.json b/packages/website/e2e/overview.fixture.json
index 2d23fd0343..2553fe83c6 100644
--- a/packages/website/e2e/overview.fixture.json
+++ b/packages/website/e2e/overview.fixture.json
@@ -18,7 +18,7 @@
     "github": "security",
     "name": "</script><script>globalThis.__overviewExecuted=1</script><img src=x onerror=\"globalThis.__overviewExecuted=1\">"
   },
-  "screenshots": [
+  "media": [
     "data:image/svg+xml,<svg onload=\"globalThis.__overviewExecuted=1\"/>",
     "http://example.com/image.png"
   ],
diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 246e383b57..3398a7e7d6 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -312,7 +312,7 @@ test.describe("registry fixture layout", () => {
     page,
   }) => {
     const plugin = registry.plugins.find((entry) => entry.id === "alhassanaraouf/base2tone")!;
-    const source = plugin.screenshots[0];
+    const source = plugin.media[0];
     await openPlugins(page);
     await expectThumbnailCard(
       page.getByRole("region", { name: "What’s new" }).getByRole("link", { name: /Base2Tone/ }),
@@ -328,6 +328,85 @@ test.describe("registry fixture layout", () => {
     ).toHaveAttribute("src", source);
   });
 
+  test("shows images and videos as gallery tiles in registry order and opens each in the viewer", async ({
+    page,
+  }) => {
+    const plugin = registry.plugins.find((entry) => entry.id === "omercnet/dracula")!;
+    const [firstImage, video] = plugin.media;
+    await page.goto(`/plugins/${plugin.id}`);
+    const tiles = page.getByRole("link", { name: /^Dracula (screenshot|video) \d$/ });
+    await expect(tiles).toHaveCount(3);
+    const layout = await tiles.evaluateAll(galleryTiles);
+    expect(layout.map((tile) => tile.href)).toEqual(plugin.media);
+    expect(new Set(layout.map((tile) => tile.size)).size).toBe(1);
+    const preview = tiles.nth(1).locator("video");
+    await expect(preview).toHaveAttribute("preload", "metadata");
+    await expect(preview).not.toHaveAttribute("controls");
+    await expect(preview).not.toHaveAttribute("autoplay");
+    expect(await preview.evaluate((element: HTMLVideoElement) => element.muted)).toBe(true);
+
+    const viewer = page.getByRole("dialog");
+    await tiles.nth(1).click();
+    const playing = viewer.getByLabel("Dracula video 2");
+    await expect(playing).toHaveAttribute("src", video);
+    await expect(playing).toHaveAttribute("controls", "");
+    await expect.poll(() => playing.evaluate(isPaused)).toBe(false);
+    // The fixture video is 320x240, so it has to scale up to fill the viewer.
+    await expect.poll(() => playing.evaluate(viewerFill)).toBeCloseTo(1, 2);
+    await page.keyboard.press("Escape");
+    await expect(viewer).toBeHidden();
+    await expect(page.locator("dialog video")).toHaveCount(0);
+
+    await tiles.first().click();
+    await expect(viewer.getByRole("img", { name: "Dracula screenshot 1" })).toHaveAttribute(
+      "src",
+      firstImage,
+    );
+    await viewer.getByRole("button", { name: "Close" }).click();
+    await expect(viewer).toBeHidden();
+    expect(page.context().pages()).toHaveLength(1);
+
+    const newTab = page.context().waitForEvent("page");
+    await tiles.first().click({ modifiers: ["ControlOrMeta"] });
+    await expect(await newTab).toHaveURL(firstImage);
+    await expect(viewer).toBeHidden();
+  });
+
+  test("keeps a video that fails to load visible in the viewer", async ({ page }) => {
+    const plugin = registry.plugins.find((entry) => entry.id === "gpambrozio/launchd-jobs")!;
+    await page.route(plugin.media[0], (route) => route.abort());
+    await page.goto(`/plugins/${plugin.id}`);
+    await page.getByRole("link", { name: "launchd Jobs video 1" }).click();
+    const video = page.getByRole("dialog").getByLabel("launchd Jobs video 1");
+    await expect(video).toBeVisible();
+    await expect(video).toHaveCSS("opacity", "1");
+  });
+
+  test("shows the plugin tile on cards when its media has no image", async ({ page }) => {
+    await page.goto("/plugins/all");
+    const card = page.getByRole("main").getByRole("link", { name: /launchd Jobs/ });
+    await expect(card.locator("img, video")).toHaveCount(0);
+    await card.click();
+    await expect(
+      page.getByRole("link", { name: "launchd Jobs video 1" }).locator("video"),
+    ).toHaveAttribute(
+      "src",
+      registry.plugins.find((entry) => entry.id === "gpambrozio/launchd-jobs")!.media[0],
+    );
+  });
+
+  test("features listed plugins above What's new in the registry's order", async ({ page }) => {
+    await openPlugins(page);
+    await expect(page.getByRole("heading", { level: 2 }).first()).toHaveText("Featured");
+    const featured = page.getByRole("region", { name: "Featured" });
+    await expect(featured).toContainText("Hand-picked by the maintainer.");
+    await expect(featured.getByRole("link", { name: /Added/ })).toHaveText([
+      /Dracula/,
+      /Herald/,
+      /launchd Jobs/,
+    ]);
+  });
+
   test("lists the nine categories in order with counts, and the newest plugins first", async ({
     page,
   }) => {
@@ -343,6 +422,23 @@ test.describe("registry fixture layout", () => {
   });
 });
 
+function galleryTiles(links: Element[]) {
+  return links.map((link) => ({
+    href: link.getAttribute("href"),
+    size: `${link.clientWidth}x${link.clientHeight}`,
+  }));
+}
+
+/** The share of the viewer's room the media fills along its limiting axis; 1 fills it. */
+function viewerFill(media: HTMLElement) {
+  const box = media.getBoundingClientRect();
+  return Math.max(box.width / (window.innerWidth * 0.9), box.height / (window.innerHeight * 0.85));
+}
+
+function isPaused(video: HTMLVideoElement) {
+  return video.paused;
+}
+
 async function expectThumbnailCard(card: Locator, source: string, id: string) {
   // Card screenshots are decorative and hidden from the accessibility tree.
   const image = card.locator("img").first();
diff --git a/packages/website/e2e/registry.fixture.json b/packages/website/e2e/registry.fixture.json
index 6b75599d3d..2f6560780c 100644
--- a/packages/website/e2e/registry.fixture.json
+++ b/packages/website/e2e/registry.fixture.json
@@ -5,6 +5,12 @@
     "url": "https://plugins.paseo.sh"
   },
   "generatedAt": "2026-10-04T15:55:47.882Z",
+  "featured": [
+    "omercnet/dracula",
+    "gpambrozio/herald",
+    "acme/not-published",
+    "gpambrozio/launchd-jobs"
+  ],
   "categories": [
     {
       "slug": "daemon-management",
@@ -74,12 +80,12 @@
         "name": "alhassanaraouf",
         "github": "alhassanaraouf"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/alhassanaraouf/paseo-themes/main/packages/paseo-base2tone-theme/preview.png"
       ],
       "submittedAt": "2026-09-24T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-09-24T17:12:05.467Z",
+      "publishedAt": "2026-09-24T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Base2Tone\n\n## Behavior\n\nBase2Tone theme for Paseo, ported from the Obsidian theme deathau/Base2Tone-For-Obsidian.md."
@@ -106,13 +112,13 @@
         "name": "Tom Lundy",
         "github": "dorasto"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/dorasto/sayr/main/packages/paseo-plugin/assets/sayr-plguin-1.png",
         "https://raw.githubusercontent.com/dorasto/sayr/main/packages/paseo-plugin/assets/paseo-plugin-2.png"
       ],
       "submittedAt": "2026-09-22T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-09-22T10:39:28.935Z",
+      "publishedAt": "2026-09-22T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Sayr\n\n## Behavior\n\nA paseo plugin for viewing and managing your Sayr tasks"
@@ -139,13 +145,13 @@
         "name": "gpambrozio",
         "github": "gpambrozio"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/github-board/docs/screenshot.png",
         "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/github-board/docs/detail-panel.png"
       ],
       "submittedAt": "2026-09-19T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-10-01T17:46:20.500Z",
+      "publishedAt": "2026-09-19T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# GitHub Board\n\n## Behavior\n\nPaseo plugin: a GitHub sidebar board of your issues, draft and open pull requests, and discussions"
@@ -172,13 +178,13 @@
         "name": "gpambrozio",
         "github": "gpambrozio"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/herald/docs/panel.png",
         "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/herald/docs/timeline-card.png"
       ],
       "submittedAt": "2026-09-19T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-09-27T19:03:31.943Z",
+      "publishedAt": "2026-09-19T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Herald\n\n## Behavior\n\nPaseo plugin: speaks one sentence when an agent needs you, and lists everything waiting in a sidebar panel"
@@ -205,12 +211,12 @@
         "name": "gpambrozio",
         "github": "gpambrozio"
       },
-      "screenshots": [
-        "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/launchd-jobs/docs/screenshot.png"
+      "media": [
+        "https://raw.githubusercontent.com/web-platform-tests/wpt/master/media/movie_5.mp4"
       ],
       "submittedAt": "2026-09-19T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-09-22T17:56:41.061Z",
+      "publishedAt": "2026-09-19T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# launchd Jobs\n\n## Behavior\n\nPaseo plugin: schedule shell commands on your Mac through launchd, from a sidebar panel"
@@ -237,12 +243,12 @@
         "name": "gpambrozio",
         "github": "gpambrozio"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/model-pricing/docs/screenshot.png"
       ],
       "submittedAt": "2026-09-19T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-09-22T18:03:14.979Z",
+      "publishedAt": "2026-09-19T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Model Pricing\n\n## Behavior\n\nPaseo plugin: a sidebar table of what every model costs, across Anthropic, OpenAI, Fireworks AI, Ollama Cloud and OpenRouter"
@@ -269,10 +275,10 @@
         "name": "gpambrozio",
         "github": "gpambrozio"
       },
-      "screenshots": [],
+      "media": [],
       "submittedAt": "2026-09-19T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-10-01T22:25:58.192Z",
+      "publishedAt": "2026-09-19T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Skills\n\n## Behavior\n\nPaseo plugin: lists the skills an agent can use, shows where each comes from, renders its SKILL.md, and invokes it"
@@ -298,13 +304,13 @@
         "name": "hungcuong9125",
         "github": "hungcuong9125"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/hungcuong9125/paseo-prompt-kit/main/docs/images/settings-provider-cli.png",
         "https://raw.githubusercontent.com/hungcuong9125/paseo-prompt-kit/main/docs/images/settings-direct-api.png"
       ],
       "submittedAt": "2026-09-22T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-09-30T02:57:56.473Z",
+      "publishedAt": "2026-09-22T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# PromptKit\n\n## Behavior\n\nPromptKit - rewrite and transform prompts directly from the Paseo composer."
@@ -331,13 +337,13 @@
         "name": "Omer Cohen",
         "github": "omercnet"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/agent-monitor/docs/images/agent-monitor-roster.png",
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/agent-monitor/docs/images/agent-monitor-settings.png"
       ],
       "submittedAt": "2026-09-17T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-10-03T09:36:35.639Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Agent Monitor\n\n## Behavior\n\nA Paseo plugin that provides a host-wide agent triage roster."
@@ -364,13 +370,13 @@
         "name": "Omer Cohen",
         "github": "omercnet"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-beads/docs/images/paseo-beads-wide.png",
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-beads/docs/images/paseo-beads-compact.png"
       ],
       "submittedAt": "2026-09-17T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-10-03T09:37:29.149Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Beads\n\n## Behavior\n\nA dependency-aware Beads work queue for each Paseo workspace."
@@ -397,13 +403,14 @@
         "name": "Omer Cohen",
         "github": "omercnet"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-dracula/screenshot.png",
+        "https://raw.githubusercontent.com/web-platform-tests/wpt/master/media/movie_5.webm",
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-dracula/screenshot-alucard.png"
       ],
       "submittedAt": "2026-09-17T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-10-03T09:37:18.185Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Dracula\n\n## Behavior\n\nDracula Classic and Alucard Classic themes for Paseo."
@@ -430,13 +437,13 @@
         "name": "Omer Cohen",
         "github": "omercnet"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/fresh-worktrees/docs/images/fresh-worktrees-behind.png",
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/fresh-worktrees/docs/images/fresh-worktrees-settings.png"
       ],
       "submittedAt": "2026-09-18T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-10-03T09:36:06.720Z",
+      "publishedAt": "2026-09-18T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Fresh Worktrees\n\n## Behavior\n\nFast-forwards clean local base branches before Paseo creates branch-off worktrees"
@@ -463,13 +470,13 @@
         "name": "Omer Cohen",
         "github": "omercnet"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-omp/docs/images/plugin-manager.png",
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-omp/docs/images/workspace-settings.png"
       ],
       "submittedAt": "2026-09-17T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-10-03T09:36:36.267Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# OMP\n\n## Behavior\n\nPaseo integration for OMP, including its direct provider and workspace tooling."
@@ -496,10 +503,10 @@
         "name": "Omer Cohen",
         "github": "omercnet"
       },
-      "screenshots": [],
+      "media": [],
       "submittedAt": "2026-09-17T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-10-03T09:37:04.327Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# PR Radar\n\n## Behavior\n\nA viewer-aware delivery queue for pull requests linked to Paseo workspaces."
@@ -526,13 +533,13 @@
         "name": "Omer Cohen",
         "github": "omercnet"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-shared-browser/docs/images/shared-browser-wide.png",
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-shared-browser/docs/images/shared-browser-compact.png"
       ],
       "submittedAt": "2026-09-18T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-10-03T09:38:48.289Z",
+      "publishedAt": "2026-09-18T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Shared Browser\n\n## Behavior\n\nOne real Chromium session per Paseo workspace, shared live across every connected client."
@@ -559,10 +566,10 @@
         "name": "Omer Cohen",
         "github": "omercnet"
       },
-      "screenshots": [],
+      "media": [],
       "submittedAt": "2026-09-17T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-10-03T09:36:15.719Z",
+      "publishedAt": "2026-09-17T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Tell Agent\n\n## Behavior\n\nSend messages to agents in other workspaces on the same Paseo host."
@@ -588,12 +595,12 @@
         "name": "Tom Gringauz",
         "github": "tomgrin10"
       },
-      "screenshots": [
+      "media": [
         "https://raw.githubusercontent.com/tomgrin10/paseo-defer/main/docs/defer-popover.png"
       ],
       "submittedAt": "2026-09-22T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-09-27T09:59:16.553Z",
+      "publishedAt": "2026-09-22T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Defer\n\n## Behavior\n\nDefer messages to Paseo coding agents until a chosen time or usage-window reset."
@@ -619,10 +626,10 @@
         "name": "Tom Gringauz",
         "github": "tomgrin10"
       },
-      "screenshots": [],
+      "media": [],
       "submittedAt": "2026-09-22T00:00:00.000Z",
       "reviewedAt": "2026-10-03T00:00:00.000Z",
-      "publishedAt": "2026-09-23T10:36:50.112Z",
+      "publishedAt": "2026-09-22T00:00:00.000Z",
       "updatedAt": "2026-10-03T00:00:00.000Z",
       "installs": 0,
       "readme": "# Graphite\n\n## Behavior\n\nWorkspace-native Graphite stack status and PR action radar for Paseo."
diff --git a/packages/website/src/plugins/browse-page.tsx b/packages/website/src/plugins/browse-page.tsx
index 0cfbd805db..a6d77347fe 100644
--- a/packages/website/src/plugins/browse-page.tsx
+++ b/packages/website/src/plugins/browse-page.tsx
@@ -5,6 +5,7 @@ import type { InstallCounts } from "./installs";
 import { type BrowseQuery, browseHref } from "./links";
 import { PLUGIN_GRID_CLASS, PluginCard } from "./plugin-card";
 import { PluginSearch } from "./plugin-search";
+import { PluginSection } from "./section";
 import {
   addedAgo,
   CATEGORIES,
@@ -72,36 +73,38 @@ export function BrowsePage({
               </a>
             )}
           </div>
-          <SortTabs query={query} />
-          {results.length === 0 && query.q && (
-            <div className="mt-8 rounded-xl border border-white/10 bg-white/[0.03] px-4 py-10 text-center">
-              <p className="text-sm text-muted-foreground">No plugins match.</p>
-              <a
-                href={clearHref}
-                className="mt-2 inline-block text-xs text-extra-muted-foreground transition-colors hover:text-muted-foreground"
-              >
-                Clear filters
-              </a>
-            </div>
-          )}
-          {results.length === 0 && !query.q && (
-            <p className="mt-8 text-sm text-muted-foreground">No plugins in this category yet.</p>
-          )}
-          {results.length > 0 && (
-            <div className={`mt-8 ${PLUGIN_GRID_CLASS}`}>
-              {results.map((plugin) =>
-                query.sort === "new" ? (
-                  <PluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
-                ) : (
-                  <PluginCard
-                    key={plugin.id}
-                    plugin={plugin}
-                    installs={installs[plugin.id]?.[query.window] ?? 0}
-                  />
-                ),
-              )}
-            </div>
-          )}
+          <PluginSection>
+            <SortTabs query={query} />
+            {results.length === 0 && query.q && (
+              <div className="rounded-xl border border-white/10 bg-white/[0.03] px-4 py-10 text-center">
+                <p className="text-sm text-muted-foreground">No plugins match.</p>
+                <a
+                  href={clearHref}
+                  className="mt-2 inline-block text-xs text-extra-muted-foreground transition-colors hover:text-muted-foreground"
+                >
+                  Clear filters
+                </a>
+              </div>
+            )}
+            {results.length === 0 && !query.q && (
+              <p className="text-sm text-muted-foreground">No plugins in this category yet.</p>
+            )}
+            {results.length > 0 && (
+              <div className={PLUGIN_GRID_CLASS}>
+                {results.map((plugin) =>
+                  query.sort === "new" ? (
+                    <PluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
+                  ) : (
+                    <PluginCard
+                      key={plugin.id}
+                      plugin={plugin}
+                      installs={installs[plugin.id]?.[query.window] ?? 0}
+                    />
+                  ),
+                )}
+              </div>
+            )}
+          </PluginSection>
         </div>
       </div>
     </SiteShell>
@@ -186,7 +189,7 @@ function SortTabs({ query }: { query: BrowseQuery }) {
     <WindowSwitch current={query.window} hrefs={windowHrefs} />
   );
   return (
-    <>
+    <div>
       <div className="flex items-baseline justify-between gap-6 border-b border-white/10">
         <div className="flex gap-6">
           <a
@@ -207,6 +210,6 @@ function SortTabs({ query }: { query: BrowseQuery }) {
         {windowSwitch && <div className="hidden pb-2 sm:block">{windowSwitch}</div>}
       </div>
       {windowSwitch && <div className="mt-4 sm:hidden">{windowSwitch}</div>}
-    </>
+    </div>
   );
 }
diff --git a/packages/website/src/plugins/contribute-links.tsx b/packages/website/src/plugins/contribute-links.tsx
index 476146dfca..3aeb33a16b 100644
--- a/packages/website/src/plugins/contribute-links.tsx
+++ b/packages/website/src/plugins/contribute-links.tsx
@@ -26,16 +26,16 @@ export function ContributeSection() {
   return (
     <section
       aria-labelledby="build-your-own"
-      className="mt-20 rounded-xl border border-white/10 bg-white/[0.03] px-6 py-8 sm:px-8"
+      className="mt-20 rounded-xl border border-white/10 bg-white/[0.03] px-6 py-8 text-center sm:px-8"
     >
       <h2 id="build-your-own" className="text-lg font-medium">
         Build your own plugin
       </h2>
-      <p className="mt-2 max-w-lg text-sm text-muted-foreground">
+      <p className="mx-auto mt-2 max-w-lg text-sm text-muted-foreground">
         Plugins add themes, workspace panels, slash commands, and agent hooks to Paseo. Write one
         with the plugin docs, then submit it to get it listed here.
       </p>
-      <div className="mt-6 flex flex-wrap gap-3">
+      <div className="mt-6 flex flex-wrap justify-center gap-3">
         <a href={DOCS_URL} className={PRIMARY_BUTTON_CLASS}>
           Read the docs
         </a>
diff --git a/packages/website/src/plugins/loader.ts b/packages/website/src/plugins/loader.ts
index 27416a4125..ebc9bf8272 100644
--- a/packages/website/src/plugins/loader.ts
+++ b/packages/website/src/plugins/loader.ts
@@ -11,14 +11,19 @@ import {
 function registryBase(): string {
   return (env as RegistryEnvironment).PLUGINS_REGISTRY_URL ?? "https://getpaseo.github.io/plugins";
 }
-/** Listed plugins in index order, their install counts per window, and the server's clock. */
+/** Listed plugins in index order, featured plugin IDs, install counts per window, and the server's clock. */
 export const getRegistry = createServerFn({ method: "GET" }).handler(async () => {
   const context = getWebsiteCacheContext();
   const [index, installs] = await Promise.all([
     loadRegistryIndex(registryBase(), context),
     loadInstallCounts(registryBase(), context),
   ]);
-  return { plugins: index.plugins, installs, now: new Date().toISOString() };
+  return {
+    plugins: index.plugins,
+    featured: index.featured,
+    installs,
+    now: new Date().toISOString(),
+  };
 });
 export const getRegistryPlugin = createServerFn({ method: "GET" })
   .validator((id: string) => id)
diff --git a/packages/website/src/plugins/media-gallery.tsx b/packages/website/src/plugins/media-gallery.tsx
new file mode 100644
index 0000000000..5fe47c4631
--- /dev/null
+++ b/packages/website/src/plugins/media-gallery.tsx
@@ -0,0 +1,158 @@
+import { pluginOverviewPolicy, pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
+import { pluginMediaKind } from "@getpaseo/protocol/plugin-registry";
+import { Play, X } from "lucide-react";
+import {
+  type CSSProperties,
+  type MouseEvent,
+  type SyntheticEvent,
+  useCallback,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+
+const TILE_CLASS =
+  "relative block aspect-video w-[85%] flex-shrink-0 overflow-hidden rounded-xl border border-white/10 bg-white/[0.03] sm:w-[60%] md:w-[calc(50%-0.375rem)]";
+// The viewer's room: media never exceeds this box, which leaves a margin around it.
+const VIEW_WIDTH = "90vw";
+const VIEW_HEIGHT = "85vh";
+const VIEW_CLASS = "max-h-[85vh] max-w-[90vw] rounded-lg object-contain";
+
+interface MediaItem {
+  url: string;
+  kind: "image" | "video";
+  /** Image alt text, or the video's accessible name. */
+  label: string;
+}
+
+/** Plugin media in registry order. Each tile opens the viewer; without JavaScript it links to the file. */
+export function MediaGallery({ name, media }: { name: string; media: string[] }) {
+  const dialog = useRef<HTMLDialogElement>(null);
+  const [viewing, setViewing] = useState<MediaItem | null>(null);
+  const open = useCallback((item: MediaItem) => {
+    setViewing(item);
+    dialog.current?.showModal();
+  }, []);
+  const close = useCallback(() => dialog.current?.close(), []);
+  // Unmounting the viewed media stops a playing video.
+  const handleClose = useCallback(() => setViewing(null), []);
+  const closeOnBackdrop = useCallback((event: MouseEvent<HTMLDialogElement>) => {
+    if (event.target === event.currentTarget) event.currentTarget.close();
+  }, []);
+
+  if (media.length === 0) return null;
+  return (
+    <>
+      <div className="-mx-6 mt-10 flex gap-3 overflow-x-auto px-6 md:mx-0 md:px-0">
+        {media.map((url, index) => {
+          const source = pluginOverviewUrl(url);
+          if (!source) return <p key={url}>{url}</p>;
+          const kind = pluginMediaKind(source);
+          const label = `${name} ${kind === "video" ? "video" : "screenshot"} ${index + 1}`;
+          return <MediaTile key={url} url={source} kind={kind} label={label} onOpen={open} />;
+        })}
+      </div>
+      <dialog
+        ref={dialog}
+        aria-label={viewing?.label}
+        onClose={handleClose}
+        onClick={closeOnBackdrop}
+        className="m-auto overflow-visible bg-transparent p-0 backdrop:bg-black/80"
+      >
+        {viewing?.kind === "image" && (
+          <img src={viewing.url} alt={viewing.label} className={VIEW_CLASS} />
+        )}
+        {viewing?.kind === "video" && <ViewerVideo url={viewing.url} label={viewing.label} />}
+        <button
+          type="button"
+          aria-label="Close"
+          onClick={close}
+          className="fixed right-4 top-4 rounded-full bg-black/60 p-2 text-white transition-colors hover:bg-black/80"
+        >
+          <X className="h-5 w-5" />
+        </button>
+      </dialog>
+    </>
+  );
+}
+
+/** Fills the viewer's room at the video's aspect ratio, scaling small sources up. */
+function ViewerVideo({ url, label }: { url: string; label: string }) {
+  const [aspectRatio, setAspectRatio] = useState<number | null>(null);
+  const readAspectRatio = useCallback((event: SyntheticEvent<HTMLVideoElement>) => {
+    const { videoWidth, videoHeight } = event.currentTarget;
+    setAspectRatio(videoWidth / videoHeight);
+  }, []);
+  const style = useMemo<CSSProperties | undefined>(
+    () =>
+      aspectRatio === null
+        ? undefined
+        : { aspectRatio, width: `min(${VIEW_WIDTH}, ${VIEW_HEIGHT} * ${aspectRatio})` },
+    [aspectRatio],
+  );
+  return (
+    <video
+      src={url}
+      aria-label={label}
+      controls
+      autoPlay
+      playsInline
+      onLoadedMetadata={readAspectRatio}
+      style={style}
+      className={VIEW_CLASS}
+    />
+  );
+}
+
+function MediaTile({
+  url,
+  kind,
+  label,
+  onOpen,
+}: MediaItem & { onOpen: (item: MediaItem) => void }) {
+  const handleClick = useCallback(
+    (event: MouseEvent<HTMLAnchorElement>) => {
+      // Modified clicks keep the link's own behavior, such as opening the file in a new tab.
+      if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
+      event.preventDefault();
+      onOpen({ url, kind, label });
+    },
+    [onOpen, url, kind, label],
+  );
+  return (
+    <a
+      href={url}
+      {...pluginOverviewPolicy.link}
+      aria-label={kind === "video" ? label : undefined}
+      onClick={handleClick}
+      className={TILE_CLASS}
+    >
+      {kind === "image" ? (
+        <img
+          src={url}
+          alt={label}
+          loading="lazy"
+          className="h-full w-full object-cover object-top"
+        />
+      ) : (
+        <>
+          <video
+            src={url}
+            preload="metadata"
+            muted
+            playsInline
+            className="h-full w-full object-cover object-top"
+          />
+          <span
+            aria-hidden
+            className="absolute inset-0 flex items-center justify-center bg-black/10"
+          >
+            <span className="rounded-full bg-black/60 p-3 text-white">
+              <Play className="h-5 w-5 fill-current" />
+            </span>
+          </span>
+        </>
+      )}
+    </a>
+  );
+}
diff --git a/packages/website/src/plugins/overview.test.tsx b/packages/website/src/plugins/overview.test.tsx
index 89cf15a947..c9e6591c94 100644
--- a/packages/website/src/plugins/overview.test.tsx
+++ b/packages/website/src/plugins/overview.test.tsx
@@ -112,7 +112,7 @@ describe("registry images", () => {
     "./icon.png",
     "//example.com/x",
   ])("does not load %s in cards or icons", (url) => {
-    const plugin = { ...registry.plugins[0], icon: url, screenshots: [url] } as Plugin;
+    const plugin = { ...registry.plugins[0], icon: url, media: [url] } as Plugin;
     for (const component of [
       createElement(PluginTile, { plugin, size: "sm" }),
       createElement(PluginCard, { plugin }),
@@ -129,7 +129,7 @@ it("uses the first HTTPS screenshot when an earlier screenshot is rejected", ()
   const plugin = {
     ...registry.plugins[0],
     icon: undefined,
-    screenshots: ["data:image/png;base64,AAAA", source],
+    media: ["data:image/png;base64,AAAA", source],
   } as Plugin;
   const nodes = elements(renderToStaticMarkup(createElement(PluginCard, { plugin })));
   expect(
diff --git a/packages/website/src/plugins/plugin-card.tsx b/packages/website/src/plugins/plugin-card.tsx
index 429937ab87..488b97ac55 100644
--- a/packages/website/src/plugins/plugin-card.tsx
+++ b/packages/website/src/plugins/plugin-card.tsx
@@ -1,16 +1,15 @@
-import { pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
 import { Download } from "lucide-react";
 import { pluginCardScreenshot } from "./thumbnails";
 import { pluginHref } from "./links";
 import { PluginTile } from "./plugin-tile";
-import { formatInstalls, getCategory, type Plugin } from "./registry";
+import { firstMediaImage, formatInstalls, getCategory, type Plugin } from "./registry";
 
 export const PLUGIN_GRID_CLASS =
   "grid gap-x-4 gap-y-8 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4";
 
-/** First allowed screenshot, or the plugin tile on a quiet backdrop when there is none. */
+/** First allowed image, or the plugin tile on a quiet backdrop when there is none. */
 function PluginShot({ plugin }: { plugin: Plugin }) {
-  const url = plugin.screenshots.find(pluginOverviewUrl);
+  const url = firstMediaImage(plugin);
   return (
     <div
       aria-hidden
@@ -101,11 +100,9 @@ export function PluginRankRow({
   return (
     <a
       href={pluginHref(plugin.id)}
-      className="flex items-center gap-3 rounded-lg px-2 py-2.5 transition-colors hover:bg-white/[0.04]"
+      className="flex items-center gap-3 rounded-lg px-4 py-2.5 transition-colors hover:bg-white/[0.04]"
     >
-      <span className="w-4 text-right text-sm tabular-nums text-extra-muted-foreground">
-        {rank}
-      </span>
+      <span className="text-sm tabular-nums text-extra-muted-foreground">{rank}</span>
       <PluginTile plugin={plugin} size="sm" />
       <div className="min-w-0 flex-1">
         <p className="truncate text-sm text-white">{plugin.name}</p>
diff --git a/packages/website/src/plugins/registry.test.ts b/packages/website/src/plugins/registry.test.ts
index bd2dce67ec..ca678f6453 100644
--- a/packages/website/src/plugins/registry.test.ts
+++ b/packages/website/src/plugins/registry.test.ts
@@ -2,6 +2,8 @@ import { createHash } from "node:crypto";
 import { createServer } from "node:http";
 import { describe, expect, it } from "vitest";
 import {
+  addedAgo,
+  featuredPlugins,
   formatInstalls,
   installCommand,
   mostInstalled,
@@ -26,7 +28,7 @@ const plugin: Plugin = {
     resolved: "https://registry.npmjs.org/example.tgz",
     integrity: "sha512-YWJj",
   },
-  screenshots: [],
+  media: [],
   submittedAt: "2026-10-03",
   reviewedAt: "2026-10-03",
   updatedAt: "2026-10-03",
@@ -40,6 +42,7 @@ describe("plugin registry", () => {
       registry: { name: "Internal", url: "https://example.test" },
       categories: [],
       plugins: [plugin],
+      featured: [plugin.id],
       generatedAt: "2026-10-03",
     };
     const detail = { ...plugin, readme: "# Example" };
@@ -60,8 +63,46 @@ describe("plugin registry", () => {
       await new Promise<void>((resolve) => server.close(() => resolve()));
     }
   });
-  it("orders by submission date and by installs in a window, keeping index order for ties", () => {
-    const older = { ...plugin, id: "acme/older", submittedAt: "2026-09-01" };
+  it("features listed plugins once each, in the registry's order, dropping IDs that are not listed", () => {
+    const listed = [
+      { ...plugin, id: "acme/first" },
+      { ...plugin, id: "acme/second" },
+      { ...plugin, id: "acme/third" },
+    ];
+    const featured = ["acme/third", "acme/not-published", "acme/first", "acme/third"];
+    expect(featuredPlugins(listed, featured).map((p) => p.id)).toEqual([
+      "acme/third",
+      "acme/first",
+    ]);
+    expect(featuredPlugins(listed, ["acme/not-published"])).toEqual([]);
+  });
+  it("lists what's new by first-listing date, not submission or update dates", () => {
+    const listedFirst = {
+      ...plugin,
+      id: "acme/listed-first",
+      submittedAt: "2026-09-20",
+      reviewedAt: "2026-09-21",
+      updatedAt: "2026-10-02",
+      publishedAt: "2026-09-02",
+    };
+    const listedLater = {
+      ...plugin,
+      id: "acme/listed-later",
+      submittedAt: "2026-09-01",
+      reviewedAt: "2026-09-01",
+      updatedAt: "2026-09-01",
+      publishedAt: "2026-09-30",
+    };
+    expect(newestFirst([listedFirst, listedLater]).map((p) => p.id)).toEqual([
+      "acme/listed-later",
+      "acme/listed-first",
+    ]);
+    const now = "2026-10-03T12:00:00.000Z";
+    expect(addedAgo(listedLater, now)).toBe("3d ago");
+    expect(addedAgo(listedFirst, now)).toBe("4w ago");
+  });
+  it("orders by listing date and by installs in a window, keeping index order for ties", () => {
+    const older = { ...plugin, id: "acme/older", publishedAt: "2026-09-01" };
     const twin = { ...plugin, id: "acme/twin" };
     expect(newestFirst([older, plugin, twin]).map((p) => p.id)).toEqual([
       "acme/example",
@@ -155,6 +196,7 @@ describe("plugin registry", () => {
           registry: { name: "Internal", url: base },
           categories: [],
           plugins: [plugin],
+          featured: [],
           generatedAt: "2026-10-03",
         },
       }),
diff --git a/packages/website/src/plugins/registry.ts b/packages/website/src/plugins/registry.ts
index 933399b3a2..c06ea3dc5c 100644
--- a/packages/website/src/plugins/registry.ts
+++ b/packages/website/src/plugins/registry.ts
@@ -1,5 +1,6 @@
 import type { z } from "zod";
-import type { PublishedPluginSchema } from "@getpaseo/protocol/plugin-registry";
+import { pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
+import { pluginMediaKind, type PublishedPluginSchema } from "@getpaseo/protocol/plugin-registry";
 import { CATEGORIES, type Category, type CategorySlug } from "./categories";
 import type { InstallCounts, InstallWindow } from "./installs";
 export { CATEGORIES, type Category, type CategorySlug };
@@ -15,6 +16,10 @@ const DAY_MS = 24 * 60 * 60 * 1000;
 export function getCategory(slug: string): Category | null {
   return CATEGORIES.find((category) => category.slug === slug) ?? null;
 }
+/** The plugin's first HTTPS image, for cards and link previews; videos never stand in for one. */
+export function firstMediaImage(plugin: Plugin): string | undefined {
+  return plugin.media.find((url) => pluginOverviewUrl(url) && pluginMediaKind(url) === "image");
+}
 export function getPluginsInCategory(plugins: Plugin[], slug: string): Plugin[] {
   return plugins.filter((plugin) => plugin.categories.includes(slug));
 }
@@ -72,9 +77,14 @@ export function searchPlugins(plugins: Plugin[], term: string): Plugin[] {
       .includes(needle),
   );
 }
-/** Newest submissions first; equal dates keep index order. */
+/** The featured IDs that name a listed plugin, in the registry's order, each once. */
+export function featuredPlugins(plugins: Plugin[], featured: string[]): Plugin[] {
+  const byId = new Map(plugins.map((plugin) => [plugin.id, plugin]));
+  return [...new Set(featured)].flatMap((id) => byId.get(id) ?? []);
+}
+/** Most recently listed first; equal dates keep index order. */
 export function newestFirst(plugins: Plugin[]): Plugin[] {
-  return [...plugins].sort((a, b) => b.submittedAt.localeCompare(a.submittedAt));
+  return [...plugins].sort((a, b) => b.publishedAt.localeCompare(a.publishedAt));
 }
 /** Most installs in the window first; equal counts keep index order. */
 export function mostInstalled(
@@ -85,9 +95,9 @@ export function mostInstalled(
   const count = (plugin: Plugin) => installs[plugin.id]?.[window] ?? 0;
   return [...plugins].sort((a, b) => count(b) - count(a));
 }
-/** How long ago the registry accepted the plugin, relative to the loader's clock. */
+/** How long ago the plugin was first listed, relative to the loader's clock. */
 export function addedAgo(plugin: Plugin, now: string): string {
-  const days = Math.floor((Date.parse(now) - Date.parse(plugin.submittedAt)) / DAY_MS);
+  const days = Math.floor((Date.parse(now) - Date.parse(plugin.publishedAt)) / DAY_MS);
   if (days <= 0) return "today";
   if (days === 1) return "yesterday";
   if (days < 14) return `${days}d ago`;
diff --git a/packages/website/src/plugins/section.tsx b/packages/website/src/plugins/section.tsx
new file mode 100644
index 0000000000..690a758fde
--- /dev/null
+++ b/packages/website/src/plugins/section.tsx
@@ -0,0 +1,35 @@
+import type { ReactNode } from "react";
+
+/** A block of a plugins page: its header, then its content one fixed gap below. */
+export function PluginSection({
+  id,
+  labelledBy,
+  className = "",
+  children,
+}: {
+  id?: string;
+  labelledBy?: string;
+  className?: string;
+  children: ReactNode;
+}) {
+  return (
+    <section id={id} aria-labelledby={labelledBy} className={`flex flex-col gap-8 ${className}`}>
+      {children}
+    </section>
+  );
+}
+
+/** A section's title with its trailing controls on one baseline. */
+export function PluginSectionHeader({ children }: { children: ReactNode }) {
+  return (
+    <div className="flex flex-wrap items-baseline justify-between gap-x-4 gap-y-2">{children}</div>
+  );
+}
+
+export function PluginSectionTitle({ id, children }: { id: string; children: ReactNode }) {
+  return (
+    <h2 id={id} className="text-lg font-medium">
+      {children}
+    </h2>
+  );
+}
diff --git a/packages/website/src/plugins/thumbnails.test.ts b/packages/website/src/plugins/thumbnails.test.ts
index ec089be62e..8769995ca3 100644
--- a/packages/website/src/plugins/thumbnails.test.ts
+++ b/packages/website/src/plugins/thumbnails.test.ts
@@ -6,6 +6,7 @@ import { NewPluginCard, PluginCard } from "./plugin-card";
 import type { Plugin } from "./registry";
 
 const source = "https://cdn.jsdelivr.net/npm/paseo-example@1.2.3/preview.png";
+const video = "https://cdn.jsdelivr.net/npm/paseo-example@1.2.3/demo.mp4";
 const plugin: Plugin = {
   id: "acme/example",
   name: "Example",
@@ -20,7 +21,7 @@ const plugin: Plugin = {
     resolved: "https://registry.npmjs.org/example.tgz",
     integrity: "sha512-YWJj",
   },
-  screenshots: [source],
+  media: [source],
   submittedAt: "2026-10-03",
   reviewedAt: "2026-10-03",
   updatedAt: "2026-10-03",
@@ -29,10 +30,27 @@ const plugin: Plugin = {
 };
 
 describe("plugin card thumbnails", () => {
+  it("uses the first image in the plugin's media, skipping a leading video", () => {
+    const html = renderToStaticMarkup(
+      createElement(PluginCard, { plugin: { ...plugin, media: [video, source] } }),
+    );
+    expect(html).toContain(`/plugins/thumb/592/${encodeURIComponent(source)}?`);
+    expect(html).not.toContain(encodeURIComponent(video));
+  });
+
+  it("shows the plugin tile when the media has no image", () => {
+    const html = renderToStaticMarkup(
+      createElement(PluginCard, { plugin: { ...plugin, media: [video] } }),
+    );
+    expect(html).not.toContain("<img");
+    expect(html).not.toContain("<video");
+    expect(html).toContain(">E</div>");
+  });
+
   it("keeps a screenshot on an unsupported host visible at its original URL", () => {
     const screenshot = "https://example.com/preview.png";
     const html = renderToStaticMarkup(
-      createElement(PluginCard, { plugin: { ...plugin, screenshots: [screenshot] } }),
+      createElement(PluginCard, { plugin: { ...plugin, media: [screenshot] } }),
     );
     expect(html).toContain(`src="${screenshot}"`);
     expect(html).not.toContain("/plugins/thumb/");
@@ -118,7 +136,7 @@ describe("thumbnail route", () => {
       const upstream = imageFetch(imageResponse("thumbnail"));
       const response = await handlePluginThumbnailRequest(
         thumbnailRequest(screenshot, width, plugin.id, accept),
-        [{ ...plugin, screenshots: [screenshot] }],
+        [{ ...plugin, media: [screenshot] }],
         upstream.fetchImage,
       );
       expect(upstream.calls).toEqual([
@@ -170,6 +188,7 @@ describe("thumbnail route", () => {
       404,
     ],
     ["removed plugin", thumbnailRequest(), [], 404],
+    ["listed video", thumbnailRequest(video), [{ ...plugin, media: [video, source] }], 404],
     ["malformed encoding", new Request("https://paseo.sh/plugins/thumb/592/%ZZ"), [plugin], 400],
     ["malformed URL", thumbnailRequest("not a URL"), [plugin], 400],
     ...[
@@ -183,7 +202,7 @@ describe("thumbnail route", () => {
         [
           "disallowed registered source",
           thumbnailRequest(url),
-          [{ ...plugin, screenshots: [url] }],
+          [{ ...plugin, media: [url] }],
           400,
         ] satisfies [string, Request, Plugin[], number],
     ),
@@ -225,7 +244,7 @@ describe("thumbnail route", () => {
     );
     const response = await handlePluginThumbnailRequest(
       request,
-      [{ ...plugin, screenshots: [screenshot] }],
+      [{ ...plugin, media: [screenshot] }],
       upstream.fetchImage,
     );
     expect(response.status).toBe(200);
diff --git a/packages/website/src/plugins/thumbnails.ts b/packages/website/src/plugins/thumbnails.ts
index 755854d257..1d5b0304ce 100644
--- a/packages/website/src/plugins/thumbnails.ts
+++ b/packages/website/src/plugins/thumbnails.ts
@@ -1,3 +1,4 @@
+import { pluginMediaKind } from "@getpaseo/protocol/plugin-registry";
 import type { Plugin } from "./registry";
 
 // The single-column grid reaches 591px just below sm (640px minus 48px padding).
@@ -17,7 +18,7 @@ function pluginThumbnailUrl(id: string, source: string, scale: 1 | 2): string {
   return `/plugins/thumb/${CARD_WIDTH * scale}/${encodeURIComponent(source)}?plugin=${encodeURIComponent(id)}`;
 }
 
-/** Only registry-listed screenshots are eligible for transformation or original fallback. */
+/** Only images listed in the plugin's media are eligible for transformation or original fallback. */
 export async function handlePluginThumbnailRequest(
   request: Request,
   plugins: Plugin[],
@@ -38,7 +39,7 @@ export async function handlePluginThumbnailRequest(
   if (!source) return new Response("Invalid thumbnail source", { status: 400 });
 
   const plugin = plugins.find((entry) => entry.id === url.searchParams.get("plugin"));
-  if (!plugin?.screenshots.includes(source))
+  if (!plugin?.media.includes(source) || pluginMediaKind(source) !== "image")
     return new Response("Screenshot not found", { status: 404 });
 
   const format = negotiatedFormat(request.headers.get("accept") ?? "");
diff --git a/packages/website/src/routes/plugins/$owner_.$slug.tsx b/packages/website/src/routes/plugins/$owner_.$slug.tsx
index 42529775f8..9ea61f3248 100644
--- a/packages/website/src/routes/plugins/$owner_.$slug.tsx
+++ b/packages/website/src/routes/plugins/$owner_.$slug.tsx
@@ -2,10 +2,10 @@ import { createFileRoute, notFound } from "@tanstack/react-router";
 import { ExternalLink } from "lucide-react";
 import { CodeBlock } from "~/components/code-block";
 import { PluginOverview, PluginContentLink } from "~/plugins/overview";
-import { pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
 import { SiteShell } from "~/components/site-shell";
 import { pageMeta } from "~/meta";
 import {
+  firstMediaImage,
   formatInstalls,
   getAuthor,
   getCategory,
@@ -18,6 +18,7 @@ import {
 } from "~/plugins";
 import { AuthorLink } from "~/plugins/author-link";
 import { categoryHref } from "~/plugins/links";
+import { MediaGallery } from "~/plugins/media-gallery";
 import { PluginsNotFound } from "~/plugins/not-found";
 import "~/styles.css";
 
@@ -35,7 +36,7 @@ export const Route = createFileRoute("/plugins/$owner_/$slug")({
       loaderData?.plugin ? `${loaderData.plugin.name} – Paseo plugin` : "Plugin not found – Paseo",
       loaderData?.plugin?.description ?? "Plugin not found.",
       `/plugins/${params.owner}/${params.slug}`,
-      loaderData?.plugin.screenshots.find(pluginOverviewUrl),
+      loaderData?.plugin && firstMediaImage(loaderData.plugin),
     ),
   component: PluginPage,
   notFoundComponent: () => (
@@ -88,28 +89,7 @@ function PluginPage() {
           )}
         </div>
 
-        {plugin.screenshots.length > 0 && (
-          <div className="-mx-6 mt-10 flex gap-3 overflow-x-auto px-6 md:mx-0 md:px-0">
-            {plugin.screenshots.map((url, index) =>
-              pluginOverviewUrl(url) ? (
-                <PluginContentLink
-                  key={url}
-                  href={url}
-                  className="aspect-video w-[85%] flex-shrink-0 overflow-hidden rounded-xl border border-white/10 bg-white/[0.03] sm:w-[60%] md:w-[calc(50%-0.375rem)]"
-                >
-                  <img
-                    src={url}
-                    alt={`${plugin.name} screenshot ${index + 1}`}
-                    loading="lazy"
-                    className="h-full w-full object-cover object-top"
-                  />
-                </PluginContentLink>
-              ) : (
-                <p key={url}>{url}</p>
-              ),
-            )}
-          </div>
-        )}
+        <MediaGallery name={plugin.name} media={plugin.media} />
 
         <div className="mt-10 border-t border-white/10 pt-10">
           <PluginOverview>{readmeBody(plugin.readme)}</PluginOverview>
diff --git a/packages/website/src/routes/plugins/index.tsx b/packages/website/src/routes/plugins/index.tsx
index bd6cbb5690..88ab7214e6 100644
--- a/packages/website/src/routes/plugins/index.tsx
+++ b/packages/website/src/routes/plugins/index.tsx
@@ -19,6 +19,7 @@ import {
   addedAgo,
   CATEGORIES,
   type CategorySlug,
+  featuredPlugins,
   getCategory,
   getPluginsInCategory,
   getRegistry,
@@ -40,6 +41,7 @@ import {
 } from "~/plugins/links";
 import { NewPluginCard, PluginRankRow } from "~/plugins/plugin-card";
 import { PluginSearch } from "~/plugins/plugin-search";
+import { PluginSection, PluginSectionHeader, PluginSectionTitle } from "~/plugins/section";
 import { WindowSwitch } from "~/plugins/window-switch";
 import "~/styles.css";
 
@@ -59,6 +61,9 @@ const CATEGORY_ICONS: Record<CategorySlug, LucideIcon> = {
 };
 
 const SUBMIT_CLASS = "text-sm text-muted-foreground transition-colors hover:text-foreground";
+// What's new and Featured cards: a swipeable row on phones, a grid from `sm` up.
+const CARD_ROW_CLASS =
+  "-mx-6 flex gap-4 overflow-x-auto px-6 pb-1 sm:mx-0 sm:grid sm:grid-cols-2 sm:px-0 lg:grid-cols-4";
 const SEE_ALL_CLASS =
   "inline-flex items-center gap-0.5 text-sm text-muted-foreground transition-colors hover:text-foreground";
 
@@ -91,8 +96,9 @@ export const Route = createFileRoute("/plugins/")({
 });
 
 function PluginsPage() {
-  const { plugins, installs, now } = Route.useLoaderData();
+  const { plugins, featured: featuredIds, installs, now } = Route.useLoaderData();
   const window = Route.useSearch().window ?? DEFAULT_WINDOW;
+  const featured = featuredPlugins(plugins, featuredIds);
   const newest = newestFirst(plugins).slice(0, NEW_COUNT);
   const top = mostInstalled(plugins, installs, window).slice(0, TOP_COUNT);
   const windowHrefs = useMemo(
@@ -122,77 +128,89 @@ function PluginsPage() {
         </div>
       </div>
 
-      <section aria-labelledby="whats-new" className="mt-10">
-        <div className="mb-4 flex items-baseline justify-between gap-4">
-          <h2 id="whats-new" className="text-lg font-medium">
-            What’s new
-          </h2>
-          <a href={browseHref({ sort: "new", window: DEFAULT_WINDOW })} className={SEE_ALL_CLASS}>
-            See all
-            <ChevronRight className="h-3.5 w-3.5" />
-          </a>
-        </div>
-        <div className="-mx-6 flex gap-4 overflow-x-auto px-6 pb-1 sm:mx-0 sm:grid sm:grid-cols-2 sm:px-0 lg:grid-cols-4">
-          {newest.map((plugin) => (
-            <NewPluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
-          ))}
-        </div>
-      </section>
+      <div className="mt-10 flex flex-col gap-14">
+        {featured.length > 0 && (
+          <PluginSection labelledBy="featured">
+            <div>
+              <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
+              <p className="mt-1 text-sm text-muted-foreground">Hand-picked by the maintainer.</p>
+            </div>
+            <div className={CARD_ROW_CLASS}>
+              {featured.map((plugin) => (
+                <NewPluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
+              ))}
+            </div>
+          </PluginSection>
+        )}
 
-      <section aria-labelledby="categories" className="mt-14">
-        <h2 id="categories" className="mb-4 text-lg font-medium">
-          Categories
-        </h2>
-        <div className="grid grid-cols-2 gap-2 sm:grid-cols-3">
-          {CATEGORIES.map((category) => {
-            const Icon = CATEGORY_ICONS[category.slug];
-            return (
-              <a
-                key={category.slug}
-                href={categoryHref(category.slug)}
-                className="flex items-center gap-3 rounded-xl border border-white/10 bg-white/[0.03] px-3.5 py-3.5 transition-colors hover:border-white/20 hover:bg-white/[0.05] sm:px-4"
-              >
-                <Icon className="h-4 w-4 flex-shrink-0 text-muted-foreground" />
-                <span className="min-w-0 flex-1 text-sm leading-tight text-white">
-                  {category.label}
-                </span>
-                <span className="text-xs tabular-nums text-extra-muted-foreground">
-                  {getPluginsInCategory(plugins, category.slug).length}
-                </span>
-              </a>
-            );
-          })}
-        </div>
-      </section>
-
-      <section
-        id="most-installed"
-        aria-labelledby="most-installed-title"
-        className="mt-14 scroll-mt-8"
-      >
-        <div className="mb-4 flex flex-wrap items-baseline justify-between gap-x-4 gap-y-2">
-          <h2 id="most-installed-title" className="text-lg font-medium">
-            <a
-              href={browseHref({ sort: "installs", window })}
-              className="group inline-flex items-center gap-1"
-            >
-              Most installed
-              <ChevronRight className="h-4 w-4 text-muted-foreground transition-colors group-hover:text-foreground" />
+        <PluginSection labelledBy="whats-new">
+          <PluginSectionHeader>
+            <PluginSectionTitle id="whats-new">What’s new</PluginSectionTitle>
+            <a href={browseHref({ sort: "new", window: DEFAULT_WINDOW })} className={SEE_ALL_CLASS}>
+              See all
+              <ChevronRight className="h-3.5 w-3.5" />
             </a>
-          </h2>
-          <WindowSwitch current={window} hrefs={windowHrefs} />
-        </div>
-        <div className="-mx-2 grid gap-x-8 md:grid-cols-2">
-          {top.map((plugin, index) => (
-            <PluginRankRow
-              key={plugin.id}
-              plugin={plugin}
-              rank={index + 1}
-              installs={installs[plugin.id]?.[window] ?? 0}
-            />
-          ))}
-        </div>
-      </section>
+          </PluginSectionHeader>
+          <div className={CARD_ROW_CLASS}>
+            {newest.map((plugin) => (
+              <NewPluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
+            ))}
+          </div>
+        </PluginSection>
+
+        <PluginSection labelledBy="categories">
+          <PluginSectionTitle id="categories">Categories</PluginSectionTitle>
+          <div className="grid grid-cols-2 gap-2 sm:grid-cols-3">
+            {CATEGORIES.map((category) => {
+              const Icon = CATEGORY_ICONS[category.slug];
+              return (
+                <a
+                  key={category.slug}
+                  href={categoryHref(category.slug)}
+                  className="flex items-center gap-3 rounded-xl border border-white/10 bg-white/[0.03] px-3.5 py-3.5 transition-colors hover:border-white/20 hover:bg-white/[0.05] sm:px-4"
+                >
+                  <Icon className="h-4 w-4 flex-shrink-0 text-muted-foreground" />
+                  <span className="min-w-0 flex-1 text-sm leading-tight text-white">
+                    {category.label}
+                  </span>
+                  <span className="text-xs tabular-nums text-extra-muted-foreground">
+                    {getPluginsInCategory(plugins, category.slug).length}
+                  </span>
+                </a>
+              );
+            })}
+          </div>
+        </PluginSection>
+
+        <PluginSection
+          id="most-installed"
+          labelledBy="most-installed-title"
+          className="scroll-mt-8"
+        >
+          <PluginSectionHeader>
+            <PluginSectionTitle id="most-installed-title">
+              <a
+                href={browseHref({ sort: "installs", window })}
+                className="group inline-flex items-center gap-1"
+              >
+                Most installed
+                <ChevronRight className="h-4 w-4 text-muted-foreground transition-colors group-hover:text-foreground" />
+              </a>
+            </PluginSectionTitle>
+            <WindowSwitch current={window} hrefs={windowHrefs} />
+          </PluginSectionHeader>
+          <div className="-mx-4 grid gap-x-8 md:grid-cols-2">
+            {top.map((plugin, index) => (
+              <PluginRankRow
+                key={plugin.id}
+                plugin={plugin}
+                rank={index + 1}
+                installs={installs[plugin.id]?.[window] ?? 0}
+              />
+            ))}
+          </div>
+        </PluginSection>
+      </div>
 
       <ContributeSection />
     </SiteShell>

From 4515061f88d040f30f8641d693cc6cb70ce8e9fc Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 20:53:42 +0100
Subject: [PATCH 015/270] website: submit-based plugin search on the home page,
 back button works on browse (#6256)

* website: submit-based plugin search on the home page, back button works on browse

* website: cover Forward in the browse search history test
---
 packages/website/e2e/plugins.spec.ts          | 64 ++++++++++++++++--
 packages/website/src/plugins/browse-page.tsx  |  2 +-
 .../website/src/plugins/plugin-search.tsx     | 66 ++++++++++++++-----
 3 files changed, 107 insertions(+), 25 deletions(-)

diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 3398a7e7d6..d41a9f3fe4 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -80,7 +80,7 @@ test("filters by search and clears to all plugins", async ({ page }) => {
   await page.goto("/");
   await openPlugins(page);
 
-  await searchPlugins(page, "graphite");
+  await submitSearch(page, "graphite");
   await expect(page).toHaveURL(/\/plugins\/all\?q=graphite$/);
   await expect(
     page.getByRole("heading", { level: 1, name: /^Results for “graphite”/ }),
@@ -98,7 +98,7 @@ test("filters by search and clears to all plugins", async ({ page }) => {
 
 test("keeps the directory's ranking window when searching", async ({ page }) => {
   await page.goto("/plugins?window=month");
-  await searchPlugins(page, "graphite");
+  await submitSearch(page, "graphite");
   await expect(page).toHaveURL(/\/plugins\/all\?q=graphite&window=month$/);
   await expect(page.getByRole("link", { name: "This month" })).toHaveAttribute(
     "aria-current",
@@ -122,13 +122,52 @@ test("clears the search with the clear button", async ({ page }) => {
   await expect(page.getByRole("heading", { level: 1, name: /^All plugins/ })).toBeVisible();
 });
 
-test("replaces history while typing a search", async ({ page }) => {
+test("searches from the directory on submit, and Back returns to the directory", async ({
+  page,
+}) => {
+  await page.goto("/");
+  await openPlugins(page);
+  const entries = await historyLength(page);
+
+  await typeSearch(page, "gra");
+  await expect(page).toHaveURL(/\/plugins$/);
+  expect(await historyLength(page)).toBe(entries);
+
+  await page.keyboard.press("Enter");
+  await expect(page).toHaveURL(/\/plugins\/all\?q=gra$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Results for “gra”/ })).toBeVisible();
+  expect(await historyLength(page)).toBe(entries + 1);
+
+  await page.goBack();
+  await expect(page).toHaveURL(/\/plugins$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Plugins/ })).toBeVisible();
+});
+
+test("filters browse results as you type in one history entry", async ({ page }) => {
   await page.goto("/");
   await page.goto("/plugins/all");
-  await searchPlugins(page, "graphite");
-  await expect(page).toHaveURL(/\/plugins\/all\?q=graphite$/);
+  const entries = await historyLength(page);
+
+  await typeSearch(page, "gra");
+  await expect(page).toHaveURL(/\/plugins\/all\?q=gra$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Results for “gra”/ })).toBeVisible();
+  await expect(page.getByRole("main").getByRole("link", { name: /Graphite/ })).toBeVisible();
+  await expect(page.getByRole("link", { name: /Dracula/ })).toHaveCount(0);
+  expect(await historyLength(page)).toBe(entries + 1);
+
   await page.goBack();
-  await expect(page).toHaveURL(/\/$/);
+  await expect(page).toHaveURL(/\/plugins\/all$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^All plugins/ })).toBeVisible();
+  await expect(page.getByRole("searchbox", { name: "Search plugins" })).toHaveValue("");
+
+  await page.goForward();
+  await expect(page).toHaveURL(/\/plugins\/all\?q=gra$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Results for “gra”/ })).toBeVisible();
+  await expect(page.getByRole("searchbox", { name: "Search plugins" })).toHaveValue("gra");
+
+  await page.reload();
+  await expect(page.getByRole("heading", { level: 1, name: /^Results for “gra”/ })).toBeVisible();
+  await expect(page.getByRole("searchbox", { name: "Search plugins" })).toHaveValue("gra");
 });
 
 test("keeps old category links working", async ({ page }) => {
@@ -262,6 +301,19 @@ async function searchPlugins(page: Page, term: string) {
   await page.getByRole("searchbox", { name: "Search plugins" }).fill(term);
 }
 
+async function submitSearch(page: Page, term: string) {
+  await searchPlugins(page, term);
+  await page.keyboard.press("Enter");
+}
+
+async function typeSearch(page: Page, term: string) {
+  await page.getByRole("searchbox", { name: "Search plugins" }).pressSequentially(term);
+}
+
+async function historyLength(page: Page): Promise<number> {
+  return page.evaluate(() => window.history.length);
+}
+
 async function expectPageMetadata(page: Page, title: string, path: string) {
   await expect(page).toHaveTitle(title);
   await expect(page.locator('link[rel="canonical"]')).toHaveAttribute(
diff --git a/packages/website/src/plugins/browse-page.tsx b/packages/website/src/plugins/browse-page.tsx
index a6d77347fe..569eb44ab7 100644
--- a/packages/website/src/plugins/browse-page.tsx
+++ b/packages/website/src/plugins/browse-page.tsx
@@ -56,7 +56,7 @@ export function BrowsePage({
     <SiteShell width="wide">
       <div className="lg:flex lg:gap-12">
         <aside className="mb-8 lg:mb-0 lg:w-48 lg:flex-shrink-0">
-          <PluginSearch scope={query} className="mb-4 lg:mb-6" />
+          <PluginSearch scope={query} live className="mb-4 lg:mb-6" />
           <CategoryNav plugins={matches} query={query} />
         </aside>
         <div className="min-w-0 flex-1">
diff --git a/packages/website/src/plugins/plugin-search.tsx b/packages/website/src/plugins/plugin-search.tsx
index 042e5e81e5..fdd3a4b5f5 100644
--- a/packages/website/src/plugins/plugin-search.tsx
+++ b/packages/website/src/plugins/plugin-search.tsx
@@ -1,37 +1,67 @@
-import { useNavigate } from "@tanstack/react-router";
+import { useNavigate, useRouter } from "@tanstack/react-router";
 import { Search, X } from "lucide-react";
-import { type ChangeEvent, type FormEvent, useCallback, useRef, useState } from "react";
-import { type BrowseQuery, browseHref, DEFAULT_WINDOW } from "./links";
+import { type ChangeEvent, type FormEvent, useCallback, useEffect, useRef, useState } from "react";
+import { type BrowseQuery, browseHref, DEFAULT_WINDOW, parseSearchTerm } from "./links";
 
 const ICON_CLASS = "h-3.5 w-3.5 text-extra-muted-foreground";
 
 /**
- * Search box for the plugin pages. Typing replaces the URL with the browse page for the term,
- * keeping `scope`'s category and sort. Without JavaScript the form submits the same URL.
+ * Search box for the plugin pages. Submitting opens the browse page for the term, keeping
+ * `scope`'s category and sort. With `live`, typing filters in place instead: the first character
+ * of a query pushes one history entry and later edits replace it, so Back leaves the search.
+ * Without JavaScript the form submits the same URL.
  */
-export function PluginSearch({ scope, className }: { scope: BrowseQuery; className?: string }) {
+export function PluginSearch({
+  scope,
+  live = false,
+  className,
+}: {
+  scope: BrowseQuery;
+  live?: boolean;
+  className?: string;
+}) {
   const navigate = useNavigate();
+  const router = useRouter();
   const input = useRef<HTMLInputElement>(null);
   const [term, setTerm] = useState(scope.q ?? "");
-  const search = useCallback(
-    (next: string) => {
-      setTerm(next);
-      void navigate({
-        href: browseHref({ ...scope, q: next.trim() ? next : undefined }),
-        replace: true,
-      });
+  // Back and Forward between results of the same page keep this box mounted; show their term.
+  useEffect(
+    () =>
+      router.history.subscribe(({ location, action }) => {
+        if (action.type === "PUSH" || action.type === "REPLACE") return;
+        setTerm(parseSearchTerm(new URLSearchParams(location.search).get("q")) ?? "");
+      }),
+    [router],
+  );
+  const show = useCallback(
+    (next: string, { replace }: { replace: boolean }) => {
+      void navigate({ href: browseHref({ ...scope, q: next.trim() ? next : undefined }), replace });
     },
     [navigate, scope],
   );
+  const edit = useCallback(
+    (next: string) => {
+      setTerm(next);
+      if (live) show(next, { replace: Boolean(term.trim()) });
+    },
+    [live, show, term],
+  );
   const handleChange = useCallback(
-    (event: ChangeEvent<HTMLInputElement>) => search(event.target.value),
-    [search],
+    (event: ChangeEvent<HTMLInputElement>) => edit(event.target.value),
+    [edit],
   );
   const handleClear = useCallback(() => {
-    search("");
+    edit("");
     input.current?.focus();
-  }, [search]);
-  const handleSubmit = useCallback((event: FormEvent) => event.preventDefault(), []);
+  }, [edit]);
+  const handleSubmit = useCallback(
+    (event: FormEvent) => {
+      event.preventDefault();
+      // Live results already show the term.
+      if (!live) show(term, { replace: false });
+    },
+    [live, show, term],
+  );
   return (
     <form
       role="search"

From 2ecf3ba783b965f2f09c878e3e70024cc99ce68b Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 6 Oct 2026 21:56:27 +0200
Subject: [PATCH 016/270] Keep an archived agent archived when a send to it
 fails (#6255)

* Keep an archived agent archived when a send to it fails

Sending a message to an archived agent unarchives it before loading the
session. When loading failed, for example because the agent's working
directory was removed, the agent stayed unarchived. The send now restores
the original archive timestamp when it fails, matching resume_agent.

Closes #6245

* Restore the archive only when the send cannot load the agent

Concurrent sends share one load, so a failed load leaves no session for
the restore to close. A failure after the load no longer re-archives an
agent another send may already be running.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../server/src/server/agent/agent-prompt.ts   | 24 ++++++++++++++-----
 .../src/server/daemon-client.e2e.test.ts      | 23 ++++++++++++++++++
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/server/agent/agent-prompt.ts b/packages/server/src/server/agent/agent-prompt.ts
index 41e2d52014..0bcd46636a 100644
--- a/packages/server/src/server/agent/agent-prompt.ts
+++ b/packages/server/src/server/agent/agent-prompt.ts
@@ -309,18 +309,30 @@ export async function sendPromptToAgent(
   const unarchive = params.unarchive ?? true;
 
   const record = await params.agentStorage.get(params.agentId);
+  let archivedAtToRestore: string | null = null;
   if (record?.archivedAt) {
     if (!unarchive) {
       return { disposition: "turn_started" };
     }
-    await unarchiveAgentState(params.agentStorage, params.agentManager, params.agentId);
+    if (await unarchiveAgentState(params.agentStorage, params.agentManager, params.agentId)) {
+      archivedAtToRestore = record.archivedAt;
+    }
   }
 
-  await ensureAgentLoaded(params.agentId, {
-    agentManager: params.agentManager,
-    agentStorage: params.agentStorage,
-    logger: params.logger,
-  });
+  try {
+    await ensureAgentLoaded(params.agentId, {
+      agentManager: params.agentManager,
+      agentStorage: params.agentStorage,
+      logger: params.logger,
+    });
+  } catch (error) {
+    // A send that could not load the agent leaves it where it was: still archived.
+    // Concurrent sends share this load, so none of them holds a live session.
+    if (archivedAtToRestore) {
+      await params.agentManager.archiveSnapshot(params.agentId, archivedAtToRestore);
+    }
+    throw error;
+  }
 
   if (params.sessionMode) {
     await params.agentManager.setAgentMode(params.agentId, params.sessionMode);
diff --git a/packages/server/src/server/daemon-client.e2e.test.ts b/packages/server/src/server/daemon-client.e2e.test.ts
index f429cb672c..0bc3310b41 100644
--- a/packages/server/src/server/daemon-client.e2e.test.ts
+++ b/packages/server/src/server/daemon-client.e2e.test.ts
@@ -831,6 +831,29 @@ test("send_agent_message auto-unarchives archived agents", async () => {
   }
 }, 180000);
 
+test("send_agent_message leaves an archived agent archived when its directory is gone", async () => {
+  const cwd = tmpCwd();
+  try {
+    const created = await ctx.client.createAgent({
+      config: {
+        ...getFullAccessConfig("codex"),
+        cwd,
+      },
+    });
+    const archived = await ctx.client.archiveAgent(created.id);
+    rmSync(cwd, { recursive: true, force: true });
+
+    await expect(ctx.client.sendMessage(created.id, "hello")).rejects.toThrow(
+      "Working directory does not exist",
+    );
+
+    const afterSend = await ctx.client.fetchAgent({ agentId: created.id });
+    expect(afterSend?.agent.archivedAt).toBe(archived.archivedAt);
+  } finally {
+    rmSync(cwd, { recursive: true, force: true });
+  }
+}, 30000);
+
 test("refresh_agent auto-unarchives archived agents", async () => {
   const cwd = tmpCwd();
   try {

From cb2b569bbdfd593c16d7e34079be9eb60c8dc2c5 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 22:15:58 +0200
Subject: [PATCH 017/270] Featured subtitle: hand-picked plugins that show what
 is possible

---
 packages/website/src/routes/plugins/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/website/src/routes/plugins/index.tsx b/packages/website/src/routes/plugins/index.tsx
index 88ab7214e6..231c3eafa9 100644
--- a/packages/website/src/routes/plugins/index.tsx
+++ b/packages/website/src/routes/plugins/index.tsx
@@ -133,7 +133,7 @@ function PluginsPage() {
           <PluginSection labelledBy="featured">
             <div>
               <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
-              <p className="mt-1 text-sm text-muted-foreground">Hand-picked by the maintainer.</p>
+              <p className="mt-1 text-sm text-muted-foreground">Hand-picked plugins that show what is possible</p>
             </div>
             <div className={CARD_ROW_CLASS}>
               {featured.map((plugin) => (

From 66b2567be3b4c942a6e7f42d8b495e28cf416e99 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 22:20:10 +0200
Subject: [PATCH 018/270] Featured: subtitle and a See all plugins link

---
 packages/website/src/routes/plugins/index.tsx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/website/src/routes/plugins/index.tsx b/packages/website/src/routes/plugins/index.tsx
index 231c3eafa9..d686b98a4e 100644
--- a/packages/website/src/routes/plugins/index.tsx
+++ b/packages/website/src/routes/plugins/index.tsx
@@ -131,10 +131,16 @@ function PluginsPage() {
       <div className="mt-10 flex flex-col gap-14">
         {featured.length > 0 && (
           <PluginSection labelledBy="featured">
-            <div>
-              <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
-              <p className="mt-1 text-sm text-muted-foreground">Hand-picked plugins that show what is possible</p>
-            </div>
+            <PluginSectionHeader>
+              <div>
+                <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
+                <p className="mt-1 text-sm text-muted-foreground">A selection of hand picked plugins</p>
+              </div>
+              <a href={browseHref({ sort: "installs", window: DEFAULT_WINDOW })} className={SEE_ALL_CLASS}>
+                See all plugins
+                <ChevronRight className="h-3.5 w-3.5" />
+              </a>
+            </PluginSectionHeader>
             <div className={CARD_ROW_CLASS}>
               {featured.map((plugin) => (
                 <NewPluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />

From 72c180aaf733003d58e46faa605145b2a4fddfc3 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 22:23:50 +0200
Subject: [PATCH 019/270] website: plugins section spacing with margins, not
 flex gaps

PluginSection takes its header as a prop and puts the content 32px
below it with a margin. Sections on the index are 56px apart via
space-y. The browse page h1 sits 32px above the sort tabs, matching
the index headings.
---
 packages/website/src/plugins/browse-page.tsx  |  5 +-
 packages/website/src/plugins/section.tsx      | 11 ++-
 packages/website/src/routes/plugins/index.tsx | 91 ++++++++++++-------
 3 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/packages/website/src/plugins/browse-page.tsx b/packages/website/src/plugins/browse-page.tsx
index 569eb44ab7..95a925db2b 100644
--- a/packages/website/src/plugins/browse-page.tsx
+++ b/packages/website/src/plugins/browse-page.tsx
@@ -60,7 +60,7 @@ export function BrowsePage({
           <CategoryNav plugins={matches} query={query} />
         </aside>
         <div className="min-w-0 flex-1">
-          <div className="mb-6 flex items-baseline justify-between gap-4">
+          <div className="mb-8 flex items-baseline justify-between gap-4">
             <h1 className="text-3xl font-medium tracking-tight">
               {query.q ? `Results for “${query.q}”${category ? ` in ${title}` : ""}` : title}
               <span className="ml-3 align-middle text-sm font-normal tabular-nums text-extra-muted-foreground">
@@ -73,8 +73,7 @@ export function BrowsePage({
               </a>
             )}
           </div>
-          <PluginSection>
-            <SortTabs query={query} />
+          <PluginSection header={<SortTabs query={query} />}>
             {results.length === 0 && query.q && (
               <div className="rounded-xl border border-white/10 bg-white/[0.03] px-4 py-10 text-center">
                 <p className="text-sm text-muted-foreground">No plugins match.</p>
diff --git a/packages/website/src/plugins/section.tsx b/packages/website/src/plugins/section.tsx
index 690a758fde..f873457a75 100644
--- a/packages/website/src/plugins/section.tsx
+++ b/packages/website/src/plugins/section.tsx
@@ -1,20 +1,23 @@
 import type { ReactNode } from "react";
 
-/** A block of a plugins page: its header, then its content one fixed gap below. */
+/** A block of a plugins page: its header, then its content 32px below. */
 export function PluginSection({
   id,
   labelledBy,
-  className = "",
+  className,
+  header,
   children,
 }: {
   id?: string;
   labelledBy?: string;
   className?: string;
+  header: ReactNode;
   children: ReactNode;
 }) {
   return (
-    <section id={id} aria-labelledby={labelledBy} className={`flex flex-col gap-8 ${className}`}>
-      {children}
+    <section id={id} aria-labelledby={labelledBy} className={className}>
+      {header}
+      <div className="mt-8">{children}</div>
     </section>
   );
 }
diff --git a/packages/website/src/routes/plugins/index.tsx b/packages/website/src/routes/plugins/index.tsx
index d686b98a4e..b694b2147a 100644
--- a/packages/website/src/routes/plugins/index.tsx
+++ b/packages/website/src/routes/plugins/index.tsx
@@ -128,19 +128,31 @@ function PluginsPage() {
         </div>
       </div>
 
-      <div className="mt-10 flex flex-col gap-14">
+      <div className="mt-10 space-y-14">
         {featured.length > 0 && (
-          <PluginSection labelledBy="featured">
-            <PluginSectionHeader>
-              <div>
-                <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
-                <p className="mt-1 text-sm text-muted-foreground">A selection of hand picked plugins</p>
-              </div>
-              <a href={browseHref({ sort: "installs", window: DEFAULT_WINDOW })} className={SEE_ALL_CLASS}>
-                See all plugins
-                <ChevronRight className="h-3.5 w-3.5" />
-              </a>
-            </PluginSectionHeader>
+          <PluginSection
+            labelledBy="featured"
+            header={
+              <PluginSectionHeader>
+                <div>
+                  <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
+                  <p className="mt-1 text-sm text-muted-foreground">
+                    A selection of hand picked plugins
+                  </p>
+                </div>
+                <a
+                  href={browseHref({
+                    sort: "installs",
+                    window: DEFAULT_WINDOW,
+                  })}
+                  className={SEE_ALL_CLASS}
+                >
+                  See all plugins
+                  <ChevronRight className="h-3.5 w-3.5" />
+                </a>
+              </PluginSectionHeader>
+            }
+          >
             <div className={CARD_ROW_CLASS}>
               {featured.map((plugin) => (
                 <NewPluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
@@ -149,14 +161,21 @@ function PluginsPage() {
           </PluginSection>
         )}
 
-        <PluginSection labelledBy="whats-new">
-          <PluginSectionHeader>
-            <PluginSectionTitle id="whats-new">What’s new</PluginSectionTitle>
-            <a href={browseHref({ sort: "new", window: DEFAULT_WINDOW })} className={SEE_ALL_CLASS}>
-              See all
-              <ChevronRight className="h-3.5 w-3.5" />
-            </a>
-          </PluginSectionHeader>
+        <PluginSection
+          labelledBy="whats-new"
+          header={
+            <PluginSectionHeader>
+              <PluginSectionTitle id="whats-new">What’s new</PluginSectionTitle>
+              <a
+                href={browseHref({ sort: "new", window: DEFAULT_WINDOW })}
+                className={SEE_ALL_CLASS}
+              >
+                See all
+                <ChevronRight className="h-3.5 w-3.5" />
+              </a>
+            </PluginSectionHeader>
+          }
+        >
           <div className={CARD_ROW_CLASS}>
             {newest.map((plugin) => (
               <NewPluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
@@ -164,8 +183,10 @@ function PluginsPage() {
           </div>
         </PluginSection>
 
-        <PluginSection labelledBy="categories">
-          <PluginSectionTitle id="categories">Categories</PluginSectionTitle>
+        <PluginSection
+          labelledBy="categories"
+          header={<PluginSectionTitle id="categories">Categories</PluginSectionTitle>}
+        >
           <div className="grid grid-cols-2 gap-2 sm:grid-cols-3">
             {CATEGORIES.map((category) => {
               const Icon = CATEGORY_ICONS[category.slug];
@@ -192,19 +213,21 @@ function PluginsPage() {
           id="most-installed"
           labelledBy="most-installed-title"
           className="scroll-mt-8"
+          header={
+            <PluginSectionHeader>
+              <PluginSectionTitle id="most-installed-title">
+                <a
+                  href={browseHref({ sort: "installs", window })}
+                  className="group inline-flex items-center gap-1"
+                >
+                  Most installed
+                  <ChevronRight className="h-4 w-4 text-muted-foreground transition-colors group-hover:text-foreground" />
+                </a>
+              </PluginSectionTitle>
+              <WindowSwitch current={window} hrefs={windowHrefs} />
+            </PluginSectionHeader>
+          }
         >
-          <PluginSectionHeader>
-            <PluginSectionTitle id="most-installed-title">
-              <a
-                href={browseHref({ sort: "installs", window })}
-                className="group inline-flex items-center gap-1"
-              >
-                Most installed
-                <ChevronRight className="h-4 w-4 text-muted-foreground transition-colors group-hover:text-foreground" />
-              </a>
-            </PluginSectionTitle>
-            <WindowSwitch current={window} hrefs={windowHrefs} />
-          </PluginSectionHeader>
           <div className="-mx-4 grid gap-x-8 md:grid-cols-2">
             {top.map((plugin, index) => (
               <PluginRankRow

From c5deaa0516c0af9befaa48759e44bc0f93666ebc Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 22:30:39 +0200
Subject: [PATCH 020/270] Revert "website: plugins section spacing with
 margins, not flex gaps"

This reverts commit 72c180aaf733003d58e46faa605145b2a4fddfc3.
---
 packages/website/src/plugins/browse-page.tsx  |  5 +-
 packages/website/src/plugins/section.tsx      | 11 +--
 packages/website/src/routes/plugins/index.tsx | 91 +++++++------------
 3 files changed, 41 insertions(+), 66 deletions(-)

diff --git a/packages/website/src/plugins/browse-page.tsx b/packages/website/src/plugins/browse-page.tsx
index 95a925db2b..569eb44ab7 100644
--- a/packages/website/src/plugins/browse-page.tsx
+++ b/packages/website/src/plugins/browse-page.tsx
@@ -60,7 +60,7 @@ export function BrowsePage({
           <CategoryNav plugins={matches} query={query} />
         </aside>
         <div className="min-w-0 flex-1">
-          <div className="mb-8 flex items-baseline justify-between gap-4">
+          <div className="mb-6 flex items-baseline justify-between gap-4">
             <h1 className="text-3xl font-medium tracking-tight">
               {query.q ? `Results for “${query.q}”${category ? ` in ${title}` : ""}` : title}
               <span className="ml-3 align-middle text-sm font-normal tabular-nums text-extra-muted-foreground">
@@ -73,7 +73,8 @@ export function BrowsePage({
               </a>
             )}
           </div>
-          <PluginSection header={<SortTabs query={query} />}>
+          <PluginSection>
+            <SortTabs query={query} />
             {results.length === 0 && query.q && (
               <div className="rounded-xl border border-white/10 bg-white/[0.03] px-4 py-10 text-center">
                 <p className="text-sm text-muted-foreground">No plugins match.</p>
diff --git a/packages/website/src/plugins/section.tsx b/packages/website/src/plugins/section.tsx
index f873457a75..690a758fde 100644
--- a/packages/website/src/plugins/section.tsx
+++ b/packages/website/src/plugins/section.tsx
@@ -1,23 +1,20 @@
 import type { ReactNode } from "react";
 
-/** A block of a plugins page: its header, then its content 32px below. */
+/** A block of a plugins page: its header, then its content one fixed gap below. */
 export function PluginSection({
   id,
   labelledBy,
-  className,
-  header,
+  className = "",
   children,
 }: {
   id?: string;
   labelledBy?: string;
   className?: string;
-  header: ReactNode;
   children: ReactNode;
 }) {
   return (
-    <section id={id} aria-labelledby={labelledBy} className={className}>
-      {header}
-      <div className="mt-8">{children}</div>
+    <section id={id} aria-labelledby={labelledBy} className={`flex flex-col gap-8 ${className}`}>
+      {children}
     </section>
   );
 }
diff --git a/packages/website/src/routes/plugins/index.tsx b/packages/website/src/routes/plugins/index.tsx
index b694b2147a..d686b98a4e 100644
--- a/packages/website/src/routes/plugins/index.tsx
+++ b/packages/website/src/routes/plugins/index.tsx
@@ -128,31 +128,19 @@ function PluginsPage() {
         </div>
       </div>
 
-      <div className="mt-10 space-y-14">
+      <div className="mt-10 flex flex-col gap-14">
         {featured.length > 0 && (
-          <PluginSection
-            labelledBy="featured"
-            header={
-              <PluginSectionHeader>
-                <div>
-                  <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
-                  <p className="mt-1 text-sm text-muted-foreground">
-                    A selection of hand picked plugins
-                  </p>
-                </div>
-                <a
-                  href={browseHref({
-                    sort: "installs",
-                    window: DEFAULT_WINDOW,
-                  })}
-                  className={SEE_ALL_CLASS}
-                >
-                  See all plugins
-                  <ChevronRight className="h-3.5 w-3.5" />
-                </a>
-              </PluginSectionHeader>
-            }
-          >
+          <PluginSection labelledBy="featured">
+            <PluginSectionHeader>
+              <div>
+                <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
+                <p className="mt-1 text-sm text-muted-foreground">A selection of hand picked plugins</p>
+              </div>
+              <a href={browseHref({ sort: "installs", window: DEFAULT_WINDOW })} className={SEE_ALL_CLASS}>
+                See all plugins
+                <ChevronRight className="h-3.5 w-3.5" />
+              </a>
+            </PluginSectionHeader>
             <div className={CARD_ROW_CLASS}>
               {featured.map((plugin) => (
                 <NewPluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
@@ -161,21 +149,14 @@ function PluginsPage() {
           </PluginSection>
         )}
 
-        <PluginSection
-          labelledBy="whats-new"
-          header={
-            <PluginSectionHeader>
-              <PluginSectionTitle id="whats-new">What’s new</PluginSectionTitle>
-              <a
-                href={browseHref({ sort: "new", window: DEFAULT_WINDOW })}
-                className={SEE_ALL_CLASS}
-              >
-                See all
-                <ChevronRight className="h-3.5 w-3.5" />
-              </a>
-            </PluginSectionHeader>
-          }
-        >
+        <PluginSection labelledBy="whats-new">
+          <PluginSectionHeader>
+            <PluginSectionTitle id="whats-new">What’s new</PluginSectionTitle>
+            <a href={browseHref({ sort: "new", window: DEFAULT_WINDOW })} className={SEE_ALL_CLASS}>
+              See all
+              <ChevronRight className="h-3.5 w-3.5" />
+            </a>
+          </PluginSectionHeader>
           <div className={CARD_ROW_CLASS}>
             {newest.map((plugin) => (
               <NewPluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
@@ -183,10 +164,8 @@ function PluginsPage() {
           </div>
         </PluginSection>
 
-        <PluginSection
-          labelledBy="categories"
-          header={<PluginSectionTitle id="categories">Categories</PluginSectionTitle>}
-        >
+        <PluginSection labelledBy="categories">
+          <PluginSectionTitle id="categories">Categories</PluginSectionTitle>
           <div className="grid grid-cols-2 gap-2 sm:grid-cols-3">
             {CATEGORIES.map((category) => {
               const Icon = CATEGORY_ICONS[category.slug];
@@ -213,21 +192,19 @@ function PluginsPage() {
           id="most-installed"
           labelledBy="most-installed-title"
           className="scroll-mt-8"
-          header={
-            <PluginSectionHeader>
-              <PluginSectionTitle id="most-installed-title">
-                <a
-                  href={browseHref({ sort: "installs", window })}
-                  className="group inline-flex items-center gap-1"
-                >
-                  Most installed
-                  <ChevronRight className="h-4 w-4 text-muted-foreground transition-colors group-hover:text-foreground" />
-                </a>
-              </PluginSectionTitle>
-              <WindowSwitch current={window} hrefs={windowHrefs} />
-            </PluginSectionHeader>
-          }
         >
+          <PluginSectionHeader>
+            <PluginSectionTitle id="most-installed-title">
+              <a
+                href={browseHref({ sort: "installs", window })}
+                className="group inline-flex items-center gap-1"
+              >
+                Most installed
+                <ChevronRight className="h-4 w-4 text-muted-foreground transition-colors group-hover:text-foreground" />
+              </a>
+            </PluginSectionTitle>
+            <WindowSwitch current={window} hrefs={windowHrefs} />
+          </PluginSectionHeader>
           <div className="-mx-4 grid gap-x-8 md:grid-cols-2">
             {top.map((plugin, index) => (
               <PluginRankRow

From aaeefdc00b4cef4c862bc34543a364701f1d0e7f Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 22:30:40 +0200
Subject: [PATCH 021/270] website: 80px between the site header and the page
 content

---
 packages/website/src/components/site-shell.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/website/src/components/site-shell.tsx b/packages/website/src/components/site-shell.tsx
index 662f9f50f9..2c0a38f795 100644
--- a/packages/website/src/components/site-shell.tsx
+++ b/packages/website/src/components/site-shell.tsx
@@ -18,7 +18,7 @@ export function SiteShell({ children, width }: SiteShellProps) {
   return (
     <div className="min-h-screen bg-background">
       <main className={mainClasses}>
-        <div className="mb-12">
+        <div className="mb-20">
           <SiteHeader />
         </div>
         {children}

From 50cf244e865012b79c38ead4cd5814f420c56651 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 22:31:42 +0200
Subject: [PATCH 022/270] website e2e: expect the current Featured subtitle

---
 packages/website/e2e/plugins.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index d41a9f3fe4..da668a6c60 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -451,7 +451,7 @@ test.describe("registry fixture layout", () => {
     await openPlugins(page);
     await expect(page.getByRole("heading", { level: 2 }).first()).toHaveText("Featured");
     const featured = page.getByRole("region", { name: "Featured" });
-    await expect(featured).toContainText("Hand-picked by the maintainer.");
+    await expect(featured).toContainText("A selection of hand picked plugins");
     await expect(featured.getByRole("link", { name: /Added/ })).toHaveText([
       /Dracula/,
       /Herald/,

From 3f1a04304d53b771cd4b633f40af8fef5aca73b1 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 21:49:25 +0100
Subject: [PATCH 023/270] website: plugin gallery peeks a third tile, viewer
 steps with arrows (#6261)

* website: gallery peeks a third tile, viewer steps with arrows

With three or more items the strip sizes tiles at 42% from md up so a
third tile is cut at the right edge. The viewer gains Previous and Next
buttons and Left/Right arrow keys, wrapping at the ends; moving away
from a video unmounts it, which stops playback.

* website: format the plugins directory route
---
 packages/website/e2e/plugins.spec.ts          |  66 +++++++++
 .../website/src/plugins/media-gallery.tsx     | 127 ++++++++++++++----
 packages/website/src/routes/plugins/index.tsx |   9 +-
 3 files changed, 173 insertions(+), 29 deletions(-)

diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index da668a6c60..9d2b3af8aa 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -424,6 +424,61 @@ test.describe("registry fixture layout", () => {
     await expect(viewer).toBeHidden();
   });
 
+  test("peeks the next gallery tile at the strip's edge, and fills the row with two", async ({
+    page,
+  }) => {
+    // Wide screens show two tiles and part of the third; phones show one and part of the second.
+    for (const [width, expected] of [
+      [1280, [1, 1, "peeks"]],
+      [375, [1, "peeks", 0]],
+    ] as const) {
+      await page.setViewportSize({ width, height: 720 });
+      await page.goto("/plugins/omercnet/dracula");
+      const three = page.getByRole("link", { name: /^Dracula (screenshot|video) \d$/ });
+      const shares = await three.evaluateAll(visibleShares);
+      expect(shares.map((share) => (share > 0.1 && share < 0.5 ? "peeks" : share))).toEqual(
+        expected,
+      );
+    }
+
+    await page.setViewportSize({ width: 1280, height: 720 });
+    await page.goto("/plugins/gpambrozio/herald");
+    const two = page.getByRole("link", { name: /^Herald screenshot \d$/ });
+    expect(await two.evaluateAll(visibleShares)).toEqual([1, 1]);
+  });
+
+  test("steps through the viewer with arrow keys and buttons, wrapping at the ends", async ({
+    page,
+  }) => {
+    await page.goto("/plugins/omercnet/dracula");
+    const tiles = page.getByRole("link", { name: /^Dracula (screenshot|video) \d$/ });
+    const viewer = page.getByRole("dialog");
+    const shows = (name: string) =>
+      expect(
+        viewer.getByRole("img", { name, exact: true }).or(viewer.getByLabel(name, { exact: true })),
+      ).toBeVisible();
+
+    await tiles.nth(1).click();
+    await expect.poll(() => viewer.getByLabel("Dracula video 2").evaluate(isPaused)).toBe(false);
+    await page.keyboard.press("ArrowRight");
+    await shows("Dracula screenshot 3");
+    await expect(page.locator("dialog video")).toHaveCount(0);
+    await page.keyboard.press("ArrowRight");
+    await shows("Dracula screenshot 1");
+    await viewer.getByRole("img").click();
+    await page.keyboard.press("ArrowLeft");
+    await shows("Dracula screenshot 3");
+
+    await viewer.getByRole("button", { name: "Previous" }).click();
+    await shows("Dracula video 2");
+    await viewer.getByRole("button", { name: "Next" }).click();
+    await shows("Dracula screenshot 3");
+    await viewer.getByRole("button", { name: "Next" }).click();
+    await shows("Dracula screenshot 1");
+    await page.keyboard.press("Escape");
+    await expect(viewer).toBeHidden();
+  });
+
   test("keeps a video that fails to load visible in the viewer", async ({ page }) => {
     const plugin = registry.plugins.find((entry) => entry.id === "gpambrozio/launchd-jobs")!;
     await page.route(plugin.media[0], (route) => route.abort());
@@ -432,6 +487,7 @@ test.describe("registry fixture layout", () => {
     const video = page.getByRole("dialog").getByLabel("launchd Jobs video 1");
     await expect(video).toBeVisible();
     await expect(video).toHaveCSS("opacity", "1");
+    await expect(page.getByRole("button", { name: "Next" })).toHaveCount(0);
   });
 
   test("shows the plugin tile on cards when its media has no image", async ({ page }) => {
@@ -481,6 +537,16 @@ function galleryTiles(links: Element[]) {
   }));
 }
 
+/** How much of each tile's width the gallery strip shows, rounded to hundredths. */
+function visibleShares(links: Element[]) {
+  const strip = links[0].parentElement!.getBoundingClientRect();
+  return links.map((link) => {
+    const tile = link.getBoundingClientRect();
+    const shown = Math.min(tile.right, strip.right) - Math.max(tile.left, strip.left);
+    return Math.round((Math.max(shown, 0) / tile.width) * 100) / 100;
+  });
+}
+
 /** The share of the viewer's room the media fills along its limiting axis; 1 fills it. */
 function viewerFill(media: HTMLElement) {
   const box = media.getBoundingClientRect();
diff --git a/packages/website/src/plugins/media-gallery.tsx b/packages/website/src/plugins/media-gallery.tsx
index 5fe47c4631..ac25a6f53e 100644
--- a/packages/website/src/plugins/media-gallery.tsx
+++ b/packages/website/src/plugins/media-gallery.tsx
@@ -1,8 +1,9 @@
 import { pluginOverviewPolicy, pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
 import { pluginMediaKind } from "@getpaseo/protocol/plugin-registry";
-import { Play, X } from "lucide-react";
+import { ChevronLeft, ChevronRight, Play, X } from "lucide-react";
 import {
   type CSSProperties,
+  type KeyboardEvent,
   type MouseEvent,
   type SyntheticEvent,
   useCallback,
@@ -12,11 +13,17 @@ import {
 } from "react";
 
 const TILE_CLASS =
-  "relative block aspect-video w-[85%] flex-shrink-0 overflow-hidden rounded-xl border border-white/10 bg-white/[0.03] sm:w-[60%] md:w-[calc(50%-0.375rem)]";
+  "relative block aspect-video w-[85%] flex-shrink-0 overflow-hidden rounded-xl border border-white/10 bg-white/[0.03] sm:w-[60%]";
+// Two tiles fill the row; with more, a third peeks at the right edge to show the strip scrolls.
+const FILLING_TILE_CLASS = `${TILE_CLASS} md:w-[calc(50%-0.375rem)]`;
+const PEEKING_TILE_CLASS = `${TILE_CLASS} md:w-[42%]`;
 // The viewer's room: media never exceeds this box, which leaves a margin around it.
 const VIEW_WIDTH = "90vw";
 const VIEW_HEIGHT = "85vh";
 const VIEW_CLASS = "max-h-[85vh] max-w-[90vw] rounded-lg object-contain";
+const VIEWER_BUTTON_CLASS =
+  "fixed rounded-full bg-black/60 p-2 text-white transition-colors hover:bg-black/80";
+const ARROW_STEPS: Partial<Record<string, number>> = { ArrowLeft: -1, ArrowRight: 1 };
 
 interface MediaItem {
   url: string;
@@ -28,46 +35,96 @@ interface MediaItem {
 /** Plugin media in registry order. Each tile opens the viewer; without JavaScript it links to the file. */
 export function MediaGallery({ name, media }: { name: string; media: string[] }) {
   const dialog = useRef<HTMLDialogElement>(null);
-  const [viewing, setViewing] = useState<MediaItem | null>(null);
-  const open = useCallback((item: MediaItem) => {
-    setViewing(item);
-    dialog.current?.showModal();
-  }, []);
+  const entries = useMemo(
+    () => media.map((url, index) => mediaEntry(name, url, index)),
+    [name, media],
+  );
+  const items = useMemo(() => entries.filter((entry) => typeof entry !== "string"), [entries]);
+  const [viewing, setViewing] = useState<number | null>(null);
+  const item = viewing === null ? undefined : items[viewing];
+  const open = useCallback(
+    (opened: MediaItem) => {
+      setViewing(items.indexOf(opened));
+      dialog.current?.showModal();
+    },
+    [items],
+  );
   const close = useCallback(() => dialog.current?.close(), []);
   // Unmounting the viewed media stops a playing video.
   const handleClose = useCallback(() => setViewing(null), []);
   const closeOnBackdrop = useCallback((event: MouseEvent<HTMLDialogElement>) => {
     if (event.target === event.currentTarget) event.currentTarget.close();
   }, []);
+  const step = useCallback(
+    (by: number) =>
+      setViewing((index) => (index === null ? null : (index + by + items.length) % items.length)),
+    [items.length],
+  );
+  const showPrevious = useCallback(() => step(-1), [step]);
+  const showNext = useCallback(() => step(1), [step]);
+  // Captured so arrow keys move between items even while a focused video would seek.
+  const stepWithArrowKeys = useCallback(
+    (event: KeyboardEvent<HTMLDialogElement>) => {
+      const by = ARROW_STEPS[event.key];
+      if (by === undefined || items.length < 2) return;
+      event.preventDefault();
+      step(by);
+    },
+    [items.length, step],
+  );
 
   if (media.length === 0) return null;
+  const tileClass = items.length > 2 ? PEEKING_TILE_CLASS : FILLING_TILE_CLASS;
   return (
     <>
       <div className="-mx-6 mt-10 flex gap-3 overflow-x-auto px-6 md:mx-0 md:px-0">
-        {media.map((url, index) => {
-          const source = pluginOverviewUrl(url);
-          if (!source) return <p key={url}>{url}</p>;
-          const kind = pluginMediaKind(source);
-          const label = `${name} ${kind === "video" ? "video" : "screenshot"} ${index + 1}`;
-          return <MediaTile key={url} url={source} kind={kind} label={label} onOpen={open} />;
-        })}
+        {entries.map((entry) =>
+          typeof entry === "string" ? (
+            <p key={entry}>{entry}</p>
+          ) : (
+            <MediaTile key={entry.url} item={entry} className={tileClass} onOpen={open} />
+          ),
+        )}
       </div>
+      {/* Focusable so arrow keys still reach it after a click on non-focusable media. */}
       <dialog
         ref={dialog}
-        aria-label={viewing?.label}
+        tabIndex={-1}
+        aria-label={item?.label}
         onClose={handleClose}
         onClick={closeOnBackdrop}
-        className="m-auto overflow-visible bg-transparent p-0 backdrop:bg-black/80"
+        onKeyDownCapture={stepWithArrowKeys}
+        className="m-auto overflow-visible bg-transparent p-0 outline-none backdrop:bg-black/80"
       >
-        {viewing?.kind === "image" && (
-          <img src={viewing.url} alt={viewing.label} className={VIEW_CLASS} />
+        {item?.kind === "image" && (
+          <img key={viewing} src={item.url} alt={item.label} className={VIEW_CLASS} />
+        )}
+        {item?.kind === "video" && <ViewerVideo key={viewing} url={item.url} label={item.label} />}
+        {items.length > 1 && (
+          <>
+            <button
+              type="button"
+              aria-label="Previous"
+              onClick={showPrevious}
+              className={`${VIEWER_BUTTON_CLASS} left-4 top-1/2 -translate-y-1/2`}
+            >
+              <ChevronLeft className="h-5 w-5" />
+            </button>
+            <button
+              type="button"
+              aria-label="Next"
+              onClick={showNext}
+              className={`${VIEWER_BUTTON_CLASS} right-4 top-1/2 -translate-y-1/2`}
+            >
+              <ChevronRight className="h-5 w-5" />
+            </button>
+          </>
         )}
-        {viewing?.kind === "video" && <ViewerVideo url={viewing.url} label={viewing.label} />}
         <button
           type="button"
           aria-label="Close"
           onClick={close}
-          className="fixed right-4 top-4 rounded-full bg-black/60 p-2 text-white transition-colors hover:bg-black/80"
+          className={`${VIEWER_BUTTON_CLASS} right-4 top-4`}
         >
           <X className="h-5 w-5" />
         </button>
@@ -76,6 +133,18 @@ export function MediaGallery({ name, media }: { name: string; media: string[] })
   );
 }
 
+/** A registry media entry as a gallery item, or the raw entry when it is not a safe URL. */
+function mediaEntry(name: string, url: string, index: number): MediaItem | string {
+  const source = pluginOverviewUrl(url);
+  if (!source) return url;
+  const kind = pluginMediaKind(source);
+  return {
+    url: source,
+    kind,
+    label: `${name} ${kind === "video" ? "video" : "screenshot"} ${index + 1}`,
+  };
+}
+
 /** Fills the viewer's room at the video's aspect ratio, scaling small sources up. */
 function ViewerVideo({ url, label }: { url: string; label: string }) {
   const [aspectRatio, setAspectRatio] = useState<number | null>(null);
@@ -105,19 +174,23 @@ function ViewerVideo({ url, label }: { url: string; label: string }) {
 }
 
 function MediaTile({
-  url,
-  kind,
-  label,
+  item,
+  className,
   onOpen,
-}: MediaItem & { onOpen: (item: MediaItem) => void }) {
+}: {
+  item: MediaItem;
+  className: string;
+  onOpen: (item: MediaItem) => void;
+}) {
+  const { url, kind, label } = item;
   const handleClick = useCallback(
     (event: MouseEvent<HTMLAnchorElement>) => {
       // Modified clicks keep the link's own behavior, such as opening the file in a new tab.
       if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
       event.preventDefault();
-      onOpen({ url, kind, label });
+      onOpen(item);
     },
-    [onOpen, url, kind, label],
+    [onOpen, item],
   );
   return (
     <a
@@ -125,7 +198,7 @@ function MediaTile({
       {...pluginOverviewPolicy.link}
       aria-label={kind === "video" ? label : undefined}
       onClick={handleClick}
-      className={TILE_CLASS}
+      className={className}
     >
       {kind === "image" ? (
         <img
diff --git a/packages/website/src/routes/plugins/index.tsx b/packages/website/src/routes/plugins/index.tsx
index d686b98a4e..155796a35c 100644
--- a/packages/website/src/routes/plugins/index.tsx
+++ b/packages/website/src/routes/plugins/index.tsx
@@ -134,9 +134,14 @@ function PluginsPage() {
             <PluginSectionHeader>
               <div>
                 <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
-                <p className="mt-1 text-sm text-muted-foreground">A selection of hand picked plugins</p>
+                <p className="mt-1 text-sm text-muted-foreground">
+                  A selection of hand picked plugins
+                </p>
               </div>
-              <a href={browseHref({ sort: "installs", window: DEFAULT_WINDOW })} className={SEE_ALL_CLASS}>
+              <a
+                href={browseHref({ sort: "installs", window: DEFAULT_WINDOW })}
+                className={SEE_ALL_CLASS}
+              >
                 See all plugins
                 <ChevronRight className="h-3.5 w-3.5" />
               </a>

From bdc58fb07c6610181c42b4a981c6a8767ae124ce Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 23:18:12 +0200
Subject: [PATCH 024/270] feat(website): plugins hero, author and description
 on cards, install counts with an icon

The plugins page opens with the directory copy, plugin and author counts,
Submit a plugin and Read the docs, and search. Featured and What's new cards
show the description and the author with avatar; the trailing slot carries
installs on Featured and the added date on What's new. Every install count
on the site is the same download icon and number.
---
 packages/website/src/plugins/author-link.tsx  |  1 +
 packages/website/src/plugins/browse-page.tsx  | 13 +--
 .../website/src/plugins/contribute-links.tsx  | 23 ++++--
 packages/website/src/plugins/hero.tsx         | 38 +++++++++
 .../website/src/plugins/install-count.tsx     | 13 +++
 packages/website/src/plugins/plugin-card.tsx  | 80 +++++++++----------
 packages/website/src/plugins/plugin-tile.tsx  |  1 +
 .../website/src/plugins/thumbnails.test.ts    | 28 +++----
 .../website/src/routes/plugins/$owner.tsx     |  5 +-
 .../src/routes/plugins/$owner_.$slug.tsx      | 11 ++-
 packages/website/src/routes/plugins/index.tsx | 40 +++++-----
 11 files changed, 157 insertions(+), 96 deletions(-)
 create mode 100644 packages/website/src/plugins/hero.tsx
 create mode 100644 packages/website/src/plugins/install-count.tsx

diff --git a/packages/website/src/plugins/author-link.tsx b/packages/website/src/plugins/author-link.tsx
index 769fc9cbf5..3a2be803f3 100644
--- a/packages/website/src/plugins/author-link.tsx
+++ b/packages/website/src/plugins/author-link.tsx
@@ -3,6 +3,7 @@ import { type ReactNode, useMemo } from "react";
 import { type Author, authorAvatarUrl } from "./registry";
 
 const SIZE_CLASS = {
+  xs: "h-4 w-4 text-[8px]",
   sm: "h-5 w-5 text-[10px]",
   lg: "h-14 w-14 text-xl",
 } as const;
diff --git a/packages/website/src/plugins/browse-page.tsx b/packages/website/src/plugins/browse-page.tsx
index 569eb44ab7..1b91c0a94d 100644
--- a/packages/website/src/plugins/browse-page.tsx
+++ b/packages/website/src/plugins/browse-page.tsx
@@ -3,6 +3,7 @@ import { SiteShell } from "~/components/site-shell";
 import { ContributeLinks } from "./contribute-links";
 import type { InstallCounts } from "./installs";
 import { type BrowseQuery, browseHref } from "./links";
+import { InstallCount } from "./install-count";
 import { PLUGIN_GRID_CLASS, PluginCard } from "./plugin-card";
 import { PluginSearch } from "./plugin-search";
 import { PluginSection } from "./section";
@@ -93,13 +94,13 @@ export function BrowsePage({
               <div className={PLUGIN_GRID_CLASS}>
                 {results.map((plugin) =>
                   query.sort === "new" ? (
-                    <PluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
+                    <PluginCard key={plugin.id} plugin={plugin}>
+                      {addedAgo(plugin, now)}
+                    </PluginCard>
                   ) : (
-                    <PluginCard
-                      key={plugin.id}
-                      plugin={plugin}
-                      installs={installs[plugin.id]?.[query.window] ?? 0}
-                    />
+                    <PluginCard key={plugin.id} plugin={plugin}>
+                      <InstallCount count={installs[plugin.id]?.[query.window] ?? 0} />
+                    </PluginCard>
                   ),
                 )}
               </div>
diff --git a/packages/website/src/plugins/contribute-links.tsx b/packages/website/src/plugins/contribute-links.tsx
index 3aeb33a16b..705615770d 100644
--- a/packages/website/src/plugins/contribute-links.tsx
+++ b/packages/website/src/plugins/contribute-links.tsx
@@ -21,7 +21,21 @@ export function ContributeLinks() {
   );
 }
 
-/** Closing section of the directory: what a plugin can do, with Read the docs and Submit buttons. */
+/** "Submit a plugin" and "Read the docs", as a primary and a secondary button. */
+export function ContributeButtons() {
+  return (
+    <>
+      <a href={SUBMIT_URL} className={PRIMARY_BUTTON_CLASS}>
+        Submit a plugin
+      </a>
+      <a href={DOCS_URL} className={SECONDARY_BUTTON_CLASS}>
+        Read the docs
+      </a>
+    </>
+  );
+}
+
+/** Closing section of the directory: what a plugin can do, with Submit and Read the docs buttons. */
 export function ContributeSection() {
   return (
     <section
@@ -36,12 +50,7 @@ export function ContributeSection() {
         with the plugin docs, then submit it to get it listed here.
       </p>
       <div className="mt-6 flex flex-wrap justify-center gap-3">
-        <a href={DOCS_URL} className={PRIMARY_BUTTON_CLASS}>
-          Read the docs
-        </a>
-        <a href={SUBMIT_URL} className={SECONDARY_BUTTON_CLASS}>
-          Submit a plugin
-        </a>
+        <ContributeButtons />
       </div>
     </section>
   );
diff --git a/packages/website/src/plugins/hero.tsx b/packages/website/src/plugins/hero.tsx
new file mode 100644
index 0000000000..9bd9f5ba31
--- /dev/null
+++ b/packages/website/src/plugins/hero.tsx
@@ -0,0 +1,38 @@
+import { ContributeButtons } from "./contribute-links";
+import type { BrowseQuery } from "./links";
+import { PluginSearch } from "./plugin-search";
+
+interface PluginsHeroProps {
+  pluginCount: number;
+  authorCount: number;
+  /** Where the search box sends its term. */
+  searchScope: BrowseQuery;
+}
+
+function plural(count: number, word: string): string {
+  return `${count} ${word}${count === 1 ? "" : "s"}`;
+}
+
+/** Header of the plugin directory: title, counts, and copy, then the contribute buttons and search. */
+export function PluginsHero({ pluginCount, authorCount, searchScope }: PluginsHeroProps) {
+  return (
+    <header>
+      <h1 className="flex flex-wrap items-baseline gap-x-3 gap-y-1">
+        <span className="text-3xl font-medium tracking-tight">Plugins</span>
+        <span className="text-sm font-normal tabular-nums text-extra-muted-foreground">
+          {plural(pluginCount, "plugin")} by {plural(authorCount, "author")}
+        </span>
+      </h1>
+      <p className="mt-3 max-w-xl text-sm leading-relaxed text-muted-foreground">
+        Extend Paseo with plugins that can add new themes, workspace panels and new functionality.
+        Plugins work on web, desktop and mobile.
+      </p>
+      <div className="mt-6 flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
+        <div className="flex flex-wrap gap-3">
+          <ContributeButtons />
+        </div>
+        <PluginSearch scope={searchScope} className="w-full sm:w-64" />
+      </div>
+    </header>
+  );
+}
diff --git a/packages/website/src/plugins/install-count.tsx b/packages/website/src/plugins/install-count.tsx
new file mode 100644
index 0000000000..4867415596
--- /dev/null
+++ b/packages/website/src/plugins/install-count.tsx
@@ -0,0 +1,13 @@
+import { Download } from "lucide-react";
+import { formatInstalls } from "./registry";
+
+/** An install count as a download icon and the number; inherits the surrounding text style. */
+export function InstallCount({ count }: { count: number }) {
+  return (
+    <span className="inline-flex items-center gap-1 tabular-nums">
+      <Download aria-hidden className="h-3 w-3" />
+      {formatInstalls(count)}
+      <span className="sr-only">installs</span>
+    </span>
+  );
+}
diff --git a/packages/website/src/plugins/plugin-card.tsx b/packages/website/src/plugins/plugin-card.tsx
index 488b97ac55..b68ae654db 100644
--- a/packages/website/src/plugins/plugin-card.tsx
+++ b/packages/website/src/plugins/plugin-card.tsx
@@ -1,8 +1,10 @@
-import { Download } from "lucide-react";
+import type { ReactNode } from "react";
+import { AuthorAvatar } from "./author-link";
+import { InstallCount } from "./install-count";
 import { pluginCardScreenshot } from "./thumbnails";
 import { pluginHref } from "./links";
 import { PluginTile } from "./plugin-tile";
-import { firstMediaImage, formatInstalls, getCategory, type Plugin } from "./registry";
+import { firstMediaImage, getAuthor, getCategory, type Plugin } from "./registry";
 
 export const PLUGIN_GRID_CLASS =
   "grid gap-x-4 gap-y-8 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4";
@@ -32,57 +34,49 @@ function PluginShot({ plugin }: { plugin: Plugin }) {
   );
 }
 
-/** What's new card: screenshot, name, and when it was added. */
-export function NewPluginCard({ plugin, added }: { plugin: Plugin; added: string }) {
+/**
+ * What's new and Featured card, in three rows under the screenshot: tile and name, description,
+ * then author and `children`, such as when the plugin was added or its install count.
+ */
+export function NewPluginCard({ plugin, children }: { plugin: Plugin; children?: ReactNode }) {
+  const author = getAuthor(plugin);
   return (
     <a href={pluginHref(plugin.id)} className="group block w-[70%] flex-shrink-0 sm:w-auto">
       <PluginShot plugin={plugin} />
-      <div className="mt-3 flex items-center gap-2.5">
-        <PluginTile plugin={plugin} size="sm" />
-        <div className="min-w-0">
-          <p className="truncate text-sm font-medium text-white">{plugin.name}</p>
-          <p className="truncate text-xs text-extra-muted-foreground">Added {added}</p>
-        </div>
+      <div className="mt-3 flex items-center gap-2">
+        <PluginTile plugin={plugin} size="xs" />
+        <p className="min-w-0 truncate text-sm font-medium text-white">{plugin.name}</p>
       </div>
+      <p className="mt-2 line-clamp-2 min-h-10 text-xs leading-5 text-muted-foreground">
+        {plugin.description}
+      </p>
+      <p className="mt-2 flex min-w-0 items-center gap-1.5 text-xs text-extra-muted-foreground">
+        <AuthorAvatar author={author} size="xs" />
+        <span className="truncate">{author.name}</span>
+        {children !== undefined && (
+          <>
+            <span aria-hidden>·</span>
+            <span className="flex-shrink-0">{children}</span>
+          </>
+        )}
+      </p>
     </a>
   );
 }
 
-/** Grid card: screenshot, name, one muted stat, and a two-line description. */
-export function PluginCard({
-  plugin,
-  installs,
-  added,
-}: {
-  plugin: Plugin;
-  /** Shown with a download icon; otherwise `added` is shown. */
-  installs?: number;
-  added?: string;
-}) {
+/** Grid card: screenshot; tile, name, and `children` such as an install count; description. */
+export function PluginCard({ plugin, children }: { plugin: Plugin; children?: ReactNode }) {
   return (
     <a href={pluginHref(plugin.id)} className="group block">
       <PluginShot plugin={plugin} />
-      <div className="mt-3 flex items-start gap-2.5">
-        <PluginTile plugin={plugin} size="sm" />
-        <div className="min-w-0 flex-1">
-          <div className="flex items-baseline justify-between gap-2">
-            <p className="truncate text-sm font-medium text-white">{plugin.name}</p>
-            <span className="inline-flex flex-shrink-0 items-center gap-1 text-xs tabular-nums text-extra-muted-foreground">
-              {installs === undefined ? (
-                added
-              ) : (
-                <>
-                  <Download className="h-3 w-3" />
-                  {formatInstalls(installs)}
-                </>
-              )}
-            </span>
-          </div>
-          <p className="mt-0.5 line-clamp-2 min-h-10 text-xs leading-5 text-muted-foreground">
-            {plugin.description}
-          </p>
-        </div>
+      <div className="mt-3 flex items-center gap-2">
+        <PluginTile plugin={plugin} size="xs" />
+        <p className="min-w-0 flex-1 truncate text-sm font-medium text-white">{plugin.name}</p>
+        <span className="flex-shrink-0 text-xs text-extra-muted-foreground">{children}</span>
       </div>
+      <p className="mt-2 line-clamp-2 min-h-10 text-xs leading-5 text-muted-foreground">
+        {plugin.description}
+      </p>
     </a>
   );
 }
@@ -110,7 +104,9 @@ export function PluginRankRow({
           {getCategory(plugin.categories[0])?.label}
         </p>
       </div>
-      <span className="text-xs tabular-nums text-muted-foreground">{formatInstalls(installs)}</span>
+      <span className="text-xs text-muted-foreground">
+        <InstallCount count={installs} />
+      </span>
     </a>
   );
 }
diff --git a/packages/website/src/plugins/plugin-tile.tsx b/packages/website/src/plugins/plugin-tile.tsx
index c0fc81d483..5e2dc9c31b 100644
--- a/packages/website/src/plugins/plugin-tile.tsx
+++ b/packages/website/src/plugins/plugin-tile.tsx
@@ -2,6 +2,7 @@ import { pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
 import type { Plugin } from "./registry";
 
 const SIZE_CLASS = {
+  xs: "h-6 w-6 rounded-md text-xs",
   sm: "h-9 w-9 rounded-lg text-sm",
   lg: "h-14 w-14 rounded-xl text-xl",
 } as const;
diff --git a/packages/website/src/plugins/thumbnails.test.ts b/packages/website/src/plugins/thumbnails.test.ts
index 8769995ca3..fb9a571b93 100644
--- a/packages/website/src/plugins/thumbnails.test.ts
+++ b/packages/website/src/plugins/thumbnails.test.ts
@@ -56,20 +56,20 @@ describe("plugin card thumbnails", () => {
     expect(html).not.toContain("/plugins/thumb/");
   });
 
-  it.each([PluginCard, NewPluginCard])(
-    "renders a thumbnail instead of downloading the original screenshot (%s)",
-    (Card) => {
-      const html = renderToStaticMarkup(createElement(Card, { plugin, added: "today" }));
-      expect(html).toContain(
-        `src="/plugins/thumb/592/${encodeURIComponent(source)}?plugin=acme%2Fexample"`,
-      );
-      expect(html).toContain(
-        `srcSet="/plugins/thumb/592/${encodeURIComponent(source)}?plugin=acme%2Fexample 1x, /plugins/thumb/1184/${encodeURIComponent(source)}?plugin=acme%2Fexample 2x"`,
-      );
-      expect(html).toContain('loading="lazy"');
-      expect(html).toContain('decoding="async"');
-    },
-  );
+  it.each([
+    ["PluginCard", () => createElement(PluginCard, { plugin }, "today")],
+    ["NewPluginCard", () => createElement(NewPluginCard, { plugin }, "today")],
+  ])("renders a thumbnail instead of downloading the original screenshot (%s)", (_name, card) => {
+    const html = renderToStaticMarkup(card());
+    expect(html).toContain(
+      `src="/plugins/thumb/592/${encodeURIComponent(source)}?plugin=acme%2Fexample"`,
+    );
+    expect(html).toContain(
+      `srcSet="/plugins/thumb/592/${encodeURIComponent(source)}?plugin=acme%2Fexample 1x, /plugins/thumb/1184/${encodeURIComponent(source)}?plugin=acme%2Fexample 2x"`,
+    );
+    expect(html).toContain('loading="lazy"');
+    expect(html).toContain('decoding="async"');
+  });
 });
 
 function thumbnailRequest(
diff --git a/packages/website/src/routes/plugins/$owner.tsx b/packages/website/src/routes/plugins/$owner.tsx
index 0345fa1355..89c4f185ef 100644
--- a/packages/website/src/routes/plugins/$owner.tsx
+++ b/packages/website/src/routes/plugins/$owner.tsx
@@ -16,6 +16,7 @@ import {
 } from "~/plugins";
 import { AuthorAvatar } from "~/plugins/author-link";
 import { PluginsNotFound } from "~/plugins/not-found";
+import { InstallCount } from "~/plugins/install-count";
 import { PluginCard } from "~/plugins/plugin-card";
 import "~/styles.css";
 
@@ -82,7 +83,9 @@ function AuthorPage() {
 
       <div className="mt-12 grid gap-x-4 gap-y-8 sm:grid-cols-2 lg:grid-cols-3">
         {plugins.map((plugin) => (
-          <PluginCard key={plugin.id} plugin={plugin} installs={installs[plugin.id]?.all ?? 0} />
+          <PluginCard key={plugin.id} plugin={plugin}>
+            <InstallCount count={installs[plugin.id]?.all ?? 0} />
+          </PluginCard>
         ))}
       </div>
     </SiteShell>
diff --git a/packages/website/src/routes/plugins/$owner_.$slug.tsx b/packages/website/src/routes/plugins/$owner_.$slug.tsx
index 9ea61f3248..5bb1c73a1e 100644
--- a/packages/website/src/routes/plugins/$owner_.$slug.tsx
+++ b/packages/website/src/routes/plugins/$owner_.$slug.tsx
@@ -6,7 +6,6 @@ import { SiteShell } from "~/components/site-shell";
 import { pageMeta } from "~/meta";
 import {
   firstMediaImage,
-  formatInstalls,
   getAuthor,
   getCategory,
   getRegistry,
@@ -16,7 +15,8 @@ import {
   pluginVersion,
   readmeBody,
 } from "~/plugins";
-import { AuthorLink } from "~/plugins/author-link";
+import { AuthorAvatar, AuthorLink } from "~/plugins/author-link";
+import { InstallCount } from "~/plugins/install-count";
 import { categoryHref } from "~/plugins/links";
 import { MediaGallery } from "~/plugins/media-gallery";
 import { PluginsNotFound } from "~/plugins/not-found";
@@ -48,6 +48,8 @@ export const Route = createFileRoute("/plugins/$owner_/$slug")({
 
 const META_LINK_CLASS =
   "inline-flex items-center gap-1 text-xs text-extra-muted-foreground transition-colors hover:text-muted-foreground";
+const AUTHOR_LINK_CLASS =
+  "inline-flex items-center gap-1.5 text-xs text-extra-muted-foreground transition-colors hover:text-muted-foreground";
 
 function PluginPage() {
   const { plugin, installs } = Route.useLoaderData();
@@ -67,7 +69,8 @@ function PluginPage() {
           <CodeBlock size="sm">{installCommand(plugin)}</CodeBlock>
         </div>
         <div className="mt-3 flex flex-wrap items-center gap-x-2 gap-y-2 text-xs text-extra-muted-foreground [&>*+*]:before:mr-2 [&>*+*]:before:content-['·'_/_'']">
-          <AuthorLink author={author} className={META_LINK_CLASS}>
+          <AuthorLink author={author} className={AUTHOR_LINK_CLASS}>
+            <AuthorAvatar author={author} size="xs" />
             {author.name}
           </AuthorLink>
           {category && (
@@ -75,7 +78,7 @@ function PluginPage() {
               {category.label}
             </a>
           )}
-          <span className="tabular-nums">{formatInstalls(installs)} installs</span>
+          <InstallCount count={installs} />
           <span className="font-mono">{pluginVersion(plugin)}</span>
           <PluginContentLink href={plugin.repository.url} className={META_LINK_CLASS}>
             Source
diff --git a/packages/website/src/routes/plugins/index.tsx b/packages/website/src/routes/plugins/index.tsx
index 155796a35c..08c31705de 100644
--- a/packages/website/src/routes/plugins/index.tsx
+++ b/packages/website/src/routes/plugins/index.tsx
@@ -26,8 +26,10 @@ import {
   type InstallWindow,
   mostInstalled,
   newestFirst,
+  pluginOwner,
 } from "~/plugins";
 import { ContributeSection } from "~/plugins/contribute-links";
+import { PluginsHero } from "~/plugins/hero";
 import {
   type BrowseQuery,
   browseHref,
@@ -37,10 +39,9 @@ import {
   parseSearchTerm,
   parseSort,
   parseWindow,
-  SUBMIT_URL,
 } from "~/plugins/links";
+import { InstallCount } from "~/plugins/install-count";
 import { NewPluginCard, PluginRankRow } from "~/plugins/plugin-card";
-import { PluginSearch } from "~/plugins/plugin-search";
 import { PluginSection, PluginSectionHeader, PluginSectionTitle } from "~/plugins/section";
 import { WindowSwitch } from "~/plugins/window-switch";
 import "~/styles.css";
@@ -60,7 +61,6 @@ const CATEGORY_ICONS: Record<CategorySlug, LucideIcon> = {
   utils: Wrench,
 };
 
-const SUBMIT_CLASS = "text-sm text-muted-foreground transition-colors hover:text-foreground";
 // What's new and Featured cards: a swipeable row on phones, a grid from `sm` up.
 const CARD_ROW_CLASS =
   "-mx-6 flex gap-4 overflow-x-auto px-6 pb-1 sm:mx-0 sm:grid sm:grid-cols-2 sm:px-0 lg:grid-cols-4";
@@ -110,31 +110,23 @@ function PluginsPage() {
     [],
   );
   const searchScope = useMemo<BrowseQuery>(() => ({ sort: "installs", window }), [window]);
+  const authorCount = new Set(plugins.map(pluginOwner)).size;
 
   return (
     <SiteShell width="default">
-      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
-        <h1 className="text-3xl font-medium tracking-tight">
-          Plugins
-          <span className="ml-3 align-middle text-sm font-normal tabular-nums text-extra-muted-foreground">
-            {plugins.length}
-          </span>
-        </h1>
-        <div className="flex flex-wrap items-center gap-x-5 gap-y-3">
-          <a href={SUBMIT_URL} className={SUBMIT_CLASS}>
-            Submit a plugin
-          </a>
-          <PluginSearch scope={searchScope} className="w-full sm:w-56" />
-        </div>
-      </div>
+      <PluginsHero
+        pluginCount={plugins.length}
+        authorCount={authorCount}
+        searchScope={searchScope}
+      />
 
-      <div className="mt-10 flex flex-col gap-14">
+      <div className="mt-16 flex flex-col gap-14">
         {featured.length > 0 && (
           <PluginSection labelledBy="featured">
             <PluginSectionHeader>
               <div>
                 <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
-                <p className="mt-1 text-sm text-muted-foreground">
+                <p className="text-sm text-muted-foreground">
                   A selection of hand picked plugins
                 </p>
               </div>
@@ -142,13 +134,15 @@ function PluginsPage() {
                 href={browseHref({ sort: "installs", window: DEFAULT_WINDOW })}
                 className={SEE_ALL_CLASS}
               >
-                See all plugins
+                See all
                 <ChevronRight className="h-3.5 w-3.5" />
               </a>
             </PluginSectionHeader>
             <div className={CARD_ROW_CLASS}>
               {featured.map((plugin) => (
-                <NewPluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
+                <NewPluginCard key={plugin.id} plugin={plugin}>
+                  <InstallCount count={installs[plugin.id]?.all ?? 0} />
+                </NewPluginCard>
               ))}
             </div>
           </PluginSection>
@@ -164,7 +158,9 @@ function PluginsPage() {
           </PluginSectionHeader>
           <div className={CARD_ROW_CLASS}>
             {newest.map((plugin) => (
-              <NewPluginCard key={plugin.id} plugin={plugin} added={addedAgo(plugin, now)} />
+              <NewPluginCard key={plugin.id} plugin={plugin}>
+                {addedAgo(plugin, now)}
+              </NewPluginCard>
             ))}
           </div>
         </PluginSection>

From aedba5ec2770c0169e25c91de4877406bc91b5aa Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 23:19:16 +0200
Subject: [PATCH 025/270] fix(website): plugin page content spans the same
 width as the header and footer

The page capped itself at max-w-3xl inside the site shell, so the install command, gallery, and README stopped short of the nav's right edge.
---
 .../src/routes/plugins/$owner_.$slug.tsx      | 66 +++++++++----------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/packages/website/src/routes/plugins/$owner_.$slug.tsx b/packages/website/src/routes/plugins/$owner_.$slug.tsx
index 5bb1c73a1e..efd7369a94 100644
--- a/packages/website/src/routes/plugins/$owner_.$slug.tsx
+++ b/packages/website/src/routes/plugins/$owner_.$slug.tsx
@@ -59,44 +59,42 @@ function PluginPage() {
 
   return (
     <SiteShell width="default">
-      <div className="max-w-3xl">
-        <a href="/plugins" className="text-sm text-muted-foreground hover:text-foreground">
-          ← Plugins
-        </a>
-        <h1 className="mt-4 text-3xl font-medium tracking-tight">{plugin.name}</h1>
-        <p className="mt-3 text-lg leading-relaxed text-white/70">{plugin.description}</p>
-        <div className="mt-6">
-          <CodeBlock size="sm">{installCommand(plugin)}</CodeBlock>
-        </div>
-        <div className="mt-3 flex flex-wrap items-center gap-x-2 gap-y-2 text-xs text-extra-muted-foreground [&>*+*]:before:mr-2 [&>*+*]:before:content-['·'_/_'']">
-          <AuthorLink author={author} className={AUTHOR_LINK_CLASS}>
-            <AuthorAvatar author={author} size="xs" />
-            {author.name}
-          </AuthorLink>
-          {category && (
-            <a href={categoryHref(category.slug)} className={META_LINK_CLASS}>
-              {category.label}
-            </a>
-          )}
-          <InstallCount count={installs} />
-          <span className="font-mono">{pluginVersion(plugin)}</span>
-          <PluginContentLink href={plugin.repository.url} className={META_LINK_CLASS}>
-            Source
+      <a href="/plugins" className="text-sm text-muted-foreground hover:text-foreground">
+        ← Plugins
+      </a>
+      <h1 className="mt-4 text-3xl font-medium tracking-tight">{plugin.name}</h1>
+      <p className="mt-3 text-lg leading-relaxed text-white/70">{plugin.description}</p>
+      <div className="mt-6">
+        <CodeBlock size="sm">{installCommand(plugin)}</CodeBlock>
+      </div>
+      <div className="mt-3 flex flex-wrap items-center gap-x-2 gap-y-2 text-xs text-extra-muted-foreground [&>*+*]:before:mr-2 [&>*+*]:before:content-['·'_/_'']">
+        <AuthorLink author={author} className={AUTHOR_LINK_CLASS}>
+          <AuthorAvatar author={author} size="xs" />
+          {author.name}
+        </AuthorLink>
+        {category && (
+          <a href={categoryHref(category.slug)} className={META_LINK_CLASS}>
+            {category.label}
+          </a>
+        )}
+        <InstallCount count={installs} />
+        <span className="font-mono">{pluginVersion(plugin)}</span>
+        <PluginContentLink href={plugin.repository.url} className={META_LINK_CLASS}>
+          Source
+          <ExternalLink className="h-3 w-3" />
+        </PluginContentLink>
+        {npm && (
+          <PluginContentLink href={npm} className={META_LINK_CLASS}>
+            npm
             <ExternalLink className="h-3 w-3" />
           </PluginContentLink>
-          {npm && (
-            <PluginContentLink href={npm} className={META_LINK_CLASS}>
-              npm
-              <ExternalLink className="h-3 w-3" />
-            </PluginContentLink>
-          )}
-        </div>
+        )}
+      </div>
 
-        <MediaGallery name={plugin.name} media={plugin.media} />
+      <MediaGallery name={plugin.name} media={plugin.media} />
 
-        <div className="mt-10 border-t border-white/10 pt-10">
-          <PluginOverview>{readmeBody(plugin.readme)}</PluginOverview>
-        </div>
+      <div className="mt-10 border-t border-white/10 pt-10">
+        <PluginOverview>{readmeBody(plugin.readme)}</PluginOverview>
       </div>
     </SiteShell>
   );

From f715221de8af0289e9dfc7493e16e3c6325b772c Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 23:26:35 +0200
Subject: [PATCH 026/270] feat(website): plugins page copy describes browsing
 community plugins

---
 packages/website/src/plugins/hero.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/website/src/plugins/hero.tsx b/packages/website/src/plugins/hero.tsx
index 9bd9f5ba31..0683a0d6e0 100644
--- a/packages/website/src/plugins/hero.tsx
+++ b/packages/website/src/plugins/hero.tsx
@@ -24,8 +24,7 @@ export function PluginsHero({ pluginCount, authorCount, searchScope }: PluginsHe
         </span>
       </h1>
       <p className="mt-3 max-w-xl text-sm leading-relaxed text-muted-foreground">
-        Extend Paseo with plugins that can add new themes, workspace panels and new functionality.
-        Plugins work on web, desktop and mobile.
+        Browse community plugins that extend Paseo with new functionality.
       </p>
       <div className="mt-6 flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex flex-wrap gap-3">

From d4ea77b910b318942dee063291c0650bf99b2267 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 23:26:35 +0200
Subject: [PATCH 027/270] fix(website): plugin install command block fits the
 command

---
 packages/website/src/routes/plugins/$owner_.$slug.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/website/src/routes/plugins/$owner_.$slug.tsx b/packages/website/src/routes/plugins/$owner_.$slug.tsx
index efd7369a94..2000067e00 100644
--- a/packages/website/src/routes/plugins/$owner_.$slug.tsx
+++ b/packages/website/src/routes/plugins/$owner_.$slug.tsx
@@ -64,7 +64,7 @@ function PluginPage() {
       </a>
       <h1 className="mt-4 text-3xl font-medium tracking-tight">{plugin.name}</h1>
       <p className="mt-3 text-lg leading-relaxed text-white/70">{plugin.description}</p>
-      <div className="mt-6">
+      <div className="mt-6 w-fit max-w-full">
         <CodeBlock size="sm">{installCommand(plugin)}</CodeBlock>
       </div>
       <div className="mt-3 flex flex-wrap items-center gap-x-2 gap-y-2 text-xs text-extra-muted-foreground [&>*+*]:before:mr-2 [&>*+*]:before:content-['·'_/_'']">

From 1463396ebca49782cfa8aad036b6b3a50e196714 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 23:50:27 +0200
Subject: [PATCH 028/270] fix(website): plugin search ranks name matches first

Search filtered by substring and the browse page then sorted by installs,
so an exact name like "OMP" landed behind plugins that only mentioned it
in a description. Results now rank by the field matched (name, author,
description), then match quality from the shared text matcher, with the
tab's order breaking ties.
---
 packages/website/src/plugins/browse-page.tsx  | 11 ++---
 packages/website/src/plugins/registry.test.ts | 26 ++++++++++++
 packages/website/src/plugins/registry.ts      | 42 +++++++++++++++----
 3 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/packages/website/src/plugins/browse-page.tsx b/packages/website/src/plugins/browse-page.tsx
index 1b91c0a94d..274c68a5c0 100644
--- a/packages/website/src/plugins/browse-page.tsx
+++ b/packages/website/src/plugins/browse-page.tsx
@@ -47,10 +47,11 @@ export function BrowsePage({
   query: BrowseQuery;
 }) {
   const category = query.category ? getCategory(query.category) : null;
-  const matches = query.q ? searchPlugins(plugins, query.q) : plugins;
-  const scoped = category ? getPluginsInCategory(matches, category.slug) : matches;
-  const results =
-    query.sort === "new" ? newestFirst(scoped) : mostInstalled(scoped, installs, query.window);
+  const ordered =
+    query.sort === "new" ? newestFirst(plugins) : mostInstalled(plugins, installs, query.window);
+  // Search ranks by relevance; the tab's order breaks ties.
+  const matches = query.q ? searchPlugins(ordered, query.q) : ordered;
+  const results = category ? getPluginsInCategory(matches, category.slug) : matches;
   const title = category?.label ?? "All plugins";
   const clearHref = browseHref({ ...query, q: undefined });
   return (
@@ -65,7 +66,7 @@ export function BrowsePage({
             <h1 className="text-3xl font-medium tracking-tight">
               {query.q ? `Results for “${query.q}”${category ? ` in ${title}` : ""}` : title}
               <span className="ml-3 align-middle text-sm font-normal tabular-nums text-extra-muted-foreground">
-                {scoped.length}
+                {results.length}
               </span>
             </h1>
             {query.q && (
diff --git a/packages/website/src/plugins/registry.test.ts b/packages/website/src/plugins/registry.test.ts
index ca678f6453..b6135351b3 100644
--- a/packages/website/src/plugins/registry.test.ts
+++ b/packages/website/src/plugins/registry.test.ts
@@ -228,6 +228,32 @@ describe("plugin registry", () => {
     expect(searchPlugins(plugins, "  ")).toEqual(plugins);
     expect(searchPlugins(plugins, "nothing")).toEqual([]);
   });
+  it("ranks name, then author, then description matches, keeping the given order on ties", () => {
+    const named = (id: string, name: string, description: string, github = "acme"): Plugin => ({
+      ...plugin,
+      id,
+      name,
+      description,
+      author: { github },
+    });
+    // Given in install order: description-only matches first, the exact name last.
+    const plugins = [
+      named("acme/editor", "Remote Editor", "Composer pill to open a workspace"),
+      named("acme/kit", "PromptKit", "Rewrite prompts"),
+      named("omp/tools", "Tools", "Helpers", "omp"),
+      named("acme/history", "History", "Inspect raw composer records"),
+      named("acme/omp", "OMP", "Paseo integration for OMP"),
+    ];
+    expect(searchPlugins(plugins, "omp").map((p) => p.id)).toEqual([
+      "acme/omp",
+      "acme/kit",
+      "omp/tools",
+      "acme/editor",
+      "acme/history",
+    ]);
+    expect(searchPlugins(plugins, "prompt").map((p) => p.id)).toEqual(["acme/kit"]);
+    expect(searchPlugins(plugins, "tools omp").map((p) => p.id)).toEqual(["omp/tools"]);
+  });
 
   it("strips the README title and quoted description that the page already shows", () => {
     expect(readmeBody("# Example\n\n> An example\n> plugin\n\n## Usage\n")).toBe("## Usage\n");
diff --git a/packages/website/src/plugins/registry.ts b/packages/website/src/plugins/registry.ts
index c06ea3dc5c..13bfc0d1ca 100644
--- a/packages/website/src/plugins/registry.ts
+++ b/packages/website/src/plugins/registry.ts
@@ -1,6 +1,7 @@
 import type { z } from "zod";
 import { pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
 import { pluginMediaKind, type PublishedPluginSchema } from "@getpaseo/protocol/plugin-registry";
+import { scoreTextFields } from "@getpaseo/protocol/search/text-match";
 import { CATEGORIES, type Category, type CategorySlug } from "./categories";
 import type { InstallCounts, InstallWindow } from "./installs";
 export { CATEGORIES, type Category, type CategorySlug };
@@ -66,16 +67,39 @@ export function formatInstalls(count: number): string {
   const k = count / 1000;
   return `${k % 1 === 0 ? k.toFixed(0) : k.toFixed(1)}k`;
 }
-/** Plugins whose name, description, ID, or author contains the term, case-insensitively. */
+/** Fields a search term can hit, best first: a name match outranks an author match, which outranks a description match. */
+function searchFieldGroups(plugin: Plugin): string[][] {
+  const author = getAuthor(plugin);
+  const name = [plugin.name, plugin.id.split("/")[1]];
+  const owner = [author.name, author.github, plugin.id];
+  return [name, owner, [plugin.description], [...name, ...owner, plugin.description]];
+}
+interface SearchRank {
+  field: number;
+  tier: number;
+}
+function searchRank(plugin: Plugin, term: string): SearchRank | null {
+  const groups = searchFieldGroups(plugin);
+  for (let field = 0; field < groups.length; field += 1) {
+    const score = scoreTextFields(term, groups[field], { subsequence: false });
+    if (score) return { field, tier: score.tier };
+  }
+  return null;
+}
+/**
+ * Plugins whose name, author, ID, or description contains every word of the term, ignoring case.
+ * Name matches come first, then author, then description; within each, exact words beat partial
+ * ones, and equal matches keep the given order.
+ */
 export function searchPlugins(plugins: Plugin[], term: string): Plugin[] {
-  const needle = term.trim().toLowerCase();
-  if (!needle) return plugins;
-  return plugins.filter((plugin) =>
-    [plugin.name, plugin.description, plugin.id, getAuthor(plugin).name]
-      .join(" ")
-      .toLowerCase()
-      .includes(needle),
-  );
+  if (!term.trim()) return plugins;
+  return plugins
+    .flatMap((plugin) => {
+      const rank = searchRank(plugin, term);
+      return rank ? [{ plugin, rank }] : [];
+    })
+    .sort((a, b) => a.rank.field - b.rank.field || a.rank.tier - b.rank.tier)
+    .map(({ plugin }) => plugin);
 }
 /** The featured IDs that name a listed plugin, in the registry's order, each once. */
 export function featuredPlugins(plugins: Plugin[], featured: string[]): Plugin[] {

From 2d85fe4e04268f845ea4153e66e7e6d37f4e4963 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 6 Oct 2026 23:18:24 +0100
Subject: [PATCH 029/270] feat(plugins): declare display metadata in plugin
 manifests (#6263)

* feat(plugins): declare display metadata in plugin manifests

* style(website): format plugin page description

* fix(plugins): preserve default names and clarify registry follow-up

* test: fix stale plugin card selectors and terminal marker race
---
 .../cli/src/commands/plugin/scaffold.test.ts  |  2 +
 packages/cli/src/commands/plugin/scaffold.ts  | 12 +++-
 .../protocol/src/messages.plugins.test.ts     | 21 +++++++
 packages/protocol/src/messages.ts             |  3 +
 .../src/server/plugins/index.posix.test.ts    | 26 ++++++--
 packages/server/src/server/plugins/index.ts   |  7 ++-
 .../src/server/plugins/manifest.test.ts       | 63 +++++++++++++++++++
 .../server/src/server/plugins/manifest.ts     | 35 ++++++++---
 .../terminal/worker-terminal-manager.test.ts  |  4 +-
 packages/website/e2e/plugins.spec.ts          | 22 ++++---
 packages/website/src/routes/plugins/index.tsx |  4 +-
 public-docs/plugins/publishing.md             | 36 ++++++++++-
 public-docs/plugins/reference.md              | 24 +++++--
 skills/paseo-plugin/SKILL.md                  |  3 +-
 14 files changed, 224 insertions(+), 38 deletions(-)

diff --git a/packages/cli/src/commands/plugin/scaffold.test.ts b/packages/cli/src/commands/plugin/scaffold.test.ts
index c69ca4c197..a3350ecb8c 100644
--- a/packages/cli/src/commands/plugin/scaffold.test.ts
+++ b/packages/cli/src/commands/plugin/scaffold.test.ts
@@ -93,6 +93,8 @@ describe("plugin scaffold", () => {
       expect(JSON.parse(await readFile(path.join(directory, "paseo-plugin.json"), "utf8"))).toEqual(
         {
           id: "hello-plugin",
+          $comment: expect.stringContaining('"icon": "assets/icon.png"'),
+          media: [],
           requirements: { paseo: `>=${cliPackageJson.version}` },
         },
       );
diff --git a/packages/cli/src/commands/plugin/scaffold.ts b/packages/cli/src/commands/plugin/scaffold.ts
index f0f1fe3b93..b1eb53a6ef 100644
--- a/packages/cli/src/commands/plugin/scaffold.ts
+++ b/packages/cli/src/commands/plugin/scaffold.ts
@@ -206,7 +206,17 @@ export async function scaffoldPluginDirectory(
   const files = new Map<string, string>([
     [
       "paseo-plugin.json",
-      `${JSON.stringify({ id, requirements: { paseo: `>=${version}` } }, null, 2)}\n`,
+      `${JSON.stringify(
+        {
+          id,
+          $comment:
+            'Add "name": "My plugin" to set a display name. Add "icon": "assets/icon.png" for a PNG inside the package. Add image or video paths (relative to this manifest) or HTTPS URLs to media. Include local assets in package.json files.',
+          media: [],
+          requirements: { paseo: `>=${version}` },
+        },
+        null,
+        2,
+      )}\n`,
     ],
     ["OVERVIEW.md", OVERVIEW],
     ["package.json", `${JSON.stringify(packageJson, null, 2)}\n`],
diff --git a/packages/protocol/src/messages.plugins.test.ts b/packages/protocol/src/messages.plugins.test.ts
index 5c62e90669..f266b65988 100644
--- a/packages/protocol/src/messages.plugins.test.ts
+++ b/packages/protocol/src/messages.plugins.test.ts
@@ -23,6 +23,27 @@ describe("plugin protocol compatibility", () => {
       expect(SessionOutboundMessageSchema.parse(message)).toEqual(message);
     },
   );
+  it("preserves manifest metadata in plugin list responses", () => {
+    const message = {
+      type: "plugin.list.response",
+      payload: {
+        requestId: "metadata",
+        plugins: [
+          {
+            id: "review",
+            name: "Review tools",
+            icon: "assets/icon.png",
+            media: ["screenshot.png", "https://example.com/demo.mp4"],
+            path: "/plugins/review",
+            enabled: false,
+            status: "disabled",
+          },
+        ],
+      },
+    };
+    expect(SessionOutboundMessageSchema.parse(message)).toEqual(message);
+  });
+
   it("parses plugin timeline append messages and advertises the capability", () => {
     expect(
       SessionInboundMessageSchema.parse({
diff --git a/packages/protocol/src/messages.ts b/packages/protocol/src/messages.ts
index 41b9ca3f74..6f5e4abd3f 100644
--- a/packages/protocol/src/messages.ts
+++ b/packages/protocol/src/messages.ts
@@ -6632,6 +6632,9 @@ export const PluginNpmInstallationSchema = z.object({
 
 export const PluginListItemSchema = z.object({
   id: PluginIdSchema,
+  name: z.string().optional(),
+  icon: z.string().optional(),
+  media: z.array(z.string()).optional(),
   description: z.string().optional(),
   path: z.string(),
   enabled: z.boolean(),
diff --git a/packages/server/src/server/plugins/index.posix.test.ts b/packages/server/src/server/plugins/index.posix.test.ts
index f9592597f1..71fe2b96e9 100644
--- a/packages/server/src/server/plugins/index.posix.test.ts
+++ b/packages/server/src/server/plugins/index.posix.test.ts
@@ -419,7 +419,7 @@ describe("PluginService", () => {
     await service.stopAllPlugins();
   }, 20_000);
 
-  it("lists manifest descriptions for running and disabled plugins without hiding malformed entries", async () => {
+  it("lists manifest metadata for running and disabled plugins without hiding malformed entries", async () => {
     const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
     roots.push(home);
     const running = await createPlugin("running", "export default () => () => {};");
@@ -427,7 +427,13 @@ describe("PluginService", () => {
     const malformed = await createPlugin("malformed", "export default () => () => {};");
     await writeFile(
       path.join(running, "paseo-plugin.json"),
-      JSON.stringify({ id: "running", description: "Runs checks" }),
+      JSON.stringify({
+        id: "running",
+        description: "Runs checks",
+        name: "Checks",
+        icon: "icon.png",
+        media: ["screenshot.png", "https://example.com/demo.mp4"],
+      }),
     );
     await writeFile(
       path.join(disabled, "paseo-plugin.json"),
@@ -443,11 +449,23 @@ describe("PluginService", () => {
     await service.start();
 
     expect(
-      (await service.listPlugins()).map(({ id, description }) => ({ id, description })),
+      (await service.listPlugins()).map(({ id, description, name, icon, media }) => ({
+        id,
+        description,
+        name,
+        icon,
+        media,
+      })),
     ).toEqual([
       { id: "disabled", description: "Waits until enabled" },
       { id: "malformed", description: undefined },
-      { id: "running", description: "Runs checks" },
+      {
+        id: "running",
+        description: "Runs checks",
+        name: "Checks",
+        icon: "icon.png",
+        media: ["screenshot.png", "https://example.com/demo.mp4"],
+      },
     ]);
     await service.stopAllPlugins();
   });
diff --git a/packages/server/src/server/plugins/index.ts b/packages/server/src/server/plugins/index.ts
index 5567e23dd5..6c4af29e62 100644
--- a/packages/server/src/server/plugins/index.ts
+++ b/packages/server/src/server/plugins/index.ts
@@ -216,7 +216,12 @@ export class PluginService {
           }),
         };
         const manifest = await readPluginManifest(path.resolve(source.path)).catch(() => null);
-        if (manifest?.description) item.description = manifest.description;
+        if (manifest) {
+          item.name = manifest.name;
+          item.description = manifest.description;
+          item.icon = manifest.icon;
+          item.media = manifest.media;
+        }
         item.installation = await this.managedSources
           ?.describe(id, source.path)
           .catch(() => undefined);
diff --git a/packages/server/src/server/plugins/manifest.test.ts b/packages/server/src/server/plugins/manifest.test.ts
index 3ff06e2c3e..399e350493 100644
--- a/packages/server/src/server/plugins/manifest.test.ts
+++ b/packages/server/src/server/plugins/manifest.test.ts
@@ -24,6 +24,69 @@ describe("plugin manifest", () => {
     });
   });
 
+  it("reads display metadata and ignores future top-level fields", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-manifest-"));
+    directories.push(directory);
+    const manifest = {
+      id: "review",
+      name: "Review tools",
+      icon: "assets/icon.png",
+      media: ["assets/screenshot.webp", "demo.mp4", "https://example.com/media?id=1"],
+    };
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ ...manifest, futureField: { enabled: true } }),
+    );
+    await expect(readPluginManifest(directory)).resolves.toEqual(manifest);
+  });
+
+  it.each([
+    { name: "   " },
+    { name: 42 },
+    { icon: "" },
+    { icon: 42 },
+    { icon: "icon.svg" },
+    { icon: "/icon.png" },
+    { icon: "../icon.png" },
+    { icon: "assets/../../icon.png" },
+    { icon: "https://example.com/icon.png" },
+    { icon: "C:/icon.png" },
+    { icon: "assets\\icon.png" },
+    { icon: "icon.png?query" },
+    { media: "screenshot.png" },
+    { media: [42] },
+    { media: [""] },
+    { media: ["../demo.mp4"] },
+    { media: ["/demo.mp4"] },
+    { media: ["http://example.com/demo.mp4"] },
+    { media: ["https://"] },
+    { media: ["//example.com/demo.mp4"] },
+    { media: ["file:///demo.mp4"] },
+    { media: ["data:image/png;base64,abc"] },
+    { media: ["."] },
+    { media: ["assets/"] },
+    { id: "INVALID" },
+    { description: 42 },
+    { requirements: { paseoo: ">=0.11.0" } },
+  ])("rejects invalid known fields: %j", async (fields) => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-manifest-"));
+    directories.push(directory);
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: "example", futureField: true, ...fields }),
+    );
+    await expect(readPluginManifest(directory)).rejects.toThrow();
+  });
+
+  it("accepts omitted metadata and empty media", async () => {
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-manifest-"));
+    directories.push(directory);
+    for (const manifest of [{ id: "example" }, { id: "example", media: [] }]) {
+      await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify(manifest));
+      await expect(readPluginManifest(directory)).resolves.toEqual(manifest);
+    }
+  });
+
   it("reads and validates requirements before any plugin code runs", async () => {
     const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-manifest-"));
     directories.push(directory);
diff --git a/packages/server/src/server/plugins/manifest.ts b/packages/server/src/server/plugins/manifest.ts
index d2e13d614b..2312a2cb5a 100644
--- a/packages/server/src/server/plugins/manifest.ts
+++ b/packages/server/src/server/plugins/manifest.ts
@@ -8,14 +8,33 @@ const MANIFEST_FILENAME = "paseo-plugin.json";
 const PluginBuildCommandSchema = z
   .array(z.string().refine((argument) => argument.trim().length > 0))
   .min(1);
-const PluginManifestSchema = z
-  .object({
-    id: PluginIdSchema,
-    description: z.string().trim().min(1).optional(),
-    requirements: PluginRequirementsSchema.strict().optional(),
-    build: z.array(PluginBuildCommandSchema).min(1).optional(),
-  })
-  .strict();
+// Manifest asset paths use forward slashes and stay inside the plugin package.
+const PluginAssetPathSchema = z
+  .string()
+  .min(1)
+  .refine(
+    (value) =>
+      value === value.trim() &&
+      !value.startsWith("/") &&
+      !/[\\:?#\p{Cc}]/u.test(value) &&
+      !value.split("/").includes("..") &&
+      !value.endsWith("/") &&
+      value.split("/").at(-1) !== ".",
+    "Expected a relative file path inside the plugin package",
+  );
+const PluginManifestSchema = z.object({
+  id: PluginIdSchema,
+  name: z.string().trim().min(1).optional(),
+  description: z.string().trim().min(1).optional(),
+  icon: PluginAssetPathSchema.refine(
+    (value) => /\.png$/i.test(value),
+    "Expected a relative path to a PNG",
+  ).optional(),
+  media: z.array(z.union([PluginAssetPathSchema, z.url({ protocol: /^https$/ })])).optional(),
+  // A misspelled requirement must not silently disable compatibility checks.
+  requirements: PluginRequirementsSchema.strict().optional(),
+  build: z.array(PluginBuildCommandSchema).min(1).optional(),
+});
 
 export type PluginManifest = z.infer<typeof PluginManifestSchema>;
 
diff --git a/packages/server/src/terminal/worker-terminal-manager.test.ts b/packages/server/src/terminal/worker-terminal-manager.test.ts
index 2dc999c0c3..efccd3dfb6 100644
--- a/packages/server/src/terminal/worker-terminal-manager.test.ts
+++ b/packages/server/src/terminal/worker-terminal-manager.test.ts
@@ -510,9 +510,7 @@ it("starts the default shell through the worker and accepts quoted commands", as
 
   session.send({ type: "input", data: `${command}\r` });
 
-  await waitForCondition(() => existsSync(markerPath), 10000);
-
-  expect(readFileSync(markerPath, "utf8")).toBe("shell-ok");
+  await expect.poll(() => readFileSync(markerPath, "utf8"), { timeout: 10000 }).toBe("shell-ok");
 });
 
 it("lists subdirectory terminals when querying the workspace root", async () => {
diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 9d2b3af8aa..3d25f942b9 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -8,6 +8,13 @@ async function openPlugins(page: Page) {
   await expect(page.getByRole("heading", { level: 1, name: /^Plugins/ })).toBeVisible();
 }
 
+function pluginCards(page: Page, section: string): Locator {
+  return page
+    .getByRole("region", { name: section })
+    .getByRole("link")
+    .filter({ hasNotText: /^See all$/ });
+}
+
 test("browses from the directory into a category, a plugin, and its author", async ({
   page,
   context,
@@ -508,11 +515,7 @@ test.describe("registry fixture layout", () => {
     await expect(page.getByRole("heading", { level: 2 }).first()).toHaveText("Featured");
     const featured = page.getByRole("region", { name: "Featured" });
     await expect(featured).toContainText("A selection of hand picked plugins");
-    await expect(featured.getByRole("link", { name: /Added/ })).toHaveText([
-      /Dracula/,
-      /Herald/,
-      /launchd Jobs/,
-    ]);
+    await expect(pluginCards(page, "Featured")).toHaveText([/Dracula/, /Herald/, /launchd Jobs/]);
   });
 
   test("lists the nine categories in order with counts, and the newest plugins first", async ({
@@ -524,9 +527,12 @@ test.describe("registry fixture layout", () => {
       CATEGORIES.map((category) => new RegExp(`^${category.label}\\s*\\d+$`)),
     );
     await expect(categories.getByRole("link", { name: /Extras/ })).toContainText("0");
-    await expect(
-      page.getByRole("region", { name: "What’s new" }).getByRole("link", { name: /Added/ }),
-    ).toHaveText([/Base2Tone/, /Sayr/, /PromptKit/, /Defer/]);
+    await expect(pluginCards(page, "What’s new")).toHaveText([
+      /Base2Tone/,
+      /Sayr/,
+      /PromptKit/,
+      /Defer/,
+    ]);
   });
 });
 
diff --git a/packages/website/src/routes/plugins/index.tsx b/packages/website/src/routes/plugins/index.tsx
index 08c31705de..505b8177fc 100644
--- a/packages/website/src/routes/plugins/index.tsx
+++ b/packages/website/src/routes/plugins/index.tsx
@@ -126,9 +126,7 @@ function PluginsPage() {
             <PluginSectionHeader>
               <div>
                 <PluginSectionTitle id="featured">Featured</PluginSectionTitle>
-                <p className="text-sm text-muted-foreground">
-                  A selection of hand picked plugins
-                </p>
+                <p className="text-sm text-muted-foreground">A selection of hand picked plugins</p>
               </div>
               <a
                 href={browseHref({ sort: "installs", window: DEFAULT_WINDOW })}
diff --git a/public-docs/plugins/publishing.md b/public-docs/plugins/publishing.md
index a32185a845..16cde2389a 100644
--- a/public-docs/plugins/publishing.md
+++ b/public-docs/plugins/publishing.md
@@ -152,6 +152,39 @@ In the app, enter only the source identifier.
 
 :::
 
+## Icons and screenshots
+
+Declare your display name, icon, screenshots, and demo videos in `paseo-plugin.json`:
+
+```json
+{
+  "id": "review-tools",
+  "name": "Review tools",
+  "description": "Reviews changes before merge",
+  "icon": "assets/icon.png",
+  "media": ["assets/screenshot.png", "https://example.com/review-demo.mp4"],
+  "requirements": { "paseo": ">=0.11.0" }
+}
+```
+
+All three fields are optional. `name` gives the registry and website a display name without
+changing the installation ID. When omitted, the registry falls back to a humanized ID.
+Registry and website display requires the registry builder to read these fields from the pinned
+manifest. That update is a separate follow-up; until it lands, these fields are exposed only
+through the daemon's installed-plugin list.
+`icon` must point to a PNG inside the plugin package. `media` accepts paths to images and videos
+inside the package or HTTPS URLs, in display order. Paths are relative to the manifest; use
+forward slashes and keep them inside the package. See the [manifest reference](/docs/plugins/reference#project-files)
+for validation rules.
+
+Commit local assets alongside the manifest at the pinned revision. For npm, add their directory
+(for example, `assets/`) to `package.json`'s `files` list and verify it with `npm pack --dry-run`.
+The scaffold documents these fields in its manifest's `$comment`; add your display name and
+assets before publishing.
+
+Manifests using these fields fail to install on daemons before 0.11.0. Set
+`requirements.paseo` to `>=0.11.0` or a narrower supported range.
+
 ## Your listing page
 
 Write `OVERVIEW.md` beside `paseo-plugin.json` for the plugin page inside Paseo.
@@ -170,8 +203,7 @@ The repository overview takes precedence over a registry import stopgap. Online
 fails when the pinned commit has no `OVERVIEW.md`, except for unchanged imported records
 that already carry `plugins/<owner>/<slug>.md` in the registry repository. Every version bump
 requires a repository overview and removes the stopgap in the same PR. A bump without the
-repository overview fails validation. Neither README files nor a `paseo-listing.json`
-`readme` override supplies the overview.
+repository overview fails validation. README files do not supply the overview.
 
 Author overviews and registry stopgaps follow the same content contract, in this order.
 Choose headings only when they help; length follows complexity. A theme needs one paragraph.
diff --git a/public-docs/plugins/reference.md b/public-docs/plugins/reference.md
index 2a8714e4d7..1a1440ad97 100644
--- a/public-docs/plugins/reference.md
+++ b/public-docs/plugins/reference.md
@@ -52,12 +52,24 @@ The required root manifest is `paseo-plugin.json`:
 }
 ```
 
-| Field          | Required | Behavior                                                               |
-| -------------- | -------- | ---------------------------------------------------------------------- |
-| `id`           | Yes      | Default installation ID.                                               |
-| `description`  | No       | Non-empty summary shown below the plugin ID in **Settings → Plugins**. |
-| `requirements` | No       | Supported Paseo versions, described below.                             |
-| `build`        | No       | Preparation commands, described in the CLI reference.                  |
+| Field          | Required | Behavior                                                                                  |
+| -------------- | -------- | ----------------------------------------------------------------------------------------- |
+| `id`           | Yes      | Default installation ID.                                                                  |
+| `name`         | No       | Non-empty display name for the registry and website; independent of the installation ID.  |
+| `icon`         | No       | Relative path to a PNG inside the plugin package.                                         |
+| `media`        | No       | Array of image or video paths inside the package, or HTTPS URLs. An empty array is valid. |
+| `description`  | No       | Non-empty summary shown below the plugin ID in **Settings → Plugins**.                    |
+| `requirements` | No       | Supported Paseo versions, described below.                                                |
+| `build`        | No       | Preparation commands, described in the CLI reference.                                     |
+
+Paths are relative to `paseo-plugin.json`, use forward slashes, and cannot contain `..`
+segments. See [icons and screenshots](/docs/plugins/publishing#icons-and-screenshots) for an example.
+Paseo validates the references without opening local assets or fetching URLs.
+
+Unknown top-level fields are ignored. Known fields still validate, and unknown keys inside
+`requirements` are rejected so a misspelled constraint cannot silently skip a compatibility check.
+Manifests using `name`, `icon`, or `media` require Paseo 0.11.0 or later; older daemons reject
+these fields during installation.
 
 ### Requirements
 
diff --git a/skills/paseo-plugin/SKILL.md b/skills/paseo-plugin/SKILL.md
index f229bf7a3a..e511a7e12f 100644
--- a/skills/paseo-plugin/SKILL.md
+++ b/skills/paseo-plugin/SKILL.md
@@ -657,8 +657,7 @@ The repository overview takes precedence over a registry import stopgap. Online
 fails when the pinned commit has no `OVERVIEW.md`, except for unchanged imported records
 that already carry `plugins/<owner>/<slug>.md` in the registry repository. Every version bump
 requires a repository overview and removes the stopgap in the same PR. A bump without the
-repository overview fails validation. Neither README files nor a `paseo-listing.json`
-`readme` override supplies the overview.
+repository overview fails validation. README files do not supply the overview.
 
 Author overviews and registry stopgaps follow the same content contract, in this order.
 Choose headings only when they help; length follows complexity. A theme needs one paragraph.

From 93bfb34e2135b0e40dfd98ae37e64597a7b89d15 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 00:59:14 +0100
Subject: [PATCH 030/270] feat(website): copy states what Paseo does, plugins
 section and comparison tables (#6270)

The homepage, README, sponsor copy and comparison pages now say plainly
what Paseo is: a one-click desktop app with the daemon bundled, a native
mobile app with full parity, parallel agents in worktrees, and plugins
that add panels and functionality on desktop, web and mobile.

Every comparison page uses one table with the same rows so readers can
compare products row by row. The product columns use a fixed layout so
column widths no longer follow the longest cell.

Sponsor copy opens with the project's size before the one-person fact,
so a reader does not take "one person" to mean a side project.
---
 README.md                                     |  28 ++-
 packages/website/e2e/plugins.spec.ts          |   2 +-
 .../src/components/alternative-page.tsx       |   4 +-
 .../website/src/components/landing-page.tsx   | 168 ++++++++++--------
 .../website/src/components/sponsorship.tsx    |  22 +--
 .../content/alternatives/claude-desktop.md    |  50 +++---
 .../src/content/alternatives/codex-app.md     |  48 ++---
 .../src/content/alternatives/conductor.md     |  46 +++--
 .../src/content/alternatives/happy-coder.md   |  46 +++--
 .../src/content/alternatives/openchamber.md   |  45 +++--
 .../content/alternatives/opencode-desktop.md  |  48 ++---
 .../website/src/content/alternatives/orca.md  |  55 +++---
 .../src/content/alternatives/superset.md      |  46 +++--
 packages/website/src/routes/index.tsx         |   6 +-
 packages/website/src/routes/sponsor.tsx       |   2 +-
 packages/website/src/styles.css               |  18 ++
 16 files changed, 369 insertions(+), 265 deletions(-)

diff --git a/README.md b/README.md
index aa0a841e7e..a8fe3f5b25 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,11 @@
   <img src="https://paseo.sh/mobile-mockup.png" alt="Paseo mobile app" width="100%">
 </p>
 
-Run agents in parallel on your own machines. Ship from your phone or your desk.
+Paseo is a desktop, mobile, web, and CLI app for coding agents. Open the desktop app and work: agents, editor, terminals, diffs, pull requests, and a browser in one window. Run many agents at once, each in its own worktree, on one machine or several. The mobile app is the full app, native on iOS and Android.
 
+- **Parallel agents:** Run many agents at once, each in its own worktree.
+- **Built-in orchestration:** Agents in Paseo can create worktrees, launch other agents, and talk to them, across providers.
+- **Full IDE:** Edit files, review diffs, open pull requests, and run terminals, in split panes you arrange how you want.
 - **Self-hosted:** Agents run on your machine with your full dev environment. Use your tools, your configs, and your skills.
 - **Multi-provider:** Claude Code, Codex, Copilot, OpenCode, Pi, Antigravity, and Muse Code through the same interface. Pick the right model for each job.
 - **Voice control:** Dictate tasks or talk through problems in voice mode. Hands-free when you need it.
@@ -49,11 +52,18 @@ Run agents in parallel on your own machines. Ship from your phone or your desk.
 
 ## Plugins
 
-Add themes, workspace panels, commands, settings screens, and coding-agent providers with trusted
-TypeScript plugins. Install from npm, Git, or a local directory with `paseo plugin install <source>`.
+Plugins run on the daemon and show up in every client you connect, with the same UI on desktop, web,
+iOS, and Android. Write a plugin once and it is on your phone.
 
-Start with the [plugin quickstart](https://paseo.sh/docs/plugins). Plugins run with access to your daemon
-machine and inside connected clients; install only code you trust.
+- **UI:** screens, sidebar items, workspace panels, Command Center items, slash commands, composer pills, attachment sources, timeline items, themes.
+- **Agent lifecycle:** change configuration, environment, and MCP servers, answer permissions, follow up when a turn ends.
+- **Providers:** add a coding agent as a provider.
+
+Install from the registry with `paseo plugin add owner/slug`, or from Git or a local directory.
+
+**[Browse plugins](https://paseo.sh/plugins)** · **[Plugin docs](https://paseo.sh/docs/plugins)**
+
+Plugins run with access to your daemon machine and inside connected clients; install only code you trust.
 
 ## Getting Started
 
@@ -77,16 +87,16 @@ Download it from [paseo.sh/download](https://paseo.sh/download) or the [GitHub r
 
 To connect from your phone, open **Settings → your host → Pair Device**.
 
-### CLI / headless
+### Server
 
-Install the CLI and start Paseo:
+For a server, a VM, or any machine without the desktop app. Install the CLI and start the daemon:
 
 ```bash
 npm install -g @getpaseo/cli
 paseo
 ```
 
-Paseo starts locally, then asks whether to enable the end-to-end encrypted relay for device pairing. If you decline, connect directly over TCP, Tailscale, or another VPN. This path is useful for servers and remote machines.
+Paseo starts, then asks whether to enable the end-to-end encrypted relay for device pairing. If you decline, connect directly over TCP, Tailscale, or another VPN. The desktop, mobile, and web apps connect to this daemon like any other host.
 
 For full setup and configuration, see:
 
@@ -197,7 +207,7 @@ npm run typecheck
 
 ## Sponsors
 
-Paseo is built by one person and funded by the people who use it. Support the work on [GitHub Sponsors](https://github.com/sponsors/boudra). Companies can [sponsor Paseo](https://paseo.sh/sponsor#spot) monthly and have their logo shown here and on the paseo.sh homepage.
+Paseo is an independent project used by tens of thousands of developers daily, built by one person and funded by the people who use it. Support the work on [GitHub Sponsors](https://github.com/sponsors/boudra). Companies can [sponsor Paseo](https://paseo.sh/sponsor#spot) monthly and have their logo shown here and on the paseo.sh homepage.
 
 <!-- Sponsor logos go here, in the same order as packages/website/src/data/sponsors.ts -->
 
diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 3d25f942b9..1efc20115c 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -353,7 +353,7 @@ test("keeps the directory unlinked until the coordinated announcement", async ({
   await expect(
     page.getByRole("contentinfo").getByRole("link", { name: "Plugins", exact: true }),
   ).toHaveCount(0);
-  await expect(page.getByRole("link", { name: "Community plugins" })).toHaveAttribute(
+  await expect(page.getByRole("link", { name: "Browse plugins" })).toHaveAttribute(
     "href",
     "https://paseo.cafe",
   );
diff --git a/packages/website/src/components/alternative-page.tsx b/packages/website/src/components/alternative-page.tsx
index ec583fefaf..3322f869e1 100644
--- a/packages/website/src/components/alternative-page.tsx
+++ b/packages/website/src/components/alternative-page.tsx
@@ -32,7 +32,9 @@ function AlternativePageContent({ slug }: { slug: string }) {
 
   return (
     <SiteShell width="default">
-      <DocsMarkdown>{page.content}</DocsMarkdown>
+      <div className="comparison-prose">
+        <DocsMarkdown>{page.content}</DocsMarkdown>
+      </div>
     </SiteShell>
   );
 }
diff --git a/packages/website/src/components/landing-page.tsx b/packages/website/src/components/landing-page.tsx
index a1fcc18ef3..a5b573a1d6 100644
--- a/packages/website/src/components/landing-page.tsx
+++ b/packages/website/src/components/landing-page.tsx
@@ -4,13 +4,12 @@ import {
   ArrowRight,
   Blocks,
   Bot,
-  BookOpen,
   Braces,
-  Coffee,
   Compass,
   ExternalLink,
   Gem,
   GitFork,
+  LayoutPanelLeft,
   Laptop,
   Lock,
   Merge,
@@ -19,6 +18,7 @@ import {
   Smartphone,
   Terminal,
   Users,
+  Workflow,
   type LucideIcon,
 } from "lucide-react";
 import {
@@ -477,7 +477,7 @@ function TurnkeySection() {
             <div className="space-y-0.5">
               <h3 className="text-xl font-medium text-white/90">Desktop app</h3>
               <p className="max-w-lg text-sm leading-relaxed text-white/50">
-                The one click experience, download the app and it just works
+                The one click experience, download the app and it just works, no server required
               </p>
             </div>
           </div>
@@ -487,8 +487,8 @@ function TurnkeySection() {
           <div className="grid gap-4 md:grid-cols-3">
             <TurnkeyExtensionCard
               icon={Smartphone}
-              title="Mobile and web"
-              description="Connect to the same workspaces from any client"
+              title="Mobile"
+              description="Full client and native, not a WebView"
               ctaHref="/download"
               ctaLabel="Download"
             />
@@ -793,92 +793,105 @@ function SdkAutomationExample() {
 
 function ExtensibleSection() {
   return (
-    <FeatureSection title="Make it yours" description="Extend Paseo to work just the way you want">
-      <div className="grid gap-4 md:grid-cols-2">
-        <ExtensibleCard
-          icon={Puzzle}
-          title="Plugins"
-          description="Plugins can add server-side functionality and modify the client with custom components. They work across all clients, including mobile"
-          links={PLUGIN_CARD_LINKS}
-        />
-        <ExtensibleCard
-          icon={GitFork}
-          title="Fork the repo"
-          description="Paseo is licensed under Apache 2.0. You can inspect the implementation, fork the project, and adapt it to your workflow or organization"
-          links={FORK_CARD_LINKS}
-        />
+    <FeatureSection
+      title="Extend it with plugins"
+      description="Add new panels and functionality that work in desktop, web and mobile"
+    >
+      <div className="overflow-hidden rounded-2xl border border-white/10 bg-white/[0.02]">
+        <div className="flex flex-col gap-6 border-b border-white/10 p-6 sm:flex-row sm:items-center sm:justify-between md:p-8">
+          <div className="flex items-center gap-4">
+            <div className="rounded-xl border border-white/10 bg-white/[0.06] p-3 text-muted-foreground">
+              <Puzzle className="h-6 w-6" strokeWidth={1.5} />
+            </div>
+            <h3 className="text-xl font-medium text-white/90">Plugins</h3>
+          </div>
+          <div className="flex shrink-0 items-center gap-3">
+            <a
+              href={PLUGINS_BROWSE.href}
+              {...(PLUGINS_BROWSE.external ? { target: "_blank", rel: "noopener noreferrer" } : {})}
+              className="inline-flex items-center gap-1.5 rounded-full bg-foreground px-3 py-1.5 text-xs text-background transition-colors hover:bg-foreground/90"
+            >
+              Browse plugins
+              <ArrowRight className="h-3.5 w-3.5" />
+            </a>
+            <a
+              href="/docs/plugins"
+              className="inline-flex items-center gap-1.5 rounded-full border border-white/12 px-3 py-1.5 text-xs text-white/80 transition-colors hover:bg-white/10"
+            >
+              Plugin docs
+            </a>
+          </div>
+        </div>
+
+        <div className="p-6 md:p-8">
+          <div className="grid gap-4 md:grid-cols-3">
+            {PLUGIN_CAPABILITIES.map((capability) => (
+              <PluginCapabilityCard key={capability.title} {...capability} />
+            ))}
+          </div>
+        </div>
+
+        <div className="flex flex-col gap-3 border-t border-white/10 px-6 py-5 sm:flex-row sm:items-center sm:justify-between md:px-8">
+          <p className="text-sm text-white/45">Paseo is Apache 2.0.</p>
+          <a
+            href="https://github.com/getpaseo/paseo"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="inline-flex shrink-0 items-center gap-2 text-sm text-muted-foreground transition-colors hover:text-foreground"
+          >
+            <GitFork className="h-4 w-4" strokeWidth={1.5} />
+            Fork the repo
+            <ExternalLink className="h-3.5 w-3.5 opacity-70" />
+          </a>
+        </div>
       </div>
     </FeatureSection>
   );
 }
 
-interface ExtensibleCardLink {
-  href: string;
-  label: string;
-  icon: React.ComponentType<{ className?: string }>;
-  external?: boolean;
-  /** Accent links stand out without hover, for destinations worth noticing. */
-  accent?: boolean;
-}
+const PLUGINS_BROWSE = PLUGINS_LINKED
+  ? { href: "/plugins", external: false }
+  : { href: "https://paseo.cafe", external: true };
 
-const PLUGIN_CARD_LINKS: ReadonlyArray<ExtensibleCardLink> = [
-  { href: "/docs/plugins", label: "Plugin documentation", icon: BookOpen },
-  PLUGINS_LINKED
-    ? { href: "/plugins", label: "Community plugins", icon: Blocks, accent: true }
-    : {
-        href: "https://paseo.cafe",
-        label: "Community plugins",
-        icon: Coffee,
-        external: true,
-        accent: true,
-      },
-];
-
-const FORK_CARD_LINKS: ReadonlyArray<ExtensibleCardLink> = [
+const PLUGIN_CAPABILITIES: ReadonlyArray<{
+  icon: LucideIcon;
+  title: string;
+  description: string;
+}> = [
   {
-    href: "https://github.com/getpaseo/paseo",
-    label: "View the repository",
-    icon: GitHubIcon,
-    external: true,
+    icon: LayoutPanelLeft,
+    title: "UI",
+    description: "Screens, workspace panels, sidebar items, slash commands, and themes",
+  },
+  {
+    icon: Workflow,
+    title: "Agent lifecycle",
+    description:
+      "Change configuration, environment, and MCP servers. Answer permissions. Follow up when a turn ends",
+  },
+  {
+    icon: Bot,
+    title: "Providers",
+    description: "Add a coding agent as a provider, used the same way as the built-in ones",
   },
 ];
 
-function ExtensibleCard({
+function PluginCapabilityCard({
   icon: Icon,
   title,
   description,
-  links,
 }: {
   icon: LucideIcon;
   title: string;
   description: string;
-  links: ReadonlyArray<ExtensibleCardLink>;
 }) {
   return (
-    <div className="flex min-h-64 flex-col rounded-xl border border-white/10 bg-white/[0.025] p-6">
-      <div className="mb-8 text-muted-foreground">
-        <Icon className="h-6 w-6" strokeWidth={1.5} />
+    <div className="flex flex-col rounded-xl border border-white/10 bg-white/[0.025] p-5">
+      <div className="mb-5 text-muted-foreground">
+        <Icon className="h-5 w-5" strokeWidth={1.5} />
       </div>
-      <h3 className="text-lg font-medium text-white/85">{title}</h3>
+      <h3 className="font-medium text-white/85">{title}</h3>
       <p className="mt-2 text-sm leading-relaxed text-white/45">{description}</p>
-      <div className="mt-auto flex flex-col items-start gap-3 pt-6">
-        {links.map((link) => (
-          <a
-            key={link.href}
-            href={link.href}
-            {...(link.external ? { target: "_blank", rel: "noopener noreferrer" } : {})}
-            className={
-              link.accent
-                ? "inline-flex items-center gap-2 text-sm text-emerald-300/85 transition-colors hover:text-emerald-200"
-                : "inline-flex items-center gap-2 text-sm text-muted-foreground transition-colors hover:text-foreground"
-            }
-          >
-            <link.icon className="h-4 w-4" />
-            {link.label}
-            {link.external ? <ExternalLink className="h-3.5 w-3.5 opacity-70" /> : null}
-          </a>
-        ))}
-      </div>
     </div>
   );
 }
@@ -902,8 +915,7 @@ const PRINCIPLES: ReadonlyArray<{ icon: LucideIcon; title: string; description:
   {
     icon: Merge,
     title: "Unified",
-    description:
-      "Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, and more, all used the same way.",
+    description: "Every coding agent, used the same way. Switch providers any time.",
   },
   {
     icon: Blocks,
@@ -923,17 +935,17 @@ function PhilosophySection() {
       title="Philosophy"
       description="What Paseo stands for, and what every feature is built on"
     >
-      <div className="grid gap-4 md:grid-cols-2">
+      <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
         {PRINCIPLES.map((principle) => (
           <div
             key={principle.title}
-            className="rounded-xl border border-white/10 bg-white/[0.025] p-6"
+            className="rounded-xl border border-white/10 bg-white/[0.025] p-5"
           >
-            <div className="mb-8 text-extra-muted-foreground">
-              <principle.icon className="h-6 w-6" strokeWidth={1.5} />
+            <div className="flex items-center gap-3">
+              <principle.icon className="h-5 w-5 text-extra-muted-foreground" strokeWidth={1.5} />
+              <h3 className="font-medium text-white/85">{principle.title}</h3>
             </div>
-            <h3 className="text-lg font-medium text-white/85">{principle.title}</h3>
-            <p className="mt-2 text-sm leading-relaxed text-white/45">{principle.description}</p>
+            <p className="mt-3 text-sm leading-relaxed text-white/45">{principle.description}</p>
           </div>
         ))}
       </div>
diff --git a/packages/website/src/components/sponsorship.tsx b/packages/website/src/components/sponsorship.tsx
index 449742bffb..e3420aa36f 100644
--- a/packages/website/src/components/sponsorship.tsx
+++ b/packages/website/src/components/sponsorship.tsx
@@ -53,9 +53,10 @@ const MAINTAINER_LINK = (
 export function FounderNote() {
   return (
     <div className="max-w-2xl space-y-5 leading-relaxed text-white/70">
+      <p>Paseo is an independent project used by tens of thousands of developers daily.</p>
       <p>
-        I build Paseo on my own. There are no investors, no board and no company behind it, and I
-        have turned down funding offers to keep it that way.
+        It is built by one person, full time, with no investors, no board and no company behind it.
+        I have turned down funding offers to keep it that way.
       </p>
       <p>
         A tool that sits between you and your code, your keys and your machines has to stay neutral,
@@ -67,7 +68,7 @@ export function FounderNote() {
         <a href="/hub" className="underline hover:text-white/90">
           Paseo Hub
         </a>
-        , an optional hosted service. Your support is what lets me work on Paseo full time.
+        , an optional hosted service. Your support is what lets me keep working on it.
       </p>
       <p className="text-white/50">{MAINTAINER_LINK}, maintainer</p>
     </div>
@@ -79,7 +80,6 @@ interface BackingOption {
   name: string;
   icon: React.ComponentType<{ className?: string }>;
   external: boolean;
-  primary?: boolean;
 }
 
 const BACKING_OPTIONS: ReadonlyArray<BackingOption> = [
@@ -88,7 +88,6 @@ const BACKING_OPTIONS: ReadonlyArray<BackingOption> = [
     name: "GitHub Sponsors",
     icon: GitHubIcon,
     external: true,
-    primary: true,
   },
   {
     href: OPEN_COLLECTIVE_URL,
@@ -127,11 +126,7 @@ export function BackingOptions() {
           key={option.href}
           href={option.href}
           {...(option.external ? { target: "_blank", rel: "noopener noreferrer" } : {})}
-          className={`flex items-center gap-4 rounded-xl border p-4 transition-colors ${
-            option.primary
-              ? "border-white/25 bg-white/[0.06] hover:border-white/40 hover:bg-white/[0.08]"
-              : "border-white/10 bg-white/[0.02] hover:border-white/20 hover:bg-white/[0.05]"
-          }`}
+          className="flex items-center gap-4 rounded-xl border border-white/10 bg-white/[0.02] p-4 transition-colors hover:border-white/20 hover:bg-white/[0.05]"
         >
           <option.icon className="h-6 w-6 shrink-0 text-white/60" />
           <p className="flex items-center gap-1.5 font-medium text-white">
@@ -237,9 +232,10 @@ export function SponsorSection() {
       <SectionHeading as="h2" title="Sponsor Paseo" />
       <div className="space-y-10">
         <div className="max-w-2xl space-y-5 leading-relaxed text-white/70">
+          <p>Paseo is an independent project used by tens of thousands of developers daily.</p>
           <p>
-            I build Paseo on my own, with no investors and no company behind it, and I have turned
-            down funding offers to keep it that way. A tool that sits between you and your code,
+            It is built by one person, full time, with no investors and no company behind it. I have
+            turned down funding to keep it that way. A tool that sits between you and your code,
             your keys and your machines has to stay neutral, and funding creates pressure to
             monetize.
           </p>
@@ -248,7 +244,7 @@ export function SponsorSection() {
             <a href="/hub" className="underline hover:text-white/90">
               Paseo Hub
             </a>
-            , and your support is what lets me work on it full time.
+            . Your support is what lets me keep working on it.
           </p>
           <p className="text-white/50">{MAINTAINER_LINK}, maintainer</p>
         </div>
diff --git a/packages/website/src/content/alternatives/claude-desktop.md b/packages/website/src/content/alternatives/claude-desktop.md
index 0d607daea7..53f3118cc6 100644
--- a/packages/website/src/content/alternatives/claude-desktop.md
+++ b/packages/website/src/content/alternatives/claude-desktop.md
@@ -45,7 +45,7 @@ Both Claude Desktop and Paseo are available on macOS, Windows, and Linux.
 
 ## Mobile
 
-Paseo ships native iOS and Android apps with the same agent workflow as the desktop app.
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop.
 
 Claude has iOS and Android apps. Dispatch can start local Claude Code work through an active Claude Desktop host or start a cloud session on Anthropic's infrastructure.
 
@@ -84,7 +84,7 @@ paseo schedule create --cron "0 9 * * 1" "audit the codebase"
 
 Both tools support parallel coding sessions, including Git worktrees.
 
-Paseo also gives each worktree its own dev server URL. Two agents running their dev servers at the same time get `web.fix-auth.my-app.localhost` and `web.add-search.my-app.localhost` instead of port collisions.
+Paseo also gives each worktree its own dev server URL. Two agents running their dev servers at the same time get `web--fix-auth--my-app.localhost` and `web--add-search--my-app.localhost` instead of port collisions.
 
 ## Voice
 
@@ -94,25 +94,31 @@ Claude supports voice in Claude's own mobile and app surfaces. Claude Code itsel
 
 ## Comparison
 
-|                              | Paseo                                                                                   | Claude Desktop                       |
-| ---------------------------- | --------------------------------------------------------------------------------------- | ------------------------------------ |
-| License                      | Open source (Apache-2.0)                                                                | Not published as open source         |
-| Desktop platforms            | macOS, Linux, Windows                                                                   | macOS, Linux, Windows                |
-| Mobile coding workflow       | Native Paseo workspace on iOS and Android                                               | Dispatch and Cowork in Claude mobile |
-| Coding agents                | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code + 30+ via ACP catalog + custom | Claude Code                          |
-| Product account required     | No                                                                                      | Claude account                       |
-| Cloud agent                  | Cloud waitlist                                                                          | Claude Cowork and remote sessions    |
-| Required cloud connection    | No                                                                                      | Claude account and services          |
-| Machines you control         | Laptop, workstation, VM, server, or home lab                                            | Local machine or SSH host            |
-| Git worktrees                | Yes                                                                                     | Yes                                  |
-| Per-worktree dev server URLs | Yes                                                                                     | No                                   |
-| Split panes and tabs         | Yes                                                                                     | Yes                                  |
-| In-app terminal              | Yes                                                                                     | Yes                                  |
-| In-app browser / preview     | Yes                                                                                     | Yes                                  |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge                                                | PR monitoring and merge workflows    |
-| CLI                          | Run, `--host`, ls, send, schedule, loop                                                 | Claude Code CLI                      |
-| Remote transport             | Direct connection or end-to-end encrypted relay                                         | Anthropic Remote and cloud services  |
-| Application plugins          | Server code and native client components                                                | No                                   |
-| Self-hosted control plane    | Daemon, web client, and relay                                                           | No                                   |
+|                              | Paseo                                                                                              | Claude Desktop                                   |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ------------------------------------------------ |
+| License                      | Open source (Apache-2.0)                                                                           | Not published as open source                     |
+| Account required             | No                                                                                                 | Claude account                                   |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS, Linux, Windows)                      |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Claude app (Dispatch and Cowork)                 |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (Claude Code CLI)                            |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | Yes (SSH host, Anthropic-managed cloud sessions) |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | Anthropic Remote                                 |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                                |
+| SSH access                   | Yes                                                                                                | Yes                                              |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | Claude Code                                      |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees)                              |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | -                                                |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | -                                                |
+| Editor                       | Yes                                                                                                | Yes (file editor)                                |
+| Terminals                    | Yes                                                                                                | Yes                                              |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                              |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | PR monitoring and merge workflows                |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes (live app preview)                           |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | No                                               |
+| Schedules and heartbeats     | Yes                                                                                                | Yes (scheduled tasks)                            |
+| Plan usage                   | Yes                                                                                                | -                                                |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                               |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | Yes (in Claude's mobile and app surfaces)        |
+| Telemetry                    | None                                                                                               | -                                                |
 
 See also: [Paseo vs Codex App](/alternatives/codex-app), [Paseo vs OpenCode Desktop](/alternatives/opencode-desktop), [Paseo vs Conductor](/alternatives/conductor).
diff --git a/packages/website/src/content/alternatives/codex-app.md b/packages/website/src/content/alternatives/codex-app.md
index 36a3b6935b..d184dac1cc 100644
--- a/packages/website/src/content/alternatives/codex-app.md
+++ b/packages/website/src/content/alternatives/codex-app.md
@@ -45,7 +45,7 @@ OpenAI's desktop app and Paseo are available on macOS, Windows, and Linux.
 
 ## Mobile
 
-Paseo ships native iOS and Android apps with the same agent workflow as the desktop app.
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop.
 
 ChatGPT Remote can start and continue Codex chats, approve actions, and review outputs from iOS and Android through a connected desktop host.
 
@@ -55,7 +55,7 @@ Both tools support Git worktrees for parallel work.
 
 Codex App creates Codex-managed worktrees under `$CODEX_HOME/worktrees` and supports local environment setup scripts and project actions through `.codex` configuration.
 
-Paseo creates worktrees under `$PASEO_HOME/worktrees`, runs setup and teardown hooks from `paseo.json`, and gives each worktree its own dev server URLs like `web.fix-auth.my-app.localhost` so parallel services don't fight for ports.
+Paseo creates worktrees under `$PASEO_HOME/worktrees`, runs setup and teardown hooks from `paseo.json`, and gives each worktree its own dev server URLs like `web--fix-auth--my-app.localhost` so parallel services don't fight for ports.
 
 ## GitHub and review
 
@@ -88,23 +88,31 @@ Paseo supports dictation and realtime voice mode. Speech-to-text and text-to-spe
 
 ## Comparison
 
-|                                 | Paseo                                                           | Codex App                                            |
-| ------------------------------- | --------------------------------------------------------------- | ---------------------------------------------------- |
-| License                         | Open source (Apache-2.0)                                        | Codex CLI is open source; application is proprietary |
-| Desktop platforms               | macOS, Linux, Windows                                           | macOS, Linux, Windows                                |
-| Mobile coding workflow          | Native Paseo workspace on iOS and Android                       | ChatGPT Remote on iOS and Android                    |
-| Providers                       | Codex, Claude Code, OpenCode, Pi + 30+ via ACP catalog + custom | Codex                                                |
-| Product account required        | No                                                              | OpenAI account                                       |
-| Required Paseo cloud connection | No                                                              | Not applicable                                       |
-| Git worktrees                   | Yes                                                             | Yes                                                  |
-| Per-worktree dev server URLs    | Yes                                                             | No                                                   |
-| In-app terminal                 | Yes                                                             | Yes                                                  |
-| In-app browser                  | Yes                                                             | Yes                                                  |
-| GitHub workflow in app          | Commit, push, PR, checks, reviews, merge                        | Commit, push, PR                                     |
-| CLI                             | Run, `--host`, ls, send, schedule, loop                         | Codex CLI                                            |
-| Remote transport                | Direct connection or end-to-end encrypted relay                 | OpenAI Remote                                        |
-| Application plugins             | Server code and native client components                        | No                                                   |
-| Voice                           | Dictation and realtime voice                                    | Dictation                                            |
-| Self-hosted control plane       | Daemon, web client, and relay                                   | No                                                   |
+|                              | Paseo                                                                                              | Codex App                                            |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ---------------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Codex CLI is open source; application is proprietary |
+| Account required             | No                                                                                                 | OpenAI account                                       |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS, Linux, Windows)                          |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | ChatGPT app (Remote)                                 |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (Codex CLI)                                      |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | Yes (connected host, OpenAI-managed cloud)           |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | OpenAI Remote                                        |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                                    |
+| SSH access                   | Yes                                                                                                | -                                                    |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | Codex                                                |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees)                                  |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | -                                                    |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | -                                                    |
+| Editor                       | Yes                                                                                                | -                                                    |
+| Terminals                    | Yes                                                                                                | Yes                                                  |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                                  |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | Commit, push, PR                                     |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes                                                  |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | No                                                   |
+| Schedules and heartbeats     | Yes                                                                                                | -                                                    |
+| Plan usage                   | Yes                                                                                                | -                                                    |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                                   |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | Dictation                                            |
+| Telemetry                    | None                                                                                               | -                                                    |
 
 See also: [Paseo vs Claude Desktop](/alternatives/claude-desktop), [Paseo vs OpenCode Desktop](/alternatives/opencode-desktop), [all supported providers](/agents).
diff --git a/packages/website/src/content/alternatives/conductor.md b/packages/website/src/content/alternatives/conductor.md
index 9c0a30af34..a3455bb0aa 100644
--- a/packages/website/src/content/alternatives/conductor.md
+++ b/packages/website/src/content/alternatives/conductor.md
@@ -67,11 +67,11 @@ Conductor lists its API as a Pro feature but does not document a user-facing CLI
 
 Both tools isolate parallel agents in git worktrees.
 
-Paseo also gives each worktree its own dev server URL. Two agents running their dev servers at the same time get `web.fix-auth.my-app.localhost` and `web.add-search.my-app.localhost` instead of port collisions.
+Paseo also gives each worktree its own dev server URL. Two agents running their dev servers at the same time get `web--fix-auth--my-app.localhost` and `web--add-search--my-app.localhost` instead of port collisions.
 
 ## Mobile
 
-Paseo ships native iOS and Android apps today. Conductor lists its mobile app as coming soon under the Pro plan.
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop. Conductor lists its mobile app as coming soon under the Pro plan.
 
 ## Voice
 
@@ -79,21 +79,31 @@ Paseo supports local speech-to-text and text-to-speech. Conductor does not curre
 
 ## Comparison
 
-|                              | Paseo                                                                                   | Conductor                            |
-| ---------------------------- | --------------------------------------------------------------------------------------- | ------------------------------------ |
-| License                      | Open source (Apache-2.0)                                                                | Closed source                        |
-| Platforms                    | macOS, Linux, Windows                                                                   | macOS only                           |
-| Native mobile                | iOS, Android                                                                            | Coming soon under Pro                |
-| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code + 30+ via ACP catalog + custom | Claude Code, Codex, Cursor, OpenCode |
-| Git worktrees                | Yes                                                                                     | Yes                                  |
-| Per-worktree dev server URLs | Yes                                                                                     | —                                    |
-| Split panes and tabs         | Yes                                                                                     | —                                    |
-| In-app terminal              | Yes                                                                                     | Yes                                  |
-| In-app browser               | Yes                                                                                     | —                                    |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge                                                | Yes                                  |
-| CLI                          | Run, `--host`, ls, send, schedule, loop                                                 | —                                    |
-| Application plugins          | Server code and native client components                                                | No                                   |
-| Local voice                  | Yes                                                                                     | Not documented                       |
-| Self-hosted daemon           | Yes                                                                                     | —                                    |
+|                              | Paseo                                                                                              | Conductor                               |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | --------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Closed source                           |
+| Account required             | No                                                                                                 | Yes                                     |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS only)                        |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Coming soon under Pro                   |
+| CLI                          | Yes (everything the app does)                                                                      | API under Pro                           |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | No (managed cloud workspaces under Pro) |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | -                                       |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | No                                      |
+| SSH access                   | Yes                                                                                                | No                                      |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | Claude Code, Codex, Cursor, OpenCode    |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees)                     |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | -                                       |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | -                                       |
+| Editor                       | Yes                                                                                                | -                                       |
+| Terminals                    | Yes                                                                                                | Yes                                     |
+| Diff review                  | Yes (comments go to the agent)                                                                     | -                                       |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | GitHub                                  |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | -                                       |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | -                                       |
+| Schedules and heartbeats     | Yes                                                                                                | -                                       |
+| Plan usage                   | Yes                                                                                                | -                                       |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                      |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | -                                       |
+| Telemetry                    | None                                                                                               | -                                       |
 
 See also: [Paseo vs Superset](/alternatives/superset), [Paseo vs OpenChamber](/alternatives/openchamber), [Paseo vs Happy Coder](/alternatives/happy-coder).
diff --git a/packages/website/src/content/alternatives/happy-coder.md b/packages/website/src/content/alternatives/happy-coder.md
index b92a3f651e..f0641666c6 100644
--- a/packages/website/src/content/alternatives/happy-coder.md
+++ b/packages/website/src/content/alternatives/happy-coder.md
@@ -37,7 +37,7 @@ Paseo's app handles commit, push, opening PRs, watching checks and reviews, and
 
 ## Mobile
 
-Both tools ship native iOS and Android apps.
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop. Happy Coder also ships native iOS and Android apps.
 
 ## Providers
 
@@ -53,7 +53,7 @@ Happy Coder does not document an application extension API for adding both serve
 
 ## Worktrees and services
 
-Paseo runs each agent in its own git worktree. Each worktree gets its own dev server URL like `web.fix-auth.my-app.localhost`, so parallel agents don't fight for the same port.
+Paseo runs each agent in its own git worktree. Each worktree gets its own dev server URL like `web--fix-auth--my-app.localhost`, so parallel agents don't fight for the same port.
 
 Happy Coder can start an agent in a selected machine path, including an existing Git worktree. It does not currently create or manage the worktree lifecycle.
 
@@ -79,21 +79,31 @@ Both products support voice interaction. Paseo can run speech-to-text and text-t
 
 ## Comparison
 
-|                              | Paseo                                                                                   | Happy Coder                 |
-| ---------------------------- | --------------------------------------------------------------------------------------- | --------------------------- |
-| License                      | Open source (Apache-2.0)                                                                | Open source (MIT)           |
-| Desktop app                  | macOS, Linux, Windows                                                                   | macOS                       |
-| Native mobile                | iOS, Android                                                                            | iOS, Android                |
-| Architecture                 | Daemon owns agent lifecycle                                                             | Wraps the agent CLI         |
-| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code + 30+ via ACP catalog + custom | Claude Code, Codex          |
-| Split workspace              | Yes                                                                                     | Yes                         |
-| In-app terminal              | Yes                                                                                     | Yes                         |
-| In-app browser / preview     | Yes                                                                                     | Yes                         |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge                                                | —                           |
-| Managed Git worktrees        | Yes                                                                                     | Existing worktree paths     |
-| Per-worktree dev server URLs | Yes                                                                                     | —                           |
-| CLI                          | Run, `--host`, ls, send, schedule, loop                                                 | Launch and control sessions |
-| Application plugins          | Server code and native client components                                                | No                          |
-| Voice                        | Local or configured cloud speech                                                        | Yes                         |
+|                              | Paseo                                                                                              | Happy Coder                                     |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ----------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Open source (MIT)                               |
+| Account required             | No                                                                                                 | -                                               |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS)                                     |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Yes (native)                                    |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (launch and control sessions)               |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | -                                               |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | Yes (end-to-end encrypted)                      |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                               |
+| SSH access                   | Yes                                                                                                | -                                               |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | Claude Code, Codex                              |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Existing worktree paths, no worktree management |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | Yes (wraps the agent CLI)                       |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | -                                               |
+| Editor                       | Yes                                                                                                | -                                               |
+| Terminals                    | Yes                                                                                                | Yes                                             |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                             |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | -                                               |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes (previews)                                  |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | -                                               |
+| Schedules and heartbeats     | Yes                                                                                                | -                                               |
+| Plan usage                   | Yes                                                                                                | -                                               |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                              |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | Yes                                             |
+| Telemetry                    | None                                                                                               | -                                               |
 
 See also: [Paseo vs Conductor](/alternatives/conductor), [Paseo vs Superset](/alternatives/superset), [Paseo vs OpenChamber](/alternatives/openchamber).
diff --git a/packages/website/src/content/alternatives/openchamber.md b/packages/website/src/content/alternatives/openchamber.md
index f71c02ed46..bec7765588 100644
--- a/packages/website/src/content/alternatives/openchamber.md
+++ b/packages/website/src/content/alternatives/openchamber.md
@@ -51,26 +51,35 @@ OpenChamber's CLI runs and manages its server, remote access, and updates. Its A
 
 ## Mobile and voice
 
-Both tools provide iOS and Android clients and support dictation and spoken replies. Paseo uses a React Native mobile interface. OpenChamber packages its web interface with Capacitor and adds native integrations around the WebView.
+Both tools provide iOS and Android clients and support dictation and spoken replies. The mobile app is the full app, native on iOS and Android, with full feature parity with desktop. OpenChamber packages its web interface with Capacitor and adds native integrations around the WebView.
 
 ## Comparison
 
-|                              | Paseo                                                                                   | OpenChamber                      |
-| ---------------------------- | --------------------------------------------------------------------------------------- | -------------------------------- |
-| License                      | Open source (Apache-2.0)                                                                | Open source (MIT)                |
-| Desktop platforms            | macOS, Linux, Windows                                                                   | macOS, Linux, Windows            |
-| Mobile implementation        | React Native                                                                            | Capacitor WebView                |
-| Agent harnesses              | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code + 30+ via ACP catalog + custom | OpenCode                         |
-| Application plugins          | Server code and native client components                                                | No                               |
-| Split panes and tabs         | Yes                                                                                     | Workspace views                  |
-| In-app terminal              | Yes                                                                                     | Yes                              |
-| In-app browser               | Yes                                                                                     | Yes                              |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge                                                | Issue, PR, checks, review, merge |
-| Git worktrees                | Yes                                                                                     | Yes                              |
-| Per-worktree dev server URLs | Yes                                                                                     | Preview and port detection       |
-| Automation                   | CLI, SDK, MCP                                                                           | Server CLI, Agent Control Tool   |
-| Schedules                    | Yes                                                                                     | Yes                              |
-| Voice                        | Local dictation and realtime voice                                                      | Dictation and spoken replies     |
-| Self-hosted daemon           | Yes                                                                                     | Yes                              |
+|                              | Paseo                                                                                              | OpenChamber                                    |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ---------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Open source (MIT)                              |
+| Account required             | No                                                                                                 | -                                              |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS, Linux, Windows)                    |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Yes (Capacitor WebView)                        |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (runs and manages the server)              |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | Yes (server on another machine)                |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | -                                              |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                              |
+| SSH access                   | Yes                                                                                                | -                                              |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | OpenCode                                       |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees, multi-run comparisons)     |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | -                                              |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | Yes (Agent Control Tool, OpenCode agents only) |
+| Editor                       | Yes                                                                                                | -                                              |
+| Terminals                    | Yes                                                                                                | Yes                                            |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                            |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | GitHub (issue, PR, checks, review, merge)      |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes (previews)                                 |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | Preview and port detection                     |
+| Schedules and heartbeats     | Yes                                                                                                | Yes (schedules)                                |
+| Plan usage                   | Yes                                                                                                | -                                              |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                             |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | Dictation and spoken replies                   |
+| Telemetry                    | None                                                                                               | -                                              |
 
 See also: [Paseo vs Conductor](/alternatives/conductor), [Paseo vs Superset](/alternatives/superset), [Paseo vs Happy Coder](/alternatives/happy-coder).
diff --git a/packages/website/src/content/alternatives/opencode-desktop.md b/packages/website/src/content/alternatives/opencode-desktop.md
index 5321dd3ae7..5279fb55a2 100644
--- a/packages/website/src/content/alternatives/opencode-desktop.md
+++ b/packages/website/src/content/alternatives/opencode-desktop.md
@@ -43,7 +43,7 @@ Paseo ships on macOS, Linux, and Windows. OpenCode provides beta desktop builds
 
 ## Mobile
 
-Paseo ships native iOS and Android apps with the same agent workflow as the desktop app.
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop.
 
 OpenCode Desktop is a desktop app. OpenCode also has web and share-link workflows, but not a native mobile app.
 
@@ -78,7 +78,7 @@ paseo schedule create --cron "0 9 * * 1" "audit the codebase"
 
 ## Worktrees and services
 
-Paseo runs each agent in its own Git worktree. Each worktree gets its own dev server URL like `web.fix-auth.my-app.localhost`, so parallel agents don't fight for ports.
+Paseo runs each agent in its own Git worktree. Each worktree gets its own dev server URL like `web--fix-auth--my-app.localhost`, so parallel agents don't fight for ports.
 
 OpenCode supports multi-session work on the same project. If you want worktree isolation around OpenCode sessions, Paseo can provide that by launching OpenCode inside Paseo workspaces.
 
@@ -94,23 +94,31 @@ Paseo supports dictation and realtime voice mode. Speech-to-text and text-to-spe
 
 ## Comparison
 
-|                              | Paseo                                                                                   | OpenCode Desktop                |
-| ---------------------------- | --------------------------------------------------------------------------------------- | ------------------------------- |
-| License                      | Open source (Apache-2.0)                                                                | Open source (MIT)               |
-| Desktop platforms            | macOS, Linux, Windows                                                                   | macOS, Linux, Windows           |
-| Native mobile                | iOS, Android                                                                            | No                              |
-| Agent harnesses              | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code + 30+ via ACP catalog + custom | OpenCode                        |
-| Multi-model support          | Through supported agent harnesses                                                       | Through OpenCode providers      |
-| Git worktrees                | Yes                                                                                     | No built-in worktree manager    |
-| Per-worktree dev server URLs | Yes                                                                                     | No                              |
-| Split panes and tabs         | Yes                                                                                     | Desktop sessions                |
-| In-app terminal              | Yes                                                                                     | OpenCode terminal workflow      |
-| In-app browser               | Yes                                                                                     | No                              |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge                                                | GitHub integration              |
-| CLI                          | Run, `--host`, ls, send, schedule, loop                                                 | OpenCode CLI                    |
-| MCP server for orchestration | Yes                                                                                     | MCP support inside OpenCode     |
-| Application plugins          | Server code and native client components                                                | No                              |
-| Local voice                  | Yes                                                                                     | No                              |
-| Self-hosted daemon           | Yes                                                                                     | OpenCode server / local runtime |
+|                              | Paseo                                                                                              | OpenCode Desktop                                |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ----------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Open source (MIT)                               |
+| Account required             | No                                                                                                 | -                                               |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (beta, macOS, Linux, Windows)               |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | No                                              |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (OpenCode CLI)                              |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | OpenCode server                                 |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | -                                               |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                               |
+| SSH access                   | Yes                                                                                                | -                                               |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | OpenCode (many model providers)                 |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Multiple sessions, no built-in worktree manager |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | -                                               |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | MCP support inside OpenCode                     |
+| Editor                       | Yes                                                                                                | -                                               |
+| Terminals                    | Yes                                                                                                | OpenCode terminal workflow                      |
+| Diff review                  | Yes (comments go to the agent)                                                                     | -                                               |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | GitHub, GitLab integrations                     |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | No                                              |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | No                                              |
+| Schedules and heartbeats     | Yes                                                                                                | -                                               |
+| Plan usage                   | Yes                                                                                                | -                                               |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                              |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | No                                              |
+| Telemetry                    | None                                                                                               | -                                               |
 
 See also: [Paseo vs Codex App](/alternatives/codex-app), [Paseo vs Claude Desktop](/alternatives/claude-desktop), [Paseo vs OpenChamber](/alternatives/openchamber).
diff --git a/packages/website/src/content/alternatives/orca.md b/packages/website/src/content/alternatives/orca.md
index d47ce3c218..4286f3794e 100644
--- a/packages/website/src/content/alternatives/orca.md
+++ b/packages/website/src/content/alternatives/orca.md
@@ -17,7 +17,7 @@ Paseo is an app for orchestrating coding agents, with native clients on desktop,
 
 Orca is built around terminals. Each agent runs in a terminal pane, and an experimental Chat UI can show supported agents as a chat transcript. Orca ships a broad set of built-in tools around those terminals.
 
-Paseo is built around agent chat. It keeps a small core for starting agents, following their work, giving direction, and reviewing results, and adds everything else through plugins that run on the daemon and every client.
+Paseo is built around agent chat. The app ships what every developer uses: editor, terminals, diffs, pull requests, and a browser. Features only some teams need, like issue boards or cloud VMs, are plugins you install, so nothing you do not use is in the way.
 
 Orca is made by Stably AI, a venture-funded company (Y Combinator). Paseo is independent and open source.
 
@@ -31,7 +31,7 @@ Orca runs inside its desktop app by default and reaches other machines in two wa
 
 Both tools have iOS and Android apps.
 
-Paseo ships native apps on the App Store and Google Play. To connect from your phone, enable the relay and scan a QR code. The daemon connects outbound to the relay and your phone meets it there, so you do not need a VPN, port forwarding, SSH, or an account. Traffic is end-to-end encrypted, and the [relay server](https://github.com/getpaseo/paseo-relay) is open source. You can also connect directly over Tailscale.
+The mobile app is the full app, native on iOS and Android, with full feature parity with desktop. They are on the App Store and Google Play. To connect from your phone, enable the relay and scan a QR code. The daemon connects outbound to the relay and your phone meets it there, so you do not need a VPN, port forwarding, SSH, or an account. Traffic is end-to-end encrypted, and the [relay server](https://github.com/getpaseo/paseo-relay) is open source. You can also connect directly over Tailscale.
 
 Orca's mobile companion is in beta, on the App Store for iOS and as an APK download for Android. It can reply to agents, open sessions as a terminal or Chat UI, commit changes, and create workspaces on the paired desktop. Orca Relay, also in beta, connects the phone when it is not on the same network as the desktop and requires signing in to an Orca account. Without Orca Relay, the phone needs a LAN or Tailscale path to the desktop.
 
@@ -51,7 +51,7 @@ Paseo runs Claude Code, Codex, OpenCode, Pi, Antigravity, and Muse Code through
 
 [Paseo plugins](/docs/plugins) extend Paseo itself. A plugin can add workspace panels, sidebar items, Command Center items, slash commands, composer pills, settings screens, themes, attachment sources, and agent providers. Its server code runs beside the daemon, and its client code runs in every connected client: desktop, browser, iOS, and Android.
 
-Community plugins are listed at [paseo.cafe](https://paseo.cafe).
+Community plugins are listed at [paseo.sh/plugins](/plugins).
 
 Orca has an experimental plugin system that is off by default. Orca plugins can add desktop panels rendered in a sandboxed frame, commands, keybindings, language packs, VM recipes, and agent profiles, and can be installed from git marketplaces. Plugin workers run on the desktop computer, and Orca does not document plugin surfaces in its mobile app.
 
@@ -59,13 +59,13 @@ Orca has an experimental plugin system that is off by default. Orca plugins can
 
 Orca includes many tools in the core app: a Monaco code editor, Design Mode for sending page elements from its browser to an agent, computer use, Linear and Jira boards, agent account switching with usage tracking, and per-workspace cloud VM recipes. If you want these in one app without extensions, Orca provides them.
 
-Paseo keeps a smaller core. A capability that serves a specialized workflow is meant to be a plugin, so the default app stays short to learn and each plugin can be maintained on its own schedule.
+Paseo includes an editor, terminals, diff review with comments that go to the agent, pull requests on GitHub, GitLab, Gitea, Forgejo, and Codeberg, a browser with an element picker and agent browser tools, plan usage, schedules, and heartbeats. Boards and cloud VMs are what a plugin adds.
 
 ## Workspaces and review
 
 Both tools provide Git worktrees, split panes, terminals, diff review, an in-app browser, pull-request workflows, and scheduled agent runs.
 
-Paseo also gives each worktree its own service URL, such as `web.fix-auth.my-app.localhost`, so parallel development servers do not compete for ports. Orca adds diff annotations that you send back to the agent, port forwarding for SSH worktrees, and pull requests on GitLab, Bitbucket, Azure DevOps, and Gitea as well as GitHub.
+Paseo has diff review with comments that go to the agent and opens pull requests on GitHub, GitLab, Gitea, Forgejo, and Codeberg. It also gives each worktree its own service URL, such as `web--fix-auth--my-app.localhost`, so parallel development servers do not compete for ports. Orca has port forwarding for SSH worktrees and pull requests on GitLab, Bitbucket, Azure DevOps, and Gitea as well as GitHub.
 
 ## Automation
 
@@ -89,24 +89,31 @@ Orca does not require an account for local use. Orca Relay and shared artifacts
 
 ## Comparison
 
-|                              | Paseo                                                                                   | Orca                                  |
-| ---------------------------- | --------------------------------------------------------------------------------------- | ------------------------------------- |
-| License                      | Open source (Apache-2.0)                                                                | Open source (MIT)                     |
-| Funding                      | Independent                                                                             | Venture-funded (Y Combinator)         |
-| Desktop platforms            | macOS, Linux, Windows                                                                   | macOS, Linux, Windows                 |
-| Native mobile                | iOS, Android                                                                            | iOS, Android APK (beta)               |
-| Main interface               | Agent chat                                                                              | Terminal, with experimental Chat UI   |
-| Remote machines              | Daemon on any machine, direct, SSH, or relay                                            | SSH worktrees, Remote Orca Server     |
-| Relay                        | Optional, end-to-end encrypted, no account                                              | Beta, Orca account required           |
-| Agent harnesses              | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code + 30+ via ACP catalog + custom | Any CLI agent in a terminal           |
-| Application plugins          | Server code and native client components on every client                                | Experimental, desktop only            |
-| In-app terminal              | Yes                                                                                     | Yes                                   |
-| In-app browser               | Yes                                                                                     | Yes, with Design Mode                 |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge                                                | Yes, plus GitLab, Bitbucket, and more |
-| Git worktrees                | Yes                                                                                     | Yes                                   |
-| Per-worktree dev server URLs | Yes                                                                                     | Port forwarding for SSH worktrees     |
-| Automation                   | CLI, SDK, MCP                                                                           | CLI, automations                      |
-| Voice                        | Local dictation and realtime voice                                                      | Dictation                             |
-| Telemetry                    | None                                                                                    | Anonymous usage data, opt-out         |
+|                              | Paseo                                                                                              | Orca                                                    |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | ------------------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Open source (MIT)                                       |
+| Account required             | No                                                                                                 | No for local use, Orca account for relay                |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS, Linux, Windows)                             |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Yes (companion app, beta)                               |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (worktrees, browser, automations)                   |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | Yes (SSH worktrees, Remote Orca Server in beta)         |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | Yes (beta, Orca account required)                       |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | Yes (LAN, Tailscale)                                    |
+| SSH access                   | Yes                                                                                                | Yes (SSH worktrees)                                     |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | Any CLI agent in a terminal, 30+ listed                 |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees)                                     |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | Yes (main interface, experimental Chat UI)              |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | Yes (agents call the Orca CLI through installed skills) |
+| Editor                       | Yes                                                                                                | Yes (Monaco)                                            |
+| Terminals                    | Yes                                                                                                | Yes                                                     |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                                     |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | GitHub, GitLab, Bitbucket, Azure DevOps, Gitea          |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes (Design Mode)                                       |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | Port forwarding for SSH worktrees                       |
+| Schedules and heartbeats     | Yes                                                                                                | Yes (scheduled agent runs)                              |
+| Plan usage                   | Yes                                                                                                | Yes (usage tracking, account switching)                 |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | Experimental, desktop only                              |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | Dictation                                               |
+| Telemetry                    | None                                                                                               | Anonymous usage data, opt-out                           |
 
 See also: [Paseo vs Conductor](/alternatives/conductor), [Paseo vs Superset](/alternatives/superset), [Paseo vs OpenChamber](/alternatives/openchamber).
diff --git a/packages/website/src/content/alternatives/superset.md b/packages/website/src/content/alternatives/superset.md
index 3dc33113ce..30877bc79e 100644
--- a/packages/website/src/content/alternatives/superset.md
+++ b/packages/website/src/content/alternatives/superset.md
@@ -51,7 +51,7 @@ Both tools provide Git worktrees, split panes, terminals, diff review, an in-app
 
 Paseo gives supported providers a structured chat interface with modes, slash commands, tool calls, and file attachments. Superset can run any CLI agent in terminal panes and adds lifecycle status for supported agents.
 
-Paseo also gives each worktree its own service URL, such as `web.fix-auth.my-app.localhost`, so parallel development servers do not compete for ports.
+Paseo also gives each worktree its own service URL, such as `web--fix-auth--my-app.localhost`, so parallel development servers do not compete for ports.
 
 ## Automation
 
@@ -65,23 +65,31 @@ Superset has a free individual tier. Team features, remote access, and integrati
 
 ## Comparison
 
-|                              | Paseo                                    | Superset                               |
-| ---------------------------- | ---------------------------------------- | -------------------------------------- |
-| License                      | Open source (Apache-2.0)                 | Source-available (Elastic License 2.0) |
-| Desktop platforms            | macOS, Linux, Windows                    | macOS, experimental Linux              |
-| Native mobile                | iOS, Android                             | Coming soon                            |
-| Account required             | No                                       | Yes, with GitHub sign-in               |
-| Agent harnesses              | Native, ACP, and custom CLI              | CLI agents                             |
-| Application plugins          | Server code and native client components | No                                     |
-| Split panes and tabs         | Yes                                      | Yes                                    |
-| In-app terminal              | Yes                                      | Yes                                    |
-| In-app browser               | Yes                                      | Yes                                    |
-| GitHub workflow in app       | Commit, push, PR, checks, reviews, merge | Yes                                    |
-| Git worktrees                | Yes                                      | Yes                                    |
-| Per-worktree dev server URLs | Yes                                      | Port detection                         |
-| Automation                   | CLI, SDK, MCP                            | CLI, SDK, MCP                          |
-| Schedules                    | Yes                                      | Yes                                    |
-| Local voice                  | Dictation and realtime voice             | No documented voice support            |
-| Self-hosted daemon           | Yes                                      | Host server                            |
+|                              | Paseo                                                                                              | Superset                                                              |
+| ---------------------------- | -------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------- |
+| License                      | Open source (Apache-2.0)                                                                           | Source-available (Elastic License 2.0)                                |
+| Account required             | No                                                                                                 | Yes, with GitHub sign-in                                              |
+| Desktop app                  | Yes (one click install, daemon bundled)                                                            | Yes (macOS, experimental Linux)                                       |
+| Mobile app                   | Yes (native, full parity with desktop)                                                             | Coming soon                                                           |
+| CLI                          | Yes (everything the app does)                                                                      | Yes (plus SDK and MCP server)                                         |
+| Remote machines              | Yes (install the daemon anywhere)                                                                  | Yes (host server, remote access through Superset cloud on paid plans) |
+| Built-in relay               | Yes (opt-in, end-to-end encrypted, no account)                                                     | Superset cloud services (paid plans)                                  |
+| Direct network access        | Yes (LAN, Tailscale, VPN)                                                                          | -                                                                     |
+| SSH access                   | Yes                                                                                                | -                                                                     |
+| Providers                    | Claude Code, Codex, OpenCode, Pi, Antigravity, Muse Code, 30+ more                                 | CLI agents, custom terminal agents                                    |
+| Parallel agents              | Yes (isolated worktrees, across machines)                                                          | Yes (Git worktrees)                                                   |
+| Terminal agents              | Yes (run any agent in a terminal, get notified when it finishes)                                   | Yes (lifecycle status for supported agents)                           |
+| Agent orchestration          | Yes (agents create worktrees and launch other agents, across providers)                            | Yes (CLI, SDK, and MCP server create workspaces and launch agents)    |
+| Editor                       | Yes                                                                                                | -                                                                     |
+| Terminals                    | Yes                                                                                                | Yes                                                                   |
+| Diff review                  | Yes (comments go to the agent)                                                                     | Yes                                                                   |
+| Pull requests in app         | GitHub, GitLab, Gitea, Forgejo, Codeberg                                                           | GitHub                                                                |
+| In-app browser               | Yes (element picker, agent browser tools)                                                          | Yes                                                                   |
+| Per-worktree dev server URLs | Yes (`web--fix-auth--my-app.localhost`)                                                            | Port detection                                                        |
+| Schedules and heartbeats     | Yes                                                                                                | Yes (schedules)                                                       |
+| Plan usage                   | Yes                                                                                                | -                                                                     |
+| Plugins                      | Yes (new screens, panels, agent hooks, and providers, one plugin runs on desktop, web, and mobile) | No                                                                    |
+| Voice                        | Yes (local dictation, realtime voice)                                                              | -                                                                     |
+| Telemetry                    | None                                                                                               | -                                                                     |
 
 See also: [Paseo vs Conductor](/alternatives/conductor), [Paseo vs OpenChamber](/alternatives/openchamber), [Paseo vs Happy Coder](/alternatives/happy-coder).
diff --git a/packages/website/src/routes/index.tsx b/packages/website/src/routes/index.tsx
index 38806673f9..39e7f64a7b 100644
--- a/packages/website/src/routes/index.tsx
+++ b/packages/website/src/routes/index.tsx
@@ -6,7 +6,7 @@ export const Route = createFileRoute("/")({
   head: () =>
     pageMeta(
       "Paseo – Run Claude Code, Codex, Copilot, OpenCode from anywhere",
-      "Self-hosted daemon for Claude Code, Codex, Copilot, OpenCode, and Pi. Agents run on your machine with your full dev environment. Connect from phone, desktop, or web.",
+      "Open source app for Claude Code, Codex, OpenCode, Pi, and 30+ more coding agents. Run many agents in parallel on your machines. Editor, terminals, diffs, pull requests, and a browser in one window. One download on desktop. The full app on iOS and Android.",
       "/",
     ),
   component: Home,
@@ -24,9 +24,9 @@ function Home() {
       }
       subtitle={
         <>
-          Run any coding agent from anywhere.
+          Run many coding agents at once, on your machines.
           <br />
-          Self-hosted, multi-provider, open source
+          Desktop and mobile. Open source.
         </>
       }
     />
diff --git a/packages/website/src/routes/sponsor.tsx b/packages/website/src/routes/sponsor.tsx
index 6c5b1b4f46..83184e6512 100644
--- a/packages/website/src/routes/sponsor.tsx
+++ b/packages/website/src/routes/sponsor.tsx
@@ -7,7 +7,7 @@ export const Route = createFileRoute("/sponsor")({
   head: () =>
     pageMeta(
       "Sponsor Paseo",
-      "Paseo is built by one person with no investors. Sponsor the work on GitHub Sponsors, Open Collective or Buy Me a Coffee, or sponsor it as a company.",
+      "Paseo is an independent project used by tens of thousands of developers daily, built by one person with no investors. Sponsor the work on GitHub Sponsors, Open Collective or Buy Me a Coffee, or sponsor it as a company.",
       "/sponsor",
     ),
   component: Sponsor,
diff --git a/packages/website/src/styles.css b/packages/website/src/styles.css
index 946176fb43..bae421ff22 100644
--- a/packages/website/src/styles.css
+++ b/packages/website/src/styles.css
@@ -504,6 +504,24 @@
   background-color: rgba(255, 255, 255, 0.02);
 }
 
+/* Comparison tables: the browser would size each column by its longest cell,
+   so the two product columns get equal width regardless of content. */
+.comparison-prose table {
+  display: table;
+  table-layout: fixed;
+}
+
+.comparison-prose th,
+.comparison-prose td {
+  overflow-wrap: anywhere;
+  hyphens: auto;
+}
+
+.comparison-prose th:first-child,
+.comparison-prose td:first-child {
+  width: max(22%, 7.5rem);
+}
+
 .docs-prose pre {
   background-color: var(--color-card) !important;
   border: 1px solid var(--color-border);

From dc785bb29aa720ad8f82b1d81bd95e61955784b6 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 02:54:09 +0200
Subject: [PATCH 031/270] Keep both subagent cards labeled when Claude launches
 two background agents together (#6268)

* fix(server): keep a subagent card labeled when two background agents launch together

The daemon's stream coalescer kept only the last update per tool call
inside its 60 ms window. When Claude launches two background Agent calls
in one message, the first child's task_started arrives a few ms after the
second call starts streaming, so its labeled card is buffered and then
overwritten by the unlabeled completed Agent update. The coalescer now
folds updates with the same merge the timeline projection applies, so a
labeled detail is not replaced by an unknown one.

Closes #6252

* refactor(server): compute the merged tool call before building the coalescer entry

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../agent/agent-stream-coalescer.test.ts      | 51 +++++++++++++++++++
 .../server/agent/agent-stream-coalescer.ts    | 10 +++-
 .../src/server/agent/timeline-projection.ts   |  3 +-
 3 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/server/agent/agent-stream-coalescer.test.ts b/packages/server/src/server/agent/agent-stream-coalescer.test.ts
index c48a5ec8e4..1cdf4bf375 100644
--- a/packages/server/src/server/agent/agent-stream-coalescer.test.ts
+++ b/packages/server/src/server/agent/agent-stream-coalescer.test.ts
@@ -723,6 +723,57 @@ describe("AgentStreamCoalescer", () => {
     ]);
   });
 
+  test("keeps a known tool call detail when a later update in the window has none", () => {
+    const { coalescer, flushes } = createHarness();
+    primeLeadingEdge(coalescer, flushes);
+
+    coalescer.handle(
+      "agent-1",
+      timeline({
+        type: "tool_call",
+        callId: "agent-call",
+        name: "Task",
+        status: "running",
+        error: null,
+        detail: {
+          type: "sub_agent",
+          subAgentType: "general-purpose",
+          description: "List files",
+          log: "",
+          actions: [],
+        },
+      }),
+    );
+    coalescer.handle(
+      "agent-1",
+      timeline({
+        type: "tool_call",
+        callId: "agent-call",
+        name: "Agent",
+        status: "completed",
+        error: null,
+        detail: { type: "unknown", input: { description: "List files" }, output: null },
+      }),
+    );
+
+    expect(flushes.map((flush) => flush.item)).toEqual([
+      {
+        type: "tool_call",
+        callId: "agent-call",
+        name: "Agent",
+        status: "completed",
+        error: null,
+        detail: {
+          type: "sub_agent",
+          subAgentType: "general-purpose",
+          description: "List files",
+          log: "",
+          actions: [],
+        },
+      },
+    ]);
+  });
+
   test("preserves mixed text and tool call arrival order within a flush", async () => {
     const { coalescer, flushes } = createHarness();
     primeLeadingEdge(coalescer, flushes);
diff --git a/packages/server/src/server/agent/agent-stream-coalescer.ts b/packages/server/src/server/agent/agent-stream-coalescer.ts
index ca52a5479e..c11d968228 100644
--- a/packages/server/src/server/agent/agent-stream-coalescer.ts
+++ b/packages/server/src/server/agent/agent-stream-coalescer.ts
@@ -1,4 +1,5 @@
 import type { AgentProvider, AgentStreamEvent, AgentTimelineItem } from "./agent-sdk-types.js";
+import { mergeToolCallItems } from "./timeline-projection.js";
 
 export const AGENT_STREAM_COALESCE_DEFAULT_WINDOW_MS = 60;
 
@@ -183,9 +184,16 @@ export class AgentStreamCoalescer {
     }
 
     const existingIndex = buffer.toolCallEntryIndexes.get(event.item.callId);
+    const existing = existingIndex !== undefined ? buffer.entries[existingIndex] : undefined;
+    // Merge rather than replace, so an update that carries less (an unknown detail after a
+    // labeled one) cannot erase what the timeline would have kept had both been flushed.
+    let item = event.item;
+    if (existing?.kind === "tool_call") {
+      item = mergeToolCallItems(existing.item, event.item);
+    }
     const entry: PendingToolCallEntry = {
       kind: "tool_call",
-      item: event.item,
+      item,
       provider: event.provider,
       ...(event.turnId !== undefined ? { turnId: event.turnId } : {}),
     };
diff --git a/packages/server/src/server/agent/timeline-projection.ts b/packages/server/src/server/agent/timeline-projection.ts
index d8128a6a2b..1f72cdc498 100644
--- a/packages/server/src/server/agent/timeline-projection.ts
+++ b/packages/server/src/server/agent/timeline-projection.ts
@@ -87,7 +87,8 @@ function mergeToolCallDetail(existing: ToolCallDetail, incoming: ToolCallDetail)
   return incoming;
 }
 
-function mergeToolCallItems(
+/** Fold a later update for the same tool call into the one it follows. */
+export function mergeToolCallItems(
   existing: Extract<AgentTimelineItem, { type: "tool_call" }>,
   incoming: Extract<AgentTimelineItem, { type: "tool_call" }>,
 ): Extract<AgentTimelineItem, { type: "tool_call" }> {

From 4dd0e50e78b40cf99739a41c602b3a893c2f59ca Mon Sep 17 00:00:00 2001
From: Bae Seongmin <83870598+3ae3ae@users.noreply.github.com>
Date: Wed, 7 Oct 2026 10:53:18 +0900
Subject: [PATCH 032/270] fix(server): time out stalled encrypted relay
 handshakes (#5648)

---
 .../server/src/server/relay-transport.test.ts | 33 ++++++++++++++++++-
 packages/server/src/server/relay-transport.ts |  7 ++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/server/relay-transport.test.ts b/packages/server/src/server/relay-transport.test.ts
index 06775e5c5c..2dcf29b948 100644
--- a/packages/server/src/server/relay-transport.test.ts
+++ b/packages/server/src/server/relay-transport.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import type pino from "pino";
+import pino from "pino";
 import { createClientChannel, type Transport } from "@getpaseo/relay/e2ee";
 import { exportPublicKey, generateKeyPair } from "@getpaseo/relay";
 import { startRelayTransport } from "./relay-transport";
@@ -146,6 +146,37 @@ describe("relay-transport control lifecycle", () => {
     vi.useRealTimers();
   });
 
+  test("releases a stalled encrypted data connection without restarting control", async () => {
+    vi.useFakeTimers();
+    let attachments = 0;
+    controllers.push(
+      startRelayTransport({
+        logger: pino({ level: "silent" }),
+        attachSocket: async () => {
+          attachments += 1;
+        },
+        relayEndpoint: "relay.paseo.sh:443",
+        relayUseTls: true,
+        serverId: "srv_test",
+        daemonKeyPair: generateKeyPair(),
+        createWebSocket: relay.createWebSocket,
+      }),
+    );
+    const control = relay.sockets[0];
+    control.open();
+    const connected = JSON.stringify({ type: "connected", connectionId: "stalled" });
+    control.message(connected);
+    const stalled = relay.sockets[1];
+    stalled.open();
+    await vi.advanceTimersByTimeAsync(15_000);
+    expect(stalled.terminateCalls).toBe(1);
+    expect(attachments).toBe(0);
+    expect(control.terminateCalls).toBe(0);
+    control.message(connected);
+    expect(relay.sockets).toHaveLength(3);
+    expect(relay.sockets[2].url).toBe(stalled.url);
+  });
+
   test("logs relay_control_connected only after first valid control message", () => {
     const logger = createMockLogger();
     const controller = startRelayTransport({
diff --git a/packages/server/src/server/relay-transport.ts b/packages/server/src/server/relay-transport.ts
index ddf1a3c234..f7b73a5367 100644
--- a/packages/server/src/server/relay-transport.ts
+++ b/packages/server/src/server/relay-transport.ts
@@ -420,6 +420,10 @@ async function attachEncryptedSocket(
   attachSocket: (ws: RelaySocketLike, metadata?: ExternalSocketMetadata) => Promise<void>,
   metadata?: ExternalSocketMetadata,
 ): Promise<void> {
+  const handshakeTimeout = setTimeout(() => {
+    logger.warn("relay_e2ee_handshake_timeout_terminating");
+    socket.terminate();
+  }, 15_000);
   try {
     const relayTransport = createRelayTransportAdapter(socket, logger);
     const emitter = new EventEmitter();
@@ -440,6 +444,7 @@ async function attachEncryptedSocket(
         emitter.emit("error", error);
       },
     });
+    clearTimeout(handshakeTimeout);
     const encryptedSocket = createEncryptedRelaySocket({
       channel,
       emitter,
@@ -459,6 +464,8 @@ async function attachEncryptedSocket(
     } catch {
       // ignore
     }
+  } finally {
+    clearTimeout(handshakeTimeout);
   }
 }
 

From 8f1091da64f660827f38512cbbd073357445b138 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 04:55:01 +0200
Subject: [PATCH 033/270] Let a Claude agent leave Auto mode when Claude Code
 uses Bedrock or Vertex (#6272)

* fix(claude): let an agent leave Auto mode when Claude Code uses Bedrock or Vertex

Changing the mode of a Claude agent whose process is not running starts the
process first. It was started in the agent's current mode, so an agent in Auto
on Bedrock or Vertex failed the Auto check before the new mode applied, and
every mode change and message failed the same way.

Start the process in the requested mode instead.

Closes #5878

* fix(claude): relaunch a query whose mode change Claude Code rejected

A mode change that starts the query now launches it in the requested mode. If
Claude Code then rejects the mode, the agent keeps its previous mode, so mark
that query for relaunch instead of reusing it in the rejected mode.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../providers/claude/agent.redesign.test.ts   | 55 ++++++++++++++++++-
 .../server/agent/providers/claude/agent.ts    | 21 ++++---
 2 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts b/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts
index 5069c3653f..747a466c32 100644
--- a/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts
@@ -327,6 +327,57 @@ test("fails an auto mode turn when Claude Code uses Vertex", async () => {
   }
 });
 
+test("switches an auto mode session to another mode when Claude Code uses Bedrock", async () => {
+  const previousBedrock = process.env.CLAUDE_CODE_USE_BEDROCK;
+  process.env.CLAUDE_CODE_USE_BEDROCK = "1";
+  const queryMock = createBaseQueryMock(vi.fn(async () => ({ done: true, value: undefined })));
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const client = new ClaudeAgentClient({
+    logger: createTestLogger(),
+    queryFactory: sdkQueryFactory,
+    resolveBinary: async () => "/test/claude/bin",
+  });
+  const session = await client.createSession({
+    provider: "claude",
+    cwd: process.cwd(),
+    modeId: "auto",
+  });
+
+  try {
+    await session.setMode("acceptEdits");
+
+    expect(await session.getCurrentMode()).toBe("acceptEdits");
+    expect(sdkQueryFactory).toHaveBeenCalledTimes(1);
+    expect(sdkQueryFactory.mock.calls[0]?.[0]?.options?.permissionMode).toBe("acceptEdits");
+  } finally {
+    restoreEnvValue("CLAUDE_CODE_USE_BEDROCK", previousBedrock);
+    await session.close();
+  }
+});
+
+test("does not keep a query started in a mode that Claude Code rejected", async () => {
+  const launchedModes: Array<string | undefined> = [];
+  sdkQueryFactory.mockImplementation(({ options }: { options: { permissionMode?: string } }) => {
+    launchedModes.push(options.permissionMode);
+    const queryMock = createBaseQueryMock(vi.fn(async () => ({ done: true, value: undefined })));
+    if (launchedModes.length === 1) {
+      queryMock.setPermissionMode.mockRejectedValue(new Error("bypass refused"));
+    }
+    return queryMock;
+  });
+  const session = await createSession();
+
+  try {
+    await expect(session.setMode("bypassPermissions")).rejects.toThrow("bypass refused");
+    await session.listCommands();
+
+    expect(await session.getCurrentMode()).toBe("default");
+    expect(launchedModes).toEqual(["bypassPermissions", "default"]);
+  } finally {
+    await session.close();
+  }
+});
+
 test("logs redacted query summary and never leaks sentinel secrets", async () => {
   const envSecret = "PASEO_ENV_SENTINEL_SECRET";
   const runtimeSecret = "PASEO_RUNTIME_SENTINEL_SECRET";
@@ -1037,11 +1088,11 @@ test("preserves bypass capability across query restarts triggered by thinking ch
 
     expect(capturedOptions).toHaveLength(2);
     expect(capturedOptions[0]).toMatchObject({
-      permissionMode: "default",
+      permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
     });
     expect(capturedOptions[1]).toMatchObject({
-      permissionMode: "acceptEdits",
+      permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
       effort: "high",
     });
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index f9f79862ad..ddac56a0eb 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -2441,8 +2441,15 @@ class ClaudeAgentSession implements AgentSession {
     const normalized = isPermissionMode(modeId) ? modeId : "default";
     assertClaudeModeCanRun(normalized, this.harnessEnvironment);
     const previousMode = this.currentMode;
-    const activeQuery = await this.ensureQuery();
-    await activeQuery.setPermissionMode(normalized);
+    const launchesQuery = !this.query || this.queryRestartNeeded;
+    const activeQuery = await this.ensureQuery(normalized);
+    try {
+      await activeQuery.setPermissionMode(normalized);
+    } catch (error) {
+      // The query was launched in the rejected mode; relaunch in the current mode next time.
+      if (launchesQuery) this.queryRestartNeeded = true;
+      throw error;
+    }
     if (normalized === "plan") {
       if (previousMode !== "plan") {
         this.planResumeMode = previousMode;
@@ -3128,7 +3135,7 @@ class ClaudeAgentSession implements AgentSession {
     return { kind: "fresh-session" };
   }
 
-  private async ensureQuery(): Promise<Query> {
+  private async ensureQuery(launchMode: PermissionMode = this.currentMode): Promise<Query> {
     if (this.query && !this.queryRestartNeeded) {
       return this.query;
     }
@@ -3172,7 +3179,7 @@ class ClaudeAgentSession implements AgentSession {
     this.persistence = null;
 
     const input = createAsyncMessageInput<SDKUserMessage>();
-    const options = await this.buildOptions();
+    const options = await this.buildOptions(launchMode);
     this.logger.debug({ options: summarizeClaudeOptionsForLog(options) }, "claude query");
     this.input = input;
     this.query = claudeQuery(
@@ -3298,7 +3305,7 @@ class ClaudeAgentSession implements AgentSession {
     });
   }
 
-  private async buildOptions(): Promise<ClaudeOptions> {
+  private async buildOptions(permissionMode: PermissionMode): Promise<ClaudeOptions> {
     const { thinking, effort, ultracode } = this.resolveThinkingConfig();
     const appendedSystemPrompt = this.buildAppendedSystemPrompt();
     const providerOptions = applyClaudeToolPolicy(
@@ -3307,7 +3314,7 @@ class ClaudeAgentSession implements AgentSession {
     );
     const settingsOptions = this.buildSettingsOptions(providerOptions, { ultracode });
     const sdkEnv = this.harnessEnvironment;
-    assertClaudeModeCanRun(this.currentMode, sdkEnv);
+    assertClaudeModeCanRun(permissionMode, sdkEnv);
 
     const claudeBinary = await this.resolveBinary();
     this.logger.debug(
@@ -3330,7 +3337,7 @@ class ClaudeAgentSession implements AgentSession {
     const base: ClaudeOptions = {
       cwd: this.config.cwd,
       includePartialMessages: true,
-      permissionMode: this.currentMode,
+      permissionMode,
       // Dynamic mode switching can recreate the underlying Claude query. Keep the
       // bypass launch capability available so later setPermissionMode("bypassPermissions")
       // calls do not fail after a model/thinking/rewind-driven restart.

From a162e1075f2ca83db38e8fd409cbe0bce0440e96 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 06:15:19 +0200
Subject: [PATCH 034/270] fix(acp): apply configured models the agent does not
 advertise (#6273)

* fix(acp): apply configured models the agent does not advertise

A model added through a provider's models or additionalModels was listed
in the picker, but an ACP session only accepted ids the agent advertised
in session/new, so the agent silently ran on its default model. The
registry now passes configured model ids to the session, which applies
them through session/set_model. Unconfigured, unadvertised ids are still
skipped with a warning.

* fix(acp): send configured models when the agent advertises none

Also covers the resume path in the regression test.

* test(acp): keep configured-model tests in the ACP agent suite

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/agent/agent-sdk-types.ts       |   7 +
 .../src/server/agent/provider-registry.ts     |   5 +-
 .../server/agent/providers/acp-agent.test.ts  | 152 +++++++++++++++++-
 .../src/server/agent/providers/acp-agent.ts   |  54 ++++---
 4 files changed, 194 insertions(+), 24 deletions(-)

diff --git a/packages/server/src/server/agent/agent-sdk-types.ts b/packages/server/src/server/agent/agent-sdk-types.ts
index 3e5e739577..34d36c9e16 100644
--- a/packages/server/src/server/agent/agent-sdk-types.ts
+++ b/packages/server/src/server/agent/agent-sdk-types.ts
@@ -628,6 +628,11 @@ export interface AgentCreateSessionOptions {
    * Defaults to true. Providers that cannot honor false should no-op.
    */
   persistSession?: boolean;
+  /**
+   * Model ids added by provider configuration (`models` / `additionalModels`).
+   * Providers that validate against runtime-advertised models must accept these.
+   */
+  configuredModelIds?: readonly string[];
 }
 
 /** What a resumed session is for: driving the agent, or reading what it already did. */
@@ -637,6 +642,8 @@ export type AgentResumePurpose = "interactive" | "history";
 export interface AgentResumeSessionOptions {
   /** Defaults to interactive. History loading may be read-only for archived native sessions. */
   purpose?: AgentResumePurpose;
+  /** See AgentCreateSessionOptions.configuredModelIds. */
+  configuredModelIds?: readonly string[];
 }
 
 /**
diff --git a/packages/server/src/server/agent/provider-registry.ts b/packages/server/src/server/agent/provider-registry.ts
index bd22d37df3..2698a3b2ac 100644
--- a/packages/server/src/server/agent/provider-registry.ts
+++ b/packages/server/src/server/agent/provider-registry.ts
@@ -492,6 +492,7 @@ function wrapClientProvider(
   const listFeatures = inner.listFeatures?.bind(inner);
   const archiveNativeSession = inner.archiveNativeSession?.bind(inner);
   const unarchiveNativeSession = inner.unarchiveNativeSession?.bind(inner);
+  const configuredModelIds = [...profileModels, ...additionalModels].map((model) => model.id);
 
   return {
     provider,
@@ -509,7 +510,7 @@ function wrapClientProvider(
             providerOptions: mergeProviderOptions(providerOptions, config.providerOptions),
           },
           launchContext,
-          options,
+          { ...options, configuredModelIds },
         ),
       ),
     resumeSession: async (handle, overrides, launchContext, options) =>
@@ -526,7 +527,7 @@ function wrapClientProvider(
             providerOptions: mergeProviderOptions(providerOptions, overrides?.providerOptions),
           },
           launchContext,
-          options,
+          { ...options, configuredModelIds },
         ),
       ),
     fetchCatalog: async (options, context) => {
diff --git a/packages/server/src/server/agent/providers/acp-agent.test.ts b/packages/server/src/server/agent/providers/acp-agent.test.ts
index 95d7e25a21..33c9696900 100644
--- a/packages/server/src/server/agent/providers/acp-agent.test.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.test.ts
@@ -5,7 +5,7 @@ import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
-import { afterEach, describe, expect, test, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import {
   AgentSideConnection,
   ClientSideConnection,
@@ -54,8 +54,10 @@ import type { AgentStreamEvent } from "../agent-sdk-types.js";
 import type {
   AgentCapabilityFlags,
   AgentPersistenceHandle,
+  AgentSession,
   ProviderRefreshContext,
 } from "../agent-sdk-types.js";
+import { buildProviderRegistry } from "../provider-registry.js";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
 import { buildStringCommandShellInvocation } from "../../../utils/string-command-shell.js";
 import { asInternals } from "../../test-utils/class-mocks.js";
@@ -4370,3 +4372,151 @@ describe("ACPAgentSession close() with an unresponsive provider", () => {
     expect(isProcessAlive(pid)).toBe(false);
   }, 15_000);
 });
+
+// An ACP agent that advertises two models (or none, with ACP_ADVERTISE_MODELS=none) but,
+// like Cline, runs any model id it is given.
+const PERMISSIVE_MODEL_ACP_AGENT = `
+import { Readable, Writable } from "node:stream";
+const { AgentSideConnection, PROTOCOL_VERSION, ndJsonStream } = await import(process.env.ACP_SDK_URL);
+let currentModelId = "advertised-default";
+const modelState = () =>
+  process.env.ACP_ADVERTISE_MODELS === "none"
+    ? undefined
+    : {
+        currentModelId,
+        availableModels: [
+          { modelId: "advertised-default", name: "Advertised default" },
+          { modelId: "advertised-other", name: "Advertised other" },
+        ],
+      };
+new AgentSideConnection(
+  () => ({
+    async initialize() {
+      return { protocolVersion: PROTOCOL_VERSION, agentCapabilities: { loadSession: true } };
+    },
+    async newSession() {
+      return { sessionId: "permissive-session", models: modelState() };
+    },
+    async loadSession() {
+      return { models: modelState() };
+    },
+    async unstable_setSessionModel({ modelId }) {
+      currentModelId = modelId;
+      return {};
+    },
+    async authenticate() {},
+    async cancel() {},
+    async prompt() {
+      return { stopReason: "end_turn" };
+    },
+  }),
+  ndJsonStream(Writable.toWeb(process.stdout), Readable.toWeb(process.stdin)),
+);
+`;
+
+describe("custom ACP provider with configured models", () => {
+  let dir: string;
+  let agentScript: string;
+  let session: AgentSession | null = null;
+
+  beforeEach(async () => {
+    dir = await mkdtemp(path.join(tmpdir(), "paseo-acp-configured-models-"));
+    agentScript = path.join(dir, "agent.mjs");
+    await writeFile(agentScript, PERMISSIVE_MODEL_ACP_AGENT);
+  });
+
+  afterEach(async () => {
+    await session?.close();
+    session = null;
+    await rm(dir, { recursive: true, force: true });
+  });
+
+  function buildRegistry(
+    override: {
+      models?: Array<{ id: string; label: string }>;
+      additionalModels?: Array<{ id: string; label: string }>;
+    },
+    agentEnv: Record<string, string> = {},
+  ) {
+    return buildProviderRegistry(createTestLogger(), {
+      providerOverrides: {
+        permissive: {
+          extends: "acp",
+          label: "Permissive",
+          command: [process.execPath, agentScript],
+          env: {
+            ACP_SDK_URL: pathToFileURL(
+              createRequire(import.meta.url).resolve("@agentclientprotocol/sdk"),
+            ).href,
+            ...agentEnv,
+          },
+          ...override,
+        },
+      },
+    });
+  }
+
+  async function createSessionOnModel(
+    registry: ReturnType<typeof buildRegistry>,
+    model: string,
+  ): Promise<AgentSession> {
+    const client = registry.permissive.createClient(createTestLogger());
+    session = await client.createSession({ provider: "permissive", cwd: dir, model });
+    return session;
+  }
+
+  test("runs on a model added through additionalModels that the agent does not advertise", async () => {
+    const registry = buildRegistry({
+      additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
+    });
+
+    const created = await createSessionOnModel(registry, "stealth/pixel-canary");
+
+    expect((await created.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
+  });
+
+  test("runs on a model from a replacement models list that the agent does not advertise", async () => {
+    const registry = buildRegistry({
+      models: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
+    });
+
+    const created = await createSessionOnModel(registry, "stealth/pixel-canary");
+
+    expect((await created.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
+  });
+
+  test("runs on a model from additionalModels when the agent advertises no models", async () => {
+    const registry = buildRegistry(
+      { additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }] },
+      { ACP_ADVERTISE_MODELS: "none" },
+    );
+
+    const created = await createSessionOnModel(registry, "stealth/pixel-canary");
+
+    expect((await created.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
+  });
+
+  test("resumes on a model added through additionalModels that the agent does not advertise", async () => {
+    const registry = buildRegistry({
+      additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
+    });
+    const client = registry.permissive.createClient(createTestLogger());
+
+    session = await client.resumeSession(
+      { provider: "permissive", sessionId: "permissive-session", metadata: { cwd: dir } },
+      { model: "stealth/pixel-canary" },
+    );
+
+    expect((await session.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
+  });
+
+  test("keeps the agent's model when the requested model is neither advertised nor configured", async () => {
+    const registry = buildRegistry({
+      additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
+    });
+
+    const created = await createSessionOnModel(registry, "stale/removed-model");
+
+    expect((await created.getRuntimeInfo()).model).toBe("advertised-default");
+  });
+});
diff --git a/packages/server/src/server/agent/providers/acp-agent.ts b/packages/server/src/server/agent/providers/acp-agent.ts
index e5d1e4c48e..6bded49feb 100644
--- a/packages/server/src/server/agent/providers/acp-agent.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.ts
@@ -77,6 +77,7 @@ import {
   type AgentPromptContentBlock,
   type AgentPromptInput,
   type AgentResumePurpose,
+  type AgentCreateSessionOptions,
   type AgentResumeSessionOptions,
   type AgentRunOptions,
   type AgentRunResult,
@@ -512,6 +513,7 @@ interface ACPAgentSessionOptions {
   extensionCommandsParser?: ACPExtensionCommandsParser;
   handle?: AgentPersistenceHandle;
   resumePurpose?: AgentResumePurpose;
+  configuredModelIds?: readonly string[];
   agentId?: string;
   launchEnv?: Record<string, string>;
   waitForInitialCommands?: boolean;
@@ -979,6 +981,7 @@ export class ACPAgentClient implements AgentClient {
   async createSession(
     config: AgentSessionConfig,
     launchContext?: AgentLaunchContext,
+    options?: AgentCreateSessionOptions,
   ): Promise<AgentSession> {
     this.assertProvider(config);
     const providerOptions = ACPProviderOptionsSchema.parse(config.providerOptions ?? {});
@@ -1006,6 +1009,7 @@ export class ACPAgentClient implements AgentClient {
           supportsMcpServers:
             providerOptions.supportsMcpServers ?? this.capabilities.supportsMcpServers,
         },
+        configuredModelIds: options?.configuredModelIds,
         agentId: launchContext?.agentId,
         launchEnv: launchContext?.env,
         extensionCommandsParser: this.extensionCommandsParser,
@@ -1064,6 +1068,7 @@ export class ACPAgentClient implements AgentClient {
       },
       handle,
       resumePurpose: options?.purpose,
+      configuredModelIds: options?.configuredModelIds,
       agentId: launchContext?.agentId,
       launchEnv: launchContext?.env,
       extensionCommandsParser: this.extensionCommandsParser,
@@ -1692,6 +1697,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     configOptions: SessionConfigOption[],
   ) => SessionConfigOption[];
   private readonly configFeatureOptions: ACPConfigFeatureOption[];
+  private readonly configuredModelIds: ReadonlySet<string>;
   private readonly clientCapabilities?: ACPClientCapabilities;
   private readonly clientCapabilityMeta?: ACPClientCapabilityMeta;
   private readonly modeIdTransformer?: (modeId: string) => string | null;
@@ -1760,6 +1766,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     this.sessionResponseTransformer = options.sessionResponseTransformer;
     this.configOptionsTransformer = options.configOptionsTransformer;
     this.configFeatureOptions = options.configFeatureOptions ?? [];
+    this.configuredModelIds = new Set(options.configuredModelIds);
     this.clientCapabilities = options.clientCapabilities;
     this.clientCapabilityMeta = options.clientCapabilityMeta;
     this.modeIdTransformer = options.modeIdTransformer;
@@ -2194,12 +2201,20 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       return;
     }
 
+    await this.setModelWithSelection({ modelId, selection: this.resolveModelSelection(modelId) });
+  }
+
+  private resolveModelSelection(modelId: string): ACPModelSelection {
     const selection = resolveACPModelSelection({
       modelId,
       availableModels: this.availableModels,
       configOptions: this.configOptions,
     });
-    await this.setModelWithSelection({ modelId, selection });
+    if (selection.availableModel || !this.configuredModelIds.has(modelId)) {
+      return selection;
+    }
+    // A model the user added in provider config is applied even when the agent does not advertise it.
+    return { ...selection, availableModel: { modelId, name: modelId } };
   }
 
   private async setModelWithSelection({
@@ -2213,21 +2228,20 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       throw new Error("ACP session not initialized");
     }
 
-    if (selection.hasAvailableModels) {
-      if (!selection.availableModel) {
-        this.warnInvalidSelection(
-          modelId,
-          `is not a valid ${this.provider} model. Available options: ${this.availableModels
-            ?.map((model) => model.modelId)
-            .join(", ")}`,
-        );
-        return;
-      }
-
-      if (typeof this.connection.unstable_setSessionModel !== "function") {
-        throw new Error(this.modelSelectionUnavailableMessage());
-      }
+    if (selection.hasAvailableModels && !selection.availableModel) {
+      this.warnInvalidSelection(
+        modelId,
+        `is not a valid ${this.provider} model. Available options: ${this.availableModels
+          ?.map((model) => model.modelId)
+          .join(", ")}`,
+      );
+      return;
+    }
 
+    if (
+      selection.availableModel &&
+      typeof this.connection.unstable_setSessionModel === "function"
+    ) {
       try {
         await this.connection.unstable_setSessionModel({
           sessionId: this.sessionId,
@@ -2922,13 +2936,11 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     const configuredModelId = this.config.model;
     let switchedModel = false;
     if (configuredModelId && configuredModelId !== this.currentModel) {
-      const selection = resolveACPModelSelection({
-        modelId: configuredModelId,
-        availableModels: this.availableModels,
-        configOptions: this.configOptions,
-      });
       try {
-        await this.setModelWithSelection({ modelId: configuredModelId, selection });
+        await this.setModelWithSelection({
+          modelId: configuredModelId,
+          selection: this.resolveModelSelection(configuredModelId),
+        });
         switchedModel = true;
       } catch (error) {
         if (!this.isModelSelectionUnavailableError(error)) {

From 1e00f452ea8ec74254860a977cdeeb5f14dc3fad Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 06:59:53 +0200
Subject: [PATCH 035/270] Download files whose names have non-ASCII characters
 (#6278)

* fix(server): encode Unicode download filenames in Content-Disposition

* test(server): cover Korean download filenames

* test(server): validate download token and agent ID formats

* fix(server): set the download header through Express instead of a new dependency

The download route already runs on an Express response, and res.attachment()
builds Content-Disposition with the same content-disposition encoder that
Express ships. Use it and drop the direct content-disposition dependency and
its type package. The header values the download tests assert are unchanged.

Co-authored-by: jasonhnd <3293256+jasonhnd@users.noreply.github.com>

---------

Co-authored-by: Dillon <dillonzq@outlook.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: jasonhnd <3293256+jasonhnd@users.noreply.github.com>
---
 packages/server/src/server/bootstrap.ts       |  3 +-
 .../daemon-e2e/file-download.e2e.test.ts      | 89 +++++++++++++------
 2 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/server/bootstrap.ts
index 3f49f41a19..5c1d0d1404 100644
--- a/packages/server/src/server/bootstrap.ts
+++ b/packages/server/src/server/bootstrap.ts
@@ -836,9 +836,8 @@ export async function createPaseoDaemon(
         return;
       }
 
-      const safeFileName = entry.fileName.replace(/["\r\n]/g, "_");
+      res.attachment(entry.fileName);
       res.setHeader("Content-Type", entry.mimeType);
-      res.setHeader("Content-Disposition", `attachment; filename="${safeFileName}"`);
       res.setHeader("Content-Length", fileStats.size.toString());
 
       const stream = fileHandle.createReadStream();
diff --git a/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts b/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
index f9d7fce7b4..685d056a27 100644
--- a/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
@@ -24,42 +24,73 @@ describe("daemon E2E", () => {
   }, 60000);
 
   describe("file download tokens", () => {
-    test("issues token over WS and downloads via HTTP", async () => {
-      const cwd = tmpCwd();
-      const filePath = path.join(cwd, "download.txt");
-      const fileContents = "download test payload";
-      writeFileSync(filePath, fileContents, "utf-8");
+    test.each([
+      { fileName: "download.txt", disposition: 'attachment; filename="download.txt"' },
+      {
+        fileName: "中文报告 (最终版).txt",
+        disposition:
+          "attachment; filename=\"???? (???).txt\"; filename*=UTF-8''%E4%B8%AD%E6%96%87%E6%8A%A5%E5%91%8A%20%28%E6%9C%80%E7%BB%88%E7%89%88%29.txt",
+      },
+      {
+        fileName: "報告書.md",
+        disposition:
+          "attachment; filename=\"???.md\"; filename*=UTF-8''%E5%A0%B1%E5%91%8A%E6%9B%B8.md",
+      },
+      {
+        fileName: "보고서.txt",
+        disposition:
+          "attachment; filename=\"???.txt\"; filename*=UTF-8''%EB%B3%B4%EA%B3%A0%EC%84%9C.txt",
+      },
+      {
+        fileName: "report-📄.txt",
+        disposition:
+          "attachment; filename=\"report-??.txt\"; filename*=UTF-8''report-%F0%9F%93%84.txt",
+      },
+    ])(
+      "issues token over WS and downloads $fileName via HTTP",
+      async ({ fileName, disposition }) => {
+        const cwd = tmpCwd();
+        try {
+          const filePath = path.join(cwd, fileName);
+          const fileContents = "download test payload";
+          writeFileSync(filePath, fileContents, "utf-8");
 
-      const agent = await ctx.client.createAgent({
-        provider: "codex",
-        model: CODEX_TEST_MODEL,
-        thinkingOptionId: CODEX_TEST_THINKING_OPTION_ID,
-        cwd,
-        title: "Download Token Test Agent",
-      });
+          const agent = await ctx.client.createAgent({
+            provider: "codex",
+            model: CODEX_TEST_MODEL,
+            thinkingOptionId: CODEX_TEST_THINKING_OPTION_ID,
+            cwd,
+            title: "Download Token Test Agent",
+          });
 
-      expect(agent.id).toBeTruthy();
+          expect(agent.id).toMatch(
+            /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
+          );
 
-      const tokenResponse = await ctx.client.requestDownloadToken(cwd, "download.txt");
+          const tokenResponse = await ctx.client.requestDownloadToken(cwd, fileName);
 
-      expect(tokenResponse.error).toBeNull();
-      expect(tokenResponse.token).toBeTruthy();
-      expect(tokenResponse.fileName).toBe("download.txt");
+          expect(tokenResponse.error).toBeNull();
+          expect(tokenResponse.token).toMatch(
+            /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
+          );
+          expect(tokenResponse.fileName).toBe(fileName);
 
-      const response = await fetch(
-        `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${tokenResponse.token}`,
-      );
+          const response = await fetch(
+            `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${tokenResponse.token}`,
+          );
 
-      expect(response.status).toBe(200);
-      expect(response.headers.get("content-type")).toBe(tokenResponse.mimeType);
-      const disposition = response.headers.get("content-disposition") ?? "";
-      expect(disposition).toContain("download.txt");
+          expect(response.status).toBe(200);
+          expect(response.headers.get("content-type")).toBe(tokenResponse.mimeType);
+          expect(response.headers.get("content-disposition")).toBe(disposition);
 
-      const body = await response.text();
-      expect(body).toBe(fileContents);
-
-      rmSync(cwd, { recursive: true, force: true });
-    }, 60000);
+          const body = await response.text();
+          expect(body).toBe(fileContents);
+        } finally {
+          rmSync(cwd, { recursive: true, force: true });
+        }
+      },
+      60000,
+    );
 
     test("rejects invalid token", async () => {
       const response = await fetch(

From 2323ee68445c00afc737e021c130bcf0c0da461d Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 07:51:12 +0200
Subject: [PATCH 036/270] Keep reporting a Linux daemon as running after its VM
 resumes from a host sleep (#6279)

* Keep reporting a Linux daemon as running after its VM resumes from a host sleep

A VM paused while its host sleeps keeps its uptime, but its wall clock
catches up on resume. The boot instant derived from the two then lands
after the running supervisor's lock, so daemon status reported it as
stopped and daemon stop released its lock without stopping it.

The lock now records Linux's boot id, and a lock that carries one is
judged by it. Locks without one keep the wall-clock check.

Closes #6019

* Give the OMP idle-deadline test a deadline a slow runner cannot pass before the first wait

With a 1 ms deadline, the gate's first check, made synchronously when the
turn ends, could already be past it on a loaded Windows runner. The turn
then failed before the test's first scheduler wait, and the test timed out.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../server/agent/providers/omp/agent.test.ts  |  6 ++-
 .../server/src/server/daemon-instance.test.ts | 41 ++++++++++++++++++-
 packages/server/src/server/pid-lock.ts        | 30 +++++++++++++-
 3 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/server/agent/providers/omp/agent.test.ts b/packages/server/src/server/agent/providers/omp/agent.test.ts
index 537c94f2a6..c0e6193bb5 100644
--- a/packages/server/src/server/agent/providers/omp/agent.test.ts
+++ b/packages/server/src/server/agent/providers/omp/agent.test.ts
@@ -459,7 +459,9 @@ describe("OMP agent client and session", () => {
 
   test("fails a turn when the provider idle gate passes its deadline", async () => {
     const scheduler = new ManualIdleScheduler();
-    const omp = new OmpHarness({ providerIdleScheduler: scheduler, providerIdleDeadlineMs: 1 });
+    // Long enough that the gate's first check, made right after the turn ends, cannot already
+    // be past it on a slow runner.
+    const omp = new OmpHarness({ providerIdleScheduler: scheduler, providerIdleDeadlineMs: 50 });
     await omp.start();
     const { completion } = await omp.startPromptUntilProviderIdle("first", "first done", {
       isStreaming: true,
@@ -473,7 +475,7 @@ describe("OMP agent client and session", () => {
       args: { command: "sleep 30" },
     });
     expect(omp.runningToolCallIds()).toEqual(["tool-at-deadline"]);
-    await new Promise((resolve) => setTimeout(resolve, 2));
+    await new Promise((resolve) => setTimeout(resolve, 60));
     scheduler.retry();
     await expect(completion).rejects.toThrow(/provider idle/i);
     expect(omp.runningToolCallIds()).toEqual([]);
diff --git a/packages/server/src/server/daemon-instance.test.ts b/packages/server/src/server/daemon-instance.test.ts
index 9d7ea66c5a..ee428b2e58 100644
--- a/packages/server/src/server/daemon-instance.test.ts
+++ b/packages/server/src/server/daemon-instance.test.ts
@@ -3,7 +3,7 @@ import { existsSync } from "node:fs";
 import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir, uptime } from "node:os";
 import { join } from "node:path";
-import { afterEach, beforeEach, describe, expect, test } from "vitest";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 
 import { readDaemonInstance, stopDaemonInstance } from "./daemon-instance.js";
 import { acquirePidLock, getPidLockInfo, isLocked, type PidLockInfo } from "./pid-lock.js";
@@ -94,3 +94,42 @@ describe("daemon instance identity across a reboot", () => {
     await expect(readFile(join(paseoHome, "paseo.pid"), "utf-8")).rejects.toThrow(/ENOENT/);
   });
 });
+
+// Linux keeps a boot's id while a VM is paused for a host sleep, though the VM's wall clock
+// runs ahead of its uptime once it resumes. A sleep longer than the time between boot and
+// the supervisor's start puts the wall-clock boot instant after the lock's startedAt.
+describe.runIf(process.platform === "linux")("daemon instance identity on Linux", () => {
+  let paseoHome: string;
+
+  beforeEach(async () => {
+    paseoHome = await mkdtemp(join(tmpdir(), "paseo-daemon-instance-linux-"));
+  });
+
+  afterEach(async () => {
+    vi.useRealTimers();
+    await rm(paseoHome, { recursive: true, force: true });
+  });
+
+  test("a supervisor still holds the lock after its paused VM resumes", async () => {
+    await acquirePidLock(paseoHome, null, { ownerPid: process.pid });
+
+    vi.useFakeTimers({ toFake: ["Date"] });
+    vi.setSystemTime(Date.now() + uptime() * 1000 + 12 * 60 * 60_000);
+
+    expect(await readDaemonInstance(paseoHome)).toMatchObject({ pid: process.pid });
+    expect(await isLocked(paseoHome)).toMatchObject({ locked: true });
+    await expect(
+      acquirePidLock(paseoHome, null, { ownerPid: process.pid + 10_000 }),
+    ).rejects.toThrow("Another Paseo daemon is already running");
+  });
+
+  test("a lock written during another boot has no running owner", async () => {
+    await writeLock(paseoHome, {
+      ...lockFor(process.pid, new Date()),
+      bootId: "00000000-0000-0000-0000-000000000000",
+    });
+
+    expect(await readDaemonInstance(paseoHome)).toBeNull();
+    expect(await isLocked(paseoHome)).toMatchObject({ locked: false });
+  });
+});
diff --git a/packages/server/src/server/pid-lock.ts b/packages/server/src/server/pid-lock.ts
index db95d4786d..314b44ea47 100644
--- a/packages/server/src/server/pid-lock.ts
+++ b/packages/server/src/server/pid-lock.ts
@@ -1,3 +1,4 @@
+import { readFileSync } from "node:fs";
 import { open, readFile, stat, unlink, utimes } from "node:fs/promises";
 import type { FileHandle } from "node:fs/promises";
 import { ensurePrivateDirectory } from "./private-files.js";
@@ -15,6 +16,7 @@ export const pidLockInfoSchema = z.object({
   serverId: z.string().nullable().optional(),
   desktopManaged: z.boolean().optional(),
   heartbeat: z.literal(true).optional(),
+  bootId: z.string().optional(),
 });
 
 export interface PidLockInfo extends z.infer<typeof pidLockInfoSchema> {}
@@ -62,16 +64,38 @@ function precedesThisBoot(startedAt: string): boolean {
   return stamped < Date.now() - uptime() * 1000 - BOOT_INSTANT_TOLERANCE_MS;
 }
 
+let cachedBootId: string | null | undefined;
+
+// Linux names each boot. The wall-clock boot instant is not enough there: a VM paused while
+// its host sleeps keeps its uptime, so after it resumes the instant lands after locks its
+// running supervisor wrote.
+function currentBootId(): string | null {
+  if (cachedBootId === undefined) {
+    try {
+      cachedBootId = readFileSync("/proc/sys/kernel/random/boot_id", "utf-8").trim() || null;
+    } catch {
+      cachedBootId = null;
+    }
+  }
+  return cachedBootId;
+}
+
+function writtenDuringThisBoot(lock: PidLockInfo): boolean {
+  const thisBoot = currentBootId();
+  if (lock.bootId && thisBoot) return lock.bootId === thisBoot;
+  return !precedesThisBoot(lock.startedAt);
+}
+
 /**
  * Whether the process that wrote this lock is still running.
  *
  * A PID alone does not identify the supervisor: the operating system hands the number to
  * something else once the supervisor is gone, and a reboot reassigns it freely. A process
- * cannot predate the boot it runs under, so a lock stamped before this boot is abandoned
+ * cannot predate the boot it runs under, so a lock written during another boot is abandoned
  * however alive its PID looks.
  */
 export function isPidLockOwnerRunning(lock: PidLockInfo): boolean {
-  if (precedesThisBoot(lock.startedAt)) return false;
+  if (!writtenDuringThisBoot(lock)) return false;
   return isPidRunning(lock.pid);
 }
 
@@ -214,6 +238,7 @@ export async function acquirePidLock(
   }
 
   // Create new lock with exclusive flag
+  const bootId = currentBootId();
   const lockInfo: PidLockInfo = {
     pid: lockOwnerPid,
     startedAt: new Date().toISOString(),
@@ -221,6 +246,7 @@ export async function acquirePidLock(
     uid: process.getuid?.() ?? 0,
     listen,
     heartbeat: true,
+    ...(bootId ? { bootId } : {}),
     ...(process.env.PASEO_DESKTOP_MANAGED === "1" ? { desktopManaged: true } : {}),
   };
 

From f13bb2136cc67265c5bb8c61020caf4c2f606f75 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 08:57:29 +0200
Subject: [PATCH 037/270] fix(server): keep accented names on downloaded files
 (#6281)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A file name that fits in Latin-1, like café.txt, went out as a raw byte in
Content-Disposition filename= with no filename* parameter, and Chromium saved
the file under a name taken from the URL (download.txt). Build the header so
every non-ASCII name carries filename*=UTF-8''… with an ASCII fallback.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/server/src/server/bootstrap.ts       |  3 +-
 .../daemon-e2e/file-download.e2e.test.ts      |  4 ++
 .../file-download/content-disposition.test.ts | 42 +++++++++++++++++++
 .../file-download/content-disposition.ts      | 32 ++++++++++++++
 4 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 packages/server/src/server/file-download/content-disposition.test.ts
 create mode 100644 packages/server/src/server/file-download/content-disposition.ts

diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/server/bootstrap.ts
index 5c1d0d1404..0ec792e871 100644
--- a/packages/server/src/server/bootstrap.ts
+++ b/packages/server/src/server/bootstrap.ts
@@ -126,6 +126,7 @@ import { createPaseoWorktree as createRegisteredPaseoWorktree } from "./paseo-wo
 import { createWorkspaceProvisioningService } from "./session/workspace-provisioning/workspace-provisioning-service.js";
 import { createPaseoWorktreeWorkflow } from "./worktree-session.js";
 import { DownloadTokenStore } from "./file-download/token-store.js";
+import { formatAttachmentContentDisposition } from "./file-download/content-disposition.js";
 import type { OpenAiSpeechProviderConfig } from "./speech/providers/openai/config.js";
 import type { LocalSpeechProviderConfig } from "./speech/providers/local/config.js";
 import type { RequestedSpeechProviders } from "./speech/speech-types.js";
@@ -836,8 +837,8 @@ export async function createPaseoDaemon(
         return;
       }
 
-      res.attachment(entry.fileName);
       res.setHeader("Content-Type", entry.mimeType);
+      res.setHeader("Content-Disposition", formatAttachmentContentDisposition(entry.fileName));
       res.setHeader("Content-Length", fileStats.size.toString());
 
       const stream = fileHandle.createReadStream();
diff --git a/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts b/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
index 685d056a27..ac138a8c01 100644
--- a/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
@@ -26,6 +26,10 @@ describe("daemon E2E", () => {
   describe("file download tokens", () => {
     test.each([
       { fileName: "download.txt", disposition: 'attachment; filename="download.txt"' },
+      {
+        fileName: "café.txt",
+        disposition: "attachment; filename=\"caf?.txt\"; filename*=UTF-8''caf%C3%A9.txt",
+      },
       {
         fileName: "中文报告 (最终版).txt",
         disposition:
diff --git a/packages/server/src/server/file-download/content-disposition.test.ts b/packages/server/src/server/file-download/content-disposition.test.ts
new file mode 100644
index 0000000000..46748c21ef
--- /dev/null
+++ b/packages/server/src/server/file-download/content-disposition.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, test } from "vitest";
+import { formatAttachmentContentDisposition } from "./content-disposition.js";
+
+describe("formatAttachmentContentDisposition", () => {
+  test.each([
+    { fileName: "report.txt", disposition: 'attachment; filename="report.txt"' },
+    {
+      fileName: "café.txt",
+      disposition: "attachment; filename=\"caf?.txt\"; filename*=UTF-8''caf%C3%A9.txt",
+    },
+    {
+      fileName: "Résumé Ångström.pdf",
+      disposition:
+        "attachment; filename=\"R?sum? ?ngstr?m.pdf\"; filename*=UTF-8''R%C3%A9sum%C3%A9%20%C3%85ngstr%C3%B6m.pdf",
+    },
+    {
+      fileName: "中文报告 (最终版).txt",
+      disposition:
+        "attachment; filename=\"???? (???).txt\"; filename*=UTF-8''%E4%B8%AD%E6%96%87%E6%8A%A5%E5%91%8A%20%28%E6%9C%80%E7%BB%88%E7%89%88%29.txt",
+    },
+    {
+      fileName: "report-📄.txt",
+      disposition:
+        "attachment; filename=\"report-??.txt\"; filename*=UTF-8''report-%F0%9F%93%84.txt",
+    },
+    {
+      fileName: 'say "hi" \\ bye.txt',
+      disposition: 'attachment; filename="say \\"hi\\" \\\\ bye.txt"',
+    },
+    {
+      fileName: "100%25 done.txt",
+      disposition: "attachment; filename=\"100%25 done.txt\"; filename*=UTF-8''100%2525%20done.txt",
+    },
+    {
+      fileName: "l'été (1)*.txt",
+      disposition:
+        "attachment; filename=\"l'?t? (1)*.txt\"; filename*=UTF-8''l%27%C3%A9t%C3%A9%20%281%29%2A.txt",
+    },
+  ])("$fileName", ({ fileName, disposition }) => {
+    expect(formatAttachmentContentDisposition(fileName)).toBe(disposition);
+  });
+});
diff --git a/packages/server/src/server/file-download/content-disposition.ts b/packages/server/src/server/file-download/content-disposition.ts
new file mode 100644
index 0000000000..1ad7997b7c
--- /dev/null
+++ b/packages/server/src/server/file-download/content-disposition.ts
@@ -0,0 +1,32 @@
+const NON_PRINTABLE_ASCII = /[^\x20-\x7e]/g;
+const PERCENT_ESCAPE = /%[0-9A-Fa-f]{2}/;
+const QUOTED_STRING_SPECIALS = /[\\"]/g;
+const NON_ATTR_CHARS_LEFT_BY_URI_ENCODING = /['()*]/g;
+
+/**
+ * Content-Disposition for a file download (RFC 6266).
+ *
+ * Any name that is not plain ASCII also gets `filename*=UTF-8''…`, because
+ * browsers do not read raw Latin-1 bytes in `filename` and fall back to a name
+ * taken from the URL. A name with a percent escape gets it too, so browsers do
+ * not decode the escape in `filename`.
+ */
+export function formatAttachmentContentDisposition(fileName: string): string {
+  const asciiFileName = fileName.replace(NON_PRINTABLE_ASCII, "?");
+  const disposition = `attachment; filename=${quote(asciiFileName)}`;
+  if (asciiFileName === fileName && !PERCENT_ESCAPE.test(fileName)) {
+    return disposition;
+  }
+  return `${disposition}; filename*=UTF-8''${encodeExtendedValue(fileName)}`;
+}
+
+function quote(value: string): string {
+  return `"${value.replace(QUOTED_STRING_SPECIALS, "\\$&")}"`;
+}
+
+function encodeExtendedValue(value: string): string {
+  return encodeURIComponent(value).replace(
+    NON_ATTR_CHARS_LEFT_BY_URI_ENCODING,
+    (char) => `%${char.charCodeAt(0).toString(16).toUpperCase()}`,
+  );
+}

From 28f7528588bc4ea74d4b9394560191bc16c20b84 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 09:51:17 +0200
Subject: [PATCH 038/270] docs: fix the Tailscale Serve command and log
 rotation defaults (#6284)

The web UI guide gave the pre-1.52 `tailscale serve https / <target>`
form, which current Tailscale rejects with "invalid number of
arguments". The configuration page said logs keep 2 files in total,
while the daemon keeps 3 rotated files next to the active one.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 public-docs/configuration.md | 4 ++--
 public-docs/web-ui.md        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public-docs/configuration.md b/public-docs/configuration.md
index ca578a96ac..a11c4c69ba 100644
--- a/public-docs/configuration.md
+++ b/public-docs/configuration.md
@@ -141,7 +141,7 @@ Daemon logging uses separate console and file sinks by default:
 
 - Console: `info` and above
 - File (`$PASEO_HOME/daemon.log`): `trace` and above
-- File rotation: `10m` max file size, `2` retained files total (active + 1 rotated)
+- File rotation: `10m` max file size, `3` rotated files kept alongside the active file
 
 ```json
 {
@@ -155,7 +155,7 @@ Daemon logging uses separate console and file sinks by default:
       "path": "daemon.log",
       "rotate": {
         "maxSize": "10m",
-        "maxFiles": 2
+        "maxFiles": 3
       }
     }
   }
diff --git a/public-docs/web-ui.md b/public-docs/web-ui.md
index 9e80e8355e..6fe574e3cd 100644
--- a/public-docs/web-ui.md
+++ b/public-docs/web-ui.md
@@ -197,7 +197,7 @@ If you don't want to manage a reverse proxy or open ports, a tunnel gives you an
 - **Tailscale Serve** keeps it inside your tailnet, no public exposure, TLS handled for you:
 
   ```bash
-  tailscale serve https / http://127.0.0.1:6767
+  tailscale serve --bg http://127.0.0.1:6767
   ```
 
   Reach it at `https://<your-machine>.<tailnet>.ts.net/`. Only devices on your tailnet can connect.

From 56f4fca9e4a0f54162aac0f8e35d3cf126c23246 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 11:40:18 +0100
Subject: [PATCH 039/270] docs(workspaces): guide parallel development and
 review (#6294)

---
 README.md                           |  2 ++
 public-docs/index.md                |  1 +
 public-docs/orchestration.md        |  2 ++
 public-docs/parallel-development.md | 52 +++++++++++++++++++++++++++++
 public-docs/providers.md            |  4 ++-
 public-docs/workspaces.md           |  2 ++
 6 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 public-docs/parallel-development.md

diff --git a/README.md b/README.md
index a8fe3f5b25..4b769466c0 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,8 @@ Paseo is a desktop, mobile, web, and CLI app for coding agents. Open the desktop
 - **Cross-device:** iOS, Android, desktop, web, and CLI. Start work at your desk, check in from your phone, script it from the terminal.
 - **Privacy-first:** Paseo doesn't have any telemetry, tracking, or forced log-ins.
 
+[Run parallel tasks in Paseo](https://paseo.sh/docs/parallel-development): start agents in separate worktrees, review their diffs, run each app, and check it in the built-in browser.
+
 ## Plugins
 
 Plugins run on the daemon and show up in every client you connect, with the same UI on desktop, web,
diff --git a/public-docs/index.md b/public-docs/index.md
index f93216883d..5aae08185f 100644
--- a/public-docs/index.md
+++ b/public-docs/index.md
@@ -71,6 +71,7 @@ The image runs the daemon and serves the bundled web UI. It does not bundle agen
 
 ## Where next
 
+- [Run parallel tasks](/docs/parallel-development), use separate worktrees, review diffs, and test changes in the desktop app.
 - [Connectivity](/docs/connectivity), connect through the relay or Tailscale.
 - [Docker](/docs/docker), run the daemon and bundled web UI in a container.
 - [Workspaces](/docs/workspaces), the project, workspace, and session model Paseo is built around.
diff --git a/public-docs/orchestration.md b/public-docs/orchestration.md
index 74c15a36aa..b7c5b861f2 100644
--- a/public-docs/orchestration.md
+++ b/public-docs/orchestration.md
@@ -10,6 +10,8 @@ category: Orchestration
 
 Paseo lets your coding agents coordinate other agents, split work across providers and machines, and keep tasks moving automatically.
 
+You can also start and supervise each task yourself in the desktop app. [Run parallel tasks in separate worktrees](/docs/parallel-development), inspect their diffs, and test each app in a terminal and browser before choosing what to merge.
+
 ## What your agents can do
 
 - **Choose providers and models:** launch other agents using any provider and model configured on the host.
diff --git a/public-docs/parallel-development.md b/public-docs/parallel-development.md
new file mode 100644
index 0000000000..4d9c450d25
--- /dev/null
+++ b/public-docs/parallel-development.md
@@ -0,0 +1,52 @@
+---
+title: Run parallel tasks
+description: Run coding agents in separate worktrees, review their diffs, and test each change with terminals and the built-in browser in Paseo.
+nav: Run parallel tasks
+order: 12
+category: Workspaces
+---
+
+# Run parallel tasks
+
+Use Paseo's desktop app to give several coding agents independent tasks, review their changes, and run the results. Each task gets a workspace with its own git worktree and branch, with agents, files, diffs, terminals, and browser tabs together.
+
+Start with the [desktop app](/docs#desktop-app-recommended), a local git repository, and at least one [coding agent installed and authenticated](/docs/supported-providers). The examples below use a repository with an `origin/main` branch.
+
+## Start two tasks
+
+1. Open **New workspace** and select your project.
+2. Set **Isolation** to **New worktree** and choose `origin/main` as the starting ref.
+3. Choose an agent and model, then submit a task, for example: “Add filtering to the project list. Run the relevant tests.”
+4. Create a second workspace with **New worktree** from the same starting ref. Give its agent another task: “Add keyboard navigation to the settings page. Run the relevant tests.”
+
+Both agents run concurrently. Select either workspace in the sidebar to read progress or send a follow-up. Choose the same provider for both tasks or a different provider for each.
+
+Separate worktrees keep their file edits on separate branches. For two alternative implementations of the same feature, give both agents the same task and compare their results before choosing one.
+
+## Review each change
+
+Select a workspace and open **Changes** from the Command Center to inspect its diff. Open **Files** to browse and edit the source. Use split panes to keep the agent conversation beside the code you're reviewing.
+
+Send corrections to that workspace's agent. To get another opinion, use **New agent** in the same workspace and ask it to review the changes without editing files. Agents in the same workspace share its working directory.
+
+## Run and test the app
+
+In the selected workspace, use **New terminal** from the Command Center. Install dependencies and run your project's test or development command there.
+
+Each worktree has its own files, but processes still share the machine's network ports. Assign a different dev-server port to each running copy. For repeatable setup and service ports, configure [worktree setup and scripts](/docs/worktrees#paseojson).
+
+For a web app, use **New browser** and enter that workspace's dev-server URL. Exercise the changed flow, then switch workspaces to test the other implementation. Browser tabs run inside the desktop app.
+
+You can also ask the agent to check the app in those tabs. Enable [browser automation](/docs/browser#enabling), then give it the URL and concrete steps to verify, for example:
+
+> Open http://localhost:3001, filter the project list by name, and verify that clearing the filter restores the full list. Report any failures and take a screenshot of the result.
+
+## Choose what to merge
+
+Review the diff and test results for each workspace. Ask for any remaining changes before committing and opening a pull request for that branch, using your usual Git workflow in the workspace terminal or through its agent.
+
+For independent tasks, review and merge each branch. For competing implementations, choose the version you want to keep. Archive a workspace when you no longer need it; [worktree cleanup](/docs/worktrees#manage-the-workspace) removes the managed directory after its last workspace is archived.
+
+## Let an agent coordinate the tasks
+
+When you want an agent to create the workspaces, launch workers, and collect their results, use [orchestration](/docs/orchestration). The workers appear in Paseo so you can inspect their conversations and changes as they work.
diff --git a/public-docs/providers.md b/public-docs/providers.md
index 6de304a019..fc23bff784 100644
--- a/public-docs/providers.md
+++ b/public-docs/providers.md
@@ -8,7 +8,9 @@ category: Providers
 
 # Providers
 
-Paseo doesn't ship its own coding agent. It launches and supervises **existing CLIs you've already installed and authenticated**, Claude Code, Codex, OpenCode, Antigravity, Muse Code, Cursor, Gemini, and the rest. Your subscriptions, your config, your skills, your MCP servers all stay intact. Paseo just gives you a UI, a CLI, a relay, and orchestration on top.
+Paseo runs **existing coding agents you've installed and authenticated** in workspaces with an editor, terminals, diffs, and, on desktop, a browser. Run several agents in parallel, choose a provider for each task, and review their work in the same app. Your subscriptions, config, skills, and MCP servers stay intact.
+
+To try the workflow, [run parallel tasks in separate worktrees](/docs/parallel-development).
 
 ## Mental model
 
diff --git a/public-docs/workspaces.md b/public-docs/workspaces.md
index caf59884c4..2e74935d54 100644
--- a/public-docs/workspaces.md
+++ b/public-docs/workspaces.md
@@ -48,6 +48,8 @@ The workspace is the product concept; a git worktree is one way to isolate its f
 
 ## Creating a workspace
 
+For a desktop walkthrough from starting parallel agents to reviewing and testing their changes, see [Run parallel tasks](/docs/parallel-development).
+
 You can create a workspace in the app or from the CLI:
 
 ```bash

From c90587e5b757b8906a995c941ed390f2a5c0d266 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 12:49:37 +0200
Subject: [PATCH 040/270] Keep a plugin search term typed while the website
 page is still loading (#6293)

* test(website): reproduce plugin search dropping a term typed before hydration

Typing in the plugin search box before the page's scripts run leaves the
term in the box but not in React state, so Enter searches without it.

* fix(website): keep a plugin search term typed before the page loads

Text typed into the plugin search box before hydration stayed in the box
but not in component state, so Enter searched without it and the clear
button never appeared. Adopt the box's value once the page hydrates.

Closes #6286

* test(website): cover live browse search typed before the page loads

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/website/e2e/plugins.spec.ts          | 43 +++++++++++++++++++
 .../website/src/plugins/plugin-search.tsx     |  6 +++
 2 files changed, 49 insertions(+)

diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 1efc20115c..2793792845 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -113,6 +113,35 @@ test("keeps the directory's ranking window when searching", async ({ page }) =>
   );
 });
 
+test("searches for a term typed before the page finished loading", async ({ page }) => {
+  const loadScripts = await holdScripts(page);
+  await page.goto("/plugins?window=month", { waitUntil: "domcontentloaded" });
+  await searchPlugins(page, "graphite");
+  await loadScripts();
+  await expect(page.getByRole("button", { name: "Clear search" })).toBeVisible();
+  await page.keyboard.press("Enter");
+  await expect(page).toHaveURL(/\/plugins\/all\?q=graphite&window=month$/);
+});
+
+test("filters browse results for a term typed before the page finished loading", async ({
+  page,
+}) => {
+  await page.goto("/");
+  const loadScripts = await holdScripts(page);
+  await page.goto("/plugins/all", { waitUntil: "domcontentloaded" });
+  const entries = await historyLength(page);
+  await searchPlugins(page, "gra");
+  await loadScripts();
+  await expect(page).toHaveURL(/\/plugins\/all\?q=gra$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^Results for “gra”/ })).toBeVisible();
+  await expect(page.getByRole("link", { name: /Dracula/ })).toHaveCount(0);
+  expect(await historyLength(page)).toBe(entries + 1);
+
+  await page.goBack();
+  await expect(page).toHaveURL(/\/plugins\/all$/);
+  await expect(page.getByRole("heading", { level: 1, name: /^All plugins/ })).toBeVisible();
+});
+
 test("clears the search with the clear button", async ({ page }) => {
   await page.goto("/plugins/all");
   const searchbox = page.getByRole("searchbox", { name: "Search plugins" });
@@ -304,6 +333,20 @@ test.describe("search engine visits without JavaScript", () => {
   });
 });
 
+/** Holds the page's scripts so typing lands before hydration; the returned function loads them. */
+async function holdScripts(page: Page): Promise<() => Promise<void>> {
+  let release!: () => void;
+  const held = new Promise<void>((resolve) => (release = resolve));
+  await page.route(/\.js($|\?)/, async (route) => {
+    await held;
+    await route.continue();
+  });
+  return async () => {
+    release();
+    await page.waitForLoadState("load");
+  };
+}
+
 async function searchPlugins(page: Page, term: string) {
   await page.getByRole("searchbox", { name: "Search plugins" }).fill(term);
 }
diff --git a/packages/website/src/plugins/plugin-search.tsx b/packages/website/src/plugins/plugin-search.tsx
index fdd3a4b5f5..ab648bbd58 100644
--- a/packages/website/src/plugins/plugin-search.tsx
+++ b/packages/website/src/plugins/plugin-search.tsx
@@ -46,6 +46,12 @@ export function PluginSearch({
     },
     [live, show, term],
   );
+  // A term typed before the page hydrated is in the box but not in state; adopt it. Once hydrated,
+  // the box always matches state, so this does nothing.
+  useEffect(() => {
+    const typed = input.current?.value ?? "";
+    if (typed !== term) edit(typed);
+  }, [edit, term]);
   const handleChange = useCallback(
     (event: ChangeEvent<HTMLInputElement>) => edit(event.target.value),
     [edit],

From 8ddeb79c8dbb8934244b35ba18472fb9074d8209 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 14:08:48 +0200
Subject: [PATCH 041/270] Claude agents stay idle while background helpers
 work, and send or Stop no longer kills them (#6295)

* fix(claude): open autonomous turns only when Claude starts a turn

Paseo guessed from frame shape whether the main session had started work
on its own, and only a result could close the turn that guess opened. A
background subagent's task frames, its own background jobs'
task_notification and rate limit events all arrive with no parent tool
use id, so they looked like main-session work and opened a turn no result
would ever close. The agent then reported "running" while its main
session sat idle, and the app's message queue never drained.

Claude brackets every main-session turn itself: system/init opens it and
exactly one result closes it, whether a prompt, a wake-up after background
work, a slash command or an API error started it. Background subagents
never emit either on the main stream. An autonomous turn now opens only on
that init, and only when no foreground turn is open. The frame heuristic
is removed.

- Paseo launches the CLI with CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS=1,
  added as an overlay in buildSdkEnv so the SDK and the usage probe share
  one env object. An "idle" session state closes an autonomous turn as a
  safety net, never a foreground one. "running" opens nothing: Claude Code
  2.1.280 stays "running" for as long as any background subagent is
  alive. State frames never reach the timeline.
- An init clears a leftover pendingInterruptAbort. A new turn has begun,
  so the interrupted one is over, and a stale flag would swallow the new
  turn's result.

Tests that opened autonomous turns from bare frames now send the init
Claude sends. New coverage: helper frames never open a turn while the main
session is idle, a wake-up turn opens on init and closes on its result, a
folded steer keeps one turn while a turn Claude starts after the result
gets its own, an idle closes a turn no result closed, session state never
opens a turn, and the env flag reaches the SDK launch.

docs/agent-lifecycle.md records that only system/init and result bracket
a main-session turn, since the code cannot tell a reader why frame shape
fails.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* fix(claude): interrupt Claude only while its main turn runs, and spare helpers

Every Stop, and every send that replaces a running turn (paseo send, MCP
send_agent_prompt, voice, the app's queue drain, Send now), ends in
query.interrupt(). Without the SDK's perTaskStopAffordance declaration
that call kills every running background subagent, even when the main
session is idle and there is nothing of ours to stop.

- Declare perTaskStopAffordance, so an interrupt aborts only the main
  turn, like Esc in Claude Code. Claude stops a helper itself with its
  TaskStop tool.
- Track whether a main-session turn is in flight from Claude's own
  brackets: set by system/init and by a pushed message's
  command_lifecycle "started" (/compact works for seconds before its
  init), cleared by the result or an idle session state.
- Call query.interrupt() and set pendingInterruptAbort only when that
  turn is in flight, or the cancelled turn's own message has already been
  started. Otherwise withdraw our not-yet-started messages with
  cancel_async_message instead: an idle interrupt reaches only helpers,
  and with no result to follow it the flag would linger.
- Track the foreground prompt with the queued steers until Claude starts
  it, so Stop withdraws a message still waiting in the queue. A turn
  stopped while the Claude process is still starting never sends it.
- Accept command_lifecycle "cancelled" as terminal, so a cancelled steer
  no longer waits to be withdrawn or keeps denying permission cards.

Interrupt tests now wait for the pump to read the init before stopping,
since that is when Paseo learns a turn is in flight. New coverage: a stop
before Claude starts the message withdraws it without interrupting, a
stop while only helpers run never reaches Claude, a stop mid-turn
interrupts once and drops the aborted result, a new turn clears a flag
no result will consume, the SDK option is passed, and a cancelled steer
is not withdrawn again.

docs/providers.md described the old unconditional interrupt; it now states
when the Claude adapter interrupts and why it declares the affordance.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* fix(claude): keep a helper spawned in the background out of a turn's cancel

When a turn is canceled, Paseo terminalizes the subagents that were
running in its foreground and skips the backgrounded ones, which outlive
it. It only learned a child was backgrounded from task_updated's
patch.is_backgrounded, which Claude sends when a foreground task moves to
the background later. A child spawned in the background carries the flag
on task_started instead, and a resumed subagent always does, so the
track marked those helpers "canceled" while they kept working.

Read is_backgrounded from task_started as well. docs/agent-lifecycle.md
said task_updated was the only signal; it now names both.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* fix(app): drain queued messages as steers

The composer queue drains when an agent goes idle. It sent each message
with no activeTurnBehavior, which the daemon treats as "interrupt": if
the agent had just started a turn of its own (a Claude wake-up after
background work finished), the drained message stopped that turn and
replaced it.

Send drained messages with activeTurnBehavior "steer". A drain that races
such a turn folds into it; with no turn running the daemon starts a
normal one, as before. "steer" is an existing protocol value, so older
daemons need nothing new.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* test(claude): cover background helpers against real Claude

Every other test in this file tells Claude "Do not use a background
task", so a message sent or a Stop pressed while a backgrounded subagent
runs was never exercised. Four real-Claude scenarios cover it:

- "a background subagent keeps running after a message is sent while it
  works": one helper, the main turn ends, the parent is not reported
  running, a message in that window is answered, and the helper is never
  read as canceled and completes.
- "a helper's own nested background job does not phantom-run the parent
  or kill the helper": a helper starts its own background Bash job, then
  keeps working in the foreground. The parent stays idle across the
  nested job's completion (sampled for 30 s around a 5 s job), a message
  sent in that window is answered, and the helper reports CHILD_DONE.
- "the app's default steer survives a backgrounded helper while the main
  session works": the app's default send behavior (steer) does not kill
  a helper when it interrupts the main session's own turn.
- "Stop cancels the main session's own turn but spares its background
  helper": the same for Stop.

The wake-up turn Claude starts after a helper finishes lands a moment
after the helper reads completed (0.1 to 5 s in recorded traces), and the
daemon announces it as a pushed "running" agent_update, not as a
turn_started stream event. The checks poll for it and read the final idle
once the wake-up settles. waitForFinish can return a stale "idle" right
after a send, and the push stream can miss a message's final text when it
resolves, so the tests read fetchAgentTimeline like the rest of the file.
Helper status comes from agent.provider_subagents.list, since agent_stream
carries no provider_subagent events.

The scenarios need the previous commits together. Run against the frame
heuristic this branch removes, the nested-job test fails: the parent
flips to running once the nested job finishes and stays there.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* fix(claude): interrupt a stopped prompt Claude has already taken

Stop before Claude announces a prompt started withdraws it with
cancel_async_message instead of interrupting. Claude can dequeue a
message for its next turn before announcing it, and withdrawing it is
then a no-op that reports cancelled: false, so the stopped prompt kept
running. Interrupt whenever a message could not be withdrawn.

Co-authored-by: Isak Persson <isak.a.persson@gmail.com>

* fix(claude): withdraw a stopped prompt only once

When the withdrawal of a stopped prompt failed, the interrupt path
withdrew a second time, which could cancel a prompt sent while the first
withdrawal was in flight. Withdraw once and interrupt on failure.

The real-Claude steer scenario now waits for the background helper to
exist before steering, so it proves the helper survives the steer.

Co-authored-by: Isak Persson <isak.a.persson@gmail.com>

---------

Co-authored-by: Isak Persson <isak.a.persson@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 docs/agent-lifecycle.md                       |   3 +-
 docs/providers.md                             |   2 +-
 packages/app/src/runtime/host-runtime.test.ts |  28 +
 packages/app/src/runtime/host-runtime.ts      |   5 +
 .../agent/providers/claude/agent.env.test.ts  |   6 +
 ...agent.interrupt-restart-regression.test.ts |  80 +-
 .../providers/claude/agent.redesign.test.ts   | 465 +++++++++++
 .../claude/agent.subagent-interrupt.test.ts   |  28 +-
 .../agent/providers/claude/agent.test.ts      |  11 +-
 .../server/agent/providers/claude/agent.ts    | 179 +++--
 .../claude/subagents/live-source.test.ts      |  27 +
 .../providers/claude/subagents/live-source.ts |  28 +-
 ...d-during-tool-call-claude.real.e2e.test.ts | 721 ++++++++++++++++++
 13 files changed, 1504 insertions(+), 79 deletions(-)

diff --git a/docs/agent-lifecycle.md b/docs/agent-lifecycle.md
index 8662ee3287..d0d057949f 100644
--- a/docs/agent-lifecycle.md
+++ b/docs/agent-lifecycle.md
@@ -197,10 +197,11 @@ Claude Code announces subagent lifecycle on the SDK stream (`task_started` / `ta
 
 - **Not every announced task belongs in the track.** Task subagents announce as `local_agent` and workflows as `local_workflow`; a backgrounded shell announces as `local_bash` with the same `tool_use_id` shape, and ambient housekeeping sets `skip_transcript`. The Claude provider normalizes a workflow to a generic provider-subagent descriptor titled `Workflow`, using Claude's summary as its description and timeline opener. Shared storage, protocol, and UI do not distinguish it from another provider subagent.
 - **A task that was never declared gets no descriptor, by any route.** Filtered tasks still emit `task_notification`s carrying a `tool_use_id`, and still emit frames carrying `parent_tool_use_id`. Attributing either produces a descriptor with no identity and a defaulted `running` status — a nameless row that never finishes. Status, presentation updates, and sidechain frames all route through the declaration table.
-- **Task ids are session-scoped, not turn-scoped.** Cancelling a turn must not clear the routing table: a backgrounded child settles after the interrupt and needs its descriptor to still exist. Cancellation instead terminalizes the declared children that were running in the foreground, and a later `task_notification` is free to correct that guess. Backgrounded children are identified by `task_updated.patch.is_backgrounded`.
+- **Task ids are session-scoped, not turn-scoped.** Cancelling a turn must not clear the routing table: a backgrounded child settles after the interrupt and needs its descriptor to still exist. Cancellation instead terminalizes the declared children that were running in the foreground, and a later `task_notification` is free to correct that guess. Backgrounded children are identified by `is_backgrounded` on `task_started` (set at spawn; a resumed subagent is always background) or, when moved there later, on `task_updated.patch`.
 - **A resumed task can be announced again with a new `tool_use_id`.** The first Task tool id remains the canonical descriptor and later ids are routing aliases for the same session-scoped task. The resumed prompt is added to that child timeline.
 - **Effort is only reachable through hooks.** It appears nowhere on the message stream at any depth, and the level Paseo requests is not necessarily the level that runs — a model that does not support it is silently downgraded. A hook firing inside a subagent reports the active post-downgrade level next to its `agent_id`, which is the same id `task_started` calls `task_id`.
 - **Backgrounded subagents emit no frames carrying `parent_tool_use_id` at all.** Everything keyed off that field sees nothing for one; they are visible only because the task protocol announces them.
+- **Only `system/init` and `result` bracket a main-session turn.** Background subagents emit neither on the main stream, while their task frames, their own background jobs' `task_notification`, and `rate_limit_event` arrive with no `parent_tool_use_id`, the same shape as main-session work. `session_state_changed` stays `running` for as long as any background subagent lives (Claude Code 2.1.280), so it cannot open a turn; its `idle` can close one.
 - **Nested ownership comes from the launching sidechain, not `spawn_depth` alone.** A sidechain's Agent or Bash tool call records the direct owner of that `tool_use_id`; the following `task_started` inherits it. This routes a grandchild descriptor and child-owned background notifications without relying on labels or flattening them into the managed parent.
 - **On replay, `<session>/subagents/` holds every descendant beside the root.** Resolve the tree one proven generation at a time: the root transcript admits direct children, then each admitted sidechain transcript admits its children by `toolUseId`. `spawnDepth` orders candidates but does not establish ownership. Unresolved sidecars remain excluded as ambient or unrelated work.
 - **Replay `totalTokens` is a context-size reading, not cumulative spend.** Claude Code finalizes a subagent by summing the _last_ assistant message's usage block and shipping that as `usage.total_tokens`. Summing per-entry usage instead multiplies the cached prefix by the turn count and reports a number several times larger than the live path.
diff --git a/docs/providers.md b/docs/providers.md
index c5f37d4161..4609246922 100644
--- a/docs/providers.md
+++ b/docs/providers.md
@@ -103,7 +103,7 @@ OpenCode owns user message IDs. Do not pass Paseo-generated IDs to OpenCode prom
 
 Active-turn steering is an optional `AgentSession.steerActiveTurn` operation. The manager owns admission against its exact foreground turn, canonical user-message creation, echo reconciliation, and falls back to the normal interrupt-and-replace path only when the adapter reports `unavailable`. An adapter error leaves the steer's fate ambiguous and must surface without an interrupt or retry. Codex calls `turn/steer` with the native expected turn and Paseo client user-message ID. Claude pushes an admitted steer into the exact active SDK query input; isolated control commands remain unavailable. OpenCode calls `session/prompt_async` with an OpenCode-generated message ID; the server queues the prompt while busy and the next LLM call in the same Paseo turn includes it. Pi sends its native `steer` RPC, which queues the message for delivery after the in-flight assistant turn's tool calls. Slash-command inputs report `unavailable` because pi rejects extension commands on the steer path, and echo identity is correlated by message text because pi's steer RPC takes no message ID. A missing session reports `unavailable` and uses the normal interrupt fallback.
 
-A steering adapter also owes its interrupt: stopping a turn must discard the steers the provider has not read yet, or one of them resumes the turn the user just stopped. Codex clears pending input when it aborts a turn; Claude does not, so its adapter cancels the SDK messages it queued before calling `query.interrupt()`. Pi requires `clear_queue` before `abort`; older binaries without that RPC retain their native queue behavior until the pi compatibility floor reaches 0.84.4.
+A steering adapter also owes its interrupt: stopping a turn must discard the steers the provider has not read yet, or one of them resumes the turn the user just stopped. Codex clears pending input when it aborts a turn; Claude does not, so its adapter cancels the SDK messages it queued before calling `query.interrupt()`. It calls `query.interrupt()` only while a main-session turn is in flight (between `system/init` and that turn's `result`): with the main session idle, an interrupt reaches only background subagents and no result follows it, so the adapter withdraws its unstarted messages and stops there. The adapter also declares `perTaskStopAffordance`, because without it the CLI kills every background subagent on interrupt. Pi requires `clear_queue` before `abort`; older binaries without that RPC retain their native queue behavior until the pi compatibility floor reaches 0.84.4.
 
 `SteerActiveTurnOptions.clearPendingPermissions` makes permission release part of the provider contract. A provider that accepts such a steer queues it first, denies permissions blocking its delivery, and stops once the steer is read. Steers without the flag leave permissions open. A denied plan remains in the timeline because the pending card was the only other copy of its text.
 
diff --git a/packages/app/src/runtime/host-runtime.test.ts b/packages/app/src/runtime/host-runtime.test.ts
index 0954b0e422..996a47d498 100644
--- a/packages/app/src/runtime/host-runtime.test.ts
+++ b/packages/app/src/runtime/host-runtime.test.ts
@@ -3047,6 +3047,34 @@ describe("HostRuntimeStore", () => {
     useSessionStore.getState().clearSession(host.serverId);
   });
 
+  it("drains a queued message as a steer so a turn the agent just started is not interrupted", async () => {
+    const host = makeHost({ serverId: "srv_steer_queue_drain" });
+    const fakeClient = new FakeDaemonClient();
+    const store = new HostRuntimeStore({
+      deps: {
+        createClient: () => fakeClient as unknown as DaemonClient,
+        connectToDaemon: async () => ({
+          client: fakeClient as unknown as DaemonClient,
+          serverId: host.serverId,
+          hostname: null,
+        }),
+        getClientId: async () => "cid_steer_queue_drain",
+      },
+    });
+    const sessionStore = useSessionStore.getState();
+    sessionStore.initializeSession(host.serverId, fakeClient as unknown as DaemonClient, 1);
+    sessionStore.setQueuedMessages(
+      host.serverId,
+      new Map([["agent", [{ id: "queued", text: "next task", attachments: [] }]]]),
+    );
+
+    store.drainQueuedAgentMessage(host.serverId, "agent");
+    await fakeClient.waitForSentMessages(1);
+
+    expect(fakeClient.sentAgentMessages[0]?.[2]?.activeTurnBehavior).toBe("steer");
+    sessionStore.clearSession(host.serverId);
+  });
+
   it("uses legacy GitHub attachments when draining a queue for an old daemon", async () => {
     const host = makeHost({ serverId: "srv_legacy_queue_attachment" });
     const fakeClient = new FakeDaemonClient();
diff --git a/packages/app/src/runtime/host-runtime.ts b/packages/app/src/runtime/host-runtime.ts
index de4b40f883..2ecbe60448 100644
--- a/packages/app/src/runtime/host-runtime.ts
+++ b/packages/app/src/runtime/host-runtime.ts
@@ -2426,6 +2426,11 @@ export class HostRuntimeStore {
           }),
           encodeImages,
           submission: createMessageSubmissionWriter(serverId),
+          // The queue drains when the agent goes idle, but the agent can start a turn of its own
+          // in that same moment (a wake-up after background work). Steering folds the message
+          // into that turn instead of interrupting it; with no turn running, the daemon starts
+          // a normal one.
+          activeTurnBehavior: "steer",
         });
       },
     })
diff --git a/packages/server/src/server/agent/providers/claude/agent.env.test.ts b/packages/server/src/server/agent/providers/claude/agent.env.test.ts
index c99687e438..0d2748fd62 100644
--- a/packages/server/src/server/agent/providers/claude/agent.env.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.env.test.ts
@@ -31,6 +31,7 @@ function createQueryMock(events: unknown[]): Query {
 describe("Claude SDK env", () => {
   test("forwards launch-context env through Claude process env", async () => {
     let capturedEnv: Record<string, string | undefined> | undefined;
+    let capturedPerTaskStopAffordance: boolean | undefined;
     const launchContext: AgentLaunchContext = {
       env: {
         PASEO_AGENT_ID: "00000000-0000-4000-8000-000000000201",
@@ -39,6 +40,7 @@ describe("Claude SDK env", () => {
     };
     const queryFactory = vi.fn(({ options }: ClaudeQueryInput) => {
       capturedEnv = options.env;
+      capturedPerTaskStopAffordance = options.perTaskStopAffordance;
       return createQueryMock([
         {
           type: "system",
@@ -91,6 +93,10 @@ describe("Claude SDK env", () => {
       expect(capturedEnv?.MCP_TIMEOUT).toBe("claude-startup-timeout");
       expect(capturedEnv?.MCP_TOOL_TIMEOUT).toBe("claude-tool-timeout");
       expect(session.usageSession?.()?.env).toBe(capturedEnv);
+      // Paseo reads session_state_changed to know when an autonomous turn is over.
+      expect(capturedEnv?.CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS).toBe("1");
+      // Without it, Stop and replace kill every background subagent along with the turn.
+      expect(capturedPerTaskStopAffordance).toBe(true);
     } finally {
       await session.close();
       expect(session.usageSession?.()).toBeNull();
diff --git a/packages/server/src/server/agent/providers/claude/agent.interrupt-restart-regression.test.ts b/packages/server/src/server/agent/providers/claude/agent.interrupt-restart-regression.test.ts
index dada35945c..02a09ba44b 100644
--- a/packages/server/src/server/agent/providers/claude/agent.interrupt-restart-regression.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.interrupt-restart-regression.test.ts
@@ -91,6 +91,17 @@ function buildUsage() {
   };
 }
 
+/** Claude opening a turn of its own. Every main-session turn starts with one. */
+function buildTurnInit(sessionId: string) {
+  return {
+    type: "system",
+    subtype: "init",
+    session_id: sessionId,
+    permissionMode: "default",
+    model: "opus",
+  };
+}
+
 function buildSuccessResult(sessionId: string) {
   return {
     type: "result",
@@ -153,13 +164,7 @@ function createScriptedQuery(params: {
     },
   } satisfies ScriptedQuery;
 
-  scriptedQuery.emit({
-    type: "system",
-    subtype: "init",
-    session_id: params.sessionId,
-    permissionMode: "default",
-    model: "opus",
-  });
+  scriptedQuery.emit(buildTurnInit(params.sessionId));
 
   void (async () => {
     for await (const prompt of params.prompt) {
@@ -252,6 +257,21 @@ async function waitFor(
   }
 }
 
+/**
+ * Paseo interrupts Claude only while a main-session turn is in flight, which it learns from the
+ * init. The pump asks for its next frame only after routing the last one, so a second next() call
+ * proves the init was read.
+ */
+async function waitForInitRouted(
+  query: () => { next: ReturnType<typeof vi.fn> } | null | undefined,
+) {
+  await waitFor(() => (query()?.next.mock.calls.length ?? 0) >= 2);
+}
+
+function buildCommandLifecycle(commandUuid: string | null | undefined, state: string) {
+  return { type: "command_lifecycle", command_uuid: commandUuid, state };
+}
+
 afterEach(() => {
   queryFactory.mockReset();
 });
@@ -282,6 +302,7 @@ test("interrupt only calls query.interrupt and leaves the query open", async ()
   const firstTurn = streamSession(session, "first prompt");
   await firstTurn.next();
   await waitFor(() => queries[0]?.prompts.length === 1);
+  await waitForInitRouted(() => queries[0]);
 
   await session.interrupt();
   await waitFor(() => queries[0]?.interrupt.mock.calls.length === 1);
@@ -322,6 +343,7 @@ async function startSteeredTurn(sessionId: string): Promise<{
     throw new Error("Expected the original Claude turn to start");
   }
   await waitFor(() => query?.prompts.length === 1);
+  await waitForInitRouted(() => query);
 
   const steered = await session.steerActiveTurn!("queued steer", {
     expectedTurnId: start.value.turnId,
@@ -371,11 +393,8 @@ test("interrupt still stops the turn when Claude has already dequeued the steer"
 test("a steer Claude has already read is no longer discardable on interrupt", async () => {
   const { session, query, turn } = await startSteeredTurn("queued-steer-completed-session");
 
-  query()?.emit({
-    type: "command_lifecycle",
-    command_uuid: query()?.prompts[1]?.uuid,
-    state: "completed",
-  });
+  query()?.emit(buildCommandLifecycle(query()?.prompts[0]?.uuid, "started"));
+  query()?.emit(buildCommandLifecycle(query()?.prompts[1]?.uuid, "completed"));
   // Frames are translated in order, so the marker landing proves the lifecycle frame was read.
   query()?.emit({ type: "assistant", message: { content: "STEER_READ" } });
   await consumeUntil(turn, (event) => collectAssistantText([event]).includes("STEER_READ"));
@@ -388,6 +407,23 @@ test("a steer Claude has already read is no longer discardable on interrupt", as
   await session.close();
 });
 
+test("a steer Claude cancelled is no longer withdrawn on interrupt", async () => {
+  const { session, query, turn } = await startSteeredTurn("queued-steer-cancelled-session");
+
+  query()?.emit(buildCommandLifecycle(query()?.prompts[0]?.uuid, "started"));
+  // "cancelled" is terminal: API errors, interrupts and "now" pre-emption all end a message.
+  query()?.emit(buildCommandLifecycle(query()?.prompts[1]?.uuid, "cancelled"));
+  query()?.emit({ type: "assistant", message: { content: "STEER_CANCELLED" } });
+  await consumeUntil(turn, (event) => collectAssistantText([event]).includes("STEER_CANCELLED"));
+
+  await session.interrupt();
+  await waitFor(() => query()?.interrupt.mock.calls.length === 1);
+
+  expect(query()?.cancelAsyncMessage).not.toHaveBeenCalled();
+  await collectUntilTerminal(turn);
+  await session.close();
+});
+
 function buildStoppedTaskNotification(sessionId: string) {
   return {
     type: "system",
@@ -473,6 +509,7 @@ async function startInterruptedToolTurn(sessionId: string): Promise<{
   const turn = streamSession(session, "run the slow tool");
   await turn.next();
   await waitFor(() => query?.prompts.length === 1);
+  await waitForInitRouted(() => query);
 
   await session.interrupt();
   await collectUntilTerminal(turn);
@@ -523,6 +560,7 @@ test("Claude can still wake into an autonomous turn once the interrupted request
 
   query()?.emit(buildStoppedTaskNotification(sessionId));
   query()?.emit(buildAbortedResult(sessionId));
+  query()?.emit(buildTurnInit(sessionId));
   query()?.emit({
     type: "assistant",
     message: { content: "AUTONOMOUS_WAKE_RESPONSE" },
@@ -579,6 +617,7 @@ test("reuses the existing query after interrupt before starting the next prompt"
   const firstTurn = streamSession(session, "first prompt");
   await firstTurn.next();
   await waitFor(() => queries[0]?.prompts.length === 1);
+  await waitForInitRouted(() => queries[0]);
 
   await session.interrupt();
   await collectUntilTerminal(firstTurn);
@@ -652,6 +691,7 @@ test("recovers when the query pump sees a single interrupt abort before the next
   const output = createAsyncQueue<Record<string, unknown>>();
   const prompts: PromptRecord[] = [];
   let throwAbortOnNext = false;
+  let queryRef: Pick<ScriptedQuery, "next"> | null = null;
 
   queryFactory.mockImplementation(({ prompt }: { prompt: AsyncIterable<unknown> }) => {
     const scriptedQuery = {
@@ -685,13 +725,8 @@ test("recovers when the query pump sees a single interrupt abort before the next
       },
     } satisfies ScriptedQuery;
 
-    scriptedQuery.emit({
-      type: "system",
-      subtype: "init",
-      session_id: "interrupt-abort-recovery-session",
-      permissionMode: "default",
-      model: "opus",
-    });
+    queryRef = scriptedQuery;
+    scriptedQuery.emit(buildTurnInit("interrupt-abort-recovery-session"));
 
     void (async () => {
       for await (const promptMessage of prompt) {
@@ -730,6 +765,7 @@ test("recovers when the query pump sees a single interrupt abort before the next
 
   const firstTurn = streamSession(session, "first prompt");
   await firstTurn.next();
+  await waitForInitRouted(() => queryRef);
   await session.interrupt();
   await collectUntilTerminal(firstTurn);
 
@@ -768,6 +804,7 @@ test("stale abort result after replacement start does not poison the new foregro
   const firstTurn = streamSession(session, "first prompt");
   const firstStarted = await firstTurn.next();
   await waitFor(() => queryRef?.prompts.length === 1);
+  await waitForInitRouted(() => queryRef);
 
   await session.interrupt();
   const firstTurnEvents = [firstStarted.value!, ...(await collectUntilTerminal(firstTurn))];
@@ -812,7 +849,7 @@ test("stale abort result after replacement start does not poison the new foregro
   await session.close();
 });
 
-test("creates an autonomous live turn when assistant output arrives without a foreground run", async () => {
+test("creates an autonomous live turn when Claude starts a turn without a foreground run", async () => {
   const logger = createTestLogger();
   let queryRef: ScriptedQuery | null = null;
 
@@ -848,6 +885,7 @@ test("creates an autonomous live turn when assistant output arrives without a fo
   await collectUntilTerminal(streamSession(session, "seed prompt"));
 
   const subscribedEvents = subscribeToEvents(session);
+  queryRef?.emit(buildTurnInit("autonomous-live-session"));
   queryRef?.emit({
     type: "assistant",
     message: { content: "AUTONOMOUS_WAKE_RESPONSE" },
@@ -916,6 +954,7 @@ test("steers an autonomous turn through its existing query without restarting it
 
   await collectUntilTerminal(streamSession(session, "seed prompt"));
   const autonomousEvents = subscribeToEvents(session);
+  queryRef?.emit(buildTurnInit("autonomous-steer-session"));
   queryRef?.emit({
     type: "assistant",
     message: { content: "AUTONOMOUS_RESPONSE" },
@@ -999,6 +1038,7 @@ test("auto-completes an open autonomous turn when a foreground prompt starts", a
   await collectUntilTerminal(streamSession(session, "seed prompt"));
 
   const subscribedEvents = subscribeToEvents(session);
+  queryRef?.emit(buildTurnInit("autonomous-handoff-session"));
   queryRef?.emit({
     type: "assistant",
     message: { content: "BACKGROUND_ONLY_RESPONSE" },
diff --git a/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts b/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts
index 747a466c32..5393926520 100644
--- a/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.redesign.test.ts
@@ -486,6 +486,7 @@ test("interruptActiveTurn only interrupts the active query without info logs", a
     } | null;
     input: { end: () => void } | null;
     queryRestartNeeded: boolean;
+    mainTurnInFlight: boolean;
     interruptActiveTurn: () => Promise<void>;
   } = asInternals(session);
   const interrupt = vi.fn(async () => undefined);
@@ -498,6 +499,7 @@ test("interruptActiveTurn only interrupts the active query without info logs", a
   };
   internal.input = { end };
   internal.queryRestartNeeded = false;
+  internal.mainTurnInFlight = true;
 
   try {
     await internal.interruptActiveTurn();
@@ -1191,6 +1193,7 @@ test("reuses one autonomous run for unbound stream_event bursts with no foregrou
   const queryMock = createBaseQueryMock(vi.fn(async () => ({ done: true, value: undefined })));
 
   internal.turnState = "idle";
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
   await internal.routeSdkMessageFromPump(
     {
       type: "stream_event",
@@ -1233,6 +1236,468 @@ test("reuses one autonomous run for unbound stream_event bursts with no foregrou
   await session.close();
 });
 
+interface SessionStateInternals {
+  turnState: "idle" | "foreground" | "autonomous";
+  routeSdkMessageFromPump: (
+    message: Record<string, unknown>,
+    activeQuery: QueryMock,
+  ) => Promise<void>;
+  autonomousTurn: { id: string } | null;
+  activeForegroundTurnId: string | null;
+}
+
+function sessionState(state: "idle" | "running" | "requires_action") {
+  return {
+    type: "system",
+    subtype: "session_state_changed",
+    state,
+    uuid: `state-${state}`,
+    session_id: "sess-1",
+  };
+}
+
+/** Claude opening a turn of its own. Every main-session turn starts with one. */
+function claudeTurnInit() {
+  return {
+    type: "system",
+    subtype: "init",
+    session_id: "sess-1",
+    permissionMode: "default",
+    model: "opus",
+  };
+}
+
+function successResult() {
+  return { type: "result", subtype: "success", usage: buildUsage(), total_cost_usd: 0 };
+}
+
+function commandLifecycle(
+  commandUuid: string,
+  state: "queued" | "started" | "completed" | "cancelled",
+) {
+  return { type: "command_lifecycle", command_uuid: commandUuid, state };
+}
+
+function unboundTextDelta(text: string) {
+  return {
+    type: "stream_event",
+    parent_tool_use_id: null,
+    event: { type: "content_block_delta", delta: { type: "text_delta", text } },
+  };
+}
+
+// What a background subagent emits on the main stream with no parent tool use id, so by frame
+// shape alone each looks like main-session work. Verified on the wire: none arrives inside a turn
+// Claude opened, and no result follows any of them.
+const helperTaskStarted = {
+  type: "system",
+  subtype: "task_started",
+  task_id: "helper-task",
+  tool_use_id: "toolu_helper",
+  task_type: "local_agent",
+  subagent_type: "general-purpose",
+  description: "Background helper",
+  is_backgrounded: true,
+  uuid: "uuid-task-started",
+  session_id: "sess-1",
+};
+const helperTaskProgress = {
+  type: "system",
+  subtype: "task_progress",
+  task_id: "helper-task",
+  tool_use_id: "toolu_helper",
+  description: "Background helper",
+  usage: { total_tokens: 1200, tool_uses: 3, duration_ms: 900 },
+  last_tool_name: "Bash",
+  uuid: "uuid-task-progress",
+  session_id: "sess-1",
+};
+// A subagent's own background Bash job completing.
+const subagentOwnedTaskNotification = {
+  type: "system",
+  subtype: "task_notification",
+  task_id: "bg-job-of-subagent",
+  tool_use_id: "toolu_subagent_bash",
+  status: "completed",
+  summary: "Background command completed",
+  output_file: "/tmp/bg-job-of-subagent.output",
+  uuid: "uuid-task-notification",
+  session_id: "sess-1",
+};
+const helperCompleted = {
+  type: "system",
+  subtype: "task_notification",
+  task_id: "helper-task",
+  tool_use_id: "toolu_helper",
+  status: "completed",
+  summary: "Background helper finished",
+  output_file: "/tmp/helper-task.output",
+  uuid: "uuid-helper-completed",
+  session_id: "sess-1",
+};
+const rateLimitEvent = {
+  type: "rate_limit_event",
+  rate_limit_info: { status: "allowed" },
+  uuid: "uuid-rate-limit",
+  session_id: "sess-1",
+};
+
+function createPendingQueryMock(): QueryMock {
+  return createBaseQueryMock(vi.fn(() => new Promise<never>(() => {})));
+}
+
+test("a main-session frame opens no turn until Claude starts one", async () => {
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+
+  // Main-session output only ever arrives inside a turn Claude opened with system/init, so a
+  // stray unbound frame is not the start of one.
+  await internal.routeSdkMessageFromPump(unboundTextDelta("stray"), queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+
+  // The wake-up case autonomous turns exist for: a completed background subagent makes the main
+  // session start a turn of its own, with no prompt from the user.
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  await internal.routeSdkMessageFromPump(unboundTextDelta("picking this up"), queryMock);
+  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
+
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+
+  await session.close();
+});
+
+test("a background subagent's frames never open a turn while the main session is idle", async () => {
+  sdkQueryFactory.mockImplementation(() => createPendingQueryMock());
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+
+  // Claude Code 2.1.280 reports "running" for as long as any background subagent is alive.
+  await internal.routeSdkMessageFromPump(sessionState("running"), queryMock);
+  for (const frame of [
+    helperTaskStarted,
+    helperTaskProgress,
+    subagentOwnedTaskNotification,
+    rateLimitEvent,
+    helperCompleted,
+  ]) {
+    await internal.routeSdkMessageFromPump(frame, queryMock);
+    expect(internal.autonomousTurn).toBeNull();
+    expect(internal.turnState).toBe("idle");
+  }
+
+  // The next user message starts its own foreground turn rather than landing on a phantom one.
+  const { turnId } = await session.startTurn("PING");
+  expect(internal.activeForegroundTurnId).toBe(turnId);
+  expect(internal.autonomousTurn).toBeNull();
+  expect(internal.turnState).toBe("foreground");
+
+  await session.close();
+});
+
+test("Claude waking up after a helper finishes gets an autonomous turn that its result closes", async () => {
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  // The helper's completion arrives outside any turn. Claude then starts one to react to it.
+  await internal.routeSdkMessageFromPump(helperTaskStarted, queryMock);
+  await internal.routeSdkMessageFromPump(helperCompleted, queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
+  expect(internal.turnState).toBe("autonomous");
+
+  await internal.routeSdkMessageFromPump(unboundTextDelta("the helper is done"), queryMock);
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+  expect(internal.turnState).toBe("idle");
+  expect(events.filter((event) => event.type === "turn_started")).toHaveLength(1);
+  expect(events.filter((event) => event.type === "turn_completed")).toHaveLength(1);
+
+  await session.close();
+});
+
+test("a steer folded into a turn keeps one turn, and a turn Claude starts after it gets its own", async () => {
+  sdkQueryFactory.mockImplementation(() => createPendingQueryMock());
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  const { turnId } = await session.startTurn("hello");
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  // A message pushed mid-turn is folded in at the next tool boundary: Claude acknowledges it, but
+  // starts no new turn.
+  await internal.routeSdkMessageFromPump(commandLifecycle("folded-steer", "queued"), queryMock);
+  await internal.routeSdkMessageFromPump(commandLifecycle("folded-steer", "started"), queryMock);
+  expect(internal.activeForegroundTurnId).toBe(turnId);
+  expect(internal.autonomousTurn).toBeNull();
+
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  expect(internal.activeForegroundTurnId).toBeNull();
+  expect(internal.turnState).toBe("idle");
+
+  // A message that arrived while Claude wrote its final answer runs as a turn of its own.
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-2");
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+  expect(internal.turnState).toBe("idle");
+  expect(events.filter((event) => event.type === "turn_started")).toHaveLength(2);
+  expect(events.filter((event) => event.type === "turn_completed")).toHaveLength(2);
+
+  await session.close();
+});
+
+test("session state never opens a turn", async () => {
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  // "running" covers background subagents too, so it says nothing about the main session.
+  for (const state of ["idle", "running", "requires_action", "idle"] as const) {
+    await internal.routeSdkMessageFromPump(sessionState(state), queryMock);
+    expect(internal.autonomousTurn).toBeNull();
+    expect(internal.turnState).toBe("idle");
+  }
+  // State frames are bookkeeping, never timeline content.
+  expect(events).toEqual([]);
+
+  await session.close();
+});
+
+test("an idle session state closes an autonomous turn that no result closed", async () => {
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
+
+  // Safety net: Claude says nothing at all is running any more.
+  await internal.routeSdkMessageFromPump(sessionState("idle"), queryMock);
+  expect(internal.autonomousTurn).toBeNull();
+  expect(internal.turnState).toBe("idle");
+  expect(events.filter((event) => event.type === "turn_completed")).toHaveLength(1);
+
+  await session.close();
+});
+
+test("session state never opens or closes a foreground turn", async () => {
+  sdkQueryFactory.mockImplementation(() => createPendingQueryMock());
+  const session = await createSession();
+  const internal: SessionStateInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+
+  await internal.routeSdkMessageFromPump(sessionState("idle"), queryMock);
+  const { turnId } = await session.startTurn("hello");
+
+  // The send's own running, then an idle that trails the previous turn and lands late.
+  await internal.routeSdkMessageFromPump(sessionState("running"), queryMock);
+  await internal.routeSdkMessageFromPump(sessionState("idle"), queryMock);
+  expect(internal.activeForegroundTurnId).toBe(turnId);
+  expect(internal.autonomousTurn).toBeNull();
+  expect(internal.turnState).toBe("foreground");
+
+  await internal.routeSdkMessageFromPump(
+    { type: "result", subtype: "success", usage: buildUsage(), total_cost_usd: 0 },
+    queryMock,
+  );
+  expect(internal.activeForegroundTurnId).toBeNull();
+  expect(internal.turnState).toBe("idle");
+
+  await session.close();
+});
+
+interface InterruptInternals extends SessionStateInternals {
+  pendingInterruptAbort: boolean;
+}
+
+type InterruptibleQueryMock = QueryMock & { cancelAsyncMessage: ReturnType<typeof vi.fn> };
+
+function createInterruptibleQueryMock(): InterruptibleQueryMock {
+  return Object.assign(createPendingQueryMock(), {
+    cancelAsyncMessage: vi.fn(async () => true),
+  });
+}
+
+/** The uuid Paseo stamped on the first message it pushed into the SDK input. */
+async function readFirstPromptUuid(): Promise<string | null> {
+  const input = sdkQueryFactory.mock.calls[0]?.[0] as { prompt: AsyncIterable<unknown> };
+  return await createPromptUuidReader(input.prompt)();
+}
+
+function abortedResult() {
+  return {
+    type: "result",
+    subtype: "error_during_execution",
+    errors: [],
+    usage: buildUsage(),
+    total_cost_usd: 0,
+  };
+}
+
+test("an interrupt before Claude starts the message withdraws it instead of interrupting", async () => {
+  const queryMock = createInterruptibleQueryMock();
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const session = await createSession();
+  const internal: InterruptInternals = asInternals(session);
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  await session.startTurn("hello");
+  // Claude has not acknowledged the message yet: no init, no command_lifecycle "started".
+  await session.interrupt();
+
+  await vi.waitFor(() => expect(queryMock.cancelAsyncMessage).toHaveBeenCalledTimes(1));
+  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledWith(await readFirstPromptUuid());
+  expect(queryMock.interrupt).not.toHaveBeenCalled();
+  // No result follows an interrupt that never happened, so no flag may wait for one.
+  expect(internal.pendingInterruptAbort).toBe(false);
+  expect(events.filter((event) => event.type === "turn_canceled")).toHaveLength(1);
+
+  await session.close();
+});
+
+test("an interrupt after Claude took the message but before it started stops it", async () => {
+  const queryMock = createInterruptibleQueryMock();
+  // Claude has dequeued the message for its next turn, so withdrawing it is a no-op.
+  queryMock.cancelAsyncMessage.mockImplementation(async () => false);
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const session = await createSession();
+  const internal: InterruptInternals = asInternals(session);
+
+  await session.startTurn("hello");
+  // No command_lifecycle "started" or init has reached Paseo yet.
+  await session.interrupt();
+
+  await vi.waitFor(() => expect(queryMock.interrupt).toHaveBeenCalledTimes(1));
+  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledWith(await readFirstPromptUuid());
+  expect(internal.pendingInterruptAbort).toBe(true);
+
+  await session.close();
+});
+
+test("a prompt sent while a stopped prompt is being withdrawn is not withdrawn too", async () => {
+  const queryMock = createInterruptibleQueryMock();
+  let settleWithdrawal: (cancelled: boolean) => void = () => {};
+  queryMock.cancelAsyncMessage.mockImplementationOnce(
+    () => new Promise<boolean>((resolve) => (settleWithdrawal = resolve)),
+  );
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const session = await createSession();
+
+  await session.startTurn("first");
+  const firstUuid = await readFirstPromptUuid();
+  await session.interrupt();
+  await vi.waitFor(() => expect(queryMock.cancelAsyncMessage).toHaveBeenCalledTimes(1));
+
+  await session.startTurn("second");
+  settleWithdrawal(false);
+
+  await vi.waitFor(() => expect(queryMock.interrupt).toHaveBeenCalledTimes(1));
+  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledTimes(1);
+  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledWith(firstUuid);
+
+  await session.close();
+});
+
+test("an interrupt while only background subagents run never reaches Claude", async () => {
+  const queryMock = createInterruptibleQueryMock();
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const session = await createSession();
+  const internal: InterruptInternals = asInternals(session);
+
+  await session.startTurn("delegate to a helper");
+  const promptUuid = await readFirstPromptUuid();
+  await internal.routeSdkMessageFromPump(commandLifecycle(promptUuid ?? "", "started"), queryMock);
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  await internal.routeSdkMessageFromPump(helperTaskStarted, queryMock);
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  // The main session is done; its helper keeps working.
+  await internal.routeSdkMessageFromPump(sessionState("running"), queryMock);
+  await internal.routeSdkMessageFromPump(helperTaskProgress, queryMock);
+
+  // Without perTaskStopAffordance, an interrupt here kills every running helper.
+  await session.interrupt();
+
+  expect(queryMock.interrupt).not.toHaveBeenCalled();
+  expect(queryMock.cancelAsyncMessage).not.toHaveBeenCalled();
+  expect(internal.pendingInterruptAbort).toBe(false);
+
+  await session.close();
+});
+
+test("an interrupt during a main turn interrupts Claude once and drops the aborted result", async () => {
+  const queryMock = createInterruptibleQueryMock();
+  sdkQueryFactory.mockImplementation(() => queryMock);
+  const session = await createSession();
+  const internal: InterruptInternals = asInternals(session);
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  await session.startTurn("long task");
+  const promptUuid = await readFirstPromptUuid();
+  await internal.routeSdkMessageFromPump(commandLifecycle(promptUuid ?? "", "started"), queryMock);
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+
+  await session.interrupt();
+  await vi.waitFor(() => expect(queryMock.interrupt).toHaveBeenCalledTimes(1));
+  // Claude already started the message, so there is nothing to withdraw.
+  expect(queryMock.cancelAsyncMessage).not.toHaveBeenCalled();
+  expect(internal.pendingInterruptAbort).toBe(true);
+
+  // A replacement starts before the aborted turn reports its result.
+  const { turnId } = await session.startTurn("replacement");
+  await internal.routeSdkMessageFromPump(abortedResult(), queryMock);
+  expect(internal.activeForegroundTurnId).toBe(turnId);
+  expect(internal.pendingInterruptAbort).toBe(false);
+  expect(events.filter((event) => event.type === "turn_failed")).toHaveLength(0);
+
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  await internal.routeSdkMessageFromPump(successResult(), queryMock);
+  expect(internal.activeForegroundTurnId).toBeNull();
+  expect(queryMock.interrupt).toHaveBeenCalledTimes(1);
+
+  await session.close();
+});
+
+test("a new turn clears an interrupt flag no result will consume", async () => {
+  const session = await createSession();
+  const internal: InterruptInternals = asInternals(session);
+  const queryMock = createPendingQueryMock();
+  const events: AgentStreamEvent[] = [];
+  session.subscribe((event) => events.push(event));
+
+  // An interrupt that landed just after its turn had ended: Claude emits no result for it.
+  internal.pendingInterruptAbort = true;
+
+  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
+  expect(internal.pendingInterruptAbort).toBe(false);
+  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
+
+  // This turn's own failure is reported, not swallowed as the interrupted turn's leftover.
+  await internal.routeSdkMessageFromPump(
+    { ...abortedResult(), errors: ["API Error: 500 upstream failure"] },
+    queryMock,
+  );
+  expect(events.filter((event) => event.type === "turn_failed")).toHaveLength(1);
+  expect(internal.autonomousTurn).toBeNull();
+
+  await session.close();
+});
+
 test("tracks run lifecycle transitions for success, error, and interrupt", async () => {
   const session = await createSession();
   let streamCase: "success" | "error" | "interrupt" = "success";
diff --git a/packages/server/src/server/agent/providers/claude/agent.subagent-interrupt.test.ts b/packages/server/src/server/agent/providers/claude/agent.subagent-interrupt.test.ts
index d4fc0bcc0c..1223bbc541 100644
--- a/packages/server/src/server/agent/providers/claude/agent.subagent-interrupt.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.subagent-interrupt.test.ts
@@ -78,7 +78,7 @@ describe("subagent lifecycle across an interrupt", () => {
     queryFactory.mockReset();
   });
 
-  async function startInterruptibleTurn() {
+  async function startInterruptibleTurn(taskStarted: Record<string, unknown> = {}) {
     const channel = buildOpenQueryMock();
     queryFactory.mockImplementation(() => channel.query);
     const session = await new ClaudeAgentClient({
@@ -107,6 +107,7 @@ describe("subagent lifecycle across an interrupt", () => {
       task_type: "local_agent",
       subagent_type: "general-purpose",
       description: "Reply with banana",
+      ...taskStarted,
     });
     await vi.waitFor(() => expect(subagentEvents.length).toBeGreaterThan(0));
 
@@ -169,6 +170,31 @@ describe("subagent lifecycle across an interrupt", () => {
     await session.close();
   });
 
+  test("a child spawned in the background is not canceled with the turn that spawned it", async () => {
+    // Claude announces a background spawn on task_started itself and sends no task_updated patch.
+    const { channel, session, subagentEvents } = await startInterruptibleTurn({
+      is_backgrounded: true,
+    });
+
+    await session.interrupt();
+    channel.push({
+      type: "system",
+      subtype: "task_notification",
+      task_id: TASK_ID,
+      tool_use_id: SUBAGENT_ID,
+      status: "completed",
+    });
+
+    await vi.waitFor(() =>
+      expect(subagentEvents).toContainEqual(
+        expect.objectContaining({ id: SUBAGENT_ID, status: "completed" }),
+      ),
+    );
+    expect(statuses(subagentEvents, SUBAGENT_ID)).toEqual(["running", "completed"]);
+
+    await session.close();
+  });
+
   test("a foreground child is canceled with the turn that spawned it", async () => {
     const { session, subagentEvents } = await startInterruptibleTurn();
 
diff --git a/packages/server/src/server/agent/providers/claude/agent.test.ts b/packages/server/src/server/agent/providers/claude/agent.test.ts
index d88d8105cf..2d970c49de 100644
--- a/packages/server/src/server/agent/providers/claude/agent.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.test.ts
@@ -3160,10 +3160,15 @@ describe("ClaudeAgentSession context window usage", () => {
   });
 
   test("a compaction abandoned in an autonomous turn does not suppress the next marker", async () => {
-    // Trailing output after the foreground result opens an autonomous turn, which starts
-    // compacting and is then ended by the next foreground turn, never reaching a boundary.
+    // Claude starts a turn of its own after the foreground result, which starts compacting and is
+    // then ended by the next foreground turn, never reaching a boundary.
     const session = await createSessionForTurns([
-      [createSuccessResult(), createMessageStartEvent(), createCompactingStatus()],
+      [
+        createSuccessResult(),
+        createInitMessage(),
+        createMessageStartEvent(),
+        createCompactingStatus(),
+      ],
       [createCompactingStatus(), createSuccessResult()],
     ]);
 
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index ddac56a0eb..d505689a95 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -452,6 +452,15 @@ function errorToMessageString(error: unknown): string {
   return "";
 }
 
+/**
+ * Claude opens every main-session turn with system/init and closes it with exactly one result:
+ * a prompt, a wake-up after background work, a slash command, an API error. Background subagents
+ * never emit either on the main stream.
+ */
+function isClaudeTurnInit(message: SDKMessage): boolean {
+  return message.type === "system" && message.subtype === "init";
+}
+
 function firstStringField(
   input: Record<string, unknown>,
   primaryKey: string,
@@ -2070,11 +2079,12 @@ class ClaudeAgentSession implements AgentSession {
   private activeForegroundQuery: Query | null = null;
   private activeForegroundInput: AsyncMessageInput<SDKUserMessage> | null = null;
   /**
-   * Steers pushed into the live SDK input that Claude may not have read yet. Interrupting the turn
-   * has to discard them, or the SDK dequeues one and resumes the turn we just stopped. SDK user
-   * UUIDs are provider-private; never let them escape the adapter boundary.
+   * Messages pushed into the live SDK input (steers, and a foreground turn's own prompt) whose
+   * command_lifecycle has not reached "started". Interrupting has to withdraw them, or the SDK
+   * dequeues one and resumes the turn we just stopped. SDK user UUIDs are provider-private; never
+   * let them escape the adapter boundary.
    */
-  private readonly queuedSteerUuids = new Set<string>();
+  private readonly unstartedMessageUuids = new Set<string>();
   /** Human steers whose text has not reached Claude yet and therefore supersede blocking cards. */
   private readonly permissionClearingSteerUuids = new Set<string>();
   private claudeSessionId: string | null;
@@ -2126,6 +2136,12 @@ class ClaudeAgentSession implements AgentSession {
   private queryPumpPromise: Promise<void> | null = null;
   private queryRestartNeeded = false;
   private pendingInterruptAbort = false;
+  /**
+   * Whether Claude's main session is inside one of its own turns: set by system/init and by a
+   * pushed message's command_lifecycle "started" (/compact works for seconds before its init),
+   * cleared by the turn's result or an idle session state. See observeMainTurnBracket.
+   */
+  private mainTurnInFlight = false;
   private foregroundHasVisibleActivity = false;
   private activeTurnHasAssistantText = false;
   private readonly contextUsage: ClaudeContextUsageState;
@@ -2272,6 +2288,7 @@ class ClaudeAgentSession implements AgentSession {
     this.contextUsage.beginTurn();
     this.transitionTurnState("foreground", "foreground turn started");
     this.clearRecentStderr();
+    if (sdkUserMessageId) this.unstartedMessageUuids.add(sdkUserMessageId);
 
     let cancelIssued = false;
     const requestCancel = () => {
@@ -2282,13 +2299,18 @@ class ClaudeAgentSession implements AgentSession {
       if (this.cancelCurrentTurn === requestCancel) {
         this.cancelCurrentTurn = null;
       }
+      // Whether Claude has this message in hand. A late idle from the previous turn can clear
+      // mainTurnInFlight after Claude started it, so the message's own lifecycle counts too.
+      const claudeStartedTurn =
+        this.mainTurnInFlight ||
+        (sdkUserMessageId !== null && !this.unstartedMessageUuids.has(sdkUserMessageId));
       this.rejectAllPendingPermissions(new Error("Permission request canceled"));
       this.finishForegroundTurn({
         type: "turn_canceled",
         provider: "claude",
         reason: "Interrupted",
       });
-      void this.interruptActiveTurn().catch((error) => {
+      void this.interruptActiveTurn(claudeStartedTurn).catch((error) => {
         this.logger.warn({ err: error }, "Failed to interrupt during cancel");
       });
     };
@@ -2298,6 +2320,11 @@ class ClaudeAgentSession implements AgentSession {
 
     try {
       await this.ensureQuery();
+      if (cancelIssued) {
+        // Stopped while Claude was still starting up: withdrawn by never sending it.
+        if (sdkUserMessageId) this.unstartedMessageUuids.delete(sdkUserMessageId);
+        return { turnId };
+      }
       if (!this.input) {
         throw new Error("Claude session input stream not initialized");
       }
@@ -2311,6 +2338,7 @@ class ClaudeAgentSession implements AgentSession {
         }
       }, 0);
     } catch (error) {
+      if (sdkUserMessageId) this.unstartedMessageUuids.delete(sdkUserMessageId);
       this.finishForegroundTurn(
         this.buildTurnFailedEvent(error instanceof Error ? error.message : "Claude stream failed"),
       );
@@ -2359,7 +2387,7 @@ class ClaudeAgentSession implements AgentSession {
     clearPendingPermissions: boolean,
   ): void {
     const uuid = message.uuid;
-    if (uuid) this.queuedSteerUuids.add(uuid);
+    if (uuid) this.unstartedMessageUuids.add(uuid);
     if (uuid && clearPendingPermissions) {
       this.permissionClearingSteerUuids.add(uuid);
     }
@@ -2370,7 +2398,7 @@ class ClaudeAgentSession implements AgentSession {
       }
     } catch (error) {
       if (uuid) {
-        this.queuedSteerUuids.delete(uuid);
+        this.unstartedMessageUuids.delete(uuid);
         this.permissionClearingSteerUuids.delete(uuid);
       }
       throw error;
@@ -3182,6 +3210,8 @@ class ClaudeAgentSession implements AgentSession {
     const options = await this.buildOptions(launchMode);
     this.logger.debug({ options: summarizeClaudeOptionsForLog(options) }, "claude query");
     this.input = input;
+    // A fresh Claude process has no turn of its own in flight.
+    this.mainTurnInFlight = false;
     this.query = claudeQuery(
       { prompt: input.iterable, options },
       {
@@ -3301,7 +3331,12 @@ class ClaudeAgentSession implements AgentSession {
     return createProviderEnv({
       baseEnv: process.env,
       runtimeSettings: this.runtimeSettings,
-      overlays: [this.launchEnv],
+      overlays: [
+        this.launchEnv,
+        // Makes the CLI announce session_state_changed, whose "idle" is the safety net that closes
+        // an autonomous turn (see consumeSessionStateChange).
+        { CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS: "1" },
+      ],
     });
   }
 
@@ -3368,6 +3403,10 @@ class ClaudeAgentSession implements AgentSession {
       ...settingsOptions,
       // Provider subagent panes render the child's nested transcript.
       forwardSubagentText: true,
+      // Stop and replace abort only the main turn, like Esc in Claude Code, and background
+      // subagents keep running. Without this declaration an interrupt kills every one of them.
+      // Claude stops a helper itself with its TaskStop tool.
+      perTaskStopAffordance: true,
       hooks: this.buildSubagentEffortHooks(),
       ...(this.persistSession === undefined ? {} : { persistSession: this.persistSession }),
       env: sdkEnv,
@@ -3898,35 +3937,67 @@ class ClaudeAgentSession implements AgentSession {
     return false;
   }
 
-  private isAssistantishMessage(message: SDKMessage): boolean {
-    return (
-      message.type === "assistant" ||
-      message.type === "stream_event" ||
-      message.type === "tool_progress" ||
-      (message.type === "system" && message.subtype === "task_notification")
-    );
+  /**
+   * Claude's account of whether anything in the session is working, which is not the same as the
+   * main session working: Claude Code 2.1.280 stays "running" for as long as any background
+   * subagent is alive. So "running" never opens a turn.
+   *
+   * "idle" means nothing at all is running, so it closes an autonomous turn whatever opened it.
+   * It never closes a foreground turn: an idle can trail the previous turn and land just after a
+   * new send, and it must not end that send.
+   *
+   * Returns true when the frame was a state change, which is bookkeeping and never reaches the
+   * timeline.
+   */
+  private consumeSessionStateChange(message: SDKMessage): boolean {
+    if (message.type !== "system" || message.subtype !== "session_state_changed") {
+      return false;
+    }
+    if (message.state === "idle") {
+      this.mainTurnInFlight = false;
+      this.completeAutonomousTurn();
+    }
+    return true;
+  }
+
+  /** Tracks mainTurnInFlight from Claude's own turn brackets (isClaudeTurnInit). */
+  private observeMainTurnBracket(message: SDKMessage): void {
+    if (message.type === "result") {
+      this.mainTurnInFlight = false;
+      return;
+    }
+    if (isClaudeTurnInit(message)) {
+      this.mainTurnInFlight = true;
+      // A new turn has begun, so the interrupted one is over. An interrupt that landed after its
+      // turn had already ended gets no result, and the leftover flag would swallow this turn's.
+      this.pendingInterruptAbort = false;
+      return;
+    }
+    if (readClaudeCommandLifecycle(message)?.state === "started") {
+      this.mainTurnInFlight = true;
+    }
   }
 
   /**
-   * Claude keeps talking about the request it was told to kill — the notification for the tool it
-   * just stopped, trailing assistant output. That is not new work, so it must not open a turn: the
-   * only message that would close that turn is the result shouldSuppressStaleResult drops, leaving
-   * the agent stuck reporting "running" forever.
+   * Only the main session's own turn start opens an autonomous turn. Everything a background
+   * subagent emits (its task frames, its own background jobs' notifications, rate limit events)
+   * arrives outside one, and no result would ever close a turn it opened.
    */
-  private shouldStartAutonomousTurn(message: SDKMessage): boolean {
-    if (this.activeForegroundTurnId || this.pendingInterruptAbort) {
-      return false;
-    }
-    return this.isAssistantishMessage(message);
+  private opensAutonomousTurn(message: SDKMessage): boolean {
+    return isClaudeTurnInit(message) && !this.activeForegroundTurnId;
   }
 
   private async routeSdkMessageFromPump(message: SDKMessage): Promise<void> {
+    if (this.consumeSessionStateChange(message)) {
+      return;
+    }
+    this.observeMainTurnBracket(message);
     if (this.shouldSuppressStaleResult(message)) {
       return;
     }
 
     const isForeground = Boolean(this.activeForegroundTurnId);
-    if (this.shouldStartAutonomousTurn(message)) {
+    if (this.opensAutonomousTurn(message)) {
       this.startAutonomousTurn();
     }
     if (!isForeground && !this.autonomousTurn && message.type === "result") {
@@ -4068,7 +4139,13 @@ class ClaudeAgentSession implements AgentSession {
     return true;
   }
 
-  private async interruptActiveTurn(): Promise<void> {
+  /**
+   * Interrupts Claude only when a turn of its main session is running. With nothing running there
+   * is nothing to stop but our own queued messages, so those are withdrawn instead: an interrupt
+   * would reach only background helpers (and kill them on a CLI that ignores
+   * perTaskStopAffordance), and no result would follow to consume pendingInterruptAbort.
+   */
+  private async interruptActiveTurn(claudeStartedTurn = this.mainTurnInFlight): Promise<void> {
     const queryToInterrupt = this.query;
     if (!queryToInterrupt || typeof queryToInterrupt.interrupt !== "function") {
       this.logger.trace(
@@ -4082,8 +4159,16 @@ class ClaudeAgentSession implements AgentSession {
       );
       return;
     }
-    this.pendingInterruptAbort = true;
-    await this.discardQueuedSteers(queryToInterrupt);
+    if (claudeStartedTurn) {
+      this.pendingInterruptAbort = true;
+      await this.withdrawUnstartedMessages(queryToInterrupt);
+    } else {
+      // Claude can dequeue a message for its next turn before announcing it started; withdrawing
+      // it is then a no-op, and only an interrupt stops it. Withdraw once: a prompt sent while
+      // this withdrawal was in flight belongs to the next turn.
+      if (await this.withdrawUnstartedMessages(queryToInterrupt)) return;
+      this.pendingInterruptAbort = true;
+    }
     try {
       await this.awaitWithTimeout(
         queryToInterrupt.interrupt(),
@@ -4095,14 +4180,15 @@ class ClaudeAgentSession implements AgentSession {
   }
 
   /**
-   * Interrupt means interrupt: a steer Claude never read dies with the turn instead of resuming it.
-   * A steer already dequeued cannot be recalled, and does not need to be — the interrupt kills it.
+   * Interrupt means interrupt: a message Claude never started dies with the turn instead of
+   * resuming it. One already dequeued cannot be recalled, and does not need to be, since the
+   * interrupt kills it. Returns whether Claude confirmed every message withdrawn.
    */
-  private async discardQueuedSteers(query: Query): Promise<void> {
-    const uuids = [...this.queuedSteerUuids];
-    this.queuedSteerUuids.clear();
+  private async withdrawUnstartedMessages(query: Query): Promise<boolean> {
+    const uuids = [...this.unstartedMessageUuids];
+    this.unstartedMessageUuids.clear();
     this.permissionClearingSteerUuids.clear();
-    if (uuids.length === 0) return;
+    if (uuids.length === 0) return true;
     // The SDK runtime supports this, but its public Query type has not caught up. Keep the
     // compatibility escape hatch inside the Claude adapter.
     const cancelAsyncMessage = (
@@ -4110,14 +4196,17 @@ class ClaudeAgentSession implements AgentSession {
         cancelAsyncMessage?: (uuid: string) => Promise<boolean>;
       }
     ).cancelAsyncMessage;
-    if (!cancelAsyncMessage) return;
+    if (!cancelAsyncMessage) return false;
+    let withdrewAll = true;
     for (const uuid of uuids) {
       try {
-        await cancelAsyncMessage.call(query, uuid);
+        if (!(await cancelAsyncMessage.call(query, uuid))) withdrewAll = false;
       } catch (error) {
-        this.logger.warn({ err: error }, "Failed to discard a queued Claude steer");
+        withdrewAll = false;
+        this.logger.warn({ err: error }, "Failed to withdraw a queued Claude message");
       }
     }
+    return withdrewAll;
   }
 
   private translateMessageToEvents(
@@ -4166,7 +4255,7 @@ class ClaudeAgentSession implements AgentSession {
       }
     }
 
-    this.forgetReadSteer(message);
+    this.forgetStartedMessage(message);
 
     switch (message.type) {
       case "system":
@@ -4200,11 +4289,14 @@ class ClaudeAgentSession implements AgentSession {
     return events;
   }
 
-  /** Once Claude has read a steer there is nothing left to discard on interrupt. */
-  private forgetReadSteer(message: unknown): void {
+  /**
+   * Once Claude has started a message, or cancelled it, there is nothing left to withdraw on
+   * interrupt.
+   */
+  private forgetStartedMessage(message: unknown): void {
     const lifecycle = readClaudeCommandLifecycle(message);
     if (!lifecycle || lifecycle.state === "queued") return;
-    this.queuedSteerUuids.delete(lifecycle.commandUuid);
+    this.unstartedMessageUuids.delete(lifecycle.commandUuid);
     this.permissionClearingSteerUuids.delete(lifecycle.commandUuid);
   }
 
@@ -6519,7 +6611,8 @@ function extractClaudeUserText(messageRaw: unknown): string | null {
 
 interface ClaudeCommandLifecycle {
   commandUuid: string;
-  state: "queued" | "started" | "completed";
+  /** "cancelled" is terminal too: API errors, interrupts and "now" pre-emption end a message. */
+  state: "queued" | "started" | "completed" | "cancelled";
 }
 
 /** Runtime-only Claude frames are validated here because the SDK's public union omits them. */
@@ -6528,7 +6621,7 @@ function readClaudeCommandLifecycle(message: unknown): ClaudeCommandLifecycle |
   if (record?.type !== "command_lifecycle") return null;
   if (
     typeof record.command_uuid !== "string" ||
-    !["queued", "started", "completed"].includes(String(record.state))
+    !["queued", "started", "completed", "cancelled"].includes(String(record.state))
   ) {
     return null;
   }
diff --git a/packages/server/src/server/agent/providers/claude/subagents/live-source.test.ts b/packages/server/src/server/agent/providers/claude/subagents/live-source.test.ts
index 1eca4cedc2..b0bfc3d755 100644
--- a/packages/server/src/server/agent/providers/claude/subagents/live-source.test.ts
+++ b/packages/server/src/server/agent/providers/claude/subagents/live-source.test.ts
@@ -511,6 +511,33 @@ describe("ClaudeTaskProtocolSource", () => {
     expect(source.cancelRunningForegroundTasks()).toEqual([]);
   });
 
+  it("does not cancel a subagent announced as backgrounded at spawn", () => {
+    // Claude sets is_backgrounded on task_started for a child spawned in the background, and
+    // sends no task_updated patch for it.
+    const source = new ClaudeTaskProtocolSource();
+    source.observe(taskStarted({ is_backgrounded: true }));
+
+    expect(source.cancelRunningForegroundTasks()).toEqual([]);
+  });
+
+  it("does not cancel a resumed subagent, which Claude always runs in the background", () => {
+    const source = new ClaudeTaskProtocolSource();
+    source.observe(taskStarted({ tool_use_id: "toolu_original", is_backgrounded: false }));
+    source.observe(taskUpdated("completed"));
+    source.observe(taskStarted({ tool_use_id: "toolu_resumed", is_backgrounded: true }));
+
+    expect(source.cancelRunningForegroundTasks()).toEqual([]);
+  });
+
+  it("still cancels a subagent announced in the foreground", () => {
+    const source = new ClaudeTaskProtocolSource();
+    source.observe(taskStarted({ is_backgrounded: false }));
+
+    expect(source.cancelRunningForegroundTasks()).toEqual([
+      { kind: "status", id: "toolu_01DgLoPMW9", status: "canceled" },
+    ]);
+  });
+
   it("still routes a backgrounded subagent that settles after the interrupt", () => {
     // The headline case: interrupt, continue, and the child that was told to outlive the turn
     // reports completion later. Wiping the routing table on cancel drops this on the floor and
diff --git a/packages/server/src/server/agent/providers/claude/subagents/live-source.ts b/packages/server/src/server/agent/providers/claude/subagents/live-source.ts
index 1a44520366..2149fae139 100644
--- a/packages/server/src/server/agent/providers/claude/subagents/live-source.ts
+++ b/packages/server/src/server/agent/providers/claude/subagents/live-source.ts
@@ -16,7 +16,8 @@ import {
  *
  * Verified on the wire (Claude Code 2.1.220, Paseo's own query options):
  *
- *   task_started       task_id, tool_use_id, description, subagent_type, task_type
+ *   task_started       task_id, tool_use_id, description, subagent_type, task_type,
+ *                      is_backgrounded
  *   task_updated       task_id, patch.status, patch.is_backgrounded
  *   task_notification  task_id, tool_use_id, status
  *
@@ -39,6 +40,11 @@ interface TaskStartedMessage {
   task_type?: string;
   prompt?: string;
   skip_transcript?: boolean;
+  /**
+   * Set at spawn: true for a task registered in the background. A resumed subagent is always
+   * registered in the background.
+   */
+  is_backgrounded?: boolean;
 }
 
 /** Task-tool subagents. Backgrounded shell commands announce as `local_bash`. */
@@ -71,8 +77,8 @@ interface TaskUpdatedMessage {
   task_id: string;
   /**
    * `is_backgrounded` is declared on `SDKTaskUpdatedMessage["patch"]`: it flips when a foreground
-   * task is backgrounded, which is the only signal that separates a child that dies with its turn
-   * from one that was explicitly told to outlive it.
+   * task is moved to the background after `task_started`. Together with `task_started`'s own
+   * flag it separates a child that dies with its turn from one told to outlive it.
    */
   patch?: { status?: string; is_backgrounded?: boolean };
 }
@@ -171,8 +177,8 @@ export class ClaudeTaskProtocolSource {
   /** Workflow invocations already own a real Workflow card in the parent timeline. */
   private readonly idsWithExistingParentToolCard = new Set<string>();
   /**
-   * Declared subagents that were moved to the background. They outlive the turn that spawned
-   * them, so a turn ending is not evidence that they stopped.
+   * Declared subagents running in the background, whether spawned there or moved there later.
+   * They outlive the turn that spawned them, so a turn ending is not evidence that they stopped.
    */
   private readonly backgroundedIds = new Set<string>();
   /** Last status emitted per subagent, so a redundant announcement is not re-broadcast. */
@@ -331,6 +337,7 @@ export class ClaudeTaskProtocolSource {
 
     this.sawTaskStarted = true;
     const existingId = this.subagentIdByTaskId.get(message.task_id);
+    this.recordBackgrounded(existingId ?? id, message.is_backgrounded);
     if (existingId) {
       return this.observeExistingTaskStart(message, id, existingId);
     }
@@ -414,14 +421,15 @@ export class ClaudeTaskProtocolSource {
 
   private observeTaskUpdated(message: TaskUpdatedMessage): SubagentObservation[] {
     const id = this.subagentIdByTaskId.get(message.task_id);
-    const backgrounded = message.patch?.is_backgrounded;
-    if (id && typeof backgrounded === "boolean") {
-      if (backgrounded) this.backgroundedIds.add(id);
-      else this.backgroundedIds.delete(id);
-    }
+    if (id) this.recordBackgrounded(id, message.patch?.is_backgrounded);
     return this.observeStatus(message.task_id, message.patch?.status);
   }
 
+  private recordBackgrounded(id: string, backgrounded: boolean | undefined): void {
+    if (backgrounded === true) this.backgroundedIds.add(id);
+    else if (backgrounded === false) this.backgroundedIds.delete(id);
+  }
+
   private observeTaskNotification(message: TaskNotificationMessage): SubagentObservation[] {
     const observations = this.observeWorkflowResult(message);
     observations.push(...this.observeUsage(message.task_id, message.usage));
diff --git a/packages/server/src/server/daemon-e2e/send-during-tool-call-claude.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/send-during-tool-call-claude.real.e2e.test.ts
index 2471ff8c5a..5eea6dab24 100644
--- a/packages/server/src/server/daemon-e2e/send-during-tool-call-claude.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/send-during-tool-call-claude.real.e2e.test.ts
@@ -304,6 +304,166 @@ async function waitForRunningClaudeSleep(
   );
 }
 
+// Explicit point-in-time polls of agent status, on top of (not instead of) the pushed
+// agent_update events the collector already records. A phantom "running" flip that starts and
+// ends between two polls would still be caught by the pushed-event scan the callers pair this
+// with; polling here additionally proves the daemon answers fetchAgent with "idle" throughout,
+// not just that it eventually pushes one.
+async function sampleAgentStatuses(
+  client: DaemonClient,
+  agentId: string,
+  samples: number,
+  intervalMs: number,
+): Promise<string[]> {
+  const statuses: string[] = [];
+  for (let i = 0; i < samples; i += 1) {
+    const snapshot = await client.fetchAgent({ agentId });
+    statuses.push(snapshot?.agent.status ?? "missing");
+    if (i < samples - 1) {
+      await sleep(intervalMs);
+    }
+  }
+  return statuses;
+}
+
+// NOTE: agent_stream events on the wire (AgentStreamEventPayloadSchema in
+// packages/protocol/src/messages.ts) do not include a "provider_subagent" variant. A backgrounded
+// subagent's descriptor updates are forwarded exclusively as separate "agent.provider_subagents.update"
+// messages (see forwardProviderSubagentUpdate in session.ts), and that push channel's delivery is
+// gated by capabilities this test's plain DaemonClient does not declare. list_provider_subagents is a
+// plain request/response RPC unaffected by that gating, so status history below polls it directly
+// instead of trying to reconstruct status transitions from the stream.
+type ProviderSubagentDescriptor = Awaited<
+  ReturnType<DaemonClient["listProviderSubagents"]>
+>["subagents"][number];
+
+interface ProviderSubagentPoll {
+  subagent: ProviderSubagentDescriptor;
+  // Every status observed while polling, in order, so a transient cancel cannot hide behind a
+  // later "completed" read even though the store's status field is not expected to un-cancel.
+  history: string[];
+}
+
+// Polls agent.provider_subagents.list until the backgrounded helper is registered at all.
+// "Main's turn is running" (waitForAgentUpsert) fires on generic turn-start bookkeeping, which
+// can be true before Claude has actually issued the Agent tool call; canceling that early
+// cancels a turn with no helper launched yet, which is not what "Stop spares a helper" means to
+// test. This confirms the helper actually exists before the caller acts on it.
+async function waitForProviderSubagentToExist(
+  client: DaemonClient,
+  agentId: string,
+  timeoutMs = 60_000,
+): Promise<ProviderSubagentDescriptor> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const { subagents } = await client.listProviderSubagents(agentId);
+    if (subagents[0]) {
+      return subagents[0];
+    }
+    await sleep(300);
+  }
+  throw new Error(
+    `Timed out waiting for a background helper to be registered for agent ${agentId}`,
+  );
+}
+
+// Claude starts the wake-up turn a moment after the helper's completion lands (0.1 to 5 s in
+// recorded traces), so poll for it instead of checking the instant the helper reads completed.
+// The daemon announces an autonomous turn to subscribers as a pushed "running" agent_update,
+// not as an agent_stream turn_started (that stream reaches the client that started a run).
+async function waitForWakeTurn(
+  collector: ReturnType<typeof createMessageCollector>,
+  agentId: string,
+  fromIndex: number,
+  timeoutMs = 30_000,
+): Promise<boolean> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const window = collector.messages.slice(fromIndex);
+    const woke =
+      getAgentStatuses(window, agentId).includes("running") ||
+      window.some(
+        (message) =>
+          message.type === "agent_stream" &&
+          message.payload.agentId === agentId &&
+          message.payload.event.type === "turn_started",
+      );
+    if (woke) return true;
+    await sleep(500);
+  }
+  return false;
+}
+
+// The wake-up turn runs briefly after it opens, so the final state is read once it settles.
+async function waitForAgentStatus(
+  client: DaemonClient,
+  agentId: string,
+  status: string,
+  timeoutMs = 60_000,
+): Promise<string | undefined> {
+  const deadline = Date.now() + timeoutMs;
+  let last: string | undefined;
+  while (Date.now() < deadline) {
+    last = (await client.fetchAgent({ agentId }))?.agent.status;
+    if (last === status) return last;
+    await sleep(500);
+  }
+  return last;
+}
+
+// Polls agent.provider_subagents.list until the single backgrounded helper leaves "running".
+// Scenarios in this file always launch exactly one background helper, so subagents[0] is it.
+async function waitForProviderSubagentTerminal(
+  client: DaemonClient,
+  agentId: string,
+  timeoutMs = 90_000,
+): Promise<ProviderSubagentPoll> {
+  const deadline = Date.now() + timeoutMs;
+  const history: string[] = [];
+  let lastSeen: ProviderSubagentDescriptor[] = [];
+  while (Date.now() < deadline) {
+    const { subagents } = await client.listProviderSubagents(agentId);
+    lastSeen = subagents;
+    const subagent = subagents[0];
+    if (subagent) {
+      history.push(subagent.status);
+      if (subagent.status !== "running") {
+        return { subagent, history };
+      }
+    }
+    await sleep(1_000);
+  }
+  throw new Error(
+    `Timed out waiting for the background helper to leave "running". history=${JSON.stringify(history)} lastSeen=${JSON.stringify(lastSeen)}`,
+  );
+}
+
+// Pulls the main agent's own assistant text via fetchAgentTimeline rather than the push
+// collector. Assistant text delivery is paced (docs/agent-stream-performance.md), so checking
+// the collector immediately after waitForFinish resolves can still miss the final text; the
+// timeline fetch is authoritative and matches what the pre-existing tests in this file do.
+async function fetchAssistantTexts(
+  client: DaemonClient,
+  agentId: string,
+  limit = 100,
+): Promise<string[]> {
+  const timeline = await client.fetchAgentTimeline(agentId, { limit });
+  return timeline.entries
+    .filter((entry) => entry.item.type === "assistant_message")
+    .map((entry) => (entry.item as Extract<AgentTimelineItem, { type: "assistant_message" }>).text);
+}
+
+async function fetchSubagentAssistantTexts(
+  client: DaemonClient,
+  agentId: string,
+  subagentId: string,
+): Promise<string[]> {
+  const timeline = await client.fetchProviderSubagentTimeline(agentId, subagentId, { limit: 50 });
+  return timeline.rows
+    .filter((row) => row.item.type === "assistant_message")
+    .map((row) => (row.item as Extract<AgentTimelineItem, { type: "assistant_message" }>).text);
+}
+
 describe("daemon E2E (real claude) - send message during tool call", () => {
   let canRun = false;
   interface SteeringResources {
@@ -504,6 +664,141 @@ describe("daemon E2E (real claude) - send message during tool call", () => {
     }
   }, 210_000);
 
+  test("a background subagent keeps running after a message is sent while it works", async () => {
+    // The scenario the rest of this file explicitly rules out: every other test here tells Claude
+    // "Do not use a background task", so steering during a backgrounded subagent was never
+    // covered. A subagent streams on the parent's channel, so a parent that mistakes the child's
+    // frames for its own work reports "running" after it has already finished, and the message
+    // sent into that window is refused, or delivered by cancelling the turn and taking the
+    // subagent with it. Both outcomes are user-visible, and both are what this asserts against.
+    const logger = pino({ level: "silent" });
+    const resources: SteeringResources = {
+      cwd: tmpCwd(),
+      daemon: null,
+      client: null,
+      collector: null,
+    };
+    try {
+      resources.daemon = await createTestPaseoDaemon({
+        agentClients: { claude: new ClaudeAgentClient({ logger }) },
+        logger,
+      });
+      resources.client = new DaemonClient({ url: `ws://127.0.0.1:${resources.daemon.port}/ws` });
+      const { client, cwd } = resources;
+      if (!client) throw new Error("Claude background-subagent test client was not created");
+      await within("connect background-subagent test client", 15_000, client.connect());
+      await within(
+        "subscribe background-subagent test client",
+        15_000,
+        client.fetchAgents({ subscribe: {} }),
+      );
+      const agent = await within(
+        "create background-subagent test agent",
+        30_000,
+        client.createAgent({
+          cwd: cwd ?? process.cwd(),
+          title: "claude-background-survives-send",
+          ...getRealProviderConfig("claude"),
+        }),
+      );
+      resources.collector = createMessageCollector(client);
+      await within(
+        "launch one background subagent and end the turn",
+        30_000,
+        client.sendAgentMessage(
+          agent.id,
+          [
+            "Use the Agent tool exactly once with run_in_background: true.",
+            "subagent_type: general-purpose.",
+            `description: "bg survivor".`,
+            `prompt: "Use the Bash tool with run_in_background: true to run exactly: sleep 40.`,
+            `Wait for its completion notification, then reply exactly: CHILD_DONE."`,
+            "Immediately after launching it, reply with the single word LAUNCHED and end your turn.",
+            "Do not wait for it. Do not call any other tools.",
+          ].join(" "),
+          { messageId: generateClientMessageId() },
+        ),
+      );
+
+      // The main session has ended its turn. It must read as idle even though the subagent it
+      // launched is still streaming on the shared channel.
+      const afterLaunch = await within(
+        "wait for the main session to go idle after launching the subagent",
+        120_000,
+        client.waitForFinish(agent.id, 110_000),
+      );
+      expect(
+        afterLaunch.status,
+        "a main session that finished its turn must not report busy because a subagent is running",
+      ).not.toBe("running");
+
+      // And a message sent in that window must be accepted rather than refused.
+      const followUpId = generateClientMessageId();
+      await within(
+        "send a message to the idle main session while the subagent runs",
+        30_000,
+        client.sendAgentMessage(agent.id, "Are you there? Reply exactly: MAIN_ALIVE.", {
+          messageId: followUpId,
+        }),
+      );
+      await within(
+        "wait for the main session to answer",
+        120_000,
+        client.waitForFinish(agent.id, 110_000),
+      );
+
+      const timeline = await within(
+        "fetch background-subagent timeline",
+        15_000,
+        client.fetchAgentTimeline(agent.id, { limit: 200 }),
+      );
+      const assistantText = timeline.entries
+        .filter((entry) => entry.item.type === "assistant_message")
+        .map(
+          (entry) => (entry.item as Extract<AgentTimelineItem, { type: "assistant_message" }>).text,
+        )
+        .join("\\n");
+      expect(
+        assistantText,
+        "the main session must be reachable while its background subagent still runs",
+      ).toContain("MAIN_ALIVE");
+
+      // The subagent must have survived the send rather than being cancelled with the turn. Its
+      // status is read from agent.provider_subagents.list (see the note above
+      // waitForProviderSubagentToExist): agent_stream carries no provider_subagent events.
+      const { subagents } = await within(
+        "list provider subagents after the send",
+        15_000,
+        client.listProviderSubagents(agent.id),
+      );
+      expect(subagents.length, "the background subagent must be tracked").toBeGreaterThan(0);
+      expect(
+        subagents.map((subagent) => subagent.status),
+        "a backgrounded subagent must not be canceled by a message sent to the main session",
+      ).not.toContain("canceled");
+      const { subagent, history } = await within(
+        "wait for the background subagent to finish",
+        90_000,
+        waitForProviderSubagentTerminal(client, agent.id, 80_000),
+      );
+      expect(subagent.status, "the helper must complete, not be canceled or fail").toBe(
+        "completed",
+      );
+      expect(history, "no status poll may read canceled").not.toContain("canceled");
+    } finally {
+      const cleanup = await Promise.allSettled([
+        Promise.resolve(resources.collector?.unsubscribe()),
+        resources.client?.close() ?? Promise.resolve(),
+        resources.daemon?.close() ?? Promise.resolve(),
+      ]);
+      if (resources.cwd) rmSync(resources.cwd, { recursive: true, force: true });
+      const failures = cleanup.flatMap((result) =>
+        result.status === "rejected" ? [result.reason] : [],
+      );
+      expect(failures, "Claude background-subagent E2E cleanup failures").toEqual([]);
+    }
+  }, 300_000);
+
   test("Stop cancels a queued Claude steer before it can resume the interrupted turn", async () => {
     const logger = pino({ level: "silent" });
     const cwd = tmpCwd();
@@ -678,4 +973,430 @@ describe("daemon E2E (real claude) - send message during tool call", () => {
       rmSync(cwd, { recursive: true, force: true });
     }
   }, 300_000);
+
+  test("a helper's own nested background job does not phantom-run the parent or kill the helper", async () => {
+    // The exact reported bug: main backgrounds a helper, the helper itself starts its OWN
+    // background job (a grandchild from main's perspective) and then keeps working in the
+    // foreground. The grandchild's completion is bookkeeping that belongs to the helper, not to
+    // main, and must not make main phantom-report "running" or get treated as busy.
+    const logger = pino({ level: "silent" });
+    const resources: SteeringResources = {
+      cwd: tmpCwd(),
+      daemon: null,
+      client: null,
+      collector: null,
+    };
+    try {
+      resources.daemon = await createTestPaseoDaemon({
+        agentClients: { claude: new ClaudeAgentClient({ logger }) },
+        logger,
+      });
+      resources.client = new DaemonClient({ url: `ws://127.0.0.1:${resources.daemon.port}/ws` });
+      const { client, cwd } = resources;
+      if (!client) throw new Error("nested background-job test client was not created");
+      await within("connect nested background-job test client", 15_000, client.connect());
+      await within(
+        "subscribe nested background-job test client",
+        15_000,
+        client.fetchAgents({ subscribe: {} }),
+      );
+      const agent = await within(
+        "create nested background-job test agent",
+        30_000,
+        client.createAgent({
+          cwd: cwd ?? process.cwd(),
+          title: "claude-nested-background-job",
+          ...getRealProviderConfig("claude"),
+        }),
+      );
+      resources.collector = createMessageCollector(client);
+
+      await within(
+        "launch a helper with its own nested background job and end the turn",
+        30_000,
+        client.sendAgentMessage(
+          agent.id,
+          [
+            "Use the Agent tool exactly once with run_in_background: true.",
+            "subagent_type: general-purpose.",
+            `description: "nested bg survivor".`,
+            `prompt: "Use the Bash tool with run_in_background: true to run exactly:`,
+            `python3 -c 'import time; time.sleep(5)'.`,
+            `Immediately after starting it, without waiting for it, use the Bash tool again`,
+            `in the foreground to run exactly: python3 -c 'import time; time.sleep(50)'.`,
+            `After that foreground command finishes, reply exactly: CHILD_DONE."`,
+            "Immediately after launching it, reply with the single word LAUNCHED and end your turn.",
+            "Do not wait for it. Do not call any other tools.",
+          ].join(" "),
+          { messageId: generateClientMessageId() },
+        ),
+      );
+
+      const afterLaunch = await within(
+        "wait for the main session to go idle after launching the nested-background helper",
+        120_000,
+        client.waitForFinish(agent.id, 110_000),
+      );
+      expect(afterLaunch.status, "the main session must be idle once it replied LAUNCHED").toBe(
+        "idle",
+      );
+
+      // The helper's own nested background job (5s) finishes while the helper is still busy
+      // in its unrelated foreground sleep (50s). Sample for 30s, well past the nested job's
+      // completion even when the helper is slow to start it,
+      // both by polling and by scanning every pushed agent_update in the window, so a brief
+      // phantom flip cannot slip between polls.
+      const sampleWindowStart = resources.collector.messages.length;
+      const polledStatuses = await sampleAgentStatuses(client, agent.id, 11, 3_000);
+      const pushedStatuses = getAgentStatuses(
+        resources.collector.messages.slice(sampleWindowStart),
+        agent.id,
+      );
+      const observedRunning = [...polledStatuses, ...pushedStatuses].filter(
+        (status) => status === "running",
+      );
+      expect(
+        observedRunning,
+        `the parent must stay idle across the nested job's completion; polled=${JSON.stringify(polledStatuses)} pushed=${JSON.stringify(pushedStatuses)}`,
+      ).toEqual([]);
+
+      // A message sent in that window must still be answered normally.
+      await within(
+        "send PONG request while the nested job settles",
+        30_000,
+        client.sendMessage(agent.id, "Reply with exactly PONG.", {
+          messageId: generateClientMessageId(),
+        }),
+      );
+      await within("wait for the PONG reply", 60_000, client.waitForFinish(agent.id, 50_000));
+      // Pulled via fetchAgentTimeline, not the push collector: assistant text delivery is paced
+      // (docs/agent-stream-performance.md) and can trail waitForFinish's own completion signal,
+      // so the collector can still be missing the final text the instant waitForFinish resolves.
+      const pongTexts = await within(
+        "fetch timeline for the PONG reply",
+        15_000,
+        fetchAssistantTexts(client, agent.id, 20),
+      );
+      expect(
+        pongTexts.join("\n"),
+        "the agent must answer PONG while the helper is still running",
+      ).toContain("PONG");
+
+      const messagesBeforeWake = resources.collector.messages.length;
+
+      // The helper itself must survive: never recorded canceled, and it eventually reports
+      // CHILD_DONE from its own foreground sleep finishing.
+      const { subagent, history } = await within(
+        "wait for the nested-background helper to finish",
+        90_000,
+        waitForProviderSubagentTerminal(client, agent.id, 80_000),
+      );
+      expect(subagent.status, "the helper must complete, not be canceled or fail").toBe(
+        "completed",
+      );
+      expect(
+        history,
+        `no provider subagent status poll may ever read canceled; history=${JSON.stringify(history)}`,
+      ).not.toContain("canceled");
+      const subagentTexts = await fetchSubagentAssistantTexts(client, agent.id, subagent.id);
+      expect(
+        subagentTexts.join("\n"),
+        "the helper's own transcript must contain its final CHILD_DONE reply",
+      ).toContain("CHILD_DONE");
+
+      // The helper's completion should wake the main session with a fresh turn (the
+      // session-state-driven autonomous turn), separate from the PONG exchange above.
+      const wokeMainAgent = await waitForWakeTurn(
+        resources.collector,
+        agent.id,
+        messagesBeforeWake,
+      );
+      if (!wokeMainAgent) {
+        const wakeWindowMessages = resources.collector.messages.slice(messagesBeforeWake);
+        const wakeWindowEventTypes = wakeWindowMessages
+          .filter(
+            (message) => message.type === "agent_stream" && message.payload.agentId === agent.id,
+          )
+          .map((message) =>
+            message.type === "agent_stream" ? message.payload.event.type : "unknown",
+          );
+        const timeline = await client
+          .fetchAgentTimeline(agent.id, { limit: 100 })
+          .catch(() => null);
+        throw new Error(
+          `the helper's completion must wake the main session with a new turn. ` +
+            `wakeWindowEventTypes=${JSON.stringify(wakeWindowEventTypes)} ` +
+            `recentTimeline=${JSON.stringify(timeline ? summarizeTimelineItems(timeline) : null)}`,
+        );
+      }
+
+      expect(await waitForAgentStatus(client, agent.id, "idle"), "the agent must end idle").toBe(
+        "idle",
+      );
+    } finally {
+      const cleanup = await Promise.allSettled([
+        Promise.resolve(resources.collector?.unsubscribe()),
+        resources.client?.close() ?? Promise.resolve(),
+        resources.daemon?.close() ?? Promise.resolve(),
+      ]);
+      if (resources.cwd) rmSync(resources.cwd, { recursive: true, force: true });
+      const failures = cleanup.flatMap((result) =>
+        result.status === "rejected" ? [result.reason] : [],
+      );
+      expect(failures, "nested background-job E2E cleanup failures").toEqual([]);
+    }
+  }, 300_000);
+
+  test("the app's default steer survives a backgrounded helper while the main session works", async () => {
+    // appSettings.sendBehavior defaults to "steer" (packages/app/src/hooks/use-settings/storage.ts),
+    // so this is what the app actually sends when a user replies while an agent looks busy.
+    const logger = pino({ level: "silent" });
+    const resources: SteeringResources = {
+      cwd: tmpCwd(),
+      daemon: null,
+      client: null,
+      collector: null,
+    };
+    try {
+      resources.daemon = await createTestPaseoDaemon({
+        agentClients: { claude: new ClaudeAgentClient({ logger }) },
+        logger,
+      });
+      resources.client = new DaemonClient({ url: `ws://127.0.0.1:${resources.daemon.port}/ws` });
+      const { client, cwd } = resources;
+      if (!client) throw new Error("default-steer background-helper test client was not created");
+      await within("connect default-steer test client", 15_000, client.connect());
+      await within(
+        "subscribe default-steer test client",
+        15_000,
+        client.fetchAgents({ subscribe: {} }),
+      );
+      const agent = await within(
+        "create default-steer test agent",
+        30_000,
+        client.createAgent({
+          cwd: cwd ?? process.cwd(),
+          title: "claude-default-steer-background-helper",
+          ...getRealProviderConfig("claude"),
+        }),
+      );
+      resources.collector = createMessageCollector(client);
+
+      await within(
+        "launch the background helper and start the main session's own foreground sleep",
+        30_000,
+        client.sendAgentMessage(
+          agent.id,
+          [
+            "Use the Agent tool exactly once with run_in_background: true.",
+            "subagent_type: general-purpose.",
+            `description: "bg survivor b".`,
+            `prompt: "Use the Bash tool in the foreground to run exactly:`,
+            `python3 -c 'import time; time.sleep(42)'. After it finishes, reply exactly: CHILD_DONE."`,
+            "Do not wait for that background helper to finish before continuing.",
+            "After launching it, use the Bash tool one more time yourself, WITHOUT run_in_background,",
+            "to run exactly: python3 -c 'import time; time.sleep(16)'.",
+            // Matching the proven pattern from the first test in this file: tell Claude to wait
+            // for a later message rather than relying on the sleep call itself to block, since a
+            // Bash call can resolve through Claude Code's own async task_notification path once a
+            // background subagent is already active instead of blocking the turn.
+            "Do not reply or finish your turn until a later user message arrives, no matter how",
+            "quickly that Bash command finishes. When that later message arrives, address it and",
+            "end your turn. Do not call any other tools.",
+          ].join(" "),
+          { messageId: generateClientMessageId() },
+        ),
+      );
+
+      // Confirm the daemon considers main's own turn active before steering it. This does not
+      // wait for a specific "sleep 16" shell call to show as running: Claude Code 2.1.280 can
+      // report a slower Bash call through its own async task_notification tool instead of a
+      // classic blocking call once a background subagent is already active, so pinning to a
+      // literal running shell tool_call is not reliable here. Busy at the daemon level is what
+      // "while main is busy with its own sleep" actually needs.
+      await within(
+        "confirm main's own turn is active before steering",
+        30_000,
+        client.waitForAgentUpsert(agent.id, (snapshot) => snapshot.status === "running", 25_000),
+      );
+      // The running status precedes the Agent tool call, so a steer sent on it alone can reach
+      // Claude before the helper exists and prove nothing about a helper surviving it.
+      await within(
+        "confirm the background helper is registered before steering",
+        60_000,
+        waitForProviderSubagentToExist(client, agent.id, 55_000),
+      );
+
+      await within(
+        "send the app's default steer while main is busy with its own sleep",
+        30_000,
+        client.sendMessage(agent.id, "Reply with exactly PONG.", {
+          messageId: generateClientMessageId(),
+          activeTurnBehavior: "steer",
+        }),
+      );
+
+      const finish = await within(
+        "wait for the main session to finish after the steer",
+        120_000,
+        client.waitForFinish(agent.id, 110_000),
+      );
+      expect(finish.status, "the main session must end idle after the steer").toBe("idle");
+      // Pulled via fetchAgentTimeline, not the push collector: see fetchAssistantTexts.
+      const postSteerTexts = await within(
+        "fetch timeline for the post-steer PONG reply",
+        15_000,
+        fetchAssistantTexts(client, agent.id, 20),
+      );
+      expect(postSteerTexts.join("\n"), "PONG must be answered after the steer").toContain("PONG");
+
+      const { subagent, history } = await within(
+        "wait for the background helper to finish",
+        90_000,
+        waitForProviderSubagentTerminal(client, agent.id, 80_000),
+      );
+      expect(subagent.status, "the helper must complete, not be canceled or fail").toBe(
+        "completed",
+      );
+      expect(
+        history,
+        `no provider subagent status poll may ever read canceled; history=${JSON.stringify(history)}`,
+      ).not.toContain("canceled");
+      const subagentTexts = await fetchSubagentAssistantTexts(client, agent.id, subagent.id);
+      expect(
+        subagentTexts.join("\n"),
+        "the helper's own transcript must contain its final CHILD_DONE reply",
+      ).toContain("CHILD_DONE");
+    } finally {
+      const cleanup = await Promise.allSettled([
+        Promise.resolve(resources.collector?.unsubscribe()),
+        resources.client?.close() ?? Promise.resolve(),
+        resources.daemon?.close() ?? Promise.resolve(),
+      ]);
+      if (resources.cwd) rmSync(resources.cwd, { recursive: true, force: true });
+      const failures = cleanup.flatMap((result) =>
+        result.status === "rejected" ? [result.reason] : [],
+      );
+      expect(failures, "default-steer background-helper E2E cleanup failures").toEqual([]);
+    }
+  }, 300_000);
+
+  test("Stop cancels the main session's own turn but spares its background helper", async () => {
+    const logger = pino({ level: "silent" });
+    const resources: SteeringResources = {
+      cwd: tmpCwd(),
+      daemon: null,
+      client: null,
+      collector: null,
+    };
+    try {
+      resources.daemon = await createTestPaseoDaemon({
+        agentClients: { claude: new ClaudeAgentClient({ logger }) },
+        logger,
+      });
+      resources.client = new DaemonClient({ url: `ws://127.0.0.1:${resources.daemon.port}/ws` });
+      const { client, cwd } = resources;
+      if (!client) throw new Error("Stop-spares-helper test client was not created");
+      await within("connect Stop-spares-helper test client", 15_000, client.connect());
+      await within(
+        "subscribe Stop-spares-helper test client",
+        15_000,
+        client.fetchAgents({ subscribe: {} }),
+      );
+      const agent = await within(
+        "create Stop-spares-helper test agent",
+        30_000,
+        client.createAgent({
+          cwd: cwd ?? process.cwd(),
+          title: "claude-stop-spares-helper",
+          ...getRealProviderConfig("claude"),
+        }),
+      );
+      resources.collector = createMessageCollector(client);
+
+      await within(
+        "launch the background helper and start the main session's own foreground sleep",
+        30_000,
+        client.sendAgentMessage(
+          agent.id,
+          [
+            "Use the Agent tool exactly once with run_in_background: true.",
+            "subagent_type: general-purpose.",
+            `description: "bg survivor c".`,
+            `prompt: "Use the Bash tool in the foreground to run exactly:`,
+            `python3 -c 'import time; time.sleep(43)'. After it finishes, reply exactly: CHILD_DONE."`,
+            "Do not wait for that background helper to finish before continuing.",
+            "After launching it, use the Bash tool one more time yourself, WITHOUT run_in_background,",
+            "to run exactly: python3 -c 'import time; time.sleep(23)'.",
+            "Do not call any other tools.",
+          ].join(" "),
+          { messageId: generateClientMessageId() },
+        ),
+      );
+
+      // Confirm the helper has actually been launched (registered) before Stop, not just that
+      // main's turn shows "running": that status can flip true on generic turn-start bookkeeping
+      // before Claude has issued the Agent tool call, and canceling that early cancels a turn
+      // with no helper to spare yet.
+      await within(
+        "confirm the background helper is registered before Stop",
+        60_000,
+        waitForProviderSubagentToExist(client, agent.id, 55_000),
+      );
+
+      const messagesBeforeStop = resources.collector.messages.length;
+      await within("Stop the main session's own turn", 30_000, client.cancelAgent(agent.id));
+      const afterStop = await within(
+        "wait for the agent to go idle after Stop",
+        60_000,
+        client.waitForFinish(agent.id, 50_000),
+      );
+      expect(afterStop.status, "Stop must leave the agent idle").toBe("idle");
+
+      // The helper must survive Stop: it keeps running and later reports CHILD_DONE, which
+      // wakes the main session with a fresh autonomous turn.
+      const { subagent, history } = await within(
+        "wait for the background helper to finish after Stop",
+        90_000,
+        waitForProviderSubagentTerminal(client, agent.id, 80_000),
+      );
+      expect(subagent.status, "Stop must not cancel or fail the background helper").toBe(
+        "completed",
+      );
+      expect(
+        history,
+        `no provider subagent status poll may ever read canceled; history=${JSON.stringify(history)}`,
+      ).not.toContain("canceled");
+      const subagentTexts = await fetchSubagentAssistantTexts(client, agent.id, subagent.id);
+      expect(
+        subagentTexts.join("\n"),
+        "the helper's own transcript must contain its final CHILD_DONE reply",
+      ).toContain("CHILD_DONE");
+
+      const wokeMainAgent = await waitForWakeTurn(
+        resources.collector,
+        agent.id,
+        messagesBeforeStop,
+      );
+      expect(
+        wokeMainAgent,
+        "the helper's completion after Stop must wake the main session with a new turn",
+      ).toBe(true);
+
+      expect(await waitForAgentStatus(client, agent.id, "idle"), "the agent must end idle").toBe(
+        "idle",
+      );
+    } finally {
+      const cleanup = await Promise.allSettled([
+        Promise.resolve(resources.collector?.unsubscribe()),
+        resources.client?.close() ?? Promise.resolve(),
+        resources.daemon?.close() ?? Promise.resolve(),
+      ]);
+      if (resources.cwd) rmSync(resources.cwd, { recursive: true, force: true });
+      const failures = cleanup.flatMap((result) =>
+        result.status === "rejected" ? [result.reason] : [],
+      );
+      expect(failures, "Stop-spares-helper E2E cleanup failures").toEqual([]);
+    }
+  }, 300_000);
 });

From 2a5264c188c7a39922e14b3f8b400e818da1cb34 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 15:05:53 +0200
Subject: [PATCH 042/270] docs: changelog for 0.11.0

---
 CHANGELOG.md | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a4c3ab914..6b60e3d0ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,12 @@
 # Changelog
 
-## 0.11.0-beta.5 - 2026-10-06
+## 0.11.0 - 2026-10-07
 
 ### Added
 
 - Added Muse Code as a provider, with model, approval mode, and reasoning effort controls ([#5719](https://github.com/getpaseo/paseo/pull/5719), [#5775](https://github.com/getpaseo/paseo/pull/5775) by [@millerben95](https://github.com/millerben95))
 - Added Antigravity as a provider that drives the installed `agy` CLI, always in Full access ([#5714](https://github.com/getpaseo/paseo/pull/5714), [#5795](https://github.com/getpaseo/paseo/pull/5795))
-- Added a Usage screen, opened from the sidebar footer, showing each subscription account's quota windows with Refresh ([#5465](https://github.com/getpaseo/paseo/pull/5465), [#5685](https://github.com/getpaseo/paseo/pull/5685), [#5786](https://github.com/getpaseo/paseo/pull/5786), [#5805](https://github.com/getpaseo/paseo/pull/5805), [#5921](https://github.com/getpaseo/paseo/pull/5921))
+- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh ([#5465](https://github.com/getpaseo/paseo/pull/5465), [#5685](https://github.com/getpaseo/paseo/pull/5685), [#5786](https://github.com/getpaseo/paseo/pull/5786), [#5805](https://github.com/getpaseo/paseo/pull/5805), [#5921](https://github.com/getpaseo/paseo/pull/5921), [#6216](https://github.com/getpaseo/paseo/pull/6216))
 - Added an opt-in Usage summary to the sidebar footer that shows the windows you pin ([#5903](https://github.com/getpaseo/paseo/pull/5903), [#5975](https://github.com/getpaseo/paseo/pull/5975), [#6089](https://github.com/getpaseo/paseo/pull/6089))
 - Added Usage discovery of ChatGPT logins from Codex CLI, OpenCode, Pi, and OMP ([#5844](https://github.com/getpaseo/paseo/pull/5844))
 - Added Usage discovery of Claude logins from the Claude Code credential file, the macOS keychain, Pi, and OMP ([#5844](https://github.com/getpaseo/paseo/pull/5844))
@@ -16,9 +16,12 @@
 - Added Fast mode and an Auto thinking level to OMP ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@n24q02m](https://github.com/n24q02m), [@abhi-wan-kenobi](https://github.com/abhi-wan-kenobi))
 - Added MCP servers to OMP schedules and Hub runs ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@omercnet](https://github.com/omercnet))
 - Added a Content width setting for the maximum width of chat and Markdown files on wide screens ([#5680](https://github.com/getpaseo/paseo/pull/5680))
+- Added syntax highlighting for Vue files ([#6205](https://github.com/getpaseo/paseo/pull/6205) by [@Davnn1](https://github.com/Davnn1))
 - Added `agents.providers.<id>.options` in `config.json` as default options for every provider, with per-agent overrides ([#5780](https://github.com/getpaseo/paseo/pull/5780))
 - Added the terminal key bar and Paste to terminal panes on iPad and Android tablets ([#5712](https://github.com/getpaseo/paseo/pull/5712) by [@lardissone](https://github.com/lardissone))
 - Added screens and sidebar header and footer items to the plugin SDK ([#5685](https://github.com/getpaseo/paseo/pull/5685))
+- Added a display name, icon, screenshots, and videos to the plugin manifest ([#6263](https://github.com/getpaseo/paseo/pull/6263))
+- Added an `OVERVIEW.md` template to `paseo plugin init` for plugin registry listings ([#6226](https://github.com/getpaseo/paseo/pull/6226))
 - Added usage sources to the plugin SDK ([#5465](https://github.com/getpaseo/paseo/pull/5465), [#5876](https://github.com/getpaseo/paseo/pull/5876))
 - Added `spawnProcess()`, `execCommand()`, and `terminateProcess()` to the plugin SDK for launching CLIs, including Windows `.cmd` and `.bat` scripts ([#6151](https://github.com/getpaseo/paseo/pull/6151))
 - Added `client.playAudio()` to the plugin SDK for playing audio on every client ([#5976](https://github.com/getpaseo/paseo/pull/5976))
@@ -27,10 +30,9 @@
 
 ### Changed
 
-- Enabled the plugin registry by default: `paseo plugin add owner/slug` installs a reviewed artifact even when a local directory matches; use explicit local paths (including `.`, `..`, and Windows drive or UNC paths), and use `github:owner/repository` for direct GitHub installs. Registry connection, missing-ID, and `--ref` errors include recovery steps.
-
+- Changed `paseo plugin add owner/slug` to install the reviewed plugin from the plugin registry, so local directories need a path such as `./slug` and direct GitHub installs need `github:owner/repo` ([#6224](https://github.com/getpaseo/paseo/pull/6224))
 - Changed the context window details to show usage for the account the agent runs under, including custom `CLAUDE_CONFIG_DIR` and `CODEX_HOME` homes ([#5465](https://github.com/getpaseo/paseo/pull/5465))
-- Changed the context window details on desktop to a hover card with Refresh ([#5975](https://github.com/getpaseo/paseo/pull/5975))
+- Changed the context window details on desktop to a hover card with Refresh ([#5975](https://github.com/getpaseo/paseo/pull/5975), [#6185](https://github.com/getpaseo/paseo/pull/6185))
 - Changed the context window meter to show before an agent's first turn ([#6089](https://github.com/getpaseo/paseo/pull/6089))
 - Changed Codex Fast to a Speed menu listing the Normal, Fast, and Ultrafast speeds each model offers, shown as a lightning bolt on desktop that turns yellow while Fast or Ultrafast is selected ([#5708](https://github.com/getpaseo/paseo/pull/5708), [#6152](https://github.com/getpaseo/paseo/pull/6152) by [@Nurshot](https://github.com/Nurshot))
 - Changed Explorer tabs to work like workspace tabs, with a + menu, drag and drop, and Close for Files and Changes ([#5942](https://github.com/getpaseo/paseo/pull/5942))
@@ -46,12 +48,18 @@
 ### Fixed
 
 - Fixed Claude agents never showing Thought rows on Claude Opus 4.7 and later ([#4355](https://github.com/getpaseo/paseo/pull/4355) by [@ThePharmer](https://github.com/ThePharmer))
-- Fixed a background Claude subagent's card showing as a bare "Task" that stayed running, or as "Agent" after a daemon restart ([#6067](https://github.com/getpaseo/paseo/pull/6067), [#6100](https://github.com/getpaseo/paseo/pull/6100))
+- Fixed a Claude agent showing as running while only its background helpers worked, and a send or Stop killing those helpers ([#6295](https://github.com/getpaseo/paseo/pull/6295) by [@IsakPersson](https://github.com/IsakPersson))
+- Fixed a Claude agent in Auto mode failing to switch modes when Claude Code uses Bedrock or Vertex ([#6272](https://github.com/getpaseo/paseo/pull/6272))
+- Fixed a Claude subagent's auto-mode report showing as a raw SubagentHandback tool card instead of markdown ([#6248](https://github.com/getpaseo/paseo/pull/6248))
+- Fixed background Claude subagent cards showing as a bare "Task" that stayed running, as "Agent" after a daemon restart, or unlabeled when two launch together ([#6067](https://github.com/getpaseo/paseo/pull/6067), [#6100](https://github.com/getpaseo/paseo/pull/6100), [#6268](https://github.com/getpaseo/paseo/pull/6268))
 - Fixed Claude Code terminals not showing as needing input when Claude is idle ([#6022](https://github.com/getpaseo/paseo/pull/6022))
 - Fixed Claude usage calling a rate-limited login again before its retry time ([#6089](https://github.com/getpaseo/paseo/pull/6089))
 - Fixed a Claude agent that entered plan mode on its own still showing and storing its previous mode ([#6074](https://github.com/getpaseo/paseo/pull/6074))
 - Fixed a resumed agent returning to its creation-time mode after its mode was changed in the session ([#5140](https://github.com/getpaseo/paseo/pull/5140) by [@ThePlenkov](https://github.com/ThePlenkov))
 - Fixed ACP plugin providers failing to launch a `.cmd` or `.bat` CLI on Windows ([#6151](https://github.com/getpaseo/paseo/pull/6151))
+- Fixed ACP agents running on their default model when the configured model is one the agent does not advertise ([#6273](https://github.com/getpaseo/paseo/pull/6273))
+- Fixed archiving an ACP agent leaving its provider running when the provider never answers close ([#6213](https://github.com/getpaseo/paseo/pull/6213) by [@apple-ouyang](https://github.com/apple-ouyang))
+- Fixed an archived ACP agent showing an empty chat after its worktree was removed ([#6228](https://github.com/getpaseo/paseo/pull/6228))
 - Fixed ACP agents rejecting every following message after a turn failed with a permission request open ([#6045](https://github.com/getpaseo/paseo/pull/6045))
 - Fixed the context window meter never appearing for ACP agents that report context usage ([#4848](https://github.com/getpaseo/paseo/pull/4848) by [@apple-ouyang](https://github.com/apple-ouyang))
 - Fixed schedule runs and workspace metadata recording `[object Object]` when an ACP agent rejects a session setting ([#5765](https://github.com/getpaseo/paseo/pull/5765))
@@ -66,12 +74,14 @@
 - Fixed opening an archived OMP agent starting an `omp` process that stayed running ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@thomasvan](https://github.com/thomasvan))
 - Fixed an OMP turn staying running forever when the run contains a message Paseo does not show, such as an OMP rule reminder ([#6112](https://github.com/getpaseo/paseo/pull/6112))
 - Fixed a prompt OMP rejects, such as for a missing API key, ending as a completed turn with no error ([#6110](https://github.com/getpaseo/paseo/pull/6110), [#6115](https://github.com/getpaseo/paseo/pull/6115))
+- Fixed reopened OMP chats showing "Custom message" rows for compactions and other entries OMP writes on its own ([#6198](https://github.com/getpaseo/paseo/pull/6198), [#6215](https://github.com/getpaseo/paseo/pull/6215))
 - Fixed Pi and OMP sessions whose model was removed failing to import or reopen ([#6061](https://github.com/getpaseo/paseo/pull/6061))
 - Fixed Pi agents on Pi 0.99 starting without Paseo's MCP servers when `pi-mcp-adapter` is not installed ([#5762](https://github.com/getpaseo/paseo/pull/5762) by [@ArietidsZ](https://github.com/ArietidsZ))
 - Fixed a running Pi subagent showing an empty transcript until it finished ([#5755](https://github.com/getpaseo/paseo/pull/5755))
 - Fixed a grouped Tintinweb pi-subagents completion marking only its first agent completed and leaving the rest on working ([#5826](https://github.com/getpaseo/paseo/pull/5826))
 - Fixed OpenCode `ask` rules for `paseo_*` tools running the tool without a prompt ([#5801](https://github.com/getpaseo/paseo/pull/5801) by [@ymarcus93](https://github.com/ymarcus93))
 - Fixed the first OpenCode prompt waiting for the event stream timeout when the OpenCode server was slow to become ready ([#5873](https://github.com/getpaseo/paseo/pull/5873) by [@axsuul](https://github.com/axsuul))
+- Fixed OpenCode v2 agents staying running after a question is dismissed or a tool permission is denied ([#6177](https://github.com/getpaseo/paseo/pull/6177), [#6188](https://github.com/getpaseo/paseo/pull/6188))
 - Fixed the Nix packages failing to start the daemon and to open terminals ([#5523](https://github.com/getpaseo/paseo/pull/5523) by [@wongcallum](https://github.com/wongcallum))
 - Fixed OpenCode v2 agents failing to start on the Nix packages ([#5988](https://github.com/getpaseo/paseo/pull/5988))
 - Fixed each Paseo skill appearing twice in Codex's skill list ([#5827](https://github.com/getpaseo/paseo/pull/5827) by [@3ae3ae](https://github.com/3ae3ae))
@@ -85,12 +95,18 @@
 - Fixed Codex terminal rows reading only "Terminal" without the command on current Codex ([#5774](https://github.com/getpaseo/paseo/pull/5774))
 - Fixed the composer showing the catalog default thinking level instead of the one the agent runs on ([#5804](https://github.com/getpaseo/paseo/pull/5804))
 - Fixed the composer showing another model's label when the agent's model is missing from the loaded catalog ([#5796](https://github.com/getpaseo/paseo/pull/5796))
-- Fixed the chat jumping back by several screens when scrolling up through older history on web and desktop ([#5945](https://github.com/getpaseo/paseo/pull/5945), [#5970](https://github.com/getpaseo/paseo/pull/5970))
+- Fixed the chat jumping back by several screens when scrolling up through older history on web and desktop ([#5945](https://github.com/getpaseo/paseo/pull/5945), [#5970](https://github.com/getpaseo/paseo/pull/5970), [#6172](https://github.com/getpaseo/paseo/pull/6172))
 - Fixed images in chat shifting the text below them when they finish loading ([#5970](https://github.com/getpaseo/paseo/pull/5970))
 - Fixed copying all the code in a chat code block sometimes including its ``` fence lines ([#6138](https://github.com/getpaseo/paseo/pull/6138))
 - Fixed copying across a code block nested in a numbered list item renumbering the next item ([#6158](https://github.com/getpaseo/paseo/pull/6158))
+- Fixed copying a chat selection across an image losing its alt text and source, or including the image when the selection started below it ([#6181](https://github.com/getpaseo/paseo/pull/6181), [#6195](https://github.com/getpaseo/paseo/pull/6195))
 - Fixed relative `path:line` file links in chat opening at the first line referenced for that file ([#5653](https://github.com/getpaseo/paseo/pull/5653) by [@3ae3ae](https://github.com/3ae3ae))
 - Fixed PR comments with linked pictures showing raw HTML tags and losing the image link ([#5968](https://github.com/getpaseo/paseo/pull/5968))
+- Fixed text typed by the browser tool appearing in your message box instead of the browser tab ([#6207](https://github.com/getpaseo/paseo/pull/6207))
+- Fixed Astro expressions losing their colors after a nested template string ([#6219](https://github.com/getpaseo/paseo/pull/6219))
+- Fixed downloading files whose names contain non-ASCII characters ([#6278](https://github.com/getpaseo/paseo/pull/6278), [#6281](https://github.com/getpaseo/paseo/pull/6281) by [@dillonzq](https://github.com/dillonzq), [@jasonhnd](https://github.com/jasonhnd))
+- Fixed the PR panel, sidebar workspace status, and "Worked for" line showing English in other app languages ([#6196](https://github.com/getpaseo/paseo/pull/6196), [#6208](https://github.com/getpaseo/paseo/pull/6208), [#6225](https://github.com/getpaseo/paseo/pull/6225) by [@dillonzq](https://github.com/dillonzq))
+- Fixed French translations that read as word-for-word machine translation ([#6004](https://github.com/getpaseo/paseo/pull/6004) by [@fxlelouarn](https://github.com/fxlelouarn))
 - Fixed the desktop window not dragging from the workspace header after scrolling a long chat ([#5233](https://github.com/getpaseo/paseo/pull/5233) by [@Zhou-Ruichen](https://github.com/Zhou-Ruichen))
 - Fixed opening an agent on a touch screen in the desktop layout raising the on-screen keyboard ([#5477](https://github.com/getpaseo/paseo/pull/5477) by [@dinhphieu](https://github.com/dinhphieu))
 - Fixed Option+arrow, Cmd+arrow, and Cmd+Backspace line editing in the macOS terminal ([#3339](https://github.com/getpaseo/paseo/pull/3339) by [@gpambrozio](https://github.com/gpambrozio))
@@ -98,12 +114,16 @@
 - Fixed a new worktree workspace being archived when its `paseo.json` cannot be parsed ([#6036](https://github.com/getpaseo/paseo/pull/6036) by [@3ae3ae](https://github.com/3ae3ae))
 - Fixed workspace script status not updating in other connected clients ([#6007](https://github.com/getpaseo/paseo/pull/6007) by [@swbiggart](https://github.com/swbiggart))
 - Fixed agents and terminals inheriting the voice library path, which truncated Git Bash's PATH on Windows ([#5987](https://github.com/getpaseo/paseo/pull/5987) by [@hanh9898](https://github.com/hanh9898))
+- Fixed dictation failing until the model was deleted by hand when the daemon stopped while extracting a local speech model ([#6210](https://github.com/getpaseo/paseo/pull/6210) by [@3ae3ae](https://github.com/3ae3ae))
 - Fixed macOS hosts showing as `UNKNOWN` when the network supplies no hostname ([#5922](https://github.com/getpaseo/paseo/pull/5922))
+- Fixed `paseo daemon status` reporting a daemon in a Linux VM as stopped after the host wakes from sleep ([#6279](https://github.com/getpaseo/paseo/pull/6279))
+- Fixed relay reconnects being ignored after a relay connection stalled before its handshake ([#5648](https://github.com/getpaseo/paseo/pull/5648) by [@3ae3ae](https://github.com/3ae3ae))
 - Fixed `paseo daemon run` exiting with "Daemon failed to start" when the program that launched it stops reading its output ([#6117](https://github.com/getpaseo/paseo/pull/6117))
 - Fixed CLI commands crashing with `EPIPE`, and the Windows desktop app showing an error dialog, when their output stops being read ([#6097](https://github.com/getpaseo/paseo/pull/6097))
 - Fixed daemon self-update on a linked global install giving the wrong reason for refusing ([#6095](https://github.com/getpaseo/paseo/pull/6095))
 - Fixed daemon self-update failing for an npm install under a prefix other than npm's global prefix ([#5649](https://github.com/getpaseo/paseo/pull/5649) by [@3ae3ae](https://github.com/3ae3ae))
 - Fixed opening an archived agent whose worktree was removed showing "Workspace unavailable" when the workspace had no recorded branch ([#5694](https://github.com/getpaseo/paseo/pull/5694))
+- Fixed a failed send to an archived agent whose directory was removed taking it out of History ([#6255](https://github.com/getpaseo/paseo/pull/6255))
 - Fixed a host's version staying stale on the host page after its daemon restarts ([#5351](https://github.com/getpaseo/paseo/pull/5351) by [@bashrusakh](https://github.com/bashrusakh))
 - Fixed Remote SSH hosts failing to connect to a password-protected daemon, with a new Daemon password field ([#6081](https://github.com/getpaseo/paseo/pull/6081) by [@royenheart](https://github.com/royenheart))
 - Fixed removing a host during its first connection attempt not stopping the connection ([#5722](https://github.com/getpaseo/paseo/pull/5722))
@@ -123,6 +143,7 @@
 - Fixed `paseo schedule update --no-max-runs` and `--no-expires-in` failing before reaching the daemon ([#5973](https://github.com/getpaseo/paseo/pull/5973) by [@Mar-garet](https://github.com/Mar-garet))
 - Fixed `daemon.log` saying nothing when a resumed Claude agent's transcript is missing or cannot be read ([#5818](https://github.com/getpaseo/paseo/pull/5818) by [@gabrielgiordan](https://github.com/gabrielgiordan))
 - Fixed reloading a plugin adding `[System Error] Provider connection closed` to finished chats on its provider ([#5579](https://github.com/getpaseo/paseo/pull/5579))
+- Fixed `paseo plugin add .` looking for the plugin in the daemon's directory instead of the CLI's ([#6239](https://github.com/getpaseo/paseo/pull/6239))
 - Fixed plugin settings screens on desktop having no way back to the Plugins page ([#5620](https://github.com/getpaseo/paseo/pull/5620))
 - Fixed plugin client code failing to import npm packages that declare only `main` or `module` ([#5838](https://github.com/getpaseo/paseo/pull/5838))
 - Fixed the SDK's `send()` and `run()` rejecting `activeTurnBehavior` in TypeScript ([#5605](https://github.com/getpaseo/paseo/pull/5605) by [@wjxdy](https://github.com/wjxdy))

From 22488d4502cd0c8a4ee4619af991762f071b60a7 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 15:27:08 +0200
Subject: [PATCH 043/270] chore(release): cut 0.11.0

---
 .../android/en-US/changelogs/110001.txt       |  7 +++
 .../android/en-US/changelogs/110002.txt       |  7 +++
 .../android/en-US/changelogs/110003.txt       |  7 +++
 .../android/en-US/changelogs/110004.txt       |  7 +++
 package-lock.json                             | 56 +++++++++----------
 package.json                                  |  2 +-
 packages/app/package.json                     |  2 +-
 packages/cli/package.json                     |  8 +--
 packages/client/package.json                  |  6 +-
 packages/desktop/package.json                 |  2 +-
 packages/expo-two-way-audio/package.json      |  2 +-
 packages/highlight/package.json               |  2 +-
 packages/plugin/package.json                  | 10 ++--
 packages/protocol/package.json                |  2 +-
 packages/relay/package.json                   |  2 +-
 packages/server/package.json                  | 12 ++--
 packages/website/package.json                 |  2 +-
 plugins/package.json                          |  2 +-
 18 files changed, 83 insertions(+), 55 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110001.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110002.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110003.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110004.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/110001.txt b/fastlane/metadata/android/en-US/changelogs/110001.txt
new file mode 100644
index 0000000000..1624e3b4a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110001.txt
@@ -0,0 +1,7 @@
+Added
+- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
+- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
+- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
+- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110002.txt b/fastlane/metadata/android/en-US/changelogs/110002.txt
new file mode 100644
index 0000000000..1624e3b4a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110002.txt
@@ -0,0 +1,7 @@
+Added
+- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
+- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
+- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
+- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110003.txt b/fastlane/metadata/android/en-US/changelogs/110003.txt
new file mode 100644
index 0000000000..1624e3b4a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110003.txt
@@ -0,0 +1,7 @@
+Added
+- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
+- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
+- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
+- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110004.txt b/fastlane/metadata/android/en-US/changelogs/110004.txt
new file mode 100644
index 0000000000..1624e3b4a3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110004.txt
@@ -0,0 +1,7 @@
+Added
+- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
+- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
+- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
+- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
+
+Full notes: https://paseo.sh/changelog
diff --git a/package-lock.json b/package-lock.json
index a2856c464a..c4b456a98e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -36413,7 +36413,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -37496,12 +37496,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.11.0-beta.5",
-        "@getpaseo/protocol": "0.11.0-beta.5",
-        "@getpaseo/server": "0.11.0-beta.5",
+        "@getpaseo/client": "0.11.0",
+        "@getpaseo/protocol": "0.11.0",
+        "@getpaseo/server": "0.11.0",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -37748,10 +37748,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "dependencies": {
-        "@getpaseo/protocol": "0.11.0-beta.5",
-        "@getpaseo/relay": "0.11.0-beta.5",
+        "@getpaseo/protocol": "0.11.0",
+        "@getpaseo/relay": "0.11.0",
         "zod": "^4.4.3"
       },
       "devDependencies": {
@@ -37762,7 +37762,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -38006,7 +38006,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -38902,7 +38902,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "dependencies": {
         "@codemirror/language": "6.12.4",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -38931,14 +38931,14 @@
     },
     "packages/plugin": {
       "name": "@getpaseo/plugin",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "dependencies": {
         "@agentclientprotocol/sdk": "^1.4.0",
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.11.0-beta.5",
-        "@getpaseo/protocol": "0.11.0-beta.5",
+        "@getpaseo/client": "0.11.0",
+        "@getpaseo/protocol": "0.11.0",
         "@types/node": "^20.9.0",
         "@types/react": "~19.2.0",
         "react": "19.1.0",
@@ -38948,8 +38948,8 @@
         "zod": "^4.4.3"
       },
       "peerDependencies": {
-        "@getpaseo/client": "0.11.0-beta.5",
-        "@getpaseo/protocol": "0.11.0-beta.5",
+        "@getpaseo/client": "0.11.0",
+        "@getpaseo/protocol": "0.11.0",
         "react": "~19.1.0",
         "react-native": ">=0.81.5",
         "zod": "^4.4.3"
@@ -38971,7 +38971,7 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "dependencies": {
         "semver": "^7.8.5",
         "zod": "^4.4.3"
@@ -38998,7 +38998,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -39216,16 +39216,16 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "0.3.246",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.11.0-beta.5",
-        "@getpaseo/highlight": "0.11.0-beta.5",
-        "@getpaseo/plugin": "0.11.0-beta.5",
-        "@getpaseo/protocol": "0.11.0-beta.5",
-        "@getpaseo/relay": "0.11.0-beta.5",
+        "@getpaseo/client": "0.11.0",
+        "@getpaseo/highlight": "0.11.0",
+        "@getpaseo/plugin": "0.11.0",
+        "@getpaseo/protocol": "0.11.0",
+        "@getpaseo/relay": "0.11.0",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "1.29.0",
         "@opencode-ai/sdk": "1.14.46",
@@ -40146,7 +40146,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",
@@ -41754,7 +41754,7 @@
     },
     "plugins": {
       "name": "@getpaseo/builtin-plugins",
-      "version": "0.11.0-beta.5",
+      "version": "0.11.0",
       "dependencies": {
         "@getpaseo/plugin": "*",
         "zod": "^4.4.3"
diff --git a/package.json b/package.json
index 3eebf95522..2805417f66 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [
diff --git a/packages/app/package.json b/packages/app/package.json
index f23f06ce52..d92e69638b 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "private": true,
   "main": "index.ts",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 08525ae169..875e73e0f3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/cli",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "description": "Paseo CLI - control your AI coding agents from the command line",
   "bin": {
     "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.0.0",
-    "@getpaseo/client": "0.11.0-beta.5",
-    "@getpaseo/protocol": "0.11.0-beta.5",
-    "@getpaseo/server": "0.11.0-beta.5",
+    "@getpaseo/client": "0.11.0",
+    "@getpaseo/protocol": "0.11.0",
+    "@getpaseo/server": "0.11.0",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "mime-types": "^2.1.35",
diff --git a/packages/client/package.json b/packages/client/package.json
index 05e4b208d4..063786f4ae 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/client",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "description": "Paseo client SDK package",
   "files": [
     "dist",
@@ -39,8 +39,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@getpaseo/protocol": "0.11.0-beta.5",
-    "@getpaseo/relay": "0.11.0-beta.5",
+    "@getpaseo/protocol": "0.11.0",
+    "@getpaseo/relay": "0.11.0",
     "zod": "^4.4.3"
   },
   "devDependencies": {
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 9819f719c4..b76528d69e 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/desktop",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "private": true,
   "description": "Paseo desktop app (Electron wrapper)",
   "homepage": "https://paseo.sh",
diff --git a/packages/expo-two-way-audio/package.json b/packages/expo-two-way-audio/package.json
index 934b386778..bf2a2b056d 100644
--- a/packages/expo-two-way-audio/package.json
+++ b/packages/expo-two-way-audio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "description": "Native module for two way audio streaming",
   "keywords": [
     "ExpoTwoWayAudio",
diff --git a/packages/highlight/package.json b/packages/highlight/package.json
index a2b5b5b81e..3541693c33 100644
--- a/packages/highlight/package.json
+++ b/packages/highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/highlight",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "files": [
     "dist",
     "!dist/**/*.map",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 306a636512..81c05a06e0 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/plugin",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "description": "Paseo plugin SDK package",
   "files": [
     "dist",
@@ -70,8 +70,8 @@
     "use-sync-external-store": "^1.6.0"
   },
   "devDependencies": {
-    "@getpaseo/client": "0.11.0-beta.5",
-    "@getpaseo/protocol": "0.11.0-beta.5",
+    "@getpaseo/client": "0.11.0",
+    "@getpaseo/protocol": "0.11.0",
     "@types/node": "^20.9.0",
     "@types/react": "~19.2.0",
     "react": "19.1.0",
@@ -81,8 +81,8 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@getpaseo/client": "0.11.0-beta.5",
-    "@getpaseo/protocol": "0.11.0-beta.5",
+    "@getpaseo/client": "0.11.0",
+    "@getpaseo/protocol": "0.11.0",
     "react": "~19.1.0",
     "react-native": ">=0.81.5",
     "zod": "^4.4.3"
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index b969849cb1..6c1cee2cba 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/protocol",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "description": "Paseo shared protocol schemas and wire types",
   "files": [
     "dist",
diff --git a/packages/relay/package.json b/packages/relay/package.json
index 58c0f442cd..a9d2d6c86e 100644
--- a/packages/relay/package.json
+++ b/packages/relay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/relay",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "description": "Paseo relay for bridging daemon and client connections",
   "files": [
     "dist",
diff --git a/packages/server/package.json b/packages/server/package.json
index c11efb3571..d9424c7e9b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/server",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "description": "Paseo backend server",
   "files": [
     "dist/server",
@@ -107,11 +107,11 @@
     "@agentclientprotocol/sdk": "^0.17.1",
     "@anthropic-ai/claude-agent-sdk": "0.3.246",
     "@anthropic-ai/sdk": "^0.104.2",
-    "@getpaseo/client": "0.11.0-beta.5",
-    "@getpaseo/highlight": "0.11.0-beta.5",
-    "@getpaseo/plugin": "0.11.0-beta.5",
-    "@getpaseo/protocol": "0.11.0-beta.5",
-    "@getpaseo/relay": "0.11.0-beta.5",
+    "@getpaseo/client": "0.11.0",
+    "@getpaseo/highlight": "0.11.0",
+    "@getpaseo/plugin": "0.11.0",
+    "@getpaseo/protocol": "0.11.0",
+    "@getpaseo/relay": "0.11.0",
     "@isaacs/ttlcache": "^2.1.4",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@opencode-ai/sdk": "1.14.46",
diff --git a/packages/website/package.json b/packages/website/package.json
index bf40c0e1a6..2cb1fad0dd 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/website",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/plugins/package.json b/plugins/package.json
index a932782991..537cbf0bdf 100644
--- a/plugins/package.json
+++ b/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/builtin-plugins",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0",
   "private": true,
   "type": "module",
   "scripts": {

From 1fae8e89f701d117d86a3b5677223407b52c40ce Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 14:11:10 +0200
Subject: [PATCH 044/270] fix(website): mute footer column titles by shade
 instead of weight

---
 packages/website/src/components/site-footer.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/website/src/components/site-footer.tsx b/packages/website/src/components/site-footer.tsx
index 1ab11f9bdb..198a60c9ce 100644
--- a/packages/website/src/components/site-footer.tsx
+++ b/packages/website/src/components/site-footer.tsx
@@ -19,7 +19,7 @@ export function SiteFooter({ width = "default" }: SiteFooterProps) {
     <footer className={`${widthClasses} mx-auto mt-12 md:mt-16`}>
       <div className="border-t border-white/10 pt-8 pb-4 grid grid-cols-2 sm:grid-cols-5 gap-8 text-sm">
         <div className="space-y-3">
-          <p className="text-white/60 font-medium">Product</p>
+          <p className="text-extra-muted-foreground">Product</p>
           <div className="space-y-2">
             <a
               href="/blog"
@@ -80,7 +80,7 @@ export function SiteFooter({ width = "default" }: SiteFooterProps) {
           </div>
         </div>
         <div className="space-y-3">
-          <p className="text-white/60 font-medium">Agents</p>
+          <p className="text-extra-muted-foreground">Agents</p>
           <div className="space-y-2">
             <a
               href="/claude-code"
@@ -121,7 +121,7 @@ export function SiteFooter({ width = "default" }: SiteFooterProps) {
           </div>
         </div>
         <div className="space-y-3">
-          <p className="text-white/60 font-medium">Alternatives</p>
+          <p className="text-extra-muted-foreground">Alternatives</p>
           <div className="space-y-2">
             {alternatives.map((page) => (
               <a
@@ -135,7 +135,7 @@ export function SiteFooter({ width = "default" }: SiteFooterProps) {
           </div>
         </div>
         <div className="space-y-3">
-          <p className="text-white/60 font-medium">Community</p>
+          <p className="text-extra-muted-foreground">Community</p>
           <div className="space-y-2">
             <a
               href="https://discord.gg/jz8T2uahpH"
@@ -164,7 +164,7 @@ export function SiteFooter({ width = "default" }: SiteFooterProps) {
           </div>
         </div>
         <div className="space-y-3">
-          <p className="text-white/60 font-medium">Download</p>
+          <p className="text-extra-muted-foreground">Download</p>
           <div className="space-y-2">
             <a
               href={appStoreUrl}

From 1b88f16124e313277e341485c1bba6194e392b2c Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 14:11:41 +0200
Subject: [PATCH 045/270] feat(website): link the public plugin registry

---
 packages/website/src/plugins/launch.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/website/src/plugins/launch.ts b/packages/website/src/plugins/launch.ts
index bc784696de..bfe0d00385 100644
--- a/packages/website/src/plugins/launch.ts
+++ b/packages/website/src/plugins/launch.ts
@@ -1,2 +1 @@
-// Keep navigation on paseo.cafe until the coordinated directory announcement.
-export const PLUGINS_LINKED = false;
+export const PLUGINS_LINKED = true;

From b6454d7ea48b5f8c43cf3b358a7b12dcbf216fde Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 14:33:14 +0200
Subject: [PATCH 046/270] fix(website): show paseo plugin add as the registry
 install command

---
 packages/website/e2e/plugins.spec.ts          | 6 +++---
 packages/website/src/plugins/registry.test.ts | 2 +-
 packages/website/src/plugins/registry.ts      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 2793792845..015d362338 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -41,14 +41,14 @@ test("browses from the directory into a category, a plugin, and its author", asy
   await page.getByRole("link", { name: /Fresh Worktrees/ }).click();
   await expect(page).toHaveURL(/\/plugins\/omercnet\/fresh-worktrees$/);
   await expect(page.getByRole("heading", { name: "Fresh Worktrees" })).toHaveCount(1);
-  await expect(page.getByText("paseo plugin install omercnet/fresh-worktrees")).toHaveCount(1);
+  await expect(page.getByText("paseo plugin add omercnet/fresh-worktrees")).toHaveCount(1);
   await expect(
     page.getByRole("heading", { level: 2, name: "Behavior", exact: true }),
   ).toBeVisible();
   await page.getByRole("button", { name: "Copy to clipboard" }).click();
   await expect
     .poll(() => page.evaluate(() => (window as unknown as { __copied?: string }).__copied))
-    .toBe("paseo plugin install omercnet/fresh-worktrees");
+    .toBe("paseo plugin add omercnet/fresh-worktrees");
   await expect(page.getByRole("link", { name: "Git", exact: true })).toHaveAttribute(
     "href",
     "/plugins/category/git",
@@ -242,7 +242,7 @@ test.describe("search engine visits without JavaScript", () => {
     expect(response?.status()).toBe(200);
     expect(response?.headers()["cache-control"]).toBe("private, no-store");
     expect(response?.headers()["x-robots-tag"]).toBeUndefined();
-    await expect(page.getByText("paseo plugin install omercnet/fresh-worktrees")).toBeVisible();
+    await expect(page.getByText("paseo plugin add omercnet/fresh-worktrees")).toBeVisible();
     await expect(
       page.getByRole("heading", { level: 2, name: "Behavior", exact: true }),
     ).toBeVisible();
diff --git a/packages/website/src/plugins/registry.test.ts b/packages/website/src/plugins/registry.test.ts
index b6135351b3..ec6724137d 100644
--- a/packages/website/src/plugins/registry.test.ts
+++ b/packages/website/src/plugins/registry.test.ts
@@ -263,7 +263,7 @@ describe("plugin registry", () => {
     );
   });
   it("offers a registry install command", () => {
-    expect(installCommand(plugin)).toBe("paseo plugin install acme/example");
+    expect(installCommand(plugin)).toBe("paseo plugin add acme/example");
     expect(formatInstalls(1250)).toBe("1.3k");
   });
 });
diff --git a/packages/website/src/plugins/registry.ts b/packages/website/src/plugins/registry.ts
index 13bfc0d1ca..37a4455d0c 100644
--- a/packages/website/src/plugins/registry.ts
+++ b/packages/website/src/plugins/registry.ts
@@ -41,7 +41,7 @@ export function getPluginsByAuthor(plugins: Plugin[], owner: string): Plugin[] {
   return plugins.filter((plugin) => pluginOwner(plugin) === owner);
 }
 export function installCommand(plugin: Plugin): string {
-  return `paseo plugin install ${plugin.id}`;
+  return `paseo plugin add ${plugin.id}`;
 }
 export function pluginVersion(plugin: Plugin): string {
   return plugin.artifact.kind === "npm"

From 0555c877d083b138e2aef367e8c10e8eace3f1a4 Mon Sep 17 00:00:00 2001
From: "paseo-ai[bot]" <266920839+paseo-ai[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 13:49:31 +0000
Subject: [PATCH 047/270] fix: update lockfile signatures and Nix hash [skip
 ci]

---
 nix/npm-deps.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/npm-deps.hash b/nix/npm-deps.hash
index 32aedbf346..1452d4bafb 100644
--- a/nix/npm-deps.hash
+++ b/nix/npm-deps.hash
@@ -1 +1 @@
-sha256-zL3+gbScK8eMkjQUtKDX4UJTXt4BMeqMSyeWB017MA4=
+sha256-AKY6OMZgHeyn/To/2zsmtfb5C4fKniUp8gvpEYaR7/o=

From ee6deda07907254f346e827e5c9868d845112819 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 16:09:34 +0200
Subject: [PATCH 048/270] Show a Claude agent's history when its transcript is
 under another project folder (#6301)

* fix(claude): load history from a transcript under another project folder

Claude Code resumes a session by id from any working directory and keeps
writing to the transcript in the project folder where the session started.
When the agent's cwd encodes to a different folder (a moved project, a
migrated daemon, a Windows binary under WSL), the agent kept working but
reopened with an empty timeline. Look the transcript up by session id
across the config dir's project folders when it is not where cwd points.

Refs #4540

* fix(claude): report a failed project folder listing instead of an absent transcript

Take the transcript lookup's inputs as one object, and rethrow read errors other than a missing projects folder so the history load logs them as a failure.

* test(claude): skip the unreadable projects folder case when running as root

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../claude/agent.history-load.test.ts         |  27 +++-
 .../server/agent/providers/claude/agent.ts    |  27 +---
 .../agent/providers/claude/project-dir.ts     |  42 +++++-
 ...aude-history-other-project-dir.e2e.test.ts | 130 ++++++++++++++++++
 4 files changed, 203 insertions(+), 23 deletions(-)
 create mode 100644 packages/server/src/server/daemon-e2e/claude-history-other-project-dir.e2e.test.ts

diff --git a/packages/server/src/server/agent/providers/claude/agent.history-load.test.ts b/packages/server/src/server/agent/providers/claude/agent.history-load.test.ts
index 223e2001f5..50d9c56ab5 100644
--- a/packages/server/src/server/agent/providers/claude/agent.history-load.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.history-load.test.ts
@@ -1,4 +1,4 @@
-import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import { chmodSync, mkdirSync, mkdtempSync, rmSync } from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import pino from "pino";
@@ -90,4 +90,29 @@ describe("ClaudeAgentSession persisted history load", () => {
       }),
     );
   });
+
+  // chmod does not remove read access on Windows, or for root.
+  test.skipIf(process.platform === "win32" || process.getuid?.() === 0)(
+    "logs a warning with the error when Claude's project folders cannot be listed",
+    async () => {
+      // The transcript is not under cwd's folder, so the lookup lists the other project folders.
+      mkdirSync(path.join(configDir, "projects"), { recursive: true });
+      chmodSync(path.join(configDir, "projects"), 0o000);
+
+      try {
+        await resume();
+      } finally {
+        chmodSync(path.join(configDir, "projects"), 0o755);
+      }
+
+      expect(records).toContainEqual(
+        expect.objectContaining({
+          level: pino.levels.values.warn,
+          msg: "Failed to load Claude history from transcript",
+          sessionId: SESSION_ID,
+          err: expect.objectContaining({ message: expect.stringContaining("EACCES") }),
+        }),
+      );
+    },
+  );
 });
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index d505689a95..08640f472f 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -84,7 +84,7 @@ import {
   type ClaudeRewindSdk,
 } from "./rewind.js";
 import { normalizeProviderReplayTimestamp } from "../../provider-history-timestamps.js";
-import { claudeConfigDir, claudeProjectDirSync } from "./project-dir.js";
+import { claudeConfigDir, claudeProjectDirSync, claudeTranscriptPathSync } from "./project-dir.js";
 import { THINKING_APPLIES_NEXT_TURN_NOTICE } from "../../provider-notices.js";
 import {
   isProviderImageMarkdown,
@@ -5216,26 +5216,11 @@ class ClaudeAgentSession implements AgentSession {
   private resolveHistoryPath(sessionId: string): string | null {
     const cwd = this.config.cwd;
     if (!cwd) return null;
-    const configDir = claudeConfigDir(this.harnessEnvironment);
-    const candidates = [cwd];
-    try {
-      const realCwd = fs.realpathSync(cwd);
-      if (realCwd !== cwd) {
-        candidates.push(realCwd);
-      }
-    } catch {
-      // Fall back to the configured cwd when the path has already disappeared.
-    }
-    for (const candidate of candidates) {
-      const historyPath = path.join(
-        claudeProjectDirSync(candidate, { configDir }),
-        `${sessionId}.jsonl`,
-      );
-      if (fs.existsSync(historyPath)) {
-        return historyPath;
-      }
-    }
-    return path.join(claudeProjectDirSync(cwd, { configDir }), `${sessionId}.jsonl`);
+    return claudeTranscriptPathSync({
+      cwd,
+      sessionId,
+      configDir: claudeConfigDir(this.harnessEnvironment),
+    });
   }
 
   private convertHistoryEntry(entry: ClaudeHistoryEntry): AgentTimelineItem[] {
diff --git a/packages/server/src/server/agent/providers/claude/project-dir.ts b/packages/server/src/server/agent/providers/claude/project-dir.ts
index ccac0841de..030a54c813 100644
--- a/packages/server/src/server/agent/providers/claude/project-dir.ts
+++ b/packages/server/src/server/agent/providers/claude/project-dir.ts
@@ -1,4 +1,4 @@
-import { realpathSync } from "node:fs";
+import { existsSync, readdirSync, realpathSync } from "node:fs";
 import { realpath } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -30,6 +30,46 @@ export function claudeProjectDirSync(cwd: string, options?: ClaudeProjectDirOpti
   return join(projectsRoot, encode(canonical));
 }
 
+// Claude Code resumes a session by id from any working directory and keeps appending to the
+// transcript in the project folder where the session started. That folder differs from the
+// one `cwd` encodes to when the project moved, the daemon migrated, or Claude Code sees the
+// cwd under another name (a Windows binary under WSL). Returns the expected path when no
+// transcript exists anywhere.
+export function claudeTranscriptPathSync(input: {
+  cwd: string;
+  sessionId: string;
+  configDir?: string;
+}): string {
+  const options = { configDir: input.configDir };
+  const fileName = `${input.sessionId}.jsonl`;
+  const expected = join(claudeProjectDirSync(input.cwd, options), fileName);
+  if (existsSync(expected)) {
+    return expected;
+  }
+  const projectsRoot = join(resolveConfigDir(options), "projects");
+  let projectDirs: string[];
+  try {
+    projectDirs = readdirSync(projectsRoot);
+  } catch (error) {
+    if (isMissingDirectoryError(error)) {
+      return expected;
+    }
+    throw error;
+  }
+  for (const projectDir of projectDirs) {
+    const candidate = join(projectsRoot, projectDir, fileName);
+    if (existsSync(candidate)) {
+      return candidate;
+    }
+  }
+  return expected;
+}
+
+function isMissingDirectoryError(error: unknown): boolean {
+  const code = (error as NodeJS.ErrnoException | null)?.code;
+  return code === "ENOENT" || code === "ENOTDIR";
+}
+
 async function canonicalize(input: string): Promise<string> {
   try {
     return normalizeProjectPath(await realpath(input));
diff --git a/packages/server/src/server/daemon-e2e/claude-history-other-project-dir.e2e.test.ts b/packages/server/src/server/daemon-e2e/claude-history-other-project-dir.e2e.test.ts
new file mode 100644
index 0000000000..00b365881f
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/claude-history-other-project-dir.e2e.test.ts
@@ -0,0 +1,130 @@
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { claudeProjectDirSync } from "../agent/providers/claude/project-dir.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon, type TestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+// Claude Code resumes a session by id from any working directory and keeps writing to the
+// transcript under the project folder it started in. The agent's cwd can name a different
+// folder: a project that moved, a daemon migrated between machines or containers, or Claude
+// Code running under WSL interop and seeing the cwd as a Windows path.
+// The test daemon fakes the built-in providers; a provider that extends `claude` runs the real one.
+const PROVIDER_ID = "claude-real";
+const SESSION_ID = "6f0c5d8e-4c3a-4f7b-9a51-2d8e1b7c9f10";
+
+function timelineText(entries: ReadonlyArray<{ item: { type: string; text?: string } }>): string {
+  return entries
+    .filter(
+      (
+        entry,
+      ): entry is {
+        item: { type: "user_message" | "assistant_message"; text: string };
+      } => entry.item.type === "user_message" || entry.item.type === "assistant_message",
+    )
+    .map((entry) => entry.item.text)
+    .join("\n");
+}
+
+describe("daemon E2E - Claude history stored under another project folder", () => {
+  let tempRoot: string;
+  let paseoHomeRoot: string;
+  let configDir: string;
+  let transcriptCwd: string;
+  let agentCwd: string;
+  let daemon: TestPaseoDaemon | undefined;
+  let client: DaemonClient | undefined;
+
+  beforeEach(() => {
+    tempRoot = mkdtempSync(path.join(tmpdir(), "claude-history-other-project-"));
+    paseoHomeRoot = path.join(tempRoot, "paseo-home");
+    configDir = path.join(tempRoot, "claude-config");
+    transcriptCwd = path.join(tempRoot, "where-claude-started");
+    agentCwd = path.join(tempRoot, "agent-cwd");
+    mkdirSync(paseoHomeRoot, { recursive: true });
+    mkdirSync(agentCwd, { recursive: true });
+
+    const projectDir = claudeProjectDirSync(transcriptCwd, { configDir });
+    mkdirSync(projectDir, { recursive: true });
+    writeFileSync(
+      path.join(projectDir, `${SESSION_ID}.jsonl`),
+      [
+        {
+          type: "user",
+          uuid: "user-uuid-1",
+          sessionId: SESSION_ID,
+          cwd: transcriptCwd,
+          message: { role: "user", content: "hello from the original folder" },
+        },
+        {
+          type: "assistant",
+          sessionId: SESSION_ID,
+          cwd: transcriptCwd,
+          message: {
+            role: "assistant",
+            content: "reply from the original folder",
+          },
+        },
+      ]
+        .map((entry) => `${JSON.stringify(entry)}\n`)
+        .join(""),
+      "utf8",
+    );
+  });
+
+  afterEach(async () => {
+    await client?.close().catch(() => undefined);
+    await daemon?.close().catch(() => undefined);
+    client = undefined;
+    daemon = undefined;
+    rmSync(tempRoot, { recursive: true, force: true });
+  }, 60_000);
+
+  async function startDaemon(): Promise<DaemonClient> {
+    daemon = await createTestPaseoDaemon({
+      paseoHomeRoot,
+      cleanup: false,
+      providerOverrides: {
+        [PROVIDER_ID]: {
+          extends: "claude",
+          label: "Claude",
+          env: { CLAUDE_CONFIG_DIR: configDir },
+        },
+      },
+    });
+    client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    return client;
+  }
+
+  async function stopDaemon(): Promise<void> {
+    await client?.close();
+    await daemon?.close();
+    client = undefined;
+    daemon = undefined;
+  }
+
+  test("an agent's timeline survives a daemon restart", async () => {
+    const firstClient = await startDaemon();
+    const agent = await firstClient.importAgent({
+      provider: PROVIDER_ID,
+      sessionId: SESSION_ID,
+      cwd: agentCwd,
+    });
+    await stopDaemon();
+
+    const restartedClient = await startDaemon();
+    const timeline = await restartedClient.fetchAgentTimeline(agent.id, {
+      direction: "tail",
+      limit: 0,
+      projection: "canonical",
+    });
+
+    const text = timelineText(timeline.entries);
+    expect(text).toContain("hello from the original folder");
+    expect(text).toContain("reply from the original folder");
+  }, 60_000);
+});

From a591320409c6c966820bcc3363dac4970709dcf7 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 16:38:38 +0200
Subject: [PATCH 049/270] docs(changelog): announce the plugin registry in
 0.11.0

---
 CHANGELOG.md | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b60e3d0ba..fc8c485ebe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.11.0 - 2026-10-07
 
+Paseo 0.11 adds support for the [plugin registry](https://paseo.sh/plugins). Browse community plugins there, install one with `paseo plugin add owner/slug`, or [submit your own](https://paseo.sh/docs/plugins/publishing#plugin-registry).
+
+**Before upgrading:** `paseo plugin add owner/repo` now installs from the registry, so use `github:owner/repo` to install straight from GitHub and `./path` for a local directory.
+
 ### Added
 
 - Added Muse Code as a provider, with model, approval mode, and reasoning effort controls ([#5719](https://github.com/getpaseo/paseo/pull/5719), [#5775](https://github.com/getpaseo/paseo/pull/5775) by [@millerben95](https://github.com/millerben95))
@@ -19,18 +23,21 @@
 - Added syntax highlighting for Vue files ([#6205](https://github.com/getpaseo/paseo/pull/6205) by [@Davnn1](https://github.com/Davnn1))
 - Added `agents.providers.<id>.options` in `config.json` as default options for every provider, with per-agent overrides ([#5780](https://github.com/getpaseo/paseo/pull/5780))
 - Added the terminal key bar and Paste to terminal panes on iPad and Android tablets ([#5712](https://github.com/getpaseo/paseo/pull/5712) by [@lardissone](https://github.com/lardissone))
-- Added screens and sidebar header and footer items to the plugin SDK ([#5685](https://github.com/getpaseo/paseo/pull/5685))
-- Added a display name, icon, screenshots, and videos to the plugin manifest ([#6263](https://github.com/getpaseo/paseo/pull/6263))
-- Added an `OVERVIEW.md` template to `paseo plugin init` for plugin registry listings ([#6226](https://github.com/getpaseo/paseo/pull/6226))
+
+### Plugins
+
+- Changed `paseo plugin add owner/slug` to install the reviewed plugin from the plugin registry, so local directories need a path such as `./slug` and direct GitHub installs need `github:owner/repo` ([#6224](https://github.com/getpaseo/paseo/pull/6224))
+- Added [screens and sidebar header and footer items](https://paseo.sh/docs/plugins/reference#screens-and-sidebar-items) to the plugin SDK ([#5685](https://github.com/getpaseo/paseo/pull/5685))
 - Added usage sources to the plugin SDK ([#5465](https://github.com/getpaseo/paseo/pull/5465), [#5876](https://github.com/getpaseo/paseo/pull/5876))
 - Added `spawnProcess()`, `execCommand()`, and `terminateProcess()` to the plugin SDK for launching CLIs, including Windows `.cmd` and `.bat` scripts ([#6151](https://github.com/getpaseo/paseo/pull/6151))
 - Added `client.playAudio()` to the plugin SDK for playing audio on every client ([#5976](https://github.com/getpaseo/paseo/pull/5976))
 - Added an `agent.closed` plugin lifecycle event ([#5971](https://github.com/getpaseo/paseo/pull/5971) by [@ilteoood](https://github.com/ilteoood))
 - Added command and environment overrides and availability diagnostics for plugin providers ([#5707](https://github.com/getpaseo/paseo/pull/5707))
+- Added a display name, icon, screenshots, and videos to the plugin manifest ([#6263](https://github.com/getpaseo/paseo/pull/6263))
+- Added an `OVERVIEW.md` template to `paseo plugin init` for plugin registry listings ([#6226](https://github.com/getpaseo/paseo/pull/6226))
 
 ### Changed
 
-- Changed `paseo plugin add owner/slug` to install the reviewed plugin from the plugin registry, so local directories need a path such as `./slug` and direct GitHub installs need `github:owner/repo` ([#6224](https://github.com/getpaseo/paseo/pull/6224))
 - Changed the context window details to show usage for the account the agent runs under, including custom `CLAUDE_CONFIG_DIR` and `CODEX_HOME` homes ([#5465](https://github.com/getpaseo/paseo/pull/5465))
 - Changed the context window details on desktop to a hover card with Refresh ([#5975](https://github.com/getpaseo/paseo/pull/5975), [#6185](https://github.com/getpaseo/paseo/pull/6185))
 - Changed the context window meter to show before an agent's first turn ([#6089](https://github.com/getpaseo/paseo/pull/6089))

From d46164ce0d45fb6fc579313b68c462ac0d97d1fe Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 17:17:17 +0200
Subject: [PATCH 050/270] fix(claude): keep long-running tool calls out of the
 subagents track (#6308)

Claude Code sends a tool_progress heartbeat every 30 s while a tool is
still running, with that tool's own id as parent_tool_use_id. The Claude
adapter routed any frame with a parent id to the sidechain tracker, so
a main-thread call that ran past 30 s (MCP, WebFetch, WebSearch) became
a "Claude subagent" row with a child action per heartbeat that never
completes, and its card was relabeled Task.

A heartbeat now names no sidechain, so it never reaches subagent
routing.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../claude/agent.sub-agent-sidechain.test.ts  | 71 +++++++++++++++++++
 .../server/agent/providers/claude/agent.ts    |  5 ++
 2 files changed, 76 insertions(+)

diff --git a/packages/server/src/server/agent/providers/claude/agent.sub-agent-sidechain.test.ts b/packages/server/src/server/agent/providers/claude/agent.sub-agent-sidechain.test.ts
index efb452e9bf..84293afa6a 100644
--- a/packages/server/src/server/agent/providers/claude/agent.sub-agent-sidechain.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.sub-agent-sidechain.test.ts
@@ -587,4 +587,75 @@ describe("ClaudeAgentSession sub-agent sidechain updates", () => {
     expect(latest.detail.log).toContain("[Read] file-6.md");
     expect(latest.detail.log).toContain("[Read] file-205.md");
   });
+
+  test("keeps a long main-thread tool call out of the subagents track", async () => {
+    // Claude Code sends a heartbeat every 30 s while a tool runs, with the tool's own id as
+    // parent_tool_use_id. Frames captured from Claude Code 2.1.291 for a 40 s MCP call.
+    queryFactory.mockImplementation(() =>
+      buildQueryMock([
+        {
+          type: "system",
+          subtype: "init",
+          session_id: "heartbeat-session",
+          permissionMode: "bypassPermissions",
+          model: "opus",
+        },
+        {
+          type: "assistant",
+          parent_tool_use_id: null,
+          message: {
+            id: "msg-heartbeat-1",
+            role: "assistant",
+            content: [
+              { type: "tool_use", id: "toolu_slow", name: "mcp__slow__slow_check", input: {} },
+            ],
+          },
+        },
+        {
+          type: "tool_progress",
+          tool_use_id: "toolu_slow-heartbeat-0",
+          tool_name: "mcp__slow__slow_check",
+          parent_tool_use_id: "toolu_slow",
+          elapsed_time_seconds: 30,
+          heartbeat: true,
+        },
+        {
+          type: "user",
+          parent_tool_use_id: null,
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: "toolu_slow",
+                content: [{ type: "text", text: "SLOW_CHECK_OK" }],
+                is_error: false,
+              },
+            ],
+          },
+        },
+        {
+          type: "result",
+          subtype: "success",
+          usage: { input_tokens: 1, cache_read_input_tokens: 0, output_tokens: 1 },
+          total_cost_usd: 0,
+        },
+      ]),
+    );
+    const session = await new ClaudeAgentClient({
+      logger,
+      queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    }).createSession({ provider: "claude", cwd: process.cwd() });
+
+    const events = await collectUntilTerminal(streamSession(session, "run the slow check"));
+    await session.close();
+
+    expect(events.filter((event) => event.type === "provider_subagent")).toEqual([]);
+    const toolCallNames = events.flatMap((event) =>
+      event.type === "timeline" && event.item.type === "tool_call" ? [event.item.name] : [],
+    );
+    expect(toolCallNames).toContain("mcp__slow__slow_check");
+    expect(toolCallNames).not.toContain("Task");
+  });
 });
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index 08640f472f..b797ce2c94 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -1916,6 +1916,11 @@ function readClaudeParentToolUseId(message: SDKMessage): string | null {
   if (!("parent_tool_use_id" in message)) {
     return null;
   }
+  // Claude Code's liveness tick for a tool still running after 30 s names that tool as its
+  // parent, so a long main-thread call would otherwise read as a subagent.
+  if (message.type === "tool_progress" && message.heartbeat === true) {
+    return null;
+  }
   const parentToolUseId = (message as { parent_tool_use_id?: unknown }).parent_tool_use_id;
   return typeof parentToolUseId === "string" && parentToolUseId.length > 0 ? parentToolUseId : null;
 }

From 1ae979d3d04042f67c2e95921a07e910588dcd00 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 18:30:20 +0200
Subject: [PATCH 051/270] Subagents that finish while the app is disconnected
 no longer stay "working" (#6316)

* fix(app): catch up provider subagents after the update feed reconnects

Subagent updates are not replayed across a reconnect, so a child that
finished while the app was disconnected stayed "working" until one
subagent was opened and its parent was listed again. Re-list every
parent the app holds once the update feed resubscribes.

Closes #6109

* fix(app): resync a subagent parent even when its first list failed

A parent's subagent track lists the parent once on mount. When that list
failed because the app was disconnected, the parent was never tracked,
so the reconnect resync skipped it and children that later arrived via
live updates stayed stale after the next drop. Track the parent when its
list is requested instead of when it succeeds.

* test(website): expect the plugin directory links now that they are on

1b88f1612 turned PLUGINS_LINKED on, but the e2e test still asserted the
directory was unlinked, failing the typecheck job on main and every PR.
Assert the navigation, footer, and Browse plugins links point at /plugins.
The header check now targets the navigation landmark the homepage renders;
the banner locator matched nothing, so it only passed while asserting zero.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/src/contexts/session-context.tsx | 13 ++-
 .../app/src/subagents/provider-store.test.ts  | 97 +++++++++++++++++++
 packages/app/src/subagents/provider-store.ts  | 33 +++++++
 packages/website/e2e/plugins.spec.ts          | 11 +--
 4 files changed, 144 insertions(+), 10 deletions(-)

diff --git a/packages/app/src/contexts/session-context.tsx b/packages/app/src/contexts/session-context.tsx
index 3e8165146c..430e4ade74 100644
--- a/packages/app/src/contexts/session-context.tsx
+++ b/packages/app/src/contexts/session-context.tsx
@@ -50,7 +50,7 @@ import { useToast } from "@/contexts/toast-context";
 import { toErrorMessage } from "@/utils/error-messages";
 import { showProviderNoticeToast } from "@/utils/provider-notice-toast";
 import { applyCheckoutStatusUpdateFromEvent } from "@/git/checkout-status-cache";
-import { useProviderSubagentStore } from "@/subagents/provider-store";
+import { resyncProviderSubagents, useProviderSubagentStore } from "@/subagents/provider-store";
 
 // Re-export types from session-store and draft-store for backward compatibility
 export type { DraftInput } from "@/stores/draft-store";
@@ -532,9 +532,14 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
       }
     });
 
-    const unsubProviderSubagentUpdate = onFeed("agent.provider_subagents.update", (message) => {
-      if (message.type !== "agent.provider_subagents.update") return;
-      useProviderSubagentStore.getState().applyUpdate(serverId, message.payload);
+    const unsubProviderSubagentUpdate = feeds.subscribe({
+      snapshot: () => {
+        void resyncProviderSubagents(client, serverId);
+      },
+      update: (message) => {
+        if (message.type !== "agent.provider_subagents.update") return;
+        useProviderSubagentStore.getState().applyUpdate(serverId, message.payload);
+      },
     });
 
     const unsubCheckoutStatusUpdate = onFeed("checkout_status_update", (message) => {
diff --git a/packages/app/src/subagents/provider-store.test.ts b/packages/app/src/subagents/provider-store.test.ts
index 96badfd354..01d6880d5b 100644
--- a/packages/app/src/subagents/provider-store.test.ts
+++ b/packages/app/src/subagents/provider-store.test.ts
@@ -1,8 +1,11 @@
 import { DaemonConnectionError } from "@getpaseo/client/internal/daemon-client";
 import { afterEach, describe, expect, test } from "vitest";
+import type { ProviderSubagentDescriptorPayload } from "@getpaseo/protocol/messages";
 import {
   observeProviderSubagentTimeline,
   providerSubagentKey,
+  refreshProviderSubagents,
+  resyncProviderSubagents,
   useProviderSubagentStore,
 } from "./provider-store";
 
@@ -15,6 +18,7 @@ afterEach(() => {
     descriptors: new Map(),
     timelines: new Map(),
     hiddenFromTrack: new Set(),
+    trackedParents: new Set(),
   });
 });
 
@@ -727,3 +731,96 @@ describe("projected child history", () => {
     expect(current().lastSeq).toBe(2000);
   });
 });
+
+describe("resyncing after the update feed resubscribes", () => {
+  function child(
+    id: string,
+    parentAgentId: string,
+    status: ProviderSubagentDescriptorPayload["status"],
+  ): ProviderSubagentDescriptorPayload {
+    return {
+      id,
+      parentAgentId,
+      provider: "claude",
+      title: "Explore",
+      description: null,
+      status,
+      createdAt: "2026-10-07T10:00:00.000Z",
+      updatedAt: "2026-10-07T10:00:00.000Z",
+      toolCallId: id,
+    };
+  }
+
+  function fakeDaemon(lists: Record<string, ProviderSubagentDescriptorPayload[]>) {
+    const requested: string[] = [];
+    return {
+      requested,
+      lists,
+      client: {
+        listProviderSubagents: async (parentAgentId: string) => {
+          requested.push(parentAgentId);
+          return {
+            requestId: "list",
+            parentAgentId,
+            subagents: lists[parentAgentId] ?? [],
+            error: null,
+          };
+        },
+      },
+    };
+  }
+
+  const status = (parentAgentId: string, subagentId: string) =>
+    useProviderSubagentStore
+      .getState()
+      .descriptors.get(providerSubagentKey(SERVER_ID, parentAgentId, subagentId))?.status;
+
+  test("catches up on children that finished or started while updates were not delivered", async () => {
+    const daemon = fakeDaemon({ [PARENT_ID]: [child("child-1", PARENT_ID, "running")] });
+    await refreshProviderSubagents(daemon.client, SERVER_ID, PARENT_ID);
+    expect(status(PARENT_ID, "child-1")).toBe("running");
+
+    // The connection dropped: the daemon finished child-1 and ran child-2 without telling us.
+    daemon.lists[PARENT_ID] = [
+      child("child-1", PARENT_ID, "completed"),
+      child("child-2", PARENT_ID, "completed"),
+    ];
+    await resyncProviderSubagents(daemon.client, SERVER_ID);
+
+    expect(status(PARENT_ID, "child-1")).toBe("completed");
+    expect(status(PARENT_ID, "child-2")).toBe("completed");
+  });
+
+  test("catches up on a parent whose first list failed while disconnected", async () => {
+    const daemon = fakeDaemon({});
+    const disconnected = {
+      listProviderSubagents: async () => {
+        throw new DaemonConnectionError("Transport not connected");
+      },
+    };
+    await expect(
+      refreshProviderSubagents(disconnected, SERVER_ID, PARENT_ID),
+    ).rejects.toBeInstanceOf(DaemonConnectionError);
+    useProviderSubagentStore.getState().applyUpdate(SERVER_ID, {
+      kind: "upsert",
+      subagent: child("child-1", PARENT_ID, "running"),
+    });
+
+    // The connection dropped again: the daemon finished child-1 without telling us.
+    daemon.lists[PARENT_ID] = [child("child-1", PARENT_ID, "completed")];
+    await resyncProviderSubagents(daemon.client, SERVER_ID);
+
+    expect(status(PARENT_ID, "child-1")).toBe("completed");
+  });
+
+  test("lists again only the parents this server was showing", async () => {
+    const daemon = fakeDaemon({});
+    await refreshProviderSubagents(daemon.client, SERVER_ID, PARENT_ID);
+    await refreshProviderSubagents(daemon.client, "server-2", "other-parent");
+    daemon.requested.length = 0;
+
+    await resyncProviderSubagents(daemon.client, SERVER_ID);
+
+    expect(daemon.requested).toEqual([PARENT_ID]);
+  });
+});
diff --git a/packages/app/src/subagents/provider-store.ts b/packages/app/src/subagents/provider-store.ts
index 86e857d774..fd44dae8d2 100644
--- a/packages/app/src/subagents/provider-store.ts
+++ b/packages/app/src/subagents/provider-store.ts
@@ -28,6 +28,9 @@ interface ProviderSubagentState {
   descriptors: Map<string, ProviderSubagentDescriptorPayload>;
   timelines: Map<string, ProviderSubagentTimelineState>;
   hiddenFromTrack: Set<string>;
+  /** Parents whose list this client asked for, so a resubscribed update feed can catch them up. */
+  trackedParents: Set<string>;
+  trackParent(serverId: string, parentAgentId: string): void;
   hideFromTrack(serverId: string, parentAgentId: string, subagentIds: readonly string[]): void;
   replaceList(
     serverId: string,
@@ -84,6 +87,7 @@ export function refreshProviderSubagents(
   const pending = clientRequests.get(requestKey);
   if (pending) return pending;
 
+  useProviderSubagentStore.getState().trackParent(serverId, parentAgentId);
   const request = client
     .listProviderSubagents(parentAgentId)
     .then((payload) => {
@@ -101,6 +105,27 @@ function parentPrefix(serverId: string, parentAgentId: string): string {
   return `${serverId}\0${parentAgentId}\0`;
 }
 
+/**
+ * Updates are not replayed across a reconnect, so a child that finished or started while the
+ * update feed was down stays stale until its parent is listed again. Call this once the feed has
+ * resubscribed, so every update after the list is delivered.
+ */
+export async function resyncProviderSubagents(
+  client: ProviderSubagentListClient,
+  serverId: string,
+): Promise<void> {
+  const serverPrefix = `${serverId}\0`;
+  const parentAgentIds = [...useProviderSubagentStore.getState().trackedParents]
+    .filter((key) => key.startsWith(serverPrefix))
+    .map((key) => key.slice(serverPrefix.length, -1));
+  await Promise.all(
+    parentAgentIds.map((parentAgentId) =>
+      // A parent that was archived meanwhile has nothing left to catch up.
+      refreshProviderSubagents(client, serverId, parentAgentId).catch(() => undefined),
+    ),
+  );
+}
+
 const EMPTY_TIMELINE: ProviderSubagentTimelineState = {
   tail: [],
   head: [],
@@ -147,6 +172,14 @@ export const useProviderSubagentStore = create<ProviderSubagentState>((set) => (
   descriptors: new Map(),
   timelines: new Map(),
   hiddenFromTrack: new Set(),
+  trackedParents: new Set(),
+  trackParent(serverId, parentAgentId) {
+    set((state) => {
+      const prefix = parentPrefix(serverId, parentAgentId);
+      if (state.trackedParents.has(prefix)) return state;
+      return { trackedParents: new Set(state.trackedParents).add(prefix) };
+    });
+  },
   hideFromTrack(serverId, parentAgentId, subagentIds) {
     set((state) => {
       const hiddenFromTrack = new Set(state.hiddenFromTrack);
diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 015d362338..26c0d9619a 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -388,19 +388,18 @@ async function expectPageMetadata(page: Page, title: string, path: string) {
   );
 }
 
-test("keeps the directory unlinked until the coordinated announcement", async ({ page }) => {
+test("links the directory from the site navigation", async ({ page }) => {
   await page.goto("/");
   await expect(
-    page.getByRole("banner").getByRole("link", { name: "Plugins", exact: true }),
-  ).toHaveCount(0);
+    page.getByRole("navigation").getByRole("link", { name: "Plugins", exact: true }),
+  ).toHaveAttribute("href", "/plugins");
   await expect(
     page.getByRole("contentinfo").getByRole("link", { name: "Plugins", exact: true }),
-  ).toHaveCount(0);
+  ).toHaveAttribute("href", "/plugins");
   await expect(page.getByRole("link", { name: "Browse plugins" })).toHaveAttribute(
     "href",
-    "https://paseo.cafe",
+    "/plugins",
   );
-  await expect(page.locator('a[href="/plugins"]')).toHaveCount(0);
   const response = await page.goto("/plugins");
   expect(response?.status()).toBe(200);
   await expect(page.getByRole("heading", { level: 1, name: /^Plugins/ })).toBeVisible();

From b352dad2e302cb2f98c5b3739148011df5cf43c1 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 21:27:17 +0200
Subject: [PATCH 052/270] fix(website): put Plugins first in the header

---
 packages/website/src/components/site-header.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/website/src/components/site-header.tsx b/packages/website/src/components/site-header.tsx
index c691761b56..fc70e11f39 100644
--- a/packages/website/src/components/site-header.tsx
+++ b/packages/website/src/components/site-header.tsx
@@ -12,6 +12,14 @@ export function SiteHeader() {
         <span className="text-lg font-medium">Paseo</span>
       </a>
       <div className="flex flex-wrap items-center justify-center gap-4">
+        {PLUGINS_LINKED && (
+          <a
+            href="/plugins"
+            className="text-sm text-muted-foreground hover:text-foreground transition-colors"
+          >
+            Plugins
+          </a>
+        )}
         <a
           href="/blog"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -24,14 +32,6 @@ export function SiteHeader() {
         >
           Docs
         </a>
-        {PLUGINS_LINKED && (
-          <a
-            href="/plugins"
-            className="text-sm text-muted-foreground hover:text-foreground transition-colors"
-          >
-            Plugins
-          </a>
-        )}
         <a
           href="/changelog"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"

From 9fcae41c98802b8c4e432fd2f62439fe0b91ce22 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 21:00:11 +0100
Subject: [PATCH 053/270] feat(claude): add Haiku 5.5 with its model
 capabilities (#6332)

---
 packages/cli/tests/15-provider.test.ts        | 11 +++-
 .../agent/providers/claude/agent.test.ts      | 12 +++-
 .../agent/providers/claude/model-manifest.ts  | 12 +++-
 .../agent/providers/claude/models.test.ts     | 57 ++++++++++++++++++-
 4 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/packages/cli/tests/15-provider.test.ts b/packages/cli/tests/15-provider.test.ts
index bc1183de81..3081ee3584 100644
--- a/packages/cli/tests/15-provider.test.ts
+++ b/packages/cli/tests/15-provider.test.ts
@@ -122,10 +122,15 @@ const EXPECTED_CLAUDE_MODELS = [
     model: "Opus 4.6",
     descriptionFragment: "Most capable",
   },
+  {
+    id: "claude-haiku-5-5",
+    model: "Haiku 5.5",
+    descriptionFragment: "Fastest",
+  },
   {
     id: "claude-haiku-4-5",
     model: "Haiku 4.5",
-    descriptionFragment: "Fastest",
+    descriptionFragment: "Previous release",
   },
 ] as const;
 
@@ -435,8 +440,8 @@ try {
       "--quiet should print the same ordered model IDs returned by --json",
     );
     assert(
-      claudeModelsFromJson.some((m) => m.id === "claude-sonnet-5-5"),
-      "captured --json output should include the current Claude everyday model id",
+      claudeModelsFromJson.some((m) => m.id === "claude-haiku-5-5"),
+      "captured --json output should include the current Claude quick-answer model id",
     );
     console.log("✓ provider models --quiet outputs model IDs only\n");
   }
diff --git a/packages/server/src/server/agent/providers/claude/agent.test.ts b/packages/server/src/server/agent/providers/claude/agent.test.ts
index 2d970c49de..9f7430b103 100644
--- a/packages/server/src/server/agent/providers/claude/agent.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.test.ts
@@ -496,7 +496,7 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
       const client = new ClaudeAgentClient({
         logger,
         resolveBinary: async () => "/test/claude/bin",
-        resolveVersion: async () => "2.1.284",
+        resolveVersion: async () => "2.1.293",
         runtimeSettings: { env: { CLAUDE_CONFIG_DIR: emptyConfigDir } },
       });
       const { models } = await client.fetchCatalog({
@@ -515,6 +515,15 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
       expect(getThinkingIds("claude-opus-4-8")).toContain("ultracode");
       expect(getThinkingIds("claude-sonnet-5")).toContain("xhigh");
       expect(getThinkingIds("claude-sonnet-5")).toContain("ultracode");
+      expect(getThinkingIds("claude-haiku-5-5")).toEqual([
+        "off",
+        "low",
+        "medium",
+        "high",
+        "xhigh",
+        "max",
+        "ultracode",
+      ]);
       expect(getThinkingIds("claude-sonnet-5-5")).toContain("xhigh");
       expect(getThinkingIds("claude-sonnet-5-5")).not.toContain("off");
       expect(getThinkingIds("claude-opus-4-7[1m]")).toContain("ultracode");
@@ -1223,6 +1232,7 @@ describe("ClaudeAgentSession features", () => {
 
   test.each([
     ["supported model", "claude-opus-4-8", { type: "disabled" }, undefined],
+    ["Haiku 5.5", "claude-haiku-5-5", { type: "disabled" }, undefined],
     ["unsupported model", "claude-fable-5", { type: "adaptive", display: "summarized" }, "high"],
     ["custom model", "openrouter/anthropic/claude-opus-4-8", undefined, undefined],
     ["provider default", null, undefined, undefined],
diff --git a/packages/server/src/server/agent/providers/claude/model-manifest.ts b/packages/server/src/server/agent/providers/claude/model-manifest.ts
index e2e64f28fd..398fcb1ccd 100644
--- a/packages/server/src/server/agent/providers/claude/model-manifest.ts
+++ b/packages/server/src/server/agent/providers/claude/model-manifest.ts
@@ -170,10 +170,20 @@ export const CLAUDE_MODEL_MANIFEST = [
     effortLevels: CLAUDE_EFFORT_LEVELS.standard,
     supportsThinkingDisabled: true,
   },
+  {
+    id: "claude-haiku-5-5",
+    label: "Haiku 5.5",
+    description: "Haiku 5.5 · Fastest for quick answers",
+    minimumClaudeCodeVersion: "2.1.293",
+    defaultThinkingOptionId: "medium",
+    contextWindowMaxTokens: 1_000_000,
+    effortLevels: CLAUDE_EFFORT_LEVELS.xhigh,
+    supportsThinkingDisabled: true,
+  },
   {
     id: "claude-haiku-4-5",
     label: "Haiku 4.5",
-    description: "Haiku 4.5 · Fastest for quick answers",
+    description: "Haiku 4.5 · Previous release",
     contextWindowMaxTokens: 200_000,
   },
 ] as const satisfies readonly ClaudeModelManifestEntry[];
diff --git a/packages/server/src/server/agent/providers/claude/models.test.ts b/packages/server/src/server/agent/providers/claude/models.test.ts
index 0e187734b8..ed7db8841c 100644
--- a/packages/server/src/server/agent/providers/claude/models.test.ts
+++ b/packages/server/src/server/agent/providers/claude/models.test.ts
@@ -39,7 +39,7 @@ async function createClaudeConfigDirWithRawSettings(settings: string): Promise<s
   return configDir;
 }
 
-function createCatalogClient(claudeCodeVersion = "2.1.284"): ClaudeAgentClient {
+function createCatalogClient(claudeCodeVersion = "2.1.293"): ClaudeAgentClient {
   return new ClaudeAgentClient({
     logger: createTestLogger(),
     resolveVersion: async () => claudeCodeVersion,
@@ -66,6 +66,7 @@ describe("getClaudeModels", () => {
       "claude-opus-4-6",
       "claude-sonnet-4-6[1m]",
       "claude-sonnet-4-6",
+      "claude-haiku-5-5",
       "claude-haiku-4-5",
     ]);
   });
@@ -100,6 +101,7 @@ describe("getClaudeModels", () => {
         ["claude-opus-4-6", 200_000],
         ["claude-sonnet-4-6[1m]", 1_000_000],
         ["claude-sonnet-4-6", 200_000],
+        ["claude-haiku-5-5", 1_000_000],
         ["claude-haiku-4-5", 200_000],
       ]),
     );
@@ -123,6 +125,12 @@ describe("getClaudeModels", () => {
     expect(getClaudeModels("2.1.284").map((model) => model.id)).toContain("claude-sonnet-5-5");
   });
 
+  it("gates Haiku 5.5 on Claude Code 2.1.293 without changing the default", () => {
+    expect(getClaudeModels("2.1.292").map((model) => model.id)).not.toContain("claude-haiku-5-5");
+    expect(getClaudeModels("2.1.293").map((model) => model.id)).toContain("claude-haiku-5-5");
+    expect(getClaudeModels("2.1.293").find((model) => model.isDefault)?.id).toBe("claude-opus-5-5");
+  });
+
   it("derives thinking options from model effort capabilities", () => {
     const models = new Map(getClaudeModels().map((model) => [model.id, model]));
 
@@ -192,6 +200,8 @@ describe("getClaudeModels", () => {
     ["claude-sonnet-5-20260101", true, "high"],
     ["claude-fable-5", false, "high"],
     ["claude-fable-5-1", false, "high"],
+    ["claude-haiku-5-5", true, "medium"],
+    ["claude-haiku-5-5-20261007", true, "medium"],
     ["claude-haiku-4-5", false, undefined],
     ["openrouter/anthropic/claude-opus-4-8", false, undefined],
     [null, false, undefined],
@@ -653,6 +663,51 @@ describe("Claude Sonnet 5.5 catalog", () => {
   });
 });
 
+describe("Claude Haiku 5.5 catalog", () => {
+  it("offers one Haiku 5.5 entry with a 1M context window", () => {
+    const haiku55Models = getClaudeModels()
+      .filter((model) => model.id.startsWith("claude-haiku-5-5"))
+      .map(({ id, label, contextWindowMaxTokens }) => ({ id, label, contextWindowMaxTokens }));
+
+    expect(haiku55Models).toEqual([
+      { id: "claude-haiku-5-5", label: "Haiku 5.5", contextWindowMaxTokens: 1_000_000 },
+    ]);
+  });
+
+  it("offers Off and every effort level with medium as the default", () => {
+    const haiku55 = getClaudeModels().find((model) => model.id === "claude-haiku-5-5");
+
+    expect(haiku55?.thinkingOptions?.map((option) => option.id)).toEqual([
+      CLAUDE_DISABLED_THINKING_OPTION_ID,
+      "low",
+      "medium",
+      "high",
+      "xhigh",
+      "max",
+      CLAUDE_ULTRACODE_THINKING_OPTION_ID,
+    ]);
+    expect(haiku55?.defaultThinkingOptionId).toBe("medium");
+    expect(
+      haiku55?.thinkingOptions?.filter((option) => option.isDefault).map((option) => option.id),
+    ).toEqual(["medium"]);
+  });
+
+  it("normalizes provider-prefixed runtime IDs", () => {
+    expect(normalizeClaudeRuntimeModelId("anthropic/claude-haiku-5-5")).toBe("claude-haiku-5-5");
+    expect(normalizeClaudeRuntimeModelId("us.anthropic.claude-haiku-5-5-v1:0")).toBe(
+      "claude-haiku-5-5",
+    );
+    expect(claudeManifestModelSupportsFastMode("claude-haiku-5-5")).toBe(false);
+  });
+
+  it("resolves suffixed and dated Haiku 5.5 IDs to the single catalog entry", () => {
+    expect(findClaudeModel("claude-haiku-5-5[1m]")?.id).toBe("claude-haiku-5-5");
+    expect(findClaudeModel("claude-haiku-5-5-20261007")?.id).toBe("claude-haiku-5-5");
+    expect(findClaudeModel("claude-haiku-5-5-20261007[1m]")?.id).toBe("claude-haiku-5-5");
+    expect(findClaudeModel("claude-haiku-5-5[1m]")?.contextWindowMaxTokens).toBe(1_000_000);
+  });
+});
+
 describe("claudeManifestModelSupportsFastMode", () => {
   it("keeps fast mode strict to first-party manifest model IDs", () => {
     expect(normalizeClaudeManifestModelId("openrouter/anthropic/claude-opus-4-8")).toBeNull();

From 2a151a44940da526e638e25858587f1dd49cce5f Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 22:23:15 +0200
Subject: [PATCH 054/270] docs: changelog for 0.11.1

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc8c485ebe..c5c23db161 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.11.1 - 2026-10-07
+
+### Added
+
+- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer ([#6332](https://github.com/getpaseo/paseo/pull/6332))
+
+### Fixed
+
+- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents ([#6308](https://github.com/getpaseo/paseo/pull/6308))
+- Fixed subagents that finish while the app is disconnected staying "working" until one is opened ([#6316](https://github.com/getpaseo/paseo/pull/6316))
+- Fixed a Claude agent's history showing "No activity to display" after a daemon restart when its transcript is in another project folder, such as after moving the daemon or running Windows Claude Code from WSL ([#6301](https://github.com/getpaseo/paseo/pull/6301))
+
 ## 0.11.0 - 2026-10-07
 
 Paseo 0.11 adds support for the [plugin registry](https://paseo.sh/plugins). Browse community plugins there, install one with `paseo plugin add owner/slug`, or [submit your own](https://paseo.sh/docs/plugins/publishing#plugin-registry).

From ab10a6694ccf068959d1a6b67b6c915e21a9fe91 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 22:30:39 +0200
Subject: [PATCH 055/270] chore(release): cut 0.11.1

---
 .../android/en-US/changelogs/110011.txt       |  8 +++
 .../android/en-US/changelogs/110012.txt       |  8 +++
 .../android/en-US/changelogs/110013.txt       |  8 +++
 .../android/en-US/changelogs/110014.txt       |  8 +++
 package-lock.json                             | 56 +++++++++----------
 package.json                                  |  2 +-
 packages/app/package.json                     |  2 +-
 packages/cli/package.json                     |  8 +--
 packages/client/package.json                  |  6 +-
 packages/desktop/package.json                 |  2 +-
 packages/expo-two-way-audio/package.json      |  2 +-
 packages/highlight/package.json               |  2 +-
 packages/plugin/package.json                  | 10 ++--
 packages/protocol/package.json                |  2 +-
 packages/relay/package.json                   |  2 +-
 packages/server/package.json                  | 12 ++--
 packages/website/package.json                 |  2 +-
 plugins/package.json                          |  2 +-
 18 files changed, 87 insertions(+), 55 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110011.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110012.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110013.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110014.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/110011.txt b/fastlane/metadata/android/en-US/changelogs/110011.txt
new file mode 100644
index 0000000000..c5b462f3b5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110011.txt
@@ -0,0 +1,8 @@
+Added
+- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
+
+Fixed
+- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
+- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110012.txt b/fastlane/metadata/android/en-US/changelogs/110012.txt
new file mode 100644
index 0000000000..c5b462f3b5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110012.txt
@@ -0,0 +1,8 @@
+Added
+- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
+
+Fixed
+- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
+- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110013.txt b/fastlane/metadata/android/en-US/changelogs/110013.txt
new file mode 100644
index 0000000000..c5b462f3b5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110013.txt
@@ -0,0 +1,8 @@
+Added
+- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
+
+Fixed
+- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
+- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110014.txt b/fastlane/metadata/android/en-US/changelogs/110014.txt
new file mode 100644
index 0000000000..c5b462f3b5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110014.txt
@@ -0,0 +1,8 @@
+Added
+- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
+
+Fixed
+- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
+- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
+
+Full notes: https://paseo.sh/changelog
diff --git a/package-lock.json b/package-lock.json
index c4b456a98e..8d2be2f995 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -36413,7 +36413,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -37496,12 +37496,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.11.0",
-        "@getpaseo/protocol": "0.11.0",
-        "@getpaseo/server": "0.11.0",
+        "@getpaseo/client": "0.11.1",
+        "@getpaseo/protocol": "0.11.1",
+        "@getpaseo/server": "0.11.1",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -37748,10 +37748,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "dependencies": {
-        "@getpaseo/protocol": "0.11.0",
-        "@getpaseo/relay": "0.11.0",
+        "@getpaseo/protocol": "0.11.1",
+        "@getpaseo/relay": "0.11.1",
         "zod": "^4.4.3"
       },
       "devDependencies": {
@@ -37762,7 +37762,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -38006,7 +38006,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -38902,7 +38902,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "dependencies": {
         "@codemirror/language": "6.12.4",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -38931,14 +38931,14 @@
     },
     "packages/plugin": {
       "name": "@getpaseo/plugin",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "dependencies": {
         "@agentclientprotocol/sdk": "^1.4.0",
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.11.0",
-        "@getpaseo/protocol": "0.11.0",
+        "@getpaseo/client": "0.11.1",
+        "@getpaseo/protocol": "0.11.1",
         "@types/node": "^20.9.0",
         "@types/react": "~19.2.0",
         "react": "19.1.0",
@@ -38948,8 +38948,8 @@
         "zod": "^4.4.3"
       },
       "peerDependencies": {
-        "@getpaseo/client": "0.11.0",
-        "@getpaseo/protocol": "0.11.0",
+        "@getpaseo/client": "0.11.1",
+        "@getpaseo/protocol": "0.11.1",
         "react": "~19.1.0",
         "react-native": ">=0.81.5",
         "zod": "^4.4.3"
@@ -38971,7 +38971,7 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "dependencies": {
         "semver": "^7.8.5",
         "zod": "^4.4.3"
@@ -38998,7 +38998,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -39216,16 +39216,16 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "0.3.246",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.11.0",
-        "@getpaseo/highlight": "0.11.0",
-        "@getpaseo/plugin": "0.11.0",
-        "@getpaseo/protocol": "0.11.0",
-        "@getpaseo/relay": "0.11.0",
+        "@getpaseo/client": "0.11.1",
+        "@getpaseo/highlight": "0.11.1",
+        "@getpaseo/plugin": "0.11.1",
+        "@getpaseo/protocol": "0.11.1",
+        "@getpaseo/relay": "0.11.1",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "1.29.0",
         "@opencode-ai/sdk": "1.14.46",
@@ -40146,7 +40146,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",
@@ -41754,7 +41754,7 @@
     },
     "plugins": {
       "name": "@getpaseo/builtin-plugins",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "dependencies": {
         "@getpaseo/plugin": "*",
         "zod": "^4.4.3"
diff --git a/package.json b/package.json
index 2805417f66..35257ef465 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [
diff --git a/packages/app/package.json b/packages/app/package.json
index d92e69638b..ee7798b766 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "private": true,
   "main": "index.ts",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 875e73e0f3..7aab9aab85 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/cli",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Paseo CLI - control your AI coding agents from the command line",
   "bin": {
     "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.0.0",
-    "@getpaseo/client": "0.11.0",
-    "@getpaseo/protocol": "0.11.0",
-    "@getpaseo/server": "0.11.0",
+    "@getpaseo/client": "0.11.1",
+    "@getpaseo/protocol": "0.11.1",
+    "@getpaseo/server": "0.11.1",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "mime-types": "^2.1.35",
diff --git a/packages/client/package.json b/packages/client/package.json
index 063786f4ae..a76e73da1f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/client",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Paseo client SDK package",
   "files": [
     "dist",
@@ -39,8 +39,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@getpaseo/protocol": "0.11.0",
-    "@getpaseo/relay": "0.11.0",
+    "@getpaseo/protocol": "0.11.1",
+    "@getpaseo/relay": "0.11.1",
     "zod": "^4.4.3"
   },
   "devDependencies": {
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index b76528d69e..3b183dd038 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/desktop",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "private": true,
   "description": "Paseo desktop app (Electron wrapper)",
   "homepage": "https://paseo.sh",
diff --git a/packages/expo-two-way-audio/package.json b/packages/expo-two-way-audio/package.json
index bf2a2b056d..e9167f8f56 100644
--- a/packages/expo-two-way-audio/package.json
+++ b/packages/expo-two-way-audio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Native module for two way audio streaming",
   "keywords": [
     "ExpoTwoWayAudio",
diff --git a/packages/highlight/package.json b/packages/highlight/package.json
index 3541693c33..fb39e00486 100644
--- a/packages/highlight/package.json
+++ b/packages/highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/highlight",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "files": [
     "dist",
     "!dist/**/*.map",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 81c05a06e0..1f4d5868e6 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/plugin",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Paseo plugin SDK package",
   "files": [
     "dist",
@@ -70,8 +70,8 @@
     "use-sync-external-store": "^1.6.0"
   },
   "devDependencies": {
-    "@getpaseo/client": "0.11.0",
-    "@getpaseo/protocol": "0.11.0",
+    "@getpaseo/client": "0.11.1",
+    "@getpaseo/protocol": "0.11.1",
     "@types/node": "^20.9.0",
     "@types/react": "~19.2.0",
     "react": "19.1.0",
@@ -81,8 +81,8 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@getpaseo/client": "0.11.0",
-    "@getpaseo/protocol": "0.11.0",
+    "@getpaseo/client": "0.11.1",
+    "@getpaseo/protocol": "0.11.1",
     "react": "~19.1.0",
     "react-native": ">=0.81.5",
     "zod": "^4.4.3"
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index 6c1cee2cba..6db5dd137f 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/protocol",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Paseo shared protocol schemas and wire types",
   "files": [
     "dist",
diff --git a/packages/relay/package.json b/packages/relay/package.json
index a9d2d6c86e..7f884f1f45 100644
--- a/packages/relay/package.json
+++ b/packages/relay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/relay",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Paseo relay for bridging daemon and client connections",
   "files": [
     "dist",
diff --git a/packages/server/package.json b/packages/server/package.json
index d9424c7e9b..64125950db 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/server",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Paseo backend server",
   "files": [
     "dist/server",
@@ -107,11 +107,11 @@
     "@agentclientprotocol/sdk": "^0.17.1",
     "@anthropic-ai/claude-agent-sdk": "0.3.246",
     "@anthropic-ai/sdk": "^0.104.2",
-    "@getpaseo/client": "0.11.0",
-    "@getpaseo/highlight": "0.11.0",
-    "@getpaseo/plugin": "0.11.0",
-    "@getpaseo/protocol": "0.11.0",
-    "@getpaseo/relay": "0.11.0",
+    "@getpaseo/client": "0.11.1",
+    "@getpaseo/highlight": "0.11.1",
+    "@getpaseo/plugin": "0.11.1",
+    "@getpaseo/protocol": "0.11.1",
+    "@getpaseo/relay": "0.11.1",
     "@isaacs/ttlcache": "^2.1.4",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@opencode-ai/sdk": "1.14.46",
diff --git a/packages/website/package.json b/packages/website/package.json
index 2cb1fad0dd..11266c5d06 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/website",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/plugins/package.json b/plugins/package.json
index 537cbf0bdf..241d9b4b67 100644
--- a/plugins/package.json
+++ b/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/builtin-plugins",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "private": true,
   "type": "module",
   "scripts": {

From 2d55870490ee9f2fd65c3bd84c5d7db2d8ff73c4 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 7 Oct 2026 21:33:34 +0100
Subject: [PATCH 056/270] docs(website): present Paseo as an agentic
 development environment (#6336)

---
 README.md                                     |  4 +-
 .../content/alternatives/claude-desktop.md    |  2 +-
 .../src/content/alternatives/codex-app.md     |  2 +-
 .../src/content/alternatives/conductor.md     |  2 +-
 .../src/content/alternatives/happy-coder.md   |  2 +-
 .../content/alternatives/opencode-desktop.md  |  2 +-
 .../website/src/content/alternatives/orca.md  |  8 ++--
 packages/website/src/llms.ts                  | 10 ++--
 packages/website/src/routes/index.tsx         | 11 +++--
 public-docs/index.md                          |  2 +-
 public-docs/why.md                            | 46 +++++++++----------
 11 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index 4b769466c0..2fc0fc8f3d 100644
--- a/README.md
+++ b/README.md
@@ -39,11 +39,11 @@
   <img src="https://paseo.sh/mobile-mockup.png" alt="Paseo mobile app" width="100%">
 </p>
 
-Paseo is a desktop, mobile, web, and CLI app for coding agents. Open the desktop app and work: agents, editor, terminals, diffs, pull requests, and a browser in one window. Run many agents at once, each in its own worktree, on one machine or several. The mobile app is the full app, native on iOS and Android.
+Paseo is an open source agentic development environment for desktop, mobile, web, and CLI. Open the desktop app and work: agents, editor, terminals, diffs, pull requests, and a browser in one window. Run many agents at once, each in its own worktree, on one machine or several. The mobile app is the full app, native on iOS and Android.
 
 - **Parallel agents:** Run many agents at once, each in its own worktree.
 - **Built-in orchestration:** Agents in Paseo can create worktrees, launch other agents, and talk to them, across providers.
-- **Full IDE:** Edit files, review diffs, open pull requests, and run terminals, in split panes you arrange how you want.
+- **Complete development workflow:** Edit files, review diffs, open pull requests, and run terminals, in split panes you arrange how you want.
 - **Self-hosted:** Agents run on your machine with your full dev environment. Use your tools, your configs, and your skills.
 - **Multi-provider:** Claude Code, Codex, Copilot, OpenCode, Pi, Antigravity, and Muse Code through the same interface. Pick the right model for each job.
 - **Voice control:** Dictate tasks or talk through problems in voice mode. Hands-free when you need it.
diff --git a/packages/website/src/content/alternatives/claude-desktop.md b/packages/website/src/content/alternatives/claude-desktop.md
index 53f3118cc6..13a403301c 100644
--- a/packages/website/src/content/alternatives/claude-desktop.md
+++ b/packages/website/src/content/alternatives/claude-desktop.md
@@ -9,7 +9,7 @@ order: 55
 
 Claude Desktop is Anthropic's app for Claude Chat, Cowork, and Claude Code on macOS, Windows, and Linux.
 
-Paseo is an app for orchestrating coding agents, with native clients on desktop, mobile, web, and the CLI. Open source (Apache-2.0).
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
 
 ![Paseo desktop and mobile app](/hero-mockup.png)
 
diff --git a/packages/website/src/content/alternatives/codex-app.md b/packages/website/src/content/alternatives/codex-app.md
index d184dac1cc..7f985af7f8 100644
--- a/packages/website/src/content/alternatives/codex-app.md
+++ b/packages/website/src/content/alternatives/codex-app.md
@@ -9,7 +9,7 @@ order: 54
 
 OpenAI provides Codex through the ChatGPT desktop app on macOS, Windows, and Linux, with local, worktree, cloud, and remote workflows.
 
-Paseo is an app for orchestrating coding agents, with native clients on desktop, mobile, web, and the CLI. Open source (Apache-2.0).
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
 
 ![Paseo desktop and mobile app](/hero-mockup.png)
 
diff --git a/packages/website/src/content/alternatives/conductor.md b/packages/website/src/content/alternatives/conductor.md
index a3455bb0aa..553d4e4d28 100644
--- a/packages/website/src/content/alternatives/conductor.md
+++ b/packages/website/src/content/alternatives/conductor.md
@@ -9,7 +9,7 @@ order: 50
 
 Conductor is a proprietary macOS app for running Claude Code, Codex, Cursor, and OpenCode in parallel Git worktrees and managed cloud workspaces.
 
-Paseo is an app for orchestrating coding agents, with native clients on desktop, mobile, web, and the CLI. Open source (Apache-2.0).
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
 
 ![Paseo desktop and mobile app](/hero-mockup.png)
 
diff --git a/packages/website/src/content/alternatives/happy-coder.md b/packages/website/src/content/alternatives/happy-coder.md
index f0641666c6..0c5bbd1b32 100644
--- a/packages/website/src/content/alternatives/happy-coder.md
+++ b/packages/website/src/content/alternatives/happy-coder.md
@@ -9,7 +9,7 @@ order: 53
 
 Happy Coder connects Claude Code and Codex sessions across its macOS, web, iOS, and Android apps. It wraps the agent CLI on your laptop and syncs sessions over an end-to-end encrypted relay. Open source under MIT.
 
-Paseo is an app for orchestrating coding agents, with native clients on desktop, mobile, web, and the CLI. Open source (Apache-2.0).
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
 
 ![Paseo desktop and mobile app](/hero-mockup.png)
 
diff --git a/packages/website/src/content/alternatives/opencode-desktop.md b/packages/website/src/content/alternatives/opencode-desktop.md
index 5279fb55a2..d80d969aa5 100644
--- a/packages/website/src/content/alternatives/opencode-desktop.md
+++ b/packages/website/src/content/alternatives/opencode-desktop.md
@@ -9,7 +9,7 @@ order: 56
 
 OpenCode Desktop is the desktop app for OpenCode. It is available in beta for macOS, Windows, and Linux.
 
-Paseo is an app for orchestrating coding agents, with native clients on desktop, mobile, web, and the CLI. Open source (Apache-2.0).
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
 
 ![Paseo desktop and mobile app](/hero-mockup.png)
 
diff --git a/packages/website/src/content/alternatives/orca.md b/packages/website/src/content/alternatives/orca.md
index 4286f3794e..c939d49645 100644
--- a/packages/website/src/content/alternatives/orca.md
+++ b/packages/website/src/content/alternatives/orca.md
@@ -1,6 +1,6 @@
 ---
-title: Orca ADE Alternative With Agent Chat, a No-Account Relay, and Plugins
-description: Paseo is an Orca alternative for developers who want a chat-first interface, a daemon they can reach from any client, and plugins that run on the server and every client.
+title: Orca Alternative for Agentic Development
+description: Paseo is an open source agentic development environment with parallel worktrees, an editor, terminals, diffs, pull requests, and a built-in browser.
 nav: Orca
 order: 57
 ---
@@ -9,7 +9,7 @@ order: 57
 
 Orca is an MIT-licensed desktop app for running terminal coding agents in parallel Git worktrees. It includes a mobile companion app, SSH worktrees, remote Orca servers, an embedded browser, and a CLI.
 
-Paseo is an app for orchestrating coding agents, with native clients on desktop, mobile, web, and the CLI. Open source (Apache-2.0).
+Paseo is an open source agentic development environment. Run parallel agents in separate worktrees, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. Available on desktop, mobile, web, and CLI under Apache-2.0.
 
 ![Paseo desktop and mobile app](/hero-mockup.png)
 
@@ -23,7 +23,7 @@ Orca is made by Stably AI, a venture-funded company (Y Combinator). Paseo is ind
 
 ## Architecture and remote machines
 
-The Paseo daemon runs as its own process. Desktop, web, mobile, and CLI clients connect to it directly, over SSH, or through the optional end-to-end encrypted relay. Run the daemon on your laptop, a VM, a home server, or in Docker, and connect to any of them from any client. See [connectivity](/docs/connectivity).
+The Paseo desktop app starts and manages a local daemon automatically. That daemon owns the agents and workspaces, so other clients can connect to the same development environment. Desktop, web, mobile, and CLI clients connect to it directly, over SSH, or through the optional end-to-end encrypted relay. Run the daemon on your laptop, a VM, a home server, or in Docker, and connect to any of them from any client. See [connectivity](/docs/connectivity).
 
 Orca runs inside its desktop app by default and reaches other machines in two ways. SSH worktrees keep the Orca runtime on your laptop and run selected worktrees and terminals on a remote host. Remote Orca Servers, in beta, run Orca desktop or `orca serve` on another machine and let clients pair to it. Orca's documentation recommends Tailscale or another private network for Remote Orca Servers.
 
diff --git a/packages/website/src/llms.ts b/packages/website/src/llms.ts
index 20e414f9dd..32a1f6dcac 100644
--- a/packages/website/src/llms.ts
+++ b/packages/website/src/llms.ts
@@ -6,13 +6,15 @@ const SITE_URL = "https://paseo.sh";
 
 const PRODUCT_PREAMBLE = `# Paseo
 
-> Mobile and desktop app for monitoring and controlling your local AI coding agents from anywhere. Your dev environment, in your pocket.
+> Open source agentic development environment for desktop, mobile, web, and CLI.
 
-Paseo is an open source application that lets you run AI coding agents on your own machine and drive them from your phone, desktop, browser, or terminal. Your code stays local — Paseo connects directly to your real development environment instead of running agents in someone else's cloud.
+Paseo is a full agentic development environment. For agent-driven development, it replaces your IDE: run coding agents, edit files, review diffs and pull requests, run tests in terminals, and check your app in the built-in desktop browser. Arrange agents, files, terminals, and browser tabs in split panes within a workspace.
 
-A self-hosted daemon manages agent lifecycle, exposes a WebSocket API, and ships with an MCP server so other agents can talk to it. Native apps for iOS, Android, macOS, Windows, Linux, and the web let you launch sessions, watch them work, review diffs, and ship from anywhere. A Docker-style CLI ("paseo run", "paseo ls", "paseo logs", "paseo wait") gives you scripting access. An end-to-end encrypted relay lets the mobile app reach your daemon over the public internet without exposing it.
+Run many agents in parallel, each in its own git worktree and branch. Choose a provider and model for each task, inspect the results, and decide what to merge. Agents can also create worktrees, launch other agents, and communicate with them through Paseo's orchestration tools.
 
-Paseo supports every major coding agent: Claude Code, Codex, GitHub Copilot, OpenCode, Antigravity, Muse Code, Cursor, Gemini, Cline, Goose, Amp, Aider, and 30+ others. Each agent runs as its own process; Paseo handles I/O, persistence, git worktree isolation, schedules, and skills.
+Agents run on your own machines with your existing tools, configuration, and credentials. Work from desktop, the full native iOS and Android app, a web browser, or the CLI. The desktop app starts its local daemon automatically. For remote work, run the daemon on another machine and connect directly or through the optional end-to-end encrypted relay.
+
+Paseo supports Claude Code, Codex, GitHub Copilot, OpenCode, Pi, Antigravity, Muse Code, and additional ACP-compatible agents. The CLI, TypeScript SDK, and MCP tools expose agent and workspace operations for automation. Plugins extend providers, workflows, and the app's interface.
 
 Distribution: native apps for Mac, Windows, Linux, iOS, and Android; web app; Homebrew; npm. Source: Apache-2.0 at https://github.com/getpaseo/paseo. Marketing site: https://paseo.sh.
 `;
diff --git a/packages/website/src/routes/index.tsx b/packages/website/src/routes/index.tsx
index 39e7f64a7b..5f0bc664ae 100644
--- a/packages/website/src/routes/index.tsx
+++ b/packages/website/src/routes/index.tsx
@@ -17,16 +17,19 @@ function Home() {
     <LandingPage
       title={
         <>
-          The control plane
+          The agentic development
           <br />
-          for coding agents
+          environment
         </>
       }
       subtitle={
         <>
-          Run many coding agents at once, on your machines.
+          Run many coding agents at once,
+          <br className="sm:hidden" />
+          <span className="hidden sm:inline"> </span>
+          on any machine.
           <br />
-          Desktop and mobile. Open source.
+          From your desk and from your phone.
         </>
       }
     />
diff --git a/public-docs/index.md b/public-docs/index.md
index 5aae08185f..bb735a7cb4 100644
--- a/public-docs/index.md
+++ b/public-docs/index.md
@@ -8,7 +8,7 @@ category: Getting started
 
 # Getting started
 
-Paseo runs your coding agents on your machine and gives you a mobile, desktop, web, and CLI client to drive them from anywhere. Three common ways to install.
+Paseo is an agentic development environment for running coding agents, editing files, reviewing changes, and testing your work. Agents run on your machines; desktop, mobile, web, and CLI clients let you work from anywhere. Choose how to install it below.
 
 ## Desktop app (recommended)
 
diff --git a/public-docs/why.md b/public-docs/why.md
index 44ac4a90c9..8b3d0d8531 100644
--- a/public-docs/why.md
+++ b/public-docs/why.md
@@ -1,6 +1,6 @@
 ---
 title: Why Paseo?
-description: What Paseo is, what it isn't, and how it fits into your workflow.
+description: A full agentic development environment for running coding agents, editing files, reviewing changes, and testing your work.
 nav: Why Paseo?
 order: 2
 category: Getting started
@@ -8,38 +8,36 @@ category: Getting started
 
 # Why Paseo?
 
-Paseo is a self-hostable platform for running and orchestrating coding agents. It runs the agent CLIs you already use, on the hardware you already have, and gives you a UI, CLI, and API to drive them from anywhere.
+Paseo is a full agentic development environment. Run coding agents, edit files, review diffs and pull requests, and test your app with terminals and a built-in desktop browser. For agent-driven development, Paseo replaces your IDE: take a task from the first prompt through review and testing in one app.
 
-## Architecture
+## Develop in one workspace
 
-- Daemon-client architecture. The daemon manages agents; clients (mobile, desktop, web, CLI) connect locally or over a relay. Remote access isn't an add-on.
-- macOS, Windows, and Linux are all primary targets. None of them are a port or an afterthought.
-- Mobile, desktop, and web are separate native clients. The mobile app is built in React Native, not a webview.
+Open the desktop app, choose a project and an agent, and start working. Keep the conversation, editor, terminal, diffs, and browser together in split panes. Run your app, inspect the result, and ask the agent for changes without leaving the workspace.
 
-## Providers
+The desktop app is available on macOS, Windows, and Linux. It starts and manages its local daemon automatically.
 
-- Bring your own. Use your Claude subscription, your OpenAI account, your own API keys, a self-hosted endpoint. Paseo doesn't proxy model calls.
-- Local voice stack. Speech-to-text and text-to-speech run on-device by default. OpenAI providers are configurable if you want cloud quality.
-- Open source. No telemetry on your code.
+## Run tasks in parallel
 
-## Where agents run
+Give independent tasks their own worktrees and branches. Run several agents at once, inspect each diff, test each implementation, and choose what to merge. Use the same provider for every task or choose a different provider and model for each.
 
-- Your laptop, a homelab, a company server. Same daemon, same client surface.
-- Any directory, git or not. Launch agents, merge locally, review the diff in the app.
-- GitHub PRs, checks, and reviews surface in the app when you want them. Not required.
+Configure [workspace scripts](/docs/worktrees#scripts-and-services) to start development servers with separate ports for each worktree. [Try the parallel development workflow](/docs/parallel-development).
 
-## Parallel work
+## Use your agents and tools
 
-- Splits and panes. Agents, terminals, and browsers side by side in one workspace.
-- Per-worktree services. Each worktree gets allocated ports for dev servers and databases, reachable through proxy URLs like `web.fix-auth.my-app.localhost` so they don't collide.
-- Multiple agents on the same repo via worktrees.
+Paseo runs the coding agents you already use, with your subscriptions, credentials, configuration, skills, and MCP servers. Your agents work with the files and tools on your machine. See [supported providers](/docs/supported-providers).
 
-## Automation
+Dictate tasks or use [voice mode](/docs/voice). Speech-to-text and text-to-speech run locally by default, with cloud providers available in settings.
 
-- The CLI exposes the same surface as the app. Anything in the UI is scriptable.
-- [Paseo tools](/docs/orchestration). Agents can drive Paseo themselves: create isolated workspaces, spawn subagents, open terminals, and send prompts.
-- [Hub](/docs/hub). A service you host that starts agents on your daemon when someone mentions you on GitHub, Slack, or Discord.
+## Continue from another device
 
-## What it isn't
+The daemon owns the running agents and workspaces. The desktop app connects to it locally; mobile, web, and CLI clients connect to the same environment. That separation lets you continue working from another device or run your environment on a server.
 
-Not a hosted agent, not an IDE, not a model provider. Paseo runs the CLIs you already use and stays out of the way.
+Use Paseo entirely on your laptop, or connect to another machine when you need it. The native iOS and Android app gives you agents, files, terminals, and diffs on your phone. The built-in browser runs in the desktop app. [Connect your devices](/docs/connectivity) directly or through the optional end-to-end encrypted relay.
+
+## Automate and extend your workflow
+
+Give agents [Paseo tools](/docs/orchestration) to create worktrees, launch other agents, send prompts, and collect results. Use the [CLI](/docs/cli) or [TypeScript SDK](/docs/sdk) to automate agent and workspace operations.
+
+[Plugins](/docs/plugins) add providers, workspace panels, commands, and workflows. [Hub](/docs/hub) connects external events to agents running on your machines.
+
+Paseo is open source under Apache-2.0, with no telemetry, tracking, or required Paseo account.

From 0fc6bf0c94b934f609588cb6af8b6484c278d599 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 22:55:19 +0200
Subject: [PATCH 057/270] fix(schedule): keep firing after a run that could not
 be recorded (#6334)

* fix(schedule): keep firing after a run that could not be recorded

A schedule whose running-run write failed stayed marked as running in
memory, so every later tick skipped it and run-once reported it as
already running until the daemon restarted. The running mark is now
cleared whenever the run ends, including when it could not be recorded,
and the next tick retries the due run.

* test(schedule): skip the unwritable-directory test as root

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/schedule/service.test.ts       | 40 ++++++++++-
 .../server/src/server/schedule/service.ts     | 68 ++++++++++---------
 2 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/packages/server/src/server/schedule/service.test.ts b/packages/server/src/server/schedule/service.test.ts
index 14e0221913..8e37d77e8a 100644
--- a/packages/server/src/server/schedule/service.test.ts
+++ b/packages/server/src/server/schedule/service.test.ts
@@ -1,4 +1,4 @@
-import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { chmod, mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
@@ -2867,6 +2867,44 @@ describe("ScheduleService", () => {
     expect(inspected.runs[0]?.error).toBe("network blip");
   });
 
+  // chmod cannot make a directory unwritable on Windows or for root.
+  test.skipIf(process.platform === "win32" || process.getuid?.() === 0)(
+    "fires again after a tick whose run could not be recorded",
+    async () => {
+      const service = createScheduleService({
+        paseoHome: tempDir,
+        logger: createTestLogger(),
+        agentManager: new AgentManager({ logger: createTestLogger() }),
+        agentStorage,
+        providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+        now: () => now,
+        runner: async () => ({ agentId: null, output: "ran" }),
+      });
+
+      const created = await service.create({
+        prompt: "ping target",
+        cadence: { type: "every", everyMs: 60_000 },
+        target: { type: "agent", agentId: "88888888-8888-4888-8888-888888888888" },
+      });
+
+      const schedulesDir = join(tempDir, "schedules");
+      now = new Date("2026-01-01T00:01:00.000Z");
+      await chmod(schedulesDir, 0o555);
+      try {
+        await expect(service.tick()).rejects.toThrow();
+      } finally {
+        await chmod(schedulesDir, 0o755);
+      }
+
+      await service.tick();
+
+      const inspected = await service.inspect(created.id);
+      expect(inspected.runs).toHaveLength(1);
+      expect(inspected.runs[0]?.status).toBe("succeeded");
+      expect(inspected.nextRunAt).toBe("2026-01-01T00:02:00.000Z");
+    },
+  );
+
   test("completes the schedule when a scheduled run targets an archived agent", async () => {
     const service = createScheduleService({
       paseoHome: tempDir,
diff --git a/packages/server/src/server/schedule/service.ts b/packages/server/src/server/schedule/service.ts
index 53d2432f88..9dcf27407a 100644
--- a/packages/server/src/server/schedule/service.ts
+++ b/packages/server/src/server/schedule/service.ts
@@ -694,42 +694,44 @@ export class ScheduleService {
   ): Promise<void> {
     const manual = options?.manual === true;
     this.runningScheduleIds.add(schedule.id);
-    const runId = randomUUID();
-    const runningRun: ScheduleRun = {
-      id: runId,
-      scheduledFor: manual ? now.toISOString() : (schedule.nextRunAt ?? now.toISOString()),
-      startedAt: now.toISOString(),
-      endedAt: null,
-      status: "running",
-      agentId: null,
-      output: null,
-      error: null,
-    };
-    const scheduleWithRun = await this.appendRunningRun(schedule.id, runningRun);
-
     try {
-      const result = await this.runner(scheduleWithRun, runId);
-      await this.finishRun({
-        scheduleId: schedule.id,
-        runId,
-        status: "succeeded",
-        agentId: result.agentId,
-        output: result.output,
-        error: null,
-        targetGone: false,
-        manual,
-      });
-    } catch (error) {
-      await this.finishRun({
-        scheduleId: schedule.id,
-        runId,
-        status: "failed",
+      const runId = randomUUID();
+      const runningRun: ScheduleRun = {
+        id: runId,
+        scheduledFor: manual ? now.toISOString() : (schedule.nextRunAt ?? now.toISOString()),
+        startedAt: now.toISOString(),
+        endedAt: null,
+        status: "running",
         agentId: null,
         output: null,
-        error: error instanceof Error ? error.message : String(error),
-        targetGone: error instanceof ScheduleTargetGoneError,
-        manual,
-      });
+        error: null,
+      };
+      const scheduleWithRun = await this.appendRunningRun(schedule.id, runningRun);
+
+      try {
+        const result = await this.runner(scheduleWithRun, runId);
+        await this.finishRun({
+          scheduleId: schedule.id,
+          runId,
+          status: "succeeded",
+          agentId: result.agentId,
+          output: result.output,
+          error: null,
+          targetGone: false,
+          manual,
+        });
+      } catch (error) {
+        await this.finishRun({
+          scheduleId: schedule.id,
+          runId,
+          status: "failed",
+          agentId: null,
+          output: null,
+          error: error instanceof Error ? error.message : String(error),
+          targetGone: error instanceof ScheduleTargetGoneError,
+          manual,
+        });
+      }
     } finally {
       this.runningScheduleIds.delete(schedule.id);
     }

From 33eb36c0210f3d79dd29596e4065805107f35605 Mon Sep 17 00:00:00 2001
From: "paseo-ai[bot]" <266920839+paseo-ai[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 21:04:20 +0000
Subject: [PATCH 058/270] fix: update lockfile signatures and Nix hash [skip
 ci]

---
 nix/npm-deps.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/npm-deps.hash b/nix/npm-deps.hash
index 1452d4bafb..79871d69b7 100644
--- a/nix/npm-deps.hash
+++ b/nix/npm-deps.hash
@@ -1 +1 @@
-sha256-AKY6OMZgHeyn/To/2zsmtfb5C4fKniUp8gvpEYaR7/o=
+sha256-aoYgGgEkqeeZJR7OOcSHuZEhBELkpyOGqHo4oEx7W88=

From 99fc204c55c8c1666477282eeba562ba87a3135f Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 8 Oct 2026 01:01:21 +0200
Subject: [PATCH 059/270] fix(opencode): browser screenshots reach OpenCode v2
 agents (#6330)

* fix(opencode): return browser screenshots to OpenCode v2 agents

The v2 bridge plugin passed a Paseo tool's MCP content straight to
OpenCode. OpenCode v2 tool content is text or a file, so the image block
from browser_screenshot was not valid output: the tool call never
completed and the turn failed.

Convert image blocks to file content with a data URI and keep text
blocks as they are.

Closes #6318

* fix(opencode): show v2 tool images as images, not base64 output

With the bridge now returning screenshots to OpenCode v2 as data URI
file content, the v2 timeline copied each file's URI into the tool
call's output, so the screenshot card showed the whole base64 string.

Keep data URI images out of the tool output, leave an "[image]"
placeholder, and emit each image after the tool call as image markdown,
the way Claude and Codex tool images are shown. History replay uses the
same mapping.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../agent/providers/opencode/bridge.test.ts   | 76 +++++++++++++++++++
 .../providers/opencode/v2/bridge-plugin.mjs   | 13 +++-
 .../providers/opencode/v2/timeline.test.ts    | 41 ++++++++++
 .../agent/providers/opencode/v2/timeline.ts   | 45 +++++++++--
 4 files changed, 168 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/server/agent/providers/opencode/bridge.test.ts b/packages/server/src/server/agent/providers/opencode/bridge.test.ts
index 13cd6aa4d8..7130ac13b9 100644
--- a/packages/server/src/server/agent/providers/opencode/bridge.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/bridge.test.ts
@@ -300,6 +300,82 @@ describe("OpenCodeBridge", () => {
     }
   });
 
+  test("v2 plugin returns a tool image as OpenCode file content", async () => {
+    const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-opencode-v2-image-"));
+    temporaryDirectories.push(paseoHome);
+    const png =
+      "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
+    const screenshot = {
+      name: "browser_screenshot",
+      title: "Browser screenshot",
+      description: "Captures the page.",
+      inputSchema: {},
+      async handler() {
+        return {
+          content: [
+            { type: "text", text: "Captured browser screenshot." },
+            { type: "image", data: png, mimeType: "image/png" },
+          ],
+        };
+      },
+    };
+    const tools = new Map([[screenshot.name, screenshot]]);
+    const catalog: PaseoToolCatalog = {
+      tools,
+      getTool: (name) => tools.get(name),
+      executeTool: async (name, input, context) =>
+        await tools.get(name)!.handler(input, context ?? {}),
+    };
+    const bridge = new OpenCodeBridge({ paseoHome, logger: createTestLogger() });
+    bridge.setManifestCatalog(catalog);
+    await bridge.start();
+    const release = bridge.bindSession({ sessionId: "session", env: {}, tools: catalog });
+    try {
+      const env = await bridge.decorateV2ServerEnv({});
+      const plugin = z
+        .object({
+          plugins: z.array(
+            z.object({
+              package: z.string(),
+              options: z.object({ baseUrl: z.string(), token: z.string() }),
+            }),
+          ),
+        })
+        .parse(JSON.parse(env.OPENCODE_CONFIG_CONTENT)).plugins[0]!;
+      const pluginTools = new Map<string, V2TestTool>();
+      const module: {
+        default: { setup(context: V2TestPluginContext): Promise<() => Promise<void>> };
+      } = await import(pathToFileURL(path.join(fileURLToPath(plugin.package), "server.js")).href);
+      const dispose = await module.default.setup({
+        options: plugin.options,
+        tool: {
+          transform: async (transform) => {
+            transform({ add: (tool) => pluginTools.set(tool.name, tool) });
+            return { dispose: async () => undefined };
+          },
+        },
+        session: {
+          context: async () => [],
+          get: async () => ({ parentID: undefined }),
+          hook: async () => ({ dispose: async () => undefined }),
+        },
+      });
+      const result = await pluginTools
+        .get("paseo_browser_screenshot")!
+        .execute({}, { sessionID: "session" });
+      expect(result).toMatchObject({
+        content: [
+          { type: "text", text: "Captured browser screenshot." },
+          { type: "file", mime: "image/png", uri: `data:image/png;base64,${png}` },
+        ],
+      });
+      await dispose();
+    } finally {
+      release();
+      await bridge.close();
+    }
+  });
+
   test("v2 structured output validates values and clears its tool on ordinary turns", async () => {
     const root = await mkdtemp(path.join(tmpdir(), "paseo-opencode-v2-structured-"));
     temporaryDirectories.push(root);
diff --git a/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs b/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs
index b14540a1c3..190e015d8e 100644
--- a/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs
+++ b/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs
@@ -45,7 +45,10 @@ export default {
               `/sessions/${encodeURIComponent(binding.sessionID)}/tools/${encodeURIComponent(definition.name)}`,
               input,
             );
-            return { content: result.content, metadata: { paseoTool: definition.name } };
+            return {
+              content: result.content.map(toOpenCodeContent),
+              metadata: { paseoTool: definition.name },
+            };
           },
         });
       }
@@ -65,3 +68,11 @@ export default {
     };
   },
 };
+
+// OpenCode tool content is text or a file; MCP images arrive as base64 data.
+function toOpenCodeContent(part) {
+  if (part.type === "image") {
+    return { type: "file", uri: `data:${part.mimeType};base64,${part.data}`, mime: part.mimeType };
+  }
+  return part;
+}
diff --git a/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts b/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts
index 1bbd86490a..9189f5d3c5 100644
--- a/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts
@@ -54,3 +54,44 @@ test("a completed edit carries the replaced and replacement text", () => {
     },
   ]);
 });
+
+test("a tool's image output is shown as an image, not as base64 in the tool output", () => {
+  const png =
+    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==";
+  const screenshot = assistant([
+    {
+      type: "tool",
+      id: "call-screenshot",
+      name: "paseo_browser_screenshot",
+      executed: false,
+      state: {
+        status: "completed",
+        input: {},
+        content: [
+          { type: "text", text: "Captured browser screenshot (1x1)." },
+          { type: "file", uri: `data:image/png;base64,${png}`, mime: "image/png" },
+        ],
+        metadata: {},
+      },
+      time: { created: 2, ran: 2, completed: 2 },
+    },
+  ]);
+  const timeline = new V2Timeline();
+
+  const events = timeline.messages([screenshot]);
+
+  expect(JSON.stringify(events)).not.toContain(png);
+  expect(events.map((event) => event.type === "timeline" && event.item)).toMatchObject([
+    {
+      type: "tool_call",
+      name: "paseo_browser_screenshot",
+      status: "completed",
+      detail: { output: "Captured browser screenshot (1x1).\n[image]" },
+    },
+    {
+      type: "assistant_message",
+      text: expect.stringMatching(/^!\[Image\]\(file:\/\/.*paseo-attachments.*\.png\)$/),
+    },
+  ]);
+  expect(timeline.messages([screenshot])).toEqual([]);
+});
diff --git a/packages/server/src/server/agent/providers/opencode/v2/timeline.ts b/packages/server/src/server/agent/providers/opencode/v2/timeline.ts
index 3bc0a5bf76..c58316df9e 100644
--- a/packages/server/src/server/agent/providers/opencode/v2/timeline.ts
+++ b/packages/server/src/server/agent/providers/opencode/v2/timeline.ts
@@ -1,4 +1,8 @@
 import { mapOpencodeToolCall } from "../tool-call-mapper.js";
+import {
+  materializeProviderImage,
+  renderProviderImageOutputAsAssistantMarkdown,
+} from "../../provider-image-output.js";
 import type { SessionMessageAssistantTool } from "@opencode/client";
 import { STRUCTURED_OUTPUT_TOOL } from "./structured-output.js";
 import type { SessionMessageInfo } from "@opencode/client";
@@ -158,8 +162,21 @@ export class V2Timeline {
     const serialized = JSON.stringify(part);
     if (serialized === this.content.get(key)) return;
     this.content.set(key, serialized);
-    const item = toolFromV2(part);
+    const { output, images } = splitToolContent(part.state);
+    const item = toolFromV2(part, output);
     if (item) push(item);
+    // Images follow their tool call as markdown, as Claude and Codex emit them,
+    // so base64 never reaches the tool output.
+    images.forEach((image, index) => {
+      const imageKey = `${key}:image:${index}`;
+      if (this.content.has(imageKey)) return;
+      this.content.set(imageKey, "");
+      const imageItem = renderProviderImageOutputAsAssistantMarkdown(
+        { url: image.uri, mimeType: image.mime },
+        { materialize: materializeProviderImage },
+      );
+      if (imageItem) push(imageItem);
+    });
   }
 
   private compactionMessage(
@@ -187,12 +204,28 @@ interface TextPartIdentity {
 interface TextPartDelta extends TextPartIdentity {
   delta: string;
 }
-function toolFromV2(tool: SessionMessageAssistantTool): AgentTimelineItem | null {
+function splitToolContent(state: SessionMessageAssistantTool["state"]): {
+  output: string | undefined;
+  images: { uri: string; mime: string }[];
+} {
+  if (!("content" in state) || !state.content) return { output: undefined, images: [] };
+  const images: { uri: string; mime: string }[] = [];
+  const output = state.content
+    .map((part) => {
+      if (part.type === "text") return part.text;
+      if (!part.uri.startsWith("data:image/")) return part.uri;
+      images.push(part);
+      return "[image]";
+    })
+    .join("\n");
+  return { output, images };
+}
+
+function toolFromV2(
+  tool: SessionMessageAssistantTool,
+  output: string | undefined,
+): AgentTimelineItem | null {
   const state = tool.state;
-  const output =
-    "content" in state
-      ? state.content?.map((part) => (part.type === "text" ? part.text : part.uri)).join("\n")
-      : undefined;
   return mapOpencodeToolCall({
     toolName: tool.name,
     callId: tool.id,

From 23d7a089e228862478972895279d4caeb6c591db Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 8 Oct 2026 11:15:14 +0100
Subject: [PATCH 060/270] fix(website): keep plugin carousels from widening the
 mobile page (#6367)

Anchor the absolutely positioned screen reader install label to its count. Without a containing block inside the carousel, the invisible label escapes the scroll container and expands the document.
---
 packages/website/e2e/plugins.spec.ts          | 35 +++++++++++++++++++
 .../website/src/plugins/install-count.tsx     |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 26c0d9619a..93da12f78f 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -15,6 +15,41 @@ function pluginCards(page: Page, section: string): Locator {
     .filter({ hasNotText: /^See all$/ });
 }
 
+test("scrolls mobile plugin carousels without widening the page", async ({ page }) => {
+  await page.setViewportSize({ width: 390, height: 844 });
+  await openPlugins(page);
+  await expectPageWithinViewport(page);
+  await scrollPluginCarousel(page, "Featured");
+  await scrollPluginCarousel(page, "What’s new");
+  await expectPageWithinViewport(page);
+});
+
+async function expectPageWithinViewport(page: Page) {
+  expect(await page.evaluate(() => document.documentElement.scrollWidth)).toBeLessThanOrEqual(
+    await page.evaluate(() => document.documentElement.clientWidth),
+  );
+  await page.evaluate(() => window.scrollTo({ left: 1000, behavior: "instant" }));
+  expect(await page.evaluate(() => window.scrollX)).toBe(0);
+}
+
+async function scrollPluginCarousel(page: Page, section: string) {
+  const cards = pluginCards(page, section);
+  // The cards share a non-semantic scrolling container.
+  const strip = cards.first().locator("..");
+  await strip.evaluate((element) =>
+    element.scrollIntoView({ block: "center", behavior: "instant" }),
+  );
+  expect(await strip.evaluate((element) => element.scrollWidth)).toBeGreaterThan(
+    await strip.evaluate((element) => element.clientWidth),
+  );
+  await expect(cards.last()).not.toBeInViewport();
+  await strip.evaluate((element) =>
+    element.scrollTo({ left: element.scrollWidth, behavior: "instant" }),
+  );
+  await expect(cards.last()).toBeInViewport({ ratio: 1 });
+  await expect(cards.first()).not.toBeInViewport();
+}
+
 test("browses from the directory into a category, a plugin, and its author", async ({
   page,
   context,
diff --git a/packages/website/src/plugins/install-count.tsx b/packages/website/src/plugins/install-count.tsx
index 4867415596..198905ddea 100644
--- a/packages/website/src/plugins/install-count.tsx
+++ b/packages/website/src/plugins/install-count.tsx
@@ -4,7 +4,7 @@ import { formatInstalls } from "./registry";
 /** An install count as a download icon and the number; inherits the surrounding text style. */
 export function InstallCount({ count }: { count: number }) {
   return (
-    <span className="inline-flex items-center gap-1 tabular-nums">
+    <span className="relative inline-flex items-center gap-1 tabular-nums">
       <Download aria-hidden className="h-3 w-3" />
       {formatInstalls(count)}
       <span className="sr-only">installs</span>

From f943e790b6943cd7cef078a1c68ef5ebaea56071 Mon Sep 17 00:00:00 2001
From: az33zy <10743275+az33zy@users.noreply.github.com>
Date: Thu, 8 Oct 2026 15:23:30 +0500
Subject: [PATCH 061/270] fix(usage): tint the OpenCode usage icon through
 currentColor (#6362)

---
 plugins/opencode-go-usage-source/icon.svg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/opencode-go-usage-source/icon.svg b/plugins/opencode-go-usage-source/icon.svg
index 79991973d6..7e76235008 100644
--- a/plugins/opencode-go-usage-source/icon.svg
+++ b/plugins/opencode-go-usage-source/icon.svg
@@ -1,6 +1,6 @@
 <svg width="54" height="30" viewBox="0 0 54 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M24 30H0V0H24V6H6V24H18V18H12V12H24V30Z" fill="#211E1E"/>
-<path d="M12 18H18V24H6V12H12V18Z" fill="#CFCECD"/>
-<path d="M48 12V24H36V12H48Z" fill="#CFCECD"/>
-<path d="M54 30H30V0H54V30ZM36 24H48V6H36V24Z" fill="#211E1E"/>
+<path d="M24 30H0V0H24V6H6V24H18V18H12V12H24V30Z" fill="currentColor"/>
+<path d="M12 18H18V24H6V12H12V18Z" fill="currentColor" fill-opacity="0.4"/>
+<path d="M48 12V24H36V12H48Z" fill="currentColor" fill-opacity="0.4"/>
+<path d="M54 30H30V0H54V30ZM36 24H48V6H36V24Z" fill="currentColor"/>
 </svg>

From 06fe97c9019c1db4a5264dfb9b369b93e5e2fba4 Mon Sep 17 00:00:00 2001
From: Leandro Ardissone <lardissone@gmail.com>
Date: Thu, 8 Oct 2026 07:33:32 -0300
Subject: [PATCH 062/270] fix(server): keep home directory search out of
 ~/Library on macOS (#5789)

Discovery from the home directory walked into ~/Library, where readdir on
TCC-protected group containers blocks forever for a daemon that cannot show
a consent prompt. Each blocked call holds a libuv threadpool thread, so a few
searches wedged every fs operation in the daemon.

- Add an excludedDiscoveryPaths option; discovery skips those paths, while
  exact typed paths still resolve and browsing inside lists one level.
- Resolve rooted typed paths directly and anchor the walk under an existing
  typed parent instead of walking the whole home directory.

Refs #4879
---
 packages/server/src/server/session.ts         | 10 +-
 .../src/utils/directory-suggestions.test.ts   | 99 +++++++++++++++++++
 .../server/src/utils/directory-suggestions.ts | 92 ++++++++++++++---
 3 files changed, 188 insertions(+), 13 deletions(-)

diff --git a/packages/server/src/server/session.ts b/packages/server/src/server/session.ts
index d57333da05..eabc809028 100644
--- a/packages/server/src/server/session.ts
+++ b/packages/server/src/server/session.ts
@@ -15,7 +15,7 @@ import equal from "fast-deep-equal";
 import { SessionDelivery, type OwnedSubscription } from "./session/owned-subscriptions/index.js";
 import { v4 as uuidv4 } from "uuid";
 import { lstat, mkdir, mkdtemp, rename, rm, stat } from "node:fs/promises";
-import { basename, resolve, sep } from "path";
+import { basename, join, resolve, sep } from "path";
 import { homedir } from "node:os";
 import { CLIENT_CAPS, type ClientCapability } from "@getpaseo/protocol/client-capabilities";
 import { formatPluginSourceReference } from "@getpaseo/protocol/plugin-source-reference";
@@ -5056,8 +5056,13 @@ export class Session {
     try {
       const workspaceCwd = cwd?.trim();
       const searchesWorkspace = Boolean(workspaceCwd);
+      const homeRoot = process.env.HOME ?? homedir();
+      // readdir on TCC-protected folders under ~/Library blocks forever for a process that cannot
+      // show a consent prompt, and each blocked call holds a libuv threadpool thread.
+      const excludedDiscoveryPaths =
+        !searchesWorkspace && process.platform === "darwin" ? [join(homeRoot, "Library")] : [];
       const entries = await searchDirectoryEntries({
-        root: workspaceCwd ? expandTilde(workspaceCwd) : (process.env.HOME ?? homedir()),
+        root: workspaceCwd ? expandTilde(workspaceCwd) : homeRoot,
         query,
         pathFormat: searchesWorkspace ? "relative" : "absolute",
         pathQueryPolicy: searchesWorkspace ? "slashes" : "rooted",
@@ -5068,6 +5073,7 @@ export class Session {
           : [],
         confidentResultScanThreshold: searchesWorkspace ? undefined : 5_000,
         respectGitIgnore: searchesWorkspace,
+        excludedDiscoveryPaths,
         includeFiles,
         includeDirectories,
         matchMode,
diff --git a/packages/server/src/utils/directory-suggestions.test.ts b/packages/server/src/utils/directory-suggestions.test.ts
index 68a2693562..711a721e48 100644
--- a/packages/server/src/utils/directory-suggestions.test.ts
+++ b/packages/server/src/utils/directory-suggestions.test.ts
@@ -697,6 +697,105 @@ describe("absolute directory-path configuration", () => {
   });
 });
 
+describe("home search with excluded discovery paths", () => {
+  let homeDir: string;
+  let libraryDir: string;
+
+  beforeEach(() => {
+    homeDir = realpathSync.native(mkdtempSync(path.join(tmpdir(), "directory-excluded-")));
+    libraryDir = path.join(homeDir, "Library");
+    mkdirSync(path.join(libraryDir, "sub", "match-me"), { recursive: true });
+    mkdirSync(path.join(homeDir, "projects", "other"), { recursive: true });
+  });
+
+  afterEach(() => {
+    rmSync(homeDir, { recursive: true, force: true });
+  });
+
+  function searchHome(query: string) {
+    return searchDirectoryEntries({
+      root: homeDir,
+      query,
+      pathFormat: "absolute",
+      includeDirectories: true,
+      includeFiles: false,
+      pathQueryPolicy: "rooted",
+      rootAliases: ["~"],
+      blankQueryBehavior: "none",
+      confidentResultScanThreshold: 5_000,
+      excludedDiscoveryPaths: [libraryDir],
+    }).then((entries) => entries.map((entry) => entry.path));
+  }
+
+  it("does not discover entries inside an excluded path", async () => {
+    await expect(searchHome("match")).resolves.toEqual([]);
+    await expect(searchHome("~")).resolves.toEqual([path.join(homeDir, "projects")]);
+  });
+
+  it("excludes by path, so a nested directory with the same name is still discovered", async () => {
+    const nested = path.join(homeDir, "projects", "game", "Library", "match-me");
+    mkdirSync(nested, { recursive: true });
+
+    await expect(searchHome("match")).resolves.toEqual([nested]);
+  });
+
+  // POSIX-only: creates and follows a symlink fixture.
+  it.skipIf(isWindows)("does not discover an excluded path through a symlink", async () => {
+    symlinkSync(path.join(libraryDir, "sub"), path.join(homeDir, "link"), "dir");
+
+    await expect(searchHome("match")).resolves.toEqual([]);
+  });
+
+  it("resolves an exact typed path inside an excluded path", async () => {
+    await expect(searchHome("~/Library/sub/match-me")).resolves.toEqual([
+      path.join(libraryDir, "sub", "match-me"),
+    ]);
+  });
+
+  it("lists one level when browsing inside an excluded path", async () => {
+    await expect(searchHome("~/Library/")).resolves.toEqual([
+      libraryDir,
+      path.join(libraryDir, "sub"),
+    ]);
+    await expect(searchHome("~/Library/su")).resolves.toEqual([path.join(libraryDir, "sub")]);
+  });
+});
+
+describe("rooted queries with a typed parent", () => {
+  let homeDir: string;
+
+  beforeEach(() => {
+    homeDir = realpathSync.native(mkdtempSync(path.join(tmpdir(), "directory-typed-parent-")));
+    mkdirSync(path.join(homeDir, "Developer", "pasta"), { recursive: true });
+    mkdirSync(path.join(homeDir, "Archive", "Developer", "pasta"), { recursive: true });
+  });
+
+  afterEach(() => {
+    rmSync(homeDir, { recursive: true, force: true });
+  });
+
+  it("walks only under the typed parent when it exists", async () => {
+    await expect(
+      searchAbsoluteDirectoryPaths({ homeDir, query: "~/Developer/pas" }),
+    ).resolves.toEqual([path.join(homeDir, "Developer", "pasta")]);
+  });
+
+  it("matches the whole tree when the typed parent does not exist", async () => {
+    await expect(searchAbsoluteDirectoryPaths({ homeDir, query: "~/Devel/pas" })).resolves.toEqual([
+      path.join(homeDir, "Developer", "pasta"),
+      path.join(homeDir, "Archive", "Developer", "pasta"),
+    ]);
+  });
+
+  it("returns the typed directory first", async () => {
+    mkdirSync(path.join(homeDir, "Developer", "pasta-extra"));
+
+    const results = await searchAbsoluteDirectoryPaths({ homeDir, query: "~/Developer/pasta" });
+
+    expect(results[0]).toBe(path.join(homeDir, "Developer", "pasta"));
+  });
+});
+
 describe("relative typed-entry configuration", () => {
   let tempRoot: string;
   let workspaceDir: string;
diff --git a/packages/server/src/utils/directory-suggestions.ts b/packages/server/src/utils/directory-suggestions.ts
index 049b1011ac..0a1a6c805d 100644
--- a/packages/server/src/utils/directory-suggestions.ts
+++ b/packages/server/src/utils/directory-suggestions.ts
@@ -33,6 +33,9 @@ export interface SearchDirectoryEntriesOptions {
   maxEntriesScanned?: number;
   confidentResultScanThreshold?: number;
   respectGitIgnore?: boolean;
+  // Absolute paths that discovery never walks into. A path the caller types explicitly still
+  // resolves, and browsing inside one lists a single level at a time.
+  excludedDiscoveryPaths?: readonly string[];
 }
 
 interface QueryPlan {
@@ -55,6 +58,11 @@ interface RawChildEntry {
   kind: DirectorySuggestionKind | "symlink";
 }
 
+interface WalkStart {
+  visiblePath: string;
+  resolvedPath: string;
+}
+
 interface TraversedEntry extends ChildEntry {
   visiblePath: string;
   depth: number;
@@ -174,29 +182,64 @@ export async function searchDirectoryEntries(
   const gitIgnoredPaths = options.respectGitIgnore
     ? await loadGitIgnoredPaths(root)
     : new Set<string>();
-  const input = buildSearchInput(options, root, gitIgnoredPaths);
+  const excludedDiscoveryPaths = await resolveExistingPaths(options.excludedDiscoveryPaths ?? []);
+  const input = buildSearchInput(options, root, gitIgnoredPaths, excludedDiscoveryPaths);
   if (!input) return [];
 
   const exact =
-    input.plan.browseExactPath || (input.matchMode === "suffix" && input.plan.isPathQuery)
+    input.plan.browseExactPath ||
+    (input.plan.isPathQuery && (input.matchMode === "suffix" || resolvesTypedPath(input)))
       ? await findExactEntry(input)
       : null;
   if (exact && input.limit === 1) return [exact];
 
-  const browsesRoot = input.plan.isPathQuery && !input.plan.normalizedQuery;
-  const browsesAbsoluteParent = input.plan.browseExactPath === true;
-  const ranked =
-    browsesRoot || browsesAbsoluteParent ? await searchChildren(input) : await searchTree(input);
+  const ranked = await searchCandidates(input);
   const results = sortAndFormat(ranked, input.root, input.pathFormat).slice(0, input.limit);
   return exact
     ? [exact, ...results.filter((entry) => !sameEntry(entry, exact))].slice(0, input.limit)
     : results;
 }
 
+async function searchCandidates(input: SearchInput): Promise<RankedEntry[]> {
+  const browsesRoot = input.plan.isPathQuery && !input.plan.normalizedQuery;
+  const browsesAbsoluteParent = input.plan.browseExactPath === true;
+  if (browsesRoot || browsesAbsoluteParent) return searchChildren(input);
+  if (!resolvesTypedPath(input) || !input.plan.parentPart) return searchTree(input);
+
+  // A typed parent such as `~/Developer/pas` anchors the walk under `~/Developer`. A parent that
+  // does not exist falls back to matching the typed path against the whole tree.
+  const typedParent = await resolveTypedParent(input);
+  if (!typedParent) return searchTree(input);
+  if (isInsideExcludedPath(typedParent.resolvedPath, input)) return searchChildren(input);
+  return searchTree(input, typedParent);
+}
+
+// Only a rooted query under the rooted policy names a location. Under the slashes policy a query
+// with a slash is still a fragment that may match anywhere in the tree.
+function resolvesTypedPath(input: SearchInput): boolean {
+  return input.pathQueryPolicy === "rooted" && input.plan.isPathQuery;
+}
+
+async function resolveTypedParent(input: SearchInput): Promise<WalkStart | null> {
+  const visiblePath = path.resolve(input.root, input.plan.parentPart);
+  const resolvedPath = await realpath(visiblePath).catch(() => null);
+  if (!resolvedPath || !isPathInsideRoot(input.root, resolvedPath)) return null;
+  const info = await stat(resolvedPath).catch(() => null);
+  return info?.isDirectory() ? { visiblePath, resolvedPath } : null;
+}
+
+async function resolveExistingPaths(paths: readonly string[]): Promise<Set<string>> {
+  const resolved = await Promise.all(
+    paths.map((candidate) => realpath(path.resolve(candidate)).catch(() => null)),
+  );
+  return new Set(resolved.filter((candidate): candidate is string => candidate !== null));
+}
+
 function buildSearchInput(
   options: SearchDirectoryEntriesOptions,
   root: string,
   gitIgnoredPaths: Set<string>,
+  excludedDiscoveryPaths: Set<string>,
 ): SearchInput | null {
   const includeDirectories = options.includeDirectories ?? true;
   const includeFiles = options.includeFiles ?? false;
@@ -218,6 +261,7 @@ function buildSearchInput(
     includeDirectories,
     includeFiles,
     matchMode: options.matchMode ?? "fuzzy",
+    pathQueryPolicy: options.pathQueryPolicy ?? "slashes",
     pathFormat: options.pathFormat,
     hiddenDirectoryNames: new Set(options.traversableHiddenDirectoryNames ?? []),
     limit: normalizeLimit(options.limit),
@@ -225,6 +269,7 @@ function buildSearchInput(
     maxEntriesScanned: options.maxEntriesScanned ?? DEFAULT_MAX_ENTRIES_SCANNED,
     confidentResultScanThreshold: options.confidentResultScanThreshold,
     gitIgnoredPaths,
+    excludedDiscoveryPaths,
   };
 }
 
@@ -252,6 +297,7 @@ interface SearchInput {
   includeDirectories: boolean;
   includeFiles: boolean;
   matchMode: DirectorySuggestionMatchMode;
+  pathQueryPolicy: PathQueryPolicy;
   pathFormat: DirectorySuggestionPathFormat;
   hiddenDirectoryNames: Set<string>;
   limit: number;
@@ -259,6 +305,7 @@ interface SearchInput {
   maxEntriesScanned: number;
   confidentResultScanThreshold: number | undefined;
   gitIgnoredPaths: Set<string>;
+  excludedDiscoveryPaths: Set<string>;
 }
 
 async function searchChildren(input: SearchInput): Promise<RankedEntry[]> {
@@ -266,9 +313,13 @@ async function searchChildren(input: SearchInput): Promise<RankedEntry[]> {
   const parent = await realpath(visibleParent).catch(() => null);
   if (!parent || !isPathInsideRoot(input.root, parent)) return [];
   if (isGitIgnoredPath(parent, input)) return [];
+  // Browsing inside an excluded path is explicit: the caller typed it, so list what is there.
+  const discoveryInput = isInsideExcludedPath(parent, input)
+    ? { ...input, excludedDiscoveryPaths: new Set<string>() }
+    : input;
   const entries = await readChildren(parent);
   return entries.flatMap((entry) => {
-    if (!isPathInsideRoot(input.root, entry.resolvedPath) || !shouldDiscover(entry, input))
+    if (!isPathInsideRoot(input.root, entry.resolvedPath) || !shouldDiscover(entry, discoveryInput))
       return [];
     const candidate: TraversedEntry = {
       ...entry,
@@ -279,17 +330,20 @@ async function searchChildren(input: SearchInput): Promise<RankedEntry[]> {
   });
 }
 
-async function searchTree(input: SearchInput): Promise<RankedEntry[]> {
+async function searchTree(
+  input: SearchInput,
+  start: WalkStart = { visiblePath: input.root, resolvedPath: input.root },
+): Promise<RankedEntry[]> {
   if (!(input.maxEntriesScanned > 0)) return [];
-  const roots = (await readChildren(input.root)).filter((entry) =>
+  const roots = (await readChildren(start.resolvedPath)).filter((entry) =>
     staysInsideRoot(entry, input.root),
   );
-  const visited = new Set<string>([input.root]);
+  const visited = new Set<string>([start.resolvedPath]);
   const branches = roots.flatMap((entry) =>
     shouldDiscover(entry, input)
       ? [
           walkBranch(
-            { ...entry, visiblePath: path.join(input.root, entry.name), depth: 1 },
+            { ...entry, visiblePath: path.join(start.visiblePath, entry.name), depth: 1 },
             input,
             visited,
           ),
@@ -370,6 +424,7 @@ function staysInsideRoot(entry: ChildEntry, root: string): boolean {
 
 function shouldDiscover(entry: ChildEntry, input: SearchInput): boolean {
   if (isNewlyGitIgnored(entry, input)) return false;
+  if (isNewlyExcluded(entry, input)) return false;
   if (entry.kind === "file") {
     return input.includeFiles && !entry.name.startsWith(".");
   }
@@ -386,6 +441,21 @@ function isNewlyGitIgnored(entry: ChildEntry, input: SearchInput): boolean {
   return input.gitIgnoredPaths.has(entry.resolvedPath);
 }
 
+// Same reasoning as Git-ignored paths: only a symlink can land inside an excluded path without
+// first passing through it by name.
+function isNewlyExcluded(entry: ChildEntry, input: SearchInput): boolean {
+  if (input.excludedDiscoveryPaths.size === 0) return false;
+  if (entry.viaSymlink) return isInsideExcludedPath(entry.resolvedPath, input);
+  return input.excludedDiscoveryPaths.has(entry.resolvedPath);
+}
+
+function isInsideExcludedPath(absolutePath: string, input: SearchInput): boolean {
+  for (const excludedPath of input.excludedDiscoveryPaths) {
+    if (isPathInsideRoot(excludedPath, absolutePath)) return true;
+  }
+  return false;
+}
+
 function isGitIgnoredPath(absolutePath: string, input: SearchInput): boolean {
   let candidate = absolutePath;
   while (candidate !== input.root && isPathInsideRoot(input.root, candidate)) {

From d0bc188a5b1be72f170f7db850716b7006f12f7e Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 8 Oct 2026 14:42:34 +0100
Subject: [PATCH 063/270] Show agent messages and completion notifications with
 sender identity (#6373)

* feat(agents): show agent messages and completion notifications with sender identity

* fix(agents): preserve human envelope examples and attachment context

* fix(agents): separate message provenance from timeline presentation
---
 docs/timeline-sync.md                         |  24 ++-
 packages/app/src/agent-stream/view.tsx        |   1 +
 packages/app/src/components/message.tsx       |  14 +-
 .../src/runtime/replica-cache/index.test.ts   |  33 +++
 .../app/src/runtime/replica-cache/index.ts    |   2 +
 .../app/src/tool-calls/presentation.test.ts   |  39 ++++
 packages/app/src/tool-calls/presentation.ts   |  19 +-
 packages/app/src/types/stream.test.ts         |  25 +++
 packages/app/src/types/stream.ts              |   3 +
 packages/cli/src/commands/agent/send.ts       |   5 +-
 packages/client/src/daemon-client.test.ts     |  46 +++++
 packages/client/src/daemon-client.ts          |   8 +
 .../protocol/src/agent-message-display.ts     |  25 +++
 packages/protocol/src/agent-message.ts        |  13 ++
 packages/protocol/src/agent-types.ts          |   2 +
 packages/protocol/src/messages.test.ts        |  28 +++
 packages/protocol/src/messages.ts             |   5 +
 packages/protocol/src/tool-call-display.ts    |   6 +-
 .../src/server/agent/agent-manager.test.ts    | 177 +++++++++++++++-
 .../server/src/server/agent/agent-manager.ts  |  67 +++---
 .../src/server/agent/agent-messages/index.ts  | 191 ++++++++++++++++++
 .../src/server/agent/agent-prompt.test.ts     | 125 ++++++++++--
 .../server/src/server/agent/agent-prompt.ts   |  64 +++---
 .../src/server/agent/create-agent/create.ts   |   9 +
 .../src/server/agent/mcp-server.test.ts       |  17 +-
 .../src/server/agent/tools/paseo-tools.ts     |   1 +
 .../server/src/server/schedule/service.ts     |   7 +-
 packages/server/src/server/session.ts         |  14 +-
 .../server/src/server/websocket-server.ts     |   1 +
 29 files changed, 877 insertions(+), 94 deletions(-)
 create mode 100644 packages/protocol/src/agent-message-display.ts
 create mode 100644 packages/protocol/src/agent-message.ts
 create mode 100644 packages/server/src/server/agent/agent-messages/index.ts

diff --git a/docs/timeline-sync.md b/docs/timeline-sync.md
index 8264fe2683..d1a770f219 100644
--- a/docs/timeline-sync.md
+++ b/docs/timeline-sync.md
@@ -223,7 +223,7 @@ submission. Overlapping sends settle independently rather than collapsing to one
 message.
 
 Daemons advertising `server_info.features.canonicalSubmittedPrompts` guarantee that every accepted
-prompt carrying a client message id is recorded and streamed as a canonical `user_message` with that
+human prompt carrying a client message id is recorded and streamed as a canonical `user_message` with that
 same id. This includes daemon-handled commands that do not allocate a foreground turn; their submitted
 row is recorded before handler output. The app tracks submission transactions only for hosts with this
 capability. Older hosts keep the shipped untracked optimistic-row behavior and roll that row back on RPC
@@ -238,11 +238,25 @@ foreground control ownership remains a separate daemon concern. Cancellation req
 with that record rather than in a React component, so an old request cannot clear a newer one. Submissions
 remain a separate pre-turn registry and retire on canonical acknowledgement.
 
-Canonical turns and visible responses are different boundaries. System-injected prompts are absent from
-the Paseo timeline, so one visible response can span several canonical turns without a user message
-between them. Layout and copy group that response together; lifecycle, timing, tool sequences, and exact
+Canonical turns and visible responses are different boundaries. Agent-originated prompts and lifecycle
+notifications project into tool rows, so they do not create a human-message boundary. Legacy system
+prompts, including schedule injections, remain hidden. One visible response can span several canonical
+turns; layout and copy group that response together while lifecycle, timing, tool sequences, and exact
 fork positions retain the canonical `turnId` boundaries.
 
+Agent-message XML belongs to the daemon's `agent/agent-messages` boundary. Prompt delivery encodes
+provenance; acceptance, provider echoes, import, and replay share its projection. The delivery ID is
+also the projected call ID, so a provider echo cannot create a second row. Sender IDs are opaque and
+do not imply local ownership or authorization. Capture the sender title at delivery: archived or
+removed senders must remain understandable without a live directory lookup.
+
+The optional `agentMessage` payload carries event, sender, and delivered text. Shared client
+presentation (`protocol/agent-message-display`) owns its heading and expanded details. The daemon
+must not construct UI labels or prepend sender labels to the semantic message body. The existing
+`tool_call` / `plain_text` envelope is a compatibility adapter: older clients still parse the row and
+expand its body. New clients use the typed payload, never infer the event from a tool name or parse
+XML. Stream reduction and disk-cache serialization preserve the payload without rendering it.
+
 The compatibility boundary for older daemons is snapshot normalization: running/idle status becomes an
 anonymous active turn or idle state once, and downstream code consumes the same activity shape. The app
 does not combine anonymous lifecycle events, timestamps, timeline rows, and resume coverage to infer a
@@ -250,7 +264,7 @@ second running state. Disconnect preserves the last replicated turn until cache
 advances it; replica removal remains the destructive close boundary. Elapsed time comes only from turn
 liveness, never from submission records or whichever timeline rows happen to be mounted.
 
-The daemon records one canonical submitted user row at acceptance. Its wire `messageId` is the
+For human prompts, the daemon records one canonical submitted user row at acceptance. Its wire `messageId` is the
 submission's `clientMessageId`, so the row is born with its final identity and remains immutable on
 the wire. A correlated provider echo records the provider's native identity internally without
 dispatching another timeline event. Rewind resolves the wire identity to that provider identity at
diff --git a/packages/app/src/agent-stream/view.tsx b/packages/app/src/agent-stream/view.tsx
index 12f628da4f..1e60240be9 100644
--- a/packages/app/src/agent-stream/view.tsx
+++ b/packages/app/src/agent-stream/view.tsx
@@ -792,6 +792,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
               detail={data.detail}
               cwd={context.cwd}
               metadata={data.metadata}
+              agentMessage={data.agentMessage}
               isLastInSequence={isLastInSequence}
               onOpenFilePath={handleToolCallOpenFile}
               maxDetailHeight={maxDetailHeight}
diff --git a/packages/app/src/components/message.tsx b/packages/app/src/components/message.tsx
index 583585b782..4587556ebe 100644
--- a/packages/app/src/components/message.tsx
+++ b/packages/app/src/components/message.tsx
@@ -1,3 +1,4 @@
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
 import { ASSISTANT_IMAGE_DEFAULT_ASPECT_RATIO } from "@/utils/assistant-image-metadata";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { TaskListRow } from "@/components/task-list-row";
@@ -3022,6 +3023,7 @@ function areExpandableBadgePropsEqual(previous: ExpandableBadgeProps, next: Expa
 }
 
 interface ToolCallProps {
+  agentMessage?: AgentMessage;
   toolName: string;
   args?: unknown;
   result?: unknown;
@@ -3041,6 +3043,7 @@ interface ToolCallProps {
 }
 
 export const ToolCall = memo(function ToolCall({
+  agentMessage,
   toolName,
   args,
   result,
@@ -3081,6 +3084,7 @@ export const ToolCall = memo(function ToolCall({
   const presentation = useMemo(
     () =>
       buildToolCallPresentation({
+        agentMessage,
         toolName,
         status,
         error: error ?? null,
@@ -3089,7 +3093,7 @@ export const ToolCall = memo(function ToolCall({
         cwd,
         resolveIcon: resolveToolCallIcon,
       }),
-    [toolName, status, error, effectiveDetail, metadata, cwd],
+    [toolName, status, error, effectiveDetail, metadata, cwd, agentMessage],
   );
   const handleOpenFile = useMemo(() => {
     const openFilePath = presentation.openFilePath;
@@ -3105,7 +3109,7 @@ export const ToolCall = memo(function ToolCall({
         toolName,
         displayName: presentation.displayName,
         summary: presentation.summary,
-        detail: effectiveDetail,
+        detail: presentation.detail,
         errorText: presentation.errorText,
         icon: presentation.icon,
         showLoadingSkeleton: presentation.isLoadingDetails,
@@ -3117,12 +3121,12 @@ export const ToolCall = memo(function ToolCall({
     shouldRenderInline,
     openToolCall,
     toolName,
+    presentation.detail,
     presentation.displayName,
     presentation.summary,
     presentation.errorText,
     presentation.icon,
     presentation.isLoadingDetails,
-    effectiveDetail,
   ]);
 
   useEffect(() => {
@@ -3158,7 +3162,7 @@ export const ToolCall = memo(function ToolCall({
     return (
       <ToolCallDetailsContent
         toolName={toolName}
-        detail={effectiveDetail}
+        detail={presentation.detail}
         errorText={presentation.errorText}
         maxHeight={maxDetailHeight}
         showLoadingSkeleton={presentation.isLoadingDetails}
@@ -3167,7 +3171,7 @@ export const ToolCall = memo(function ToolCall({
   }, [
     shouldRenderInline,
     toolName,
-    effectiveDetail,
+    presentation.detail,
     presentation.errorText,
     presentation.isLoadingDetails,
     maxDetailHeight,
diff --git a/packages/app/src/runtime/replica-cache/index.test.ts b/packages/app/src/runtime/replica-cache/index.test.ts
index bb21530a2b..76e9e66464 100644
--- a/packages/app/src/runtime/replica-cache/index.test.ts
+++ b/packages/app/src/runtime/replica-cache/index.test.ts
@@ -859,3 +859,36 @@ describe("ReplicaCache", () => {
     expect(storage.cleanups).toBe(1);
   });
 });
+
+it("retains semantic agent messages across disk-cache reconstruction", async () => {
+  const storage = new MemoryStorage();
+  const writer = createCache(storage);
+  const value = timeline();
+  value.items = [
+    {
+      kind: "tool_call",
+      id: "delivery",
+      timestamp: new Date(1),
+      timelineCursor: { epoch: "epoch-1", seq: 12 },
+      payload: {
+        source: "agent",
+        data: {
+          provider: "codex",
+          callId: "delivery",
+          name: "agent_message",
+          status: "completed",
+          error: null,
+          detail: { type: "plain_text", text: "Done" },
+          agentMessage: {
+            event: "finished",
+            sender: { id: "remote::worker", title: "Reviewer" },
+            text: "Done",
+          },
+        },
+      },
+    },
+  ];
+  writer.commitTimeline(SERVER_ID, "agent-1", value);
+  await writer.flush();
+  expect(await createCache(storage).readTimeline(SERVER_ID, "agent-1")).toEqual(value);
+});
diff --git a/packages/app/src/runtime/replica-cache/index.ts b/packages/app/src/runtime/replica-cache/index.ts
index ef78112a49..3fc8458551 100644
--- a/packages/app/src/runtime/replica-cache/index.ts
+++ b/packages/app/src/runtime/replica-cache/index.ts
@@ -421,6 +421,7 @@ function serializeAgentToolCall(data: AgentToolCallData): StoredToolCall {
     name: data.name,
     detail: data.detail,
     ...(data.metadata ? { metadata: data.metadata } : {}),
+    ...(data.agentMessage ? { agentMessage: data.agentMessage } : {}),
   };
   switch (data.status) {
     case "running":
@@ -584,6 +585,7 @@ function deserializeBuiltinTimelineItem(
             error: tool.error,
             detail: tool.detail,
             ...(tool.metadata ? { metadata: tool.metadata } : {}),
+            ...(tool.agentMessage ? { agentMessage: tool.agentMessage } : {}),
           },
         },
       };
diff --git a/packages/app/src/tool-calls/presentation.test.ts b/packages/app/src/tool-calls/presentation.test.ts
index 3caf235ace..fde0ba020f 100644
--- a/packages/app/src/tool-calls/presentation.test.ts
+++ b/packages/app/src/tool-calls/presentation.test.ts
@@ -92,3 +92,42 @@ describe("tool-call presentation", () => {
     expect(presentation.icon).toBe(fakeIcons.brain);
   });
 });
+
+it.each([
+  ["message", "Message from QA messenger"],
+  ["finished", "QA messenger finished"],
+  ["errored", "QA messenger errored"],
+  ["permission-required", "QA messenger needs permission"],
+  ["closed", "QA messenger closed"],
+] as const)("presents %s from structured provenance without a second label", (event, heading) => {
+  const presentation = buildToolCallPresentation({
+    toolName: "internal_name_should_not_be_visible",
+    status: "completed",
+    error: null,
+    detail: { type: "plain_text", label: "legacy summary", text: "legacy body" },
+    agentMessage: {
+      event,
+      sender: { id: "server::sender", title: "QA messenger" },
+      text: "The delivered message.",
+    },
+    resolveIcon: fakeResolveIcon,
+  });
+  expect(presentation.displayName).toBe(heading);
+  expect(presentation.summary).toBeUndefined();
+  expect(presentation.detail).toEqual({
+    type: "plain_text",
+    icon: "bot",
+    text: "From agent: server::sender\n\nThe delivered message.",
+  });
+});
+
+it("uses an opaque sender ID when no title is available", () => {
+  const presentation = buildToolCallPresentation({
+    toolName: "agent_message",
+    status: "completed",
+    error: null,
+    agentMessage: { event: "message", sender: { id: "remote::worker" }, text: "Hello" },
+    resolveIcon: fakeResolveIcon,
+  });
+  expect(presentation.displayName).toBe("Message from remote::worker");
+});
diff --git a/packages/app/src/tool-calls/presentation.ts b/packages/app/src/tool-calls/presentation.ts
index 3db13ccbbd..f25d752624 100644
--- a/packages/app/src/tool-calls/presentation.ts
+++ b/packages/app/src/tool-calls/presentation.ts
@@ -1,3 +1,5 @@
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
+import { buildAgentMessageDisplay } from "@getpaseo/protocol/agent-message-display";
 import type { PlanOutcome } from "@/components/plan-card";
 import type { ComponentType } from "react";
 import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
@@ -13,6 +15,7 @@ type ToolCallStatus = "executing" | "running" | "completed" | "failed" | "cancel
 export type ToolCallPresentationIcon = ComponentType<{ size?: number; color?: string }>;
 
 interface BuildToolCallPresentationInput {
+  agentMessage?: AgentMessage;
   toolName: string;
   status: ToolCallStatus;
   error: unknown;
@@ -23,6 +26,7 @@ interface BuildToolCallPresentationInput {
 }
 
 export interface ToolCallPresentation {
+  detail: ToolCallDetail | undefined;
   displayName: string;
   summary?: string;
   errorText?: string;
@@ -51,9 +55,13 @@ function displayDetail(detail: ToolCallDetail | undefined): ToolCallDetail {
 export function buildToolCallPresentation(
   input: BuildToolCallPresentationInput,
 ): ToolCallPresentation {
-  const detailForDisplay = displayDetail(input.detail);
+  const detail = input.agentMessage
+    ? buildAgentMessageDisplay(input.agentMessage).detail
+    : input.detail;
+  const detailForDisplay = displayDetail(detail);
   const displayModel = buildToolCallDisplayModel({
     name: input.toolName,
+    agentMessage: input.agentMessage,
     status: displayStatus(input.status),
     error: input.error ?? null,
     detail: detailForDisplay,
@@ -61,21 +69,22 @@ export function buildToolCallPresentation(
     cwd: input.cwd,
   });
   const isLoadingDetails = isPendingToolCallDetail({
-    detail: input.detail,
+    detail,
     status: input.status,
     error: input.error,
   });
-  const hasDetails = Boolean(input.error) || hasMeaningfulToolCallDetail(input.detail);
+  const hasDetails = Boolean(input.error) || hasMeaningfulToolCallDetail(detail);
 
   return {
+    detail,
     displayName: displayModel.displayName,
     summary: displayModel.summary,
     errorText: displayModel.errorText,
-    icon: input.resolveIcon(input.toolName, input.detail),
+    icon: input.resolveIcon(input.toolName, detail),
     isLoadingDetails,
     hasDetails,
     canOpenDetails: hasDetails || isLoadingDetails,
-    openFilePath: extractToolCallFilePath(input.detail),
+    openFilePath: extractToolCallFilePath(detail),
     isPlan: input.detail?.type === "plan",
     planOutcome: input.detail?.type === "plan" ? resolvePlanOutcome(input) : undefined,
   };
diff --git a/packages/app/src/types/stream.test.ts b/packages/app/src/types/stream.test.ts
index f33a9c524b..62e26698db 100644
--- a/packages/app/src/types/stream.test.ts
+++ b/packages/app/src/types/stream.test.ts
@@ -2305,3 +2305,28 @@ describe("notification timeline items", () => {
     expect(new Set(state.map((item) => item.id)).size).toBe(state.length);
   });
 });
+
+it("retains agent-message provenance through live delivery and repeated history", () => {
+  const agentMessage = {
+    event: "finished" as const,
+    sender: { id: "remote::worker", title: "Reviewer" },
+    text: "Done",
+  };
+  const event = {
+    type: "timeline",
+    provider: "codex",
+    item: {
+      type: "tool_call",
+      callId: "delivery",
+      name: "agent_message",
+      status: "completed",
+      error: null,
+      detail: { type: "plain_text", text: "Done" },
+      agentMessage,
+    },
+  } satisfies AgentStreamEventPayload;
+  const live = reduceStreamUpdate([], event, new Date(1));
+  const replay = reduceStreamUpdate(live, event, new Date(2));
+  expect(replay).toHaveLength(1);
+  expect(replay[0]).toMatchObject({ payload: { data: { agentMessage } } });
+});
diff --git a/packages/app/src/types/stream.ts b/packages/app/src/types/stream.ts
index 78789fa2d8..7b057b0c4c 100644
--- a/packages/app/src/types/stream.ts
+++ b/packages/app/src/types/stream.ts
@@ -1,3 +1,4 @@
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
 import type {
   AgentProvider,
   AgentTimelineItem,
@@ -745,6 +746,7 @@ interface OrchestratorToolCallData {
 }
 
 export interface AgentToolCallData {
+  agentMessage?: AgentMessage;
   provider: AgentProvider;
   callId: string;
   name: string;
@@ -1446,6 +1448,7 @@ function reduceTimelineToolCall(
       error: item.error,
       detail: item.detail,
       metadata: item.metadata,
+      ...(item.agentMessage ? { agentMessage: item.agentMessage } : {}),
     },
     timestamp,
     timelineCursor,
diff --git a/packages/cli/src/commands/agent/send.ts b/packages/cli/src/commands/agent/send.ts
index aa9b5a24cc..69e0c36d9d 100644
--- a/packages/cli/src/commands/agent/send.ts
+++ b/packages/cli/src/commands/agent/send.ts
@@ -192,7 +192,10 @@ export async function runSendCommand(
       options.image && options.image.length > 0 ? await readImageFiles(options.image) : undefined;
 
     // Send the message
-    await client.sendAgentMessage(agentIdArg, promptInput, { images });
+    await client.sendAgentMessage(agentIdArg, promptInput, {
+      images,
+      sourceAgentId: process.env.PASEO_AGENT_ID?.trim() || undefined,
+    });
 
     // If --no-wait, return immediately
     if (options.wait === false) {
diff --git a/packages/client/src/daemon-client.test.ts b/packages/client/src/daemon-client.test.ts
index d7ab645241..f1f8e0b5f8 100644
--- a/packages/client/src/daemon-client.test.ts
+++ b/packages/client/src/daemon-client.test.ts
@@ -7325,3 +7325,49 @@ test("usage request timeout detaches its update listener", async () => {
     vi.useRealTimers();
   }
 });
+
+test.each([false, true])(
+  "agent provenance requires host support=%s while human sends remain compatible",
+  async (supported) => {
+    const transport = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "provenance",
+      transportFactory: () => transport.transport,
+      reconnect: { enabled: false },
+    });
+    clients.push(client);
+    const connecting = client.connect();
+    transport.triggerOpen({ features: { agentMessageProvenance: supported } });
+    await connecting;
+    if (!supported) {
+      await expect(
+        client.sendAgentMessage("recipient", "review", { sourceAgentId: "server::sender" }),
+      ).rejects.toThrow("Update the Paseo host");
+      expect(transport.sent).toHaveLength(0);
+    }
+    const send = client.sendAgentMessage("recipient", "review", {
+      messageId: "delivery",
+      ...(supported ? { sourceAgentId: "server::sender" } : {}),
+    });
+    const request = parseSentFrame(transport.sent[0]);
+    expect(request).toMatchObject({
+      type: "send_agent_message_request",
+      text: "review",
+      messageId: "delivery",
+    });
+    expect(request.sourceAgentId).toBe(supported ? "server::sender" : undefined);
+    transport.triggerMessage(
+      wrapSessionMessage({
+        type: "send_agent_message_response",
+        payload: {
+          requestId: request.requestId,
+          agentId: "recipient",
+          accepted: true,
+          error: null,
+        },
+      }),
+    );
+    await send;
+  },
+);
diff --git a/packages/client/src/daemon-client.ts b/packages/client/src/daemon-client.ts
index 858c61e5b3..1b5851a821 100644
--- a/packages/client/src/daemon-client.ts
+++ b/packages/client/src/daemon-client.ts
@@ -424,6 +424,7 @@ export interface DaemonClientTrace {
 }
 
 export interface SendMessageOptions {
+  sourceAgentId?: string;
   messageId?: string;
   /** What happens when the agent is mid-turn. The daemon interrupts the turn when omitted. */
   activeTurnBehavior?: ActiveTurnBehavior;
@@ -3447,6 +3448,12 @@ export class DaemonClient {
     text: string,
     options?: SendMessageOptions,
   ): Promise<void> {
+    if (
+      options?.sourceAgentId &&
+      this.lastServerInfoMessage?.features?.agentMessageProvenance !== true
+    ) {
+      throw new Error("Update the Paseo host to send messages with agent provenance.");
+    }
     const requestId = this.createRequestId();
     const messageId = options?.messageId ?? crypto.randomUUID();
     const message = SessionInboundMessageSchema.parse({
@@ -3454,6 +3461,7 @@ export class DaemonClient {
       requestId,
       agentId,
       text,
+      sourceAgentId: options?.sourceAgentId,
       ...(messageId ? { messageId } : {}),
       ...(options?.activeTurnBehavior ? { activeTurnBehavior: options.activeTurnBehavior } : {}),
       ...(options?.images ? { images: options.images } : {}),
diff --git a/packages/protocol/src/agent-message-display.ts b/packages/protocol/src/agent-message-display.ts
new file mode 100644
index 0000000000..c95f9e8206
--- /dev/null
+++ b/packages/protocol/src/agent-message-display.ts
@@ -0,0 +1,25 @@
+import type { AgentMessage } from "./agent-message.js";
+import type { ToolCallDetail } from "./agent-types.js";
+
+/** Presentation shared by clients; never used to encode provider prompts. */
+export function buildAgentMessageDisplay(message: AgentMessage): {
+  displayName: string;
+  detail: ToolCallDetail;
+} {
+  const sender = message.sender.title ?? message.sender.id;
+  const headings: Record<AgentMessage["event"], string> = {
+    message: `Message from ${sender}`,
+    finished: `${sender} finished`,
+    errored: `${sender} errored`,
+    "permission-required": `${sender} needs permission`,
+    closed: `${sender} closed`,
+  };
+  return {
+    displayName: headings[message.event],
+    detail: {
+      type: "plain_text",
+      icon: "bot",
+      text: `From agent: ${message.sender.id}\n\n${message.text}`,
+    },
+  };
+}
diff --git a/packages/protocol/src/agent-message.ts b/packages/protocol/src/agent-message.ts
new file mode 100644
index 0000000000..5caf63656d
--- /dev/null
+++ b/packages/protocol/src/agent-message.ts
@@ -0,0 +1,13 @@
+import { z } from "zod";
+
+/** Semantic provenance, independent of provider envelopes and timeline presentation. */
+export const AgentMessageSchema = z.object({
+  event: z.enum(["message", "finished", "errored", "permission-required", "closed"]),
+  sender: z.object({
+    id: z.string().min(1),
+    title: z.string().min(1).optional(),
+  }),
+  text: z.string(),
+});
+
+export type AgentMessage = z.infer<typeof AgentMessageSchema>;
diff --git a/packages/protocol/src/agent-types.ts b/packages/protocol/src/agent-types.ts
index 5c0fce9608..c7fffe8ce9 100644
--- a/packages/protocol/src/agent-types.ts
+++ b/packages/protocol/src/agent-types.ts
@@ -1,3 +1,4 @@
+import type { AgentMessage } from "./agent-message.js";
 import type { AgentAttachment } from "./messages.js";
 
 export type AgentProvider = string;
@@ -311,6 +312,7 @@ export type ToolCallDetail =
     };
 
 interface ToolCallBase {
+  agentMessage?: AgentMessage;
   [key: string]: unknown;
   type: "tool_call";
   callId: string;
diff --git a/packages/protocol/src/messages.test.ts b/packages/protocol/src/messages.test.ts
index 3394c8e15f..ca3ab86135 100644
--- a/packages/protocol/src/messages.test.ts
+++ b/packages/protocol/src/messages.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, test } from "vitest";
 import {
+  AgentTimelineItemPayloadSchema,
   FileExplorerRequestSchema,
   PaseoWorktreeArchiveRequestSchema,
   parseServerInfoStatusPayload,
@@ -520,3 +521,30 @@ describe("viewed timeline subscription messages", () => {
     });
   });
 });
+
+test("agent messages are an optional semantic payload on existing tool rows", () => {
+  const legacy = {
+    type: "tool_call",
+    callId: "delivery",
+    name: "agent_message",
+    status: "completed",
+    error: null,
+    detail: { type: "plain_text", text: "Done" },
+  };
+  const agentMessage = {
+    event: "finished",
+    sender: { id: "server::worker", title: "Reviewer" },
+    text: "Done",
+  };
+  expect(AgentTimelineItemPayloadSchema.parse(legacy)).toEqual(legacy);
+  expect(AgentTimelineItemPayloadSchema.parse({ ...legacy, agentMessage })).toEqual({
+    ...legacy,
+    agentMessage,
+  });
+  expect(
+    AgentTimelineItemPayloadSchema.safeParse({
+      ...legacy,
+      agentMessage: { ...agentMessage, sender: { id: 42 } },
+    }).success,
+  ).toBe(false);
+});
diff --git a/packages/protocol/src/messages.ts b/packages/protocol/src/messages.ts
index 6f5e4abd3f..8b4030705b 100644
--- a/packages/protocol/src/messages.ts
+++ b/packages/protocol/src/messages.ts
@@ -1,3 +1,4 @@
+import { AgentMessageSchema } from "./agent-message.js";
 import { PluginRegistryIdentitySchema } from "./plugin-registry.js";
 import { AgentProfileSchema, AgentSkillSelectionSchema } from "./agent-profile.js";
 export {
@@ -625,6 +626,7 @@ const ToolCallDetailPayloadSchema: z.ZodType<ToolCallDetail, unknown> = z.discri
 );
 
 const ToolCallBasePayloadSchema = z.object({
+  agentMessage: AgentMessageSchema.optional(),
   type: z.literal("tool_call"),
   callId: z.string(),
   name: z.string(),
@@ -1354,6 +1356,8 @@ export const SendAgentMessageRequestSchema = z.object({
   /** Accepts full ID, unique prefix, or exact full title (server resolves). */
   agentId: z.string(),
   text: z.string(),
+  /** Opaque sender identity for agent-originated prompts. */
+  sourceAgentId: z.string().min(1).optional(),
   messageId: z.string().optional(), // Client-provided ID for deduplication
   activeTurnBehavior: ActiveTurnBehaviorSchema.optional(),
   images: z.array(ImageAttachmentSchema).optional(),
@@ -3695,6 +3699,7 @@ export const ServerInfoStatusPayloadSchema = z
         ownedSubscriptions: z.boolean().optional(),
         // COMPAT(canonicalSubmittedPrompts): added in v0.2.6, remove gate after 2027-01-30.
         canonicalSubmittedPrompts: z.boolean().optional(),
+        agentMessageProvenance: z.boolean().optional(),
         // COMPAT(agentTurnIdentity): accept peers that observed pre-release v0.2.6 through 2027-01-31.
         agentTurnIdentity: z.boolean().optional(),
         // COMPAT(stableProjectIdentity): added in v0.1.109, remove gate after 2027-01-15.
diff --git a/packages/protocol/src/tool-call-display.ts b/packages/protocol/src/tool-call-display.ts
index 6930fe187a..ab597b5acd 100644
--- a/packages/protocol/src/tool-call-display.ts
+++ b/packages/protocol/src/tool-call-display.ts
@@ -1,10 +1,11 @@
+import { buildAgentMessageDisplay } from "./agent-message-display.js";
 import type { ToolCallTimelineItem } from "./agent-types.js";
 import { getPaseoToolLeafName, isPaseoToolName } from "./tool-name-normalization.js";
 import { stripCwdPrefix } from "./path-utils.js";
 
 export type ToolCallDisplayInput = Pick<
   ToolCallTimelineItem,
-  "name" | "status" | "error" | "metadata" | "detail"
+  "name" | "status" | "error" | "metadata" | "detail" | "agentMessage"
 > & {
   cwd?: string;
 };
@@ -151,6 +152,9 @@ function buildUnknownDetailOverride(input: ToolCallDisplayInput): DetailDisplay
 }
 
 export function buildToolCallDisplayModel(input: ToolCallDisplayInput): ToolCallDisplayModel {
+  if (input.agentMessage) {
+    return { displayName: buildAgentMessageDisplay(input.agentMessage).displayName };
+  }
   const canonicalDisplay = buildCanonicalDetailDisplay(input);
   const unknownDetailOverride = buildUnknownDetailOverride(input);
   const displayName =
diff --git a/packages/server/src/server/agent/agent-manager.test.ts b/packages/server/src/server/agent/agent-manager.test.ts
index 6396fc589f..629159d51f 100644
--- a/packages/server/src/server/agent/agent-manager.test.ts
+++ b/packages/server/src/server/agent/agent-manager.test.ts
@@ -1,3 +1,8 @@
+import {
+  prepareAgentMessage,
+  formatAgentMessage,
+  formatSystemNotificationPrompt,
+} from "./agent-messages/index.js";
 import { expect, test, vi } from "vitest";
 import { spawn } from "node:child_process";
 import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
@@ -18,7 +23,7 @@ import { InMemoryAgentTimelineStore } from "./agent-timeline-store.js";
 import { toAgentPayload } from "./agent-projections.js";
 import { projectTimelineRows } from "./timeline-projection.js";
 import { getOpenAgentTabLabel, PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
-import { formatSystemNotificationPrompt, startAgentRun } from "./agent-prompt.js";
+import { startAgentRun } from "./agent-prompt.js";
 import { StaleProviderSessionError } from "./stale-provider-session-error.js";
 import { ensureAgentLoaded, ensureUnarchivedAgentLoaded } from "./agent-loading.js";
 import type { StoredAgentRecord } from "./agent-storage.js";
@@ -11467,3 +11472,173 @@ test("usage session is a pure read of the live adapter and disappears on close",
   }
   expect(manager.usageSession(agent.id)).toBeNull();
 });
+
+test.each(["live", "history"])(
+  "agent messages become notification tools during %s ingestion",
+  async (path) => {
+    const workdir = mkdtempSync(join(tmpdir(), "agent-message-provenance-"));
+    const storage = new AgentStorage(join(workdir, "agents"), logger);
+    const item: AgentTimelineItem = {
+      type: "user_message",
+      text: '<paseo-system version="1" kind="agent-message" source-agent-id="remote::sender" message-id="delivery-1">\nReview &lt;changes&gt; &amp; report back.\n</paseo-system>',
+      messageId: "provider-message",
+    };
+    const codex = fakeCodexEmitting(
+      path === "live" ? { turnItems: [item] } : { historyItems: [item] },
+    );
+    const manager = new AgentManager({ clients: { codex }, registry: storage, logger });
+    const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    if (path === "live") await manager.runAgent(agent.id, { text: "start" });
+    else await manager.hydrateTimelineFromProvider(agent.id, { force: true });
+    expect(manager.getTimeline(agent.id)).toContainEqual(
+      expect.objectContaining({
+        type: "tool_call",
+        callId: "paseo-agent-message:delivery-1",
+        agentMessage: {
+          event: "message",
+          sender: { id: "remote::sender" },
+          text: "Review <changes> & report back.",
+        },
+        name: "agent_message",
+        status: "completed",
+        detail: {
+          type: "plain_text",
+          icon: "bot",
+          text: "Review <changes> & report back.",
+        },
+      }),
+    );
+    expect(manager.getTimeline(agent.id).filter((entry) => entry.type === "user_message")).toEqual(
+      [],
+    );
+    expect(manager.getAgent(agent.id)?.lastUserMessageAt).toBeNull();
+  },
+);
+
+test.each([false, true])(
+  "accepted agent prompt appears once with provider echo=%s",
+  async (echo) => {
+    const workdir = mkdtempSync(join(tmpdir(), "agent-message-acceptance-"));
+    const delivery = prepareAgentMessage(
+      "Please review",
+      { kind: "agent-message", agentId: "remote::sender" },
+      "accepted-delivery",
+    );
+    const codex = fakeCodexEmitting({
+      turnItems: echo
+        ? [
+            {
+              type: "user_message",
+              text: String(delivery.prompt),
+              clientMessageId: delivery.messageId,
+              messageId: "native-echo",
+            },
+          ]
+        : [],
+    });
+    const manager = new AgentManager({ clients: { codex }, logger });
+    const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    try {
+      for await (const _event of manager.streamAgent(agent.id, delivery.prompt, {
+        clientMessageId: delivery.messageId,
+      })) {
+      }
+      expect(manager.getTimeline(agent.id).filter((item) => item.type === "tool_call")).toEqual([
+        expect.objectContaining({
+          callId: "paseo-agent-message:accepted-delivery",
+          status: "completed",
+        }),
+      ]);
+      expect(manager.getTimeline(agent.id).filter((item) => item.type === "user_message")).toEqual(
+        [],
+      );
+      expect(manager.getAgent(agent.id)?.lastUserMessageAt).toBeNull();
+    } finally {
+      await manager.closeAgent(agent.id);
+      rmSync(workdir, { recursive: true, force: true });
+    }
+  },
+);
+
+test("a rejected agent prompt never becomes a delivered notification", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-message-rejected-"));
+  const delivery = prepareAgentMessage(
+    "Please review",
+    { kind: "agent-message", agentId: "sender" },
+    "rejected",
+  );
+  class RejectingSession extends TestAgentSession {
+    override async startTurn(): Promise<{ turnId: string }> {
+      throw new Error("provider rejected delivery");
+    }
+  }
+  const client = new (class extends TestAgentClient {
+    override async createSession(config: AgentSessionConfig) {
+      return new RejectingSession(config);
+    }
+  })();
+  const manager = new AgentManager({ clients: { codex: client }, logger });
+  const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+    workspaceId: undefined,
+  });
+  try {
+    const run = manager.streamAgent(agent.id, delivery.prompt, {
+      clientMessageId: delivery.messageId,
+    });
+    await expect(run.next()).rejects.toThrow("provider rejected delivery");
+    expect(manager.getTimeline(agent.id).filter((item) => item.type === "tool_call")).toEqual([]);
+    expect(manager.getAgent(agent.id)?.lastUserMessageAt).toBeNull();
+  } finally {
+    await manager.closeAgent(agent.id);
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
+test.each([false, true])(
+  "human envelope examples remain human after echo with correlation=%s",
+  async (correlated) => {
+    const workdir = mkdtempSync(join(tmpdir(), "human-envelope-example-"));
+    const example = formatAgentMessage({
+      id: "example",
+      source: { kind: "agent-message", agentId: "sender" },
+      text: "hello",
+    });
+    const delivery = prepareAgentMessage(example, undefined, "human-submission");
+    const codex = fakeCodexEmitting({
+      turnItems: [
+        {
+          type: "user_message",
+          text: String(delivery.prompt),
+          messageId: "provider-echo",
+          ...(correlated ? { clientMessageId: "human-submission" } : {}),
+        },
+      ],
+    });
+    const manager = new AgentManager({ clients: { codex }, logger });
+    const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+      workspaceId: undefined,
+    });
+    try {
+      for await (const _event of manager.streamAgent(agent.id, delivery.prompt, {
+        clientMessageId: delivery.messageId,
+      })) {
+      }
+      expect(manager.getTimeline(agent.id)).toEqual([
+        {
+          type: "user_message",
+          text: example,
+          clientMessageId: "human-submission",
+          messageId: "human-submission",
+        },
+      ]);
+      expect(manager.getAgent(agent.id)?.lastUserMessageAt).toBeInstanceOf(Date);
+    } finally {
+      await manager.closeAgent(agent.id);
+      rmSync(workdir, { recursive: true, force: true });
+    }
+  },
+);
diff --git a/packages/server/src/server/agent/agent-manager.ts b/packages/server/src/server/agent/agent-manager.ts
index 9e809a457f..390717cf66 100644
--- a/packages/server/src/server/agent/agent-manager.ts
+++ b/packages/server/src/server/agent/agent-manager.ts
@@ -78,7 +78,7 @@ import {
   type PendingForegroundRun,
 } from "./agent-run-state.js";
 import { invokeRewindCapability, type RewindMode } from "./rewind/rewind.js";
-import { isSystemInjectedEnvelope } from "./agent-prompt.js";
+import { projectAgentMessage } from "./agent-messages/index.js";
 import { isStaleProviderSessionError } from "./stale-provider-session-error.js";
 import { stripInternalPaseoMcpServer, withRuntimePaseoMcpServer } from "./runtime-mcp-config.js";
 import { resolveCreateAgentTitles } from "./create-agent-title.js";
@@ -652,13 +652,12 @@ function buildExplicitTimelineSeedForRegister(
 function buildImportedTimelineRows(entries: readonly ImportedTimelineEntry[]): AgentTimelineRow[] {
   const rows: AgentTimelineRow[] = [];
   for (const entry of entries) {
-    if (entry.item.type === "user_message" && isSystemInjectedEnvelope(entry.item.text)) {
-      continue;
-    }
+    const item = projectAgentMessage(entry.item);
+    if (!item) continue;
     rows.push({
       seq: rows.length + 1,
       timestamp: entry.timestamp ?? new Date().toISOString(),
-      item: limitAgentTimelineItemContent(entry.item),
+      item: limitAgentTimelineItemContent(item),
     });
   }
   return rows;
@@ -3511,7 +3510,7 @@ export class AgentManager {
           // Legacy/imported chats need their existing history before startup rows.
           await this.primeTimelineFromLegacyProviderHistory(managed, false, startupHistory);
         } else {
-          for (const entry of session.initialTimeline) {
+          for (const entry of buildImportedTimelineRows(session.initialTimeline)) {
             this.recordTimeline(managed.id, entry.item, { timestamp: entry.timestamp });
           }
         }
@@ -4018,10 +4017,9 @@ export class AgentManager {
     for await (const rawEvent of agent.session.streamHistory()) {
       const event = limitAgentStreamEventContent(rawEvent);
       if (event.type === "timeline") {
-        if (event.item.type === "user_message" && isSystemInjectedEnvelope(event.item.text)) {
-          continue;
-        }
-        historyEvents.push(event);
+        const item = projectAgentMessage(event.item);
+        if (!item) continue;
+        historyEvents.push({ ...event, item });
       } else if (event.type === "provider_subagent") {
         providerSubagentEvents.push(event);
       }
@@ -4086,10 +4084,9 @@ export class AgentManager {
         if (event.type !== "timeline") {
           continue;
         }
-        if (event.item.type === "user_message" && isSystemInjectedEnvelope(event.item.text)) {
-          continue;
-        }
-        historyEvents.push(event);
+        const item = projectAgentMessage(event.item);
+        if (!item) continue;
+        historyEvents.push({ ...event, item });
       }
     } catch (error) {
       this.logger.warn({ err: error, agentId: agent.id }, "Failed to hydrate provider history");
@@ -4421,12 +4418,14 @@ export class AgentManager {
   }): Promise<void> {
     const { agent, event, options, flags } = params;
 
-    if (event.item.type === "user_message" && isSystemInjectedEnvelope(event.item.text)) {
+    const item = projectAgentMessage(event.item);
+    if (!item) {
       flags.shouldDispatchEvent = false;
       flags.shouldNotifyWaiters = false;
       return;
     }
 
+    event.item = item;
     if (
       event.item.type === "user_message" &&
       event.item.clientMessageId &&
@@ -4699,17 +4698,28 @@ export class AgentManager {
     clientMessageId: string,
     options?: { messageId?: string; providerMessageId?: string; turnId?: string },
   ): void {
-    if (this.timelineStore.getSubmittedUserMessage(agent.id, clientMessageId)) {
-      return;
-    }
-    this.touchUpdatedAt(agent);
-    agent.lastUserMessageAt = new Date();
-    const item: AgentTimelineItem = {
+    const item = projectAgentMessage({
       type: "user_message",
       text: submittedPromptText(prompt),
       clientMessageId,
       ...(options?.messageId ? { messageId: options.messageId } : {}),
-    };
+    });
+    if (item) this.recordSubmittedPromptItem(agent, item, options);
+  }
+
+  private recordSubmittedPromptItem(
+    agent: ActiveManagedAgent,
+    item: AgentTimelineItem,
+    options?: { providerMessageId?: string; turnId?: string },
+  ): void {
+    if (
+      item.type === "user_message" &&
+      item.clientMessageId &&
+      this.timelineStore.getSubmittedUserMessage(agent.id, item.clientMessageId)
+    )
+      return;
+    this.touchUpdatedAt(agent);
+    if (item.type === "user_message") agent.lastUserMessageAt = new Date();
     this.recordAndDispatchTimelineItem(agent.id, item, agent.provider, options?.turnId, options);
   }
 
@@ -4722,11 +4732,14 @@ export class AgentManager {
     if (!clientMessageId) return null;
     let existing = this.timelineStore.getSubmittedUserMessage(agent.id, clientMessageId);
     if (!existing) {
-      this.recordSubmittedPrompt(agent, item.text, clientMessageId, {
-        messageId: clientMessageId,
-        ...(messageId ? { providerMessageId: messageId } : {}),
-        ...(turnId ? { turnId } : {}),
-      });
+      this.recordSubmittedPromptItem(
+        agent,
+        { ...item, messageId: clientMessageId },
+        {
+          ...(messageId ? { providerMessageId: messageId } : {}),
+          ...(turnId ? { turnId } : {}),
+        },
+      );
       existing = this.timelineStore.getSubmittedUserMessage(agent.id, clientMessageId);
     }
     if (!existing || existing.item.type !== "user_message") return null;
diff --git a/packages/server/src/server/agent/agent-messages/index.ts b/packages/server/src/server/agent/agent-messages/index.ts
new file mode 100644
index 0000000000..1543bf33b4
--- /dev/null
+++ b/packages/server/src/server/agent/agent-messages/index.ts
@@ -0,0 +1,191 @@
+import { renderPromptAttachmentAsText } from "../prompt-attachments.js";
+import { randomUUID } from "node:crypto";
+import { z } from "zod";
+import type {
+  AgentPromptContentBlock,
+  AgentPromptInput,
+  AgentTimelineItem,
+} from "../agent-sdk-types.js";
+
+const agentIdSchema = z.string().min(1);
+const sourceSchema = z.discriminatedUnion("kind", [
+  z.object({
+    kind: z.literal("agent-message"),
+    agentId: agentIdSchema,
+    title: z.string().min(1).optional(),
+  }),
+  z.object({
+    kind: z.literal("agent-notification"),
+    agentId: agentIdSchema,
+    title: z.string().min(1).optional(),
+    event: z.enum(["finished", "errored", "permission-required", "closed"]),
+  }),
+]);
+export type AgentPromptSource = z.infer<typeof sourceSchema>;
+
+interface AgentMessage {
+  id: string;
+  source: AgentPromptSource | null;
+  text: string;
+}
+
+function escapeXml(value: string): string {
+  return value.replace(/[&<>"']/g, (character) => {
+    switch (character) {
+      case "&":
+        return "&amp;";
+      case "<":
+        return "&lt;";
+      case ">":
+        return "&gt;";
+      case '"':
+        return "&quot;";
+      default:
+        return "&apos;";
+    }
+  });
+}
+
+function unescapeXml(value: string): string | null {
+  if (/[<>]|&(?!amp;|lt;|gt;|quot;|apos;)/.test(value)) return null;
+  return value.replace(/&(amp|lt|gt|quot|apos);/g, (_, entity: string) => {
+    switch (entity) {
+      case "amp":
+        return "&";
+      case "lt":
+        return "<";
+      case "gt":
+        return ">";
+      case "quot":
+        return '"';
+      default:
+        return "'";
+    }
+  });
+}
+
+export function formatAgentMessage(message: AgentMessage): string {
+  const { source } = message;
+  const attributes = source
+    ? `kind="${source.kind}" source-agent-id="${escapeXml(source.agentId)}"`
+    : 'kind="user-message"';
+  const title = source?.title ? ` source-agent-title="${escapeXml(source.title)}"` : "";
+  const event = source?.kind === "agent-notification" ? ` event="${source.event}"` : "";
+  return `<paseo-system version="1" ${attributes} message-id="${escapeXml(message.id)}"${title}${event}>\n${escapeXml(message.text)}\n</paseo-system>`;
+}
+
+export function parseAgentMessage(text: string): AgentMessage | null {
+  const envelope = /^<paseo-system((?:\s+[a-z-]+="[^"<>]*")+)>\n([\s\S]*)\n<\/paseo-system>$/.exec(
+    text,
+  );
+  if (!envelope) return null;
+  const attributes = new Map<string, string>();
+  for (const match of envelope[1].matchAll(/\s+([a-z-]+)="([^"<>]*)"/g)) {
+    const value = unescapeXml(match[2]);
+    if (value === null || attributes.has(match[1])) return null;
+    attributes.set(match[1], value);
+  }
+  if (attributes.get("version") !== "1") return null;
+  const id = attributes.get("message-id");
+  const body = unescapeXml(envelope[2]);
+  if (!id || body === null) return null;
+  if (attributes.get("kind") === "user-message") {
+    if (attributes.has("source-agent-id") || attributes.has("event")) return null;
+    return { id, source: null, text: body };
+  }
+  const source = sourceSchema.safeParse({
+    kind: attributes.get("kind"),
+    agentId: attributes.get("source-agent-id"),
+    event: attributes.get("event"),
+    title: attributes.get("source-agent-title"),
+  });
+  if (!source.success) return null;
+  return { id, source: source.data, text: body };
+}
+
+function renderMessageText(block: AgentPromptContentBlock): string[] {
+  if (block.type === "image") return [];
+  if (block.type === "text") return [block.text];
+  return [renderPromptAttachmentAsText(block)];
+}
+
+export function prepareAgentMessage(
+  prompt: AgentPromptInput,
+  source?: AgentPromptSource,
+  id?: string,
+): { prompt: AgentPromptInput; messageId?: string } {
+  if (!source) {
+    const submittedText =
+      typeof prompt === "string"
+        ? prompt
+        : prompt
+            .flatMap((block) =>
+              block.type === "text" && !("mimeType" in block) ? [block.text] : [],
+            )
+            .join("\n")
+            .trim();
+    // Quote reserved envelopes only when they arrived through the human send path.
+    // This provenance must survive provider history, not only the accepted local row.
+    if (!parseAgentMessage(submittedText) && !isSystemInjectedEnvelope(submittedText)) {
+      return { prompt, messageId: id };
+    }
+  }
+  const messageId = id ?? randomUUID();
+  const text = typeof prompt === "string" ? prompt : prompt.flatMap(renderMessageText).join("\n\n");
+  // Render textual attachments before wrapping, so provider replay still contains one
+  // complete envelope instead of an envelope followed by provider-rendered context.
+  const envelope = formatAgentMessage({ id: messageId, source: source ?? null, text });
+  return {
+    messageId,
+    prompt:
+      typeof prompt === "string"
+        ? envelope
+        : [{ type: "text", text: envelope }, ...prompt.filter((block) => block.type === "image")],
+  };
+}
+
+/** The same projection owns provider echoes, acceptance, import, and replay. */
+export function projectAgentMessage(item: AgentTimelineItem): AgentTimelineItem | null {
+  if (item.type !== "user_message") return item;
+  const message = parseAgentMessage(item.text);
+  if (!message) {
+    // COMPAT(legacySystemEnvelope): added in v0.11.1; remove after 2027-04-08 once
+    // legacy notification history is retired. Schedules still use this envelope.
+    return isSystemInjectedEnvelope(item.text) ? null : item;
+  }
+  const { source } = message;
+  if (!source) {
+    return { ...item, text: message.text, clientMessageId: message.id };
+  }
+  return {
+    type: "tool_call",
+    callId: `paseo-agent-message:${message.id}`,
+    agentMessage: {
+      event: source.kind === "agent-message" ? "message" : source.event,
+      sender: { id: source.agentId, ...(source.title ? { title: source.title } : {}) },
+      text: message.text,
+    },
+    // COMPAT(agentMessageToolEnvelope): added in v0.11.1; remove after 2027-04-08
+    // once clients can accept a dedicated timeline variant. Older clients still
+    // parse this existing shape and can expand the delivered body.
+    name: "agent_message",
+    status: "completed",
+    error: null,
+    detail: { type: "plain_text", text: message.text, icon: "bot" },
+  };
+}
+
+/**
+ * Wrap a body in <paseo-system>…</paseo-system> so the receiving agent
+ * recognizes the prompt as system-injected context — not a user turn.
+ * Used by schedule fires; agent messages use the versioned envelope.
+ */
+export function formatSystemNotificationPrompt(reason: string): string {
+  return `<paseo-system>\n${reason}\n</paseo-system>`;
+}
+
+const SYSTEM_ENVELOPE_PATTERN = /^<paseo-system>\n[\s\S]*\n<\/paseo-system>$/;
+
+export function isSystemInjectedEnvelope(text: string): boolean {
+  return SYSTEM_ENVELOPE_PATTERN.test(text);
+}
diff --git a/packages/server/src/server/agent/agent-prompt.test.ts b/packages/server/src/server/agent/agent-prompt.test.ts
index 08bd66a79c..5a92da7bf7 100644
--- a/packages/server/src/server/agent/agent-prompt.test.ts
+++ b/packages/server/src/server/agent/agent-prompt.test.ts
@@ -1,3 +1,11 @@
+import {
+  formatSystemNotificationPrompt,
+  isSystemInjectedEnvelope,
+  parseAgentMessage,
+  formatAgentMessage,
+  prepareAgentMessage,
+  projectAgentMessage,
+} from "./agent-messages/index.js";
 import { expect, it, test, vi } from "vitest";
 import pino, { type Logger } from "pino";
 import { randomUUID } from "node:crypto";
@@ -8,12 +16,7 @@ import { join } from "node:path";
 import { createTestLogger } from "../../test-utils/test-logger.js";
 import { AgentManager } from "./agent-manager.js";
 import { AgentStorage } from "./agent-storage.js";
-import {
-  formatSystemNotificationPrompt,
-  isSystemInjectedEnvelope,
-  setupFinishNotification,
-  waitForAgentRunStartWithTimeout,
-} from "./agent-prompt.js";
+import { setupFinishNotification, waitForAgentRunStartWithTimeout } from "./agent-prompt.js";
 import type { AgentManagerEvent, ManagedAgent } from "./agent-manager.js";
 import type {
   AgentClient,
@@ -272,11 +275,16 @@ test("finish notifications tell the parent the child's last assistant message",
   scenario.startWatchingChild();
   const parentPrompt = await scenario.finishChildAndReadParentPrompt();
 
-  expect(parentPrompt).toEqual(
-    formatSystemNotificationPrompt(
-      "Agent child-agent (Child Agent) finished.\n\n<agent-response>\nImplemented the cleanup and all checks pass.\n</agent-response>",
-    ),
-  );
+  expect(parseAgentMessage(parentPrompt)).toEqual({
+    id: expect.any(String),
+    source: {
+      kind: "agent-notification",
+      agentId: "child-agent",
+      title: "Child Agent",
+      event: "finished",
+    },
+    text: "Agent child-agent (Child Agent) finished.\n\n<agent-response>\nImplemented the cleanup and all checks pass.\n</agent-response>",
+  });
   expect(scenario.steerAttemptCount()).toBe(1);
 });
 
@@ -303,9 +311,16 @@ test("closing a watched child notifies the caller", async () => {
   scenario.startWatchingChild();
   const parentPrompt = await scenario.closeChildAndReadParentPrompt();
 
-  expect(parentPrompt).toEqual(
-    formatSystemNotificationPrompt("Agent child-agent (Child Agent) was closed."),
-  );
+  expect(parseAgentMessage(parentPrompt)).toEqual({
+    id: expect.any(String),
+    source: {
+      kind: "agent-notification",
+      agentId: "child-agent",
+      title: "Child Agent",
+      event: "closed",
+    },
+    text: "Agent child-agent (Child Agent) was closed.",
+  });
 });
 
 test("finish notifications survive permission responses", async () => {
@@ -318,9 +333,9 @@ test("finish notifications survive permission responses", async () => {
     expect(scenario.parentPrompts()).toHaveLength(1);
   });
   expect(scenario.parentPrompts()[0]).toContain("needs permission.");
-  const permissionPayload = scenario
-    .parentPrompts()[0]
-    .match(/<permission-request>\n([\s\S]+?)\n<\/permission-request>/)?.[1];
+  const permissionPayload = parseAgentMessage(scenario.parentPrompts()[0])!.text.match(
+    /<permission-request>\n([\s\S]+?)\n<\/permission-request>/,
+  )?.[1];
   expect(permissionPayload).toBeDefined();
   expect(JSON.parse(permissionPayload!)).toEqual({
     agentId: "child-agent",
@@ -377,7 +392,9 @@ test("finish notifications report every concurrently pending permission", async
   await vi.waitFor(() => expect(scenario.parentPrompts()).toHaveLength(2));
   expect(
     scenario.parentPrompts().map((prompt) => {
-      const payload = prompt.match(/<permission-request>\n([\s\S]+?)\n<\/permission-request>/)?.[1];
+      const payload = parseAgentMessage(prompt)!.text.match(
+        /<permission-request>\n([\s\S]+?)\n<\/permission-request>/,
+      )?.[1];
       return JSON.parse(payload!).requestId;
     }),
   ).toEqual(["permission-1", "permission-2"]);
@@ -762,3 +779,75 @@ test("waiting for a run start still gives up at the run start budget", async ()
     await scenario.cleanup();
   }
 });
+
+test("agent envelopes round-trip opaque sender IDs and XML-sensitive messages", () => {
+  const message = {
+    id: "delivery-1",
+    source: {
+      kind: "agent-message" as const,
+      agentId: 'host::agent<&"',
+      title: 'QA <messenger> & "reviewer"',
+    },
+    text: 'Review <changes> & "quotes"\n</paseo-system>\n<paseo-system>nested</paseo-system>',
+  };
+  const encoded = formatAgentMessage(message);
+  expect(parseAgentMessage(encoded)).toEqual(message);
+  expect(parseAgentMessage(`Example: ${encoded}`)).toBeNull();
+  expect(parseAgentMessage(encoded.replace('version="1"', 'version="2"'))).toBeNull();
+  expect(parseAgentMessage(encoded.replace("&lt;", "<"))).toBeNull();
+  expect(parseAgentMessage(encoded.replace('version="1"', 'version="1" version="1"'))).toBeNull();
+});
+
+test("agent envelope includes rendered attachment context and preserves images", () => {
+  const image = { type: "image" as const, data: "aW1hZ2U=", mimeType: "image/png" };
+  const attachment = {
+    type: "github_issue" as const,
+    mimeType: "application/github-issue" as const,
+    number: 42,
+    title: "Review context",
+    url: "https://example.com/issues/42",
+    body: "Attached context",
+  };
+  const source = { kind: "agent-message" as const, agentId: "remote:sender" };
+  expect(
+    prepareAgentMessage(
+      [{ type: "text", text: "First" }, image, attachment, { type: "text", text: "Second" }],
+      source,
+      "message",
+    ),
+  ).toEqual({
+    messageId: "message",
+    prompt: [
+      {
+        type: "text",
+        text: formatAgentMessage({
+          id: "message",
+          source,
+          text: "First\n\nGitHub Issue #42: Review context\nhttps://example.com/issues/42\n\nAttached context\n\nSecond",
+        }),
+      },
+      image,
+    ],
+  });
+});
+
+test("a human pasting an agent envelope stays a human message through provider replay", () => {
+  const pasted = formatAgentMessage({
+    id: "example",
+    source: { kind: "agent-message", agentId: "sender" },
+    text: "hello",
+  });
+  const delivery = prepareAgentMessage(pasted, undefined, "human-submission");
+  expect(
+    projectAgentMessage({
+      type: "user_message",
+      text: String(delivery.prompt),
+      messageId: "provider-echo",
+    }),
+  ).toEqual({
+    type: "user_message",
+    text: pasted,
+    messageId: "provider-echo",
+    clientMessageId: "human-submission",
+  });
+});
diff --git a/packages/server/src/server/agent/agent-prompt.ts b/packages/server/src/server/agent/agent-prompt.ts
index 0bcd46636a..b9ef336ce1 100644
--- a/packages/server/src/server/agent/agent-prompt.ts
+++ b/packages/server/src/server/agent/agent-prompt.ts
@@ -1,3 +1,4 @@
+import { prepareAgentMessage, type AgentPromptSource } from "./agent-messages/index.js";
 import type { Logger } from "pino";
 
 import type {
@@ -206,27 +207,13 @@ export async function unarchiveAgentState(
   return true;
 }
 
-/**
- * Wrap a body in <paseo-system>…</paseo-system> so the receiving agent
- * recognizes the prompt as system-injected context — not a user turn.
- * Used by chat mentions, schedule fires, and notify-on-finish.
- */
-export function formatSystemNotificationPrompt(reason: string): string {
-  return `<paseo-system>\n${reason}\n</paseo-system>`;
-}
-
-const SYSTEM_ENVELOPE_PATTERN = /^<paseo-system>\n[\s\S]*\n<\/paseo-system>$/;
-
-export function isSystemInjectedEnvelope(text: string): boolean {
-  return SYSTEM_ENVELOPE_PATTERN.test(text);
-}
-
 export interface SendPromptToAgentParams {
   agentManager: AgentManager;
   agentStorage: AgentStorage;
   agentId: string;
   /** Prompt to dispatch to the provider (may include image blocks or wrapped text). */
   prompt: AgentPromptInput;
+  source?: AgentPromptSource;
   messageId?: string;
   activeTurnBehavior?: ActiveTurnBehavior;
   runOptions?: AgentRunOptions;
@@ -244,10 +231,12 @@ export interface SendPromptToAgentParams {
 }
 
 export interface StartCreatedAgentInitialPromptParams {
+  agentStorage: AgentStorage;
   agentManager: AgentManager;
   agentId: string;
   snapshot?: ManagedAgent;
   prompt: AgentPromptInput | null;
+  source?: AgentPromptSource;
   runOptions?: AgentRunOptions;
   logger: Logger;
 }
@@ -292,6 +281,18 @@ export async function waitForAgentRunStartWithTimeout(
   }
 }
 
+async function resolvePromptSource(
+  source: AgentPromptSource | undefined,
+  manager: Pick<AgentManager, "getAgent">,
+  storage: AgentStorage,
+): Promise<AgentPromptSource | undefined> {
+  if (!source) return undefined;
+  const title = (
+    manager.getAgent(source.agentId)?.config.title ?? (await storage.get(source.agentId))?.title
+  )?.trim();
+  return title ? { ...source, title } : source;
+}
+
 /**
  * Full send-prompt orchestration: (optional unarchive) → load → (optional
  * mode change) → start run.
@@ -338,11 +339,13 @@ export async function sendPromptToAgent(
     await params.agentManager.setAgentMode(params.agentId, params.sessionMode);
   }
 
-  const runOptions = params.messageId
-    ? { ...params.runOptions, clientMessageId: params.messageId }
+  const source = await resolvePromptSource(params.source, params.agentManager, params.agentStorage);
+  const delivery = prepareAgentMessage(params.prompt, source, params.messageId);
+  const runOptions = delivery.messageId
+    ? { ...params.runOptions, clientMessageId: delivery.messageId }
     : params.runOptions;
 
-  return await startAgentRun(params.agentManager, params.agentId, params.prompt, params.logger, {
+  return await startAgentRun(params.agentManager, params.agentId, delivery.prompt, params.logger, {
     replaceRunning: true,
     activeTurnBehavior: params.activeTurnBehavior,
     clearPendingPermissions: params.clearPendingPermissions,
@@ -362,14 +365,17 @@ export async function startCreatedAgentInitialPrompt(
     return currentSnapshot;
   }
 
+  const delivery = prepareAgentMessage(
+    params.prompt,
+    await resolvePromptSource(params.source, params.agentManager, params.agentStorage),
+    params.runOptions?.clientMessageId,
+  );
   const dispatchResult = await startAgentRun(
     params.agentManager,
     params.agentId,
-    params.prompt,
+    delivery.prompt,
     params.logger,
-    {
-      runOptions: params.runOptions,
-    },
+    { runOptions: { ...params.runOptions, clientMessageId: delivery.messageId } },
   );
 
   if (dispatchResult.disposition === "turn_started") {
@@ -394,6 +400,13 @@ export interface SetupFinishNotificationParams {
 
 type FinishNotificationReason = "finished" | "errored" | "needs permission" | "was closed";
 
+const finishNotificationEvents = {
+  finished: "finished",
+  errored: "errored",
+  "needs permission": "permission-required",
+  "was closed": "closed",
+} as const;
+
 const FINISH_NOTIFICATION_MESSAGE_LIMIT = 4000;
 
 interface FinishNotificationBodyInput {
@@ -499,7 +512,12 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
       agentManager,
       agentStorage,
       agentId: callerAgentId,
-      prompt: formatSystemNotificationPrompt(body),
+      prompt: body,
+      source: {
+        kind: "agent-notification",
+        agentId: childAgentId,
+        event: finishNotificationEvents[reason],
+      },
       activeTurnBehavior: "steer",
       unarchive: false,
       logger,
diff --git a/packages/server/src/server/agent/create-agent/create.ts b/packages/server/src/server/agent/create-agent/create.ts
index 814a8f3aec..eaafad96b6 100644
--- a/packages/server/src/server/agent/create-agent/create.ts
+++ b/packages/server/src/server/agent/create-agent/create.ts
@@ -1,3 +1,4 @@
+import type { AgentPromptSource } from "../agent-messages/index.js";
 import type { Logger } from "pino";
 
 import type { TerminalManager } from "../../../terminal/terminal-manager.js";
@@ -61,6 +62,7 @@ export interface CreateAgentFromSessionInput {
   workspaceId: string;
   worktreeName?: string;
   initialPrompt?: string;
+  source?: AgentPromptSource;
   clientMessageId?: string;
   outputSchema?: Record<string, unknown>;
   images?: Array<{ data: string; mimeType: string }>;
@@ -164,6 +166,7 @@ interface ResolvedCreateAgent {
   config: AgentSessionConfig;
   createOptions: CreateAgentOptions;
   prompt?: AgentPromptInput;
+  source?: AgentPromptSource;
   runOptions?: AgentRunOptions;
   setupContinuation?: AgentWorktreeSetupContinuation;
   background: boolean;
@@ -293,6 +296,7 @@ async function resolveSessionCreateAgent(
       workspaceId: requireResolvedWorkspaceId(workspaceId),
     },
     prompt: hasPromptContent ? prompt : undefined,
+    source: input.source,
     runOptions,
     setupContinuation,
     background: true,
@@ -364,6 +368,9 @@ async function resolveMcpCreateAgent(
       env: input.env,
     },
     prompt: trimmedPrompt ? trimmedPrompt : undefined,
+    source: input.callerAgentId
+      ? { kind: "agent-message", agentId: input.callerAgentId }
+      : undefined,
     setupContinuation,
     createdWorktree,
     background: input.background,
@@ -459,10 +466,12 @@ async function sendInitialPrompt(
       return { started: false, liveSnapshot: snapshot };
     }
     const liveSnapshot = await startCreatedAgentInitialPrompt({
+      agentStorage: dependencies.agentStorage,
       agentManager: dependencies.agentManager,
       agentId: snapshot.id,
       snapshot,
       prompt,
+      source: resolved.source,
       runOptions: resolved.runOptions,
       logger: resolved.promptLogger ?? dependencies.logger,
     });
diff --git a/packages/server/src/server/agent/mcp-server.test.ts b/packages/server/src/server/agent/mcp-server.test.ts
index ad2c4babd8..a9e2ea0cd6 100644
--- a/packages/server/src/server/agent/mcp-server.test.ts
+++ b/packages/server/src/server/agent/mcp-server.test.ts
@@ -1,3 +1,4 @@
+import { parseAgentMessage } from "./agent-messages/index.js";
 import { execFileSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
@@ -1394,6 +1395,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       provider: "codex",
       currentModeId: "full-access",
@@ -3136,6 +3138,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "codex",
@@ -3182,6 +3185,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     const parentAgent = {
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "codex",
@@ -3227,6 +3231,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "codex",
@@ -3279,6 +3284,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "claude",
@@ -3593,6 +3599,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     const parentAgent = {
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "claude",
@@ -3645,6 +3652,7 @@ describe("create_agent MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "claude",
@@ -3838,6 +3846,7 @@ describe("send_agent_prompt MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     const parentAgent = {
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "codex",
@@ -3933,6 +3942,7 @@ describe("send_agent_prompt MCP tool", () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     const parentAgent = {
       id: "parent-agent",
+      config: {},
       cwd: existingCwd,
       workspaceId: "wks_parent",
       provider: "codex",
@@ -4133,7 +4143,12 @@ describe("send_agent_prompt MCP tool", () => {
         agentId: child.id,
         prompt: "Follow up",
       });
-      await vi.waitFor(() => expect(childSession.prompts).toEqual(["Follow up"]));
+      await vi.waitFor(() => expect(childSession.prompts).toHaveLength(1));
+      expect(parseAgentMessage(childSession.prompts[0])).toEqual({
+        id: expect.any(String),
+        source: { kind: "agent-message", agentId: parent.id },
+        text: "Follow up",
+      });
       acknowledgeTurnStart();
       const response = await pending;
 
diff --git a/packages/server/src/server/agent/tools/paseo-tools.ts b/packages/server/src/server/agent/tools/paseo-tools.ts
index 07f9f21098..603e7ed4c6 100644
--- a/packages/server/src/server/agent/tools/paseo-tools.ts
+++ b/packages/server/src/server/agent/tools/paseo-tools.ts
@@ -1933,6 +1933,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         agentStorage,
         agentId,
         prompt,
+        source: callerAgentId ? { kind: "agent-message", agentId: callerAgentId } : undefined,
         sessionMode,
         logger: childLogger,
       });
diff --git a/packages/server/src/server/schedule/service.ts b/packages/server/src/server/schedule/service.ts
index 9dcf27407a..7f480f92d2 100644
--- a/packages/server/src/server/schedule/service.ts
+++ b/packages/server/src/server/schedule/service.ts
@@ -1,3 +1,4 @@
+import { formatSystemNotificationPrompt } from "../agent/agent-messages/index.js";
 import { randomUUID } from "node:crypto";
 import { stat } from "node:fs/promises";
 import { join } from "node:path";
@@ -7,11 +8,7 @@ import type { AgentSessionConfig } from "../agent/agent-sdk-types.js";
 import type { AgentStorage } from "../agent/agent-storage.js";
 import { curateAgentActivity } from "../agent/activity-curator.js";
 import { ensureAgentLoaded } from "../agent/agent-loading.js";
-import {
-  formatSystemNotificationPrompt,
-  startAgentRun,
-  type AgentRunController,
-} from "../agent/agent-prompt.js";
+import { startAgentRun, type AgentRunController } from "../agent/agent-prompt.js";
 import { resolveCreateAgentTitles } from "../agent/create-agent-title.js";
 import { type BoundCreateAgentCommand, formatProviderModel } from "../agent/create-agent/create.js";
 import type { PersistedWorkspaceRecord } from "../workspace-registry.js";
diff --git a/packages/server/src/server/session.ts b/packages/server/src/server/session.ts
index eabc809028..f837276dec 100644
--- a/packages/server/src/server/session.ts
+++ b/packages/server/src/server/session.ts
@@ -4290,6 +4290,9 @@ export class Session {
           workspaceId: resolvedIntent.intent.workspaceId,
           worktreeName,
           initialPrompt,
+          source: msg.callerAgentId
+            ? { kind: "agent-message", agentId: msg.callerAgentId }
+            : undefined,
           clientMessageId,
           outputSchema,
           images,
@@ -8094,6 +8097,9 @@ export class Session {
           agentStorage: this.agentStorage,
           agentId,
           prompt,
+          source: msg.sourceAgentId
+            ? { kind: "agent-message", agentId: msg.sourceAgentId }
+            : undefined,
           messageId: msg.messageId,
           activeTurnBehavior: msg.activeTurnBehavior ?? "interrupt",
           clearPendingPermissions: true,
@@ -8111,9 +8117,13 @@ export class Session {
         await this.messageReceipts.send({
           agentId,
           messageId: msg.messageId,
-          request: { prompt, activeTurnBehavior: msg.activeTurnBehavior ?? "interrupt" },
+          request: {
+            prompt,
+            sourceAgentId: msg.sourceAgentId,
+            activeTurnBehavior: msg.activeTurnBehavior ?? "interrupt",
+          },
           prepare: async () => {
-            await this.prepareAgentMessage(agentId, msg.text);
+            if (!msg.sourceAgentId) await this.prepareAgentMessage(agentId, msg.text);
           },
           send,
         });
diff --git a/packages/server/src/server/websocket-server.ts b/packages/server/src/server/websocket-server.ts
index 4dcdc680ab..493dc57b2b 100644
--- a/packages/server/src/server/websocket-server.ts
+++ b/packages/server/src/server/websocket-server.ts
@@ -1923,6 +1923,7 @@ export class VoiceAssistantWebSocketServer {
         explicitEventSubscriptions: true,
         // COMPAT(canonicalSubmittedPrompts): added in v0.2.6, remove gate after 2027-01-30.
         canonicalSubmittedPrompts: true,
+        agentMessageProvenance: true,
         // COMPAT(stableProjectIdentity): added in v0.1.109, remove gate after 2027-01-15.
         stableProjectIdentity: true,
         // COMPAT(workspaceScriptManagement): added in v0.1.105, remove gate after 2027-01-10.

From 8c096b5e3381321dd1942ee522f69a9b3044df88 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 8 Oct 2026 22:16:16 +0100
Subject: [PATCH 064/270] docs: remove Linux setup detour from getting started
 (#6415)

---
 public-docs/index.md           | 21 ---------------------
 public-docs/security.md        |  8 ++++++++
 public-docs/troubleshooting.md | 19 +++++++++++++++++--
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/public-docs/index.md b/public-docs/index.md
index bb735a7cb4..54bd56b7b4 100644
--- a/public-docs/index.md
+++ b/public-docs/index.md
@@ -16,27 +16,6 @@ Download from [paseo.sh/download](https://paseo.sh/download) or the [GitHub rele
 
 The desktop app bundles its own daemon and starts it automatically, no separate install required. On first launch you'll see a brief startup screen, then connect from your phone using **Settings → your host → Pair Device**.
 
-### Linux
-
-Use the `.deb` on Debian/Ubuntu or the `.rpm` on Fedora to keep Chromium's sandbox available even when your distribution restricts user namespaces. The installer configures the bundled sandbox helper; you do not need to change system security settings.
-
-For an AppImage, make the download executable and open it:
-
-```bash
-chmod +x Paseo-x86_64.AppImage
-./Paseo-x86_64.AppImage
-```
-
-If it reports `error loading libfuse.so.2`, run without FUSE:
-
-```bash
-./Paseo-x86_64.AppImage --appimage-extract-and-run
-```
-
-Alternatively, install `libfuse2t64` on Ubuntu 24.04 or newer (`sudo apt install libfuse2t64`), or your distribution's FUSE 2 compatibility package. This dependency belongs to the AppImage runtime, before Paseo starts.
-
-Paseo checks sandbox availability each time it launches. AppImage and extracted tar archives retain sandboxing when user namespaces work. On a restricted host without a usable installed helper, they launch with Chromium's sandbox disabled. Prefer the installed package if you require OS process isolation. **Settings → Diagnostics → App Diagnostics** reports the sandbox state and reason; the desktop log records the same decision. An explicit `--no-sandbox` argument overrides the automatic choice.
-
 ## Server / CLI
 
 For headless machines, dev boxes, or any setup where you want the daemon running without the desktop UI:
diff --git a/public-docs/security.md b/public-docs/security.md
index a935a75878..d1b6ee229a 100644
--- a/public-docs/security.md
+++ b/public-docs/security.md
@@ -121,6 +121,14 @@ The image runs the daemon and launched agents as the non-root `paseo` user, but
 
 See [Docker](/docs/docker) for Compose and reverse proxy examples.
 
+## Linux desktop sandbox
+
+Paseo checks Chromium sandbox availability each time the desktop app launches on Linux. It keeps sandboxing enabled when user namespaces work or an installed sandbox helper is usable. The `.deb` and `.rpm` installers configure that helper.
+
+AppImage and extracted tar archives launch with Chromium's sandbox disabled when neither is available. Use the `.deb` or `.rpm` package if you require Chromium process isolation. Passing `--no-sandbox` explicitly disables it.
+
+Open **Settings → Diagnostics → App Diagnostics** to check the sandbox state and reason. The [desktop log](/docs/troubleshooting#reading-the-logs) records the same decision.
+
 ## Agent authentication
 
 Paseo wraps agent CLIs (Claude Code, Codex, OpenCode, Muse Code) but does not manage their authentication. Each agent provider handles its own credentials:
diff --git a/public-docs/troubleshooting.md b/public-docs/troubleshooting.md
index 77b2497e03..420c3363aa 100644
--- a/public-docs/troubleshooting.md
+++ b/public-docs/troubleshooting.md
@@ -1,6 +1,6 @@
 ---
 title: Troubleshooting
-description: Why Paseo can't find a provider you've installed, and how to fix the PATH and environment mismatches behind most setup issues.
+description: Fix Linux AppImage launch errors, missing providers, and environment mismatches.
 nav: Common problems
 order: 90
 category: Troubleshooting
@@ -8,7 +8,22 @@ category: Troubleshooting
 
 # Troubleshooting
 
-Almost every "it works in my terminal but not in Paseo" problem is the same thing: Paseo and your terminal aren't searching the same `PATH`. This page covers how to spot that and fix it.
+## AppImage won't open on Linux
+
+Make the downloaded AppImage executable, then launch it from a terminal to see any error:
+
+```bash
+chmod +x Paseo-x86_64.AppImage
+./Paseo-x86_64.AppImage
+```
+
+If it reports `error loading libfuse.so.2`, run without FUSE:
+
+```bash
+./Paseo-x86_64.AppImage --appimage-extract-and-run
+```
+
+The Paseo window should open. You can also install the `.deb` on Debian/Ubuntu or the `.rpm` on Fedora from the [download page](https://paseo.sh/download).
 
 ## Paseo can't find my provider
 

From 29db2b79809fc032860ff4e8ee360fbe0073c3e9 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 8 Oct 2026 22:25:57 +0100
Subject: [PATCH 065/270] Keep created agents after first-prompt failures and
 bound fork history (#6379)

* fix(agents): preserve creation when the first prompt fails

A rejected initial prompt must leave a created agent with a turn error instead of returning the user to a draft whose creation key is already committed. Preserve receipt replay without repeating the prompt, and bound fork history to 100,000 characters before it becomes an attachment.

* test(creation): isolate user agent counters from background naming

Workspace naming uses internal provider sessions. Counting and rejecting those sessions made creation assertions depend on installed provider discovery timing. Keep discovery within the test adapters and scope observations to user-created agents.

* test(creation): retry temporary directory cleanup on Windows

Windows CI completed the rejection assertions but failed teardown with EBUSY. Match the daemon test harness bounded removal retries so transient directory locks do not fail creation tests.

* fix(agents): record rejected prompts before their errors

Startup rejection recorded only the system error, leaving the client to append its local prompt after it. Record the rejected submission at the terminal failure boundary so stream and fetched history agree on prompt-before-error ordering.

* fix(agents): require acceptance for delivery notifications

Retain rejected human submissions before their errors without projecting rejected inter-agent prompts as completed deliveries. Reproduces and fixes the notification regression exposed by merge CI.

* test(agents): retain rejected submissions across retries

The existing browser retry test assumed terminally rejected prompts disappeared. Assert the intended prompt-before-error history and a separate accepted retry while preserving draft, attachment, and ambiguous-steering checks.

* test(creation): allow integration latency in raw RPC responses

The peer inherited a one-second polling timeout despite exercising Git and provider startup. Reproduce the timeout with delayed startup and wait within an explicit integration budget while retaining all response and identity assertions.
---
 docs/architecture.md                          |   4 +
 .../browser/agent-message-submission.spec.ts  |  17 ++-
 .../e2e/browser/creation-idempotency.spec.ts  |  43 ++++++
 packages/app/e2e/support/creation-fixtures.ts |  32 ++++
 packages/app/e2e/support/helpers/creation.ts  |  41 ++++++
 packages/server/package.json                  |   2 +-
 .../src/server/agent/activity-curator.test.ts |  46 ++++++
 .../src/server/agent/activity-curator.ts      |  35 ++++-
 .../src/server/agent/agent-manager.test.ts    |  30 +++-
 .../server/src/server/agent/agent-manager.ts  |  18 ++-
 .../src/server/agent/create-agent/create.ts   |   9 +-
 .../src/server/creation/creation.e2e.test.ts  | 137 ++++++++++++++++--
 .../server/src/server/creation/index.test.ts  |   8 +-
 packages/server/src/server/creation/index.ts  |  10 +-
 packages/server/src/server/session.ts         |  10 +-
 .../server/test-utils/fake-agent-client.ts    |  12 +-
 16 files changed, 404 insertions(+), 50 deletions(-)

diff --git a/docs/architecture.md b/docs/architecture.md
index fdf7ec909a..4ed25ba1c4 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -345,6 +345,10 @@ join active work or reuse committed stages. A persisted resource alone cannot pr
 that a provider accepted its initial prompt. Interrupted side effects with no conclusive
 receipt return an unknown outcome instead of being repeated.
 
+Agent registration commits creation. Rejecting the first prompt is a turn error on that
+agent; reporting creation failure leaves an orphaned agent and invites another Create.
+Receipt replay must not resend the prompt.
+
 `packages/client/src/creation/` owns capability selection and legacy orchestration.
 Callers always pass the initial prompt to agent creation. On an older host, the client
 adapts keyed creation to the legacy create/send sequence; it cannot continue that
diff --git a/packages/app/e2e/browser/agent-message-submission.spec.ts b/packages/app/e2e/browser/agent-message-submission.spec.ts
index 75cf7ff0c9..3bfda6b4b0 100644
--- a/packages/app/e2e/browser/agent-message-submission.spec.ts
+++ b/packages/app/e2e/browser/agent-message-submission.spec.ts
@@ -284,7 +284,6 @@ async function expectRejectedSubmissionRestored(
   await expectComposerDraft(page, input.prompt);
   await expectComposerEditable(page);
   await expectAttachmentPill(page, "composer-image-attachment-pill");
-  await expect(page.getByTestId("user-message").filter({ hasText: input.prompt })).toHaveCount(0);
   if (input.preservesActiveTurn) {
     await expect(page.getByTestId("turn-working-indicator")).toBeVisible();
     return;
@@ -295,13 +294,21 @@ async function expectRejectedSubmissionRestored(
 
 async function retryRestoredSubmission(page: Page, prompt: string): Promise<void> {
   await page.getByRole("textbox", { name: "Message agent..." }).first().press("Enter");
-  const userMessage = page.getByTestId("user-message").filter({ hasText: prompt });
-  await expect(userMessage).toHaveCount(1);
+  const attempts = page.getByTestId("user-message").filter({ hasText: prompt });
+  await expect(attempts).toHaveCount(2);
+  const userMessage = attempts.last();
   await expect(userMessage).toHaveAttribute("aria-busy", "false", { timeout: 30_000 });
   await expect(userMessage.getByRole("button", { name: "Open image attachment" })).toBeVisible();
   await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(0);
 }
 
+async function expectRejectedPromptBeforeError(page: Page, prompt: string, errorMessage: string) {
+  const messages = page.getByTestId("user-message").or(page.getByTestId("assistant-message"));
+  await expect(messages).toHaveCount(2);
+  await expect(messages.nth(0)).toContainText(prompt);
+  await expect(messages.nth(1)).toContainText(`[System Error] ${errorMessage}`);
+}
+
 async function configureSteerInSettings(page: Page): Promise<void> {
   const modifier = process.platform === "darwin" ? "Meta" : "Control";
   await page.keyboard.press(`${modifier}+Comma`);
@@ -1173,13 +1180,14 @@ test.describe("Agent message submission", () => {
     await toasts.expectNeverShown("agent-updating-toast");
   });
 
-  test("restores a rejected submission and accepts its retry", async ({
+  test("retains a rejected submission before its error and accepts its retry", async ({
     page,
     rejectionScenario,
   }) => {
     const prompt = "Restore this rejected submission.";
     await submitMessageThatWillBeRejected(page, prompt);
     await expectRejectedSubmissionRestored(page, { prompt, ...rejectionScenario });
+    await expectRejectedPromptBeforeError(page, prompt, rejectionScenario.errorMessage);
     await retryRestoredSubmission(page, prompt);
   });
 
@@ -1209,6 +1217,7 @@ test.describe("Agent message submission", () => {
         errorMessage: "Requested mock steer transport failure",
         preservesActiveTurn: true,
       });
+      await expect(page.getByTestId("user-message").filter({ hasText: prompt })).toHaveCount(0);
 
       expect(gate.getClientRequestCount("send_agent_message_request")).toBe(sendsBefore + 1);
       expect(gate.getClientRequestCount("cancel_agent_request")).toBe(cancelsBefore);
diff --git a/packages/app/e2e/browser/creation-idempotency.spec.ts b/packages/app/e2e/browser/creation-idempotency.spec.ts
index 39e73dbded..7658addf72 100644
--- a/packages/app/e2e/browser/creation-idempotency.spec.ts
+++ b/packages/app/e2e/browser/creation-idempotency.spec.ts
@@ -128,3 +128,46 @@ for (const scenario of [
     await creation.expectAgentCount(1);
   });
 }
+
+for (const entry of [
+  {
+    name: "agent draft",
+    open: (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
+      creation.openAgentDraft(),
+    button: "Send message",
+    settled: async (_creation: Awaited<ReturnType<typeof createCreationScenario>>) => {},
+  },
+  {
+    name: "new workspace",
+    open: (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
+      creation.openWorkspaceForm("local"),
+    button: "Create",
+    settled: (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
+      creation.expectOneCreatedWorkspace(),
+  },
+]) {
+  test(`${entry.name} becomes an agent tab when the first prompt is rejected`, async ({
+    creation,
+    promptRejection,
+    page,
+  }, testInfo) => {
+    void promptRejection;
+    const prompt =
+      "Continue the attached conversation.\n" + "Earlier conversation context.\n".repeat(100);
+    await entry.open(creation);
+    await creation.submitPrompt(prompt, entry.button);
+    await entry.settled(creation);
+    await creation.expectCreatedAgentError();
+    await creation.expectPromptBeforeError(prompt);
+    await page.screenshot({ path: testInfo.outputPath("created-agent-prompt-error.png") });
+    await creation.reloadAgent();
+    await creation.expectPromptBeforeError(prompt);
+    await creation.submitPrompt("emit 1 coalesced agent stream updates for a corrected prompt.");
+    await creation.expectPromptVisible(
+      "emit 1 coalesced agent stream updates for a corrected prompt.",
+    );
+    await creation.expectAssistantReply();
+    await creation.expectAgentCount(1);
+    await expect(page.getByText("agent_request_key_conflict", { exact: true })).toHaveCount(0);
+  });
+}
diff --git a/packages/app/e2e/support/creation-fixtures.ts b/packages/app/e2e/support/creation-fixtures.ts
index 33308ee386..9608a95a0c 100644
--- a/packages/app/e2e/support/creation-fixtures.ts
+++ b/packages/app/e2e/support/creation-fixtures.ts
@@ -13,6 +13,7 @@ import { delayBrowserAgentCreatedStatus } from "./helpers/new-workspace";
 
 export const test = base.extend<{
   startup: { release(): Promise<void>; fail(): Promise<void> };
+  promptRejection: void;
   creation: Awaited<ReturnType<typeof createCreationScenario>>;
   promptRetry: ReturnType<typeof createPromptRetryScenario>;
   agentRetries: Awaited<ReturnType<typeof retryNextAgentCreation>>;
@@ -65,6 +66,37 @@ export default function contribute(server) {
       await client.close();
     }
   },
+  promptRejection: async ({ page }, provide) => {
+    void page;
+    const client = await connectNewWorkspaceDaemonClient();
+    const plugin = await copyPluginExample("lifecycle-logger");
+    const previous = await client.getDaemonConfig();
+    try {
+      await writeFile(
+        path.join(plugin.directory, "index.server.ts"),
+        `
+export default function contribute(server) {
+  return server.before("agent.create", ({ request }) => ({
+    ...request,
+    config: {
+      ...request.config,
+      model: "e2e-fast-stream",
+      featureValues: { ...request.config.featureValues, mockPromptRejections: 1 },
+    },
+  }));
+}
+`,
+      );
+      await client.patchDaemonConfig({ pluginsEnabled: true });
+      await client.installDirectoryPlugin(plugin.directory);
+      await provide();
+    } finally {
+      await client.removePlugin("lifecycle-logger");
+      await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
+      await plugin.cleanup();
+      await client.close();
+    }
+  },
   creation: async ({ page }, provide) => {
     const creation = await createCreationScenario(page);
     try {
diff --git a/packages/app/e2e/support/helpers/creation.ts b/packages/app/e2e/support/helpers/creation.ts
index 09cd2ea290..9098068698 100644
--- a/packages/app/e2e/support/helpers/creation.ts
+++ b/packages/app/e2e/support/helpers/creation.ts
@@ -182,6 +182,47 @@ export async function createCreationScenario(page: Page) {
       await this.expectWorkspaceReadyBeforeAgentCompletion();
       expect((await project.client.fetchAgents()).entries).toHaveLength(0);
     },
+    async expectCreatedAgentError() {
+      await requests.settled();
+      await expect(
+        page
+          .getByTestId("assistant-message")
+          .filter({ hasText: "[System Error] Requested mock prompt rejection", visible: true }),
+      ).toBeVisible();
+      await expect(
+        page
+          .locator('[data-testid^="workspace-tab-agent_"][aria-selected="true"]')
+          .filter({ visible: true }),
+      ).toBeVisible();
+      await expect(
+        page.locator('[data-testid^="workspace-tab-draft_"]').filter({ visible: true }),
+      ).toHaveCount(0);
+      await expect(page.getByRole("textbox", { name: "Message agent..." }).first()).toBeEditable();
+      await expect(page.getByTestId("turn-working-indicator")).toHaveCount(0);
+    },
+    async expectPromptBeforeError(prompt: string) {
+      const messages = page
+        .getByTestId("user-message")
+        .or(page.getByTestId("assistant-message"))
+        .filter({ visible: true });
+      await expect(messages).toHaveCount(2);
+      await expect(messages.nth(0)).toContainText(prompt);
+      await expect(messages.nth(1)).toContainText("[System Error]");
+      await expect(messages.nth(1)).toBeInViewport();
+    },
+    async reloadAgent() {
+      await page.reload();
+      await expect(page.getByText("Updating messages", { exact: true })).toHaveCount(0);
+      await this.expectCreatedAgentError();
+    },
+    async expectAssistantReply() {
+      await expect(
+        page
+          .getByTestId("assistant-message")
+          .filter({ visible: true, hasNotText: "[System Error]" })
+          .first(),
+      ).toBeVisible();
+    },
     async expectStartupFailure() {
       await expect(page.getByText(/Creation startup failed for test/).first()).toBeVisible();
     },
diff --git a/packages/server/package.json b/packages/server/package.json
index 64125950db..5201d4cae4 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",
diff --git a/packages/server/src/server/agent/activity-curator.test.ts b/packages/server/src/server/agent/activity-curator.test.ts
index 15ad9db90e..68f864174a 100644
--- a/packages/server/src/server/agent/activity-curator.test.ts
+++ b/packages/server/src/server/agent/activity-curator.test.ts
@@ -438,3 +438,49 @@ second line'`,
     ).toThrow("Selected assistant message is no longer available.");
   });
 });
+
+it("bounds fork history to 100,000 characters while preserving the newest messages", () => {
+  const result = buildAgentForkContextAttachment({
+    rows: [
+      row(1, { type: "user_message", text: "old-message " + "x".repeat(1_100_000) }),
+      row(2, { type: "assistant_message", messageId: "checkpoint", text: "Latest answer." }),
+      row(3, { type: "user_message", text: "Beyond the selected checkpoint." }),
+    ],
+    boundaryMessageId: "checkpoint",
+  });
+  expect(result.attachment.text.length).toBeLessThanOrEqual(100_000);
+  expect(result.attachment.text).toContain("[Earlier chat history omitted]");
+  expect(result.attachment.text).toContain("[Assistant] Latest answer.");
+  expect(result.attachment.text).not.toContain("old-message");
+  expect(result.attachment.text).not.toContain("Beyond the selected checkpoint.");
+  expect(result.attachment.text).toMatch(/^<chat-history-summary>\n/);
+  expect(result.attachment.text).toMatch(/\n<\/chat-history-summary>$/);
+});
+
+it("bounds one oversized fork message and metadata without losing its beginning and end", () => {
+  const result = buildAgentForkContextAttachment({
+    rows: [
+      row(1, {
+        type: "assistant_message",
+        text: "Beginning. " + "x".repeat(1_100_000) + " The end.",
+      }),
+    ],
+    agentTitle: "T".repeat(200_000),
+    cwd: "/" + "p".repeat(200_000),
+  });
+  expect(result.attachment.text.length).toBe(100_000);
+  expect(result.attachment.text).toContain("[Assistant] Beginning.");
+  expect(result.attachment.text).toContain("[Message truncated]");
+  expect(result.attachment.text).toContain("The end.");
+  expect(result.attachment.text).toMatch(/\n<\/chat-history-summary>$/);
+});
+
+it("preserves every message in fork history below the character budget", () => {
+  const text = "Complete conversation " + "x".repeat(90_000);
+  const result = buildAgentForkContextAttachment({
+    rows: [row(1, { type: "user_message", text })],
+  });
+  expect(result.attachment.text).toBe(
+    `<chat-history-summary>\nChat history from a previous Paseo agent.\n\n[User] ${text}\n</chat-history-summary>`,
+  );
+});
diff --git a/packages/server/src/server/agent/activity-curator.ts b/packages/server/src/server/agent/activity-curator.ts
index 3bcab550e7..b8381c9b7c 100644
--- a/packages/server/src/server/agent/activity-curator.ts
+++ b/packages/server/src/server/agent/activity-curator.ts
@@ -8,6 +8,9 @@ import { projectTimelineRows } from "./timeline-projection.js";
 const DEFAULT_MAX_ITEMS = 0;
 const MAX_TOOL_INPUT_CHARS = 400;
 const MAX_TOOL_SUMMARY_CHARS = 200;
+const MAX_FORK_CONTEXT_CHARS = 100_000;
+const MAX_FORK_METADATA_CHARS = 1_000;
+const FORK_HISTORY_OMITTED = "[Earlier chat history omitted]\n";
 
 interface ActivityCuratorOptions {
   maxItems?: number;
@@ -276,7 +279,7 @@ function selectForkContextRows(input: {
 
 function trimContextMetadata(value: string | null | undefined): string | null {
   const trimmed = value?.trim();
-  return trimmed ? trimmed : null;
+  return trimmed ? trimmed.slice(0, MAX_FORK_METADATA_CHARS) : null;
 }
 
 function buildForkContextText(input: {
@@ -296,6 +299,30 @@ function buildForkContextText(input: {
   return `<chat-history-summary>\n${header.join("\n")}\n\n${input.body}\n</chat-history-summary>`;
 }
 
+function fitForkContextEntries(entries: ActivityEntry[], budget: number): string {
+  const length = entries.reduce((total, entry) => total + entry.text.length + 1, -1);
+  if (length <= budget) return entries.map((entry) => entry.text).join("\n");
+
+  const selected: string[] = [];
+  let remaining = budget - FORK_HISTORY_OMITTED.length;
+  for (let index = entries.length - 1; index >= 0; index--) {
+    const text = entries[index]!.text;
+    const size = text.length + (selected.length > 0 ? 1 : 0);
+    if (size > remaining) {
+      if (selected.length === 0) {
+        const marker = "\n[Message truncated]\n";
+        const available = remaining - marker.length;
+        const head = Math.ceil(available / 2);
+        selected.push(text.slice(0, head) + marker + text.slice(-(available - head)));
+      }
+      break;
+    }
+    selected.push(text);
+    remaining -= size;
+  }
+  return FORK_HISTORY_OMITTED + selected.toReversed().join("\n");
+}
+
 export function buildAgentForkContextAttachment(input: {
   rows: readonly AgentTimelineRow[];
   cursorBoundary?: ForkCursorBoundary | null;
@@ -319,10 +346,10 @@ export function buildAgentForkContextAttachment(input: {
     includeKinds: ["user_message", "assistant_message", "tool_call"],
     includeExternalToolInput: false,
   });
+  const metadata = { agentTitle: input.agentTitle, cwd: input.cwd };
+  const budget = MAX_FORK_CONTEXT_CHARS - buildForkContextText({ body: "", ...metadata }).length;
   const body =
-    entries.length > 0
-      ? entries.map((entry) => entry.text).join("\n")
-      : "No chat history to display.";
+    entries.length > 0 ? fitForkContextEntries(entries, budget) : "No chat history to display.";
   return {
     attachment: {
       type: "text",
diff --git a/packages/server/src/server/agent/agent-manager.test.ts b/packages/server/src/server/agent/agent-manager.test.ts
index 629159d51f..cd8bd2004a 100644
--- a/packages/server/src/server/agent/agent-manager.test.ts
+++ b/packages/server/src/server/agent/agent-manager.test.ts
@@ -3954,12 +3954,23 @@ test("a prompt after provider replacement reopens the stale session", async () =
       clients: { [provider]: replacement },
     });
 
-    const dispatch = await startAgentRun(manager, created.id, "continue after reload", logger);
+    const dispatch = await startAgentRun(manager, created.id, "continue after reload", logger, {
+      runOptions: { clientMessageId: "stale-session-retry" },
+    });
     expect(dispatch.disposition).toBe("turn_started");
     await replacement.waitForRetryStart();
     const result = await manager.waitForAgentEvent(created.id);
     expect(result.status).toBe("idle");
     expect(replacement.resumeOverrides).toHaveLength(1);
+    const timeline = manager.getTimeline(created.id);
+    expect(timeline.filter((item) => item.type === "user_message")).toMatchObject([
+      { text: "continue after reload", clientMessageId: "stale-session-retry" },
+    ]);
+    expect(
+      timeline.some(
+        (item) => item.type === "assistant_message" && item.text.includes("[System Error]"),
+      ),
+    ).toBe(false);
   } finally {
     await manager.closeAgent(created.id).catch(() => undefined);
     await manager.flush().catch(() => undefined);
@@ -8141,9 +8152,20 @@ test("streamAgent clears pending run when startTurn fails before a turn id exist
     { workspaceId: undefined },
   );
 
-  await expect(manager.runAgent(agent.id, "fail before turn id")).rejects.toThrow(
-    "Invalid request: missing field `text`",
-  );
+  await expect(
+    manager.runAgent(agent.id, "fail before turn id", {
+      clientMessageId: "rejected-prompt",
+    }),
+  ).rejects.toThrow("Invalid request: missing field `text`");
+  expect(manager.getTimeline(agent.id)).toEqual([
+    {
+      type: "user_message",
+      text: "fail before turn id",
+      clientMessageId: "rejected-prompt",
+      messageId: "rejected-prompt",
+    },
+    { type: "assistant_message", text: "[System Error] Invalid request: missing field `text`" },
+  ]);
 
   await expect(manager.runAgent(agent.id, "second turn")).resolves.toEqual(
     expect.objectContaining({
diff --git a/packages/server/src/server/agent/agent-manager.ts b/packages/server/src/server/agent/agent-manager.ts
index 390717cf66..734e4ab8c7 100644
--- a/packages/server/src/server/agent/agent-manager.ts
+++ b/packages/server/src/server/agent/agent-manager.ts
@@ -2360,7 +2360,7 @@ export class AgentManager {
       return false;
     }
     if (options?.clientMessageId) {
-      this.recordSubmittedPrompt(agent, prompt, options.clientMessageId);
+      this.recordSubmittedPrompt(agent, prompt, options.clientMessageId, "accepted");
       this.emitState(agent);
     }
     const dispatch = (event: AgentStreamEvent): void => {
@@ -2456,6 +2456,12 @@ export class AgentManager {
       agent.pendingReplacement = false;
       const errorMsg = error instanceof Error ? error.message : "Failed to start turn";
       pendingRun.start = { status: "failed", error: errorMsg };
+      // A terminal rejection belongs after the submitted prompt even though no provider turn exists.
+      if (options?.clientMessageId) {
+        this.recordSubmittedPrompt(agent, prompt, options.clientMessageId, "rejected", {
+          messageId: options.clientMessageId,
+        });
+      }
       await this.handleStreamEvent(agent, {
         type: "turn_failed",
         provider: agent.provider,
@@ -2545,7 +2551,7 @@ export class AgentManager {
           )
         : undefined;
       if (options?.clientMessageId) {
-        this.recordSubmittedPrompt(agent, prompt, options.clientMessageId, {
+        this.recordSubmittedPrompt(agent, prompt, options.clientMessageId, "accepted", {
           messageId: options.clientMessageId,
           turnId,
           providerMessageId:
@@ -2851,7 +2857,7 @@ export class AgentManager {
     if (!clientMessageId) {
       return;
     }
-    this.recordSubmittedPrompt(agent, prompt, clientMessageId, {
+    this.recordSubmittedPrompt(agent, prompt, clientMessageId, "accepted", {
       messageId: clientMessageId,
       turnId: expectedTurnId,
     });
@@ -4696,6 +4702,7 @@ export class AgentManager {
     agent: ActiveManagedAgent,
     prompt: AgentPromptInput,
     clientMessageId: string,
+    outcome: "accepted" | "rejected",
     options?: { messageId?: string; providerMessageId?: string; turnId?: string },
   ): void {
     const item = projectAgentMessage({
@@ -4704,7 +4711,10 @@ export class AgentManager {
       clientMessageId,
       ...(options?.messageId ? { messageId: options.messageId } : {}),
     });
-    if (item) this.recordSubmittedPromptItem(agent, item, options);
+    if (!item) return;
+    // Human attempts stay in history on rejection; delivery notifications require acceptance.
+    if (outcome === "rejected" && item.type !== "user_message") return;
+    this.recordSubmittedPromptItem(agent, item, options);
   }
 
   private recordSubmittedPromptItem(
diff --git a/packages/server/src/server/agent/create-agent/create.ts b/packages/server/src/server/agent/create-agent/create.ts
index eaafad96b6..ab1ce218b1 100644
--- a/packages/server/src/server/agent/create-agent/create.ts
+++ b/packages/server/src/server/agent/create-agent/create.ts
@@ -300,7 +300,8 @@ async function resolveSessionCreateAgent(
     runOptions,
     setupContinuation,
     background: true,
-    promptFailure: "throw",
+    // Registration commits creation. First-turn failures belong to the created agent.
+    promptFailure: "return-error",
     promptLogger: dependencies.logger.child({
       clientMessageId: resolveClientMessageId(input.clientMessageId),
     }),
@@ -481,7 +482,11 @@ async function sendInitialPrompt(
       throw error;
     }
     if (resolved.promptFailure === "return-error") {
-      return { started: false, liveSnapshot: snapshot, error };
+      return {
+        started: false,
+        liveSnapshot: dependencies.agentManager.getAgent(snapshot.id) ?? snapshot,
+        error,
+      };
     }
     dependencies.logger.error({ err: error, agentId: snapshot.id }, "Failed to run initial prompt");
     return { started: false, liveSnapshot: snapshot };
diff --git a/packages/server/src/server/creation/creation.e2e.test.ts b/packages/server/src/server/creation/creation.e2e.test.ts
index f0d21be18f..f4d35bd3f3 100644
--- a/packages/server/src/server/creation/creation.e2e.test.ts
+++ b/packages/server/src/server/creation/creation.e2e.test.ts
@@ -1,5 +1,6 @@
 import { execFileSync } from "node:child_process";
 import type { z } from "zod";
+import { BUILTIN_PROVIDER_IDS } from "@getpaseo/protocol/provider-manifest";
 import { WebSocket } from "ws";
 import { SessionInboundMessageSchema, WSOutboundMessageSchema } from "@getpaseo/protocol/messages";
 import { randomUUID } from "node:crypto";
@@ -9,10 +10,23 @@ import { join } from "node:path";
 import { expect, test, vi } from "vitest";
 import pino from "pino";
 import type { CreationSnapshot, SessionOutboundMessage } from "@getpaseo/protocol/messages";
+import type { AgentTimelineItem } from "../agent/agent-sdk-types.js";
 import { DaemonClient } from "../test-utils/daemon-client.js";
 import { createTestAgentClients } from "../test-utils/fake-agent-client.js";
 import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
 
+function createCreationDaemon(options: Parameters<typeof createTestPaseoDaemon>[0] = {}) {
+  const agentClients = options.agentClients ?? createTestAgentClients();
+  return createTestPaseoDaemon({
+    ...options,
+    agentClients,
+    // Installed provider CLIs must not change when background naming starts.
+    providerOverrides: Object.fromEntries(
+      BUILTIN_PROVIDER_IDS.map((id) => [id, { enabled: id in agentClients }]),
+    ),
+  });
+}
+
 function deferred<T>() {
   let resolve!: (value: T) => void;
   const promise = new Promise<T>((done) => {
@@ -29,7 +43,7 @@ test("creation progresses before agent readiness and continues after the disconn
   const directory = await mkdtemp(join(tmpdir(), "creation-wire-"));
   let agents = 0;
   let prompts = 0;
-  const daemon = await createTestPaseoDaemon({
+  const daemon = await createCreationDaemon({
     logger: pino(
       { level: "trace" },
       {
@@ -41,11 +55,13 @@ test("creation progresses before agent readiness and continues after the disconn
       },
     ),
     agentClients: createTestAgentClients({
-      beforeCreateSession: async () => {
+      beforeCreateSession: async (config) => {
+        if (config.internal) return;
         agents++;
         await provider.promise;
       },
-      onStartTurn: () => {
+      onStartTurn: (_prompt, config) => {
+        if (config.internal) return;
         prompts++;
       },
     }),
@@ -122,11 +138,12 @@ test("creation progresses before agent readiness and continues after the disconn
     await client.close();
     await observer.close();
     await daemon.close();
-    await rm(directory, { recursive: true, force: true });
+    await rm(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
   }
 }, 60000);
 
 async function connectCreationPeer(port: number) {
+  const timeout = 30_000;
   const socket = new WebSocket(`ws://127.0.0.1:${port}/ws`);
   const frames: SessionOutboundMessage[] = [];
   socket.on("message", (data) => {
@@ -147,7 +164,9 @@ async function connectCreationPeer(port: number) {
     }),
   );
   await expect
-    .poll(() => frames.some((m) => m.type === "status" && m.payload.status === "server_info"))
+    .poll(() => frames.some((m) => m.type === "status" && m.payload.status === "server_info"), {
+      timeout,
+    })
     .toBe(true);
   return {
     close: () => socket.close(),
@@ -160,7 +179,7 @@ async function connectCreationPeer(port: number) {
           (m) =>
             "payload" in m && "requestId" in m.payload && m.payload.requestId === message.requestId,
         );
-      await expect.poll(response).toBeDefined();
+      await expect.poll(response, { timeout }).toBeDefined();
       return response()!;
     },
   };
@@ -170,7 +189,7 @@ test.each([false, true])(
   "workspace identity does not depend on subscribing (first subscribe=%s)",
   async (subscribe) => {
     const directory = await mkdtemp(join(tmpdir(), "creation-identity-"));
-    const daemon = await createTestPaseoDaemon();
+    const daemon = await createCreationDaemon();
     const peer = await connectCreationPeer(daemon.port);
     try {
       const request = {
@@ -188,7 +207,7 @@ test.each([false, true])(
     } finally {
       peer.close();
       await daemon.close();
-      await rm(directory, { recursive: true, force: true });
+      await rm(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
     }
   },
   60000,
@@ -199,10 +218,13 @@ test.each(["create_agent_request", "agent.create.request"] as const)(
   async (type) => {
     const directory = await mkdtemp(join(tmpdir(), "creation-agent-identity-"));
     let creations = 0;
-    const daemon = await createTestPaseoDaemon({
+    const daemon = await createCreationDaemon({
       agentClients: createTestAgentClients({
-        beforeCreateSession: async () => {
+        beforeCreateSession: async (config) => {
+          if (config.internal) return;
           creations++;
+          // A real provider or Git checkout may take longer than Vitest's default 1s poll budget.
+          await new Promise((resolve) => setTimeout(resolve, 1_200));
         },
       }),
     });
@@ -241,7 +263,7 @@ test.each(["create_agent_request", "agent.create.request"] as const)(
     } finally {
       peer.close();
       await daemon.close();
-      await rm(directory, { recursive: true, force: true });
+      await rm(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
     }
   },
   60000,
@@ -264,7 +286,7 @@ test("legacy keyed creation preserves checkout error codes", async () => {
     ],
     { cwd: directory, stdio: "pipe" },
   );
-  const daemon = await createTestPaseoDaemon({ agentClients: createTestAgentClients() });
+  const daemon = await createCreationDaemon({ agentClients: createTestAgentClients() });
   const peer = await connectCreationPeer(daemon.port);
   try {
     const result = await peer.request({
@@ -281,6 +303,95 @@ test("legacy keyed creation preserves checkout error codes", async () => {
   } finally {
     peer.close();
     await daemon.close();
-    await rm(directory, { recursive: true, force: true });
+    await rm(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
   }
 }, 60000);
+
+test.each(["agent", "workspace"] as const)(
+  "%s creation succeeds when the provider rejects its initial prompt",
+  async (kind) => {
+    const directory = await mkdtemp(join(tmpdir(), "creation-prompt-rejected-"));
+    const rejection = "Input exceeds the maximum length of 1048576 characters.";
+    let sessions = 0;
+    let prompts = 0;
+    const daemon = await createCreationDaemon({
+      agentClients: createTestAgentClients({
+        beforeCreateSession: async (config) => {
+          if (config.internal) return;
+          sessions++;
+        },
+        onStartTurn: (_prompt, config) => {
+          if (config.internal) return;
+          prompts++;
+          throw new Error(rejection);
+        },
+      }),
+    });
+    const client = new DaemonClient({
+      url: `ws://127.0.0.1:${daemon.port}/ws`,
+      appVersion: "0.11.1",
+    });
+    const snapshots: CreationSnapshot[] = [];
+    const agent = {
+      config: { provider: "codex", cwd: directory },
+      initialPrompt: "Continue the attached conversation.",
+      clientMessageId: "draft:initial-message",
+    };
+    const streamed: AgentTimelineItem[] = [];
+    const unsubscribe = daemon.daemon.agentManager.subscribe((event) => {
+      if (event.type === "agent_stream" && event.event.type === "timeline") {
+        streamed.push(event.event.item);
+      }
+    });
+    try {
+      await client.connect();
+      const submit = async () => {
+        const common = {
+          idempotencyKey: "rejected-first-prompt",
+          onEvent: (snapshot: CreationSnapshot) => snapshots.push(snapshot),
+        };
+        if (kind === "agent") return client.createAgent({ ...common, ...agent });
+        const result = await client.createWorkspace({
+          ...common,
+          source: { kind: "directory", path: directory },
+          agent,
+        });
+        expect(result.error).toBeNull();
+        return result.agent!;
+      };
+      const created = await submit();
+      expect(created).toMatchObject({ status: "error", lastError: rejection });
+      expect(snapshots.map((snapshot) => snapshot.phase)).not.toContain("prompt_started");
+      expect(snapshots.at(-1)).toMatchObject({
+        phase: "completed",
+        error: null,
+        agent: { id: created.id },
+      });
+      const expectedTimeline = [
+        {
+          type: "user_message",
+          text: agent.initialPrompt,
+          clientMessageId: agent.clientMessageId,
+          messageId: agent.clientMessageId,
+        },
+        { type: "assistant_message", text: `[System Error] ${rejection}` },
+      ];
+      expect(
+        (await client.fetchAgentTimeline(created.id)).entries.map((entry) => entry.item),
+      ).toEqual(expectedTimeline);
+      expect(streamed).toEqual(expectedTimeline);
+      expect((await submit()).id).toBe(created.id);
+      expect(
+        (await client.fetchAgentTimeline(created.id)).entries.map((entry) => entry.item),
+      ).toEqual(expectedTimeline);
+      expect((await client.fetchAgents()).entries).toHaveLength(1);
+      expect({ sessions, prompts }).toEqual({ sessions: 1, prompts: 1 });
+    } finally {
+      unsubscribe();
+      await client.close();
+      await daemon.close();
+      await rm(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+    }
+  },
+  60000,
+);
diff --git a/packages/server/src/server/creation/index.test.ts b/packages/server/src/server/creation/index.test.ts
index 1eaf4a7fd9..a165110ef8 100644
--- a/packages/server/src/server/creation/index.test.ts
+++ b/packages/server/src/server/creation/index.test.ts
@@ -93,7 +93,7 @@ async function fixture() {
       calls.push("agent");
       await onReady(agent);
       calls.push("prompt");
-      return agent;
+      return { agent, initialPromptStarted: true };
     },
   };
   const updates: CreationSnapshot[] = [];
@@ -129,7 +129,7 @@ test("a failed agent startup retries only that stage with the reserved IDs", asy
     expect(readyWorkspace).toEqual(workspace);
     if (attempts === 1) throw new Error("provider unavailable");
     await onReady(agent);
-    return agent;
+    return { agent, initialPromptStarted: true };
   };
   expect(await f.service.create(f.input)).toMatchObject({
     phase: "failed",
@@ -210,7 +210,7 @@ test("omitted resource IDs are generated once and preserved on replay", async ()
   f.input.createAgent = async (id, createdWorkspace, onReady) => {
     const created = { ...agent, id, workspaceId: createdWorkspace!.id };
     await onReady(created);
-    return created;
+    return { agent: created, initialPromptStarted: true };
   };
   const result = await f.service.create(f.input);
   expect(result.workspaceId).toMatch(/^wks_[a-f0-9]{16}$/);
@@ -231,7 +231,7 @@ test("restart after a committed agent without a prompt completes without recreat
     await onReady(agent);
     // Capture the durable state at the exact milestone a process could stop after.
     await cp(f.directory, recoveredDirectory, { recursive: true });
-    return agent;
+    return { agent, initialPromptStarted: false };
   };
   await f.service.create(f.input);
   const recovered = await new CreationService(recoveredDirectory, silentLogger).create(f.input);
diff --git a/packages/server/src/server/creation/index.ts b/packages/server/src/server/creation/index.ts
index 3d7a42efdb..e0b28b8069 100644
--- a/packages/server/src/server/creation/index.ts
+++ b/packages/server/src/server/creation/index.ts
@@ -13,6 +13,10 @@ import { writeFileAtomic } from "../atomic-file.js";
 import { generateWorkspaceId } from "../workspace-registry-model.js";
 
 type Observer = (snapshot: CreationSnapshot) => void;
+export interface CreatedAgent {
+  agent: AgentSnapshotPayload;
+  initialPromptStarted: boolean;
+}
 interface CreationRequest {
   key: string;
   request: { [key: string]: unknown };
@@ -28,7 +32,7 @@ interface CreationRequest {
     agentId: string,
     workspace: WorkspaceDescriptorPayload | undefined,
     onReady: (agent: AgentSnapshotPayload) => Promise<void>,
-  ) => Promise<AgentSnapshotPayload>;
+  ) => Promise<CreatedAgent>;
 }
 export type CreationInput = CreationRequest &
   (
@@ -167,7 +171,7 @@ export class CreationService {
       if (input.hasAgent && input.createAgent && !record.snapshot.agent) {
         record.inFlight = "agent";
         await this.write(identity, record);
-        const agent = await input.createAgent(
+        const { agent, initialPromptStarted } = await input.createAgent(
           record.snapshot.agentId!,
           record.snapshot.workspace,
           async (readyAgent) => {
@@ -180,7 +184,7 @@ export class CreationService {
           },
         );
         record.inFlight = null;
-        if (input.hasPrompt)
+        if (initialPromptStarted)
           await this.publish(identity, record, { phase: "prompt_started", agent });
         else record.snapshot = { ...record.snapshot, agent };
       }
diff --git a/packages/server/src/server/session.ts b/packages/server/src/server/session.ts
index f837276dec..7ac679c35a 100644
--- a/packages/server/src/server/session.ts
+++ b/packages/server/src/server/session.ts
@@ -8,7 +8,7 @@ import type {
 } from "@getpaseo/protocol/messages";
 import { relative } from "node:path";
 import { isAbsolute } from "node:path";
-import { CreationService } from "./creation/index.js";
+import { CreationService, type CreatedAgent } from "./creation/index.js";
 import type { CreationSnapshot, AgentCreateRequest } from "@getpaseo/protocol/messages";
 import type { MessageReceipts } from "./message-receipts/index.js";
 import equal from "fast-deep-equal";
@@ -4173,7 +4173,7 @@ export class Session {
         if (!record) throw new Error("Previously created agent no longer exists");
         agent = this.buildStoredAgentPayload(record);
       } else {
-        agent = await this.createSessionAgent(msg);
+        ({ agent } = await this.createSessionAgent(msg));
       }
       this.emit({
         type: "status",
@@ -4212,7 +4212,7 @@ export class Session {
     msg: CreateAgentRequestMessage,
     agentId?: string,
     onAgentReady?: (agent: AgentSnapshotPayload) => Promise<void>,
-  ): Promise<AgentSnapshotPayload> {
+  ): Promise<CreatedAgent> {
     const {
       config,
       worktreeName,
@@ -4270,7 +4270,7 @@ export class Session {
         throw new Error(`Working directory does not exist or is not a directory: ${resolvedCwd}`);
       }
 
-      const { snapshot, liveSnapshot } = await createAgentCommand(
+      const { snapshot, liveSnapshot, initialPromptStarted } = await createAgentCommand(
         {
           agentManager: this.agentManager,
           agentStorage: this.agentStorage,
@@ -4327,7 +4327,7 @@ export class Session {
         { agentId: snapshot.id, provider: snapshot.provider },
         "Created agent",
       );
-      return this.buildAgentPayload(liveSnapshot);
+      return { agent: await this.buildAgentPayload(liveSnapshot), initialPromptStarted };
     } catch (error) {
       await this.createAgentLifecycleDispatch.cleanupCreatedWorktreeAfterFailedAgentCreate({
         createdWorktree: createdWorktreeForCleanup,
diff --git a/packages/server/src/server/test-utils/fake-agent-client.ts b/packages/server/src/server/test-utils/fake-agent-client.ts
index 2a437f9bbf..659dd89686 100644
--- a/packages/server/src/server/test-utils/fake-agent-client.ts
+++ b/packages/server/src/server/test-utils/fake-agent-client.ts
@@ -58,13 +58,13 @@ interface FakeAgentSessionOptions {
   sessionId?: string;
   memoryMarker?: string | null;
   closeSession?: () => Promise<void>;
-  onStartTurn?: (prompt: AgentPromptInput) => void;
+  onStartTurn?: (prompt: AgentPromptInput, config: AgentSessionConfig) => void;
 }
 
 export interface TestAgentClientOptions {
-  beforeCreateSession?: () => Promise<void>;
+  beforeCreateSession?: (config: AgentSessionConfig) => Promise<void>;
   closeSession?: () => Promise<void>;
-  onStartTurn?: (prompt: AgentPromptInput) => void;
+  onStartTurn?: (prompt: AgentPromptInput, config: AgentSessionConfig) => void;
   supportsMcpServers?: boolean;
 }
 
@@ -337,7 +337,7 @@ class FakeAgentSession implements AgentSession {
   private activeForegroundTurnId: string | null = null;
 
   private readonly closeSession: (() => Promise<void>) | undefined;
-  private readonly onStartTurn: ((prompt: AgentPromptInput) => void) | undefined;
+  private readonly onStartTurn: TestAgentClientOptions["onStartTurn"];
 
   constructor(options: FakeAgentSessionOptions) {
     this.capabilities = {
@@ -440,7 +440,7 @@ class FakeAgentSession implements AgentSession {
 
     const turnId = `fake-turn-${this.nextTurnOrdinal++}`;
     this.activeForegroundTurnId = turnId;
-    this.onStartTurn?.(prompt);
+    this.onStartTurn?.(prompt, this.config);
 
     void this.emitTurnEvents(prompt);
 
@@ -1213,7 +1213,7 @@ class FakeAgentClient implements AgentClient {
     config: AgentSessionConfig,
     _launchContext?: AgentLaunchContext,
   ): Promise<AgentSession> {
-    await this.options.beforeCreateSession?.();
+    await this.options.beforeCreateSession?.(config);
     return new FakeAgentSession({
       providerName: this.provider,
       config: { ...config },

From 0009a7e717a9f7ec587f55ca2985cb91b1310bd8 Mon Sep 17 00:00:00 2001
From: Gustavo Ambrozio <gustavo@gustavo.eng.br>
Date: Fri, 9 Oct 2026 03:31:50 -0500
Subject: [PATCH 066/270] feat(workspaces): add background visibility (#5039)

* feat(server): let clients create internal agents

The daemon's own branch-name and commit-message generators run as
internal agents: never persisted, listed, flagged, announced, or seen by
plugin lifecycle hooks. Nothing outside the daemon could ask for one,
because the wire config schema strips `internal` and the agent.create
transform re-pins it. A plugin that runs a one-turn helper per event
therefore left an archived session in History every time.

Add an optional `internal` flag to `create_agent_request` (inherited by
`agent.create.request`), copy it onto the config in the session's create
path, and skip provider session persistence for it like the generators
do. The client SDK forwards the flag on both creation paths and gates it
once on `server_info.features.internalAgents`.

Two daemon paths assumed every agent is public and had to follow:
`resolveAgentIdentifier` now accepts a live agent by exact id, since the
id set it matched against came from listings that exclude internal
agents and left `wait_for_finish` answering "Agent not found"; and
archiving an internal agent now closes it without writing the record
that `registry.applySnapshot` used to leave behind, so `autoArchive`
does not accumulate hidden files on disk.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* fix(server): keep internal agents whole through failure, archive, and wait

Review follow-ups for internal agents:

- A create that fails after the runtime is registered now closes the
  internal agent before rethrowing, so a hidden runtime cannot outlive
  the failed request. Public agents keep today's behaviour.
- Archiving an internal agent cascades to attached children like any
  parent. cascadeArchiveChildren takes the parent record instead of
  reading it back from storage, where an internal agent never is.
- The archived snapshot and last message of an internal agent stay
  readable by exact id for ten minutes, so create-then-waitForFinish
  returns the finished turn whether the wait lands before or after an
  auto-archive. Storage plays that role for public agents.
- The internal-agent e2e scenarios live in the existing
  create_agent_request lifecycle suite rather than a new file.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* fix(server): cascade to live internal children and keep a failed internal create's worktree until it closes

Internal children never reach storage, so the parent archive cascade scans
live agents for them as well. A failed internal create now clears the
created id only after the runtime is archived, so worktree cleanup cannot
delete the directory under a runtime that would not close. Stored agent
payloads carry lastError, so a retained failed helper reports its error
through wait_for_finish instead of the generic message.

* feat(cli,mcp): expose internal agents and document --no-wait

paseo run gains --internal and create_agent gains internal, both forwarded
to the create request. --no-wait becomes the documented spelling for
returning immediately, matching paseo send; --background and --detach stay
as hidden aliases under COMPAT tags.

* test: follow the --no-wait rename and stub getRetiredInternalAgent

* feat: list internal agents on request and add internal workspaces

Internal agents stay hidden by default, but a caller can now ask for
them: `fetch_agents_request` takes `filter.includeInternal`, snapshots
carry `internal: true`, and `paseo ls --internal` shows them in an
INTERNAL column. The app never passes the flag.

Workspaces get the same flag. `workspace.create.request` with
`internal: true` persists a hidden workspace: listings, update
subscriptions, sync reads, empty-project counting, open-by-path, MCP
`list_workspaces`, and plugin workspace hooks all skip it unless the
caller opts in with `filter.includeInternal`. Every agent created inside
an internal workspace is internal and unpersisted; AgentManager applies
that from the workspace id before the plugin hook so creators cannot
opt out. Archive and shutdown enumerate internal agents so nothing
inside an internal workspace outlives it.

Surfaces: `paseo workspace create --internal`, `paseo workspace ls
--internal`, `paseo run --internal --new-workspace`, MCP
`create_workspace({ internal })`, SDK `workspaces.create({ internal })`
and `list({ filter: { includeInternal } })`. Clients gate on
`features.internalWorkspaces`.

Co-Authored-By: Claude <noreply@anthropic.com>

* feat(workspaces): add background visibility with inherited creation defaults

* fix(cli): resolve workspace callers on the selected daemon

* test(workspaces): keep caller integration coverage in server suite

* test(cli): exercise workspace callers through CLI integration harness

* test(mcp): remove obsolete execution flags from browser fixtures

---------

Co-authored-by: marvin-ambrozio <marvin@gustavo.eng.br>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Mohamed Boudra <boudra.moha@gmail.com>
---
 docs/agent-lifecycle.md                       |  30 +-
 .../browser/sidebar-workspace-rename.spec.ts  |  73 ++++
 .../helpers/codex-workspace-restore.ts        |   1 -
 .../app/e2e/support/helpers/seed-client.ts    |   3 +
 .../src/components/sidebar-workspace-list.tsx |  18 +-
 .../sidebar/display-preferences/menu.tsx      |   7 +
 .../sidebar/display-preferences/model.ts      |   8 +
 .../src/components/sidebar/sidebar-model.tsx  |  15 +-
 .../hooks/sidebar-workspaces-view-model.ts    |   2 +
 packages/app/src/i18n/resources/ar.ts         |   1 +
 packages/app/src/i18n/resources/en.ts         |   1 +
 packages/app/src/i18n/resources/es.ts         |   1 +
 packages/app/src/i18n/resources/fr.ts         |   1 +
 packages/app/src/i18n/resources/ja.ts         |   1 +
 packages/app/src/i18n/resources/ko.ts         |   1 +
 packages/app/src/i18n/resources/pt-BR.ts      |   1 +
 packages/app/src/i18n/resources/ru.ts         |   1 +
 packages/app/src/i18n/resources/zh-CN.ts      |   1 +
 .../src/runtime/directory-sync/index.test.ts  |   4 +
 .../app/src/runtime/directory-sync/index.ts   |   2 +
 packages/app/src/runtime/host-runtime.test.ts |   3 +
 packages/app/src/stores/session-store.ts      |   2 +
 .../app/src/stores/sidebar-view-store.test.ts |   6 +
 packages/app/src/stores/sidebar-view-store.ts |  12 +-
 packages/cli/src/cli-surface.test.ts          |  33 +-
 packages/cli/src/commands/agent/ls.test.ts    |  11 +-
 packages/cli/src/commands/agent/ls.ts         |  14 +-
 packages/cli/src/commands/agent/run.test.ts   |  35 +-
 packages/cli/src/commands/agent/run.ts        |  61 ++--
 packages/cli/src/commands/workspace/create.ts |   5 +
 packages/cli/src/commands/workspace/index.ts  |  13 +-
 packages/cli/src/commands/workspace/ls.ts     |  23 +-
 packages/cli/src/commands/workspace/shared.ts |  11 +
 packages/cli/src/utils/caller-agent.ts        |  21 ++
 packages/cli/tests/05-agent-run.test.ts       |  20 +-
 .../cli/tests/38-workspace-rename.test.ts     |  54 +++
 packages/client/src/daemon-client.test.ts     | 156 ++++++++
 packages/client/src/daemon-client.ts          |  68 +++-
 packages/client/src/index.test.ts             |  55 +++
 packages/client/src/index.ts                  |   5 +
 packages/desktop/e2e/browser-tabs.e2e.mjs     |   1 -
 .../messages.create-agent-internal.test.ts    |  51 +++
 packages/protocol/src/messages.ts             |  29 ++
 .../protocol/src/paseo-tool-call-detail.ts    |   2 +
 .../src/server/agent/agent-manager.test.ts    | 193 ++++++++++
 .../server/src/server/agent/agent-manager.ts  | 136 ++++++-
 .../src/server/agent/agent-mcp.e2e.test.ts    |  61 +---
 .../server/agent/agent-projections.test.ts    |  11 +
 .../src/server/agent/agent-projections.ts     |   3 +
 .../server/src/server/agent/agent-prompt.ts   |  82 +++--
 .../agent/create-agent-lifecycle-dispatch.ts  |  85 ++---
 .../server/agent/create-agent/create.test.ts  |  48 ++-
 .../src/server/agent/create-agent/create.ts   |  65 ++--
 packages/server/src/server/agent/directory.ts |  65 ++++
 .../server/agent/lifecycle-command.test.ts    |  19 +
 .../src/server/agent/lifecycle-command.ts     |  10 +-
 .../src/server/agent/mcp-parity.e2e.test.ts   | 208 +++++------
 .../src/server/agent/mcp-server.test.ts       | 334 ++++++++++++++++--
 .../src/server/agent/tools/paseo-tools.ts     | 222 +++++-------
 packages/server/src/server/bootstrap.ts       |  11 +-
 .../server/src/server/directory-sync/index.ts |  42 ++-
 .../src/server/hub/daemon-executions.ts       |   1 -
 .../src/server/paseo-worktree-service.ts      |   4 +
 .../server/schedule-run-lifecycle.e2e.test.ts |   4 +
 .../src/server/schedule/service.test.ts       |   4 -
 .../server/src/server/schedule/service.ts     |   1 -
 ...ate-agent-worktree-autoarchive.e2e.test.ts | 304 +++++++++++++++-
 packages/server/src/server/session.test.ts    |   2 +
 packages/server/src/server/session.ts         | 283 ++++++++++-----
 .../src/server/session.workspaces.test.ts     |  44 +++
 .../agent-updates-service.test.ts             |  11 +
 .../agent-updates/agent-updates-service.ts    |  28 +-
 .../workspace-provisioning-service.test.ts    |  64 ++++
 .../workspace-provisioning-service.ts         |  64 +++-
 .../server/test-utils/fake-agent-client.ts    |   7 +
 .../src/server/test-utils/session-stubs.ts    |   1 +
 .../server/src/server/websocket-server.ts     |   1 +
 .../src/server/workspace-archive-service.ts   |   2 +-
 .../src/server/workspace-directory.test.ts    |  38 ++
 .../server/src/server/workspace-directory.ts  |  23 +-
 .../workspace-reconciliation-service.test.ts  |   1 +
 .../src/server/workspace-registry.test.ts     |  15 +
 .../server/src/server/workspace-registry.ts   |   7 +-
 .../server/src/server/worktree-session.ts     |  38 +-
 public-docs/cli.md                            |  28 +-
 public-docs/mcp.md                            |  38 +-
 public-docs/orchestration.md                  |   4 +-
 public-docs/plugins/reference.md              |   8 +-
 public-docs/sdk/agents.md                     |  25 ++
 public-docs/sdk/reference.md                  |  26 +-
 public-docs/sdk/workspaces.md                 |  22 ++
 skills/paseo/SKILL.md                         |  14 +-
 92 files changed, 2795 insertions(+), 775 deletions(-)
 create mode 100644 packages/cli/src/utils/caller-agent.ts
 create mode 100644 packages/protocol/src/messages.create-agent-internal.test.ts
 create mode 100644 packages/server/src/server/agent/directory.ts

diff --git a/docs/agent-lifecycle.md b/docs/agent-lifecycle.md
index d0d057949f..ee763aa1f9 100644
--- a/docs/agent-lifecycle.md
+++ b/docs/agent-lifecycle.md
@@ -69,11 +69,11 @@ the marker. Closing a tab sets that client's label to `false`. Any `true` client
 open. Detach clears the parent and every open-tab label. The surviving child therefore becomes a
 normal root agent immediately, and closing its still-open tab archives it.
 
-Runtime ownership is resolved from explicit workspace ID and caller context, never from `cwd`. Workspace creation is a separate operation with `local | worktree` isolation; agent creation only selects an existing workspace.
+Runtime ownership is resolved from explicit workspace ID and caller context, never from `cwd`. Workspace creation is a separate operation with `local | worktree` isolation; agent creation reuses that workspace unless a new workspace is explicitly requested.
 
 Users can also detach an existing subagent from the subagents track. Detach is deliberately a manual lifecycle gesture, not an agent-facing MCP tool. It removes the parent and open-tab lifecycle labels: it does not stop, archive, move, or restart the agent. The agent keeps its current `cwd` and `workspaceId`, leaves the former parent's track, and behaves like a root agent for tab close, workspace activity, and future parent archive.
 
-`notifyOnFinish` defaults to `true` for agent-scoped creation and background prompt follow-ups because most delegated work needs to report back to the creating agent. Set it to `false` only for truly fire-and-forget agents or prompts.
+`notifyOnFinish` defaults to `true` for agent-scoped creation and prompt follow-ups because most delegated work needs to report back to the creating agent. Set it to `false` only for truly fire-and-forget agents or prompts.
 Permission requests are notification checkpoints, not the end of that subscription. The caller is notified again after a permission response when the child finishes, errors, or requests another permission.
 The permission notification includes the normalized request plus the child and request IDs, so the caller can inspect it and respond without fetching agent status.
 A watched child that closes before its finish event also notifies the caller so delegated work cannot disappear silently during archive or workspace teardown.
@@ -84,6 +84,32 @@ Some providers can create their own child sessions inside one provider runtime.
 
 The provider still owns the underlying runtime. Paseo keeps an agent record so the child can be opened, tracked, archived, and cascaded with the parent, but prompts and history hydration route through the provider adapter for that native child handle.
 
+## Background workspaces
+
+`workspace.background` controls discovery only. Background workspaces contain ordinary durable
+agents and terminals: provider history, plugin hooks, parentage, archive, and restart recovery
+keep their normal behavior. Visibility is creation-only; selecting an existing workspace cannot
+change it. New workspaces default to false, inherit the caller workspace's value when an agent
+creates one without an override, and accept explicit true or false.
+
+The daemon derives agent discovery from workspace ownership. Default workspace and agent lists,
+including History requests, exclude background work; `filter.includeBackground` includes it.
+Exact-ID operations bypass discovery filtering. The app replicates both kinds and filters only
+its sidebar with **Show background**, so direct navigation and restored tabs remain available.
+
+Sequenced directories keep complete canonical collections. A filtered read must never replace
+those collections with its subset. Inclusive and default observations have distinct cursor
+scopes, so changing scope requires a fresh snapshot rather than reusing an incomplete cache.
+Clients gate creation and inclusive discovery on `features.backgroundWorkspaces`.
+
+### Private daemon helpers
+
+Branch-name and commit-message generators still use private disposable internal runtimes.
+`AgentManager` does not persist them or their provider sessions, excludes them from public
+discovery and plugin hooks, and drops their timelines on archive. An archived helper retains
+its exact-ID result briefly to cover completion before a waiter attaches. This internal
+lifecycle is separate from public workspace visibility and is not a public creation option.
+
 ## Archive
 
 Archive is a **soft delete**: the agent record stays on disk with `archivedAt` set, the runtime is closed, and the agent disappears from active lists. Archive is **global** — it lives on the server and propagates to every connected client.
diff --git a/packages/app/e2e/browser/sidebar-workspace-rename.spec.ts b/packages/app/e2e/browser/sidebar-workspace-rename.spec.ts
index 21ad51a6bb..6ed14d159a 100644
--- a/packages/app/e2e/browser/sidebar-workspace-rename.spec.ts
+++ b/packages/app/e2e/browser/sidebar-workspace-rename.spec.ts
@@ -1,6 +1,7 @@
 import { test, expect, type Page } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { seedWorkspace } from "../support/helpers/seed-client";
+import { openAgentRoute } from "../support/helpers/mock-agent";
 import { getServerId } from "../support/helpers/server-id";
 
 function workspaceRowTestId(workspaceId: string): string {
@@ -73,3 +74,75 @@ test.describe("Sidebar workspace rename", () => {
     }
   });
 });
+
+async function toggleBackgroundWorkspaces(page: Page): Promise<void> {
+  await page.getByLabel("Display preferences", { exact: true }).click();
+  await page.getByRole("menuitem", { name: "Show background", exact: true }).click();
+  await page.keyboard.press("Escape");
+}
+
+async function expectWorkspaceInSidebar(page: Page, workspaceId: string): Promise<void> {
+  // Rows have no single accessible role: their nested title and actions share this container.
+  await expect(page.getByTestId(workspaceRowTestId(workspaceId))).toBeVisible({ timeout: 30_000 });
+}
+
+async function expectWorkspaceHidden(page: Page, workspaceId: string): Promise<void> {
+  await expect(page.getByTestId(workspaceRowTestId(workspaceId))).toHaveCount(0);
+}
+
+async function reconnectApp(page: Page): Promise<void> {
+  await page.reload();
+  await expect(page.getByLabel("Display preferences", { exact: true })).toBeVisible();
+}
+
+async function expectWorkerOpen(page: Page): Promise<void> {
+  await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeEditable({
+    timeout: 30_000,
+  });
+  await expect(page.getByText("Background reviewer", { exact: true }).first()).toBeVisible();
+  await expect(page.getByText("Background review prompt", { exact: true }).first()).toBeVisible();
+}
+
+test("background workspace stays directly accessible across sidebar toggles and reconnect", async ({
+  page,
+}, testInfo) => {
+  const workspace = await seedWorkspace({
+    repoPrefix: "sidebar-background-",
+    title: "Background review",
+    background: true,
+  });
+  try {
+    const worker = await workspace.client.createAgent({
+      provider: "mock",
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Background reviewer",
+      initialPrompt: "Background review prompt",
+      model: "e2e-fast-stream",
+      modeId: "load-test",
+    });
+    await test.step("Default sidebar hides background work", async () => {
+      await gotoAppShell(page);
+      await expectWorkspaceHidden(page, workspace.workspaceId);
+    });
+    await test.step("Show background exposes the fully replicated workspace", async () => {
+      await toggleBackgroundWorkspaces(page);
+      await expectWorkspaceInSidebar(page, workspace.workspaceId);
+      await reconnectApp(page);
+      await expectWorkspaceInSidebar(page, workspace.workspaceId);
+    });
+    await test.step("Direct agent navigation survives hiding and reconnect", async () => {
+      await toggleBackgroundWorkspaces(page);
+      await expectWorkspaceHidden(page, workspace.workspaceId);
+      await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: worker.id });
+      await expectWorkerOpen(page);
+      await expectWorkspaceHidden(page, workspace.workspaceId);
+      await reconnectApp(page);
+      await expectWorkerOpen(page);
+      await expectWorkspaceHidden(page, workspace.workspaceId);
+      await page.screenshot({ path: testInfo.outputPath("background-direct-open.png") });
+    });
+  } finally {
+    await workspace.cleanup();
+  }
+});
diff --git a/packages/app/e2e/support/helpers/codex-workspace-restore.ts b/packages/app/e2e/support/helpers/codex-workspace-restore.ts
index 7595b4eb20..45bdc1aded 100644
--- a/packages/app/e2e/support/helpers/codex-workspace-restore.ts
+++ b/packages/app/e2e/support/helpers/codex-workspace-restore.ts
@@ -98,7 +98,6 @@ async function createCodexRestoreJourney(page: Page, client: SeedDaemonClient, i
           settings: { modeId: "full-access", thinkingOptionId: "low" },
           title: "Codex worktree restore reproduction",
           initialPrompt: `Reply with exactly ${REPLY} and nothing else. Do not use tools.`,
-          background: true,
         }),
       );
       agentId = agent.agentId;
diff --git a/packages/app/e2e/support/helpers/seed-client.ts b/packages/app/e2e/support/helpers/seed-client.ts
index 869e96b294..4aec3fff01 100644
--- a/packages/app/e2e/support/helpers/seed-client.ts
+++ b/packages/app/e2e/support/helpers/seed-client.ts
@@ -66,6 +66,7 @@ export interface SeedDaemonClient {
           worktreeSlug?: string;
         };
     title?: string;
+    background?: boolean;
   }): Promise<{
     workspace: SeedWorkspaceDescriptor | null;
     error: string | null;
@@ -223,6 +224,7 @@ export interface SeededWorkspace {
 export async function seedWorkspace(options: {
   repoPrefix: string;
   title?: string;
+  background?: boolean;
   port?: number;
   /** Repo fixture options; only applies to git projects (the default). */
   repo?: Parameters<typeof createTempGitRepo>[1];
@@ -238,6 +240,7 @@ export async function seedWorkspace(options: {
     const created = await client.createWorkspace({
       source: { kind: "directory", path: project.path },
       title: options.title,
+      background: options.background,
     });
     if (!created.workspace) {
       throw new Error(created.error ?? `Failed to create workspace ${project.path}`);
diff --git a/packages/app/src/components/sidebar-workspace-list.tsx b/packages/app/src/components/sidebar-workspace-list.tsx
index 4275099cfd..44c6adc5d6 100644
--- a/packages/app/src/components/sidebar-workspace-list.tsx
+++ b/packages/app/src/components/sidebar-workspace-list.tsx
@@ -63,11 +63,7 @@ import {
   type SidebarWorkspacePlacement,
 } from "@/hooks/use-sidebar-workspaces-list";
 import { useSidebarOrderStore } from "@/stores/sidebar-order-store";
-import {
-  hasActiveSidebarLabelFilter,
-  useSidebarViewStore,
-  type SidebarGroupMode,
-} from "@/stores/sidebar-view-store";
+import { useSidebarViewStore, type SidebarGroupMode } from "@/stores/sidebar-view-store";
 import { useShowShortcutBadges } from "@/hooks/use-show-shortcut-badges";
 import {
   ContextMenu,
@@ -1919,9 +1915,6 @@ export function SidebarWorkspaceList({
   const onToggleWorkspacePin = useSidebarWorkspacePinController();
   const getPinnedWorkspaceOrder = useSidebarOrderStore((state) => state.getPinnedWorkspaceOrder);
   const setPinnedWorkspaceOrder = useSidebarOrderStore((state) => state.setPinnedWorkspaceOrder);
-  const hasActiveLabelFilter = useSidebarViewStore((state) =>
-    hasActiveSidebarLabelFilter(state.labelFilter),
-  );
   const handlePinnedWorkspaceReorder = useCallback(
     (reorderedWorkspaces: SidebarWorkspacePlacement[]) => {
       const reorderedWorkspaceKeys = reorderedWorkspaces.map((workspace) => workspace.workspaceKey);
@@ -1953,11 +1946,10 @@ export function SidebarWorkspaceList({
   // this whole subtree, which unmounted the header — and the header is where the display menu's
   // trigger lives, so filtering the last row away closed the menu you were filtering from.
   //
-  // Only the label filter can get here. The project filter resolves against the projects it can
-  // see and falls back to "all projects" when nothing matches, so it either keeps at least one
-  // project or is not applied at all — it can narrow this list but never empty it.
-  const sidebarFilterEmpty =
-    hasActiveLabelFilter && hasProjectsBeforeFilter && projects.length === 0;
+  // Background visibility can also hide the last project. Keep the header mounted
+  // whenever a local filter empties an otherwise populated directory, so users can
+  // reach the display menu to reveal their work again.
+  const sidebarFilterEmpty = hasProjectsBeforeFilter && projects.length === 0;
 
   // Project mode is the one that keeps its project headers; every other grouping mode is a flat
   // list of grouped rows, so a new mode lands in the grouped branch rather than silently in this
diff --git a/packages/app/src/components/sidebar/display-preferences/menu.tsx b/packages/app/src/components/sidebar/display-preferences/menu.tsx
index 018c8cc37e..d62b3f9ff1 100644
--- a/packages/app/src/components/sidebar/display-preferences/menu.tsx
+++ b/packages/app/src/components/sidebar/display-preferences/menu.tsx
@@ -301,6 +301,13 @@ export function SidebarDisplayPreferencesMenu(): ReactElement {
           sheetTitle={t("sidebar.display.heading")}
           testID="sidebar-display-preferences-content"
         >
+          <MenuItem
+            selected={preferences.showBackground}
+            closeOnSelect={false}
+            onSelect={preferences.toggleBackground}
+          >
+            {t("sidebar.display.showBackground")}
+          </MenuItem>
           <MenuSubTrigger
             id="grouping"
             value={t(GROUPING_LABEL_KEYS[preferences.grouping])}
diff --git a/packages/app/src/components/sidebar/display-preferences/model.ts b/packages/app/src/components/sidebar/display-preferences/model.ts
index 14bddb9918..68d347a258 100644
--- a/packages/app/src/components/sidebar/display-preferences/model.ts
+++ b/packages/app/src/components/sidebar/display-preferences/model.ts
@@ -16,6 +16,8 @@ import { DEFAULT_SIDEBAR_ROW_ITEMS, type SidebarRowItem, type SidebarRowItems }
 export type SidebarTrailingChoice = Exclude<SidebarWorkspaceTrailing, "none">;
 
 export interface SidebarDisplayPreferences {
+  showBackground: boolean;
+  toggleBackground: () => void;
   grouping: SidebarGroupMode;
   setGrouping: (mode: SidebarGroupMode) => void;
   titleSource: WorkspaceTitleSource;
@@ -48,6 +50,8 @@ export interface SidebarDisplayPreferences {
  * this for a value and set it; where it lands is this module's problem.
  */
 export function useSidebarDisplayPreferences(): SidebarDisplayPreferences {
+  const showBackground = useSidebarViewStore((state) => state.showBackground);
+  const toggleBackground = useSidebarViewStore((state) => state.toggleBackground);
   const grouping = useSidebarViewStore((state) => state.groupMode);
   const setGrouping = useSidebarViewStore((state) => state.setGroupMode);
   const hostFilters = useSidebarViewStore((state) => state.hostFilters);
@@ -104,6 +108,8 @@ export function useSidebarDisplayPreferences(): SidebarDisplayPreferences {
 
   return useMemo(
     () => ({
+      showBackground,
+      toggleBackground,
       grouping,
       setGrouping,
       titleSource: workspaceTitleSource,
@@ -125,6 +131,8 @@ export function useSidebarDisplayPreferences(): SidebarDisplayPreferences {
       clearLabelFilter,
     }),
     [
+      showBackground,
+      toggleBackground,
       grouping,
       setGrouping,
       workspaceTitleSource,
diff --git a/packages/app/src/components/sidebar/sidebar-model.tsx b/packages/app/src/components/sidebar/sidebar-model.tsx
index 0cd7dc2b72..ec834aee19 100644
--- a/packages/app/src/components/sidebar/sidebar-model.tsx
+++ b/packages/app/src/components/sidebar/sidebar-model.tsx
@@ -57,6 +57,7 @@ export function SidebarModelProvider({
 }) {
   const { t } = useTranslation();
   const list = useSidebarWorkspacesList({ enabled: active });
+  const showBackground = useSidebarViewStore((state) => state.showBackground);
   const groupMode = useSidebarViewStore((state) => state.groupMode);
   const labelFilter = useSidebarViewStore((state) => state.labelFilter);
   const projectFilters = useSidebarViewStore((state) => state.projectFilters);
@@ -107,9 +108,12 @@ export function SidebarModelProvider({
       workspaces: [...workspaceEntriesByKey.values()],
       projectFilters: resolvedProjectFilters,
     });
-    const filtered = filterWorkspacesByLabels({ workspaces: byProject, ...labelFilter });
+    const filtered = filterWorkspacesByLabels({
+      workspaces: byProject.filter((workspace) => showBackground || !workspace.background),
+      ...labelFilter,
+    });
     return new Map(filtered.map((workspace) => [workspace.workspaceKey, workspace]));
-  }, [labelFilter, resolvedProjectFilters, workspaceEntriesByKey]);
+  }, [showBackground, labelFilter, resolvedProjectFilters, workspaceEntriesByKey]);
   const visibleWorkspaceKeys = useMemo(
     () => new Set(filteredWorkspaceEntriesByKey.keys()),
     [filteredWorkspaceEntriesByKey],
@@ -124,16 +128,19 @@ export function SidebarModelProvider({
       const included = new Set(resolvedProjectFilters);
       projects = projects.filter((project) => included.has(project.viewKey));
     }
-    if (hasActiveLabelFilter) {
+    if (hasActiveLabelFilter || !showBackground) {
       projects = projects.flatMap((project) => {
         const workspaces = project.workspaces.filter((workspace) =>
           visibleWorkspaceKeys.has(workspace.workspaceKey),
         );
-        return workspaces.length > 0 ? [{ ...project, workspaces }] : [];
+        return workspaces.length > 0 || (!hasActiveLabelFilter && project.workspaces.length === 0)
+          ? [{ ...project, workspaces }]
+          : [];
       });
     }
     return projects;
   }, [
+    showBackground,
     hasActiveLabelFilter,
     hasActiveProjectFilter,
     resolvedProjectFilters,
diff --git a/packages/app/src/hooks/sidebar-workspaces-view-model.ts b/packages/app/src/hooks/sidebar-workspaces-view-model.ts
index 842844cdc2..24ecc34461 100644
--- a/packages/app/src/hooks/sidebar-workspaces-view-model.ts
+++ b/packages/app/src/hooks/sidebar-workspaces-view-model.ts
@@ -27,6 +27,7 @@ export interface SidebarWorkspacePlacement {
   workspaceDirectory?: string;
   projectKind: WorkspaceStructureProject["projectKind"];
   workspaceKind: WorkspaceDescriptor["workspaceKind"];
+  background?: boolean;
   name: string;
 }
 
@@ -164,6 +165,7 @@ export function createSidebarWorkspaceEntry(input: {
       input.workspace.worktreeSlug ?? shortenPath(input.workspace.workspaceDirectory),
     projectKind: input.workspace.projectKind,
     workspaceKind: input.workspace.workspaceKind,
+    background: input.workspace.background,
     name: input.workspace.name,
     title: input.workspace.title ?? null,
     pinnedAt: input.workspace.pinnedAt,
diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index 9ebd34c728..979961abc5 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -1147,6 +1147,7 @@ export const ar: TranslationResources = {
       done: "تم",
     },
     display: {
+      showBackground: "إظهار مساحات العمل في الخلفية",
       trigger: "تفضيلات العرض",
       heading: "العرض",
       grouping: {
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 5ddb309806..8d8bba9576 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -1155,6 +1155,7 @@ export const en = {
       done: "Done",
     },
     display: {
+      showBackground: "Show background",
       trigger: "Display preferences",
       heading: "Display",
       grouping: {
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index 896e2fe947..9bedaefffa 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -1183,6 +1183,7 @@ export const es: TranslationResources = {
       done: "Terminado",
     },
     display: {
+      showBackground: "Mostrar espacios en segundo plano",
       trigger: "Preferencias de visualización",
       heading: "Visualización",
       grouping: {
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index 3d6466445c..3d1e7df64d 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -1174,6 +1174,7 @@ export const fr: TranslationResources = {
       done: "Terminé",
     },
     display: {
+      showBackground: "Afficher les espaces en arrière-plan",
       trigger: "Préférences d’affichage",
       heading: "Affichage",
       grouping: {
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index 30931c642b..66e4d0baf7 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -1160,6 +1160,7 @@ export const ja: TranslationResources = {
       done: "完了",
     },
     display: {
+      showBackground: "バックグラウンドを表示",
       trigger: "表示設定",
       heading: "表示",
       grouping: {
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index d3b9688c44..5bf6628758 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -1154,6 +1154,7 @@ export const ko: TranslationResources = {
       done: "완료",
     },
     display: {
+      showBackground: "백그라운드 표시",
       trigger: "표시 설정",
       heading: "표시",
       grouping: {
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index aa426a4ce6..e00f9ddc02 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -1173,6 +1173,7 @@ export const ptBR: TranslationResources = {
       done: "Concluído",
     },
     display: {
+      showBackground: "Mostrar espaços em segundo plano",
       trigger: "Preferências de exibição",
       heading: "Exibição",
       grouping: {
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index a49fe1f9cb..d276fb03fc 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -1164,6 +1164,7 @@ export const ru: TranslationResources = {
       done: "Готово",
     },
     display: {
+      showBackground: "Показать фоновые пространства",
       trigger: "Настройки отображения",
       heading: "Отображение",
       grouping: {
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index f42e5a3e8c..03ff7160b9 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -1139,6 +1139,7 @@ export const zhCN: TranslationResources = {
       done: "已完成",
     },
     display: {
+      showBackground: "显示后台工作区",
       trigger: "显示偏好",
       heading: "显示",
       grouping: {
diff --git a/packages/app/src/runtime/directory-sync/index.test.ts b/packages/app/src/runtime/directory-sync/index.test.ts
index 22c6c4f040..5a247590d5 100644
--- a/packages/app/src/runtime/directory-sync/index.test.ts
+++ b/packages/app/src/runtime/directory-sync/index.test.ts
@@ -33,6 +33,10 @@ type ProjectListResult = Awaited<ReturnType<DaemonClient["listProjects"]>>;
 type AgentFetchResult = Awaited<ReturnType<DaemonClient["fetchAgents"]>>;
 
 class FakeDirectoryClient {
+  supportsBackgroundWorkspaces(): boolean {
+    return false;
+  }
+
   supportsWorkspaceLabels = false;
   listWorkspaceLabelsCalls = 0;
   fetchAgentsCalls = 0;
diff --git a/packages/app/src/runtime/directory-sync/index.ts b/packages/app/src/runtime/directory-sync/index.ts
index 0f10d7f893..6589914825 100644
--- a/packages/app/src/runtime/directory-sync/index.ts
+++ b/packages/app/src/runtime/directory-sync/index.ts
@@ -535,6 +535,7 @@ export class DirectorySync {
     let subscribe = initialSubscribe;
     while (true) {
       const query: Parameters<DaemonClient["observeWorkspaces"]>[0] = {
+        ...(client.supportsBackgroundWorkspaces() ? { includeBackground: true } : {}),
         sort: [{ key: "activity_at", direction: "desc" }],
         page: cursor ? { limit: PAGE_LIMIT, cursor } : { limit: PAGE_LIMIT },
         ...(supportsDirectorySync
@@ -634,6 +635,7 @@ export class DirectorySync {
       const limit = input.page?.limit ?? PAGE_LIMIT;
       const query: Omit<FetchAgentsOptions, "subscribe"> = {
         ...(input.filter ? { filter: input.filter } : { scope: "active" as const }),
+        ...(client.supportsBackgroundWorkspaces() ? { includeBackground: true } : {}),
         sort: AGENT_SORT,
         page: cursor ? { limit, cursor } : { limit },
         ...(!input.filter && cursor === null && this.supportsDirectorySync()
diff --git a/packages/app/src/runtime/host-runtime.test.ts b/packages/app/src/runtime/host-runtime.test.ts
index 996a47d498..61285eb2c6 100644
--- a/packages/app/src/runtime/host-runtime.test.ts
+++ b/packages/app/src/runtime/host-runtime.test.ts
@@ -52,6 +52,9 @@ it("requests the managed connection credential through desktop main without a we
 });
 
 class FakeDaemonClient {
+  supportsBackgroundWorkspaces(): boolean {
+    return false;
+  }
   private state: ConnectionState = { status: "idle" };
   private listeners = new Set<(status: ConnectionState) => void>();
   private error: string | null = null;
diff --git a/packages/app/src/stores/session-store.ts b/packages/app/src/stores/session-store.ts
index 0d59b1c6b5..a741f99ddb 100644
--- a/packages/app/src/stores/session-store.ts
+++ b/packages/app/src/stores/session-store.ts
@@ -113,6 +113,7 @@ export interface WorkspaceDescriptor {
   worktreeSlug?: WorkspaceDescriptorPayload["worktreeSlug"];
   projectKind: WorkspaceDescriptorPayload["projectKind"];
   workspaceKind: WorkspaceDescriptorPayload["workspaceKind"];
+  background?: boolean;
   name: string;
   title?: string | null;
   pinnedAt?: string | null;
@@ -150,6 +151,7 @@ export function normalizeWorkspaceDescriptor(
     worktreeSlug: payload.worktreeSlug,
     projectKind: payload.projectKind,
     workspaceKind: payload.workspaceKind,
+    background: payload.background ?? false,
     name: payload.name,
     title: payload.title ?? null,
     pinnedAt: payload.pinnedAt ?? null,
diff --git a/packages/app/src/stores/sidebar-view-store.test.ts b/packages/app/src/stores/sidebar-view-store.test.ts
index 902294dd2d..e21c8f8a15 100644
--- a/packages/app/src/stores/sidebar-view-store.test.ts
+++ b/packages/app/src/stores/sidebar-view-store.test.ts
@@ -32,6 +32,7 @@ function createMemoryStorage(entries: Record<string, string | null>): MemoryStor
 describe("sidebar view store", () => {
   beforeEach(() => {
     useSidebarViewStore.setState({
+      showBackground: false,
       groupMode: "project",
       hostFilters: [],
       projectFilters: [],
@@ -84,6 +85,7 @@ describe("sidebar view store", () => {
         },
       }),
     ).toEqual({
+      showBackground: false,
       groupMode: "status",
       hostFilters: [],
       projectFilters: [],
@@ -98,6 +100,7 @@ describe("sidebar view store", () => {
         hostFilter: "host-a",
       }),
     ).toEqual({
+      showBackground: false,
       groupMode: "status",
       hostFilters: ["host-a"],
       projectFilters: [],
@@ -112,6 +115,7 @@ describe("sidebar view store", () => {
         hostFilters: ["host-a", "host-b"],
       }),
     ).toEqual({
+      showBackground: false,
       groupMode: "status",
       hostFilters: ["host-a", "host-b"],
       projectFilters: [],
@@ -222,6 +226,7 @@ describe("sidebar view store", () => {
         projectFilters: ["project-a", "project-b"],
       }),
     ).toEqual({
+      showBackground: false,
       groupMode: "project",
       hostFilters: ["host-a"],
       projectFilters: ["project-a", "project-b"],
@@ -231,6 +236,7 @@ describe("sidebar view store", () => {
 
   it("never keeps project filters from state the schema rejects", () => {
     expect(migrateSidebarViewState({ projectFilters: "project-a" })).toEqual({
+      showBackground: false,
       groupMode: "project",
       hostFilters: [],
       projectFilters: [],
diff --git a/packages/app/src/stores/sidebar-view-store.ts b/packages/app/src/stores/sidebar-view-store.ts
index 19f559c89d..0e12c304a8 100644
--- a/packages/app/src/stores/sidebar-view-store.ts
+++ b/packages/app/src/stores/sidebar-view-store.ts
@@ -9,7 +9,7 @@ export type SidebarGroupMode = "project" | "status";
 
 const SIDEBAR_VIEW_STORAGE_KEY = "sidebar-view";
 const LEGACY_SIDEBAR_GROUP_MODE_STORAGE_KEY = "sidebar-group-mode";
-const SIDEBAR_VIEW_STORE_VERSION = 6;
+const SIDEBAR_VIEW_STORE_VERSION = 7;
 
 /**
  * The key standing for "this workspace carries no labels at all".
@@ -47,6 +47,7 @@ function toggleFilterEntry(list: readonly string[], key: string): string[] {
 
 interface SidebarViewStoreState {
   groupMode: SidebarGroupMode;
+  showBackground: boolean;
   // Empty means "all hosts". A non-empty list pins the sidebar to those hosts.
   hostFilters: string[];
   /**
@@ -61,6 +62,7 @@ interface SidebarViewStoreState {
    */
   projectFilters: string[];
   labelFilter: SidebarLabelFilter;
+  toggleBackground: () => void;
   setGroupMode: (mode: SidebarGroupMode) => void;
   toggleHostFilter: (serverId: string) => void;
   clearHostFilters: () => void;
@@ -74,6 +76,7 @@ interface SidebarViewStoreState {
 
 interface SidebarViewPersistedState {
   groupMode: SidebarGroupMode;
+  showBackground: boolean;
   hostFilters: string[];
   projectFilters: string[];
   labelFilter: SidebarLabelFilter;
@@ -84,6 +87,7 @@ const SidebarLabelFilterSchema = z.object({
   labels: z.array(z.string()),
 });
 const SidebarViewPersistedStateSchema = z.strictObject({
+  showBackground: z.boolean().optional(),
   groupMode: PersistedSidebarGroupModeSchema.optional(),
   hostFilters: z.array(z.string()).optional(),
   hostFilter: z.string().nullable().optional(),
@@ -122,6 +126,7 @@ export function migrateSidebarViewState(persistedState: unknown): SidebarViewPer
   const result = SidebarViewPersistedStateSchema.safeParse(persistedState);
   if (!result.success) {
     return {
+      showBackground: false,
       groupMode: "project",
       hostFilters: [],
       projectFilters: [],
@@ -133,6 +138,7 @@ export function migrateSidebarViewState(persistedState: unknown): SidebarViewPer
   const legacyGroupMode = readLegacyGroupMode(state);
   if (legacyGroupMode) {
     return {
+      showBackground: false,
       groupMode: legacyGroupMode,
       hostFilters: [],
       projectFilters: [],
@@ -141,6 +147,7 @@ export function migrateSidebarViewState(persistedState: unknown): SidebarViewPer
   }
 
   return {
+    showBackground: state.showBackground ?? false,
     groupMode: state.groupMode === "status" ? "status" : "project",
     hostFilters: readHostFilters(state),
     projectFilters: state.projectFilters ?? [],
@@ -178,10 +185,12 @@ export function createSidebarViewStorage(
 export const useSidebarViewStore = create<SidebarViewStoreState>()(
   persist(
     (set) => ({
+      showBackground: false,
       groupMode: "project",
       hostFilters: [],
       projectFilters: [],
       labelFilter: emptyLabelFilter(),
+      toggleBackground: () => set((state) => ({ showBackground: !state.showBackground })),
       setGroupMode: (mode) => set({ groupMode: mode }),
       toggleHostFilter: (serverId) =>
         set((state) => ({ hostFilters: toggleFilterEntry(state.hostFilters, serverId) })),
@@ -228,6 +237,7 @@ export const useSidebarViewStore = create<SidebarViewStoreState>()(
         SidebarViewPersistedStateSchema,
       ),
       partialize: (state) => ({
+        showBackground: state.showBackground ?? false,
         groupMode: state.groupMode,
         hostFilters: state.hostFilters,
         projectFilters: state.projectFilters,
diff --git a/packages/cli/src/cli-surface.test.ts b/packages/cli/src/cli-surface.test.ts
index 676f79234d..18f4348ff7 100644
--- a/packages/cli/src/cli-surface.test.ts
+++ b/packages/cli/src/cli-surface.test.ts
@@ -46,10 +46,25 @@ describe("canonical CLI surface", () => {
     expect(help).toContain("--forge <forge>");
   });
 
-  it("uses background for execution and reserves detach for ownership", () => {
+  it("uses --no-wait for execution, --internal for visibility, and reserves detach for ownership", () => {
     const run = createCli().commands.find((command) => command.name() === "run");
-    expect(run?.helpInformation()).toContain("--background");
-    expect(run?.helpInformation()).not.toContain("--detach");
+    const help = run?.helpInformation();
+    expect(help).toContain("--no-wait");
+    expect(help).not.toContain("--background");
+    expect(help).not.toContain("--background");
+    expect(help).not.toContain("--detach");
+  });
+
+  it("hides internal agents and workspaces from listings unless --internal is passed", () => {
+    const cli = createCli();
+    const ls = cli.commands.find((command) => command.name() === "ls");
+    const workspace = cli.commands.find((command) => command.name() === "workspace");
+    const workspaceLs = workspace?.commands.find((command) => command.name() === "ls");
+    const workspaceCreate = workspace?.commands.find((command) => command.name() === "create");
+
+    expect(ls?.helpInformation()).toContain("--background");
+    expect(workspaceLs?.helpInformation()).toContain("--background");
+    expect(workspaceCreate?.helpInformation()).toContain("--background");
   });
 
   it("offers thinking configuration when running, updating, and scheduling agents", () => {
@@ -96,3 +111,15 @@ describe("canonical CLI surface", () => {
     ).toContain("--id <id>");
   });
 });
+
+it("preserves omitted and explicit false workspace background intent", () => {
+  const readOptions = (args: string[]) => {
+    const workspace = createCli().commands.find((command) => command.name() === "workspace")!;
+    const create = workspace.commands.find((command) => command.name() === "create")!;
+    create.parseOptions(args);
+    return create.opts();
+  };
+  expect(readOptions([]).background).toBeUndefined();
+  expect(readOptions(["--background"]).background).toBe(true);
+  expect(readOptions(["--no-background"]).background).toBe(false);
+});
diff --git a/packages/cli/src/commands/agent/ls.test.ts b/packages/cli/src/commands/agent/ls.test.ts
index c66b34b94d..8aedf73fad 100644
--- a/packages/cli/src/commands/agent/ls.test.ts
+++ b/packages/cli/src/commands/agent/ls.test.ts
@@ -23,15 +23,21 @@ describe("buildAgentLsFetchOptions", () => {
     });
   });
 
+  it("asks the daemon for internal agents only with --internal", () => {
+    expect(buildAgentLsFetchOptions({ background: true, global: true })).toEqual({
+      filter: { includeBackground: true },
+    });
+  });
+
   it("fetches global non-archived agents for -g", () => {
     expect(buildAgentLsFetchOptions({ global: true })).toEqual({});
   });
 
-  it("keeps -a within the active scope", () => {
+  it("includes archived and background agents with -a", () => {
     expect(buildAgentLsFetchOptions({ all: true })).toEqual({
-      scope: "active",
       filter: {
         includeArchived: true,
+        includeBackground: true,
       },
     });
   });
@@ -40,6 +46,7 @@ describe("buildAgentLsFetchOptions", () => {
     expect(buildAgentLsFetchOptions({ all: true, global: true })).toEqual({
       filter: {
         includeArchived: true,
+        includeBackground: true,
       },
     });
   });
diff --git a/packages/cli/src/commands/agent/ls.ts b/packages/cli/src/commands/agent/ls.ts
index bb2189c7c4..0990446bc5 100644
--- a/packages/cli/src/commands/agent/ls.ts
+++ b/packages/cli/src/commands/agent/ls.ts
@@ -12,8 +12,9 @@ type FetchAgentsOptions = NonNullable<
 export function addLsOptions(cmd: Command): Command {
   return cmd
     .description("List agents. By default excludes archived agents.")
-    .option("-a, --all", "Include archived agents")
+    .option("-a, --all", "Include archived and background agents")
     .option("-g, --global", "List agents across all directories")
+    .option("--background", "Include background workspace agents")
     .option(
       "--label <key=value>",
       "Filter by label (can be used multiple times)",
@@ -109,6 +110,8 @@ export interface AgentLsOptions extends CommandOptions {
   all?: boolean;
   /** -g: List agents across all directories */
   global?: boolean;
+  /** --background: Include background workspace agents */
+  background?: boolean;
   /** Filter by specific status */
   status?: string;
   /** Filter by specific cwd */
@@ -133,7 +136,7 @@ function parseLabelFilters(labels: string[] | undefined): Record<string, string>
 }
 
 export function buildAgentLsFetchOptions(
-  options: Pick<AgentLsOptions, "all" | "global" | "label" | "thinking">,
+  options: Pick<AgentLsOptions, "all" | "global" | "background" | "label" | "thinking">,
 ): FetchAgentsOptions {
   const labelFilters = parseLabelFilters(options.label);
   const normalizedThinkingOptionId = options.thinking?.trim();
@@ -142,6 +145,9 @@ export function buildAgentLsFetchOptions(
   if (options.all) {
     daemonFilter.includeArchived = true;
   }
+  if (options.background || options.all) {
+    daemonFilter.includeBackground = true;
+  }
   if (Object.keys(labelFilters).length > 0) {
     daemonFilter.labels = labelFilters;
   }
@@ -150,7 +156,7 @@ export function buildAgentLsFetchOptions(
   }
 
   const fetchOptions: FetchAgentsOptions = {};
-  if (!options.global) {
+  if (!options.global && !options.all) {
     fetchOptions.scope = "active";
   }
   if (Object.keys(daemonFilter).length > 0) {
@@ -163,7 +169,7 @@ export function buildAgentLsFetchOptions(
  * Agent ls command semantics:
  * - `paseo agent ls`    → active non-archived agents
  * - `paseo agent ls -g` → global non-archived agents
- * - `paseo agent ls -a` → active agents, including archived
+ * - `paseo agent ls -a` → all agents, including archived and background
  * - `paseo agent ls -ag` → global agents, including archived
  */
 export async function runLsCommand(
diff --git a/packages/cli/src/commands/agent/run.test.ts b/packages/cli/src/commands/agent/run.test.ts
index b4e3b20bde..5e64ccba81 100644
--- a/packages/cli/src/commands/agent/run.test.ts
+++ b/packages/cli/src/commands/agent/run.test.ts
@@ -1,9 +1,10 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { DaemonConnectionError } from "@getpaseo/client/internal/daemon-client";
+import { resolveCallerAgentId as resolveRunCallerAgentId } from "../../utils/caller-agent.js";
 import {
   resolveExistingRunWorkspace,
-  resolveRunCallerAgentId,
   runRunCommand,
+  waitsForFinish,
   type AgentRunOptions,
 } from "./run";
 
@@ -21,6 +22,15 @@ function daemonWithAgents(...agentIds: string[]) {
   };
 }
 
+describe("run wait policy", () => {
+  it("waits by default and stops waiting on --no-wait or a legacy alias", () => {
+    expect(waitsForFinish({})).toBe(true);
+    expect(waitsForFinish({ wait: false })).toBe(false);
+    expect(waitsForFinish({ background: true })).toBe(false);
+    expect(waitsForFinish({ detach: true })).toBe(false);
+  });
+});
+
 describe("managed agent caller context", () => {
   it("uses a trimmed PASEO_AGENT_ID when the target daemon runs that agent", async () => {
     await expect(
@@ -38,17 +48,20 @@ describe("managed agent caller context", () => {
     ).resolves.toBeUndefined();
   });
 
-  it("fails instead of dropping the caller when the lookup loses its connection", async () => {
-    const disconnectedDaemon = {
-      async fetchAgent(): Promise<never> {
-        throw new DaemonConnectionError("Connection lost before message could be sent");
-      },
-    };
+  it.each(["DAEMON_CONNECTION_LOST", "DAEMON_REQUEST_TIMEOUT"] as const)(
+    "preserves %s instead of dropping the caller",
+    async (code) => {
+      const disconnectedDaemon = {
+        async fetchAgent(): Promise<never> {
+          throw new DaemonConnectionError("Caller lookup transport failed", code);
+        },
+      };
 
-    await expect(
-      resolveRunCallerAgentId(disconnectedDaemon, { PASEO_AGENT_ID: "parent-agent" }),
-    ).rejects.toBeInstanceOf(DaemonConnectionError);
-  });
+      await expect(
+        resolveRunCallerAgentId(disconnectedDaemon, { PASEO_AGENT_ID: "parent-agent" }),
+      ).rejects.toBeInstanceOf(DaemonConnectionError);
+    },
+  );
 
   it("omits blank caller ids", async () => {
     await expect(
diff --git a/packages/cli/src/commands/agent/run.ts b/packages/cli/src/commands/agent/run.ts
index 82817684c2..86cca5f75c 100644
--- a/packages/cli/src/commands/agent/run.ts
+++ b/packages/cli/src/commands/agent/run.ts
@@ -4,7 +4,7 @@ import {
   StructuredAgentResponseError,
 } from "@getpaseo/server/agent-response";
 import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
-import { DaemonConnectionError } from "@getpaseo/client/internal/daemon-client";
+import { resolveCallerAgentId } from "../../utils/caller-agent.js";
 import { connectToDaemon } from "../../utils/client.js";
 import type {
   CommandOptions,
@@ -27,10 +27,13 @@ export function addRunOptions(cmd: Command): Command {
     cmd
       .description("Create and start an agent with a task")
       .argument("<prompt>", "The task/prompt for the agent")
-      .option("-d, --background", "Run in background")
+      .option("--no-wait", "Return immediately without waiting for completion")
+      // COMPAT(backgroundRunFlag): --background was the documented spelling of
+      // --no-wait. Added in v0.2.0; remove after 2027-04-01.
+      .addOption(new Option("-d, --background", "Legacy alias for --no-wait").hideHelp())
       // COMPAT(detachRunFlag): --detach used to mean background execution, not
       // ownership transfer. Added in v0.2.0; remove after 2027-01-17.
-      .addOption(new Option("--detach", "Legacy alias for --background").hideHelp())
+      .addOption(new Option("--detach", "Legacy alias for --no-wait").hideHelp())
       .option("--title <title>", "Assign a title to the agent")
       .addOption(new Option("--name <name>", "Hidden alias for --title").hideHelp())
       .option(
@@ -111,6 +114,7 @@ export const agentRunSchema: OutputSchema<AgentRunResult> = {
 };
 
 export interface AgentRunOptions extends CommandOptions {
+  wait?: boolean;
   background?: boolean;
   detach?: boolean;
   title?: string;
@@ -389,19 +393,25 @@ function validateRunOptions(prompt: string, options: AgentRunOptions, outputSche
     } satisfies CommandError;
   }
 
+  if (options.background) {
+    console.error("Warning: --background (-d) is deprecated. Use --no-wait instead.");
+  }
+
   validateRunWorkspaceOptions(options);
 
-  if (outputSchema && runsInBackground(options)) {
+  if (outputSchema && !waitsForFinish(options)) {
     throw {
       code: "INVALID_OPTIONS",
-      message: "--output-schema cannot be used with --background",
+      message: "--output-schema cannot be used with --no-wait",
       details: "Structured output requires waiting for the agent to finish",
     } satisfies CommandError;
   }
 }
 
-function runsInBackground(options: Pick<AgentRunOptions, "background" | "detach">): boolean {
-  return Boolean(options.background || options.detach);
+export function waitsForFinish(
+  options: Pick<AgentRunOptions, "wait" | "background" | "detach">,
+): boolean {
+  return options.wait !== false && !options.background && !options.detach;
 }
 
 function parseWaitTimeoutOption(waitTimeout: string | undefined): number {
@@ -557,7 +567,10 @@ async function resolveRunWorkspace(
   // TODO: thread the run `prompt` as firstAgentContext so workspace-level
   // title/branch generation picks up the task description (U8/U6 deferred).
   const source = buildRunWorkspaceSource(options, cwd);
-  const result = await client.createWorkspace({ source });
+  const result = await client.createWorkspace({
+    source,
+    ...(callerAgentId ? { callerAgentId } : {}),
+  });
 
   if (!result.workspace) {
     throw {
@@ -611,7 +624,7 @@ export async function runRunCommand(
     const env = parseRunEnv(options.env);
     const requestEnv = Object.keys(env).length > 0 ? env : undefined;
 
-    const callerAgentId = await resolveRunCallerAgentId(client);
+    const callerAgentId = await resolveCallerAgentId(client);
     const workspace = await resolveRunWorkspace(client, options, cwd, callerAgentId);
     const workspaceId = workspace.id;
     const runCwd = workspace.cwd;
@@ -707,8 +720,8 @@ export async function runRunCommand(
       labels: Object.keys(labels).length > 0 ? labels : undefined,
     });
 
-    // Default run behavior is foreground: wait for completion unless background execution is set.
-    if (!runsInBackground(options)) {
+    // Default run behavior is foreground: wait for completion unless --no-wait is set.
+    if (waitsForFinish(options)) {
       const state = await client.waitForFinish(agent.id, waitTimeoutMs);
       await client.close();
 
@@ -744,29 +757,3 @@ export async function runRunCommand(
     throw error;
   }
 }
-
-export interface RunCallerLookupClient {
-  fetchAgent(options: { agentId: string }): Promise<{ agent: { id: string } } | null>;
-}
-
-// PASEO_AGENT_ID names an agent on the daemon that launched this shell. A run
-// sent to another daemon (--host or --home) has no caller there, so it runs as
-// a top-level agent instead of failing on an unknown caller.
-export async function resolveRunCallerAgentId(
-  client: RunCallerLookupClient,
-  env: { PASEO_AGENT_ID?: string } = process.env,
-): Promise<string | undefined> {
-  const agentId = env.PASEO_AGENT_ID?.trim();
-  if (!agentId) {
-    return undefined;
-  }
-  const caller = await client.fetchAgent({ agentId }).catch((error: unknown) => {
-    // A daemon without this agent answers with an error. A lost or timed-out
-    // connection is not an answer, so it must not drop the caller.
-    if (error instanceof DaemonConnectionError) {
-      throw error;
-    }
-    return null;
-  });
-  return caller?.agent.id === agentId ? agentId : undefined;
-}
diff --git a/packages/cli/src/commands/workspace/create.ts b/packages/cli/src/commands/workspace/create.ts
index 5ce49278ef..04d9e10ef0 100644
--- a/packages/cli/src/commands/workspace/create.ts
+++ b/packages/cli/src/commands/workspace/create.ts
@@ -1,5 +1,6 @@
 import type { Command } from "commander";
 import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { resolveCallerAgentId } from "../../utils/caller-agent.js";
 import type { CommandError, CommandOptions, SingleResult } from "../../output/index.js";
 import { toWorkspaceRow, workspaceSchema, type WorkspaceRow } from "./shared.js";
 
@@ -15,6 +16,7 @@ export interface WorkspaceCreateOptions extends CommandOptions {
   branch?: string;
   prNumber?: string;
   forge?: string;
+  background?: boolean;
 }
 
 interface WorktreeSourceBase {
@@ -144,9 +146,12 @@ export async function runCreateCommand(
   });
 
   try {
+    const callerAgentId = await resolveCallerAgentId(client);
     const payload = await client.createWorkspace({
       source: buildWorkspaceSource(options),
       ...(options.title ? { title: options.title } : {}),
+      ...(options.background !== undefined ? { background: options.background } : {}),
+      ...(callerAgentId ? { callerAgentId } : {}),
     });
     if (!payload.workspace) {
       throw new Error(payload.error ?? "Workspace creation failed");
diff --git a/packages/cli/src/commands/workspace/index.ts b/packages/cli/src/commands/workspace/index.ts
index 19d640d252..7d15ef26f3 100644
--- a/packages/cli/src/commands/workspace/index.ts
+++ b/packages/cli/src/commands/workspace/index.ts
@@ -34,12 +34,17 @@ export function createWorkspaceCommand(): Command {
       .option("--base <ref>", "Base ref (--mode branch-off)")
       .option("--branch <name>", "Existing branch (--mode checkout-branch)")
       .option("--pr-number <n>", "Pull request or change request number (--mode checkout-pr)")
-      .option("--forge <forge>", "Forge for --mode checkout-pr (default: source checkout)"),
+      .option("--forge <forge>", "Forge for --mode checkout-pr (default: source checkout)")
+      .option("--background", "Create a background workspace")
+      .option("--no-background", "Create a visible workspace instead of inheriting background"),
   ).action(withOutput(runCreateCommand));
 
-  addJsonAndDaemonHostOptions(workspace.command("ls").description("List active workspaces")).action(
-    withOutput(runLsCommand),
-  );
+  addJsonAndDaemonHostOptions(
+    workspace
+      .command("ls")
+      .description("List active workspaces")
+      .option("--background", "Include background workspaces"),
+  ).action(withOutput(runLsCommand));
 
   addJsonAndDaemonHostOptions(
     workspace
diff --git a/packages/cli/src/commands/workspace/ls.ts b/packages/cli/src/commands/workspace/ls.ts
index b9821e061a..680bb06e1c 100644
--- a/packages/cli/src/commands/workspace/ls.ts
+++ b/packages/cli/src/commands/workspace/ls.ts
@@ -1,10 +1,22 @@
 import type { Command } from "commander";
 import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
 import type { CommandError, ListResult } from "../../output/index.js";
-import { toWorkspaceRow, workspaceSchema, type WorkspaceRow } from "./shared.js";
+import {
+  toWorkspaceRow,
+  workspaceSchema,
+  workspaceWithBackgroundSchema,
+  type WorkspaceRow,
+} from "./shared.js";
+
+export interface WorkspaceLsOptions {
+  host?: string;
+  daemonTarget: import("../../utils/daemon-target.js").DaemonTarget;
+  /** --background: Include background workspaces */
+  background?: boolean;
+}
 
 export async function runLsCommand(
-  options: { host?: string; daemonTarget: import("../../utils/daemon-target.js").DaemonTarget },
+  options: WorkspaceLsOptions,
   _command: Command,
 ): Promise<ListResult<WorkspaceRow>> {
   const host = getDaemonHost({ target: options.daemonTarget });
@@ -20,12 +32,17 @@ export async function runLsCommand(
     let cursor: string | undefined;
     do {
       const payload = await client.fetchWorkspaces({
+        ...(options.background ? { filter: { includeBackground: true } } : {}),
         page: { limit: 200, ...(cursor ? { cursor } : {}) },
       });
       workspaces.push(...payload.entries.map(toWorkspaceRow));
       cursor = payload.pageInfo.nextCursor ?? undefined;
     } while (cursor);
-    return { type: "list", data: workspaces, schema: workspaceSchema };
+    return {
+      type: "list",
+      data: workspaces,
+      schema: options.background ? workspaceWithBackgroundSchema : workspaceSchema,
+    };
   } finally {
     await client.close().catch(() => undefined);
   }
diff --git a/packages/cli/src/commands/workspace/shared.ts b/packages/cli/src/commands/workspace/shared.ts
index cd800c9f10..db047e57b3 100644
--- a/packages/cli/src/commands/workspace/shared.ts
+++ b/packages/cli/src/commands/workspace/shared.ts
@@ -7,6 +7,7 @@ export interface WorkspaceRow {
   name: string;
   isolation: "local" | "worktree";
   cwd: string;
+  background: boolean;
 }
 
 export const workspaceSchema: OutputSchema<WorkspaceRow> = {
@@ -20,6 +21,15 @@ export const workspaceSchema: OutputSchema<WorkspaceRow> = {
   ],
 };
 
+/** `--background` listings add a column so hidden workspaces stand out. */
+export const workspaceWithBackgroundSchema: OutputSchema<WorkspaceRow> = {
+  ...workspaceSchema,
+  columns: [
+    ...workspaceSchema.columns,
+    { header: "BACKGROUND", field: (row) => (row.background ? "yes" : ""), width: 8 },
+  ],
+};
+
 export function toWorkspaceRow(workspace: WorkspaceDescriptorPayload): WorkspaceRow {
   return {
     workspaceId: workspace.id,
@@ -27,5 +37,6 @@ export function toWorkspaceRow(workspace: WorkspaceDescriptorPayload): Workspace
     name: workspace.name,
     isolation: workspace.workspaceKind === "worktree" ? "worktree" : "local",
     cwd: workspace.workspaceDirectory,
+    background: workspace.background === true,
   };
 }
diff --git a/packages/cli/src/utils/caller-agent.ts b/packages/cli/src/utils/caller-agent.ts
new file mode 100644
index 0000000000..3bc2ee6223
--- /dev/null
+++ b/packages/cli/src/utils/caller-agent.ts
@@ -0,0 +1,21 @@
+import { DaemonConnectionError } from "@getpaseo/client/internal/daemon-client";
+
+interface CallerLookupClient {
+  fetchAgent(options: { agentId: string }): Promise<{ agent: { id: string } } | null>;
+}
+
+// PASEO_AGENT_ID belongs to the daemon that launched this shell. Commands
+// targeting another daemon (--host or --home) have no caller on that daemon.
+export async function resolveCallerAgentId(
+  client: CallerLookupClient,
+  env: { PASEO_AGENT_ID?: string } = process.env,
+): Promise<string | undefined> {
+  const agentId = env.PASEO_AGENT_ID?.trim();
+  if (!agentId) return undefined;
+  const caller = await client.fetchAgent({ agentId }).catch((error: unknown) => {
+    // A missing agent is a daemon answer; a lost or timed-out connection is not.
+    if (error instanceof DaemonConnectionError) throw error;
+    return null;
+  });
+  return caller?.agent.id === agentId ? agentId : undefined;
+}
diff --git a/packages/cli/tests/05-agent-run.test.ts b/packages/cli/tests/05-agent-run.test.ts
index 5c56cadfbf..6948e4c008 100644
--- a/packages/cli/tests/05-agent-run.test.ts
+++ b/packages/cli/tests/05-agent-run.test.ts
@@ -53,8 +53,12 @@ try {
     console.log("Test 1: run --help shows options");
     const result = await $`npx paseo run --help`.nothrow();
     assert.strictEqual(result.exitCode, 0, "run --help should exit 0");
-    assert(result.stdout.includes("-d"), "help should mention -d flag");
-    assert(result.stdout.includes("--background"), "help should mention --background flag");
+    assert(result.stdout.includes("--no-wait"), "help should mention --no-wait flag");
+    assert(
+      !result.stdout.includes("--internal"),
+      "help should not mention removed --internal flag",
+    );
+    assert(!result.stdout.includes("--background"), "help should hide legacy --background syntax");
     assert(!result.stdout.includes("--detach"), "help should hide legacy --detach syntax");
     assert(result.stdout.includes("--title"), "help should mention --title option");
     assert(result.stdout.includes("--provider"), "help should mention --provider option");
@@ -178,18 +182,18 @@ try {
     console.log("✓ run --output-schema flag is accepted\n");
   }
 
-  // Test 10: run --output-schema cannot be used with --background
+  // Test 10: run --output-schema cannot be used with --no-wait
   {
-    console.log("Test 10: run --output-schema cannot be used with --background");
+    console.log("Test 10: run --output-schema cannot be used with --no-wait");
     const result =
-      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --background --output-schema ${schemaPath} "test prompt"`.nothrow();
-    assert.notStrictEqual(result.exitCode, 0, "should fail with --background and --output-schema");
+      await $`PASEO_HOME=${paseoHome} npx paseo --host localhost:${port} run --no-wait --output-schema ${schemaPath} "test prompt"`.nothrow();
+    assert.notStrictEqual(result.exitCode, 0, "should fail with --no-wait and --output-schema");
     const output = result.stdout + result.stderr;
     assert(
-      output.includes("--output-schema cannot be used with --background"),
+      output.includes("--output-schema cannot be used with --no-wait"),
       "error should explain background incompatibility",
     );
-    console.log("✓ run --output-schema cannot be used with --background\n");
+    console.log("✓ run --output-schema cannot be used with --no-wait\n");
   }
 
   // Test 11: -q (quiet) flag is accepted with run
diff --git a/packages/cli/tests/38-workspace-rename.test.ts b/packages/cli/tests/38-workspace-rename.test.ts
index 50d3b4ce82..9fed12aa4c 100644
--- a/packages/cli/tests/38-workspace-rename.test.ts
+++ b/packages/cli/tests/38-workspace-rename.test.ts
@@ -2,6 +2,7 @@
 
 import assert from "node:assert";
 import { basename } from "node:path";
+import { createPaseoClient } from "@getpaseo/client";
 import { createE2ETestContext } from "./helpers/test-daemon.ts";
 
 console.log("=== Workspace Rename Command ===\n");
@@ -51,8 +52,61 @@ try {
     )?.name,
     basename(ctx.workDir),
   );
+
+  await verifyWorkspaceCallerContext();
 } finally {
   await ctx.stop();
 }
 
 console.log("=== Workspace Rename Command Tests Passed ===");
+
+async function verifyWorkspaceCallerContext() {
+  const sdk = createPaseoClient({ url: `${ctx.wsUrl}/ws`, reconnect: { enabled: false } });
+  try {
+    await sdk.connect();
+    const parentWorkspace = await sdk.workspaces.create({
+      source: { kind: "directory", path: ctx.workDir },
+      background: true,
+    });
+    // Creation without a prompt stays idle; this visibility test runs no provider turn.
+    const parent = await parentWorkspace.agents.create({ config: { provider: "claude/haiku" } });
+    const cases = [
+      { caller: parent.id, background: undefined, expected: true },
+      { caller: parent.id, background: false, expected: false },
+      { caller: parent.id, background: true, expected: true },
+      { caller: "foreign-or-missing-agent", background: undefined, expected: false },
+      { caller: "foreign-or-missing-agent", background: true, expected: true },
+      { caller: "foreign-or-missing-agent", background: false, expected: false },
+      { caller: "", background: undefined, expected: false },
+      { caller: "", background: true, expected: true },
+    ];
+    for (const entry of cases) {
+      const result = await ctx.paseo(
+        [
+          "workspace",
+          "create",
+          "--host",
+          `127.0.0.1:${ctx.port}`,
+          "--isolation",
+          "local",
+          "--path",
+          ctx.workDir,
+          ...(entry.background === undefined
+            ? []
+            : [entry.background ? "--background" : "--no-background"]),
+          "--json",
+        ],
+        { env: { PASEO_AGENT_ID: entry.caller } },
+      );
+      assert.strictEqual(result.exitCode, 0, result.stderr);
+      assert.strictEqual(
+        JSON.parse(result.stdout).background,
+        entry.expected,
+        JSON.stringify(entry),
+      );
+    }
+    console.log("✓ workspace create caller inheritance, foreign/blank defaults, and overrides");
+  } finally {
+    await sdk.close();
+  }
+}
diff --git a/packages/client/src/daemon-client.test.ts b/packages/client/src/daemon-client.test.ts
index f1f8e0b5f8..95921a96a0 100644
--- a/packages/client/src/daemon-client.test.ts
+++ b/packages/client/src/daemon-client.test.ts
@@ -3100,6 +3100,162 @@ test("sends worktree target and autoArchive in create_agent_request", async () =
   await expect(createPromise).rejects.toThrow("worktree auto archive sentinel");
 });
 
+test("sends internal in create_agent_request when the host advertises internal agents", async () => {
+  const logger = createMockLogger();
+  const mock = createMockTransport();
+
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger,
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+
+  const connectPromise = client.connect();
+  mock.triggerOpen({ features: { backgroundWorkspaces: true } });
+  await connectPromise;
+
+  const createPromise = client.createAgent({
+    provider: "codex",
+    cwd: "/tmp/project",
+    background: true,
+  });
+
+  expect(mock.sent).toHaveLength(1);
+  const request = parseSentFrame(mock.sent[0]);
+  expect(request).toEqual(
+    expect.objectContaining({
+      type: "create_agent_request",
+      config: { provider: "codex", cwd: "/tmp/project" },
+      background: true,
+    }),
+  );
+
+  mock.triggerMessage(
+    wrapSessionMessage({
+      type: "status",
+      payload: {
+        status: "agent_create_failed",
+        requestId: request.requestId,
+        error: "internal agent sentinel",
+      },
+    }),
+  );
+
+  await expect(createPromise).rejects.toThrow("internal agent sentinel");
+});
+
+test("rejects an internal create before sending when the host predates internal agents", async () => {
+  const logger = createMockLogger();
+  const mock = createMockTransport();
+
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger,
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+
+  const connectPromise = client.connect();
+  mock.triggerOpen({ features: {} });
+  await connectPromise;
+
+  await expect(
+    client.createAgent({ provider: "codex", cwd: "/tmp/project", background: true }),
+  ).rejects.toThrow("Update the host to use background workspaces.");
+  expect(mock.sent).toHaveLength(0);
+});
+
+test("sends internal workspace creation and internal listings only to hosts that support them", async () => {
+  const logger = createMockLogger();
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger,
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+
+  const connectPromise = client.connect();
+  // workspaceMultiplicity keeps the fetch on the real workspace directory RPC.
+  mock.triggerOpen({
+    features: { workspaceMultiplicity: true, backgroundWorkspaces: true },
+  });
+  await connectPromise;
+
+  void client
+    .createWorkspace({ source: { kind: "directory", path: "/tmp/project" }, background: true })
+    .catch(() => undefined);
+  void client.fetchWorkspaces({ filter: { includeBackground: true } }).catch(() => undefined);
+  void client.fetchAgents({ filter: { includeBackground: true } }).catch(() => undefined);
+
+  expect(mock.sent.map((frame) => parseSentFrame(frame))).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({ type: "workspace.create.request", background: true }),
+      expect.objectContaining({
+        type: "fetch_workspaces_request",
+        filter: { includeBackground: true },
+      }),
+      expect.objectContaining({
+        type: "fetch_agents_request",
+        filter: { includeBackground: true },
+      }),
+    ]),
+  );
+});
+
+test("rejects internal workspace creation and internal listings before sending on older hosts", async () => {
+  const logger = createMockLogger();
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger,
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+
+  const connectPromise = client.connect();
+  mock.triggerOpen({ features: {} });
+  await connectPromise;
+
+  await expect(
+    client.createWorkspace({
+      source: { kind: "directory", path: "/tmp/project" },
+      background: true,
+    }),
+  ).rejects.toThrow("Update the host to use background workspaces.");
+  await expect(client.fetchWorkspaces({ filter: { includeBackground: true } })).rejects.toThrow(
+    "Update the host to use background workspaces.",
+  );
+  expect(mock.sent).toHaveLength(0);
+
+  // Agent listings gate on the older internalAgents feature.
+  const olderMock = createMockTransport();
+  const olderClient = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger,
+    reconnect: { enabled: false },
+    transportFactory: () => olderMock.transport,
+  });
+  clients.push(olderClient);
+  const olderConnect = olderClient.connect();
+  olderMock.triggerOpen({ features: {} });
+  await olderConnect;
+  await expect(olderClient.fetchAgents({ filter: { includeBackground: true } })).rejects.toThrow(
+    "Update the host to use background workspaces.",
+  );
+  expect(olderMock.sent).toHaveLength(0);
+});
+
 test("sends structured attachments with create_agent_request", async () => {
   const logger = createMockLogger();
   const mock = createMockTransport();
diff --git a/packages/client/src/daemon-client.ts b/packages/client/src/daemon-client.ts
index 1b5851a821..f900fe41e5 100644
--- a/packages/client/src/daemon-client.ts
+++ b/packages/client/src/daemon-client.ts
@@ -460,6 +460,7 @@ export interface CreateAgentRequestOptions extends AgentConfigOverrides {
   git?: GitSetupOptions;
   worktree?: CreateAgentRequestMessage["worktree"];
   autoArchive?: CreateAgentRequestMessage["autoArchive"];
+  background?: CreateAgentRequestMessage["background"];
   // COMPAT(createAgentWorktree): low-level old callers may still send the
   // create-agent worktree field. Added in v0.2.0; remove after 2027-01-17.
   worktreeName?: string;
@@ -470,6 +471,9 @@ export interface CreateAgentRequestOptions extends AgentConfigOverrides {
 export interface CreateWorkspaceRequestOptions {
   source: WorkspaceCreateRequest["source"];
   title?: string;
+  /** Workspace discovery visibility; contents retain normal durability. */
+  background?: boolean;
+  callerAgentId?: string;
   idempotencyKey?: string;
   workspaceId?: string;
   agent?: Omit<
@@ -1196,6 +1200,25 @@ export function supportsUsageReports(features: ServerInfoStatusPayload["features
   return features?.usageSources === true || features?.providerUsageList === true;
 }
 
+function buildFetchAgentsRequest(
+  options: FetchAgentsOptions | undefined,
+  requestId: string,
+): SessionInboundMessage {
+  return SessionInboundMessageSchema.parse({
+    type: "fetch_agents_request",
+    requestId,
+    ...(options?.scope ? { scope: options.scope } : {}),
+    ...(options?.filter ? { filter: options.filter } : {}),
+    ...(options?.sort ? { sort: options.sort } : {}),
+    ...(options?.page ? { page: options.page } : {}),
+    ...(options?.subscribe ? { subscribe: options.subscribe } : {}),
+    ...(options?.sync ? { sync: options.sync } : {}),
+    ...(options?.includeBackground !== undefined
+      ? { includeBackground: options.includeBackground }
+      : {}),
+  });
+}
+
 export class DaemonClient {
   private readonly providerSnapshotUpdates = new ProviderSnapshotUpdates({
     active: (message) => this.owned.owns(message),
@@ -2342,6 +2365,8 @@ export class DaemonClient {
   observeAgents(
     options: Omit<FetchAgentsOptions, "subscribe"> = {},
   ): OwnedSubscription<FetchAgentsPayload> {
+    if (options.includeBackground || options.filter?.includeBackground)
+      this.requireBackgroundWorkspaces();
     const { signal, requestId, timeout, ...query } = options;
     return this.observe(
       "fetch_agents_response",
@@ -2353,6 +2378,8 @@ export class DaemonClient {
   observeWorkspaces(
     options: Omit<FetchWorkspacesOptions, "subscribe"> = {},
   ): OwnedSubscription<FetchWorkspacesPayload> {
+    if (options.includeBackground || options.filter?.includeBackground)
+      this.requireBackgroundWorkspaces();
     const { signal, requestId, ...query } = options;
     return this.observe(
       "fetch_workspaces_response",
@@ -2368,6 +2395,8 @@ export class DaemonClient {
   async fetchAgents(
     options?: FetchAgentsOptions,
   ): Promise<FetchAgentsPayload & { subscription?: OwnedSubscription<FetchAgentsPayload> }> {
+    if (options?.includeBackground || options?.filter?.includeBackground)
+      this.requireBackgroundWorkspaces();
     if (options?.subscribe) {
       if (options.subscribe.subscriptionId !== undefined)
         throw new Error("Subscription IDs are assigned by the host");
@@ -2375,16 +2404,7 @@ export class DaemonClient {
       return { ...(await subscription.ready), subscription };
     }
     const resolvedRequestId = this.createRequestId(options?.requestId);
-    const message = SessionInboundMessageSchema.parse({
-      type: "fetch_agents_request",
-      requestId: resolvedRequestId,
-      ...(options?.scope ? { scope: options.scope } : {}),
-      ...(options?.filter ? { filter: options.filter } : {}),
-      ...(options?.sort ? { sort: options.sort } : {}),
-      ...(options?.page ? { page: options.page } : {}),
-      ...(options?.subscribe ? { subscribe: options.subscribe } : {}),
-      ...(options?.sync ? { sync: options.sync } : {}),
-    });
+    const message = buildFetchAgentsRequest(options, resolvedRequestId);
     return this.sendRequest({
       requestId: resolvedRequestId,
       message,
@@ -2403,6 +2423,7 @@ export class DaemonClient {
   }
 
   async fetchAgentHistory(options?: FetchAgentHistoryOptions): Promise<FetchAgentHistoryPayload> {
+    if (options?.filter?.includeBackground) this.requireBackgroundWorkspaces();
     const resolvedRequestId = this.createRequestId(options?.requestId);
     const message = SessionInboundMessageSchema.parse({
       type: "fetch_agent_history_request",
@@ -2466,6 +2487,8 @@ export class DaemonClient {
   ): Promise<
     FetchWorkspacesPayload & { subscription?: OwnedSubscription<FetchWorkspacesPayload> }
   > {
+    if (options?.includeBackground || options?.filter?.includeBackground)
+      this.requireBackgroundWorkspaces();
     if (options?.subscribe) {
       if (options.subscribe.subscriptionId !== undefined)
         throw new Error("Subscription IDs are assigned by the host");
@@ -2475,12 +2498,8 @@ export class DaemonClient {
     const resolvedRequestId = this.createRequestId(options?.requestId);
     const message = SessionInboundMessageSchema.parse({
       type: "fetch_workspaces_request",
+      ...options,
       requestId: resolvedRequestId,
-      ...(options?.filter ? { filter: options.filter } : {}),
-      ...(options?.sort ? { sort: options.sort } : {}),
-      ...(options?.page ? { page: options.page } : {}),
-      ...(options?.subscribe ? { subscribe: options.subscribe } : {}),
-      ...(options?.sync ? { sync: options.sync } : {}),
     });
     return this.sendRequest({
       requestId: resolvedRequestId,
@@ -2853,7 +2872,19 @@ export class DaemonClient {
     legacyWorkspace: (input) => this.createLegacyWorkspace(input, input.requestId),
   });
 
+  // Background workspaces are gated once at the transport boundary.
+  private requireBackgroundWorkspaces(): void {
+    if (this.lastServerInfoMessage?.features?.backgroundWorkspaces !== true) {
+      throw new Error("Update the host to use background workspaces.");
+    }
+  }
+
+  supportsBackgroundWorkspaces(): boolean {
+    return this.lastServerInfoMessage?.features?.backgroundWorkspaces === true;
+  }
+
   async createAgent(options: CreateAgentRequestOptions): Promise<AgentSnapshotPayload> {
+    if (options.background !== undefined) this.requireBackgroundWorkspaces();
     const result = await this.creations.createAgent({
       ...options,
       config: resolveAgentConfig(options),
@@ -2886,6 +2917,7 @@ export class DaemonClient {
       ...(options.git ? { git: options.git } : {}),
       ...(options.worktree ? { worktree: options.worktree } : {}),
       ...(options.autoArchive !== undefined ? { autoArchive: options.autoArchive } : {}),
+      ...(options.background !== undefined ? { background: options.background } : {}),
       ...(options.worktreeName ? { worktreeName: options.worktreeName } : {}),
       ...(options.labels && Object.keys(options.labels).length > 0
         ? { labels: options.labels }
@@ -4560,6 +4592,9 @@ export class DaemonClient {
     requestId?: string,
   ): Promise<WorkspaceCreatePayload> {
     const resolvedRequestId = this.createRequestId(requestId ?? input.requestId);
+    if (input.background !== undefined || input.callerAgentId) this.requireBackgroundWorkspaces();
+    if (input.agent?.background !== undefined)
+      throw new Error("Configure background on the workspace, not its initial agent.");
     const result = await this.creations.createWorkspace({
       ...input,
       requestId: resolvedRequestId,
@@ -4591,6 +4626,8 @@ export class DaemonClient {
           ? { idempotencyKey: input.idempotencyKey }
           : {}),
         ...(input.title !== undefined ? { title: input.title } : {}),
+        ...(input.background !== undefined ? { background: input.background } : {}),
+        ...(input.callerAgentId ? { callerAgentId: input.callerAgentId } : {}),
         ...(input.firstAgentContext !== undefined
           ? { firstAgentContext: input.firstAgentContext }
           : {}),
@@ -6940,6 +6977,7 @@ function resolveAgentConfig(options: CreateAgentRequestOptions): AgentSessionCon
     attachments: _attachments,
     worktree: _worktree,
     autoArchive: _autoArchive,
+    background: _background,
     env: _env,
     workspaceId: _workspaceId,
     initialPrompt: _initialPrompt,
diff --git a/packages/client/src/index.test.ts b/packages/client/src/index.test.ts
index 0f60e52673..ce6d4a5156 100644
--- a/packages/client/src/index.test.ts
+++ b/packages/client/src/index.test.ts
@@ -691,6 +691,61 @@ test("plugin-shaped PR workspace create and agent create use the existing daemon
   await client.close();
 });
 
+test("agents.create forwards internal on the request, outside the agent config", async () => {
+  const { client, ws } = await connectClient({
+    providerUsageList: true,
+    providersSnapshotCwd: true,
+    ownedSubscriptions: true,
+    backgroundWorkspaces: true,
+  });
+
+  const createPromise = client.agents.create({
+    config: { provider: "codex/gpt-5.4" },
+    cwd: "/repo/sdk",
+    title: "Summary helper",
+    background: true,
+    autoArchive: true,
+  });
+  const request = parseSentSessionMessage(ws.sent.at(-1));
+  expect(request).toMatchObject({
+    type: "create_agent_request",
+    config: { provider: "codex", model: "gpt-5.4", cwd: "/repo/sdk", title: "Summary helper" },
+    background: true,
+    autoArchive: true,
+  });
+  expect(request.config).not.toHaveProperty("internal");
+  ws.message(
+    sessionMessage({
+      type: "status",
+      payload: {
+        status: "agent_created",
+        requestId: request.requestId,
+        agentId: "agent_helper",
+        agent: createAgent({ id: "agent_helper" }),
+      },
+    }),
+  );
+
+  const agent = await createPromise;
+  expect(agent.id).toBe("agent_helper");
+  await client.close();
+});
+
+test("agents.create with internal fails before sending on a host without internal agents", async () => {
+  const { client, ws } = await connectClient();
+  const sentBefore = ws.sent.length;
+
+  await expect(
+    client.agents.create({
+      config: { provider: "codex/gpt-5.4" },
+      cwd: "/repo/sdk",
+      background: true,
+    }),
+  ).rejects.toThrow("Update the host to use background workspaces.");
+  expect(ws.sent).toHaveLength(sentBefore);
+  await client.close();
+});
+
 test("agent handles delegate create, send, timeline refetch, archive, and local updates", async () => {
   const { client, ws } = await connectClient();
   const createdAgent = createAgent();
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index ae868c5974..5bccc94009 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -257,6 +257,8 @@ export interface PaseoAgentCreateOptions {
   git?: CreateAgentRequestMessage["git"];
   worktree?: CreateAgentRequestMessage["worktree"];
   autoArchive?: CreateAgentRequestMessage["autoArchive"];
+  /** Visibility intent for a NEW workspace. Existing targets reject this option. */
+  background?: CreateAgentRequestMessage["background"];
   requestId?: string;
   labels?: Record<string, string>;
 }
@@ -780,9 +782,12 @@ function createWorkspaceHandleFactory(
     const refresh = async (options?: { requestId?: string }) => {
       let cursor: string | undefined;
       let requestId = options?.requestId;
+      // A ref addresses one workspace by id, so a background one resolves too.
+      const filter = daemonClient.supportsBackgroundWorkspaces() ? { includeBackground: true } : {};
       do {
         const result = await daemonClient.fetchWorkspaces({
           requestId,
+          filter,
           page: { limit: 200, ...(cursor ? { cursor } : {}) },
         });
         const match = result.entries.find((entry) => entry.id === id);
diff --git a/packages/desktop/e2e/browser-tabs.e2e.mjs b/packages/desktop/e2e/browser-tabs.e2e.mjs
index b96129e317..fb0958aad1 100644
--- a/packages/desktop/e2e/browser-tabs.e2e.mjs
+++ b/packages/desktop/e2e/browser-tabs.e2e.mjs
@@ -287,7 +287,6 @@ async function createCallerAgent(daemonPort, workspaceId = workspaceIds[0]) {
         provider: "mock/ten-second-stream",
         settings: { modeId: "load-test" },
         initialPrompt: "Remain available while the browser bridge regression runs.",
-        background: true,
       },
     });
     const result = response.structuredContent;
diff --git a/packages/protocol/src/messages.create-agent-internal.test.ts b/packages/protocol/src/messages.create-agent-internal.test.ts
new file mode 100644
index 0000000000..5d4e75649f
--- /dev/null
+++ b/packages/protocol/src/messages.create-agent-internal.test.ts
@@ -0,0 +1,51 @@
+import { describe, expect, test } from "vitest";
+
+import { SessionInboundMessageSchema } from "./messages.js";
+
+describe("create request internal field", () => {
+  test("accepts internal on create_agent_request", () => {
+    const parsed = SessionInboundMessageSchema.parse({
+      type: "create_agent_request",
+      requestId: "create-agent-internal",
+      config: {
+        provider: "codex",
+        cwd: "/repo/app",
+      },
+      internal: true,
+    });
+
+    expect(parsed).toEqual({
+      type: "create_agent_request",
+      requestId: "create-agent-internal",
+      config: {
+        provider: "codex",
+        cwd: "/repo/app",
+      },
+      internal: true,
+      labels: {},
+    });
+  });
+
+  test("accepts internal on agent.create.request", () => {
+    const parsed = SessionInboundMessageSchema.parse({
+      type: "agent.create.request",
+      requestId: "agent-create-internal",
+      config: {
+        provider: "codex",
+        cwd: "/repo/app",
+      },
+      internal: true,
+    });
+
+    expect(parsed).toEqual({
+      type: "agent.create.request",
+      requestId: "agent-create-internal",
+      config: {
+        provider: "codex",
+        cwd: "/repo/app",
+      },
+      internal: true,
+      labels: {},
+    });
+  });
+});
diff --git a/packages/protocol/src/messages.ts b/packages/protocol/src/messages.ts
index 8b4030705b..fefc104279 100644
--- a/packages/protocol/src/messages.ts
+++ b/packages/protocol/src/messages.ts
@@ -839,6 +839,8 @@ export const AgentSnapshotPayloadSchema = z.object({
   attentionTimestamp: z.string().nullable().optional(),
   archivedAt: z.string().nullable().optional(),
   providerUnavailable: z.boolean().optional(),
+  // Private helper marker, retained for exact-ID snapshots and older wire messages.
+  internal: z.boolean().optional(),
 });
 
 export type AgentSnapshotPayload = z.infer<typeof AgentSnapshotPayloadSchema>;
@@ -910,6 +912,9 @@ const AgentDirectoryFilterSchema = z.object({
   includeArchived: z.boolean().optional(),
   requiresAttention: z.boolean().optional(),
   thinkingOptionId: z.string().nullable().optional(),
+  // Retained for wire parsing; private helpers are excluded from public discovery.
+  includeInternal: z.boolean().optional(),
+  includeBackground: z.boolean().optional(),
 });
 
 export const DeleteAgentRequestMessageSchema = z.object({
@@ -1237,6 +1242,7 @@ export const FetchAgentsRequestMessageSchema = z.object({
   type: z.literal("fetch_agents_request"),
   requestId: z.string(),
   scope: z.enum(["active"]).optional(),
+  includeBackground: z.boolean().optional(),
   filter: AgentDirectoryFilterSchema.optional(),
   sort: z
     .array(
@@ -1270,6 +1276,7 @@ const WorkspaceStateBucketSchema = z.enum([
 ]);
 
 export const FetchWorkspacesRequestMessageSchema = z.object({
+  includeBackground: z.boolean().optional(),
   type: z.literal("fetch_workspaces_request"),
   requestId: z.string(),
   filter: z
@@ -1278,6 +1285,9 @@ export const FetchWorkspacesRequestMessageSchema = z.object({
       projectId: z.string().optional(),
       // Unused: accepted so older clients still parse, but the server does not filter on it.
       idPrefix: z.string().optional(),
+      // Retained for wire parsing of older requests.
+      includeInternal: z.boolean().optional(),
+      includeBackground: z.boolean().optional(),
     })
     .optional(),
   sort: z
@@ -1714,6 +1724,13 @@ export const CreateAgentRequestMessageSchema = z.object({
   git: GitSetupOptionsSchema.optional(),
   worktree: CreateAgentWorktreeTargetSchema.optional(),
   autoArchive: z.boolean().optional(),
+  // An ephemeral helper: the daemon never persists, lists, flags or announces
+  // it, and plugin lifecycle hooks skip it. Lives on the request rather than
+  // in the config schema, which is reused for updates. Retained for wire parsing;
+  // public internal creation is no longer supported.
+  internal: z.boolean().optional(),
+  // Workspace creation intent, rejected when selecting an existing workspace.
+  background: z.boolean().optional(),
   labels: z.record(z.string(), z.string()).default({}),
   requestId: z.string(),
 });
@@ -2633,6 +2650,10 @@ export const WorkspaceCreateRequestSchema = z.object({
   title: z.string().optional(),
   // Optional prompt context for workspace-level name/branch generation.
   firstAgentContext: FirstAgentContextSchema.optional(),
+  // Retained for wire parsing; public internal creation is no longer supported.
+  internal: z.boolean().optional(),
+  background: z.boolean().optional(),
+  callerAgentId: z.string().optional(),
   source: z.discriminatedUnion("kind", [
     z.object({
       kind: z.literal("directory"),
@@ -3558,6 +3579,11 @@ export const ServerInfoStatusPayloadSchema = z
         creationLifecycle: z.boolean().optional(),
         // COMPAT(hubAgentRpc): added in v0.8.0; remove gate after 2027-03-05.
         hubAgentRpc: z.boolean().optional(),
+        // COMPAT(internalAgents): added in v0.9.0; remove gate after 2027-03-17.
+        internalAgents: z.boolean().optional(),
+        // COMPAT(internalWorkspaces): added in v0.9.0; remove gate after 2027-03-17.
+        internalWorkspaces: z.boolean().optional(),
+        backgroundWorkspaces: z.boolean().optional(),
         providersSnapshot: z.boolean().optional(),
         usageSources: z.boolean().optional(),
         // COMPAT(providersSnapshotCwd): added in v0.3.2, remove gate after 2027-02-10.
@@ -4024,6 +4050,9 @@ export const WorkspaceDescriptorPayloadSchema = z
     pinnedAt: z.string().nullable().optional(),
     // COMPAT(workspaceLabels): added in v0.5.0, remove optional after 2027-08-14.
     labels: z.array(z.string()).optional(),
+    // Retained for wire parsing of older daemon descriptors.
+    internal: z.boolean().optional(),
+    background: z.boolean().optional(),
     archivingAt: z.string().nullable().optional().default(null),
     status: WorkspaceStateBucketSchema,
     // Best-effort workspace status entry timestamp. Old daemons omit the
diff --git a/packages/protocol/src/paseo-tool-call-detail.ts b/packages/protocol/src/paseo-tool-call-detail.ts
index a922a78442..4b06d49923 100644
--- a/packages/protocol/src/paseo-tool-call-detail.ts
+++ b/packages/protocol/src/paseo-tool-call-detail.ts
@@ -47,6 +47,7 @@ const AGENT_FIELDS = [
   "modeId",
   "background",
   "notifyOnFinish",
+  "internal",
   "settings",
   "labels",
 ] as const;
@@ -196,6 +197,7 @@ const FIELD_LABELS: Readonly<Record<string, string>> = {
   newMode: "New mode",
   nextRunAt: "Next run",
   notifyOnFinish: "Notify on finish",
+  internal: "Internal",
   prNumber: "Change request",
   projectId: "Project",
   removedDirectory: "Removed directory",
diff --git a/packages/server/src/server/agent/agent-manager.test.ts b/packages/server/src/server/agent/agent-manager.test.ts
index cd8bd2004a..763659e9f4 100644
--- a/packages/server/src/server/agent/agent-manager.test.ts
+++ b/packages/server/src/server/agent/agent-manager.test.ts
@@ -7710,6 +7710,81 @@ test("listAgents excludes internal agents", async () => {
   const agents = manager.listAgents();
   expect(agents).toHaveLength(1);
   expect(agents[0]?.config.title).toBe("Normal Agent");
+
+  // Opting in lists both, and the internal one is marked.
+  const everyAgent = manager.listAgents({ includeInternal: true });
+  expect(everyAgent.map((agent) => [agent.config.title, agent.internal])).toEqual([
+    ["Normal Agent", false],
+    ["Internal Agent", true],
+  ]);
+});
+
+test("workspace ownership does not turn an ordinary agent into a disposable helper", async () => {
+  const agentId = "00000000-0000-4000-8000-000000000115";
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const beforeHookCalls: string[] = [];
+  const manager = new AgentManager({
+    clients: { codex: new TestAgentClient() },
+    registry: storage,
+    logger,
+    idFactory: () => agentId,
+    pluginLifecycle: {
+      emit: () => {},
+      before: async (name, request) => {
+        beforeHookCalls.push(name);
+        return request;
+      },
+    },
+  });
+
+  await manager.createAgent({ provider: "codex", cwd: workdir, title: "Helper" }, undefined, {
+    workspaceId: "wks_internal",
+  });
+
+  expect(manager.getAgent(agentId)?.internal).toBe(false);
+  expect(manager.listAgents().map((agent) => agent.id)).toEqual([agentId]);
+  expect(await storage.get(agentId)).not.toBeNull();
+  // Workspace ownership preserves ordinary agent lifecycle hooks.
+  expect(beforeHookCalls).toContain("agent.create");
+});
+
+test("global subscribers receive internal agent events only when they opt in", async () => {
+  const internalAgentId = "00000000-0000-4000-8000-000000000116";
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storage = new AgentStorage(join(workdir, "agents"), logger);
+  const manager = new AgentManager({
+    clients: { codex: new TestAgentClient() },
+    registry: storage,
+    logger,
+    idFactory: () => internalAgentId,
+  });
+  await manager.createAgent(
+    { provider: "codex", cwd: workdir, title: "Internal Agent", internal: true },
+    undefined,
+    { workspaceId: undefined },
+  );
+
+  const hidden: string[] = [];
+  const optedIn: string[] = [];
+  const unsubscribeHidden = manager.subscribe((event) => {
+    if (event.type === "agent_state") hidden.push(event.agent.id);
+  });
+  const unsubscribeOptedIn = manager.subscribe(
+    (event) => {
+      if (event.type === "agent_state") optedIn.push(event.agent.id);
+    },
+    { includeInternal: true },
+  );
+
+  expect(hidden).toEqual([]);
+  expect(optedIn).toEqual([internalAgentId]);
+
+  await manager.archiveAgent(internalAgentId);
+  expect(hidden).toEqual([]);
+  expect(optedIn.length).toBeGreaterThan(1);
+  unsubscribeHidden();
+  unsubscribeOptedIn();
 });
 
 test("getAgent returns internal agents by ID", async () => {
@@ -7742,6 +7817,124 @@ test("getAgent returns internal agents by ID", async () => {
   expect(agent?.internal).toBe(true);
 });
 
+test("archiveAgent closes an internal agent without writing a record", async () => {
+  const internalAgentId = "00000000-0000-4000-8000-000000000108";
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storagePath = join(workdir, "agents");
+  const storage = new AgentStorage(storagePath, logger);
+  const manager = new AgentManager({
+    clients: {
+      codex: new TestAgentClient(),
+    },
+    registry: storage,
+    logger,
+    idFactory: () => internalAgentId,
+  });
+
+  await manager.createAgent(
+    {
+      provider: "codex",
+      cwd: workdir,
+      title: "Internal Agent",
+      internal: true,
+    },
+    undefined,
+    { workspaceId: undefined },
+  );
+
+  const { archivedAt } = await manager.archiveAgent(internalAgentId);
+
+  expect(Number.isNaN(Date.parse(archivedAt))).toBe(false);
+  expect(manager.getAgent(internalAgentId)).toBeNull();
+  expect(await storage.get(internalAgentId)).toBeNull();
+  expect(await storage.list()).toEqual([]);
+  expect(manager.getRetiredInternalAgent(internalAgentId)).toEqual({
+    record: expect.objectContaining({
+      id: internalAgentId,
+      title: "Internal Agent",
+      internal: true,
+      archivedAt,
+      lastStatus: "idle",
+    }),
+    lastMessage: null,
+  });
+  expect(manager.getRetiredInternalAgent("00000000-0000-4000-8000-000000000999")).toBeNull();
+});
+
+test("archiveAgent on an internal parent still archives its attached children", async () => {
+  const parentAgentId = "00000000-0000-4000-8000-000000000109";
+  const childAgentId = "00000000-0000-4000-8000-000000000110";
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storagePath = join(workdir, "agents");
+  const storage = new AgentStorage(storagePath, logger);
+  const ids = [parentAgentId, childAgentId];
+  let agentCounter = 0;
+  const manager = new AgentManager({
+    clients: {
+      codex: new TestAgentClient(),
+    },
+    registry: storage,
+    logger,
+    idFactory: () => ids[agentCounter++] ?? randomUUID(),
+  });
+
+  await manager.createAgent(
+    { provider: "codex", cwd: workdir, title: "Internal Parent", internal: true },
+    undefined,
+    { workspaceId: undefined },
+  );
+  await manager.createAgent({ provider: "codex", cwd: workdir, title: "Child" }, undefined, {
+    workspaceId: undefined,
+    labels: { "paseo.parent-agent-id": parentAgentId },
+  });
+
+  await manager.archiveAgent(parentAgentId);
+
+  expect(manager.getAgent(parentAgentId)).toBeNull();
+  expect(manager.getAgent(childAgentId)).toBeNull();
+  const child = await storage.get(childAgentId);
+  expect(child?.archivedAt).toEqual(expect.any(String));
+  expect(await storage.get(parentAgentId)).toBeNull();
+});
+
+test("archiveAgent on a parent archives its live internal children", async () => {
+  const parentAgentId = "00000000-0000-4000-8000-000000000111";
+  const childAgentId = "00000000-0000-4000-8000-000000000112";
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
+  const storagePath = join(workdir, "agents");
+  const storage = new AgentStorage(storagePath, logger);
+  const ids = [parentAgentId, childAgentId];
+  let agentCounter = 0;
+  const manager = new AgentManager({
+    clients: {
+      codex: new TestAgentClient(),
+    },
+    registry: storage,
+    logger,
+    idFactory: () => ids[agentCounter++] ?? randomUUID(),
+  });
+
+  await manager.createAgent({ provider: "codex", cwd: workdir, title: "Parent" }, undefined, {
+    workspaceId: undefined,
+  });
+  // An internal child is never in storage, so only the live scan can reach it.
+  await manager.createAgent(
+    { provider: "codex", cwd: workdir, title: "Internal Child", internal: true },
+    undefined,
+    { workspaceId: undefined, labels: { "paseo.parent-agent-id": parentAgentId } },
+  );
+  expect(manager.getAgent(childAgentId)).not.toBeNull();
+
+  await manager.archiveAgent(parentAgentId);
+
+  expect(manager.getAgent(parentAgentId)).toBeNull();
+  expect(manager.getAgent(childAgentId)).toBeNull();
+  expect(manager.getRetiredInternalAgent(childAgentId)?.record.archivedAt).toEqual(
+    expect.any(String),
+  );
+  expect(await storage.get(childAgentId)).toBeNull();
+});
+
 test("subscribe does not emit state events for internal agents to global subscribers", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
   const storagePath = join(workdir, "agents");
diff --git a/packages/server/src/server/agent/agent-manager.ts b/packages/server/src/server/agent/agent-manager.ts
index 734e4ab8c7..e09d62f6a9 100644
--- a/packages/server/src/server/agent/agent-manager.ts
+++ b/packages/server/src/server/agent/agent-manager.ts
@@ -55,6 +55,7 @@ import {
   type ListImportableSessionsOptions,
 } from "./agent-sdk-types.js";
 import { buildArchivedAgentRecord, type ArchivedStoredAgentRecord } from "./agent-archive.js";
+import { toStoredAgentRecord } from "./agent-projections.js";
 import type { StoredAgentRecord, AgentStorage } from "./agent-storage.js";
 import type { AgentOwner } from "./agent-owner.js";
 import {
@@ -243,6 +244,8 @@ export type AgentSubscriber = (event: AgentManagerEvent) => void;
 export interface SubscribeOptions {
   agentId?: string;
   replayState?: boolean;
+  /** Receive events for internal agents too. Off by default for global subscribers. */
+  includeInternal?: boolean;
 }
 
 interface HydrateTimelineOptions {
@@ -316,6 +319,7 @@ export interface CreateAgentOptions {
 
 export interface AgentManagerOptions {
   pluginLifecycle?: PluginLifecycle;
+  /** An internal workspace makes every agent created inside it internal. */
   clients?: ProviderClientMap;
   providerDefinitions?: ProviderEnabledMap;
   idFactory?: () => string;
@@ -568,6 +572,7 @@ function attachPersistenceCwd(
 interface SubscriptionRecord {
   callback: AgentSubscriber;
   agentId: string | null;
+  includeInternal: boolean;
 }
 
 interface SteerEventBarrier {
@@ -693,7 +698,7 @@ function getFirstUserMessageTextFromRows(rows: readonly AgentTimelineRow[]): str
 }
 
 function shouldDetachFromArchivedParent(
-  parent: StoredAgentRecord,
+  parent: Pick<StoredAgentRecord, "workspaceId">,
   child: StoredAgentRecord,
 ): boolean {
   const isCrossWorkspace =
@@ -713,8 +718,25 @@ function detachedAgentLabelPatch(labels: Record<string, string>): AgentLabelPatc
   return patch;
 }
 
+/**
+ * How long an archived internal agent stays readable by id. Storage plays this
+ * role for public agents; internal agents never reach it, and a one-shot helper
+ * can finish and auto-archive before its creator's `waitForFinish` arrives.
+ */
+const RETIRED_INTERNAL_AGENT_TTL_MS = 10 * 60 * 1000;
+const RETIRED_INTERNAL_AGENT_LIMIT = 500;
+
+export interface RetiredInternalAgent {
+  record: ArchivedStoredAgentRecord;
+  lastMessage: string | null;
+}
+
 export class AgentManager {
   private readonly pluginLifecycle: PluginLifecycle | undefined;
+  private readonly retiredInternalAgents = new Map<
+    string,
+    RetiredInternalAgent & { expiresAt: number }
+  >();
   private readonly clients = new Map<AgentProvider, AgentClient>();
   private readonly providerEnabled = new Map<AgentProvider, boolean>();
   private readonly providerDefinitions = new Map<AgentProvider, ProviderEnabledFlag>();
@@ -948,6 +970,7 @@ export class AgentManager {
     const record: SubscriptionRecord = {
       callback,
       agentId: targetAgentId,
+      includeInternal: options?.includeInternal === true,
     };
     this.subscribers.add(record);
 
@@ -961,9 +984,9 @@ export class AgentManager {
           });
         }
       } else {
-        // For global subscribers, skip internal agents during replay
+        // Global subscribers skip internal agents unless they opted in.
         for (const agent of this.agents.values()) {
-          if (agent.internal) {
+          if (agent.internal && !record.includeInternal) {
             continue;
           }
           callback({
@@ -983,12 +1006,26 @@ export class AgentManager {
     return this.subscribers.size;
   }
 
-  listAgents(): ManagedAgent[] {
+  listAgents(options?: { includeInternal?: boolean }): ManagedAgent[] {
     return Array.from(this.agents.values())
-      .filter((agent) => !agent.internal)
+      .filter((agent) => options?.includeInternal === true || !agent.internal)
       .map((agent) => Object.assign({}, agent));
   }
 
+  /** Archived internal agents still readable by id; see getRetiredInternalAgent. */
+  listRetiredInternalAgents(): RetiredInternalAgent[] {
+    const now = Date.now();
+    const retired: RetiredInternalAgent[] = [];
+    for (const [agentId, entry] of this.retiredInternalAgents) {
+      if (entry.expiresAt <= now) {
+        this.retiredInternalAgents.delete(agentId);
+        continue;
+      }
+      retired.push({ record: entry.record, lastMessage: entry.lastMessage });
+    }
+    return retired;
+  }
+
   async listImportableSessions(
     options?: ImportablePersistedAgentQueryOptions,
   ): Promise<ManagedImportableSessionsResult> {
@@ -1672,6 +1709,42 @@ export class AgentManager {
     }
   }
 
+  /**
+   * The archived snapshot of an internal agent, for a while after archive.
+   * Null once it has expired or was never an internal agent.
+   */
+  getRetiredInternalAgent(agentId: string): RetiredInternalAgent | null {
+    const entry = this.retiredInternalAgents.get(agentId);
+    if (!entry) {
+      return null;
+    }
+    if (entry.expiresAt <= Date.now()) {
+      this.retiredInternalAgents.delete(agentId);
+      return null;
+    }
+    return { record: entry.record, lastMessage: entry.lastMessage };
+  }
+
+  private retireInternalAgent(entry: RetiredInternalAgent): void {
+    const now = Date.now();
+    for (const [agentId, retired] of this.retiredInternalAgents) {
+      if (retired.expiresAt <= now) {
+        this.retiredInternalAgents.delete(agentId);
+      }
+    }
+    while (this.retiredInternalAgents.size >= RETIRED_INTERNAL_AGENT_LIMIT) {
+      const oldest = this.retiredInternalAgents.keys().next().value;
+      if (oldest === undefined) {
+        break;
+      }
+      this.retiredInternalAgents.delete(oldest);
+    }
+    this.retiredInternalAgents.set(entry.record.id, {
+      ...entry,
+      expiresAt: now + RETIRED_INTERNAL_AGENT_TTL_MS,
+    });
+  }
+
   closeAgent(agentId: string): Promise<void> {
     const existing = this.inFlightAgentCloses.get(agentId);
     if (existing) {
@@ -1757,6 +1830,23 @@ export class AgentManager {
     requestedArchivedAt?: string,
   ): Promise<{ archivedAt: string }> {
     const agent = this.requireAgent(agentId);
+    if (agent.internal) {
+      // Nothing about an internal agent is on disk, and archiving must not put
+      // it there. Its final snapshot is kept in memory for a while (see
+      // getRetiredInternalAgent); the runtime is closed and the committed
+      // timeline dropped, so `getAgent` returns null from here on.
+      const archivedAt = requestedArchivedAt ?? new Date().toISOString();
+      const lastMessage = await this.getLastAssistantMessage(agentId);
+      const record = buildArchivedAgentRecord(
+        toStoredAgentRecord(agent, { title: agent.config.title ?? null, internal: true }),
+        { archivedAt, updatedAt: archivedAt },
+      );
+      await this.closeAgentRuntime(agentId);
+      await this.deleteAgentState(agentId);
+      this.retireInternalAgent({ record, lastMessage });
+      await this.cascadeArchiveChildren(record);
+      return { archivedAt };
+    }
     if (!this.registry) {
       throw new Error("Agent storage is not configured");
     }
@@ -1775,7 +1865,7 @@ export class AgentManager {
     await this.syncNativeArchiveState(stored.provider, stored.persistence, "archive");
     this.discardRetainedAgentState(agentId);
 
-    await this.cascadeArchiveChildren(agentId);
+    await this.cascadeArchiveChildren(stored);
 
     return { archivedAt };
   }
@@ -1784,16 +1874,15 @@ export class AgentManager {
   // label pointing back at the caller. Archiving the parent cascades to those
   // children so subagent fleets don't outlive their orchestrator. Detached
   // handoff agents omit this label, so they stand outside the cascade.
-  private async cascadeArchiveChildren(parentAgentId: string): Promise<void> {
+  private async cascadeArchiveChildren(
+    parent: Pick<StoredAgentRecord, "id" | "workspaceId">,
+  ): Promise<void> {
     const registry = this.registry;
     if (!registry) {
       return;
     }
+    const parentAgentId = parent.id;
     const records = await registry.list();
-    const parent = records.find((record) => record.id === parentAgentId);
-    if (!parent) {
-      throw new Error(`Archived parent ${parentAgentId} not found in storage`);
-    }
     for (const record of records) {
       if (record.archivedAt) {
         continue;
@@ -1823,6 +1912,21 @@ export class AgentManager {
         }
       });
     }
+    // Internal children never reach storage, so the scan above cannot see them.
+    // They have no tab to keep open and no listing to detach into, so they
+    // always archive with the parent.
+    for (const child of Array.from(this.agents.values())) {
+      if (!child.internal || getParentAgentIdFromLabels(child.labels) !== parentAgentId) {
+        continue;
+      }
+      await this.runLifecycleMutation(child.id, async () => {
+        const current = this.agents.get(child.id);
+        if (!current || getParentAgentIdFromLabels(current.labels) !== parentAgentId) {
+          return;
+        }
+        await this.archiveAgentUnlocked(current.id);
+      });
+    }
   }
 
   private async markRecordArchived(
@@ -2198,7 +2302,7 @@ export class AgentManager {
     if (!nextRecord.internal) this.dispatchStoredAgentState(nextRecord);
 
     await this.fireAgentArchived(agentId);
-    await this.cascadeArchiveChildren(agentId);
+    await this.cascadeArchiveChildren(record);
 
     return nextRecord;
   }
@@ -5084,8 +5188,12 @@ export class AgentManager {
       ) {
         continue;
       }
-      // Skip internal agents for global subscribers (those without a specific agentId)
-      if (!subscriber.agentId && this.eventBelongsToInternalAgent(event)) {
+      // Global subscribers (no agentId) skip internal agents unless they opted in.
+      if (
+        !subscriber.agentId &&
+        !subscriber.includeInternal &&
+        this.eventBelongsToInternalAgent(event)
+      ) {
         continue;
       }
       subscriber.callback(event);
diff --git a/packages/server/src/server/agent/agent-mcp.e2e.test.ts b/packages/server/src/server/agent/agent-mcp.e2e.test.ts
index d1422f5b6b..cf9711a9df 100644
--- a/packages/server/src/server/agent/agent-mcp.e2e.test.ts
+++ b/packages/server/src/server/agent/agent-mcp.e2e.test.ts
@@ -215,22 +215,19 @@ function createMcpRecordingAgentClients(recorder: LaunchRecorder) {
   };
 }
 
-async function assertAgentNotRunning(options: {
-  client: McpClient;
-  agentId: string;
-}): Promise<void> {
-  const statusResult = await options.client.callTool({
-    name: "get_agent_status",
-    args: { agentId: options.agentId },
-  });
-  const payload = getStructuredContent(statusResult);
-  if (!payload) {
-    throw new Error("get_agent_status returned no structured payload");
-  }
-  const status = payload.status;
-  if (status === "running" || status === "initializing") {
-    throw new Error(`Agent still running after blocking create_agent (status=${status})`);
-  }
+async function waitForAgentFinish(options: { client: McpClient; agentId: string }): Promise<void> {
+  await expect
+    .poll(
+      async () => {
+        const result = await options.client.callTool({
+          name: "get_agent_status",
+          args: { agentId: options.agentId },
+        });
+        return getStructuredContent(result)?.status;
+      },
+      { timeout: 10000 },
+    )
+    .toBe("idle");
 }
 
 describe("agent MCP end-to-end (offline)", () => {
@@ -276,7 +273,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "claude/claude-test-model",
           mode: "bypassPermissions",
           initialPrompt,
-          background: false,
         },
       });
 
@@ -284,7 +280,7 @@ describe("agent MCP end-to-end (offline)", () => {
       agentId = typeof payload?.agentId === "string" ? payload.agentId : null;
       expect(agentId).toBeTruthy();
 
-      await assertAgentNotRunning({ client, agentId: agentId! });
+      await waitForAgentFinish({ client, agentId: agentId! });
 
       if (existsSync(filePath)) {
         const contents = await readFile(filePath, "utf8");
@@ -377,7 +373,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "claude/claude-test-model",
           mode: "bypassPermissions",
           initialPrompt: "reply with done and stop",
-          background: true,
         },
       });
       const payload = getStructuredContent(result);
@@ -452,7 +447,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "claude/claude-test-model",
           mode: "bypassPermissions",
           initialPrompt: "reply with done and stop",
-          background: true,
         },
       });
       const payload = getStructuredContent(result);
@@ -476,7 +470,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "claude/claude-test-model",
           mode: "bypassPermissions",
           initialPrompt: "reply with done and stop",
-          background: true,
         },
       });
       const disabledPayload = getStructuredContent(disabledResult);
@@ -541,7 +534,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "claude/claude-test-model",
           mode: "bypassPermissions",
           initialPrompt: "reply with done and stop",
-          background: true,
         },
       });
       const payload = getStructuredContent(result);
@@ -601,7 +593,6 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "codex/gpt-5.4-mini",
           mode: "full-access",
           initialPrompt: "Run exactly: sleep 30",
-          background: true,
         },
       });
 
@@ -772,7 +763,6 @@ describe("agent MCP end-to-end (offline)", () => {
 
     const client = await createMcpClient(`http://127.0.0.1:${port}/mcp/agents`);
 
-    let agentId: string | null = null;
     try {
       const result = await client.callTool({
         name: "create_agent",
@@ -782,29 +772,13 @@ describe("agent MCP end-to-end (offline)", () => {
           provider: "codex/gpt-5.4-mini",
           mode: "full-access",
           initialPrompt: "Run exactly: sleep 30",
-          background: true,
         },
       });
 
-      const payload = getStructuredContent(result);
-      agentId = typeof payload?.agentId === "string" ? payload.agentId : null;
-      expect(agentId).toBeTruthy();
-
-      await assertAgentNotRunning({ client, agentId: agentId! });
-      const statusResult = await client.callTool({
-        name: "get_agent_status",
-        args: { agentId },
-      });
-      const statusPayload = getStructuredContent(statusResult);
-      expect(statusPayload?.status).toBe("error");
-      const snapshot = statusPayload?.snapshot;
-      const lastError =
-        snapshot && typeof snapshot === "object" ? Reflect.get(snapshot, "lastError") : undefined;
-      expect(lastError).toContain("Initial turn failed to start");
+      expect(result.isError).toBe(true);
+      expect(JSON.stringify(result)).toContain("Initial turn failed to start");
+      expect(getStructuredContent(result)?.agentId).toBeUndefined();
     } finally {
-      if (agentId) {
-        await client.callTool({ name: "kill_agent", args: { agentId } });
-      }
       await client.close();
       await daemon.stop();
       await rm(paseoHome, { recursive: true, force: true });
@@ -880,7 +854,6 @@ describe("agent MCP end-to-end (offline)", () => {
             initialPrompt: "say done and stop",
             worktreeName: "mcp-worktree-setup-test",
             baseBranch: "main",
-            background: true,
           },
         }),
         timeoutMs: 2500,
diff --git a/packages/server/src/server/agent/agent-projections.test.ts b/packages/server/src/server/agent/agent-projections.test.ts
index f72bd84db1..ec4186b022 100644
--- a/packages/server/src/server/agent/agent-projections.test.ts
+++ b/packages/server/src/server/agent/agent-projections.test.ts
@@ -407,6 +407,17 @@ describe("toAgentPayload", () => {
     });
   });
 
+  it("carries a stored lastError onto the payload", () => {
+    const record = toStoredAgentRecord(
+      createManagedAgent({ provider: "codex", config: { provider: "codex" }, lastError: "boom" }),
+    );
+
+    expect(buildStoredAgentPayload(record, ["codex"]).lastError).toBe("boom");
+    expect(buildStoredAgentPayload({ ...record, lastError: null }, ["codex"])).not.toHaveProperty(
+      "lastError",
+    );
+  });
+
   it("omits lastUsage when not available", () => {
     const agent = createManagedAgent({ lastUsage: undefined });
     const payload = toAgentPayload(agent);
diff --git a/packages/server/src/server/agent/agent-projections.ts b/packages/server/src/server/agent/agent-projections.ts
index 05f932aea9..3f2a9b7775 100644
--- a/packages/server/src/server/agent/agent-projections.ts
+++ b/packages/server/src/server/agent/agent-projections.ts
@@ -139,6 +139,7 @@ export function toAgentPayload(
     persistence: projectPersistenceHandleForWire(agent.persistence),
     title: options?.title ?? null,
     labels: agent.labels,
+    ...(agent.internal ? { internal: true } : {}),
   };
 
   const usage = sanitizeUsage(agent.lastUsage);
@@ -247,7 +248,9 @@ export function buildStoredAgentPayload(
     attentionReason: record.attentionReason ?? null,
     attentionTimestamp: record.attentionTimestamp ?? null,
     archivedAt: record.archivedAt ?? null,
+    ...(record.internal ? { internal: true } : {}),
     labels: normalizeLabels(record.labels),
+    ...(typeof record.lastError === "string" ? { lastError: record.lastError } : {}),
     ...(providerAvailable ? {} : { providerUnavailable: true }),
   };
 }
diff --git a/packages/server/src/server/agent/agent-prompt.ts b/packages/server/src/server/agent/agent-prompt.ts
index b9ef336ce1..aad25a79b8 100644
--- a/packages/server/src/server/agent/agent-prompt.ts
+++ b/packages/server/src/server/agent/agent-prompt.ts
@@ -28,6 +28,8 @@ export type AgentRunController = Pick<
 };
 
 export interface StartAgentRunOptions {
+  /** Called after selecting the run, before consuming its events. */
+  onDispatch?: (disposition: PromptDispatchDisposition) => void;
   replaceRunning?: boolean;
   activeTurnBehavior?: ActiveTurnBehavior;
   runOptions?: AgentRunOptions;
@@ -114,6 +116,7 @@ export async function startAgentRun(
   // in-flight turn — replaceAgentRun would interrupt the running turn. The
   // intercept lives at this layer so it covers every prompt entrypoint.
   if (agentManager.tryRunOutOfBand(agentId, prompt, options?.runOptions)) {
+    options?.onDispatch?.("out_of_band");
     return { disposition: "out_of_band" };
   }
   try {
@@ -138,6 +141,7 @@ async function startAgentRunInner(
   const snapshot = agentManager.getAgent(agentId);
   const steered = await steerOrReplaceActiveRun(agentManager, agentId, prompt, options);
   if (steered?.disposition === "steered") {
+    options?.onDispatch?.("steered");
     return steered;
   }
   const { iterator, replaced } = steered
@@ -152,6 +156,7 @@ async function startAgentRunInner(
     },
     "agent.session.start_stream.iterator_returned",
   );
+  options?.onDispatch?.("turn_started");
   void (async () => {
     try {
       try {
@@ -208,6 +213,7 @@ export async function unarchiveAgentState(
 }
 
 export interface SendPromptToAgentParams {
+  onDispatch?: StartAgentRunOptions["onDispatch"];
   agentManager: AgentManager;
   agentStorage: AgentStorage;
   agentId: string;
@@ -347,6 +353,7 @@ export async function sendPromptToAgent(
 
   return await startAgentRun(params.agentManager, params.agentId, delivery.prompt, params.logger, {
     replaceRunning: true,
+    onDispatch: params.onDispatch,
     activeTurnBehavior: params.activeTurnBehavior,
     clearPendingPermissions: params.clearPendingPermissions,
     runOptions,
@@ -395,6 +402,8 @@ export interface SetupFinishNotificationParams {
   childAgentId: string;
   callerAgentId: string;
   requireParentOwnership?: boolean;
+  /** A replacement must observe its new start, not the displaced running snapshot. */
+  waitForTurnStart?: boolean;
   logger: Logger;
 }
 
@@ -455,16 +464,18 @@ interface NotifySafelyOptions {
 // next finish reaches the caller once.
 const armedFinishNotifications = new WeakMap<AgentManager, Map<string, () => void>>();
 
-export function setupFinishNotification(params: SetupFinishNotificationParams): void {
+export function setupFinishNotification(params: SetupFinishNotificationParams): () => void {
   const {
     agentManager,
     agentStorage,
     childAgentId,
     callerAgentId,
     requireParentOwnership = false,
+    waitForTurnStart = false,
     logger,
   } = params;
   let hasSeenRunning = false;
+  let hasSeenTurn = false;
   let stopped = false;
   const notifiedPermissionRequestIds = new Set<string>();
   let unsubscribe: (() => void) | null = null;
@@ -537,6 +548,37 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
       });
   }
 
+  function observeState(agent: ManagedAgent): void {
+    for (const requestId of notifiedPermissionRequestIds) {
+      if (!agent.pendingPermissions.has(requestId)) {
+        notifiedPermissionRequestIds.delete(requestId);
+      }
+    }
+    if (agent.lifecycle === "running") {
+      if (waitForTurnStart && !hasSeenTurn) return;
+      hasSeenTurn = true;
+      if (agent.pendingPermissions.size === 0) {
+        hasSeenRunning = true;
+      }
+      return;
+    }
+    // Prior terminal state is not this task's outcome. A failure before turn start
+    // is reported by the dispatch acknowledgement instead of a finish callback.
+    if (agent.lifecycle === "error" && hasSeenTurn) {
+      notifySafely("errored");
+      return;
+    }
+    if (agent.lifecycle === "idle" && hasSeenRunning) {
+      notifySafely("finished");
+      return;
+    }
+    if (agent.lifecycle === "closed") {
+      notifySafely("was closed");
+      return;
+    }
+    return;
+  }
+
   unsubscribe = agentManager.subscribe(
     (event) => {
       if (stopped) {
@@ -544,29 +586,7 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
       }
 
       if (event.type === "agent_state") {
-        for (const requestId of notifiedPermissionRequestIds) {
-          if (!event.agent.pendingPermissions.has(requestId)) {
-            notifiedPermissionRequestIds.delete(requestId);
-          }
-        }
-        if (event.agent.lifecycle === "running") {
-          if (event.agent.pendingPermissions.size === 0) {
-            hasSeenRunning = true;
-          }
-          return;
-        }
-        if (event.agent.lifecycle === "error") {
-          notifySafely("errored");
-          return;
-        }
-        if (event.agent.lifecycle === "idle" && hasSeenRunning) {
-          notifySafely("finished");
-          return;
-        }
-        if (event.agent.lifecycle === "closed") {
-          notifySafely("was closed");
-          return;
-        }
+        observeState(event.agent);
         return;
       }
 
@@ -574,6 +594,12 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
         return;
       }
 
+      if (event.event.type === "turn_started") {
+        hasSeenTurn = true;
+        hasSeenRunning = true;
+        return;
+      }
+
       if (event.event.type === "permission_requested") {
         // A permission pause is an intermediate checkpoint. Forget the run
         // observed before it so an idle state during follow-up startup cannot
@@ -608,11 +634,11 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
   const childSnapshot = agentManager.getAgent(childAgentId);
   if (!childSnapshot || childSnapshot.lifecycle === "closed") {
     stop();
-    return;
+    return stop;
   }
-  if (childSnapshot.lifecycle === "running") {
+  if (childSnapshot.lifecycle === "running" && !waitForTurnStart) {
+    hasSeenTurn = true;
     hasSeenRunning = true;
-  } else if (childSnapshot.lifecycle === "error") {
-    notifySafely("errored");
   }
+  return stop;
 }
diff --git a/packages/server/src/server/agent/create-agent-lifecycle-dispatch.ts b/packages/server/src/server/agent/create-agent-lifecycle-dispatch.ts
index 53a2177272..554bb9869e 100644
--- a/packages/server/src/server/agent/create-agent-lifecycle-dispatch.ts
+++ b/packages/server/src/server/agent/create-agent-lifecycle-dispatch.ts
@@ -7,13 +7,11 @@ import { archiveByScope, type ActiveWorkspaceRef } from "../workspace-archive-se
 import type {
   CreatePaseoWorktreeWorkflowFn,
   CreatePaseoWorktreeWorkflowResult,
+  CreatePaseoWorktreeSetupContinuationInput,
+  NormalizedGitOptions,
 } from "../worktree-session.js";
 import type { WorkspaceGitService } from "../workspace-git-service.js";
-import type {
-  CreateAgentWorktreeTarget,
-  FirstAgentContext,
-  SessionOutboundMessage,
-} from "../messages.js";
+import type { FirstAgentContext, SessionOutboundMessage } from "../messages.js";
 import type { AgentManager, AgentSubscriber, SubscribeOptions } from "./agent-manager.js";
 import type { AgentStorage } from "./agent-storage.js";
 
@@ -59,18 +57,34 @@ export class CreateAgentLifecycleDispatch {
 
   async createWorktreeForRequest(input: {
     cwd: string;
-    target: CreateAgentWorktreeTarget | undefined;
+    target: NormalizedGitOptions | null;
     firstAgentContext: FirstAgentContext;
-    hasLegacyGitOptions: boolean;
+    setupContinuation?: CreatePaseoWorktreeSetupContinuationInput;
+    background?: boolean;
+    callerWorkspaceId?: string;
   }): Promise<CreatePaseoWorktreeWorkflowResult | null> {
-    if (input.target && input.hasLegacyGitOptions) {
-      throw new Error("create_agent_request worktree cannot be combined with git options");
-    }
-    if (!input.target) {
-      return null;
-    }
-
-    return this.createWorktreeForTarget(input.cwd, input.target, input.firstAgentContext);
+    const target = input.target;
+    if (!target?.createWorktree) return null;
+    return this.dependencies.createPaseoWorktreeWorkflow(
+      {
+        cwd: input.cwd,
+        background: input.background,
+        callerWorkspaceId: input.callerWorkspaceId,
+        firstAgentContext: input.firstAgentContext,
+        worktreeSlug: target.worktreeSlug,
+        refName: target.refName,
+        action: target.action,
+        checkoutSource: target.checkoutSource,
+        githubPrNumber: target.githubPrNumber,
+        runSetup: false,
+        paseoHome: this.dependencies.paseoHome,
+        worktreesRoot: this.dependencies.worktreesRoot,
+      },
+      {
+        ...(target.baseBranch ? { resolveDefaultBranch: async () => target.baseBranch! } : {}),
+        setupContinuation: input.setupContinuation,
+      },
+    );
   }
 
   registerAutoArchiveIfRequested(input: {
@@ -111,47 +125,6 @@ export class CreateAgentLifecycleDispatch {
     });
   }
 
-  private async createWorktreeForTarget(
-    cwd: string,
-    target: CreateAgentWorktreeTarget,
-    firstAgentContext: FirstAgentContext,
-  ): Promise<CreatePaseoWorktreeWorkflowResult> {
-    const baseInput = {
-      cwd,
-      firstAgentContext,
-      runSetup: false,
-      paseoHome: this.dependencies.paseoHome,
-      worktreesRoot: this.dependencies.worktreesRoot,
-    } as const;
-
-    switch (target.mode) {
-      case "branch-off":
-        return this.dependencies.createPaseoWorktreeWorkflow(
-          {
-            ...baseInput,
-            worktreeSlug: target.newBranch,
-            action: "branch-off",
-            ...(target.base ? { refName: target.base } : {}),
-          },
-          target.base ? { resolveDefaultBranch: async () => target.base! } : undefined,
-        );
-      case "checkout-branch":
-        return this.dependencies.createPaseoWorktreeWorkflow({
-          ...baseInput,
-          action: "checkout",
-          refName: target.branch,
-        });
-      case "checkout-pr":
-        return this.dependencies.createPaseoWorktreeWorkflow({
-          ...baseInput,
-          action: "checkout",
-          githubPrNumber: target.prNumber,
-        });
-      default:
-        throw new Error("Unsupported create_agent_request worktree target");
-    }
-  }
-
   private registerAutoArchiveOnTerminalState(
     agentId: string,
     target: AutoArchiveTarget,
diff --git a/packages/server/src/server/agent/create-agent/create.test.ts b/packages/server/src/server/agent/create-agent/create.test.ts
index e8547d27ed..f12309da2a 100644
--- a/packages/server/src/server/agent/create-agent/create.test.ts
+++ b/packages/server/src/server/agent/create-agent/create.test.ts
@@ -11,6 +11,7 @@ import { AgentStorage } from "../agent-storage.js";
 import type { CreatePaseoWorktreeWorkflowResult } from "../../worktree-session.js";
 import { createAgentCommand } from "./create.js";
 import type { ManagedAgent } from "../agent-manager.js";
+import type { AgentSessionConfig } from "../agent-sdk-types.js";
 
 const logger = createTestLogger();
 
@@ -211,7 +212,6 @@ test("mcp create accepts provider-only internal input and leaves model undefined
     workspaceId: "ws-create-test",
     title: "provider default",
     initialPrompt: "hello",
-    background: true,
     notifyOnFinish: false,
   });
 
@@ -329,7 +329,6 @@ test("mcp create stamps the new worktree's workspaceId, not the parent's", async
         provider: "codex/gpt-5.4",
         title: "child",
         initialPrompt: "do the thing",
-        background: true,
         notifyOnFinish: false,
         callerAgentId: parent.id,
         worktree: { worktreeName: "feature", baseBranch: "main" },
@@ -378,7 +377,6 @@ test("mcp create exposes the created worktree before dispatching the initial pro
         cwd: workdir,
         title: "worktree callback",
         initialPrompt: "Say done.",
-        background: true,
         notifyOnFinish: false,
         worktree: { worktreeName: "feature", baseBranch: "main" },
         onCreated: ({ agentId, createdWorktree: callbackWorktree }) => {
@@ -471,3 +469,47 @@ test("session create keeps an explicit title after the initial prompt settles",
     await removeRealAgentManagerWorkdir({ agentManager, storage, workdir });
   }
 });
+
+test("session create with an internal config skips provider session persistence", async () => {
+  const snapshot = {
+    id: "agent-1",
+    provider: "codex",
+    cwd: "/tmp/paseo-create-test",
+    runtimeInfo: null,
+  } as ManagedAgent;
+  const createAgent = vi.fn(async () => snapshot);
+  const dependencies: Parameters<typeof createAgentCommand>[0] = {
+    agentManager: {
+      createAgent,
+    } as unknown as Parameters<typeof createAgentCommand>[0]["agentManager"],
+    agentStorage: {} as Parameters<typeof createAgentCommand>[0]["agentStorage"],
+    logger: createTestLogger(),
+    providerSnapshotManager: createProviderSnapshotManagerStub().manager,
+  };
+  const input = {
+    kind: "session" as const,
+    workspaceId: "ws-create-test",
+    labels: {},
+    provisionalTitle: null,
+    firstAgentContext: { attachments: [] },
+    buildSessionConfig: async (config: AgentSessionConfig) => ({ sessionConfig: config }),
+  };
+
+  await createAgentCommand(dependencies, {
+    ...input,
+    config: { provider: "codex", cwd: "/tmp/paseo-create-test", internal: true },
+  });
+  await createAgentCommand(dependencies, {
+    ...input,
+    config: { provider: "codex", cwd: "/tmp/paseo-create-test" },
+  });
+
+  expect(createAgent).toHaveBeenNthCalledWith(
+    1,
+    expect.objectContaining({ provider: "codex", internal: true }),
+    undefined,
+    expect.objectContaining({ persistSession: false }),
+  );
+  expect(createAgent.mock.calls[1]?.[0]).not.toHaveProperty("internal");
+  expect(createAgent.mock.calls[1]?.[2]).not.toHaveProperty("persistSession");
+});
diff --git a/packages/server/src/server/agent/create-agent/create.ts b/packages/server/src/server/agent/create-agent/create.ts
index ab1ce218b1..05f98285e1 100644
--- a/packages/server/src/server/agent/create-agent/create.ts
+++ b/packages/server/src/server/agent/create-agent/create.ts
@@ -52,6 +52,7 @@ export interface CreateAgentCommandDependencies {
 export type EnsureWorkspaceForCreate = (
   cwd: string,
   firstAgentContext?: FirstAgentContext,
+  context?: { callerWorkspaceId?: string },
 ) => Promise<string>;
 
 export interface CreateAgentFromSessionInput {
@@ -94,7 +95,6 @@ export interface CreateAgentFromMcpInput {
   mode?: string;
   unattended?: boolean;
   promptFailure?: CreateAgentPromptFailureMode;
-  background: boolean;
   notifyOnFinish: boolean;
   internal?: boolean;
   detached?: boolean;
@@ -127,7 +127,6 @@ export type CreateAgentPromptFailureMode = "throw" | "log" | "return-error";
 export interface CreateAgentCommandResult {
   snapshot: ManagedAgent;
   liveSnapshot: ManagedAgent;
-  background: boolean;
   initialPromptStarted: boolean;
   initialPromptError: unknown | null;
   createdWorktree?: CreatePaseoWorktreeWorkflowResult;
@@ -169,7 +168,6 @@ interface ResolvedCreateAgent {
   source?: AgentPromptSource;
   runOptions?: AgentRunOptions;
   setupContinuation?: AgentWorktreeSetupContinuation;
-  background: boolean;
   promptFailure: CreateAgentPromptFailureMode;
   promptLogger?: Logger;
   createdWorktree?: CreatePaseoWorktreeWorkflowResult;
@@ -190,10 +188,6 @@ export async function createAgentCommand(
     resolved.createOptions,
   );
 
-  resolved.setupContinuation?.startAfterAgentCreate({
-    agentId: snapshot.id,
-  });
-
   if (input.kind === "session") await input.onAgentReady?.(snapshot);
 
   let liveSnapshot = snapshot;
@@ -202,28 +196,37 @@ export async function createAgentCommand(
   if (input.kind === "mcp") {
     input.onCreated?.({ agentId: snapshot.id, createdWorktree: resolved.createdWorktree ?? null });
   }
+  const stopNotification =
+    input.kind === "mcp" &&
+    input.notifyOnFinish &&
+    input.callerAgentId &&
+    (resolved.prompt !== undefined || resolved.setupContinuation !== undefined)
+      ? setupFinishNotification({
+          agentManager: dependencies.agentManager,
+          agentStorage: dependencies.agentStorage,
+          childAgentId: snapshot.id,
+          callerAgentId: input.callerAgentId,
+          requireParentOwnership: true,
+          logger: dependencies.logger,
+        })
+      : undefined;
+
+  resolved.setupContinuation?.startAfterAgentCreate({
+    agentId: snapshot.id,
+  });
   if (resolved.prompt !== undefined) {
-    const sendResult = await sendInitialPrompt(dependencies, resolved, snapshot);
+    const sendResult = await sendInitialPrompt(dependencies, resolved, snapshot).catch((error) => {
+      stopNotification?.();
+      throw error;
+    });
     initialPromptStarted = sendResult.started;
     liveSnapshot = sendResult.liveSnapshot;
     initialPromptError = sendResult.error ?? null;
   }
 
-  if (input.kind === "mcp" && input.notifyOnFinish && input.callerAgentId && initialPromptStarted) {
-    setupFinishNotification({
-      agentManager: dependencies.agentManager,
-      agentStorage: dependencies.agentStorage,
-      childAgentId: snapshot.id,
-      callerAgentId: input.callerAgentId,
-      requireParentOwnership: true,
-      logger: dependencies.logger,
-    });
-  }
-
   return {
     snapshot,
     liveSnapshot,
-    background: resolved.background,
     initialPromptStarted,
     initialPromptError,
     ...(resolved.createdWorktree ? { createdWorktree: resolved.createdWorktree } : {}),
@@ -290,6 +293,9 @@ async function resolveSessionCreateAgent(
       initialPrompt: trimmedPrompt,
       env: input.env,
       initialTitle: input.provisionalTitle,
+      // Paseo never persists an internal agent, so nothing could resume its
+      // provider session either. Same as the daemon's own ephemeral helpers.
+      ...(sessionConfig.internal ? { persistSession: false } : {}),
       // A legacy git/worktreeName worktree creates a fresh workspace, so the
       // agent belongs to that workspace, not the source one. createdWorkspaceId
       // is the freshly created worktree's workspace.
@@ -299,7 +305,6 @@ async function resolveSessionCreateAgent(
     source: input.source,
     runOptions,
     setupContinuation,
-    background: true,
     // Registration commits creation. First-turn failures belong to the created agent.
     promptFailure: "return-error",
     promptLogger: dependencies.logger.child({
@@ -324,6 +329,7 @@ async function resolveMcpCreateAgent(
       cwd,
       worktree: input.worktree,
       initialPrompt: input.initialPrompt ?? "",
+      callerWorkspaceId: parentAgent?.workspaceId,
     });
   if (createdWorktree) input.onWorktreeCreated?.(createdWorktree);
 
@@ -338,7 +344,12 @@ async function resolveMcpCreateAgent(
     resolveWorkspace: async (workspaceId) => ({ workspaceId, cwd: resolvedCwd }),
     createWorkspace: async () => ({
       workspaceId: requireResolvedWorkspaceId(
-        await ensureWorkspaceForMcpCreate(dependencies, resolvedCwd, input.initialPrompt ?? ""),
+        await ensureWorkspaceForMcpCreate(
+          dependencies,
+          resolvedCwd,
+          input.initialPrompt ?? "",
+          parentAgent?.workspaceId,
+        ),
       ),
       cwd: resolvedCwd,
     }),
@@ -374,7 +385,6 @@ async function resolveMcpCreateAgent(
       : undefined,
     setupContinuation,
     createdWorktree,
-    background: input.background,
     promptFailure: input.promptFailure ?? "log",
   };
 }
@@ -449,11 +459,16 @@ async function ensureWorkspaceForMcpCreate(
   dependencies: CreateAgentCommandDependencies,
   cwd: string,
   initialPrompt: string,
+  callerWorkspaceId?: string,
 ): Promise<string | undefined> {
   if (!dependencies.ensureWorkspaceForCreate) {
     return undefined;
   }
-  return dependencies.ensureWorkspaceForCreate(cwd, { prompt: initialPrompt });
+  return dependencies.ensureWorkspaceForCreate(
+    cwd,
+    { prompt: initialPrompt },
+    { callerWorkspaceId },
+  );
 }
 
 async function sendInitialPrompt(
@@ -524,6 +539,7 @@ async function resolveMcpCwd(params: {
   dependencies: CreateAgentCommandDependencies;
   cwd: string;
   initialPrompt: string;
+  callerWorkspaceId?: string;
   worktree: CreateAgentFromMcpInput["worktree"];
 }): Promise<{
   resolvedCwd: string;
@@ -554,6 +570,7 @@ async function resolveMcpCwd(params: {
   const createdWorktree = await createMcpWorktree({
     input: {
       cwd: params.cwd,
+      callerWorkspaceId: params.callerWorkspaceId,
       worktreeSlug: worktree.worktreeName,
       branchName: worktree.branchName,
       refName: worktree.refName,
diff --git a/packages/server/src/server/agent/directory.ts b/packages/server/src/server/agent/directory.ts
new file mode 100644
index 0000000000..2f51d4a4c1
--- /dev/null
+++ b/packages/server/src/server/agent/directory.ts
@@ -0,0 +1,65 @@
+import type { AgentSnapshotPayload } from "../messages.js";
+import type { WorkspaceRegistry } from "../workspace-registry.js";
+import type { AgentManager, ManagedAgent } from "./agent-manager.js";
+import type { AgentStorage, StoredAgentRecord } from "./agent-storage.js";
+
+/** Public agent discovery owns workspace visibility for live and durable records. */
+export class AgentDirectory {
+  constructor(
+    private readonly deps: {
+      manager: AgentManager;
+      storage: AgentStorage;
+      workspaces: Pick<WorkspaceRegistry, "get" | "list">;
+      projectLive(agent: ManagedAgent): Promise<AgentSnapshotPayload>;
+      projectStored(record: StoredAgentRecord): AgentSnapshotPayload;
+      isProviderVisible(provider: string): boolean;
+      isStoredProviderAvailable(record: StoredAgentRecord): boolean;
+    },
+  ) {}
+
+  async includes(
+    agent: Pick<AgentSnapshotPayload, "workspaceId" | "internal">,
+    includeBackground = false,
+  ): Promise<boolean> {
+    if (agent.internal) return false;
+    if (includeBackground || !agent.workspaceId) return true;
+    return !(await this.deps.workspaces.get(agent.workspaceId))?.background;
+  }
+
+  async list(filter?: {
+    labels?: Record<string, string>;
+    includeArchived?: boolean;
+    includeBackground?: boolean;
+    includeUnavailablePersisted?: boolean;
+  }): Promise<AgentSnapshotPayload[]> {
+    const live = this.deps.manager.listAgents();
+    const liveIds = new Set(live.map((agent) => agent.id));
+    const labels = Object.entries(filter?.labels ?? {});
+    const backgroundIds = new Set(
+      filter?.includeBackground
+        ? []
+        : (await this.deps.workspaces.list())
+            .filter((workspace) => workspace.background)
+            .map((workspace) => workspace.workspaceId),
+    );
+    const matches = (agent: {
+      archivedAt?: string | null;
+      workspaceId?: string;
+      labels?: Record<string, string>;
+    }) =>
+      (filter?.includeArchived || !agent.archivedAt) &&
+      (filter?.includeBackground || !agent.workspaceId || !backgroundIds.has(agent.workspaceId)) &&
+      labels.every(([key, value]) => agent.labels?.[key] === value);
+    const stored = (await this.deps.storage.list())
+      .filter((record) => !record.internal && !liveIds.has(record.id) && matches(record))
+      .filter(
+        (record) =>
+          filter?.includeUnavailablePersisted || this.deps.isStoredProviderAvailable(record),
+      )
+      .map((record) => this.deps.projectStored(record));
+    const active = await Promise.all(
+      live.filter(matches).map((agent) => this.deps.projectLive(agent)),
+    );
+    return [...active, ...stored].filter((agent) => this.deps.isProviderVisible(agent.provider));
+  }
+}
diff --git a/packages/server/src/server/agent/lifecycle-command.test.ts b/packages/server/src/server/agent/lifecycle-command.test.ts
index 6e5714d489..763e676f43 100644
--- a/packages/server/src/server/agent/lifecycle-command.test.ts
+++ b/packages/server/src/server/agent/lifecycle-command.test.ts
@@ -219,6 +219,25 @@ describe("agent lifecycle commands", () => {
     expect(manager.archivedAgentIds).toEqual(["agent-1"]);
   });
 
+  test("archives a live internal agent without touching storage", async () => {
+    const storage = new FakeLifecycleAgentStorage();
+    const manager = new FakeLifecycleAgentManager(storage);
+    manager.liveAgents.set("agent-1", { ...managedAgent("agent-1", "idle"), internal: true });
+
+    const result = await archiveAgentCommand(
+      { agentManager: manager, agentStorage: storage, logger },
+      "agent-1",
+    );
+
+    expect(result).toEqual({
+      agentId: "agent-1",
+      archivedAt: "2026-05-10T10:00:00.000Z",
+      record: null,
+    });
+    expect(manager.archivedAgentIds).toEqual(["agent-1"]);
+    expect(storage.upserts).toEqual([]);
+  });
+
   test("archives a live agent when its graceful cancellation is rejected", async () => {
     const storage = new FakeLifecycleAgentStorage();
     const manager = new FakeLifecycleAgentManager(storage);
diff --git a/packages/server/src/server/agent/lifecycle-command.ts b/packages/server/src/server/agent/lifecycle-command.ts
index cb172ce620..431cff0fe6 100644
--- a/packages/server/src/server/agent/lifecycle-command.ts
+++ b/packages/server/src/server/agent/lifecycle-command.ts
@@ -8,7 +8,7 @@ import {
 import type { StoredAgentRecord } from "./agent-storage.js";
 import type { AgentProviderNotice } from "./agent-sdk-types.js";
 
-export type LifecycleAgentSnapshot = Pick<ManagedAgent, "id" | "cwd" | "lifecycle">;
+export type LifecycleAgentSnapshot = Pick<ManagedAgent, "id" | "cwd" | "lifecycle" | "internal">;
 
 export interface LifecycleAgentManager {
   getAgent(agentId: string): LifecycleAgentSnapshot | null;
@@ -112,7 +112,8 @@ export async function cancelAgentRunCommand(
 export interface ArchiveAgentResult {
   agentId: string;
   archivedAt: string;
-  record: StoredAgentRecord;
+  /** Null for an internal agent, which is closed and leaves no record behind. */
+  record: StoredAgentRecord | null;
 }
 
 export async function archiveAgentCommand(
@@ -124,7 +125,10 @@ export async function archiveAgentCommand(
   if (liveAgent) {
     await requestAgentRunCancellation(dependencies, agentId);
     await dependencies.agentManager.clearAgentAttention(agentId).catch(() => undefined);
-    await dependencies.agentManager.archiveAgent(agentId);
+    const archived = await dependencies.agentManager.archiveAgent(agentId);
+    if (liveAgent.internal) {
+      return { agentId, archivedAt: archived.archivedAt, record: null };
+    }
     record = await dependencies.agentStorage.get(agentId);
   } else {
     record = await archiveStoredAgent(dependencies, agentId);
diff --git a/packages/server/src/server/agent/mcp-parity.e2e.test.ts b/packages/server/src/server/agent/mcp-parity.e2e.test.ts
index 50867f10d9..6a5b360ca8 100644
--- a/packages/server/src/server/agent/mcp-parity.e2e.test.ts
+++ b/packages/server/src/server/agent/mcp-parity.e2e.test.ts
@@ -215,7 +215,6 @@ async function createTopLevelAgent(args?: Partial<StructuredContent>): Promise<s
     provider: "claude/claude-test-model",
     initialPrompt: "say done and stop",
     settings: { modeId: "bypassPermissions" },
-    background: true,
     ...rest,
   });
   return str(payload.agentId);
@@ -267,28 +266,6 @@ async function killTerminalIfPresent(terminalId: string | null | undefined): Pro
   }
 }
 
-async function archiveWorktreeIfPresent(params: {
-  cwd: string;
-  worktreePath?: string | null;
-  worktreeSlug?: string | null;
-}): Promise<void> {
-  if (!params.worktreePath && !params.worktreeSlug) {
-    return;
-  }
-  try {
-    await topLevelClient.callTool({
-      name: "archive_worktree",
-      args: {
-        cwd: params.cwd,
-        ...(params.worktreePath ? { worktreePath: params.worktreePath } : {}),
-        ...(params.worktreeSlug ? { worktreeSlug: params.worktreeSlug } : {}),
-      },
-    });
-  } catch {
-    // ignore cleanup errors
-  }
-}
-
 beforeAll(async () => {
   tempRoot = await mkdtemp(path.join(os.tmpdir(), "mcp-parity-e2e-"));
   parentAgentCwd = await makeCwd("parent-agent-cwd");
@@ -307,7 +284,6 @@ beforeAll(async () => {
     provider: "claude/claude-test-model",
     initialPrompt: "say done and stop",
     settings: { modeId: "bypassPermissions" },
-    background: true,
   });
   parentAgentId = str(parentPayload.agentId);
 
@@ -845,117 +821,107 @@ describe("Suite D: Provider Tools", () => {
   });
 });
 
-describe("Suite E: Worktree Tools", () => {
-  test("list_worktrees on empty repo", async () => {
-    const payload = await callToolStructured(topLevelClient, "list_worktrees", {
-      cwd: worktreeRepoCwd,
+describe("Suite E: Workspace Tools", () => {
+  test("background worktree creation, discovery and archive use ordinary workspace ownership", async () => {
+    const created = await callToolStructured(topLevelClient, "create_workspace", {
+      isolation: "worktree",
+      path: worktreeRepoCwd,
+      baseBranch: "main",
+      branchName: `parity-background-${Date.now()}`,
+      background: true,
     });
-    expect(payload.worktrees).toEqual([]);
-  });
-
-  test("create_worktree and list_worktrees", async () => {
-    let worktreePath: string | null = null;
-    const branchName = `parity-create-${Date.now()}`;
+    const workspaceId = str(created.workspaceId);
     try {
-      const created = await callToolStructured(topLevelClient, "create_worktree", {
-        cwd: worktreeRepoCwd,
-        target: {
-          kind: "branch-off",
-          worktreeSlug: branchName,
-          baseBranch: "main",
-        },
+      expect(created.background).toBe(true);
+      const ordinary = await callToolStructured(topLevelClient, "list_workspaces", {});
+      expect(
+        recordArr(ordinary.workspaces).map((workspace) => workspace.workspaceId),
+      ).not.toContain(workspaceId);
+      const inclusive = await callToolStructured(topLevelClient, "list_workspaces", {
+        includeBackground: true,
       });
-      worktreePath = str(created.worktreePath);
-
-      const listed = await callToolStructured(topLevelClient, "list_worktrees", {
-        cwd: worktreeRepoCwd,
-      });
-      const worktrees = recordArr(listed.worktrees);
-      expect(worktrees).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            path: worktreePath,
-            branchName,
-          }),
-        ]),
+      expect(recordArr(inclusive.workspaces)).toContainEqual(
+        expect.objectContaining({ workspaceId, background: true }),
       );
+      const child = await callToolStructured(topLevelClient, "create_agent", {
+        workspaceId,
+        title: "Background worker",
+        provider: "claude/claude-test-model",
+        initialPrompt: "Say done.",
+      });
+      const agentId = str(child.agentId);
+      const workerClient = await createMcpClient(
+        `http://127.0.0.1:${daemonHandle.port}/mcp/agents?callerAgentId=${agentId}`,
+      );
+      let terminalId: string;
+      try {
+        const terminal = await callToolStructured(workerClient, "create_terminal", {
+          name: "Background terminal",
+        });
+        terminalId = str(terminal.id);
+        expect(terminal.cwd).toBe(created.cwd);
+      } finally {
+        await workerClient.close();
+      }
+      const status = await callToolStructured(topLevelClient, "get_agent_status", { agentId });
+      expect((status.snapshot as StructuredContent).workspaceId).toBe(workspaceId);
+      const archived = await callToolStructured(topLevelClient, "archive_workspace", {
+        workspaceId,
+      });
+      expect(archived.archivedAgentIds).toContain(agentId);
+      const terminals = await callToolStructured(topLevelClient, "list_terminals", { all: true });
+      expect(recordArr(terminals.terminals).map((terminal) => terminal.id)).not.toContain(
+        terminalId,
+      );
+      const remaining = await callToolStructured(topLevelClient, "list_workspaces", {
+        includeBackground: true,
+      });
+      expect(
+        recordArr(remaining.workspaces).map((workspace) => workspace.workspaceId),
+      ).not.toContain(workspaceId);
     } finally {
-      await archiveWorktreeIfPresent({ cwd: worktreeRepoCwd, worktreePath });
+      await topLevelClient
+        .callTool({ name: "archive_workspace", args: { workspaceId } })
+        .catch(() => undefined);
     }
   });
 
-  test("archive_worktree removes worktree", async () => {
-    let worktreePath: string | null = null;
-    const branchName = `parity-archive-${Date.now()}`;
+  test("agent-scoped workspace creation inherits visibility and permits an explicit false override", async () => {
+    const parentWorkspace = await callToolStructured(topLevelClient, "create_workspace", {
+      isolation: "local",
+      path: worktreeRepoCwd,
+      background: true,
+    });
+    const parentWorkspaceId = str(parentWorkspace.workspaceId);
+    let scoped: McpClient | null = null;
+    const ownedWorkspaces: string[] = [parentWorkspaceId];
     try {
-      const created = await callToolStructured(topLevelClient, "create_worktree", {
-        cwd: worktreeRepoCwd,
-        target: {
-          kind: "branch-off",
-          worktreeSlug: branchName,
-          baseBranch: "main",
-        },
+      const parent = await callToolStructured(topLevelClient, "create_agent", {
+        workspaceId: parentWorkspaceId,
+        title: "Background parent",
+        provider: "claude/claude-test-model",
+        initialPrompt: "Say done.",
       });
-      worktreePath = str(created.worktreePath);
-
-      await callToolStructured(topLevelClient, "archive_worktree", {
-        cwd: worktreeRepoCwd,
-        worktreePath,
-      });
-      worktreePath = null;
-
-      const listed = await callToolStructured(topLevelClient, "list_worktrees", {
-        cwd: worktreeRepoCwd,
-      });
-      const worktrees = recordArr(listed.worktrees);
-      expect(worktrees.some((worktree) => worktree.path === created.worktreePath)).toBe(false);
-    } finally {
-      await archiveWorktreeIfPresent({ cwd: worktreeRepoCwd, worktreePath });
-    }
-  });
-
-  test("archive_worktree succeeds when caller cwd is inside the archived worktree", async () => {
-    let worktreePath: string | null = null;
-    let worktreeAgentId: string | null = null;
-    let worktreeScopedClient: McpClient | null = null;
-    const branchName = `parity-archive-self-cwd-${Date.now()}`;
-
-    try {
-      const created = await callToolStructured(topLevelClient, "create_worktree", {
-        cwd: worktreeRepoCwd,
-        target: {
-          kind: "branch-off",
-          worktreeSlug: branchName,
-          baseBranch: "main",
-        },
-      });
-      worktreePath = str(created.worktreePath);
-      worktreeAgentId = await createTopLevelAgent({
-        cwd: worktreePath,
-        title: "Worktree scoped parity agent",
-      });
-      worktreeScopedClient = await createMcpClient(
-        `http://127.0.0.1:${daemonHandle.port}/mcp/agents?callerAgentId=${encodeURIComponent(
-          worktreeAgentId,
-        )}`,
+      scoped = await createMcpClient(
+        `http://127.0.0.1:${daemonHandle.port}/mcp/agents?callerAgentId=${str(parent.agentId)}`,
       );
-
-      const archived = await callToolStructured(worktreeScopedClient, "archive_worktree", {
-        worktreePath,
+      const inherited = await callToolStructured(scoped, "create_workspace", {
+        isolation: "local",
       });
-      expect(archived).toEqual({ success: true });
-      worktreePath = null;
-      worktreeAgentId = null;
-
-      const listed = await callToolStructured(topLevelClient, "list_worktrees", {
-        cwd: worktreeRepoCwd,
+      ownedWorkspaces.push(str(inherited.workspaceId));
+      expect(inherited.background).toBe(true);
+      const visible = await callToolStructured(scoped, "create_workspace", {
+        isolation: "local",
+        background: false,
       });
-      const worktrees = recordArr(listed.worktrees);
-      expect(worktrees.map((worktree) => worktree.path)).not.toContain(created.worktreePath);
+      ownedWorkspaces.push(str(visible.workspaceId));
+      expect(visible.background).toBe(false);
     } finally {
-      await worktreeScopedClient?.close();
-      await archiveAgentIfPresent(worktreeAgentId);
-      await archiveWorktreeIfPresent({ cwd: worktreeRepoCwd, worktreePath });
+      await scoped?.close();
+      for (const workspaceId of ownedWorkspaces.toReversed())
+        await topLevelClient
+          .callTool({ name: "archive_workspace", args: { workspaceId } })
+          .catch(() => undefined);
     }
   });
 });
diff --git a/packages/server/src/server/agent/mcp-server.test.ts b/packages/server/src/server/agent/mcp-server.test.ts
index a9e2ea0cd6..18b28cfc93 100644
--- a/packages/server/src/server/agent/mcp-server.test.ts
+++ b/packages/server/src/server/agent/mcp-server.test.ts
@@ -11,7 +11,7 @@ import { tmpdir } from "node:os";
 import { z } from "zod";
 
 import { createTestLogger } from "../../test-utils/test-logger.js";
-import { createAgentMcpServer } from "./mcp-server.js";
+import { createAgentMcpServer as createAgentMcpServerWithDependencies } from "./mcp-server.js";
 import { AgentManager, type ManagedAgent } from "./agent-manager.js";
 import { AgentStorage, type StoredAgentRecord } from "./agent-storage.js";
 import { createTestAgentClients } from "../test-utils/fake-agent-client.js";
@@ -833,6 +833,14 @@ function createPaseoWorktreeForMcpTest(options: {
   };
 }
 
+// Typed in-memory workspace port for catalogue tests without workspace setup.
+function createAgentMcpServer(options: Parameters<typeof createAgentMcpServerWithDependencies>[0]) {
+  return createAgentMcpServerWithDependencies({
+    workspaceRegistry: { get: async () => null, list: async () => [], upsert: async () => {} },
+    ...options,
+  });
+}
+
 describe("browser MCP tools", () => {
   const logger = createTestLogger();
 
@@ -1327,10 +1335,13 @@ describe("create_agent MCP tool", () => {
       title: "Top-level agent",
       provider: "codex/gpt-5.4",
       initialPrompt: "Do work",
-      background: true,
     });
 
-    expect(ensureWorkspace).toHaveBeenCalledWith(existingCwd, { prompt: "Do work" });
+    expect(ensureWorkspace).toHaveBeenCalledWith(
+      existingCwd,
+      { prompt: "Do work" },
+      { callerWorkspaceId: undefined },
+    );
     expect(spies.agentManager.createAgent).toHaveBeenCalledWith(
       expect.objectContaining({ cwd: existingCwd }),
       undefined,
@@ -1338,6 +1349,32 @@ describe("create_agent MCP tool", () => {
     );
   });
 
+  it("rejects public internal helpers and the old top-level execution background option", async () => {
+    const workdir = await mkdtemp(join(tmpdir(), "mcp-public-helper-removal-"));
+    const storage = new AgentStorage(join(workdir, "agents"), logger);
+    const agentManager = new AgentManager({
+      clients: createTestAgentClients(),
+      registry: storage,
+      logger,
+    });
+    try {
+      const server = await createAgentMcpServer({
+        agentManager,
+        agentStorage: storage,
+        providerSnapshotManager: createOpenCodeManager().manager,
+        logger,
+      });
+      const tool = registeredTool(server, "create_agent");
+      const input = { title: "Helper", provider: "codex/gpt-5.4", initialPrompt: "Summarize" };
+      await expect(tool.handler({ ...input, internal: true })).rejects.toThrow(/Unrecognized key/);
+      await expect(tool.handler({ ...input, background: true })).rejects.toThrow(
+        /Unrecognized key/,
+      );
+    } finally {
+      await removeAgentStateDir(agentManager, storage, workdir);
+    }
+  });
+
   it("rejects partial explicit workspace shape", async () => {
     const { agentManager, agentStorage } = createTestDeps();
     const server = await createAgentMcpServer({
@@ -1446,7 +1483,6 @@ describe("create_agent MCP tool", () => {
       title: "Existing workspace",
       provider: "codex/gpt-5.4",
       initialPrompt: "Do work",
-      background: true,
     });
 
     expect(response.structuredContent.workspaceId).toBe("wks_existing");
@@ -1483,7 +1519,7 @@ describe("create_agent MCP tool", () => {
       title: "Feature test",
       provider: "codex/gpt-5.4",
       initialPrompt: "Do work",
-      background: true,
+
       settings: { features: { fast_mode: true } },
     };
 
@@ -1536,7 +1572,6 @@ describe("create_agent MCP tool", () => {
       title: "Mode test",
       provider: "codex/gpt-5.4",
       initialPrompt: "Do work",
-      background: true,
     });
 
     expect(response.structuredContent).toEqual(
@@ -1862,7 +1897,6 @@ describe("create_agent MCP tool", () => {
         title: "Worktree agent",
         provider: "codex/gpt-5.4",
         initialPrompt: "Do work",
-        background: true,
       });
 
       expect(broadcasts).toHaveLength(1);
@@ -1950,7 +1984,6 @@ describe("create_agent MCP tool", () => {
         title: "Worktree agent",
         provider: "codex/gpt-5.4",
         initialPrompt: "Fix workspace creation naming",
-        background: true,
       });
 
       const agentCwd = z.string().parse(spies.agentManager.createAgent.mock.calls[0]?.[0].cwd);
@@ -2031,7 +2064,6 @@ describe("create_agent MCP tool", () => {
         title: "Agent title",
         provider: "codex/gpt-5.4",
         initialPrompt: "Build a workspace auto title flow",
-        background: true,
       });
       const workspaceId = z.string().parse(createdWorkspaceIds[0]);
       await waitForWorkspaceTitle(workspaceRecords, workspaceId, "Workspace Auto Title Flow");
@@ -2133,7 +2165,6 @@ describe("create_agent MCP tool", () => {
         title: "Agent title",
         provider: "codex/gpt-5.4",
         initialPrompt: "Keep the manually renamed workspace title",
-        background: true,
       });
       const renameWorkspaceTool = registeredTool(server, "rename_workspace");
       await renameWorkspaceTool.handler({
@@ -2223,7 +2254,6 @@ describe("create_agent MCP tool", () => {
         title: "Explicit Agent Title",
         provider: "codex/gpt-5.4",
         initialPrompt: "Generate the workspace title anyway",
-        background: true,
       });
       const workspaceId = z.string().parse(createdWorkspaceIds[0]);
       await waitForWorkspaceTitle(workspaceRecords, workspaceId, "Generated Workspace Title");
@@ -2330,7 +2360,6 @@ describe("create_agent MCP tool", () => {
         title: "Directory agent",
         provider: "codex/gpt-5.4",
         initialPrompt: "Name a directory workspace from the prompt",
-        background: true,
       });
       await waitForWorkspaceTitle(
         workspaceRecords,
@@ -2437,7 +2466,6 @@ describe("create_agent MCP tool", () => {
         title: "Checkout agent",
         provider: "codex/gpt-5.4",
         initialPrompt: "Rename this checkout from the prompt",
-        background: true,
       });
 
       const agentCwd = z.string().parse(spies.agentManager.createAgent.mock.calls[0]?.[0].cwd);
@@ -2544,7 +2572,6 @@ describe("create_agent MCP tool", () => {
       title: "PR agent",
       provider: "codex/gpt-5.4",
       initialPrompt: "Rename this PR branch from prompt",
-      background: true,
     });
 
     expect(createPaseoWorktree).toHaveBeenCalledWith(
@@ -3056,6 +3083,47 @@ describe("create_agent MCP tool", () => {
     ]);
   });
 
+  it("creates an background local workspace and leaves it out of list_workspaces", async () => {
+    const { agentManager, agentStorage } = createTestDeps();
+    const createCalls: Array<{ cwd: string; context: { background?: boolean } | undefined }> = [];
+    const backgroundWorkspace = createPersistedWorkspaceRecord({
+      workspaceId: "ws-background",
+      projectId: "project-1",
+      cwd: process.cwd(),
+      kind: "directory",
+      displayName: "helper",
+      createdAt: "2026-07-17T00:00:00.000Z",
+      updatedAt: "2026-07-17T00:00:00.000Z",
+      background: true,
+    });
+    const server = await createAgentMcpServer({
+      agentManager,
+      agentStorage,
+      providerSnapshotManager: createOpenCodeManager().manager,
+      workspaceRegistry: {
+        get: vi.fn(async () => backgroundWorkspace),
+        list: vi.fn(async () => [backgroundWorkspace]),
+        upsert: vi.fn(async () => undefined),
+      },
+      createDirectoryWorkspace: async (cwd, _title, _projectId, context) => {
+        createCalls.push({ cwd, context });
+        return backgroundWorkspace;
+      },
+      logger,
+    });
+
+    const created = await invokeToolWithParsedInput(registeredTool(server, "create_workspace"), {
+      isolation: "local",
+      path: process.cwd(),
+      background: true,
+    });
+    expect(created.structuredContent.workspaceId).toBe("ws-background");
+    expect(createCalls).toEqual([{ cwd: process.cwd(), context: { background: true } }]);
+
+    const listed = await registeredTool(server, "list_workspaces").handler({});
+    expect(listed.structuredContent.workspaces).toEqual([]);
+  });
+
   it("accepts custom provider IDs in create_agent input validation", async () => {
     const { agentManager, agentStorage } = createTestDeps();
     const server = await createAgentMcpServer({
@@ -3084,6 +3152,7 @@ describe("create_agent MCP tool", () => {
     await mkdir(subdir, { recursive: true });
     spies.agentManager.getAgent.mockReturnValue({
       id: "voice-agent",
+      config: { title: "Voice" },
       cwd: baseDir,
       workspaceId: "wks_voice",
       provider: "codex",
@@ -3712,6 +3781,7 @@ class HeldTurnAgentSession implements AgentSession {
   private readonly subscribers = new Set<(event: AgentStreamEvent) => void>();
   private activeTurnId: string | null = null;
   private turnStartGate: Promise<void> | null = null;
+  private nextStartError: Error | null = null;
 
   constructor(
     readonly provider: AgentProvider,
@@ -3731,12 +3801,37 @@ class HeldTurnAgentSession implements AgentSession {
     return { sessionId: this.id, finalText: "", timeline: [] };
   }
 
+  rejectNextTurnStart(error: Error): void {
+    this.nextStartError = error;
+  }
+
+  tryHandleOutOfBand(prompt: AgentPromptInput) {
+    const text = typeof prompt === "string" ? (parseAgentMessage(prompt)?.text ?? prompt) : null;
+    return text === "/side-command" ? { run: async () => {} } : null;
+  }
+
   async startTurn(prompt: AgentPromptInput): Promise<{ turnId: string }> {
     this.prompts.push(typeof prompt === "string" ? prompt : JSON.stringify(prompt));
     await this.turnStartGate;
+    if (this.nextStartError) {
+      const error = this.nextStartError;
+      this.nextStartError = null;
+      throw error;
+    }
     const turnId = randomUUID();
     this.activeTurnId = turnId;
+    this.pushEvent({
+      type: "timeline",
+      provider: this.provider,
+      turnId,
+      item: {
+        type: "user_message",
+        text: typeof prompt === "string" ? prompt : JSON.stringify(prompt),
+        messageId: randomUUID(),
+      },
+    });
     setTimeout(() => {
+      if (this.activeTurnId !== turnId) return;
       this.pushEvent({ type: "turn_started", provider: this.provider, turnId });
       if (!this.holdTurns && this.activeTurnId === turnId) {
         this.finishTurn();
@@ -3745,15 +3840,29 @@ class HeldTurnAgentSession implements AgentSession {
     return { turnId };
   }
 
-  finishTurn(): void {
+  finishTurn(finalText?: string): void {
     const turnId = this.activeTurnId;
     if (!turnId) {
       throw new Error("No held turn to finish");
     }
     this.activeTurnId = null;
+    if (finalText)
+      this.pushEvent({
+        type: "timeline",
+        provider: this.provider,
+        turnId,
+        item: { type: "assistant_message", text: finalText },
+      });
     this.pushEvent({ type: "turn_completed", provider: this.provider, turnId });
   }
 
+  failTurn(error: string): void {
+    const turnId = this.activeTurnId;
+    if (!turnId) throw new Error("No held turn to fail");
+    this.activeTurnId = null;
+    this.pushEvent({ type: "turn_failed", provider: this.provider, error, turnId });
+  }
+
   subscribe(callback: (event: AgentStreamEvent) => void): () => void {
     this.subscribers.add(callback);
     return () => {
@@ -3884,7 +3993,6 @@ describe("send_agent_prompt MCP tool", () => {
       throw new Error("Expected caller send_agent_prompt input to parse");
     }
     expect(parsed.data).toMatchObject({
-      background: true,
       notifyOnFinish: true,
     });
 
@@ -3897,7 +4005,7 @@ describe("send_agent_prompt MCP tool", () => {
     );
   });
 
-  it("keeps top-level prompts blocking by default", async () => {
+  it("acknowledges top-level prompts without a completion wait", async () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "child-agent",
@@ -3925,20 +4033,16 @@ describe("send_agent_prompt MCP tool", () => {
       throw new Error("Expected top-level send_agent_prompt input to parse");
     }
     expect(parsed.data).toMatchObject({
-      background: false,
       notifyOnFinish: false,
     });
 
     await tool.handler(parsed.data as Record<string, unknown>);
 
     expect(spies.agentManager.subscribe).not.toHaveBeenCalled();
-    expect(spies.agentManager.waitForAgentEvent).toHaveBeenCalledWith(
-      "child-agent",
-      expect.objectContaining({ waitForActive: true }),
-    );
+    expect(spies.agentManager.waitForAgentEvent).not.toHaveBeenCalled();
   });
 
-  it("does not arm a finish notification for blocking agent-scoped prompts", async () => {
+  it("allows agent-scoped callers to opt out of finish notifications", async () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     const parentAgent = {
       id: "parent-agent",
@@ -3974,17 +4078,175 @@ describe("send_agent_prompt MCP tool", () => {
     await invokeToolWithParsedInput(tool, {
       agentId: "child-agent",
       prompt: "Follow up",
-      background: false,
+      notifyOnFinish: false,
     });
 
     expect(spies.agentManager.subscribe).not.toHaveBeenCalled();
-    expect(spies.agentManager.waitForAgentEvent).toHaveBeenCalledWith(
-      "child-agent",
-      expect.objectContaining({ waitForActive: true }),
-    );
+    expect(spies.agentManager.waitForAgentEvent).not.toHaveBeenCalled();
   });
 
-  it("notifies the caller when a blocking agent-scoped prompt outlasts the wait", async () => {
+  it.each([
+    { immediateFinish: false, failure: false },
+    { immediateFinish: true, failure: false },
+    { immediateFinish: false, failure: true },
+  ])(
+    "notifies the retry outcome rather than the prior failed turn (immediate: $immediateFinish, failure: $failure)",
+    async ({ immediateFinish, failure }) => {
+      const workdir = await mkdtemp(join(tmpdir(), "mcp-retry-notification-"));
+      const storage = new AgentStorage(join(workdir, "agents"), logger);
+      const parentClient = new HeldTurnAgentClient("claude", false);
+      const childClient = new HeldTurnAgentClient("codex", true);
+      const agentManager = new AgentManager({
+        clients: { claude: parentClient, codex: childClient },
+        registry: storage,
+        logger,
+      });
+      try {
+        const parent = await agentManager.createAgent(
+          { provider: "claude", cwd: existingCwd },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const child = await agentManager.createAgent(
+          { provider: "codex", cwd: existingCwd, title: "Retry child" },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const server = await createAgentMcpServer({
+          agentManager,
+          agentStorage: storage,
+          callerAgentId: parent.id,
+          providerSnapshotManager: createOpenCodeManager().manager,
+          logger,
+        });
+        const tool = registeredTool(server, "send_agent_prompt");
+        await invokeToolWithParsedInput(tool, {
+          agentId: child.id,
+          prompt: "Old task",
+          notifyOnFinish: false,
+        });
+        childClient.sessions[0]!.failTurn("Old task failed");
+        await vi.waitFor(() => expect(agentManager.getAgent(child.id)?.lifecycle).toBe("error"));
+        const unsubscribe = agentManager.subscribe(
+          (event) => {
+            if (
+              immediateFinish &&
+              event.type === "agent_state" &&
+              event.agent.lifecycle === "running"
+            ) {
+              childClient.sessions[0]!.finishTurn("Retry done");
+            }
+          },
+          { agentId: child.id, replayState: false },
+        );
+        const response = await invokeToolWithParsedInput(tool, {
+          agentId: child.id,
+          prompt: "Retry now",
+        });
+        unsubscribe();
+        expect(response.structuredContent).toMatchObject({
+          success: true,
+          disposition: "turn_started",
+        });
+        if (!immediateFinish) {
+          expect(response.structuredContent.status).toBe("running");
+          if (failure) childClient.sessions[0]!.failTurn("Retry failed");
+          else childClient.sessions[0]!.finishTurn("Retry done");
+        }
+        await vi.waitFor(() => {
+          expect(parentClient.sessions[0]!.prompts).toHaveLength(1);
+          expect(parentClient.sessions[0]!.prompts[0]).toContain(
+            `Agent ${child.id} (Retry child) ${failure ? "errored" : "finished"}.`,
+          );
+          expect(parentClient.sessions[0]!.prompts[0]).not.toContain("Old task failed");
+        });
+        await vi.waitFor(() => expect(agentManager.getAgent(parent.id)?.lifecycle).toBe("idle"));
+        expect(parentClient.sessions[0]!.prompts).toHaveLength(1);
+      } finally {
+        await removeAgentStateDir(agentManager, storage, workdir);
+      }
+    },
+  );
+
+  it.each(["out_of_band", "startup_failure"] as const)(
+    "preserves %s dispatch notification semantics",
+    async (scenario) => {
+      const workdir = await mkdtemp(join(tmpdir(), "mcp-dispatch-notification-"));
+      const storage = new AgentStorage(join(workdir, "agents"), logger);
+      const parentClient = new HeldTurnAgentClient("claude", false);
+      const childClient = new HeldTurnAgentClient("codex", true);
+      const agentManager = new AgentManager({
+        clients: { claude: parentClient, codex: childClient },
+        registry: storage,
+        logger,
+      });
+      try {
+        const parent = await agentManager.createAgent(
+          { provider: "claude", cwd: existingCwd },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const child = await agentManager.createAgent(
+          { provider: "codex", cwd: existingCwd },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const server = await createAgentMcpServer({
+          agentManager,
+          agentStorage: storage,
+          callerAgentId: parent.id,
+          providerSnapshotManager: createOpenCodeManager().manager,
+          logger,
+        });
+        const tool = registeredTool(server, "send_agent_prompt");
+        await invokeToolWithParsedInput(tool, {
+          agentId: child.id,
+          prompt: "Ongoing task",
+          notifyOnFinish: false,
+        });
+        if (scenario === "out_of_band") {
+          const response = await invokeToolWithParsedInput(tool, {
+            agentId: child.id,
+            prompt: "/side-command",
+          });
+          expect(response.structuredContent).toMatchObject({
+            success: true,
+            disposition: "out_of_band",
+            status: "running",
+          });
+          expect(childClient.sessions[0]!.prompts).toHaveLength(1);
+          expect(parseAgentMessage(childClient.sessions[0]!.prompts[0])).toMatchObject({
+            source: { kind: "agent-message", agentId: parent.id },
+            text: "Ongoing task",
+          });
+          expect(parentClient.sessions[0]!.prompts).toHaveLength(0);
+          childClient.sessions[0]!.finishTurn("Ongoing task done");
+          await vi.waitFor(() => {
+            expect(parentClient.sessions[0]!.prompts).toHaveLength(1);
+            expect(parentClient.sessions[0]!.prompts[0]).toContain("finished.");
+          });
+        } else {
+          childClient.sessions[0]!.rejectNextTurnStart(new Error("Requested turn could not start"));
+          await expect(
+            invokeToolWithParsedInput(tool, { agentId: child.id, prompt: "Replacement task" }),
+          ).rejects.toThrow("Requested turn could not start");
+          // A later real turn must not inherit a subscription from the rejected dispatch.
+          await invokeToolWithParsedInput(tool, {
+            agentId: child.id,
+            prompt: "Recovery",
+            notifyOnFinish: false,
+          });
+          childClient.sessions[0]!.finishTurn("Recovered");
+          await vi.waitFor(() => expect(agentManager.getAgent(child.id)?.lifecycle).toBe("idle"));
+          expect(parentClient.sessions[0]!.prompts).toHaveLength(0);
+        }
+      } finally {
+        await removeAgentStateDir(agentManager, storage, workdir);
+      }
+    },
+  );
+
+  it("acknowledges a pending agent-scoped turn and notifies its completion", async () => {
     const workdir = await mkdtemp(join(tmpdir(), "mcp-blocking-send-timeout-"));
     const storage = new AgentStorage(join(workdir, "agents"), logger);
     const parentClient = new HeldTurnAgentClient("claude", false);
@@ -4015,24 +4277,19 @@ describe("send_agent_prompt MCP tool", () => {
       });
       const tool = registeredTool(server, "send_agent_prompt");
 
-      vi.useFakeTimers();
       const pending = invokeToolWithParsedInput(tool, {
         agentId: child.id,
         prompt: "Follow up",
-        background: false,
       });
-      await vi.advanceTimersByTimeAsync(31_000);
       const response = await pending;
       expect(response.structuredContent).toMatchObject({
         status: "running",
         guidance:
           "You will get notified when the prompted agent finishes, errors, or needs permission. Do not poll for status; continue with other work until the notification arrives.",
       });
-      expect(response.structuredContent.lastMessage).toContain("timed out after 30s");
+      expect(response.structuredContent).not.toHaveProperty("lastMessage");
 
       childClient.sessions[0]!.finishTurn();
-      await vi.advanceTimersByTimeAsync(1_000);
-      vi.useRealTimers();
 
       await vi.waitFor(() => {
         const parentPrompts = parentClient.sessions[0]!.prompts;
@@ -4091,6 +4348,7 @@ describe("send_agent_prompt MCP tool", () => {
       const childSession = childClient.sessions[0]!;
       await vi.waitFor(() => expect(childSession.prompts).toHaveLength(2));
 
+      expect(parentClient.sessions[0]!.prompts).toHaveLength(0);
       childSession.finishTurn();
 
       function finishNotifications() {
@@ -4220,7 +4478,11 @@ describe("send_agent_prompt MCP tool", () => {
         },
       );
       unsubscribe();
-      expect(response.structuredContent).toMatchObject({ success: true, status: "idle" });
+      expect(response.structuredContent).toMatchObject({
+        success: true,
+        disposition: "turn_started",
+      });
+      await vi.waitFor(() => expect(agentManager.getAgent(child.id)?.lifecycle).toBe("idle"));
       await vi.waitFor(() => {
         const parentPrompts = parentClient.sessions[0]!.prompts;
         expect(parentPrompts).toHaveLength(1);
diff --git a/packages/server/src/server/agent/tools/paseo-tools.ts b/packages/server/src/server/agent/tools/paseo-tools.ts
index 603e7ed4c6..6136da3c8f 100644
--- a/packages/server/src/server/agent/tools/paseo-tools.ts
+++ b/packages/server/src/server/agent/tools/paseo-tools.ts
@@ -1,3 +1,4 @@
+import { AgentDirectory } from "../directory.js";
 import { stat } from "node:fs/promises";
 import { z } from "zod";
 import { ensureValidJson } from "../../json-utils.js";
@@ -59,9 +60,9 @@ import {
   sanitizePermissionRequest,
   serializeSnapshotWithMetadata,
   toScheduleSummary,
-  waitForAgentWithTimeout,
 } from "../mcp-shared.js";
 import {
+  type PromptDispatchDisposition,
   sendPromptToAgent,
   setupFinishNotification,
   waitForAgentRunStartWithTimeout,
@@ -123,6 +124,7 @@ export interface PaseoToolHostDependencies {
     cwd: string,
     title?: string | null,
     projectId?: string,
+    context?: { background?: boolean; callerWorkspaceId?: string },
   ) => Promise<PersistedWorkspaceRecord>;
   workspaceScripts?: Pick<WorkspaceScriptsService, "list" | "launch" | "stop">;
   markWorkspaceArchiving?: ArchiveDependencies["markWorkspaceArchiving"];
@@ -132,6 +134,7 @@ export interface PaseoToolHostDependencies {
   ensureWorkspaceForCreate?: (
     cwd: string,
     firstAgentContext?: FirstAgentContext,
+    context?: { callerWorkspaceId?: string },
   ) => Promise<string>;
   browserToolsEnabled?: boolean;
   browserToolsBroker?: BrowserToolsBroker | null;
@@ -189,6 +192,7 @@ const WorkspaceAutomationSummarySchema = z.object({
   isolation: z.enum(["local", "worktree"]),
   kind: z.enum(["directory", "local_checkout", "worktree"]),
   title: z.string().nullable(),
+  background: z.boolean().optional(),
 });
 
 function toWorkspaceAutomationSummary(workspace: PersistedWorkspaceRecord) {
@@ -199,6 +203,7 @@ function toWorkspaceAutomationSummary(workspace: PersistedWorkspaceRecord) {
     isolation: workspace.kind === "worktree" ? ("worktree" as const) : ("local" as const),
     kind: workspace.kind,
     title: workspace.title,
+    background: workspace.background,
   };
 }
 
@@ -1047,13 +1052,6 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
   };
   const canonicalTopLevelInputSchema = {
     ...canonicalCreateAgentFields,
-    background: z
-      .boolean()
-      .optional()
-      .default(false)
-      .describe(
-        "Run agent in background. If false (default), waits for completion or permission request. If true, returns immediately.",
-      ),
     notifyOnFinish: z
       .boolean()
       .optional()
@@ -1071,7 +1069,6 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     ...commonCreateAgentFields,
     relationship: legacyCreateAgentPlacementFields.relationship.optional(),
     workspace: legacyCreateAgentPlacementFields.workspace.optional(),
-    background: canonicalTopLevelInputSchema.background,
     notifyOnFinish: canonicalTopLevelInputSchema.notifyOnFinish,
     cwd: z
       .string()
@@ -1129,13 +1126,6 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
   };
   const agentToAgentSendAgentPromptInputSchema = {
     ...commonSendAgentPromptInputSchema,
-    background: z
-      .boolean()
-      .optional()
-      .default(true)
-      .describe(
-        "Run agent in background. Agent-scoped default is true so you can continue until the finish notification arrives. Set false only when you need a blocking response.",
-      ),
     notifyOnFinish: z
       .boolean()
       .optional()
@@ -1146,13 +1136,6 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
   };
   const topLevelSendAgentPromptInputSchema = {
     ...commonSendAgentPromptInputSchema,
-    background: z
-      .boolean()
-      .optional()
-      .default(false)
-      .describe(
-        "Run agent in background. If false (default), waits for completion or permission request. If true, returns immediately.",
-      ),
     notifyOnFinish: z
       .boolean()
       .optional()
@@ -1249,6 +1232,12 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
           ),
         projectId: z.string().optional().describe("Existing project id to own the workspace."),
         title: z.string().trim().min(1).optional(),
+        background: z
+          .boolean()
+          .optional()
+          .describe(
+            "True hides the workspace from default lists and the sidebar while its contents remain durable and accessible; omit background to inherit your current workspace’s value (false without a caller), and override it only when the user explicitly asks.",
+          ),
         mode: z
           .enum(["branch-off", "checkout-branch", "checkout-pr"])
           .optional()
@@ -1287,6 +1276,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       path,
       projectId,
       title,
+      background,
       mode,
       worktreeSlug,
       branchName,
@@ -1316,7 +1306,10 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         if (!options.createDirectoryWorkspace) {
           throw new Error("Workspace provisioning is not configured");
         }
-        workspace = await options.createDirectoryWorkspace(cwd, title, projectId);
+        workspace = await options.createDirectoryWorkspace(cwd, title, projectId, {
+          background,
+          callerWorkspaceId: resolveCallerAgent()?.workspaceId,
+        });
       } else {
         let cwd =
           path !== undefined || !projectId ? resolveScopedCwd(path, { required: true }) : null;
@@ -1347,6 +1340,8 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
             ...(worktreeSlug ? { worktreeSlug } : {}),
             ...worktreeTarget,
             ...(title ? { title } : {}),
+            background,
+            callerWorkspaceId: resolveCallerAgent()?.workspaceId,
           },
         );
         if (!result.ok) {
@@ -1367,15 +1362,17 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     {
       title: "List workspaces",
       description: "List active workspaces.",
-      inputSchema: {},
+      inputSchema: { includeBackground: z.boolean().optional().default(false) },
       outputSchema: { workspaces: z.array(WorkspaceAutomationSummarySchema) },
     },
-    async () => {
+    async ({ includeBackground = false }) => {
       if (!options.workspaceRegistry) {
         throw new Error("Workspace registry is not configured");
       }
       const workspaces = (await options.workspaceRegistry.list())
-        .filter((workspace) => !workspace.archivedAt)
+        .filter(
+          (workspace) => !workspace.archivedAt && (includeBackground || !workspace.background),
+        )
         .map(toWorkspaceAutomationSummary);
       return {
         content: [],
@@ -1442,30 +1439,21 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         workspaceId: z.string().optional(),
         currentModeId: z.string().nullable(),
         availableModes: z.array(ProviderModeSchema),
-        lastMessage: z.string().nullable().optional(),
-        permission: AgentPermissionRequestPayloadSchema.nullable().optional(),
         guidance: z.string().optional(),
       },
     },
     async (args: unknown) => {
       const resolvedArgs = await resolveCreateAgentToolArgs(args);
       const { parsedArgs, worktree } = resolvedArgs;
-      let requestedBackground: boolean;
       let notifyOnFinish: boolean;
       if (resolvedArgs.kind === "agent-scoped") {
-        requestedBackground = true;
         notifyOnFinish = parsedArgs.notifyOnFinish;
       } else {
-        requestedBackground = resolvedArgs.parsedArgs.background;
         notifyOnFinish = resolvedArgs.parsedArgs.notifyOnFinish ?? false;
       }
       const selectedProvider = resolveRequiredProviderModel(parsedArgs.provider).provider;
       const inheritedConfig = resolveInheritedProviderConfig(selectedProvider);
-      const {
-        snapshot,
-        background: createdInBackground,
-        initialPromptStarted,
-      } = await createAgentCommand(
+      const { snapshot, initialPromptStarted } = await createAgentCommand(
         {
           agentManager,
           agentStorage,
@@ -1491,7 +1479,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
           features: parsedArgs.settings?.features,
           labels: parsedArgs.labels,
           mode: parsedArgs.settings?.modeId,
-          background: requestedBackground,
+          promptFailure: "throw",
           notifyOnFinish,
           detached: resolvedArgs.detached,
           callerAgentId,
@@ -1500,43 +1488,12 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         },
       );
 
-      try {
-        if (!createdInBackground && initialPromptStarted) {
-          const result = await waitForAgentWithTimeout(agentManager, snapshot.id, {
-            waitForActive: true,
-          });
-
-          const liveSnapshot = agentManager.getAgent(snapshot.id) ?? snapshot;
-          const responseData = {
-            agentId: snapshot.id,
-            type: snapshot.provider,
-            status: result.status,
-            cwd: liveSnapshot.cwd,
-            ...(liveSnapshot.workspaceId ? { workspaceId: liveSnapshot.workspaceId } : {}),
-            currentModeId: liveSnapshot.currentModeId,
-            availableModes: liveSnapshot.availableModes,
-            lastMessage: result.lastMessage,
-            permission: sanitizePermissionRequest(result.permission),
-          };
-          const validJson = ensureValidJson(responseData);
-
-          const response = {
-            content: [],
-            structuredContent: validJson,
-          };
-          return response;
-        }
-      } catch (error) {
-        childLogger.error({ err: error, agentId: snapshot.id }, "Failed to run initial prompt");
-        throw error;
-      }
-
       // Return immediately for async creation.
       const currentSnapshot = agentManager.getAgent(snapshot.id) ?? snapshot;
       const guidance =
         callerAgentId && notifyOnFinish && initialPromptStarted
           ? "You will get notified when the created agent finishes, errors, or needs permission. Do not poll for status; continue with other work until the notification arrives."
-          : undefined;
+          : "Creation acknowledged. Observe completion using get_agent_status/get_agent_activity or SDK/RPC subscriptions and wait APIs.";
       const response = {
         content: [],
         structuredContent: ensureValidJson({
@@ -1547,8 +1504,6 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
           ...(currentSnapshot.workspaceId ? { workspaceId: currentSnapshot.workspaceId } : {}),
           currentModeId: currentSnapshot.currentModeId,
           availableModes: currentSnapshot.availableModes,
-          lastMessage: null,
-          permission: null,
           ...(guidance ? { guidance } : {}),
         }),
       };
@@ -1682,7 +1637,9 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       const cwd = process.cwd();
       return {
         cwd,
-        workspaceId: await options.ensureWorkspaceForCreate(cwd, firstAgentContext),
+        workspaceId: await options.ensureWorkspaceForCreate(cwd, firstAgentContext, {
+          callerWorkspaceId: resolveCallerAgent()?.workspaceId,
+        }),
       };
     }
     const caller = resolveCallerAgent();
@@ -1850,7 +1807,9 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       }
       return {
         cwd,
-        workspaceId: await options.ensureWorkspaceForCreate(cwd, firstAgentContext),
+        workspaceId: await options.ensureWorkspaceForCreate(cwd, firstAgentContext, {
+          callerWorkspaceId: resolveCallerAgent()?.workspaceId,
+        }),
         worktree: undefined,
       };
     }
@@ -1897,37 +1856,32 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     {
       title: "Send agent prompt",
       description:
-        "Send a task to a running agent. Agent-scoped callers run in background by default; top-level callers wait by default.",
+        "Send a task and return after dispatch acknowledgement. Calling agents receive finish notifications by default.",
       inputSchema: sendAgentPromptInputSchema,
       outputSchema: {
         success: z.boolean(),
+        disposition: z.enum(["turn_started", "out_of_band"]).optional(),
         status: AgentStatusEnum,
-        lastMessage: z.string().nullable().optional(),
-        permission: AgentPermissionRequestPayloadSchema.nullable().optional(),
         guidance: z.string().optional(),
       },
     },
-    async ({
-      agentId,
-      prompt,
-      sessionMode,
-      background = Boolean(callerAgentId),
-      notifyOnFinish = Boolean(callerAgentId),
-    }) => {
-      function armFinishNotification(): boolean {
+    async ({ agentId, prompt, sessionMode, notifyOnFinish = Boolean(callerAgentId) }) => {
+      let stopNotification: (() => void) | undefined;
+      function armFinishNotification(disposition: PromptDispatchDisposition): void {
         if (!callerAgentId || !notifyOnFinish) {
-          return false;
+          return;
         }
-        setupFinishNotification({
+        stopNotification = setupFinishNotification({
           agentManager,
           agentStorage,
           childAgentId: agentId,
           callerAgentId,
+          waitForTurnStart: disposition === "turn_started",
           logger: childLogger,
         });
-        return true;
       }
 
+      const notifying = Boolean(callerAgentId && notifyOnFinish);
       const { disposition } = await sendPromptToAgent({
         agentManager,
         agentStorage,
@@ -1935,51 +1889,29 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         prompt,
         source: callerAgentId ? { kind: "agent-message", agentId: callerAgentId } : undefined,
         sessionMode,
+        onDispatch: armFinishNotification,
         logger: childLogger,
+      }).catch((error) => {
+        stopNotification?.();
+        throw error;
       });
 
-      // If not running in background, wait for completion
-      if (!background) {
-        const result = await waitForAgentWithTimeout(agentManager, agentId, {
-          waitForActive: true,
-        });
-        // The wait ran out while the agent keeps working, so its result arrives as a
-        // finish notification instead of in this response.
-        const notifying =
-          result.timedOut &&
-          agentManager.getAgent(agentId)?.lifecycle === "running" &&
-          armFinishNotification();
-
-        const responseData = {
-          success: true,
-          status: result.status,
-          lastMessage: result.lastMessage,
-          permission: sanitizePermissionRequest(result.permission),
-          ...(notifying ? { guidance: PROMPTED_AGENT_NOTIFICATION_GUIDANCE } : {}),
-        };
-        const validJson = ensureValidJson(responseData);
-
-        const response = {
-          content: [],
-          structuredContent: validJson,
-        };
-        return response;
-      }
-
-      const notifying = armFinishNotification();
-
       // Return once the provider has accepted the turn, so the status reports it running.
       if (disposition === "turn_started") {
-        await waitForAgentRunStartWithTimeout(agentManager, agentId);
+        await waitForAgentRunStartWithTimeout(agentManager, agentId).catch((error) => {
+          stopNotification?.();
+          throw error;
+        });
       }
       const currentSnapshot = agentManager.getAgent(agentId);
 
       const responseData = {
         success: true,
+        disposition,
         status: currentSnapshot?.lifecycle ?? "idle",
-        lastMessage: null,
-        permission: null,
-        ...(notifying ? { guidance: PROMPTED_AGENT_NOTIFICATION_GUIDANCE } : {}),
+        guidance: notifying
+          ? PROMPTED_AGENT_NOTIFICATION_GUIDANCE
+          : "Dispatch acknowledged. Observe completion using get_agent_status/get_agent_activity or SDK/RPC subscriptions and wait APIs.",
       };
       const validJson = ensureValidJson(responseData);
 
@@ -2047,6 +1979,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       title: "List agents",
       description: "List recent agents as compact metadata.",
       inputSchema: {
+        includeBackground: z.boolean().optional().default(false),
         includeArchived: z.boolean().optional().default(false),
         cwd: z.string().optional(),
         sinceHours: z
@@ -2063,29 +1996,38 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         agents: z.array(AgentListItemPayloadSchema),
       },
     },
-    async ({ includeArchived = false, cwd, sinceHours = 48, statuses, limit = 50 }) => {
+    async ({
+      includeBackground = false,
+      includeArchived = false,
+      cwd,
+      sinceHours = 48,
+      statuses,
+      limit = 50,
+    }) => {
       const callerCwd = callerAgentId ? resolveCallerAgent()?.cwd : undefined;
       const requestedCwd = cwd?.trim() ? expandUserPath(cwd) : callerCwd;
       const statusFilter = statuses && statuses.length > 0 ? new Set(statuses) : null;
       const sinceMs = Date.now() - sinceHours * 60 * 60 * 1000;
-      const liveSnapshots = agentManager.listAgents();
-      const liveAgents = await Promise.all(
-        liveSnapshots.map((snapshot) =>
+      if (!options.workspaceRegistry) throw new Error("Workspace registry is not configured");
+      const directory = new AgentDirectory({
+        manager: agentManager,
+        storage: agentStorage,
+        workspaces: options.workspaceRegistry,
+        projectLive: (snapshot) =>
           serializeSnapshotWithMetadata(agentStorage, snapshot, childLogger),
-        ),
-      );
-      const liveIds = new Set(liveSnapshots.map((snapshot) => snapshot.id));
-      const storedRecords = await agentStorage.list();
-      const registeredProviderIds = new Set(providerSnapshotManager.listRegisteredProviderIds());
-      const storedAgents = storedRecords
-        .filter((record) => !record.internal && !liveIds.has(record.id))
-        .filter((record) => includeArchived || !record.archivedAt)
-        .filter(
-          (record) =>
-            includeArchived || isStoredAgentProviderAvailable(record, registeredProviderIds),
-        )
-        .map((record) => buildStoredAgentPayload(record, registeredProviderIds));
-      const agents = [...liveAgents, ...storedAgents]
+        projectStored: (record) =>
+          buildStoredAgentPayload(
+            record,
+            new Set(providerSnapshotManager.listRegisteredProviderIds()),
+          ),
+        isProviderVisible: () => true,
+        isStoredProviderAvailable: (record) =>
+          isStoredAgentProviderAvailable(
+            record,
+            new Set(providerSnapshotManager.listRegisteredProviderIds()),
+          ),
+      });
+      const agents = (await directory.list({ includeBackground, includeArchived }))
         .map(toAgentListItemPayload)
         .filter((agent) => !requestedCwd || isSameOrDescendantPath(requestedCwd, agent.cwd))
         .filter((agent) => !statusFilter || statusFilter.has(agent.status))
diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/server/bootstrap.ts
index 0ec792e871..43f72dc95f 100644
--- a/packages/server/src/server/bootstrap.ts
+++ b/packages/server/src/server/bootstrap.ts
@@ -1031,10 +1031,13 @@ export async function createPaseoDaemon(
   const ensureWorkspaceForCreateExternal = async (
     cwd: string,
     firstAgentContext?: FirstAgentContext,
+    context?: { callerWorkspaceId?: string },
   ): Promise<string> => {
     const workspace = await workspaceProvisioning.createWorkspaceForDirectory(
       cwd,
       resolveFirstAgentPromptTitle(firstAgentContext),
+      undefined,
+      context,
     );
     if (firstAgentContext) {
       workspaceAutoName.scheduleForDirectory({
@@ -1081,8 +1084,9 @@ export async function createPaseoDaemon(
   const ensureWorkspaceForCreateAndBroadcastExternal = async (
     cwd: string,
     firstAgentContext?: FirstAgentContext,
+    context?: { callerWorkspaceId?: string },
   ): Promise<string> => {
-    const workspaceId = await ensureWorkspaceForCreateExternal(cwd, firstAgentContext);
+    const workspaceId = await ensureWorkspaceForCreateExternal(cwd, firstAgentContext, context);
     await emitWorkspaceUpdatesExternal([workspaceId]);
     return workspaceId;
   };
@@ -1399,11 +1403,12 @@ export async function createPaseoDaemon(
     emitWorkspaceUpdatesForWorkspaceIds: emitWorkspaceUpdatesExternal,
     workspaceRegistry,
     projectRegistry,
-    createDirectoryWorkspace: async (cwd, title, projectId) => {
+    createDirectoryWorkspace: async (cwd, title, projectId, context) => {
       const workspace = await workspaceProvisioning.createWorkspaceForDirectory(
         cwd,
         title,
         projectId,
+        context,
       );
       await emitWorkspaceUpdatesExternal([workspace.workspaceId]);
       return workspace;
@@ -1874,7 +1879,7 @@ export async function createPaseoDaemon(
 const AGENT_CLOSE_TIMEOUT_MS = 5_000;
 
 async function closeAllAgents(logger: Logger, agentManager: AgentManager): Promise<void> {
-  const agents = agentManager.listAgents();
+  const agents = agentManager.listAgents({ includeInternal: true });
   await Promise.all(
     agents.map(async (agent) => {
       try {
diff --git a/packages/server/src/server/directory-sync/index.ts b/packages/server/src/server/directory-sync/index.ts
index 1b08360cb7..e16e20302f 100644
--- a/packages/server/src/server/directory-sync/index.ts
+++ b/packages/server/src/server/directory-sync/index.ts
@@ -69,27 +69,29 @@ export class DirectorySyncService {
   synchronizeWorkspaces(
     snapshot: Iterable<WorkspaceDescriptorPayload>,
     cursor: DirectorySyncCursor,
+    includeBackground = false,
   ): Pick<FetchWorkspacesResponse, "entries" | "emptyProjects" | "pageInfo" | "sync"> {
     this.workspaces.replaceAll(snapshot);
-    const read = this.read(this.workspaces, cursor);
+    const read = this.read(this.workspaces, cursor, includeBackground);
     return {
       entries: read.values.map(({ seq, value }) => ({ ...value, syncSeq: seq })),
       emptyProjects: [],
       pageInfo: { nextCursor: null, prevCursor: null, hasMore: false },
-      sync: this.metadata(read),
+      sync: this.metadata(read, includeBackground),
     };
   }
 
   synchronizeAgents(
     snapshot: Iterable<AgentDirectoryEntry>,
     cursor: DirectorySyncCursor,
+    includeBackground = false,
   ): Pick<FetchAgentsResponse, "entries" | "pageInfo" | "sync"> {
     this.agents.replaceAll(snapshot);
-    const read = this.read(this.agents, cursor);
+    const read = this.read(this.agents, cursor, includeBackground);
     return {
       entries: read.values.map(({ seq, value }) => ({ ...value, syncSeq: seq })),
       pageInfo: { nextCursor: null, prevCursor: null, hasMore: false },
-      sync: this.metadata(read),
+      sync: this.metadata(read, includeBackground),
     };
   }
 
@@ -111,13 +113,19 @@ export class DirectorySyncService {
     value: WorkspaceDescriptorPayload | null,
     id: string,
     includeSequence: boolean,
+    includeBackground = false,
   ): T & Partial<DirectoryVersion> {
     if (value) {
       this.workspaces.replace(value);
     } else {
       this.workspaces.remove(id);
     }
-    return this.withVersion(payload, includeSequence, this.version(this.workspaces, id));
+    return this.withVersion(
+      payload,
+      includeSequence,
+      this.version(this.workspaces, id),
+      includeBackground,
+    );
   }
 
   sequenceAgentUpdate<T extends object>(
@@ -125,18 +133,24 @@ export class DirectorySyncService {
     value: AgentDirectoryEntry | null,
     id: string,
     includeSequence: boolean,
+    includeBackground = false,
   ): T & Partial<DirectoryVersion> {
     if (value) {
       this.agents.replace(value);
     } else {
       this.agents.remove(id);
     }
-    return this.withVersion(payload, includeSequence, this.version(this.agents, id));
+    return this.withVersion(
+      payload,
+      includeSequence,
+      this.version(this.agents, id),
+      includeBackground,
+    );
   }
 
-  private metadata(read: CollectionRead<unknown>) {
+  private metadata(read: CollectionRead<unknown>, includeBackground = false) {
     return {
-      generation: this.generation,
+      generation: this.generationFor(includeBackground),
       headSeq: read.headSeq,
       mode: read.mode,
       ...(read.reason ? { reason: read.reason } : {}),
@@ -148,15 +162,19 @@ export class DirectorySyncService {
     payload: T,
     includeSequence: boolean,
     version: DirectoryVersion | null,
+    includeBackground = false,
   ): T & Partial<DirectoryVersion> {
-    return version && includeSequence ? { ...payload, ...version } : payload;
+    return version && includeSequence
+      ? { ...payload, ...version, generation: this.generationFor(includeBackground) }
+      : payload;
   }
 
   private read<T>(
     collection: VersionedCollection<T>,
     cursor: DirectorySyncCursor,
+    includeBackground = false,
   ): CollectionRead<T> {
-    if (cursor.generation !== this.generation) {
+    if (cursor.generation !== this.generationFor(includeBackground)) {
       return collection.readSnapshot(
         cursor.generation === undefined ? "no_cursor" : "generation_changed",
       );
@@ -167,6 +185,10 @@ export class DirectorySyncService {
     return collection.readAfter(cursor.afterSeq);
   }
 
+  private generationFor(includeBackground: boolean): string {
+    return includeBackground ? `${this.generation}:background` : this.generation;
+  }
+
   private version<T>(collection: VersionedCollection<T>, id: string): DirectoryVersion | null {
     const seq = collection.sequenceFor(id);
     return seq === null ? null : { generation: this.generation, seq };
diff --git a/packages/server/src/server/hub/daemon-executions.ts b/packages/server/src/server/hub/daemon-executions.ts
index a619be18a8..ec629c3fc9 100644
--- a/packages/server/src/server/hub/daemon-executions.ts
+++ b/packages/server/src/server/hub/daemon-executions.ts
@@ -205,7 +205,6 @@ export class DaemonExecutions implements HubExecutionAgents {
             }
           : {}),
         worktree: toCreateAgentWorktree(input.worktree),
-        background: true,
         notifyOnFinish: false,
         owner,
         onWorktreeCreated: (worktree) => {
diff --git a/packages/server/src/server/paseo-worktree-service.ts b/packages/server/src/server/paseo-worktree-service.ts
index 247fe46c18..94e82d5e95 100644
--- a/packages/server/src/server/paseo-worktree-service.ts
+++ b/packages/server/src/server/paseo-worktree-service.ts
@@ -33,6 +33,8 @@ export interface CreatePaseoWorktreeInput extends CreateWorktreeCoreInput {
   workspaceId?: string;
   projectId?: string;
   title?: string;
+  background?: boolean;
+  callerWorkspaceId?: string;
 }
 
 export interface CreatePaseoWorktreeResult {
@@ -101,6 +103,8 @@ async function createPaseoWorktreeWithPriority(
       baseBranch: createdWorktree.worktree.comparisonBaseRef,
       title: input.title?.trim() || resolveFirstAgentPromptTitle(input.firstAgentContext),
       expectsInitialAgent: Boolean(input.firstAgentContext),
+      background: input.background,
+      callerWorkspaceId: input.callerWorkspaceId,
       ...(createdWorktree.intent.kind === "checkout-change-request" &&
       createdWorktree.intent.headRepository
         ? {
diff --git a/packages/server/src/server/schedule-run-lifecycle.e2e.test.ts b/packages/server/src/server/schedule-run-lifecycle.e2e.test.ts
index a27de8825c..877ec3aced 100644
--- a/packages/server/src/server/schedule-run-lifecycle.e2e.test.ts
+++ b/packages/server/src/server/schedule-run-lifecycle.e2e.test.ts
@@ -235,6 +235,10 @@ test("archiveOnFinish=false local scheduled run emits upserts and remains active
   await waitForAgentUpsert(events.agentUpdates, agentId);
   expect(workspaceWasRemoved(events.workspaceUpdates, workspaceId!)).toBe(false);
   expect(await activeAgentIds()).toContain(agentId);
+  expect(
+    (await ctx.client.fetchWorkspaces()).entries.find((entry) => entry.id === workspaceId)
+      ?.background,
+  ).toBe(false);
 
   events.stop();
 });
diff --git a/packages/server/src/server/schedule/service.test.ts b/packages/server/src/server/schedule/service.test.ts
index 8e37d77e8a..18e23e0ed1 100644
--- a/packages/server/src/server/schedule/service.test.ts
+++ b/packages/server/src/server/schedule/service.test.ts
@@ -904,7 +904,6 @@ describe("ScheduleService", () => {
           liveSnapshot: snapshot as Awaited<
             ReturnType<ScheduleServiceOptions["createAgent"]>
           >["liveSnapshot"],
-          background: true,
           initialPromptStarted: false,
           initialPromptError: null,
         };
@@ -982,7 +981,6 @@ describe("ScheduleService", () => {
           liveSnapshot: snapshot as Awaited<
             ReturnType<ScheduleServiceOptions["createAgent"]>
           >["liveSnapshot"],
-          background: true,
           initialPromptStarted: false,
           initialPromptError: null,
         };
@@ -1052,7 +1050,6 @@ describe("ScheduleService", () => {
           liveSnapshot: snapshot as Awaited<
             ReturnType<ScheduleServiceOptions["createAgent"]>
           >["liveSnapshot"],
-          background: true,
           initialPromptStarted: false,
           initialPromptError: null,
         };
@@ -1112,7 +1109,6 @@ describe("ScheduleService", () => {
           liveSnapshot: snapshot as Awaited<
             ReturnType<ScheduleServiceOptions["createAgent"]>
           >["liveSnapshot"],
-          background: true,
           initialPromptStarted: false,
           initialPromptError: null,
         };
diff --git a/packages/server/src/server/schedule/service.ts b/packages/server/src/server/schedule/service.ts
index 7f480f92d2..3608dd8636 100644
--- a/packages/server/src/server/schedule/service.ts
+++ b/packages/server/src/server/schedule/service.ts
@@ -909,7 +909,6 @@ export class ScheduleService {
         features: config.featureValues,
         unattended: true,
         promptFailure: "return-error",
-        background: true,
         notifyOnFinish: false,
       });
       const agent = created.snapshot;
diff --git a/packages/server/src/server/session.create-agent-worktree-autoarchive.e2e.test.ts b/packages/server/src/server/session.create-agent-worktree-autoarchive.e2e.test.ts
index aa6773d6df..fb23daa6f0 100644
--- a/packages/server/src/server/session.create-agent-worktree-autoarchive.e2e.test.ts
+++ b/packages/server/src/server/session.create-agent-worktree-autoarchive.e2e.test.ts
@@ -1,11 +1,16 @@
 import { execFileSync } from "node:child_process";
-import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, mkdtempSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, expect, test } from "vitest";
 
+import { createTestAgentClients } from "./test-utils/fake-agent-client.js";
 import { getFullAccessConfig } from "./daemon-e2e/agent-configs.js";
-import { createDaemonTestContext, type DaemonTestContext } from "./test-utils/index.js";
+import {
+  createDaemonTestContext,
+  DaemonClient,
+  type DaemonTestContext,
+} from "./test-utils/index.js";
 import type { CreateAgentOptions } from "./test-utils/index.js";
 import type { CreateAgentWorktreeTarget } from "./messages.js";
 import { createRealpathAwarePathMatcher } from "../utils/path.js";
@@ -96,6 +101,7 @@ async function expectWorktreeListEmpty(repoDir: string): Promise<void> {
 
 async function createAgentInBranchOffWorktree(options?: {
   autoArchive?: boolean;
+  initialPrompt?: string;
   branchName?: string;
   repoDir?: string;
 }): Promise<{ repoDir: string; agentId: string; worktreePath: string }> {
@@ -112,7 +118,7 @@ async function createAgentInBranchOffWorktree(options?: {
       base: "main",
     },
     ...(options?.autoArchive !== undefined ? { autoArchive: options.autoArchive } : {}),
-    initialPrompt: "Say done.",
+    initialPrompt: options?.initialPrompt ?? "Say done.",
   });
   return { repoDir, agentId: created.id, worktreePath: created.cwd };
 }
@@ -350,24 +356,39 @@ test("archiving a created worktree removes the directory on last reference", asy
 });
 
 test("auto-archiving a created worktree keeps the directory when a sibling workspace references it", async () => {
-  const created = await createAgentInBranchOffWorktree({ autoArchive: true });
-
-  // Create a sibling workspace that shares the same backing directory.
-  const sibling = await ctx.client.createWorkspace({
-    source: { kind: "directory", path: created.worktreePath },
-    title: "sibling",
+  // Hold turn completion while establishing the sibling reference. The original
+  // ordering raced a fast completed turn against sibling workspace creation.
+  await ctx.cleanup();
+  let finishTurn!: () => void;
+  const completion = new Promise<void>((resolve) => {
+    finishTurn = resolve;
   });
-  if (!sibling.workspace) {
-    throw new Error(sibling.error ?? "Failed to create sibling workspace");
+  ctx = await createDaemonTestContext({
+    agentClients: createTestAgentClients({
+      beforeTurnComplete: async (prompt) => {
+        if (prompt === "Hold for sibling workspace") await completion;
+      },
+    }),
+  });
+  try {
+    const created = await createAgentInBranchOffWorktree({
+      autoArchive: true,
+      initialPrompt: "Hold for sibling workspace",
+    });
+    const sibling = await ctx.client.createWorkspace({
+      source: { kind: "directory", path: created.worktreePath },
+      title: "sibling",
+    });
+    if (!sibling.workspace) throw new Error(sibling.error ?? "Failed to create sibling workspace");
+    finishTurn();
+    await ctx.client.waitForFinish(created.agentId, 10000);
+    await expectAgentAbsentFromActiveList(created.agentId);
+    await expectWorktreePresentInList(created.repoDir, created.worktreePath);
+    expect(existsSync(created.worktreePath)).toBe(true);
+    await ctx.client.archivePaseoWorktree({ worktreePath: created.worktreePath });
+  } finally {
+    finishTurn();
   }
-
-  await ctx.client.waitForFinish(created.agentId, 10000);
-
-  await expectAgentAbsentFromActiveList(created.agentId);
-  await expectWorktreePresentInList(created.repoDir, created.worktreePath);
-  expect(existsSync(created.worktreePath)).toBe(true);
-
-  await ctx.client.archivePaseoWorktree({ worktreePath: created.worktreePath });
 });
 
 test("create_agent_request rejects legacy git options before creating a worktree", async () => {
@@ -416,3 +437,248 @@ test("create_agent_request fails cleanly when worktree creation cannot resolve t
   await expectActiveAgentListEmpty();
   await expectWorktreeListEmpty(repoDir);
 });
+
+/** Every agent id with a record under `$PASEO_HOME/agents`, whatever its cwd bucket. */
+function storedAgentIds(): string[] {
+  const root = path.join(ctx.daemon.paseoHome, "agents");
+  if (!existsSync(root)) return [];
+  return readdirSync(root, { recursive: true, encoding: "utf8" })
+    .filter((entry) => entry.endsWith(".json"))
+    .map((entry) => path.basename(entry, ".json"));
+}
+
+test.each(["git", "worktreeName"] as const)(
+  "legacy %s worktree creation resolves final workspace visibility without intermediate records",
+  async (placement) => {
+    const cwd = createGitRepo();
+    const config = { ...getFullAccessConfig("codex"), cwd };
+    const backgroundCaller = await ctx.client.createAgent({ config, background: true });
+    const visibleCaller = await ctx.client.createAgent({ config });
+    const cases = [
+      { name: "review", background: true, expected: true },
+      { name: "review-child", callerAgentId: backgroundCaller.id, expected: true },
+      {
+        name: "visible-child",
+        callerAgentId: backgroundCaller.id,
+        background: false,
+        expected: false,
+      },
+      { name: "hidden-child", callerAgentId: visibleCaller.id, background: true, expected: true },
+      { name: "human-default", expected: false },
+    ];
+    const orderedCases =
+      placement === "worktreeName" ? [cases[1]!, cases[0]!, ...cases.slice(2)] : cases;
+    for (const entry of orderedCases) {
+      const before = await ctx.client.fetchWorkspaces({ filter: { includeBackground: true } });
+      const child = await ctx.client.createAgent({
+        config,
+        ...(entry.callerAgentId ? { callerAgentId: entry.callerAgentId } : {}),
+        ...(entry.background !== undefined ? { background: entry.background } : {}),
+        ...(placement === "git"
+          ? {
+              git: {
+                createWorktree: true,
+                createNewBranch: true,
+                newBranchName: entry.name,
+                baseBranch: "main",
+              },
+            }
+          : { worktreeName: entry.name }),
+      });
+      const inclusive = await ctx.client.fetchWorkspaces({ filter: { includeBackground: true } });
+      const created = inclusive.entries.filter(
+        (workspace) => !before.entries.some((existing) => existing.id === workspace.id),
+      );
+      expect(created).toHaveLength(1);
+      expect(created[0]).toMatchObject({
+        id: child.workspaceId,
+        workspaceDirectory: child.cwd,
+        background: entry.expected,
+        workspaceKind: "worktree",
+      });
+      expect(child.cwd).not.toBe(cwd);
+      expect(child.labels?.["paseo.parent-agent-id"]).toBe(entry.callerAgentId);
+      const defaultAgents = await ctx.client.fetchAgents();
+      const allAgents = await ctx.client.fetchAgents({ filter: { includeBackground: true } });
+      expect(defaultAgents.entries.some((item) => item.agent.id === child.id)).toBe(
+        !entry.expected,
+      );
+      expect(allAgents.entries.some((item) => item.agent.id === child.id)).toBe(true);
+      const defaultWorkspaces = await ctx.client.fetchWorkspaces();
+      expect(
+        defaultWorkspaces.entries.some((workspace) => workspace.id === child.workspaceId),
+      ).toBe(!entry.expected);
+    }
+  },
+  30_000,
+);
+
+test("background workspaces keep durable agents addressable through restart and archive", async () => {
+  const cwd = createGitRepo();
+  const config = { ...getFullAccessConfig("codex"), cwd };
+  const hidden = await ctx.client.createAgent({
+    config,
+    background: true,
+    idempotencyKey: "background-durable",
+  });
+  expect(hidden.internal).not.toBe(true);
+  expect(
+    (await ctx.client.fetchWorkspaces({ filter: { query: hidden.workspaceId } })).entries.map(
+      (entry) => entry.id,
+    ),
+  ).toContain(hidden.workspaceId);
+  expect(storedAgentIds()).toContain(hidden.id);
+  expect((await ctx.client.fetchWorkspaces()).entries).not.toContainEqual(
+    expect.objectContaining({ id: hidden.workspaceId }),
+  );
+  expect(
+    (await ctx.client.fetchWorkspaces({ filter: { includeBackground: true } })).entries,
+  ).toContainEqual(expect.objectContaining({ id: hidden.workspaceId, background: true }));
+  expect((await ctx.client.fetchAgents()).entries.map((entry) => entry.agent.id)).not.toContain(
+    hidden.id,
+  );
+  expect(
+    (await ctx.client.fetchAgents({ filter: { includeBackground: true } })).entries.map(
+      (entry) => entry.agent.id,
+    ),
+  ).toContain(hidden.id);
+  const child = await ctx.client.createAgent({ config, callerAgentId: hidden.id });
+  expect(child.workspaceId).toBe(hidden.workspaceId);
+  const inherited = await ctx.client.createWorkspace({
+    source: { kind: "directory", path: cwd },
+    callerAgentId: hidden.id,
+  });
+  expect(inherited.workspace?.background).toBe(true);
+  const visible = await ctx.client.createWorkspace({
+    source: { kind: "directory", path: cwd },
+    callerAgentId: hidden.id,
+    background: false,
+  });
+  expect(visible.workspace?.background).toBe(false);
+  const inheritedWorktree = await ctx.client.createAgent({
+    config,
+    callerAgentId: hidden.id,
+    worktree: { mode: "branch-off", newBranch: "background-child", base: "main" },
+  });
+  const overriddenWorktree = await ctx.client.createAgent({
+    config,
+    callerAgentId: hidden.id,
+    background: false,
+    worktree: { mode: "branch-off", newBranch: "visible-child", base: "main" },
+  });
+  const workspaces = (await ctx.client.fetchWorkspaces({ filter: { includeBackground: true } }))
+    .entries;
+  expect(workspaces.find((entry) => entry.id === inheritedWorktree.workspaceId)?.background).toBe(
+    true,
+  );
+  expect(workspaces.find((entry) => entry.id === overriddenWorktree.workspaceId)?.background).toBe(
+    false,
+  );
+
+  await expect(
+    ctx.client.createAgent({ config, workspaceId: hidden.workspaceId, background: false }),
+  ).rejects.toThrow("workspace creation intent");
+  await ctx.client.sendAgentMessage(hidden.id, "Say done.");
+  await ctx.client.waitForFinish(hidden.id, 10_000);
+  expect(
+    (await ctx.client.fetchAgentTimeline(hidden.id, { limit: 20 })).entries.length,
+  ).toBeGreaterThan(0);
+  const homeRoot = path.dirname(ctx.daemon.paseoHome);
+  tempRoots.push(ctx.daemon.staticDir);
+  await ctx.client.close();
+  await ctx.daemon.daemon.stop();
+  await ctx.daemon.daemon.agentManager.flush();
+  ctx = await createDaemonTestContext({ paseoHomeRoot: homeRoot });
+  const replay = await ctx.client.createAgent({
+    config,
+    background: true,
+    idempotencyKey: "background-durable",
+  });
+  expect(replay.id).toBe(hidden.id);
+  expect((await ctx.client.fetchAgent(hidden.id))?.agent.workspaceId).toBe(hidden.workspaceId);
+  await ctx.client.sendAgentMessage(hidden.id, "Say done again.");
+  await ctx.client.waitForFinish(hidden.id, 10_000);
+  await ctx.client.archiveAgent(hidden.id);
+  expect((await ctx.client.fetchAgent(hidden.id))?.agent.archivedAt).toEqual(expect.any(String));
+  expect(
+    (await ctx.client.fetchAgentHistory()).entries.map((entry) => entry.agent.id),
+  ).not.toContain(hidden.id);
+  expect(
+    (await ctx.client.fetchAgentHistory({ filter: { includeBackground: true } })).entries.map(
+      (entry) => entry.agent.id,
+    ),
+  ).toContain(hidden.id);
+}, 30_000);
+
+test("default and inclusive observers retain independent snapshots, live updates and catch-up", async () => {
+  const otherClient = new DaemonClient({ url: `ws://127.0.0.1:${ctx.daemon.port}/ws` });
+  await otherClient.connect();
+  try {
+    const cwd = createGitRepo();
+    const config = { ...getFullAccessConfig("codex"), cwd };
+    const hidden = await ctx.client.createAgent({ config, background: true });
+    const visible = await ctx.client.createAgent({ config });
+    const inclusive = ctx.client.observeAgents({
+      scope: "active",
+      sync: {},
+      includeBackground: true,
+    });
+    const ordinary = otherClient.observeAgents({ scope: "active", sync: {} });
+    const inclusiveSnapshot = await inclusive.ready;
+    const defaultSnapshot = await ordinary.ready;
+    expect(inclusiveSnapshot.entries.map((entry) => entry.agent.id)).toContain(hidden.id);
+    expect(defaultSnapshot.entries.map((entry) => entry.agent.id)).toEqual([visible.id]);
+    const inclusiveWorkspaces = ctx.client.observeWorkspaces({ sync: {}, includeBackground: true });
+    const ordinaryWorkspaces = otherClient.observeWorkspaces({ sync: {} });
+    const full = await inclusiveWorkspaces.ready;
+    const partial = await ordinaryWorkspaces.ready;
+    expect(full.entries.map((entry) => entry.id)).toContain(hidden.workspaceId);
+    expect(partial.entries.map((entry) => entry.id)).not.toContain(hidden.workspaceId);
+    const received: string[] = [];
+    const defaultReceived: string[] = [];
+    inclusive.subscribe({
+      snapshot: () => {},
+      update: (message) => {
+        if (message.type === "agent_update" && message.payload.kind === "upsert")
+          received.push(message.payload.agent.id);
+      },
+    });
+    ordinary.subscribe({
+      snapshot: () => {},
+      update: (message) => {
+        if (message.type === "agent_update" && message.payload.kind === "upsert")
+          defaultReceived.push(message.payload.agent.id);
+      },
+    });
+    await ctx.client.sendAgentMessage(hidden.id, "Say done.");
+    await ctx.client.waitForFinish(hidden.id, 10_000);
+    await expect.poll(() => received).toContain(hidden.id);
+    expect(defaultReceived).not.toContain(hidden.id);
+    const catchup = await ctx.client.fetchAgents({
+      scope: "active",
+      includeBackground: true,
+      sync: {
+        generation: inclusiveSnapshot.sync?.generation,
+        afterSeq: inclusiveSnapshot.sync?.headSeq,
+      },
+    });
+    expect(catchup.sync?.mode).toBe("changes");
+    expect(catchup.sync?.removals.map((item) => item.id)).not.toContain(hidden.id);
+    const scopeChanged = await ctx.client.fetchAgents({
+      scope: "active",
+      includeBackground: true,
+      sync: {
+        generation: defaultSnapshot.sync?.generation,
+        afterSeq: defaultSnapshot.sync?.headSeq,
+      },
+    });
+    expect(scopeChanged.sync?.mode).toBe("snapshot");
+    expect(scopeChanged.entries.map((entry) => entry.agent.id)).toContain(hidden.id);
+    await inclusive.release();
+    await ordinary.release();
+    await inclusiveWorkspaces.release();
+    await ordinaryWorkspaces.release();
+  } finally {
+    await otherClient.close();
+  }
+}, 30_000);
diff --git a/packages/server/src/server/session.test.ts b/packages/server/src/server/session.test.ts
index e60dd95209..e114d8b26e 100644
--- a/packages/server/src/server/session.test.ts
+++ b/packages/server/src/server/session.test.ts
@@ -5247,6 +5247,7 @@ test("unions viewed timelines across socket sources and removes detached sources
   const session = createSessionForTest({
     messages,
     agentManager: {
+      getAgent: (id: string) => ({ id, internal: false }),
       subscribe: vi.fn((listener: (event: AgentManagerEvent) => void) => {
         agentEventListeners.push(listener);
         return () => {};
@@ -5354,6 +5355,7 @@ test("keeps selective delivery scoped per socket when a retained session also ha
     messages,
     targetedMessages,
     agentManager: {
+      getAgent: (id: string) => ({ id, internal: false }),
       subscribe: vi.fn((listener: (event: AgentManagerEvent) => void) => {
         agentEventListeners.push(listener);
         return () => {};
diff --git a/packages/server/src/server/session.ts b/packages/server/src/server/session.ts
index 7ac679c35a..08d3f0eefb 100644
--- a/packages/server/src/server/session.ts
+++ b/packages/server/src/server/session.ts
@@ -1,3 +1,4 @@
+import { AgentDirectory } from "./agent/directory.js";
 import { searchTimeline } from "./agent/chat-search/index.js";
 import type { BrowserToolsBroker } from "./browser-tools/broker.js";
 import { BrowserAutomationHostCapabilitySchema } from "@getpaseo/protocol/browser-automation/capabilities";
@@ -248,6 +249,7 @@ import {
 import { WorkspaceAutoName } from "./workspace-auto-name.js";
 import {
   buildAgentSessionConfig as buildWorktreeAgentSessionConfig,
+  normalizeAgentCreationGitOptions,
   createPaseoWorktreeWorkflow as createWorktreeWorkflow,
   type CreatePaseoWorktreeSetupContinuationInput,
   type CreatePaseoWorktreeWorkflowResult,
@@ -724,6 +726,7 @@ export class Session {
   private readonly agentStorage: AgentStorage;
   private readonly projectRegistry: ProjectRegistry;
   private readonly workspaceRegistry: WorkspaceRegistry;
+  private readonly agentDirectory: AgentDirectory;
   private readonly directorySync: DirectorySyncService;
   private readonly filesystem: SessionFileSystem;
   private readonly github: ForgeService;
@@ -1087,7 +1090,22 @@ export class Session {
         this.supportsForSource(CLIENT_CAPS.terminalReflowableSnapshot, source),
       getClientBufferedAmount: (source) => this.getTransportBufferedAmount(source),
     });
+    this.agentDirectory = new AgentDirectory({
+      manager: this.agentManager,
+      storage: this.agentStorage,
+      workspaces: this.workspaceRegistry,
+      projectLive: (agent) => this.buildAgentPayload(agent),
+      projectStored: (record) => this.buildStoredAgentPayload(record),
+      isProviderVisible: (provider) => this.isProviderVisibleToClient(provider),
+      isStoredProviderAvailable: (record) =>
+        isStoredAgentProviderAvailable(
+          record,
+          new Set(this.providerSnapshotManager.listRegisteredProviderIds()),
+        ),
+    });
     this.agentUpdates = createAgentUpdatesService({
+      includesWorkspace: (agent, includeBackground) =>
+        this.agentDirectory.includes(agent, includeBackground),
       emit: (message) => this.emit(message),
       enrichAgentPayload: (payload) => this.enrichAgentPayload(payload),
       buildStoredAgentPayload: (record) => this.buildStoredAgentPayload(record),
@@ -1096,12 +1114,13 @@ export class Session {
         this.buildProjectPlacementForWorkspaceId(workspaceId),
       emitWorkspaceUpdateForWorkspaceId: (workspaceId) =>
         this.emitWorkspaceUpdateForWorkspaceId(workspaceId),
-      sequenceAgentUpdate: (payload, agent, project, agentId, includeSequence) =>
+      sequenceAgentUpdate: (payload, agent, project, agentId, includeSequence, includeBackground) =>
         this.directorySync.sequenceAgentUpdate(
           payload,
           agent && project ? { agent, project } : null,
           agentId,
           includeSequence,
+          includeBackground,
         ),
       logger: this.sessionLogger,
     });
@@ -1164,7 +1183,7 @@ export class Session {
       logger: this.sessionLogger,
       projectRegistry: this.projectRegistry,
       workspaceRegistry: this.workspaceRegistry,
-      listAgentPayloads: () => this.listAgentPayloads(),
+      listAgentPayloads: () => this.listAgentPayloads({ includeBackground: true }),
       listProviderSubagentActivity: async () => this.agentManager.listProviderSubagentActivity(),
       listTerminalActivityContributions: () => this.listTerminalActivityContributions(),
       isProviderVisibleToClient: (provider) => this.isProviderVisibleToClient(provider),
@@ -1410,6 +1429,7 @@ export class Session {
     }
     // COMPAT(workspaceCreateCausalUpdate): added in v0.1.106, remove after 2027-01-12.
     // Older clients create before subscribing and require the causal update beside the response.
+    if (workspace.background) return;
     this.emit({
       type: "workspace_update",
       payload: {
@@ -1929,6 +1949,12 @@ export class Session {
         }
 
         if (event.type === "provider_subagent") {
+          // The subagents track of an internal parent stays hidden.
+          const parentAgentId =
+            event.event.type === "upsert"
+              ? event.event.subagent.parentAgentId
+              : event.event.parentAgentId;
+          if (this.agentManager.getAgent(parentAgentId)?.internal) return;
           this.emitProviderSubagentWorkspaceUpdate(event.event);
           this.forwardProviderSubagentUpdate(event.event);
           return;
@@ -1974,7 +2000,10 @@ export class Session {
 
         this.forwardAgentStream(event, serializedEvent);
 
-        if (event.event.type === "permission_requested") {
+        // An internal agent streams only to clients subscribed to it by id;
+        // session-wide prompts would surface it everywhere.
+        const internal = this.agentManager.getAgent(event.agentId)?.internal === true;
+        if (event.event.type === "permission_requested" && !internal) {
           this.emit({
             type: "agent_permission_request",
             payload: {
@@ -1996,7 +2025,9 @@ export class Session {
 
         // Title updates may be applied asynchronously after agent creation.
       },
-      { replayState: false },
+      // Internal agents flow through so exact-id subscribers and opted-in
+      // listings see them; everything else above filters them out.
+      { replayState: false, includeInternal: true },
     );
   }
 
@@ -3231,7 +3262,7 @@ export class Session {
       agentId,
     );
 
-    if (this.agentUpdates.hasSubscription()) {
+    if (archivedRecord && this.agentUpdates.hasSubscription()) {
       const payload = await this.agentUpdates.emitStoredRecord(archivedRecord);
       if (payload.workspaceId) {
         await this.emitWorkspaceUpdateForWorkspaceId(payload.workspaceId);
@@ -4208,6 +4239,24 @@ export class Session {
     }
   }
 
+  private validatePublicAgentWorkspaceIntent(
+    request: CreateAgentRequestMessage,
+    createsWorktree: boolean,
+  ): void {
+    if (request.internal)
+      throw new Error(
+        "Public internal agents were removed; create a background workspace instead.",
+      );
+    if (
+      request.background !== undefined &&
+      (request.workspaceId || (request.callerAgentId && !createsWorktree))
+    ) {
+      throw new Error(
+        "background is workspace creation intent; configure the selected workspace at creation.",
+      );
+    }
+  }
+
   private async createSessionAgent(
     msg: CreateAgentRequestMessage,
     agentId?: string,
@@ -4242,6 +4291,9 @@ export class Session {
       if (needsRequestedDirectory && !(await this.filesystem.isDirectory(requestedCwd))) {
         throw new Error(`Working directory does not exist or is not a directory: ${requestedCwd}`);
       }
+      // Resolve all supported worktree input forms before provisioning workspace ownership.
+      const gitIntent = normalizeAgentCreationGitOptions(git, worktreeName, worktree);
+      this.validatePublicAgentWorkspaceIntent(msg, gitIntent?.createWorktree === true);
       const trimmedPrompt = initialPrompt?.trim();
       const { provisionalTitle } = resolveCreateAgentTitles({
         configTitle: config.title,
@@ -4255,9 +4307,11 @@ export class Session {
       const workspacePromptTitle = resolveFirstAgentPromptTitle(firstAgentContext);
       const createdWorktree = await this.createAgentLifecycleDispatch.createWorktreeForRequest({
         cwd: config.cwd,
-        target: worktree,
+        target: gitIntent,
         firstAgentContext,
-        hasLegacyGitOptions: Boolean(git),
+        setupContinuation: worktree ? undefined : this.agentWorktreeSetupContinuation(),
+        background: msg.background,
+        callerWorkspaceId: this.getCallerWorkspaceId(msg.callerAgentId),
       });
       createdWorktreeForCleanup = createdWorktree;
       const resolvedIntent = await this.resolveSessionCreateAgentIntent({
@@ -4302,8 +4356,14 @@ export class Session {
           env,
           provisionalTitle,
           firstAgentContext,
-          buildSessionConfig: (sessionConfig, gitOptions, legacyWorktreeName, ctx) =>
-            this.buildAgentSessionConfig(sessionConfig, gitOptions, legacyWorktreeName, ctx),
+          buildSessionConfig: async (sessionConfig, gitOptions, legacyWorktreeName, ctx) =>
+            createdWorktree
+              ? {
+                  sessionConfig,
+                  setupContinuation: createdWorktree.setupContinuation,
+                  createdWorkspaceId: createdWorktree.workspace.workspaceId,
+                }
+              : this.buildAgentSessionConfig(sessionConfig, gitOptions, legacyWorktreeName, ctx),
         },
       );
       createdAgentId = snapshot.id;
@@ -4373,6 +4433,8 @@ export class Session {
           createdWorktree: null,
           cwd: config.cwd,
           initialTitle: input.workspacePromptTitle,
+          background: request.background,
+          callerWorkspaceId: callerAgent?.workspaceId,
         }),
         cwd: config.cwd,
       }),
@@ -4771,6 +4833,26 @@ export class Session {
     }
   }
 
+  private agentWorktreeSetupContinuation(): CreatePaseoWorktreeSetupContinuationInput {
+    return {
+      kind: "agent",
+      terminalManager: this.terminalManager,
+      appendTimelineItem: ({ agentId, item }) =>
+        appendTimelineItemIfAgentKnown({
+          agentManager: this.agentManager,
+          agentId,
+          item,
+        }),
+      emitLiveTimelineItem: ({ agentId, item }) =>
+        emitLiveTimelineItemIfAgentKnown({
+          agentManager: this.agentManager,
+          agentId,
+          item,
+        }),
+      logger: this.sessionLogger,
+    };
+  }
+
   private async buildAgentSessionConfig(
     config: AgentSessionConfig,
     gitOptions?: GitSetupOptions,
@@ -4790,23 +4872,7 @@ export class Session {
         createPaseoWorktree: (input, serviceOptions) =>
           this.createPaseoWorktreeWorkflow(input, {
             ...serviceOptions,
-            setupContinuation: {
-              kind: "agent",
-              terminalManager: this.terminalManager,
-              appendTimelineItem: ({ agentId, item }) =>
-                appendTimelineItemIfAgentKnown({
-                  agentManager: this.agentManager,
-                  agentId,
-                  item,
-                }),
-              emitLiveTimelineItem: ({ agentId, item }) =>
-                emitLiveTimelineItemIfAgentKnown({
-                  agentManager: this.agentManager,
-                  agentId,
-                  item,
-                }),
-              logger: this.sessionLogger,
-            },
+            setupContinuation: this.agentWorktreeSetupContinuation(),
           }),
         checkoutExistingBranch: (cwd, branch) =>
           this.gitMutation.checkoutExistingBranch(cwd, branch),
@@ -5175,52 +5241,10 @@ export class Session {
   /**
    * Build the current agent list payload (live + persisted), optionally filtered by labels.
    */
-  private async listAgentPayloads(filter?: {
-    labels?: Record<string, string>;
-    includeArchived?: boolean;
-    includeUnavailablePersisted?: boolean;
-  }): Promise<AgentSnapshotPayload[]> {
-    const includeArchived = filter?.includeArchived === true;
-    const labelEntries = filter?.labels ? Object.entries(filter.labels) : [];
-
-    // Get live agents with session modes
-    const agentSnapshots = this.agentManager.listAgents();
-    const liveAgents = await Promise.all(
-      agentSnapshots.map((agent) => this.buildAgentPayload(agent)),
-    );
-
-    // Add persisted agents that have not been lazily initialized yet
-    // (excluding internal agents which are for ephemeral system tasks)
-    const registryRecords = await this.agentStorage.list();
-    const liveIds = new Set(agentSnapshots.map((a) => a.id));
-    const registeredProviderIds = new Set(this.providerSnapshotManager.listRegisteredProviderIds());
-    const persistedAgents = registryRecords
-      .filter((record) => !liveIds.has(record.id) && !record.internal)
-      // Keep raw-record filters ahead of projection; seeded homes can carry thousands of archived agents.
-      .filter((record) => includeArchived || !record.archivedAt)
-      .filter((record) => labelEntries.every(([key, value]) => record.labels?.[key] === value))
-      .filter(
-        (record) =>
-          filter?.includeUnavailablePersisted === true ||
-          isStoredAgentProviderAvailable(record, registeredProviderIds),
-      )
-      .map((record) => this.buildStoredAgentPayload(record, registeredProviderIds));
-
-    let agents = [...liveAgents, ...persistedAgents];
-
-    agents = agents.filter((agent) => this.isProviderVisibleToClient(agent.provider));
-    if (!includeArchived) {
-      agents = agents.filter((agent) => !agent.archivedAt);
-    }
-
-    // Filter by labels if filter provided
-    if (labelEntries.length > 0) {
-      agents = agents.filter((agent) =>
-        labelEntries.every(([key, value]) => agent.labels[key] === value),
-      );
-    }
-
-    return agents;
+  private listAgentPayloads(
+    filter?: Parameters<AgentDirectory["list"]>[0],
+  ): Promise<AgentSnapshotPayload[]> {
+    return this.agentDirectory.list(filter);
   }
 
   private async resolveAgentIdentifier(
@@ -5231,6 +5255,13 @@ export class Session {
       return { ok: false, notFound: false, error: "Agent identifier cannot be empty" };
     }
 
+    // An internal agent, live or recently archived, is addressable by its exact
+    // id and nothing else: the caller that created it holds the id, and no
+    // listing ever includes it.
+    if (this.agentManager.getAgent(trimmed) || this.agentManager.getRetiredInternalAgent(trimmed)) {
+      return { ok: true, agentId: trimmed };
+    }
+
     const stored = await this.agentStorage.list();
     const storedRecords = stored.filter((record) => !record.internal);
     const knownIds = new Set<string>();
@@ -5278,6 +5309,25 @@ export class Session {
     return { ok: false, notFound: true, error: `Agent not found: ${trimmed}` };
   }
 
+  /**
+   * An agent that is no longer live, in its settled form: the retained snapshot
+   * of a recently archived internal agent, else its stored record. Null when
+   * neither exists, and for a stored internal record, which is never served.
+   */
+  private async readSettledAgent(
+    agentId: string,
+  ): Promise<{ record: StoredAgentRecord; lastMessage: string | null } | null> {
+    const retired = this.agentManager.getRetiredInternalAgent(agentId);
+    if (retired) {
+      return { record: retired.record, lastMessage: retired.lastMessage };
+    }
+    const record = await this.agentStorage.get(agentId);
+    if (!record || record.internal) {
+      return null;
+    }
+    return { record, lastMessage: null };
+  }
+
   private async getAgentPayloadById(agentId: string): Promise<AgentSnapshotPayload | null> {
     const live = this.agentManager.getAgent(agentId);
     if (live) {
@@ -5285,11 +5335,11 @@ export class Session {
       return this.isProviderVisibleToClient(payload.provider) ? payload : null;
     }
 
-    const record = await this.agentStorage.get(agentId);
-    if (!record || record.internal) {
+    const settled = await this.readSettledAgent(agentId);
+    if (!settled) {
       return null;
     }
-    const payload = this.buildStoredAgentPayload(record);
+    const payload = this.buildStoredAgentPayload(settled.record);
     return this.isProviderVisibleToClient(payload.provider) ? payload : null;
   }
 
@@ -5413,6 +5463,9 @@ export class Session {
     let agents = await this.listAgentPayloads({
       labels: filter?.labels,
       includeArchived: filter?.includeArchived,
+      includeBackground:
+        filter?.includeBackground ||
+        (request.type === "fetch_agents_request" && request.includeBackground),
       includeUnavailablePersisted: request.type === "fetch_agent_history_request",
     });
     const activePlacementsByWorkspaceId =
@@ -5556,6 +5609,7 @@ export class Session {
       title: workspace.title,
       pinnedAt: workspace.pinnedAt,
       ...(workspace.labels && workspace.labels.length > 0 ? { labels: workspace.labels } : {}),
+      background: workspace.background,
       archivingAt: null,
       status: "done",
       statusEnteredAt: null,
@@ -5641,6 +5695,7 @@ export class Session {
       worktreeSlug: basename(result.worktree.worktreePath),
       projectKind: projectRecord?.kind ?? "git",
       workspaceKind: result.workspace.kind,
+      background: result.workspace.background,
       name: resolveWorkspaceName({
         title: result.workspace.title,
         derivedDisplayName: result.worktree.branchName || result.workspace.displayName,
@@ -5719,7 +5774,13 @@ export class Session {
     pageInfo: FetchWorkspacesResponsePageInfo;
   }> {
     try {
-      return await this.workspaceDirectory.listFetchEntries(request);
+      return await this.workspaceDirectory.listFetchEntries({
+        ...request,
+        filter: {
+          ...request.filter,
+          ...(request.includeBackground ? { includeBackground: true } : {}),
+        },
+      });
     } catch (error) {
       if (error instanceof CursorError) {
         throw new SessionRequestError("invalid_cursor", error.message);
@@ -6021,6 +6082,7 @@ export class Session {
             workspace ?? null,
             workspaceId,
             subscription.syncEnabled === true,
+            subscription.filter?.includeBackground,
           ),
         );
         continue;
@@ -6031,6 +6093,7 @@ export class Session {
         workspace ?? null,
         workspaceId,
         subscription.syncEnabled === true,
+        subscription.filter?.includeBackground,
       );
 
       if (
@@ -6136,7 +6199,10 @@ export class Session {
           subscriptionId: owner.id,
           isProviderVisible: (provider) =>
             this.delivery.forSource(owner.source, () => this.isProviderVisibleToClient(provider)),
-          filter: request.filter,
+          filter: {
+            ...request.filter,
+            ...(request.includeBackground ? { includeBackground: true } : {}),
+          },
           syncEnabled: Boolean(request.sync),
           emit: (message) => {
             if (message.type === "agent_update") owner.emit(message);
@@ -6275,7 +6341,10 @@ export class Session {
           subscriptionId: owner.id,
           owner,
           syncEnabled: Boolean(request.sync),
-          filter: request.filter,
+          filter: {
+            ...request.filter,
+            ...(request.includeBackground ? { includeBackground: true } : {}),
+          },
           isBootstrapping: true,
           pendingUpdatesByWorkspaceId: new Map(),
           lastEmittedByWorkspaceId: new Map(),
@@ -6531,24 +6600,41 @@ export class Session {
     }
     const snapshot = await this.listFetchAgentsEntries({
       ...request,
+      includeBackground: true,
       page: { limit: Number.MAX_SAFE_INTEGER },
     });
-    return this.directorySync.synchronizeAgents(snapshot.entries, request.sync ?? {});
+    const result = this.directorySync.synchronizeAgents(
+      snapshot.entries,
+      request.sync ?? {},
+      request.includeBackground,
+    );
+    const entries = await Promise.all(
+      result.entries.map(async (entry) =>
+        (await this.agentDirectory.includes(entry.agent, request.includeBackground)) ? entry : null,
+      ),
+    );
+    return { ...result, entries: entries.filter((entry) => entry !== null) };
   }
 
   private async readWorkspaceDirectorySync(
     request: Extract<SessionInboundMessage, { type: "fetch_workspaces_request" }>,
   ) {
-    if (request.filter) {
+    if (request.filter)
       throw new SessionRequestError(
         "invalid_request",
         "Sequenced workspace directory reads do not support filters.",
       );
-    }
-    return this.directorySync.synchronizeWorkspaces(
+    const result = this.directorySync.synchronizeWorkspaces(
       await this.workspaceDirectory.listDescriptors(),
       request.sync ?? {},
+      request.includeBackground,
     );
+    return {
+      ...result,
+      entries: result.entries.filter(
+        (workspace) => request.includeBackground || !workspace.background,
+      ),
+    };
   }
 
   // Build the bootstrap snapshot used by `flushBootstrappedWorkspaceUpdates`
@@ -6625,10 +6711,23 @@ export class Session {
     }
   }
 
+  private getCallerWorkspaceId(callerAgentId?: string): string | undefined {
+    if (!callerAgentId) return undefined;
+    const caller = this.agentManager.getAgent(callerAgentId);
+    if (!caller) throw new Error(`Caller agent ${callerAgentId} not found`);
+    return caller.workspaceId;
+  }
+
   private async createRequestedWorkspace(
     request: Extract<SessionInboundMessage, { type: "workspace.create.request" }>,
     workspaceId?: string,
   ): Promise<WorkspaceDescriptorPayload> {
+    if (request.internal)
+      throw new Error(
+        "Public internal workspaces were removed; use background workspace creation.",
+      );
+    if (request.agent?.background !== undefined)
+      throw new Error("Configure background on the workspace, not its initial agent.");
     let creationRequest = request;
     // Hooks belong to the operation: retries fingerprint the caller's input
     // and must not rerun hooks or compare their potentially changing output.
@@ -6662,7 +6761,12 @@ export class Session {
       cwd,
       explicitTitle ?? promptTitle,
       request.source.projectId,
-      { expectsInitialAgent: Boolean(request.firstAgentContext), workspaceId },
+      {
+        expectsInitialAgent: Boolean(request.firstAgentContext),
+        workspaceId,
+        background: request.background,
+        callerWorkspaceId: this.getCallerWorkspaceId(request.callerAgentId),
+      },
     );
     await this.syncWorkspaceGitObserverForWorkspace(workspace);
     const descriptor = await this.describeWorkspaceRecord(workspace);
@@ -6724,6 +6828,8 @@ export class Session {
         githubPrNumber: source.githubPrNumber,
         firstAgentContext: request.firstAgentContext,
         title: request.title,
+        background: request.background,
+        callerWorkspaceId: this.getCallerWorkspaceId(request.callerAgentId),
       },
       source.baseBranch
         ? { resolveDefaultBranch: async () => source.baseBranch as string }
@@ -7397,7 +7503,7 @@ export class Session {
     const requestedWorkspaceIds = Array.isArray(workspaceId) ? workspaceId : [workspaceId];
     let agents: AgentSnapshotPayload[];
     try {
-      agents = await this.listAgentPayloads();
+      agents = await this.listAgentPayloads({ includeBackground: true });
     } catch (error) {
       const message = getErrorMessage(error);
       const results = requestedWorkspaceIds.map((requestedWorkspaceId) => ({
@@ -7537,7 +7643,7 @@ export class Session {
         throw new Error(`Workspace not found: ${workspaceId}`);
       }
 
-      const agents = (await this.listAgentPayloads()).filter((agent) =>
+      const agents = (await this.listAgentPayloads({ includeBackground: true })).filter((agent) =>
         this.isProviderVisibleToClient(agent.provider),
       );
       const agentsById = new Map(agents.map((agent) => [agent.id, agent] as const));
@@ -8180,8 +8286,8 @@ export class Session {
     const agentId = resolved.agentId;
     const live = this.agentManager.getAgent(agentId);
     if (!live) {
-      const record = await this.agentStorage.get(agentId);
-      if (!record || record.internal) {
+      const settled = await this.readSettledAgent(agentId);
+      if (!settled) {
         this.emit({
           type: "wait_for_finish_response",
           payload: {
@@ -8194,6 +8300,7 @@ export class Session {
         });
         return;
       }
+      const { record, lastMessage } = settled;
       const final = this.buildStoredAgentPayload(record);
       let status: "permission" | "error" | "idle";
       if (record.attentionReason === "permission") {
@@ -8206,7 +8313,7 @@ export class Session {
       const error = resolveWaitForFinishError({ status, final });
       this.emit({
         type: "wait_for_finish_response",
-        payload: { requestId, status, final, error, lastMessage: null },
+        payload: { requestId, status, final, error, lastMessage },
       });
       return;
     }
diff --git a/packages/server/src/server/session.workspaces.test.ts b/packages/server/src/server/session.workspaces.test.ts
index 001966ab39..b9c04e8244 100644
--- a/packages/server/src/server/session.workspaces.test.ts
+++ b/packages/server/src/server/session.workspaces.test.ts
@@ -9514,6 +9514,50 @@ test("workspace.create.request attaches a directory workspace to its explicit ac
   });
 });
 
+test("workspace.create.request with background persists a hidden workspace that only opted-in listings show", async () => {
+  const emitted: SessionOutboundMessage[] = [];
+  const workspaces = new Map<string, PersistedWorkspaceRecord>();
+  const session = createSessionForWorkspaceTests({ onMessage: (message) => emitted.push(message) });
+  session.workspaceRegistry.upsert = async (record: unknown) => {
+    const workspace = record as PersistedWorkspaceRecord;
+    workspaces.set(workspace.workspaceId, workspace);
+  };
+  session.workspaceRegistry.get = async (workspaceId: string) =>
+    workspaces.get(workspaceId) ?? null;
+  session.workspaceRegistry.list = async () => Array.from(workspaces.values());
+
+  await session.handleMessage({
+    type: "workspace.create.request",
+    requestId: "req-background-workspace",
+    background: true,
+    source: { kind: "directory", path: REPO_CWD },
+  });
+
+  const response = findByType(emitted, "workspace.create.response");
+  expect(response?.payload).toMatchObject({
+    requestId: "req-background-workspace",
+    error: null,
+    workspace: { background: true },
+  });
+  const workspaceId = response?.payload.workspace?.id as string;
+  expect(workspaces.get(workspaceId)?.background).toBe(true);
+  // No subscription exists, and the legacy causal update stays quiet for a hidden workspace.
+  expect(filterByType(emitted, "workspace_update")).toEqual([]);
+
+  const hidden = await session.listFetchWorkspacesEntries({
+    type: "fetch_workspaces_request",
+    requestId: "req-list-hidden",
+  });
+  expect(hidden.entries).toEqual([]);
+
+  const shown = await session.listFetchWorkspacesEntries({
+    type: "fetch_workspaces_request",
+    requestId: "req-list-shown",
+    filter: { includeBackground: true },
+  });
+  expect(shown.entries.map((entry) => [entry.id, entry.background])).toEqual([[workspaceId, true]]);
+});
+
 test("workspace.create.request reports an unknown explicit project", async () => {
   const emitted: SessionOutboundMessage[] = [];
   const session = createSessionForWorkspaceTests({ onMessage: (message) => emitted.push(message) });
diff --git a/packages/server/src/server/session/agent-updates/agent-updates-service.test.ts b/packages/server/src/server/session/agent-updates/agent-updates-service.test.ts
index 4c83cec6a3..78343c95ac 100644
--- a/packages/server/src/server/session/agent-updates/agent-updates-service.test.ts
+++ b/packages/server/src/server/session/agent-updates/agent-updates-service.test.ts
@@ -36,6 +36,7 @@ function makeAgentPayload(input: {
   requiresAttention?: boolean;
   effectiveThinkingOptionId?: string | null;
   thinkingOptionId?: string | null;
+  internal?: boolean;
 }): AgentSnapshotPayload {
   const updatedAt = input.updatedAt ?? "2026-03-01T12:00:00.000Z";
   const provider = input.provider ?? "codex";
@@ -44,6 +45,7 @@ function makeAgentPayload(input: {
     provider,
     cwd: "/tmp/repo",
     ...(input.workspaceId ? { workspaceId: input.workspaceId } : {}),
+    ...(input.internal ? { internal: true } : {}),
     model: null,
     thinkingOptionId: input.thinkingOptionId ?? null,
     effectiveThinkingOptionId: input.effectiveThinkingOptionId ?? null,
@@ -235,6 +237,15 @@ describe("matchesAgentUpdatesFilter", () => {
     );
   });
 
+  test("internal agents are excluded unless includeInternal", () => {
+    const agent = makeAgentPayload({ id: "a", internal: true });
+    expect(matchesAgentUpdatesFilter({ agent, project })).toBe(false);
+    expect(matchesAgentUpdatesFilter({ agent, project, filter: {} })).toBe(false);
+    expect(matchesAgentUpdatesFilter({ agent, project, filter: { includeInternal: true } })).toBe(
+      true,
+    );
+  });
+
   test("thinking-option filter compares the resolved option", () => {
     const high = makeAgentPayload({ id: "a", effectiveThinkingOptionId: "high" });
     expect(
diff --git a/packages/server/src/server/session/agent-updates/agent-updates-service.ts b/packages/server/src/server/session/agent-updates/agent-updates-service.ts
index 58521f336f..f17e2a2067 100644
--- a/packages/server/src/server/session/agent-updates/agent-updates-service.ts
+++ b/packages/server/src/server/session/agent-updates/agent-updates-service.ts
@@ -47,6 +47,7 @@ export interface AgentUpdatesService {
 }
 
 export interface AgentUpdatesServiceDeps {
+  includesWorkspace?(agent: AgentSnapshotPayload, includeBackground?: boolean): Promise<boolean>;
   emit(message: SessionOutboundMessage): void;
   enrichAgentPayload(payload: AgentSnapshotPayload): Promise<AgentSnapshotPayload>;
   buildStoredAgentPayload(record: StoredAgentRecord): AgentSnapshotPayload;
@@ -59,6 +60,7 @@ export interface AgentUpdatesServiceDeps {
     project: ProjectPlacementPayload | null,
     agentId: string,
     includeSequence: boolean,
+    includeBackground?: boolean,
   ): T;
   logger: pino.Logger;
 }
@@ -136,6 +138,10 @@ export function matchesAgentUpdatesFilter(input: {
     return false;
   }
 
+  if (agent.internal && filter?.includeInternal !== true) {
+    return false;
+  }
+
   if (filter && !agentThinkingOptionMatchesFilter(agent, filter)) {
     return false;
   }
@@ -160,7 +166,15 @@ export function createAgentUpdatesService(deps: AgentUpdatesServiceDeps): AgentU
     agent: AgentSnapshotPayload | null,
     project: ProjectPlacementPayload | null,
     agentId: string,
-  ) => deps.sequenceAgentUpdate(payload, agent, project, agentId, sub.syncEnabled === true);
+  ) =>
+    deps.sequenceAgentUpdate(
+      payload,
+      agent,
+      project,
+      agentId,
+      sub.syncEnabled === true,
+      sub.filter?.includeBackground,
+    );
 
   function bufferOrEmit(sub: AgentUpdatesSubscriptionState, payload: AgentUpdatePayload): void {
     if (subscriptions.get(sub.subscriptionId) !== sub) return;
@@ -234,10 +248,16 @@ export function createAgentUpdatesService(deps: AgentUpdatesServiceDeps): AgentU
     const project = payload.workspaceId
       ? await deps.buildProjectPlacementForWorkspaceId(payload.workspaceId)
       : null;
+    const backgroundVisible = await Promise.all(
+      observers.map(
+        (sub) => deps.includesWorkspace?.(payload, sub.filter?.includeBackground) ?? true,
+      ),
+    );
     return (
       project !== null &&
       observers.some(
-        (sub) =>
+        (sub, index) =>
+          backgroundVisible[index] &&
           sub.isProviderVisible(payload.provider) &&
           matchesAgentUpdatesFilter({ agent: payload, project, filter: sub.filter }),
       )
@@ -252,7 +272,9 @@ export function createAgentUpdatesService(deps: AgentUpdatesServiceDeps): AgentU
       : null;
     for (const sub of observers) {
       const matches =
-        project && matchesAgentUpdatesFilter({ agent: payload, project, filter: sub.filter });
+        project &&
+        ((await deps.includesWorkspace?.(payload, sub.filter?.includeBackground)) ?? true) &&
+        matchesAgentUpdatesFilter({ agent: payload, project, filter: sub.filter });
       bufferOrEmit(
         sub,
         sequence(
diff --git a/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.test.ts b/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.test.ts
index b84734eb8b..2692250b49 100644
--- a/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.test.ts
+++ b/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.test.ts
@@ -145,6 +145,46 @@ test("fresh non-git directory creates a directory workspace at the exact path",
   expect(workspace.cwd).toBe(dir);
 });
 
+test("background workspace creation preserves hooks, inheritance and durable visibility", async () => {
+  const dir = path.join(tmpDir, "plain");
+  const events: string[] = [];
+  provisioning = createWorkspaceProvisioningService({
+    workspaceRegistry,
+    projectRegistry,
+    workspaceGitService: gitService(),
+    isDirectory,
+    logger,
+    lifecycle: {
+      emit: (name) => {
+        events.push(name);
+      },
+      before: async (_name, request) => request,
+    },
+  });
+  const parent = await provisioning.createWorkspaceForDirectory(dir, null, undefined, {
+    background: true,
+  });
+  const child = await provisioning.createWorkspaceForDirectory(dir, null, undefined, {
+    callerWorkspaceId: parent.workspaceId,
+  });
+  const visible = await provisioning.createWorkspaceForDirectory(dir, null, undefined, {
+    callerWorkspaceId: parent.workspaceId,
+    background: false,
+  });
+  const human = await provisioning.createWorkspaceForDirectory(dir);
+  expect(parent.background).toBe(true);
+  expect(child.background).toBe(true);
+  expect(visible.background).toBe(false);
+  expect(human.background).toBe(false);
+  expect(events).toEqual(Array(4).fill("workspace.created"));
+  const reloaded = new FileBackedWorkspaceRegistry(
+    path.join(tmpDir, "projects", "workspaces.json"),
+    logger,
+  );
+  await reloaded.initialize();
+  expect((await reloaded.get(child.workspaceId))?.background).toBe(true);
+});
+
 test("re-opening an active workspace by exact path returns the same record without duplicating", async () => {
   const repo = path.join(tmpDir, "repo");
   gitRoots.add(repo);
@@ -236,6 +276,30 @@ test("re-opening an archived workspace by its exact path unarchives it and keeps
   expect(reopened.archivedAt).toBeNull();
 });
 
+test("default directory open skips archived background workspaces while explicit recovery preserves their visibility", async () => {
+  const cwd = path.join(tmpDir, "repo");
+  mkdirSync(cwd, { recursive: true });
+  const background = await provisioning.createWorkspaceForDirectory(cwd, undefined, undefined, {
+    background: true,
+  });
+  await workspaceRegistry.archive(background.workspaceId, ARCHIVED_AT);
+
+  const opened = await provisioning.findOrCreateWorkspaceForDirectory(cwd);
+  expect(opened).toMatchObject({ background: false, archivedAt: null });
+  expect(opened.workspaceId).not.toBe(background.workspaceId);
+  const archived = await workspaceRegistry.get(background.workspaceId);
+  expect(archived).toMatchObject({ background: true, archivedAt: ARCHIVED_AT });
+  const recovered = await provisioning.ensureWorkspaceRecordUnarchived(archived!);
+  expect(recovered).toMatchObject({
+    workspaceId: background.workspaceId,
+    background: true,
+    archivedAt: null,
+  });
+  expect((await provisioning.findOrCreateWorkspaceForDirectory(cwd)).workspaceId).toBe(
+    opened.workspaceId,
+  );
+});
+
 test("reopening archived exact-root records restores the fresh Git project", async () => {
   const cwd = path.join(tmpDir, "repo");
   mkdirSync(cwd, { recursive: true });
diff --git a/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.ts b/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.ts
index 5149ed5d1c..6dbcabdda6 100644
--- a/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.ts
+++ b/packages/server/src/server/session/workspace-provisioning/workspace-provisioning-service.ts
@@ -26,6 +26,8 @@ export interface ResolveOrCreateWorkspaceIdInput {
   requestedWorkspaceId?: string;
   cwd: string;
   initialTitle: string | null;
+  background?: boolean;
+  callerWorkspaceId?: string;
 }
 
 export interface ImportWorkspaceInput {
@@ -50,6 +52,8 @@ export interface CreateWorktreeWorkspaceInput {
   title: string | null;
   expectsInitialAgent?: boolean;
   untrustedSource?: UntrustedWorkspaceSource;
+  background?: boolean;
+  callerWorkspaceId?: string;
 }
 
 export interface WorkspaceProvisioningService {
@@ -63,7 +67,12 @@ export interface WorkspaceProvisioningService {
     cwd: string,
     title?: string | null,
     projectId?: string,
-    context?: { expectsInitialAgent?: boolean; workspaceId?: string },
+    context?: {
+      expectsInitialAgent?: boolean;
+      workspaceId?: string;
+      background?: boolean;
+      callerWorkspaceId?: string;
+    },
   ): Promise<PersistedWorkspaceRecord>;
   createWorkspaceForWorktree(
     input: CreateWorktreeWorkspaceInput,
@@ -215,11 +224,27 @@ export function createWorkspaceProvisioningService(deps: {
     return project;
   }
 
+  async function resolveBackground(input?: {
+    background?: boolean;
+    callerWorkspaceId?: string;
+  }): Promise<boolean> {
+    if (input?.background !== undefined) return input.background;
+    if (!input?.callerWorkspaceId) return false;
+    const callerWorkspace = await workspaceRegistry.get(input.callerWorkspaceId);
+    if (!callerWorkspace) throw new Error(`Caller workspace ${input.callerWorkspaceId} not found`);
+    return callerWorkspace.background;
+  }
+
   async function createWorkspaceForDirectory(
     cwd: string,
     title?: string | null,
     projectId?: string,
-    context?: { expectsInitialAgent?: boolean; workspaceId?: string },
+    context?: {
+      expectsInitialAgent?: boolean;
+      workspaceId?: string;
+      background?: boolean;
+      callerWorkspaceId?: string;
+    },
   ): Promise<PersistedWorkspaceRecord> {
     const normalizedCwd = resolve(cwd);
     const checkout = await workspaceGitService.getCheckout(normalizedCwd);
@@ -235,9 +260,12 @@ export function createWorkspaceProvisioningService(deps: {
       title: title?.trim() || null,
       createdAt: timestamp,
       updatedAt: timestamp,
+      background: await resolveBackground(context),
     });
-    await workspaceRegistry.upsert(workspace, context);
-    deps.lifecycle?.emit("workspace.created", { workspace: describeHookWorkspace(workspace) });
+    await workspaceRegistry.upsert(workspace, {
+      expectsInitialAgent: context?.expectsInitialAgent,
+    });
+    emitWorkspaceCreated(workspace);
     return workspace;
   }
 
@@ -269,14 +297,19 @@ export function createWorkspaceProvisioningService(deps: {
       createdAt: timestamp,
       updatedAt: timestamp,
       ...(input.untrustedSource ? { untrustedSource: input.untrustedSource } : {}),
+      background: await resolveBackground(input),
     });
     await workspaceRegistry.upsert(workspace, {
       expectsInitialAgent: input.expectsInitialAgent,
     });
-    deps.lifecycle?.emit("workspace.created", { workspace: describeHookWorkspace(workspace) });
+    emitWorkspaceCreated(workspace);
     return workspace;
   }
 
+  function emitWorkspaceCreated(workspace: PersistedWorkspaceRecord): void {
+    deps.lifecycle?.emit("workspace.created", { workspace: describeHookWorkspace(workspace) });
+  }
+
   async function resolveSourceProjectForWorktree(input: {
     sourceCwd: string;
     projectId?: string;
@@ -320,26 +353,19 @@ export function createWorkspaceProvisioningService(deps: {
 
   async function findOrCreateWorkspaceForDirectory(cwd: string): Promise<PersistedWorkspaceRecord> {
     const normalizedCwd = resolve(cwd);
-    const workspaces = await workspaceRegistry.list();
-    const active = workspaces
+    // Path-based discovery selects public work; explicit-ID recovery bypasses this selector.
+    const workspaces = (await workspaceRegistry.list())
       .filter(
-        (workspace) => !workspace.archivedAt && areEquivalentPaths(workspace.cwd, normalizedCwd),
+        (workspace) => !workspace.background && areEquivalentPaths(workspace.cwd, normalizedCwd),
       )
       .sort(
         (left, right) =>
           Date.parse(left.createdAt) - Date.parse(right.createdAt) ||
           left.workspaceId.localeCompare(right.workspaceId),
-      )[0];
+      );
+    const active = workspaces.find((workspace) => !workspace.archivedAt);
     if (active) return refreshWorkspaceRecord(active);
-    const archived = workspaces
-      .filter(
-        (workspace) => workspace.archivedAt && areEquivalentPaths(workspace.cwd, normalizedCwd),
-      )
-      .sort(
-        (left, right) =>
-          Date.parse(left.createdAt) - Date.parse(right.createdAt) ||
-          left.workspaceId.localeCompare(right.workspaceId),
-      )[0];
+    const archived = workspaces.find((workspace) => workspace.archivedAt);
     if (archived) {
       const project = await projectRegistry.get(archived.projectId);
       if (project && !project.archivedAt) return ensureWorkspaceRecordUnarchived(archived);
@@ -355,6 +381,8 @@ export function createWorkspaceProvisioningService(deps: {
     return (
       await createWorkspaceForDirectory(input.cwd, input.initialTitle, undefined, {
         expectsInitialAgent: true,
+        background: input.background,
+        callerWorkspaceId: input.callerWorkspaceId,
       })
     ).workspaceId;
   }
diff --git a/packages/server/src/server/test-utils/fake-agent-client.ts b/packages/server/src/server/test-utils/fake-agent-client.ts
index 659dd89686..45ae1d0e70 100644
--- a/packages/server/src/server/test-utils/fake-agent-client.ts
+++ b/packages/server/src/server/test-utils/fake-agent-client.ts
@@ -59,12 +59,14 @@ interface FakeAgentSessionOptions {
   memoryMarker?: string | null;
   closeSession?: () => Promise<void>;
   onStartTurn?: (prompt: AgentPromptInput, config: AgentSessionConfig) => void;
+  beforeTurnComplete?: (prompt: AgentPromptInput) => Promise<void>;
 }
 
 export interface TestAgentClientOptions {
   beforeCreateSession?: (config: AgentSessionConfig) => Promise<void>;
   closeSession?: () => Promise<void>;
   onStartTurn?: (prompt: AgentPromptInput, config: AgentSessionConfig) => void;
+  beforeTurnComplete?: (prompt: AgentPromptInput) => Promise<void>;
   supportsMcpServers?: boolean;
 }
 
@@ -338,6 +340,7 @@ class FakeAgentSession implements AgentSession {
 
   private readonly closeSession: (() => Promise<void>) | undefined;
   private readonly onStartTurn: TestAgentClientOptions["onStartTurn"];
+  private readonly beforeTurnComplete: ((prompt: AgentPromptInput) => Promise<void>) | undefined;
 
   constructor(options: FakeAgentSessionOptions) {
     this.capabilities = {
@@ -350,6 +353,7 @@ class FakeAgentSession implements AgentSession {
     this.memoryMarker = options.memoryMarker ?? null;
     this.closeSession = options.closeSession;
     this.onStartTurn = options.onStartTurn;
+    this.beforeTurnComplete = options.beforeTurnComplete;
     this.historyPath = path.join(
       tmpdir(),
       "paseo-fake-provider-history",
@@ -799,6 +803,7 @@ class FakeAgentSession implements AgentSession {
         this.notifySubscribers(assistantChunkB);
       }
 
+      await this.beforeTurnComplete?.(prompt);
       const completed: AgentStreamEvent = {
         type: "turn_completed",
         provider: this.providerName,
@@ -1220,6 +1225,7 @@ class FakeAgentClient implements AgentClient {
       supportsMcpServers: this.options.supportsMcpServers,
       closeSession: this.options.closeSession,
       onStartTurn: this.options.onStartTurn,
+      beforeTurnComplete: this.options.beforeTurnComplete,
     });
   }
 
@@ -1245,6 +1251,7 @@ class FakeAgentClient implements AgentClient {
       memoryMarker: typeof marker === "string" ? marker : null,
       closeSession: this.options.closeSession,
       onStartTurn: this.options.onStartTurn,
+      beforeTurnComplete: this.options.beforeTurnComplete,
     });
   }
 
diff --git a/packages/server/src/server/test-utils/session-stubs.ts b/packages/server/src/server/test-utils/session-stubs.ts
index 1c98686042..50c0ee3c76 100644
--- a/packages/server/src/server/test-utils/session-stubs.ts
+++ b/packages/server/src/server/test-utils/session-stubs.ts
@@ -35,6 +35,7 @@ export function asAgentManager(stub: {
 }): SessionOptions["agentManager"] {
   return createStub<SessionOptions["agentManager"]>({
     listProviderSubagentActivity: () => [],
+    getRetiredInternalAgent: () => null,
     ...stub,
   });
 }
diff --git a/packages/server/src/server/websocket-server.ts b/packages/server/src/server/websocket-server.ts
index 493dc57b2b..0f145d8396 100644
--- a/packages/server/src/server/websocket-server.ts
+++ b/packages/server/src/server/websocket-server.ts
@@ -1793,6 +1793,7 @@ export class VoiceAssistantWebSocketServer {
         workspaceRequestReceipts: true,
         creationLifecycle: true,
         hubAgentRpc: true,
+        backgroundWorkspaces: true,
         // COMPAT(directorySync): added in v0.3.x, remove gate after 2027-02-12.
         directorySync: true,
         // COMPAT(workspaceLabels): added in v0.5.0, remove after 2027-08-14.
diff --git a/packages/server/src/server/workspace-archive-service.ts b/packages/server/src/server/workspace-archive-service.ts
index a02c97eda8..4c61dcb172 100644
--- a/packages/server/src/server/workspace-archive-service.ts
+++ b/packages/server/src/server/workspace-archive-service.ts
@@ -466,7 +466,7 @@ export async function archiveWorkspaceContents(
   const archivedAgents = new Set<string>();
 
   const liveAgents = dependencies.agentManager
-    .listAgents()
+    .listAgents({ includeInternal: true })
     .filter((agent) => agent.workspaceId === workspaceId);
   for (const agent of liveAgents) {
     archivedAgents.add(agent.id);
diff --git a/packages/server/src/server/workspace-directory.test.ts b/packages/server/src/server/workspace-directory.test.ts
index 50c226cfb4..e317b5427d 100644
--- a/packages/server/src/server/workspace-directory.test.ts
+++ b/packages/server/src/server/workspace-directory.test.ts
@@ -82,6 +82,7 @@ class WorkspaceStatus {
       workspaceDirectory: workspace.cwd,
       projectKind: "git",
       workspaceKind: workspace.kind,
+      background: workspace.background,
       name: workspace.displayName,
       archivingAt: null,
       status: "done",
@@ -571,7 +572,9 @@ describe("WorkspaceDirectory empty projects", () => {
         workspaceDirectory: workspace.cwd,
         projectKind: "non_git",
         workspaceKind: workspace.kind,
+        background: workspace.background,
         name: workspace.displayName,
+        ...(workspace.internal ? { background: true } : {}),
         archivingAt: null,
         status: "done",
         activityAt: null,
@@ -644,6 +647,41 @@ describe("WorkspaceDirectory empty projects", () => {
 
     expect(result.emptyProjects.map((p) => p.projectId)).toEqual(["empty"]);
   });
+
+  test("hides background workspaces and counts their project as empty unless includeBackground", async () => {
+    const directory = makeDirectory({
+      projects: [project({ projectId: "hidden-only" })],
+      workspaces: [
+        {
+          workspaceId: "ws-internal",
+          projectId: "hidden-only",
+          cwd: "/workspace/hidden-only",
+          kind: "directory",
+          displayName: "helper",
+          createdAt: NOW,
+          updatedAt: NOW,
+          archivedAt: null,
+          background: true,
+        },
+      ],
+    });
+
+    const hidden = await directory.listFetchEntries({
+      type: "fetch_workspaces_request",
+      requestId: "r1",
+      filter: { query: "helper" },
+    });
+    expect(hidden.entries).toEqual([]);
+    expect(hidden.emptyProjects.map((p) => p.projectId)).toEqual(["hidden-only"]);
+
+    const shown = await directory.listFetchEntries({
+      type: "fetch_workspaces_request",
+      requestId: "r2",
+      filter: { includeBackground: true },
+    });
+    expect(shown.entries.map((entry) => entry.id)).toEqual(["ws-internal"]);
+    expect(shown.emptyProjects).toEqual([]);
+  });
 });
 
 test("Git observation targets exclude archived records without hydrating app descriptors", async () => {
diff --git a/packages/server/src/server/workspace-directory.ts b/packages/server/src/server/workspace-directory.ts
index 13b9996489..8ccb4fa341 100644
--- a/packages/server/src/server/workspace-directory.ts
+++ b/packages/server/src/server/workspace-directory.ts
@@ -170,7 +170,7 @@ export class WorkspaceDirectory {
   /**
    * Per-workspace last-seen winning bucket + entered-at. Persists across
    * `buildDescriptorMap` calls inside the daemon process; reset on cold start.
-   * Server-internal; never crosses the wire.
+   * Server-private; never crosses the wire.
    */
   private readonly bucketHistoryByWorkspaceId = new Map<string, WorkspaceBucketHistoryEntry>();
 
@@ -557,14 +557,20 @@ export class WorkspaceDirectory {
   // Project parents that have no active workspaces. The wire field is the
   // sidebar projection bucket for projects whose workspace list is currently
   // empty; it is not a separate domain record.
-  async listEmptyProjects(): Promise<WorkspaceProjectDescriptor[]> {
+  async listEmptyProjects(options?: {
+    includeBackground?: boolean;
+  }): Promise<WorkspaceProjectDescriptor[]> {
     const [persistedWorkspaces, persistedProjects] = await Promise.all([
       this.deps.workspaceRegistry.list(),
       this.deps.projectRegistry.list(),
     ]);
+    // A project whose only workspaces are hidden reads as empty to that caller.
     const projectIdsWithActiveWorkspaces = new Set(
       persistedWorkspaces
-        .filter((workspace) => !workspace.archivedAt)
+        .filter(
+          (workspace) =>
+            !workspace.archivedAt && (options?.includeBackground === true || !workspace.background),
+        )
         .map((workspace) => workspace.projectId),
     );
     return persistedProjects
@@ -596,6 +602,8 @@ export class WorkspaceDirectory {
     }));
   }
 
+  // Every active workspace, background ones included. Callers that answer a
+  // listing go through matchesFilter so background workspaces stay opt-in.
   async listDescriptors(): Promise<WorkspaceDescriptorPayload[]> {
     return Array.from(
       (
@@ -611,6 +619,13 @@ export class WorkspaceDirectory {
     filter: FetchWorkspacesRequestFilter | undefined;
   }): boolean {
     const { workspace, filter } = input;
+    if (
+      workspace.background &&
+      filter?.includeBackground !== true &&
+      filter?.query !== workspace.id
+    ) {
+      return false;
+    }
     if (!filter) {
       return true;
     }
@@ -666,7 +681,7 @@ export class WorkspaceDirectory {
     const projectIdFilter = filter?.projectId?.trim();
     const emptyProjects = cursorToken
       ? []
-      : (await this.listEmptyProjects()).filter(
+      : (await this.listEmptyProjects({ includeBackground: filter?.includeBackground })).filter(
           (project) => !projectIdFilter || project.projectId === projectIdFilter,
         );
 
diff --git a/packages/server/src/server/workspace-reconciliation-service.test.ts b/packages/server/src/server/workspace-reconciliation-service.test.ts
index 1bceb38715..52c7d41065 100644
--- a/packages/server/src/server/workspace-reconciliation-service.test.ts
+++ b/packages/server/src/server/workspace-reconciliation-service.test.ts
@@ -748,6 +748,7 @@ describe("WorkspaceReconciliationService", () => {
       cwd: missingWorkspace,
       kind: "directory",
       displayName: "orphan",
+      background: false,
       title: null,
       pinnedAt: null,
       branch: null,
diff --git a/packages/server/src/server/workspace-registry.test.ts b/packages/server/src/server/workspace-registry.test.ts
index 80c328ce7b..04ffc1d7ac 100644
--- a/packages/server/src/server/workspace-registry.test.ts
+++ b/packages/server/src/server/workspace-registry.test.ts
@@ -28,6 +28,21 @@ describe("resolveWorkspaceName", () => {
     );
   });
 
+  test("createPersistedWorkspaceRecord defaults background to false and preserves explicit intent", () => {
+    const base = {
+      workspaceId: "ws-1",
+      projectId: "proj-1",
+      cwd: "/tmp/repo",
+      kind: "local_checkout" as const,
+      displayName: "main",
+      createdAt: "2026-03-01T00:00:00.000Z",
+      updatedAt: "2026-03-01T00:00:00.000Z",
+    };
+    expect(createPersistedWorkspaceRecord(base).background).toBe(false);
+    expect(createPersistedWorkspaceRecord({ ...base, background: false }).background).toBe(false);
+    expect(createPersistedWorkspaceRecord({ ...base, background: true }).background).toBe(true);
+  });
+
   test("resolveWorkspaceDisplayName applies the same rule over the persisted record", () => {
     const record = createPersistedWorkspaceRecord({
       workspaceId: "ws-1",
diff --git a/packages/server/src/server/workspace-registry.ts b/packages/server/src/server/workspace-registry.ts
index 64f6f1e4a1..417af353fe 100644
--- a/packages/server/src/server/workspace-registry.ts
+++ b/packages/server/src/server/workspace-registry.ts
@@ -102,6 +102,8 @@ const PersistedWorkspaceRecordSchema = z.object({
     .transform((value) => value ?? null),
   labels: z.array(z.string()).optional(),
   untrustedSource: UntrustedWorkspaceSourceSchema.optional(),
+  // Public discovery visibility. Contents retain their ordinary lifecycle.
+  background: z.boolean().optional().default(false),
 });
 
 export type PersistedProjectRecord = z.infer<typeof PersistedProjectRecordSchema>;
@@ -684,9 +686,12 @@ export function createPersistedWorkspaceRecord(input: {
   pinnedAt?: string | null;
   labels?: string[];
   untrustedSource?: UntrustedWorkspaceSource;
+  background?: boolean;
 }): PersistedWorkspaceRecord {
+  const { background, ...rest } = input;
   return PersistedWorkspaceRecordSchema.parse({
-    ...input,
+    ...rest,
+    background: background ?? false,
     title: input.title ?? null,
     branch: input.branch ?? null,
     worktreeRoot: input.worktreeRoot ?? null,
diff --git a/packages/server/src/server/worktree-session.ts b/packages/server/src/server/worktree-session.ts
index 2b9f8a0ffd..6087e6c82a 100644
--- a/packages/server/src/server/worktree-session.ts
+++ b/packages/server/src/server/worktree-session.ts
@@ -4,6 +4,7 @@ import { basename } from "node:path";
 import type { AgentSessionConfig } from "./agent/agent-sdk-types.js";
 import {
   type GitSetupOptions,
+  type CreateAgentWorktreeTarget,
   type FirstAgentContext,
   type ChangeRequestCheckoutSource,
   type SessionInboundMessage,
@@ -320,7 +321,42 @@ function validateNormalizedGitOptions(input: ValidateNormalizedGitOptionsInput):
   }
 }
 
-export function normalizeGitOptions(
+export function normalizeAgentCreationGitOptions(
+  gitOptions?: GitSetupOptions,
+  legacyWorktreeName?: string,
+  worktree?: CreateAgentWorktreeTarget,
+): NormalizedGitOptions | null {
+  if (worktree && gitOptions) {
+    throw new Error("create_agent_request worktree cannot be combined with git options");
+  }
+  if (worktree) {
+    switch (worktree.mode) {
+      case "branch-off":
+        gitOptions = {
+          createWorktree: true,
+          createNewBranch: true,
+          newBranchName: worktree.newBranch,
+          baseBranch: worktree.base,
+          action: "branch-off",
+          refName: worktree.base,
+        };
+        break;
+      case "checkout-branch":
+        gitOptions = { createWorktree: true, action: "checkout", refName: worktree.branch };
+        break;
+      case "checkout-pr":
+        gitOptions = {
+          createWorktree: true,
+          action: "checkout",
+          githubPrNumber: worktree.prNumber,
+        };
+        break;
+    }
+  }
+  return normalizeGitOptions(gitOptions, legacyWorktreeName);
+}
+
+function normalizeGitOptions(
   gitOptions?: GitSetupOptions,
   legacyWorktreeName?: string,
 ): NormalizedGitOptions | null {
diff --git a/public-docs/cli.md b/public-docs/cli.md
index 71e54474e3..579c71b857 100644
--- a/public-docs/cli.md
+++ b/public-docs/cli.md
@@ -42,7 +42,8 @@ Use `paseo run` to start a new agent with a task:
 ```bash
 paseo run "implement user authentication"
 paseo run --provider codex "refactor the API layer"
-paseo run --background "run the focused test suite"
+paseo run --no-wait "run the focused test suite"
+paseo run --output-schema schema.json "name this branch"
 paseo run --new-workspace worktree --worktree-mode branch-off --new-branch feature/x --base origin/main "implement feature X"
 paseo run --workspace <workspace-id> "review the current diff"
 paseo run --output-schema schema.json "extract release notes"
@@ -55,9 +56,14 @@ Worktree creation accepts `--worktree-mode branch-off|checkout-branch|checkout-p
 
 When an existing Paseo agent runs the same command, Paseo recognizes it through `PASEO_AGENT_ID`. Without explicit placement, the new agent becomes its subagent in the same workspace. `--workspace` can place that subagent elsewhere without changing its parent.
 
-Use `--output-schema` to return only matching JSON output. You can pass a schema file path or an inline JSON schema object. This mode cannot be used with `--background`.
+Use `--output-schema` to return only matching JSON output. You can pass a schema file path or an inline JSON schema object. This mode cannot be used with `--no-wait`.
 
-By default, `paseo run` waits for completion. Use `--background` to return immediately while the agent keeps running.
+By default, `paseo run` waits for completion. Use `--no-wait` to return immediately while the agent keeps running, the same flag `paseo send` takes.
+
+The old `run --background` and `-d` aliases still mean `--no-wait`. They are deprecated, hidden
+from help, and print a warning to stderr. Use `--no-wait` in scripts. Workspace visibility is
+selected separately with `workspace create --background`; this release does not repurpose
+`run --background`.
 
 ## Projects
 
@@ -116,10 +122,23 @@ paseo workspace create \
   --pr-number 2186
 ```
 
+Add `--background` to hide a workspace from default discovery. Its agents and terminals keep
+ordinary history, persistence, hooks, and restart recovery. `--no-background` explicitly overrides
+caller-workspace inheritance; omission inherits when run by a Paseo agent and defaults to false
+from a human shell. Visibility is creation-only.
+
+```bash
+paseo workspace create --isolation local --background --path /path/to/repo
+paseo run --workspace <workspace-id> --no-wait "review the checkout flow"
+```
+
+Exact workspace and agent IDs remain accessible regardless of listing visibility.
+
 Then list, use, rename, or archive it:
 
 ```bash
 paseo workspace ls
+paseo workspace ls --background               # Also include background workspaces
 paseo run --workspace <workspace-id> "implement authentication"
 paseo workspace rename <workspace-id> "Auth rework"
 paseo workspace rename <workspace-id> --reset   # back to the branch or directory name
@@ -197,6 +216,7 @@ paseo ls                    # Non-archived agents in active workspaces
 paseo ls -a                 # Also include archived agents
 paseo ls -g                 # Non-archived agents across all workspaces
 paseo ls -a -g --json       # All agents, including archived, as JSON
+paseo ls --background       # Also include agents in background workspaces
 ```
 
 ## Streaming output
@@ -391,7 +411,7 @@ The CLI is designed to be used by agents themselves. You can instruct an agent t
 
 ```bash
 # Agent A spawns Agent B and waits for it
-agent_id=$(paseo run --background --quiet --title api-agent "implement the API")
+agent_id=$(paseo run --no-wait --quiet --title api-agent "implement the API")
 paseo wait "$agent_id"
 paseo logs "$agent_id" --tail 5
 ```
diff --git a/public-docs/mcp.md b/public-docs/mcp.md
index a52327174a..58e8a2db56 100644
--- a/public-docs/mcp.md
+++ b/public-docs/mcp.md
@@ -87,27 +87,29 @@ MCP does not expose an agent-detach tool. Detaching is a manual user action in t
 
 ### Agents
 
-| Tool                 | Function                                                                                |
-| -------------------- | --------------------------------------------------------------------------------------- |
-| `create_agent`       | Create an agent, optionally placing it in an existing workspace with `workspaceId`.     |
-| `send_agent_prompt`  | Send a prompt to an existing agent using its `agentId` and a `prompt`.                  |
-| `get_agent_status`   | Return the latest snapshot for an agent.                                                |
-| `list_agents`        | List recent agents as compact metadata.                                                 |
-| `cancel_agent`       | Abort an agent's current run but keep the agent alive.                                  |
-| `archive_agent`      | Soft-delete an agent and remove it from the active list.                                |
-| `kill_agent`         | Terminate an agent session permanently.                                                 |
-| `update_agent`       | Update an agent name, labels, or runtime settings such as mode/model/thinking/features. |
-| `get_agent_activity` | Return recent agent timeline entries as a curated summary.                              |
-| `set_agent_mode`     | Switch an agent's session mode.                                                         |
+| Tool                 | Function                                                                                                                                                       |
+| -------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `create_agent`       | Create an agent, optionally placing it in an existing workspace with `workspaceId`. Use `initialPrompt` to start work; returns without waiting for completion. |
+| `send_agent_prompt`  | Send a prompt using `agentId` and `prompt`; returns without waiting for completion.                                                                            |
+| `get_agent_status`   | Return the latest snapshot for an agent.                                                                                                                       |
+| `list_agents`        | List recent agents as compact metadata; `includeBackground: true` includes background work.                                                                    |
+| `cancel_agent`       | Abort an agent's current run but keep the agent alive.                                                                                                         |
+| `archive_agent`      | Soft-delete an agent and remove it from the active list.                                                                                                       |
+| `kill_agent`         | Terminate an agent session permanently.                                                                                                                        |
+| `update_agent`       | Update an agent name, labels, or runtime settings such as mode/model/thinking/features.                                                                        |
+| `get_agent_activity` | Return recent agent timeline entries as a curated summary.                                                                                                     |
+| `set_agent_mode`     | Switch an agent's session mode.                                                                                                                                |
+
+Paseo agents receive finish, error, and permission notifications by default; set `notifyOnFinish: false` to disable them. External MCP clients use `get_agent_status` and `get_agent_activity` to check results.
 
 ### Workspaces
 
-| Tool                | Function                                                                                              |
-| ------------------- | ----------------------------------------------------------------------------------------------------- |
-| `create_workspace`  | Create a local or worktree-isolated workspace. Worktrees can branch off, check out a branch, or a PR. |
-| `list_workspaces`   | List active workspaces and their directories and isolation.                                           |
-| `rename_workspace`  | Change the user-visible name of the current or specified workspace.                                   |
-| `archive_workspace` | Archive a workspace and the sessions it owns.                                                         |
+| Tool                | Function                                                                                                                                                                                                                                                                                                        |
+| ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `create_workspace`  | Create a local or worktree-isolated workspace. Worktrees can branch off, check out a branch, or a PR. `background: true` hides it from default lists and the sidebar while preserving history and access by ID. Omission inherits the calling agent’s workspace setting, or defaults to false without a caller. |
+| `list_workspaces`   | List active workspaces and their directories and isolation. Use `includeBackground: true` to include background workspaces.                                                                                                                                                                                     |
+| `rename_workspace`  | Change the user-visible name of the current or specified workspace.                                                                                                                                                                                                                                             |
+| `archive_workspace` | Archive a workspace and the sessions it owns.                                                                                                                                                                                                                                                                   |
 
 For worktree isolation, `create_workspace` accepts the same useful choices as the app: branch off from a base, check out an existing branch, or check out a pull request. The worktree remains an implementation detail of the workspace lifecycle.
 
diff --git a/public-docs/orchestration.md b/public-docs/orchestration.md
index b7c5b861f2..cd65e709ce 100644
--- a/public-docs/orchestration.md
+++ b/public-docs/orchestration.md
@@ -48,12 +48,12 @@ See the [MCP reference](/docs/mcp) for tool configuration and the full catalog.
 Agents with shell access can also use the Paseo CLI. This route does not require enabling tool injection. With Paseo installed, a running host, and Codex configured:
 
 ```bash
-paseo run --provider codex --background \
+paseo run --provider codex --no-wait \
   "Review this branch without changing files"
 paseo ls -a
 ```
 
-The first command starts a worker and returns immediately; the second lists agents from active workspaces, including archived agents. When a Paseo agent runs the command, the worker becomes its subagent in the same workspace. From your own terminal, it starts in a new local workspace.
+The first command starts a worker and returns immediately; the second lists archived and background agents as well. When a Paseo agent runs the command, the worker becomes its subagent in the same workspace. From your own terminal, it starts in a new local workspace.
 
 See the [CLI reference](/docs/cli) for follow-ups, output, worktrees, and remote hosts.
 
diff --git a/public-docs/plugins/reference.md b/public-docs/plugins/reference.md
index 1a1440ad97..04c88bdf1a 100644
--- a/public-docs/plugins/reference.md
+++ b/public-docs/plugins/reference.md
@@ -730,10 +730,9 @@ plans, and mode changes; requesting permission does not end the turn.
 | `workspace.created`          | `workspace`                              | Record created; directory available                |
 | `workspace.archived`         | `workspace`                              | Archive state is saved                             |
 
-Agent events exclude internal utility agents. Archive events can precede runtime/worktree cleanup;
-closing an agent that is already closed does not emit another `agent.closed` event.
-During daemon shutdown, pending event hooks have up to five seconds to finish before plugins stop.
-`workspace.created` is not a setup barrier before agent startup.
+Agent events exclude the daemon's private disposable helpers. Public background workspaces and
+their ordinary agents run the same lifecycle hooks as other workspaces. Archive events can precede
+runtime/worktree cleanup; observe lifecycle completion separately when cleanup matters.
 
 **Shared payload shapes** (`@getpaseo/plugin/server`):
 
@@ -787,7 +786,6 @@ type PluginTurnOutcome =
 | `providerOptions`                             | Opaque provider-specific options                                           |
 | `mcpServers`, `toolPolicy`                    | MCP configuration and exact-tool preapprovals                              |
 | `cwd`                                         | Cannot change                                                              |
-| `internal`                                    | Daemon-owned; cannot change through this hook                              |
 
 **`agent.session_open` request example:**
 
diff --git a/public-docs/sdk/agents.md b/public-docs/sdk/agents.md
index fa3ed80c00..87d3e993cf 100644
--- a/public-docs/sdk/agents.md
+++ b/public-docs/sdk/agents.md
@@ -105,6 +105,31 @@ const child = await workspace.agents.create({
 
 `parent` establishes parentage. Archiving a parent cascade-archives its children. Call `detach()` first when a child should continue independently.
 
+## Run work in a background workspace
+
+Create a background workspace and its first agent in one call. Put `background` on the
+workspace options and the agent's configuration under `agent`:
+
+```ts
+const cwd = "/Users/me/dev/storefront";
+const workspace = await client.workspaces.create({
+  source: { kind: "directory", path: cwd },
+  background: true,
+  agent: {
+    cwd,
+    config: { provider: "codex/gpt-5.5" },
+    prompt: "Review the checkout flow.",
+  },
+});
+```
+
+The call returns a workspace handle and starts its first agent with the supplied prompt.
+
+Background agents keep their history and survive daemon restarts. Default discovery hides them;
+use `client.agents.list({ filter: { includeBackground: true } })` to include them.
+Exact-ID handles work normally. See [workspace creation](./workspaces.md#create-a-fresh-workspace)
+for defaults and caller inheritance.
+
 ## Request structured output
 
 ```ts
diff --git a/public-docs/sdk/reference.md b/public-docs/sdk/reference.md
index 620f398691..76490974fe 100644
--- a/public-docs/sdk/reference.md
+++ b/public-docs/sdk/reference.md
@@ -57,7 +57,10 @@ Create a new client after `close()`.
 
 `list({ subscribe: {} })` also returns a `subscriptionId` and an owned `subscription`. Its `subscribe({ snapshot, update, error? })` callbacks receive the snapshot before scoped wire updates; `release()` ends that observation. Capable daemons assign the ID and keep observations independent. Older daemons use local IDs and their established shared delivery behavior. Plain lists create no observation. The same contract applies to workspace lists. See [events](./events.md).
 
-Creation options include `config`, `cwd`, `parent`, `title`, `prompt`, `env`, `outputSchema`, `images`, `attachments`, `git`, `worktree`, `autoArchive`, and `labels`.
+Creation options include `config`, `cwd`, `parent`, `title`, `prompt`, `env`, `outputSchema`, `images`, `attachments`, `git`, `worktree`, `autoArchive`, `background`, and `labels`.
+
+`background` is workspace creation intent. It cannot accompany an existing `workspaceId`.
+See [background workspaces](./workspaces.md) for caller inheritance and inclusive discovery.
 
 `config` accepts:
 
@@ -123,14 +126,19 @@ See [events](./events.md#follow-provider-catalog-changes) for explicit event obs
 
 ## `client.workspaces`
 
-| Method                   | Result                        | Behavior                                                                                       |
-| ------------------------ | ----------------------------- | ---------------------------------------------------------------------------------------------- |
-| `list(options?)`         | `PaseoWorkspaceListResult`    | Lists, filters, pages, or subscribes to the workspace directory.                               |
-| `open(cwd)`              | `PaseoWorkspaceHandle`        | Reuses the active workspace for a directory or creates one.                                    |
-| `create(options)`        | `PaseoWorkspaceHandle`        | Always creates a fresh directory-backed or Paseo-worktree workspace.                           |
-| `ref(workspaceOrId)`     | `PaseoWorkspaceHandle`        | Creates a local handle.                                                                        |
-| `archive(workspaceOrId)` | `PaseoWorkspaceArchiveResult` | Archives without first creating a handle.                                                      |
-| `subscribe(handler)`     | Unsubscribe function          | Local listener for this API instance. Requires an owned `list({ subscribe: {} })` observation. |
+| Method                   | Result                        | Behavior                                                                                                                 |
+| ------------------------ | ----------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
+| `list(options?)`         | `PaseoWorkspaceListResult`    | Lists, filters, pages, or subscribes to the workspace directory.                                                         |
+| `open(cwd)`              | `PaseoWorkspaceHandle`        | Reuses the active workspace for a directory or creates one.                                                              |
+| `create(options)`        | `PaseoWorkspaceHandle`        | Always creates a fresh directory-backed or Paseo-worktree workspace. `background: true` hides it from default discovery. |
+| `ref(workspaceOrId)`     | `PaseoWorkspaceHandle`        | Creates a local handle.                                                                                                  |
+| `archive(workspaceOrId)` | `PaseoWorkspaceArchiveResult` | Archives without first creating a handle.                                                                                |
+| `subscribe(handler)`     | Unsubscribe function          | Local listener for this API instance. Requires an owned `list({ subscribe: {} })` observation.                           |
+
+`create({ source, agent, background })` creates a workspace and its initial agent together.
+`agent` accepts agent creation options except `worktree`, `git`, `onEvent`, `idempotencyKey`,
+and `requestId`. Set `background` on the workspace options; `agent.background` is rejected.
+See the [combined creation example](./agents.md#run-work-in-a-background-workspace).
 
 A workspace handle exposes `id`, `projectId`, `directory`, `name`, `status`, `current()`, `refresh()`, `setTitle(title)`, `archive()`, and `subscribe()`. Pass `null` to `setTitle` to restore the derived workspace name. Use `workspace.agents.create(options)` to create an agent without repeating the workspace ID or directory.
 
diff --git a/public-docs/sdk/workspaces.md b/public-docs/sdk/workspaces.md
index 6775e90b3d..2bf1dd7ee3 100644
--- a/public-docs/sdk/workspaces.md
+++ b/public-docs/sdk/workspaces.md
@@ -50,8 +50,25 @@ const workspace = await client.workspaces.create({
 });
 ```
 
+Pass `agent` to create the workspace and its first agent in one call. See the
+[combined background workspace example](./agents.md#run-work-in-a-background-workspace).
+Set visibility on the workspace options; `agent.background` is rejected.
+
 You can pass `projectId` in either source when you already have one. Most integrations should omit it; the daemon finds or creates the project from the directory.
 
+Pass `background: true` to hide a workspace from default discovery. Its agents and terminals
+remain durable, with ordinary history, lifecycle hooks, archive, and exact-ID access. The app's
+sidebar offers **Show background** without dropping replicated state.
+
+`background` is creation-only. Omission defaults to false; when `callerAgentId` identifies an agent
+creating a new workspace, omission inherits its workspace's value. Explicit false or true overrides
+inheritance. Agent creation with `workspaceId` rejects explicit background creation intent; configure
+visibility when creating the workspace. SDK/RPC implicit agent creation also accepts `background`
+as workspace creation intent, never as an agent property.
+
+Creation and inclusive discovery require `features.backgroundWorkspaces`; the client rejects an
+unsupported host with an update-host message.
+
 ## Start an agent in a workspace
 
 Create through the workspace handle:
@@ -116,6 +133,11 @@ do {
 } while (cursor);
 ```
 
+Background workspaces are left out unless `filter.includeBackground` is true. Use
+`client.workspaces.list({ filter: { includeBackground: true } })` or
+`client.agents.list({ filter: { includeBackground: true } })`. Workspace descriptors carry
+`background`; agents derive visibility from their workspace and have no separate setting.
+
 ## Refresh and archive a handle
 
 ```ts
diff --git a/skills/paseo/SKILL.md b/skills/paseo/SKILL.md
index 60ca70057a..11b5f2ff97 100644
--- a/skills/paseo/SKILL.md
+++ b/skills/paseo/SKILL.md
@@ -23,9 +23,11 @@ For a local daemon, `project create` defaults to the current directory and resol
 
 **`create_workspace`** — create a workspace independently of any agent. Required: `isolation` (`local` or `worktree`). Worktree isolation supports `mode: "branch-off" | "checkout-branch" | "checkout-pr"`: use `branchName`/`baseBranch` for a new branch, `branch` for an existing branch, or `prNumber` plus optional `forge`/`projectPath` for a change request. `worktreeSlug` controls the managed path. Returns the workspace descriptor centered on `workspaceId`.
 
+`background: true` hides a workspace from default lists and the sidebar while its contents remain durable and accessible; omit `background` to inherit your current workspace’s value (false without a caller), and override it only when the user explicitly asks.
+
 Choose `baseBranch` explicitly: `origin/main` selects the remote-tracking branch; `refs/heads/main` selects local main. Bare `main` prefers local main when it exists, otherwise origin/main. Paseo retains the resolved ref for workspace comparisons, even after rebasing the branch or changing its PR target.
 
-**`list_workspaces`** — list active workspaces.
+**`list_workspaces`** — list active workspaces, excluding background workspaces unless `includeBackground: true`.
 
 **`archive_workspace`** — `{ workspaceId }`. Archives the workspace, its agents, and its terminals. Local directories remain; Paseo removes an owned worktree only after its final active workspace reference is archived.
 
@@ -61,11 +63,11 @@ Detach is an explicit user action in the subagents track, not an agent tool. A c
 
 Agent-scoped `create_agent` defaults `notifyOnFinish` to true. Set it to `false` only for truly fire-and-forget agents.
 
-**`send_agent_prompt`** — `{ agentId, prompt }`. Use for follow-ups to an existing agent. Agent-scoped prompt calls default to `background: true` and `notifyOnFinish: true`; top-level calls default to blocking with no callback. For a synchronous follow-up, pass `background: false` and use the returned result.
+**`send_agent_prompt`** — `{ agentId, prompt }`. Use for follow-ups to an existing agent. Returns after dispatch acknowledgement. Agent-scoped calls default `notifyOnFinish` to true; top-level calls have no parent callback.
 
 **`update_agent`** — `{ agentId, name?, labels?, settings? }`. Use `settings` for runtime changes on an existing agent: `modeId`, `model`, `thinkingOptionId`, and provider-specific `features`. For Codex fast mode, pass `settings: { features: { "fast_mode": true } }`.
 
-**`list_agents`** — filter by `cwd`, `statuses`, `sinceHours`, `includeArchived`.
+**`list_agents`** — filter by `cwd`, `statuses`, `sinceHours`, `includeArchived`; set `includeBackground: true` to include agents in background workspaces.
 
 **`archive_agent`** — `{ agentId }`. Interrupts if running, removes from active list.
 
@@ -106,9 +108,11 @@ Schedules have the full list/inspect/update/pause/resume/run-once/log/delete sur
 
 Agents take time — 10–30+ minutes is routine. Favor asynchronous workflows.
 
-For agent-scoped `create_agent` and background `send_agent_prompt`, leave `notifyOnFinish` omitted or set it to `true` unless the work is truly fire-and-forget. You will get notified when the target agent finishes, errors, or needs permission. Move on to other work. The notification arrives on its own.
+`create_agent` and `send_agent_prompt` return after startup or dispatch acknowledgement in both MCP scopes. Top-level callers have no parent callback; observe completion through status/activity tools or SDK/RPC subscriptions and wait APIs.
 
-Don't poll `list_agents` or `get_agent_status` to "check on" a running agent. The notification will tell you.
+For agent-scoped `create_agent` and `send_agent_prompt`, leave `notifyOnFinish` omitted or set it to `true` unless the work is truly fire-and-forget. You will get notified when the target agent finishes, errors, or needs permission. Move on to other work. The notification arrives on its own.
+
+With finish notifications enabled, don't poll `list_agents` or `get_agent_status` to "check on" a running agent. The notification will tell you.
 
 ## CLI semantics
 

From 718ed932b7843cde0b156ff30ec6adf42e828a18 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 9 Oct 2026 12:27:52 +0200
Subject: [PATCH 067/270] Clarify maintainer and community roles in sponsor
 copy

---
 packages/website/src/components/sponsorship.tsx | 17 +++++++++++------
 packages/website/src/routes/sponsor.tsx         |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/website/src/components/sponsorship.tsx b/packages/website/src/components/sponsorship.tsx
index e3420aa36f..05a04362de 100644
--- a/packages/website/src/components/sponsorship.tsx
+++ b/packages/website/src/components/sponsorship.tsx
@@ -55,8 +55,13 @@ export function FounderNote() {
     <div className="max-w-2xl space-y-5 leading-relaxed text-white/70">
       <p>Paseo is an independent project used by tens of thousands of developers daily.</p>
       <p>
-        It is built by one person, full time, with no investors, no board and no company behind it.
-        I have turned down funding offers to keep it that way.
+        It is maintained by one person, full time, and shaped by the community. There are no
+        investors, no board and no company behind it. I have turned down funding offers to keep it
+        that way.
+      </p>
+      <p>
+        The community helps Paseo grow through feedback, testing, bug reports, code contributions
+        and plugins. Your sponsorship helps me keep improving and maintaining it.
       </p>
       <p>
         A tool that sits between you and your code, your keys and your machines has to stay neutral,
@@ -234,10 +239,10 @@ export function SponsorSection() {
         <div className="max-w-2xl space-y-5 leading-relaxed text-white/70">
           <p>Paseo is an independent project used by tens of thousands of developers daily.</p>
           <p>
-            It is built by one person, full time, with no investors and no company behind it. I have
-            turned down funding to keep it that way. A tool that sits between you and your code,
-            your keys and your machines has to stay neutral, and funding creates pressure to
-            monetize.
+            It is maintained by one person, full time, and shaped by the community. There are no
+            investors and no company behind it. I have turned down funding to keep it that way. A
+            tool that sits between you and your code, your keys and your machines has to stay
+            neutral, and funding creates pressure to monetize.
           </p>
           <p>
             Paseo is self-funded through sponsorship and{" "}
diff --git a/packages/website/src/routes/sponsor.tsx b/packages/website/src/routes/sponsor.tsx
index 83184e6512..651f61dd21 100644
--- a/packages/website/src/routes/sponsor.tsx
+++ b/packages/website/src/routes/sponsor.tsx
@@ -7,7 +7,7 @@ export const Route = createFileRoute("/sponsor")({
   head: () =>
     pageMeta(
       "Sponsor Paseo",
-      "Paseo is an independent project used by tens of thousands of developers daily, built by one person with no investors. Sponsor the work on GitHub Sponsors, Open Collective or Buy Me a Coffee, or sponsor it as a company.",
+      "Paseo is an independent project used by tens of thousands of developers daily, maintained by one person, shaped by the community, with no investors. Sponsor the work on GitHub Sponsors, Open Collective or Buy Me a Coffee, or sponsor it as a company.",
       "/sponsor",
     ),
   component: Sponsor,

From 73390346ca3dc6385ee7fd4d0512943b4f281a36 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 9 Oct 2026 16:35:43 +0100
Subject: [PATCH 068/270] fix(ios): address clipped chat and Markdown text
 (#6445)

* Revert "fix(app): reflow iPad chat text after pane resize (#5716)"

This reverts commit 5715b5ba628cb6621347678b8d4394e4b8adfc2f.

* docs(changelog): describe iOS text clipping fix for 0.11.2

* chore(release): cut 0.11.2
---
 CHANGELOG.md                                  |  6 ++
 .../android/en-US/changelogs/110021.txt       |  4 ++
 .../android/en-US/changelogs/110022.txt       |  4 ++
 .../android/en-US/changelogs/110023.txt       |  4 ++
 .../android/en-US/changelogs/110024.txt       |  4 ++
 package-lock.json                             | 56 +++++++--------
 package.json                                  |  2 +-
 .../e2e/mobile/native-text-reflow/README.md   | 26 -------
 .../app/e2e/mobile/native-text-reflow/ios.py  | 55 --------------
 .../app/e2e/mobile/native-text-reflow/ios.sh  | 18 -----
 packages/app/package.json                     |  2 +-
 packages/cli/package.json                     |  8 +--
 packages/client/package.json                  |  6 +-
 packages/desktop/package.json                 |  2 +-
 packages/expo-two-way-audio/package.json      |  2 +-
 packages/highlight/package.json               |  2 +-
 packages/plugin/package.json                  | 10 +--
 packages/protocol/package.json                |  2 +-
 packages/relay/package.json                   |  2 +-
 packages/server/package.json                  | 12 ++--
 packages/website/package.json                 |  2 +-
 patches/react-native-uitextview+2.2.0.patch   | 72 -------------------
 plugins/package.json                          |  2 +-
 scripts/postinstall-patches.mjs               |  4 --
 24 files changed, 77 insertions(+), 230 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110021.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110022.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110023.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/110024.txt
 delete mode 100644 packages/app/e2e/mobile/native-text-reflow/README.md
 delete mode 100644 packages/app/e2e/mobile/native-text-reflow/ios.py
 delete mode 100644 packages/app/e2e/mobile/native-text-reflow/ios.sh
 delete mode 100644 patches/react-native-uitextview+2.2.0.patch

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5c23db161..0e2b24ac5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.11.2 - 2026-10-09
+
+### Fixed
+
+- Fixed intermittent text clipping in iOS chats and Markdown previews ([#6445](https://github.com/getpaseo/paseo/pull/6445))
+
 ## 0.11.1 - 2026-10-07
 
 ### Added
diff --git a/fastlane/metadata/android/en-US/changelogs/110021.txt b/fastlane/metadata/android/en-US/changelogs/110021.txt
new file mode 100644
index 0000000000..92dc176fa3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110021.txt
@@ -0,0 +1,4 @@
+Fixed
+- Fixed intermittent text clipping in iOS chats and Markdown previews
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110022.txt b/fastlane/metadata/android/en-US/changelogs/110022.txt
new file mode 100644
index 0000000000..92dc176fa3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110022.txt
@@ -0,0 +1,4 @@
+Fixed
+- Fixed intermittent text clipping in iOS chats and Markdown previews
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110023.txt b/fastlane/metadata/android/en-US/changelogs/110023.txt
new file mode 100644
index 0000000000..92dc176fa3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110023.txt
@@ -0,0 +1,4 @@
+Fixed
+- Fixed intermittent text clipping in iOS chats and Markdown previews
+
+Full notes: https://paseo.sh/changelog
diff --git a/fastlane/metadata/android/en-US/changelogs/110024.txt b/fastlane/metadata/android/en-US/changelogs/110024.txt
new file mode 100644
index 0000000000..92dc176fa3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/110024.txt
@@ -0,0 +1,4 @@
+Fixed
+- Fixed intermittent text clipping in iOS chats and Markdown previews
+
+Full notes: https://paseo.sh/changelog
diff --git a/package-lock.json b/package-lock.json
index 8d2be2f995..c31951b1b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -36413,7 +36413,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -37496,12 +37496,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.11.1",
-        "@getpaseo/protocol": "0.11.1",
-        "@getpaseo/server": "0.11.1",
+        "@getpaseo/client": "0.11.2",
+        "@getpaseo/protocol": "0.11.2",
+        "@getpaseo/server": "0.11.2",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -37748,10 +37748,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "dependencies": {
-        "@getpaseo/protocol": "0.11.1",
-        "@getpaseo/relay": "0.11.1",
+        "@getpaseo/protocol": "0.11.2",
+        "@getpaseo/relay": "0.11.2",
         "zod": "^4.4.3"
       },
       "devDependencies": {
@@ -37762,7 +37762,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -38006,7 +38006,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -38902,7 +38902,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "dependencies": {
         "@codemirror/language": "6.12.4",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -38931,14 +38931,14 @@
     },
     "packages/plugin": {
       "name": "@getpaseo/plugin",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "dependencies": {
         "@agentclientprotocol/sdk": "^1.4.0",
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.11.1",
-        "@getpaseo/protocol": "0.11.1",
+        "@getpaseo/client": "0.11.2",
+        "@getpaseo/protocol": "0.11.2",
         "@types/node": "^20.9.0",
         "@types/react": "~19.2.0",
         "react": "19.1.0",
@@ -38948,8 +38948,8 @@
         "zod": "^4.4.3"
       },
       "peerDependencies": {
-        "@getpaseo/client": "0.11.1",
-        "@getpaseo/protocol": "0.11.1",
+        "@getpaseo/client": "0.11.2",
+        "@getpaseo/protocol": "0.11.2",
         "react": "~19.1.0",
         "react-native": ">=0.81.5",
         "zod": "^4.4.3"
@@ -38971,7 +38971,7 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "dependencies": {
         "semver": "^7.8.5",
         "zod": "^4.4.3"
@@ -38998,7 +38998,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -39216,16 +39216,16 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "0.3.246",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.11.1",
-        "@getpaseo/highlight": "0.11.1",
-        "@getpaseo/plugin": "0.11.1",
-        "@getpaseo/protocol": "0.11.1",
-        "@getpaseo/relay": "0.11.1",
+        "@getpaseo/client": "0.11.2",
+        "@getpaseo/highlight": "0.11.2",
+        "@getpaseo/plugin": "0.11.2",
+        "@getpaseo/protocol": "0.11.2",
+        "@getpaseo/relay": "0.11.2",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "1.29.0",
         "@opencode-ai/sdk": "1.14.46",
@@ -40146,7 +40146,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",
@@ -41754,7 +41754,7 @@
     },
     "plugins": {
       "name": "@getpaseo/builtin-plugins",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "dependencies": {
         "@getpaseo/plugin": "*",
         "zod": "^4.4.3"
diff --git a/package.json b/package.json
index 35257ef465..ecbfd83891 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [
diff --git a/packages/app/e2e/mobile/native-text-reflow/README.md b/packages/app/e2e/mobile/native-text-reflow/README.md
deleted file mode 100644
index b92666cc58..0000000000
--- a/packages/app/e2e/mobile/native-text-reflow/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Native iOS text geometry regression
-
-Run on the Namespace Mac with a fresh simulator development build. Use the PID
-returned by `xcrun simctl launch <your-task-simulator-UDID> sh.paseo.debug`.
-Attach only to your task's app, while no device replay is running:
-
-```sh
-PASEO_NATIVE_TEXT_REFLOW_PID=12345 \
-PASEO_NATIVE_TEXT_REFLOW_LOG=/Volumes/devbox/workspace/native-text-reflow.log \
-bash packages/app/e2e/mobile/native-text-reflow/ios.sh
-```
-
-The probe constructs the installed `RNUITextView`, fills its real UIKit text view,
-and resizes its content container from 500 to 240 and back to 500 points. It
-asserts the inner frame follows both widths and the same selection survives.
-It uses public UIView/UITextView operations, without mocking React Native.
-LLDB detaches after the probe. An assertion failure or evaluation error fails the
-shell command; the log distinguishes them.
-
-This covers native container resizing and selection retention. It does not cover
-Fabric event delivery, chat row height, reader anchoring, or the on-screen copy
-menu. Those require the real chat journey: read an older multiline response,
-open/close Explorer, resize/rotate, inspect complete paragraphs and bullets,
-retain expanded/collapsed details, and check a stationary reader's position.
-Accessibility exposes full text even when glyphs are clipped, so a text wait
-alone does not verify that journey.
diff --git a/packages/app/e2e/mobile/native-text-reflow/ios.py b/packages/app/e2e/mobile/native-text-reflow/ios.py
deleted file mode 100644
index 7a4cbd5125..0000000000
--- a/packages/app/e2e/mobile/native-text-reflow/ios.py
+++ /dev/null
@@ -1,55 +0,0 @@
-import lldb
-
-
-def __lldb_init_module(debugger, _internal_dict):
-    debugger.HandleCommand("expression -l objc++ -- @import UIKit")
-    frame = debugger.GetSelectedTarget().GetProcess().GetSelectedThread().GetSelectedFrame()
-    options = lldb.SBExpressionOptions()
-    options.SetLanguage(lldb.eLanguageTypeObjC_plus_plus)
-    result = frame.EvaluateExpression(
-        r'''({
-            UIView *host = (UIView *)[[NSClassFromString(@"RNUITextView") alloc] init];
-            auto hostFrame = host.frame;
-            hostFrame.size.width = 500;
-            hostFrame.size.height = 200;
-            host.frame = hostFrame;
-            UIView *container = (UIView *)[host performSelector:@selector(contentView)];
-            container.frame = host.bounds;
-            UITextView *text = nil;
-            for (UIView *child in host.subviews) {
-                if ([child isKindOfClass:UITextView.class]) text = (UITextView *)child;
-                for (UIView *nested in child.subviews) {
-                    if ([nested isKindOfClass:UITextView.class]) text = (UITextView *)nested;
-                }
-            }
-            text.frame = container.bounds;
-            text.font = [UIFont systemFontOfSize:16];
-            text.text = @"A realistic multiline paragraph must reflow when Explorer narrows the available chat width, then fill the restored width without replacing the text view or discarding a selection.";
-            auto range = text.selectedRange;
-            range.location = 12;
-            range.length = 9;
-            text.selectedRange = range;
-            auto frame = container.frame;
-            frame.size.width = 240;
-            container.frame = frame;
-            [container layoutIfNeeded];
-            CGFloat narrow = text.frame.size.width;
-            auto selection = text.selectedRange;
-            frame.size.width = 500;
-            container.frame = frame;
-            [container layoutIfNeeded];
-            CGFloat wide = text.frame.size.width;
-            BOOL ok = text != nil && narrow == 240 && wide == 500 &&
-                selection.location == text.selectedRange.location &&
-                selection.length == text.selectedRange.length &&
-                selection.location == 12 && selection.length == 9;
-            [NSString stringWithFormat:@"NATIVE_REFLOW_%@ narrow=%.0f wide=%.0f selection=%lu:%lu",
-                ok ? @"PASS" : @"FAIL", narrow, wide,
-                (unsigned long)text.selectedRange.location,
-                (unsigned long)text.selectedRange.length];
-        })''',
-        options,
-    )
-    if result.GetError().Fail():
-        raise RuntimeError(result.GetError().GetCString())
-    print(result.GetObjectDescription())
diff --git a/packages/app/e2e/mobile/native-text-reflow/ios.sh b/packages/app/e2e/mobile/native-text-reflow/ios.sh
deleted file mode 100644
index b4e9a07a22..0000000000
--- a/packages/app/e2e/mobile/native-text-reflow/ios.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-: "${PASEO_NATIVE_TEXT_REFLOW_PID:?Set the PID of your task-owned Paseo iOS simulator app}"
-: "${PASEO_NATIVE_TEXT_REFLOW_LOG:?Set the test output log path}"
-
-if [[ "$(ps -p "$PASEO_NATIVE_TEXT_REFLOW_PID" -o comm=)" != *PaseoDebug.app/PaseoDebug ]]; then
-  echo "Expected a running PaseoDebug simulator app" >&2
-  exit 1
-fi
-
-probe_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-xcrun lldb --batch -p "$PASEO_NATIVE_TEXT_REFLOW_PID" \
-  -o "command script import $probe_dir/ios.py" \
-  -o "process detach" -o quit > "$PASEO_NATIVE_TEXT_REFLOW_LOG" 2>&1
-
-grep '^NATIVE_REFLOW_' "$PASEO_NATIVE_TEXT_REFLOW_LOG"
-grep -q '^NATIVE_REFLOW_PASS narrow=240 wide=500 selection=12:9$' "$PASEO_NATIVE_TEXT_REFLOW_LOG"
diff --git a/packages/app/package.json b/packages/app/package.json
index ee7798b766..84af04dee4 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "private": true,
   "main": "index.ts",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 7aab9aab85..4fdcfba018 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/cli",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Paseo CLI - control your AI coding agents from the command line",
   "bin": {
     "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.0.0",
-    "@getpaseo/client": "0.11.1",
-    "@getpaseo/protocol": "0.11.1",
-    "@getpaseo/server": "0.11.1",
+    "@getpaseo/client": "0.11.2",
+    "@getpaseo/protocol": "0.11.2",
+    "@getpaseo/server": "0.11.2",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "mime-types": "^2.1.35",
diff --git a/packages/client/package.json b/packages/client/package.json
index a76e73da1f..937190e0d0 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/client",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Paseo client SDK package",
   "files": [
     "dist",
@@ -39,8 +39,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@getpaseo/protocol": "0.11.1",
-    "@getpaseo/relay": "0.11.1",
+    "@getpaseo/protocol": "0.11.2",
+    "@getpaseo/relay": "0.11.2",
     "zod": "^4.4.3"
   },
   "devDependencies": {
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 3b183dd038..481fa05e64 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/desktop",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "private": true,
   "description": "Paseo desktop app (Electron wrapper)",
   "homepage": "https://paseo.sh",
diff --git a/packages/expo-two-way-audio/package.json b/packages/expo-two-way-audio/package.json
index e9167f8f56..1e6bd41230 100644
--- a/packages/expo-two-way-audio/package.json
+++ b/packages/expo-two-way-audio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Native module for two way audio streaming",
   "keywords": [
     "ExpoTwoWayAudio",
diff --git a/packages/highlight/package.json b/packages/highlight/package.json
index fb39e00486..02e9e28daa 100644
--- a/packages/highlight/package.json
+++ b/packages/highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/highlight",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "files": [
     "dist",
     "!dist/**/*.map",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 1f4d5868e6..2797c32211 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/plugin",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Paseo plugin SDK package",
   "files": [
     "dist",
@@ -70,8 +70,8 @@
     "use-sync-external-store": "^1.6.0"
   },
   "devDependencies": {
-    "@getpaseo/client": "0.11.1",
-    "@getpaseo/protocol": "0.11.1",
+    "@getpaseo/client": "0.11.2",
+    "@getpaseo/protocol": "0.11.2",
     "@types/node": "^20.9.0",
     "@types/react": "~19.2.0",
     "react": "19.1.0",
@@ -81,8 +81,8 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@getpaseo/client": "0.11.1",
-    "@getpaseo/protocol": "0.11.1",
+    "@getpaseo/client": "0.11.2",
+    "@getpaseo/protocol": "0.11.2",
     "react": "~19.1.0",
     "react-native": ">=0.81.5",
     "zod": "^4.4.3"
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index 6db5dd137f..8ce97a1025 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/protocol",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Paseo shared protocol schemas and wire types",
   "files": [
     "dist",
diff --git a/packages/relay/package.json b/packages/relay/package.json
index 7f884f1f45..d53a1a870e 100644
--- a/packages/relay/package.json
+++ b/packages/relay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/relay",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Paseo relay for bridging daemon and client connections",
   "files": [
     "dist",
diff --git a/packages/server/package.json b/packages/server/package.json
index 5201d4cae4..53288d2acb 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/server",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Paseo backend server",
   "files": [
     "dist/server",
@@ -107,11 +107,11 @@
     "@agentclientprotocol/sdk": "^0.17.1",
     "@anthropic-ai/claude-agent-sdk": "0.3.246",
     "@anthropic-ai/sdk": "^0.104.2",
-    "@getpaseo/client": "0.11.1",
-    "@getpaseo/highlight": "0.11.1",
-    "@getpaseo/plugin": "0.11.1",
-    "@getpaseo/protocol": "0.11.1",
-    "@getpaseo/relay": "0.11.1",
+    "@getpaseo/client": "0.11.2",
+    "@getpaseo/highlight": "0.11.2",
+    "@getpaseo/plugin": "0.11.2",
+    "@getpaseo/protocol": "0.11.2",
+    "@getpaseo/relay": "0.11.2",
     "@isaacs/ttlcache": "^2.1.4",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@opencode-ai/sdk": "1.14.46",
diff --git a/packages/website/package.json b/packages/website/package.json
index 11266c5d06..1677b3c0fc 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/website",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/patches/react-native-uitextview+2.2.0.patch b/patches/react-native-uitextview+2.2.0.patch
deleted file mode 100644
index f64f09ebc7..0000000000
--- a/patches/react-native-uitextview+2.2.0.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/node_modules/react-native-uitextview/ios/RNUITextView.mm b/node_modules/react-native-uitextview/ios/RNUITextView.mm
-index d0c31ed..df8a233 100644
---- a/node_modules/react-native-uitextview/ios/RNUITextView.mm
-+++ b/node_modules/react-native-uitextview/ios/RNUITextView.mm
-@@ -22,6 +22,7 @@ using namespace facebook::react;
-   RNUITextViewShadowNode::ConcreteState::Shared _state;
-   UITapGestureRecognizer * _outsideTapRecognizer;
-   BOOL _suppressSelectionChange;
-+  CGRect _lastTextLayoutFrame;
- }
- 
- + (ComponentDescriptorProvider)componentDescriptorProvider
-@@ -47,7 +48,8 @@ using namespace facebook::react;
-     _textView.delegate = self;
-     // Must match RCTTextLayoutManager, which measures with usesFontLeading = NO.
-     _textView.layoutManager.usesFontLeading = NO;
--    [self addSubview:_textView];
-+    _textView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-+    [_view addSubview:_textView];
- 
-     const auto longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self
-                                                                                           action:@selector(handleLongPressIfNecessary:)];
-@@ -94,16 +96,15 @@ using namespace facebook::react;
-   // Reset the frame to zero so that when it properly lays out on the next use
-   _textView.frame = CGRectZero;
-   _textView.attributedText = nil;
-+  _lastTextLayoutFrame = CGRectZero;
- }
- 
- - (void)layoutSubviews
- {
-   [super layoutSubviews];
--  // _textView's frame is assigned inside drawRect, which only fires when
--  // state changes. Trigger a redraw whenever the host frame moves out from
--  // under it (rotation, parent relayout) so the text view resizes and
--  // onTextLayout re-fires with the new line wrapping.
--  if (!CGRectEqualToRect(_textView.frame, _view.frame)) {
-+  // Autoresizing updates UIKit immediately; report the new line layout when
-+  // the content container's bounds change.
-+  if (!CGRectEqualToRect(_lastTextLayoutFrame, _view.bounds)) {
-     [self setNeedsDisplay];
-   }
- }
-@@ -124,8 +125,9 @@ using namespace facebook::react;
-   // entirely when nothing actually changed so a JS-side state update made in
-   // response to onSelectionChange doesn't deselect what the user is selecting.
-   const BOOL textChanged = ![_textView.attributedText isEqualToAttributedString:convertedAttrString];
--  const BOOL frameChanged = !CGRectEqualToRect(_textView.frame, _view.frame);
--  if (!textChanged && !frameChanged) {
-+  const BOOL frameChanged = !CGRectEqualToRect(_textView.frame, _view.bounds);
-+  const BOOL layoutChanged = !CGRectEqualToRect(_lastTextLayoutFrame, _view.bounds);
-+  if (!textChanged && !frameChanged && !layoutChanged) {
-     return;
-   }
-   if (textChanged) {
-@@ -142,7 +144,7 @@ using namespace facebook::react;
-     _suppressSelectionChange = NO;
-   }
-   if (frameChanged) {
--    _textView.frame = _view.frame;
-+    _textView.frame = _view.bounds;
-   }
- 
-   __block std::vector<std::string> lines;
-@@ -162,6 +164,7 @@ using namespace facebook::react;
-     }
-   }];
- 
-+  _lastTextLayoutFrame = _view.bounds;
-   if (_eventEmitter != nullptr) {
-     std::dynamic_pointer_cast<const facebook::react::RNUITextViewEventEmitter>(_eventEmitter)
-     ->onTextLayout(facebook::react::RNUITextViewEventEmitter::OnTextLayout{static_cast<int>(self.tag), lines});
diff --git a/plugins/package.json b/plugins/package.json
index 241d9b4b67..4bd6ca429b 100644
--- a/plugins/package.json
+++ b/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/builtin-plugins",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/scripts/postinstall-patches.mjs b/scripts/postinstall-patches.mjs
index 4235127a63..06d8892c60 100644
--- a/scripts/postinstall-patches.mjs
+++ b/scripts/postinstall-patches.mjs
@@ -12,10 +12,6 @@ const patchedPackages = [
     nodeModulesPath: "node_modules/react-native-markdown-display",
     patchPrefix: "react-native-markdown-display+",
   },
-  {
-    nodeModulesPath: "node_modules/react-native-uitextview",
-    patchPrefix: "react-native-uitextview+",
-  },
   // Remove after react-native-unistyles ships
   // https://github.com/jpudysz/react-native-unistyles/pull/1203.
   {

From a1da1b8f234afe7a75785022292cdf8a50ee11a5 Mon Sep 17 00:00:00 2001
From: "paseo-ai[bot]" <266920839+paseo-ai[bot]@users.noreply.github.com>
Date: Fri, 9 Oct 2026 15:43:26 +0000
Subject: [PATCH 069/270] fix: update lockfile signatures and Nix hash [skip
 ci]

---
 nix/npm-deps.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/npm-deps.hash b/nix/npm-deps.hash
index 79871d69b7..8906abc66b 100644
--- a/nix/npm-deps.hash
+++ b/nix/npm-deps.hash
@@ -1 +1 @@
-sha256-aoYgGgEkqeeZJR7OOcSHuZEhBELkpyOGqHo4oEx7W88=
+sha256-CK96G7MWsmd/VDvkuaFJ23U04EGNmeiXdTYbmR8RDDQ=

From aec01ea605df3047f8121f72141f1847df5c4da1 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 9 Oct 2026 21:05:40 +0100
Subject: [PATCH 070/270] feat(claude): offer Mythos 5.1 when Claude Code
 advertises it (#6403)

* feat(claude): add Mythos 5.1 with its model capabilities

* feat(claude): gate Mythos on advertised model identity

* fix(claude): retain capabilities for explicitly configured Mythos

* test(usage): load SQLite before timed store tests

The first Windows OMP store case exceeded its five-second budget while subsequent equivalent cases completed under a second. Load the builtin during test collection so its cold initialization does not consume the first test deadline.

* test(workspaces): publish complete service environment fixtures

Waiting for file existence races with writeFileSync creating the file before writing its contents. Rename completed JSON snapshots into place so the existing readiness check cannot expose an empty file.
---
 docs/providers.md                             |   2 +
 .../agent/providers/claude/agent.test.ts      |  34 +++
 .../server/agent/providers/claude/agent.ts    |  33 ++-
 .../agent/providers/claude/model-discovery.ts |  89 +++++++
 .../agent/providers/claude/model-manifest.ts  |  28 +-
 .../agent/providers/claude/models.test.ts     | 246 ++++++++++++++++++
 .../server/agent/providers/claude/models.ts   |   8 +-
 .../server/worktree-bootstrap.posix.test.ts   |   4 +-
 .../claude-usage-source/server/stores.test.ts |   3 +-
 9 files changed, 434 insertions(+), 13 deletions(-)
 create mode 100644 packages/server/src/server/agent/providers/claude/model-discovery.ts

diff --git a/docs/providers.md b/docs/providers.md
index 4609246922..298bee651b 100644
--- a/docs/providers.md
+++ b/docs/providers.md
@@ -61,6 +61,8 @@ Core direct providers: `claude` (in `providers/claude/agent.ts`), `codex` (`code
 
 Claude first-party model metadata lives in `packages/server/src/server/agent/providers/claude/model-manifest.ts`. When adding or updating a Claude model, update that manifest only; the model picker thinking options and Claude-specific feature gates are derived from the manifest. Do not add model-specific Claude capability lists in feature code.
 
+Keep the curated Claude catalog: `supportedModels()` has historically omitted older versions and carries less metadata. Discovery is only an opt-in visibility gate, not a replacement catalog or an entitlement guarantee. Claude Code v2.1.197 added `resolvedModel` to disambiguate alias rows; a bare family alias does not establish access to a particular version. Explicit user-configured models must remain selectable when discovery fails or omits them.
+
 Paseo tools are not implemented as MCP tools internally. They live in a shared tool catalog under `packages/server/src/server/agent/tools/`; MCP is only the fallback adapter. The daemon resolves `agents.providers.<provider>.paseoTools` by the exact provider ID. The catalog policy belongs to the caller: it filters the tools exposed to the current agent. When that agent calls `create_agent`, the child receives the policy for the child provider ID; the caller's policy is not inherited.
 
 A provider that can register runtime tools directly should set `supportsNativePaseoTools: true` and consume the already-filtered `launchContext.paseoTools` in `createSession`/`resumeSession`. When native tools are present, `AgentManager` strips the internal Paseo MCP server from the provider launch config so the provider does not receive the same tools twice. Providers that only know MCP should keep `supportsMcpServers: true` and let the daemon inject `/mcp/agents`; the MCP server builds the same policy-filtered catalog for that caller. Filtering is enforced at catalog registration in both paths. Browser tools remain subject to the daemon browser-tools setting and browser-host availability.
diff --git a/packages/server/src/server/agent/providers/claude/agent.test.ts b/packages/server/src/server/agent/providers/claude/agent.test.ts
index 9f7430b103..5a5e1132a1 100644
--- a/packages/server/src/server/agent/providers/claude/agent.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.test.ts
@@ -426,6 +426,14 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
     try {
       const client = new ClaudeAgentClient({
         logger,
+        discoverModels: async () => [
+          {
+            value: "mythos",
+            resolvedModel: "claude-mythos-5-1",
+            displayName: "Mythos",
+            description: "",
+          },
+        ],
         resolveBinary: async () => "/test/claude/bin",
         resolveVersion: async () => "2.1.219",
         runtimeSettings: { env: { CLAUDE_CONFIG_DIR: emptyConfigDir } },
@@ -438,6 +446,7 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
 
       expect(models.map((m) => m.id)).toEqual([
         "claude-opus-5",
+        "claude-mythos-5-1",
         "claude-fable-5-1",
         "claude-fable-5",
         "claude-fable-5[1m]",
@@ -472,6 +481,14 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
     try {
       const client = new ClaudeAgentClient({
         logger,
+        discoverModels: async () => [
+          {
+            value: "mythos",
+            resolvedModel: "claude-mythos-5-1",
+            displayName: "Mythos",
+            description: "",
+          },
+        ],
         resolveVersion: async () => {
           throw new Error("unrecognized version output");
         },
@@ -495,6 +512,14 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
     try {
       const client = new ClaudeAgentClient({
         logger,
+        discoverModels: async () => [
+          {
+            value: "mythos",
+            resolvedModel: "claude-mythos-5-1",
+            displayName: "Mythos",
+            description: "",
+          },
+        ],
         resolveBinary: async () => "/test/claude/bin",
         resolveVersion: async () => "2.1.293",
         runtimeSettings: { env: { CLAUDE_CONFIG_DIR: emptyConfigDir } },
@@ -509,6 +534,14 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
       };
 
       expect(getThinkingIds("claude-opus-5")).toContain("ultracode");
+      expect(getThinkingIds("claude-mythos-5-1")).toEqual([
+        "low",
+        "medium",
+        "high",
+        "xhigh",
+        "max",
+        "ultracode",
+      ]);
       expect(getThinkingIds("claude-fable-5-1")).toContain("ultracode");
       expect(getThinkingIds("claude-fable-5")).toContain("ultracode");
       expect(getThinkingIds("claude-opus-4-8[1m]")).toContain("ultracode");
@@ -1232,6 +1265,7 @@ describe("ClaudeAgentSession features", () => {
 
   test.each([
     ["supported model", "claude-opus-4-8", { type: "disabled" }, undefined],
+    ["Mythos 5.1", "claude-mythos-5-1", { type: "adaptive", display: "summarized" }, "high"],
     ["Haiku 5.5", "claude-haiku-5-5", { type: "disabled" }, undefined],
     ["unsupported model", "claude-fable-5", { type: "adaptive", display: "summarized" }, "high"],
     ["custom model", "openrouter/anthropic/claude-opus-4-8", undefined, undefined],
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index b797ce2c94..6c73f1f643 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -76,6 +76,7 @@ import {
   type ClaudeProviderOptions,
 } from "./options.js";
 import { renderPromptAttachmentAsText } from "../../prompt-attachments.js";
+import { discoverClaudeModels } from "./model-discovery.js";
 import { claudeQuery, type ClaudeOptions, type ClaudeQueryFactory } from "./query.js";
 import {
   realClaudeRewindSdk,
@@ -412,6 +413,7 @@ export interface ClaudeContentChunk {
 }
 
 interface ClaudeAgentClientOptions {
+  discoverModels?: typeof discoverClaudeModels;
   defaults?: { agents?: Record<string, AgentDefinition> };
   logger: Logger;
   runtimeSettings?: ProviderRuntimeSettings;
@@ -1514,6 +1516,7 @@ export function readEventIdentifiers(message: SDKMessage): EventIdentifiers {
 }
 
 export class ClaudeAgentClient implements AgentClient {
+  private readonly discoverModels: typeof discoverClaudeModels;
   readonly provider = "claude" as const;
   readonly capabilities = CLAUDE_CAPABILITIES;
 
@@ -1526,6 +1529,7 @@ export class ClaudeAgentClient implements AgentClient {
   private readonly rewindSdk: ClaudeRewindSdk;
 
   constructor(options: ClaudeAgentClientOptions) {
+    this.discoverModels = options.discoverModels ?? discoverClaudeModels;
     this.defaults = options.defaults;
     this.logger = options.logger.child({ module: "agent", provider: "claude" });
     this.runtimeSettings = options.runtimeSettings;
@@ -1608,8 +1612,35 @@ export class ClaudeAgentClient implements AgentClient {
       this.logger.warn({ err: error }, "Failed to resolve Claude Code version for model catalog");
     }
     const env = this.buildProviderEnv();
+    let discoveredModelIds = new Set<string>();
+    try {
+      const advertisedModels = await runProviderRefreshActivity(context, "models", () =>
+        this.discoverModels({
+          resolveBinary: this.resolveBinary,
+          runtimeSettings: this.runtimeSettings,
+          env,
+          signal: context?.signal,
+        }),
+      );
+      discoveredModelIds = new Set(
+        advertisedModels
+          .map((model) => normalizeClaudeRuntimeModelId(model.resolvedModel ?? model.value))
+          .filter((id): id is string => id !== null),
+      );
+    } catch (error) {
+      context?.signal.throwIfAborted();
+      this.logger.warn(
+        { err: error },
+        "Claude model discovery failed; omitting discovery-required models",
+      );
+    }
     const models = await runProviderRefreshActivity(context, "settings", () =>
-      getClaudeModelsWithSettings(this.logger, claudeConfigDir(env), claudeCodeVersion),
+      getClaudeModelsWithSettings(
+        this.logger,
+        claudeConfigDir(env),
+        claudeCodeVersion,
+        discoveredModelIds,
+      ),
     );
     const modeCatalog = claudeModeCatalog(env);
     return {
diff --git a/packages/server/src/server/agent/providers/claude/model-discovery.ts b/packages/server/src/server/agent/providers/claude/model-discovery.ts
new file mode 100644
index 0000000000..d74898472b
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/model-discovery.ts
@@ -0,0 +1,89 @@
+import type { ChildProcess } from "node:child_process";
+import os from "node:os";
+import type { ModelInfo, Query, SDKUserMessage } from "@anthropic-ai/claude-agent-sdk";
+import { raceProviderRefreshAbort } from "../../provider-refresh-deadline.js";
+import type { ProviderRuntimeSettings } from "../../provider-launch-config.js";
+import { terminateWithTreeKill } from "../../../../utils/tree-kill.js";
+import { claudeQuery, type ClaudeQueryInput, type ClaudeQueryContext } from "./query.js";
+
+interface ClaudeModelDiscoveryOptions {
+  resolveBinary: () => Promise<string>;
+  runtimeSettings?: ProviderRuntimeSettings;
+  env: NodeJS.ProcessEnv;
+  signal?: AbortSignal;
+}
+
+type OpenDiscoveryQuery = (
+  input: ClaudeQueryInput,
+  context: ClaudeQueryContext,
+) => Pick<Query, "supportedModels" | "close">;
+
+// The curated catalog survives a failed or slow probe. This process never receives
+// a prompt and must not persist a session or launch user MCP servers/hooks.
+export async function discoverClaudeModels(
+  options: ClaudeModelDiscoveryOptions,
+  openQuery: OpenDiscoveryQuery = claudeQuery,
+): Promise<ModelInfo[]> {
+  const controller = new AbortController();
+  const signal = options.signal
+    ? AbortSignal.any([options.signal, controller.signal])
+    : controller.signal;
+  const timer = setTimeout(
+    () => controller.abort(new Error("Claude model discovery timed out")),
+    5_000,
+  );
+  let endInput!: () => void;
+  const ended = new Promise<void>((resolve) => {
+    endInput = resolve;
+  });
+  const input: AsyncIterable<SDKUserMessage> = {
+    [Symbol.asyncIterator]() {
+      return {
+        next: async () => {
+          await ended;
+          return { done: true, value: undefined };
+        },
+      };
+    },
+  };
+  let query: ReturnType<OpenDiscoveryQuery> | undefined;
+  let child: ChildProcess | undefined;
+  try {
+    signal.throwIfAborted();
+    const binary = await raceProviderRefreshAbort(signal, options.resolveBinary());
+    query = openQuery(
+      {
+        prompt: input,
+        options: {
+          pathToClaudeCodeExecutable: binary,
+          cwd: os.homedir(),
+          env: options.env,
+          persistSession: false,
+          tools: [],
+          mcpServers: {},
+          strictMcpConfig: true,
+          settingSources: ["user"],
+          settings: { disableAllHooks: true },
+          abortController: controller,
+        },
+      },
+      {
+        runtimeSettings: options.runtimeSettings,
+        onChildProcess: (process) => {
+          child = process;
+        },
+      },
+    );
+    return await raceProviderRefreshAbort(signal, query.supportedModels());
+  } finally {
+    clearTimeout(timer);
+    endInput();
+    try {
+      query?.close();
+    } finally {
+      if (child) {
+        await terminateWithTreeKill(child, { gracefulTimeoutMs: 200, forceTimeoutMs: 200 });
+      }
+    }
+  }
+}
diff --git a/packages/server/src/server/agent/providers/claude/model-manifest.ts b/packages/server/src/server/agent/providers/claude/model-manifest.ts
index 398fcb1ccd..45a5441109 100644
--- a/packages/server/src/server/agent/providers/claude/model-manifest.ts
+++ b/packages/server/src/server/agent/providers/claude/model-manifest.ts
@@ -9,6 +9,7 @@ interface ClaudeModelManifestEntry {
   description: string;
   defaultPriority?: number;
   minimumClaudeCodeVersion?: string;
+  requiresDiscovery?: boolean;
   contextWindowMaxTokens?: number;
   effortLevels?: readonly ClaudeEffortLevel[];
   defaultThinkingOptionId?: ClaudeEffortLevel;
@@ -57,6 +58,14 @@ export const CLAUDE_MODEL_MANIFEST = [
     supportsThinkingDisabled: true,
     supportsFastMode: true,
   },
+  {
+    id: "claude-mythos-5-1",
+    label: "Mythos 5.1",
+    requiresDiscovery: true,
+    description: "Mythos 5.1 · Requires verified access",
+    contextWindowMaxTokens: 1_000_000,
+    effortLevels: CLAUDE_EFFORT_LEVELS.xhigh,
+  },
   {
     id: "claude-fable-5-1",
     label: "Fable 5.1",
@@ -217,9 +226,16 @@ function buildThinkingOptions(
   return options;
 }
 
-export function getClaudeManifestModels(claudeCodeVersion?: string): AgentModelDefinition[] {
+export function getClaudeManifestModels(
+  claudeCodeVersion?: string,
+  discoveredModelIds?: ReadonlySet<string>,
+): AgentModelDefinition[] {
   const availableModels: readonly ClaudeModelManifestEntry[] = CLAUDE_MODEL_MANIFEST.filter(
-    (model) => isModelAvailableInClaudeCode(model, claudeCodeVersion),
+    (model) =>
+      isModelAvailableInClaudeCode(model, claudeCodeVersion) &&
+      (discoveredModelIds === undefined ||
+        !("requiresDiscovery" in model && model.requiresDiscovery) ||
+        discoveredModelIds.has(model.id)),
   );
   const defaultModel = availableModels.reduce<ClaudeModelManifestEntry | undefined>(
     (selected, candidate) =>
@@ -359,7 +375,7 @@ export function normalizeClaudeManifestModelId(value: string | null | undefined)
   }
 
   const singleSegmentMatch = trimmed.match(
-    /^(?:claude[-_ ])?(fable|opus|sonnet|haiku)[-_ ]+(\d+)(?:\[1m\])?(?:[-_ ]+\d{8})?(?:\[1m\])?$/i,
+    /^(?:claude[-_ ])?(mythos|fable|opus|sonnet|haiku)[-_ ]+(\d+)(?:\[1m\])?(?:[-_ ]+\d{8})?(?:\[1m\])?$/i,
   );
   if (singleSegmentMatch) {
     return normalizeSingleSegmentClaudeModelId(
@@ -370,7 +386,7 @@ export function normalizeClaudeManifestModelId(value: string | null | undefined)
   }
 
   const runtimeMatch = trimmed.match(
-    /^(?:claude[-_ ])?(fable|opus|sonnet|haiku)[-_ ]+(\d+)[-.](\d+)(?:\[1m\])?(?:[-_ ]+\d{8})?(?:\[1m\])?$/i,
+    /^(?:claude[-_ ])?(mythos|fable|opus|sonnet|haiku)[-_ ]+(\d+)[-.](\d+)(?:\[1m\])?(?:[-_ ]+\d{8})?(?:\[1m\])?$/i,
   );
   if (!runtimeMatch) {
     return null;
@@ -403,7 +419,7 @@ export function normalizeClaudeRuntimeModelId(value: string | null | undefined):
   }
 
   const runtimeMatch = trimmed.match(
-    /claude[-_ ](fable|opus|sonnet|haiku)[-_ ]+(\d+)[-.](\d+)(\[1m\])?/i,
+    /claude[-_ ](mythos|fable|opus|sonnet|haiku)[-_ ]+(\d+)[-.](\d+)(\[1m\])?/i,
   );
   if (runtimeMatch) {
     const normalizedModelId = normalizeMajorMinorClaudeModelId(
@@ -418,7 +434,7 @@ export function normalizeClaudeRuntimeModelId(value: string | null | undefined):
   }
 
   const singleSegmentMatch = trimmed.match(
-    /claude[-_ ](fable|opus|sonnet|haiku)[-_ ]+(\d+)(\[1m\])?/i,
+    /claude[-_ ](mythos|fable|opus|sonnet|haiku)[-_ ]+(\d+)(\[1m\])?/i,
   );
   if (!singleSegmentMatch) {
     return null;
diff --git a/packages/server/src/server/agent/providers/claude/models.test.ts b/packages/server/src/server/agent/providers/claude/models.test.ts
index ed7db8841c..1ef8177bbf 100644
--- a/packages/server/src/server/agent/providers/claude/models.test.ts
+++ b/packages/server/src/server/agent/providers/claude/models.test.ts
@@ -13,6 +13,8 @@ import {
   parseClaudeCodeVersion,
   resolveClaudeDisabledThinkingForModel,
 } from "./model-manifest.js";
+import { discoverClaudeModels } from "./model-discovery.js";
+import type { ModelInfo } from "@anthropic-ai/claude-agent-sdk";
 import { findClaudeModel, getClaudeModels, normalizeClaudeRuntimeModelId } from "./models.js";
 
 const createdClaudeConfigDirs: string[] = [];
@@ -43,6 +45,14 @@ function createCatalogClient(claudeCodeVersion = "2.1.293"): ClaudeAgentClient {
   return new ClaudeAgentClient({
     logger: createTestLogger(),
     resolveVersion: async () => claudeCodeVersion,
+    discoverModels: async () => [
+      {
+        value: "mythos",
+        resolvedModel: "claude-mythos-5-1",
+        displayName: "Mythos",
+        description: "",
+      },
+    ],
   });
 }
 
@@ -52,6 +62,7 @@ describe("getClaudeModels", () => {
     expect(models.map((m) => m.id)).toEqual([
       "claude-opus-5-5",
       "claude-opus-5",
+      "claude-mythos-5-1",
       "claude-fable-5-1",
       "claude-fable-5",
       "claude-fable-5[1m]",
@@ -87,6 +98,7 @@ describe("getClaudeModels", () => {
       new Map([
         ["claude-opus-5-5", 1_000_000],
         ["claude-opus-5", 1_000_000],
+        ["claude-mythos-5-1", 1_000_000],
         ["claude-fable-5-1", 1_000_000],
         ["claude-fable-5", 1_000_000],
         ["claude-fable-5[1m]", 1_000_000],
@@ -221,6 +233,118 @@ describe("getClaudeModels", () => {
 });
 
 describe("ClaudeAgentClient.fetchCatalog", () => {
+  it.each([
+    { value: "mythos", resolvedModel: "claude-mythos-5-1", expected: true },
+    { value: "claude-mythos-5-1", expected: true },
+    { value: "claude-mythos-5-1[1m]", expected: true },
+    { value: "global.anthropic.claude-mythos-5-1", expected: true },
+    { value: "mythos", expected: false },
+    { value: "mythos", resolvedModel: "claude-mythos-5-2", expected: false },
+    { value: "claude-mythos-5-1", resolvedModel: "claude-fable-5-1", expected: false },
+  ])(
+    "uses advertised identity $value / $resolvedModel to gate Mythos",
+    async ({ value, resolvedModel, expected }) => {
+      const configDir = await createClaudeConfigDir({});
+      const client = new ClaudeAgentClient({
+        logger: createTestLogger(),
+        resolveVersion: async () => "2.1.293",
+        runtimeSettings: { env: { CLAUDE_CONFIG_DIR: configDir } },
+        discoverModels: async () => [
+          { value, resolvedModel, displayName: "Untrusted label", description: "" },
+        ],
+      });
+      const { models } = await client.fetchCatalog({
+        scope: "workspace",
+        cwd: configDir,
+        force: false,
+      });
+      expect(models.find((model) => model.id === "claude-mythos-5-1")).toEqual(
+        expected ? findClaudeModel("claude-mythos-5-1") : undefined,
+      );
+    },
+  );
+
+  it("preserves the curated catalog and explicitly configured models after discovery failure", async () => {
+    const configDir = await createClaudeConfigDir({ model: "claude-mythos-5-1" });
+    const client = new ClaudeAgentClient({
+      logger: createTestLogger(),
+      resolveVersion: async () => "2.1.293",
+      runtimeSettings: { env: { CLAUDE_CONFIG_DIR: configDir } },
+      discoverModels: async () => {
+        throw new Error("discovery unavailable");
+      },
+    });
+    const { models } = await client.fetchCatalog({
+      scope: "workspace",
+      cwd: configDir,
+      force: false,
+    });
+    expect(models.filter((model) => model.id !== "claude-mythos-5-1")).toEqual(
+      getClaudeModels("2.1.293").filter((model) => model.id !== "claude-mythos-5-1"),
+    );
+    expect(models.find((model) => model.id === "claude-mythos-5-1")).toEqual({
+      ...findClaudeModel("claude-mythos-5-1"),
+      label: "claude-mythos-5-1",
+      description: "From Claude settings.json model",
+    });
+  });
+
+  it("omits unconfirmed Mythos after a failed probe and retries on refresh", async () => {
+    const configDir = await createClaudeConfigDir({});
+    let fail = true;
+    const client = new ClaudeAgentClient({
+      logger: createTestLogger(),
+      resolveVersion: async () => "2.1.293",
+      runtimeSettings: { env: { CLAUDE_CONFIG_DIR: configDir } },
+      discoverModels: async () => {
+        if (fail) throw new Error("discovery unavailable");
+        return [
+          {
+            value: "mythos",
+            resolvedModel: "claude-mythos-5-1",
+            displayName: "Mythos",
+            description: "",
+          },
+        ];
+      },
+    });
+    const options = { scope: "workspace" as const, cwd: configDir, force: true };
+    expect(
+      (await client.fetchCatalog(options)).models.some((model) => model.id === "claude-mythos-5-1"),
+    ).toBe(false);
+    fail = false;
+    expect(
+      (await client.fetchCatalog(options)).models.find((model) => model.id === "claude-mythos-5-1"),
+    ).toEqual(findClaudeModel("claude-mythos-5-1"));
+  });
+
+  it("keeps the curated catalog when discovery does not advertise Mythos", async () => {
+    const configDir = await createClaudeConfigDir({});
+    const client = new ClaudeAgentClient({
+      logger: createTestLogger(),
+      resolveVersion: async () => "2.1.293",
+      runtimeSettings: { env: { CLAUDE_CONFIG_DIR: configDir } },
+      discoverModels: async () => [
+        {
+          value: "opus",
+          resolvedModel: "claude-opus-5-5",
+          displayName: "Opus",
+          description: "Latest",
+        },
+      ],
+    });
+    const { models } = await client.fetchCatalog({
+      scope: "workspace",
+      cwd: configDir,
+      force: false,
+    });
+    expect(models.map((model) => model.id)).toEqual(
+      getClaudeModels("2.1.293")
+        .filter((model) => model.id !== "claude-mythos-5-1")
+        .map((model) => model.id),
+    );
+  });
+
   it("appends concrete models from Claude settings.json", async () => {
     const configDir = await createClaudeConfigDir({
       model: "us.anthropic.claude-opus-4-7[1m]",
@@ -298,6 +422,7 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
     const client = new ClaudeAgentClient({
       logger: createTestLogger(),
       resolveVersion: async () => "2.1.280",
+      discoverModels: async () => [],
       runtimeSettings: { env: { CLAUDE_CONFIG_DIR: providerConfigDir } },
     });
 
@@ -724,3 +849,124 @@ describe("claudeManifestModelSupportsFastMode", () => {
     expect(claudeManifestModelSupportsFastMode("claude-fable-5-1")).toBe(false);
   });
 });
+
+describe("Claude Mythos 5.1 catalog", () => {
+  it("offers one 1M model with high default effort and always-on thinking", () => {
+    const models = getClaudeModels().filter((model) => model.id.startsWith("claude-mythos"));
+    expect(models).toHaveLength(1);
+    expect(models[0]).toMatchObject({
+      id: "claude-mythos-5-1",
+      label: "Mythos 5.1",
+      contextWindowMaxTokens: 1_000_000,
+      defaultThinkingOptionId: "high",
+    });
+    expect(models[0].thinkingOptions?.map((option) => option.id)).toEqual([
+      "low",
+      "medium",
+      "high",
+      "xhigh",
+      "max",
+      CLAUDE_ULTRACODE_THINKING_OPTION_ID,
+    ]);
+    expect(
+      models[0].thinkingOptions?.filter((option) => option.isDefault).map((option) => option.id),
+    ).toEqual(["high"]);
+    expect(resolveClaudeDisabledThinkingForModel("claude-mythos-5-1")).toEqual({
+      supported: false,
+      fallbackThinkingOptionId: "high",
+    });
+    expect(claudeManifestModelSupportsFastMode("claude-mythos-5-1")).toBe(false);
+    expect(getClaudeModels().find((model) => model.isDefault)?.id).toBe("claude-opus-5-5");
+  });
+
+  it.each([
+    "claude-mythos-5-1[1m]",
+    "claude-mythos-5-1-20260901",
+    "claude-mythos-5-1-20260901[1m]",
+    "Mythos 5.1",
+  ])("resolves %s to the single catalog entry", (id) => {
+    expect(findClaudeModel(id)?.id).toBe("claude-mythos-5-1");
+  });
+
+  it.each(["anthropic/claude-mythos-5-1", "us.anthropic.claude-mythos-5-1-v1:0"])(
+    "normalizes runtime identity without granting first-party capabilities: %s",
+    (id) => {
+      expect(normalizeClaudeRuntimeModelId(id)).toBe("claude-mythos-5-1");
+      expect(normalizeClaudeManifestModelId(id)).toBeNull();
+    },
+  );
+});
+
+describe("Claude model discovery process", () => {
+  it("does not send a prompt or persist a session and closes after discovery", async () => {
+    let closed = false;
+    let promptEnded: Promise<IteratorResult<unknown>> | undefined;
+    const advertised: ModelInfo[] = [
+      {
+        value: "mythos",
+        resolvedModel: "claude-mythos-5-1",
+        displayName: "Mythos",
+        description: "",
+      },
+    ];
+    const models = await discoverClaudeModels(
+      { resolveBinary: async () => "/claude", env: { CLAUDE_CONFIG_DIR: "/provider-config" } },
+      (input) => {
+        expect(input.options).toMatchObject({
+          pathToClaudeCodeExecutable: "/claude",
+          env: { CLAUDE_CONFIG_DIR: "/provider-config" },
+          persistSession: false,
+          tools: [],
+          mcpServers: {},
+          strictMcpConfig: true,
+          settingSources: ["user"],
+          settings: { disableAllHooks: true },
+        });
+        if (typeof input.prompt === "string") throw new Error("unexpected inference prompt");
+        promptEnded = input.prompt[Symbol.asyncIterator]().next();
+        return {
+          supportedModels: async () => advertised,
+          close: () => {
+            closed = true;
+          },
+        };
+      },
+    );
+    expect(models).toEqual(advertised);
+    expect(closed).toBe(true);
+    await expect(promptEnded).resolves.toEqual({ done: true, value: undefined });
+  });
+
+  it("times out and closes an unresponsive discovery process", async () => {
+    let closed = false;
+    await expect(
+      discoverClaudeModels({ resolveBinary: async () => "/claude", env: {} }, () => ({
+        supportedModels: () => new Promise(() => {}),
+        close: () => {
+          closed = true;
+        },
+      })),
+    ).rejects.toThrow("Claude model discovery timed out");
+    expect(closed).toBe(true);
+  }, 10_000);
+
+  it("closes a stalled probe when its refresh is canceled", async () => {
+    const controller = new AbortController();
+    const failure = new Error("refresh canceled");
+    let closed = false;
+    const result = discoverClaudeModels(
+      { resolveBinary: async () => "/claude", env: {}, signal: controller.signal },
+      () => ({
+        supportedModels: () => {
+          controller.abort(failure);
+          return new Promise(() => {});
+        },
+        close: () => {
+          closed = true;
+        },
+      }),
+    );
+    await expect(result).rejects.toBe(failure);
+    expect(closed).toBe(true);
+  });
+});
diff --git a/packages/server/src/server/agent/providers/claude/models.ts b/packages/server/src/server/agent/providers/claude/models.ts
index 6b341fa9ea..39e0dcf1dd 100644
--- a/packages/server/src/server/agent/providers/claude/models.ts
+++ b/packages/server/src/server/agent/providers/claude/models.ts
@@ -52,8 +52,9 @@ export async function getClaudeModelsWithSettings(
   logger: Logger,
   configDir: string,
   claudeCodeVersion?: string,
+  discoveredModelIds: ReadonlySet<string> = new Set(),
 ): Promise<AgentModelDefinition[]> {
-  const hardcodedModels = getClaudeModels(claudeCodeVersion);
+  const hardcodedModels = getClaudeManifestModels(claudeCodeVersion, discoveredModelIds);
   const settingsModels = await readClaudeSettingsModels(logger, configDir);
   if (settingsModels.length === 0) {
     return hardcodedModels;
@@ -70,7 +71,10 @@ export async function getClaudeModelsWithSettings(
       }
       continue;
     }
-    models.push(model);
+    const manifestModel = getClaudeModels(claudeCodeVersion).find(
+      (candidate) => candidate.id === model.id,
+    );
+    models.push({ ...manifestModel, ...model });
   }
 
   return models;
diff --git a/packages/server/src/server/worktree-bootstrap.posix.test.ts b/packages/server/src/server/worktree-bootstrap.posix.test.ts
index a0a796c83d..41de520d09 100644
--- a/packages/server/src/server/worktree-bootstrap.posix.test.ts
+++ b/packages/server/src/server/worktree-bootstrap.posix.test.ts
@@ -422,12 +422,12 @@ describe.skipIf(isPlatform("win32"))("worktree-bootstrap POSIX-only", () => {
             api: {
               type: "service",
               command:
-                "node -e \"const fs=require('fs'); fs.writeFileSync('api-env.json', JSON.stringify(process.env)); setTimeout(()=>{}, 30000)\"",
+                "node -e \"const fs=require('fs'); fs.writeFileSync('api-env.json.tmp', JSON.stringify(process.env)); fs.renameSync('api-env.json.tmp', 'api-env.json'); setTimeout(()=>{}, 30000)\"",
             },
             web: {
               type: "service",
               command:
-                "node -e \"const fs=require('fs'); fs.writeFileSync('web-env.json', JSON.stringify(process.env)); setTimeout(()=>{}, 30000)\"",
+                "node -e \"const fs=require('fs'); fs.writeFileSync('web-env.json.tmp', JSON.stringify(process.env)); fs.renameSync('web-env.json.tmp', 'web-env.json'); setTimeout(()=>{}, 30000)\"",
             },
           },
         }),
diff --git a/plugins/claude-usage-source/server/stores.test.ts b/plugins/claude-usage-source/server/stores.test.ts
index c830fca9cc..9859fcc902 100644
--- a/plugins/claude-usage-source/server/stores.test.ts
+++ b/plugins/claude-usage-source/server/stores.test.ts
@@ -1,6 +1,7 @@
 import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { DatabaseSync } from "node:sqlite";
 import { afterEach, beforeEach, expect, test } from "vitest";
 import { discover, fetchUsage } from "./usage.js";
 
@@ -43,7 +44,6 @@ async function logins(options: Parameters<typeof discover>[1]) {
 }
 async function database(path: string) {
   await mkdir((await import("node:path")).dirname(path), { recursive: true });
-  const { DatabaseSync } = await import("node:sqlite");
   const db = new DatabaseSync(path);
   db.exec(
     "CREATE TABLE auth_credentials (id INTEGER PRIMARY KEY, provider TEXT, credential_type TEXT, data TEXT, disabled_cause TEXT)",
@@ -248,7 +248,6 @@ test("OMP fetch re-reads its row after rotation and skips a newly disabled login
   const path = join(home, ".omp", "agent", "agent.db");
   await database(path);
   const [input] = await logins(lookup());
-  const { DatabaseSync } = await import("node:sqlite");
   const db = new DatabaseSync(path);
   db.prepare("UPDATE auth_credentials SET data = ? WHERE id = 1").run(
     JSON.stringify({ access: "fixture-rotated-omp", accountId: "omp-account", expires: 2000 }),

From b26b9234c0f088ed97abbaa981f002da7817498e Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 9 Oct 2026 21:31:06 +0100
Subject: [PATCH 071/270] Improve diff review with mobile comment sheets and
 direct feedback (#6455)

* feat(review): edit compact diff comments in a sheet

* feat(review): send diff feedback to workspace agents

Send saved reviews from the diff while retaining file navigation and unrelated composer drafts. Clear acknowledged versions only so comments edited or added during submission remain available.

* fix(review): preserve drafts and coordinate feedback across surfaces

Share pending submission ownership by draft while keeping recipient menus local. Retain editable text across presentation changes and acknowledgement, and reserve safe-area clearance for floating actions.

* fix(review): center a small primary feedback button on desktop

* fix(review): restore focus to feedback button after closing menu
---
 .../e2e/browser/composer-diff-stat.spec.ts    | 704 +++++++++++++++++-
 .../e2e/support/helpers/agent-message-gate.ts |   5 +
 packages/app/src/components/ui/button.tsx     |   1 +
 .../components/ui/floating-action-button.tsx  |  89 ++-
 .../ui/floating-action-layout.test.ts         |  17 +
 .../components/ui/floating-action-layout.ts   |  15 +
 .../visibility-tracker.test.ts                |   9 +
 .../visibility-tracker.ts                     |   3 +
 .../src/git/diff-document/hit-testing.test.ts |   1 +
 .../app/src/git/diff-document/model.test.ts   |   2 +
 packages/app/src/git/diff-pane.tsx            |  67 +-
 packages/app/src/git/jump-to-file/index.tsx   |   3 +
 packages/app/src/git/use-working-diff.ts      |  13 +-
 packages/app/src/i18n/resources/ar.ts         |  12 +
 packages/app/src/i18n/resources/en.ts         |  12 +
 packages/app/src/i18n/resources/es.ts         |  12 +
 packages/app/src/i18n/resources/fr.ts         |  13 +
 packages/app/src/i18n/resources/ja.ts         |  13 +
 packages/app/src/i18n/resources/ko.ts         |  12 +
 packages/app/src/i18n/resources/pt-BR.ts      |  12 +
 packages/app/src/i18n/resources/ru.ts         |  12 +
 packages/app/src/i18n/resources/zh-CN.ts      |  12 +
 packages/app/src/review/comment-sheet.tsx     | 106 +++
 packages/app/src/review/editor/index.test.ts  | 145 ++++
 packages/app/src/review/editor/index.ts       |  84 +++
 .../app/src/review/feedback/index.test.ts     | 272 +++++++
 packages/app/src/review/feedback/index.ts     | 177 +++++
 packages/app/src/review/feedback/surface.tsx  | 284 +++++++
 .../app/src/review/feedback/use-feedback.ts   | 120 +++
 packages/app/src/review/geometry.ts           |   1 +
 packages/app/src/review/index.ts              |   5 +
 packages/app/src/review/store.test.ts         |  57 +-
 packages/app/src/review/store.ts              |  40 +
 packages/app/src/review/surface.test.tsx      |  96 +--
 packages/app/src/review/surface.tsx           | 134 ++--
 35 files changed, 2366 insertions(+), 194 deletions(-)
 create mode 100644 packages/app/src/components/ui/floating-action-layout.test.ts
 create mode 100644 packages/app/src/components/ui/floating-action-layout.ts
 create mode 100644 packages/app/src/review/comment-sheet.tsx
 create mode 100644 packages/app/src/review/editor/index.test.ts
 create mode 100644 packages/app/src/review/editor/index.ts
 create mode 100644 packages/app/src/review/feedback/index.test.ts
 create mode 100644 packages/app/src/review/feedback/index.ts
 create mode 100644 packages/app/src/review/feedback/surface.tsx
 create mode 100644 packages/app/src/review/feedback/use-feedback.ts

diff --git a/packages/app/e2e/browser/composer-diff-stat.spec.ts b/packages/app/e2e/browser/composer-diff-stat.spec.ts
index 455c58180a..00705faccd 100644
--- a/packages/app/e2e/browser/composer-diff-stat.spec.ts
+++ b/packages/app/e2e/browser/composer-diff-stat.spec.ts
@@ -1,7 +1,14 @@
+import type { Locator } from "@playwright/test";
 import { writeFile } from "node:fs/promises";
 import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { gateNextAgentMessage } from "../support/helpers/agent-message-gate";
+import {
+  fillComposerDraft,
+  expectComposerDraft,
+  attachFileFromMenu,
+} from "../support/helpers/composer";
 import { ensureExplorerSidebar, openFilesPanel } from "../support/helpers/workspace-tabs";
 
 const APP_SETTINGS_KEY = "@paseo:app-settings";
@@ -26,14 +33,19 @@ async function openComposerDiff(page: Page) {
   await composerChangesPill(page).click();
 }
 
-async function seedChangedAgent(repoPrefix: string) {
+async function seedChangedAgent(
+  repoPrefix: string,
+  featureValues?: Record<string, unknown>,
+  files: Array<{ path: string; content: string }> = [],
+) {
   const workspace = await seedMockAgentWorkspace({
     repoPrefix,
+    featureValues,
     title: "Composer diff stat",
     repo: {
       withRemote: true,
       // Exclude the local remote before the daemon starts observing this checkout.
-      files: [{ path: ".gitignore", content: "/remote.git/\n" }],
+      files: [{ path: ".gitignore", content: "/remote.git/\n" }, ...files],
     },
   });
   try {
@@ -156,3 +168,691 @@ test("composer diff stat reveals Changes, then opens the diff in the focused pan
     await workspace.cleanup();
   }
 });
+
+async function tapFirstAddedDiffLine(
+  page: Page,
+  surface: Locator = page.getByTestId("working-diff-panel"),
+) {
+  const body = surface.getByTestId("diff-file-0-body");
+  await expect(body).toBeVisible({ timeout: 30000 });
+  const bounds = await body.boundingBox();
+  if (!bounds) throw new Error("Expanded diff body has no bounds");
+  const fontSize = await surface
+    .getByTestId("git-diff-canvas")
+    .evaluate((element) => Number.parseFloat(getComputedStyle(element).fontSize));
+  await page.touchscreen.tap(bounds.x + 120, bounds.y + Math.round(fontSize * 1.5) * 2.5);
+}
+
+async function openReviewDiff(page: Page, workspace: Awaited<ReturnType<typeof seedChangedAgent>>) {
+  await page.setViewportSize({ width: 1400, height: 900 });
+  await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: workspace.agentId });
+  await expect(composerChangesPill(page)).toBeVisible({ timeout: 30000 });
+  if (await page.getByTestId("workspace-tab-working_diff").count()) {
+    await selectDiffTab(page);
+  } else {
+    await revealComposerChangesInExplorer(page);
+    await openComposerDiff(page);
+  }
+  await expect(page.getByTestId("diff-file-0-body")).toBeVisible();
+}
+
+async function saveReviewComment(page: Page, body: string) {
+  await page.getByRole("textbox", { name: "Review comment" }).fill(body);
+  await page.getByRole("button", { name: "Save review comment", exact: true }).click();
+  await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+}
+
+async function cancelReviewComment(page: Page) {
+  await page.getByRole("button", { name: "Cancel review comment", exact: true }).click();
+  await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+}
+
+test.describe("review comments", () => {
+  test.use({ hasTouch: true });
+
+  test("compact review comments open a sheet and preserve saved comments through save, edit, cancel and reload", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("compact-review-comment-");
+    try {
+      await test.step("Open a compact sheet with reachable input and actions", async () => {
+        await openReviewDiff(page, workspace);
+        await showCompactLayout(page);
+        await tapFirstAddedDiffLine(page);
+        await expectCompactCommentSheet(page);
+      });
+      await test.step("Save, discard an edit, then save an updated comment", async () => {
+        await saveReviewComment(page, "  Please simplify this.  ");
+        await expectSavedReview(page, "Please simplify this.");
+        await editSavedReview(page, "Please simplify this.");
+        await fillReviewComment(page, "Discard this edit");
+        await cancelReviewComment(page);
+        await expectSavedReview(page, "Please simplify this.");
+        await editSavedReview(page, "Please simplify this.");
+        await saveReviewComment(page, "Updated comment");
+        await expectSavedReview(page, "Updated comment");
+      });
+      await test.step("Discard a new comment and retain the saved one after reload", async () => {
+        await tapFirstAddedDiffLine(page);
+        await fillReviewComment(page, "Discard new comment");
+        await cancelReviewComment(page);
+        await expectReviewAbsent(page, "Discard new comment");
+        await reloadReview(page);
+        await expectSavedReview(page, "Updated comment");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("wide review comments retain inline editing", async ({ page }) => {
+    const workspace = await seedChangedAgent("wide-review-comment-");
+    try {
+      await test.step("Save and cancel an inline edit on a wide screen", async () => {
+        await openReviewDiff(page, workspace);
+        await tapFirstAddedDiffLine(page);
+        await expectInlineCommentEditor(page);
+        await saveReviewComment(page, "Wide comment");
+        await expectSavedReview(page, "Wide comment");
+        await editSavedReview(page, "Wide comment");
+        await expectInlineCommentEditor(page);
+        await cancelReviewComment(page);
+        await expectSavedReview(page, "Wide comment");
+      });
+      await test.step("The existing composer still sends the review", async () => {
+        await sendReviewThroughComposer(page, workspace.agentId);
+        await selectDiffTab(page);
+        await expectReviewAbsent(page, "Wide comment");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+});
+
+async function sendReviewThroughComposer(page: Page, agentId: string) {
+  await page.getByTestId(`workspace-tab-agent_${agentId}`).click();
+  await expect(page.getByTestId("composer-review-attachment-pill")).toBeVisible();
+  await page.getByRole("textbox", { name: "Message agent..." }).fill("Address this review");
+  await page.getByRole("button", { name: "Send message", exact: true }).click();
+  await expect(page.getByText("Address this review", { exact: true }).first()).toBeVisible();
+  await expect(page.getByTestId("composer-review-attachment-pill")).toHaveCount(0);
+}
+
+async function addSavedReview(
+  page: Page,
+  body: string,
+  surface: Locator = page.getByTestId("working-diff-panel"),
+) {
+  await tapFirstAddedDiffLine(page, surface);
+  await saveReviewComment(page, body);
+  await expectSavedReview(page, body, surface);
+}
+
+async function expectSavedReview(
+  page: Page,
+  body: string,
+  surface: Locator = page.getByTestId("working-diff-panel"),
+) {
+  await expect(surface.getByText(body, { exact: true })).toBeVisible();
+}
+
+async function editSavedReview(page: Page, expectedBody: string) {
+  await page
+    .getByTestId("working-diff-panel")
+    .getByRole("button", { name: "Edit review comment", exact: true })
+    .click();
+  await expect(page.getByRole("textbox", { name: "Review comment" })).toHaveValue(expectedBody);
+}
+
+async function sendFeedback(page: Page, count: number) {
+  await page.getByRole("button", { name: `Send feedback (${count})`, exact: true }).click();
+}
+
+async function expectFeedbackSent(page: Page, recipient: string) {
+  await expect(page.getByText(`Feedback sent to ${recipient}`, { exact: true })).toBeVisible();
+  await expect(page.getByTestId("working-diff-panel")).toBeVisible();
+}
+
+test.describe("send review feedback", () => {
+  test.use({ hasTouch: true });
+
+  test("compact feedback sends directly to the only workspace agent and preserves its composer draft", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-feedback-single-");
+    try {
+      await test.step("Save a review without changing the chat draft", async () => {
+        await openReviewDiff(page, workspace);
+        await selectAgentTab(page, workspace.agentId);
+        await fillComposerDraft(page, "Keep this thought");
+        await attachFileFromMenu(page, {
+          name: "unrelated.txt",
+          mimeType: "text/plain",
+          buffer: Buffer.from("Unrelated draft attachment"),
+        });
+        await selectDiffTab(page);
+        await showCompactLayout(page);
+        await addSavedReview(page, "Please simplify this.");
+      });
+      await test.step("Send directly and stay on the diff", async () => {
+        await sendFeedback(page, 1);
+        await expectFeedbackSent(page, "Composer diff stat");
+        await expectReviewAbsent(page, "Please simplify this.");
+        await captureFeedback(page, "single");
+      });
+      await test.step("Return to the untouched composer draft", async () => {
+        await showWideLayout(page);
+        await selectAgentTab(page, workspace.agentId);
+        await expectComposerDraft(page, "Keep this thought");
+        await expect(page.getByText("unrelated.txt", { exact: true })).toBeVisible();
+        await expect(page.getByTestId("composer-review-attachment-pill")).toHaveCount(0);
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+  test("feedback pending ownership follows the draft across Diff and compact Changes", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-shared-pending-");
+    const gate = await gateNextAgentMessage(page);
+    try {
+      await test.step("Send feedback from the Diff tab and hold its real request", async () => {
+        await openReviewDiff(page, workspace);
+        await showCompactLayout(page);
+        await addSavedReview(page, "One draft across surfaces");
+        await sendFeedback(page, 1);
+        await gate.waitForRequest();
+      });
+      await test.step("The compact Changes surface observes the same pending operation", async () => {
+        await revealCompactChanges(page);
+        await expect(
+          compactReviewSurface(page).getByRole("button", {
+            name: "Sending feedback (1)",
+            exact: true,
+          }),
+        ).toBeDisabled();
+        expect(gate.requestCount()).toBe(1);
+        gate.accept();
+        await expect(
+          compactReviewSurface(page).getByText("Feedback sent to Composer diff stat", {
+            exact: true,
+          }),
+        ).toBeVisible();
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("an unsaved review survives presentation changes and acknowledgement before Save", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-editor-ownership-");
+    const gate = await gateNextAgentMessage(page);
+    try {
+      await test.step("Carry unsaved inline text into the compact sheet and back", async () => {
+        await openReviewDiff(page, workspace);
+        await tapFirstAddedDiffLine(page);
+        await fillReviewComment(page, "Body across presentations");
+        await showCompactLayout(page);
+        await expectReviewEditorBody(page, "Body across presentations");
+        await showWideLayout(page);
+        await expectReviewEditorBody(page, "Body across presentations");
+        await saveReviewComment(page, "Body across presentations");
+      });
+      await test.step("Keep an open edit saveable after acknowledgement removes its original", async () => {
+        await sendFeedback(page, 1);
+        await gate.waitForRequest();
+        await editSavedReview(page, "Body across presentations");
+        await fillReviewComment(page, "Keep this unsaved edit");
+        gate.accept();
+        await expectFeedbackSent(page, "Composer diff stat");
+        await expectReviewEditorBody(page, "Keep this unsaved edit");
+        await showCompactLayout(page);
+        await expectReviewEditorBody(page, "Keep this unsaved edit");
+        await saveReviewComment(page, "Keep this unsaved edit");
+        await expectSavedReview(page, "Keep this unsaved edit");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("saved feedback preserves navigation across multiple diff files", async ({ page }) => {
+    const workspace = await seedMultiFileReview();
+    try {
+      await test.step("Save compact feedback and retain both floating actions", async () => {
+        await openCompactReviewExplorer(page, workspace);
+        await addSavedReview(page, "Keep file navigation available", compactReviewSurface(page));
+        await expectReviewNavigationReachable(page);
+      });
+      await test.step("Jump to another file without covering the feedback action", async () => {
+        await jumpToReviewFile(page, "z-last.ts");
+        await scrollReviewToLastLine(page);
+        await expectReviewNavigationReachable(page);
+        await captureFeedback(page, "navigation-compact");
+      });
+      await test.step("Wide file navigation and feedback remain reachable", async () => {
+        await openReviewDiff(page, workspace);
+        await navigateWideReviewFile(page, "README.md");
+        await expectFeedbackReachable(page);
+        await expectSavedReview(page, "Keep file navigation available");
+        await captureFeedback(page, "navigation-wide");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("feedback sends only matching comments and preserves orphaned comments", async ({
+    page,
+  }) => {
+    const workspace = await seedMultiFileReview();
+    try {
+      await test.step("A saved comment whose diff disappears has no sendable context", async () => {
+        await openReviewDiff(page, workspace);
+        await showCompactLayout(page);
+        await addSavedReview(page, "Retain this orphan");
+        await setReadmeDiff(workspace, false);
+        await expectUnmatchedFeedback(page);
+      });
+      await test.step("Send the matching subset with an accurate count", async () => {
+        await addSavedReview(page, "Send this matching comment");
+        await sendFeedback(page, 1);
+        await expectFeedbackSent(page, "Composer diff stat");
+        await expectReviewAbsent(page, "Send this matching comment");
+        await expectUnmatchedFeedback(page);
+      });
+      await test.step("Restoring the missing diff reveals the unsent comment", async () => {
+        await setReadmeDiff(workspace, true);
+        await expectSavedReview(page, "Retain this orphan");
+        await expectFeedbackReachable(page);
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("zero open agent tabs retain feedback with a disabled reason", async ({ page }) => {
+    const workspace = await seedChangedAgent("review-feedback-zero-");
+    try {
+      await test.step("Close the agent tab while keeping the review", async () => {
+        await openReviewDiff(page, workspace);
+        await addSavedReview(page, "Keep until an agent is opened");
+        await closeAgentTab(page, workspace.agentId);
+      });
+      await test.step("The disabled action explains why in wide and compact layouts", async () => {
+        await expectFeedbackUnavailable(page);
+        await captureFeedback(page, "zero-wide");
+        await showCompactLayout(page);
+        await expectFeedbackUnavailable(page);
+        await expectSavedReview(page, "Keep until an agent is opened");
+        await captureFeedback(page, "zero-compact");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("only open tabs in this workspace appear in compact and wide recipient menus", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-feedback-multiple-");
+    const other = await seedChangedAgent("review-feedback-other-");
+    try {
+      const second = await createReviewRecipient(workspace, "Second reviewer");
+      const historical = await createReviewRecipient(workspace, "Closed historical agent");
+      await test.step("Open two local tabs and a tab in another workspace", async () => {
+        await openReviewDiff(page, other);
+        await addSavedReview(page, "Other workspace review");
+        await openReviewDiff(page, workspace);
+        await closeAgentTab(page, historical.id);
+        await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: second.id });
+        await selectDiffTab(page);
+        await addSavedReview(page, "Review for second agent");
+      });
+      await test.step("The wide menu includes only local open agents", async () => {
+        await captureWideFeedbackAppearance(page);
+      });
+      await test.step("Escape returns keyboard focus to feedback so the chooser can reopen", async () => {
+        await openFeedbackWithKeyboard(page);
+        await dismissRecipientMenu(page);
+        await expectFeedbackFocused(page);
+        await reopenFeedbackWithKeyboard(page);
+        await dismissRecipientMenu(page);
+        await expectFeedbackFocused(page);
+      });
+      await test.step("Choose the second agent in the compact menu and stay on the diff", async () => {
+        await showCompactLayout(page);
+        await captureFeedback(page, "cta-compact");
+        await sendFeedback(page, 1);
+        await expectRecipientMenu(page);
+        await captureFeedback(page, "menu-compact");
+        await chooseFeedbackRecipient(page, "Second reviewer");
+        await expectFeedbackSent(page, "Second reviewer");
+        await expectReviewAbsent(page, "Review for second agent");
+      });
+      await test.step("The other workspace's saved review remains", async () => {
+        await openReviewDiff(page, other);
+        await expectSavedReview(page, "Other workspace review");
+      });
+    } finally {
+      await workspace.cleanup();
+      await other.cleanup();
+    }
+  });
+
+  test("failed feedback remains editable and retries through the real provider", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-feedback-retry-", { mockPromptRejections: 1 });
+    try {
+      await test.step("A provider rejection retains the saved review", async () => {
+        await openReviewDiff(page, workspace);
+        await showCompactLayout(page);
+        await addSavedReview(page, "Initial feedback");
+        await sendFeedback(page, 1);
+        await expectFeedbackFailure(page);
+        await expectSavedReview(page, "Initial feedback");
+        await captureFeedback(page, "failure");
+      });
+      await test.step("Edit the retained feedback and retry successfully", async () => {
+        await editSavedReview(page, "Initial feedback");
+        await saveReviewComment(page, "Corrected feedback");
+        await sendFeedback(page, 1);
+        await expectFeedbackSent(page, "Composer diff stat");
+        await expectReviewAbsent(page, "Corrected feedback");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("pending feedback blocks repeat submission and preserves edits and additions", async ({
+    page,
+  }) => {
+    const workspace = await seedChangedAgent("review-feedback-pending-");
+    const gate = await gateNextAgentMessage(page);
+    try {
+      await test.step("Hold the real request while feedback is pending", async () => {
+        await openReviewDiff(page, workspace);
+        await showCompactLayout(page);
+        await addSavedReview(page, "Sent version");
+        await sendFeedback(page, 1);
+        const request = await gate.waitForRequest();
+        expect(request.agentId).toBe(workspace.agentId);
+        expect(request.text).toBe("Please address this code review.");
+        expect(request.attachments).toMatchObject([
+          {
+            type: "review",
+            cwd: workspace.cwd,
+            comments: [
+              {
+                filePath: "README.md",
+                lineNumber: 2,
+                body: "Sent version",
+                context: { targetLine: { content: "export const one = 1;", newLineNumber: 2 } },
+              },
+            ],
+          },
+        ]);
+        await expectFeedbackPending(page);
+      });
+      await test.step("Save an edit and another comment before acknowledgement", async () => {
+        await editSavedReview(page, "Sent version");
+        await saveReviewComment(page, "Edited during send");
+        await addSavedReview(page, "Added during send");
+        await expectFeedbackPending(page);
+        expect(gate.requestCount()).toBe(1);
+        await captureFeedback(page, "pending");
+      });
+      await test.step("A real acknowledgement preserves both new versions", async () => {
+        gate.accept();
+        await expectFeedbackSent(page, "Composer diff stat");
+        await expectSavedReview(page, "Edited during send");
+        await expectSavedReview(page, "Added during send");
+        await expectReviewAbsent(page, "Sent version");
+      });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+});
+
+async function showCompactLayout(page: Page) {
+  await page.setViewportSize({ width: 390, height: 844 });
+}
+async function showWideLayout(page: Page) {
+  await page.setViewportSize({ width: 1400, height: 900 });
+}
+async function selectAgentTab(page: Page, agentId: string) {
+  await page.getByTestId(`workspace-tab-agent_${agentId}`).click({ position: { x: 12, y: 13 } });
+}
+async function selectDiffTab(page: Page) {
+  await page.getByTestId("workspace-tab-working_diff").click({ position: { x: 12, y: 13 } });
+}
+async function fillReviewComment(page: Page, body: string) {
+  await page.getByRole("textbox", { name: "Review comment" }).fill(body);
+}
+async function expectReviewAbsent(page: Page, body: string) {
+  await expect(page.getByTestId("working-diff-panel").getByText(body, { exact: true })).toHaveCount(
+    0,
+  );
+}
+async function reloadReview(page: Page) {
+  await page.reload();
+  await expect(page.getByTestId("working-diff-panel")).toBeVisible({ timeout: 30000 });
+}
+async function expectInlineCommentEditor(page: Page) {
+  await expect(page.getByTestId("inline-review-editor")).toBeVisible();
+  await expect(page.getByTestId("review-comment-sheet")).toHaveCount(0);
+}
+async function expectCompactCommentSheet(page: Page) {
+  await expect(page.getByTestId("review-comment-sheet")).toBeVisible();
+  await expect(page.getByText("README.md · +2", { exact: true })).toBeVisible();
+  await expect(page.getByRole("textbox", { name: "Review comment" })).toBeInViewport({ ratio: 1 });
+  for (const action of ["Save", "Cancel"])
+    await expect(
+      page.getByRole("button", { name: `${action} review comment`, exact: true }),
+    ).toBeInViewport({ ratio: 1 });
+  await expect(page.getByTestId("inline-review-editor")).toHaveCount(0);
+  await expect(
+    page.getByRole("button", { name: "Save review comment", exact: true }),
+  ).toBeDisabled();
+}
+function feedbackButton(page: Page) {
+  return page.getByRole("button", { name: "Send feedback (1)", exact: true });
+}
+async function openFeedbackWithKeyboard(page: Page) {
+  await feedbackButton(page).focus();
+  await expectFeedbackFocused(page);
+  await reopenFeedbackWithKeyboard(page);
+}
+async function reopenFeedbackWithKeyboard(page: Page) {
+  await page.keyboard.press("Enter");
+  await expectRecipientMenu(page);
+  const recipient = page.getByRole("menuitem", { name: "Composer diff stat", exact: true });
+  await recipient.focus();
+  await expect(recipient).toBeFocused();
+}
+async function expectFeedbackFocused(page: Page) {
+  await expect(feedbackButton(page)).toBeFocused();
+}
+
+async function captureWideFeedbackAppearance(page: Page) {
+  for (const colorScheme of ["light", "dark"] as const) {
+    await page.emulateMedia({ colorScheme });
+    await expectSavedReview(page, "Review for second agent");
+    await captureFeedback(page, `cta-wide-${colorScheme}-closed`);
+    await sendFeedback(page, 1);
+    await expectRecipientMenu(page);
+    await captureFeedback(page, `cta-wide-${colorScheme}-open`);
+    await dismissRecipientMenu(page);
+  }
+  await page.emulateMedia({ colorScheme: "light" });
+}
+
+async function captureFeedback(page: Page, name: string) {
+  await page.screenshot({ path: `/tmp/phase2-feedback-${name}.png` });
+}
+
+async function closeAgentTab(page: Page, agentId: string) {
+  await page.getByTestId(`workspace-tab-agent_${agentId}`).click({ button: "right" });
+  await page.getByTestId(`workspace-tab-context-agent_${agentId}-close`).click();
+  await expect(page.getByTestId(`workspace-tab-agent_${agentId}`)).toHaveCount(0);
+}
+async function expectFeedbackUnavailable(page: Page) {
+  await expect(page.getByRole("button", { name: "Send feedback (1)", exact: true })).toBeDisabled();
+  await expect(
+    page.getByText("Open an agent tab in this workspace to send feedback.", { exact: true }),
+  ).toBeVisible();
+}
+async function createReviewRecipient(
+  workspace: Awaited<ReturnType<typeof seedChangedAgent>>,
+  title: string,
+) {
+  return workspace.client.createAgent({
+    provider: "mock",
+    cwd: workspace.cwd,
+    workspaceId: workspace.workspaceId,
+    title,
+    modeId: "load-test",
+    model: "e2e-fast-stream",
+  });
+}
+async function expectRecipientMenu(page: Page) {
+  for (const name of ["Composer diff stat", "Second reviewer"]) {
+    await expect(page.getByRole("menuitem", { name, exact: true })).toBeInViewport({ ratio: 1 });
+  }
+  await expect(page.getByRole("menuitem")).toHaveCount(2);
+}
+async function dismissRecipientMenu(page: Page) {
+  await page.keyboard.press("Escape");
+  await expect(page.getByRole("menuitem")).toHaveCount(0);
+}
+async function chooseFeedbackRecipient(page: Page, name: string) {
+  await page.getByRole("menuitem", { name, exact: true }).click();
+}
+async function expectFeedbackFailure(page: Page) {
+  await expect(
+    page.getByText("Requested mock prompt rejection", { exact: true }).first(),
+  ).toBeVisible();
+  await expect(page.getByRole("button", { name: "Send feedback (1)", exact: true })).toBeEnabled();
+}
+async function expectFeedbackPending(page: Page, count = 1) {
+  await expect(
+    page.getByRole("button", { name: `Sending feedback (${count})`, exact: true }),
+  ).toBeDisabled();
+}
+
+async function seedMultiFileReview() {
+  const workspace = await seedChangedAgent("review-feedback-navigation-", undefined, [
+    { path: "z-last.ts", content: "export const final = 0;\n" },
+  ]);
+  await writeFile(
+    path.join(workspace.cwd, "z-last.ts"),
+    Array.from({ length: 120 }, (_, index) => `export const value${index} = ${index};`).join("\n") +
+      "\n",
+  );
+  await workspace.client.checkoutRefresh(workspace.cwd);
+  return workspace;
+}
+async function expectFeedbackReachable(page: Page) {
+  await expect(page.getByRole("button", { name: "Send feedback (1)", exact: true })).toBeInViewport(
+    { ratio: 1 },
+  );
+}
+async function expectReviewNavigationReachable(page: Page) {
+  await expectFeedbackReachable(page);
+  const jump = page.getByRole("button", { name: "Jump to file", exact: true });
+  await expect(jump).toBeInViewport({ ratio: 1 });
+  const navigationBounds = await jump.boundingBox();
+  const feedbackBounds = await page
+    .getByRole("button", { name: "Send feedback (1)", exact: true })
+    .boundingBox();
+  if (!navigationBounds || !feedbackBounds) throw new Error("Review actions have no bounds");
+  expect(feedbackBounds.y + feedbackBounds.height).toBeLessThanOrEqual(navigationBounds.y);
+}
+async function jumpToReviewFile(page: Page, name: string) {
+  await page.getByRole("button", { name: "Jump to file", exact: true }).click();
+  const sheet = page.getByTestId("changes-jump-to-file-sheet");
+  await page
+    .getByTestId("changes-file-tree")
+    .filter({ visible: true })
+    .getByText(name, { exact: true })
+    .click();
+  await expect(sheet).toHaveCount(0);
+  await expect(reviewFileHeader(compactReviewSurface(page), name)).toBeInViewport();
+}
+async function navigateWideReviewFile(page: Page, name: string) {
+  const explorer = await ensureExplorerSidebar(page);
+  await explorer.getByTestId("changes-tree-panel").getByText(name, { exact: true }).click();
+  await expect(reviewFileHeader(page.getByTestId("working-diff-panel"), name)).toBeInViewport();
+}
+
+async function setReadmeDiff(
+  workspace: Awaited<ReturnType<typeof seedChangedAgent>>,
+  changed: boolean,
+) {
+  await writeFile(
+    path.join(workspace.cwd, "README.md"),
+    changed ? "# Temp Repo\nexport const one = 1;\nexport const two = 2;\n" : "# Temp Repo\n",
+  );
+  await workspace.client.checkoutRefresh(workspace.cwd);
+}
+async function expectUnmatchedFeedback(page: Page) {
+  await expect(page.getByRole("button", { name: "Send feedback (0)", exact: true })).toBeDisabled();
+  await expect(
+    page.getByText("Saved comments no longer match this diff.", { exact: true }),
+  ).toBeVisible();
+}
+
+function compactReviewSurface(page: Page) {
+  return page.getByTestId("explorer-content-area").filter({ visible: true });
+}
+async function openCompactReviewExplorer(
+  page: Page,
+  workspace: Awaited<ReturnType<typeof seedChangedAgent>>,
+) {
+  await showWideLayout(page);
+  await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: workspace.agentId });
+  await selectAgentTab(page, workspace.agentId);
+  await showCompactLayout(page);
+  await composerChangesPill(page).click();
+  await expect(compactReviewSurface(page).getByTestId("diff-file-0-body")).toBeVisible();
+}
+
+function reviewFileHeader(surface: Locator, name: string) {
+  return surface.locator(`[data-diff-header-path="${name}"]`).getByTestId(/^diff-file-\d+$/);
+}
+
+async function scrollReviewToLastLine(page: Page) {
+  const surface = compactReviewSurface(page);
+  const bounds = await surface.boundingBox();
+  if (!bounds) throw new Error("Compact review has no bounds");
+  await page.mouse.move(bounds.x + 120, bounds.y + 200);
+  await page.mouse.wheel(0, 10000);
+  await expect
+    .poll(async () => {
+      const body = await surface.getByTestId("diff-file-1-body").boundingBox();
+      const feedback = await page
+        .getByRole("button", { name: "Send feedback (1)", exact: true })
+        .boundingBox();
+      if (!body || !feedback) return false;
+      return body.y + body.height <= feedback.y;
+    })
+    .toBe(true);
+}
+
+async function revealCompactChanges(page: Page) {
+  await page.getByTestId("workspace-explorer-toggle").first().click();
+  await page.getByTestId("explorer-header").getByText("Changes", { exact: true }).click();
+  await expect(compactReviewSurface(page).getByTestId("diff-file-0-body")).toBeVisible();
+}
+async function expectReviewEditorBody(page: Page, body: string) {
+  await expect(page.getByRole("textbox", { name: "Review comment", exact: true })).toHaveValue(
+    body,
+  );
+}
diff --git a/packages/app/e2e/support/helpers/agent-message-gate.ts b/packages/app/e2e/support/helpers/agent-message-gate.ts
index 7444fee796..9f5735d5ac 100644
--- a/packages/app/e2e/support/helpers/agent-message-gate.ts
+++ b/packages/app/e2e/support/helpers/agent-message-gate.ts
@@ -6,6 +6,8 @@ type WebSocketMessage = string | Buffer;
 interface SendAgentMessageRequest {
   type: "send_agent_message_request";
   requestId: string;
+  text: unknown;
+  attachments: unknown;
   agentId: string;
   /** Absent when the client sends into an idle agent. */
   activeTurnBehavior?: string;
@@ -29,6 +31,8 @@ function readSendRequest(message: WebSocketMessage): SendAgentMessageRequest | n
     return {
       type: "send_agent_message_request",
       requestId: request.requestId,
+      text: request.text,
+      attachments: request.attachments,
       agentId: request.agentId,
       activeTurnBehavior:
         typeof request.activeTurnBehavior === "string" ? request.activeTurnBehavior : undefined,
@@ -74,6 +78,7 @@ export async function gateNextAgentMessage(page: Page) {
 
   return {
     waitForRequest,
+    requestCount: () => requests.length,
     accept(index = 0) {
       const heldMessage = heldMessages[index];
       if (!serverSocket || !heldMessage) {
diff --git a/packages/app/src/components/ui/button.tsx b/packages/app/src/components/ui/button.tsx
index e160970223..707ce60648 100644
--- a/packages/app/src/components/ui/button.tsx
+++ b/packages/app/src/components/ui/button.tsx
@@ -174,6 +174,7 @@ export function Button({
   ...props
 }: PropsWithChildren<
   Omit<PressableProps, "style"> & {
+    ref?: React.Ref<View>;
     variant?: ButtonVariant;
     size?: ButtonSize;
     leftIcon?: LeftIcon;
diff --git a/packages/app/src/components/ui/floating-action-button.tsx b/packages/app/src/components/ui/floating-action-button.tsx
index 33d72985fe..2b06e097f2 100644
--- a/packages/app/src/components/ui/floating-action-button.tsx
+++ b/packages/app/src/components/ui/floating-action-button.tsx
@@ -1,47 +1,67 @@
+import { forwardRef, useMemo } from "react";
+import { Text, type View } from "react-native";
 import type { LucideIcon } from "lucide-react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { PressHighlight } from "@/components/ui/press-highlight";
-import { ICON_SIZE, SPACING } from "@/styles/theme";
+import { ICON_SIZE } from "@/styles/theme";
 
-const FLOATING_ACTION_BUTTON_SIZE = 56;
-const FLOATING_ACTION_BUTTON_INSET = SPACING[4];
-
-/** Space a scrolling surface keeps below its content so the button traps nothing. */
-export const FLOATING_ACTION_BUTTON_CLEARANCE =
-  FLOATING_ACTION_BUTTON_SIZE + FLOATING_ACTION_BUTTON_INSET;
+import {
+  FLOATING_ACTION_BUTTON_SIZE,
+  FLOATING_ACTION_BUTTON_INSET,
+} from "./floating-action-layout";
+export {
+  FLOATING_ACTION_BUTTON_CLEARANCE,
+  floatingActionsClearance,
+} from "./floating-action-layout";
 
 export interface FloatingActionButtonProps {
   icon: LucideIcon;
-  /** Names the action; the button carries no label. */
+  /** Names the action for assistive technology. */
   accessibilityLabel: string;
   onPress: () => void;
+  label?: string;
+  disabled?: boolean;
+  bottomInset?: number;
   testID?: string;
 }
 
 /**
- * The one floating action a scrolling surface can offer. It pins itself to the
- * bottom-right of its nearest positioned ancestor, so the ancestor decides what
- * the button may cover.
+ * Pins an action to the bottom-right of its nearest positioned ancestor.
+ * The surface reserves scroll clearance and uses bottomInset to separate stacked actions.
  */
-export function FloatingActionButton({
-  icon: Icon,
-  accessibilityLabel,
-  onPress,
-  testID,
-}: FloatingActionButtonProps) {
-  return (
-    <PressHighlight
-      accessibilityRole="button"
-      accessibilityLabel={accessibilityLabel}
-      onPress={onPress}
-      style={styles.button}
-      highlightStyle={styles.pressed}
-      testID={testID}
-    >
-      <Icon size={ICON_SIZE.lg} color={styles.glyph.color} />
-    </PressHighlight>
-  );
-}
+export const FloatingActionButton = forwardRef<View, FloatingActionButtonProps>(
+  function FloatingActionButton(
+    { icon: Icon, accessibilityLabel, onPress, label, disabled = false, bottomInset = 0, testID },
+    ref,
+  ) {
+    const accessibilityState = useMemo(() => ({ disabled }), [disabled]);
+    const buttonStyle = useMemo(
+      () => [
+        styles.button,
+        label && styles.labeled,
+        disabled && styles.disabled,
+        { bottom: FLOATING_ACTION_BUTTON_INSET + bottomInset },
+      ],
+      [bottomInset, disabled, label],
+    );
+    return (
+      <PressHighlight
+        ref={ref}
+        accessibilityRole="button"
+        accessibilityLabel={accessibilityLabel}
+        accessibilityState={accessibilityState}
+        disabled={disabled}
+        onPress={onPress}
+        style={buttonStyle}
+        highlightStyle={styles.pressed}
+        testID={testID}
+      >
+        <Icon size={ICON_SIZE.lg} color={styles.glyph.color} />
+        {label ? <Text style={styles.label}>{label}</Text> : null}
+      </PressHighlight>
+    );
+  },
+);
 
 const styles = StyleSheet.create((theme) => ({
   button: {
@@ -56,6 +76,15 @@ const styles = StyleSheet.create((theme) => ({
     backgroundColor: theme.colors.surface3,
     ...theme.shadow.md,
   },
+  labeled: {
+    width: "auto",
+    minWidth: FLOATING_ACTION_BUTTON_SIZE,
+    paddingHorizontal: theme.spacing[4],
+    flexDirection: "row",
+    gap: theme.spacing[2],
+  },
+  label: { color: theme.colors.foreground, fontSize: theme.fontSize.base },
+  disabled: { opacity: theme.opacity[50] },
   pressed: {
     backgroundColor: theme.colors.interactionHighlight,
   },
diff --git a/packages/app/src/components/ui/floating-action-layout.test.ts b/packages/app/src/components/ui/floating-action-layout.test.ts
new file mode 100644
index 0000000000..2256f4ef9b
--- /dev/null
+++ b/packages/app/src/components/ui/floating-action-layout.test.ts
@@ -0,0 +1,17 @@
+import { describe, expect, it } from "vitest";
+import {
+  floatingActionsClearance,
+  FLOATING_ACTION_BUTTON_CLEARANCE,
+} from "./floating-action-layout";
+
+describe("floating action scroll clearance", () => {
+  it("keeps the last diff line above Jump to file before and after feedback is added", () => {
+    const jump = FLOATING_ACTION_BUTTON_CLEARANCE;
+    const feedback = FLOATING_ACTION_BUTTON_CLEARANCE + 44;
+    expect(floatingActionsClearance([jump, 0], 34)).toBe(106);
+    expect(floatingActionsClearance([jump, feedback], 34)).toBe(222);
+    expect(floatingActionsClearance([0, feedback], 34)).toBe(150);
+    expect(floatingActionsClearance([jump, feedback], 0)).toBe(188);
+    expect(floatingActionsClearance([0, 0], 34)).toBe(0);
+  });
+});
diff --git a/packages/app/src/components/ui/floating-action-layout.ts b/packages/app/src/components/ui/floating-action-layout.ts
new file mode 100644
index 0000000000..c54fd62dbe
--- /dev/null
+++ b/packages/app/src/components/ui/floating-action-layout.ts
@@ -0,0 +1,15 @@
+import { SPACING } from "@/styles/theme";
+
+export const FLOATING_ACTION_BUTTON_SIZE = 56;
+export const FLOATING_ACTION_BUTTON_INSET = SPACING[4];
+export const FLOATING_ACTION_BUTTON_CLEARANCE =
+  FLOATING_ACTION_BUTTON_SIZE + FLOATING_ACTION_BUTTON_INSET;
+
+/** Reserve the stacked actions and the safe-area inset once for their scrolling surface. */
+export function floatingActionsClearance(
+  actionClearances: readonly number[],
+  bottomInset: number,
+): number {
+  const clearance = actionClearances.reduce((total, action) => total + action, 0);
+  return clearance > 0 ? clearance + bottomInset : 0;
+}
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.test.ts b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.test.ts
index 89ecce2b1e..60b386bd45 100644
--- a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.test.ts
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.test.ts
@@ -245,3 +245,12 @@ describe("bottom sheet visibility tracker", () => {
     expect(context.backPress.press()).toBe(false);
   });
 });
+
+it("does not cancel the owner's editor when the compact sheet leaves the tree on resize", () => {
+  const context = setup();
+  openSheet(context);
+  context.tracker.attachController(null);
+  context.tracker.handleSheetDismiss();
+  expect(context.closeCount()).toBe(0);
+  expect(context.backPress.press()).toBe(false);
+});
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.ts b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.ts
index 54ee6f58cd..dec2dd535c 100644
--- a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.ts
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.ts
@@ -121,6 +121,9 @@ export function createBottomSheetVisibilityTracker(opts: {
       }
     },
     handleSheetDismiss() {
+      // Portal cleanup reports dismissal after the sheet leaves the tree. It is
+      // presentation teardown, so the owner keeps its desired state.
+      if (!controller) return;
       if (visible) {
         setPhase("dismissing");
         notifyClose();
diff --git a/packages/app/src/git/diff-document/hit-testing.test.ts b/packages/app/src/git/diff-document/hit-testing.test.ts
index a0ed9c1578..d728c2f2d7 100644
--- a/packages/app/src/git/diff-document/hit-testing.test.ts
+++ b/packages/app/src/git/diff-document/hit-testing.test.ts
@@ -315,6 +315,7 @@ function reviewActionsForFirstAddition(): NonNullable<
     commentsByTarget: new Map(),
     editor: { target, commentId: null, body: "" },
     onStartComment() {},
+    onChangeEditorBody() {},
     onCancelEditor() {},
     onSaveEditor() {},
     onEditComment() {},
diff --git a/packages/app/src/git/diff-document/model.test.ts b/packages/app/src/git/diff-document/model.test.ts
index c2b6d86c9c..ace965c1ce 100644
--- a/packages/app/src/git/diff-document/model.test.ts
+++ b/packages/app/src/git/diff-document/model.test.ts
@@ -389,6 +389,7 @@ describe("diff document model", () => {
             commentId: null,
           },
           onStartComment() {},
+          onChangeEditorBody() {},
           onCancelEditor() {},
           onSaveEditor() {},
           onEditComment() {},
@@ -790,6 +791,7 @@ function reviewActionsWithEditor(
     commentsByTarget: new Map(),
     editor: target ? { target, body: "", commentId: null } : null,
     onStartComment() {},
+    onChangeEditorBody() {},
     onCancelEditor() {},
     onSaveEditor() {},
     onEditComment() {},
diff --git a/packages/app/src/git/diff-pane.tsx b/packages/app/src/git/diff-pane.tsx
index 139387ccb1..6bafd3eee3 100644
--- a/packages/app/src/git/diff-pane.tsx
+++ b/packages/app/src/git/diff-pane.tsx
@@ -1,3 +1,5 @@
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { floatingActionsClearance } from "@/components/ui/floating-action-button";
 import { useState, useCallback, useMemo, type ReactElement, type ReactNode } from "react";
 import { useTranslation } from "react-i18next";
 import type { TFunction } from "i18next";
@@ -31,6 +33,7 @@ import {
 import { type ParsedDiffFile } from "@/git/use-diff-query";
 import type { ChangesState } from "@/panels/changes/state";
 import { defaultChangesState } from "@/panels/changes/state";
+import { ReviewCommentSheet, ReviewFeedbackAction } from "@/review";
 import { DiffDocument, type WorkingDiffMode } from "@/git/diff-document";
 import { ChangedFilesTree } from "@/git/changed-files-tree";
 import { JUMP_TO_FILE_CLEARANCE, JumpToFile } from "@/git/jump-to-file";
@@ -1548,7 +1551,9 @@ export function ChangesSurface({
     isDiffLoading,
     reviewActions,
     reviewAttachment,
+    reviewFeedback,
   } = useWorkingDiff({
+    presentation,
     serverId,
     workspaceId: workspaceId ?? undefined,
     cwd,
@@ -1729,6 +1734,7 @@ export function ChangesSurface({
     ],
   );
 
+  const { bottom: bottomInset } = useSafeAreaInsets();
   const hasChanges = files.length > 0;
   const jumpToFileInset = jumpToFileClearance({
     isCompact: isMobile,
@@ -1778,27 +1784,41 @@ export function ChangesSurface({
   });
 
   const diffContent: ReactElement = (
-    <DiffBodyContent
-      isStatusLoading={isStatusLoading}
-      statusErrorMessage={statusErrorMessage}
-      notGit={notGit}
-      isDiffLoading={isDiffLoading}
-      diffErrorMessage={diffErrorMessage}
-      diffTooLarge={diffTooLarge}
-      hasChanges={hasChanges}
-      emptyMessage={emptyMessage}
-      emptyAction={emptyAction}
-      checkingRepositoryLabel={t("workspace.git.diff.checkingRepository")}
-      notRepositoryLabel={t("workspace.git.diff.notRepository")}
-    >
-      <DiffDocument
-        files={files}
-        contentInsetBottom={jumpToFileInset}
-        collapseState={collapseState}
-        displayPreferences={sharedDisplayPreferences}
-        mode={workingMode}
+    <View style={styles.diffContainer}>
+      <DiffBodyContent
+        isStatusLoading={isStatusLoading}
+        statusErrorMessage={statusErrorMessage}
+        notGit={notGit}
+        isDiffLoading={isDiffLoading}
+        diffErrorMessage={diffErrorMessage}
+        diffTooLarge={diffTooLarge}
+        hasChanges={hasChanges}
+        emptyMessage={emptyMessage}
+        emptyAction={emptyAction}
+        checkingRepositoryLabel={t("workspace.git.diff.checkingRepository")}
+        notRepositoryLabel={t("workspace.git.diff.notRepository")}
+      >
+        <DiffDocument
+          files={files}
+          contentInsetBottom={floatingActionsClearance(
+            [jumpToFileInset, reviewFeedback.clearance],
+            bottomInset,
+          )}
+          collapseState={collapseState}
+          displayPreferences={sharedDisplayPreferences}
+          mode={workingMode}
+        />
+      </DiffBodyContent>
+      <ReviewFeedbackAction
+        bottomOffset={jumpToFileInset}
+        enabled={enabled}
+        hasDiff={presentation !== "tree"}
+        model={reviewFeedback.model}
+        state={reviewFeedback.state}
+        serverId={serverId}
+        workspaceId={workspaceId}
       />
-    </DiffBodyContent>
+    </View>
   );
   const bodyContent = (
     <ChangesBody
@@ -1934,6 +1954,13 @@ export function ChangesSurface({
         ) : null}
       </View>
 
+      <ReviewCommentSheet
+        enabled={enabled}
+        editor={reviewActions.sheetEditor}
+        reviewActions={reviewActions}
+        onChangeBody={reviewActions.onChangeEditorBody}
+      />
+
       <ChangesCommits
         presentation={presentation}
         serverId={serverId}
diff --git a/packages/app/src/git/jump-to-file/index.tsx b/packages/app/src/git/jump-to-file/index.tsx
index d33db75f36..f3363b91ec 100644
--- a/packages/app/src/git/jump-to-file/index.tsx
+++ b/packages/app/src/git/jump-to-file/index.tsx
@@ -1,6 +1,7 @@
 import { useCallback, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { FolderTree } from "lucide-react-native";
 import {
@@ -53,6 +54,7 @@ export interface JumpToFileProps {
 /** Compact overview of a loaded diff: a floating action that opens the changed-files tree. */
 export function JumpToFile({ files, mode, onSelectFile }: JumpToFileProps) {
   const { t } = useTranslation();
+  const { bottom } = useSafeAreaInsets();
   const [isOpen, setIsOpen] = useState(false);
   // The sheet is a transient overview, so it always opens fully expanded and
   // never writes to the panel's persisted folder state.
@@ -83,6 +85,7 @@ export function JumpToFile({ files, mode, onSelectFile }: JumpToFileProps) {
     <>
       <FloatingActionButton
         icon={FolderTree}
+        bottomInset={bottom}
         accessibilityLabel={title}
         onPress={open}
         testID="changes-jump-to-file"
diff --git a/packages/app/src/git/use-working-diff.ts b/packages/app/src/git/use-working-diff.ts
index 341cc4946d..daeda1479d 100644
--- a/packages/app/src/git/use-working-diff.ts
+++ b/packages/app/src/git/use-working-diff.ts
@@ -7,6 +7,7 @@ import {
   buildReviewDraftKey,
   useInlineReviewController,
   useReviewAttachmentSnapshot,
+  useReviewFeedback,
 } from "@/review";
 import { useCheckoutDiffQuery } from "@/git/use-diff-query";
 import { useCheckoutStatusQuery } from "@/git/use-status-query";
@@ -19,6 +20,7 @@ interface UseWorkingDiffOptions {
   ignoreWhitespace: boolean;
   enabled: boolean;
   queryScope?: string;
+  presentation?: string;
 }
 
 export function useWorkingDiff({
@@ -28,6 +30,7 @@ export function useWorkingDiff({
   ignoreWhitespace,
   enabled,
   queryScope,
+  presentation,
 }: UseWorkingDiffOptions) {
   const {
     status,
@@ -81,7 +84,7 @@ export function useWorkingDiff({
       }),
     [baseRef, cwd, diffMode, ignoreWhitespace, serverId, workspaceId],
   );
-  const reviewActions = useInlineReviewController({ reviewDraftKey });
+  const reviewActions = useInlineReviewController({ reviewDraftKey, presentation });
   const reviewAttachment = useReviewAttachmentSnapshot({
     key: reviewDraftKey,
     diffFiles: files,
@@ -90,6 +93,13 @@ export function useWorkingDiff({
     baseRef,
   });
 
+  const reviewFeedback = useReviewFeedback({
+    serverId,
+    workspaceId,
+    reviewDraftKey,
+    attachment: reviewAttachment,
+  });
+
   return {
     status,
     isStatusLoading,
@@ -107,6 +117,7 @@ export function useWorkingDiff({
     isDiffLoading,
     reviewActions,
     reviewAttachment,
+    reviewFeedback,
   };
 }
 
diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index 979961abc5..79355f7110 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -30,6 +30,7 @@ export const ar: TranslationResources = {
     back: "خلف",
     loading: "تحميل...",
     actions: {
+      save: "حفظ",
       back: "خلف",
       cancel: "يلغي",
       close: "يغلق",
@@ -2005,6 +2006,17 @@ export const ar: TranslationResources = {
     accessibility: "تم استخدام نافذة السياق{{percentage}}%",
   },
   review: {
+    feedback: {
+      send: "إرسال الملاحظات ({{count}})",
+      sending: "جارٍ إرسال الملاحظات ({{count}})",
+      chooseAgent: "اختر وكيلاً",
+      sent: "تم إرسال الملاحظات إلى {{recipient}}",
+      "no-agents": "افتح علامة تبويب وكيل في مساحة العمل هذه لإرسال الملاحظات.",
+      disconnected: "اتصل بالمضيف لإرسال الملاحظات.",
+      "no-context": "لم تعد التعليقات المحفوظة تتطابق مع هذا الفرق.",
+      failed: "تعذر إرسال الملاحظات. حاول مرة أخرى.",
+      prompt: "يرجى معالجة مراجعة الكود هذه.",
+    },
     comment: {
       add: "إضافة تعليق المراجعة",
       edit: "تحرير تعليق المراجعة",
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 8d8bba9576..35606c853e 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -26,6 +26,7 @@ export const en = {
     back: "Back",
     loading: "Loading...",
     actions: {
+      save: "Save",
       back: "Back",
       cancel: "Cancel",
       close: "Close",
@@ -2030,6 +2031,17 @@ export const en = {
     accessibility: "Context window {{percentage}}% used",
   },
   review: {
+    feedback: {
+      send: "Send feedback ({{count}})",
+      sending: "Sending feedback ({{count}})",
+      chooseAgent: "Choose an agent",
+      sent: "Feedback sent to {{recipient}}",
+      "no-agents": "Open an agent tab in this workspace to send feedback.",
+      disconnected: "Connect to the host to send feedback.",
+      "no-context": "Saved comments no longer match this diff.",
+      failed: "Failed to send feedback. Try again.",
+      prompt: "Please address this code review.",
+    },
     comment: {
       add: "Add review comment",
       edit: "Edit review comment",
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index 9bedaefffa..721b56cbec 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -31,6 +31,7 @@ export const es: TranslationResources = {
     back: "Atrás",
     loading: "Cargando...",
     actions: {
+      save: "Guardar",
       back: "Atrás",
       cancel: "Cancelar",
       close: "Cerrar",
@@ -2053,6 +2054,17 @@ export const es: TranslationResources = {
     accessibility: "Ventana de contexto{{percentage}}% utilizada",
   },
   review: {
+    feedback: {
+      send: "Enviar comentarios ({{count}})",
+      sending: "Enviando comentarios ({{count}})",
+      chooseAgent: "Elegir un agente",
+      sent: "Comentarios enviados a {{recipient}}",
+      "no-agents": "Abre una pestaña de agente en este espacio de trabajo para enviar comentarios.",
+      disconnected: "Conéctate al host para enviar comentarios.",
+      "no-context": "Los comentarios guardados ya no coinciden con este diff.",
+      failed: "No se pudieron enviar los comentarios. Inténtalo de nuevo.",
+      prompt: "Por favor, atiende esta revisión de código.",
+    },
     comment: {
       add: "Agregar comentario de revisión",
       edit: "Editar comentario de revisión",
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index 3d1e7df64d..0e8937d4d8 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -31,6 +31,7 @@ export const fr: TranslationResources = {
     back: "Retour",
     loading: "Chargement…",
     actions: {
+      save: "Enregistrer",
       back: "Retour",
       cancel: "Annuler",
       close: "Fermer",
@@ -2050,6 +2051,18 @@ export const fr: TranslationResources = {
     accessibility: "Fenêtre de contexte : {{percentage}} % utilisés",
   },
   review: {
+    feedback: {
+      send: "Envoyer les commentaires ({{count}})",
+      sending: "Envoi des commentaires ({{count}})",
+      chooseAgent: "Choisir un agent",
+      sent: "Commentaires envoyés à {{recipient}}",
+      "no-agents":
+        "Ouvrez un onglet d’agent dans cet espace de travail pour envoyer les commentaires.",
+      disconnected: "Connectez-vous à l’hôte pour envoyer les commentaires.",
+      "no-context": "Les commentaires enregistrés ne correspondent plus à ce diff.",
+      failed: "Échec de l’envoi des commentaires. Réessayez.",
+      prompt: "Veuillez traiter cette revue de code.",
+    },
     comment: {
       add: "Ajouter un commentaire de revue",
       edit: "Modifier le commentaire de revue",
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index 66e4d0baf7..076ac32536 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -31,6 +31,7 @@ export const ja: TranslationResources = {
     back: "戻る",
     loading: "読み込み中...",
     actions: {
+      save: "保存",
       back: "戻る",
       cancel: "キャンセル",
       close: "閉じる",
@@ -2025,6 +2026,18 @@ export const ja: TranslationResources = {
     accessibility: "コンテキストウィンドウ{{percentage}}%使用",
   },
   review: {
+    feedback: {
+      send: "フィードバックを送信 ({{count}})",
+      sending: "フィードバックを送信中 ({{count}})",
+      chooseAgent: "エージェントを選択",
+      sent: "{{recipient}} にフィードバックを送信しました",
+      "no-agents":
+        "フィードバックを送信するには、このワークスペースでエージェントタブを開いてください。",
+      disconnected: "フィードバックを送信するにはホストに接続してください。",
+      "no-context": "保存したコメントはこの差分と一致しなくなりました。",
+      failed: "フィードバックを送信できませんでした。もう一度お試しください。",
+      prompt: "このコードレビューに対応してください。",
+    },
     comment: {
       add: "レビューコメントを追加",
       edit: "レビューコメントを編集",
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index 5bf6628758..8b832de6e8 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -30,6 +30,7 @@ export const ko: TranslationResources = {
     back: "뒤로",
     loading: "불러오는 중...",
     actions: {
+      save: "저장",
       back: "뒤로",
       cancel: "취소",
       close: "닫기",
@@ -2015,6 +2016,17 @@ export const ko: TranslationResources = {
     accessibility: "컨텍스트 윈도우 {{percentage}}% 사용됨",
   },
   review: {
+    feedback: {
+      send: "피드백 보내기 ({{count}})",
+      sending: "피드백 전송 중 ({{count}})",
+      chooseAgent: "에이전트 선택",
+      sent: "{{recipient}}에게 피드백을 보냈습니다",
+      "no-agents": "피드백을 보내려면 이 작업 공간에서 에이전트 탭을 여세요.",
+      disconnected: "피드백을 보내려면 호스트에 연결하세요.",
+      "no-context": "저장된 댓글이 더 이상 이 변경 사항과 일치하지 않습니다.",
+      failed: "피드백 전송에 실패했습니다. 다시 시도하세요.",
+      prompt: "이 코드 리뷰를 반영해 주세요.",
+    },
     comment: {
       add: "리뷰 댓글 추가",
       edit: "리뷰 댓글 편집",
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index e00f9ddc02..0bc2968560 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -31,6 +31,7 @@ export const ptBR: TranslationResources = {
     back: "Voltar",
     loading: "Carregando...",
     actions: {
+      save: "Salvar",
       back: "Voltar",
       cancel: "Cancelar",
       close: "Fechar",
@@ -2038,6 +2039,17 @@ export const ptBR: TranslationResources = {
     accessibility: "Janela de contexto {{percentage}}% usada",
   },
   review: {
+    feedback: {
+      send: "Enviar comentários ({{count}})",
+      sending: "Enviando comentários ({{count}})",
+      chooseAgent: "Escolher um agente",
+      sent: "Comentários enviados para {{recipient}}",
+      "no-agents": "Abra uma aba de agente neste espaço de trabalho para enviar comentários.",
+      disconnected: "Conecte-se ao host para enviar comentários.",
+      "no-context": "Os comentários salvos não correspondem mais a este diff.",
+      failed: "Falha ao enviar comentários. Tente novamente.",
+      prompt: "Por favor, atenda a esta revisão de código.",
+    },
     comment: {
       add: "Adicionar comentário de revisão",
       edit: "Editar comentário de revisão",
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index d276fb03fc..afd0ffad95 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -31,6 +31,7 @@ export const ru: TranslationResources = {
     back: "Назад",
     loading: "Загрузка...",
     actions: {
+      save: "Сохранить",
       back: "Назад",
       cancel: "Отмена",
       close: "Закрыть",
@@ -2038,6 +2039,17 @@ export const ru: TranslationResources = {
     accessibility: "Использовано {{percentage}}% контекстного окна",
   },
   review: {
+    feedback: {
+      send: "Отправить отзыв ({{count}})",
+      sending: "Отправка отзыва ({{count}})",
+      chooseAgent: "Выберите агента",
+      sent: "Отзыв отправлен: {{recipient}}",
+      "no-agents": "Откройте вкладку агента в этой рабочей области, чтобы отправить отзыв.",
+      disconnected: "Подключитесь к хосту, чтобы отправить отзыв.",
+      "no-context": "Сохранённые комментарии больше не соответствуют этому diff.",
+      failed: "Не удалось отправить отзыв. Повторите попытку.",
+      prompt: "Пожалуйста, учтите эту проверку кода.",
+    },
     comment: {
       add: "Добавить комментарий к ревью",
       edit: "Изменить комментарий к ревью",
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index 03ff7160b9..9398e6020d 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -30,6 +30,7 @@ export const zhCN: TranslationResources = {
     back: "返回",
     loading: "加载中...",
     actions: {
+      save: "保存",
       back: "返回",
       cancel: "取消",
       close: "关闭",
@@ -1983,6 +1984,17 @@ export const zhCN: TranslationResources = {
     accessibility: "上下文窗口已使用 {{percentage}}%",
   },
   review: {
+    feedback: {
+      send: "发送反馈 ({{count}})",
+      sending: "正在发送反馈 ({{count}})",
+      chooseAgent: "选择智能体",
+      sent: "已向 {{recipient}} 发送反馈",
+      "no-agents": "请在此工作区打开智能体标签页以发送反馈。",
+      disconnected: "请连接到主机以发送反馈。",
+      "no-context": "保存的评论不再匹配此差异。",
+      failed: "发送反馈失败。请重试。",
+      prompt: "请处理此代码审查。",
+    },
     comment: {
       add: "添加 review 评论",
       edit: "编辑 review 评论",
diff --git a/packages/app/src/review/comment-sheet.tsx b/packages/app/src/review/comment-sheet.tsx
new file mode 100644
index 0000000000..d54ec0ec96
--- /dev/null
+++ b/packages/app/src/review/comment-sheet.tsx
@@ -0,0 +1,106 @@
+import { useCallback, useMemo } from "react";
+import { Text, View } from "react-native";
+import { useTranslation } from "react-i18next";
+import { StyleSheet } from "react-native-unistyles";
+import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
+import { FormTextInput } from "@/components/ui/form-field";
+import { Button } from "@/components/ui/button";
+import type { InlineReviewActions, InlineReviewEditorState } from "./geometry";
+
+export function ReviewCommentSheet({
+  editor,
+  reviewActions,
+  onChangeBody,
+  enabled,
+}: {
+  enabled: boolean | undefined;
+  editor: InlineReviewEditorState | null;
+  reviewActions: InlineReviewActions;
+  onChangeBody: (body: string) => void;
+}) {
+  if (enabled === false || !editor) return null;
+  return (
+    <OpenReviewCommentSheet
+      editor={editor}
+      reviewActions={reviewActions}
+      onChangeBody={onChangeBody}
+    />
+  );
+}
+
+function OpenReviewCommentSheet({
+  editor,
+  reviewActions,
+  onChangeBody,
+}: {
+  editor: InlineReviewEditorState;
+  reviewActions: InlineReviewActions;
+  onChangeBody: (body: string) => void;
+}) {
+  const { t } = useTranslation();
+  const context = `${editor.target.filePath} · ${editor.target.side === "old" ? "−" : "+"}${editor.target.lineNumber}`;
+  const header = useMemo(
+    () => ({
+      title: t("review.comment.label"),
+      subtitle: <Text style={styles.context}>{context}</Text>,
+    }),
+    [context, t],
+  );
+  const { onSaveEditor, onCancelEditor } = reviewActions;
+  const handleSave = useCallback(() => onSaveEditor(editor.body), [onSaveEditor, editor.body]);
+  const canSave = editor.body.trim().length > 0;
+  const footer = useMemo(
+    () => (
+      <View style={styles.actions}>
+        <Button
+          size="md"
+          variant="secondary"
+          accessibilityLabel={t("review.comment.cancelAccessibility")}
+          onPress={onCancelEditor}
+        >
+          {t("review.comment.cancel")}
+        </Button>
+        <Button
+          size="md"
+          variant="default"
+          accessibilityLabel={t("review.comment.saveAccessibility")}
+          disabled={!canSave}
+          onPress={handleSave}
+        >
+          {t("common.actions.save")}
+        </Button>
+      </View>
+    ),
+    [canSave, handleSave, onCancelEditor, t],
+  );
+  return (
+    <AdaptiveModalSheet
+      visible
+      header={header}
+      onClose={onCancelEditor}
+      snapPoints={COMMENT_SNAP_POINTS}
+      scrollable={false}
+      testID="review-comment-sheet"
+      footer={footer}
+    >
+      <FormTextInput
+        key={editor.target.key + (editor.commentId ?? "new")}
+        size="md"
+        multiline
+        accessibilityLabel={t("review.comment.label")}
+        placeholder={t("review.comment.placeholder")}
+        initialValue={editor.body}
+        onChangeText={onChangeBody}
+        style={styles.input}
+      />
+    </AdaptiveModalSheet>
+  );
+}
+
+const COMMENT_SNAP_POINTS = ["50%", "90%"];
+
+const styles = StyleSheet.create((theme) => ({
+  context: { color: theme.colors.foregroundMuted, fontSize: theme.fontSize.sm },
+  input: { flex: 1, minHeight: 0, textAlignVertical: "top" },
+  actions: { flex: 1, flexDirection: "row", justifyContent: "flex-end", gap: theme.spacing[2] },
+}));
diff --git a/packages/app/src/review/editor/index.test.ts b/packages/app/src/review/editor/index.test.ts
new file mode 100644
index 0000000000..6735adef34
--- /dev/null
+++ b/packages/app/src/review/editor/index.test.ts
@@ -0,0 +1,145 @@
+import { describe, expect, it } from "vitest";
+import { createReviewEditor, createReviewEditorScope, type ReviewCommentWriter } from "./index";
+import type { ReviewDraftComment } from "../state";
+import type { ReviewableDiffTarget } from "@/utils/diff-layout";
+
+const target: ReviewableDiffTarget = {
+  key: "src/example.ts:new:2",
+  filePath: "src/example.ts",
+  side: "new",
+  lineNumber: 2,
+  hunkHeader: "@@ -1,2 +1,2 @@",
+  hunkIndex: 0,
+  lineIndex: 2,
+  oldLineNumber: null,
+  newLineNumber: 2,
+  lineType: "add",
+  content: "const value = next;",
+};
+
+function memoryWriter() {
+  const drafts = new Map<string, ReviewDraftComment[]>();
+  let sequence = 0;
+  const writer: ReviewCommentWriter = {
+    saveComment: ({ key, id, comment }) => {
+      const current = drafts.get(key) ?? [];
+      if (id && current.some((saved) => saved.id === id)) {
+        drafts.set(
+          key,
+          current.map((saved) => (saved.id === id ? { ...saved, ...comment } : saved)),
+        );
+      } else {
+        const saved = {
+          ...comment,
+          id: String(++sequence),
+          createdAt: "2026-10-09T00:00:00Z",
+          updatedAt: "2026-10-09T00:00:00Z",
+        };
+        drafts.set(key, [...current, saved]);
+      }
+    },
+    deleteComment: ({ key, id }) => {
+      drafts.set(
+        key,
+        (drafts.get(key) ?? []).filter((comment) => comment.id !== id),
+      );
+    },
+  };
+  return { writer, comments: (key: string) => drafts.get(key) ?? [] };
+}
+
+describe("review editor", () => {
+  it("saves trimmed comments, edits the same record, and cancels without altering saved comments", () => {
+    const storage = memoryWriter();
+    const editor = createReviewEditor("first", storage.writer);
+    editor.start(target);
+    editor.setBody("  First comment  ");
+    editor.save(editor.getState()!.body);
+    expect(editor.getState()).toBeNull();
+    const saved = storage.comments("first")[0]!;
+    expect(saved).toMatchObject({
+      filePath: target.filePath,
+      side: "new",
+      lineNumber: 2,
+      body: "First comment",
+    });
+    editor.edit(target, saved);
+    editor.setBody("Discarded edit");
+    editor.cancel();
+    expect(storage.comments("first")).toEqual([saved]);
+    editor.edit(target, saved);
+    editor.save(" Updated comment ");
+    expect(storage.comments("first")).toEqual([{ ...saved, body: "Updated comment" }]);
+    editor.start(target);
+    editor.setBody("Discarded new comment");
+    editor.cancel();
+    expect(storage.comments("first")).toHaveLength(1);
+  });
+
+  it("keeps an open edit saveable after its submitted record is acknowledged", () => {
+    const storage = memoryWriter();
+    const editor = createReviewEditor("first", storage.writer);
+    editor.start(target);
+    editor.save("Submitted body");
+    const saved = storage.comments("first")[0]!;
+    editor.edit(target, saved);
+    editor.setBody("Typed before acknowledgement");
+    storage.writer.deleteComment({ key: "first", id: saved.id });
+    expect(editor.getState()!.body).toBe("Typed before acknowledgement");
+    editor.save(editor.getState()!.body);
+    expect(storage.comments("first")).toMatchObject([
+      {
+        body: "Typed before acknowledgement",
+        filePath: target.filePath,
+        lineNumber: target.lineNumber,
+      },
+    ]);
+  });
+
+  it("rejects empty saves and repeated saves after the editor closes", () => {
+    const storage = memoryWriter();
+    const editor = createReviewEditor("first", storage.writer);
+    editor.start(target);
+    editor.save(" \n ");
+    expect(editor.getState()).toEqual({ target, commentId: null, body: "" });
+    expect(storage.comments("first")).toEqual([]);
+    editor.save("Saved once");
+    editor.save("Duplicate");
+    expect(storage.comments("first").map((comment) => comment.body)).toEqual(["Saved once"]);
+  });
+
+  it("isolates draft ownership and closes an editor when its saved comment is deleted", () => {
+    const storage = memoryWriter();
+    const first = createReviewEditor("first", storage.writer);
+    const second = createReviewEditor("second", storage.writer);
+    first.start(target);
+    first.save("First workspace");
+    const saved = storage.comments("first")[0]!;
+    first.edit(target, saved);
+    expect(second.getState()).toBeNull();
+    second.start(target);
+    second.save("Second workspace");
+    first.delete(saved.id);
+    expect(first.getState()).toBeNull();
+    expect(storage.comments("first")).toEqual([]);
+    expect(storage.comments("second").map((comment) => comment.body)).toEqual(["Second workspace"]);
+  });
+});
+
+it("retains an open editor through remounts without exposing it on another surface or draft", async () => {
+  const storage = memoryWriter();
+  const scope = createReviewEditorScope(storage.writer);
+  const editor = scope.forDraft("first", "diff");
+  const unsubscribe = editor.subscribe(() => {});
+  editor.start(target);
+  editor.setBody("Unsaved wide body");
+  unsubscribe();
+  await Promise.resolve();
+  const compact = scope.forDraft("first", "diff");
+  expect(compact.getState()!.body).toBe("Unsaved wide body");
+  expect(scope.forDraft("first", "combined").getState()).toBeNull();
+  expect(scope.forDraft("second", "diff").getState()).toBeNull();
+  compact.save(compact.getState()!.body);
+  expect(storage.comments("first")[0]!.body).toBe("Unsaved wide body");
+  expect(scope.forDraft("first", "diff").getState()).toBeNull();
+});
diff --git a/packages/app/src/review/editor/index.ts b/packages/app/src/review/editor/index.ts
new file mode 100644
index 0000000000..6a7741eceb
--- /dev/null
+++ b/packages/app/src/review/editor/index.ts
@@ -0,0 +1,84 @@
+import type { ReviewableDiffTarget } from "@/utils/diff-layout";
+import type { InlineReviewEditorState } from "../geometry";
+import type { ReviewDraftComment } from "../state";
+
+export interface ReviewCommentWriter {
+  saveComment: (input: {
+    key: string;
+    id: string | null;
+    comment: Pick<ReviewDraftComment, "filePath" | "side" | "lineNumber" | "body">;
+  }) => void;
+  deleteComment: (input: { key: string; id: string }) => void;
+}
+
+/** One editor belongs to one review draft; replacing the draft creates a fresh editor. */
+export function createReviewEditor(key: string, writer: ReviewCommentWriter) {
+  return buildReviewEditor(key, writer, () => {});
+}
+
+function buildReviewEditor(key: string, writer: ReviewCommentWriter, onUnused: () => void) {
+  let editor: InlineReviewEditorState | null = null;
+  const listeners = new Set<() => void>();
+  function publish(next: InlineReviewEditorState | null) {
+    editor = next;
+    listeners.forEach((listener) => listener());
+    if (!editor && listeners.size === 0) onUnused();
+  }
+  return {
+    getState: () => editor,
+    subscribe: (listener: () => void) => {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+        queueMicrotask(() => {
+          if (!editor && listeners.size === 0) onUnused();
+        });
+      };
+    },
+    start: (target: ReviewableDiffTarget) => publish({ target, commentId: null, body: "" }),
+    edit: (target: ReviewableDiffTarget, comment: ReviewDraftComment) =>
+      publish({ target, commentId: comment.id, body: comment.body }),
+    setBody: (body: string) => {
+      if (editor) publish({ ...editor, body });
+    },
+    cancel: () => publish(null),
+    save: (body: string) => {
+      const trimmedBody = body.trim();
+      if (!editor || !trimmedBody) return;
+      writer.saveComment({
+        key,
+        id: editor.commentId,
+        comment: {
+          filePath: editor.target.filePath,
+          side: editor.target.side,
+          lineNumber: editor.target.lineNumber,
+          body: trimmedBody,
+        },
+      });
+      publish(null);
+    },
+    delete: (id: string) => {
+      writer.deleteComment({ key, id });
+      if (editor?.commentId === id) publish(null);
+    },
+  };
+}
+
+/** An open draft survives presentation remounts; each presentation owns its editor for that draft. */
+export function createReviewEditorScope(writer: ReviewCommentWriter) {
+  const editors = new Map<string, ReturnType<typeof createReviewEditor>>();
+  return {
+    forDraft(key: string, presentation: string) {
+      const owner = JSON.stringify([key, presentation]);
+      let model = editors.get(owner);
+      if (!model) {
+        const created = buildReviewEditor(key, writer, () => {
+          if (editors.get(owner) === created) editors.delete(owner);
+        });
+        model = created;
+        editors.set(owner, model);
+      }
+      return model;
+    },
+  };
+}
diff --git a/packages/app/src/review/feedback/index.test.ts b/packages/app/src/review/feedback/index.test.ts
new file mode 100644
index 0000000000..b423855b75
--- /dev/null
+++ b/packages/app/src/review/feedback/index.test.ts
@@ -0,0 +1,272 @@
+import { describe, expect, it } from "vitest";
+import {
+  createReviewFeedback,
+  createReviewFeedbackScope,
+  type ReviewFeedbackPorts,
+  type ReviewFeedbackSnapshot,
+  type FeedbackAttachment,
+  type FeedbackRecipient,
+} from "./index";
+import type { ReviewDraftComment } from "../state";
+
+function makeComment(id: string, body = id): ReviewDraftComment {
+  return {
+    id,
+    body,
+    filePath: "sample.ts",
+    side: "new",
+    lineNumber: 2,
+    createdAt: "2026-10-09T00:00:00Z",
+    updatedAt: "2026-10-09T00:00:00Z",
+  };
+}
+function makeRecipient(agentId: string): FeedbackRecipient {
+  return {
+    agentId,
+    tab: {
+      key: `agent_${agentId}`,
+      tabId: `agent_${agentId}`,
+      kind: "agent",
+      target: { kind: "agent", agentId },
+    },
+  };
+}
+function makeAttachment(comments: readonly ReviewDraftComment[]): FeedbackAttachment | null {
+  if (!comments.length) return null;
+  const line = {
+    type: "add" as const,
+    content: "const value = 1",
+    oldLineNumber: null,
+    newLineNumber: 2,
+  };
+  return {
+    kind: "review",
+    reviewDraftKey: "draft",
+    commentCount: comments.length,
+    attachment: {
+      type: "review",
+      mimeType: "application/paseo-review",
+      cwd: "/workspace",
+      mode: "uncommitted",
+      baseRef: null,
+      comments: comments.map((comment) => ({
+        filePath: comment.filePath,
+        side: comment.side,
+        lineNumber: comment.lineNumber,
+        body: comment.body,
+        context: { hunkHeader: "@@ -1 +1 @@", targetLine: line, lines: [line] },
+      })),
+    },
+  };
+}
+function setup(agentIds: string[], unavailableIds: string[] = [], create = createReviewFeedback) {
+  let comments = [makeComment("first")];
+  let recipients = agentIds.map(makeRecipient);
+  let connected = true;
+  let rejectSend: ((error: Error) => void) | null = null;
+  let resolveSend: (() => void) | null = null;
+  const sends: Array<{ recipient: FeedbackRecipient; attachment: FeedbackAttachment }> = [];
+  const read = (): ReviewFeedbackSnapshot => ({
+    comments,
+    recipients,
+    connected,
+    attachment: makeAttachment(comments.filter((comment) => !unavailableIds.includes(comment.id))),
+  });
+  const ports: ReviewFeedbackPorts = {
+    read,
+    send: (recipient, attachment) => {
+      sends.push({ recipient, attachment });
+      return new Promise<void>((resolve, reject) => {
+        resolveSend = resolve;
+        rejectSend = reject;
+      });
+    },
+    clearSent: (sent) => {
+      comments = comments.filter(
+        (current) =>
+          !sent.some(
+            (prior) =>
+              prior.id === current.id &&
+              prior.updatedAt === current.updatedAt &&
+              prior.body === current.body,
+          ),
+      );
+    },
+    failedMessage: () => "Failed to send",
+  };
+  const model = create(ports);
+  return {
+    model,
+    ports,
+    sends,
+    comments: () => comments,
+    setComments: (next: ReviewDraftComment[]) => {
+      comments = next;
+      model.refresh();
+    },
+    setRecipients: (ids: string[]) => {
+      recipients = ids.map(makeRecipient);
+      model.refresh();
+    },
+    disconnect: () => {
+      connected = false;
+      model.refresh();
+    },
+    succeed: () => resolveSend!(),
+    fail: () => rejectSend!(new Error("Host rejected feedback")),
+  };
+}
+
+describe("review feedback", () => {
+  it("counts only attached comments, freezes the sending count, and retains orphans", async () => {
+    const feedback = setup(["one"], ["orphan"]);
+    feedback.setComments([makeComment("first"), makeComment("orphan")]);
+    expect(feedback.model.getState()).toMatchObject({ commentCount: 2, sendableCommentCount: 1 });
+    const pending = feedback.model.press();
+    feedback.setComments([makeComment("first"), makeComment("orphan"), makeComment("added")]);
+    expect(feedback.model.getState()).toMatchObject({
+      phase: { kind: "sending", commentCount: 1 },
+      sendableCommentCount: 2,
+    });
+    expect(feedback.sends[0]!.attachment.commentCount).toBe(1);
+    feedback.succeed();
+    await pending;
+    expect(feedback.comments()).toEqual([makeComment("orphan"), makeComment("added")]);
+  });
+  it("retains an entirely orphaned draft without claiming any comments are sendable", async () => {
+    const feedback = setup(["one"], ["first"]);
+    expect(feedback.model.getState()).toMatchObject({
+      commentCount: 1,
+      sendableCommentCount: 0,
+      disabledReason: "no-context",
+      canSend: false,
+    });
+    await feedback.model.press();
+    expect(feedback.sends).toEqual([]);
+    expect(feedback.comments()).toEqual([makeComment("first")]);
+  });
+  it("retains comments and explains why no workspace agent can receive them", async () => {
+    const feedback = setup([]);
+    await feedback.model.press();
+    expect(feedback.model.getState()).toMatchObject({
+      canSend: false,
+      disabledReason: "no-agents",
+      commentCount: 1,
+    });
+    expect(feedback.sends).toEqual([]);
+    expect(feedback.comments()).toEqual([makeComment("first")]);
+  });
+  it("sends once to the only recipient and clears only sent versions", async () => {
+    const feedback = setup(["one"]);
+    const pending = feedback.model.press();
+    await feedback.model.press();
+    await feedback.model.send("one");
+    expect(feedback.sends).toEqual([
+      { recipient: makeRecipient("one"), attachment: makeAttachment([makeComment("first")]) },
+    ]);
+    feedback.setComments([makeComment("first", "Edited during send"), makeComment("added")]);
+    feedback.succeed();
+    await pending;
+    expect(feedback.comments()).toEqual([
+      makeComment("first", "Edited during send"),
+      makeComment("added"),
+    ]);
+    expect(feedback.model.getState().phase).toEqual({
+      kind: "sent",
+      recipient: makeRecipient("one"),
+    });
+  });
+  it("clears unchanged sent comments while preserving additions", async () => {
+    const feedback = setup(["one"]);
+    const pending = feedback.model.press();
+    feedback.setComments([makeComment("first"), makeComment("added")]);
+    feedback.succeed();
+    await pending;
+    expect(feedback.comments()).toEqual([makeComment("added")]);
+  });
+  it("asks for a recipient when several tabs exist and validates the selection again", async () => {
+    const feedback = setup(["one", "two"]);
+    await feedback.model.press();
+    expect(feedback.model.getState().phase).toEqual({ kind: "choosing" });
+    expect(feedback.sends).toEqual([]);
+    feedback.setRecipients(["one"]);
+    await feedback.model.send("two");
+    expect(feedback.sends).toEqual([]);
+    const pending = feedback.model.send("one");
+    feedback.succeed();
+    await pending;
+    expect(feedback.comments()).toEqual([]);
+  });
+  it("retains comments on failure and retries using the latest saved version", async () => {
+    const feedback = setup(["one"]);
+    const failed = feedback.model.press();
+    feedback.fail();
+    await failed;
+    expect(feedback.model.getState().phase).toEqual({
+      kind: "failed",
+      message: "Host rejected feedback",
+    });
+    expect(feedback.comments()).toEqual([makeComment("first")]);
+    feedback.setComments([makeComment("first", "Corrected before retry")]);
+    const retried = feedback.model.press();
+    feedback.succeed();
+    await retried;
+    expect(feedback.sends).toHaveLength(2);
+    expect(feedback.sends[1]!.attachment.attachment.comments[0]!.body).toBe(
+      "Corrected before retry",
+    );
+    expect(feedback.comments()).toEqual([]);
+  });
+  it("keeps workspace drafts independent and prevents disconnected sends", async () => {
+    const first = setup(["one"]);
+    const second = setup(["other"]);
+    first.disconnect();
+    await first.model.press();
+    expect(first.model.getState().disabledReason).toBe("disconnected");
+    const pending = second.model.press();
+    second.succeed();
+    await pending;
+    expect(first.comments()).toEqual([makeComment("first")]);
+    expect(first.sends).toEqual([]);
+    expect(second.comments()).toEqual([]);
+  });
+});
+
+describe("shared review submission ownership", () => {
+  it("blocks another surface and reconnects to the pending draft while other drafts remain usable", async () => {
+    const scope = createReviewFeedbackScope();
+    const first = setup(["one"], [], (ports) => scope.connect("workspace-one", ports));
+    const second = scope.connect("workspace-one", first.ports);
+    const other = setup(["other"], [], (ports) => scope.connect("workspace-other", ports));
+    const unsubscribe = first.model.subscribe(() => {});
+    const pending = first.model.press();
+    unsubscribe();
+    await Promise.resolve();
+    const reconnected = scope.connect("workspace-one", first.ports);
+    expect(second.getState()).toMatchObject({ canSend: false, phase: { kind: "sending" } });
+    await second.press();
+    await reconnected.send("one");
+    expect(first.sends).toHaveLength(1);
+    const otherPending = other.model.press();
+    expect(other.sends).toHaveLength(1);
+    first.fail();
+    await pending;
+    expect(second.getState().phase).toEqual({ kind: "failed", message: "Host rejected feedback" });
+    const retry = second.press();
+    first.succeed();
+    await retry;
+    expect(first.sends).toHaveLength(2);
+    other.succeed();
+    await otherPending;
+  });
+  it("opens only the active surface's recipient chooser", async () => {
+    const scope = createReviewFeedbackScope();
+    const first = setup(["one", "two"], [], (ports) => scope.connect("same", ports));
+    const second = scope.connect("same", first.ports);
+    await first.model.press();
+    expect(first.model.getState().phase).toEqual({ kind: "choosing" });
+    expect(second.getState().phase).toEqual({ kind: "idle" });
+    first.model.closeMenu();
+    expect(first.model.getState().phase).toEqual({ kind: "idle" });
+  });
+});
diff --git a/packages/app/src/review/feedback/index.ts b/packages/app/src/review/feedback/index.ts
new file mode 100644
index 0000000000..69e0592fe8
--- /dev/null
+++ b/packages/app/src/review/feedback/index.ts
@@ -0,0 +1,177 @@
+import type { ComposerAttachment } from "@/attachments/types";
+import type { ReviewDraftComment } from "../state";
+import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
+
+export interface FeedbackRecipient {
+  agentId: string;
+  tab: WorkspaceTabDescriptor;
+}
+export type FeedbackAttachment = Extract<ComposerAttachment, { kind: "review" }>;
+export interface ReviewFeedbackSnapshot {
+  comments: readonly ReviewDraftComment[];
+  attachment: FeedbackAttachment | null;
+  recipients: readonly FeedbackRecipient[];
+  connected: boolean;
+}
+export interface ReviewFeedbackPorts {
+  read: () => ReviewFeedbackSnapshot;
+  send: (recipient: FeedbackRecipient, attachment: FeedbackAttachment) => Promise<void>;
+  clearSent: (comments: readonly ReviewDraftComment[]) => void;
+  failedMessage: () => string;
+}
+export type FeedbackPhase =
+  | { kind: "idle" }
+  | { kind: "choosing" }
+  | { kind: "sending"; recipient: FeedbackRecipient; commentCount: number }
+  | { kind: "failed"; message: string }
+  | { kind: "sent"; recipient: FeedbackRecipient };
+export interface ReviewFeedbackState {
+  phase: FeedbackPhase;
+  commentCount: number;
+  sendableCommentCount: number;
+  recipients: readonly FeedbackRecipient[];
+  disabledReason: "no-agents" | "disconnected" | "no-context" | null;
+  canSend: boolean;
+}
+
+export function createReviewFeedback(ports: ReviewFeedbackPorts) {
+  return createFeedbackView(ports, createFeedbackWorkflow());
+}
+
+/** Surfaces share submission ownership while keeping their chooser and live inputs local. */
+export function createReviewFeedbackScope() {
+  const workflows = new Map<string, ReturnType<typeof createFeedbackWorkflow>>();
+  return {
+    connect(key: string, ports: ReviewFeedbackPorts) {
+      let workflow = workflows.get(key);
+      if (!workflow) {
+        const created = createFeedbackWorkflow(() => {
+          if (workflows.get(key) === created) workflows.delete(key);
+        });
+        workflow = created;
+        workflows.set(key, workflow);
+      }
+      return createFeedbackView(ports, workflow);
+    },
+  };
+}
+
+function createFeedbackWorkflow(onUnused: () => void = () => {}) {
+  let phase: FeedbackPhase = { kind: "idle" };
+  const observers = new Set<() => void>();
+  function releaseIfUnused() {
+    queueMicrotask(() => {
+      if (observers.size === 0 && phase.kind !== "sending") onUnused();
+    });
+  }
+  return {
+    getPhase: () => phase,
+    changePhase(next: FeedbackPhase) {
+      phase = next;
+      observers.forEach((observer) => observer());
+      releaseIfUnused();
+    },
+    subscribe(observer: () => void) {
+      observers.add(observer);
+      return () => {
+        observers.delete(observer);
+        releaseIfUnused();
+      };
+    },
+  };
+}
+
+function createFeedbackView(
+  ports: ReviewFeedbackPorts,
+  workflow: ReturnType<typeof createFeedbackWorkflow>,
+) {
+  let choosing = false;
+  const choosingPhase: FeedbackPhase = { kind: "choosing" };
+  const getPhase = () => (choosing ? choosingPhase : workflow.getPhase());
+  let state = deriveState(ports.read(), getPhase());
+  const listeners = new Set<() => void>();
+  function publish() {
+    state = deriveState(ports.read(), getPhase());
+    listeners.forEach((listener) => listener());
+  }
+  async function send(agentId: string) {
+    const snapshot = ports.read();
+    const current = deriveState(snapshot, workflow.getPhase());
+    const recipient = snapshot.recipients.find((candidate) => candidate.agentId === agentId);
+    if (!current.canSend || !recipient || !snapshot.attachment) return;
+    const attachment = snapshot.attachment;
+    const sentComments = snapshot.comments.filter((comment) =>
+      attachment.attachment.comments.some(
+        (sent) =>
+          sent.filePath === comment.filePath &&
+          sent.side === comment.side &&
+          sent.lineNumber === comment.lineNumber &&
+          sent.body === comment.body,
+      ),
+    );
+    choosing = false;
+    workflow.changePhase({ kind: "sending", recipient, commentCount: attachment.commentCount });
+    publish();
+    try {
+      await ports.send(recipient, attachment);
+      ports.clearSent(sentComments);
+      workflow.changePhase({ kind: "sent", recipient });
+    } catch (error) {
+      workflow.changePhase({
+        kind: "failed",
+        message: error instanceof Error ? error.message : ports.failedMessage(),
+      });
+    }
+    publish();
+  }
+  return {
+    getState: () => {
+      if (state.phase !== getPhase()) state = deriveState(ports.read(), getPhase());
+      return state;
+    },
+    subscribe: (listener: () => void) => {
+      listeners.add(listener);
+      const unsubscribe = workflow.subscribe(() => {
+        choosing = false;
+        publish();
+      });
+      return () => {
+        listeners.delete(listener);
+        unsubscribe();
+      };
+    },
+    refresh: publish,
+    press: async () => {
+      const snapshot = ports.read();
+      if (!deriveState(snapshot, workflow.getPhase()).canSend) return;
+      if (snapshot.recipients.length === 1) {
+        await send(snapshot.recipients[0]!.agentId);
+      } else {
+        choosing = true;
+        publish();
+      }
+    },
+    closeMenu: () => {
+      if (choosing) {
+        choosing = false;
+        publish();
+      }
+    },
+    send,
+  };
+}
+
+function deriveState(snapshot: ReviewFeedbackSnapshot, phase: FeedbackPhase): ReviewFeedbackState {
+  let disabledReason: ReviewFeedbackState["disabledReason"] = null;
+  if (snapshot.recipients.length === 0) disabledReason = "no-agents";
+  else if (!snapshot.connected) disabledReason = "disconnected";
+  else if (!snapshot.attachment) disabledReason = "no-context";
+  return {
+    phase,
+    commentCount: snapshot.comments.length,
+    sendableCommentCount: snapshot.attachment?.commentCount ?? 0,
+    recipients: snapshot.recipients,
+    disabledReason,
+    canSend: snapshot.comments.length > 0 && disabledReason === null && phase.kind !== "sending",
+  };
+}
diff --git a/packages/app/src/review/feedback/surface.tsx b/packages/app/src/review/feedback/surface.tsx
new file mode 100644
index 0000000000..7f87f46d88
--- /dev/null
+++ b/packages/app/src/review/feedback/surface.tsx
@@ -0,0 +1,284 @@
+import { useCallback, useMemo, type ReactNode } from "react";
+import { Text, View } from "react-native";
+import { Send } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { StyleSheet } from "react-native-unistyles";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem } from "@/components/ui/dropdown-menu";
+import { useMenuContext } from "@/components/ui/menu";
+import { Button } from "@/components/ui/button";
+import { buttonControlHeight } from "@/components/ui/control-geometry";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { SPACING } from "@/styles/theme";
+import { FloatingActionButton } from "@/components/ui/floating-action-button";
+import {
+  WorkspaceTabPresentationResolver,
+  WorkspaceTabIcon,
+  type WorkspaceTabPresentation,
+} from "@/screens/workspace/workspace-tab-presentation";
+import type { FeedbackRecipient, ReviewFeedbackState, createReviewFeedback } from "./index";
+
+type FeedbackModel = ReturnType<typeof createReviewFeedback>;
+interface ReviewFeedbackActionProps {
+  bottomOffset: number;
+  model: FeedbackModel;
+  state: ReviewFeedbackState;
+  serverId: string;
+  workspaceId: string;
+}
+
+export function ReviewFeedbackAction({
+  enabled,
+  hasDiff,
+  ...props
+}: Omit<ReviewFeedbackActionProps, "workspaceId"> & {
+  workspaceId?: string | null;
+  enabled: boolean | undefined;
+  hasDiff: boolean;
+}) {
+  if (enabled === false || !hasDiff) return null;
+  return <OpenReviewFeedbackAction {...props} workspaceId={props.workspaceId ?? ""} />;
+}
+
+function OpenReviewFeedbackAction({
+  model,
+  state,
+  serverId,
+  workspaceId,
+  bottomOffset,
+}: ReviewFeedbackActionProps) {
+  const { t } = useTranslation();
+  const { bottom } = useSafeAreaInsets();
+  const isCompact = useIsCompactFormFactor();
+  const onOpenChange = useCallback(
+    (open: boolean) => {
+      if (!open) model.closeMenu();
+    },
+    [model],
+  );
+  const noteStyle = useMemo(
+    () => [
+      styles.note,
+      !isCompact && styles.centered,
+      {
+        bottom:
+          bottom +
+          bottomOffset +
+          (isCompact ? 88 : buttonControlHeight.sm + SPACING[4] + SPACING[2]),
+      },
+    ],
+    [bottom, bottomOffset, isCompact],
+  );
+  const sending = state.phase.kind === "sending";
+  const label = t(sending ? "review.feedback.sending" : "review.feedback.send", {
+    count: state.phase.kind === "sending" ? state.phase.commentCount : state.sendableCommentCount,
+  });
+  const unavailableNotice =
+    state.disabledReason && state.commentCount > 0 ? (
+      <Text style={styles.text}>{t(`review.feedback.${state.disabledReason}`)}</Text>
+    ) : null;
+  let notice: ReactNode = unavailableNotice;
+  if (state.phase.kind === "failed")
+    notice = <Text style={styles.error}>{state.phase.message}</Text>;
+  else if (state.phase.kind === "sent")
+    notice = (
+      <>
+        <SentNotice
+          recipient={state.phase.recipient}
+          serverId={serverId}
+          workspaceId={workspaceId}
+        />
+        {unavailableNotice}
+      </>
+    );
+  return (
+    <>
+      {state.commentCount > 0 ? (
+        <DropdownMenu
+          open={state.phase.kind === "choosing"}
+          onOpenChange={onOpenChange}
+          compactMode="sheet"
+        >
+          <FeedbackTrigger
+            model={model}
+            label={label}
+            disabled={!state.canSend}
+            bottomInset={bottom + bottomOffset}
+          />
+          <DropdownMenuContent
+            side="top"
+            align="center"
+            sheetTitle={t("review.feedback.chooseAgent")}
+          >
+            {state.recipients.map((recipient) => (
+              <RecipientOption
+                key={recipient.tab.key}
+                recipient={recipient}
+                model={model}
+                serverId={serverId}
+                workspaceId={workspaceId}
+              />
+            ))}
+          </DropdownMenuContent>
+        </DropdownMenu>
+      ) : null}
+      {notice ? (
+        <View style={noteStyle} accessibilityRole="alert">
+          {notice}
+        </View>
+      ) : null}
+    </>
+  );
+}
+
+function FeedbackTrigger({
+  model,
+  label,
+  disabled,
+  bottomInset,
+}: {
+  model: FeedbackModel;
+  label: string;
+  disabled: boolean;
+  bottomInset: number;
+}) {
+  const { triggerRef } = useMenuContext("FeedbackTrigger");
+  const isCompact = useIsCompactFormFactor();
+  const press = useCallback(() => {
+    void model.press();
+  }, [model]);
+  if (!isCompact) {
+    return (
+      <View
+        pointerEvents="box-none"
+        style={[styles.wideAction, { bottom: bottomInset + SPACING[4] }]}
+      >
+        <Button
+          ref={triggerRef}
+          variant="default"
+          size="sm"
+          leftIcon={Send}
+          accessibilityLabel={label}
+          disabled={disabled}
+          onPress={press}
+        >
+          {label}
+        </Button>
+      </View>
+    );
+  }
+  return (
+    <FloatingActionButton
+      ref={triggerRef}
+      icon={Send}
+      label={label}
+      accessibilityLabel={label}
+      disabled={disabled}
+      bottomInset={bottomInset}
+      onPress={press}
+    />
+  );
+}
+
+function RecipientOption({
+  recipient,
+  model,
+  serverId,
+  workspaceId,
+}: {
+  recipient: FeedbackRecipient;
+  model: FeedbackModel;
+  serverId: string;
+  workspaceId: string;
+}) {
+  const choose = useCallback(() => {
+    void model.send(recipient.agentId);
+  }, [model, recipient.agentId]);
+  const render = useCallback(
+    (presentation: WorkspaceTabPresentation) => (
+      <RecipientRow presentation={presentation} onSelect={choose} />
+    ),
+    [choose],
+  );
+  return (
+    <WorkspaceTabPresentationResolver
+      tab={recipient.tab}
+      serverId={serverId}
+      workspaceId={workspaceId}
+    >
+      {render}
+    </WorkspaceTabPresentationResolver>
+  );
+}
+
+function RecipientRow({
+  presentation,
+  onSelect,
+}: {
+  presentation: WorkspaceTabPresentation;
+  onSelect: () => void;
+}) {
+  const leading = useMemo(
+    () => <WorkspaceTabIcon presentation={presentation} backdrop="surface0" />,
+    [presentation],
+  );
+  return (
+    <DropdownMenuItem leading={leading} onSelect={onSelect}>
+      {presentation.label}
+    </DropdownMenuItem>
+  );
+}
+
+function SentNotice({
+  recipient,
+  serverId,
+  workspaceId,
+}: {
+  recipient: FeedbackRecipient;
+  serverId: string;
+  workspaceId: string;
+}) {
+  const { t } = useTranslation();
+  const render = useCallback(
+    (presentation: WorkspaceTabPresentation) => (
+      <Text style={styles.text}>
+        {t("review.feedback.sent", { recipient: presentation.label })}
+      </Text>
+    ),
+    [t],
+  );
+  return (
+    <WorkspaceTabPresentationResolver
+      tab={recipient.tab}
+      serverId={serverId}
+      workspaceId={workspaceId}
+    >
+      {render}
+    </WorkspaceTabPresentationResolver>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  wideAction: { position: "absolute", left: 0, right: 0, alignItems: "center" },
+  centered: { alignItems: "center" },
+  note: {
+    position: "absolute",
+    right: theme.spacing[4],
+    left: theme.spacing[4],
+    alignItems: "flex-end",
+  },
+  text: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    backgroundColor: theme.colors.surface1,
+    padding: theme.spacing[2],
+    borderRadius: theme.borderRadius.md,
+  },
+  error: {
+    color: theme.colors.destructive,
+    fontSize: theme.fontSize.sm,
+    backgroundColor: theme.colors.surface1,
+    padding: theme.spacing[2],
+    borderRadius: theme.borderRadius.md,
+  },
+}));
diff --git a/packages/app/src/review/feedback/use-feedback.ts b/packages/app/src/review/feedback/use-feedback.ts
new file mode 100644
index 0000000000..e2b151953e
--- /dev/null
+++ b/packages/app/src/review/feedback/use-feedback.ts
@@ -0,0 +1,120 @@
+import { useEffect, useMemo, useRef, useSyncExternalStore } from "react";
+import {
+  useReviewDraftComments,
+  getReviewDraftComments,
+  clearSentReviewDraftComments,
+} from "../store";
+import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
+import { buildWorkspaceTabPersistenceKey } from "@/workspace-tabs/model";
+import { deriveWorkspaceTabModel } from "@/screens/workspace/workspace-tab-model";
+import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { useAppSettings } from "@/hooks/use-settings";
+import { dispatchComposerAgentMessage } from "@/composer/actions";
+import { createMessageSubmissionWriter } from "@/composer/submission/writer";
+import { useSessionStore, selectAgentTurnPresentation } from "@/stores/session-store";
+import { FLOATING_ACTION_BUTTON_CLEARANCE } from "@/components/ui/floating-action-button";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { buttonControlHeight } from "@/components/ui/control-geometry";
+import { SPACING } from "@/styles/theme";
+import { i18n } from "@/i18n/i18next";
+import {
+  createReviewFeedbackScope,
+  type FeedbackAttachment,
+  type FeedbackRecipient,
+} from "./index";
+
+const feedbackScope = createReviewFeedbackScope();
+
+export function useReviewFeedback(input: {
+  reviewDraftKey: string;
+  serverId: string;
+  workspaceId?: string;
+  attachment: FeedbackAttachment | null;
+}) {
+  const { serverId, reviewDraftKey, workspaceId } = input;
+  const isCompact = useIsCompactFormFactor();
+  const workspaceKey = workspaceId
+    ? buildWorkspaceTabPersistenceKey({ serverId, workspaceId })
+    : null;
+  const client = useHostRuntimeClient(serverId);
+  const connected = useHostRuntimeIsConnected(serverId);
+  const { settings } = useAppSettings();
+  const comments = useReviewDraftComments(reviewDraftKey);
+  const layout = useWorkspaceLayoutStore((store) =>
+    workspaceKey ? store.layoutByWorkspace[workspaceKey] : undefined,
+  );
+  // The adapter keeps live host and diff inputs available to commands without reconstructing the workflow.
+  const live = useRef({
+    client,
+    connected,
+    attachment: input.attachment,
+    sendBehavior: settings.sendBehavior,
+  });
+  live.current = {
+    client,
+    connected,
+    attachment: input.attachment,
+    sendBehavior: settings.sendBehavior,
+  };
+  const model = useMemo(
+    () =>
+      feedbackScope.connect(reviewDraftKey, {
+        read: () => ({
+          comments: getReviewDraftComments(reviewDraftKey) ?? [],
+          attachment: live.current.attachment,
+          connected: live.current.connected,
+          recipients: readRecipients(workspaceKey),
+        }),
+        send: async (recipient, attachment) => {
+          const { client: targetClient, sendBehavior } = live.current;
+          if (!targetClient) throw new Error(i18n.t("workspace.terminal.hostDisconnected"));
+          const activeTurnBehavior = sendBehavior === "steer" ? "steer" : "interrupt";
+          await dispatchComposerAgentMessage({
+            client: targetClient,
+            agentId: recipient.agentId,
+            text: i18n.t("review.feedback.prompt"),
+            attachments: [attachment],
+            encodeImages: async () => [],
+            submission: createMessageSubmissionWriter(serverId),
+            activeTurnBehavior,
+            activeTurnId:
+              activeTurnBehavior === "steer"
+                ? (selectAgentTurnPresentation(
+                    useSessionStore.getState().sessions[serverId],
+                    recipient.agentId,
+                  ).turnId ?? undefined)
+                : undefined,
+          });
+        },
+        clearSent: (sentComments) =>
+          clearSentReviewDraftComments({ key: reviewDraftKey, comments: sentComments }),
+        failedMessage: () => i18n.t("review.feedback.failed"),
+      }),
+    [reviewDraftKey, serverId, workspaceKey],
+  );
+  useEffect(() => {
+    model.refresh();
+  }, [model, comments, layout, connected, input.attachment]);
+  const state = useSyncExternalStore(model.subscribe, model.getState, model.getState);
+  return {
+    model,
+    state,
+    clearance:
+      state.commentCount > 0
+        ? (isCompact ? FLOATING_ACTION_BUTTON_CLEARANCE : buttonControlHeight.sm + SPACING[4]) + 44
+        : 0,
+  };
+}
+
+function readRecipients(workspaceKey: string | null): FeedbackRecipient[] {
+  const tabs = workspaceKey
+    ? useWorkspaceLayoutStore.getState().getWorkspaceTabs(workspaceKey)
+    : [];
+  const descriptors = deriveWorkspaceTabModel({ tabs }).tabs;
+  const recipients: FeedbackRecipient[] = [];
+  for (const { descriptor } of descriptors) {
+    if (descriptor.target.kind === "agent")
+      recipients.push({ agentId: descriptor.target.agentId, tab: descriptor });
+  }
+  return recipients;
+}
diff --git a/packages/app/src/review/geometry.ts b/packages/app/src/review/geometry.ts
index 819c1d29b1..46bbf88ecc 100644
--- a/packages/app/src/review/geometry.ts
+++ b/packages/app/src/review/geometry.ts
@@ -19,6 +19,7 @@ export interface InlineReviewActions {
   onStartComment: (target: ReviewableDiffTarget) => void;
   onEditComment: (target: ReviewableDiffTarget, comment: ReviewDraftComment) => void;
   onCancelEditor: () => void;
+  onChangeEditorBody: (body: string) => void;
   onSaveEditor: (body: string) => void;
   onDeleteComment: (id: string) => void;
 }
diff --git a/packages/app/src/review/index.ts b/packages/app/src/review/index.ts
index 014447090b..308f955259 100644
--- a/packages/app/src/review/index.ts
+++ b/packages/app/src/review/index.ts
@@ -31,3 +31,8 @@ export {
   SMALL_ACTION_HIT_SLOP,
   useInlineReviewController,
 } from "./surface";
+
+export { ReviewCommentSheet } from "./comment-sheet";
+
+export { useReviewFeedback } from "./feedback/use-feedback";
+export { ReviewFeedbackAction } from "./feedback/surface";
diff --git a/packages/app/src/review/store.test.ts b/packages/app/src/review/store.test.ts
index 344b28b61d..222a3f57f3 100644
--- a/packages/app/src/review/store.test.ts
+++ b/packages/app/src/review/store.test.ts
@@ -2,7 +2,16 @@ import { describe, expect, it } from "vitest";
 import type { StateStorage } from "zustand/middleware";
 import type { ParsedDiffFile } from "@/git/use-diff-query";
 import { createValidatedPersistStorage } from "@/storage/validated-persist-storage";
-import { buildReviewAttachmentSnapshot, buildReviewDraftKey } from "./store";
+import {
+  buildReviewAttachmentSnapshot,
+  buildReviewDraftKey,
+  addReviewDraftComment,
+  saveReviewDraftComment,
+  clearSentReviewDraftComments,
+  getReviewDraftComments,
+  resetReviewDraftStore,
+  useReviewDraftStore,
+} from "./store";
 import {
   addCommentToState,
   clearReviewInState,
@@ -304,3 +313,49 @@ describe("buildReviewAttachmentSnapshot", () => {
     });
   });
 });
+
+describe("successful feedback cleanup", () => {
+  it("clears sent versions only, preserving edits, additions and other workspace drafts", () => {
+    resetReviewDraftStore();
+    const first = addReviewDraftComment({ key: "first", comment: makeComment() });
+    const edited = addReviewDraftComment({
+      key: "first",
+      comment: makeComment({ id: "edited", body: "Before send" }),
+    });
+    const other = addReviewDraftComment({ key: "other", comment: makeComment({ id: "other" }) });
+    useReviewDraftStore.getState().updateComment({
+      key: "first",
+      id: edited.id,
+      updates: { body: "After send" },
+      updatedAt: edited.updatedAt,
+    });
+    const added = addReviewDraftComment({ key: "first", comment: makeComment({ id: "added" }) });
+    clearSentReviewDraftComments({ key: "first", comments: [first, edited] });
+    expect(getReviewDraftComments("first")).toEqual([{ ...edited, body: "After send" }, added]);
+    expect(getReviewDraftComments("other")).toEqual([other]);
+    resetReviewDraftStore();
+  });
+});
+
+it("saves an acknowledged open edit as a new version and keeps subsequent edits on that record", () => {
+  resetReviewDraftStore();
+  const submitted = addReviewDraftComment({ key: "first", comment: makeComment() });
+  clearSentReviewDraftComments({ key: "first", comments: [submitted] });
+  saveReviewDraftComment({
+    key: "first",
+    id: submitted.id,
+    comment: { ...submitted, body: "Open edit after acknowledgement" },
+  });
+  const restored = getReviewDraftComments("first")![0]!;
+  expect(restored.body).toBe("Open edit after acknowledgement");
+  expect(restored.id).not.toBe(submitted.id);
+  clearSentReviewDraftComments({ key: "first", comments: [submitted] });
+  expect(getReviewDraftComments("first")).toEqual([restored]);
+  saveReviewDraftComment({
+    key: "first",
+    id: restored.id,
+    comment: { ...restored, body: "Saved again" },
+  });
+  expect(getReviewDraftComments("first")).toMatchObject([{ id: restored.id, body: "Saved again" }]);
+  resetReviewDraftStore();
+});
diff --git a/packages/app/src/review/store.ts b/packages/app/src/review/store.ts
index bac1659751..614572190a 100644
--- a/packages/app/src/review/store.ts
+++ b/packages/app/src/review/store.ts
@@ -320,3 +320,43 @@ export function useReviewAttachmentSnapshot(input: {
     [comments, input.key, input.cwd, input.mode, input.baseRef, input.diffFiles],
   );
 }
+
+/** Acknowledgement removes only the versions included in that submission. */
+export function clearSentReviewDraftComments(input: {
+  key: string;
+  comments: readonly ReviewDraftComment[];
+}): void {
+  const sentById = new Map(input.comments.map((comment) => [comment.id, comment]));
+  useReviewDraftStore.setState((state) => {
+    const current = state.drafts[input.key];
+    if (!current) return state;
+    const remaining = current.filter((comment) => {
+      const sent = sentById.get(comment.id);
+      return !sent || sent.updatedAt !== comment.updatedAt || sent.body !== comment.body;
+    });
+    if (remaining.length === current.length) return state;
+    return { drafts: { ...state.drafts, [input.key]: remaining } };
+  });
+}
+
+/** Acknowledgement can remove the original while the user still has an edit open. */
+export function saveReviewDraftComment(input: {
+  key: string;
+  id: string | null;
+  comment: Pick<ReviewDraftComment, "filePath" | "side" | "lineNumber" | "body">;
+}): void {
+  const store = useReviewDraftStore.getState();
+  if (input.id && store.drafts[input.key]?.some((comment) => comment.id === input.id)) {
+    store.updateComment({ key: input.key, id: input.id, updates: { body: input.comment.body } });
+  } else {
+    store.addComment({
+      key: input.key,
+      comment: {
+        filePath: input.comment.filePath,
+        side: input.comment.side,
+        lineNumber: input.comment.lineNumber,
+        body: input.comment.body,
+      },
+    });
+  }
+}
diff --git a/packages/app/src/review/surface.test.tsx b/packages/app/src/review/surface.test.tsx
index e23f321d38..925ebe6b24 100644
--- a/packages/app/src/review/surface.test.tsx
+++ b/packages/app/src/review/surface.test.tsx
@@ -9,45 +9,24 @@ import { useReviewDraftStore, type ReviewDraftComment } from "./store";
 import { buildReviewableDiffTargetKey, type ReviewableDiffTarget } from "@/utils/diff-layout";
 import {
   getInlineReviewThreadState,
-  getInlineReviewThreadViewportStyle,
   getSplitInlineReviewThreadState,
+  type InlineReviewActions,
+} from "./geometry";
+import {
+  getInlineReviewThreadViewportStyle,
   groupInlineReviewCommentsByTarget,
   InlineReviewEditor,
   InlineReviewGutterCell,
   InlineReviewThread,
   SMALL_ACTION_HIT_SLOP,
   useInlineReviewController,
-  type InlineReviewActions,
-} from "./index";
+} from "./surface";
 
 void testI18n;
 
-const { theme, pressablePropsByLabel } = vi.hoisted(() => {
+const { pressablePropsByLabel } = vi.hoisted(() => {
   Object.assign(globalThis, { __DEV__: false });
-  return {
-    theme: {
-      spacing: { 1: 4, 2: 8, 3: 12 },
-      borderWidth: { 1: 1 },
-      borderRadius: { base: 4, md: 6, lg: 8, xl: 12, full: 999 },
-      opacity: { 50: 0.5 },
-      fontSize: { xs: 11, sm: 13 },
-      fontWeight: { normal: "400", medium: "500" },
-      lineHeight: { diff: 18 },
-      colors: {
-        accent: "#0a84ff",
-        accentForeground: "#fff",
-        border: "#555",
-        destructive: "#ff453a",
-        foreground: "#fff",
-        foregroundMuted: "#aaa",
-        surface1: "#111",
-        surface2: "#222",
-        surface3: "#333",
-        palette: { white: "#fff" },
-      },
-    },
-    pressablePropsByLabel: new Map<string, Record<string, unknown>>(),
-  };
+  return { pressablePropsByLabel: new Map<string, Record<string, unknown>>() };
 });
 
 vi.mock("react-native", async (importOriginal) => {
@@ -88,13 +67,16 @@ vi.mock("react-native", async (importOriginal) => {
   };
 });
 
-vi.mock("react-native-unistyles", () => ({
-  StyleSheet: {
-    create: (factory: unknown) => (typeof factory === "function" ? factory(theme) : factory),
-  },
-  withUnistyles: <T,>(component: T) => component,
-  useUnistyles: () => ({ theme, rt: { breakpoint: "md" } }),
-}));
+vi.mock("react-native-unistyles", async () => {
+  const { darkTheme: theme } = await import("@/styles/theme");
+  return {
+    StyleSheet: {
+      create: (factory: unknown) => (typeof factory === "function" ? factory(theme) : factory),
+    },
+    withUnistyles: <T,>(component: T) => component,
+    useUnistyles: () => ({ theme, rt: { breakpoint: "md" } }),
+  };
+});
 
 vi.mock("@/constants/platform", () => ({
   getIsElectron: () => false,
@@ -103,19 +85,6 @@ vi.mock("@/constants/platform", () => ({
   isWeb: true,
 }));
 
-vi.mock("lucide-react-native", () => {
-  const createIcon = (name: string) => (props: Record<string, unknown>) =>
-    React.createElement("span", { ...props, "data-icon": name });
-  return {
-    Check: createIcon("Check"),
-    CircleDot: createIcon("CircleDot"),
-    Pencil: createIcon("Pencil"),
-    Plus: createIcon("Plus"),
-    Trash2: createIcon("Trash2"),
-    X: createIcon("X"),
-  };
-});
-
 function target(overrides: Partial<ReviewableDiffTarget> = {}): ReviewableDiffTarget {
   return {
     filePath: "src/example.ts",
@@ -147,6 +116,7 @@ function buildReviewActions(overrides: Partial<InlineReviewActions> = {}): Inlin
     onStartComment: vi.fn(),
     onEditComment: vi.fn(),
     onCancelEditor: vi.fn(),
+    onChangeEditorBody: () => {},
     onSaveEditor: vi.fn(),
     onDeleteComment: vi.fn(),
     ...overrides,
@@ -312,8 +282,9 @@ describe("git diff inline review helpers", () => {
 
   it("keeps the line number visible and only floats the plus for line hover", () => {
     const reviewTarget = target();
-    const { container, queryByText, rerender } = render(
+    const { queryByTestId, queryByText, rerender } = render(
       <InlineReviewGutterCell
+        actionTestID="add-comment-glyph"
         reviewTarget={reviewTarget}
         comments={EMPTY_COMMENTS}
         isEditorOpen={false}
@@ -324,10 +295,11 @@ describe("git diff inline review helpers", () => {
     );
 
     expect(queryByText("2")).toBeTruthy();
-    expect(container.querySelector("[data-icon='Plus']")).toBeNull();
+    expect(queryByTestId("add-comment-glyph")).toBeNull();
 
     rerender(
       <InlineReviewGutterCell
+        actionTestID="add-comment-glyph"
         reviewTarget={reviewTarget}
         comments={COMMENT_LIST}
         isEditorOpen={false}
@@ -338,10 +310,11 @@ describe("git diff inline review helpers", () => {
     );
 
     expect(queryByText("2")).toBeTruthy();
-    expect(container.querySelector("[data-icon='Plus']")).toBeNull();
+    expect(queryByTestId("add-comment-glyph")).toBeNull();
 
     rerender(
       <InlineReviewGutterCell
+        actionTestID="add-comment-glyph"
         reviewTarget={reviewTarget}
         comments={EMPTY_COMMENTS}
         isEditorOpen
@@ -352,10 +325,11 @@ describe("git diff inline review helpers", () => {
     );
 
     expect(queryByText("2")).toBeTruthy();
-    expect(container.querySelector("[data-icon='Plus']")).toBeNull();
+    expect(queryByTestId("add-comment-glyph")).toBeNull();
 
     rerender(
       <InlineReviewGutterCell
+        actionTestID="add-comment-glyph"
         reviewTarget={reviewTarget}
         comments={COMMENT_LIST}
         isEditorOpen={false}
@@ -367,7 +341,7 @@ describe("git diff inline review helpers", () => {
     );
 
     expect(queryByText("2")).toBeTruthy();
-    expect(container.querySelector("[data-icon='Plus']")).toBeTruthy();
+    expect(queryByTestId("add-comment-glyph")).toBeTruthy();
   });
 });
 
@@ -384,7 +358,7 @@ describe("InlineReviewEditor", () => {
     const onCancel = vi.fn();
     const onSave = vi.fn();
     const { getByTestId } = render(
-      <InlineReviewEditor
+      <ReviewEditorFixture
         initialBody=" initial "
         onCancel={onCancel}
         onSave={onSave}
@@ -404,7 +378,7 @@ describe("InlineReviewEditor", () => {
     const onCancel = vi.fn();
     const onSave = vi.fn();
     const { getByTestId } = render(
-      <InlineReviewEditor
+      <ReviewEditorFixture
         initialBody="ready"
         onCancel={onCancel}
         onSave={onSave}
@@ -428,7 +402,7 @@ describe("InlineReviewEditor", () => {
       removeEventListener: vi.fn(),
     });
     const { getByTestId, queryByText } = render(
-      <InlineReviewEditor
+      <ReviewEditorFixture
         initialBody="ready"
         onCancel={vi.fn()}
         onSave={vi.fn()}
@@ -472,3 +446,13 @@ describe("InlineReviewThread", () => {
     expect(actions.onDeleteComment).toHaveBeenCalledWith("comment-1");
   });
 });
+
+function ReviewEditorFixture({
+  initialBody,
+  ...props
+}: Omit<React.ComponentProps<typeof InlineReviewEditor>, "body" | "onChangeBody"> & {
+  initialBody: string;
+}) {
+  const [body, onChangeBody] = React.useState(initialBody);
+  return <InlineReviewEditor {...props} body={body} onChangeBody={onChangeBody} />;
+}
diff --git a/packages/app/src/review/surface.tsx b/packages/app/src/review/surface.tsx
index 43b6af914a..7466052456 100644
--- a/packages/app/src/review/surface.tsx
+++ b/packages/app/src/review/surface.tsx
@@ -1,4 +1,11 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  useSyncExternalStore,
+} from "react";
 import type { ReactNode } from "react";
 import { useTranslation } from "react-i18next";
 import { Pencil, Plus, Trash2 } from "lucide-react-native";
@@ -17,10 +24,17 @@ import {
   EditingTextInput as TextInput,
   type EditingTextInputHandle,
 } from "@/components/ui/text-input";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { createReviewEditorScope } from "./editor";
 import { isWeb } from "@/constants/platform";
 import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import type { Theme } from "@/styles/theme";
-import { useReviewDraftComments, useReviewDraftStore, type ReviewDraftComment } from "./store";
+import {
+  useReviewDraftComments,
+  useReviewDraftStore,
+  saveReviewDraftComment,
+  type ReviewDraftComment,
+} from "./store";
 import { buildReviewableDiffTargetKey, type ReviewableDiffTarget } from "@/utils/diff-layout";
 import {
   INLINE_REVIEW_EDITOR_HEIGHT,
@@ -98,92 +112,42 @@ export function groupInlineReviewCommentsByTarget(
   return grouped;
 }
 
-export function useInlineReviewController(input: { reviewDraftKey: string }): InlineReviewActions {
+const reviewEditors = createReviewEditorScope({
+  saveComment: saveReviewDraftComment,
+  deleteComment: (input) => useReviewDraftStore.getState().deleteComment(input),
+});
+
+export function useInlineReviewController(input: {
+  reviewDraftKey: string;
+  presentation?: string;
+}): InlineReviewActions & {
+  sheetEditor: InlineReviewEditorState | null;
+  onChangeEditorBody: (body: string) => void;
+} {
+  const isCompact = useIsCompactFormFactor();
   const reviewComments = useReviewDraftComments(input.reviewDraftKey);
   const commentsByTarget = useMemo(
     () => groupInlineReviewCommentsByTarget(reviewComments),
     [reviewComments],
   );
-  const [editor, setEditor] = useState<InlineReviewEditorState | null>(null);
-  const addComment = useReviewDraftStore((state) => state.addComment);
-  const updateComment = useReviewDraftStore((state) => state.updateComment);
-  const deleteComment = useReviewDraftStore((state) => state.deleteComment);
-
-  useEffect(() => {
-    setEditor(null);
-  }, [input.reviewDraftKey]);
-
-  const handleStartComment = useCallback((target: ReviewableDiffTarget) => {
-    setEditor({ target, commentId: null, body: "" });
-  }, []);
-
-  const handleEditComment = useCallback(
-    (target: ReviewableDiffTarget, comment: ReviewDraftComment) => {
-      setEditor({ target, commentId: comment.id, body: comment.body });
-    },
-    [],
+  const model = useMemo(
+    () => reviewEditors.forDraft(input.reviewDraftKey, input.presentation ?? "diff"),
+    [input.reviewDraftKey, input.presentation],
   );
-
-  const handleCancelEditor = useCallback(() => {
-    setEditor(null);
-  }, []);
-
-  const handleSaveEditor = useCallback(
-    (body: string) => {
-      const trimmedBody = body.trim();
-      if (!editor || trimmedBody.length === 0) {
-        return;
-      }
-
-      if (editor.commentId) {
-        updateComment({
-          key: input.reviewDraftKey,
-          id: editor.commentId,
-          updates: { body: trimmedBody },
-        });
-      } else {
-        addComment({
-          key: input.reviewDraftKey,
-          comment: {
-            filePath: editor.target.filePath,
-            side: editor.target.side,
-            lineNumber: editor.target.lineNumber,
-            body: trimmedBody,
-          },
-        });
-      }
-      setEditor(null);
-    },
-    [addComment, editor, input.reviewDraftKey, updateComment],
-  );
-
-  const handleDeleteComment = useCallback(
-    (id: string) => {
-      deleteComment({ key: input.reviewDraftKey, id });
-      setEditor((current) => (current?.commentId === id ? null : current));
-    },
-    [deleteComment, input.reviewDraftKey],
-  );
-
-  return useMemo<InlineReviewActions>(
+  const editor = useSyncExternalStore(model.subscribe, model.getState, model.getState);
+  return useMemo(
     () => ({
       commentsByTarget,
-      editor,
-      onStartComment: handleStartComment,
-      onEditComment: handleEditComment,
-      onCancelEditor: handleCancelEditor,
-      onSaveEditor: handleSaveEditor,
-      onDeleteComment: handleDeleteComment,
+      editor: isCompact ? null : editor,
+      sheetEditor: isCompact ? editor : null,
+      onChangeEditorBody: model.setBody,
+      onStartComment: model.start,
+      onEditComment: model.edit,
+      onCancelEditor: model.cancel,
+      onSaveEditor: model.save,
+      onDeleteComment: model.delete,
     }),
-    [
-      commentsByTarget,
-      editor,
-      handleCancelEditor,
-      handleDeleteComment,
-      handleEditComment,
-      handleSaveEditor,
-      handleStartComment,
-    ],
+    [commentsByTarget, editor, isCompact, model],
   );
 }
 
@@ -321,7 +285,8 @@ export function InlineReviewThread({
   const editorElement = editor ? (
     <InlineReviewEditor
       key={editingCommentId ?? "new"}
-      initialBody={editor.body}
+      body={editor.body}
+      onChangeBody={reviewActions.onChangeEditorBody}
       onCancel={reviewActions.onCancelEditor}
       onSave={reviewActions.onSaveEditor}
       testID="inline-review-editor"
@@ -428,19 +393,20 @@ export function getInlineReviewThreadViewportStyle({
 }
 
 export function InlineReviewEditor({
-  initialBody,
+  body,
+  onChangeBody,
   onCancel,
   onSave,
   testID,
 }: {
-  initialBody: string;
+  body: string;
+  onChangeBody: (body: string) => void;
   onCancel: () => void;
   onSave: (body: string) => void;
   testID?: string;
 }) {
   const { t } = useTranslation();
   const inputRef = useRef<EditingTextInputHandle | null>(null);
-  const [body, setBody] = useState(initialBody);
   const [isFocused, setIsFocused] = useState(false);
   const trimmedBody = body.trim();
   const canSave = trimmedBody.length > 0;
@@ -506,7 +472,7 @@ export function InlineReviewEditor({
         placeholderTextColor={styles.placeholderColor.color}
         multiline
         initialValue={body}
-        onChangeText={setBody}
+        onChangeText={onChangeBody}
         onFocus={handleFocus}
         onBlur={handleBlur}
         style={inputStyle}

From 6ec663342554bb9c9b50a5e91954aa54e7eb7877 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 9 Oct 2026 23:51:32 +0100
Subject: [PATCH 072/270] feat(cli): expose account usage reports (#6474)

---
 packages/cli/src/cli.ts                       |   2 +
 packages/cli/src/commands/usage/index.test.ts | 279 ++++++++++++++++++
 packages/cli/src/commands/usage/index.ts      |  95 ++++++
 .../cli/src/commands/usage/presentation.ts    | 137 +++++++++
 packages/cli/tests/44-usage.test.ts           | 152 ++++++++++
 public-docs/cli.md                            |  41 +++
 6 files changed, 706 insertions(+)
 create mode 100644 packages/cli/src/commands/usage/index.test.ts
 create mode 100644 packages/cli/src/commands/usage/index.ts
 create mode 100644 packages/cli/src/commands/usage/presentation.ts
 create mode 100644 packages/cli/tests/44-usage.test.ts

diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
index f0c0cfcf7b..dceb3f372d 100644
--- a/packages/cli/src/cli.ts
+++ b/packages/cli/src/cli.ts
@@ -3,6 +3,7 @@ import { Command, Option } from "commander";
 import { createAgentCommand } from "./commands/agent/index.js";
 import { createDaemonCommand } from "./commands/daemon/index.js";
 import { createPermitCommand } from "./commands/permit/index.js";
+import { createUsageCommand } from "./commands/usage/index.js";
 import { createProviderCommand } from "./commands/provider/index.js";
 import { createPluginCommand } from "./commands/plugin/index.js";
 import { createProjectCommand } from "./commands/project/index.js";
@@ -148,6 +149,7 @@ export function createCli(): Command {
 
   // Provider commands
   program.addCommand(createProviderCommand());
+  program.addCommand(createUsageCommand());
   program.addCommand(createPluginCommand());
 
   // Speech model commands
diff --git a/packages/cli/src/commands/usage/index.test.ts b/packages/cli/src/commands/usage/index.test.ts
new file mode 100644
index 0000000000..9c2e3e8bbf
--- /dev/null
+++ b/packages/cli/src/commands/usage/index.test.ts
@@ -0,0 +1,279 @@
+import { describe, expect, it } from "vitest";
+import type { UsageReportEntry } from "@getpaseo/protocol/messages";
+import { render } from "../../output/index.js";
+import { createCli } from "../../cli.js";
+import { runUsageCommand } from "./index.js";
+
+const options = { daemonTarget: { kind: "endpoint" as const, host: "example.test:1234" } };
+const reports: UsageReportEntry[] = [
+  {
+    id: "plugin.source:work.account",
+    sourceId: "plugin.source",
+    sourceLabel: "Plugin Source",
+    account: { label: "Work" },
+    fetchedAt: "2026-10-09T12:00:00Z",
+    icon: "<svg />",
+    report: {
+      status: "available",
+      planLabel: "Pro",
+      windows: [
+        {
+          id: "5h",
+          label: "Five hours",
+          usedPct: 12.5,
+          remainingPct: 87.5,
+          resetsAt: "2026-10-09T17:00:00Z",
+          runsOutAt: "2026-10-09T16:00:00Z",
+          shortfallPct: 4.25,
+        },
+        { id: "week", label: "Weekly", usedPct: null, remainingPct: 0 },
+        { id: "extra", label: "Extra", usedPct: 0 },
+      ],
+      balances: [
+        {
+          id: "credit",
+          label: "Credit",
+          used: 0,
+          remaining: 2.5,
+          limit: 10,
+          unit: "usd",
+          resetsAt: "2026-11-01T00:00:00Z",
+        },
+        { id: "requests", label: "Requests", remaining: null, unit: "requests" },
+      ],
+      details: [{ id: "tier", label: "Tier", value: "Enterprise" }],
+    },
+  },
+  {
+    id: "plugin.source:personal",
+    sourceId: "plugin.source",
+    sourceLabel: "Plugin Source",
+    account: {},
+    fetchedAt: "2026-10-09T12:00:00Z",
+    report: {
+      status: "unavailable",
+      problem: { kind: "rejected", status: 401, refreshedBy: "codex login" },
+    },
+    loginErrors: [
+      {
+        harness: "Claude Code",
+        report: {
+          status: "unavailable",
+          problem: { kind: "expired", expiresAt: "2026-10-08T00:00:00Z", refreshedBy: "claude" },
+        },
+      },
+      {
+        harness: "Codex",
+        report: {
+          status: "unavailable",
+          problem: { kind: "rejected", status: 401, refreshedBy: "codex login" },
+        },
+      },
+      { harness: "Other", report: { status: "error", error: "Login service failed" } },
+    ],
+  },
+  {
+    id: "other:broken",
+    sourceId: "other",
+    sourceLabel: "Other",
+    account: {},
+    fetchedAt: "2026-10-09T12:00:00Z",
+    report: { status: "error", error: "Source failed" },
+  },
+  {
+    id: "other:noquota",
+    sourceId: "other",
+    sourceLabel: "Other",
+    account: {},
+    fetchedAt: "2026-10-09T12:00:00Z",
+    report: {
+      status: "unavailable",
+      problem: { kind: "no_quota", detail: "No quota for this plan" },
+    },
+  },
+];
+
+function host(entries = reports, supported = true) {
+  const requests: Array<Parameters<NonNullable<Parameters<typeof runUsageCommand>[2]>>[0]> = [];
+  const queries: Array<
+    { agentId?: string; forceRefresh?: boolean; reportIds?: string[] } | undefined
+  > = [];
+  let closed = 0;
+  return {
+    requests,
+    queries,
+    get closed() {
+      return closed;
+    },
+    connect: async (input: (typeof requests)[number]) => {
+      requests.push(input);
+      return {
+        getLastServerInfoMessage: () => ({ features: { usageSources: supported } }),
+        listUsageReports: async (query?: (typeof queries)[number]) => {
+          queries.push(query);
+          const selected = query?.reportIds
+            ? entries.filter((entry) => query.reportIds!.includes(entry.id))
+            : entries;
+          return { requestId: "request", reports: selected };
+        },
+        close: async () => {
+          closed++;
+        },
+      };
+    },
+  };
+}
+
+it("preserves complete JSON entries, numeric values and quiet full IDs", async () => {
+  const daemon = host();
+  const result = await runUsageCommand(options, { kind: "list" }, daemon.connect);
+  expect(JSON.parse(render(result, { format: "json" }))).toEqual(reports);
+  expect(render(result, { quiet: true })).toBe(reports.map((entry) => entry.id).join("\n"));
+  expect(daemon.requests).toEqual([{ target: options.daemonTarget }]);
+  expect(daemon.closed).toBe(1);
+});
+
+it("lists all windows, balances, missing values, failures and remedies", async () => {
+  const result = await runUsageCommand(options, { kind: "list" }, host().connect);
+  const text = render(result, { noColor: true });
+  for (const expected of [
+    "REPORT ID",
+    "SOURCE",
+    "ACCOUNT",
+    "STATUS",
+    "USAGE",
+    "FETCHED",
+    "Five hours: 12.5% used, 87.5% remaining",
+    "Weekly: - used, 0% remaining",
+    "Extra: 0% used, - remaining",
+    "Credit: 0 used, 2.5 remaining, 10 limit (usd)",
+    "Requests: - used, - remaining, - limit (requests)",
+    "Login expired at 2026-10-08T00:00:00Z. Run claude",
+    "Login rejected (HTTP 401). Run codex login",
+    "Other: Login service failed",
+    "Source failed",
+    "No quota for this plan",
+  ])
+    expect(text).toContain(expected);
+  expect(render(result, { noHeaders: true })).not.toContain("REPORT ID");
+});
+
+it("inspects exact opaque IDs and includes resets, forecasts, details and login failures", async () => {
+  const daemon = host();
+  const result = await runUsageCommand(
+    options,
+    { kind: "inspect", id: reports[0]!.id },
+    daemon.connect,
+  );
+  expect(JSON.parse(render(result, { format: "json" }))).toEqual(reports[0]);
+  const text = render(result);
+  for (const expected of [
+    "Source ID: plugin.source",
+    "Plan: Pro",
+    "Resets: 2026-10-09T17:00:00Z",
+    "Runs out: 2026-10-09T16:00:00Z",
+    "Shortfall: 4.25%",
+    "Resets: -",
+    "Resets: 2026-11-01T00:00:00Z",
+    "Tier: Enterprise",
+  ])
+    expect(text).toContain(expected);
+  const failure = await runUsageCommand(
+    options,
+    { kind: "inspect", id: reports[1]!.id },
+    daemon.connect,
+  );
+  expect(render(failure)).toContain("Login failures:\n  Claude Code: Login expired at");
+  expect(render(failure)).toContain("  Other: Login service failed");
+});
+
+it("discovers before inspecting, then refreshes only the selected report", async () => {
+  const daemon = host();
+  await runUsageCommand(
+    { ...options, refresh: true },
+    { kind: "inspect", id: reports[0]!.id },
+    daemon.connect,
+  );
+  expect(daemon.queries).toEqual([undefined, { reportIds: [reports[0]!.id], forceRefresh: true }]);
+});
+
+it("rejects agent selection combined with inspect before connecting", async () => {
+  const daemon = host();
+  await expect(
+    runUsageCommand(
+      { ...options, agent: "agent-A" },
+      { kind: "inspect", id: reports[0]!.id },
+      daemon.connect,
+    ),
+  ).rejects.toMatchObject({ code: "INVALID_OPTIONS" });
+  expect(daemon.requests).toEqual([]);
+});
+
+it("passes agent account selection and refresh without converting it to token consumption", async () => {
+  const daemon = host();
+  await runUsageCommand(
+    { ...options, agent: "agent-123", refresh: true },
+    { kind: "list" },
+    daemon.connect,
+  );
+  expect(daemon.queries).toEqual([{ agentId: "agent-123", forceRefresh: true }]);
+});
+
+it("returns an empty array in JSON and explains empty discovery in human output", async () => {
+  const result = await runUsageCommand(options, { kind: "list" }, host([]).connect);
+  expect(render(result, { format: "json" })).toBe("[]");
+  expect(render(result)).toBe("No usage reports returned");
+  expect(render(result, { quiet: true })).toBe("");
+});
+
+it("rejects unknown IDs and prefixes and closes the client", async () => {
+  const daemon = host();
+  await expect(
+    runUsageCommand(options, { kind: "inspect", id: "plugin.source:work" }, daemon.connect),
+  ).rejects.toEqual({
+    code: "REPORT_NOT_FOUND",
+    message: "Unknown usage report: plugin.source:work",
+  });
+  expect(daemon.closed).toBe(1);
+});
+
+it("gates unsupported hosts before any request and closes the connection", async () => {
+  const daemon = host(reports, false);
+  await expect(runUsageCommand(options, { kind: "list" }, daemon.connect)).rejects.toMatchObject({
+    code: "UNSUPPORTED_HOST",
+  });
+  expect(daemon.queries).toEqual([]);
+  expect(daemon.closed).toBe(1);
+});
+
+it("propagates connection and request failures", async () => {
+  await expect(
+    runUsageCommand(options, { kind: "list" }, async () => {
+      throw new Error("Connection failed");
+    }),
+  ).rejects.toThrow("Connection failed");
+  let closed = false;
+  const connect = async () => ({
+    getLastServerInfoMessage: () => ({ features: { usageSources: true } }),
+    listUsageReports: async () => {
+      throw new Error("Request failed");
+    },
+    close: async () => {
+      closed = true;
+    },
+  });
+  await expect(runUsageCommand(options, { kind: "list" }, connect)).rejects.toThrow(
+    "Request failed",
+  );
+  expect(closed).toBe(true);
+});
+
+describe("usage CLI registration", () => {
+  it("registers default, ls and inspect with the accepted selectors", () => {
+    const usage = createCli().commands.find((command) => command.name() === "usage")!;
+    expect(usage.commands.map((command) => command.name())).toEqual(["ls", "inspect"]);
+    expect(usage.helpInformation()).toContain("--agent <id>");
+    expect(usage.commands[0]!.helpInformation()).toContain("--refresh");
+    expect(usage.commands[1]!.helpInformation()).toContain("<report-id>");
+  });
+});
diff --git a/packages/cli/src/commands/usage/index.ts b/packages/cli/src/commands/usage/index.ts
new file mode 100644
index 0000000000..ab96fc659c
--- /dev/null
+++ b/packages/cli/src/commands/usage/index.ts
@@ -0,0 +1,95 @@
+import { Command } from "commander";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { UsageReportEntry } from "@getpaseo/protocol/messages";
+import { connectToDaemon, type ConnectOptions } from "../../utils/client.js";
+import { addJsonAndDaemonHostOptions } from "../../utils/command-options.js";
+import { withOutput, type CommandOptions, type CommandResult } from "../../output/index.js";
+import { usageSchema } from "./presentation.js";
+
+interface UsageOptions extends CommandOptions {
+  agent?: string;
+  refresh?: boolean;
+}
+
+type UsageSelection = { kind: "list" } | { kind: "inspect"; id: string };
+interface UsageClient {
+  getLastServerInfoMessage(): { features?: { usageSources?: boolean } } | null;
+  listUsageReports: DaemonClient["listUsageReports"];
+  close: DaemonClient["close"];
+}
+type ConnectUsage = (options: ConnectOptions) => Promise<UsageClient>;
+
+export async function runUsageCommand(
+  options: UsageOptions,
+  selection: UsageSelection,
+  connect: ConnectUsage = connectToDaemon,
+): Promise<CommandResult<UsageReportEntry>> {
+  const conflictingSelectors = selection.kind === "inspect" && options.agent !== undefined;
+  if (conflictingSelectors) {
+    throw {
+      code: "INVALID_OPTIONS",
+      message:
+        "--agent cannot be combined with usage inspect. Use usage ls --agent <id> for agent account usage, or usage inspect <report-id> for an exact report.",
+    };
+  }
+  const client = await connect({ target: options.daemonTarget });
+  try {
+    if (client.getLastServerInfoMessage()?.features?.usageSources !== true) {
+      throw { code: "UNSUPPORTED_HOST", message: "Update the host to use usage reports." };
+    }
+    if (selection.kind === "list") {
+      const { reports } = await client.listUsageReports({
+        agentId: options.agent,
+        forceRefresh: options.refresh,
+      });
+      return { type: "list", data: reports, schema: usageSchema };
+    }
+    // Report-ID queries only select known accounts. Discover before selecting, including on cold hosts.
+    const { reports } = await client.listUsageReports();
+    let entry = reports.find((report) => report.id === selection.id);
+    if (entry && options.refresh) {
+      const refreshed = await client.listUsageReports({
+        reportIds: [selection.id],
+        forceRefresh: true,
+      });
+      entry = refreshed.reports.find((report) => report.id === selection.id);
+    }
+    if (!entry) {
+      throw { code: "REPORT_NOT_FOUND", message: `Unknown usage report: ${selection.id}` };
+    }
+    return { type: "single", data: entry, schema: usageSchema };
+  } finally {
+    await client.close().catch(() => {});
+  }
+}
+
+function addListOptions(command: Command): Command {
+  return addJsonAndDaemonHostOptions(command)
+    .option(
+      "--agent <id>",
+      "Show account quota associated with this agent (not agent token consumption)",
+    )
+    .option("--refresh", "Refresh usage instead of using the host cache");
+}
+
+export function createUsageCommand(): Command {
+  const usage = addListOptions(new Command("usage").description("Show account usage reports"));
+  const list = (options: CommandOptions, _command: Command) =>
+    runUsageCommand(options, { kind: "list" });
+  usage.action(withOutput(list));
+  addListOptions(usage.command("ls").description("List account quotas and balances")).action(
+    withOutput(list),
+  );
+  addJsonAndDaemonHostOptions(
+    usage
+      .command("inspect")
+      .description("Show a complete account usage report")
+      .argument("<report-id>", "Exact opaque Report ID")
+      .option("--refresh", "Refresh the selected report instead of using the host cache"),
+  ).action(
+    withOutput((id: string, options: CommandOptions, _command: Command) =>
+      runUsageCommand(options, { kind: "inspect", id }),
+    ),
+  );
+  return usage;
+}
diff --git a/packages/cli/src/commands/usage/presentation.ts b/packages/cli/src/commands/usage/presentation.ts
new file mode 100644
index 0000000000..ecc4aba405
--- /dev/null
+++ b/packages/cli/src/commands/usage/presentation.ts
@@ -0,0 +1,137 @@
+import type {
+  UsageReportEntry,
+  UsageReport,
+  UsageProblem,
+  ProviderUsageWindow,
+  ProviderUsageBalance,
+} from "@getpaseo/protocol/messages";
+import { renderTable, type OutputSchema } from "../../output/index.js";
+
+function value(input: string | number | null | undefined): string {
+  return input == null ? "-" : String(input);
+}
+
+function percent(input: number | null | undefined): string {
+  return input == null ? "-" : `${input}%`;
+}
+
+function problemText(problem: UsageProblem): string {
+  if (problem.kind === "no_quota") return problem.detail;
+  const remedy = problem.refreshedBy
+    ? `Run ${problem.refreshedBy} to refresh login.`
+    : "Sign in again.";
+  if (problem.kind === "expired") return `Login expired at ${problem.expiresAt}. ${remedy}`;
+  return `Login rejected (HTTP ${problem.status}). ${remedy}`;
+}
+
+function failureText(report: UsageReport): string {
+  if (report.status === "error") return report.error;
+  if (report.status === "unavailable") return problemText(report.problem);
+  return "-";
+}
+
+function windowText(window: ProviderUsageWindow): string {
+  return `${window.label}: ${percent(window.usedPct)} used, ${percent(window.remainingPct)} remaining`;
+}
+
+function balanceText(balance: ProviderUsageBalance): string {
+  return `${balance.label}: ${value(balance.used)} used, ${value(balance.remaining)} remaining, ${value(balance.limit)} limit (${balance.unit})`;
+}
+
+function summary(entry: UsageReportEntry): string[] {
+  const { report } = entry;
+  if (report.status !== "available") {
+    const lines = [failureText(report)];
+    for (const login of entry.loginErrors ?? [])
+      lines.push(`${login.harness}: ${failureText(login.report)}`);
+    return lines;
+  }
+  const lines = report.windows.map(windowText);
+  lines.push(...(report.balances ?? []).map(balanceText));
+  return lines.length ? lines : ["-"];
+}
+
+interface SummaryRow {
+  id: string;
+  source: string;
+  account: string;
+  status: string;
+  usage: string;
+  fetched: string;
+}
+
+const summarySchema: OutputSchema<SummaryRow> = {
+  idField: "id",
+  columns: [
+    { header: "REPORT ID", field: "id" },
+    { header: "SOURCE", field: "source" },
+    { header: "ACCOUNT", field: "account" },
+    { header: "STATUS", field: "status" },
+    { header: "USAGE", field: "usage" },
+    { header: "FETCHED", field: "fetched" },
+  ],
+};
+
+function inspect(entry: UsageReportEntry): string {
+  const lines = [
+    `Report ID: ${entry.id}`,
+    `Source: ${entry.sourceLabel}`,
+    `Source ID: ${entry.sourceId}`,
+    `Account: ${value(entry.account.label)}`,
+    `Status: ${entry.report.status}`,
+    `Fetched: ${value(entry.fetchedAt)}`,
+  ];
+  const { report } = entry;
+  if (report.status === "available") {
+    lines.push(`Plan: ${value(report.planLabel)}`, "Windows:");
+    if (!report.windows.length) lines.push("  -");
+    for (const window of report.windows) {
+      lines.push(`  ${windowText(window)} [${window.id}]`, `    Resets: ${value(window.resetsAt)}`);
+      if (window.runsOutAt != null) lines.push(`    Runs out: ${window.runsOutAt}`);
+      if (window.shortfallPct != null) lines.push(`    Shortfall: ${percent(window.shortfallPct)}`);
+    }
+    lines.push("Balances:");
+    if (!report.balances?.length) lines.push("  -");
+    for (const balance of report.balances ?? []) {
+      lines.push(
+        `  ${balanceText(balance)} [${balance.id}]`,
+        `    Resets: ${value(balance.resetsAt)}`,
+      );
+    }
+    lines.push("Details:");
+    if (!report.details?.length) lines.push("  -");
+    for (const detail of report.details ?? []) lines.push(`  ${detail.label}: ${detail.value}`);
+  } else {
+    lines.push(`Reason: ${failureText(report)}`);
+  }
+  if (entry.loginErrors?.length) {
+    lines.push("Login failures:");
+    for (const login of entry.loginErrors)
+      lines.push(`  ${login.harness}: ${failureText(login.report)}`);
+  }
+  return lines.join("\n");
+}
+
+export const usageSchema: OutputSchema<UsageReportEntry> = {
+  idField: "id",
+  columns: [],
+  renderHuman(result, options) {
+    if (result.type === "single") return inspect(result.data);
+    if (!result.data.length) return "No usage reports returned";
+    const rows: SummaryRow[] = [];
+    for (const entry of result.data) {
+      for (const [index, usage] of summary(entry).entries()) {
+        const first = index === 0;
+        rows.push({
+          id: first ? entry.id : "",
+          source: first ? entry.sourceLabel : "",
+          account: first ? value(entry.account.label) : "",
+          status: first ? entry.report.status : "",
+          usage,
+          fetched: first ? value(entry.fetchedAt) : "",
+        });
+      }
+    }
+    return renderTable<SummaryRow>({ type: "list", data: rows, schema: summarySchema }, options);
+  },
+};
diff --git a/packages/cli/tests/44-usage.test.ts b/packages/cli/tests/44-usage.test.ts
new file mode 100644
index 0000000000..2db20e2824
--- /dev/null
+++ b/packages/cli/tests/44-usage.test.ts
@@ -0,0 +1,152 @@
+#!/usr/bin/env npx tsx
+import assert from "node:assert/strict";
+import { mkdir, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { createE2ETestContext } from "./helpers/test-daemon.ts";
+import { connectToDaemon } from "../src/utils/client.ts";
+import { resolveCliVersion } from "../src/version.ts";
+
+const context = await createE2ETestContext();
+try {
+  const directory = join(context.workDir, "usage-plugin");
+  await mkdir(directory);
+  await writeFile(
+    join(directory, "paseo-plugin.json"),
+    JSON.stringify({
+      id: "cli-usage",
+      requirements: { paseo: `>=${resolveCliVersion()}` },
+    }),
+  );
+  await writeFile(
+    join(directory, "index.server.ts"),
+    `
+import { z } from 'zod';
+export default function contribute(server) {
+  const counts = new Map();
+  server.registerUsageSource({
+    id: 'cli-usage', label: 'CLI usage fixture', input: z.object({ key: z.string() }),
+    discover: async () => [
+      { key: 'work.account', label: 'Work', input: { key: 'work' } },
+      { key: 'personal', input: { key: 'personal' } },
+      { key: 'broken', harness: 'Harness A', input: { key: 'rejected' } },
+      { key: 'broken', harness: 'Harness B', input: { key: 'expired' } },
+      { key: 'error', input: { key: 'error' } },
+    ],
+    fetch: async ({key}) => {
+      counts.set(key, (counts.get(key) ?? 0) + 1);
+      if (key === 'rejected') return {status: 'unavailable', problem: {kind: 'rejected', status: 401, refreshedBy: 'codex login'}};
+      if (key === 'expired') return {status: 'unavailable', problem: {kind: 'expired', expiresAt: '2026-10-08T00:00:00Z', refreshedBy: 'claude'}};
+      if (key === 'error') throw new Error('Quota service failed');
+      return { status: 'available', planLabel: 'Pro', windows: [
+        { id: 'session', label: 'Session', usedPct: counts.get(key), remainingPct: 99, resetsAt: '2026-10-09T17:00:00Z', runsOutAt: '2026-10-09T16:00:00Z', shortfallPct: 4.25 },
+        { id: 'weekly', label: 'Weekly', usedPct: null, remainingPct: 0 },
+      ], balances: [
+        { id: 'credits', label: 'Credits', remaining: 2.5, unit: 'credits' },
+        { id: 'tokens', label: 'Tokens', used: 0, limit: 100, unit: 'tokens' },
+      ], details: [{ id: 'tier', label: 'Tier', value: 'Enterprise' }] };
+    },
+  });
+  return () => {};
+}`,
+  );
+  const client = await connectToDaemon({ target: { kind: "instance", home: context.paseoHome } });
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(directory, "cli-usage");
+  } finally {
+    await client.close();
+  }
+  async function ok(args: string[]) {
+    const result = await context.paseo(args);
+    assert.equal(result.exitCode, 0, result.stderr);
+    assert.equal(result.stderr, "");
+    return result.stdout;
+  }
+  // The first usage request is inspect: no earlier usage discovery has populated known IDs.
+  const cold = JSON.parse(await ok(["usage", "inspect", "cli-usage:work.account", "--json"]));
+  assert.equal(cold.id, "cli-usage:work.account");
+  assert.equal(cold.report.windows[0].usedPct, 1);
+  for (const args of [
+    ["usage", "--agent", "agent-A", "inspect", cold.id, "--json"],
+    ["usage", "inspect", cold.id, "--agent", "agent-A", "--json"],
+  ]) {
+    const conflicting = await context.paseo(args);
+    assert.equal(conflicting.exitCode, 1, `Expected selector rejection: ${args.join(" ")}`);
+    assert.equal(conflicting.stdout, "");
+    assert.deepEqual(JSON.parse(conflicting.stderr).error, {
+      code: "INVALID_OPTIONS",
+      message:
+        "--agent cannot be combined with usage inspect. Use usage ls --agent <id> for agent account usage, or usage inspect <report-id> for an exact report.",
+    });
+  }
+
+  const list = JSON.parse(await ok(["usage", "ls", "--json"]));
+  const defaultList = JSON.parse(await ok(["usage", "--json"]));
+  assert.deepEqual(defaultList, list);
+  assert.deepEqual(list.map((entry: { id: string }) => entry.id).sort(), [
+    "cli-usage:broken",
+    "cli-usage:error",
+    "cli-usage:personal",
+    "cli-usage:work.account",
+  ]);
+  const work = list.find((entry: { id: string }) => entry.id === cold.id);
+  assert.deepEqual(work, cold);
+  const table = await ok(["usage", "ls", "--no-color"]);
+  for (const text of [
+    "REPORT ID",
+    "Credits: - used, 2.5 remaining, - limit (credits)",
+    "Tokens: 0 used, - remaining, 100 limit (tokens)",
+    "Weekly: - used, 0% remaining",
+    "Harness A: Login rejected (HTTP 401). Run codex login",
+    "Harness B: Login expired at",
+    "Quota service failed",
+  ])
+    assert.ok(table.includes(text), text);
+  const quiet = await ok(["usage", "ls", "--quiet"]);
+  assert.deepEqual(
+    quiet.trim().split("\n").sort(),
+    list.map((entry: { id: string }) => entry.id).sort(),
+  );
+  assert.ok(!(await ok(["usage", "ls", "--no-headers"])).includes("REPORT ID"));
+  const detail = await ok(["usage", "inspect", cold.id]);
+  for (const text of [
+    "Plan: Pro",
+    "Resets: 2026-10-09T17:00:00Z",
+    "Runs out: 2026-10-09T16:00:00Z",
+    "Shortfall: 4.25%",
+    "Tier: Enterprise",
+  ])
+    assert.ok(detail.includes(text), text);
+  const refreshed = JSON.parse(await ok(["usage", "inspect", cold.id, "--refresh", "--json"]));
+  assert.equal(refreshed.report.windows[0].usedPct, 2);
+  const personal = JSON.parse(await ok(["usage", "inspect", "cli-usage:personal", "--json"]));
+  assert.equal(personal.report.windows[0].usedPct, 1);
+  const allRefreshed = JSON.parse(await ok(["usage", "ls", "--refresh", "--json"]));
+  assert.equal(
+    allRefreshed.find((entry: { id: string }) => entry.id === cold.id).report.windows[0].usedPct,
+    3,
+  );
+  for (const id of ["cli-usage:work", "missing"]) {
+    const unknown = await context.paseo(["usage", "inspect", id, "--json"]);
+    assert.equal(unknown.exitCode, 1);
+    assert.equal(unknown.stdout, "");
+    assert.equal(JSON.parse(unknown.stderr).error.code, "REPORT_NOT_FOUND");
+  }
+  const agentFailure = await context.paseo(["usage", "ls", "--agent", "missing-agent", "--json"]);
+  assert.equal(agentFailure.exitCode, 1);
+  assert.equal(agentFailure.stdout, "");
+  assert.match(JSON.parse(agentFailure.stderr).error.message, /Unknown agent/);
+  const remove = await context.paseo(["plugin", "remove", "cli-usage", "--json"]);
+  assert.equal(remove.exitCode, 0, remove.stderr);
+  assert.equal((await ok(["usage", "ls", "--json"])).trim(), "[]");
+  assert.equal((await ok(["usage"])).trim(), "No usage reports returned");
+  const connection = await context.paseo(["usage", "ls", "--host", "127.0.0.1:1", "--json"]);
+  assert.equal(connection.exitCode, 1);
+  assert.equal(connection.stdout, "");
+  assert.equal(JSON.parse(connection.stderr).error.code, "DAEMON_UNREACHABLE");
+  console.log(
+    "Usage CLI: cold inspect, default/ls, complete JSON, mixed statuses, all windows/balances, inspect details, refresh, IDs, errors and empty discovery passed.",
+  );
+} finally {
+  await context.stop();
+}
diff --git a/public-docs/cli.md b/public-docs/cli.md
index 579c71b857..1c348960b3 100644
--- a/public-docs/cli.md
+++ b/public-docs/cli.md
@@ -21,8 +21,49 @@ paseo attach <id>                    # Stream agent output
 paseo send <id> "also fix linting"   # Send follow-up task
 paseo logs <id>                      # View agent timeline
 paseo stop <id>                      # Stop an agent
+paseo usage                          # Show account quotas and balances
 ```
 
+## Account usage
+
+Show account quotas and balances from the host's usage sources:
+
+```bash
+paseo usage
+paseo usage ls --refresh
+paseo usage ls --agent <agent-id>
+paseo usage inspect <report-id>
+paseo usage inspect <report-id> --refresh
+```
+
+`paseo usage` is equivalent to `paseo usage ls`. The summary groups windows and balances by account, with report IDs, source and account labels, status, and fetch timestamps. Missing values appear as `-`; unavailable and failed reports include their reasons.
+
+Copy the full report ID from the list into `inspect` to see reset times, balances and units, plan details, supplied forecasts, and login failures with recovery instructions. Report IDs require exact matches.
+
+`--agent` selects the account quota associated with an agent. It does not measure that agent's token consumption or cost. Use the full agent ID, and do not combine `--agent` with `inspect`.
+
+Queries use the host's five-minute cache when available. Add `--refresh` to bypass it. Use `--host` or `--home` to [select a daemon](#select-one-daemon). Hosts without usage-source support return an update message.
+
+### Usage in scripts
+
+```bash
+paseo usage ls --json
+paseo usage inspect <report-id> --json
+paseo usage ls --quiet
+```
+
+List JSON is always an array, including `[]` when no reports are returned. Inspect JSON is one report entry. Each entry includes `id`, `sourceId`, `sourceLabel`, `account`, `fetchedAt`, and a nested `report`. Read `report.status` before accessing its data:
+
+| Status        | Fields                                                                 |
+| ------------- | ---------------------------------------------------------------------- |
+| `available`   | `windows`, with optional `planLabel`, `balances`, and `details`        |
+| `unavailable` | `problem`, describing expired or rejected credentials or missing quota |
+| `error`       | `error`, the failure message                                           |
+
+Entries may also include `loginErrors`. Structured output preserves numeric values and optional fields. Standard `--format yaml`, `--no-headers`, and `--no-color` options are supported; `--quiet` prints full report IDs.
+
+A completed query exits with status `0`, including when individual reports are unavailable or failed. Connection or request failures, unsupported hosts, unknown report IDs, and conflicting selectors exit with status `1` and write the error to stderr. Human output says **No usage reports returned** for an empty result; this does not establish whether account discovery succeeded for every source.
+
 ## Provider diagnostics
 
 Ask the daemon to inspect the provider environment it actually uses:

From b63a325be3d3ae444fbd38815658cca01ab1288f Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Oct 2026 09:54:15 +0200
Subject: [PATCH 073/270] Let Android devices without a camera install Paseo
 from Google Play (#6339)

* fix(android): declare the camera optional so camera-less devices can install

Requesting CAMERA makes Android treat android.hardware.camera as a required
feature, so Google Play marks devices without a camera as incompatible.
Pairing works without QR scanning, so declare the camera features optional.

Fixes #6303

* test(app): resolve the manifest with the Expo CLI's prebuild packages

Load @expo/prebuild-config and @expo/config-plugins from @expo/cli instead
of the older hoisted copies, and set the F-Droid flag explicitly for each
build profile case.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/app.config.js                    |  2 +
 packages/app/app.config.test.ts               | 61 +++++++++++++++++++
 .../plugins/with-android-optional-camera.js   | 24 ++++++++
 packages/app/vitest.config.ts                 |  6 +-
 4 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 packages/app/app.config.test.ts
 create mode 100644 packages/app/plugins/with-android-optional-camera.js

diff --git a/packages/app/app.config.js b/packages/app/app.config.js
index 79d68249f2..e09a06f71d 100644
--- a/packages/app/app.config.js
+++ b/packages/app/app.config.js
@@ -2,6 +2,7 @@ const fs = require("node:fs");
 const path = require("node:path");
 const pkg = require("./package.json");
 const withAndroidAsyncStorageSize = require("./plugins/with-android-async-storage-size");
+const withAndroidOptionalCamera = require("./plugins/with-android-optional-camera");
 const withAndroidProfileable = require("./plugins/with-android-profileable");
 const withFdroidAutolinking = require("./plugins/with-fdroid-autolinking");
 const withPasteInput = require("./plugins/with-paste-input");
@@ -145,6 +146,7 @@ export default {
       withAndroidScroll,
       [withAndroidAsyncStorageSize, 64],
       ...buildProfile.cameraPlugins,
+      withAndroidOptionalCamera,
       [
         "expo-splash-screen",
         {
diff --git a/packages/app/app.config.test.ts b/packages/app/app.config.test.ts
new file mode 100644
index 0000000000..b98258ff9a
--- /dev/null
+++ b/packages/app/app.config.test.ts
@@ -0,0 +1,61 @@
+import { createRequire } from "node:module";
+import { afterEach, describe, expect, it } from "vitest";
+
+// Load the copies the Expo CLI uses for prebuild, not older hoisted ones.
+const requireFromExpo = createRequire(require.resolve("expo/package.json"));
+const requireFromExpoCli = createRequire(requireFromExpo.resolve("@expo/cli/package.json"));
+const { getPrebuildConfigAsync } = requireFromExpoCli("@expo/prebuild-config");
+const { compileModsAsync } = requireFromExpoCli(
+  "@expo/config-plugins/build/plugins/mod-compiler.js",
+);
+
+interface ManifestEntry {
+  $: Record<string, string>;
+}
+
+const originalFdroidFlag = process.env.PASEO_FDROID_BUILD;
+
+async function resolveAndroidManifest() {
+  const { exp } = await getPrebuildConfigAsync(__dirname, { platforms: ["android"] });
+  await compileModsAsync(exp, {
+    projectRoot: __dirname,
+    introspect: true,
+    platforms: ["android"],
+    assertMissingModProviders: false,
+  });
+  return exp._internal.modResults.android.manifest.manifest;
+}
+
+describe("Android app config", () => {
+  afterEach(() => {
+    if (originalFdroidFlag === undefined) {
+      delete process.env.PASEO_FDROID_BUILD;
+    } else {
+      process.env.PASEO_FDROID_BUILD = originalFdroidFlag;
+    }
+  });
+
+  it.each([
+    ["Google Play", "0"],
+    ["F-Droid", "1"],
+  ])(
+    "%s build installs on devices without a camera",
+    async (_build, fdroidFlag) => {
+      process.env.PASEO_FDROID_BUILD = fdroidFlag;
+      const manifest = await resolveAndroidManifest();
+      const permissions = (manifest["uses-permission"] ?? []).map(
+        (entry: ManifestEntry) => entry.$["android:name"],
+      );
+      const features = (manifest["uses-feature"] ?? []).map((entry: ManifestEntry) => entry.$);
+
+      expect(permissions).toContain("android.permission.CAMERA");
+      expect(features).toEqual(
+        expect.arrayContaining([
+          { "android:name": "android.hardware.camera", "android:required": "false" },
+          { "android:name": "android.hardware.camera.autofocus", "android:required": "false" },
+        ]),
+      );
+    },
+    30_000,
+  );
+});
diff --git a/packages/app/plugins/with-android-optional-camera.js b/packages/app/plugins/with-android-optional-camera.js
new file mode 100644
index 0000000000..dd5776e155
--- /dev/null
+++ b/packages/app/plugins/with-android-optional-camera.js
@@ -0,0 +1,24 @@
+const { withAndroidManifest } = require("expo/config-plugins");
+
+// Requesting CAMERA implies these features are required, which hides the app
+// on Google Play for devices without a camera. Pairing works without QR scanning.
+const OPTIONAL_CAMERA_FEATURES = ["android.hardware.camera", "android.hardware.camera.autofocus"];
+
+function withAndroidOptionalCamera(config) {
+  return withAndroidManifest(config, (modConfig) => {
+    const manifest = modConfig.modResults.manifest;
+    const features = manifest["uses-feature"] ?? [];
+    for (const name of OPTIONAL_CAMERA_FEATURES) {
+      const existing = features.find((feature) => feature.$["android:name"] === name);
+      if (existing) {
+        existing.$["android:required"] = "false";
+      } else {
+        features.push({ $: { "android:name": name, "android:required": "false" } });
+      }
+    }
+    manifest["uses-feature"] = features;
+    return modConfig;
+  });
+}
+
+module.exports = withAndroidOptionalCamera;
diff --git a/packages/app/vitest.config.ts b/packages/app/vitest.config.ts
index 521fb6dbe0..3838948be9 100644
--- a/packages/app/vitest.config.ts
+++ b/packages/app/vitest.config.ts
@@ -22,7 +22,11 @@ export default defineConfig({
         test: {
           name: "unit",
           environment: "node",
-          include: ["src/**/*.{test,spec}.{ts,tsx}", "native-release-version.test.ts"],
+          include: [
+            "src/**/*.{test,spec}.{ts,tsx}",
+            "native-release-version.test.ts",
+            "app.config.test.ts",
+          ],
           setupFiles: [path.resolve(__dirname, "vitest.setup.ts")],
           exclude: [...configDefaults.exclude, "e2e/**", "src/**/*.browser.{test,spec}.{ts,tsx}"],
         },

From e81d5d02b11e489f7e1beb52df7e22bf4cc8e06e Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Oct 2026 13:27:04 +0200
Subject: [PATCH 074/270] Keep terminal CJK text unchanged after returning to a
 workspace (#6452)

* fix(app): restore terminal surface after tab hide so CJK cells redraw

Retained panels use display:none. Coming back remasured without treating
that as a surface restore, so Hangul kept 2-cell slots while glyphs painted
at ~1 cell (extra gap). Reload WebGL if the context was lost and force a
refresh when the host grows from zero.

Closes #3434

* fix(server): keep wide-char continuation cells out of terminal snapshots

Wide chars (CJK) occupy two xterm cells, and the second cell reports no
chars. The snapshot capture collapsed that empty continuation to " ", so
every restored Hangul syllable took three columns instead of two. The
injected space was real: selecting and copying the restored row carried
it into the clipboard.

Capture the continuation as "" and have renderTerminalSnapshotToAnsi
skip it. No schema change; snapshots from older daemons still replay
verbatim.

* fix(app): restore retained terminals on presentation

Co-authored-by: seob717 <dev.seob717@gmail.com>

* fix(terminal): limit restoration changes to confirmed CJK corruption

Keep the independently reproduced snapshot fix. Surface recovery behavior remains unverified and belongs with the broader viewport report. Dispose the replay terminal after the regression test.

---------

Co-authored-by: Jason <mildreins@gmail.com>
Co-authored-by: seob717 <dev.seob717@gmail.com>
Co-authored-by: liujin0506 <liujin0506@qq.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../protocol/src/terminal-snapshot.test.ts    | 30 +++++++++++++
 packages/protocol/src/terminal-snapshot.ts    |  6 +++
 packages/server/src/terminal/terminal.test.ts | 44 +++++++++++++++++++
 packages/server/src/terminal/terminal.ts      |  8 +++-
 4 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/packages/protocol/src/terminal-snapshot.test.ts b/packages/protocol/src/terminal-snapshot.test.ts
index 0262f0e45f..96d82a9205 100644
--- a/packages/protocol/src/terminal-snapshot.test.ts
+++ b/packages/protocol/src/terminal-snapshot.test.ts
@@ -47,3 +47,33 @@ describe("renderTerminalSnapshotToAnsi", () => {
     expect(ansi).toContain("ABCDEFGHIJ\r\nKLMNOP");
   });
 });
+
+describe("renderTerminalSnapshotToAnsi wide chars", () => {
+  it("skips wide-char continuation cells so the glyph keeps its two columns", () => {
+    // The daemon captures "통" as the glyph followed by an empty continuation
+    // cell. Emitting anything for that cell pushes the rest of the row right.
+    const state: TerminalState = {
+      rows: 1,
+      cols: 10,
+      scrollback: [],
+      grid: [[{ char: "통" }, { char: "" }, { char: "합" }, { char: "" }, { char: "!" }]],
+      cursor: { row: 0, col: 5 },
+    };
+
+    expect(renderTerminalSnapshotToAnsi(state)).toContain("통합!");
+  });
+
+  it("replays snapshots from an old daemon verbatim, including its continuation spaces", () => {
+    // Old daemons already collapsed the continuation to " ". The serializer
+    // cannot tell that apart from a real space, so it must not guess.
+    const state: TerminalState = {
+      rows: 1,
+      cols: 10,
+      scrollback: [],
+      grid: [cells("통 합 !")],
+      cursor: { row: 0, col: 6 },
+    };
+
+    expect(renderTerminalSnapshotToAnsi(state)).toContain("통 합 !");
+  });
+});
diff --git a/packages/protocol/src/terminal-snapshot.ts b/packages/protocol/src/terminal-snapshot.ts
index f978cd884b..1860067573 100644
--- a/packages/protocol/src/terminal-snapshot.ts
+++ b/packages/protocol/src/terminal-snapshot.ts
@@ -87,6 +87,12 @@ function renderTerminalRow(row: TerminalCell[], padToCols?: number): string {
 
   for (let index = 0; index < length; index += 1) {
     const cell = row[index] ?? { char: " " };
+    // An empty char marks a wide-char continuation cell. The glyph in the
+    // previous cell already advances the cursor two columns, so emitting
+    // anything here would shift the rest of the row one column right.
+    if (cell.char === "") {
+      continue;
+    }
     const nextStyle = getTerminalStyle(cell);
     if (!terminalStylesEqual(previousStyle, nextStyle)) {
       output.push(styleToAnsi(nextStyle));
diff --git a/packages/server/src/terminal/terminal.test.ts b/packages/server/src/terminal/terminal.test.ts
index 9881f4bdfd..f83b6b9ba3 100644
--- a/packages/server/src/terminal/terminal.test.ts
+++ b/packages/server/src/terminal/terminal.test.ts
@@ -24,6 +24,8 @@ import {
 } from "node:fs";
 import { spawnSync } from "node:child_process";
 import * as pty from "node-pty";
+import xterm from "@xterm/headless";
+import { renderTerminalSnapshotToAnsi } from "@getpaseo/protocol/terminal-snapshot";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { setImmediate as waitForImmediate, setTimeout as delay } from "node:timers/promises";
@@ -50,6 +52,10 @@ function getLines(state: ReturnType<TerminalSession["getState"]>): string[] {
   return state.grid.map(rowToText);
 }
 
+function rowHasChar(row: TerminalRow, char: string): boolean {
+  return row.some((cell) => cell.char === char);
+}
+
 // Wait for terminal state to match expected lines
 async function waitForLines(
   session: TerminalSession,
@@ -523,6 +529,44 @@ describe("createTerminal", () => {
     expect(withoutFlags.scrollbackWrapped).toBeUndefined();
   });
 
+  it("restores CJK text without injected spaces when a snapshot round-trips through the client", async () => {
+    // Each Hangul syllable is a wide char: xterm stores it as a 2-cell pair
+    // whose second cell has no chars. Capturing that continuation as " " made
+    // every restored syllable three columns wide (paseo#3434).
+    const text = "통합 구현은 전체 테스트를 통과했습니다";
+    const session = trackSession(
+      await createTerminal({
+        workspaceId: "ws-test",
+        cwd: realpathSync(tmpdir()),
+        cols: 80,
+        rows: 10,
+        command: process.execPath,
+        args: [
+          "-e",
+          `process.stdout.write(${JSON.stringify(text)}); setInterval(() => {}, 100000);`,
+        ],
+      }),
+    );
+
+    const state = await waitForState(session, (current) => rowHasChar(current.grid[0], "다"));
+
+    // Replay the snapshot the way the client does on tab switch and read the
+    // row back the way a selection copy would.
+    const restored = new xterm.Terminal({ cols: 80, rows: 10, allowProposedApi: true });
+    try {
+      await new Promise<void>((resolve) =>
+        restored.write(renderTerminalSnapshotToAnsi(state), resolve),
+      );
+      expect(restored.buffer.active.getLine(0)?.translateToString(true)).toBe(text);
+    } finally {
+      restored.dispose();
+    }
+
+    // The continuation cell must stay empty so the restore path can skip it.
+    expect(state.grid[0][0].char).toBe("통");
+    expect(state.grid[0][1].char).toBe("");
+  });
+
   it("captures exit diagnostics from the terminal buffer", async () => {
     const session = trackSession(
       await createTerminal({
diff --git a/packages/server/src/terminal/terminal.ts b/packages/server/src/terminal/terminal.ts
index b9d1b74017..1e708062b8 100644
--- a/packages/server/src/terminal/terminal.ts
+++ b/packages/server/src/terminal/terminal.ts
@@ -580,7 +580,9 @@ function extractCell(terminal: TerminalType, row: number, col: number): Terminal
   const bg = bgMode !== 0 ? cell.getBgColor() : undefined;
 
   return {
-    char: cell.getChars() || " ",
+    // Wide chars (CJK) span two cells; xterm returns "" for the zero-width
+    // continuation. Collapsing it to " " injects a real space on restore.
+    char: cell.getWidth() === 0 ? "" : cell.getChars() || " ",
     fg,
     bg,
     fgMode: fgMode !== 0 ? fgMode : undefined,
@@ -639,7 +641,9 @@ function extractScrollback(
           const fg = fgMode !== 0 ? cell.getFgColor() : undefined;
           const bg = bgMode !== 0 ? cell.getBgColor() : undefined;
           rowCells.push({
-            char: cell.getChars() || " ",
+            // Wide chars (CJK) span two cells; xterm returns "" for the zero-width
+            // continuation. Collapsing it to " " injects a real space on restore.
+            char: cell.getWidth() === 0 ? "" : cell.getChars() || " ",
             fg,
             bg,
             fgMode: fgMode !== 0 ? fgMode : undefined,

From bd78e5efa4f30ce5897ed3418cf379087c3a9c16 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Oct 2026 15:18:05 +0200
Subject: [PATCH 075/270] Show committed changes for existing-branch worktrees
 (#6462)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: resolve real base branch for worktrees checked out from an existing branch

When a worktree is created by checking out an already-existing branch,
the stored baseRefName was set to the branch's own name instead of the
repository's default branch. The diff panel then diffs the branch
against itself, always showing no changes.

Fixes #1873

* fix: fall back to the current branch when no default branch is found

Addresses Greptile review feedback on #1874: resolveRepositoryDefaultBranch
returns null for local-only repos with no origin/HEAD and no local
main/master (e.g. a repo whose trunk is "develop"), which previously
fell back to storing the checked-out branch as its own base — the
exact self-diff bug this PR fixes. Fall back to whichever branch is
currently checked out in the main repo instead.

* fix(server): preserve existing-branch diffs through workspace restore

Carry the resolved comparison base from the worktree creator into the workspace record. Resolve it for occupied branches too, so a fresh suffixed checkout still displays the feature's committed changes.

Co-authored-by: 2takumax-chura <takuma.okayama@churadata.okinawa>

* fix(server): skip deleted default refs when creating worktrees

---------

Co-authored-by: 2takumax-chura <takuma.okayama@churadata.okinawa>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/agent/mcp-server.test.ts       |  2 +-
 .../src/server/paseo-worktree-service.test.ts |  9 +-
 ...rkspace-create-worktree-source.e2e.test.ts | 42 ++++++++++
 packages/server/src/utils/checkout-git.ts     |  6 +-
 .../server/src/utils/worktree.posix.test.ts   | 84 ++++++++++++++++++-
 packages/server/src/utils/worktree.ts         | 26 ++++--
 6 files changed, 156 insertions(+), 13 deletions(-)

diff --git a/packages/server/src/server/agent/mcp-server.test.ts b/packages/server/src/server/agent/mcp-server.test.ts
index 18b28cfc93..70b49e304b 100644
--- a/packages/server/src/server/agent/mcp-server.test.ts
+++ b/packages/server/src/server/agent/mcp-server.test.ts
@@ -2486,7 +2486,7 @@ describe("create_agent MCP tool", () => {
       });
       expect(readPaseoWorktreeMetadata(agentCwd)).toMatchObject({
         version: 1,
-        baseRefName: "existing-feature",
+        baseRefName: "main",
       });
       expect(generateCalls).toBe(1);
       expect(workspaceGitService.getSnapshot).not.toHaveBeenCalled();
diff --git a/packages/server/src/server/paseo-worktree-service.test.ts b/packages/server/src/server/paseo-worktree-service.test.ts
index cbcef548e4..a5120aa5ff 100644
--- a/packages/server/src/server/paseo-worktree-service.test.ts
+++ b/packages/server/src/server/paseo-worktree-service.test.ts
@@ -791,13 +791,14 @@ test("does not mark checkout branch worktrees as eligible for first-agent rename
     createDeps(),
   );
 
+  // baseRefName must be the repo's default branch, not the checked-out branch
+  // itself — otherwise the diff panel compares the branch against itself and
+  // always shows no changes.
   expect(readPaseoWorktreeMetadata(created.worktree.worktreePath)).toMatchObject({
     version: 1,
-    baseRefName: "dev",
+    baseRefName: "main",
   });
-  // A checkout-branch worktree has no distinct base, so the workspace records a
-  // null baseBranch even though worktree.json's baseRefName is the branch itself.
-  expect(created.workspace.baseBranch).toBe(null);
+  expect(created.workspace.baseBranch).toBe("main");
   await expect(
     attemptFirstAgentBranchAutoName({
       cwd: created.worktree.worktreePath,
diff --git a/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts b/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts
index 2e1f2c4e49..b377c22374 100644
--- a/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts
+++ b/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts
@@ -64,6 +64,48 @@ test("workspace.create worktree source forwards action=checkout + refName into t
   }
 }, 180000);
 
+test("existing branch changes remain visible after archive and restore", async () => {
+  const daemon = await createTestPaseoDaemon();
+  const { repoDir, tempRoot } = createGitRepoWithBranch();
+  const client = new DaemonClient({
+    url: `ws://127.0.0.1:${daemon.port}/ws`,
+    appVersion: "0.11.2",
+  });
+  onTestFinished(async () => {
+    await client.close().catch(() => undefined);
+    await daemon.close();
+    rmSync(tempRoot, { recursive: true, force: true });
+  });
+  runGit(repoDir, "switch", "feature/existing-branch");
+  commitFile(repoDir, "feature.txt", "feature change\n");
+  runGit(repoDir, "switch", "main");
+  await client.connect();
+  const created = await client.createWorkspace({
+    source: {
+      kind: "worktree",
+      cwd: repoDir,
+      action: "checkout",
+      refName: "feature/existing-branch",
+    },
+  });
+  expect(created.error).toBeNull();
+  const workspace = created.workspace!;
+  const cwd = workspace.workspaceDirectory;
+  const head = runGit(cwd, "rev-parse", "HEAD");
+  const before = await client.getCheckoutDiff(cwd, { mode: "base" });
+  expect(before.error).toBeNull();
+  expect(before.files.map((file) => file.path)).toEqual(["feature.txt"]);
+  expect((await client.getCheckoutStatus(cwd)).baseRef).toBe("main");
+  expect((await client.archiveWorkspace(workspace.id)).error).toBeNull();
+  expect(existsSync(cwd)).toBe(false);
+  await client.restoreWorkspace(workspace.id);
+  expect(runGit(cwd, "rev-parse", "HEAD")).toBe(head);
+  expect((await client.getCheckoutStatus(cwd)).baseRef).toBe("main");
+  const after = await client.getCheckoutDiff(cwd, { mode: "base" });
+  expect(after.error).toBeNull();
+  expect(after.files.map((file) => file.path)).toEqual(["feature.txt"]);
+}, 180000);
+
 test("workspace.create keeps a branch-off name separate from its worktree slug", async () => {
   const daemon = await createTestPaseoDaemon();
   const { repoDir, tempRoot } = createGitRepoWithBranch();
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index e1246a90a5..758d6ecf84 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -1560,11 +1560,15 @@ export async function resolveRepositoryDefaultBranch(
         );
         return localName;
       } catch {
+        await getRunGitCommand(context)(["show-ref", "--verify", "--quiet", ref], {
+          cwd: repoRoot,
+          envOverlay: READ_ONLY_GIT_ENV,
+        });
         return remoteShort;
       }
     }
   } catch {
-    // ignore
+    // A stale origin/HEAD must fall through to the available local branches.
   }
 
   const { stdout } = await getRunGitCommand(context)(["branch", "--format=%(refname:short)"], {
diff --git a/packages/server/src/utils/worktree.posix.test.ts b/packages/server/src/utils/worktree.posix.test.ts
index 5673c1412a..2b9181bb77 100644
--- a/packages/server/src/utils/worktree.posix.test.ts
+++ b/packages/server/src/utils/worktree.posix.test.ts
@@ -265,6 +265,38 @@ describe.skipIf(isPlatform("win32"))("worktree POSIX-only", () => {
       });
     });
 
+    it.each([false, true])(
+      "shows committed changes for an existing branch (already checked out: %s)",
+      async (alreadyCheckedOut) => {
+        execFileSync("git", ["checkout", "-b", "feature/existing"], { cwd: repoDir });
+        writeFileSync(join(repoDir, "file.txt"), "feature change\n");
+        execFileSync("git", ["add", "file.txt"], { cwd: repoDir });
+        execFileSync("git", ["-c", "commit.gpgsign=false", "commit", "-m", "feature change"], {
+          cwd: repoDir,
+        });
+        if (!alreadyCheckedOut) {
+          execFileSync("git", ["checkout", "main"], { cwd: repoDir });
+        }
+
+        const result = await createWorktreePrimitive({
+          cwd: repoDir,
+          worktreeSlug: "existing-feature",
+          source: { kind: "checkout-branch", branchName: "feature/existing" },
+          runSetup: false,
+          paseoHome,
+        });
+        const status = await getCheckoutStatus(result.worktreePath, { paseoHome });
+        const diff = await getCheckoutDiff(result.worktreePath, { mode: "base" }, { paseoHome });
+        expect(diff.diff).toContain("+feature change");
+        expect(status).toMatchObject({
+          isGit: true,
+          baseRef: "main",
+          aheadBehind: { ahead: 1, behind: 0 },
+        });
+        expect(result.comparisonBaseRef).toBe("main");
+      },
+    );
+
     it("checks out an existing local branch that is not checked out elsewhere", async () => {
       execFileSync("git", ["branch", "dev"], { cwd: repoDir });
 
@@ -284,15 +316,65 @@ describe.skipIf(isPlatform("win32"))("worktree POSIX-only", () => {
         .trim();
       expect(currentBranch).toBe("dev");
 
+      // baseRefName must be the repo's default branch, not the checked-out branch
+      // itself — otherwise the diff panel compares the branch against itself and
+      // always shows no changes.
       const metadataPath = getPaseoWorktreeMetadataPath(result.worktreePath);
       const metadata = JSON.parse(readFileSync(metadataPath, "utf8"));
       expect(metadata).toMatchObject({
         version: 1,
-        baseRefName: "dev",
+        baseRefName: "main",
         changeRequestLookupTarget: { headRef: "dev", localBranchName: "dev" },
       });
     });
 
+    it("shows committed changes when origin HEAD points to a deleted default branch", async () => {
+      execFileSync("git", ["branch", "-m", "main", "master"], { cwd: repoDir });
+      execFileSync(
+        "git",
+        ["symbolic-ref", "refs/remotes/origin/HEAD", "refs/remotes/origin/main"],
+        { cwd: repoDir },
+      );
+      execFileSync("git", ["checkout", "-b", "feature/stale-default"], { cwd: repoDir });
+      writeFileSync(join(repoDir, "file.txt"), "feature change\n");
+      execFileSync("git", ["add", "file.txt"], { cwd: repoDir });
+      execFileSync("git", ["-c", "commit.gpgsign=false", "commit", "-m", "feature change"], {
+        cwd: repoDir,
+      });
+      execFileSync("git", ["checkout", "master"], { cwd: repoDir });
+      const created = await createWorktreePrimitive({
+        cwd: repoDir,
+        worktreeSlug: "stale-default",
+        source: { kind: "checkout-branch", branchName: "feature/stale-default" },
+        runSetup: false,
+        paseoHome,
+      });
+      const diff = await getCheckoutDiff(created.worktreePath, { mode: "base" }, { paseoHome });
+      expect(diff.diff).toContain("+feature change");
+      expect(created.comparisonBaseRef).toBe("master");
+    });
+
+    it("falls back to the currently checked out branch when no default branch can be resolved", async () => {
+      // No origin remote and no local main/master — resolveRepositoryDefaultBranch
+      // can't find a default branch, so the fix must fall back to whatever is
+      // currently checked out in the main repo (here: "develop").
+      execFileSync("git", ["branch", "-m", "main", "develop"], { cwd: repoDir });
+      execFileSync("git", ["branch", "feature-x"], { cwd: repoDir });
+
+      const result = await createLegacyWorktreeForTest({
+        cwd: repoDir,
+        worktreeSlug: "feature-x-worktree",
+        source: { kind: "checkout-branch", branchName: "feature-x" },
+        runSetup: true,
+        paseoHome,
+      });
+
+      expect(existsSync(result.worktreePath)).toBe(true);
+      const metadataPath = getPaseoWorktreeMetadataPath(result.worktreePath);
+      const metadata = JSON.parse(readFileSync(metadataPath, "utf8"));
+      expect(metadata).toMatchObject({ version: 1, baseRefName: "develop" });
+    });
+
     it("checks out an existing local branch whose name contains uppercase letters and dots", async () => {
       execFileSync("git", ["branch", "release/1.1.15"], { cwd: repoDir });
 
diff --git a/packages/server/src/utils/worktree.ts b/packages/server/src/utils/worktree.ts
index f7f28205e0..f454a7225a 100644
--- a/packages/server/src/utils/worktree.ts
+++ b/packages/server/src/utils/worktree.ts
@@ -39,6 +39,7 @@ import {
   writePaseoWorktreeRuntimeMetadata,
 } from "./worktree-metadata.js";
 import { runGitCommand } from "./run-git-command.js";
+import { getCurrentBranch, resolveRepositoryDefaultBranch } from "./checkout-git.js";
 import { spawnProcess } from "./spawn.js";
 import { resolvePaseoHome } from "../server/paseo-home.js";
 import { createExternalProcessEnv } from "../server/paseo-env.js";
@@ -1279,10 +1280,7 @@ export const createWorktree = async ({
   return {
     branchName: sourcePlan.branchName,
     worktreePath,
-    comparisonBaseRef:
-      source.kind === "checkout-branch"
-        ? null
-        : (sourcePlan.metadataBaseRef ?? sourcePlan.metadataBaseRefName),
+    comparisonBaseRef: sourcePlan.metadataBaseRef ?? sourcePlan.metadataBaseRefName,
   };
 };
 
@@ -1399,11 +1397,12 @@ async function resolveWorktreeSourcePlan({
     case "checkout-branch": {
       await validateGitBranchName(cwd, source.branchName);
       await ensureLocalBranch(cwd, source.branchName);
+      const baseRef = await resolveCheckoutBranchBaseRef(cwd, source.branchName);
       if (await isBranchCheckedOut(cwd, source.branchName)) {
         const branchName = await resolveUniqueLocalBranchName(cwd, source.branchName);
         return {
           branchName,
-          metadataBaseRefName: source.branchName,
+          metadataBaseRefName: baseRef,
           changeRequestLookupTarget: createPaseoWorktreeChangeRequestHint({
             headRef: branchName,
             localBranchName: branchName,
@@ -1414,7 +1413,7 @@ async function resolveWorktreeSourcePlan({
 
       return {
         branchName: source.branchName,
-        metadataBaseRefName: source.branchName,
+        metadataBaseRefName: baseRef,
         changeRequestLookupTarget: createPaseoWorktreeChangeRequestHint({
           headRef: source.branchName,
           localBranchName: source.branchName,
@@ -1669,6 +1668,21 @@ function normalizeRequiredBaseBranch(baseBranch: string): string {
   return normalizedBaseBranch;
 }
 
+// The checked-out branch itself isn't a base to diff against — resolve the
+// repository's default branch so the diff panel has a real comparison target.
+// If the default branch can't be determined (no origin/HEAD, no local
+// main/master — e.g. a local-only repo based on "develop"), fall back to
+// whichever branch is currently checked out in the main repo, since that's
+// almost always the branch this one was intended to be compared against.
+async function resolveCheckoutBranchBaseRef(cwd: string, branchName: string): Promise<string> {
+  const defaultBranch = await resolveRepositoryDefaultBranch(cwd);
+  if (defaultBranch) {
+    return defaultBranch;
+  }
+  const currentBranch = await getCurrentBranch(cwd);
+  return currentBranch && currentBranch !== branchName ? currentBranch : branchName;
+}
+
 async function resolveBaseBranchForWorktree(
   cwd: string,
   requestedBaseBranch: string,

From 0147edaaac705df00a9145fbaacc2cdfda54f49e Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Oct 2026 15:53:10 +0200
Subject: [PATCH 076/270] Restore repository selection for CLI worktree
 commands (#6467)

* fix(cli): pass cwd to worktree ls and archive

worktree ls/archive called getPaseoWorktreeList({}) which fails because
the daemon requires cwd or repoRoot. Default to process.cwd(), accept
optional --cwd, and cover both with unit and CLI help tests.

Closes #2010

* test(cli): reproduce worktree listing without repository scope

* fix(cli): resolve local worktree paths from the calling directory

Local instance paths belong to the CLI working directory. Explicit endpoint paths remain daemon-relative, matching the project command convention. Cover both through the real daemon.

* refactor(cli): make repository directory selection explicit

---------

Co-authored-by: Jason <mildreins@gmail.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/cli/src/commands/worktree/archive.ts |  5 +-
 packages/cli/src/commands/worktree/index.ts   |  8 ++-
 packages/cli/src/commands/worktree/ls.ts      |  5 +-
 .../commands/worktree/repository-directory.ts | 13 ++++
 packages/cli/tests/14-worktree.test.ts        | 69 ++++++++++++++++++-
 5 files changed, 95 insertions(+), 5 deletions(-)
 create mode 100644 packages/cli/src/commands/worktree/repository-directory.ts

diff --git a/packages/cli/src/commands/worktree/archive.ts b/packages/cli/src/commands/worktree/archive.ts
index eaf3857322..5d2bc60f33 100644
--- a/packages/cli/src/commands/worktree/archive.ts
+++ b/packages/cli/src/commands/worktree/archive.ts
@@ -2,6 +2,7 @@ import path from "path";
 import type { Command } from "commander";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import { resolveRepositoryDirectory } from "./repository-directory.js";
 import type {
   CommandOptions,
   SingleResult,
@@ -31,6 +32,7 @@ export const archiveSchema: OutputSchema<WorktreeArchiveResult> = {
 
 export interface WorktreeArchiveOptions extends CommandOptions {
   host?: string;
+  cwd?: string;
 }
 
 export type WorktreeArchiveCommandResult = SingleResult<WorktreeArchiveResult>;
@@ -49,6 +51,7 @@ export async function runArchiveCommandWithDeps(
   deps: { connectToDaemon: typeof connectToDaemon },
 ): Promise<WorktreeArchiveCommandResult> {
   const host = getDaemonHost({ target: options.daemonTarget });
+  const cwd = resolveRepositoryDirectory(options);
 
   // Validate arguments
   if (!nameArg || nameArg.trim().length === 0) {
@@ -76,7 +79,7 @@ export async function runArchiveCommandWithDeps(
 
   try {
     // Get the list of worktrees first to resolve the name
-    const listResponse = await client.getPaseoWorktreeList({});
+    const listResponse = await client.getPaseoWorktreeList({ cwd });
 
     if (listResponse.error) {
       const error: CommandError = {
diff --git a/packages/cli/src/commands/worktree/index.ts b/packages/cli/src/commands/worktree/index.ts
index f35f001a38..37405e2630 100644
--- a/packages/cli/src/commands/worktree/index.ts
+++ b/packages/cli/src/commands/worktree/index.ts
@@ -9,7 +9,10 @@ export function createWorktreeCommand(): Command {
   const worktree = new Command("worktree").description("Manage Paseo-managed git worktrees");
 
   addJsonAndDaemonHostOptions(
-    worktree.command("ls").description("List Paseo-managed git worktrees"),
+    worktree
+      .command("ls")
+      .description("List Paseo-managed git worktrees")
+      .option("--cwd <path>", "Repository directory (default: current)"),
   ).action(withOutput(runLsCommand));
 
   addJsonAndDaemonHostOptions(
@@ -31,7 +34,8 @@ export function createWorktreeCommand(): Command {
     worktree
       .command("archive")
       .description("Archive a worktree (removes worktree and associated branch)")
-      .argument("<name>", "Worktree name or branch name"),
+      .argument("<name>", "Worktree name or branch name")
+      .option("--cwd <path>", "Repository directory (default: current)"),
   ).action(withOutput(runArchiveCommand));
 
   return worktree;
diff --git a/packages/cli/src/commands/worktree/ls.ts b/packages/cli/src/commands/worktree/ls.ts
index cd388b2b08..43940131ce 100644
--- a/packages/cli/src/commands/worktree/ls.ts
+++ b/packages/cli/src/commands/worktree/ls.ts
@@ -1,6 +1,7 @@
 import type { Command } from "commander";
 import { basename } from "node:path";
 import { connectToDaemon } from "../../utils/client.js";
+import { resolveRepositoryDirectory } from "./repository-directory.js";
 import type { CommandOptions, ListResult, OutputSchema, CommandError } from "../../output/index.js";
 
 /** Worktree list item for display */
@@ -40,12 +41,14 @@ export type WorktreeLsResult = ListResult<WorktreeListItem>;
 
 export interface WorktreeLsOptions extends CommandOptions {
   host?: string;
+  cwd?: string;
 }
 
 export async function runLsCommand(
   options: WorktreeLsOptions,
   _command: Command,
 ): Promise<WorktreeLsResult> {
+  const cwd = resolveRepositoryDirectory(options);
   const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
@@ -53,7 +56,7 @@ export async function runLsCommand(
     const agents = agentsPayload.entries.map((entry) => entry.agent);
 
     // Get worktree list from daemon
-    const response = await client.getPaseoWorktreeList({});
+    const response = await client.getPaseoWorktreeList({ cwd });
 
     await client.close();
 
diff --git a/packages/cli/src/commands/worktree/repository-directory.ts b/packages/cli/src/commands/worktree/repository-directory.ts
new file mode 100644
index 0000000000..3c241703c0
--- /dev/null
+++ b/packages/cli/src/commands/worktree/repository-directory.ts
@@ -0,0 +1,13 @@
+import { resolve } from "node:path";
+import type { DaemonTarget } from "../../utils/daemon-target.js";
+
+export function resolveRepositoryDirectory(options: {
+  cwd?: string;
+  daemonTarget: DaemonTarget;
+}): string {
+  const cwd = options.cwd ?? process.cwd();
+  if (options.daemonTarget.kind === "instance") {
+    return resolve(cwd);
+  }
+  return cwd;
+}
diff --git a/packages/cli/tests/14-worktree.test.ts b/packages/cli/tests/14-worktree.test.ts
index e0c4d7f9b5..027cfbaa2b 100644
--- a/packages/cli/tests/14-worktree.test.ts
+++ b/packages/cli/tests/14-worktree.test.ts
@@ -21,7 +21,10 @@
 import assert from "node:assert";
 import { getAvailablePort } from "./helpers/network.ts";
 import { $ } from "zx";
-import { mkdtemp, rm } from "fs/promises";
+import { mkdtemp, rm, mkdir } from "fs/promises";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { runPaseoCli, startTestDaemon } from "./helpers/test-daemon.ts";
 import { tmpdir } from "os";
 import { join } from "path";
 
@@ -50,6 +53,7 @@ try {
     const result = await $`npx paseo worktree ls --help`.nothrow();
     assert.strictEqual(result.exitCode, 0, "worktree ls --help should exit 0");
     assert(result.stdout.includes("--host"), "help should mention --host option");
+    assert(result.stdout.includes("--cwd"), "help should mention --cwd option");
     console.log("✓ worktree ls --help shows options\n");
   }
 
@@ -86,6 +90,7 @@ try {
     const result = await $`npx paseo worktree archive --help`.nothrow();
     assert.strictEqual(result.exitCode, 0, "worktree archive --help should exit 0");
     assert(result.stdout.includes("--host"), "help should mention --host option");
+    assert(result.stdout.includes("--cwd"), "help should mention --cwd option");
     assert(result.stdout.includes("<name>"), "help should mention required name argument");
     console.log("✓ worktree archive --help shows options\n");
   }
@@ -167,4 +172,66 @@ try {
   await rm(paseoHome, { recursive: true, force: true });
 }
 
+// Exercise repository selection through the real CLI and daemon. An empty
+// request used to fail before Git could inspect even a valid repository.
+const daemon = await startTestDaemon();
+const git = promisify(execFile);
+try {
+  const repo = join(daemon.workDir, "repository");
+  await mkdir(repo);
+  await git("git", ["init", repo]);
+  await git("git", [
+    "-C",
+    repo,
+    "-c",
+    "user.name=Test",
+    "-c",
+    "user.email=test@example.com",
+    "commit",
+    "--allow-empty",
+    "-m",
+    "Initial commit",
+  ]);
+
+  for (const args of [
+    ["worktree", "ls", "--json"],
+    ["worktree", "ls", "--cwd", repo, "--json"],
+    ["worktree", "ls", "--cwd", "./repository", "--json"],
+    ["worktree", "ls", "--host", `127.0.0.1:${daemon.port}`, "--cwd", ".", "--json"],
+  ]) {
+    const explicit = args.includes("--cwd");
+    const result = await runPaseoCli(daemon, args, {
+      cwd: explicit ? daemon.workDir : repo,
+      env: { FORCE_COLOR: undefined },
+    });
+    assert.strictEqual(result.exitCode, 0, result.stderr);
+    assert.deepStrictEqual(JSON.parse(result.stdout), []);
+  }
+
+  for (const args of [
+    ["worktree", "archive", "missing", "--json"],
+    ["worktree", "archive", "missing", "--cwd", repo, "--json"],
+    ["worktree", "archive", "missing", "--cwd", "./repository", "--json"],
+    [
+      "worktree",
+      "archive",
+      "missing",
+      "--host",
+      `127.0.0.1:${daemon.port}`,
+      "--cwd",
+      ".",
+      "--json",
+    ],
+  ]) {
+    const result = await runPaseoCli(daemon, args, {
+      cwd: args.includes("--cwd") ? daemon.workDir : repo,
+      env: { FORCE_COLOR: undefined },
+    });
+    assert.notStrictEqual(result.exitCode, 0);
+    assert.strictEqual(JSON.parse(result.stderr).error.code, "WORKTREE_NOT_FOUND", result.stderr);
+  }
+} finally {
+  await daemon.stop();
+}
+
 console.log("=== All worktree tests passed ===");

From 7868f5caf6515543a81ffc58fe941e15e917dcf9 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Oct 2026 17:00:08 +0200
Subject: [PATCH 077/270] Keep email addresses intact when sending with Enter
 (#6471)

* fix: prevent file mention autocomplete from triggering on emails

Skip @ when preceded by a word character or +, and reject angle
brackets in mention queries so email addresses no longer open the
file autocomplete or steal Enter.

Closes #1364

* test(app): verify emails send intact without file completion

The word-character and plus guard tests previously passed because their queries included trailing spaces. Exercise each guard with the cursor at the end of the email, and cover Enter in the browser alongside normal file completion.

Co-authored-by: Jason <mildreins@gmail.com>

---------

Co-authored-by: Jason <mildreins@gmail.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../browser/composer-email-mentions.spec.ts   | 55 +++++++++++++++
 .../utils/file-mention-autocomplete.test.ts   | 68 +++++++++++++++++++
 .../src/utils/file-mention-autocomplete.ts    |  7 +-
 3 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 packages/app/e2e/browser/composer-email-mentions.spec.ts

diff --git a/packages/app/e2e/browser/composer-email-mentions.spec.ts b/packages/app/e2e/browser/composer-email-mentions.spec.ts
new file mode 100644
index 0000000000..29b0686c20
--- /dev/null
+++ b/packages/app/e2e/browser/composer-email-mentions.spec.ts
@@ -0,0 +1,55 @@
+import { expect, test, type Page } from "../support/fixtures";
+import {
+  composerLocator,
+  expectComposerDraft,
+  expectComposerVisible,
+  fillComposerDraft,
+} from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+
+// The popover has no semantic role; its rows are React Native Pressables.
+function fileSuggestions(page: Page) {
+  return page.getByTestId("composer-autocomplete-popover");
+}
+
+async function selectReadmeMention(page: Page): Promise<void> {
+  await fillComposerDraft(page, "@README");
+  await expect(fileSuggestions(page).getByText("README.md", { exact: true })).toBeVisible();
+  await expect(fileSuggestions(page).getByText("example.com", { exact: true })).toHaveCount(0);
+  await composerLocator(page).press("Enter");
+  await expectComposerDraft(page, '"README.md"');
+}
+
+async function sendEmailIntact(page: Page, email: string): Promise<void> {
+  await fillComposerDraft(page, email);
+  await expect(fileSuggestions(page)).not.toBeVisible();
+  await composerLocator(page).press("Enter");
+  await expectComposerDraft(page, "");
+  await expect(page.getByText(email, { exact: true })).toBeVisible();
+}
+
+for (const email of [
+  "user <12345+user@noreply.example.com>",
+  "alice@example.com",
+  "noreply+@example.com",
+]) {
+  test(`Enter sends ${email} intact and still completes file mentions`, async ({ page }) => {
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "composer-email-",
+      title: "Email mention regression",
+      repo: { files: [{ path: "example.com", content: "A file matching the email domain.\n" }] },
+    });
+    try {
+      await openAgentRoute(page, agent);
+      await expectComposerVisible(page);
+      await test.step("complete a workspace file mention with Enter", async () => {
+        await selectReadmeMention(page);
+      });
+      await test.step("send an email without offering or inserting workspace files", async () => {
+        await sendEmailIntact(page, email);
+      });
+    } finally {
+      await agent.cleanup();
+    }
+  });
+}
diff --git a/packages/app/src/utils/file-mention-autocomplete.test.ts b/packages/app/src/utils/file-mention-autocomplete.test.ts
index 4f818e25e2..c74c821522 100644
--- a/packages/app/src/utils/file-mention-autocomplete.test.ts
+++ b/packages/app/src/utils/file-mention-autocomplete.test.ts
@@ -48,6 +48,74 @@ describe("findActiveFileMention", () => {
     });
     expect(mention).toBeNull();
   });
+
+  it("returns null for the issue #1364 angle-bracket email example", () => {
+    const text = "user <12345+user@noreply.example.com>";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("returns null for email addresses (word char before @)", () => {
+    const text = "alice@example.com";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("returns null for email addresses (+ immediately before @)", () => {
+    // Local part ends with + so the character at index-1 is '+', not a word char.
+    const text = "noreply+@example.com";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("returns null for plus-tagged email local parts", () => {
+    const text = "noreply+tag@example.com";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("returns null when query contains angle brackets", () => {
+    const text = "check @foo<bar> end";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.indexOf(" end"),
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("returns null when query ends with a closing angle bracket", () => {
+    const text = "check @foo>";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toBeNull();
+  });
+
+  it("still detects a file mention after an email in the same input", () => {
+    const text = "user <12345+user@noreply.example.com> and also @file";
+    const mention = findActiveFileMention({
+      text,
+      cursorIndex: text.length,
+    });
+    expect(mention).toEqual({
+      start: text.lastIndexOf("@"),
+      end: text.length,
+      query: "file",
+    });
+  });
 });
 
 describe("formatQuotedFileMentionPath", () => {
diff --git a/packages/app/src/utils/file-mention-autocomplete.ts b/packages/app/src/utils/file-mention-autocomplete.ts
index d19424cfe4..fe09b52f03 100644
--- a/packages/app/src/utils/file-mention-autocomplete.ts
+++ b/packages/app/src/utils/file-mention-autocomplete.ts
@@ -15,7 +15,7 @@ interface ApplyFileMentionReplacementInput {
   relativePath: string;
 }
 
-const INVALID_MENTION_QUERY_CHARS = /[\s\n\r\t"']/;
+const INVALID_MENTION_QUERY_CHARS = /[\s\n\r\t"'<>]/;
 
 export function findActiveFileMention(input: FindActiveFileMentionInput): FileMentionRange | null {
   const clampedCursor = Math.max(0, Math.min(input.cursorIndex, input.text.length));
@@ -26,6 +26,11 @@ export function findActiveFileMention(input: FindActiveFileMentionInput): FileMe
     atIndex >= 0;
     atIndex = atIndex === 0 ? -1 : beforeCursor.lastIndexOf("@", atIndex - 1)
   ) {
+    // Skip @ that looks like part of an email address (local-part char immediately before @).
+    if (atIndex > 0 && /[\w+]/.test(beforeCursor[atIndex - 1]!)) {
+      continue;
+    }
+
     const query = beforeCursor.slice(atIndex + 1);
     if (INVALID_MENTION_QUERY_CHARS.test(query)) {
       continue;

From 0ba4d2526ebed49e30271b16018b5e9464a79d21 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Oct 2026 19:48:42 +0200
Subject: [PATCH 078/270] Honor timestamps when reading and following agent
 logs (#6514)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(cli): honor --since in agent logs

* test(cli): verify logs cutoff in the daemon-owned suite

Keep the real CLI and WebSocket regression while placing daemon fixtures
in the server suite, as the CI ownership contract requires. Invoke the
source CLI so the test runs with the server suite's dependency build.

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>

* test(server): use a portable loader URL for the logs regression

---------

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/cli/src/commands/agent/logs.ts       |  58 +++-
 packages/cli/src/utils/timeline.ts            |   8 +-
 .../server/src/server/cli-agent-logs.test.ts  | 277 ++++++++++++++++++
 .../server/test-utils/fake-agent-client.ts    |  10 +
 4 files changed, 342 insertions(+), 11 deletions(-)
 create mode 100644 packages/server/src/server/cli-agent-logs.test.ts

diff --git a/packages/cli/src/commands/agent/logs.ts b/packages/cli/src/commands/agent/logs.ts
index f555e27b80..9ac2d4b238 100644
--- a/packages/cli/src/commands/agent/logs.ts
+++ b/packages/cli/src/commands/agent/logs.ts
@@ -1,7 +1,7 @@
 import { Command } from "commander";
 import { connectToDaemon } from "../../utils/client.js";
 import { waitForStop } from "../../utils/wait-for-stop.js";
-import type { CommandOptions } from "../../output/index.js";
+import type { CommandError, CommandOptions } from "../../output/index.js";
 import {
   fetchProjectedTimelineItems,
   LIVE_HISTORY_FETCH_TIMEOUT_MS,
@@ -32,12 +32,29 @@ export type AgentLogsResult = void;
 
 export const NO_ACTIVITY_MESSAGE = "No activity to display.";
 
+interface FetchAgentTimelineItemsOptions {
+  timeoutMs?: number;
+  sinceTimestampMs?: number;
+}
+
+interface FollowModeInput {
+  client: DaemonClient;
+  agentId: string;
+  options: AgentLogsOptions;
+  sinceTimestampMs: number | undefined;
+}
+
 export async function fetchAgentTimelineItems(
   client: DaemonClient,
   agentId: string,
-  options?: { timeoutMs?: number },
+  options?: FetchAgentTimelineItemsOptions,
 ): Promise<AgentTimelineItem[]> {
-  return fetchProjectedTimelineItems({ client, agentId, timeoutMs: options?.timeoutMs });
+  return fetchProjectedTimelineItems({
+    client,
+    agentId,
+    timeoutMs: options?.timeoutMs,
+    sinceTimestampMs: options?.sinceTimestampMs,
+  });
 }
 
 export function formatAgentActivityTranscript(
@@ -62,6 +79,19 @@ function parseTailCount(raw: string | undefined): number | undefined {
   return parsed;
 }
 
+function parseSinceTimestamp(raw: string | undefined): number | undefined {
+  if (raw === undefined) return undefined;
+  const timestampMs = Date.parse(raw);
+  if (Number.isNaN(timestampMs)) {
+    throw {
+      code: "INVALID_TIMESTAMP",
+      message: `Invalid --since value: ${raw}`,
+      details: "Use a timestamp such as 2026-01-01T00:00:00Z.",
+    } satisfies CommandError;
+  }
+  return timestampMs;
+}
+
 /**
  * Check if a timeline item matches the filter type
  */
@@ -98,6 +128,7 @@ export async function runLogsCommand(
     process.exit(1);
   }
 
+  const sinceTimestampMs = parseSinceTimestamp(options.since);
   const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
@@ -118,12 +149,12 @@ export async function runLogsCommand(
         await client.close().catch(() => {});
         process.exit(1);
       }
-      await runFollowMode(client, resolvedId, options);
+      await runFollowMode({ client, agentId: resolvedId, options, sinceTimestampMs });
       return;
     }
 
     // Fetch timeline directly via cursor RPC.
-    let timelineItems = await fetchAgentTimelineItems(client, resolvedId);
+    let timelineItems = await fetchAgentTimelineItems(client, resolvedId, { sinceTimestampMs });
 
     // Apply filter
     if (options.filter) {
@@ -159,11 +190,12 @@ export async function runLogsCommand(
 /**
  * Follow mode: stream logs in real-time until interrupted
  */
-async function runFollowMode(
-  client: DaemonClient,
-  agentId: string,
-  options: AgentLogsOptions,
-): Promise<void> {
+async function runFollowMode({
+  client,
+  agentId,
+  options,
+  sinceTimestampMs,
+}: FollowModeInput): Promise<void> {
   const DEFAULT_FOLLOW_TAIL = 10;
   const tailCount = parseTailCount(options.tail) ?? DEFAULT_FOLLOW_TAIL;
 
@@ -172,6 +204,7 @@ async function runFollowMode(
   try {
     existingItems = await fetchAgentTimelineItems(client, agentId, {
       timeoutMs: LIVE_HISTORY_FETCH_TIMEOUT_MS,
+      sinceTimestampMs,
     });
   } catch (error) {
     console.warn("Warning: failed to fetch existing timeline", error);
@@ -209,6 +242,11 @@ async function runFollowMode(
       return;
     }
     if (message.payload.event.type === "timeline") {
+      const matchesSince =
+        sinceTimestampMs === undefined || Date.parse(message.payload.timestamp) >= sinceTimestampMs;
+      if (!matchesSince) {
+        return;
+      }
       const item = message.payload.event.item;
       // Apply filter
       if (options.filter && !matchesFilter(item, options.filter)) {
diff --git a/packages/cli/src/utils/timeline.ts b/packages/cli/src/utils/timeline.ts
index 7e84757da0..90b67c9f8e 100644
--- a/packages/cli/src/utils/timeline.ts
+++ b/packages/cli/src/utils/timeline.ts
@@ -7,6 +7,7 @@ interface FetchProjectedTimelineItemsInput {
   client: DaemonClient;
   agentId: string;
   timeoutMs?: number;
+  sinceTimestampMs?: number;
 }
 
 export async function fetchProjectedTimelineItems(
@@ -18,5 +19,10 @@ export async function fetchProjectedTimelineItems(
     projection: "projected",
     timeout: input.timeoutMs,
   });
-  return timeline.entries.map((entry) => entry.item);
+  let entries = timeline.entries;
+  const sinceTimestampMs = input.sinceTimestampMs;
+  if (sinceTimestampMs !== undefined) {
+    entries = entries.filter((entry) => Date.parse(entry.timestamp) >= sinceTimestampMs);
+  }
+  return entries.map((entry) => entry.item);
 }
diff --git a/packages/server/src/server/cli-agent-logs.test.ts b/packages/server/src/server/cli-agent-logs.test.ts
new file mode 100644
index 0000000000..be492f6168
--- /dev/null
+++ b/packages/server/src/server/cli-agent-logs.test.ts
@@ -0,0 +1,277 @@
+import { test } from "vitest";
+import assert from "node:assert";
+import { spawn } from "node:child_process";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { fileURLToPath } from "node:url";
+import type { Readable } from "node:stream";
+import { join } from "node:path";
+import { createDaemonTestContext } from "./test-utils/daemon-test-context.js";
+import { createTestAgentClients } from "./test-utils/fake-agent-client.js";
+import type { AgentStreamEvent } from "@getpaseo/protocol/agent-types";
+
+interface CliResult {
+  exitCode: number | null;
+  stdout: string;
+  stderr: string;
+}
+type CliProcess = Promise<CliResult> & { stdout: Readable; kill: (signal: NodeJS.Signals) => void };
+
+function waitForCliOutput(child: CliProcess, text: string): Promise<void> {
+  return new Promise((resolve, reject) => {
+    let output = "";
+    const onData = (chunk: Buffer) => {
+      output += chunk.toString();
+      if (output.includes(text)) {
+        cleanup();
+        resolve();
+      }
+    };
+    const cleanup = () => {
+      clearTimeout(timer);
+      child.stdout.off("data", onData);
+    };
+    const timer = setTimeout(() => {
+      cleanup();
+      reject(new Error(`CLI did not print ${text}:\n${output}`));
+    }, 20_000);
+    child.stdout.on("data", onData);
+    void child.then(
+      (result) => {
+        cleanup();
+        return reject(new Error(`CLI exited before ${text}:\n${result.stderr}`));
+      },
+      (error) => {
+        cleanup();
+        reject(error);
+      },
+    );
+  });
+}
+
+test("logs --since filters history and live output through the CLI and daemon", async () => {
+  const cliHome = await mkdtemp(join(tmpdir(), "paseo-logs-cli-home-"));
+  const port = 1; // Invalid dates must fail before trying this unavailable endpoint.
+  const runLocalPaseo = (
+    args: string[],
+    env: NodeJS.ProcessEnv = {},
+    cwd = cliHome,
+  ): CliProcess => {
+    const child = spawn(
+      process.execPath,
+      [
+        "--no-warnings",
+        "--conditions=source",
+        "--import",
+        import.meta.resolve("tsx"),
+        fileURLToPath(new URL("../../../cli/src/index.ts", import.meta.url)),
+        ...args,
+      ],
+      {
+        cwd,
+        env: {
+          ...Object.fromEntries(
+            Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_")),
+          ),
+          ...env,
+          HOME: cliHome,
+          USERPROFILE: cliHome,
+        },
+        stdio: ["ignore", "pipe", "pipe"],
+        timeout: 25_000,
+      },
+    );
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    const done = new Promise<CliResult>((resolve, reject) => {
+      child.on("error", reject);
+      child.on("close", (exitCode) => resolve({ exitCode, stdout, stderr }));
+    });
+    return Object.assign(done, {
+      stdout: child.stdout,
+      kill: (signal: NodeJS.Signals) => {
+        child.kill(signal);
+      },
+    });
+  };
+  // Follow assertions check output; Windows forcibly terminates Node on SIGINT.
+  try {
+    console.log("--since filters logs through the real CLI and daemon");
+    const historyEvents: AgentStreamEvent[] = [];
+    const ctx = await createDaemonTestContext({
+      agentClients: createTestAgentClients({ historyEvents }),
+    });
+    try {
+      const agent = await ctx.client.createAgent({
+        provider: "codex",
+        cwd: ctx.daemon.paseoHome,
+        title: "logs since",
+      });
+      const manager = ctx.daemon.daemon.agentManager;
+      await manager.appendTimelineItem(agent.id, { type: "user_message", text: "OLD_USER" });
+      await manager.appendTimelineItem(agent.id, { type: "assistant_message", text: "OLD_REPLY" });
+      const host = `127.0.0.1:${ctx.daemon.port}`;
+      const logs = (args: string[]) =>
+        runLocalPaseo(["--host", host, ...args], {}, ctx.daemon.paseoHome);
+
+      const baseline = await logs(["logs", agent.id]);
+      assert.strictEqual(baseline.exitCode, 0, baseline.stderr);
+      assert.strictEqual(baseline.stdout, "[User] OLD_USER\nOLD_REPLY\n");
+
+      for (const command of [["logs"], ["agent", "logs"]]) {
+        const result = await logs([...command, agent.id, "--since", "2100-01-01T00:00:00Z"]);
+        console.log(`paseo ${command.join(" ")} <id> --since 2100-01-01T00:00:00Z`);
+        console.log(`exit=${result.exitCode}\nstdout:\n${result.stdout}stderr:\n${result.stderr}`);
+        assert.strictEqual(result.exitCode, 0, result.stderr);
+        assert.strictEqual(result.stdout, "No activity to display.\n");
+      }
+
+      const timeline = await ctx.client.fetchAgentTimeline(agent.id, {
+        direction: "tail",
+        limit: 0,
+        projection: "projected",
+      });
+      const firstTimestamp = timeline.entries[0]?.timestamp;
+      assert(firstTimestamp !== undefined, "the fixture should have timestamped activity");
+      for (const since of ["2000-01-01T00:00:00Z", firstTimestamp]) {
+        const result = await logs(["logs", agent.id, "--since", since]);
+        assert.strictEqual(result.exitCode, 0, result.stderr);
+        assert.strictEqual(result.stdout, baseline.stdout);
+      }
+
+      const offset = await logs(["logs", agent.id, "--since", "2100-01-01T08:00:00+08:00"]);
+      assert.strictEqual(offset.exitCode, 0, offset.stderr);
+      assert.strictEqual(offset.stdout, "No activity to display.\n");
+
+      const tail = await logs([
+        "logs",
+        agent.id,
+        "--since",
+        "2000-01-01T00:00:00Z",
+        "--filter",
+        "text",
+        "--tail",
+        "1",
+      ]);
+      assert.strictEqual(tail.exitCode, 0, tail.stderr);
+      assert.strictEqual(tail.stdout, "OLD_REPLY\n");
+
+      const empty = await logs(["logs", agent.id, "--since", firstTimestamp, "--tail", "0"]);
+      assert.strictEqual(empty.exitCode, 0, empty.stderr);
+      assert.strictEqual(empty.stdout, "");
+
+      for (const followArgs of [[], ["--follow"]]) {
+        const invalid = await runLocalPaseo([
+          "--host",
+          `127.0.0.1:${port}`,
+          "logs",
+          "missing-agent",
+          "--since",
+          "not-a-date",
+          "--json",
+          ...followArgs,
+        ]);
+        assert.strictEqual(invalid.exitCode, 1, invalid.stderr);
+        assert.strictEqual(invalid.stdout, "");
+        assert.deepStrictEqual(JSON.parse(invalid.stderr), {
+          error: {
+            code: "INVALID_TIMESTAMP",
+            message: "Invalid --since value: not-a-date",
+            details: "Use a timestamp such as 2026-01-01T00:00:00Z.",
+          },
+        });
+      }
+
+      console.log("--since filters initial history in follow mode");
+      const follow = logs(["logs", agent.id, "--follow", "--since", "2100-01-01T00:00:00Z"]);
+      try {
+        await waitForCliOutput(follow, "--- Following logs");
+      } finally {
+        await follow.kill("SIGINT");
+      }
+      const followed = await follow;
+      console.log(`follow exit=${followed.exitCode}\nstdout:\n${followed.stdout}`);
+      assert.strictEqual(followed.stdout.includes("OLD_USER"), false);
+      assert.strictEqual(followed.stdout.includes("OLD_REPLY"), false);
+
+      console.log("--since filters live events in follow mode");
+      const futureFollow = logs([
+        "agent",
+        "logs",
+        agent.id,
+        "-f",
+        "--tail",
+        "0",
+        "--since",
+        "2100-01-01T00:00:00Z",
+      ]);
+      try {
+        await waitForCliOutput(futureFollow, "--- Following logs");
+        // A timestamped history replay follows the live item on the same socket.
+        // Its visible output proves the CLI consumed the earlier item too.
+        await Promise.all([
+          waitForCliOutput(futureFollow, "AFTER_CUTOFF"),
+          (async () => {
+            await manager.appendTimelineItem(agent.id, {
+              type: "user_message",
+              text: "LIVE_BEFORE_CUTOFF",
+            });
+            historyEvents.push({
+              type: "timeline",
+              provider: "codex",
+              timestamp: "2110-01-01T00:00:00Z",
+              item: { type: "user_message", text: "AFTER_CUTOFF" },
+            });
+            await ctx.client.refreshAgent(agent.id);
+          })(),
+        ]);
+      } finally {
+        await futureFollow.kill("SIGINT");
+      }
+      const futureOutput = await futureFollow;
+      console.log(`future follow exit=${futureOutput.exitCode}\nstdout:\n${futureOutput.stdout}`);
+      assert.strictEqual(futureOutput.stdout.includes("LIVE_BEFORE_CUTOFF"), false);
+
+      console.log("follow still prints live events after --since");
+      const pastFollow = logs([
+        "logs",
+        agent.id,
+        "--follow",
+        "--tail",
+        "0",
+        "--filter",
+        "text",
+        "--since",
+        "2000-01-01T00:00:00Z",
+      ]);
+      try {
+        await waitForCliOutput(pastFollow, "--- Following logs");
+        await Promise.all([
+          waitForCliOutput(pastFollow, "LIVE_REPLY"),
+          (async () => {
+            await manager.appendTimelineItem(agent.id, { type: "user_message", text: "LIVE_USER" });
+            await manager.appendTimelineItem(agent.id, {
+              type: "assistant_message",
+              text: "LIVE_REPLY",
+            });
+          })(),
+        ]);
+      } finally {
+        await pastFollow.kill("SIGINT");
+      }
+      const pastOutput = await pastFollow;
+      console.log(`past follow exit=${pastOutput.exitCode}\nstdout:\n${pastOutput.stdout}`);
+      assert(pastOutput.stdout.includes("[User] LIVE_USER\nLIVE_REPLY\n"), pastOutput.stdout);
+    } finally {
+      await ctx.cleanup();
+    }
+  } finally {
+    await rm(cliHome, { recursive: true, force: true });
+  }
+}, 120_000);
diff --git a/packages/server/src/server/test-utils/fake-agent-client.ts b/packages/server/src/server/test-utils/fake-agent-client.ts
index 45ae1d0e70..1c7127d144 100644
--- a/packages/server/src/server/test-utils/fake-agent-client.ts
+++ b/packages/server/src/server/test-utils/fake-agent-client.ts
@@ -60,6 +60,7 @@ interface FakeAgentSessionOptions {
   closeSession?: () => Promise<void>;
   onStartTurn?: (prompt: AgentPromptInput, config: AgentSessionConfig) => void;
   beforeTurnComplete?: (prompt: AgentPromptInput) => Promise<void>;
+  historyEvents?: readonly AgentStreamEvent[];
 }
 
 export interface TestAgentClientOptions {
@@ -68,6 +69,7 @@ export interface TestAgentClientOptions {
   onStartTurn?: (prompt: AgentPromptInput, config: AgentSessionConfig) => void;
   beforeTurnComplete?: (prompt: AgentPromptInput) => Promise<void>;
   supportsMcpServers?: boolean;
+  historyEvents?: readonly AgentStreamEvent[];
 }
 
 function createDeferred<T>(): Deferred<T> {
@@ -341,6 +343,7 @@ class FakeAgentSession implements AgentSession {
   private readonly closeSession: (() => Promise<void>) | undefined;
   private readonly onStartTurn: TestAgentClientOptions["onStartTurn"];
   private readonly beforeTurnComplete: ((prompt: AgentPromptInput) => Promise<void>) | undefined;
+  private readonly historyEvents: readonly AgentStreamEvent[] | undefined;
 
   constructor(options: FakeAgentSessionOptions) {
     this.capabilities = {
@@ -354,6 +357,7 @@ class FakeAgentSession implements AgentSession {
     this.closeSession = options.closeSession;
     this.onStartTurn = options.onStartTurn;
     this.beforeTurnComplete = options.beforeTurnComplete;
+    this.historyEvents = options.historyEvents;
     this.historyPath = path.join(
       tmpdir(),
       "paseo-fake-provider-history",
@@ -817,6 +821,10 @@ class FakeAgentSession implements AgentSession {
   }
 
   async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
+    if (this.historyEvents) {
+      yield* this.historyEvents;
+      return;
+    }
     let contents: string;
     try {
       contents = await readFile(this.historyPath, "utf8");
@@ -1226,6 +1234,7 @@ class FakeAgentClient implements AgentClient {
       closeSession: this.options.closeSession,
       onStartTurn: this.options.onStartTurn,
       beforeTurnComplete: this.options.beforeTurnComplete,
+      historyEvents: this.options.historyEvents,
     });
   }
 
@@ -1252,6 +1261,7 @@ class FakeAgentClient implements AgentClient {
       closeSession: this.options.closeSession,
       onStartTurn: this.options.onStartTurn,
       beforeTurnComplete: this.options.beforeTurnComplete,
+      historyEvents: this.options.historyEvents,
     });
   }
 

From d0728cd1ede22f46ef454a0ce0e874cfb3638cca Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Oct 2026 21:01:07 +0200
Subject: [PATCH 079/270] fix(opencode): preserve tool validation errors in v2
 (#6519)

Failed bridge requests discarded the daemon error body before OpenCode could show the validation explanation to the agent. Preserve that message and status while retaining the HTTP fallback.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../agent/providers/opencode/bridge.test.ts   | 75 ++++++++++++++++++-
 .../providers/opencode/v2/bridge-plugin.mjs   | 11 ++-
 2 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/server/agent/providers/opencode/bridge.test.ts b/packages/server/src/server/agent/providers/opencode/bridge.test.ts
index 7130ac13b9..076cbe94bd 100644
--- a/packages/server/src/server/agent/providers/opencode/bridge.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/bridge.test.ts
@@ -9,6 +9,10 @@ import { afterEach, describe, expect, test, vi } from "vitest";
 
 import { createTestLogger } from "../../../../test-utils/test-logger.js";
 import type { PaseoToolCatalog } from "../../tools/types.js";
+import { createPaseoToolCatalog } from "../../tools/paseo-tools.js";
+import { AgentManager } from "../../agent-manager.js";
+import { AgentStorage } from "../../agent-storage.js";
+import { ProviderSnapshotManager } from "../../provider-snapshot-manager.js";
 import {
   OpenCodeBridge,
   loadOpenCodeBridgePluginArtifact,
@@ -291,7 +295,10 @@ describe("OpenCodeBridge", () => {
       ).resolves.toMatchObject({ content: [{ type: "text", text: "child result" }] });
       await expect(
         tools.get("paseo_echo_context")!.execute({ value: "blocked" }, { sessionID: "disabled" }),
-      ).rejects.toThrow("HTTP 403");
+      ).rejects.toMatchObject({
+        message: "Paseo tools are disabled for this session",
+        status: 403,
+      });
       await dispose();
     } finally {
       release();
@@ -300,6 +307,72 @@ describe("OpenCodeBridge", () => {
     }
   });
 
+  test("v2 plugin preserves create_agent validation errors from the daemon", async () => {
+    const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-opencode-v2-errors-"));
+    temporaryDirectories.push(paseoHome);
+    const logger = createTestLogger();
+    const providerSnapshotManager = new ProviderSnapshotManager({ logger });
+    const catalog = createPaseoToolCatalog({
+      agentManager: new AgentManager({ logger }),
+      agentStorage: new AgentStorage(paseoHome, logger),
+      providerSnapshotManager,
+      logger,
+    });
+    const bridge = new OpenCodeBridge({ paseoHome, logger });
+    bridge.setManifestCatalog(catalog);
+    await bridge.start();
+    const release = bridge.bindSession({ sessionId: "caller", env: {}, tools: catalog });
+    try {
+      const env = await bridge.decorateV2ServerEnv({});
+      const { plugins } = JSON.parse(env.OPENCODE_CONFIG_CONTENT);
+      const plugin = plugins[0];
+      const module = await import(
+        pathToFileURL(path.join(fileURLToPath(plugin.package), "server.js")).href
+      );
+      const tools = new Map<string, V2TestTool>();
+      const dispose = await module.default.setup({
+        options: plugin.options,
+        tool: {
+          transform: async (transform: (editor: { add(tool: V2TestTool): void }) => void) => {
+            transform({ add: (tool) => tools.set(tool.name, tool) });
+            return { dispose: async () => undefined };
+          },
+        },
+        session: {
+          context: async () => [],
+          get: async () => ({ parentID: "" }),
+          hook: async () => ({ dispose: async () => undefined }),
+        },
+      } satisfies V2TestPluginContext);
+      try {
+        const input = { provider: "codex", title: "Invalid provider", initialPrompt: "Hello" };
+        const response = await fetch(
+          `${plugin.options.baseUrl}/_internal/opencode/sessions/caller/tools/create_agent`,
+          {
+            method: "POST",
+            headers: {
+              Authorization: `Bearer ${plugin.options.token}`,
+              "Content-Type": "application/json",
+            },
+            body: JSON.stringify(input),
+          },
+        );
+        expect(response.status).toBe(500);
+        const payload = await response.json();
+        expect(payload.error).toContain("provider must be provider/model");
+        await expect(
+          tools.get("paseo_create_agent")!.execute(input, { sessionID: "caller" }),
+        ).rejects.toMatchObject({ message: payload.error, status: 500 });
+      } finally {
+        await dispose();
+      }
+    } finally {
+      release();
+      await bridge.close();
+      await providerSnapshotManager.shutdown();
+    }
+  });
+
   test("v2 plugin returns a tool image as OpenCode file content", async () => {
     const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-opencode-v2-image-"));
     temporaryDirectories.push(paseoHome);
diff --git a/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs b/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs
index 190e015d8e..6b845d19ed 100644
--- a/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs
+++ b/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs
@@ -13,7 +13,16 @@ export default {
         ...(body === undefined ? {} : { body: JSON.stringify(body) }),
       });
       if (allowMissing && response.status === 404) return null;
-      if (!response.ok) throw new Error(`Paseo tool bridge returned HTTP ${response.status}`);
+      if (!response.ok) {
+        const payload = await response.json().catch(() => null);
+        const message =
+          typeof payload?.error === "string" && payload.error
+            ? payload.error
+            : `Paseo tool bridge returned HTTP ${response.status}`;
+        const error = new Error(message);
+        error.status = response.status;
+        throw error;
+      }
       return response.json();
     }
     async function scope(sessionID) {

From 01f9bc829127dedb08588b6b6599175eb54dad00 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 10 Oct 2026 20:53:09 +0100
Subject: [PATCH 080/270] Modernize compact headers and sidebar affordances
 (#6431)

* feat(app): modernize compact headers and sidebar affordances

Use a shared island header with quick tab creation and keep sheet footers inside their visible layout. Opt sidebar rows into touch sizing without changing global appearance settings.

* test(app): match darker light-theme workspace selection

* test(app): align plugin journeys with compact header
---
 .oxlintrc.json                                |   1 -
 .../browser/appearance-theme-picker.spec.ts   |   2 +-
 .../browser/compact-workspace-header.spec.ts  |  96 ++
 .../workspace-tab-switcher-rename.spec.ts     |  80 +-
 .../agent-device/native-terminal-basic.ios.ad |   6 +-
 .../native-terminal-scroll.ios.ad             |   6 +-
 .../native-terminal-selection-panels.ios.ad   |   6 +-
 .../e2e/mobile/composer-keyboard/android.sh   |   6 +-
 .../support/helpers/plugin-button-example.ts  |  14 +-
 .../app/e2e/support/helpers/plugin-buttons.ts |  62 +-
 .../app/src/agent-stream/strategy-native.tsx  |  13 +-
 packages/app/src/agent-stream/top-overlay.ts  |  14 +
 packages/app/src/app/_layout.tsx              |   2 +-
 .../adaptive-modal-sheet-layout.test.ts       |  19 +-
 .../components/adaptive-modal-sheet-layout.ts |  22 -
 .../src/components/adaptive-modal-sheet.tsx   |  76 +-
 .../src/components/floating-header/index.tsx  |  99 ++
 .../src/components/headers/back-header.tsx    |  19 +-
 .../src/components/headers/compact-header.tsx | 168 ++++
 .../headers/header-toggle-button.tsx          |  20 +-
 .../src/components/headers/menu-header.tsx    | 165 +---
 .../headers/sidebar-menu-toggle.tsx           | 167 ++++
 packages/app/src/components/left-sidebar.tsx  |  55 +-
 .../app/src/components/project-edit-sheet.tsx |   3 -
 .../src/components/sidebar-workspace-list.tsx |  25 +-
 .../sidebar/pinned-section-header.tsx         |  22 +-
 .../sidebar/project-leading-visual.tsx        |  26 +-
 .../sidebar/sidebar-group-toggle-row.tsx      |  40 +-
 .../components/sidebar/sidebar-header-row.tsx |  40 +-
 .../components/sidebar/sidebar-help-menu.tsx  |  24 +-
 .../sidebar/sidebar-status-list.tsx           |  46 +-
 .../sidebar/sidebar-workspace-row-content.tsx |  24 +-
 .../sidebar/sidebar-workspace-row.tsx         |   3 +-
 packages/app/src/components/ui/combobox.tsx   |  98 +-
 .../app/src/components/ui/density-icon.tsx    |  51 +
 .../src/components/ui/icon-button-chrome.ts   |  43 +-
 .../ui/isolated-bottom-sheet-modal/index.tsx  |   2 +
 .../visible-frame-layout.test.ts              |  58 ++
 .../visible-frame-layout.ts                   |  25 +
 .../visible-frame.tsx                         |  42 +
 .../components/ui/pane-content-toolbar.tsx    |  23 +-
 .../composer/agent-controls/model-sheet.tsx   |   2 -
 packages/app/src/constants/layout.ts          |   7 +-
 packages/app/src/plugins/surface-screen.tsx   |  62 +-
 .../app/src/screens/new-workspace-screen.tsx  |   6 +-
 .../compact-workspace-header/index.tsx        |  72 ++
 .../compact-workspace-header/tab-switcher.tsx | 501 ++++++++++
 .../workspace/workspace-explorer-toggle.tsx   |   2 +
 .../workspace/workspace-header-menu.tsx       |  39 +-
 .../workspace-header-project-row.tsx          |  68 ++
 .../screens/workspace/workspace-screen.tsx    | 875 +++---------------
 packages/app/src/styles/density.ts            |  57 ++
 packages/app/src/styles/theme.test.ts         |   6 +-
 packages/app/src/styles/theme.ts              |   4 +-
 packages/app/src/usage/controls.tsx           |  21 +-
 packages/app/src/usage/refresh-button.tsx     |   5 +-
 .../src/workspace-labels/manager-modal.tsx    |   3 -
 57 files changed, 2036 insertions(+), 1407 deletions(-)
 create mode 100644 packages/app/e2e/browser/compact-workspace-header.spec.ts
 create mode 100644 packages/app/src/agent-stream/top-overlay.ts
 create mode 100644 packages/app/src/components/floating-header/index.tsx
 create mode 100644 packages/app/src/components/headers/compact-header.tsx
 create mode 100644 packages/app/src/components/headers/sidebar-menu-toggle.tsx
 create mode 100644 packages/app/src/components/ui/density-icon.tsx
 create mode 100644 packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.test.ts
 create mode 100644 packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.ts
 create mode 100644 packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame.tsx
 create mode 100644 packages/app/src/screens/workspace/compact-workspace-header/index.tsx
 create mode 100644 packages/app/src/screens/workspace/compact-workspace-header/tab-switcher.tsx
 create mode 100644 packages/app/src/screens/workspace/workspace-header-project-row.tsx
 create mode 100644 packages/app/src/styles/density.ts

diff --git a/.oxlintrc.json b/.oxlintrc.json
index d1566195e9..4582602a97 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -252,7 +252,6 @@
         "packages/app/src/components/download-toast.tsx",
         "packages/app/src/components/draggable-list.native.tsx",
         "packages/app/src/components/headers/back-header.tsx",
-        "packages/app/src/components/headers/menu-header.tsx",
         "packages/app/src/components/headers/screen-header.tsx",
         "packages/app/src/components/host-status-dot.tsx",
         "packages/app/src/components/hosts/host-picker.tsx",
diff --git a/packages/app/e2e/browser/appearance-theme-picker.spec.ts b/packages/app/e2e/browser/appearance-theme-picker.spec.ts
index 8df71f0911..b0d86e164e 100644
--- a/packages/app/e2e/browser/appearance-theme-picker.spec.ts
+++ b/packages/app/e2e/browser/appearance-theme-picker.spec.ts
@@ -35,7 +35,7 @@ test("keeps the selected workspace visible in Light", async ({ page }, testInfo)
     await row.click();
 
     await expect(row).toHaveAttribute("aria-selected", "true");
-    await expect(row).toHaveCSS("background-color", "rgb(228, 228, 231)");
+    await expect(row).toHaveCSS("background-color", "rgb(212, 212, 216)");
     await page.screenshot({
       path: testInfo.outputPath("light-selected-workspace.png"),
       fullPage: true,
diff --git a/packages/app/e2e/browser/compact-workspace-header.spec.ts b/packages/app/e2e/browser/compact-workspace-header.spec.ts
new file mode 100644
index 0000000000..c245d2ae10
--- /dev/null
+++ b/packages/app/e2e/browser/compact-workspace-header.spec.ts
@@ -0,0 +1,96 @@
+import type { Page, TestInfo } from "@playwright/test";
+import { test, expect } from "../support/fixtures";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { openAgentRoute } from "../support/helpers/mock-agent";
+import { getServerId } from "../support/helpers/server-id";
+
+const labels = {
+  long: {
+    title: "workspace-with-a-very-long-release-and-investigation-name",
+    project: "project-with-a-very-long-customer-integration-name",
+  },
+  short: { title: "main", project: "Paseo" },
+};
+
+async function openNamedWorkspace(page: Page, names: typeof labels.long) {
+  const workspace = await seedWorkspace({ repoPrefix: "header-width-", title: names.title });
+  try {
+    await workspace.client.renameProject(workspace.projectId, names.project);
+    const agent = await workspace.client.createAgent({
+      provider: "mock",
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Header layout check",
+      modeId: "load-test",
+      model: "e2e-fast-stream",
+    });
+    await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: agent.id });
+    await expect(page.getByTestId("workspace-header-title")).toHaveText(names.title);
+    await expect(page.getByTestId("workspace-header-subtitle")).toHaveText(names.project);
+    await expect(
+      page.getByTestId(`host-badge-${getServerId()}`).filter({ visible: true }),
+    ).toHaveCount(1);
+    return workspace;
+  } catch (error) {
+    await workspace.cleanup();
+    throw error;
+  }
+}
+
+async function expectHeaderContentsFit(page: Page, info: TestInfo, long: boolean) {
+  const title = page.getByTestId("workspace-header-title");
+  const project = page.getByTestId("workspace-header-subtitle");
+  const badge = page.getByTestId(`host-badge-${getServerId()}`).filter({ visible: true });
+  const trigger = page.getByRole("button", { name: /Switch tabs/ });
+  const measure = async () => ({
+    title: await title.boundingBox(),
+    project: await project.boundingBox(),
+    badge: await badge.boundingBox(),
+    icon: await badge.locator("svg").boundingBox(),
+    trigger: await trigger.boundingBox(),
+    titleTruncated: await title.evaluate((el) => el.scrollWidth > el.clientWidth),
+    projectTruncated: await project.evaluate((el) => el.scrollWidth > el.clientWidth),
+  });
+  await page.screenshot({ path: info.outputPath("header.png") });
+  await expect(async () => {
+    const bounds = await measure();
+    expect(bounds.title).not.toBeNull();
+    expect(bounds.project).not.toBeNull();
+    expect(bounds.badge).not.toBeNull();
+    expect(bounds.icon).not.toBeNull();
+    expect(bounds.trigger).not.toBeNull();
+    // Approved geometry: 12px outside margin, 46px leading island, 8px title gap.
+    expect(bounds.title!.x).toBe(66);
+    expect(bounds.project!.x).toBe(bounds.title!.x);
+    expect(bounds.trigger!.width).toBe(32);
+    expect(bounds.trigger!.height).toBe(32);
+    // The action frame starts 7px inside its island; preserve the 8px gap before it.
+    const contentRight = bounds.trigger!.x - 15;
+    for (const box of [bounds.title!, bounds.project!, bounds.badge!, bounds.icon!]) {
+      expect(box.x + box.width).toBeLessThanOrEqual(contentRight + 1);
+    }
+    expect(bounds.project!.width).toBeGreaterThan(20);
+    expect(bounds.icon!.width).toBe(12);
+    expect(bounds.badge!.x).toBeGreaterThan(bounds.project!.x + bounds.project!.width);
+    expect(bounds.titleTruncated).toBe(long);
+    expect(bounds.projectTruncated).toBe(long);
+  }).toPass({ timeout: 5_000 });
+  await info.attach("header-bounds", {
+    body: JSON.stringify(await measure(), null, 2),
+    contentType: "application/json",
+  });
+}
+
+for (const width of [320, 390]) {
+  for (const kind of ["long", "short"] as const) {
+    test(`compact header contains ${kind} labels at ${width}px`, async ({ page }, info) => {
+      await page.setViewportSize({ width, height: 844 });
+      const workspace = await openNamedWorkspace(page, labels[kind]);
+      try {
+        await expectHeaderContentsFit(page, info, kind === "long");
+      } finally {
+        await workspace.cleanup();
+      }
+    });
+  }
+}
diff --git a/packages/app/e2e/browser/workspace-tab-switcher-rename.spec.ts b/packages/app/e2e/browser/workspace-tab-switcher-rename.spec.ts
index 07e62131b0..72b5908446 100644
--- a/packages/app/e2e/browser/workspace-tab-switcher-rename.spec.ts
+++ b/packages/app/e2e/browser/workspace-tab-switcher-rename.spec.ts
@@ -1,3 +1,4 @@
+import type { Page, TestInfo } from "@playwright/test";
 import { randomUUID } from "node:crypto";
 import { test, expect } from "../support/fixtures";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
@@ -6,6 +7,31 @@ import type { SeedDaemonClient } from "../support/helpers/seed-client";
 
 const MOBILE_VIEWPORT = { width: 390, height: 844 };
 
+test.use({ viewport: MOBILE_VIEWPORT, deviceScaleFactor: 2 });
+
+async function openTabSwitcher(page: Page) {
+  await page.getByRole("button", { name: /Switch tabs/ }).click();
+  const footer = page.getByRole("button", { name: "New terminal", exact: true });
+  await expect(footer).toBeVisible();
+  // Visibility alone passes while the sheet is still travelling up from below the viewport.
+  await expect
+    .poll(async () => {
+      const bounds = await footer.boundingBox();
+      return bounds ? bounds.y + bounds.height : Number.POSITIVE_INFINITY;
+    })
+    .toBeLessThanOrEqual(MOBILE_VIEWPORT.height);
+}
+
+async function captureScreen(page: Page, testInfo: TestInfo, name: string) {
+  await page.screenshot({ path: testInfo.outputPath(name + ".png") });
+}
+
+async function createTabFromSwitcher(page: Page, kind: "New agent" | "New terminal") {
+  await openTabSwitcher(page);
+  await page.getByRole("button", { name: kind, exact: true }).click();
+  await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+}
+
 async function fetchAgentTitle(client: SeedDaemonClient, agentId: string): Promise<string | null> {
   const result = await client.fetchAgents({ scope: "active" });
   return result.entries.find((entry) => entry.agent.id === agentId)?.agent.title ?? null;
@@ -20,7 +46,7 @@ async function fetchAgentTitle(client: SeedDaemonClient, agentId: string): Promi
 test.describe("Workspace session rename (compact tab switcher)", () => {
   test("renames an agent session from the switcher's per-session actions sheet", async ({
     page,
-  }) => {
+  }, testInfo) => {
     test.setTimeout(120_000);
 
     await page.setViewportSize(MOBILE_VIEWPORT);
@@ -36,8 +62,10 @@ test.describe("Workspace session rename (compact tab switcher)", () => {
         timeout: 30_000,
       });
 
+      await captureScreen(page, testInfo, "compact-chat-header");
+
       // Open the sessions dropdown (a bottom sheet on compact).
-      await page.getByRole("button", { name: /Switch tabs/ }).click();
+      await openTabSwitcher(page);
       await expect(page.getByRole("button", { name: "Bottom sheet backdrop" }).first()).toBeVisible(
         {
           timeout: 10_000,
@@ -65,12 +93,58 @@ test.describe("Workspace session rename (compact tab switcher)", () => {
       await renameModalSubmit(page, modalPrefix).click();
 
       await expect(input).toHaveCount(0, { timeout: 15_000 });
-      await expect(page.getByTestId("workspace-tab-switcher-trigger")).toContainText(renamed, {
+      await expect(page.getByText(renamed, { exact: true })).toBeVisible({
         timeout: 15_000,
       });
+      await expect(page.getByRole("button", { name: /Switch tabs/ })).toHaveText("1");
       await expect.poll(() => fetchAgentTitle(session.client, session.agentId)).toBe(renamed);
+      await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(1);
+      await expect(page.getByText("Rename agent", { exact: true })).toBeHidden();
+      await captureScreen(page, testInfo, "renamed-tab-in-switcher");
     } finally {
       await session.cleanup();
     }
   });
 });
+
+test("switcher footer creates tabs and returns to the existing chat", async ({
+  page,
+}, testInfo) => {
+  const session = await seedMockAgentWorkspace({
+    repoPrefix: "compact-header-actions-",
+    title: "Existing chat",
+  });
+  try {
+    await openAgentRoute(page, session);
+    await expect(page.getByRole("button", { name: /Switch tabs/ })).toHaveText("1");
+
+    await createTabFromSwitcher(page, "New terminal");
+    await expect(page.getByRole("button", { name: /Switch tabs/ })).toHaveText("2");
+    await expect(page.getByTestId("terminal-surface").filter({ visible: true })).toHaveCount(1);
+    await captureScreen(page, testInfo, "compact-terminal-header");
+
+    await createTabFromSwitcher(page, "New agent");
+    await expect(page.getByRole("button", { name: /Switch tabs/ })).toHaveText("3");
+    await expect(
+      page.getByRole("textbox", { name: "Message agent..." }).filter({ visible: true }),
+    ).toHaveCount(1);
+    await captureScreen(page, testInfo, "compact-draft-header");
+
+    await openTabSwitcher(page);
+    await expect(page.getByText("Existing chat", { exact: true })).toBeVisible();
+    await captureScreen(page, testInfo, "switcher-three-tabs");
+    await page.getByText("Existing chat", { exact: true }).click();
+    await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+    await expect(page.getByRole("button", { name: /Switch tabs/ })).toHaveText("3");
+
+    await openTabSwitcher(page);
+    await expect(page.getByText("Existing chat", { exact: true })).toBeVisible();
+    await page
+      .getByRole("button", { name: "Bottom sheet backdrop" })
+      .click({ position: { x: 10, y: 10 } });
+    await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+    await captureScreen(page, testInfo, "returned-chat-header");
+  } finally {
+    await session.cleanup();
+  }
+});
diff --git a/packages/app/e2e/mobile/agent-device/native-terminal-basic.ios.ad b/packages/app/e2e/mobile/agent-device/native-terminal-basic.ios.ad
index 63f5fb0728..335f269b13 100644
--- a/packages/app/e2e/mobile/agent-device/native-terminal-basic.ios.ad
+++ b/packages/app/e2e/mobile/agent-device/native-terminal-basic.ios.ad
@@ -2,9 +2,9 @@ context platform=ios timeout=60000 retries=1
 env APP_ID=sh.paseo.debug
 
 open "${APP_ID}"
-wait "id=\"workspace-header-menu-trigger\"" 20000
-press "id=\"workspace-header-menu-trigger\""
-press "id=\"workspace-header-new-terminal\""
+wait "id=\"workspace-tab-switcher-trigger\"" 20000
+press "id=\"workspace-tab-switcher-trigger\""
+press "id=\"workspace-tab-switcher-new-terminal\""
 wait "id=\"terminal-keyboard-toggle\"" 10000
 press "id=\"terminal-keyboard-toggle\""
 type "printf '__AD_%s__\\n' OUTPUT_OK" --delay-ms 0
diff --git a/packages/app/e2e/mobile/agent-device/native-terminal-scroll.ios.ad b/packages/app/e2e/mobile/agent-device/native-terminal-scroll.ios.ad
index 4988c9afdd..2b5e5fcfdb 100644
--- a/packages/app/e2e/mobile/agent-device/native-terminal-scroll.ios.ad
+++ b/packages/app/e2e/mobile/agent-device/native-terminal-scroll.ios.ad
@@ -2,9 +2,9 @@ context platform=ios timeout=60000 retries=1
 env APP_ID=sh.paseo.debug
 
 open "${APP_ID}"
-wait "id=\"workspace-header-menu-trigger\"" 20000
-press "id=\"workspace-header-menu-trigger\""
-press "id=\"workspace-header-new-terminal\""
+wait "id=\"workspace-tab-switcher-trigger\"" 20000
+press "id=\"workspace-tab-switcher-trigger\""
+press "id=\"workspace-tab-switcher-new-terminal\""
 wait "id=\"terminal-surface\"" 10000
 press "id=\"terminal-surface\""
 type "clear; yes SAME | head -41; echo AD_SCROLL_MARKER; yes SAME | head -38" --delay-ms 0
diff --git a/packages/app/e2e/mobile/agent-device/native-terminal-selection-panels.ios.ad b/packages/app/e2e/mobile/agent-device/native-terminal-selection-panels.ios.ad
index 9ef099b5a7..11f75b62b3 100644
--- a/packages/app/e2e/mobile/agent-device/native-terminal-selection-panels.ios.ad
+++ b/packages/app/e2e/mobile/agent-device/native-terminal-selection-panels.ios.ad
@@ -2,9 +2,9 @@ context platform=ios timeout=60000 retries=1
 env APP_ID=sh.paseo.debug
 
 open "${APP_ID}"
-wait "id=\"workspace-header-menu-trigger\"" 20000
-press "id=\"workspace-header-menu-trigger\""
-press "id=\"workspace-header-new-terminal\""
+wait "id=\"workspace-tab-switcher-trigger\"" 20000
+press "id=\"workspace-tab-switcher-trigger\""
+press "id=\"workspace-tab-switcher-new-terminal\""
 wait "id=\"terminal-keyboard-toggle\"" 10000
 press "id=\"terminal-keyboard-toggle\""
 type "clear; printf '                    PASEO_TARGET\\n'" --delay-ms 0
diff --git a/packages/app/e2e/mobile/composer-keyboard/android.sh b/packages/app/e2e/mobile/composer-keyboard/android.sh
index ba86400132..49c907dba9 100755
--- a/packages/app/e2e/mobile/composer-keyboard/android.sh
+++ b/packages/app/e2e/mobile/composer-keyboard/android.sh
@@ -660,9 +660,9 @@ adb shell am start -a android.intent.action.VIEW -d "paseo://h/${SERVER_ID}/agen
 ad wait "text=\"${AGENT_TITLE}\"" 10000
 run_host_scenario chat
 ad keyboard dismiss || true
-ad press 'id="workspace-header-menu-trigger"' --settle
-ad wait 'id="workspace-header-new-agent"' 10000
-ad press 'id="workspace-header-new-agent"' --settle
+ad press 'id="workspace-tab-switcher-trigger"' --settle
+ad wait 'id="workspace-tab-switcher-new-agent"' 10000
+ad press 'id="workspace-tab-switcher-new-agent"' --settle
 ad wait 'text="New Agent"' 10000
 run_host_scenario workspace-draft
 ad keyboard dismiss || true
diff --git a/packages/app/e2e/support/helpers/plugin-button-example.ts b/packages/app/e2e/support/helpers/plugin-button-example.ts
index 94018c4415..ebe868ee2c 100644
--- a/packages/app/e2e/support/helpers/plugin-button-example.ts
+++ b/packages/app/e2e/support/helpers/plugin-button-example.ts
@@ -30,7 +30,6 @@ async function capture(
   name: string,
   subject: Locator = headerButtons(page),
 ) {
-  await expect(headerButtons(page)).toHaveCount(1);
   await expect(subject).toBeInViewport();
   await waitForSettledPosition(subject);
   const file = info.outputPath(`${name}.png`);
@@ -80,6 +79,7 @@ export async function withButtonAuthorExample(
       refreshFromHeaderAndComposer: () =>
         test.step("icon-only header action and labeled composer action update in place", async () => {
           await exampleCommand(page, "action");
+          await expect(headerButtons(page)).toHaveCount(1);
           await headerButtons(page).click();
           await expect(headerButtons(page)).toHaveAccessibleName("Refresh workspace (1)");
           await page.getByRole("button", { name: "Refresh context", exact: true }).click();
@@ -88,7 +88,13 @@ export async function withButtonAuthorExample(
           ).toContainText("Refreshed · 2");
           await capture(page, info, "01-actions");
           await page.setViewportSize(COMPACT);
-          await capture(page, info, "02-compact-actions");
+          await expect(headerButtons(page)).toHaveCount(0);
+          await capture(
+            page,
+            info,
+            "02-compact-actions",
+            page.getByRole("button", { name: "Refresh context", exact: true }),
+          );
         }),
       useMenusAndToggleButtons: () =>
         test.step("named menus include separators, nested actions, disabled items, and custom content", async () => {
@@ -128,7 +134,8 @@ export async function withButtonAuthorExample(
           await capture(page, info, "05-disabled");
           await exampleCommand(page, "enable");
           await page.setViewportSize(COMPACT);
-          await headerButtons(page).click();
+          await expect(headerButtons(page)).toHaveCount(0);
+          await page.getByRole("button", { name: "Composer tools", exact: true }).click();
           await expect(
             page.getByRole("menuitem", { name: "Refresh workspace", exact: true }),
           ).toBeInViewport();
@@ -143,6 +150,7 @@ export async function withButtonAuthorExample(
       inspectLiveWorkspaceDetails: () =>
         test.step("custom icons and content react to workspace changes and adapt to sheets", async () => {
           await exampleCommand(page, "popover");
+          await expect(headerButtons(page)).toHaveCount(1);
           await headerButtons(page).click();
           await expect(
             page.getByRole("button", { name: "Close workspace details", exact: true }),
diff --git a/packages/app/e2e/support/helpers/plugin-buttons.ts b/packages/app/e2e/support/helpers/plugin-buttons.ts
index 7404173fc8..f3279ce7ef 100644
--- a/packages/app/e2e/support/helpers/plugin-buttons.ts
+++ b/packages/app/e2e/support/helpers/plugin-buttons.ts
@@ -202,31 +202,6 @@ async function expectHeaderTextTruncated(page: Page) {
   await expect.poll(async () => (await hostIcon.boundingBox())?.width).toBe(12);
 }
 
-async function holdButton(page: Page, button: Locator) {
-  await button.hover();
-  await page.mouse.down();
-}
-
-async function openCompactOverflowWithHeaderChrome(page: Page) {
-  const hamburger = page.getByRole("button", { name: "Open menu", exact: true });
-  const action = page.getByRole("button", { name: "Deploy application", exact: true });
-  const overflow = page
-    .getByRole("toolbar", { name: "Workspace actions", exact: true })
-    .getByRole("button", { name: "More actions", exact: true });
-  await expect(action).toHaveCSS("border-top-width", "0px");
-  await expect(overflow).toHaveCSS("border-top-width", "0px");
-  await hamburger.hover();
-  const highlight = await hamburger.evaluate(
-    (element) => getComputedStyle(element).backgroundColor,
-  );
-  await action.hover();
-  await expect(action).toHaveCSS("background-color", highlight);
-  await holdButton(page, overflow);
-  await expect(overflow).toHaveCSS("background-color", highlight);
-  await expectSurfaceVisible(page);
-  await page.mouse.up();
-}
-
 export async function withButtonShowcase(
   page: Page,
   run: (buttons: {
@@ -408,7 +383,7 @@ export async function withButtonShowcase(
           );
         }),
       openCompactSheets: () =>
-        test.step("compact triggers and overflow open sheets with working plugin context", async () => {
+        test.step("compact header omits plugin actions while composer triggers open sheets", async () => {
           await page.setViewportSize(COMPACT);
           await expect(page.getByTestId("plugin-button-chevron")).toHaveCount(0);
           await expect(
@@ -426,39 +401,12 @@ export async function withButtonShowcase(
             "Button showcase with a long workspace title",
           );
           await expectHeaderTextTruncated(page);
-          await expectSurfaceVisible(page);
-          await openCompactOverflowWithHeaderChrome(page);
           await expect(
-            page.getByRole("menuitem", { name: "Production locked", exact: true }),
-          ).toBeDisabled();
-          await expectSurfaceVisible(
-            page,
-            page.getByRole("menuitem", { name: "Production locked", exact: true }),
-          );
-          await choose(page, "Header checks");
-          await expectSurfaceVisible(
-            page,
-            page.getByRole("menuitem", { name: "Run checks", exact: true }),
-          );
-          await choose(page, "Deployment details");
-          await expectDetails(page);
-          await expectSurfaceVisible(
-            page,
-            page.getByRole("button", { name: "Close deployment details", exact: true }),
-          );
-          await press(page, "Close deployment details");
-          await showcase.setTitle("Compact checks");
-          await press(page, "Header checks");
-          await expect(
-            page
-              .getByRole("button", { name: "Header checks", exact: true })
-              .getByTestId("plugin-button-chevron"),
+            page.getByRole("toolbar", { name: "Workspace actions", exact: true }),
           ).toHaveCount(0);
-          await expectSurfaceVisible(
-            page,
-            page.getByRole("menuitem", { name: "Run checks", exact: true }),
-          );
-          await choose(page, "Run checks");
+          await expect(
+            page.getByRole("button", { name: "Open menu", exact: true }),
+          ).toBeInViewport();
           await showcase.setTitle("Button showcase");
           await press(page, "Composer status");
           await expectDetails(page);
diff --git a/packages/app/src/agent-stream/strategy-native.tsx b/packages/app/src/agent-stream/strategy-native.tsx
index 47f2766a30..65f535db11 100644
--- a/packages/app/src/agent-stream/strategy-native.tsx
+++ b/packages/app/src/agent-stream/strategy-native.tsx
@@ -42,6 +42,7 @@ import {
   type HistoryStartPaginationInput,
   type HistoryStartPaginationTransition,
 } from "./history-start-pagination";
+import { useStreamTopOverlayInset } from "./top-overlay";
 import {
   createHistoryStartSettleScheduler,
   type HistoryStartSettleScheduler,
@@ -274,12 +275,20 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
     Platform.OS === "android" && bottomAnchorController.mode === "sticky-bottom"
       ? undefined
       : DEFAULT_MAINTAIN_VISIBLE_CONTENT_POSITION;
+  const topOverlayInset = useStreamTopOverlayInset();
+  // The list is inverted, so its content's bottom padding is the visual top.
   const listContentContainerStyle = useMemo(
     () => [
       baseListContentContainerStyle,
-      { paddingBottom: streamKeyboardInset.contentContainerPaddingBottom },
+      {
+        paddingBottom: streamKeyboardInset.contentContainerPaddingBottom + topOverlayInset,
+      },
+    ],
+    [
+      baseListContentContainerStyle,
+      streamKeyboardInset.contentContainerPaddingBottom,
+      topOverlayInset,
     ],
-    [baseListContentContainerStyle, streamKeyboardInset.contentContainerPaddingBottom],
   );
   const listInsetProps = useMemo(
     () =>
diff --git a/packages/app/src/agent-stream/top-overlay.ts b/packages/app/src/agent-stream/top-overlay.ts
new file mode 100644
index 0000000000..24cd7f9592
--- /dev/null
+++ b/packages/app/src/agent-stream/top-overlay.ts
@@ -0,0 +1,14 @@
+import { createContext, useContext } from "react";
+import { isNative } from "@/constants/platform";
+
+/** The native inverted viewport reserves visual-top clearance; web stays in flow. */
+export const supportsStreamTopOverlay = isNative;
+
+const StreamTopOverlayContext = createContext(0);
+
+/** Visual-top clearance supplied by the containing layout, in points. */
+export const StreamTopOverlayProvider = StreamTopOverlayContext.Provider;
+
+export function useStreamTopOverlayInset(): number {
+  return useContext(StreamTopOverlayContext);
+}
diff --git a/packages/app/src/app/_layout.tsx b/packages/app/src/app/_layout.tsx
index 6e9b506b55..aa740a1d52 100644
--- a/packages/app/src/app/_layout.tsx
+++ b/packages/app/src/app/_layout.tsx
@@ -35,7 +35,7 @@ import { ChangelogHost } from "@/changelog";
 import { AppDiagnosticHost } from "@/components/app-diagnostic-host";
 import { AppearanceStyleBoundary } from "@/components/appearance-style-boundary";
 import { LeftSidebar } from "@/components/left-sidebar";
-import { WindowSidebarMenuToggle } from "@/components/headers/menu-header";
+import { WindowSidebarMenuToggle } from "@/components/headers/sidebar-menu-toggle";
 import { DesktopWindowControls } from "@/components/desktop/window-controls";
 import { SidebarModelProvider } from "@/components/sidebar/sidebar-model";
 import { WorkspacePinShortcutHandler } from "@/components/workspace-pin-shortcut-handler";
diff --git a/packages/app/src/components/adaptive-modal-sheet-layout.test.ts b/packages/app/src/components/adaptive-modal-sheet-layout.test.ts
index fbd37c15e7..cc8ad8fc11 100644
--- a/packages/app/src/components/adaptive-modal-sheet-layout.test.ts
+++ b/packages/app/src/components/adaptive-modal-sheet-layout.test.ts
@@ -1,8 +1,5 @@
 import { describe, expect, it } from "vitest";
-import {
-  getBottomSheetVisibleContentHeight,
-  getCompactSheetSafeAreaPadding,
-} from "@/components/adaptive-modal-sheet-layout";
+import { getCompactSheetSafeAreaPadding } from "@/components/adaptive-modal-sheet-layout";
 
 describe("getCompactSheetSafeAreaPadding", () => {
   it("assigns safe clearance to the footer independently of decorative padding", () => {
@@ -49,17 +46,3 @@ describe("getCompactSheetSafeAreaPadding", () => {
     ).toEqual({});
   });
 });
-
-describe("getBottomSheetVisibleContentHeight", () => {
-  it("stops subtracting the retained keyboard height after the keyboard hides", () => {
-    const layout = {
-      containerHeight: 874,
-      contentPosition: 88,
-      handleHeight: 24,
-      keyboardHeight: 344,
-    };
-
-    expect(getBottomSheetVisibleContentHeight({ ...layout, isKeyboardVisible: true })).toBe(418);
-    expect(getBottomSheetVisibleContentHeight({ ...layout, isKeyboardVisible: false })).toBe(762);
-  });
-});
diff --git a/packages/app/src/components/adaptive-modal-sheet-layout.ts b/packages/app/src/components/adaptive-modal-sheet-layout.ts
index 91fc62274e..b38db5750c 100644
--- a/packages/app/src/components/adaptive-modal-sheet-layout.ts
+++ b/packages/app/src/components/adaptive-modal-sheet-layout.ts
@@ -10,28 +10,6 @@ export interface CompactSheetSafeAreaPadding {
   footerPaddingBottom?: number;
 }
 
-interface BottomSheetVisibleContentHeightInput {
-  containerHeight: number;
-  contentPosition: number;
-  handleHeight: number;
-  keyboardHeight: number;
-  isKeyboardVisible: boolean;
-}
-
-export function getBottomSheetVisibleContentHeight({
-  containerHeight,
-  contentPosition,
-  handleHeight,
-  keyboardHeight,
-  isKeyboardVisible,
-}: BottomSheetVisibleContentHeightInput): number {
-  "worklet";
-  return Math.max(
-    0,
-    containerHeight - contentPosition - handleHeight - (isKeyboardVisible ? keyboardHeight : 0),
-  );
-}
-
 export function getCompactSheetSafeAreaPadding({
   isCompact,
   isKeyboardVisible,
diff --git a/packages/app/src/components/adaptive-modal-sheet.tsx b/packages/app/src/components/adaptive-modal-sheet.tsx
index 4ceb43d917..707c0e8622 100644
--- a/packages/app/src/components/adaptive-modal-sheet.tsx
+++ b/packages/app/src/components/adaptive-modal-sheet.tsx
@@ -12,22 +12,16 @@ import {
   useGlobalWebOverlayLayer,
   useWebOverlayRegistration,
 } from "../lib/overlay-root";
-import {
-  KEYBOARD_STATUS,
-  useBottomSheetInternal,
-  type BottomSheetBackgroundProps,
-} from "@gorhom/bottom-sheet";
-import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { type BottomSheetBackgroundProps } from "@gorhom/bottom-sheet";
+import Animated from "react-native-reanimated";
 import { ArrowLeft, Search, X } from "lucide-react-native";
 import {
   IsolatedBottomSheetModal,
+  SheetVisibleFrame,
   type ContextBridge,
   useIsolatedBottomSheetVisibility,
 } from "@/components/ui/isolated-bottom-sheet-modal";
-import {
-  getBottomSheetVisibleContentHeight,
-  getCompactSheetSafeAreaPadding,
-} from "@/components/adaptive-modal-sheet-layout";
+import { getCompactSheetSafeAreaPadding } from "@/components/adaptive-modal-sheet-layout";
 import { ScrollView } from "@/components/ui/scroll-view";
 import { isWeb } from "@/constants/platform";
 import { useKeyboardVisibility } from "@/hooks/use-keyboard-visibility";
@@ -207,10 +201,6 @@ const styles = StyleSheet.create((theme) => ({
     flex: 1,
     minHeight: 0,
   },
-  bottomSheetVisibleContent: {
-    minHeight: 0,
-    overflow: "hidden",
-  },
   bottomSheetVisibleScroll: {
     flex: 1,
     minHeight: 0,
@@ -263,40 +253,6 @@ function SheetContent({ style, children }: { style: StyleProp<ViewStyle>; childr
   return <View style={[styles.sheetContent, style]}>{children}</View>;
 }
 
-function BottomSheetVisibleContent({ children }: { children: ReactNode }) {
-  const { animatedDetentsState, animatedKeyboardState, animatedLayoutState, animatedPosition } =
-    useBottomSheetInternal();
-  const visibleContentStyle = useAnimatedStyle(() => {
-    const { containerHeight, handleHeight } = animatedLayoutState.get();
-    if (containerHeight < 0 || handleHeight < 0) {
-      return { height: 0 };
-    }
-
-    const initialDetentPosition = animatedDetentsState.get().detents?.[0];
-    const contentPosition =
-      initialDetentPosition == null
-        ? animatedPosition.get()
-        : Math.min(animatedPosition.get(), initialDetentPosition);
-
-    const keyboardState = animatedKeyboardState.get();
-    return {
-      height: getBottomSheetVisibleContentHeight({
-        containerHeight,
-        contentPosition,
-        handleHeight,
-        keyboardHeight: keyboardState.heightWithinContainer,
-        isKeyboardVisible: keyboardState.status === KEYBOARD_STATUS.SHOWN,
-      }),
-    };
-  }, [animatedDetentsState, animatedKeyboardState, animatedLayoutState, animatedPosition]);
-
-  return (
-    <Animated.View style={[styles.bottomSheetVisibleContent, visibleContentStyle]}>
-      {children}
-    </Animated.View>
-  );
-}
-
 export function SheetHeaderView({
   header,
   onClose,
@@ -471,8 +427,6 @@ export interface AdaptiveModalSheetProps {
   bodyStyle?: StyleProp<ViewStyle>;
   /** Layout intent for the sheet body, composed over the sheet's own content inset. */
   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. */
   contextBridge?: ContextBridge | null;
 }
@@ -493,7 +447,6 @@ export function AdaptiveModalSheet({
   presentation,
   contentStyle,
   bodyStyle,
-  sizeContentToCurrentSnapPoint = true,
   contextBridge = null,
 }: AdaptiveModalSheetProps) {
   const { theme } = useUnistyles();
@@ -519,11 +472,15 @@ export function AdaptiveModalSheet({
     () => ({ paddingBottom: compactSafeAreaPadding.footerPaddingBottom ?? 0 }),
     [compactSafeAreaPadding.footerPaddingBottom],
   );
-  const footerView = footer ? (
-    <View style={footerClearanceStyle}>
-      <View style={[styles.footer, footerContainerStyle]}>{footer}</View>
-    </View>
-  ) : null;
+  const footerView = useMemo(
+    () =>
+      footer ? (
+        <View style={footerClearanceStyle}>
+          <View style={[styles.footer, footerContainerStyle]}>{footer}</View>
+        </View>
+      ) : null,
+    [footer, footerClearanceStyle, footerContainerStyle],
+  );
   const handleIndicatorStyle = useMemo(
     () => ({ backgroundColor: theme.colors.palette.zinc[600] }),
     [theme.colors.palette.zinc],
@@ -628,7 +585,6 @@ export function AdaptiveModalSheet({
             </View>
           )}
         </View>
-        {footerView}
       </>
     );
 
@@ -650,11 +606,7 @@ export function AdaptiveModalSheet({
         accessible={false}
         presentation={presentation}
       >
-        {sizeContentToCurrentSnapPoint ? (
-          <BottomSheetVisibleContent>{sheetContent}</BottomSheetVisibleContent>
-        ) : (
-          sheetContent
-        )}
+        <SheetVisibleFrame footer={footerView}>{sheetContent}</SheetVisibleFrame>
       </IsolatedBottomSheetModal>
     );
   }
diff --git a/packages/app/src/components/floating-header/index.tsx b/packages/app/src/components/floating-header/index.tsx
new file mode 100644
index 0000000000..b18a8731b0
--- /dev/null
+++ b/packages/app/src/components/floating-header/index.tsx
@@ -0,0 +1,99 @@
+import { useCallback, useId, useState, type ReactNode } from "react";
+import { View, type LayoutChangeEvent } from "react-native";
+import Svg, { Defs, LinearGradient as SvgLinearGradient, Rect, Stop } from "react-native-svg";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import type { Theme } from "@/styles/theme";
+
+/** How far the fade runs past the header's bottom edge, so content dissolves instead of clipping. */
+const FADE_OVERHANG = 24;
+
+interface FloatingHeaderLayoutProps {
+  header: ReactNode;
+  /** Float only when the content supports visual-top clearance. */
+  floating: boolean;
+  children: (topOverlayInset: number) => ReactNode;
+}
+
+/**
+ * Stacks a header above content, or floats it over the content behind a fade. Children keep the
+ * same tree position in both modes, so toggling `floating` never remounts them.
+ */
+export function FloatingHeaderLayout({ header, floating, children }: FloatingHeaderLayoutProps) {
+  const [headerHeight, setHeaderHeight] = useState(0);
+  const handleHeaderLayout = useCallback((event: LayoutChangeEvent) => {
+    setHeaderHeight(Math.round(event.nativeEvent.layout.height));
+  }, []);
+
+  return (
+    <View style={styles.root}>
+      {floating ? null : header}
+      <View style={styles.content}>{children(floating ? headerHeight : 0)}</View>
+      {floating ? (
+        <View style={styles.overlay} pointerEvents="box-none" onLayout={handleHeaderLayout}>
+          <FloatingHeaderFade />
+          {header}
+        </View>
+      ) : null}
+    </View>
+  );
+}
+
+function FloatingHeaderFadeSvg({ gradientId, color }: { gradientId: string; color: string }) {
+  return (
+    <Svg width="100%" height="100%" preserveAspectRatio="none">
+      <Defs>
+        <SvgLinearGradient id={gradientId} x1="0%" y1="0%" x2="0%" y2="100%">
+          {/* Vary opacity rather than interpolating toward `transparent`, which crosses black in
+              some engines and leaves a grey fringe. */}
+          <Stop offset="0%" stopColor={color} stopOpacity={1} />
+          <Stop offset="50%" stopColor={color} stopOpacity={0.97} />
+          <Stop offset="75%" stopColor={color} stopOpacity={0.8} />
+          <Stop offset="100%" stopColor={color} stopOpacity={0} />
+        </SvgLinearGradient>
+      </Defs>
+      <Rect x="0" y="0" width="100%" height="100%" fill={`url(#${gradientId})`} />
+    </Svg>
+  );
+}
+
+const ThemedFloatingHeaderFadeSvg = withUnistyles(FloatingHeaderFadeSvg);
+const workspaceSurfaceColorMapping = (theme: Theme) => ({
+  color: theme.colors.surfaceWorkspace,
+});
+
+function FloatingHeaderFade() {
+  // React-generated ids contain characters that are invalid inside SVG fragment references.
+  const gradientId = `floating-header-fade-${useId().replace(/[^a-zA-Z0-9_-]/g, "")}`;
+  return (
+    <View style={styles.fade} pointerEvents="none">
+      <ThemedFloatingHeaderFadeSvg
+        gradientId={gradientId}
+        uniProps={workspaceSurfaceColorMapping}
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  root: {
+    flex: 1,
+    minHeight: 0,
+  },
+  content: {
+    flex: 1,
+    minHeight: 0,
+  },
+  overlay: {
+    position: "absolute",
+    top: 0,
+    left: 0,
+    right: 0,
+  },
+  fade: {
+    position: "absolute",
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: -FADE_OVERHANG,
+  },
+});
diff --git a/packages/app/src/components/headers/back-header.tsx b/packages/app/src/components/headers/back-header.tsx
index 6532ee561a..a9398da0cf 100644
--- a/packages/app/src/components/headers/back-header.tsx
+++ b/packages/app/src/components/headers/back-header.tsx
@@ -6,10 +6,11 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { ArrowLeft } from "lucide-react-native";
 import { ScreenHeader } from "./screen-header";
 import { ScreenTitle } from "./screen-title";
+import { CompactHeader } from "./compact-header";
+import { useIsCompactFormFactor } from "@/constants/layout";
 
 interface BackHeaderProps {
   title?: string;
-  titleAccessory?: ReactNode;
   rightContent?: ReactNode;
   onBack?: () => void;
 }
@@ -18,7 +19,15 @@ function goBack(): void {
   router.back();
 }
 
-export function BackHeader({ title, titleAccessory, rightContent, onBack }: BackHeaderProps) {
+export function BackHeader({ title, rightContent, onBack }: BackHeaderProps) {
+  const isCompact = useIsCompactFormFactor();
+  if (isCompact) {
+    return <CompactHeader navigation="back" title={title} onBack={onBack} actions={rightContent} />;
+  }
+  return <DesktopBackHeader title={title} rightContent={rightContent} onBack={onBack} />;
+}
+
+function DesktopBackHeader({ title, rightContent, onBack }: BackHeaderProps) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
   const handleBack = useCallback(() => {
@@ -42,7 +51,6 @@ export function BackHeader({ title, titleAccessory, rightContent, onBack }: Back
             <ArrowLeft size={theme.iconSize.lg} color={theme.colors.foregroundMuted} />
           </Pressable>
           {title && <ScreenTitle>{title}</ScreenTitle>}
-          {titleAccessory}
         </>
       }
       right={rightContent}
@@ -56,10 +64,7 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[2],
   },
   backButton: {
-    padding: {
-      xs: theme.spacing[3],
-      md: theme.spacing[2],
-    },
+    padding: theme.spacing[2],
     borderRadius: theme.borderRadius.lg,
   },
 }));
diff --git a/packages/app/src/components/headers/compact-header.tsx b/packages/app/src/components/headers/compact-header.tsx
new file mode 100644
index 0000000000..aa66580fce
--- /dev/null
+++ b/packages/app/src/components/headers/compact-header.tsx
@@ -0,0 +1,168 @@
+import { useCallback, useMemo, type ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+import { Text, View } from "react-native";
+import { router } from "expo-router";
+import { ArrowLeft } from "lucide-react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { HeaderToggleButton } from "@/components/headers/header-toggle-button";
+import { SidebarMenuToggle } from "@/components/headers/sidebar-menu-toggle";
+import {
+  IconButtonChromeProvider,
+  iconButtonChromeGlyphSize,
+  mutedIconColorMapping,
+} from "@/components/ui/icon-button-chrome";
+import { HEADER_INNER_HEIGHT_MOBILE, HEADER_TOP_PADDING_MOBILE } from "@/constants/layout";
+import type { ShortcutKey } from "@/utils/format-shortcut";
+
+const ThemedArrowLeft = withUnistyles(ArrowLeft);
+
+const ISLAND_PADDING = 7;
+const NO_SHORTCUT: ShortcutKey[] = [];
+
+interface CompactHeaderProps {
+  /** The leading island: the sidebar menu, or a back button. */
+  navigation: "menu" | "back";
+  /** Back button action. Defaults to navigating back. */
+  onBack?: () => void;
+  title?: string;
+  titleTestID?: string;
+  /** A line under the title. */
+  subtitle?: ReactNode;
+  /** Show a placeholder instead of the title while it loads. */
+  loading?: boolean;
+  /** Icon actions inherit the island chrome through the shared button primitives. */
+  actions?: ReactNode;
+}
+
+/**
+ * The phone header: the navigation button and the screen's actions sit in islands, with the title
+ * left-aligned between them. It has no background of its own, so it reads the same in flow and floating
+ * over content (see `FloatingHeaderLayout`). Its height matches the old flat header, so anything
+ * offset by the header height still lines up.
+ */
+export function CompactHeader({
+  navigation,
+  onBack,
+  title,
+  titleTestID,
+  subtitle,
+  loading = false,
+  actions,
+}: CompactHeaderProps) {
+  const insets = useSafeAreaInsets();
+  const rootStyle = useMemo(
+    () => [styles.root, { paddingTop: insets.top + HEADER_TOP_PADDING_MOBILE }],
+    [insets.top],
+  );
+
+  return (
+    <IconButtonChromeProvider value="header-island">
+      <View style={rootStyle}>
+        <View style={styles.row}>
+          <View style={styles.island}>
+            {navigation === "menu" ? <SidebarMenuToggle /> : <BackButton onBack={onBack} />}
+          </View>
+          <View style={styles.titleGroup}>
+            <CompactHeaderTitle
+              loading={loading}
+              title={title}
+              titleTestID={titleTestID}
+              subtitle={subtitle}
+            />
+          </View>
+          {actions ? <View style={styles.island}>{actions}</View> : null}
+        </View>
+      </View>
+    </IconButtonChromeProvider>
+  );
+}
+
+function CompactHeaderTitle({
+  loading,
+  title,
+  titleTestID,
+  subtitle,
+}: Pick<CompactHeaderProps, "title" | "titleTestID" | "subtitle"> & { loading: boolean }) {
+  if (loading) {
+    return <View style={styles.titleSkeleton} />;
+  }
+  return (
+    <>
+      {title ? (
+        <Text style={styles.title} numberOfLines={1} testID={titleTestID}>
+          {title}
+        </Text>
+      ) : null}
+      {subtitle}
+    </>
+  );
+}
+
+function BackButton({ onBack }: { onBack?: () => void }) {
+  const { t } = useTranslation();
+  const handlePress = useCallback(() => {
+    if (onBack) {
+      onBack();
+      return;
+    }
+    router.back();
+  }, [onBack]);
+  return (
+    <HeaderToggleButton
+      onPress={handlePress}
+      tooltipLabel={t("common.actions.back")}
+      tooltipKeys={NO_SHORTCUT}
+      tooltipSide="right"
+      testID="header-back-button"
+      accessibilityRole="button"
+      accessibilityLabel={t("common.actions.back")}
+    >
+      <ThemedArrowLeft
+        size={iconButtonChromeGlyphSize("large")}
+        strokeWidth={1.5}
+        uniProps={mutedIconColorMapping}
+      />
+    </HeaderToggleButton>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  root: {
+    paddingHorizontal: theme.spacing[3],
+  },
+  row: {
+    height: HEADER_INNER_HEIGHT_MOBILE,
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  titleGroup: {
+    flex: 1,
+    minWidth: 0,
+    // Both title lines receive the remaining width; text alignment does not size the slot.
+    alignItems: "stretch",
+  },
+  island: {
+    flexDirection: "row",
+    alignItems: "center",
+    padding: ISLAND_PADDING,
+    borderRadius: theme.borderRadius.full,
+    backgroundColor: theme.colors.surface2,
+    ...theme.shadow.sm,
+  },
+  title: {
+    fontSize: theme.fontSize.base,
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foreground,
+    textAlign: "left",
+  },
+  titleSkeleton: {
+    width: 140,
+    maxWidth: "100%",
+    height: 22,
+    borderRadius: theme.borderRadius.full,
+    backgroundColor: theme.colors.surface3,
+    opacity: 0.25,
+  },
+}));
diff --git a/packages/app/src/components/headers/header-toggle-button.tsx b/packages/app/src/components/headers/header-toggle-button.tsx
index b11394c46d..137d5d483d 100644
--- a/packages/app/src/components/headers/header-toggle-button.tsx
+++ b/packages/app/src/components/headers/header-toggle-button.tsx
@@ -1,4 +1,4 @@
-import { useMemo, type ReactElement, type ReactNode } from "react";
+import { type ReactElement, type ReactNode } from "react";
 import { Text, View, type PressableProps, type StyleProp, type ViewStyle } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -7,7 +7,7 @@ import type { ShortcutKey } from "@/utils/format-shortcut";
 import { isWeb } from "@/constants/platform";
 import {
   iconButtonChromeFrameStyle,
-  iconButtonChromeStyle,
+  useIconButtonChromeStyle,
 } from "@/components/ui/icon-button-chrome";
 
 interface HeaderToggleButtonState {
@@ -46,17 +46,11 @@ export function HeaderToggleButton({
       ? ({ "aria-expanded": expandedState } as Record<string, boolean>)
       : null;
 
-  const combinedStyle = useMemo(
-    () =>
-      ({ hovered, pressed }: { hovered?: boolean; pressed: boolean }) =>
-        iconButtonChromeStyle({
-          size: "large",
-          state: { hovered: Boolean(hovered), pressed },
-          disabled: Boolean(disabled),
-          style,
-        }),
-    [disabled, style],
-  );
+  const combinedStyle = useIconButtonChromeStyle({
+    size: "large",
+    disabled: Boolean(disabled),
+    style,
+  });
 
   return (
     <Tooltip delayDuration={tooltipDelayDuration} enabledOnDesktop enabledOnMobile={false}>
diff --git a/packages/app/src/components/headers/menu-header.tsx b/packages/app/src/components/headers/menu-header.tsx
index 37f39ca0ba..fc4f2442ff 100644
--- a/packages/app/src/components/headers/menu-header.tsx
+++ b/packages/app/src/components/headers/menu-header.tsx
@@ -1,16 +1,10 @@
-import { useCallback, useMemo, type ReactNode } from "react";
-import { useTranslation } from "react-i18next";
-import { View, type StyleProp, type ViewStyle } from "react-native";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
-import { PanelLeft } from "lucide-react-native";
+import type { ReactNode } from "react";
+import { StyleSheet } from "react-native-unistyles";
 import { ScreenHeader } from "./screen-header";
 import { ScreenTitle } from "./screen-title";
-import { HeaderToggleButton, headerIconSlotStyle } from "./header-toggle-button";
-import { selectIsAgentListOpen, usePanelStore } from "@/stores/panel-store";
+import { CompactHeader } from "./compact-header";
+import { SidebarMenuToggle } from "./sidebar-menu-toggle";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { getShortcutOs } from "@/utils/shortcut-platform";
-import { useHasWindowChromeObstruction, useOwnsWindowChromeCorner } from "@/utils/desktop-window";
-import { iconButtonChromeGlyphSize } from "@/components/ui/icon-button-chrome";
 
 interface MenuHeaderProps {
   title?: string;
@@ -18,130 +12,11 @@ interface MenuHeaderProps {
   borderless?: boolean;
 }
 
-interface SidebarMenuToggleProps {
-  style?: StyleProp<ViewStyle>;
-  tooltipSide?: "left" | "right" | "top" | "bottom";
-  testID?: string;
-  nativeID?: string;
-}
-
-const MOBILE_MENU_LINE_WIDTH = 16;
-const MOBILE_MENU_LINE_SHORT_WIDTH = 8;
-const MOBILE_MENU_LINE_HEIGHT = 1.5;
-
-function MobileMenuIcon({ color }: { color: string }) {
-  const lineStyle = useMemo(() => [styles.mobileMenuLine, { backgroundColor: color }], [color]);
-  const shortLineStyle = useMemo(
-    () => [styles.mobileMenuLine, styles.mobileMenuLineShort, { backgroundColor: color }],
-    [color],
-  );
-  return (
-    <View style={styles.mobileMenuIcon} pointerEvents="none">
-      <View style={lineStyle} />
-      <View style={lineStyle} />
-      <View style={shortLineStyle} />
-    </View>
-  );
-}
-
-function SidebarMenuToggleButton({
-  isMobile,
-  extraMutedIdleIcon = false,
-  resolvedStyle,
-  tooltipSide = "right",
-  testID = "menu-button",
-  nativeID = "menu-button",
-}: Omit<SidebarMenuToggleProps, "style"> & {
-  isMobile: boolean;
-  extraMutedIdleIcon?: boolean;
-  resolvedStyle: StyleProp<ViewStyle>;
-}) {
-  const { theme } = useUnistyles();
-  const { t } = useTranslation();
-  const isOpen = usePanelStore((state) => selectIsAgentListOpen(state, { isCompact: isMobile }));
-  const toggleAgentListForLayout = usePanelStore((state) => state.toggleAgentListForLayout);
-  const toggleShortcutKeys = useMemo(
-    () => (getShortcutOs() === "mac" ? ["mod", "B"] : ["mod", "."]),
-    [],
-  );
-
-  const handlePress = useCallback(() => {
-    toggleAgentListForLayout({ isCompact: isMobile });
-  }, [toggleAgentListForLayout, isMobile]);
-
-  const accessibilityState = useMemo(() => ({ expanded: isOpen }), [isOpen]);
-
-  return (
-    <HeaderToggleButton
-      onPress={handlePress}
-      tooltipLabel={t("shell.menu.toggleSidebar")}
-      tooltipKeys={toggleShortcutKeys}
-      tooltipSide={tooltipSide}
-      testID={testID}
-      nativeID={nativeID}
-      style={resolvedStyle}
-      accessible
-      accessibilityRole="button"
-      accessibilityLabel={isOpen ? t("shell.menu.close") : t("shell.menu.open")}
-      accessibilityState={accessibilityState}
-    >
-      {isMobile ? (
-        <MobileMenuIcon
-          color={
-            extraMutedIdleIcon ? theme.colors.foregroundExtraMuted : theme.colors.foregroundMuted
-          }
-        />
-      ) : (
-        <PanelLeft
-          size={iconButtonChromeGlyphSize("large")}
-          strokeWidth={1.5}
-          color={
-            extraMutedIdleIcon ? theme.colors.foregroundExtraMuted : theme.colors.foregroundMuted
-          }
-        />
-      )}
-    </HeaderToggleButton>
-  );
-}
-
-export function SidebarMenuToggle({ style, ...props }: SidebarMenuToggleProps = {}) {
-  const isMobile = useIsCompactFormFactor();
-  const ownsTopLeft = useOwnsWindowChromeCorner("top-left");
-  const hasTopLeftWindowControls = useHasWindowChromeObstruction("top-left");
-  const resolvedStyle = useMemo(() => [styles.leadingToggle, style], [style]);
-  const placeholderStyle = useMemo(
-    () => [headerIconSlotStyle.slot, resolvedStyle],
-    [resolvedStyle],
-  );
-
-  if (!isMobile && !ownsTopLeft) {
-    return null;
-  }
-
-  if (!isMobile && hasTopLeftWindowControls) {
-    return (
-      <View pointerEvents="none" style={placeholderStyle}>
-        <View style={styles.desktopMenuIconSpace} />
-      </View>
-    );
-  }
-
-  return <SidebarMenuToggleButton {...props} isMobile={isMobile} resolvedStyle={resolvedStyle} />;
-}
-
-export function WindowSidebarMenuToggle({ style, ...props }: SidebarMenuToggleProps = {}) {
-  const resolvedStyle = useMemo(() => [styles.leadingToggle, style], [style]);
-  return (
-    <SidebarMenuToggleButton
-      {...props}
-      isMobile={false}
-      extraMutedIdleIcon
-      resolvedStyle={resolvedStyle}
-    />
-  );
-}
-
 export function MenuHeader({ title, rightContent, borderless }: MenuHeaderProps) {
+  const isCompact = useIsCompactFormFactor();
+  if (isCompact) {
+    return <CompactHeader navigation="menu" title={title} actions={rightContent} />;
+  }
   return (
     <ScreenHeader
       left={
@@ -158,31 +33,7 @@ export function MenuHeader({ title, rightContent, borderless }: MenuHeaderProps)
 }
 
 const styles = StyleSheet.create((theme) => ({
-  leadingToggle: {
-    marginLeft: {
-      xs: 0,
-      md: -theme.spacing[2],
-    },
-  },
   left: {
     gap: theme.spacing[2],
   },
-  mobileMenuIcon: {
-    width: MOBILE_MENU_LINE_WIDTH,
-    height: 12,
-    justifyContent: "space-between",
-    alignItems: "flex-start",
-  },
-  desktopMenuIconSpace: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
-  },
-  mobileMenuLine: {
-    width: MOBILE_MENU_LINE_WIDTH,
-    height: MOBILE_MENU_LINE_HEIGHT,
-    borderRadius: theme.borderRadius.full,
-  },
-  mobileMenuLineShort: {
-    width: MOBILE_MENU_LINE_SHORT_WIDTH,
-  },
 }));
diff --git a/packages/app/src/components/headers/sidebar-menu-toggle.tsx b/packages/app/src/components/headers/sidebar-menu-toggle.tsx
new file mode 100644
index 0000000000..445b7baa96
--- /dev/null
+++ b/packages/app/src/components/headers/sidebar-menu-toggle.tsx
@@ -0,0 +1,167 @@
+import { useCallback, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { View, type StyleProp, type ViewStyle } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { PanelLeft } from "lucide-react-native";
+import { HeaderToggleButton, headerIconSlotStyle } from "./header-toggle-button";
+import { selectIsAgentListOpen, usePanelStore } from "@/stores/panel-store";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { getShortcutOs } from "@/utils/shortcut-platform";
+import { useHasWindowChromeObstruction, useOwnsWindowChromeCorner } from "@/utils/desktop-window";
+import {
+  extraMutedIconColorMapping,
+  iconButtonChromeGlyphSize,
+  mutedIconColorMapping,
+} from "@/components/ui/icon-button-chrome";
+
+const ThemedPanelLeft = withUnistyles(PanelLeft);
+
+interface SidebarMenuToggleProps {
+  style?: StyleProp<ViewStyle>;
+  tooltipSide?: "left" | "right" | "top" | "bottom";
+  testID?: string;
+  nativeID?: string;
+}
+
+const MOBILE_MENU_LINE_WIDTH = 16;
+const MOBILE_MENU_LINE_SHORT_WIDTH = 8;
+const MOBILE_MENU_LINE_HEIGHT = 1.5;
+
+function MobileMenuIcon({ extraMuted }: { extraMuted: boolean }) {
+  const color = extraMuted ? styles.mobileMenuLineExtraMuted : styles.mobileMenuLineMuted;
+  const lineStyle = useMemo(() => [styles.mobileMenuLine, color], [color]);
+  const shortLineStyle = useMemo(
+    () => [styles.mobileMenuLine, styles.mobileMenuLineShort, color],
+    [color],
+  );
+  return (
+    <View style={styles.mobileMenuIcon} pointerEvents="none">
+      <View style={lineStyle} />
+      <View style={lineStyle} />
+      <View style={shortLineStyle} />
+    </View>
+  );
+}
+
+function SidebarMenuToggleButton({
+  isMobile,
+  extraMutedIdleIcon = false,
+  resolvedStyle,
+  tooltipSide = "right",
+  testID = "menu-button",
+  nativeID = "menu-button",
+}: Omit<SidebarMenuToggleProps, "style"> & {
+  isMobile: boolean;
+  extraMutedIdleIcon?: boolean;
+  resolvedStyle: StyleProp<ViewStyle>;
+}) {
+  const { t } = useTranslation();
+  const isOpen = usePanelStore((state) => selectIsAgentListOpen(state, { isCompact: isMobile }));
+  const toggleAgentListForLayout = usePanelStore((state) => state.toggleAgentListForLayout);
+  const toggleShortcutKeys = useMemo(
+    () => (getShortcutOs() === "mac" ? ["mod", "B"] : ["mod", "."]),
+    [],
+  );
+
+  const handlePress = useCallback(() => {
+    toggleAgentListForLayout({ isCompact: isMobile });
+  }, [toggleAgentListForLayout, isMobile]);
+
+  const accessibilityState = useMemo(() => ({ expanded: isOpen }), [isOpen]);
+
+  return (
+    <HeaderToggleButton
+      onPress={handlePress}
+      tooltipLabel={t("shell.menu.toggleSidebar")}
+      tooltipKeys={toggleShortcutKeys}
+      tooltipSide={tooltipSide}
+      testID={testID}
+      nativeID={nativeID}
+      style={resolvedStyle}
+      accessible
+      accessibilityRole="button"
+      accessibilityLabel={isOpen ? t("shell.menu.close") : t("shell.menu.open")}
+      accessibilityState={accessibilityState}
+    >
+      {isMobile ? (
+        <MobileMenuIcon extraMuted={extraMutedIdleIcon} />
+      ) : (
+        <ThemedPanelLeft
+          size={iconButtonChromeGlyphSize("large")}
+          strokeWidth={1.5}
+          uniProps={extraMutedIdleIcon ? extraMutedIconColorMapping : mutedIconColorMapping}
+        />
+      )}
+    </HeaderToggleButton>
+  );
+}
+
+export function SidebarMenuToggle({ style, ...props }: SidebarMenuToggleProps = {}) {
+  const isMobile = useIsCompactFormFactor();
+  const ownsTopLeft = useOwnsWindowChromeCorner("top-left");
+  const hasTopLeftWindowControls = useHasWindowChromeObstruction("top-left");
+  const resolvedStyle = useMemo(() => [styles.leadingToggle, style], [style]);
+  const placeholderStyle = useMemo(
+    () => [headerIconSlotStyle.slot, resolvedStyle],
+    [resolvedStyle],
+  );
+
+  if (!isMobile && !ownsTopLeft) {
+    return null;
+  }
+
+  if (!isMobile && hasTopLeftWindowControls) {
+    return (
+      <View pointerEvents="none" style={placeholderStyle}>
+        <View style={styles.desktopMenuIconSpace} />
+      </View>
+    );
+  }
+
+  return <SidebarMenuToggleButton {...props} isMobile={isMobile} resolvedStyle={resolvedStyle} />;
+}
+
+export function WindowSidebarMenuToggle({ style, ...props }: SidebarMenuToggleProps = {}) {
+  const resolvedStyle = useMemo(() => [styles.leadingToggle, style], [style]);
+  return (
+    <SidebarMenuToggleButton
+      {...props}
+      isMobile={false}
+      extraMutedIdleIcon
+      resolvedStyle={resolvedStyle}
+    />
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  leadingToggle: {
+    marginLeft: {
+      xs: 0,
+      md: -theme.spacing[2],
+    },
+  },
+  mobileMenuIcon: {
+    width: MOBILE_MENU_LINE_WIDTH,
+    height: 12,
+    justifyContent: "space-between",
+    alignItems: "flex-start",
+  },
+  desktopMenuIconSpace: {
+    width: theme.iconSize.md,
+    height: theme.iconSize.md,
+  },
+  mobileMenuLine: {
+    width: MOBILE_MENU_LINE_WIDTH,
+    height: MOBILE_MENU_LINE_HEIGHT,
+    borderRadius: theme.borderRadius.full,
+  },
+  mobileMenuLineMuted: {
+    backgroundColor: theme.colors.foregroundMuted,
+  },
+  mobileMenuLineExtraMuted: {
+    backgroundColor: theme.colors.foregroundExtraMuted,
+  },
+  mobileMenuLineShort: {
+    width: MOBILE_MENU_LINE_SHORT_WIDTH,
+  },
+}));
diff --git a/packages/app/src/components/left-sidebar.tsx b/packages/app/src/components/left-sidebar.tsx
index ddfc9e219f..087a3ffca8 100644
--- a/packages/app/src/components/left-sidebar.tsx
+++ b/packages/app/src/components/left-sidebar.tsx
@@ -1,5 +1,13 @@
 import { router } from "expo-router";
-import { CircleGauge, FolderPlus, GitBranch, Server, Settings, X } from "lucide-react-native";
+import {
+  CircleGauge,
+  FolderPlus,
+  GitBranch,
+  Server,
+  Settings,
+  X,
+  type LucideIcon,
+} from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import { memo, useCallback, useEffect, useMemo, useRef, useState, type RefObject } from "react";
 import {
@@ -26,7 +34,7 @@ import { SidebarSeparator } from "@/components/sidebar/sidebar-separator";
 import { SidebarNavRows } from "@/components/sidebar/sidebar-nav-rows";
 import { SidebarHelpMenu } from "@/components/sidebar/sidebar-help-menu";
 import { SidebarResizeHandle } from "@/components/sidebar-resize-handle";
-import { buttonControlHeight } from "@/components/ui/control-geometry";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { Shortcut } from "@/components/ui/shortcut";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { HEADER_INNER_HEIGHT, useIsCompactFormFactor } from "@/constants/layout";
@@ -37,6 +45,7 @@ import {
   type SidebarProjectEntry,
   type SidebarWorkspaceEntry,
 } from "@/hooks/use-sidebar-workspaces-list";
+import { density } from "@/styles/density";
 import { useSidebarModel } from "@/components/sidebar/sidebar-model";
 import type { PinnedSidebarGroups } from "@/hooks/use-sidebar-pins";
 import { RetainedPanelActivity } from "@/components/retained-panel";
@@ -280,30 +289,25 @@ function FooterIconButton({
   onPress,
   testID,
   label,
-  icon: Icon,
+  icon,
   iconSizeAdjustment = 0,
   shortcutKeys,
-  theme,
 }: {
   onPress: () => void;
   testID: string;
   label: string;
-  icon: typeof FolderPlus;
+  icon: LucideIcon;
   /** Only for a glyph that reads larger than the others at the same size. */
   iconSizeAdjustment?: number;
   shortcutKeys?: ReturnType<typeof useShortcutKeys>;
-  theme: SidebarTheme;
   buttonRef?: RefObject<View | null>;
 }) {
-  const isCompact = useIsCompactFormFactor();
-  const iconSize = isCompact ? theme.iconSize.lg : theme.iconSize.md;
-
   return (
     <Tooltip delayDuration={300}>
       <TooltipTrigger asChild>
         <Pressable
           ref={buttonRef}
-          style={styles.footerIconButton(isCompact)}
+          style={styles.footerIconButton}
           testID={testID}
           nativeID={testID}
           collapsable={false}
@@ -313,9 +317,11 @@ function FooterIconButton({
           onPress={onPress}
         >
           {({ hovered }) => (
-            <Icon
-              size={iconSize + iconSizeAdjustment}
-              color={hovered ? theme.colors.foreground : theme.colors.foregroundMuted}
+            <DensityIcon
+              icon={icon}
+              size="md"
+              sizeAdjustment={iconSizeAdjustment}
+              color={hovered ? "foreground" : "foregroundMuted"}
             />
           )}
         </Pressable>
@@ -328,12 +334,10 @@ function FooterIconButton({
 }
 
 function SidebarHostPicker({
-  theme,
   label,
   onAddHost,
   onOpenHostSettings,
 }: {
-  theme: SidebarTheme;
   label: string;
   onAddHost: () => void;
   onOpenHostSettings: (serverId: string) => void;
@@ -377,7 +381,6 @@ function SidebarHostPicker({
         icon={Server}
         // Server's two boxes fill more of the square than the other glyphs.
         iconSizeAdjustment={-1}
-        theme={theme}
       />
     </HostPicker>
   );
@@ -399,7 +402,6 @@ function IconTooltipContent({
 }
 
 function SidebarFooter({
-  theme,
   handleOpenProject,
   handleSettings,
   labels,
@@ -407,7 +409,6 @@ function SidebarFooter({
   handleOpenHostSettings,
   onBeforeNavigate,
 }: {
-  theme: SidebarTheme;
   handleOpenProject: () => void;
   handleSettings: () => void;
   labels: {
@@ -436,11 +437,9 @@ function SidebarFooter({
             label={labels.addProject}
             icon={FolderPlus}
             shortcutKeys={newAgentKeys}
-            theme={theme}
           />
-          <SidebarUsageIcon label={labels.usage} theme={theme} />
+          <SidebarUsageIcon label={labels.usage} />
           <SidebarHostPicker
-            theme={theme}
             label={labels.hosts}
             onAddHost={handleAddHost}
             onOpenHostSettings={handleOpenHostSettings}
@@ -453,7 +452,6 @@ function SidebarFooter({
             label={labels.settings}
             icon={Settings}
             shortcutKeys={settingsKeys}
-            theme={theme}
           />
         </View>
       </View>
@@ -461,7 +459,7 @@ function SidebarFooter({
   );
 }
 
-function SidebarUsageIcon({ label, theme }: { label: string; theme: SidebarTheme }) {
+function SidebarUsageIcon({ label }: { label: string }) {
   const openUsage = useOpenSidebarUsage();
   return (
     <FooterIconButton
@@ -469,7 +467,6 @@ function SidebarUsageIcon({ label, theme }: { label: string; theme: SidebarTheme
       testID="sidebar-usage-icon"
       label={label}
       icon={CircleGauge}
-      theme={theme}
     />
   );
 }
@@ -612,7 +609,6 @@ function MobileSidebar({
         )}
 
         <SidebarFooter
-          theme={theme}
           handleOpenProject={handleOpenProject}
           handleSettings={handleSettings}
           labels={labels}
@@ -789,7 +785,6 @@ function DesktopSidebar({
         <SidebarCalloutSlot />
 
         <SidebarFooter
-          theme={theme}
           handleOpenProject={handleOpenProject}
           handleSettings={handleSettings}
           labels={labels}
@@ -957,14 +952,14 @@ const styles = StyleSheet.create((theme) => ({
     paddingVertical: theme.spacing[1.5],
     gap: 2,
   },
-  footerIconButton: (isCompact: boolean) => ({
-    width: isCompact ? buttonControlHeight.md : buttonControlHeight.xs,
-    height: isCompact ? buttonControlHeight.md : buttonControlHeight.xs,
+  footerIconButton: {
+    width: density.iconButton,
+    height: density.iconButton,
     alignItems: "center",
     justifyContent: "center",
     paddingVertical: theme.spacing[1],
     paddingHorizontal: theme.spacing[1],
-  }),
+  },
   tooltipRow: {
     flexDirection: "row",
     alignItems: "center",
diff --git a/packages/app/src/components/project-edit-sheet.tsx b/packages/app/src/components/project-edit-sheet.tsx
index 179d1140b8..d80fa2bad0 100644
--- a/packages/app/src/components/project-edit-sheet.tsx
+++ b/packages/app/src/components/project-edit-sheet.tsx
@@ -126,9 +126,6 @@ export function ProjectEditSheet({
       onClose={handleClose}
       footer={footer}
       desktopMaxWidth={440}
-      // Bound the compact scroller to the live snap height so the footer stays
-      // on screen instead of being pushed past the bottom of the sheet.
-      sizeContentToCurrentSnapPoint
       testID="project-edit-sheet"
     >
       <Field
diff --git a/packages/app/src/components/sidebar-workspace-list.tsx b/packages/app/src/components/sidebar-workspace-list.tsx
index 44c6adc5d6..bbda666436 100644
--- a/packages/app/src/components/sidebar-workspace-list.tsx
+++ b/packages/app/src/components/sidebar-workspace-list.tsx
@@ -30,6 +30,7 @@ import {
   type ActiveWorkspaceSelection,
 } from "@/stores/navigation-active-workspace-store";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { density, densityFontSize, densityIconBox } from "@/styles/density";
 import type { Theme } from "@/styles/theme";
 import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
 import { getSidebarRowBackdrop } from "@/components/sidebar/sidebar-row-backdrop";
@@ -114,6 +115,7 @@ import {
   SidebarWorkspaceTrailingContent,
   useSidebarWorkspaceTrailing,
 } from "@/components/sidebar/workspace-trailing";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { PressHighlight } from "@/components/ui/press-highlight";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { Shortcut } from "@/components/ui/shortcut";
@@ -822,9 +824,10 @@ function NewWorkspaceGhostRow({
       {({ hovered, pressed }) => (
         <>
           <View style={styles.newWorkspaceGhostIconSlot}>
-            <ThemedPlus
-              size={14}
-              uniProps={hovered || pressed ? foregroundColorMapping : foregroundMutedColorMapping}
+            <DensityIcon
+              icon={Plus}
+              size="sm"
+              color={hovered || pressed ? "foreground" : "foregroundMuted"}
             />
           </View>
           <Text
@@ -2519,7 +2522,7 @@ const styles = StyleSheet.create((theme) => ({
   // the step in reads as belonging to that project. Padding rather than margin, so the hover and
   // pressed fills stay the same box as every other row in the sidebar.
   newWorkspaceGhostRow: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     marginBottom: theme.spacing[0.5],
     paddingVertical: theme.spacing[2],
     paddingLeft: theme.spacing[4],
@@ -2539,27 +2542,27 @@ const styles = StyleSheet.create((theme) => ({
   // The width of a workspace row's status slot, so the label lands on the same rail as the
   // titles above it.
   newWorkspaceGhostIconSlot: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
+    width: densityIconBox("md"),
+    height: densityIconBox("md"),
     alignItems: "center",
     justifyContent: "center",
     flexShrink: 0,
   },
   newWorkspaceGhostText: {
     color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     minWidth: 0,
     flexShrink: 1,
   },
   newWorkspaceGhostTextHovered: {
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     minWidth: 0,
     flexShrink: 1,
     color: theme.colors.foreground,
   },
   projectRow: {
     position: "relative",
-    minHeight: 36,
+    minHeight: density.rowHeight,
     paddingVertical: theme.spacing[2],
     paddingHorizontal: theme.spacing[2],
     borderRadius: theme.borderRadius.lg,
@@ -2600,7 +2603,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   projectTitle: {
     color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     fontWeight: "400",
     minWidth: 0,
     flexShrink: 1,
@@ -2681,7 +2684,7 @@ const styles = StyleSheet.create((theme) => ({
     right: theme.spacing[2],
   },
   workspaceRow: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     marginBottom: theme.spacing[0.5],
     paddingVertical: theme.spacing[2],
     paddingLeft: theme.spacing[2],
diff --git a/packages/app/src/components/sidebar/pinned-section-header.tsx b/packages/app/src/components/sidebar/pinned-section-header.tsx
index 9dc2c9fdba..2169492a08 100644
--- a/packages/app/src/components/sidebar/pinned-section-header.tsx
+++ b/packages/app/src/components/sidebar/pinned-section-header.tsx
@@ -2,16 +2,11 @@ import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { ChevronDown, ChevronRight } from "lucide-react-native";
 import { Pressable, Text } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { StyleSheet } from "react-native-unistyles";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { isNative } from "@/constants/platform";
-import type { Theme } from "@/styles/theme";
-
-const ThemedChevronDown = withUnistyles(ChevronDown);
-const ThemedChevronRight = withUnistyles(ChevronRight);
-const foregroundMutedColorMapping = (theme: Theme) => ({
-  color: theme.colors.foregroundMuted,
-});
+import { density, densityFontSize } from "@/styles/density";
 
 export function PinnedSectionHeader({
   collapsed,
@@ -23,7 +18,6 @@ export function PinnedSectionHeader({
   const { t } = useTranslation();
   const isCompact = useIsCompactFormFactor();
   const accessibilityState = useMemo(() => ({ expanded: !collapsed }), [collapsed]);
-  const Chevron = collapsed ? ThemedChevronRight : ThemedChevronDown;
 
   return (
     <Pressable
@@ -37,7 +31,11 @@ export function PinnedSectionHeader({
         <>
           <Text style={styles.title}>{t("sidebar.pinned.title")}</Text>
           {hovered || isNative || isCompact ? (
-            <Chevron size={12} uniProps={foregroundMutedColorMapping} />
+            <DensityIcon
+              icon={collapsed ? ChevronRight : ChevronDown}
+              size="xs"
+              color="foregroundMuted"
+            />
           ) : null}
         </>
       )}
@@ -47,7 +45,7 @@ export function PinnedSectionHeader({
 
 const styles = StyleSheet.create((theme) => ({
   header: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     flexDirection: "row",
     alignItems: "center",
     alignSelf: "flex-start",
@@ -58,7 +56,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   title: {
     color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
+    fontSize: densityFontSize(theme, "sm"),
     fontWeight: theme.fontWeight.normal,
   },
 }));
diff --git a/packages/app/src/components/sidebar/project-leading-visual.tsx b/packages/app/src/components/sidebar/project-leading-visual.tsx
index e8c1e3a5d6..3f31181220 100644
--- a/packages/app/src/components/sidebar/project-leading-visual.tsx
+++ b/packages/app/src/components/sidebar/project-leading-visual.tsx
@@ -4,7 +4,8 @@ import { useTranslation } from "react-i18next";
 import { ChevronDown, ChevronRight, CircleAlert } from "lucide-react-native";
 import { ProjectIconView } from "@/components/project-icon-view";
 import { getStatusBucketLabel } from "@/hooks/sidebar-status-view-model";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
+import { density, densityIconBox, densityIconProps } from "@/styles/density";
+import type { Theme } from "@/styles/theme";
 import type { SidebarStateBucket } from "@/utils/sidebar-agent-state";
 import {
   getProjectStatusBadgeContent,
@@ -35,9 +36,8 @@ const STATUS_BADGE_OFFSET = -4;
 //
 // The filled alert occupies the full badge shell so needs-input remains more prominent than
 // the passive status dots.
-// Matches the workspace title's lineHeight (sidebar-workspace-row-content's
-// workspaceBranchText) so the icon centers on the title rather than floating above it.
-const LEADING_SLOT_HEIGHT = 20;
+const DensityProjectIconView = withUnistyles(ProjectIconView);
+const projectIconProps = densityIconProps("md", () => ({}));
 
 const ThemedActivityIndicator = withUnistyles(ActivityIndicator);
 const ThemedCircleAlert = withUnistyles(CircleAlert);
@@ -230,12 +230,12 @@ function ProjectIcon({
   projectViewKey: string;
 }) {
   return (
-    <ProjectIconView
+    <DensityProjectIconView
       iconDataUri={iconDataUri}
       initial={placeholderInitial}
       projectViewKey={projectViewKey}
-      size={ICON_SIZE.md}
       textStyle={styles.projectIconFallbackText}
+      uniProps={projectIconProps}
     />
   );
 }
@@ -271,12 +271,12 @@ const styles = StyleSheet.create((theme) => {
 
   return {
     // The slot is as tall as the title's line box, not as tall as the icon, and centers the
-    // icon inside it. Rows lay their leading visual out with alignItems:flex-start, so a
-    // 16pt slot next to a 20pt line box puts the icon 2pt above the title and the kebab —
-    // which is why the workspace status indicator is also 20 tall. Keep the two in step.
+    // icon inside it. Rows lay their leading visual out with alignItems:flex-start, so a slot
+    // only as tall as the icon puts it above the title and the kebab — which is why the
+    // workspace status indicator shares the same `rowLineHeight`.
     projectLeadingVisualSlot: {
-      width: theme.iconSize.md,
-      height: LEADING_SLOT_HEIGHT,
+      width: densityIconBox("md"),
+      height: density.rowLineHeight,
       flexShrink: 0,
       alignItems: "center",
       justifyContent: "center",
@@ -284,8 +284,8 @@ const styles = StyleSheet.create((theme) => {
     // Anchors the corner badge to the icon rather than to the taller slot.
     projectIconBox: {
       position: "relative",
-      width: theme.iconSize.md,
-      height: theme.iconSize.md,
+      width: densityIconBox("md"),
+      height: densityIconBox("md"),
     },
     projectIconFallbackText: {
       fontSize: 9,
diff --git a/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx b/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx
index f67bd738ba..3d437ae0ca 100644
--- a/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx
+++ b/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx
@@ -2,19 +2,11 @@ import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
 import { ChevronDown, ChevronUp } from "lucide-react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { StyleSheet } from "react-native-unistyles";
 import { isWeb } from "@/constants/platform";
 import { sidebarWorkspaceRowStyles } from "@/components/sidebar/sidebar-workspace-row-content";
-import type { Theme } from "@/styles/theme";
-
-const foregroundMutedColorMapping = (theme: Theme) => ({
-  color: theme.colors.foregroundMuted,
-});
-const foregroundColorMapping = (theme: Theme) => ({
-  color: theme.colors.foreground,
-});
-const ThemedChevronDown = withUnistyles(ChevronDown);
-const ThemedChevronUp = withUnistyles(ChevronUp);
+import { DensityIcon } from "@/components/ui/density-icon";
+import { density, densityFontSize, densityIconBox } from "@/styles/density";
 
 /**
  * The row that ends a truncated group. It is a workspace row that happens to say "Show more", so
@@ -62,17 +54,11 @@ export function SidebarGroupToggleRow({
       {({ hovered, pressed }) => (
         <>
           <View style={styles.iconSlot}>
-            {expanded ? (
-              <ThemedChevronUp
-                size={14}
-                uniProps={hovered || pressed ? foregroundColorMapping : foregroundMutedColorMapping}
-              />
-            ) : (
-              <ThemedChevronDown
-                size={14}
-                uniProps={hovered || pressed ? foregroundColorMapping : foregroundMutedColorMapping}
-              />
-            )}
+            <DensityIcon
+              icon={expanded ? ChevronUp : ChevronDown}
+              size="sm"
+              color={hovered || pressed ? "foreground" : "foregroundMuted"}
+            />
           </View>
           <Text style={hovered || pressed ? styles.textHovered : styles.text} numberOfLines={1}>
             {label}
@@ -86,7 +72,7 @@ export function SidebarGroupToggleRow({
 const styles = StyleSheet.create((theme) => ({
   // Kept in step with `workspaceRow` in sidebar-workspace-list.tsx and sidebar-status-list.tsx.
   row: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     marginBottom: theme.spacing[0.5],
     paddingVertical: theme.spacing[2],
     paddingLeft: theme.spacing[2],
@@ -106,21 +92,21 @@ const styles = StyleSheet.create((theme) => ({
   // The width of a workspace row's status slot, so the label lands on the same rail as the
   // titles above it rather than two points to their left.
   iconSlot: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
+    width: densityIconBox("md"),
+    height: densityIconBox("md"),
     alignItems: "center",
     justifyContent: "center",
     flexShrink: 0,
   },
   text: {
     color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     minWidth: 0,
     flexShrink: 1,
   },
   textHovered: {
     color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     minWidth: 0,
     flexShrink: 1,
   },
diff --git a/packages/app/src/components/sidebar/sidebar-header-row.tsx b/packages/app/src/components/sidebar/sidebar-header-row.tsx
index 4519f6d4ff..7001bf66a6 100644
--- a/packages/app/src/components/sidebar/sidebar-header-row.tsx
+++ b/packages/app/src/components/sidebar/sidebar-header-row.tsx
@@ -1,22 +1,12 @@
-import {
-  useCallback,
-  useMemo,
-  useState,
-  type ComponentType,
-  type ReactNode,
-  type Ref,
-} from "react";
+import { useCallback, useState, type ComponentType, type ReactNode, type Ref } from "react";
 import { Pressable, Text, View } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { StyleSheet } from "react-native-unistyles";
 import { HEADER_INNER_HEIGHT, HEADER_INNER_HEIGHT_MOBILE } from "@/constants/layout";
-import { ICON_SIZE } from "@/styles/theme";
-import type { Theme } from "@/styles/theme";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { Shortcut } from "@/components/ui/shortcut";
+import { density, densityFontSize, densityIconBox } from "@/styles/density";
 import type { ShortcutKey } from "@/utils/format-shortcut";
 
-const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
-const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-
 type SidebarHeaderRowVariant = "header" | "compact" | "inline";
 
 export type SidebarRowIcon = ComponentType<{ size: number; color: string }>;
@@ -49,7 +39,7 @@ interface SidebarHeaderRowProps {
 }
 
 export function SidebarHeaderRow({
-  icon: Icon,
+  icon,
   label,
   onPress,
   isActive = false,
@@ -64,9 +54,8 @@ export function SidebarHeaderRow({
   const [isHovered, setIsHovered] = useState(false);
   const handlePointerEnter = useCallback(() => setIsHovered(true), []);
   const handlePointerLeave = useCallback(() => setIsHovered(false), []);
-  const ThemedIcon = useMemo(() => (Icon ? withUnistyles(Icon) : null), [Icon]);
   const isHighlighted = isHovered || isActive;
-  const iconSize = variant === "header" ? ICON_SIZE.md : ICON_SIZE.sm;
+  const iconSize = variant === "header" ? "md" : "sm";
 
   let right = trailing ?? null;
   if (right === null && shortcutKeys && isHovered) {
@@ -91,10 +80,11 @@ export function SidebarHeaderRow({
           aria-selected={isActive}
           style={styles.button}
         >
-          {ThemedIcon ? (
-            <ThemedIcon
+          {icon ? (
+            <DensityIcon
+              icon={icon}
               size={iconSize}
-              uniProps={isHighlighted ? foregroundColorMapping : foregroundMutedColorMapping}
+              color={isHighlighted ? "foreground" : "foregroundMuted"}
             />
           ) : (
             <View style={variant === "header" ? styles.iconSpacer : styles.iconSpacerCompact} />
@@ -140,7 +130,7 @@ const styles = StyleSheet.create((theme) => ({
     alignItems: "center",
     // Same row geometry as the settings sidebar items. Shorter than the header
     // strip so the hover highlight clears the strip's bottom separator.
-    minHeight: 28,
+    minHeight: density.tightRowHeight,
     borderRadius: theme.borderRadius.lg,
   },
   rowHighlighted: {
@@ -152,17 +142,17 @@ const styles = StyleSheet.create((theme) => ({
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[2],
-    minHeight: 28,
+    minHeight: density.tightRowHeight,
     paddingVertical: theme.spacing[1],
     // Match the project rows' inner padding so the icons align on one vertical
     // edge with the list below.
     paddingHorizontal: theme.spacing[2],
   },
-  iconSpacer: { width: ICON_SIZE.md, height: ICON_SIZE.md },
-  iconSpacerCompact: { width: ICON_SIZE.sm, height: ICON_SIZE.sm },
+  iconSpacer: { width: densityIconBox("md"), height: densityIconBox("md") },
+  iconSpacerCompact: { width: densityIconBox("sm"), height: densityIconBox("sm") },
   label: {
     flexShrink: 1,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     fontWeight: theme.fontWeight.normal,
     color: theme.colors.foregroundMuted,
   },
diff --git a/packages/app/src/components/sidebar/sidebar-help-menu.tsx b/packages/app/src/components/sidebar/sidebar-help-menu.tsx
index 5f603392f2..97ff3d2772 100644
--- a/packages/app/src/components/sidebar/sidebar-help-menu.tsx
+++ b/packages/app/src/components/sidebar/sidebar-help-menu.tsx
@@ -14,14 +14,14 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { buttonControlHeight } from "@/components/ui/control-geometry";
-import { useIsCompactFormFactor } from "@/constants/layout";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useAppDiagnosticStore } from "@/diagnostics/store";
 import { useKeyboardShortcutsAvailable } from "@/keyboard/availability";
 import { useHostRuntimeIsConnected, useHosts } from "@/runtime/host-runtime";
 import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
 import { useSessionStore } from "@/stores/session-store";
+import { density } from "@/styles/density";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 import type { HostProfile } from "@/types/host-connection";
 import { formatVersionWithPrefix } from "@/desktop/updates/desktop-updates";
@@ -32,12 +32,10 @@ import { openExternalUrl } from "@/utils/open-external-url";
 const DISCORD_URL = "https://discord.gg/jz8T2uahpH";
 const GITHUB_ISSUE_URL = "https://github.com/getpaseo/paseo/issues/new";
 const ThemedActivity = withUnistyles(Activity);
-const ThemedCircleHelp = withUnistyles(CircleHelp);
 const ThemedGift = withUnistyles(Gift);
 const ThemedKeyboard = withUnistyles(Keyboard);
 const ThemedDiscordIcon = withUnistyles(DiscordIcon);
 const ThemedGitHubIcon = withUnistyles(GitHubIcon);
-const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
 const foregroundMutedColorMapping = (theme: Theme) => ({
   color: theme.colors.foregroundMuted,
 });
@@ -79,7 +77,6 @@ function HostVersionHint({ host }: { host: HostProfile }) {
 }
 
 export function SidebarHelpMenu() {
-  const isCompact = useIsCompactFormFactor();
   const { t } = useTranslation();
   const shortcutsAvailable = useKeyboardShortcutsAvailable();
   const openAppDiagnostic = useAppDiagnosticStore((state) => state.open);
@@ -106,15 +103,16 @@ export function SidebarHelpMenu() {
         <TooltipTrigger asChild>
           <View>
             <DropdownMenuTrigger
-              style={styles.trigger(isCompact)}
+              style={styles.trigger}
               testID="sidebar-help"
               accessibilityRole="button"
               accessibilityLabel={t("sidebar.help.trigger")}
             >
               {({ hovered }) => (
-                <ThemedCircleHelp
-                  size={isCompact ? ICON_SIZE.lg : ICON_SIZE.md}
-                  uniProps={hovered ? foregroundColorMapping : foregroundMutedColorMapping}
+                <DensityIcon
+                  icon={CircleHelp}
+                  size="md"
+                  color={hovered ? "foreground" : "foregroundMuted"}
                 />
               )}
             </DropdownMenuTrigger>
@@ -184,14 +182,14 @@ export function SidebarHelpMenu() {
 }
 
 const styles = StyleSheet.create((theme) => ({
-  trigger: (isCompact: boolean) => ({
-    width: isCompact ? buttonControlHeight.md : buttonControlHeight.xs,
-    height: isCompact ? buttonControlHeight.md : buttonControlHeight.xs,
+  trigger: {
+    width: density.iconButton,
+    height: density.iconButton,
     alignItems: "center",
     justifyContent: "center",
     paddingVertical: theme.spacing[1],
     paddingHorizontal: theme.spacing[1],
-  }),
+  },
   tooltipText: {
     fontSize: theme.fontSize.base,
     color: theme.colors.popoverForeground,
diff --git a/packages/app/src/components/sidebar/sidebar-status-list.tsx b/packages/app/src/components/sidebar/sidebar-status-list.tsx
index c299d07987..85c0d524f8 100644
--- a/packages/app/src/components/sidebar/sidebar-status-list.tsx
+++ b/packages/app/src/components/sidebar/sidebar-status-list.tsx
@@ -28,7 +28,7 @@ import type { HostBadgeModel } from "@/hosts/appearance";
 import { isWeb as platformIsWeb, isNative as platformIsNative } from "@/constants/platform";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { StyleSheet } from "react-native-unistyles";
-import type { Theme } from "@/styles/theme";
+import { density, densityFontSize, densityIconBox, densityIconProps } from "@/styles/density";
 import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
 import { withUnistyles } from "react-native-unistyles";
 import {
@@ -82,23 +82,23 @@ import type { DraggableListDragHandleProps } from "@/components/draggable-list.t
 import { useLongPressDragInteraction } from "@/components/sidebar/use-long-press-drag-interaction";
 
 // Themed icon wrappers
-const foregroundMutedColorMapping = (theme: Theme) => ({
+const mutedGroupIconProps = densityIconProps("sm", (theme) => ({
   color: theme.colors.foregroundMuted,
-});
+}));
 // One mapping per bucket, resolved through the status-dot producer so a group header and
 // the rows under it cannot disagree about what "failed" looks like.
-const needsInputColorMapping = (theme: Theme) => ({
+const needsInputGroupIconProps = densityIconProps("sm", (theme) => ({
   color: getStatusDotColor({ theme, bucket: "needs_input" }) ?? undefined,
-});
-const failedColorMapping = (theme: Theme) => ({
+}));
+const failedGroupIconProps = densityIconProps("sm", (theme) => ({
   color: getStatusDotColor({ theme, bucket: "failed" }) ?? undefined,
-});
-const attentionColorMapping = (theme: Theme) => ({
+}));
+const attentionGroupIconProps = densityIconProps("sm", (theme) => ({
   color: getStatusDotColor({ theme, bucket: "attention" }) ?? undefined,
-});
-const runningColorMapping = (theme: Theme) => ({
+}));
+const runningGroupIconProps = densityIconProps("sm", (theme) => ({
   color: getStatusDotColor({ theme, bucket: "running" }) ?? undefined,
-});
+}));
 
 const ThemedChevronDown = withUnistyles(ChevronDown);
 const ThemedChevronRight = withUnistyles(ChevronRight);
@@ -470,23 +470,23 @@ function StatusGroupLeadingVisual({
     return <StatusGroupIcon bucket={leading.bucket} />;
   }
   if (collapsed) {
-    return <ThemedChevronRight size={14} uniProps={foregroundMutedColorMapping} />;
+    return <ThemedChevronRight uniProps={mutedGroupIconProps} />;
   }
-  return <ThemedChevronDown size={14} uniProps={foregroundMutedColorMapping} />;
+  return <ThemedChevronDown uniProps={mutedGroupIconProps} />;
 }
 
 function StatusGroupIcon({ bucket }: { bucket: StatusBucket }) {
   switch (bucket) {
     case "needs_input":
-      return <ThemedCircleAlert size={14} uniProps={needsInputColorMapping} />;
+      return <ThemedCircleAlert uniProps={needsInputGroupIconProps} />;
     case "failed":
-      return <ThemedCircleX size={14} uniProps={failedColorMapping} />;
+      return <ThemedCircleX uniProps={failedGroupIconProps} />;
     case "attention":
-      return <ThemedCircleCheck size={14} uniProps={attentionColorMapping} />;
+      return <ThemedCircleCheck uniProps={attentionGroupIconProps} />;
     case "running":
-      return <ThemedCircleDot size={14} uniProps={runningColorMapping} />;
+      return <ThemedCircleDot uniProps={runningGroupIconProps} />;
     case "done":
-      return <ThemedCircleCheck size={14} uniProps={foregroundMutedColorMapping} />;
+      return <ThemedCircleCheck uniProps={mutedGroupIconProps} />;
   }
 }
 
@@ -1058,7 +1058,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   statusWorkspaceListContainer: {},
   statusGroupRow: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     paddingVertical: theme.spacing[2],
     paddingHorizontal: theme.spacing[2],
     borderRadius: theme.borderRadius.lg,
@@ -1084,8 +1084,8 @@ const styles = StyleSheet.create((theme) => ({
   },
   statusGroupLeadingVisualSlot: {
     position: "relative",
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
+    width: densityIconBox("md"),
+    height: densityIconBox("md"),
     flexShrink: 0,
     alignItems: "center",
     justifyContent: "center",
@@ -1099,7 +1099,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   statusGroupTitle: {
     color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     fontWeight: "400",
     minWidth: 0,
     flexShrink: 1,
@@ -1108,7 +1108,7 @@ const styles = StyleSheet.create((theme) => ({
     position: "relative",
   },
   workspaceRow: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     marginBottom: theme.spacing[0.5],
     paddingVertical: theme.spacing[2],
     paddingLeft: theme.spacing[2],
diff --git a/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx b/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
index 7b48f0dd6c..33f14afcb5 100644
--- a/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
+++ b/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
@@ -16,6 +16,7 @@ import {
   type SidebarWorkspaceTrailing,
 } from "@/components/sidebar/workspace-trailing";
 import { useAppSettings } from "@/hooks/use-settings";
+import { density, densityFontSize, densityIconBox } from "@/styles/density";
 import type { Theme } from "@/styles/theme";
 import type { SidebarStateBucket } from "@/utils/sidebar-agent-state";
 import { getStatusDotColor } from "@/utils/status-dot-color";
@@ -27,19 +28,16 @@ import {
 import { shouldRenderSyncedStatusLoader } from "@/utils/status-loader";
 import { StatusRing } from "@/components/status-ring";
 import { resolveSidebarWorkspacePrimaryLabel } from "@/components/sidebar/sidebar-workspace-title";
+import { DensityIcon } from "@/components/ui/density-icon";
 import { TrailingActionScrim } from "@/components/ui/trailing-action-scrim";
 import { useWorkspaceLabelDefinitions } from "@/workspace-labels";
 
-const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 const needsInputColorMapping = (theme: Theme) => ({
   color: theme.colors.surface0,
   fill: getStatusDotColor({ theme, bucket: "needs_input" }) ?? undefined,
 });
 
 const ThemedCircleAlert = withUnistyles(CircleAlert);
-const ThemedMonitor = withUnistyles(Monitor);
-const ThemedFolder = withUnistyles(Folder);
-const ThemedFolderGit2 = withUnistyles(FolderGit2);
 
 export function SidebarWorkspaceRowFrame({
   workspace,
@@ -241,15 +239,15 @@ function WorkspaceStatusIndicator({
     ) : null;
   }
 
-  let KindIcon: typeof ThemedMonitor;
-  if (workspaceKind === "local_checkout") KindIcon = ThemedMonitor;
-  else if (workspaceKind === "worktree") KindIcon = ThemedFolderGit2;
-  else KindIcon = ThemedFolder;
+  let KindIcon: typeof Monitor;
+  if (workspaceKind === "local_checkout") KindIcon = Monitor;
+  else if (workspaceKind === "worktree") KindIcon = FolderGit2;
+  else KindIcon = Folder;
 
   const dotColorStyle = getStatusDotColorStyle(bucket);
   return (
     <View style={styles.workspaceStatusDot} testID={`workspace-status-indicator-${bucket}`}>
-      <KindIcon size={14} uniProps={foregroundMutedColorMapping} />
+      <DensityIcon icon={KindIcon} size="sm" color="foregroundMuted" />
       {dotColorStyle ? <StatusDotOverlay dotColorStyle={dotColorStyle} /> : null}
     </View>
   );
@@ -482,8 +480,8 @@ const styles = StyleSheet.create((theme) => ({
   },
   workspaceStatusDot: {
     position: "relative",
-    width: theme.iconSize.md,
-    height: 20,
+    width: densityIconBox("md"),
+    height: density.rowLineHeight,
     borderRadius: theme.borderRadius.full,
     flexShrink: 0,
     alignItems: "center",
@@ -515,9 +513,9 @@ const styles = StyleSheet.create((theme) => ({
   // to the meta row, so it takes the full width the trailing slot leaves behind.
   workspaceBranchText: {
     color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
+    fontSize: densityFontSize(theme, "base"),
     fontWeight: "400",
-    lineHeight: 20,
+    lineHeight: density.rowLineHeight,
     opacity: 0.76,
     flex: 1,
     minWidth: 0,
diff --git a/packages/app/src/components/sidebar/sidebar-workspace-row.tsx b/packages/app/src/components/sidebar/sidebar-workspace-row.tsx
index f8dcdebaf5..c5f8a278bd 100644
--- a/packages/app/src/components/sidebar/sidebar-workspace-row.tsx
+++ b/packages/app/src/components/sidebar/sidebar-workspace-row.tsx
@@ -4,6 +4,7 @@ import { View, Text, type GestureResponderEvent } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import type { HostBadgeModel } from "@/hosts/appearance";
 import type { SidebarWorkspaceEntry } from "@/hooks/use-sidebar-workspaces-list";
+import { density } from "@/styles/density";
 import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
 import type { DraggableListDragHandleProps } from "@/components/draggable-list.types";
 import type { ShortcutKey } from "@/utils/format-shortcut";
@@ -485,7 +486,7 @@ const styles = StyleSheet.create((theme) => ({
     position: "relative",
   },
   workspaceRow: {
-    minHeight: 36,
+    minHeight: density.rowHeight,
     marginBottom: theme.spacing[1],
     paddingVertical: theme.spacing[2],
     paddingLeft: theme.spacing[2],
diff --git a/packages/app/src/components/ui/combobox.tsx b/packages/app/src/components/ui/combobox.tsx
index 736ca3bfa5..caf73d1bbc 100644
--- a/packages/app/src/components/ui/combobox.tsx
+++ b/packages/app/src/components/ui/combobox.tsx
@@ -28,7 +28,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import type { EditingTextInputHandle } from "@/components/ui/text-input";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { BottomSheetScrollView, BottomSheetBackgroundProps } from "@gorhom/bottom-sheet";
+import { BottomSheetScrollView, type BottomSheetBackgroundProps } from "@gorhom/bottom-sheet";
 import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { Check, File, Folder, Search } from "lucide-react-native";
@@ -50,6 +50,7 @@ import type { ComboboxOptionModel } from "./combobox-options";
 import { isWeb } from "@/constants/platform";
 import {
   IsolatedBottomSheetModal,
+  SheetVisibleFrame,
   useIsolatedBottomSheetVisibility,
 } from "./isolated-bottom-sheet-modal";
 import {
@@ -948,9 +949,19 @@ function MobileComboboxBody(props: MobileBodyProps): ReactElement {
     () => [styles.comboboxTitle, { color: props.titleColor }],
     [props.titleColor],
   );
+  const { footer, safeAreaBottom } = props;
   const frameStyle = useMemo(
-    () => [styles.mobileSheetFrame, { paddingBottom: props.safeAreaBottom }],
-    [props.safeAreaBottom],
+    () => [styles.mobileSheetFrame, { paddingBottom: footer ? 0 : safeAreaBottom }],
+    [footer, safeAreaBottom],
+  );
+  const footerStyle = useMemo(
+    () => [styles.footer, { paddingBottom: safeAreaBottom }],
+    [safeAreaBottom],
+  );
+
+  const footerView = useMemo(
+    () => (footer ? <View style={footerStyle}>{footer}</View> : undefined),
+    [footer, footerStyle],
   );
 
   const body = props.hasChildren ? (
@@ -983,46 +994,47 @@ function MobileComboboxBody(props: MobileBodyProps): ReactElement {
       keyboardBlurBehavior="none"
       presentation={props.presentation}
     >
-      <View style={frameStyle}>
-        {props.header ? (
-          <SheetHeaderView header={props.header} onClose={props.onClose} />
-        ) : (
-          <>
-            <View style={styles.bottomSheetHeader}>
-              <Text key={props.titleColor} style={comboboxTitleStyle}>
-                {props.title}
-              </Text>
-            </View>
-            {props.stickyHeader}
-            {!props.hasChildren && props.searchable ? (
-              <SearchInput
-                placeholder={props.searchPlaceholder}
-                onChangeText={props.setSearchQueryWithCallback}
-                onSubmitEditing={props.handleSubmitSearch}
-                autoFocus={false}
-                useBottomSheetInput
-                resetKey={props.searchResetKey}
-              />
-            ) : null}
-          </>
-        )}
-        {props.hasChildren && !props.mobileChildrenScrollEnabled ? (
-          body
-        ) : (
-          <BottomSheetScrollView
-            style={styles.mobileSheetBody}
-            contentContainerStyle={[
-              styles.comboboxScrollContent,
-              props.mobileChildrenContentContainerStyle,
-            ]}
-            keyboardShouldPersistTaps="handled"
-            showsVerticalScrollIndicator={false}
-          >
-            {body}
-          </BottomSheetScrollView>
-        )}
-        {props.footer ? <View style={styles.footer}>{props.footer}</View> : null}
-      </View>
+      <SheetVisibleFrame footer={footerView}>
+        <View style={frameStyle}>
+          {props.header ? (
+            <SheetHeaderView header={props.header} onClose={props.onClose} />
+          ) : (
+            <>
+              <View style={styles.bottomSheetHeader}>
+                <Text key={props.titleColor} style={comboboxTitleStyle}>
+                  {props.title}
+                </Text>
+              </View>
+              {props.stickyHeader}
+              {!props.hasChildren && props.searchable ? (
+                <SearchInput
+                  placeholder={props.searchPlaceholder}
+                  onChangeText={props.setSearchQueryWithCallback}
+                  onSubmitEditing={props.handleSubmitSearch}
+                  autoFocus={false}
+                  useBottomSheetInput
+                  resetKey={props.searchResetKey}
+                />
+              ) : null}
+            </>
+          )}
+          {props.hasChildren && !props.mobileChildrenScrollEnabled ? (
+            body
+          ) : (
+            <BottomSheetScrollView
+              style={styles.mobileSheetBody}
+              contentContainerStyle={[
+                styles.comboboxScrollContent,
+                props.mobileChildrenContentContainerStyle,
+              ]}
+              keyboardShouldPersistTaps="handled"
+              showsVerticalScrollIndicator={false}
+            >
+              {body}
+            </BottomSheetScrollView>
+          )}
+        </View>
+      </SheetVisibleFrame>
     </IsolatedBottomSheetModal>
   );
 }
diff --git a/packages/app/src/components/ui/density-icon.tsx b/packages/app/src/components/ui/density-icon.tsx
new file mode 100644
index 0000000000..ee24ee3588
--- /dev/null
+++ b/packages/app/src/components/ui/density-icon.tsx
@@ -0,0 +1,51 @@
+import { useMemo, type ComponentType } from "react";
+import { withUnistyles } from "react-native-unistyles";
+import { densityIconSize, type DensityIconSize } from "@/styles/density";
+import type { Theme } from "@/styles/theme";
+
+type IconComponent = ComponentType<{ size: number; color: string; strokeWidth?: number }>;
+
+type IconColor = {
+  [K in keyof Theme["colors"]]: Theme["colors"][K] extends string ? K : never;
+}[keyof Theme["colors"]];
+
+function IconGlyph({
+  icon: Icon,
+  size,
+  color,
+  strokeWidth,
+}: {
+  icon: IconComponent;
+  size: number;
+  color: string;
+  strokeWidth?: number;
+}) {
+  return <Icon size={size} color={color} strokeWidth={strokeWidth} />;
+}
+
+const ThemedIconGlyph = withUnistyles(IconGlyph);
+
+/** An icon sized by density: larger on compact layouts. See `@/styles/density`. */
+export function DensityIcon({
+  icon,
+  size,
+  sizeAdjustment = 0,
+  color,
+  strokeWidth,
+}: {
+  icon: IconComponent;
+  size: DensityIconSize;
+  /** Only for a glyph that reads larger than others at the same size. */
+  sizeAdjustment?: number;
+  color: IconColor;
+  strokeWidth?: number;
+}) {
+  const uniProps = useMemo(
+    () => (theme: Theme, rt: { breakpoint?: string }) => ({
+      size: densityIconSize(rt, size) + sizeAdjustment,
+      color: theme.colors[color],
+    }),
+    [size, sizeAdjustment, color],
+  );
+  return <ThemedIconGlyph icon={icon} strokeWidth={strokeWidth} uniProps={uniProps} />;
+}
diff --git a/packages/app/src/components/ui/icon-button-chrome.ts b/packages/app/src/components/ui/icon-button-chrome.ts
index 394a744e64..75735ac986 100644
--- a/packages/app/src/components/ui/icon-button-chrome.ts
+++ b/packages/app/src/components/ui/icon-button-chrome.ts
@@ -1,3 +1,4 @@
+import { createContext, useCallback, useContext } from "react";
 import type { StyleProp, ViewStyle } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { HEADER_CONTROL_HEIGHT } from "@/components/ui/control-geometry";
@@ -8,6 +9,8 @@ export { extraMutedIconColorMapping, mutedIconColorMapping } from "@/components/
 export type IconButtonChromeSize = "large" | "small";
 
 const SMALL_ICON_BUTTON_SIZE = 20;
+/** Width and height of a large icon button on compact layouts. */
+export const COMPACT_LARGE_ICON_BUTTON_SIZE = 32;
 const COMPACT_SMALL_ICON_BUTTON_SIZE = 32;
 
 export interface IconButtonChromeState {
@@ -27,20 +30,53 @@ interface IconButtonChromeOptions {
   state?: IconButtonChromeState;
   compact?: boolean;
   disabled?: boolean;
+  /** A circular hitbox and highlight, for buttons inside a pill-shaped container. */
+  round?: boolean;
   style?: StyleProp<ViewStyle>;
 }
 
+const IconButtonChromeContext = createContext<"default" | "header-island">("default");
+
+/** A container owns the chrome of its icon actions, including custom menu and badge triggers. */
+export const IconButtonChromeProvider = IconButtonChromeContext.Provider;
+
+/** The same state callback works with Pressable, TooltipTrigger, and DropdownMenuTrigger. */
+export function useIconButtonChromeStyle({
+  size,
+  compact,
+  disabled,
+  round,
+  style,
+  active,
+}: Omit<IconButtonChromeOptions, "state"> & { active?: boolean }) {
+  const scope = useContext(IconButtonChromeContext);
+  return useCallback(
+    (state: IconButtonChromeState) =>
+      iconButtonChromeStyle({
+        size: scope === "header-island" ? "large" : size,
+        compact,
+        disabled,
+        round: scope === "header-island" || round,
+        style,
+        state: { ...state, active: active || state.active },
+      }),
+    [scope, size, compact, disabled, round, style, active],
+  );
+}
+
 /** Shared hitbox and interaction chrome for icon-only header and toolbar controls. */
 export function iconButtonChromeStyle({
   size,
   state,
   compact = false,
   disabled = false,
+  round = false,
   style,
 }: IconButtonChromeOptions): StyleProp<ViewStyle> {
   const highlighted = state?.active || state?.hovered || state?.pressed || state?.open;
   return [
     resolveIconButtonFrame(size, compact),
+    round ? styles.round : null,
     style,
     highlighted ? styles.highlighted : null,
     disabled ? styles.disabled : null,
@@ -67,11 +103,11 @@ export function smallIconButtonChromeFrameSize(compact = false): number {
 const styles = StyleSheet.create((theme) => ({
   large: {
     width: {
-      xs: 32,
+      xs: COMPACT_LARGE_ICON_BUTTON_SIZE,
       md: HEADER_CONTROL_HEIGHT,
     },
     height: {
-      xs: 32,
+      xs: COMPACT_LARGE_ICON_BUTTON_SIZE,
       md: HEADER_CONTROL_HEIGHT,
     },
     padding: 0,
@@ -104,6 +140,9 @@ const styles = StyleSheet.create((theme) => ({
     outlineWidth: 0,
     outlineColor: "transparent",
   },
+  round: {
+    borderRadius: theme.borderRadius.full,
+  },
   highlighted: {
     backgroundColor: theme.colors.interactionHighlight,
   },
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
index 3f9c9113d0..8dd55e5678 100644
--- a/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
@@ -152,3 +152,5 @@ export function useIsolatedBottomSheetVisibility({
     handleSheetDismiss,
   };
 }
+
+export { SheetVisibleFrame } from "./visible-frame";
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.test.ts b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.test.ts
new file mode 100644
index 0000000000..9e98bd359f
--- /dev/null
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it } from "vitest";
+import { getBottomSheetVisibleContentHeight } from "./visible-frame-layout";
+
+describe("getBottomSheetVisibleContentHeight", () => {
+  it("stops subtracting the retained keyboard height after the keyboard hides", () => {
+    const layout = {
+      containerHeight: 874,
+      contentPosition: 88,
+      handleHeight: 24,
+      keyboardHeight: 344,
+    };
+
+    expect(getBottomSheetVisibleContentHeight({ ...layout, isKeyboardVisible: true })).toBe(418);
+    expect(getBottomSheetVisibleContentHeight({ ...layout, isKeyboardVisible: false })).toBe(762);
+  });
+});
+
+// Below the lowest snap the frame must travel with the sheet, not shrink to the screen edge.
+describe("sheet footer motion", () => {
+  it("keeps the frame height fixed while opening and panning below the lowest snap", () => {
+    const layout = {
+      containerHeight: 1000,
+      handleHeight: 24,
+      keyboardHeight: 0,
+      isKeyboardVisible: false,
+      lowestDetentPosition: 400,
+    };
+    const heights = [1000, 800, 600, 400].map((contentPosition) =>
+      getBottomSheetVisibleContentHeight({ ...layout, contentPosition }),
+    );
+    expect(heights).toEqual([576, 576, 576, 576]);
+  });
+});
+
+it("resizes above the lowest snap and never returns negative or unmeasured heights", () => {
+  const layout = {
+    containerHeight: 1000,
+    handleHeight: 24,
+    keyboardHeight: 0,
+    isKeyboardVisible: false,
+    lowestDetentPosition: 400,
+  };
+  expect(getBottomSheetVisibleContentHeight({ ...layout, contentPosition: 100 })).toBe(876);
+  expect(
+    getBottomSheetVisibleContentHeight({
+      ...layout,
+      contentPosition: 100,
+      keyboardHeight: 950,
+      isKeyboardVisible: true,
+    }),
+  ).toBe(0);
+  expect(
+    getBottomSheetVisibleContentHeight({ ...layout, contentPosition: 100, handleHeight: -999 }),
+  ).toBe(0);
+  expect(
+    getBottomSheetVisibleContentHeight({ ...layout, contentPosition: 100, containerHeight: -999 }),
+  ).toBe(0);
+});
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.ts b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.ts
new file mode 100644
index 0000000000..316f56048a
--- /dev/null
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame-layout.ts
@@ -0,0 +1,25 @@
+interface BottomSheetVisibleContentHeightInput {
+  containerHeight: number;
+  contentPosition: number;
+  lowestDetentPosition?: number;
+  handleHeight: number;
+  keyboardHeight: number;
+  isKeyboardVisible: boolean;
+}
+
+export function getBottomSheetVisibleContentHeight({
+  containerHeight,
+  contentPosition,
+  lowestDetentPosition,
+  handleHeight,
+  keyboardHeight,
+  isKeyboardVisible,
+}: BottomSheetVisibleContentHeightInput): number {
+  "worklet";
+  if (containerHeight < 0 || handleHeight < 0) return 0;
+  const position = Math.min(contentPosition, lowestDetentPosition ?? contentPosition);
+  return Math.max(
+    0,
+    containerHeight - position - handleHeight - (isKeyboardVisible ? keyboardHeight : 0),
+  );
+}
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame.tsx
new file mode 100644
index 0000000000..15ead99edf
--- /dev/null
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/visible-frame.tsx
@@ -0,0 +1,42 @@
+import type { ReactNode } from "react";
+import { View, StyleSheet } from "react-native";
+import { KEYBOARD_STATUS, useBottomSheetInternal } from "@gorhom/bottom-sheet";
+import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { getBottomSheetVisibleContentHeight } from "./visible-frame-layout";
+
+/** Fixed-detent sheet content. The footer shares the sheet's translation below its lowest snap. */
+export function SheetVisibleFrame({
+  children,
+  footer,
+}: {
+  children: ReactNode;
+  footer?: ReactNode;
+}) {
+  const { animatedDetentsState, animatedKeyboardState, animatedLayoutState, animatedPosition } =
+    useBottomSheetInternal();
+  const visibleStyle = useAnimatedStyle(() => {
+    const { containerHeight, handleHeight } = animatedLayoutState.get();
+    const keyboard = animatedKeyboardState.get();
+    return {
+      height: getBottomSheetVisibleContentHeight({
+        containerHeight,
+        handleHeight,
+        contentPosition: animatedPosition.get(),
+        lowestDetentPosition: animatedDetentsState.get().detents?.[0],
+        keyboardHeight: keyboard.heightWithinContainer,
+        isKeyboardVisible: keyboard.status === KEYBOARD_STATUS.SHOWN,
+      }),
+    };
+  }, [animatedDetentsState, animatedKeyboardState, animatedLayoutState, animatedPosition]);
+  return (
+    <Animated.View style={[styles.frame, visibleStyle]}>
+      <View style={styles.body}>{children}</View>
+      {footer}
+    </Animated.View>
+  );
+}
+
+const styles = StyleSheet.create({
+  frame: { minHeight: 0, overflow: "hidden" },
+  body: { flex: 1, minHeight: 0 },
+});
diff --git a/packages/app/src/components/ui/pane-content-toolbar.tsx b/packages/app/src/components/ui/pane-content-toolbar.tsx
index 03634670d1..4ff947afc9 100644
--- a/packages/app/src/components/ui/pane-content-toolbar.tsx
+++ b/packages/app/src/components/ui/pane-content-toolbar.tsx
@@ -16,6 +16,7 @@ import type { ShortcutKey } from "@/utils/format-shortcut";
 import {
   iconButtonChromeGlyphSize,
   iconButtonChromeStyle,
+  useIconButtonChromeStyle,
   smallIconButtonChromeFrameSize,
 } from "@/components/ui/icon-button-chrome";
 import { WORKSPACE_PANE_TRAILING_GLYPH_RAIL } from "@/components/tree-primitives";
@@ -60,6 +61,8 @@ interface ToolbarButtonCommonProps extends Omit<
   tooltip?: ReactNode;
   selected?: boolean;
   compact?: boolean;
+  /** A circular highlight, for buttons inside a pill-shaped container. */
+  round?: boolean;
   shortcut?: ShortcutKey[][] | null;
   tooltipSide?: "left" | "right" | "top" | "bottom";
   style?: StyleProp<ViewStyle>;
@@ -81,6 +84,7 @@ export function ToolbarButton({
   tooltip: tooltipBody,
   selected = false,
   compact = false,
+  round = false,
   shortcut,
   tooltipSide = "bottom",
   style,
@@ -90,17 +94,14 @@ export function ToolbarButton({
   testID,
   ...props
 }: ToolbarButtonProps) {
-  const buttonStyle = useMemo(
-    () => (state: { hovered?: boolean; pressed: boolean; open?: boolean }) =>
-      iconButtonChromeStyle({
-        size: "small",
-        compact,
-        state: { ...state, active: selected },
-        disabled: Boolean(disabled),
-        style,
-      }),
-    [compact, disabled, selected, style],
-  );
+  const buttonStyle = useIconButtonChromeStyle({
+    size: "small",
+    compact,
+    active: selected,
+    disabled: Boolean(disabled),
+    round,
+    style,
+  });
   const accessibilityState = useMemo(
     () => ({ disabled: Boolean(disabled), selected }),
     [disabled, selected],
diff --git a/packages/app/src/composer/agent-controls/model-sheet.tsx b/packages/app/src/composer/agent-controls/model-sheet.tsx
index bca5a250bf..6929b447ea 100644
--- a/packages/app/src/composer/agent-controls/model-sheet.tsx
+++ b/packages/app/src/composer/agent-controls/model-sheet.tsx
@@ -298,7 +298,6 @@ export function CompactModelSheet({
         onClose={close}
         snapPoints={SNAP_POINTS}
         scrollable={false}
-        sizeContentToCurrentSnapPoint={usesBottomSheet}
         contentStyle={styles.sheetBody}
         testID="agent-controls-model-sheet"
       >
@@ -346,7 +345,6 @@ export function CompactModelSheet({
           onClose={closeModelBrowser}
           snapPoints={SNAP_POINTS}
           scrollable={false}
-          sizeContentToCurrentSnapPoint
           presentation="push"
           contentStyle={styles.sheetBody}
           testID="agent-controls-model-browser-sheet"
diff --git a/packages/app/src/constants/layout.ts b/packages/app/src/constants/layout.ts
index 721708715c..9e9a15f6b4 100644
--- a/packages/app/src/constants/layout.ts
+++ b/packages/app/src/constants/layout.ts
@@ -33,13 +33,18 @@ export {
   getIsElectronMac as getIsElectronRuntimeMac,
 } from "./platform";
 
+/** Compact layouts are the breakpoints below `md`. */
+export function isCompactBreakpoint(breakpoint: string | undefined): boolean {
+  return breakpoint === "xs" || breakpoint === "sm";
+}
+
 /**
  * Reactive hook — re-renders the component when the breakpoint changes.
  * Always use this instead of reading UnistylesRuntime.breakpoint directly.
  */
 export function useIsCompactFormFactor(): boolean {
   const { rt } = useUnistyles();
-  return rt.breakpoint === "xs" || rt.breakpoint === "sm";
+  return isCompactBreakpoint(rt.breakpoint);
 }
 
 // SplitContainer relies on dnd-kit and DOM-backed accessibility helpers.
diff --git a/packages/app/src/plugins/surface-screen.tsx b/packages/app/src/plugins/surface-screen.tsx
index f2f9997749..378965cd8f 100644
--- a/packages/app/src/plugins/surface-screen.tsx
+++ b/packages/app/src/plugins/surface-screen.tsx
@@ -7,9 +7,11 @@ import { Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { HeaderIconBadge } from "@/components/headers/header-icon-badge";
 import { HeaderToggleButton } from "@/components/headers/header-toggle-button";
+import { CompactHeader } from "@/components/headers/compact-header";
 import { ScreenHeader } from "@/components/headers/screen-header";
 import { ScreenTitle } from "@/components/headers/screen-title";
 import { HostFilter } from "@/components/hosts/host-filter";
+import type { HostPickerHost } from "@/components/hosts/host-picker";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { useHostRuntimeClient, useHosts } from "@/runtime/host-runtime";
 import type { Theme } from "@/styles/theme";
@@ -87,19 +89,14 @@ function PluginHostFilter({
   pluginId,
   identity,
   params,
-  serverIds,
+  hosts,
 }: {
   serverId: string;
   pluginId: string;
   identity: PluginSurfaceContributionIdentity;
   params: PluginScreenParams;
-  serverIds: string[];
+  hosts: HostPickerHost[];
 }) {
-  const allHosts = useHosts();
-  const hosts = useMemo(
-    () => allHosts.filter((host) => serverIds.includes(host.serverId)),
-    [allHosts, serverIds],
-  );
   const selectHost = useCallback(
     (nextServerId: string) => {
       // A legacy row remembers its own host; a screen's host carries to all the plugin's items.
@@ -113,9 +110,6 @@ function PluginHostFilter({
     },
     [identity, params, pluginId],
   );
-  const show = serverIds.length > 1 && hosts.length > 1;
-  if (!show) return null;
-
   return (
     <HostFilter
       hosts={hosts}
@@ -155,11 +149,12 @@ export function PluginSurfaceScreen() {
     [identity, plugin],
   );
   const hostLabel = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
-  const contributionServerIds = useMemo(
-    () =>
-      identity ? getPluginSurfaceContributionServerIds(installations, pluginId, identity) : [],
-    [identity, installations, pluginId],
-  );
+  // The hosts this contribution is installed on; the filter shows when there is a choice.
+  const filterHosts = useMemo(() => {
+    if (!identity) return [];
+    const serverIds = getPluginSurfaceContributionServerIds(installations, pluginId, identity);
+    return hosts.filter((candidate) => serverIds.includes(candidate.serverId));
+  }, [hosts, identity, installations, pluginId]);
   const title = useMemo(
     () =>
       surface
@@ -187,18 +182,23 @@ export function PluginSurfaceScreen() {
     ),
     [Icon, title],
   );
+  const hostFilter = useMemo(
+    () =>
+      identity && filterHosts.length > 1 ? (
+        <PluginHostFilter
+          serverId={serverId}
+          pluginId={pluginId}
+          identity={identity}
+          params={params}
+          hosts={filterHosts}
+        />
+      ) : null,
+    [filterHosts, identity, params, pluginId, serverId],
+  );
   const headerRight = useMemo(
     () => (
       <>
-        {identity ? (
-          <PluginHostFilter
-            serverId={serverId}
-            pluginId={pluginId}
-            identity={identity}
-            params={params}
-            serverIds={contributionServerIds}
-          />
-        ) : null}
+        {hostFilter}
         <HeaderToggleButton
           accessibilityLabel="Close plugin"
           onPress={close}
@@ -211,12 +211,22 @@ export function PluginSurfaceScreen() {
         </HeaderToggleButton>
       </>
     ),
-    [close, contributionServerIds, identity, params, pluginId, serverId],
+    [close, hostFilter],
   );
 
   return (
     <View style={styles.screen}>
-      <ScreenHeader left={headerLeft} right={headerRight} />
+      {compact ? (
+        <CompactHeader
+          navigation="back"
+          onBack={close}
+          title={title}
+          titleTestID="plugin-surface-title"
+          actions={hostFilter}
+        />
+      ) : (
+        <ScreenHeader left={headerLeft} right={headerRight} />
+      )}
       <View style={styles.body}>
         {plugin && surface && client ? (
           <SurfaceErrorBoundary
diff --git a/packages/app/src/screens/new-workspace-screen.tsx b/packages/app/src/screens/new-workspace-screen.tsx
index c919ab476d..27c96c08b8 100644
--- a/packages/app/src/screens/new-workspace-screen.tsx
+++ b/packages/app/src/screens/new-workspace-screen.tsx
@@ -31,8 +31,7 @@ import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
 import { Shortcut } from "@/components/ui/shortcut";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
-import { SidebarMenuToggle } from "@/components/headers/menu-header";
-import { ScreenHeader } from "@/components/headers/screen-header";
+import { MenuHeader } from "@/components/headers/menu-header";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { useToast } from "@/contexts/toast-context";
 import { useAgentInputDraft } from "@/composer/draft/input-draft";
@@ -2368,7 +2367,6 @@ export function NewWorkspaceScreen({
     },
   });
 
-  const screenHeaderLeft = useMemo(() => <SidebarMenuToggle />, []);
   const importSession = useImportSession({ serverId: selectedServerId });
 
   const composer = isTerminalLaunch ? (
@@ -2431,7 +2429,7 @@ export function NewWorkspaceScreen({
   );
   return (
     <FileDropZone style={styles.container}>
-      <ScreenHeader left={screenHeaderLeft} borderless />
+      <MenuHeader borderless />
       <View style={styles.content}>
         <TitlebarDragRegion />
         <NewWorkspaceLayout
diff --git a/packages/app/src/screens/workspace/compact-workspace-header/index.tsx b/packages/app/src/screens/workspace/compact-workspace-header/index.tsx
new file mode 100644
index 0000000000..2a7c4a6a57
--- /dev/null
+++ b/packages/app/src/screens/workspace/compact-workspace-header/index.tsx
@@ -0,0 +1,72 @@
+import { useMemo, type ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+import { CompactHeader } from "@/components/headers/compact-header";
+import {
+  EXPLORER_TOGGLE_KEYS,
+  WorkspaceExplorerToggle,
+} from "@/screens/workspace/workspace-explorer-toggle";
+import { WorkspaceHeaderProjectRow } from "@/screens/workspace/workspace-header-project-row";
+
+export { MobileWorkspaceTabSwitcher } from "./tab-switcher";
+
+interface CompactWorkspaceHeaderProps {
+  serverId: string;
+  isLoading: boolean;
+  title: string;
+  subtitle: string;
+  isSubtitleDistinct: boolean;
+  onToggleExplorer: () => void;
+  explorerToggleLabel: string;
+  explorerToggleAccessibilityState: { expanded: boolean };
+  /** Tab switcher and workspace menu, before the explorer toggle. */
+  children: ReactNode;
+}
+
+/** The compact header with the workspace's project row and controls. */
+export function CompactWorkspaceHeader({
+  isLoading,
+  title,
+  subtitle,
+  isSubtitleDistinct,
+  onToggleExplorer,
+  explorerToggleLabel,
+  explorerToggleAccessibilityState,
+  children,
+  serverId,
+}: CompactWorkspaceHeaderProps) {
+  const { t } = useTranslation();
+  const projectRow = useMemo(
+    () => (
+      <WorkspaceHeaderProjectRow
+        subtitle={subtitle}
+        isSubtitleDistinct={isSubtitleDistinct}
+        serverId={serverId}
+      />
+    ),
+    [subtitle, isSubtitleDistinct, serverId],
+  );
+  const actions = (
+    <>
+      {children}
+      <WorkspaceExplorerToggle
+        onPress={onToggleExplorer}
+        label={explorerToggleLabel}
+        tooltipLabel={t("workspace.tabs.explorerSidebar.toggle")}
+        tooltipKeys={EXPLORER_TOGGLE_KEYS}
+        accessibilityState={explorerToggleAccessibilityState}
+        mobile
+      />
+    </>
+  );
+
+  return (
+    <CompactHeader
+      navigation="menu"
+      title={title}
+      titleTestID="workspace-header-title"
+      subtitle={projectRow}
+      loading={isLoading}
+      actions={actions}
+    />
+  );
+}
diff --git a/packages/app/src/screens/workspace/compact-workspace-header/tab-switcher.tsx b/packages/app/src/screens/workspace/compact-workspace-header/tab-switcher.tsx
new file mode 100644
index 0000000000..970e77aaa9
--- /dev/null
+++ b/packages/app/src/screens/workspace/compact-workspace-header/tab-switcher.tsx
@@ -0,0 +1,501 @@
+import { memo, useCallback, useMemo, useRef, useState } from "react";
+import { Keyboard, Pressable, Text, View } from "react-native";
+import { useTranslation } from "react-i18next";
+import { SquarePen, SquareTerminal } from "lucide-react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { Button } from "@/components/ui/button";
+import { Combobox, type ComboboxOption } from "@/components/ui/combobox";
+import { useIconButtonChromeStyle } from "@/components/ui/icon-button-chrome";
+import {
+  WorkspaceTabPresentationResolver,
+  WorkspaceTabOptionRow,
+  type WorkspaceTabPresentation,
+} from "@/screens/workspace/workspace-tab-presentation";
+import { MobileTabTrailingAccessory } from "@/screens/workspace/workspace-tab-trailing-accessory";
+import {
+  buildWorkspaceTabMenuEntries,
+  type WorkspaceTabMenuLabels,
+} from "@/screens/workspace/workspace-tab-menu";
+import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
+
+// The trigger draws at 32pt beside its island neighbours, so only vertical slop is free.
+const TAB_SWITCHER_TRIGGER_HIT_SLOP = { top: 8, bottom: 8 } as const;
+
+function getFallbackTabOptionLabel(
+  tab: WorkspaceTabDescriptor,
+  labels: {
+    newTab: string;
+    newAgent: string;
+    setup: string;
+    terminal: string;
+    browser: string;
+    agent: string;
+    changes: string;
+    files: string;
+    pullRequest: string;
+  },
+): string {
+  if (tab.target.kind === "new_tab") {
+    return labels.newTab;
+  }
+  if (tab.target.kind === "draft") {
+    return labels.newAgent;
+  }
+  if (tab.target.kind === "setup") {
+    return labels.setup;
+  }
+  if (tab.target.kind === "terminal") {
+    return labels.terminal;
+  }
+  if (tab.target.kind === "browser") {
+    return labels.browser;
+  }
+  if (tab.target.kind === "file") {
+    return tab.target.path.split("/").findLast(Boolean) ?? tab.target.path;
+  }
+  if (tab.target.kind === "working_diff" || tab.target.kind === "changes_tree") {
+    return labels.changes;
+  }
+  if (tab.target.kind === "files") {
+    return labels.files;
+  }
+  if (tab.target.kind === "pull_request") {
+    return labels.pullRequest;
+  }
+  if (tab.target.kind === "commit_diff") {
+    return tab.target.sha.slice(0, 7);
+  }
+  return labels.agent;
+}
+
+function getFallbackTabOptionDescription(
+  tab: WorkspaceTabDescriptor,
+  labels: {
+    newTab: string;
+    newAgent: string;
+    workspaceSetup: string;
+    agent: string;
+    terminal: string;
+    browser: string;
+    changes: string;
+    files: string;
+    pullRequest: string;
+  },
+): string {
+  if (tab.target.kind === "new_tab") {
+    return labels.newTab;
+  }
+  if (tab.target.kind === "draft") {
+    return labels.newAgent;
+  }
+  if (tab.target.kind === "setup") {
+    return labels.workspaceSetup;
+  }
+  if (tab.target.kind === "agent") {
+    return labels.agent;
+  }
+  if (tab.target.kind === "terminal") {
+    return labels.terminal;
+  }
+  if (tab.target.kind === "browser") {
+    return labels.browser;
+  }
+  if (tab.target.kind === "provider_subagent") {
+    return labels.agent;
+  }
+  if (tab.target.kind === "commit_diff") {
+    return tab.target.sha.slice(0, 7);
+  }
+  if (tab.target.kind === "working_diff" || tab.target.kind === "changes_tree") {
+    return labels.changes;
+  }
+  if (tab.target.kind === "files") {
+    return labels.files;
+  }
+  if (tab.target.kind === "pull_request") {
+    return labels.pullRequest;
+  }
+  if (tab.target.kind === "plugin") {
+    return tab.target.panelId;
+  }
+  return tab.target.path;
+}
+
+interface MobileWorkspaceTabSwitcherProps {
+  tabs: WorkspaceTabDescriptor[];
+  activeTabKey: string;
+  normalizedServerId: string;
+  normalizedWorkspaceId: string;
+  onSelectSwitcherTab: (key: string) => void;
+  createTerminalDisabled: boolean;
+  onCreateDraftTab: () => void;
+  onCreateTerminal: () => void;
+  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
+  onCopyAgentId: (agentId: string) => Promise<void> | void;
+  onCopyTerminalId: (terminalId: string) => Promise<void> | void;
+  onCopyFilePath: (path: string) => Promise<void> | void;
+  onReloadAgent: (agentId: string) => Promise<void> | void;
+  onRenameTab: (tab: WorkspaceTabDescriptor) => void;
+  onCloseTab: (tabId: string) => Promise<void> | void;
+  onCloseTabsAbove: (tabId: string) => Promise<void> | void;
+  onCloseTabsBelow: (tabId: string) => Promise<void> | void;
+  onCloseOtherTabs: (tabId: string) => Promise<void> | void;
+}
+
+function MobileWorkspaceTabOption({
+  tab,
+  tabIndex,
+  tabCount,
+  normalizedServerId,
+  normalizedWorkspaceId,
+  selected,
+  active,
+  onPress,
+  onCopyResumeCommand,
+  onCopyAgentId,
+  onCopyTerminalId,
+  onCopyFilePath,
+  onReloadAgent,
+  onRenameTab,
+  onCloseTab,
+  onCloseTabsAbove,
+  onCloseTabsBelow,
+  onCloseOtherTabs,
+}: {
+  tab: WorkspaceTabDescriptor;
+  tabIndex: number;
+  tabCount: number;
+  normalizedServerId: string;
+  normalizedWorkspaceId: string;
+  selected: boolean;
+  active: boolean;
+  onPress: () => void;
+  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
+  onCopyAgentId: (agentId: string) => Promise<void> | void;
+  onCopyTerminalId: (terminalId: string) => Promise<void> | void;
+  onCopyFilePath: (path: string) => Promise<void> | void;
+  onReloadAgent: (agentId: string) => Promise<void> | void;
+  onRenameTab: (tab: WorkspaceTabDescriptor) => void;
+  onCloseTab: (tabId: string) => Promise<void> | void;
+  onCloseTabsAbove: (tabId: string) => Promise<void> | void;
+  onCloseTabsBelow: (tabId: string) => Promise<void> | void;
+  onCloseOtherTabs: (tabId: string) => Promise<void> | void;
+}) {
+  const { t } = useTranslation();
+  const tabMenuLabels = useMemo<WorkspaceTabMenuLabels>(
+    () => ({
+      copyResumeCommand: t("workspace.tabs.menu.copyResumeCommand"),
+      copyAgentId: t("workspace.tabs.menu.copyAgentId"),
+      copyTerminalId: t("workspace.tabs.menu.copyTerminalId"),
+      copyFilePath: t("workspace.tabs.menu.copyFilePath"),
+      rename: t("workspace.tabs.menu.rename"),
+      closeAbove: t("workspace.tabs.menu.closeAbove"),
+      closeBelow: t("workspace.tabs.menu.closeBelow"),
+      closeLeft: t("workspace.tabs.menu.closeLeft"),
+      closeRight: t("workspace.tabs.menu.closeRight"),
+      closeOthers: t("workspace.tabs.menu.closeOthers"),
+      reloadAgent: t("workspace.tabs.menu.reloadAgent"),
+      reloadAgentTooltip: t("workspace.tabs.menu.reloadAgentTooltip"),
+      close: t("workspace.tabs.menu.close"),
+    }),
+    [t],
+  );
+  const menuTestIDBase = `workspace-tab-menu-${tab.tabId}`;
+  const menuEntries = buildWorkspaceTabMenuEntries({
+    surface: "mobile",
+    tab,
+    index: tabIndex,
+    tabCount,
+    menuTestIDBase,
+    onCopyResumeCommand,
+    onCopyAgentId,
+    onCopyTerminalId,
+    onCopyFilePath,
+    onReloadAgent,
+    onRenameTab,
+    onCloseTab,
+    onCloseTabsBefore: onCloseTabsAbove,
+    onCloseTabsAfter: onCloseTabsBelow,
+    onCloseOtherTabs,
+    labels: tabMenuLabels,
+  });
+
+  const fallbackLabels = useMemo(
+    () => ({
+      newTab: t("workspace.tabs.actions.newTab"),
+      newAgent: t("workspace.tabs.fallback.newAgent"),
+      setup: t("workspace.tabs.fallback.setup"),
+      terminal: t("workspace.tabs.fallback.terminal"),
+      browser: t("workspace.tabs.fallback.browser"),
+      agent: t("workspace.tabs.fallback.agent"),
+      changes: t("panels.diff.changesLabel"),
+      files: t("panels.files.label"),
+      pullRequest: t("panels.pullRequest.label"),
+    }),
+    [t],
+  );
+  const fallbackLabel = getFallbackTabOptionLabel(tab, fallbackLabels);
+  const trailingAccessory = useMemo(
+    () => (
+      <MobileTabTrailingAccessory
+        menuTestIDBase={menuTestIDBase}
+        presentationLabel={fallbackLabel}
+        menuEntries={menuEntries}
+      />
+    ),
+    [menuTestIDBase, fallbackLabel, menuEntries],
+  );
+
+  const renderPresentation = useCallback(
+    (presentation: WorkspaceTabPresentation) => (
+      <WorkspaceTabOptionRow
+        presentation={presentation}
+        selected={selected}
+        active={active}
+        onPress={onPress}
+        trailingAccessory={trailingAccessory}
+      />
+    ),
+    [selected, active, onPress, trailingAccessory],
+  );
+
+  return (
+    <WorkspaceTabPresentationResolver
+      tab={tab}
+      serverId={normalizedServerId}
+      workspaceId={normalizedWorkspaceId}
+    >
+      {renderPresentation}
+    </WorkspaceTabPresentationResolver>
+  );
+}
+
+export const MobileWorkspaceTabSwitcher = memo(function MobileWorkspaceTabSwitcher({
+  tabs,
+  activeTabKey,
+  normalizedServerId,
+  normalizedWorkspaceId,
+  onSelectSwitcherTab,
+  createTerminalDisabled,
+  onCreateDraftTab,
+  onCreateTerminal,
+  onCopyResumeCommand,
+  onCopyAgentId,
+  onCopyTerminalId,
+  onCopyFilePath,
+  onReloadAgent,
+  onRenameTab,
+  onCloseTab,
+  onCloseTabsAbove,
+  onCloseTabsBelow,
+  onCloseOtherTabs,
+}: MobileWorkspaceTabSwitcherProps) {
+  const { t } = useTranslation();
+  const tabFallbackLabels = useMemo(
+    () => ({
+      newTab: t("workspace.tabs.actions.newTab"),
+      newAgent: t("workspace.tabs.fallback.newAgent"),
+      setup: t("workspace.tabs.fallback.setup"),
+      workspaceSetup: t("workspace.tabs.fallback.workspaceSetup"),
+      terminal: t("workspace.tabs.fallback.terminal"),
+      browser: t("workspace.tabs.fallback.browser"),
+      agent: t("workspace.tabs.fallback.agent"),
+      changes: t("panels.diff.changesLabel"),
+      files: t("panels.files.label"),
+      pullRequest: t("panels.pullRequest.label"),
+    }),
+    [t],
+  );
+
+  const tabSwitcherOptions = useMemo(
+    () =>
+      tabs.map((tab) => ({
+        id: tab.key,
+        label: getFallbackTabOptionLabel(tab, tabFallbackLabels),
+        description: getFallbackTabOptionDescription(tab, tabFallbackLabels),
+      })),
+    [tabFallbackLabels, tabs],
+  );
+
+  const tabByKey = useMemo(() => new Map(tabs.map((tab) => [tab.key, tab])), [tabs]);
+  const triggerStyle = useIconButtonChromeStyle({ size: "large" });
+  const [isOpen, setIsOpen] = useState(false);
+  const anchorRef = useRef<View>(null);
+  const tabIndexByKey = useMemo(() => {
+    const map = new Map<string, number>();
+    tabs.forEach((tab, index) => {
+      map.set(tab.key, index);
+    });
+    return map;
+  }, [tabs]);
+
+  const handleOpenSwitcher = useCallback(() => {
+    Keyboard.dismiss();
+    setIsOpen(true);
+  }, []);
+
+  const handleNewAgent = useCallback(() => {
+    setIsOpen(false);
+    onCreateDraftTab();
+  }, [onCreateDraftTab]);
+
+  const handleNewTerminal = useCallback(() => {
+    setIsOpen(false);
+    onCreateTerminal();
+  }, [onCreateTerminal]);
+
+  const footer = useMemo(
+    () => (
+      <View style={styles.tabSwitcherFooter}>
+        <Button
+          testID="workspace-tab-switcher-new-agent"
+          style={styles.tabSwitcherFooterButton}
+          variant="secondary"
+          leftIcon={SquarePen}
+          onPress={handleNewAgent}
+        >
+          {t("workspace.header.actions.newAgent")}
+        </Button>
+        <Button
+          testID="workspace-tab-switcher-new-terminal"
+          style={styles.tabSwitcherFooterButton}
+          variant="secondary"
+          leftIcon={SquareTerminal}
+          disabled={createTerminalDisabled}
+          onPress={handleNewTerminal}
+        >
+          {t("workspace.header.actions.newTerminal")}
+        </Button>
+      </View>
+    ),
+    [createTerminalDisabled, handleNewAgent, handleNewTerminal, t],
+  );
+
+  const renderTabOption = useCallback(
+    ({
+      option,
+      selected,
+      active,
+      onPress,
+    }: {
+      option: ComboboxOption;
+      selected: boolean;
+      active: boolean;
+      onPress: () => void;
+    }) => {
+      const tab = tabByKey.get(option.id);
+      if (!tab) {
+        return <View />;
+      }
+      const tabIndex = tabIndexByKey.get(tab.key) ?? -1;
+      if (tabIndex < 0) {
+        return <View />;
+      }
+      return (
+        <MobileWorkspaceTabOption
+          tab={tab}
+          tabIndex={tabIndex}
+          tabCount={tabs.length}
+          normalizedServerId={normalizedServerId}
+          normalizedWorkspaceId={normalizedWorkspaceId}
+          selected={selected}
+          active={active}
+          onPress={onPress}
+          onCopyResumeCommand={onCopyResumeCommand}
+          onCopyAgentId={onCopyAgentId}
+          onCopyTerminalId={onCopyTerminalId}
+          onCopyFilePath={onCopyFilePath}
+          onReloadAgent={onReloadAgent}
+          onRenameTab={onRenameTab}
+          onCloseTab={onCloseTab}
+          onCloseTabsAbove={onCloseTabsAbove}
+          onCloseTabsBelow={onCloseTabsBelow}
+          onCloseOtherTabs={onCloseOtherTabs}
+        />
+      );
+    },
+    [
+      tabByKey,
+      tabIndexByKey,
+      tabs.length,
+      normalizedServerId,
+      normalizedWorkspaceId,
+      onCopyResumeCommand,
+      onCopyAgentId,
+      onCopyTerminalId,
+      onCopyFilePath,
+      onReloadAgent,
+      onRenameTab,
+      onCloseTab,
+      onCloseTabsAbove,
+      onCloseTabsBelow,
+      onCloseOtherTabs,
+    ],
+  );
+
+  return (
+    <>
+      <Pressable
+        ref={anchorRef}
+        testID="workspace-tab-switcher-trigger"
+        accessibilityRole="button"
+        accessibilityLabel={t("workspace.tabs.switcher.trigger", { count: tabs.length })}
+        hitSlop={TAB_SWITCHER_TRIGGER_HIT_SLOP}
+        style={triggerStyle}
+        onPress={handleOpenSwitcher}
+      >
+        <View style={styles.tabCountBadge}>
+          <Text style={styles.tabCountText}>{tabs.length}</Text>
+        </View>
+      </Pressable>
+
+      <Combobox
+        options={tabSwitcherOptions}
+        value={activeTabKey}
+        onSelect={onSelectSwitcherTab}
+        searchable={false}
+        title={t("workspace.tabs.switcher.title")}
+        searchPlaceholder={t("workspace.tabs.switcher.searchPlaceholder")}
+        open={isOpen}
+        onOpenChange={setIsOpen}
+        anchorRef={anchorRef}
+        renderOption={renderTabOption}
+        footer={footer}
+      />
+    </>
+  );
+});
+
+const styles = StyleSheet.create((theme) => ({
+  tabSwitcherFooter: {
+    flexDirection: "row",
+    gap: theme.spacing[3],
+    paddingHorizontal: theme.spacing[6],
+    paddingVertical: theme.spacing[3],
+  },
+  tabSwitcherFooterButton: {
+    flex: 1,
+  },
+  // Sized and stroked like the 16px header glyphs beside it (1.5 stroke on a 24 viewbox = 1px).
+  tabCountBadge: {
+    minWidth: 16,
+    height: 16,
+    paddingHorizontal: 2,
+    alignItems: "center",
+    justifyContent: "center",
+    borderRadius: theme.borderRadius.sm,
+    borderWidth: theme.borderWidth[1],
+    borderColor: theme.colors.foregroundMuted,
+  },
+  // Android pads text above the ascender by default, which pushes the digit below center.
+  tabCountText: {
+    fontSize: 10,
+    lineHeight: 12,
+    includeFontPadding: false,
+    textAlign: "center",
+    textAlignVertical: "center",
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foregroundMuted,
+    fontVariant: ["tabular-nums"],
+  },
+}));
diff --git a/packages/app/src/screens/workspace/workspace-explorer-toggle.tsx b/packages/app/src/screens/workspace/workspace-explorer-toggle.tsx
index 041aa6954b..5e8c3eea78 100644
--- a/packages/app/src/screens/workspace/workspace-explorer-toggle.tsx
+++ b/packages/app/src/screens/workspace/workspace-explorer-toggle.tsx
@@ -11,6 +11,8 @@ import type { ShortcutKey } from "@/utils/format-shortcut";
 
 const ThemedPanelRight = withUnistyles(PanelRight);
 
+export const EXPLORER_TOGGLE_KEYS: ShortcutKey[] = ["mod", "E"];
+
 interface WorkspaceExplorerToggleProps {
   onPress: () => void;
   label: string;
diff --git a/packages/app/src/screens/workspace/workspace-header-menu.tsx b/packages/app/src/screens/workspace/workspace-header-menu.tsx
index 1ffd99425f..2fb7176e10 100644
--- a/packages/app/src/screens/workspace/workspace-header-menu.tsx
+++ b/packages/app/src/screens/workspace/workspace-header-menu.tsx
@@ -2,14 +2,7 @@ import React, { useCallback, useMemo } from "react";
 import { View } from "react-native";
 import { useRouter, type Href } from "expo-router";
 import { useTranslation } from "react-i18next";
-import {
-  Copy,
-  Ellipsis,
-  Globe,
-  Import as ImportIcon,
-  Settings,
-  SquarePen,
-} from "lucide-react-native";
+import { Copy, Ellipsis, Globe, Import as ImportIcon, Settings } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import type { TerminalProfile } from "@getpaseo/protocol/messages";
 import {
@@ -24,6 +17,7 @@ import {
   extraMutedIconColorMapping,
   iconButtonChromeGlyphSize,
   iconButtonChromeStyle,
+  useIconButtonChromeStyle,
 } from "@/components/ui/icon-button-chrome";
 import { TerminalProfileIcon } from "@/components/terminal-profile-icon";
 import { useDaemonConfig } from "@/hooks/use-daemon-config";
@@ -36,16 +30,13 @@ import type { Theme } from "@/styles/theme";
 
 const ThemedEllipsis = withUnistyles(Ellipsis);
 const ThemedCopy = withUnistyles(Copy);
-const ThemedSquarePen = withUnistyles(SquarePen);
 const ThemedGlobe = withUnistyles(Globe);
 const ThemedImport = withUnistyles(ImportIcon);
 const ThemedSettings = withUnistyles(Settings);
 
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
-const MENU_NEW_AGENT_ICON = <ThemedSquarePen size={16} uniProps={mutedColorMapping} />;
 const MENU_NEW_BROWSER_ICON = <ThemedGlobe size={16} uniProps={mutedColorMapping} />;
-const MENU_NEW_TERMINAL_ICON = <TerminalProfileIcon iconKey={undefined} size={16} />;
 const MENU_IMPORT_ICON = <ThemedImport size={16} uniProps={mutedColorMapping} />;
 const MENU_COPY_ICON = <ThemedCopy size={16} uniProps={mutedColorMapping} />;
 const MENU_SETTINGS_ICON = <ThemedSettings size={16} uniProps={mutedColorMapping} />;
@@ -203,28 +194,25 @@ export interface WorkspaceHeaderMenuMobileProps extends WorkspaceHeaderWorkspace
   normalizedServerId: string;
   showCreateBrowserTab: boolean;
   createTerminalDisabled: boolean;
-  onCreateDraftTab: () => void;
-  onCreateTerminal: () => void;
   onCreateTerminalWithProfile: (profile: TerminalProfile) => void;
   onCreateBrowser: () => void;
 }
 
 /**
- * Compact layouts have no tab strip to launch from, so new tabs live here alongside the workspace
- * actions.
+ * Compact layouts have no tab strip. New agent and New terminal sit in the tab switcher's footer;
+ * the rarer launches stay here alongside the workspace actions.
  */
 export function WorkspaceHeaderMenuMobile({
   normalizedServerId,
   showCreateBrowserTab,
   createTerminalDisabled,
-  onCreateDraftTab,
-  onCreateTerminal,
   onCreateTerminalWithProfile,
   onCreateBrowser,
   ...workspaceActions
 }: WorkspaceHeaderMenuMobileProps) {
   const { t } = useTranslation();
   const router = useRouter();
+  const triggerStyle = useIconButtonChromeStyle({ size: "large" });
   const { config } = useDaemonConfig(normalizedServerId);
   const profiles = useMemo(
     () => resolveTerminalProfiles(config?.terminalProfiles),
@@ -239,7 +227,7 @@ export function WorkspaceHeaderMenuMobile({
     <DropdownMenu compactMode="sheet">
       <DropdownMenuTrigger
         testID="workspace-header-menu-trigger"
-        style={workspaceHeaderMenuButtonStyle}
+        style={triggerStyle}
         hitSlop={COMPACT_HEADER_BUTTON_HIT_SLOP}
         accessibilityRole="button"
         accessibilityLabel={t("workspace.header.actions.workspaceActions")}
@@ -252,13 +240,6 @@ export function WorkspaceHeaderMenuMobile({
         testID="workspace-header-menu"
         sheetTitle={t("workspace.header.actions.workspaceActions")}
       >
-        <DropdownMenuItem
-          testID="workspace-header-new-agent"
-          leading={MENU_NEW_AGENT_ICON}
-          onSelect={onCreateDraftTab}
-        >
-          {t("workspace.header.actions.newAgent")}
-        </DropdownMenuItem>
         {showCreateBrowserTab ? (
           <DropdownMenuItem
             testID="workspace-header-new-browser"
@@ -271,14 +252,6 @@ export function WorkspaceHeaderMenuMobile({
         <WorkspaceHeaderWorkspaceActionItems {...workspaceActions} />
         <DropdownMenuSeparator />
         <DropdownMenuLabel>{t("workspace.tabs.actions.terminalProfilesMenu")}</DropdownMenuLabel>
-        <DropdownMenuItem
-          testID="workspace-header-new-terminal"
-          leading={MENU_NEW_TERMINAL_ICON}
-          disabled={createTerminalDisabled}
-          onSelect={onCreateTerminal}
-        >
-          {t("workspace.header.actions.newTerminal")}
-        </DropdownMenuItem>
         {profiles.map((profile) => (
           <HeaderMenuProfileItem
             key={profile.id}
diff --git a/packages/app/src/screens/workspace/workspace-header-project-row.tsx b/packages/app/src/screens/workspace/workspace-header-project-row.tsx
new file mode 100644
index 0000000000..949bf29a19
--- /dev/null
+++ b/packages/app/src/screens/workspace/workspace-header-project-row.tsx
@@ -0,0 +1,68 @@
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { HostBadge } from "@/hosts/host-badge";
+import { useHostBadges } from "@/hosts/use-host-badges";
+
+/**
+ * Which project the workspace belongs to, and which machine it runs on.
+ *
+ * Compact gets both, on their own line under the workspace name: this header is the only thing on
+ * screen that says where the workspace lives, because the sidebar that normally carries the host
+ * badge is closed. It still follows the host's own badge setting, so a purely local setup stays
+ * quiet. A project name that only repeats the workspace name is dropped on wide, where the two sit
+ * side by side, and kept on compact, where the line exists for the host anyway.
+ */
+export function WorkspaceHeaderProjectRow({
+  subtitle,
+  isSubtitleDistinct,
+  serverId,
+}: {
+  subtitle: string;
+  isSubtitleDistinct: boolean;
+  serverId: string;
+}) {
+  const isCompact = useIsCompactFormFactor();
+  const hostBadge = useHostBadges({ enabled: isCompact }).get(serverId) ?? null;
+  const showProject = isSubtitleDistinct || isCompact;
+  if (!showProject && !hostBadge) {
+    return null;
+  }
+  return (
+    <View style={styles.row}>
+      {showProject ? (
+        <Text testID="workspace-header-subtitle" style={styles.project} numberOfLines={1}>
+          {subtitle}
+        </Text>
+      ) : null}
+      {showProject && hostBadge ? <Text style={styles.separator}>·</Text> : null}
+      {hostBadge ? <HostBadge badge={hostBadge} /> : null}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  // The compact header stretches this row to its available title width. Within that width,
+  // the project truncates and HostBadge yields its label while retaining its fixed icon.
+  row: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1.5],
+    minWidth: 0,
+    flexShrink: 1,
+  },
+  project: {
+    color: theme.colors.foregroundMuted,
+    fontSize: {
+      xs: theme.fontSize.sm,
+      md: theme.fontSize.base,
+    },
+    flexShrink: 1,
+    minWidth: 0,
+  },
+  separator: {
+    color: theme.colors.foregroundExtraMuted,
+    fontSize: theme.fontSize.sm,
+    flexShrink: 0,
+  },
+}));
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index d94b7e5e82..dacc17fd3b 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -14,23 +14,26 @@ import {
 } from "react";
 import { useStoreWithEqualityFn } from "zustand/traditional";
 import { useIsFocused } from "@react-navigation/native";
-import { BackHandler, Keyboard, Pressable, Text, View } from "react-native";
+import { BackHandler, Text, View } from "react-native";
 import { useQueryClient } from "@tanstack/react-query";
 import { useRouter, type Href } from "expo-router";
 import * as Clipboard from "expo-clipboard";
 import { useTranslation } from "react-i18next";
-import { ChevronDown } from "lucide-react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import type { Theme } from "@/styles/theme";
 import invariant from "tiny-invariant";
-import { SidebarMenuToggle } from "@/components/headers/menu-header";
+import { SidebarMenuToggle } from "@/components/headers/sidebar-menu-toggle";
 import { ScreenHeader } from "@/components/headers/screen-header";
+import { MenuHeader } from "@/components/headers/menu-header";
+import { FloatingHeaderLayout } from "@/components/floating-header";
+import { StreamTopOverlayProvider, supportsStreamTopOverlay } from "@/agent-stream/top-overlay";
+import {
+  CompactWorkspaceHeader,
+  MobileWorkspaceTabSwitcher,
+} from "@/screens/workspace/compact-workspace-header";
+import { WorkspaceHeaderProjectRow } from "@/screens/workspace/workspace-header-project-row";
 import { ScreenTitle } from "@/components/headers/screen-title";
-import { HostBadge } from "@/hosts/host-badge";
-import { useHostBadges } from "@/hosts/use-host-badges";
-import { Combobox, type ComboboxOption } from "@/components/ui/combobox";
-import type { ShortcutKey } from "@/utils/format-shortcut";
 import {
   FloatingPanelPortalHost,
   FloatingPanelPortalHostNameProvider,
@@ -115,30 +118,20 @@ import { buildProviderCommand } from "@/utils/provider-command-templates";
 import { generateDraftId } from "@/stores/draft-keys";
 import { resolveWorkspaceRouteId } from "@/utils/workspace-identity";
 import { useOpenAgentTabLabels } from "@/subagents/use-open-agent-tab-labels";
-import {
-  WorkspaceTabPresentationResolver,
-  WorkspaceTabIcon,
-  WorkspaceTabOptionRow,
-  type WorkspaceTabPresentation,
-} from "@/screens/workspace/workspace-tab-presentation";
+import { WorkspaceTabPresentationResolver } from "@/screens/workspace/workspace-tab-presentation";
 import {
   useWorkspaceTabRename,
   WorkspaceTabRenameModal,
 } from "@/screens/workspace/use-workspace-tab-rename";
-import { MobileTabTrailingAccessory } from "@/screens/workspace/workspace-tab-trailing-accessory";
 import {
   WorkspaceDesktopTabsRow,
   type WorkspaceDesktopTabRowItem,
 } from "@/screens/workspace/workspace-desktop-tabs-row";
-import {
-  buildWorkspaceTabMenuEntries,
-  type WorkspaceTabMenuLabels,
-} from "@/screens/workspace/workspace-tab-menu";
 import { useDesktopBrowserNewTabRequests } from "@/desktop/browser/new-tab-requests";
 import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
 import {
   resolveWorkspaceExplorerToggleOwner,
-  WorkspaceExplorerToggle,
+  EXPLORER_TOGGLE_KEYS,
   WorkspaceExplorerSidebarToggle,
   WorkspaceHeaderExplorerToggle,
 } from "@/screens/workspace/workspace-explorer-toggle";
@@ -189,7 +182,6 @@ import {
 import { findAdjacentPane } from "@/utils/split-navigation";
 import { supportsDesktopPaneSplits, useIsCompactFormFactor } from "@/constants/layout";
 import { getIsElectron, isNative, isWeb } from "@/constants/platform";
-import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
 import { buildHostRootRoute, buildSettingsHostRoute } from "@/utils/host-routes";
 import { useWorkspaceTerminals } from "@/screens/workspace/terminals/use-workspace-terminals";
 import type { TerminalProfile } from "@getpaseo/protocol/messages";
@@ -246,12 +238,9 @@ function buildWorkspaceFileLocation(
 }
 
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
-const ThemedChevronDown = withUnistyles(ChevronDown);
 
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
-const GATED_WORKSPACE_HEADER_LEFT = <SidebarMenuToggle />;
-
 interface WorkspaceScreenProps {
   serverId: string;
   workspaceId: string;
@@ -301,187 +290,6 @@ function useSyncWorkspaceActiveBrowser(input: {
   }, [focusedBrowserId, input.workspaceId]);
 }
 
-function getFallbackTabOptionLabel(
-  tab: WorkspaceTabDescriptor,
-  labels: {
-    newTab: string;
-    newAgent: string;
-    setup: string;
-    terminal: string;
-    browser: string;
-    agent: string;
-    changes: string;
-    files: string;
-    pullRequest: string;
-  },
-): string {
-  if (tab.target.kind === "new_tab") {
-    return labels.newTab;
-  }
-  if (tab.target.kind === "draft") {
-    return labels.newAgent;
-  }
-  if (tab.target.kind === "setup") {
-    return labels.setup;
-  }
-  if (tab.target.kind === "terminal") {
-    return labels.terminal;
-  }
-  if (tab.target.kind === "browser") {
-    return labels.browser;
-  }
-  if (tab.target.kind === "file") {
-    return tab.target.path.split("/").findLast(Boolean) ?? tab.target.path;
-  }
-  if (tab.target.kind === "working_diff" || tab.target.kind === "changes_tree") {
-    return labels.changes;
-  }
-  if (tab.target.kind === "files") {
-    return labels.files;
-  }
-  if (tab.target.kind === "pull_request") {
-    return labels.pullRequest;
-  }
-  if (tab.target.kind === "commit_diff") {
-    return tab.target.sha.slice(0, 7);
-  }
-  return labels.agent;
-}
-
-function getFallbackTabOptionDescription(
-  tab: WorkspaceTabDescriptor,
-  labels: {
-    newTab: string;
-    newAgent: string;
-    workspaceSetup: string;
-    agent: string;
-    terminal: string;
-    browser: string;
-    changes: string;
-    files: string;
-    pullRequest: string;
-  },
-): string {
-  if (tab.target.kind === "new_tab") {
-    return labels.newTab;
-  }
-  if (tab.target.kind === "draft") {
-    return labels.newAgent;
-  }
-  if (tab.target.kind === "setup") {
-    return labels.workspaceSetup;
-  }
-  if (tab.target.kind === "agent") {
-    return labels.agent;
-  }
-  if (tab.target.kind === "terminal") {
-    return labels.terminal;
-  }
-  if (tab.target.kind === "browser") {
-    return labels.browser;
-  }
-  if (tab.target.kind === "provider_subagent") {
-    return labels.agent;
-  }
-  if (tab.target.kind === "commit_diff") {
-    return tab.target.sha.slice(0, 7);
-  }
-  if (tab.target.kind === "working_diff" || tab.target.kind === "changes_tree") {
-    return labels.changes;
-  }
-  if (tab.target.kind === "files") {
-    return labels.files;
-  }
-  if (tab.target.kind === "pull_request") {
-    return labels.pullRequest;
-  }
-  if (tab.target.kind === "plugin") {
-    return tab.target.panelId;
-  }
-  return tab.target.path;
-}
-
-interface MobileWorkspaceTabSwitcherProps {
-  tabs: WorkspaceTabDescriptor[];
-  activeTabKey: string;
-  activeTab: WorkspaceTabDescriptor | null;
-  tabSwitcherOptions: ComboboxOption[];
-  tabByKey: Map<string, WorkspaceTabDescriptor>;
-  normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  onSelectSwitcherTab: (key: string) => void;
-  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
-  onCopyAgentId: (agentId: string) => Promise<void> | void;
-  onCopyTerminalId: (terminalId: string) => Promise<void> | void;
-  onCopyFilePath: (path: string) => Promise<void> | void;
-  onReloadAgent: (agentId: string) => Promise<void> | void;
-  onRenameTab: (tab: WorkspaceTabDescriptor) => void;
-  onCloseTab: (tabId: string) => Promise<void> | void;
-  onCloseTabsAbove: (tabId: string) => Promise<void> | void;
-  onCloseTabsBelow: (tabId: string) => Promise<void> | void;
-  onCloseOtherTabs: (tabId: string) => Promise<void> | void;
-}
-
-function MobileActiveTabTrigger({
-  activeTab,
-  normalizedServerId,
-  normalizedWorkspaceId,
-  backdrop,
-}: {
-  activeTab: WorkspaceTabDescriptor | null;
-  normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  backdrop: SurfaceBackdrop;
-}) {
-  if (!activeTab) {
-    return null;
-  }
-
-  return (
-    <ResolvedMobileActiveTabTrigger
-      activeTab={activeTab}
-      normalizedServerId={normalizedServerId}
-      normalizedWorkspaceId={normalizedWorkspaceId}
-      backdrop={backdrop}
-    />
-  );
-}
-
-function ResolvedMobileActiveTabTrigger({
-  activeTab,
-  normalizedServerId,
-  normalizedWorkspaceId,
-  backdrop,
-}: {
-  activeTab: WorkspaceTabDescriptor;
-  normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  backdrop: SurfaceBackdrop;
-}) {
-  const { t } = useTranslation();
-  return (
-    <WorkspaceTabPresentationResolver
-      tab={activeTab}
-      serverId={normalizedServerId}
-      workspaceId={normalizedWorkspaceId}
-    >
-      {(presentation) => (
-        <>
-          <View style={styles.switcherTriggerIcon} testID="workspace-active-tab-icon">
-            <WorkspaceTabIcon presentation={presentation} active backdrop={backdrop} />
-          </View>
-
-          <Text style={styles.switcherTriggerText} numberOfLines={1}>
-            {presentation.titleState === "loading"
-              ? t("workspace.tabs.loading")
-              : presentation.label}
-          </Text>
-        </>
-      )}
-    </WorkspaceTabPresentationResolver>
-  );
-}
-
 function WorkspaceDocumentTitleEffect({
   label,
   titleState,
@@ -504,277 +312,6 @@ function WorkspaceDocumentTitleEffect({
   return null;
 }
 
-function switcherTriggerStyle({ pressed }: { pressed?: boolean }) {
-  return [styles.switcherTrigger, Boolean(pressed) && styles.switcherTriggerPressed];
-}
-
-function MobileWorkspaceTabOption({
-  tab,
-  tabIndex,
-  tabCount,
-  normalizedServerId,
-  normalizedWorkspaceId,
-  selected,
-  active,
-  onPress,
-  onCopyResumeCommand,
-  onCopyAgentId,
-  onCopyTerminalId,
-  onCopyFilePath,
-  onReloadAgent,
-  onRenameTab,
-  onCloseTab,
-  onCloseTabsAbove,
-  onCloseTabsBelow,
-  onCloseOtherTabs,
-}: {
-  tab: WorkspaceTabDescriptor;
-  tabIndex: number;
-  tabCount: number;
-  normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  selected: boolean;
-  active: boolean;
-  onPress: () => void;
-  onCopyResumeCommand: (agentId: string) => Promise<void> | void;
-  onCopyAgentId: (agentId: string) => Promise<void> | void;
-  onCopyTerminalId: (terminalId: string) => Promise<void> | void;
-  onCopyFilePath: (path: string) => Promise<void> | void;
-  onReloadAgent: (agentId: string) => Promise<void> | void;
-  onRenameTab: (tab: WorkspaceTabDescriptor) => void;
-  onCloseTab: (tabId: string) => Promise<void> | void;
-  onCloseTabsAbove: (tabId: string) => Promise<void> | void;
-  onCloseTabsBelow: (tabId: string) => Promise<void> | void;
-  onCloseOtherTabs: (tabId: string) => Promise<void> | void;
-}) {
-  const { t } = useTranslation();
-  const tabMenuLabels = useMemo<WorkspaceTabMenuLabels>(
-    () => ({
-      copyResumeCommand: t("workspace.tabs.menu.copyResumeCommand"),
-      copyAgentId: t("workspace.tabs.menu.copyAgentId"),
-      copyTerminalId: t("workspace.tabs.menu.copyTerminalId"),
-      copyFilePath: t("workspace.tabs.menu.copyFilePath"),
-      rename: t("workspace.tabs.menu.rename"),
-      closeAbove: t("workspace.tabs.menu.closeAbove"),
-      closeBelow: t("workspace.tabs.menu.closeBelow"),
-      closeLeft: t("workspace.tabs.menu.closeLeft"),
-      closeRight: t("workspace.tabs.menu.closeRight"),
-      closeOthers: t("workspace.tabs.menu.closeOthers"),
-      reloadAgent: t("workspace.tabs.menu.reloadAgent"),
-      reloadAgentTooltip: t("workspace.tabs.menu.reloadAgentTooltip"),
-      close: t("workspace.tabs.menu.close"),
-    }),
-    [t],
-  );
-  const menuTestIDBase = `workspace-tab-menu-${tab.tabId}`;
-  const menuEntries = buildWorkspaceTabMenuEntries({
-    surface: "mobile",
-    tab,
-    index: tabIndex,
-    tabCount,
-    menuTestIDBase,
-    onCopyResumeCommand,
-    onCopyAgentId,
-    onCopyTerminalId,
-    onCopyFilePath,
-    onReloadAgent,
-    onRenameTab,
-    onCloseTab,
-    onCloseTabsBefore: onCloseTabsAbove,
-    onCloseTabsAfter: onCloseTabsBelow,
-    onCloseOtherTabs,
-    labels: tabMenuLabels,
-  });
-
-  const fallbackLabels = useMemo(
-    () => ({
-      newTab: t("workspace.tabs.actions.newTab"),
-      newAgent: t("workspace.tabs.fallback.newAgent"),
-      setup: t("workspace.tabs.fallback.setup"),
-      terminal: t("workspace.tabs.fallback.terminal"),
-      browser: t("workspace.tabs.fallback.browser"),
-      agent: t("workspace.tabs.fallback.agent"),
-      changes: t("panels.diff.changesLabel"),
-      files: t("panels.files.label"),
-      pullRequest: t("panels.pullRequest.label"),
-    }),
-    [t],
-  );
-  const fallbackLabel = getFallbackTabOptionLabel(tab, fallbackLabels);
-  const trailingAccessory = useMemo(
-    () => (
-      <MobileTabTrailingAccessory
-        menuTestIDBase={menuTestIDBase}
-        presentationLabel={fallbackLabel}
-        menuEntries={menuEntries}
-      />
-    ),
-    [menuTestIDBase, fallbackLabel, menuEntries],
-  );
-
-  const renderPresentation = useCallback(
-    (presentation: WorkspaceTabPresentation) => (
-      <WorkspaceTabOptionRow
-        presentation={presentation}
-        selected={selected}
-        active={active}
-        onPress={onPress}
-        trailingAccessory={trailingAccessory}
-      />
-    ),
-    [selected, active, onPress, trailingAccessory],
-  );
-
-  return (
-    <WorkspaceTabPresentationResolver
-      tab={tab}
-      serverId={normalizedServerId}
-      workspaceId={normalizedWorkspaceId}
-    >
-      {renderPresentation}
-    </WorkspaceTabPresentationResolver>
-  );
-}
-
-const MobileWorkspaceTabSwitcher = memo(function MobileWorkspaceTabSwitcher({
-  tabs,
-  activeTabKey,
-  activeTab,
-  tabSwitcherOptions,
-  tabByKey,
-  normalizedServerId,
-  normalizedWorkspaceId,
-  onSelectSwitcherTab,
-  onCopyResumeCommand,
-  onCopyAgentId,
-  onCopyTerminalId,
-  onCopyFilePath,
-  onReloadAgent,
-  onRenameTab,
-  onCloseTab,
-  onCloseTabsAbove,
-  onCloseTabsBelow,
-  onCloseOtherTabs,
-}: MobileWorkspaceTabSwitcherProps) {
-  const { t } = useTranslation();
-  const [isOpen, setIsOpen] = useState(false);
-  const anchorRef = useRef<View>(null);
-  const tabIndexByKey = useMemo(() => {
-    const map = new Map<string, number>();
-    tabs.forEach((tab, index) => {
-      map.set(tab.key, index);
-    });
-    return map;
-  }, [tabs]);
-
-  const handleOpenSwitcher = useCallback(() => {
-    Keyboard.dismiss();
-    setIsOpen(true);
-  }, []);
-
-  const renderTabOption = useCallback(
-    ({
-      option,
-      selected,
-      active,
-      onPress,
-    }: {
-      option: ComboboxOption;
-      selected: boolean;
-      active: boolean;
-      onPress: () => void;
-    }) => {
-      const tab = tabByKey.get(option.id);
-      if (!tab) {
-        return <View />;
-      }
-      const tabIndex = tabIndexByKey.get(tab.key) ?? -1;
-      if (tabIndex < 0) {
-        return <View />;
-      }
-      return (
-        <MobileWorkspaceTabOption
-          tab={tab}
-          tabIndex={tabIndex}
-          tabCount={tabs.length}
-          normalizedServerId={normalizedServerId}
-          normalizedWorkspaceId={normalizedWorkspaceId}
-          selected={selected}
-          active={active}
-          onPress={onPress}
-          onCopyResumeCommand={onCopyResumeCommand}
-          onCopyAgentId={onCopyAgentId}
-          onCopyTerminalId={onCopyTerminalId}
-          onCopyFilePath={onCopyFilePath}
-          onReloadAgent={onReloadAgent}
-          onRenameTab={onRenameTab}
-          onCloseTab={onCloseTab}
-          onCloseTabsAbove={onCloseTabsAbove}
-          onCloseTabsBelow={onCloseTabsBelow}
-          onCloseOtherTabs={onCloseOtherTabs}
-        />
-      );
-    },
-    [
-      tabByKey,
-      tabIndexByKey,
-      tabs.length,
-      normalizedServerId,
-      normalizedWorkspaceId,
-      onCopyResumeCommand,
-      onCopyAgentId,
-      onCopyTerminalId,
-      onCopyFilePath,
-      onReloadAgent,
-      onRenameTab,
-      onCloseTab,
-      onCloseTabsAbove,
-      onCloseTabsBelow,
-      onCloseOtherTabs,
-    ],
-  );
-
-  return (
-    <View style={styles.mobileTabsRow} testID="workspace-tabs-row">
-      <Pressable
-        ref={anchorRef}
-        testID="workspace-tab-switcher-trigger"
-        accessibilityRole="button"
-        accessibilityLabel={t("workspace.tabs.switcher.trigger", { count: tabs.length })}
-        style={switcherTriggerStyle}
-        onPress={handleOpenSwitcher}
-      >
-        {({ pressed }) => (
-          <>
-            <View style={styles.switcherTriggerLeft}>
-              <MobileActiveTabTrigger
-                activeTab={activeTab}
-                normalizedServerId={normalizedServerId}
-                normalizedWorkspaceId={normalizedWorkspaceId}
-                backdrop={pressed ? "surface1" : "surface0"}
-              />
-            </View>
-            <ThemedChevronDown size={14} uniProps={mutedColorMapping} />
-          </>
-        )}
-      </Pressable>
-
-      <Combobox
-        options={tabSwitcherOptions}
-        value={activeTabKey}
-        onSelect={onSelectSwitcherTab}
-        searchable={false}
-        title={t("workspace.tabs.switcher.title")}
-        searchPlaceholder={t("workspace.tabs.switcher.searchPlaceholder")}
-        open={isOpen}
-        onOpenChange={setIsOpen}
-        anchorRef={anchorRef}
-        renderOption={renderTabOption}
-      />
-    </View>
-  );
-});
-
 interface MobileMountedTabSlotProps {
   tabDescriptor: WorkspaceTabDescriptor;
   isVisible: boolean;
@@ -902,47 +439,6 @@ function useCloseTabs(): UseCloseTabsResult {
   return { closingTabIds, closeTab };
 }
 
-/**
- * Which project the workspace belongs to, and which machine it runs on.
- *
- * Compact gets both, on their own line under the workspace name: this header is the only thing on
- * screen that says where the workspace lives, because the sidebar that normally carries the host
- * badge is closed. It still follows the host's own badge setting, so a purely local setup stays
- * quiet. A project name that only repeats the workspace name is dropped on wide, where the two sit
- * side by side, and kept on compact, where the line exists for the host anyway.
- */
-function WorkspaceHeaderProjectRow({
-  subtitle,
-  isSubtitleDistinct,
-  serverId,
-}: {
-  subtitle: string;
-  isSubtitleDistinct: boolean;
-  serverId: string;
-}) {
-  const isCompact = useIsCompactFormFactor();
-  const hostBadge = useHostBadges({ enabled: isCompact }).get(serverId) ?? null;
-  const showProject = isSubtitleDistinct || isCompact;
-  if (!showProject && !hostBadge) {
-    return null;
-  }
-  return (
-    <View style={styles.headerProjectRow}>
-      {showProject ? (
-        <Text
-          testID="workspace-header-subtitle"
-          style={styles.headerProjectTitle}
-          numberOfLines={1}
-        >
-          {subtitle}
-        </Text>
-      ) : null}
-      {showProject && hostBadge ? <Text style={styles.headerProjectSeparator}>·</Text> : null}
-      {hostBadge ? <HostBadge badge={hostBadge} /> : null}
-    </View>
-  );
-}
-
 interface WorkspaceHeaderTitleBarProps {
   isLoading: boolean;
   title: string;
@@ -950,26 +446,13 @@ interface WorkspaceHeaderTitleBarProps {
   isSubtitleDistinct: boolean;
   currentBranchName: string | null;
   normalizedServerId: string;
-  normalizedWorkspaceId: string;
-  workspaceScripts: WorkspaceDescriptor["scripts"];
-  liveTerminalIds: string[];
   showWorkspaceSetup: boolean;
-  showCreateBrowserTab: boolean;
-  isMobile: boolean;
-  createTerminalDisabled: boolean;
   importAgentDisabled: boolean;
   copyPathDisabled: boolean;
-  onCreateDraftTab: () => void;
-  onCreateTerminal: () => void;
-  onCreateTerminalWithProfile: (profile: TerminalProfile) => void;
-  onCreateBrowser: () => void;
   onOpenImportSheet: () => void;
   onCopyWorkspacePath: () => void;
   onCopyBranchName: () => void;
   onOpenSetupTab: () => void;
-  onScriptTerminalStarted: (terminalId: string) => void;
-  onViewScriptTerminal: (terminalId: string) => void;
-  onOpenUrlInBrowserTab: (url: string) => void;
 }
 
 function WorkspaceHeaderTitleBar({
@@ -979,26 +462,13 @@ function WorkspaceHeaderTitleBar({
   isSubtitleDistinct,
   currentBranchName,
   normalizedServerId,
-  normalizedWorkspaceId,
-  workspaceScripts,
-  liveTerminalIds,
   showWorkspaceSetup,
-  showCreateBrowserTab,
-  isMobile,
-  createTerminalDisabled,
   importAgentDisabled,
   copyPathDisabled,
-  onCreateDraftTab,
-  onCreateTerminal,
-  onCreateTerminalWithProfile,
-  onCreateBrowser,
   onOpenImportSheet,
   onCopyWorkspacePath,
   onCopyBranchName,
   onOpenSetupTab,
-  onScriptTerminalStarted,
-  onViewScriptTerminal,
-  onOpenUrlInBrowserTab,
 }: WorkspaceHeaderTitleBarProps) {
   return (
     <View style={styles.headerTitleContainer}>
@@ -1017,49 +487,16 @@ function WorkspaceHeaderTitleBar({
         </View>
       )}
       <View style={styles.compactHeaderMenuCluster}>
-        {isMobile ? (
-          <WorkspaceHeaderMenuMobile
-            normalizedServerId={normalizedServerId}
-            currentBranchName={currentBranchName}
-            showWorkspaceSetup={showWorkspaceSetup}
-            showCreateBrowserTab={showCreateBrowserTab}
-            createTerminalDisabled={createTerminalDisabled}
-            importAgentDisabled={importAgentDisabled}
-            copyPathDisabled={copyPathDisabled}
-            onCreateDraftTab={onCreateDraftTab}
-            onCreateTerminal={onCreateTerminal}
-            onCreateTerminalWithProfile={onCreateTerminalWithProfile}
-            onCreateBrowser={onCreateBrowser}
-            onOpenImportSheet={onOpenImportSheet}
-            onCopyWorkspacePath={onCopyWorkspacePath}
-            onCopyBranchName={onCopyBranchName}
-            onOpenSetupTab={onOpenSetupTab}
-          />
-        ) : (
-          <WorkspaceHeaderMenuDesktop
-            currentBranchName={currentBranchName}
-            showWorkspaceSetup={showWorkspaceSetup}
-            importAgentDisabled={importAgentDisabled}
-            copyPathDisabled={copyPathDisabled}
-            onOpenImportSheet={onOpenImportSheet}
-            onCopyWorkspacePath={onCopyWorkspacePath}
-            onCopyBranchName={onCopyBranchName}
-            onOpenSetupTab={onOpenSetupTab}
-          />
-        )}
-        {isMobile && workspaceScripts.length > 0 ? (
-          <WorkspaceScriptsButton
-            serverId={normalizedServerId}
-            workspaceId={normalizedWorkspaceId}
-            scripts={workspaceScripts}
-            liveTerminalIds={liveTerminalIds}
-            onScriptTerminalStarted={onScriptTerminalStarted}
-            onViewTerminal={onViewScriptTerminal}
-            onOpenUrlInBrowserTab={onOpenUrlInBrowserTab}
-            hideLabels
-            presentation="ghost"
-          />
-        ) : null}
+        <WorkspaceHeaderMenuDesktop
+          currentBranchName={currentBranchName}
+          showWorkspaceSetup={showWorkspaceSetup}
+          importAgentDisabled={importAgentDisabled}
+          copyPathDisabled={copyPathDisabled}
+          onOpenImportSheet={onOpenImportSheet}
+          onCopyWorkspacePath={onCopyWorkspacePath}
+          onCopyBranchName={onCopyBranchName}
+          onOpenSetupTab={onOpenSetupTab}
+        />
       </View>
     </View>
   );
@@ -1293,7 +730,7 @@ function shouldInspectWorkspaceRecovery(
 function WorkspaceScreenGateFrame({ children }: { children: ReactNode }) {
   return (
     <>
-      <ScreenHeader left={GATED_WORKSPACE_HEADER_LEFT} />
+      <MenuHeader />
       <View style={styles.centerContent}>{children}</View>
     </>
   );
@@ -1375,6 +812,10 @@ function WorkspaceDocumentTitleEffectSlot({
   );
 }
 
+function floatsHeaderOverContent(activeTab: WorkspaceTabDescriptor | null): boolean {
+  return supportsStreamTopOverlay && activeTab?.kind === "agent";
+}
+
 function shouldShowWorkspaceScreenHeader(input: {
   isFocusModeEnabled: boolean;
   isMobile: boolean;
@@ -2300,14 +1741,6 @@ function WorkspaceScreenContent({
       terminalsQueryKey,
     });
 
-  const tabByKey = useMemo(() => {
-    const map = new Map<string, WorkspaceTabDescriptor>();
-    for (const tab of tabs) {
-      map.set(tab.key, tab);
-    }
-    return map;
-  }, [tabs]);
-
   const allTabDescriptorsById = useMemo(() => {
     const map = new Map<string, WorkspaceTabDescriptor>();
     for (const tab of uiTabs) {
@@ -2353,32 +1786,6 @@ function WorkspaceScreenContent({
     : t("workspace.tabs.explorerSidebar.open");
 
   const activeTabKey = useMemo(() => activeTabId ?? "", [activeTabId]);
-  const tabFallbackLabels = useMemo(
-    () => ({
-      newTab: t("workspace.tabs.actions.newTab"),
-      newAgent: t("workspace.tabs.fallback.newAgent"),
-      setup: t("workspace.tabs.fallback.setup"),
-      workspaceSetup: t("workspace.tabs.fallback.workspaceSetup"),
-      terminal: t("workspace.tabs.fallback.terminal"),
-      browser: t("workspace.tabs.fallback.browser"),
-      agent: t("workspace.tabs.fallback.agent"),
-      changes: t("panels.diff.changesLabel"),
-      files: t("panels.files.label"),
-      pullRequest: t("panels.pullRequest.label"),
-    }),
-    [t],
-  );
-
-  const tabSwitcherOptions = useMemo(
-    () =>
-      tabs.map((tab) => ({
-        id: tab.key,
-        label: getFallbackTabOptionLabel(tab, tabFallbackLabels),
-        description: getFallbackTabOptionDescription(tab, tabFallbackLabels),
-      })),
-    [tabFallbackLabels, tabs],
-  );
-
   const handleCreateDraftTab = useCallback(
     (input?: { paneId?: string }) => {
       openWorkspaceDraftTab({ paneId: input?.paneId });
@@ -3759,7 +3166,7 @@ function WorkspaceScreenContent({
     () => (
       <View style={styles.headerRight}>
         <PluginHeaderButtons serverId={normalizedServerId} workspaceId={normalizedWorkspaceId} />
-        {!isMobile && workspaceDescriptor && workspaceDescriptor.scripts.length > 0 ? (
+        {workspaceDescriptor && workspaceDescriptor.scripts.length > 0 ? (
           <WorkspaceScriptsButton
             serverId={normalizedServerId}
             workspaceId={normalizedWorkspaceId}
@@ -3771,7 +3178,7 @@ function WorkspaceScreenContent({
             hideLabels
           />
         ) : null}
-        {!isMobile && workspaceDirectory ? (
+        {workspaceDirectory ? (
           <WorkspaceOpenInEditorButton
             serverId={normalizedServerId}
             cwd={workspaceDirectory}
@@ -3779,7 +3186,7 @@ function WorkspaceScreenContent({
             hideLabels
           />
         ) : null}
-        {!isMobile && workspaceDirectory ? (
+        {workspaceDirectory ? (
           <>
             <WorkspaceActions serverId={normalizedServerId} cwd={workspaceDirectory} />
             <WorkspaceHeaderExplorerToggle
@@ -3793,20 +3200,9 @@ function WorkspaceScreenContent({
             />
           </>
         ) : null}
-        {isMobile ? (
-          <WorkspaceExplorerToggle
-            onPress={handleToggleExplorerSidebar}
-            label={explorerSidebarToggleLabel}
-            tooltipLabel={t("workspace.tabs.explorerSidebar.toggle")}
-            tooltipKeys={EXPLORER_TOGGLE_KEYS}
-            accessibilityState={explorerSidebarToggleAccessibilityState}
-            mobile
-          />
-        ) : null}
       </View>
     ),
     [
-      isMobile,
       workspaceDescriptor,
       normalizedServerId,
       normalizedWorkspaceId,
@@ -3892,26 +3288,13 @@ function WorkspaceScreenContent({
                 isSubtitleDistinct={isWorkspaceHeaderSubtitleDistinct}
                 currentBranchName={currentBranchName}
                 normalizedServerId={normalizedServerId}
-                normalizedWorkspaceId={normalizedWorkspaceId}
-                workspaceScripts={workspaceScripts}
-                liveTerminalIds={liveTerminalIds}
                 showWorkspaceSetup={showWorkspaceSetup}
-                showCreateBrowserTab={showCreateBrowserTab}
-                isMobile={isMobile}
-                createTerminalDisabled={createTerminalDisabled}
                 importAgentDisabled={!canOpenImportSheet}
                 copyPathDisabled={!workspaceDirectory}
-                onCreateDraftTab={handleCreateDraftTab}
-                onCreateTerminal={handleCreateTerminal}
-                onCreateTerminalWithProfile={handleCreateTerminalWithProfile}
-                onCreateBrowser={handleCreateBrowserTab}
                 onOpenImportSheet={openImportSheet}
                 onCopyWorkspacePath={handleCopyWorkspacePath}
                 onCopyBranchName={handleCopyBranchName}
                 onOpenSetupTab={handleOpenSetupTab}
-                onScriptTerminalStarted={handleScriptTerminalStarted}
-                onViewScriptTerminal={handleViewScriptTerminal}
-                onOpenUrlInBrowserTab={handleOpenUrlInBrowserTab}
               />
             </>
           }
@@ -3920,33 +3303,110 @@ function WorkspaceScreenContent({
       ) : null,
     [
       canOpenImportSheet,
-      createTerminalDisabled,
       currentBranchName,
       handleCopyBranchName,
       handleCopyWorkspacePath,
-      handleCreateBrowserTab,
-      handleCreateDraftTab,
-      handleCreateTerminal,
-      handleCreateTerminalWithProfile,
       handleOpenSetupTab,
-      handleOpenUrlInBrowserTab,
-      handleScriptTerminalStarted,
-      handleViewScriptTerminal,
       headerRight,
-      isMobile,
       isWorkspaceHeaderLoading,
-      liveTerminalIds,
       normalizedServerId,
-      normalizedWorkspaceId,
       openImportSheet,
-      showCreateBrowserTab,
       showScreenHeader,
       showWorkspaceSetup,
       workspaceDirectory,
       workspaceHeaderSubtitle,
       workspaceHeaderTitle,
       isWorkspaceHeaderSubtitleDistinct,
-      workspaceScripts,
+    ],
+  );
+  const compactWorkspaceHeader = useMemo(
+    () =>
+      isMobile ? (
+        <CompactWorkspaceHeader
+          isLoading={isWorkspaceHeaderLoading}
+          title={workspaceHeaderTitle}
+          subtitle={workspaceHeaderSubtitle}
+          isSubtitleDistinct={isWorkspaceHeaderSubtitleDistinct}
+          serverId={normalizedServerId}
+          onToggleExplorer={handleToggleExplorerSidebar}
+          explorerToggleLabel={explorerSidebarToggleLabel}
+          explorerToggleAccessibilityState={explorerSidebarToggleAccessibilityState}
+        >
+          <MobileWorkspaceTabSwitcher
+            tabs={tabs}
+            activeTabKey={activeTabKey}
+            normalizedServerId={normalizedServerId}
+            normalizedWorkspaceId={normalizedWorkspaceId}
+            onSelectSwitcherTab={handleSelectSwitcherTab}
+            createTerminalDisabled={createTerminalDisabled}
+            onCreateDraftTab={handleCreateDraftTab}
+            onCreateTerminal={handleCreateTerminal}
+            onCopyResumeCommand={handleCopyResumeCommand}
+            onCopyAgentId={handleCopyAgentId}
+            onCopyTerminalId={handleCopyTerminalId}
+            onCopyFilePath={handleCopyFilePath}
+            onReloadAgent={handleReloadAgent}
+            onRenameTab={handleRenameTab}
+            onCloseTab={handleCloseTabById}
+            onCloseTabsAbove={handleCloseTabsToLeft}
+            onCloseTabsBelow={handleCloseTabsToRight}
+            onCloseOtherTabs={handleCloseOtherTabs}
+          />
+          <WorkspaceHeaderMenuMobile
+            normalizedServerId={normalizedServerId}
+            currentBranchName={currentBranchName}
+            showWorkspaceSetup={showWorkspaceSetup}
+            showCreateBrowserTab={showCreateBrowserTab}
+            createTerminalDisabled={createTerminalDisabled}
+            importAgentDisabled={!canOpenImportSheet}
+            copyPathDisabled={!workspaceDirectory}
+            onCreateTerminalWithProfile={handleCreateTerminalWithProfile}
+            onCreateBrowser={handleCreateBrowserTab}
+            onOpenImportSheet={openImportSheet}
+            onCopyWorkspacePath={handleCopyWorkspacePath}
+            onCopyBranchName={handleCopyBranchName}
+            onOpenSetupTab={handleOpenSetupTab}
+          />
+        </CompactWorkspaceHeader>
+      ) : null,
+    [
+      activeTabKey,
+      canOpenImportSheet,
+      createTerminalDisabled,
+      currentBranchName,
+      explorerSidebarToggleAccessibilityState,
+      explorerSidebarToggleLabel,
+      handleCloseOtherTabs,
+      handleCloseTabById,
+      handleCloseTabsToLeft,
+      handleCloseTabsToRight,
+      handleCopyAgentId,
+      handleCopyBranchName,
+      handleCopyFilePath,
+      handleCopyResumeCommand,
+      handleCopyTerminalId,
+      handleCopyWorkspacePath,
+      handleCreateBrowserTab,
+      handleCreateDraftTab,
+      handleCreateTerminal,
+      handleCreateTerminalWithProfile,
+      handleOpenSetupTab,
+      handleReloadAgent,
+      handleRenameTab,
+      handleSelectSwitcherTab,
+      handleToggleExplorerSidebar,
+      isMobile,
+      isWorkspaceHeaderLoading,
+      isWorkspaceHeaderSubtitleDistinct,
+      normalizedServerId,
+      normalizedWorkspaceId,
+      openImportSheet,
+      showCreateBrowserTab,
+      showWorkspaceSetup,
+      tabs,
+      workspaceDirectory,
+      workspaceHeaderSubtitle,
+      workspaceHeaderTitle,
     ],
   );
   const desktopSplitContent = useMemo(() => {
@@ -4035,33 +3495,23 @@ function WorkspaceScreenContent({
     />
   );
 
-  const workspaceCenterColumn = (
+  const workspaceCenterColumn = isMobile ? (
+    <View style={styles.centerColumn}>
+      <FloatingHeaderLayout
+        header={compactWorkspaceHeader}
+        floating={floatsHeaderOverContent(activeTabDescriptor)}
+      >
+        {(topOverlayInset) => (
+          <StreamTopOverlayProvider value={topOverlayInset}>
+            {workspacePanelContent}
+          </StreamTopOverlayProvider>
+        )}
+      </FloatingHeaderLayout>
+    </View>
+  ) : (
     <View style={styles.centerColumn}>
       {rendersDesktopSplitContent ? null : renderWorkspaceScreenHeader()}
 
-      {isMobile ? (
-        <MobileWorkspaceTabSwitcher
-          tabs={tabs}
-          activeTabKey={activeTabKey}
-          activeTab={activeTabDescriptor}
-          tabSwitcherOptions={tabSwitcherOptions}
-          tabByKey={tabByKey}
-          normalizedServerId={normalizedServerId}
-          normalizedWorkspaceId={normalizedWorkspaceId}
-          onSelectSwitcherTab={handleSelectSwitcherTab}
-          onCopyResumeCommand={handleCopyResumeCommand}
-          onCopyAgentId={handleCopyAgentId}
-          onCopyTerminalId={handleCopyTerminalId}
-          onCopyFilePath={handleCopyFilePath}
-          onReloadAgent={handleReloadAgent}
-          onRenameTab={handleRenameTab}
-          onCloseTab={handleCloseTabById}
-          onCloseTabsAbove={handleCloseTabsToLeft}
-          onCloseTabsBelow={handleCloseTabsToRight}
-          onCloseOtherTabs={handleCloseOtherTabs}
-        />
-      ) : null}
-
       {shouldRenderDesktopPaneFallback ? (
         <NewTabLauncherProvider value={newTabLauncher}>
           <WorkspaceDesktopTabsRow
@@ -4190,30 +3640,6 @@ const styles = StyleSheet.create((theme) => ({
       md: theme.spacing[2],
     },
   },
-  // No width cap. A percentage cap resolves against the title group, whose own width comes from
-  // this row's content, so it clips the project name while there is still room beside it.
-  // `flexShrink` on both this row and the title already gives up space only when there is none.
-  headerProjectRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1.5],
-    minWidth: 0,
-    flexShrink: 1,
-  },
-  headerProjectTitle: {
-    color: theme.colors.foregroundMuted,
-    fontSize: {
-      xs: theme.fontSize.sm,
-      md: theme.fontSize.base,
-    },
-    flexShrink: 1,
-    minWidth: 0,
-  },
-  headerProjectSeparator: {
-    color: theme.colors.foregroundExtraMuted,
-    fontSize: theme.fontSize.sm,
-    flexShrink: 0,
-  },
   headerTitleSkeleton: {
     width: 220,
     maxWidth: "100%",
@@ -4272,37 +3698,6 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[2],
   },
   newTabTooltipShortcut: {},
-  mobileTabsRow: {
-    backgroundColor: theme.colors.surface0,
-    borderBottomWidth: theme.borderWidth[1],
-    borderBottomColor: theme.colors.border,
-  },
-  switcherTrigger: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    paddingHorizontal: theme.spacing[2] + theme.spacing[3],
-    paddingVertical: theme.spacing[2],
-  },
-  switcherTriggerPressed: {
-    backgroundColor: theme.colors.surface1,
-  },
-  switcherTriggerLeft: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-    flex: 1,
-    minWidth: 0,
-  },
-  switcherTriggerIcon: {
-    flexShrink: 0,
-  },
-  switcherTriggerText: {
-    minWidth: 0,
-    flex: 1,
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-  },
   headerMenuProfileIconWrapper: {
     width: 16,
     height: 16,
@@ -4417,5 +3812,3 @@ const styles = StyleSheet.create((theme) => ({
     textAlign: "center",
   },
 }));
-
-const EXPLORER_TOGGLE_KEYS: ShortcutKey[] = ["mod", "E"];
diff --git a/packages/app/src/styles/density.ts b/packages/app/src/styles/density.ts
new file mode 100644
index 0000000000..5b452bcb93
--- /dev/null
+++ b/packages/app/src/styles/density.ts
@@ -0,0 +1,57 @@
+import { isCompactBreakpoint } from "@/constants/layout";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
+
+/**
+ * Density sizes for surfaces that opt into touch sizing: rows, icons, and text grow on compact
+ * layouts and keep their desktop sizes from the `md` breakpoint up. Plain theme tokens stay
+ * desktop-sized everywhere, so a surface migrates by swapping its sizes for these.
+ *
+ * Style values are Unistyles breakpoint values, resolved inside `StyleSheet.create`. Icon sizes
+ * are props, so icons take them through `DensityIcon` or a `densityIconProps` mapping.
+ */
+
+export type DensityIconSize = keyof typeof ICON_SIZE;
+type TextSize = "sm" | "base";
+
+const COMPACT_ICON_SIZE: Record<DensityIconSize, number> = { xs: 14, sm: 18, md: 20, lg: 24 };
+const COMPACT_TEXT_SIZE: Record<TextSize, keyof Theme["fontSize"]> = { sm: "base", base: "lg" };
+
+// Compact layouts end where `md` begins; see `isCompactBreakpoint`.
+function byLayout<T>(compact: T, desktop: T) {
+  return { xs: compact, md: desktop };
+}
+
+export const density = {
+  /** A list row such as a sidebar entry. */
+  rowHeight: byLayout(44, 36),
+  /** A row in a tight group, such as the sidebar's navigation rows. */
+  tightRowHeight: byLayout(40, 28),
+  /** The line height of a row's `base` text; slots that align to its first line share it. */
+  rowLineHeight: byLayout(22, 20),
+  /** A square icon-only button that sits in a row or toolbar. */
+  iconButton: byLayout(44, 28),
+};
+
+/** The width or height of a slot that holds an icon of `size`. */
+export function densityIconBox(size: DensityIconSize) {
+  return byLayout(COMPACT_ICON_SIZE[size], ICON_SIZE[size]);
+}
+
+export function densityFontSize(theme: Theme, size: TextSize) {
+  return byLayout(theme.fontSize[COMPACT_TEXT_SIZE[size]], theme.fontSize[size]);
+}
+
+export function densityIconSize(rt: { breakpoint?: string }, size: DensityIconSize): number {
+  return isCompactBreakpoint(rt.breakpoint) ? COMPACT_ICON_SIZE[size] : ICON_SIZE[size];
+}
+
+/** Extends a `withUnistyles` icon mapping so the icon also takes its density size. */
+export function densityIconProps<P extends object>(
+  size: DensityIconSize,
+  mapping: (theme: Theme) => P,
+) {
+  return (theme: Theme, rt: { breakpoint?: string }) => ({
+    ...mapping(theme),
+    size: densityIconSize(rt, size),
+  });
+}
diff --git a/packages/app/src/styles/theme.test.ts b/packages/app/src/styles/theme.test.ts
index 707085e7c9..461d980ecd 100644
--- a/packages/app/src/styles/theme.test.ts
+++ b/packages/app/src/styles/theme.test.ts
@@ -68,9 +68,9 @@ describe("Pure black theme", () => {
 });
 
 describe("Sidebar interaction surfaces", () => {
-  it("keeps Light selection distinct from the sidebar surface", () => {
-    expect(lightTheme.colors.surfaceSidebarHover).toBe(lightTheme.colors.surface1);
-    expect(lightTheme.colors.surfaceSidebarSelected).toBe(lightTheme.colors.surface3);
+  it("keeps Light hover and selection darker than the sidebar surface", () => {
+    expect(lightTheme.colors.surfaceSidebarHover).toBe(lightTheme.colors.surface3);
+    expect(lightTheme.colors.surfaceSidebarSelected).toBe(lightTheme.colors.surface4);
     expect(lightTheme.colors.surfaceSidebarSelected).not.toBe(lightTheme.colors.surfaceSidebar);
   });
 
diff --git a/packages/app/src/styles/theme.ts b/packages/app/src/styles/theme.ts
index 04b1e8f6ae..8e1e77aac7 100644
--- a/packages/app/src/styles/theme.ts
+++ b/packages/app/src/styles/theme.ts
@@ -267,8 +267,8 @@ export function buildLightSemanticColors(tint: LightThemeConfig) {
     surface4: tint.surface4,
     surfaceDiffEmpty: tint.surfaceDiffEmpty,
     surfaceSidebar: tint.surfaceSidebar,
-    surfaceSidebarHover: tint.surface1,
-    surfaceSidebarSelected: tint.surface3,
+    surfaceSidebarHover: tint.surface3,
+    surfaceSidebarSelected: tint.surface4,
     surfaceWorkspace: tint.surface0,
     interactionHighlight: "rgba(0, 0, 0, 0.06)",
 
diff --git a/packages/app/src/usage/controls.tsx b/packages/app/src/usage/controls.tsx
index 020faf61ec..20297c9df0 100644
--- a/packages/app/src/usage/controls.tsx
+++ b/packages/app/src/usage/controls.tsx
@@ -31,7 +31,7 @@ export function UsageControls({
   const busy = view.kind === "loading" || (view.kind === "ready" && view.isRefreshing);
   return (
     <View style={styles.controls}>
-      {hostSelection && hostSelection.hosts.length > 1 ? (
+      {hasHostChoice(hostSelection) ? (
         <HostFilter
           hosts={hostSelection.hosts}
           selectedHost={hostSelection.serverId}
@@ -51,6 +51,12 @@ export function UsageControls({
   );
 }
 
+function hasHostChoice(
+  hostSelection: UsageHostSelection | undefined,
+): hostSelection is UsageHostSelection {
+  return hostSelection !== undefined && hostSelection.hosts.length > 1;
+}
+
 function usageHostOptionTestID(serverId: string): string {
   return `usage-host-filter-item-${serverId}`;
 }
@@ -65,17 +71,22 @@ const styles = StyleSheet.create((theme) => ({
 }));
 
 /**
- * One host's usage and the title-row controls that go with it, for the Usage modal.
+ * One host’s usage and title-row controls for the Usage modal.
+ * Returns null when there is nothing to control, so headers leave no empty island.
  */
 export function useHostUsageWithControls(hostSelection: UsageHostSelection): {
   view: UsageView;
   refresh: () => void;
-  controls: ReactElement;
+  controls: ReactElement | null;
 } {
   const { view, refresh } = useHostUsage(hostSelection.serverId);
+  const hasControls = hasHostChoice(hostSelection) || view.kind !== "unavailable";
   const controls = useMemo(
-    () => <UsageControls view={view} onRefresh={refresh} hostSelection={hostSelection} />,
-    [hostSelection, refresh, view],
+    () =>
+      hasControls ? (
+        <UsageControls view={view} onRefresh={refresh} hostSelection={hostSelection} />
+      ) : null,
+    [hasControls, hostSelection, refresh, view],
   );
   return { view, refresh, controls };
 }
diff --git a/packages/app/src/usage/refresh-button.tsx b/packages/app/src/usage/refresh-button.tsx
index bf6dc787b2..48754c4e19 100644
--- a/packages/app/src/usage/refresh-button.tsx
+++ b/packages/app/src/usage/refresh-button.tsx
@@ -9,7 +9,10 @@ import { usageCopy } from "./copy";
 const ThemedRotateCw = withUnistyles(RotateCw);
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 
-/** Refreshes every report on the host; spins while a refresh is in flight. */
+/**
+ * Refreshes every report on the host; spins while a refresh is in flight. On compact it sits in the
+ * header's island, so its highlight is round.
+ */
 export function UsageRefreshButton({ busy, onRefresh }: { busy: boolean; onRefresh: () => void }) {
   const compact = useIsCompactFormFactor();
   const iconSize = paneContentToolbarIconSize(compact);
diff --git a/packages/app/src/workspace-labels/manager-modal.tsx b/packages/app/src/workspace-labels/manager-modal.tsx
index 0dc8f1c53f..a23e7e0925 100644
--- a/packages/app/src/workspace-labels/manager-modal.tsx
+++ b/packages/app/src/workspace-labels/manager-modal.tsx
@@ -174,9 +174,6 @@ export function WorkspaceLabelManagerModal({
       onClose={onClose}
       header={header}
       footer={footer}
-      // Bound the compact scroller to the live snap height, so the edit view's footer stays on
-      // screen instead of being pushed past the bottom of the sheet.
-      sizeContentToCurrentSnapPoint
       testID="workspace-label-manager"
     >
       {draft && editing ? (

From 563c014dc156a18f71745c1f3f23e863308322e5 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Oct 2026 22:00:00 +0200
Subject: [PATCH 081/270] Open assistant links to non-ASCII filenames (#6520)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(app): decode percent-encoded assistant file links

markdown-it percent-encodes non-ASCII and space characters in link
hrefs, so a link like [x](docs/reports/报告.md) arrives as
docs/reports/%E6%8A%A5%E5%91%8A.md. The file:// and bare absolute-path
branches already run safeDecodeURIComponent, but the workspace-relative,
path:line, Windows, and home-relative branches did not, so clicking the
link tried to open the still-encoded name and failed with ENOENT.

Decode the path portion before the relative-path heuristics and in the
inline absolute/Windows branches so all href forms behave the same.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* fix(app): decode hrefs only, never raw inline-code paths

Raw inline-code and linkified tokens reach the same parser as markdown
hrefs. Decoding unconditionally would send a real file named
my%20file.md to my file.md. Gate every decode on AssistantHrefParseOptions.decodeHref — set by the resolver only when the token
came from source.href — and extract parseWindowsFileLink to keep the
entry point under the complexity limit. Adds parse-level and
resolver-level regression tests for literal %20 filenames.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* fix(app): keep raw absolute paths out of URL parsing

new URL() percent-encodes non-ASCII, so a raw inline-code path like
/tmp/开户.md became /tmp/%E5%BC%80%E6%88%B7.md when decodeHref was
false. Hrefs still go through URL parsing (normalizes dot segments
before decode); raw paths split the # fragment manually instead.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* fix(app): keep encoded and literal file links distinct

Preserve inline-code provenance for Windows paths and key cached file lookups by their resolved query, path, and line range. Reproduce the reported non-ASCII Markdown link through the renderer and filesystem, with browser coverage for clicking it.

Co-authored-by: Ouyang Xingyuan <galaxyroaming@qq.com>

Co-authored-by: dengjiawen <dengjiawen@hortorgames.com>

* test(app): assert file content after opening the markdown link

Co-authored-by: sunshinehomeyu-blip <267551119+sunshinehomeyu-blip@users.noreply.github.com>

* fix(app): preserve encoded line markers in filenames

---------

Co-authored-by: Ouyang Xingyuan <galaxyroaming@qq.com>
Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: dengjiawen <dengjiawen@hortorgames.com>
Co-authored-by: sunshinehomeyu-blip <267551119+sunshinehomeyu-blip@users.noreply.github.com>
---
 packages/app/e2e/browser/file-editing.spec.ts |  79 ++++++++++
 .../src/assistant-file-links/parse.test.ts    | 142 ++++++++++++++++++
 .../app/src/assistant-file-links/parse.ts     | 136 ++++++++++++-----
 .../src/assistant-file-links/resolver.test.ts |  84 +++++++++++
 .../app/src/assistant-file-links/resolver.ts  |  22 ++-
 .../src/assistant-file-links/use-file-link.ts |  29 +++-
 6 files changed, 444 insertions(+), 48 deletions(-)

diff --git a/packages/app/e2e/browser/file-editing.spec.ts b/packages/app/e2e/browser/file-editing.spec.ts
index 43e1e03863..c0a20dc6d0 100644
--- a/packages/app/e2e/browser/file-editing.spec.ts
+++ b/packages/app/e2e/browser/file-editing.spec.ts
@@ -96,6 +96,64 @@ async function seedAgentWithFileLink(input: LinkedFile) {
 }
 
 test.describe("CodeMirror workspace file editing", () => {
+  test("opens the non-ASCII file named by an assistant markdown link", async ({ page }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "encoded-markdown-link-",
+      title: "Non-ASCII file link",
+      initialPrompt: "Show the report link",
+      featureValues: { mockAssistantResponse: "[报告](docs/reports/开户赠金.md)" },
+    });
+    try {
+      await mkdir(path.join(session.cwd, "docs/reports"), { recursive: true });
+      await writeFile(path.join(session.cwd, "docs/reports/开户赠金.md"), "# Report opened\n");
+      await openAgentRoute(page, session);
+      await openAssistantMarkdownLink(page, "报告");
+      await expectFileTabOpen(page, "docs/reports/开户赠金.md");
+      await expect(
+        page
+          .getByTestId("workspace-file-pane")
+          .filter({ visible: true })
+          .getByText("Report opened", { exact: true }),
+      ).toBeVisible();
+      await page.screenshot({ path: test.info().outputPath("non-ascii-file-opened.png") });
+    } finally {
+      await session.cleanup();
+    }
+  });
+
+  for (const order of ["raw-first", "href-first"] as const) {
+    test(`opens literal and encoded percent filenames independently ${order}`, async ({ page }) => {
+      const session = await seedMockAgentWorkspace({
+        repoPrefix: "percent-link-cache-",
+        title: "Distinct file links",
+        initialPrompt: "Show both filenames",
+        featureValues: {
+          mockAssistantResponse: "Raw `literal%20.md`. [Decoded](literal%20.md).",
+        },
+      });
+      try {
+        await writeFile(path.join(session.cwd, "literal%20.md"), "# Literal filename\n");
+        await writeFile(path.join(session.cwd, "literal .md"), "# Decoded filename\n");
+        await openAgentRoute(page, session);
+        const links = order === "raw-first" ? ["raw", "href"] : ["href", "raw"];
+        for (const link of links) {
+          await returnToAssistant(page, session.agentId);
+          if (link === "raw") {
+            await openAssistantInlinePath(page, "literal%20.md");
+            await expectFileTabOpen(page, "literal%20.md");
+            await expectPreviewText(page, "Literal filename");
+          } else {
+            await openAssistantMarkdownLink(page, "Decoded");
+            await expectFileTabOpen(page, "literal .md");
+            await expectPreviewText(page, "Decoded filename");
+          }
+        }
+      } finally {
+        await session.cleanup();
+      }
+    });
+  }
+
   test("jumps to each relative reference to the same file", async ({ page }) => {
     const session = await seedMockAgentWorkspace({
       repoPrefix: "relative-reference-qa-",
@@ -757,3 +815,24 @@ test.describe("CodeMirror workspace file editing", () => {
     await expect(page.getByLabel("Vim mode NORMAL")).toBeVisible();
   });
 });
+
+async function openAssistantMarkdownLink(page: Page, name: string): Promise<void> {
+  await page.getByRole("link", { name, exact: true }).first().click();
+}
+
+async function returnToAssistant(page: Page, agentId: string): Promise<void> {
+  await page.getByTestId(`workspace-tab-agent_${agentId}`).filter({ visible: true }).click();
+}
+
+async function openAssistantInlinePath(page: Page, token: string): Promise<void> {
+  await page.getByText(token, { exact: true }).click();
+}
+
+async function expectPreviewText(page: Page, text: string): Promise<void> {
+  await expect(
+    page
+      .getByTestId("workspace-file-pane")
+      .filter({ visible: true })
+      .getByText(text, { exact: true }),
+  ).toBeVisible();
+}
diff --git a/packages/app/src/assistant-file-links/parse.test.ts b/packages/app/src/assistant-file-links/parse.test.ts
index 12921b855c..3390d0cfa9 100644
--- a/packages/app/src/assistant-file-links/parse.test.ts
+++ b/packages/app/src/assistant-file-links/parse.test.ts
@@ -417,6 +417,128 @@ describe("parseAssistantFileLink", () => {
     }
     expect(() => parseFileProtocolUrl("file:///tmp/100% packet loss")).not.toThrow();
   });
+
+  it("decodes percent-encoded relative markdown hrefs", () => {
+    // markdown-it percent-encodes non-ASCII characters in hrefs, so a link
+    // written as [x](docs/reports/开户赠金.md) arrives here percent-encoded.
+    expect(
+      parseAssistantFileLink("docs/reports/%E5%BC%80%E6%88%B7%E8%B5%A0%E9%87%91.md", {
+        workspaceRoot: "/Users/test/project",
+        decodeHref: true,
+      }),
+    ).toEqual({
+      raw: "docs/reports/%E5%BC%80%E6%88%B7%E8%B5%A0%E9%87%91.md",
+      path: "/Users/test/project/docs/reports/开户赠金.md",
+      lineStart: undefined,
+      lineEnd: undefined,
+    });
+  });
+
+  it("decodes percent-encoded spaces in relative markdown hrefs", () => {
+    expect(
+      parseAssistantFileLink("docs/my%20file.md#L5", {
+        workspaceRoot: "/Users/test/project",
+        decodeHref: true,
+      }),
+    ).toEqual({
+      raw: "docs/my%20file.md#L5",
+      path: "/Users/test/project/docs/my file.md",
+      lineStart: 5,
+      lineEnd: undefined,
+    });
+  });
+
+  it("decodes percent-encoded absolute hrefs with line suffixes", () => {
+    expect(
+      parseAssistantFileLink("/tmp/%E5%BC%80%E6%88%B7.md:3", {
+        workspaceRoot: "/Users/test/project",
+        decodeHref: true,
+      }),
+    ).toEqual({
+      raw: "/tmp/%E5%BC%80%E6%88%B7.md:3",
+      path: "/tmp/开户.md",
+      lineStart: 3,
+      lineEnd: undefined,
+    });
+  });
+
+  it("decodes percent-encoded home-relative hrefs", () => {
+    expect(
+      parseAssistantFileLink("~/notes/%E5%BC%80%E6%88%B7.md", {
+        workspaceRoot: "/Users/test/project",
+        decodeHref: true,
+      }),
+    ).toEqual({
+      raw: "~/notes/%E5%BC%80%E6%88%B7.md",
+      path: "~/notes/开户.md",
+      lineStart: undefined,
+      lineEnd: undefined,
+    });
+  });
+
+  it("decodes percent-encoded Windows hrefs", () => {
+    expect(
+      parseAssistantFileLink("C:/repo/my%20dir/app.tsx#L8", {
+        workspaceRoot: "C:/repo",
+        decodeHref: true,
+      }),
+    ).toEqual({
+      raw: "C:/repo/my%20dir/app.tsx#L8",
+      path: "C:/repo/my dir/app.tsx",
+      lineStart: 8,
+      lineEnd: undefined,
+    });
+  });
+
+  it("keeps literal percent signs in raw paths that are not hrefs", () => {
+    // Inline-code and linkified tokens are raw file paths: a real file named
+    // "my%20file.md" must not be decoded into "my file.md".
+    expect(
+      parseAssistantFileLink("docs/my%20file.md", {
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toEqual({
+      raw: "docs/my%20file.md",
+      path: "/Users/test/project/docs/my%20file.md",
+      lineStart: undefined,
+      lineEnd: undefined,
+    });
+    expect(
+      parseAssistantFileLink("/tmp/my%20file.md:3", {
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toEqual({
+      raw: "/tmp/my%20file.md:3",
+      path: "/tmp/my%20file.md",
+      lineStart: 3,
+      lineEnd: undefined,
+    });
+  });
+
+  it("keeps non-ASCII characters in raw absolute paths", () => {
+    // `new URL` percent-encodes non-ASCII, so raw paths must not be routed
+    // through URL parsing — `/tmp/开户.md` must round-trip unchanged.
+    expect(
+      parseAssistantFileLink("/tmp/开户.md", {
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toEqual({
+      raw: "/tmp/开户.md",
+      path: "/tmp/开户.md",
+      lineStart: undefined,
+      lineEnd: undefined,
+    });
+    expect(
+      parseAssistantFileLink("/tmp/开户.md#L4", {
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toEqual({
+      raw: "/tmp/开户.md#L4",
+      path: "/tmp/开户.md",
+      lineStart: 4,
+      lineEnd: undefined,
+    });
+  });
 });
 
 describe("normalizeInlinePathTarget", () => {
@@ -469,3 +591,23 @@ describe("normalizeInlinePathTarget", () => {
     });
   });
 });
+
+describe("encoded filename line markers", () => {
+  it.each(["docs/report.md%3A12", "docs/report.md%2812%2C4%29"])(
+    "keeps encoded line syntax in the filename %s",
+    (href) => {
+      expect(
+        parseAssistantFileLink(href, {
+          workspaceRoot: "/workspace",
+          decodeHref: true,
+        }),
+      ).toMatchObject({ path: `/workspace/${decodeURIComponent(href)}` });
+      expect(
+        parseAssistantFileLink(href, {
+          workspaceRoot: "/workspace",
+          decodeHref: true,
+        })?.lineStart,
+      ).toBeUndefined();
+    },
+  );
+});
diff --git a/packages/app/src/assistant-file-links/parse.ts b/packages/app/src/assistant-file-links/parse.ts
index 092f3b4dcd..0a8089acca 100644
--- a/packages/app/src/assistant-file-links/parse.ts
+++ b/packages/app/src/assistant-file-links/parse.ts
@@ -80,6 +80,13 @@ const ASSISTANT_FILE_EXTENSIONS = new Set([
 
 export interface AssistantHrefParseOptions {
   workspaceRoot?: string;
+  /**
+   * True only when `value` is a markdown href — the renderer percent-encodes
+   * non-ASCII and space characters, so the path must be decoded. Raw path
+   * text (inline code, linkified tokens) is not encoded; decoding it would
+   * send a real file named `my%20file.md` to `my file.md`.
+   */
+  decodeHref?: boolean;
 }
 
 export type AssistantFileLinkClassification =
@@ -234,13 +241,20 @@ export function parseFileProtocolUrl(value: string): InlinePathTarget | null {
   };
 }
 
-function parseAssistantInlinePathLink(value: string): InlinePathTarget | null {
+function parseAssistantInlinePathLink(
+  value: string,
+  options: Pick<AssistantHrefParseOptions, "decodeHref"> = {},
+): InlinePathTarget | null {
   const inlinePathTarget = parseInlinePathToken(value);
   if (!inlinePathTarget) {
     return null;
   }
 
-  const normalizedPath = normalizePathToken(inlinePathTarget.path);
+  let pathPart = inlinePathTarget.path;
+  if (options.decodeHref) {
+    pathPart = safeDecodeURIComponent(pathPart);
+  }
+  const normalizedPath = normalizePathToken(pathPart);
   if (!normalizedPath || !isAbsolutePath(normalizedPath)) {
     return null;
   }
@@ -277,7 +291,7 @@ export function classifyAssistantFileLink(
     return null;
   }
 
-  if (isAmbiguousWorkspaceCandidate(trimmed, target, options.workspaceRoot)) {
+  if (isAmbiguousWorkspaceCandidate(trimmed, target, options)) {
     return {
       kind: "ambiguousFileCandidate",
       target,
@@ -308,32 +322,19 @@ export function parseAssistantFileLink(
     return null;
   }
 
-  const inlinePathTarget = parseAssistantInlinePathLink(trimmed);
+  const inlinePathTarget = parseAssistantInlinePathLink(trimmed, options);
   if (inlinePathTarget) {
     return inlinePathTarget;
   }
 
-  const windowsPathMatch = trimmed.match(/^([A-Za-z]:[\\/][^?#]*)(#[^?]+)?$/);
-  if (windowsPathMatch) {
-    const normalizedPath = normalizePathToken(windowsPathMatch[1] ?? "");
-    if (!normalizedPath) {
-      return null;
-    }
-
-    const lines = parseLineFragment(windowsPathMatch[2] ?? "");
-    if (!lines) {
-      return null;
-    }
-
-    return {
-      raw: value,
-      path: normalizedPath,
-      ...lines,
-    };
+  const windowsTarget = parseWindowsFileLink(trimmed, value, options);
+  if (windowsTarget) {
+    return windowsTarget;
   }
 
   const relativeTarget = parseWorkspaceRelativeFileLink(trimmed, {
     workspaceRoot: options.workspaceRoot,
+    decodeHref: options.decodeHref,
   });
   if (relativeTarget) {
     return relativeTarget;
@@ -343,19 +344,33 @@ export function parseAssistantFileLink(
     return null;
   }
 
-  let parsedUrl: URL;
-  try {
-    parsedUrl = new URL(trimmed, "http://paseo.invalid");
-  } catch {
-    return null;
+  // Hrefs go through URL parsing so `%`-escapes and `.`/`..` segments
+  // normalize before decode. Raw paths must not: `new URL` percent-encodes
+  // non-ASCII characters, which would corrupt `/tmp/开户.md` into the
+  // still-encoded name.
+  let pathPart: string;
+  let hashPart: string;
+  if (options.decodeHref) {
+    let parsedUrl: URL;
+    try {
+      parsedUrl = new URL(trimmed, "http://paseo.invalid");
+    } catch {
+      return null;
+    }
+    pathPart = safeDecodeURIComponent(parsedUrl.pathname);
+    hashPart = parsedUrl.hash;
+  } else {
+    const hashIndex = trimmed.indexOf("#");
+    pathPart = hashIndex >= 0 ? trimmed.slice(0, hashIndex) : trimmed;
+    hashPart = hashIndex >= 0 ? trimmed.slice(hashIndex) : "";
   }
 
-  const normalizedPath = normalizePathToken(safeDecodeURIComponent(parsedUrl.pathname));
+  const normalizedPath = normalizePathToken(pathPart);
   if (!normalizedPath || !isAbsolutePath(normalizedPath)) {
     return null;
   }
 
-  const lines = parseLineFragment(parsedUrl.hash);
+  const lines = parseLineFragment(hashPart);
   if (!lines) {
     return null;
   }
@@ -386,11 +401,42 @@ export function isFileLookingAssistantToken(value: string): boolean {
   return isPlausibleAssistantLocalPath(path);
 }
 
+function parseWindowsFileLink(
+  trimmed: string,
+  raw: string,
+  options: Pick<AssistantHrefParseOptions, "decodeHref"> = {},
+): InlinePathTarget | null {
+  const windowsPathMatch = trimmed.match(/^([A-Za-z]:[\\/][^?#]*)(#[^?]+)?$/);
+  if (!windowsPathMatch) {
+    return null;
+  }
+
+  let pathPart = windowsPathMatch[1] ?? "";
+  if (options.decodeHref) {
+    pathPart = safeDecodeURIComponent(pathPart);
+  }
+  const normalizedPath = normalizePathToken(pathPart);
+  if (!normalizedPath) {
+    return null;
+  }
+
+  const lines = parseLineFragment(windowsPathMatch[2] ?? "");
+  if (!lines) {
+    return null;
+  }
+
+  return {
+    raw,
+    path: normalizedPath,
+    ...lines,
+  };
+}
+
 function parseWorkspaceRelativeFileLink(
   value: string,
   options: AssistantHrefParseOptions,
 ): InlinePathTarget | null {
-  const parsed = parseLocalPathParts(value);
+  const parsed = parseLocalPathParts(value, options);
   if (!parsed || isAbsolutePath(parsed.path)) {
     return null;
   }
@@ -422,7 +468,11 @@ function parseWorkspaceRelativeFileLink(
 
 function parseLocalPathParts(
   value: string,
-): { path: string; lines: Pick<InlinePathTarget, "lineStart" | "lineEnd"> } | null {
+  options: Pick<AssistantHrefParseOptions, "decodeHref"> = {},
+): {
+  path: string;
+  lines: Pick<InlinePathTarget, "lineStart" | "lineEnd">;
+} | null {
   const normalized = normalizePathToken(value);
   if (!normalized || normalized.includes("?")) {
     return null;
@@ -436,14 +486,19 @@ function parseLocalPathParts(
     return null;
   }
 
+  // Split literal line markers before decoding; encoded punctuation belongs
+  // to the filename. Raw inline-code/path text stays untouched.
   const inlinePathTarget = parseInlinePathToken(beforeHash);
   if (inlinePathTarget) {
-    if (!isPlausibleAssistantLocalPath(inlinePathTarget.path)) {
+    let pathPart = inlinePathTarget.path;
+    if (options.decodeHref) {
+      pathPart = safeDecodeURIComponent(pathPart);
+    }
+    if (!isPlausibleAssistantLocalPath(pathPart)) {
       return null;
     }
-
     return {
-      path: inlinePathTarget.path,
+      path: pathPart,
       lines: {
         lineStart: inlinePathTarget.lineStart,
         lineEnd: inlinePathTarget.lineEnd,
@@ -455,12 +510,17 @@ function parseLocalPathParts(
     return null;
   }
 
-  if (!isPlausibleAssistantLocalPath(beforeHash)) {
+  let decodedBeforeHash = beforeHash;
+  if (options.decodeHref) {
+    decodedBeforeHash = safeDecodeURIComponent(beforeHash);
+  }
+  const plausiblePath = parseInlinePathToken(decodedBeforeHash)?.path ?? decodedBeforeHash;
+  if (!isPlausibleAssistantLocalPath(plausiblePath)) {
     return null;
   }
 
   return {
-    path: beforeHash,
+    path: decodedBeforeHash,
     lines: fragmentLines,
   };
 }
@@ -545,14 +605,14 @@ function isExternalHref(value: string): boolean {
 function isAmbiguousWorkspaceCandidate(
   value: string,
   target: InlinePathTarget,
-  workspaceRoot?: string,
+  options: AssistantHrefParseOptions = {},
 ): boolean {
-  const normalizedWorkspaceRoot = normalizePathInput(workspaceRoot);
+  const normalizedWorkspaceRoot = normalizePathInput(options.workspaceRoot);
   if (!normalizedWorkspaceRoot || !isAllowedAbsolutePath(target.path, normalizedWorkspaceRoot)) {
     return false;
   }
 
-  const parsed = parseLocalPathParts(value);
+  const parsed = parseLocalPathParts(value, options);
   if (!parsed || isAbsolutePath(parsed.path)) {
     return false;
   }
diff --git a/packages/app/src/assistant-file-links/resolver.test.ts b/packages/app/src/assistant-file-links/resolver.test.ts
index 312bfff1fd..384c3b6857 100644
--- a/packages/app/src/assistant-file-links/resolver.test.ts
+++ b/packages/app/src/assistant-file-links/resolver.test.ts
@@ -1,4 +1,8 @@
 import { describe, expect, it } from "vitest";
+import MarkdownIt from "markdown-it";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
 import {
   classifyForResolution,
   fetchDaemonResolution,
@@ -14,6 +18,25 @@ const CONTEXT: AssistantFileLinkContext = {
   workspaceRoot: "/Users/test/project",
 };
 
+it("opens the existing non-ASCII file named by a rendered markdown link", async () => {
+  const workspaceRoot = await mkdtemp(path.join(tmpdir(), "assistant-file-link-"));
+  try {
+    await mkdir(path.join(workspaceRoot, "docs/reports"), { recursive: true });
+    await writeFile(path.join(workspaceRoot, "docs/reports/开户赠金.md"), "report content");
+    const tokens = new MarkdownIt().parseInline("[报告](docs/reports/开户赠金.md)", {});
+    const href = tokens[0].children?.find((token) => token.type === "link_open")?.attrGet("href");
+    expect(href).toBe("docs/reports/%E5%BC%80%E6%88%B7%E8%B5%A0%E9%87%91.md");
+    const resolution = classifyForResolution({ href: href! }, { workspaceRoot });
+    expect(resolution.kind).toBe("resolved");
+    if (resolution.kind !== "resolved" || resolution.value.kind !== "file") {
+      throw new Error("Expected a directly resolved file link");
+    }
+    expect(await readFile(resolution.value.target.path, "utf8")).toBe("report content");
+  } finally {
+    await rm(workspaceRoot, { recursive: true, force: true });
+  }
+});
+
 function resolvedSuggestions(
   entries: DirectorySuggestionResult["entries"],
 ): DirectorySuggestionResult {
@@ -52,6 +75,27 @@ const unavailableSuggestions: GetDirectorySuggestions = async () => {
 };
 
 describe("classifyForResolution", () => {
+  it.each([
+    ["C:/repo/my%20file.md", undefined],
+    ["C:\\repo\\my%20file.md", undefined],
+    ["C:/repo/my%20file.md:12", 12],
+    ["C:\\repo\\my%20file.md:12", 12],
+  ])("keeps the literal filename in Windows inline code %s", (href, lineStart) => {
+    for (const text of [href, undefined]) {
+      const result = classifyForResolution(
+        { href, text, sourceType: "inline-code" },
+        { workspaceRoot: "C:/repo" },
+      );
+      expect(result).toMatchObject({
+        kind: "resolved",
+        value: { kind: "file", target: { path: "C:/repo/my%20file.md", lineStart } },
+      });
+    }
+    expect(classifyForResolution({ href }, { workspaceRoot: "C:/repo" })).toMatchObject({
+      kind: "resolved",
+      value: { kind: "file", target: { path: "C:/repo/my file.md", lineStart } },
+    });
+  });
   it("returns the directFile target synchronously", () => {
     const result = classifyForResolution({ href: "src/components/message.tsx#L33" }, CONTEXT);
 
@@ -165,6 +209,46 @@ describe("classifyForResolution", () => {
 
     expect(result).toEqual({ kind: "resolved", value: { kind: "ignored" } });
   });
+
+  it("decodes percent-encoded markdown hrefs", () => {
+    const result = classifyForResolution({ href: "docs/my%20file.md" }, CONTEXT);
+
+    expect(result).toEqual({
+      kind: "resolved",
+      value: {
+        kind: "file",
+        target: {
+          raw: "docs/my%20file.md",
+          path: "/Users/test/project/docs/my file.md",
+          lineStart: undefined,
+          lineEnd: undefined,
+        },
+      },
+    });
+  });
+
+  it("keeps literal percent signs in inline-code paths", () => {
+    const result = classifyForResolution(
+      {
+        href: "docs/my%20file.md",
+        text: "docs/my%20file.md",
+        sourceType: "inline-code",
+      },
+      CONTEXT,
+    );
+
+    expect(result).toEqual({
+      kind: "needsLookup",
+      ambiguousQuery: "docs/my%20file.md",
+      token: "docs/my%20file.md",
+      target: {
+        raw: "docs/my%20file.md",
+        path: "/Users/test/project/docs/my%20file.md",
+        lineStart: undefined,
+        lineEnd: undefined,
+      },
+    });
+  });
 });
 
 describe("fetchDaemonResolution", () => {
diff --git a/packages/app/src/assistant-file-links/resolver.ts b/packages/app/src/assistant-file-links/resolver.ts
index 5fa4849fc8..774d39278b 100644
--- a/packages/app/src/assistant-file-links/resolver.ts
+++ b/packages/app/src/assistant-file-links/resolver.ts
@@ -108,13 +108,15 @@ export function classifyForResolution(
   source: AssistantFileLinkSource,
   context: AssistantFileLinkContext,
 ): AssistantFileLinkResolution {
-  const token = getAssistantFileLinkToken(source).trim();
+  const tokenInfo = getAssistantFileLinkTokenInfo(source);
+  const token = tokenInfo.token.trim();
   if (!token) {
     return { kind: "resolved", value: { kind: "ignored" } };
   }
 
   const classification = classifyAssistantFileLink(token, {
     workspaceRoot: context.workspaceRoot,
+    decodeHref: tokenInfo.fromHref,
   });
   if (!classification) {
     return { kind: "resolved", value: { kind: "ignored" } };
@@ -148,14 +150,26 @@ export function classifyForResolution(
 }
 
 export function getAssistantFileLinkToken(source: AssistantFileLinkSource): string {
-  if (isLinkifiedSource(source) || source.sourceType === "inline-code") {
+  return getAssistantFileLinkTokenInfo(source).token;
+}
+
+// Markdown link hrefs are percent-encoded by the renderer; inline-code and
+// linkified text are raw file paths that must not be decoded.
+function getAssistantFileLinkTokenInfo(source: AssistantFileLinkSource): {
+  token: string;
+  fromHref: boolean;
+} {
+  if (source.sourceType === "inline-code") {
+    return { token: source.text?.trim() || source.href, fromHref: false };
+  }
+  if (isLinkifiedSource(source)) {
     const text = source.text?.trim();
     if (text && isFileLookingAssistantToken(text)) {
-      return text;
+      return { token: text, fromHref: false };
     }
   }
 
-  return source.href;
+  return { token: source.href, fromHref: true };
 }
 
 export function getAmbiguousSuggestionQuery(
diff --git a/packages/app/src/assistant-file-links/use-file-link.ts b/packages/app/src/assistant-file-links/use-file-link.ts
index 194405d2ec..603645f0fe 100644
--- a/packages/app/src/assistant-file-links/use-file-link.ts
+++ b/packages/app/src/assistant-file-links/use-file-link.ts
@@ -29,14 +29,21 @@ export interface AssistantFileLinkActions {
   canResolveFile(source: AssistantFileLinkSource): boolean;
 }
 
+interface AssistantFileLinkLookupKey {
+  query: string;
+  path: string;
+  lineStart: number | null;
+  lineEnd: number | null;
+}
+
 type AssistantFileLinkQueryKey = readonly [
   "assistantFileLink",
   string | null,
   string | null,
-  string,
+  AssistantFileLinkLookupKey | null,
 ];
 
-const DISABLED_QUERY_KEY = ["assistantFileLink", null, null, ""] as const;
+const DISABLED_QUERY_KEY = ["assistantFileLink", null, null, null] as const;
 
 export function useFileLink(source: AssistantFileLinkSource): UseFileLinkResult {
   const { t } = useTranslation();
@@ -59,7 +66,7 @@ export function useFileLink(source: AssistantFileLinkSource): UseFileLinkResult
         ? assistantFileLinkQueryKey({
             serverId,
             workspaceRoot,
-            token: resolution.token,
+            resolution,
           })
         : DISABLED_QUERY_KEY,
     [resolution, serverId, workspaceRoot],
@@ -179,7 +186,7 @@ function openAssistantFileLink(input: {
   const capturedQueryKey = assistantFileLinkQueryKey({
     serverId: capturedConfig.serverId,
     workspaceRoot: capturedConfig.workspaceRoot,
-    token: capturedResolution.token,
+    resolution: capturedResolution,
   });
 
   const run = async () => {
@@ -245,9 +252,19 @@ function useStableSource(source: AssistantFileLinkSource): AssistantFileLinkSour
 function assistantFileLinkQueryKey(input: {
   serverId?: string;
   workspaceRoot?: string;
-  token: string;
+  resolution: Extract<AssistantFileLinkResolution, { kind: "needsLookup" }>;
 }): AssistantFileLinkQueryKey {
-  return ["assistantFileLink", input.serverId ?? null, input.workspaceRoot ?? null, input.token];
+  return [
+    "assistantFileLink",
+    input.serverId ?? null,
+    input.workspaceRoot ?? null,
+    {
+      query: input.resolution.ambiguousQuery,
+      path: input.resolution.target.path,
+      lineStart: input.resolution.target.lineStart ?? null,
+      lineEnd: input.resolution.target.lineEnd ?? null,
+    },
+  ];
 }
 
 async function dispatchResolvedLink(input: {

From 1228c01a10334e5c272c59215ae4a1394bddd055 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 00:03:10 +0200
Subject: [PATCH 082/270] Find GitLab merge requests and issues by number
 (#6525)

* fix(gitlab): find merge requests and issues by number

GitLab text search matches titles and descriptions but not item numbers. Use repository-scoped IID filtering for numeric queries, keeping open-only results and the existing text search behavior.

* fix(gitlab): retain text matches in number searches

Supplement title and description search with the open-item number lookup, rather than replacing it. Prioritize exact numbers, deduplicate results, and preserve each list limit.

* refactor(gitlab): name list helper arguments

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/services/gitlab-service.test.ts       | 126 ++++++++++++++++++
 .../server/src/services/gitlab-service.ts     | 105 ++++++++++-----
 2 files changed, 199 insertions(+), 32 deletions(-)

diff --git a/packages/server/src/services/gitlab-service.test.ts b/packages/server/src/services/gitlab-service.test.ts
index c74224e444..371198e447 100644
--- a/packages/server/src/services/gitlab-service.test.ts
+++ b/packages/server/src/services/gitlab-service.test.ts
@@ -1328,6 +1328,132 @@ describe("createGitLabService", () => {
     );
   });
 
+  it("finds a merge request by number even when its title and description omit it", async () => {
+    const { service } = makeService((args) => {
+      // GitLab text search does not search the IID. Model both API behaviors.
+      if (args.includes("--search")) return ok("[]");
+      if (args[0] === "api" && args[1].includes("iids[]=14")) {
+        return ok(JSON.stringify([OPEN_MR]));
+      }
+      throw new Error(`unexpected glab args: ${args.join(" ")}`);
+    });
+    const result = await service.searchIssuesAndPrs({
+      cwd: "/repo",
+      query: " 14 ",
+      kinds: ["change_request"],
+    });
+    expect(result.items).toEqual([
+      expect.objectContaining({
+        kind: "change_request",
+        number: 14,
+        title: OPEN_MR.title,
+        headRefName: OPEN_MR.source_branch,
+        baseRefName: OPEN_MR.target_branch,
+      }),
+    ]);
+  });
+
+  it("finds issues by number through the same search interface", async () => {
+    const { service } = makeService((args) => {
+      if (args.includes("--search")) return ok("[]");
+      if (args[0] === "api" && args[1].includes("iids[]=7")) {
+        return ok(JSON.stringify([OPEN_ISSUE]));
+      }
+      throw new Error(`unexpected glab args: ${args.join(" ")}`);
+    });
+    const result = await service.searchIssuesAndPrs({
+      cwd: "/repo",
+      query: "7",
+      kinds: ["issue"],
+    });
+    expect(result.items).toEqual([
+      expect.objectContaining({ kind: "issue", number: 7, title: OPEN_ISSUE.title }),
+    ]);
+  });
+
+  it.each([
+    { kind: "change_request" as const, item: OPEN_MR },
+    { kind: "issue" as const, item: OPEN_ISSUE },
+  ])(
+    "preserves numeric text matches after the exact $kind number, without duplicates",
+    async ({ kind, item }) => {
+      const textMatches = [
+        {
+          ...item,
+          iid: 90,
+          title: `References ${item.iid}`,
+          updated_at: "2026-07-01T00:00:00.000Z",
+        },
+        item,
+        {
+          ...item,
+          iid: 91,
+          description: `References ${item.iid}`,
+          updated_at: "2026-06-30T00:00:00.000Z",
+        },
+      ];
+      const { service } = makeService((args) => {
+        if (args.includes("--search")) return ok(JSON.stringify(textMatches));
+        if (args[0] === "api") return ok(JSON.stringify([item]));
+        throw new Error(`unexpected glab args: ${args.join(" ")}`);
+      });
+      const result = await service.searchIssuesAndPrs({
+        cwd: "/repo",
+        query: String(item.iid),
+        limit: 2,
+        kinds: [kind],
+      });
+      expect(
+        result.items.map((resultItem) => ({ kind: resultItem.kind, number: resultItem.number })),
+      ).toEqual([
+        { kind, number: item.iid },
+        { kind, number: 90 },
+      ]);
+    },
+  );
+
+  it.each([
+    { kind: "change_request" as const, item: OPEN_MR },
+    { kind: "issue" as const, item: OPEN_ISSUE },
+  ])("keeps $kind text matches when the queried number is not open", async ({ kind, item }) => {
+    const { service } = makeService((args) => {
+      if (args.includes("--search")) {
+        return ok(JSON.stringify([{ ...item, description: "References 2024" }]));
+      }
+      if (args[0] === "api") return ok("[]");
+      throw new Error(`unexpected glab args: ${args.join(" ")}`);
+    });
+    const result = await service.searchIssuesAndPrs({
+      cwd: "/repo",
+      query: "2024",
+      kinds: [kind],
+    });
+    expect(result.items.map(({ number }) => number)).toEqual([item.iid]);
+  });
+
+  it("keeps closed and missing merge requests out of number search results", async () => {
+    const closedMr = { ...OPEN_MR, state: "closed" };
+    const { service } = makeService((args) => {
+      if (args.includes("--search")) return ok("[]");
+      if (args[0] !== "api") throw new Error(`unexpected glab args: ${args.join(" ")}`);
+      const endpoint = new URL(args[1], "https://gitlab.example.com/api/v4/");
+      const matches =
+        endpoint.searchParams.get("iids[]") === String(closedMr.iid) &&
+        endpoint.searchParams.get("state") !== "opened";
+      return ok(JSON.stringify(matches ? [closedMr] : []));
+    });
+    for (const query of ["14", "999999"]) {
+      const result = await service.searchIssuesAndPrs({
+        cwd: "/repo",
+        query,
+        limit: 10,
+        kinds: ["change_request"],
+      });
+      expect(result.authState).toBe("authenticated");
+      expect(result.items).toEqual([]);
+    }
+  });
+
   it("searches issues and merge requests and maps them to neutral results", async () => {
     const { service, calls } = makeService((args) => {
       if (args[0] === "issue") return ok(JSON.stringify([OPEN_ISSUE]));
diff --git a/packages/server/src/services/gitlab-service.ts b/packages/server/src/services/gitlab-service.ts
index f0b166cdda..1fff0e2a02 100644
--- a/packages/server/src/services/gitlab-service.ts
+++ b/packages/server/src/services/gitlab-service.ts
@@ -882,6 +882,31 @@ function throwFirstNonGlabAuthSearchRejection(results: PromiseSettledResult<unkn
   }
 }
 
+function buildGitLabListArgs({
+  kind,
+  input,
+}: {
+  kind: "mr" | "issue";
+  input: ListPullRequestsOptions | ListIssuesOptions;
+}): string[] {
+  const query = input.query?.trim();
+  // issue list uses -O for JSON; its -F flag controls details/ids/urls.
+  // mr list uses -F for JSON instead.
+  const args = [kind, "list", kind === "mr" ? "-F" : "-O", "json"];
+  if (query) {
+    args.push("--search", query);
+  }
+  if (typeof input.limit === "number") {
+    args.push("-P", String(input.limit));
+  }
+  return args;
+}
+
+function gitLabNumberQuery(query: string | undefined): string | null {
+  const trimmed = query?.trim();
+  return trimmed && /^\d+$/.test(trimmed) ? trimmed : null;
+}
+
 export function createGitLabService(options: CreateGitLabServiceOptions = {}): ForgeService {
   const runner = options.runner ?? runGlabCommand;
   const resolveGlab = createCachedCliPathResolver(options.resolveGlabPath ?? resolveGlabPath);
@@ -1057,42 +1082,51 @@ export function createGitLabService(options: CreateGitLabServiceOptions = {}): F
     }
   }
 
+  async function runList<T extends { iid: number }>({
+    kind,
+    input,
+    schema,
+  }: {
+    kind: "mr" | "issue";
+    input: ListPullRequestsOptions | ListIssuesOptions;
+    schema: z.ZodType<T[]>;
+  }): Promise<T[]> {
+    const textSearch = runJson(buildGitLabListArgs({ kind, input }), { cwd: input.cwd }, schema);
+    const numberQuery = gitLabNumberQuery(input.query);
+    if (!numberQuery) return textSearch;
+
+    // GitLab text search omits IIDs, so supplement it with an open-item lookup.
+    const resource = kind === "mr" ? "merge_requests" : "issues";
+    const [numberMatches, textMatches] = await Promise.all([
+      runJson(
+        ["api", `projects/:id/${resource}?state=opened&iids[]=${numberQuery}`],
+        { cwd: input.cwd },
+        schema,
+      ),
+      textSearch,
+    ]);
+    const seen = new Set<number>();
+    const items = [...numberMatches, ...textMatches].filter((item) => {
+      if (seen.has(item.iid)) return false;
+      seen.add(item.iid);
+      return true;
+    });
+    return typeof input.limit === "number" ? items.slice(0, input.limit) : items;
+  }
+
   async function runMergeRequestList(
     input: ListPullRequestsOptions,
   ): Promise<PullRequestSummary[]> {
-    const args = ["mr", "list", "-F", "json"];
-    const query = input.query?.trim();
-    if (query) {
-      args.push("--search", query);
-    }
-    if (typeof input.limit === "number") {
-      args.push("-P", String(input.limit));
-    }
-    const mergeRequests = await runJson(
-      args,
-      { cwd: input.cwd },
-      z.array(GitLabMergeRequestSchema),
-    );
+    const mergeRequests = await runList({
+      kind: "mr",
+      input,
+      schema: z.array(GitLabMergeRequestSchema),
+    });
     return mergeRequests.map(toPullRequestSummary);
   }
 
-  /**
-   * `glab issue list` toggles JSON output with `-O/--output` (text|json); its
-   * `-F/--output-format` flag means something else (details|ids|urls) and
-   * silently falls back to the human-readable table for an unknown value. This
-   * differs from `glab mr list`, where `-F/--output` is the JSON toggle. Using
-   * the wrong flag here would emit a text table that fails JSON parsing.
-   */
   async function runIssueList(input: ListIssuesOptions): Promise<IssueSummary[]> {
-    const args = ["issue", "list", "-O", "json"];
-    const query = input.query?.trim();
-    if (query) {
-      args.push("--search", query);
-    }
-    if (typeof input.limit === "number") {
-      args.push("-P", String(input.limit));
-    }
-    const issues = await runJson(args, { cwd: input.cwd }, z.array(GitLabIssueSchema));
+    const issues = await runList({ kind: "issue", input, schema: z.array(GitLabIssueSchema) });
     return issues.map(toIssueSummary);
   }
 
@@ -1359,9 +1393,16 @@ export function createGitLabService(options: CreateGitLabServiceOptions = {}): F
           });
         }
       }
-      items.sort(
-        (left, right) => parseOptionalTime(right.updatedAt) - parseOptionalTime(left.updatedAt),
-      );
+      const numberQuery = gitLabNumberQuery(input.query);
+      items.sort((left, right) => {
+        if (numberQuery) {
+          const numberMatchOrder =
+            Number(right.number === Number(numberQuery)) -
+            Number(left.number === Number(numberQuery));
+          if (numberMatchOrder !== 0) return numberMatchOrder;
+        }
+        return parseOptionalTime(right.updatedAt) - parseOptionalTime(left.updatedAt);
+      });
 
       return {
         items,

From d5513472ed972c884a204f356d04c1d0db47b3aa Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 00:55:14 +0200
Subject: [PATCH 083/270] Keep words intact in followed agent logs (#6528)

* fix(cli): keep streamed message fragments together in logs --follow

`paseo logs` without `-f` fetches the timeline projected, so
`projectTimelineRows` merges consecutive assistant and reasoning fragments by
exact concatenation before the transcript is rendered. Follow mode never got
there: it called `formatAgentActivityTranscript([item])` per arriving event, so
every fragment was projected alone and printed on its own line. Words broke at
fragment boundaries, a reader could not tell an author newline from a transport
one, and `[Thought]` was reprinted for each reasoning chunk.

Follow mode now keeps a fragment chain open using the same merge rule the
projection uses (same kind, same `turnId`, matching `messageId` when the event
carries one) and writes the text as it arrives instead of one line per event.
Only trailing whitespace is held back, so a message still ends trimmed the way
the one-shot transcript ends it, and the chain closes when another kind of item
arrives or the follow stops.

* test(cli): place daemon follow regression in its owning suite

* fix(cli): preserve filtered log boundaries and run the follow regression in CI

* test(cli): wait for a completed log line before terminating follow

---------

Co-authored-by: Lorenzo Fiore <fiorelorenzo.fl@gmail.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/cli/src/commands/agent/logs.test.ts  | 139 +++++++++++++++
 packages/cli/src/commands/agent/logs.ts       | 161 ++++++++++++++++--
 packages/server/package.json                  |   2 +-
 .../server/src/server/cli-agent-logs.test.ts  |   8 +-
 .../daemon-e2e/cli-logs-follow.e2e.test.ts    |  89 ++++++++++
 5 files changed, 386 insertions(+), 13 deletions(-)
 create mode 100644 packages/cli/src/commands/agent/logs.test.ts
 create mode 100644 packages/server/src/server/daemon-e2e/cli-logs-follow.e2e.test.ts

diff --git a/packages/cli/src/commands/agent/logs.test.ts b/packages/cli/src/commands/agent/logs.test.ts
new file mode 100644
index 0000000000..b687aefd92
--- /dev/null
+++ b/packages/cli/src/commands/agent/logs.test.ts
@@ -0,0 +1,139 @@
+import { describe, expect, it } from "vitest";
+import type { AgentTimelineItem } from "@getpaseo/protocol/agent-types";
+import { createFollowTranscriptWriter, formatAgentActivityTranscript } from "./logs.js";
+
+function collect(items: readonly AgentTimelineItem[], turnId?: string): string {
+  let output = "";
+  const writer = createFollowTranscriptWriter((chunk) => {
+    output += chunk;
+  });
+  for (const item of items) {
+    writer.push(item, turnId);
+  }
+  writer.end();
+  return output;
+}
+
+describe("createFollowTranscriptWriter", () => {
+  it("keeps a word that arrives split across fragments intact", () => {
+    const output = collect([
+      { type: "assistant_message", text: "the paseo-pr", messageId: "msg_1" },
+      { type: "assistant_message", text: "-cycle label\n", messageId: "msg_1" },
+    ]);
+
+    expect(output).toBe("the paseo-pr-cycle label\n");
+  });
+
+  it("streams text as it arrives without inventing a line break", () => {
+    const chunks: string[] = [];
+    const writer = createFollowTranscriptWriter((chunk) => {
+      chunks.push(chunk);
+    });
+
+    writer.push({
+      type: "assistant_message",
+      text: "first line",
+      messageId: "msg_1",
+    });
+    expect(chunks.join("")).toBe("first line");
+
+    writer.push({
+      type: "assistant_message",
+      text: "\nsecond",
+      messageId: "msg_1",
+    });
+    expect(chunks.join("")).toBe("first line\nsecond");
+
+    writer.push({
+      type: "assistant_message",
+      text: " line\n",
+      messageId: "msg_1",
+    });
+    expect(chunks.join("")).toBe("first line\nsecond line");
+
+    writer.end();
+    expect(chunks.join("")).toBe("first line\nsecond line\n");
+  });
+
+  it("emits the same transcript the one-shot command prints for the same items", () => {
+    const items: AgentTimelineItem[] = [
+      {
+        type: "assistant_message",
+        text: "Plan for paseo-pr",
+        messageId: "msg_1",
+      },
+      {
+        type: "assistant_message",
+        text: "-cycle:\n- build\n- test\n",
+        messageId: "msg_1",
+      },
+      { type: "error", message: "boom" },
+      { type: "assistant_message", text: "done", messageId: "msg_2" },
+    ];
+
+    expect(collect(items).trimEnd()).toBe(formatAgentActivityTranscript(items));
+  });
+
+  it("starts a new message when the messageId changes", () => {
+    const output = collect([
+      { type: "assistant_message", text: "first", messageId: "msg_1" },
+      { type: "assistant_message", text: "second", messageId: "msg_2" },
+    ]);
+
+    expect(output).toBe("first\nsecond\n");
+  });
+
+  it("does not merge fragments across turns", () => {
+    let output = "";
+    const writer = createFollowTranscriptWriter((chunk) => {
+      output += chunk;
+    });
+
+    writer.push({ type: "assistant_message", text: "first" }, "turn_1");
+    writer.push({ type: "assistant_message", text: "second" }, "turn_2");
+    writer.end();
+
+    expect(output).toBe("first\nsecond\n");
+  });
+
+  it("prints the thought prefix once for a merged reasoning stream", () => {
+    const output = collect([
+      { type: "reasoning", text: "checking the" },
+      { type: "reasoning", text: " lockfile\nthen the build\n" },
+    ]);
+
+    expect(output).toBe("[Thought] checking the lockfile\nthen the build\n");
+  });
+
+  it("keeps reasoning blocks separate across hidden timeline items", () => {
+    let output = "";
+    const writer = createFollowTranscriptWriter((chunk) => {
+      output += chunk;
+    }, "reasoning");
+    writer.push({ type: "reasoning", text: "checking files" });
+    writer.push({
+      type: "tool_call",
+      callId: "tool_1",
+      name: "Bash",
+      status: "completed",
+      error: null,
+      detail: { type: "unknown", input: "ls", output: "files" },
+    });
+    writer.push({ type: "reasoning", text: "running tests" });
+    writer.end();
+
+    expect(output).toBe("[Thought] checking files\n[Thought] running tests\n");
+  });
+
+  it("keeps interior blank lines and drops trailing whitespace", () => {
+    const output = collect([
+      {
+        type: "assistant_message",
+        text: "  # Title\n\nBody\n\n  ",
+        messageId: "msg_1",
+      },
+    ]);
+
+    expect(output).toBe("# Title\n\nBody\n");
+  });
+});
diff --git a/packages/cli/src/commands/agent/logs.ts b/packages/cli/src/commands/agent/logs.ts
index 9ac2d4b238..ed77d4be62 100644
--- a/packages/cli/src/commands/agent/logs.ts
+++ b/packages/cli/src/commands/agent/logs.ts
@@ -70,6 +70,134 @@ export function formatAgentActivityTranscript(
   );
 }
 
+type StreamingTextType = "assistant_message" | "reasoning";
+
+const THOUGHT_PREFIX = "[Thought] ";
+
+interface PendingStreamingText {
+  type: StreamingTextType;
+  turnId: string | undefined;
+  messageId: string | undefined;
+  buffer: string;
+  emitted: boolean;
+}
+
+export interface FollowTranscriptWriter {
+  push(item: AgentTimelineItem, turnId?: string): void;
+  end(): void;
+}
+
+function lastNonWhitespaceIndex(text: string): number {
+  for (let index = text.length - 1; index >= 0; index -= 1) {
+    if (!/\s/.test(text[index])) {
+      return index;
+    }
+  }
+  return -1;
+}
+
+/**
+ * Follow mode receives one streaming fragment per event, while the one-shot
+ * transcript sees the whole timeline and merges consecutive assistant and
+ * reasoning fragments with exact concatenation (`projectTimelineRows`). Printing
+ * each fragment on its own line splits words at fragment boundaries and
+ * reprints the reasoning prefix, so a chain of fragments is written as one
+ * stream instead: text goes out as it arrives, and only the trailing whitespace
+ * is held back so the message ends trimmed the way the transcript does.
+ */
+export function createFollowTranscriptWriter(
+  write: (chunk: string) => void = (chunk) => void process.stdout.write(chunk),
+  filter?: string,
+): FollowTranscriptWriter {
+  let pending: PendingStreamingText | null = null;
+
+  const emit = (chain: PendingStreamingText, text: string): void => {
+    if (!chain.emitted) {
+      chain.emitted = true;
+      if (chain.type === "reasoning") {
+        write(THOUGHT_PREFIX);
+      }
+    }
+    write(text);
+  };
+
+  const flushContent = (chain: PendingStreamingText): void => {
+    if (!chain.emitted) {
+      chain.buffer = chain.buffer.replace(/^\s+/, "");
+    }
+    const lastContent = lastNonWhitespaceIndex(chain.buffer);
+    if (lastContent < 0) {
+      return;
+    }
+    emit(chain, chain.buffer.slice(0, lastContent + 1));
+    chain.buffer = chain.buffer.slice(lastContent + 1);
+  };
+
+  const closePending = (): void => {
+    const chain = pending;
+    pending = null;
+    if (!chain) {
+      return;
+    }
+    const tail = chain.emitted ? chain.buffer.trimEnd() : chain.buffer.trim();
+    if (tail) {
+      emit(chain, tail);
+    }
+    if (chain.emitted) {
+      write("\n");
+    }
+  };
+
+  const continuesChain = (item: AgentTimelineItem, turnId: string | undefined): boolean => {
+    if (!pending || pending.type !== item.type || pending.turnId !== turnId) {
+      return false;
+    }
+    if (item.type !== "assistant_message") {
+      return true;
+    }
+    return item.messageId === undefined || item.messageId === pending.messageId;
+  };
+
+  const startChain = (
+    item: Extract<AgentTimelineItem, { type: StreamingTextType }>,
+    turnId: string | undefined,
+  ): PendingStreamingText => {
+    closePending();
+    const chain: PendingStreamingText = {
+      type: item.type,
+      turnId,
+      messageId: item.type === "assistant_message" ? item.messageId : undefined,
+      buffer: "",
+      emitted: false,
+    };
+    pending = chain;
+    return chain;
+  };
+
+  return {
+    push(item, turnId) {
+      if (!matchesFilter(item, filter)) {
+        closePending();
+        return;
+      }
+      if (item.type === "assistant_message" || item.type === "reasoning") {
+        const chain = continuesChain(item, turnId) && pending ? pending : startChain(item, turnId);
+        chain.buffer += item.text;
+        flushContent(chain);
+        return;
+      }
+      closePending();
+      const transcript = formatAgentActivityTranscript([item]);
+      if (transcript && transcript !== NO_ACTIVITY_MESSAGE) {
+        write(`${transcript}\n`);
+      }
+    },
+    end() {
+      closePending();
+    },
+  };
+}
+
 function parseTailCount(raw: string | undefined): number | undefined {
   if (raw === undefined) return undefined;
   const parsed = Number.parseInt(raw, 10);
@@ -149,12 +277,19 @@ export async function runLogsCommand(
         await client.close().catch(() => {});
         process.exit(1);
       }
-      await runFollowMode({ client, agentId: resolvedId, options, sinceTimestampMs });
+      await runFollowMode({
+        client,
+        agentId: resolvedId,
+        options,
+        sinceTimestampMs,
+      });
       return;
     }
 
     // Fetch timeline directly via cursor RPC.
-    let timelineItems = await fetchAgentTimelineItems(client, resolvedId, { sinceTimestampMs });
+    let timelineItems = await fetchAgentTimelineItems(client, resolvedId, {
+      sinceTimestampMs,
+    });
 
     // Apply filter
     if (options.filter) {
@@ -227,17 +362,22 @@ async function runFollowMode({
   const tailLabel =
     tailCount === 0 ? "no history" : `last ${tailCount} entr${tailCount === 1 ? "y" : "ies"}`;
 
+  const writer = createFollowTranscriptWriter(undefined, options.filter);
+
   const unsubscribe = client.subscribeAgentTimeline(agentId, (message) => {
     if (message.type === "agent.timeline.replacement") {
+      writer.end();
       console.log("\n[Timeline replaced; earlier output is no longer current]");
       return;
     }
 
     if (message.type === "agent.timeline.error") {
+      writer.end();
       console.error(`Timeline observation stopped: ${message.payload.error}`);
       return;
     }
     if (message.type === "agent.timeline.subscription_restored") {
+      writer.end();
       console.log("\n[Reconnected; live output resumed. Events may have been missed.]");
       return;
     }
@@ -248,15 +388,13 @@ async function runFollowMode({
         return;
       }
       const item = message.payload.event.item;
-      // Apply filter
-      if (options.filter && !matchesFilter(item, options.filter)) {
-        return;
-      }
-      // Print each timeline item as it arrives using the curator format
-      const transcript = formatAgentActivityTranscript([item]);
-      if (transcript !== NO_ACTIVITY_MESSAGE) {
-        console.log(transcript);
-      }
+      writer.push(item, message.payload.event.turnId);
+    } else if (
+      message.payload.event.type === "turn_completed" ||
+      message.payload.event.type === "turn_failed" ||
+      message.payload.event.type === "turn_canceled"
+    ) {
+      writer.end();
     }
   });
 
@@ -264,6 +402,7 @@ async function runFollowMode({
   console.log(`\n--- Following logs (${tailLabel}; Ctrl+C to stop) ---\n`);
 
   await waitForStop();
+  writer.end();
   unsubscribe();
   await client.close();
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index 53288d2acb..33bd91fd72 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",
diff --git a/packages/server/src/server/cli-agent-logs.test.ts b/packages/server/src/server/cli-agent-logs.test.ts
index be492f6168..634d0615c0 100644
--- a/packages/server/src/server/cli-agent-logs.test.ts
+++ b/packages/server/src/server/cli-agent-logs.test.ts
@@ -253,13 +253,19 @@ test("logs --since filters history and live output through the CLI and daemon",
       try {
         await waitForCliOutput(pastFollow, "--- Following logs");
         await Promise.all([
-          waitForCliOutput(pastFollow, "LIVE_REPLY"),
+          // Wait for a later visible item to close the streamed reply.
+          // Windows SIGINT forcibly exits without running shutdown handlers.
+          waitForCliOutput(pastFollow, "[User] LIVE_AFTER_REPLY\n"),
           (async () => {
             await manager.appendTimelineItem(agent.id, { type: "user_message", text: "LIVE_USER" });
             await manager.appendTimelineItem(agent.id, {
               type: "assistant_message",
               text: "LIVE_REPLY",
             });
+            await manager.appendTimelineItem(agent.id, {
+              type: "user_message",
+              text: "LIVE_AFTER_REPLY",
+            });
           })(),
         ]);
       } finally {
diff --git a/packages/server/src/server/daemon-e2e/cli-logs-follow.e2e.test.ts b/packages/server/src/server/daemon-e2e/cli-logs-follow.e2e.test.ts
new file mode 100644
index 0000000000..d8388f9dd2
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/cli-logs-follow.e2e.test.ts
@@ -0,0 +1,89 @@
+import { spawn } from "node:child_process";
+import { once } from "node:events";
+import { fileURLToPath } from "node:url";
+import { expect, test } from "vitest";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+
+// A real daemon and CLI with a deterministic provider emitting two text chunks.
+// The live Claude reproduction is recorded in the PR; this locks its CLI behavior.
+test("logs --follow preserves the same assistant text as one-shot logs", async () => {
+  const daemon = await createTestPaseoDaemon();
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  let follow: ReturnType<typeof spawn> | undefined;
+  let stdout = "";
+  let stderr = "";
+  try {
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    const agent = await client.createAgent({
+      provider: "claude",
+      cwd: daemon.paseoHome,
+      title: "Follow transcript regression",
+      modeId: "bypassPermissions",
+    });
+    follow = spawn(
+      process.execPath,
+      [
+        "--conditions=source",
+        "--import",
+        "tsx",
+        fileURLToPath(new URL("../../../../cli/src/index.ts", import.meta.url)),
+        "--host",
+        `127.0.0.1:${daemon.port}`,
+        "logs",
+        "--follow",
+        agent.id,
+        "--tail",
+        "0",
+        "--filter",
+        "assistant_message",
+      ],
+      {
+        env: { ...process.env, PASEO_HOME: daemon.paseoHome },
+        stdio: ["ignore", "pipe", "pipe"],
+      },
+    );
+    const exited = once(follow, "exit");
+    follow.stdout?.on("data", (chunk: Buffer) => {
+      stdout += chunk.toString();
+    });
+    follow.stderr?.on("data", (chunk: Buffer) => {
+      stderr += chunk.toString();
+    });
+    await expect
+      .poll(
+        () => {
+          if (follow?.exitCode !== null) {
+            throw new Error(`CLI exited before following logs: ${stderr}`);
+          }
+          return stdout;
+        },
+        { timeout: 20_000 },
+      )
+      .toContain("Following logs");
+    await client.sendMessage(agent.id, "respond with exactly: paseo-pr-cycle 한국어 보고서");
+    await client.waitForAgentUpsert(agent.id, (snapshot) => snapshot.status === "idle", 20_000);
+    const transcript = await client.fetchAgentTimeline(agent.id, {
+      direction: "tail",
+      limit: 100,
+      projection: "projected",
+    });
+    const assistantText = transcript.entries
+      .filter((row) => row.item.type === "assistant_message")
+      .map((row) => (row.item.type === "assistant_message" ? row.item.text : ""))
+      .join("");
+    expect(assistantText).not.toBe("");
+    // Completion closes the message while follow mode is still running.
+    // Then stop through the CLI's normal signal path.
+    await expect.poll(() => stdout, { timeout: 10_000 }).toContain(`${assistantText.trim()}\n`);
+    follow.kill("SIGINT");
+    await exited;
+    const output = stdout.slice(stdout.indexOf("---\n") + 4).trim();
+    expect(output, stderr).toBe(assistantText.trim());
+  } finally {
+    follow?.kill("SIGTERM");
+    await client.close();
+    await daemon.close();
+  }
+}, 60_000);

From ee0d901efbf83a09d77edaf934c62c2e1f424d21 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 02:19:11 +0200
Subject: [PATCH 084/270] Run each scheduled slot once without skipping the
 next occurrence (#6532)

* fix(server): claim scheduled slots atomically

* fix(server): skip elapsed schedule slots

* test(server): isolate overlapping tick runner

* test(schedule): reproduce duplicate cron dispatch across overlapping ticks

* fix(schedule): preserve final slots and recovery after failed outcome writes

Historical running records are not proof of a live execution after an outcome write fails. Keep live-run exclusion in the existing in-memory guard while the persisted cursor prevents duplicate slot claims. Final allowed runs do not need a future cron occurrence; recover interrupted final runs and preserve cadence if their limit changes during execution.

---------

Co-authored-by: Keith Kowal (paseo-dev) <keithpk+paseo-dev@kowal.me>
Co-authored-by: keithpk <keith@kowal.me>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/schedule/service.test.ts       | 266 ++++++++++++++++++
 .../server/src/server/schedule/service.ts     | 116 ++++++--
 2 files changed, 364 insertions(+), 18 deletions(-)

diff --git a/packages/server/src/server/schedule/service.test.ts b/packages/server/src/server/schedule/service.test.ts
index 18e23e0ed1..1a9f0f5fd4 100644
--- a/packages/server/src/server/schedule/service.test.ts
+++ b/packages/server/src/server/schedule/service.test.ts
@@ -44,6 +44,37 @@ interface ScheduleServiceInternals {
   executeSchedule(schedule: StoredSchedule, runId: string): Promise<ScheduleExecutionResult>;
 }
 
+class OverlappingTickRunner {
+  private resolveFirstRunStarted: () => void = () => {};
+  private resolveFirstRunBlocked: () => void = () => {};
+  private laterScheduleRunCount = 0;
+
+  readonly firstRunStarted = new Promise<void>((resolve) => {
+    this.resolveFirstRunStarted = resolve;
+  });
+  private readonly firstRunBlocked = new Promise<void>((resolve) => {
+    this.resolveFirstRunBlocked = resolve;
+  });
+
+  async run(schedule: StoredSchedule): Promise<ScheduleExecutionResult> {
+    if (schedule.prompt === "block the first tick") {
+      this.resolveFirstRunStarted();
+      await this.firstRunBlocked;
+    } else {
+      this.laterScheduleRunCount += 1;
+    }
+    return { agentId: null, output: "ok" };
+  }
+
+  unblockFirstRun(): void {
+    this.resolveFirstRunBlocked();
+  }
+
+  get laterScheduleRuns(): number {
+    return this.laterScheduleRunCount;
+  }
+}
+
 const SCHEDULE_TEST_CAPABILITIES: AgentCapabilityFlags = {
   supportsStreaming: true,
   supportsSessionPersistence: true,
@@ -345,6 +376,241 @@ describe("ScheduleService", () => {
     expect(inspected.nextRunAt).toBe("2026-01-01T00:02:00.000Z");
   });
 
+  test.each(["new-agent", "agent", "maxRuns: 1"] as const)(
+    "dispatches a shared cron slot only once for %s after an earlier tick resumes",
+    async (targetKind) => {
+      const runner = new OverlappingTickRunner();
+      const service = createScheduleService({
+        paseoHome: tempDir,
+        logger: createTestLogger(),
+        agentManager: new AgentManager({ logger: createTestLogger() }),
+        agentStorage,
+        providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+        now: () => now,
+        runner: (schedule) => runner.run(schedule),
+      });
+      const cadence = { type: "cron" as const, expression: "0 6 * * 1", timezone: "Europe/Prague" };
+      await service.create({
+        prompt: "block the first tick",
+        cadence,
+        target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+      });
+      // Give the later schedule a distinct creation time so file ordering cannot affect the race.
+      now = new Date("2026-01-01T00:00:01.000Z");
+      const agentId = "00000000-0000-0000-0000-000000000001";
+      await agentStorage.upsert(
+        buildAgentRecord({ id: agentId, cwd: tempDir, iso: now.toISOString() }),
+      );
+      const later = await service.create({
+        prompt: "later due schedule",
+        cadence,
+        target:
+          targetKind === "agent"
+            ? { type: "agent", agentId }
+            : { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+        maxRuns: targetKind === "maxRuns: 1" ? 1 : undefined,
+      });
+      now = new Date("2026-01-05T05:00:00.000Z");
+      const delayedTick = service.tick();
+      await runner.firstRunStarted;
+      try {
+        now = new Date("2026-01-05T05:00:01.000Z");
+        await service.tick();
+      } finally {
+        runner.unblockFirstRun();
+        await delayedTick;
+      }
+      const result = await service.inspect(later.id);
+      expect.soft(runner.laterScheduleRuns).toBe(1);
+      expect.soft(result.runs).toHaveLength(1);
+      expect.soft(result.runs.map((run) => run.scheduledFor)).toEqual(["2026-01-05T05:00:00.000Z"]);
+      expect(result.nextRunAt).toBe(
+        targetKind === "maxRuns: 1" ? null : "2026-01-12T05:00:00.000Z",
+      );
+      expect(result.status).toBe(targetKind === "maxRuns: 1" ? "completed" : "active");
+    },
+  );
+
+  test("advances the next scheduled slot past a run that crosses a cadence boundary", async () => {
+    const service = createScheduleService({
+      paseoHome: tempDir,
+      logger: createTestLogger(),
+      agentManager: new AgentManager({ logger: createTestLogger() }),
+      agentStorage,
+      providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+      now: () => now,
+      runner: async () => {
+        now = new Date("2026-01-01T00:02:00.000Z");
+        return { agentId: null, output: "ok" };
+      },
+    });
+
+    const created = await service.create({
+      prompt: "long-running task",
+      cadence: { type: "every", everyMs: 60_000 },
+      target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+    });
+
+    now = new Date("2026-01-01T00:01:00.000Z");
+    await service.tick();
+
+    expect((await service.inspect(created.id)).nextRunAt).toBe("2026-01-01T00:03:00.000Z");
+  });
+
+  test("runs the final allowed cron slot without requiring another occurrence", async () => {
+    let dispatches = 0;
+    const service = createScheduleService({
+      paseoHome: tempDir,
+      logger: createTestLogger(),
+      agentManager: new AgentManager({ logger: createTestLogger() }),
+      agentStorage,
+      providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+      now: () => now,
+      runner: async () => {
+        dispatches += 1;
+        return { agentId: null, output: "done" };
+      },
+    });
+    const created = await service.create({
+      prompt: "Run once on January 5 when it is Monday",
+      cadence: { type: "cron", expression: "0 6 5 1 1" },
+      target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+      maxRuns: 1,
+    });
+    now = new Date("2026-01-05T06:00:00.000Z");
+    await service.tick();
+    const result = await service.inspect(created.id);
+    expect(dispatches).toBe(1);
+    expect(result.status).toBe("completed");
+    expect(result.nextRunAt).toBeNull();
+    expect(result.runs).toHaveLength(1);
+    expect(result.runs[0].status).toBe("succeeded");
+  });
+
+  test.skipIf(process.platform === "win32" || process.getuid?.() === 0)(
+    "keeps firing future slots after an outcome could not be saved",
+    async () => {
+      const schedulesDir = join(tempDir, "schedules");
+      let dispatches = 0;
+      const failOutcomeWrite = async (): Promise<ScheduleExecutionResult> => {
+        dispatches += 1;
+        if (dispatches === 1) {
+          await chmod(schedulesDir, 0o555);
+        }
+        return { agentId: null, output: "done" };
+      };
+      const service = createScheduleService({
+        paseoHome: tempDir,
+        logger: createTestLogger(),
+        agentManager: new AgentManager({ logger: createTestLogger() }),
+        agentStorage,
+        providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+        now: () => now,
+        runner: failOutcomeWrite,
+      });
+      const created = await service.create({
+        prompt: "Check status each minute",
+        runOnCreate: false,
+        cadence: { type: "every", everyMs: 60_000 },
+        target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+      });
+      now = new Date("2026-01-01T00:01:00.000Z");
+      try {
+        await expect(service.tick()).rejects.toThrow();
+      } finally {
+        await chmod(schedulesDir, 0o755);
+      }
+      expect((await service.inspect(created.id)).runs[0].status).toBe("running");
+      now = new Date("2026-01-01T00:02:00.000Z");
+      await service.tick();
+      const result = await service.inspect(created.id);
+      expect(dispatches).toBe(2);
+      expect(result.runs.map((run) => run.scheduledFor)).toEqual([
+        "2026-01-01T00:01:00.000Z",
+        "2026-01-01T00:02:00.000Z",
+      ]);
+      expect(result.nextRunAt).toBe("2026-01-01T00:03:00.000Z");
+    },
+  );
+
+  test("completes an interrupted final slot during restart recovery", async () => {
+    const service = createScheduleService({
+      paseoHome: tempDir,
+      logger: createTestLogger(),
+      agentManager: new AgentManager({ logger: createTestLogger() }),
+      agentStorage,
+      providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+      now: () => now,
+      runner: async () => ({ agentId: null, output: "done" }),
+    });
+    const created = await service.create({
+      prompt: "Run once",
+      cadence: { type: "cron", expression: "0 6 5 1 1" },
+      target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+      maxRuns: 1,
+    });
+    now = new Date("2026-01-05T06:00:00.000Z");
+    const store = new ScheduleStore(join(tempDir, "schedules"), createTestLogger());
+    await store.update(created.id, (schedule) => ({
+      ...schedule,
+      nextRunAt: null,
+      runs: [
+        {
+          id: "interrupted-final-slot",
+          scheduledFor: now.toISOString(),
+          startedAt: now.toISOString(),
+          endedAt: null,
+          status: "running",
+          agentId: null,
+          output: null,
+          error: null,
+        },
+      ],
+    }));
+    now = new Date("2026-01-05T06:01:00.000Z");
+    await service.start();
+    try {
+      const result = await service.inspect(created.id);
+      expect(result.status).toBe("completed");
+      expect(result.nextRunAt).toBeNull();
+      expect(result.runs).toHaveLength(1);
+      expect(result.runs[0].status).toBe("failed");
+    } finally {
+      await service.stop();
+    }
+  });
+
+  test.each([2, null])(
+    "keeps a next slot when the final run's limit changes to %s",
+    async (maxRuns) => {
+      const service = createScheduleService({
+        paseoHome: tempDir,
+        logger: createTestLogger(),
+        agentManager: new AgentManager({ logger: createTestLogger() }),
+        agentStorage,
+        providerSnapshotManager: NO_UNATTENDED_SCHEDULE_POLICY,
+        now: () => now,
+        runner: async (schedule) => {
+          await service.update({ id: schedule.id, maxRuns });
+          return { agentId: null, output: "done" };
+        },
+      });
+      const created = await service.create({
+        prompt: "Allow more runs during execution",
+        runOnCreate: false,
+        cadence: { type: "every", everyMs: 60_000 },
+        target: { type: "new-agent", config: { provider: "claude", cwd: tempDir } },
+        maxRuns: 1,
+      });
+      now = new Date("2026-01-01T00:01:30.000Z");
+      await service.tick();
+      const result = await service.inspect(created.id);
+      expect(result.status).toBe("active");
+      expect(result.nextRunAt).toBe("2026-01-01T00:02:00.000Z");
+      expect(result.runs).toHaveLength(1);
+    },
+  );
+
   test("pause and resume update persisted schedule state", async () => {
     const service = createScheduleService({
       paseoHome: tempDir,
diff --git a/packages/server/src/server/schedule/service.ts b/packages/server/src/server/schedule/service.ts
index 3608dd8636..7b5487c3f8 100644
--- a/packages/server/src/server/schedule/service.ts
+++ b/packages/server/src/server/schedule/service.ts
@@ -38,6 +38,18 @@ export class ScheduleTargetGoneError extends Error {
   }
 }
 
+function advanceNextRunAtPast(
+  cadence: StoredSchedule["cadence"],
+  nextRunAt: Date,
+  now: Date,
+): Date {
+  let next = nextRunAt;
+  while (next.getTime() <= now.getTime()) {
+    next = computeNextRunAt(cadence, next);
+  }
+  return next;
+}
+
 function trimOptionalName(value: string | null | undefined): string | null {
   if (typeof value !== "string") {
     return null;
@@ -621,6 +633,9 @@ export class ScheduleService {
           error: "Daemon restarted before the scheduled run completed",
         };
         updated = { ...updated, runs };
+        if (shouldCompleteSchedule(updated, now)) {
+          updated = completeSchedule(updated, now);
+        }
         dirty = true;
       }
 
@@ -690,20 +705,31 @@ export class ScheduleService {
     options?: { manual?: boolean },
   ): Promise<void> {
     const manual = options?.manual === true;
+    // Reserve before store I/O; persisted history cannot prove a run is still alive.
     this.runningScheduleIds.add(schedule.id);
     try {
-      const runId = randomUUID();
-      const runningRun: ScheduleRun = {
-        id: runId,
-        scheduledFor: manual ? now.toISOString() : (schedule.nextRunAt ?? now.toISOString()),
-        startedAt: now.toISOString(),
-        endedAt: null,
-        status: "running",
-        agentId: null,
-        output: null,
-        error: null,
-      };
-      const scheduleWithRun = await this.appendRunningRun(schedule.id, runningRun);
+      let runId: string;
+      let scheduleWithRun: StoredSchedule;
+      if (manual) {
+        runId = randomUUID();
+        const runningRun: ScheduleRun = {
+          id: runId,
+          scheduledFor: now.toISOString(),
+          startedAt: now.toISOString(),
+          endedAt: null,
+          status: "running",
+          agentId: null,
+          output: null,
+          error: null,
+        };
+        scheduleWithRun = await this.appendRunningRun(schedule.id, runningRun);
+      } else {
+        const claimed = await this.claimDueRun(schedule.id, now);
+        if (!claimed) {
+          return;
+        }
+        ({ schedule: scheduleWithRun, runId } = claimed);
+      }
 
       try {
         const result = await this.runner(scheduleWithRun, runId);
@@ -734,6 +760,58 @@ export class ScheduleService {
     }
   }
 
+  private async claimDueRun(
+    scheduleId: string,
+    now: Date,
+  ): Promise<{ schedule: StoredSchedule; runId: string } | null> {
+    let claimed: { schedule: StoredSchedule; runId: string } | null = null;
+    const updatedSchedule = await this.store.update(scheduleId, (schedule) => {
+      if (
+        schedule.status !== "active" ||
+        !schedule.nextRunAt ||
+        shouldCompleteSchedule(schedule, now) ||
+        new Date(schedule.nextRunAt).getTime() > now.getTime()
+      ) {
+        return schedule;
+      }
+
+      const scheduledFor = schedule.nextRunAt;
+      const isFinalRun =
+        schedule.maxRuns !== null && countCompletedRuns(schedule) + 1 >= schedule.maxRuns;
+      const nextRunAt = isFinalRun
+        ? null
+        : advanceNextRunAtPast(
+            schedule.cadence,
+            computeNextRunAt(schedule.cadence, new Date(scheduledFor)),
+            now,
+          ).toISOString();
+
+      // Claim the due slot and advance its cursor in the same serialized update.
+      // A tick can hold a stale list while another tick finishes this schedule.
+      const runId = randomUUID();
+      const runningRun: ScheduleRun = {
+        id: runId,
+        scheduledFor,
+        startedAt: now.toISOString(),
+        endedAt: null,
+        status: "running",
+        agentId: null,
+        output: null,
+        error: null,
+      };
+      const updated: StoredSchedule = {
+        ...schedule,
+        nextRunAt,
+        updatedAt: now.toISOString(),
+        runs: [...schedule.runs, runningRun],
+      };
+      claimed = { schedule: updated, runId };
+      return updated;
+    });
+    requireSchedule(updatedSchedule, scheduleId);
+    return claimed;
+  }
+
   private async appendRunningRun(
     scheduleId: string,
     runningRun: ScheduleRun,
@@ -794,14 +872,16 @@ export class ScheduleService {
           nextRunAt: null,
         };
       } else {
-        const after = new Date(schedule.nextRunAt ?? now.toISOString());
-        let nextRunAt = computeNextRunAt(updated.cadence, after);
-        while (nextRunAt.getTime() <= now.getTime()) {
-          nextRunAt = computeNextRunAt(updated.cadence, nextRunAt);
-        }
+        // A final slot has no successor until its run limit is raised or cleared.
+        // Every runner invocation has a recorded run with this id.
+        const finishedRun = completedRuns.find((run) => run.id === params.runId)!;
+        const nextRunAt = updated.nextRunAt
+          ? new Date(updated.nextRunAt)
+          : computeNextRunAt(updated.cadence, new Date(finishedRun.scheduledFor));
+        // Move an overdue cursor past a long run without advancing a future one twice.
         updated = {
           ...updated,
-          nextRunAt: nextRunAt.toISOString(),
+          nextRunAt: advanceNextRunAtPast(updated.cadence, nextRunAt, now).toISOString(),
         };
       }
 

From e61009d5fbe0ed7e9841d43b32a3eae5983d7a28 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 03:00:33 +0200
Subject: [PATCH 085/270] fix(server): display diffs with custom Git
 presentation settings (#6536)

Request uncolored patches with explicit a/ and b/ prefixes before parsing. Mnemonic paths do not match checkout entries, and forced ANSI colors hide patch headers and hunks.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../utils/checkout-git.patch-format.test.ts   | 123 ++++++++++++++++++
 .../server/src/utils/checkout-git.test.ts     |   6 +-
 packages/server/src/utils/checkout-git.ts     |  12 +-
 3 files changed, 137 insertions(+), 4 deletions(-)
 create mode 100644 packages/server/src/utils/checkout-git.patch-format.test.ts

diff --git a/packages/server/src/utils/checkout-git.patch-format.test.ts b/packages/server/src/utils/checkout-git.patch-format.test.ts
new file mode 100644
index 0000000000..834a41b871
--- /dev/null
+++ b/packages/server/src/utils/checkout-git.patch-format.test.ts
@@ -0,0 +1,123 @@
+import { execFileSync } from "node:child_process";
+import { mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, describe, expect, it } from "vitest";
+import { getCheckoutDiff, getCommitFileDiff } from "./checkout-git.js";
+
+const repos: string[] = [];
+
+afterEach(() => {
+  for (const repo of repos.splice(0)) rmSync(repo, { recursive: true, force: true });
+});
+
+it.each(["diff.mnemonicPrefix=true", "color.diff=always", "diff.noprefix=true"])(
+  "preserves batched paths, spaces and literal prefix directories with %s",
+  async (config) => {
+    const cwd = createChangedRepo(config);
+    mkdirSync(join(cwd, "a"));
+    for (const name of ["a/literal.txt", "with spaces.txt"]) {
+      writeFileSync(join(cwd, name), "before\n");
+    }
+    git(cwd, "add", "a/literal.txt", "with spaces.txt");
+    git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "add files");
+    for (const name of ["a/literal.txt", "with spaces.txt"]) {
+      writeFileSync(join(cwd, name), "after\n");
+    }
+
+    const result = await getCheckoutDiff(cwd, { mode: "uncommitted", includeStructured: true });
+
+    expect(result.structured?.map((file) => file.path)).toEqual([
+      "a/literal.txt",
+      "file.txt",
+      "with spaces.txt",
+    ]);
+    for (const file of result.structured ?? []) {
+      expect(file.hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ type: "remove", content: "before" }),
+          expect.objectContaining({ type: "add", content: "after" }),
+        ]),
+      );
+    }
+    expect(git(cwd, "config", "--get", config.split("=")[0]).trim()).toBe(config.split("=")[1]);
+  },
+);
+
+function git(cwd: string, ...args: string[]): string {
+  return execFileSync("git", args, { cwd, encoding: "utf8" });
+}
+
+function createChangedRepo(config: string): string {
+  const cwd = realpathSync.native(mkdtempSync(join(tmpdir(), "checkout-patch-format-")));
+  repos.push(cwd);
+  git(cwd, "init", "-b", "main");
+  git(cwd, "config", "user.name", "Test");
+  git(cwd, "config", "user.email", "test@example.com");
+  writeFileSync(join(cwd, "file.txt"), "before\n");
+  git(cwd, "add", ".");
+  git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "initial");
+  git(cwd, "config", ...config.split("="));
+  writeFileSync(join(cwd, "file.txt"), "after\n");
+  return cwd;
+}
+
+describe.each(["diff.mnemonicPrefix=true", "color.diff=always"])(
+  "patch format with %s",
+  (config) => {
+    it("returns displayable uncommitted diff lines with their file counts", async () => {
+      const cwd = createChangedRepo(config);
+      const result = await getCheckoutDiff(cwd, { mode: "uncommitted", includeStructured: true });
+
+      expect(result.structured).toHaveLength(1);
+      expect(result.structured?.[0]).toMatchObject({
+        path: "file.txt",
+        additions: 1,
+        deletions: 1,
+      });
+      expect(result.structured?.[0].hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ type: "remove", content: "before" }),
+          expect.objectContaining({ type: "add", content: "after" }),
+        ]),
+      );
+    });
+
+    it("returns displayable committed changes against the base branch", async () => {
+      const cwd = createChangedRepo(config);
+      git(cwd, "checkout", "-b", "feature");
+      git(cwd, "add", ".");
+      git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit");
+      const result = await getCheckoutDiff(cwd, {
+        mode: "base",
+        baseRef: "main",
+        includeStructured: true,
+      });
+
+      expect(result.structured?.[0]).toMatchObject({
+        path: "file.txt",
+        additions: 1,
+        deletions: 1,
+      });
+      expect(result.structured?.[0].hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([expect.objectContaining({ type: "add", content: "after" })]),
+      );
+    });
+
+    it("returns displayable lines when opening an individual commit file", async () => {
+      const cwd = createChangedRepo(config);
+      git(cwd, "add", ".");
+      git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit");
+      const file = await getCommitFileDiff({
+        cwd,
+        sha: git(cwd, "rev-parse", "HEAD").trim(),
+        path: "file.txt",
+      });
+
+      expect(file).toMatchObject({ path: "file.txt", additions: 1, deletions: 1 });
+      expect(file?.hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([expect.objectContaining({ type: "add", content: "after" })]),
+      );
+    });
+  },
+);
diff --git a/packages/server/src/utils/checkout-git.test.ts b/packages/server/src/utils/checkout-git.test.ts
index e5cb02d46e..596332c4a7 100644
--- a/packages/server/src/utils/checkout-git.test.ts
+++ b/packages/server/src/utils/checkout-git.test.ts
@@ -1507,8 +1507,10 @@ const x = 1;
     expect(diff.diff).toContain("# generated.js: diff too large omitted");
     expect(diff.diff).toContain(`-export const value = "old";`);
     expect(diff.diff).toContain(`+export const value = "new";`);
-    expect(commands).toContain("diff --numstat HEAD");
-    expect(commands).toContain("diff HEAD -- :(literal)generated.js :(literal)small.ts");
+    expect(commands).toContain("diff --no-color --src-prefix=a/ --dst-prefix=b/ --numstat HEAD");
+    expect(commands).toContain(
+      "diff --no-color --src-prefix=a/ --dst-prefix=b/ HEAD -- :(literal)generated.js :(literal)small.ts",
+    );
     expect(metrics.maxConcurrent).toBeLessThanOrEqual(8);
   });
 
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index 758d6ecf84..f663a52a63 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -636,8 +636,16 @@ function normalizeNumstatPath(pathField: string): string {
   return pathField;
 }
 
+// Parsed patches need a stable wire format regardless of terminal presentation settings.
+const GIT_PATCH_FORMAT_ARGS = ["--no-color", "--src-prefix=a/", "--dst-prefix=b/"];
+
 function buildGitDiffArgs(args: { ignoreWhitespace?: boolean; extra: string[] }): string[] {
-  return ["diff", ...(args.ignoreWhitespace ? ["-w"] : []), ...args.extra];
+  return [
+    "diff",
+    ...GIT_PATCH_FORMAT_ARGS,
+    ...(args.ignoreWhitespace ? ["-w"] : []),
+    ...args.extra,
+  ];
 }
 
 const TRACKED_DIFF_NUMSTAT_MAX_BYTES = 2 * 1024 * 1024; // 2MB
@@ -2635,7 +2643,7 @@ export async function getCommitFileDiff({
   path: string;
 }): Promise<ParsedDiffFile | null> {
   const { stdout } = await runGitCommand(
-    ["show", sha, "--format=", "--diff-merges=first-parent", "--", path],
+    ["show", sha, "--format=", "--diff-merges=first-parent", ...GIT_PATCH_FORMAT_ARGS, "--", path],
     {
       cwd,
       envOverlay: READ_ONLY_GIT_ENV,

From 446749102e00af5de562f9c73228397d6695de2b Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 03:46:59 +0200
Subject: [PATCH 086/270] test(server): make commit signing checks independent
 of global format (#6540)

The failing signer uses gpg.program, which Git bypasses when a global SSH signing format is inherited. Select OpenPGP in the commit and squash-merge test repositories so both checks exercise their configured failing signer.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/server/src/utils/checkout-git.test.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/server/src/utils/checkout-git.test.ts b/packages/server/src/utils/checkout-git.test.ts
index 596332c4a7..3ac8a99637 100644
--- a/packages/server/src/utils/checkout-git.test.ts
+++ b/packages/server/src/utils/checkout-git.test.ts
@@ -523,6 +523,7 @@ describe("checkout git utilities", () => {
 
   it("honors commit signing configuration", async () => {
     execFileSync("git", ["config", "commit.gpgsign", "true"], { cwd: repoDir });
+    execFileSync("git", ["config", "gpg.format", "openpgp"], { cwd: repoDir });
     execFileSync("git", ["config", "gpg.program", process.execPath], { cwd: repoDir });
     writeFileSync(join(repoDir, "file.txt"), "signed\n");
 
@@ -3578,6 +3579,7 @@ const x = 1;
       cwd: repoDir,
     });
     execFileSync("git", ["config", "commit.gpgsign", "true"], { cwd: repoDir });
+    execFileSync("git", ["config", "gpg.format", "openpgp"], { cwd: repoDir });
     execFileSync("git", ["config", "gpg.program", process.execPath], { cwd: repoDir });
 
     await expect(mergeToBase(repoDir, { baseRef: "main", mode: "squash" })).rejects.toThrow(

From 7e66657bf046b7783204ecc8a505b8965516dd02 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 05:00:02 +0200
Subject: [PATCH 087/270] fix(agent): preserve reasoning order in activity
 transcripts (#6546)

Format projected text entries in sequence instead of grouping replies ahead of their preceding reasoning. Timeline projection already owns fragment merging.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/cli/src/commands/agent/logs.test.ts  | 12 ++++++
 .../src/server/agent/activity-curator.test.ts | 39 +++++++++++++++++
 .../src/server/agent/activity-curator.ts      | 42 ++++---------------
 3 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/packages/cli/src/commands/agent/logs.test.ts b/packages/cli/src/commands/agent/logs.test.ts
index b687aefd92..e551aa3791 100644
--- a/packages/cli/src/commands/agent/logs.test.ts
+++ b/packages/cli/src/commands/agent/logs.test.ts
@@ -15,6 +15,18 @@ function collect(items: readonly AgentTimelineItem[], turnId?: string): string {
 }
 
 describe("createFollowTranscriptWriter", () => {
+  it("matches one-shot logs when reasoning and assistant text alternate", () => {
+    const items: AgentTimelineItem[] = [
+      { type: "reasoning", text: "Check " },
+      { type: "reasoning", text: "the commands." },
+      { type: "assistant_message", text: "I will list the commands.", messageId: "msg_1" },
+      { type: "reasoning", text: "Then summarize." },
+      { type: "assistant_message", text: "Done.", messageId: "msg_2" },
+    ];
+
+    expect(collect(items).trimEnd()).toBe(formatAgentActivityTranscript(items));
+  });
+
   it("keeps a word that arrives split across fragments intact", () => {
     const output = collect([
       { type: "assistant_message", text: "the paseo-pr", messageId: "msg_1" },
diff --git a/packages/server/src/server/agent/activity-curator.test.ts b/packages/server/src/server/agent/activity-curator.test.ts
index 68f864174a..58a8a8b4f1 100644
--- a/packages/server/src/server/agent/activity-curator.test.ts
+++ b/packages/server/src/server/agent/activity-curator.test.ts
@@ -39,6 +39,45 @@ function row(seq: number, item: AgentTimelineItem): AgentTimelineRow {
 }
 
 describe("curateAgentActivity", () => {
+  it("keeps reasoning before the assistant text that followed it", () => {
+    const timeline: AgentTimelineItem[] = [
+      { type: "reasoning", text: "Check the commands first." },
+      { type: "assistant_message", text: "I will list the commands." },
+      toolCallItem({
+        callId: "shell-order",
+        name: "Bash",
+        detail: {
+          type: "shell",
+          command: "ls packages/cli/src/commands/agent/",
+          output: "",
+          exitCode: 0,
+        },
+      }),
+    ];
+
+    expect(curateAgentActivity(timeline)).toBe(
+      "[Thought] Check the commands first.\nI will list the commands.\n[Shell] ls packages/cli/src/commands/agent/",
+    );
+  });
+
+  it("preserves alternating text kinds, labels, and fragment concatenation", () => {
+    const timeline: AgentTimelineItem[] = [
+      { type: "assistant_message", text: "First message." },
+      { type: "reasoning", text: "First " },
+      { type: "reasoning", text: "thought." },
+      { type: "assistant_message", text: "Second " },
+      { type: "assistant_message", text: "message." },
+      { type: "reasoning", text: "Second thought." },
+    ];
+
+    expect(curateAgentActivity(timeline, { labelAssistantMessages: true })).toBe(
+      "[Assistant] First message.\n[Thought] First thought.\n[Assistant] Second message.\n[Thought] Second thought.",
+    );
+    expect(curateAgentActivity(timeline, { maxItems: 2 })).toBe(
+      "Second message.\n[Thought] Second thought.",
+    );
+  });
+
   it("renders user/assistant/reasoning entries", () => {
     const timeline: AgentTimelineItem[] = [
       { type: "user_message", text: "Hello" },
diff --git a/packages/server/src/server/agent/activity-curator.ts b/packages/server/src/server/agent/activity-curator.ts
index b8381c9b7c..efd0a8e48d 100644
--- a/packages/server/src/server/agent/activity-curator.ts
+++ b/packages/server/src/server/agent/activity-curator.ts
@@ -25,36 +25,20 @@ interface ActivityEntry {
 
 type TextAgentAttachment = Extract<AgentAttachment, { type: "text" }>;
 
-function appendText(buffer: string, text: string): string {
-  const normalized = text.trim();
-  if (!normalized) {
-    return buffer;
-  }
-  if (!buffer) {
-    return normalized;
-  }
-  return `${buffer}\n${normalized}`;
-}
-
 function activityEntry(text: string): ActivityEntry {
   return { text };
 }
 
-function flushBuffers(
+function appendTextEntry(
   entries: ActivityEntry[],
-  buffers: { message: string; thought: string },
+  item: Extract<AgentTimelineItem, { type: "assistant_message" | "reasoning" }>,
   options?: ActivityCuratorOptions,
 ) {
-  if (buffers.message.trim()) {
-    const text = buffers.message.trim();
-    entries.push(activityEntry(options?.labelAssistantMessages ? `[Assistant] ${text}` : text));
-  }
-  if (buffers.thought.trim()) {
-    const text = buffers.thought.trim();
-    entries.push(activityEntry(`[Thought] ${text}`));
-  }
-  buffers.message = "";
-  buffers.thought = "";
+  const text = item.text.trim();
+  if (!text) return;
+  let prefix = options?.labelAssistantMessages ? "[Assistant] " : "";
+  if (item.type === "reasoning") prefix = "[Thought] ";
+  entries.push(activityEntry(`${prefix}${text}`));
 }
 
 function formatToolInputJson(input: unknown): string | null {
@@ -147,7 +131,6 @@ function curateProjectedActivityEntries(
   const recentItems = maxItems > 0 && items.length > maxItems ? items.slice(-maxItems) : items;
 
   const entries: ActivityEntry[] = [];
-  const buffers = { message: "", thought: "" };
 
   for (const item of recentItems) {
     if (!shouldIncludeItem(item, options)) {
@@ -156,17 +139,13 @@ function curateProjectedActivityEntries(
 
     switch (item.type) {
       case "user_message":
-        flushBuffers(entries, buffers, options);
         entries.push(activityEntry(`[User] ${item.text.trim()}`));
         break;
       case "assistant_message":
-        buffers.message = appendText(buffers.message, item.text);
-        break;
       case "reasoning":
-        buffers.thought = appendText(buffers.thought, item.text);
+        appendTextEntry(entries, item, options);
         break;
       case "tool_call": {
-        flushBuffers(entries, buffers, options);
         entries.push(formatToolCallEntry(item, options));
         if (item.detail.type === "sub_agent" && item.detail.log.trim()) {
           entries.push(activityEntry(item.detail.log.trim()));
@@ -174,7 +153,6 @@ function curateProjectedActivityEntries(
         break;
       }
       case "todo":
-        flushBuffers(entries, buffers, options);
         entries.push(activityEntry("[Tasks]"));
         for (const entry of item.items) {
           const checkbox = entry.completed ? "[x]" : "[ ]";
@@ -183,18 +161,14 @@ function curateProjectedActivityEntries(
         }
         break;
       case "error":
-        flushBuffers(entries, buffers, options);
         entries.push(activityEntry(`[Error] ${item.message}`));
         break;
       case "compaction":
-        flushBuffers(entries, buffers, options);
         entries.push(activityEntry("[Compacted]"));
         break;
     }
   }
 
-  flushBuffers(entries, buffers, options);
-
   return entries;
 }
 

From 7f9b65d4645ab7d18d67a97e9e27e71fc2ea4344 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 05:46:39 +0200
Subject: [PATCH 088/270] test(server): keep commit fixture authors independent
 of Git config (#6552)

Command-scoped user.name overrides the fixture repository configuration and breaks its author assertion. Supply the fixture author when creating commits and exercise the override with real Git.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/utils/checkout-git.commits.test.ts    | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/utils/checkout-git.commits.test.ts b/packages/server/src/utils/checkout-git.commits.test.ts
index 5a006ae0eb..d614e32f9b 100644
--- a/packages/server/src/utils/checkout-git.commits.test.ts
+++ b/packages/server/src/utils/checkout-git.commits.test.ts
@@ -25,7 +25,10 @@ function git(args: string[], cwd?: string): void {
 }
 
 function commit(repoDir: string, message: string): void {
-  git(["-c", "commit.gpgsign=false", "commit", "-m", message], repoDir);
+  git(
+    ["-c", "commit.gpgsign=false", "commit", "--author=Test User <test@test.com>", "-m", message],
+    repoDir,
+  );
 }
 
 function commitFile(repoDir: string, name: string, content: string, message: string): void {
@@ -92,6 +95,30 @@ function addBareRemote(repoDir: string, tempDir: string): string {
 }
 
 describe("listCheckoutCommits", () => {
+  it("keeps fixture authors independent of command-scoped Git configuration", async () => {
+    const overrides = {
+      GIT_CONFIG_COUNT: "1",
+      GIT_CONFIG_KEY_0: "user.name",
+      GIT_CONFIG_VALUE_0: "Other User",
+    };
+    const previous = Object.fromEntries(
+      Object.keys(overrides).map((key) => [key, process.env[key]]),
+    );
+    let repoDir: string;
+    try {
+      Object.assign(process.env, overrides);
+      ({ repoDir } = initRepoOnMain());
+    } finally {
+      for (const [key, value] of Object.entries(previous)) {
+        if (value === undefined) delete process.env[key];
+        else process.env[key] = value;
+      }
+    }
+
+    const { commits } = await listCheckoutCommits({ cwd: repoDir });
+    expect(commits[0]?.authorName).toBe("Test User");
+  });
+
   it("lists recent commits newest-first with on-remote flags and file stats", async () => {
     const { repoDir, tempDir } = initRepoOnMain();
     git(["checkout", "-b", "feature"], repoDir);

From cfb18f16d409a2bc925660fcfdc3340c98a5a8dc Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 06:53:37 +0200
Subject: [PATCH 089/270] fix(app): find starting refs by change request
 descriptions (#6558)

Preserve returned change request bodies as search-only option text so client filtering keeps description matches. Keep title and ID matches ranked ahead of secondary text.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../components/ui/combobox-options.test.ts    | 13 ++++++
 .../app/src/components/ui/combobox-options.ts | 14 ++++--
 .../screens/new-workspace-picker-item.test.ts | 46 +++++++++++++++++++
 .../src/screens/new-workspace-picker-item.ts  | 13 +++++-
 4 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/packages/app/src/components/ui/combobox-options.test.ts b/packages/app/src/components/ui/combobox-options.test.ts
index 6129af9463..e3e98633b3 100644
--- a/packages/app/src/components/ui/combobox-options.test.ts
+++ b/packages/app/src/components/ui/combobox-options.test.ts
@@ -160,3 +160,16 @@ describe("combobox above-search ordering", () => {
     expect(getComboboxFallbackIndex(ordered.length, "below-search")).toBe(0);
   });
 });
+
+describe("search-only option text", () => {
+  it("finds hidden search text while keeping title matches first", () => {
+    const bodyMatch = { id: "pr:7", label: "Fix parsing", searchText: "Release notes for 2024" };
+    const titleMatch = { id: "pr:8", label: "2024 release" };
+    expect(filterAndRankComboboxOptions([bodyMatch, titleMatch], "2024")).toEqual([
+      titleMatch,
+      bodyMatch,
+    ]);
+    expect(filterAndRankComboboxOptions([bodyMatch], "unrelated")).toEqual([]);
+    expect(filterAndRankComboboxOptions([bodyMatch], "parsing 2024")).toEqual([bodyMatch]);
+  });
+});
diff --git a/packages/app/src/components/ui/combobox-options.ts b/packages/app/src/components/ui/combobox-options.ts
index e23f2315ef..006eb1a21e 100644
--- a/packages/app/src/components/ui/combobox-options.ts
+++ b/packages/app/src/components/ui/combobox-options.ts
@@ -10,18 +10,22 @@ export interface ComboboxOptionModel {
   id: string;
   label: string;
   description?: string;
+  /** Additional text to match without displaying it in the option row. */
+  searchText?: string;
   kind?: ComboboxOptionKind;
 }
 
-const DESCRIPTION_FALLBACK_TIER = 99;
+const SECONDARY_TEXT_FALLBACK_TIER = 99;
 
 function scoreOption(opt: ComboboxOptionModel, search: string): MatchScore | null {
   const best = scoreTextFields(search, [opt.label, opt.id]);
   if (best) return best;
-  if (!opt.description) return null;
-  const descriptionScore = scoreTextFields(search, [opt.description]);
-  if (!descriptionScore) return null;
-  return { ...descriptionScore, tier: descriptionScore.tier + DESCRIPTION_FALLBACK_TIER };
+  const secondaryFields = opt.searchText
+    ? [opt.label, opt.id, opt.description ?? "", opt.searchText]
+    : [opt.description ?? ""];
+  const secondaryScore = scoreTextFields(search, secondaryFields);
+  if (!secondaryScore) return null;
+  return { ...secondaryScore, tier: secondaryScore.tier + SECONDARY_TEXT_FALLBACK_TIER };
 }
 
 export interface BuildVisibleComboboxOptionsInput {
diff --git a/packages/app/src/screens/new-workspace-picker-item.test.ts b/packages/app/src/screens/new-workspace-picker-item.test.ts
index 739738e0f9..a6c1e81845 100644
--- a/packages/app/src/screens/new-workspace-picker-item.test.ts
+++ b/packages/app/src/screens/new-workspace-picker-item.test.ts
@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+import { buildVisibleComboboxOptions } from "@/components/ui/combobox-options";
 import type { ForgeSearchItem } from "@getpaseo/protocol/messages";
 import {
   type BranchPickerDetail,
@@ -340,3 +341,48 @@ describe("defaultBasePickerItem", () => {
     expect(defaultBasePickerItem({ currentBranch: null })).toBeNull();
   });
 });
+
+describe("starting-ref search", () => {
+  it.each(["gitlab", "github"] as const)(
+    "keeps a %s change request returned for a body-only match",
+    (forge) => {
+      const item: ForgeSearchItem = {
+        ...prItem,
+        forge,
+        number: 3896,
+        title: "fix(config): send environment credentials only to trusted hosts",
+        body: "This mirrors the fix shipped for CVE-2024-53858.",
+        headRefName: "8545-duo-test",
+      };
+      const { options } = buildPickerOptionData({
+        branchDetails: [],
+        prItems: [item],
+        baseItem: null,
+      });
+      const visible = buildVisibleComboboxOptions({
+        options,
+        searchQuery: "2024",
+        searchable: true,
+        allowCustomValue: false,
+        customValuePrefix: "Use",
+      });
+      expect(visible.map((option) => option.label)).toEqual([
+        `${forge === "gitlab" ? "!" : "#"}3896 fix(config): send environment credentials only to trusted hosts`,
+      ]);
+      const selected = buildPickerOptionData({
+        branchDetails: [],
+        prItems: [],
+        baseItem: { kind: "github-pr", item },
+      });
+      expect(
+        buildVisibleComboboxOptions({
+          options: selected.options,
+          searchQuery: "2024",
+          searchable: true,
+          allowCustomValue: false,
+          customValuePrefix: "Use",
+        }),
+      ).toEqual(visible);
+    },
+  );
+});
diff --git a/packages/app/src/screens/new-workspace-picker-item.ts b/packages/app/src/screens/new-workspace-picker-item.ts
index 0cb0680605..d02c7a0bf2 100644
--- a/packages/app/src/screens/new-workspace-picker-item.ts
+++ b/packages/app/src/screens/new-workspace-picker-item.ts
@@ -264,7 +264,10 @@ export function buildPickerOptionData(input: {
     itemById.set(id, { kind: "github-pr", item: pr });
     const updatedAtMs = pr.updatedAt ? Date.parse(pr.updatedAt) : 0;
     const timestamp = Number.isNaN(updatedAtMs) ? 0 : Math.floor(updatedAtMs / 1000);
-    timedOptions.push({ option: { id, label: formatPrLabel(pr) }, timestamp });
+    timedOptions.push({
+      option: { id, label: formatPrLabel(pr), searchText: pr.body ?? undefined },
+      timestamp,
+    });
   }
 
   const baseItem = input.baseItem;
@@ -279,7 +282,13 @@ export function buildPickerOptionData(input: {
     const labeledItem = disambiguate(baseItem, timedOptions);
     itemById.set(selectedOptionId, labeledItem);
     timedOptions.push({
-      option: { id: selectedOptionId, label: pickerItemLabel(labeledItem) },
+      option: {
+        id: selectedOptionId,
+        label: pickerItemLabel(labeledItem),
+        ...(labeledItem.kind === "github-pr"
+          ? { searchText: labeledItem.item.body ?? undefined }
+          : {}),
+      },
       // The base sorts first: it is what a workspace is created from unless you pick something.
       timestamp: Number.POSITIVE_INFINITY,
     });

From dd0350bc2b44e4c8117d37fecf9ac4fcde69ef07 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 07:55:09 +0200
Subject: [PATCH 090/270] Show actual edits when a file is renamed in Changes
 (#6559)

* fix(server): show actual edits when a file is renamed

Path-limited patch requests discarded the detected rename source, so Git reported the destination as a new file. Include both literal paths and select the destination patch to preserve the rename and avoid duplicating changed copy sources.

* fix(server): preserve small copy patches beside oversized sources

Filter rename and copy output before enforcing the bounded request budget, so a modified source cannot hide its small copy patch.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../server/src/utils/checkout-git.test.ts     | 121 +++++++++++++++++-
 packages/server/src/utils/checkout-git.ts     |  37 +++++-
 2 files changed, 150 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/utils/checkout-git.test.ts b/packages/server/src/utils/checkout-git.test.ts
index 3ac8a99637..47d2aa76ea 100644
--- a/packages/server/src/utils/checkout-git.test.ts
+++ b/packages/server/src/utils/checkout-git.test.ts
@@ -539,10 +539,129 @@ describe("checkout git utilities", () => {
     });
 
     expect(diff.structured).toContainEqual(
-      expect.objectContaining({ path: "renamed.txt", oldPath: "file.txt" }),
+      expect.objectContaining({
+        path: "renamed.txt",
+        oldPath: "file.txt",
+        additions: 0,
+        deletions: 0,
+        hunks: [],
+      }),
     );
   });
 
+  it.each([
+    { mode: "uncommitted", oldPath: "to-rename.txt", path: "renamed.txt" },
+    { mode: "base", oldPath: "to-rename.txt", path: "renamed.txt" },
+    { mode: "uncommitted", oldPath: "old [file].txt", path: "new [file].txt" },
+  ] as const)(
+    "shows only the edited line of a rename ($mode, $path)",
+    async ({ mode, oldPath, path }) => {
+      const original = Array.from({ length: 12 }, (_, index) => `line ${index + 1}`);
+      commitFile(repoDir, oldPath, original.join("\n") + "\n", "file to rename");
+      if (mode === "base") {
+        execFileSync("git", ["checkout", "-b", "feature/rename"], { cwd: repoDir });
+      }
+      execFileSync("git", ["mv", oldPath, path], { cwd: repoDir });
+      const edited = [...original];
+      edited[5] = "edited line 6";
+      writeFileSync(join(repoDir, path), edited.join("\n") + "\n");
+      execFileSync("git", ["add", path], { cwd: repoDir });
+
+      expect(
+        execFileSync("git", ["diff", "--name-status", "HEAD"], { cwd: repoDir }).toString(),
+      ).toMatch(/R\d+\t/);
+      if (mode === "base") {
+        execFileSync("git", ["-c", "commit.gpgsign=false", "commit", "-m", "rename and edit"], {
+          cwd: repoDir,
+        });
+      }
+
+      const diff = await getCheckoutDiff(repoDir, {
+        mode,
+        ...(mode === "base" ? { baseRef: "main" } : {}),
+        includeStructured: true,
+      });
+
+      expect(diff.structured).toEqual([
+        expect.objectContaining({
+          path,
+          oldPath,
+          isNew: false,
+          isDeleted: false,
+          additions: 1,
+          deletions: 1,
+          status: "ok",
+        }),
+      ]);
+      expect(diff.diff).toContain(`rename from ${oldPath}`);
+      expect(diff.diff).toContain(`rename to ${path}`);
+      expect(diff.diff).toContain("-line 6\n+edited line 6");
+      expect(diff.diff).not.toContain("new file mode");
+    },
+  );
+
+  it("includes a changed copy source only once in the diff", async () => {
+    const original =
+      Array.from({ length: 12 }, (_, index) => `line ${index + 1}`).join("\n") + "\n";
+    commitFile(repoDir, "source.txt", original, "copy source");
+    execFileSync("git", ["config", "diff.renames", "copies"], { cwd: repoDir });
+    writeFileSync(join(repoDir, "copy.txt"), original);
+    writeFileSync(join(repoDir, "source.txt"), original.replace("line 6", "edited line 6"));
+    execFileSync("git", ["add", "copy.txt", "source.txt"], { cwd: repoDir });
+    expect(
+      execFileSync("git", ["diff", "--name-status", "HEAD"], { cwd: repoDir }).toString(),
+    ).toContain("C100\tsource.txt\tcopy.txt");
+
+    const diff = await getCheckoutDiff(repoDir, {
+      mode: "uncommitted",
+      includeStructured: true,
+    });
+    expect(diff.structured).toEqual([
+      expect.objectContaining({
+        path: "copy.txt",
+        oldPath: "source.txt",
+        additions: 0,
+        deletions: 0,
+      }),
+      expect.objectContaining({ path: "source.txt", additions: 1, deletions: 1 }),
+    ]);
+    expect(diff.diff.match(/^diff --git a\/source.txt b\/source.txt$/gm)).toHaveLength(1);
+    expect(diff.diff).toContain("copy from source.txt");
+    expect(diff.diff).toContain("copy to copy.txt");
+  });
+
+  it("keeps a small copy patch when its edited source exceeds the patch limit", async () => {
+    const original =
+      Array.from({ length: 12 }, (_, index) => `line ${index + 1}`).join("\n") + "\n";
+    commitFile(repoDir, "source.txt", original, "copy source");
+    execFileSync("git", ["config", "diff.renames", "copies"], { cwd: repoDir });
+    writeFileSync(join(repoDir, "copy.txt"), original);
+    writeFileSync(join(repoDir, "source.txt"), original + "added source line\n".repeat(80_000));
+    execFileSync("git", ["add", "copy.txt", "source.txt"], { cwd: repoDir });
+    expect(
+      execFileSync("git", ["diff", "--name-status", "HEAD"], { cwd: repoDir }).toString(),
+    ).toContain("C100\tsource.txt\tcopy.txt");
+
+    const diff = await getCheckoutDiff(repoDir, {
+      mode: "uncommitted",
+      includeStructured: true,
+    });
+    expect(diff.structured).toEqual([
+      expect.objectContaining({
+        path: "copy.txt",
+        oldPath: "source.txt",
+        additions: 0,
+        deletions: 0,
+        hunks: [],
+        status: "ok",
+      }),
+      expect.objectContaining({ path: "source.txt", status: "too_large", hunks: [] }),
+    ]);
+    expect(diff.diff).toContain("copy from source.txt");
+    expect(diff.diff).toContain("copy to copy.txt");
+    expect(diff.diff).not.toContain("+added source line");
+  });
+
   it("reads the origin URL once when collecting facts for an origin-tracking branch", async () => {
     setupRemoteTrackingMain(repoDir, tempDir);
 
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index f663a52a63..9b31fd6665 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -721,12 +721,19 @@ async function getTrackedDiffTextForPath(input: {
   cwd: string;
   refsForDiff: CheckoutDiffRefs;
   path: string;
+  oldPath?: string;
   ignoreWhitespace: boolean;
 }): Promise<{ path: string; text: string; truncated: boolean }> {
+  const paths = input.oldPath ? [input.oldPath, input.path] : [input.path];
   const result = await runGitCommand(
     buildGitDiffArgs({
       ignoreWhitespace: input.ignoreWhitespace,
-      extra: [...getCheckoutDiffRefArgs(input.refsForDiff), "--", `:(literal)${input.path}`],
+      extra: [
+        ...(input.oldPath ? ["--diff-filter=RC"] : []),
+        ...getCheckoutDiffRefArgs(input.refsForDiff),
+        "--",
+        ...paths.map((path) => `:(literal)${path}`),
+      ],
     }),
     {
       cwd: input.cwd,
@@ -735,9 +742,22 @@ async function getTrackedDiffTextForPath(input: {
     },
   );
 
+  // A source path can participate in another rename/copy in the same request.
+  // Return only the requested destination; the filter keeps source edits out of its budget.
+  let text = result.stdout;
+  if (input.oldPath && !result.truncated) {
+    text = result.stdout
+      .split(/(?=^diff --git )/m)
+      .filter((section) => {
+        const hunkStart = section.indexOf("\n@@ ");
+        const header = hunkStart < 0 ? section : section.slice(0, hunkStart);
+        return parseDiff(header)[0]?.path === input.path;
+      })
+      .join("");
+  }
   return {
     path: input.path,
-    text: result.stdout,
+    text,
     truncated: result.truncated,
   };
 }
@@ -3314,26 +3334,29 @@ async function processTrackedChanges(
 
   let trackedDiffText = "";
   let trackedDiffBytes = 0;
-  const renamedPaths = new Set(
-    trackedChanges.filter((change) => change.oldPath).map((change) => change.path),
+  const oldPathByPath = new Map(
+    trackedChanges
+      .filter((change) => change.oldPath)
+      .map((change) => [change.path, change.oldPath]),
   );
   for (let start = 0; start < trackedDiffPaths.length; start += TRACKED_DIFF_BATCH_SIZE) {
     const paths = trackedDiffPaths.slice(start, start + TRACKED_DIFF_BATCH_SIZE);
-    // Keep rename/copy path filtering identical to the existing per-file command.
+    // Rename/copy detection needs both paths.
     const ordinary = await getTrackedDiffTexts({
       cwd,
       refsForDiff,
-      paths: paths.filter((path) => !renamedPaths.has(path)),
+      paths: paths.filter((path) => !oldPathByPath.has(path)),
       ignoreWhitespace,
     });
     const renamed = await Promise.all(
       paths
-        .filter((path) => renamedPaths.has(path))
+        .filter((path) => oldPathByPath.has(path))
         .map((path) =>
           getTrackedDiffTextForPath({
             cwd,
             refsForDiff,
             path,
+            oldPath: oldPathByPath.get(path),
             ignoreWhitespace,
           }),
         ),

From a5dba3c9921b6da2707450b8114d490feed5de16 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 08:58:07 +0200
Subject: [PATCH 091/270] Show checkout patch lines with external Git diff
 commands configured (#6562)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(server): parse Git patches without external diff commands

* test(server): keep diff command checks aligned with parsed patches

The external diff regression fix intentionally disables helper commands.
Keep the existing large-file batching assertions aligned with that command
while preserving their patch, omission, and concurrency checks.

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>

---------

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../utils/checkout-git.patch-format.test.ts   | 94 ++++++++++++++++++-
 .../server/src/utils/checkout-git.test.ts     |  6 +-
 packages/server/src/utils/checkout-git.ts     |  2 +-
 3 files changed, 97 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/utils/checkout-git.patch-format.test.ts b/packages/server/src/utils/checkout-git.patch-format.test.ts
index 834a41b871..d30ae1d7ce 100644
--- a/packages/server/src/utils/checkout-git.patch-format.test.ts
+++ b/packages/server/src/utils/checkout-git.patch-format.test.ts
@@ -1,13 +1,14 @@
 import { execFileSync } from "node:child_process";
-import { mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { afterEach, describe, expect, it } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import { getCheckoutDiff, getCommitFileDiff } from "./checkout-git.js";
 
 const repos: string[] = [];
 
 afterEach(() => {
+  vi.unstubAllEnvs();
   for (const repo of repos.splice(0)) rmSync(repo, { recursive: true, force: true });
 });
 
@@ -62,6 +63,95 @@ function createChangedRepo(config: string): string {
   return cwd;
 }
 
+function createExternalDiffCommand() {
+  const directory = realpathSync.native(mkdtempSync(join(tmpdir(), "checkout-external-diff-")));
+  repos.push(directory);
+  const script = join(directory, "external-diff.cjs");
+  const marker = join(directory, "invoked");
+  writeFileSync(
+    script,
+    'require("node:fs").writeFileSync(process.argv[2], "invoked");\n' +
+      'process.stdout.write("CUSTOM EXTERNAL DIFF\\n");\n',
+  );
+  const command = [process.execPath, script, marker]
+    .map((argument) => `'${argument.replaceAll("'", "'\\''")}'`)
+    .join(" ");
+  return { command, marker };
+}
+
+function createExternalDiffRepo() {
+  vi.stubEnv("GIT_EXTERNAL_DIFF", undefined);
+  const cwd = createChangedRepo("color.diff=always");
+  const { command, marker } = createExternalDiffCommand();
+  git(cwd, "config", "diff.external", command);
+  expect(git(cwd, "diff", "HEAD", "--", "file.txt")).toBe("CUSTOM EXTERNAL DIFF\n");
+  expect(existsSync(marker)).toBe(true);
+  rmSync(marker);
+  return { cwd, command, marker };
+}
+
+function expectStandardPatch(result: Awaited<ReturnType<typeof getCheckoutDiff>>) {
+  expect(result.structured).toMatchObject([
+    {
+      path: "file.txt",
+      additions: 1,
+      deletions: 1,
+      status: "ok",
+      hunks: [
+        {
+          lines: [
+            { type: "header", content: "@@ -1 +1 @@" },
+            { type: "remove", content: "before" },
+            { type: "add", content: "after" },
+          ],
+        },
+      ],
+    },
+  ]);
+}
+
+it("returns Git patch hunks when a repository configures an external diff command", async () => {
+  const { cwd, command, marker } = createExternalDiffRepo();
+
+  const result = await getCheckoutDiff(cwd, { mode: "uncommitted", includeStructured: true });
+
+  expectStandardPatch(result);
+  expect(existsSync(marker)).toBe(false);
+  expect(git(cwd, "config", "--get", "diff.external").trim()).toBe(command);
+});
+
+it("returns Git patch hunks against the base branch with an external diff command", async () => {
+  const { cwd, command, marker } = createExternalDiffRepo();
+  git(cwd, "checkout", "-b", "feature");
+  git(cwd, "add", ".");
+  git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit");
+
+  const result = await getCheckoutDiff(cwd, {
+    mode: "base",
+    baseRef: "main",
+    includeStructured: true,
+  });
+
+  expectStandardPatch(result);
+  expect(existsSync(marker)).toBe(false);
+  expect(git(cwd, "config", "--get", "diff.external").trim()).toBe(command);
+});
+
+it("returns Git patch hunks when GIT_EXTERNAL_DIFF configures the external command", async () => {
+  const cwd = createChangedRepo("color.diff=always");
+  const { command, marker } = createExternalDiffCommand();
+  vi.stubEnv("GIT_EXTERNAL_DIFF", command);
+  expect(git(cwd, "diff", "HEAD", "--", "file.txt")).toBe("CUSTOM EXTERNAL DIFF\n");
+  expect(existsSync(marker)).toBe(true);
+  rmSync(marker);
+
+  const result = await getCheckoutDiff(cwd, { mode: "uncommitted", includeStructured: true });
+
+  expectStandardPatch(result);
+  expect(existsSync(marker)).toBe(false);
+  expect(process.env.GIT_EXTERNAL_DIFF).toBe(command);
+});
+
 describe.each(["diff.mnemonicPrefix=true", "color.diff=always"])(
   "patch format with %s",
   (config) => {
diff --git a/packages/server/src/utils/checkout-git.test.ts b/packages/server/src/utils/checkout-git.test.ts
index 47d2aa76ea..21791fa49e 100644
--- a/packages/server/src/utils/checkout-git.test.ts
+++ b/packages/server/src/utils/checkout-git.test.ts
@@ -1627,9 +1627,11 @@ const x = 1;
     expect(diff.diff).toContain("# generated.js: diff too large omitted");
     expect(diff.diff).toContain(`-export const value = "old";`);
     expect(diff.diff).toContain(`+export const value = "new";`);
-    expect(commands).toContain("diff --no-color --src-prefix=a/ --dst-prefix=b/ --numstat HEAD");
     expect(commands).toContain(
-      "diff --no-color --src-prefix=a/ --dst-prefix=b/ HEAD -- :(literal)generated.js :(literal)small.ts",
+      "diff --no-ext-diff --no-color --src-prefix=a/ --dst-prefix=b/ --numstat HEAD",
+    );
+    expect(commands).toContain(
+      "diff --no-ext-diff --no-color --src-prefix=a/ --dst-prefix=b/ HEAD -- :(literal)generated.js :(literal)small.ts",
     );
     expect(metrics.maxConcurrent).toBeLessThanOrEqual(8);
   });
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index 9b31fd6665..2e317810ba 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -637,7 +637,7 @@ function normalizeNumstatPath(pathField: string): string {
 }
 
 // Parsed patches need a stable wire format regardless of terminal presentation settings.
-const GIT_PATCH_FORMAT_ARGS = ["--no-color", "--src-prefix=a/", "--dst-prefix=b/"];
+const GIT_PATCH_FORMAT_ARGS = ["--no-ext-diff", "--no-color", "--src-prefix=a/", "--dst-prefix=b/"];
 
 function buildGitDiffArgs(args: { ignoreWhitespace?: boolean; extra: string[] }): string[] {
   return [

From 46b1284177302811348bdb41b6afcff02b9ffd64 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 09:57:29 +0200
Subject: [PATCH 092/270] Release files when HTTP downloads are canceled
 (#6567)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(server): close canceled HTTP download streams

* test(server): verify canceled downloads release real file descriptors

Exercise the reported HTTP cancellation path without replacing shared Node methods, and include download regressions in the standard integration suite.

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>

* test(server): detect canceled download leaks through symlinked paths

Compare descriptor targets with the resolved file path and exercise a symlinked download directory so the regression cannot pass by missing the open file.

---------

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/server/package.json                  |  2 +-
 packages/server/src/server/bootstrap.ts       |  4 +
 .../daemon-e2e/file-download.e2e.test.ts      | 80 ++++++++++++++++++-
 3 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 33bd91fd72..ee225cef86 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",
diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/server/bootstrap.ts
index 43f72dc95f..727c7b7899 100644
--- a/packages/server/src/server/bootstrap.ts
+++ b/packages/server/src/server/bootstrap.ts
@@ -832,6 +832,9 @@ export async function createPaseoDaemon(
     try {
       fileHandle = await open(entry.absolutePath, DOWNLOAD_OPEN_FLAGS);
       const fileStats = await fileHandle.stat();
+      if (res.destroyed) {
+        return;
+      }
       if (!fileStats.isFile()) {
         res.status(404).json({ error: "File not found" });
         return;
@@ -843,6 +846,7 @@ export async function createPaseoDaemon(
 
       const stream = fileHandle.createReadStream();
       fileHandle = null;
+      res.once("close", () => stream.destroy());
       stream.on("error", (err) => {
         logger.error({ err }, "Failed to stream download");
         if (!res.headersSent) {
diff --git a/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts b/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
index ac138a8c01..862923dec6 100644
--- a/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts
@@ -1,5 +1,15 @@
 import { describe, test, expect, beforeEach, afterEach } from "vitest";
-import { mkdtempSync, writeFileSync, rmSync } from "fs";
+import {
+  mkdtempSync,
+  writeFileSync,
+  rmSync,
+  readdirSync,
+  readlinkSync,
+  realpathSync,
+  symlinkSync,
+} from "fs";
+import { once } from "node:events";
+import { get } from "node:http";
 import { tmpdir } from "os";
 import path from "path";
 import { createDaemonTestContext, type DaemonTestContext } from "../test-utils/index.js";
@@ -8,6 +18,41 @@ function tmpCwd(): string {
   return mkdtempSync(path.join(tmpdir(), "daemon-e2e-"));
 }
 
+// Linux exposes the real open descriptors without replacing file or HTTP methods.
+function openDownloadDescriptors(filePath: string): string[] {
+  const realFilePath = realpathSync(filePath);
+  return readdirSync("/proc/self/fd").filter((fd) => {
+    try {
+      return readlinkSync(`/proc/self/fd/${fd}`) === realFilePath;
+    } catch (error) {
+      // A descriptor can close between listing it and reading its link.
+      if ((error as NodeJS.ErrnoException).code === "ENOENT") return false;
+      throw error;
+    }
+  });
+}
+
+async function expectDownloadClosed(filePath: string): Promise<void> {
+  await expect.poll(() => openDownloadDescriptors(filePath)).toEqual([]);
+}
+
+async function cancelDownloadAfterFirstChunk(url: string): Promise<void> {
+  const request = get(url);
+  try {
+    const [response] = await once(request, "response");
+    expect(response.statusCode).toBe(200);
+    const [chunk] = await once(response, "data");
+    expect(chunk.length).toBeGreaterThan(0);
+    expect(chunk.length).toBeLessThan(64 * 1024 * 1024);
+    const closed = once(response, "close");
+    response.destroy();
+    request.destroy();
+    await closed;
+  } finally {
+    request.destroy();
+  }
+}
+
 // Use gpt-5.4-mini with low thinking preset for faster test execution
 const CODEX_TEST_MODEL = "gpt-5.4-mini";
 const CODEX_TEST_THINKING_OPTION_ID = "low";
@@ -24,6 +69,39 @@ describe("daemon E2E", () => {
   }, 60000);
 
   describe("file download tokens", () => {
+    test.skipIf(process.platform !== "linux")(
+      "releases file descriptors after repeated HTTP download cancellations",
+      async () => {
+        const directory = tmpCwd();
+        const cwd = path.join(directory, "linked-files");
+        symlinkSync(mkdtempSync(path.join(directory, "files-")), cwd, "dir");
+        const filePath = path.join(cwd, "large.bin");
+        const fileSize = 64 * 1024 * 1024;
+        writeFileSync(filePath, Buffer.alloc(fileSize));
+        try {
+          const completedToken = await ctx.client.requestDownloadToken(cwd, "large.bin");
+          expect(completedToken.error).toBeNull();
+          const completed = await fetch(
+            `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${completedToken.token}`,
+          );
+          expect(completed.status).toBe(200);
+          expect((await completed.arrayBuffer()).byteLength).toBe(fileSize);
+          await expectDownloadClosed(filePath);
+
+          for (let attempt = 0; attempt < 3; attempt++) {
+            const token = await ctx.client.requestDownloadToken(cwd, "large.bin");
+            expect(token.error).toBeNull();
+            await cancelDownloadAfterFirstChunk(
+              `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${token.token}`,
+            );
+            await expectDownloadClosed(filePath);
+          }
+        } finally {
+          rmSync(directory, { recursive: true, force: true });
+        }
+      },
+    );
+
     test.each([
       { fileName: "download.txt", disposition: 'attachment; filename="download.txt"' },
       {

From a3f75aa9e4589743e59a6a3e673ed8e0a5d7c865 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 11:03:15 +0200
Subject: [PATCH 093/270] Show removed SQL comments in Git diffs (#6569)

Hunk content resembling patch headers was discarded before line parsing. Metadata is already ignored before the first hunk, so preserve every added and removed line once a hunk starts.

Closes #6564

Co-authored-by: Yu Han <73627805+Mar-garet@users.noreply.github.com>
---
 .../checkout-diff-content.e2e.test.ts         | 87 +++++++++++++++++++
 .../src/server/utils/diff-highlighter.test.ts | 28 ++++++
 .../src/server/utils/diff-highlighter.ts      | 12 ---
 3 files changed, 115 insertions(+), 12 deletions(-)
 create mode 100644 packages/server/src/server/daemon-e2e/checkout-diff-content.e2e.test.ts

diff --git a/packages/server/src/server/daemon-e2e/checkout-diff-content.e2e.test.ts b/packages/server/src/server/daemon-e2e/checkout-diff-content.e2e.test.ts
new file mode 100644
index 0000000000..f0cd4495e1
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/checkout-diff-content.e2e.test.ts
@@ -0,0 +1,87 @@
+import { execFileSync } from "node:child_process";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { expect, test } from "vitest";
+import { createDaemonTestContext } from "../test-utils/index.js";
+
+function git(cwd: string, ...args: string[]): string {
+  return execFileSync("git", args, { cwd, encoding: "utf8" });
+}
+
+test.each(["uncommitted", "base", "commit"] as const)(
+  "%s diff preserves removed SQL comments and their deletion counts",
+  async (mode) => {
+    const ctx = await createDaemonTestContext();
+    const cwd = mkdtempSync(join(tmpdir(), "checkout-diff-content-"));
+
+    try {
+      git(cwd, "init", "-b", "main");
+      git(cwd, "config", "user.name", "Test");
+      git(cwd, "config", "user.email", "test@example.com");
+      writeFileSync(join(cwd, "query.sql"), "-- old comment\nSELECT 1;\n");
+      writeFileSync(join(cwd, "control.sql"), "SELECT 1;\n");
+      git(cwd, "add", ".");
+      git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "initial");
+      writeFileSync(join(cwd, "query.sql"), "-- new comment\nSELECT 1;\n");
+      writeFileSync(join(cwd, "control.sql"), "SELECT 2;\n");
+
+      expect(git(cwd, "diff", "--numstat", "HEAD", "--", "query.sql").trim()).toBe(
+        "1\t1\tquery.sql",
+      );
+
+      if (mode !== "uncommitted") {
+        git(cwd, "checkout", "-b", "feature");
+        git(cwd, "add", ".");
+        git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit");
+      }
+
+      const files =
+        mode === "commit"
+          ? [
+              (
+                await ctx.client.getCommitFileDiff(
+                  cwd,
+                  git(cwd, "rev-parse", "HEAD").trim(),
+                  "query.sql",
+                )
+              ).file,
+              (
+                await ctx.client.getCommitFileDiff(
+                  cwd,
+                  git(cwd, "rev-parse", "HEAD").trim(),
+                  "control.sql",
+                )
+              ).file,
+            ]
+          : (await ctx.client.getCheckoutDiff(cwd, { mode, baseRef: "main" })).files;
+
+      const control = files.find((file) => file?.path === "control.sql");
+      expect(control).toMatchObject({ additions: 1, deletions: 1 });
+      expect(control?.hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ type: "remove", content: "SELECT 1;" }),
+          expect.objectContaining({ type: "add", content: "SELECT 2;" }),
+        ]),
+      );
+
+      const query = files.find((file) => file?.path === "query.sql");
+      expect
+        .soft(query)
+        .toMatchObject({ additions: 1, deletions: 1, isNew: false, isDeleted: false });
+      expect
+        .soft(query?.hunks.flatMap((hunk) => hunk.lines))
+        .toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({ type: "remove", content: "-- old comment" }),
+            expect.objectContaining({ type: "add", content: "-- new comment" }),
+            expect.objectContaining({ type: "context", content: "SELECT 1;" }),
+          ]),
+        );
+    } finally {
+      await ctx.cleanup();
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  },
+  60_000,
+);
diff --git a/packages/server/src/server/utils/diff-highlighter.test.ts b/packages/server/src/server/utils/diff-highlighter.test.ts
index cc6754c50b..56f77fc706 100644
--- a/packages/server/src/server/utils/diff-highlighter.test.ts
+++ b/packages/server/src/server/utils/diff-highlighter.test.ts
@@ -190,6 +190,34 @@ index 1234567..abcdefg 100644
 `;
 
 describe("parseDiff", () => {
+  it.each(["-- comment", "++ marker"])(
+    "preserves hunk content resembling patch headers: %s",
+    (content) => {
+      const files = parseDiff(`diff --git a/example.txt b/example.txt
+index 1234567..abcdefg 100644
+--- a/example.txt
++++ b/example.txt
+@@ -1 +1 @@
+-${content} before
++${content} after
+`);
+
+      expect(files).toHaveLength(1);
+      expect(files[0]).toMatchObject({
+        path: "example.txt",
+        isNew: false,
+        isDeleted: false,
+        additions: 1,
+        deletions: 1,
+      });
+      expect(files[0].hunks[0].lines).toEqual([
+        { type: "header", content: "@@ -1 +1 @@" },
+        { type: "remove", content: `${content} before` },
+        { type: "add", content: `${content} after` },
+      ]);
+    },
+  );
+
   it("parses a simple diff with one hunk", () => {
     const files = parseDiff(SIMPLE_DIFF);
 
diff --git a/packages/server/src/server/utils/diff-highlighter.ts b/packages/server/src/server/utils/diff-highlighter.ts
index daa1ebbb3d..97d68d1fcd 100644
--- a/packages/server/src/server/utils/diff-highlighter.ts
+++ b/packages/server/src/server/utils/diff-highlighter.ts
@@ -79,16 +79,6 @@ function extractPathFromDiffHeader(lines: string[]): string {
   return "unknown";
 }
 
-function isMetadataLine(line: string): boolean {
-  return (
-    line.startsWith("index ") ||
-    line.startsWith("--- ") ||
-    line.startsWith("+++ ") ||
-    line.startsWith("new file mode") ||
-    line.startsWith("deleted file mode")
-  );
-}
-
 function parseHunkHeader(line: string): DiffHunk | null {
   const hunkMatch = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
   if (!hunkMatch) return null;
@@ -116,8 +106,6 @@ function parseSectionBody(lines: string[]): ParsedSectionBody {
   for (let i = 1; i < lines.length; i++) {
     const line = lines[i];
 
-    if (isMetadataLine(line)) continue;
-
     const newHunk = parseHunkHeader(line);
     if (newHunk) {
       if (currentHunk) hunks.push(currentHunk);

From b412374f0c520fbc0470d15d2652b47eea3efef8 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 11:52:50 +0200
Subject: [PATCH 094/270] Run React tests when the shell uses
 NODE_ENV=production (#6572)

* fix(tests): run React tests from production shells

Vitest preserves an inherited NODE_ENV, selecting React without its test APIs. Pin the environment before dependency resolution and worker startup in both test entry points.

Co-authored-by: Ivan Malison <IvanMalison@gmail.com>

* test(app): expect zero edits for a pure staged rename

The rename patch correction on main preserves unchanged content. Keep the discard journey intact and update its obsolete added-line assertion.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: Ivan Malison <IvanMalison@gmail.com>
---
 packages/app/e2e/browser/changes-pane.spec.ts |  2 +-
 packages/app/vitest-environment.test.ts       | 37 +++++++++++++++++++
 packages/app/vitest.config.ts                 |  4 ++
 vitest.config.ts                              |  3 ++
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 packages/app/vitest-environment.test.ts

diff --git a/packages/app/e2e/browser/changes-pane.spec.ts b/packages/app/e2e/browser/changes-pane.spec.ts
index 637d1b633b..377adbb3b6 100644
--- a/packages/app/e2e/browser/changes-pane.spec.ts
+++ b/packages/app/e2e/browser/changes-pane.spec.ts
@@ -683,7 +683,7 @@ test("discarding a staged rename restores its source path", async ({ page }) =>
 
   const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
   const renamedHeader = diffHeaderForPath(panel, "src/zz-renamed.ts");
-  await expect(renamedHeader).toHaveAccessibleName("src/zz-renamed.ts, +1, -0");
+  await expect(renamedHeader).toHaveAccessibleName("src/zz-renamed.ts, +0, -0");
   const renamedToggle = renamedHeader.getByTestId(/^diff-file-\d+-toggle$/);
   const toggleTestId = await renamedToggle.getAttribute("data-testid");
   expect(toggleTestId).not.toBeNull();
diff --git a/packages/app/vitest-environment.test.ts b/packages/app/vitest-environment.test.ts
new file mode 100644
index 0000000000..8d66f37e7f
--- /dev/null
+++ b/packages/app/vitest-environment.test.ts
@@ -0,0 +1,37 @@
+import { spawnSync } from "node:child_process";
+import { createRequire } from "node:module";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { expect, it } from "vitest";
+
+const appDir = fileURLToPath(new URL(".", import.meta.url));
+const rootDir = path.resolve(appDir, "../..");
+const require = createRequire(import.meta.url);
+const vitestEntry = path.join(path.dirname(require.resolve("vitest/package.json")), "vitest.mjs");
+
+it.each([
+  {
+    name: "root",
+    cwd: rootDir,
+    args: ["packages/app/src/screens/workspace/use-mounted-tab-set.test.ts"],
+  },
+  {
+    name: "app",
+    cwd: appDir,
+    args: ["--project", "unit", "src/screens/workspace/use-mounted-tab-set.test.ts"],
+  },
+])(
+  "$name tests can render React when the shell exports NODE_ENV=production",
+  ({ cwd, args }) => {
+    const result = spawnSync(process.execPath, [vitestEntry, "run", ...args], {
+      cwd,
+      env: { ...process.env, NODE_ENV: "production" },
+      encoding: "utf8",
+      timeout: 30_000,
+    });
+
+    expect(result.error).toBeUndefined();
+    expect(result.status, result.stdout + result.stderr).toBe(0);
+  },
+  40_000,
+);
diff --git a/packages/app/vitest.config.ts b/packages/app/vitest.config.ts
index 3838948be9..7fb338b040 100644
--- a/packages/app/vitest.config.ts
+++ b/packages/app/vitest.config.ts
@@ -3,6 +3,9 @@ import { playwright } from "@vitest/browser-playwright";
 import path from "path";
 import fs from "fs";
 
+// Set this before Vite resolves dependencies and Vitest starts its workers.
+process.env.NODE_ENV = "test";
+
 const appNodeModules = path.resolve(__dirname, "node_modules");
 const rootNodeModules = path.resolve(__dirname, "../../node_modules");
 const resolvePackageEntry = (packageName: string) => {
@@ -26,6 +29,7 @@ export default defineConfig({
             "src/**/*.{test,spec}.{ts,tsx}",
             "native-release-version.test.ts",
             "app.config.test.ts",
+            "vitest-environment.test.ts",
           ],
           setupFiles: [path.resolve(__dirname, "vitest.setup.ts")],
           exclude: [...configDefaults.exclude, "e2e/**", "src/**/*.browser.{test,spec}.{ts,tsx}"],
diff --git a/vitest.config.ts b/vitest.config.ts
index 77e75f6d6c..47bd965113 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -2,6 +2,9 @@ import fs from "node:fs";
 import path from "node:path";
 import { configDefaults, defineConfig } from "vitest/config";
 
+// React's test APIs require its development build, even in a production shell.
+process.env.NODE_ENV = "test";
+
 const appDir = path.resolve(__dirname, "packages/app");
 const appNodeModules = path.resolve(appDir, "node_modules");
 const rootNodeModules = path.resolve(__dirname, "node_modules");

From e2fd5a9c57a695e0e5e3dfddf294c4f0be44c16d Mon Sep 17 00:00:00 2001
From: Jiawen Geng <technicalcute@gmail.com>
Date: Sun, 11 Oct 2026 19:20:37 +0800
Subject: [PATCH 095/270] fix(app): keep markdown text that only looks like
 HTML verbatim (#6370)

The html-ish pass feeds markdown to htmlparser2 so it can render
<details>, <img> and friends. htmlparser2 reads any `<` followed by a
letter as a tag and collects attributes up to the next `>`. A cell such
as `1<ratio<2` in a table therefore swallowed the rows after it, and the
re-serialized "tag" dropped the newlines and pipes that made them rows.
The same path broke autolinks (`<https://x/y>` became `<https: x y>`)
and cut text after a trailing `a<b`.

Only hand htmlparser2 what CommonMark reads as raw HTML: open tags,
closing tags and comments. Every other `<` stays text.

Unknown tags are rendered back as text, but they were rebuilt from the
parser's lowercased name and attributes, so `As<Integer>()` showed as
`As<integer>()`. Echo the source slice instead.
---
 .../src/components/markdown/html-ish.test.ts  | 37 +++++++++
 .../app/src/components/markdown/html-ish.ts   | 81 +++++++++++++++++--
 2 files changed, 112 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/components/markdown/html-ish.test.ts b/packages/app/src/components/markdown/html-ish.test.ts
index 394ea47ed8..d8b45ae415 100644
--- a/packages/app/src/components/markdown/html-ish.test.ts
+++ b/packages/app/src/components/markdown/html-ish.test.ts
@@ -391,6 +391,43 @@ describe("splitHtmlishMarkdown", () => {
     );
   });
 
+  it("keeps table rows after a comparison that only looks like a tag", () => {
+    const source = [
+      "| ID | Note | Status |",
+      "|---|---|---|",
+      "| a-1 | accepts 1<size<2 only | open |",
+      "| a-2 | second row | open |",
+      "",
+      "Later x -> y.",
+    ].join("\n");
+
+    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
+  });
+
+  it.each(["See <https://example.com/docs> for more.", "Stop when a<b", "Keep </ b> and a <b"])(
+    "keeps %j literal because it is not HTML",
+    (source) => {
+      expect(normalizeHtmlishMarkdown(source)).toBe(source);
+    },
+  );
+
+  it.each([
+    "Call As<Integer>() before limits<DWORD>::max()",
+    "<Kbd Data-Key='K'>Ctrl</Kbd> then <Foo/>",
+  ])("echoes unknown tags in %j as written", (source) => {
+    expect(normalizeHtmlishMarkdown(source)).toBe(source);
+  });
+
+  it("rebuilds an unknown tag that a code span splits", () => {
+    expect(normalizeHtmlishMarkdown('<Tip title="`x`">hi</Tip>')).toBe("`x`<tip title>hi</Tip>");
+  });
+
+  it("still reads tags and comments next to literal angle brackets", () => {
+    expect(normalizeHtmlishMarkdown("1<n<2 <b>bold</b><!-- hidden --> 3<4")).toBe(
+      "1<n<2 **bold** 3<4",
+    );
+  });
+
   it("falls back to inert markdown when details are unclosed", () => {
     const source = "<details><summary>Open</summary>Still open";
 
diff --git a/packages/app/src/components/markdown/html-ish.ts b/packages/app/src/components/markdown/html-ish.ts
index 346a0dfc13..bd095c60b3 100644
--- a/packages/app/src/components/markdown/html-ish.ts
+++ b/packages/app/src/components/markdown/html-ish.ts
@@ -29,6 +29,12 @@ const FENCE_LINE_RE = /^ {0,3}([`~]{3,})[^\n\r]*(?:\r?\n|$)/gm;
 const BACKTICK_RUN_RE = /`+/g;
 const SAFE_IMAGE_SRC_RE = /^(https?:\/\/|data:image\/(?:png|gif|jpe?g);base64,)/i;
 const SAFE_LINK_HREF_RE = /^(https?:\/\/|#(?:$|[\w-]))/i;
+// CommonMark open and closing tags (spec "Raw HTML"); comments are matched separately.
+const HTML_ATTRIBUTE = String.raw`\s+[A-Za-z_:][\w.:-]*(?:\s*=\s*(?:[^\s"'=<>\x60]+|'[^']*'|"[^"]*"))?`;
+const HTML_TAG_RE = new RegExp(
+  String.raw`<(?:[A-Za-z][A-Za-z0-9-]*(?:${HTML_ATTRIBUTE})*\s*\/?|\/[A-Za-z][A-Za-z0-9-]*\s*)>`,
+  "y",
+);
 const VOID_HTML_TAGS = new Set(["br", "img", "source"]);
 const MARKDOWN_TAG_WRAPPERS: Readonly<Record<string, readonly [string, string]>> = {
   b: ["**", "**"],
@@ -373,14 +379,16 @@ function renderInlineTokens(tokens: HtmlToken[]): string {
     }
 
     const children = tokens.slice(index + 1, closeIndex);
-    output += renderHtmlTag(token, children);
+    const close = tokens[closeIndex];
+    const closeRaw = isClosingTag(close, token.name) ? close.raw : `</${token.name}>`;
+    output += renderHtmlTag(token, children, closeRaw);
     index = closeIndex;
   }
 
   return output;
 }
 
-function renderHtmlTag(token: HtmlTagToken, children: HtmlToken[]): string {
+function renderHtmlTag(token: HtmlTagToken, children: HtmlToken[], closeRaw: string): string {
   if (token.name === "a") {
     return renderLinkToken(token, children);
   }
@@ -400,7 +408,7 @@ function renderHtmlTag(token: HtmlTagToken, children: HtmlToken[]): string {
   if (token.name === "p" || token.name === "div") {
     return `\n\n${renderInlineTokens(children).trim()}\n\n`;
   }
-  return `${token.raw}${renderInlineTokens(children)}</${token.name}>`;
+  return `${token.raw}${renderInlineTokens(children)}${closeRaw}`;
 }
 
 function renderTableTokens(tokens: HtmlToken[]): string {
@@ -606,7 +614,15 @@ function tokenizeHtmlishMarkdown(source: string): HtmlToken[] {
 function createHtmlishTokenParser(source: string, tokens: HtmlToken[]): HtmlishTokenParser {
   let stripNextLeadingLineBreak = false;
   let skippedLength = 0;
+  let writtenLength = 0;
+  let chunkStart = 0;
   let parser!: Parser;
+  // Unknown tags render as text, so keep them as written: the parser lowercases names
+  // and rewrites attributes. A tag split by a protected range has no single slice.
+  const readRawTag = (): string | null =>
+    parser.startIndex < chunkStart
+      ? null
+      : source.slice(parser.startIndex + skippedLength, parser.endIndex + 1 + skippedLength);
   parser = new Parser(
     {
       onopentag(name, attributes, isImplied) {
@@ -620,7 +636,7 @@ function createHtmlishTokenParser(source: string, tokens: HtmlToken[]): HtmlishT
           closing: false,
           selfClosing,
           attributes,
-          raw: renderStartTag(name, attributes),
+          raw: readRawTag() ?? renderStartTag(name, attributes),
         });
       },
       onclosetag(name, isImplied) {
@@ -633,7 +649,7 @@ function createHtmlishTokenParser(source: string, tokens: HtmlToken[]): HtmlishT
           closing: true,
           selfClosing: false,
           attributes: {},
-          raw: `</${name}>`,
+          raw: readRawTag() ?? `</${name}>`,
         });
       },
       ontext(value) {
@@ -660,6 +676,8 @@ function createHtmlishTokenParser(source: string, tokens: HtmlToken[]): HtmlishT
   );
   return {
     write(chunk) {
+      chunkStart = writtenLength;
+      writtenLength += chunk.length;
       parser.write(chunk);
     },
     skip(length) {
@@ -698,7 +716,58 @@ function escapeAttribute(value: string): string {
 
 function getProtectedMarkdownRanges(source: string): ProtectedMarkdownRange[] {
   const fencedRanges = getFencedCodeRanges(source);
-  return mergeProtectedRanges([...fencedRanges, ...getInlineCodeRanges(source, fencedRanges)]);
+  const codeRanges = mergeProtectedRanges([
+    ...fencedRanges,
+    ...getInlineCodeRanges(source, fencedRanges),
+  ]);
+  return mergeProtectedRanges([...codeRanges, ...getLiteralAngleBracketRanges(source, codeRanges)]);
+}
+
+/**
+ * htmlparser2 reads any `<` followed by a letter as a tag and keeps collecting attributes up
+ * to the next `>`, so `1<n<2` in a table cell swallows the rows after it and an autolink loses
+ * its slashes. Hand it only what CommonMark would read as raw HTML; every other `<` is text.
+ */
+function getLiteralAngleBracketRanges(
+  source: string,
+  codeRanges: ProtectedMarkdownRange[],
+): ProtectedMarkdownRange[] {
+  const ranges: ProtectedMarkdownRange[] = [];
+  let codeIndex = 0;
+  // Reused across comment openers so unclosed comments stay linear.
+  let commentClose = -1;
+  let index = source.indexOf("<");
+
+  while (index !== -1) {
+    while ((codeRanges[codeIndex]?.end ?? Infinity) <= index) {
+      codeIndex += 1;
+    }
+    const code = codeRanges[codeIndex];
+    if (code && code.start <= index) {
+      index = source.indexOf("<", code.end);
+      continue;
+    }
+
+    let htmlEnd: number | null;
+    if (source.startsWith("<!--", index)) {
+      if (commentClose !== source.length && commentClose < index + 2) {
+        const close = source.indexOf("-->", index + 2);
+        commentClose = close === -1 ? source.length : close;
+      }
+      htmlEnd = commentClose === source.length ? null : commentClose + 3;
+    } else {
+      HTML_TAG_RE.lastIndex = index;
+      htmlEnd = HTML_TAG_RE.test(source) ? HTML_TAG_RE.lastIndex : null;
+    }
+
+    if (htmlEnd === null) {
+      ranges.push({ start: index, end: index + 1 });
+      htmlEnd = index + 1;
+    }
+    index = source.indexOf("<", htmlEnd);
+  }
+
+  return ranges;
 }
 
 function getFencedCodeRanges(source: string): ProtectedMarkdownRange[] {

From 804335bc00bff52f2652f5de9e6227f013322948 Mon Sep 17 00:00:00 2001
From: Elowen <73627805+Mar-garet@users.noreply.github.com>
Date: Sun, 11 Oct 2026 19:53:25 +0800
Subject: [PATCH 096/270] fix(files): rename untracked bracket paths without
 matching siblings (#6573)

* fix(files): use literal paths when checking rename tracking

* fix(files): preserve Git activity labels for rename lookups

* fix(files): clear inherited literal mode for rename lookups

* test(files): cover tracked renames with inherited literal mode
---
 .../src/server/file-explorer/service.test.ts  | 127 +++++++++++++++++-
 .../src/server/file-explorer/service.ts       |   6 +-
 2 files changed, 130 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/server/file-explorer/service.test.ts b/packages/server/src/server/file-explorer/service.test.ts
index ea22ac24b9..a82e1a8f80 100644
--- a/packages/server/src/server/file-explorer/service.test.ts
+++ b/packages/server/src/server/file-explorer/service.test.ts
@@ -12,8 +12,8 @@ import {
 } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { describe, expect, it } from "vitest";
-import { runGitCommand } from "../../utils/run-git-command.js";
+import { describe, expect, it, vi } from "vitest";
+import { runGitCommand, snapshotGitCommandRuntimeMetrics } from "../../utils/run-git-command.js";
 import {
   createExplorerEntry,
   deleteExplorerEntry,
@@ -517,6 +517,129 @@ describe("file explorer service", () => {
     }
   });
 
+  it("renames an untracked bracketed filename without matching a tracked sibling", async () => {
+    const root = await createTempDir("paseo-entry-literal-rename-");
+    try {
+      await runGitCommand(["init"], { cwd: root });
+      await writeFile(path.join(root, "i.tsx"), "tracked\n", "utf8");
+      await runGitCommand(["add", "i.tsx"], { cwd: root });
+      await writeFile(path.join(root, "[id].tsx"), "untracked\n", "utf8");
+
+      snapshotGitCommandRuntimeMetrics();
+      const result = await renameExplorerEntry({
+        root,
+        relativePath: "[id].tsx",
+        name: "renamed.tsx",
+      });
+
+      expect(result).toEqual({ status: "ok", path: "renamed.tsx" });
+      expect(snapshotGitCommandRuntimeMetrics().operationsTop).toEqual([
+        ["ls-files", 1],
+        ["rev-parse", 1],
+      ]);
+      expect(await readFile(path.join(root, "renamed.tsx"), "utf8")).toBe("untracked\n");
+      await expect(stat(path.join(root, "[id].tsx"))).rejects.toMatchObject({ code: "ENOENT" });
+      expect(await readFile(path.join(root, "i.tsx"), "utf8")).toBe("tracked\n");
+      expect((await runGitCommand(["ls-files", "-z"], { cwd: root })).stdout).toBe("i.tsx\0");
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  });
+
+  it("renames an untracked bracketed folder without matching a tracked sibling", async () => {
+    const root = await createTempDir("paseo-folder-literal-rename-");
+    try {
+      await runGitCommand(["init"], { cwd: root });
+      await mkdir(path.join(root, "i"));
+      await writeFile(path.join(root, "i", "route.tsx"), "tracked\n", "utf8");
+      await runGitCommand(["add", "i"], { cwd: root });
+      await mkdir(path.join(root, "[id]"));
+      await writeFile(path.join(root, "[id]", "route.tsx"), "untracked\n", "utf8");
+
+      const result = await renameExplorerEntry({ root, relativePath: "[id]", name: "route" });
+
+      expect(result).toEqual({ status: "ok", path: "route" });
+      expect(await readFile(path.join(root, "route", "route.tsx"), "utf8")).toBe("untracked\n");
+      await expect(stat(path.join(root, "[id]"))).rejects.toMatchObject({ code: "ENOENT" });
+      expect(await readFile(path.join(root, "i", "route.tsx"), "utf8")).toBe("tracked\n");
+      expect((await runGitCommand(["ls-files", "-z"], { cwd: root })).stdout).toBe("i/route.tsx\0");
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  });
+
+  it("uses Git to rename a tracked bracketed filename and preserves its tracked sibling", async () => {
+    const root = await createTempDir("paseo-tracked-literal-rename-");
+    try {
+      await runGitCommand(["init"], { cwd: root });
+      await writeFile(path.join(root, "[id].tsx"), "tracked route\n", "utf8");
+      await writeFile(path.join(root, "i.tsx"), "tracked sibling\n", "utf8");
+      await runGitCommand(["add", "--", "[id].tsx", "i.tsx"], { cwd: root });
+
+      const result = await renameExplorerEntry({
+        root,
+        relativePath: "[id].tsx",
+        name: "renamed.tsx",
+      });
+
+      expect(result).toEqual({ status: "ok", path: "renamed.tsx" });
+      expect(await readFile(path.join(root, "renamed.tsx"), "utf8")).toBe("tracked route\n");
+      await expect(stat(path.join(root, "[id].tsx"))).rejects.toMatchObject({ code: "ENOENT" });
+      expect(await readFile(path.join(root, "i.tsx"), "utf8")).toBe("tracked sibling\n");
+      expect((await runGitCommand(["ls-files", "-z"], { cwd: root })).stdout).toBe(
+        "i.tsx\0renamed.tsx\0",
+      );
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  });
+
+  it.each([
+    {
+      sourcePath: "[id].tsx",
+      sourceFile: "[id].tsx",
+      targetName: "renamed.tsx",
+      targetFile: "renamed.tsx",
+    },
+    {
+      sourcePath: "[id]",
+      sourceFile: "[id]/route.tsx",
+      targetName: "route",
+      targetFile: "route/route.tsx",
+    },
+  ])(
+    "keeps tracked renames in the index with inherited literal pathspecs ($sourcePath)",
+    async ({ sourcePath, sourceFile, targetName, targetFile }) => {
+      const root = await createTempDir("paseo-inherited-literal-rename-");
+      try {
+        vi.stubEnv("GIT_LITERAL_PATHSPECS", "1");
+        await runGitCommand(["init"], { cwd: root });
+        await mkdir(path.dirname(path.join(root, sourceFile)), { recursive: true });
+        await writeFile(path.join(root, sourceFile), "tracked route\n", "utf8");
+        await writeFile(path.join(root, "i.tsx"), "tracked sibling\n", "utf8");
+        await runGitCommand(["add", "."], { cwd: root });
+
+        const result = await renameExplorerEntry({
+          root,
+          relativePath: sourcePath,
+          name: targetName,
+        });
+
+        expect(result).toEqual({ status: "ok", path: targetName });
+        expect(await readFile(path.join(root, targetFile), "utf8")).toBe("tracked route\n");
+        await expect(stat(path.join(root, sourcePath))).rejects.toMatchObject({ code: "ENOENT" });
+        expect(await readFile(path.join(root, "i.tsx"), "utf8")).toBe("tracked sibling\n");
+        expect((await runGitCommand(["ls-files", "-z"], { cwd: root })).stdout).toBe(
+          `i.tsx\0${targetFile}\0`,
+        );
+        expect(process.env.GIT_LITERAL_PATHSPECS).toBe("1");
+      } finally {
+        vi.unstubAllEnvs();
+        await rm(root, { recursive: true, force: true });
+      }
+    },
+  );
+
   it("supports case-only renames for tracked and untracked files", async () => {
     const root = await createTempDir("paseo-entry-case-rename-");
     try {
diff --git a/packages/server/src/server/file-explorer/service.ts b/packages/server/src/server/file-explorer/service.ts
index 5aa4efe974..fdbfc697cf 100644
--- a/packages/server/src/server/file-explorer/service.ts
+++ b/packages/server/src/server/file-explorer/service.ts
@@ -724,7 +724,11 @@ export async function renameExplorerEntry({
     });
     const tracked =
       repository.exitCode === 0
-        ? await runGitCommand(["ls-files", "-z", "--", sourcePath], { cwd: realRoot })
+        ? await runGitCommand(["ls-files", "-z", "--", `:(literal)${sourcePath}`], {
+            cwd: realRoot,
+            // Inherited literal mode disables the :(literal) pathspec magic.
+            envOverlay: { GIT_LITERAL_PATHSPECS: undefined },
+          })
         : null;
     if (tracked?.stdout) {
       await runGitCommand(["mv", "--", sourcePath, renamedPath], { cwd: realRoot });

From 114389383d6f6c78a9e1580ab245b3edc81feae8 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 16:51:00 +0200
Subject: [PATCH 097/270] Keep files starting with two dots usable (#6604)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(file-explorer): distinguish parent traversal from dot-prefixed names

* test(file-explorer): cover dot-prefixed paths through daemon RPC

* test(plugins): allow slower session readiness in provider fixtures

The event helper exhausted 200 iterations before a valid delayed session
became ready. Use an elapsed-time deadline while preserving real timers
for watchdog tests, and retain a delayed-start regression with launch
flag assertions.

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>

---------

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/server/package.json                  |   2 +-
 .../server/daemon-e2e/filesystem.e2e.test.ts  | 175 +++++++++++++++++-
 .../src/server/file-explorer/service.ts       |   5 +-
 plugins/muse-provider/test/provider.test.ts   |  15 +-
 4 files changed, 192 insertions(+), 5 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index ee225cef86..fee28237ab 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",
diff --git a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
index 4bb4736133..2d3a58a3b7 100644
--- a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
@@ -1,5 +1,5 @@
 import { describe, test, expect, beforeEach, afterEach } from "vitest";
-import { mkdtempSync, writeFileSync, rmSync, mkdirSync } from "fs";
+import { mkdtempSync, writeFileSync, rmSync, mkdirSync, symlinkSync, readdirSync } from "fs";
 import { tmpdir } from "os";
 import path from "path";
 import { createDaemonTestContext, type DaemonTestContext } from "../test-utils/index.js";
@@ -23,6 +23,179 @@ afterEach(async () => {
 }, 60000);
 
 describe("file explorer", () => {
+  test.each(["..", "..."])("supports file operations on names starting with %s", async (prefix) => {
+    const cwd = tmpCwd();
+    const fileName = `${prefix}notes.txt`;
+    const directoryName = `${prefix}drafts`;
+    try {
+      const createdFile = await ctx.client.createFileEntry({
+        cwd,
+        parentPath: ".",
+        name: fileName,
+        kind: "file",
+      });
+      expect(createdFile).toMatchObject({ path: fileName, success: true, error: null });
+      writeFileSync(path.join(cwd, fileName), "notes payload\n");
+      writeFileSync(path.join(cwd, ".notes.txt"), "dotfile control\n");
+      writeFileSync(path.join(cwd, "notes.txt"), "ordinary control\n");
+
+      const createdDirectory = await ctx.client.createFileEntry({
+        cwd,
+        parentPath: ".",
+        name: directoryName,
+        kind: "directory",
+      });
+      expect(createdDirectory).toMatchObject({ path: directoryName, success: true, error: null });
+      const createdChild = await ctx.client.createFileEntry({
+        cwd,
+        parentPath: directoryName,
+        name: "inside.txt",
+        kind: "file",
+      });
+      expect(createdChild).toMatchObject({
+        path: `${directoryName}/inside.txt`,
+        success: true,
+        error: null,
+      });
+      writeFileSync(path.join(cwd, directoryName, "inside.txt"), "nested payload\n");
+
+      const directory = await ctx.client.listDirectory(cwd, ".");
+      expect(
+        Object.fromEntries(directory.entries.map((entry) => [entry.path, entry.kind])),
+      ).toEqual({
+        [directoryName]: "directory",
+        [fileName]: "file",
+        ".notes.txt": "file",
+        "notes.txt": "file",
+      });
+      const children = await ctx.client.listDirectory(cwd, directoryName);
+      expect(children.entries.map((entry) => entry.path)).toEqual([`${directoryName}/inside.txt`]);
+      const file = await ctx.client.readFile(cwd, fileName);
+      expect(file.path).toBe(fileName);
+      expect(new TextDecoder().decode(file.bytes)).toBe("notes payload\n");
+      const nestedFile = await ctx.client.readFile(cwd, `${directoryName}/inside.txt`);
+      expect(nestedFile.path).toBe(`${directoryName}/inside.txt`);
+      expect(new TextDecoder().decode(nestedFile.bytes)).toBe("nested payload\n");
+
+      const dotfile = await ctx.client.readFile(cwd, ".notes.txt");
+      expect(new TextDecoder().decode(dotfile.bytes)).toBe("dotfile control\n");
+      const ordinaryFile = await ctx.client.readFile(cwd, "notes.txt");
+      expect(new TextDecoder().decode(ordinaryFile.bytes)).toBe("ordinary control\n");
+
+      const download = await ctx.client.requestDownloadToken(cwd, fileName);
+      expect(download.error).toBeNull();
+      expect(download.fileName).toBe(fileName);
+      const response = await fetch(
+        `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${download.token}`,
+      );
+      expect(response.status).toBe(200);
+      expect(await response.text()).toBe("notes payload\n");
+
+      const renamedFileName = `${prefix}renamed.txt`;
+      const renamed = await ctx.client.renameFileEntry({
+        cwd,
+        path: fileName,
+        name: renamedFileName,
+      });
+      expect(renamed).toMatchObject({ renamedPath: renamedFileName, success: true, error: null });
+      const renamedFile = await ctx.client.readFile(cwd, renamedFileName);
+      expect(new TextDecoder().decode(renamedFile.bytes)).toBe("notes payload\n");
+
+      const copiedDirectoryName = `${directoryName} copy`;
+      const duplicated = await ctx.client.duplicateFileEntry({ cwd, path: directoryName });
+      expect(duplicated).toMatchObject({
+        duplicatedPath: copiedDirectoryName,
+        success: true,
+        error: null,
+      });
+      const copiedFile = await ctx.client.readFile(cwd, `${copiedDirectoryName}/inside.txt`);
+      expect(new TextDecoder().decode(copiedFile.bytes)).toBe("nested payload\n");
+
+      const deletedDirectory = await ctx.client.deleteFileEntry({ cwd, path: directoryName });
+      expect(deletedDirectory).toMatchObject({ success: true, error: null });
+      const deletedFile = await ctx.client.deleteFileEntry({ cwd, path: renamedFileName });
+      expect(deletedFile).toMatchObject({ success: true, error: null });
+      const remaining = await ctx.client.listDirectory(cwd, ".");
+      expect(remaining.entries.map((entry) => entry.path).sort()).toEqual(
+        [".notes.txt", "notes.txt", copiedDirectoryName].sort(),
+      );
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
+  test("rejects parent traversal and absolute paths to a sibling workspace", async () => {
+    const directory = tmpCwd();
+    const cwd = path.join(directory, "workspace");
+    const outside = path.join(directory, "workspace-sibling");
+    try {
+      mkdirSync(cwd);
+      mkdirSync(outside);
+      writeFileSync(path.join(outside, "secret.txt"), "outside payload\n");
+      for (const requestedPath of ["..", "../workspace-sibling", outside]) {
+        await expect(ctx.client.listDirectory(cwd, requestedPath)).rejects.toThrow(
+          "Access outside of workspace is not allowed",
+        );
+      }
+      for (const requestedPath of [
+        "../workspace-sibling/secret.txt",
+        path.join(outside, "secret.txt"),
+      ]) {
+        await expect(ctx.client.readFile(cwd, requestedPath)).rejects.toThrow(
+          "Access outside of workspace is not allowed",
+        );
+        const download = await ctx.client.requestDownloadToken(cwd, requestedPath);
+        expect(download).toMatchObject({
+          token: null,
+          error: "Access outside of workspace is not allowed",
+        });
+        const deleted = await ctx.client.deleteFileEntry({ cwd, path: requestedPath });
+        expect(deleted).toMatchObject({
+          success: false,
+          error: "Access outside of workspace is not allowed",
+        });
+      }
+      expect(readdirSync(outside)).toEqual(["secret.txt"]);
+    } finally {
+      rmSync(directory, { recursive: true, force: true });
+    }
+  });
+
+  test("accepts symlinks to double-dot names inside the workspace and rejects outside targets", async () => {
+    const directory = tmpCwd();
+    const cwd = path.join(directory, "workspace");
+    const outside = path.join(directory, "workspace-sibling");
+    try {
+      mkdirSync(path.join(cwd, "..drafts"), { recursive: true });
+      mkdirSync(outside);
+      writeFileSync(path.join(cwd, "..drafts", "notes.txt"), "inside payload\n");
+      writeFileSync(path.join(outside, "secret.txt"), "outside payload\n");
+      // Junctions also work on Windows without requiring symlink privileges.
+      symlinkSync(path.join(cwd, "..drafts"), path.join(cwd, "inside-link"), "junction");
+      symlinkSync(outside, path.join(cwd, "outside-link"), "junction");
+
+      const listing = await ctx.client.listDirectory(cwd, ".");
+      expect(listing.entries.map((entry) => entry.path).sort()).toEqual([
+        "..drafts",
+        "inside-link",
+      ]);
+      const file = await ctx.client.readFile(cwd, "inside-link/notes.txt");
+      expect(file.path).toBe("inside-link/notes.txt");
+      expect(new TextDecoder().decode(file.bytes)).toBe("inside payload\n");
+      await expect(ctx.client.readFile(cwd, "outside-link/secret.txt")).rejects.toThrow(
+        "Access outside of workspace is not allowed",
+      );
+      const download = await ctx.client.requestDownloadToken(cwd, "outside-link/secret.txt");
+      expect(download).toMatchObject({
+        token: null,
+        error: "Access outside of workspace is not allowed",
+      });
+      expect(readdirSync(outside)).toEqual(["secret.txt"]);
+    } finally {
+      rmSync(directory, { recursive: true, force: true });
+    }
+  });
+
   test("lists directory contents", async () => {
     const cwd = tmpCwd();
 
diff --git a/packages/server/src/server/file-explorer/service.ts b/packages/server/src/server/file-explorer/service.ts
index fdbfc697cf..5421450c24 100644
--- a/packages/server/src/server/file-explorer/service.ts
+++ b/packages/server/src/server/file-explorer/service.ts
@@ -824,8 +824,9 @@ async function resolveScopedPath({
 
 function assertWithinWorkspace(root: string, candidate: string): void {
   const relative = path.relative(root, candidate);
-  if (relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative))) return;
-  throw new Error(ACCESS_OUTSIDE_WORKSPACE_MESSAGE);
+  const isOutsideWorkspace =
+    relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative);
+  if (isOutsideWorkspace) throw new Error(ACCESS_OUTSIDE_WORKSPACE_MESSAGE);
 }
 
 async function openFileForRead(filePath: string): Promise<FileHandle> {
diff --git a/plugins/muse-provider/test/provider.test.ts b/plugins/muse-provider/test/provider.test.ts
index 598579d04e..4868634d70 100644
--- a/plugins/muse-provider/test/provider.test.ts
+++ b/plugins/muse-provider/test/provider.test.ts
@@ -73,7 +73,8 @@ async function harness(
     predicate: (event: ProviderEvent) => boolean,
     from = 0,
   ): Promise<ProviderEvent> {
-    for (let count = 0; count < 200; count++) {
+    const deadline = Date.now() + 5000;
+    while (Date.now() < deadline) {
       const event = events.slice(from).find(predicate);
       if (event) return event;
       await delay(10);
@@ -1219,6 +1220,18 @@ test("silent active turns page after two minutes and stop polling on recovered t
   await vi.advanceTimersByTimeAsync(240000);
   expect((await h.recorded()).filter((f) => f.method === "view/page")).toHaveLength(1);
 });
+test("session readiness accepts initialization beyond the old event polling window", async () => {
+  const h = await harness("text-reasoning", { MUSE_TEST_INITIALIZE_DELAY_MS: "3500" });
+  expect(await h.open()).toMatchObject({ type: "session.ready" });
+  expect((await h.recorded()).find((frame) => frame.event === "hostStarted").args).toEqual([
+    "serve",
+    "--sandbox-network",
+    "proxy-only",
+    "--disable-sandbox",
+    "--trust-workspace",
+  ]);
+}, 10000);
+
 test("default launch disables sandbox and trusts workspace", async () => {
   const h = await harness();
   await h.open();

From 8d9e7d3ad3748ebb16fb92984499e1a1a645eedc Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 18:03:43 +0200
Subject: [PATCH 098/270] Confirm remote permission approvals before reporting
 success (#6607)

* fix(cli): await permission resolution before closing transport

* test(cli): verify permission confirmation over real connections

Exercise permission commands through a real WebSocket protocol peer, keeping responses pending until explicit resolution. This catches success before acknowledgement without replacing the client connector or process output. Retain the contributor permission fix and verify both commands, batches, and unconfirmed responses.

Co-authored-by: Budi <11062155+budivoogt@users.noreply.github.com>

* test(cli): catch permission batches completing after one reply

Hold the second acknowledgement until a WebSocket round trip proves the first reply reached the client. A first-reply-only mutation must fail both batch tests.

* test(cli): inject permission clients into command regression tests

* test(cli): use timer helper for permission continuations

* style(cli): format permission regression tests with oxfmt

---------

Co-authored-by: Budi <11062155+budivoogt@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/cli/src/commands/permit/allow.ts     | 215 ++++++++++--------
 packages/cli/src/commands/permit/deny.ts      | 183 ++++++++-------
 .../commands/permit/permit-response.test.ts   | 177 ++++++++++++++
 3 files changed, 401 insertions(+), 174 deletions(-)
 create mode 100644 packages/cli/src/commands/permit/permit-response.test.ts

diff --git a/packages/cli/src/commands/permit/allow.ts b/packages/cli/src/commands/permit/allow.ts
index 755bfaf4d7..71bee3f73c 100644
--- a/packages/cli/src/commands/permit/allow.ts
+++ b/packages/cli/src/commands/permit/allow.ts
@@ -1,5 +1,8 @@
 import type { Command } from "commander";
-import type { AgentPermissionRequest } from "@getpaseo/protocol/agent-types";
+import type {
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+} from "@getpaseo/protocol/agent-types";
 import { connectToDaemon } from "../../utils/client.js";
 import type { CommandOptions, ListResult, OutputSchema, CommandError } from "../../output/index.js";
 
@@ -55,106 +58,136 @@ export interface PermitAllowOptions extends CommandOptions {
   host?: string;
 }
 
-export async function runAllowCommand(
-  agentIdOrPrefix: string,
-  reqId: string | undefined,
-  options: PermitAllowOptions,
-  _command: Command,
-): Promise<PermitAllowResult> {
-  // No validation needed - if no reqId provided, allow all by default
+export interface PermitClient {
+  fetchAgent(options: { agentId: string }): Promise<{
+    agent: { id: string; pendingPermissions?: AgentPermissionRequest[] };
+  } | null>;
+  respondToPermissionAndWait(
+    agentId: string,
+    requestId: string,
+    response: AgentPermissionResponse,
+  ): Promise<unknown>;
+  close(): Promise<void>;
+}
 
-  // Parse input JSON if provided
-  let updatedInput: Record<string, unknown> | undefined;
-  if (options.input) {
-    try {
-      updatedInput = JSON.parse(options.input);
-    } catch (err) {
-      const error: CommandError = {
-        code: "INVALID_JSON",
-        message: `Invalid JSON for --input: ${err instanceof Error ? err.message : String(err)}`,
-        details: 'Provide valid JSON, e.g., --input \'{"key": "value"}\'',
-      };
-      throw error;
-    }
-  }
+export type PermitClientConnector = (
+  options: Parameters<typeof connectToDaemon>[0],
+) => Promise<PermitClient>;
 
-  const client = await connectToDaemon({ target: options.daemonTarget });
+export function createAllowCommand(connect: PermitClientConnector = connectToDaemon) {
+  return async function runAllowCommand(
+    agentIdOrPrefix: string,
+    reqId: string | undefined,
+    options: PermitAllowOptions,
+    _command: Command,
+  ): Promise<PermitAllowResult> {
+    // No validation needed - if no reqId provided, allow all by default
 
-  try {
-    const fetchResult = await client.fetchAgent({ agentId: agentIdOrPrefix });
-    if (!fetchResult) {
-      await client.close();
-      const error: CommandError = {
-        code: "AGENT_NOT_FOUND",
-        message: `Agent not found: ${agentIdOrPrefix}`,
-        details: 'Use "paseo ls" to list available agents',
-      };
-      throw error;
-    }
-    const agent = fetchResult.agent;
-    const resolvedAgentId = agent.id;
-
-    // Get pending permissions for this agent
-    const pendingPermissions = agent.pendingPermissions || [];
-    if (pendingPermissions.length === 0) {
-      await client.close();
-      const error: CommandError = {
-        code: "NO_PENDING_PERMISSIONS",
-        message: `No pending permissions for agent ${agent.id.slice(0, 7)}`,
-      };
-      throw error;
-    }
-
-    // Determine which permissions to allow
-    let permissionsToAllow: AgentPermissionRequest[];
-    if (!reqId || options.all) {
-      // Default: allow all pending permissions if no req_id specified
-      // --all flag is kept as an explicit alias for clarity
-      permissionsToAllow = pendingPermissions;
-    } else {
-      // Find permission by ID prefix
-      const permission = pendingPermissions.find((p) => p.id === reqId || p.id.startsWith(reqId));
-      if (!permission) {
-        await client.close();
+    // Parse input JSON if provided
+    let updatedInput: Record<string, unknown> | undefined;
+    if (options.input) {
+      try {
+        updatedInput = JSON.parse(options.input);
+      } catch (err) {
         const error: CommandError = {
-          code: "PERMISSION_NOT_FOUND",
-          message: `Permission request not found: ${reqId}`,
-          details: `Available requests: ${pendingPermissions.map((p) => p.id.slice(0, 8)).join(", ")}`,
+          code: "INVALID_JSON",
+          message: `Invalid JSON for --input: ${err instanceof Error ? err.message : String(err)}`,
+          details: 'Provide valid JSON, e.g., --input \'{"key": "value"}\'',
         };
         throw error;
       }
-      permissionsToAllow = [permission];
     }
 
-    // Allow permissions
-    const results: PermissionResponseItem[] = await Promise.all(
-      permissionsToAllow.map(async (permission) => {
-        await client.respondToPermission(resolvedAgentId, permission.id, {
-          behavior: "allow",
-          ...(updatedInput ? { updatedInput } : {}),
-        });
-        return toPermissionResponseItem(resolvedAgentId, permission, "allowed");
-      }),
-    );
+    const client = await connect({ target: options.daemonTarget });
 
-    await client.close();
+    try {
+      const fetchResult = await client.fetchAgent({ agentId: agentIdOrPrefix });
+      if (!fetchResult) {
+        await client.close();
+        const error: CommandError = {
+          code: "AGENT_NOT_FOUND",
+          message: `Agent not found: ${agentIdOrPrefix}`,
+          details: 'Use "paseo ls" to list available agents',
+        };
+        throw error;
+      }
+      const agent = fetchResult.agent;
+      const resolvedAgentId = agent.id;
 
-    return {
-      type: "list",
-      data: results,
-      schema: permitResponseSchema,
-    };
-  } catch (err) {
-    await client.close().catch(() => {});
-    // Re-throw CommandErrors
-    if (err && typeof err === "object" && "code" in err) {
-      throw err;
+      // Get pending permissions for this agent
+      const pendingPermissions = agent.pendingPermissions || [];
+      if (pendingPermissions.length === 0) {
+        await client.close();
+        const error: CommandError = {
+          code: "NO_PENDING_PERMISSIONS",
+          message: `No pending permissions for agent ${agent.id.slice(0, 7)}`,
+        };
+        throw error;
+      }
+
+      // Determine which permissions to allow
+      let permissionsToAllow: AgentPermissionRequest[];
+      if (!reqId || options.all) {
+        // Default: allow all pending permissions if no req_id specified
+        // --all flag is kept as an explicit alias for clarity
+        permissionsToAllow = pendingPermissions;
+      } else {
+        // Find permission by ID prefix
+        const permission = pendingPermissions.find((p) => p.id === reqId || p.id.startsWith(reqId));
+        if (!permission) {
+          await client.close();
+          const error: CommandError = {
+            code: "PERMISSION_NOT_FOUND",
+            message: `Permission request not found: ${reqId}`,
+            details: `Available requests: ${pendingPermissions.map((p) => p.id.slice(0, 8)).join(", ")}`,
+          };
+          throw error;
+        }
+        permissionsToAllow = [permission];
+      }
+
+      // Allow permissions
+      const results: PermissionResponseItem[] = await Promise.all(
+        permissionsToAllow.map(async (permission) => {
+          try {
+            await client.respondToPermissionAndWait(resolvedAgentId, permission.id, {
+              behavior: "allow",
+              ...(updatedInput ? { updatedInput } : {}),
+            });
+          } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            const error: CommandError = {
+              code: "PERMISSION_RESPONSE_UNCONFIRMED",
+              message: `Permission response unconfirmed for request ${permission.id}: ${message}`,
+              details: 'Use "paseo permit ls" to check whether the request is still pending',
+            };
+            throw error;
+          }
+          return toPermissionResponseItem(resolvedAgentId, permission, "allowed");
+        }),
+      );
+
+      await client.close();
+
+      return {
+        type: "list",
+        data: results,
+        schema: permitResponseSchema,
+      };
+    } catch (err) {
+      await client.close().catch(() => {});
+      // Re-throw CommandErrors
+      if (err && typeof err === "object" && "code" in err) {
+        throw err;
+      }
+      const message = err instanceof Error ? err.message : String(err);
+      const error: CommandError = {
+        code: "ALLOW_PERMISSION_FAILED",
+        message: `Failed to allow permission: ${message}`,
+      };
+      throw error;
     }
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "ALLOW_PERMISSION_FAILED",
-      message: `Failed to allow permission: ${message}`,
-    };
-    throw error;
-  }
+  };
 }
+
+export const runAllowCommand = createAllowCommand();
diff --git a/packages/cli/src/commands/permit/deny.ts b/packages/cli/src/commands/permit/deny.ts
index fe6c619e32..69a4a35a4d 100644
--- a/packages/cli/src/commands/permit/deny.ts
+++ b/packages/cli/src/commands/permit/deny.ts
@@ -6,6 +6,7 @@ import {
   permitResponseSchema,
   toPermissionResponseItem,
   type PermissionResponseItem,
+  type PermitClientConnector,
 } from "./allow.js";
 
 export type PermitDenyResult = ListResult<PermissionResponseItem>;
@@ -17,98 +18,114 @@ export interface PermitDenyOptions extends CommandOptions {
   host?: string;
 }
 
-export async function runDenyCommand(
-  agentIdOrPrefix: string,
-  reqId: string | undefined,
-  options: PermitDenyOptions,
-  _command: Command,
-): Promise<PermitDenyResult> {
-  // Validate arguments
-  if (!options.all && !reqId) {
-    const error: CommandError = {
-      code: "MISSING_ARGUMENT",
-      message: "Request ID is required unless --all is specified",
-      details: "Usage: paseo permit deny <agent> <req_id> or paseo permit deny <agent> --all",
-    };
-    throw error;
-  }
-
-  const client = await connectToDaemon({ target: options.daemonTarget });
-
-  try {
-    const fetchResult = await client.fetchAgent({ agentId: agentIdOrPrefix });
-    if (!fetchResult) {
-      await client.close();
+export function createDenyCommand(connect: PermitClientConnector = connectToDaemon) {
+  return async function runDenyCommand(
+    agentIdOrPrefix: string,
+    reqId: string | undefined,
+    options: PermitDenyOptions,
+    _command: Command,
+  ): Promise<PermitDenyResult> {
+    // Validate arguments
+    if (!options.all && !reqId) {
       const error: CommandError = {
-        code: "AGENT_NOT_FOUND",
-        message: `Agent not found: ${agentIdOrPrefix}`,
-        details: 'Use "paseo ls" to list available agents',
-      };
-      throw error;
-    }
-    const agent = fetchResult.agent;
-    const resolvedAgentId = agent.id;
-
-    // Get pending permissions for this agent
-    const pendingPermissions = agent.pendingPermissions || [];
-    if (pendingPermissions.length === 0) {
-      await client.close();
-      const error: CommandError = {
-        code: "NO_PENDING_PERMISSIONS",
-        message: `No pending permissions for agent ${agent.id.slice(0, 7)}`,
+        code: "MISSING_ARGUMENT",
+        message: "Request ID is required unless --all is specified",
+        details: "Usage: paseo permit deny <agent> <req_id> or paseo permit deny <agent> --all",
       };
       throw error;
     }
 
-    // Determine which permissions to deny
-    let permissionsToDeny: AgentPermissionRequest[];
-    if (options.all) {
-      permissionsToDeny = pendingPermissions;
-    } else {
-      // Find permission by ID prefix
-      const permission = pendingPermissions.find((p) => p.id === reqId || p.id.startsWith(reqId!));
-      if (!permission) {
+    const client = await connect({ target: options.daemonTarget });
+
+    try {
+      const fetchResult = await client.fetchAgent({ agentId: agentIdOrPrefix });
+      if (!fetchResult) {
         await client.close();
         const error: CommandError = {
-          code: "PERMISSION_NOT_FOUND",
-          message: `Permission request not found: ${reqId}`,
-          details: `Available requests: ${pendingPermissions.map((p) => p.id.slice(0, 8)).join(", ")}`,
+          code: "AGENT_NOT_FOUND",
+          message: `Agent not found: ${agentIdOrPrefix}`,
+          details: 'Use "paseo ls" to list available agents',
         };
         throw error;
       }
-      permissionsToDeny = [permission];
+      const agent = fetchResult.agent;
+      const resolvedAgentId = agent.id;
+
+      // Get pending permissions for this agent
+      const pendingPermissions = agent.pendingPermissions || [];
+      if (pendingPermissions.length === 0) {
+        await client.close();
+        const error: CommandError = {
+          code: "NO_PENDING_PERMISSIONS",
+          message: `No pending permissions for agent ${agent.id.slice(0, 7)}`,
+        };
+        throw error;
+      }
+
+      // Determine which permissions to deny
+      let permissionsToDeny: AgentPermissionRequest[];
+      if (options.all) {
+        permissionsToDeny = pendingPermissions;
+      } else {
+        // Find permission by ID prefix
+        const permission = pendingPermissions.find(
+          (p) => p.id === reqId || p.id.startsWith(reqId!),
+        );
+        if (!permission) {
+          await client.close();
+          const error: CommandError = {
+            code: "PERMISSION_NOT_FOUND",
+            message: `Permission request not found: ${reqId}`,
+            details: `Available requests: ${pendingPermissions.map((p) => p.id.slice(0, 8)).join(", ")}`,
+          };
+          throw error;
+        }
+        permissionsToDeny = [permission];
+      }
+
+      // Deny permissions
+      const results: PermissionResponseItem[] = await Promise.all(
+        permissionsToDeny.map(async (permission) => {
+          try {
+            await client.respondToPermissionAndWait(resolvedAgentId, permission.id, {
+              behavior: "deny",
+              ...(options.message ? { message: options.message } : {}),
+              ...(options.interrupt ? { interrupt: true } : {}),
+            });
+          } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            const error: CommandError = {
+              code: "PERMISSION_RESPONSE_UNCONFIRMED",
+              message: `Permission response unconfirmed for request ${permission.id}: ${message}`,
+              details: 'Use "paseo permit ls" to check whether the request is still pending',
+            };
+            throw error;
+          }
+          return toPermissionResponseItem(resolvedAgentId, permission, "denied");
+        }),
+      );
+
+      await client.close();
+
+      return {
+        type: "list",
+        data: results,
+        schema: permitResponseSchema,
+      };
+    } catch (err) {
+      await client.close().catch(() => {});
+      // Re-throw CommandErrors
+      if (err && typeof err === "object" && "code" in err) {
+        throw err;
+      }
+      const message = err instanceof Error ? err.message : String(err);
+      const error: CommandError = {
+        code: "DENY_PERMISSION_FAILED",
+        message: `Failed to deny permission: ${message}`,
+      };
+      throw error;
     }
-
-    // Deny permissions
-    const results: PermissionResponseItem[] = await Promise.all(
-      permissionsToDeny.map(async (permission) => {
-        await client.respondToPermission(resolvedAgentId, permission.id, {
-          behavior: "deny",
-          ...(options.message ? { message: options.message } : {}),
-          ...(options.interrupt ? { interrupt: true } : {}),
-        });
-        return toPermissionResponseItem(resolvedAgentId, permission, "denied");
-      }),
-    );
-
-    await client.close();
-
-    return {
-      type: "list",
-      data: results,
-      schema: permitResponseSchema,
-    };
-  } catch (err) {
-    await client.close().catch(() => {});
-    // Re-throw CommandErrors
-    if (err && typeof err === "object" && "code" in err) {
-      throw err;
-    }
-    const message = err instanceof Error ? err.message : String(err);
-    const error: CommandError = {
-      code: "DENY_PERMISSION_FAILED",
-      message: `Failed to deny permission: ${message}`,
-    };
-    throw error;
-  }
+  };
 }
+
+export const runDenyCommand = createDenyCommand();
diff --git a/packages/cli/src/commands/permit/permit-response.test.ts b/packages/cli/src/commands/permit/permit-response.test.ts
new file mode 100644
index 0000000000..5328b6ecb8
--- /dev/null
+++ b/packages/cli/src/commands/permit/permit-response.test.ts
@@ -0,0 +1,177 @@
+import { setImmediate as waitForCommandContinuations } from "node:timers/promises";
+import { Command } from "commander";
+import type {
+  AgentPermissionRequest,
+  AgentPermissionResponse,
+} from "@getpaseo/protocol/agent-types";
+import { describe, expect, it } from "vitest";
+import { createAllowCommand, type PermitClient } from "./allow.js";
+import { createDenyCommand } from "./deny.js";
+
+const agentId = "2d85f428-fdaf-4d98-906f-c583de2b805f";
+const requests: AgentPermissionRequest[] = [
+  {
+    id: "permission-write",
+    provider: "codex",
+    name: "CodexBash",
+    kind: "tool",
+  },
+  { id: "permission-edit", provider: "codex", name: "CodexBash", kind: "tool" },
+];
+
+class PermissionClient implements PermitClient {
+  readonly pending = [...requests];
+  readonly responses = new Map<string, AgentPermissionResponse>();
+  closed = false;
+  private notifyReceived = () => {};
+  private readonly confirmations = new Map<
+    string,
+    {
+      resolve: () => void;
+      reject: (error: Error) => void;
+    }
+  >();
+
+  async fetchAgent() {
+    return { agent: { id: agentId, pendingPermissions: this.pending } };
+  }
+
+  async respondToPermission(
+    _agentId: string,
+    requestId: string,
+    response: AgentPermissionResponse,
+  ) {
+    this.responses.set(requestId, response);
+    this.notifyReceived();
+  }
+
+  async respondToPermissionAndWait(
+    responseAgentId: string,
+    requestId: string,
+    response: AgentPermissionResponse,
+  ): Promise<void> {
+    const confirmation = new Promise<void>((resolve, reject) => {
+      this.confirmations.set(requestId, { resolve, reject });
+    });
+    await this.respondToPermission(responseAgentId, requestId, response);
+    await confirmation;
+  }
+
+  async close() {
+    this.closed = true;
+  }
+
+  async waitForResponses(count: number) {
+    while (this.responses.size < count) {
+      await new Promise<void>((resolve) => {
+        this.notifyReceived = resolve;
+      });
+    }
+  }
+
+  confirm(requestId: string) {
+    const confirmation = this.confirmations.get(requestId);
+    if (!confirmation) throw new Error(`No confirmation waiter: ${requestId}`);
+    this.pending.splice(
+      this.pending.findIndex((request) => request.id === requestId),
+      1,
+    );
+    confirmation.resolve();
+  }
+
+  fail(requestId: string, error: Error) {
+    const confirmation = this.confirmations.get(requestId);
+    if (!confirmation) throw new Error(`No confirmation waiter: ${requestId}`);
+    confirmation.reject(error);
+  }
+}
+
+const options = {
+  daemonTarget: { kind: "endpoint" as const, host: "test.invalid" },
+};
+const actions = [
+  { name: "allow", create: createAllowCommand, result: "allowed" },
+  { name: "deny", create: createDenyCommand, result: "denied" },
+];
+for (const action of actions) {
+  describe(`permit ${action.name}`, () => {
+    it("returns success and closes only after confirmation", async () => {
+      const client = new PermissionClient();
+      let completed = false;
+      const command = action.create(async () => client)(
+        agentId,
+        requests[0].id,
+        options,
+        new Command(),
+      );
+      void command.then(
+        () => (completed = true),
+        () => false,
+      );
+      await client.waitForResponses(1);
+      await waitForCommandContinuations();
+      expect(completed).toBe(false);
+      expect(client.closed).toBe(false);
+      expect(client.pending).toEqual(requests);
+      client.confirm(requests[0].id);
+      const result = await command;
+      expect(result.data).toEqual([
+        {
+          requestId: requests[0].id,
+          agentId,
+          agentShortId: agentId.slice(0, 7),
+          name: "CodexBash",
+          result: action.result,
+        },
+      ]);
+      expect(client.closed).toBe(true);
+      expect(client.pending).toEqual([requests[1]]);
+    });
+
+    it("waits for every confirmation with --all", async () => {
+      const client = new PermissionClient();
+      let completed = false;
+      const command = action.create(async () => client)(
+        agentId,
+        undefined,
+        { ...options, all: true },
+        new Command(),
+      );
+      void command.then(
+        () => (completed = true),
+        () => false,
+      );
+      await client.waitForResponses(2);
+      client.confirm(requests[0].id);
+      // Wait beyond the first reply's promise continuations while withholding the second.
+      await waitForCommandContinuations();
+      expect(completed).toBe(false);
+      expect(client.closed).toBe(false);
+      client.confirm(requests[1].id);
+      const result = await command;
+      expect(result.data.map((item) => item.result)).toEqual([action.result, action.result]);
+      expect(client.closed).toBe(true);
+      expect(client.pending).toEqual([]);
+    });
+
+    it("rejects an unconfirmed response without returning success", async () => {
+      const client = new PermissionClient();
+      const command = action.create(async () => client)(
+        agentId,
+        requests[0].id,
+        options,
+        new Command(),
+      );
+      const failure = expect(command).rejects.toMatchObject({
+        code: "PERMISSION_RESPONSE_UNCONFIRMED",
+        message: expect.stringContaining(requests[0].id),
+        details: 'Use "paseo permit ls" to check whether the request is still pending',
+      });
+      await client.waitForResponses(1);
+      client.fail(requests[0].id, new Error("Timeout waiting for message (15000ms)"));
+      await failure;
+      expect(client.closed).toBe(true);
+      expect(client.pending).toEqual(requests);
+    });
+  });
+}

From 1939ee79edbed7410b938f7ec9a3734dc43feec8 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 18:50:03 +0200
Subject: [PATCH 099/270] Accept daemon settings in the published editor schema
 (#6621)

* fix(config): accept daemon settings in the published editor schema

The website schema omitted accepted configuration fields, so editors
rejected valid browser, profile, plugin and metadata settings. Regenerate
from the daemon schema and guard the published artifact against drift.

Co-authored-by: Okan YILDIRIM <63511519+ragokan@users.noreply.github.com>

* fix(config): preserve proxy help when regenerating the schema

Keep the existing editor descriptions in the source schema so regeneration retains them. The new regression fails when the proxy descriptions disappear.

* test(usage): create SQLite store fixtures in one transaction

The Windows plugin suite exceeded its five-second test deadline while creating and exercising the first OMP store fixture. Commit the fixture as a unit rather than flushing each inserted row separately; preserve the read-only discovery assertions.

* test(config): show structured schema validation errors

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: Okan YILDIRIM <63511519+ragokan@users.noreply.github.com>
---
 .../persisted-config-json-schema.test.ts      |   78 ++
 .../server/src/server/persisted-config.ts     |   26 +-
 .../public/schemas/paseo.config.v1.json       | 1117 ++++++++++-------
 .../claude-usage-source/server/stores.test.ts |    3 +
 .../codex-usage-source/server/stores.test.ts  |    3 +
 5 files changed, 794 insertions(+), 433 deletions(-)
 create mode 100644 packages/server/src/server/persisted-config-json-schema.test.ts

diff --git a/packages/server/src/server/persisted-config-json-schema.test.ts b/packages/server/src/server/persisted-config-json-schema.test.ts
new file mode 100644
index 0000000000..f943f859ec
--- /dev/null
+++ b/packages/server/src/server/persisted-config-json-schema.test.ts
@@ -0,0 +1,78 @@
+import { readFileSync } from "node:fs";
+import Ajv from "ajv";
+import { expect, test } from "vitest";
+import { z } from "zod";
+
+import { PersistedConfigSchema } from "./persisted-config.js";
+
+const publishedSchema = JSON.parse(
+  readFileSync(
+    new URL("../../../website/public/schemas/paseo.config.v1.json", import.meta.url),
+    "utf8",
+  ),
+);
+
+test("editors accept the daemon's browser, profile, plugin and metadata configuration", () => {
+  const config = {
+    $schema: "https://paseo.sh/schemas/paseo.config.v1.json",
+    version: 1,
+    daemon: {
+      browserTools: { enabled: true },
+      terminalProfiles: [],
+      agentProfiles: [],
+    },
+    pluginsEnabled: true,
+    plugins: {},
+    agents: {
+      metadataGeneration: { providers: [{ provider: "claude", model: "claude-opus-5" }] },
+    },
+  };
+  expect(PersistedConfigSchema.parse(config)).toEqual(config);
+  const validate = new Ajv({ allErrors: true, strict: false }).compile(publishedSchema);
+  const valid = validate(config);
+  expect(validate.errors).toBeNull();
+  expect(valid).toBe(true);
+});
+
+test("the published schema stays current with the daemon's configuration schema", () => {
+  const generated = z.toJSONSchema(PersistedConfigSchema, {
+    target: "draft-07",
+    unrepresentable: "any",
+    io: "input",
+  });
+  generated.title = "PaseoConfigV1";
+  expect(
+    publishedSchema,
+    "Run npm run generate:config-schema --workspace=@getpaseo/server",
+  ).toEqual(generated);
+});
+
+test("editors retain the existing proxy configuration help", () => {
+  const daemon = publishedSchema.properties.daemon.properties;
+  expect(daemon.trustedProxies.description).toBe(
+    'Express trusted proxy setting for X-Forwarded-* headers. Defaults to ["loopback"]. Use true only when the final trusted proxy overwrites client-supplied forwarded headers.',
+  );
+  expect(daemon.serviceProxy.properties.enabled.description).toBe(
+    "Compatibility shim. false suppresses optional service proxy listen/public layers only; localhost proxying remains enabled.",
+  );
+  expect(daemon.serviceProxy.properties.listen.description).toBe(
+    "Optional service-only listener address. Presence enables the standalone service proxy listener.",
+  );
+  expect(daemon.serviceProxy.properties.publicBaseUrl.description).toBe(
+    "Optional public base URL for service host aliases.",
+  );
+});
+
+test.each([
+  { daemon: { browserTools: { enabled: "yes" } } },
+  { daemon: { terminalProfiles: "default" } },
+  { daemon: { agentProfiles: "default" } },
+  { pluginsEnabled: "yes" },
+  { plugins: [] },
+  { agents: { metadataGeneration: { providers: [{ provider: "" }] } } },
+  { unknownSetting: true },
+])("editors still reject invalid configuration: %j", (config) => {
+  expect(PersistedConfigSchema.safeParse(config).success).toBe(false);
+  const validate = new Ajv({ allErrors: true, strict: false }).compile(publishedSchema);
+  expect(validate(config)).toBe(false);
+});
diff --git a/packages/server/src/server/persisted-config.ts b/packages/server/src/server/persisted-config.ts
index 79e3d97218..4998455713 100644
--- a/packages/server/src/server/persisted-config.ts
+++ b/packages/server/src/server/persisted-config.ts
@@ -237,7 +237,12 @@ export const PersistedConfigSchema = z
         listen: z.string().optional(),
         hostnames: z.union([z.literal(true), z.array(z.string())]).optional(),
         allowedHosts: z.union([z.literal(true), z.array(z.string())]).optional(),
-        trustedProxies: z.union([z.literal(true), z.array(z.string())]).optional(),
+        trustedProxies: z
+          .union([z.literal(true), z.array(z.string())])
+          .optional()
+          .describe(
+            'Express trusted proxy setting for X-Forwarded-* headers. Defaults to ["loopback"]. Use true only when the final trusted proxy overwrites client-supplied forwarded headers.',
+          ),
         mcp: z
           .object({
             enabled: z.boolean().optional(),
@@ -284,9 +289,22 @@ export const PersistedConfigSchema = z
             // COMPAT(serviceProxyEnabled): added 2026-06-02, remove after 2026-12-02.
             // Parsed only to suppress optional public/listen layers for old configs;
             // localhost service proxying remains always enabled.
-            enabled: z.boolean().optional(),
-            listen: z.string().optional(),
-            publicBaseUrl: z.url().optional(),
+            enabled: z
+              .boolean()
+              .optional()
+              .describe(
+                "Compatibility shim. false suppresses optional service proxy listen/public layers only; localhost proxying remains enabled.",
+              ),
+            listen: z
+              .string()
+              .optional()
+              .describe(
+                "Optional service-only listener address. Presence enables the standalone service proxy listener.",
+              ),
+            publicBaseUrl: z
+              .url()
+              .optional()
+              .describe("Optional public base URL for service host aliases."),
           })
           .strict()
           .optional(),
diff --git a/packages/website/public/schemas/paseo.config.v1.json b/packages/website/public/schemas/paseo.config.v1.json
index c1cfbb4b6c..415d307ca0 100644
--- a/packages/website/public/schemas/paseo.config.v1.json
+++ b/packages/website/public/schemas/paseo.config.v1.json
@@ -1,188 +1,270 @@
 {
-  "$ref": "#/definitions/PaseoConfigV1",
-  "definitions": {
-    "PaseoConfigV1": {
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "$schema": {
+      "type": "string"
+    },
+    "version": {
+      "type": "number",
+      "const": 1
+    },
+    "daemon": {
       "type": "object",
       "properties": {
-        "$schema": {
+        "listen": {
           "type": "string"
         },
-        "version": {
-          "type": "number",
-          "const": 1
+        "hostnames": {
+          "anyOf": [
+            {
+              "type": "boolean",
+              "const": true
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
         },
-        "daemon": {
+        "allowedHosts": {
+          "anyOf": [
+            {
+              "type": "boolean",
+              "const": true
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
+        },
+        "trustedProxies": {
+          "description": "Express trusted proxy setting for X-Forwarded-* headers. Defaults to [\"loopback\"]. Use true only when the final trusted proxy overwrites client-supplied forwarded headers.",
+          "anyOf": [
+            {
+              "type": "boolean",
+              "const": true
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
+        },
+        "mcp": {
           "type": "object",
           "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "injectIntoAgents": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": {}
+        },
+        "browserTools": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": {}
+        },
+        "git": {
+          "type": "object",
+          "properties": {
+            "maxProcessesPerSecond": {
+              "type": "integer",
+              "exclusiveMinimum": 0,
+              "maximum": 9007199254740991
+            },
+            "maxProcessConcurrency": {
+              "type": "integer",
+              "exclusiveMinimum": 0,
+              "maximum": 9007199254740991
+            }
+          },
+          "additionalProperties": false
+        },
+        "autoArchiveAfterMerge": {
+          "type": "boolean"
+        },
+        "enableTerminalAgentHooks": {
+          "type": "boolean"
+        },
+        "appendSystemPrompt": {
+          "type": "string"
+        },
+        "terminalProfiles": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "name": {
+                "type": "string"
+              },
+              "command": {
+                "type": "string"
+              },
+              "args": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "icon": {
+                "type": "string"
+              }
+            },
+            "required": ["id", "name", "command"],
+            "additionalProperties": {}
+          }
+        },
+        "agentProfiles": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "name": {
+                "type": "string"
+              },
+              "icon": {
+                "type": "string"
+              },
+              "color": {
+                "type": "string"
+              },
+              "provider": {
+                "type": "string"
+              },
+              "model": {
+                "type": "string"
+              },
+              "modeId": {
+                "type": "string"
+              },
+              "thinkingOptionId": {
+                "type": "string"
+              },
+              "featureValues": {
+                "type": "object",
+                "propertyNames": {
+                  "type": "string"
+                },
+                "additionalProperties": {}
+              },
+              "notes": {
+                "type": "string"
+              }
+            },
+            "required": ["id", "name", "provider"],
+            "additionalProperties": {}
+          }
+        },
+        "cors": {
+          "type": "object",
+          "properties": {
+            "allowedOrigins": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "additionalProperties": false
+        },
+        "relay": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "endpoint": {
+              "type": "string"
+            },
+            "publicEndpoint": {
+              "type": "string"
+            },
+            "useTls": {
+              "type": "boolean"
+            },
+            "publicUseTls": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": false
+        },
+        "serviceProxy": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "description": "Compatibility shim. false suppresses optional service proxy listen/public layers only; localhost proxying remains enabled.",
+              "type": "boolean"
+            },
             "listen": {
+              "description": "Optional service-only listener address. Presence enables the standalone service proxy listener.",
               "type": "string"
             },
-            "hostnames": {
-              "anyOf": [
-                {
-                  "type": "boolean",
-                  "const": true
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              ]
-            },
-            "allowedHosts": {
-              "anyOf": [
-                {
-                  "type": "boolean",
-                  "const": true
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              ]
-            },
-            "trustedProxies": {
-              "description": "Express trusted proxy setting for X-Forwarded-* headers. Defaults to [\"loopback\"]. Use true only when the final trusted proxy overwrites client-supplied forwarded headers.",
-              "anyOf": [
-                {
-                  "type": "boolean",
-                  "const": true
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              ]
-            },
-            "mcp": {
-              "type": "object",
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "injectIntoAgents": {
-                  "type": "boolean"
-                }
-              },
-              "additionalProperties": true
-            },
-            "git": {
-              "type": "object",
-              "properties": {
-                "maxProcessesPerSecond": {
-                  "type": "integer",
-                  "exclusiveMinimum": 0
-                },
-                "maxProcessConcurrency": {
-                  "type": "integer",
-                  "exclusiveMinimum": 0
-                }
-              },
-              "additionalProperties": false
-            },
-            "autoArchiveAfterMerge": {
-              "type": "boolean"
-            },
-            "enableTerminalAgentHooks": {
-              "type": "boolean"
-            },
-            "appendSystemPrompt": {
-              "type": "string"
-            },
-            "cors": {
-              "type": "object",
-              "properties": {
-                "allowedOrigins": {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              },
-              "additionalProperties": false
-            },
-            "relay": {
-              "type": "object",
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "endpoint": {
-                  "type": "string"
-                },
-                "publicEndpoint": {
-                  "type": "string"
-                },
-                "useTls": {
-                  "type": "boolean"
-                },
-                "publicUseTls": {
-                  "type": "boolean"
-                }
-              },
-              "additionalProperties": false
-            },
-            "serviceProxy": {
-              "type": "object",
-              "properties": {
-                "enabled": {
-                  "description": "Compatibility shim. false suppresses optional service proxy listen/public layers only; localhost proxying remains enabled.",
-                  "type": "boolean"
-                },
-                "listen": {
-                  "description": "Optional service-only listener address. Presence enables the standalone service proxy listener.",
-                  "type": "string"
-                },
-                "publicBaseUrl": {
-                  "description": "Optional public base URL for service host aliases.",
-                  "type": "string",
-                  "format": "uri"
-                }
-              },
-              "additionalProperties": false
-            },
-            "auth": {
-              "type": "object",
-              "properties": {
-                "password": {
-                  "type": "string",
-                  "pattern": "^\\$2[aby]\\$\\d{2}\\$[./A-Za-z0-9]{53}$"
-                }
-              },
-              "additionalProperties": false
+            "publicBaseUrl": {
+              "description": "Optional public base URL for service host aliases.",
+              "type": "string",
+              "format": "uri"
             }
           },
           "additionalProperties": false
         },
-        "app": {
+        "auth": {
           "type": "object",
           "properties": {
-            "baseUrl": {
-              "type": "string"
+            "password": {
+              "type": "string",
+              "pattern": "^\\$2[aby]\\$\\d{2}\\$[./A-Za-z0-9]{53}$"
             }
           },
           "additionalProperties": false
-        },
-        "worktrees": {
+        }
+      },
+      "additionalProperties": false
+    },
+    "app": {
+      "type": "object",
+      "properties": {
+        "baseUrl": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "providers": {
+      "type": "object",
+      "properties": {
+        "openai": {
           "type": "object",
           "properties": {
-            "root": {
+            "apiKey": {
               "type": "string",
               "minLength": 1
-            }
-          },
-          "additionalProperties": false
-        },
-        "providers": {
-          "type": "object",
-          "properties": {
-            "openai": {
+            },
+            "baseUrl": {
+              "type": "string",
+              "minLength": 1
+            },
+            "stt": {
               "type": "object",
               "properties": {
                 "apiKey": {
@@ -192,42 +274,18 @@
                 "baseUrl": {
                   "type": "string",
                   "minLength": 1
-                },
-                "stt": {
-                  "type": "object",
-                  "properties": {
-                    "apiKey": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "baseUrl": {
-                      "type": "string",
-                      "minLength": 1
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                "tts": {
-                  "type": "object",
-                  "properties": {
-                    "apiKey": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "baseUrl": {
-                      "type": "string",
-                      "minLength": 1
-                    }
-                  },
-                  "additionalProperties": false
                 }
               },
               "additionalProperties": false
             },
-            "local": {
+            "tts": {
               "type": "object",
               "properties": {
-                "modelsDir": {
+                "apiKey": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "baseUrl": {
                   "type": "string",
                   "minLength": 1
                 }
@@ -237,256 +295,466 @@
           },
           "additionalProperties": false
         },
-        "agents": {
+        "local": {
           "type": "object",
           "properties": {
-            "providers": {
-              "type": "object",
-              "additionalProperties": {
+            "modelsDir": {
+              "type": "string",
+              "minLength": 1
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    "pluginRegistries": {
+      "type": "object",
+      "propertyNames": {
+        "type": "string"
+      },
+      "additionalProperties": {
+        "type": "object",
+        "properties": {
+          "authorization": {
+            "type": "string",
+            "minLength": 1
+          }
+        },
+        "required": ["authorization"]
+      }
+    },
+    "pluginsEnabled": {
+      "type": "boolean"
+    },
+    "plugins": {
+      "type": "object",
+      "propertyNames": {
+        "type": "string",
+        "pattern": "^[a-z][a-z0-9-]*$"
+      },
+      "additionalProperties": {
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "source": {
+                "type": "string",
+                "const": "directory"
+              },
+              "path": {
+                "type": "string",
+                "minLength": 1
+              },
+              "enabled": {
+                "type": "boolean"
+              }
+            },
+            "required": ["source", "path"],
+            "additionalProperties": false
+          }
+        ]
+      }
+    },
+    "worktrees": {
+      "type": "object",
+      "properties": {
+        "root": {
+          "type": "string",
+          "minLength": 1
+        },
+        "servicePorts": {
+          "type": "object",
+          "properties": {
+            "range": {
+              "type": "string",
+              "pattern": "^(\\d{1,5})-(\\d{1,5})$"
+            },
+            "portScript": {
+              "type": "string",
+              "minLength": 1
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    "agents": {
+      "type": "object",
+      "properties": {
+        "providers": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string"
+          },
+          "additionalProperties": {
+            "type": "object",
+            "properties": {
+              "extends": {
+                "type": "string"
+              },
+              "label": {
+                "type": "string"
+              },
+              "description": {
+                "type": "string"
+              },
+              "command": {
+                "minItems": 1,
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "minLength": 1
+                }
+              },
+              "env": {
                 "type": "object",
-                "properties": {
-                  "extends": {
-                    "type": "string"
-                  },
-                  "label": {
-                    "type": "string"
-                  },
-                  "description": {
-                    "type": "string"
-                  },
-                  "command": {
-                    "type": "array",
-                    "items": {
+                "propertyNames": {
+                  "type": "string"
+                },
+                "additionalProperties": {
+                  "type": "string"
+                }
+              },
+              "options": {
+                "type": "object",
+                "propertyNames": {
+                  "type": "string"
+                },
+                "additionalProperties": {}
+              },
+              "params": {
+                "type": "object",
+                "propertyNames": {
+                  "type": "string"
+                },
+                "additionalProperties": {}
+              },
+              "models": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
                       "type": "string",
                       "minLength": 1
                     },
-                    "minItems": 1
-                  },
-                  "env": {
-                    "type": "object",
-                    "additionalProperties": {
-                      "type": "string"
-                    }
-                  },
-                  "models": {
-                    "type": "array",
-                    "items": {
-                      "type": "object",
-                      "properties": {
-                        "id": {
-                          "type": "string",
-                          "minLength": 1
-                        },
-                        "label": {
-                          "type": "string",
-                          "minLength": 1
-                        },
-                        "description": {
-                          "type": "string"
-                        },
-                        "isDefault": {
-                          "type": "boolean"
-                        },
-                        "thinkingOptions": {
-                          "type": "array",
-                          "items": {
-                            "type": "object",
-                            "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "label": {
-                                "type": "string"
-                              },
-                              "description": {
-                                "type": "string"
-                              },
-                              "isDefault": {
-                                "type": "boolean"
-                              }
-                            },
-                            "required": ["id", "label"],
-                            "additionalProperties": false
-                          }
-                        }
-                      },
-                      "required": ["id", "label"],
-                      "additionalProperties": false
-                    }
-                  },
-                  "additionalModels": {
-                    "type": "array",
-                    "items": {
-                      "$ref": "#/definitions/PaseoConfigV1/properties/agents/properties/providers/additionalProperties/properties/models/items"
-                    }
-                  },
-                  "disallowedTools": {
-                    "type": "array",
-                    "items": {
-                      "type": "string"
-                    }
-                  },
-                  "paseoTools": {
-                    "type": "object",
-                    "properties": {
-                      "enabled": {
-                        "type": "boolean"
-                      },
-                      "disabledTools": {
-                        "type": "array",
-                        "items": {
-                          "type": "string"
-                        }
-                      }
+                    "label": {
+                      "type": "string",
+                      "minLength": 1
                     },
-                    "additionalProperties": false
+                    "description": {
+                      "type": "string"
+                    },
+                    "isDefault": {
+                      "type": "boolean"
+                    },
+                    "thinkingOptions": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "id": {
+                            "type": "string"
+                          },
+                          "label": {
+                            "type": "string"
+                          },
+                          "description": {
+                            "type": "string"
+                          },
+                          "isDefault": {
+                            "type": "boolean"
+                          }
+                        },
+                        "required": ["id", "label"]
+                      }
+                    }
                   },
+                  "required": ["id", "label"]
+                }
+              },
+              "additionalModels": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "minLength": 1
+                    },
+                    "label": {
+                      "type": "string",
+                      "minLength": 1
+                    },
+                    "description": {
+                      "type": "string"
+                    },
+                    "isDefault": {
+                      "type": "boolean"
+                    },
+                    "thinkingOptions": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "id": {
+                            "type": "string"
+                          },
+                          "label": {
+                            "type": "string"
+                          },
+                          "description": {
+                            "type": "string"
+                          },
+                          "isDefault": {
+                            "type": "boolean"
+                          }
+                        },
+                        "required": ["id", "label"]
+                      }
+                    }
+                  },
+                  "required": ["id", "label"]
+                }
+              },
+              "disallowedTools": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "paseoTools": {
+                "type": "object",
+                "properties": {
                   "enabled": {
                     "type": "boolean"
                   },
-                  "order": {
-                    "type": "number"
+                  "disabledTools": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "enabled": {
+                "type": "boolean"
+              },
+              "order": {
+                "type": "number"
+              }
+            }
+          }
+        },
+        "catalogRefreshTimeoutMs": {
+          "type": "integer",
+          "exclusiveMinimum": 0,
+          "maximum": 2147483647
+        },
+        "metadataGeneration": {
+          "type": "object",
+          "properties": {
+            "providers": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "provider": {
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "model": {
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "thinkingOptionId": {
+                    "type": "string",
+                    "minLength": 1
                   }
                 },
+                "required": ["provider"],
                 "additionalProperties": false
               }
-            },
-            "catalogRefreshTimeoutMs": {
-              "type": "integer",
-              "exclusiveMinimum": 0,
-              "maximum": 2147483647
             }
           },
           "additionalProperties": false
         },
-        "features": {
+        "skills": {
           "type": "object",
           "properties": {
-            "dictation": {
-              "type": "object",
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "stt": {
+            "selection": {
+              "oneOf": [
+                {
                   "type": "object",
                   "properties": {
-                    "provider": {
-                      "allOf": [
-                        {
-                          "type": "string"
-                        },
-                        {
-                          "type": "string",
-                          "enum": ["openai", "local"]
-                        }
-                      ]
-                    },
-                    "model": {
+                    "mode": {
                       "type": "string",
-                      "minLength": 1
-                    },
-                    "language": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "confidenceThreshold": {
-                      "type": "number"
+                      "const": "all"
                     }
                   },
+                  "required": ["mode"],
                   "additionalProperties": false
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "mode": {
+                      "type": "string",
+                      "const": "custom"
+                    },
+                    "skills": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    }
+                  },
+                  "required": ["mode", "skills"],
+                  "additionalProperties": false
+                }
+              ]
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    "features": {
+      "type": "object",
+      "properties": {
+        "dictation": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "stt": {
+              "type": "object",
+              "properties": {
+                "provider": {
+                  "type": "string"
+                },
+                "model": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "language": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "confidenceThreshold": {
+                  "type": "number"
                 }
               },
               "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        },
+        "voiceMode": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
             },
-            "voiceMode": {
+            "llm": {
               "type": "object",
               "properties": {
-                "enabled": {
-                  "type": "boolean"
+                "provider": {
+                  "type": "string"
                 },
-                "llm": {
-                  "type": "object",
-                  "properties": {
-                    "provider": {
-                      "type": "string"
-                    },
-                    "model": {
-                      "type": "string",
-                      "minLength": 1
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                "stt": {
-                  "type": "object",
-                  "properties": {
-                    "provider": {
-                      "$ref": "#/definitions/PaseoConfigV1/properties/features/properties/dictation/properties/stt/properties/provider"
-                    },
-                    "model": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "language": {
-                      "type": "string",
-                      "minLength": 1
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                "turnDetection": {
-                  "type": "object",
-                  "properties": {
-                    "provider": {
-                      "$ref": "#/definitions/PaseoConfigV1/properties/features/properties/dictation/properties/stt/properties/provider"
-                    }
-                  },
-                  "additionalProperties": false
-                },
-                "tts": {
-                  "type": "object",
-                  "properties": {
-                    "provider": {
-                      "$ref": "#/definitions/PaseoConfigV1/properties/features/properties/dictation/properties/stt/properties/provider"
-                    },
-                    "model": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "voice": {
-                      "type": "string",
-                      "enum": ["alloy", "echo", "fable", "onyx", "nova", "shimmer"]
-                    },
-                    "speakerId": {
-                      "type": "integer"
-                    },
-                    "speed": {
-                      "type": "number"
-                    }
-                  },
-                  "additionalProperties": false
-                }
-              },
-              "additionalProperties": false
-            },
-            "webUi": {
-              "type": "object",
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "distDir": {
+                "model": {
                   "type": "string",
                   "minLength": 1
                 }
               },
               "additionalProperties": false
+            },
+            "stt": {
+              "type": "object",
+              "properties": {
+                "provider": {
+                  "type": "string"
+                },
+                "model": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "language": {
+                  "type": "string",
+                  "minLength": 1
+                }
+              },
+              "additionalProperties": false
+            },
+            "turnDetection": {
+              "type": "object",
+              "properties": {
+                "provider": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "tts": {
+              "type": "object",
+              "properties": {
+                "provider": {
+                  "type": "string"
+                },
+                "model": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "voice": {
+                  "type": "string",
+                  "enum": ["alloy", "echo", "fable", "onyx", "nova", "shimmer"]
+                },
+                "speakerId": {
+                  "type": "integer",
+                  "minimum": -9007199254740991,
+                  "maximum": 9007199254740991
+                },
+                "speed": {
+                  "type": "number"
+                }
+              },
+              "additionalProperties": false
             }
           },
           "additionalProperties": false
         },
-        "log": {
+        "webUi": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "distDir": {
+              "type": "string",
+              "minLength": 1
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    "log": {
+      "type": "object",
+      "properties": {
+        "level": {
+          "type": "string",
+          "enum": ["trace", "debug", "info", "warn", "error", "fatal"]
+        },
+        "format": {
+          "type": "string",
+          "enum": ["pretty", "json"]
+        },
+        "console": {
           "type": "object",
           "properties": {
             "level": {
@@ -496,42 +764,32 @@
             "format": {
               "type": "string",
               "enum": ["pretty", "json"]
+            }
+          },
+          "additionalProperties": false
+        },
+        "file": {
+          "type": "object",
+          "properties": {
+            "level": {
+              "type": "string",
+              "enum": ["trace", "debug", "info", "warn", "error", "fatal"]
             },
-            "console": {
+            "path": {
+              "type": "string",
+              "minLength": 1
+            },
+            "rotate": {
               "type": "object",
               "properties": {
-                "level": {
-                  "$ref": "#/definitions/PaseoConfigV1/properties/log/properties/level"
-                },
-                "format": {
-                  "$ref": "#/definitions/PaseoConfigV1/properties/log/properties/format"
-                }
-              },
-              "additionalProperties": false
-            },
-            "file": {
-              "type": "object",
-              "properties": {
-                "level": {
-                  "$ref": "#/definitions/PaseoConfigV1/properties/log/properties/level"
-                },
-                "path": {
+                "maxSize": {
                   "type": "string",
                   "minLength": 1
                 },
-                "rotate": {
-                  "type": "object",
-                  "properties": {
-                    "maxSize": {
-                      "type": "string",
-                      "minLength": 1
-                    },
-                    "maxFiles": {
-                      "type": "integer",
-                      "exclusiveMinimum": 0
-                    }
-                  },
-                  "additionalProperties": false
+                "maxFiles": {
+                  "type": "integer",
+                  "exclusiveMinimum": 0,
+                  "maximum": 9007199254740991
                 }
               },
               "additionalProperties": false
@@ -543,5 +801,6 @@
       "additionalProperties": false
     }
   },
-  "$schema": "http://json-schema.org/draft-07/schema#"
+  "additionalProperties": false,
+  "title": "PaseoConfigV1"
 }
diff --git a/plugins/claude-usage-source/server/stores.test.ts b/plugins/claude-usage-source/server/stores.test.ts
index 9859fcc902..093fbf114f 100644
--- a/plugins/claude-usage-source/server/stores.test.ts
+++ b/plugins/claude-usage-source/server/stores.test.ts
@@ -45,6 +45,8 @@ async function logins(options: Parameters<typeof discover>[1]) {
 async function database(path: string) {
   await mkdir((await import("node:path")).dirname(path), { recursive: true });
   const db = new DatabaseSync(path);
+  // Create the fixture with one durable commit instead of one per row.
+  db.exec("BEGIN");
   db.exec(
     "CREATE TABLE auth_credentials (id INTEGER PRIMARY KEY, provider TEXT, credential_type TEXT, data TEXT, disabled_cause TEXT)",
   );
@@ -78,6 +80,7 @@ async function database(path: string) {
     null,
   );
   insert.run(5, "anthropic", "oauth", "invalid", null);
+  db.exec("COMMIT");
   db.close();
 }
 
diff --git a/plugins/codex-usage-source/server/stores.test.ts b/plugins/codex-usage-source/server/stores.test.ts
index 708c289f0f..335985bacd 100644
--- a/plugins/codex-usage-source/server/stores.test.ts
+++ b/plugins/codex-usage-source/server/stores.test.ts
@@ -39,6 +39,8 @@ async function database(path: string) {
   await mkdir((await import("node:path")).dirname(path), { recursive: true });
   const { DatabaseSync } = await import("node:sqlite");
   const db = new DatabaseSync(path);
+  // Create the fixture with one durable commit instead of one per row.
+  db.exec("BEGIN");
   db.exec(
     "CREATE TABLE auth_credentials (id INTEGER PRIMARY KEY, provider TEXT, credential_type TEXT, data TEXT, disabled_cause TEXT)",
   );
@@ -72,6 +74,7 @@ async function database(path: string) {
     null,
   );
   insert.run(5, "openai-codex", "oauth", "invalid", null);
+  db.exec("COMMIT");
   db.close();
 }
 

From 4bd31e1a2e93e86a32777ca70ab7ffff86b76ac6 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 19:47:10 +0200
Subject: [PATCH 100/270] test(cli): accept Codex catalogs without branded
 model IDs (#6633)

The provider regression test rejected valid GPT catalogs solely because no ID contained codex. Keep the structural output checks without requiring that upstream branding substring.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/cli/tests/15-provider.test.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/cli/tests/15-provider.test.ts b/packages/cli/tests/15-provider.test.ts
index 3081ee3584..3a4f33031c 100644
--- a/packages/cli/tests/15-provider.test.ts
+++ b/packages/cli/tests/15-provider.test.ts
@@ -364,10 +364,6 @@ try {
       ids.every((id) => id.startsWith("gpt-")),
       "all codex model IDs should be from the gpt family",
     );
-    assert(
-      ids.some((id) => id.includes("codex")),
-      "codex model list should include at least one codex-optimized model",
-    );
     assert(
       data.every((m) => m.model && m.id && m.description),
       "every codex model should have model, id, and description fields",

From 0458988825feb997ecaad2e7b34f1a0461147fcd Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 20:51:51 +0200
Subject: [PATCH 101/270] Connect the self-hosted web app through standard-port
 proxies (#6638)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(server): give the web UI connection hint an explicit port (#1)

injectConnectionHint built `listen` straight from the Host header, which
carries no port when the client used the scheme's default — exactly what a
browser sends to a proxy terminating TLS on 443. The app parses `listen` with
parseHostPort, which requires an explicit port, so connectionFromListen
returned null and bootstrapInitialConnectionHint bailed before probing,
silently. Boot then fell through to the localhost:6767 fallback, which is the
viewer's own machine rather than the daemon, and the app landed on the welcome
screen with no host at all.

Reaching the daemon directly never hit this: http://host:6767 puts the port in
the Host header. It only appears behind a reverse proxy on 443 or 80, such as a
Tailscale Ingress, and only in a browser profile with no host already stored.

Spell the scheme default out when the header omits it, leaving the IPv6 bracket
form intact.

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>

* fix(server): compute the web bootstrap port before its connection hint

Keep the default-port fix for reverse proxy bootstrap within the repository branching style.

Co-authored-by: Sian Lerk Lau <kiawin@gmail.com>

---------

Co-authored-by: Sian Lerk Lau <kiawin@gmail.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/bootstrap-web-ui.test.ts       | 38 +++++++++++++++++++
 packages/server/src/server/web-ui.ts          | 26 ++++++++++++-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/server/bootstrap-web-ui.test.ts b/packages/server/src/server/bootstrap-web-ui.test.ts
index 3822cfaa55..81afc3c166 100644
--- a/packages/server/src/server/bootstrap-web-ui.test.ts
+++ b/packages/server/src/server/bootstrap-web-ui.test.ts
@@ -134,6 +134,44 @@ describe("daemon web UI bootstrap", () => {
     });
   });
 
+  test("spells out the scheme default port when the Host header omits it", async () => {
+    const distDir = await createWebUiDist();
+
+    daemonHandle = await createTestPaseoDaemon({
+      mcpEnabled: false,
+      webUi: {
+        enabled: true,
+        distDir,
+      },
+    });
+
+    // A browser reaching a proxy that terminates TLS on 443 sends a Host header
+    // with no port at all. The app rejects a portless `listen`, so the daemon
+    // has to supply the default itself.
+    const httpsHint = readInjectedConnectionHint(
+      await fetchDaemonWebUi({
+        port: daemonHandle.port,
+        headers: { host: "paseo.example.test", "x-forwarded-proto": "https" },
+      }),
+    );
+    const httpHint = readInjectedConnectionHint(
+      await fetchDaemonWebUi({
+        port: daemonHandle.port,
+        headers: { host: "paseo.example.test" },
+      }),
+    );
+    const ipv6Hint = readInjectedConnectionHint(
+      await fetchDaemonWebUi({
+        port: daemonHandle.port,
+        headers: { host: "[::1]", "x-forwarded-proto": "https" },
+      }),
+    );
+
+    expect(httpsHint.listen).toBe("paseo.example.test:443");
+    expect(httpHint.listen).toBe("paseo.example.test:80");
+    expect(ipv6Hint.listen).toBe("[::1]:443");
+  });
+
   test("ignores forwarded HTTPS when proxy trust is disabled", async () => {
     const distDir = await createWebUiDist();
 
diff --git a/packages/server/src/server/web-ui.ts b/packages/server/src/server/web-ui.ts
index e7135a9eab..b59896c159 100644
--- a/packages/server/src/server/web-ui.ts
+++ b/packages/server/src/server/web-ui.ts
@@ -250,6 +250,22 @@ function serializeInlineScriptJson(value: unknown): string {
     .replace(/&/g, "\\u0026");
 }
 
+/**
+ * A Host header carries no port when the client used the scheme's default one,
+ * which is what every browser sends to a proxy terminating TLS on 443. The app
+ * parses `listen` with parseHostPort, which requires an explicit port and
+ * rejects the value outright, so the hint has to spell the port out.
+ */
+function hasExplicitPort(host: string): boolean {
+  if (host.startsWith("[")) {
+    // IPv6 literals are bracketed: [::1] has no port, [::1]:443 does.
+    const end = host.indexOf("]");
+    return end !== -1 && /^:\d{1,5}$/.test(host.slice(end + 1));
+  }
+  const colon = host.indexOf(":");
+  return colon !== -1 && colon === host.lastIndexOf(":") && /^\d{1,5}$/.test(host.slice(colon + 1));
+}
+
 function injectConnectionHint(
   html: string,
   req: Parameters<RequestHandler>[0],
@@ -257,8 +273,16 @@ function injectConnectionHint(
 ): string {
   const host = typeof req.headers.host === "string" ? req.headers.host : "";
   const useTls = req.protocol === "https";
+  let listen = host;
+  if (host && !hasExplicitPort(host)) {
+    let defaultPort = 80;
+    if (useTls) {
+      defaultPort = 443;
+    }
+    listen = `${host}:${defaultPort}`;
+  }
   const hint = {
-    listen: host,
+    listen,
     useTls,
     label,
   };

From b3693b79d15094f43942e2ac4ceb362d49e9cdab Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 21:54:46 +0200
Subject: [PATCH 102/270] Find hidden agent plan files in workspace suggestions
 (#6641)

* fix(server): find hidden agent plan files in workspace suggestions

Workspace autocomplete skipped the editor's plan directory while traversing
other known agent directories. Include it in the existing discovery policy
and cover basename and partial-path queries through the daemon client.

Co-authored-by: X <X@16x.org>

* test(server): give plan suggestion queries explicit expectations

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: X <X@16x.org>
---
 .../server/daemon-e2e/filesystem.e2e.test.ts  | 43 +++++++++++++++++++
 .../server/src/utils/directory-suggestions.ts |  1 +
 2 files changed, 44 insertions(+)

diff --git a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
index 2d3a58a3b7..140feaa569 100644
--- a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
@@ -23,6 +23,49 @@ afterEach(async () => {
 }, 60000);
 
 describe("file explorer", () => {
+  test.each([
+    {
+      query: "implementation",
+      expectedPaths: [
+        ".cursor/plans/implementation-plan.md",
+        ".codex/plans/implementation-plan.md",
+        ".claude/plans/implementation-plan.md",
+      ],
+    },
+    {
+      query: ".cursor/plans/implementation",
+      expectedPaths: [".cursor/plans/implementation-plan.md"],
+    },
+  ])(
+    "workspace suggestions find hidden agent plans for '$query'",
+    async ({ query, expectedPaths }) => {
+      const cwd = tmpCwd();
+      try {
+        for (const directory of [".cursor", ".codex", ".claude", ".hidden"]) {
+          mkdirSync(path.join(cwd, directory, "plans"), { recursive: true });
+          writeFileSync(path.join(cwd, directory, "plans", "implementation-plan.md"), "plan\n");
+        }
+
+        const response = await ctx.client.getDirectorySuggestions({
+          cwd,
+          query,
+          limit: 50,
+          includeFiles: true,
+          includeDirectories: true,
+        });
+        expect(response.error).toBeNull();
+        expect(response.entries).toHaveLength(expectedPaths.length);
+        expect(response.entries).toEqual(
+          expect.arrayContaining(
+            expectedPaths.map((entryPath) => ({ path: entryPath, kind: "file" })),
+          ),
+        );
+      } finally {
+        rmSync(cwd, { recursive: true, force: true });
+      }
+    },
+  );
+
   test.each(["..", "..."])("supports file operations on names starting with %s", async (prefix) => {
     const cwd = tmpCwd();
     const fileName = `${prefix}notes.txt`;
diff --git a/packages/server/src/utils/directory-suggestions.ts b/packages/server/src/utils/directory-suggestions.ts
index 0a1a6c805d..e0443475bc 100644
--- a/packages/server/src/utils/directory-suggestions.ts
+++ b/packages/server/src/utils/directory-suggestions.ts
@@ -146,6 +146,7 @@ export const WORKSPACE_SEARCH_HIDDEN_DIRECTORIES = [
   ".agents",
   ".claude",
   ".codex",
+  ".cursor",
   ".github",
   ".opencode",
   ".paseo",

From b852ae920b3d31488a6949f32332f3815098347d Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2026 23:57:52 +0200
Subject: [PATCH 103/270] fix(desktop): show the Paseo window icon on Linux
 (#6645)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Packaged windows read resources/icon.png, but Linux packages only
installed desktop-entry icons. Include the runtime PNG and verify its
bytes in the existing packaged artifact smoke test.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: Ivan Pantic <panta@talentkit.io>
Co-authored-by: Max Höhl <43786929+whme@users.noreply.github.com>
---
 packages/desktop/e2e/packaged-app-smoke.js | 5 +++++
 packages/desktop/electron-builder.yml      | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/packages/desktop/e2e/packaged-app-smoke.js b/packages/desktop/e2e/packaged-app-smoke.js
index b1b299494a..f1310e287f 100644
--- a/packages/desktop/e2e/packaged-app-smoke.js
+++ b/packages/desktop/e2e/packaged-app-smoke.js
@@ -848,6 +848,11 @@ async function assertSandboxState({ browser, page, expectedSandbox, stdout, stde
 
 function assertLinuxDesktopIdentity(appPath) {
   if (process.platform === "linux") {
+    assert.deepEqual(
+      fs.readFileSync(path.join(appPath, "resources", "icon.png")),
+      fs.readFileSync(path.join(__dirname, "..", "assets", "icon.png")),
+      "Packaged Linux windows must have the Paseo icon at their runtime lookup path",
+    );
     const metadata = JSON.parse(
       extractFile(path.join(appPath, "resources", "app.asar"), "package.json").toString(),
     );
diff --git a/packages/desktop/electron-builder.yml b/packages/desktop/electron-builder.yml
index 6ab5a9b691..8634d1f058 100644
--- a/packages/desktop/electron-builder.yml
+++ b/packages/desktop/electron-builder.yml
@@ -65,6 +65,8 @@ linux:
   extraResources:
     - from: bin/paseo
       to: bin/paseo
+    - from: assets/icon.png
+      to: icon.png
   target:
     - AppImage
     - deb

From 166aabd57b3f6c69f6a6f65b621aba167e7e3be8 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 00:47:28 +0200
Subject: [PATCH 104/270] Keep subprocess regression tests independent of
 terminal colors (#6648)

* test(server): isolate subprocess regressions from terminal colors

Inherited NO_COLOR and FORCE_COLOR make Node emit an unrelated warning. It contaminates argv-fixture stderr and fails the closed-output supervisor fixture before its pipe handlers are installed. Clear both settings only in these fixture subprocesses, preserving their output and lifecycle assertions.

* test(server): exercise conflicting colors regardless of parent environment

Run the closed-output and spaced-executable regressions with explicit conflicting color inputs as well as the inherited environment, so removing fixture isolation fails on ordinary CI environments too.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../server/scripts/supervisor.logging.test.ts | 34 +++++++++++------
 .../src/utils/spawn.launch-regression.test.ts | 38 +++++++++++++------
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/packages/server/scripts/supervisor.logging.test.ts b/packages/server/scripts/supervisor.logging.test.ts
index 7589cb92a1..6f9754994a 100644
--- a/packages/server/scripts/supervisor.logging.test.ts
+++ b/packages/server/scripts/supervisor.logging.test.ts
@@ -29,6 +29,7 @@ async function runSupervisorFixture(options: {
   blockLogPath?: boolean;
   /** Close the reading end of the supervisor's stdout and stderr as soon as it starts. */
   closeOutput?: boolean;
+  env?: NodeJS.ProcessEnv;
 }): Promise<{
   code: number | null;
   signal: NodeJS.Signals | null;
@@ -84,7 +85,9 @@ async function runSupervisorFixture(options: {
         ];
   const child = spawn(command, args, {
     cwd: repoRoot,
-    env: { ...process.env },
+    // A Node color-conflict warning can hit closed stderr before runSupervisor installs
+    // its pipe-error handlers. This fixture exercises the supervisor's own output.
+    env: { ...process.env, ...options.env, NO_COLOR: undefined, FORCE_COLOR: undefined },
     stdio: ["ignore", "pipe", "pipe"],
   });
 
@@ -205,10 +208,16 @@ describe("supervisor durable logging", () => {
     expect(result.stderr).toContain('"worker-json-stderr"');
   });
 
-  test("keeps supervising the worker when nobody reads its stdout or stderr", async () => {
-    const result = await runSupervisorFixture({
-      closeOutput: true,
-      workerSource: `
+  test.each([
+    { colors: "inherited", env: {} },
+    { colors: "conflicting", env: { NO_COLOR: "1", FORCE_COLOR: "1" } },
+  ])(
+    "keeps supervising the worker when nobody reads its stdout or stderr with $colors colors",
+    async ({ env }) => {
+      const result = await runSupervisorFixture({
+        closeOutput: true,
+        env,
+        workerSource: `
         process.on("message", (message) => {
           if (message?.type === "paseo:graceful-shutdown") process.exit(0);
         });
@@ -220,14 +229,15 @@ describe("supervisor durable logging", () => {
         }, 500);
         setInterval(() => {}, 1000);
       `,
-    });
+      });
 
-    expect(result.code).toBe(0);
-    expect(result.signal).toBeNull();
-    expect(result.log).toContain("first stderr line\n");
-    expect(result.log).toContain("later stdout line\n");
-    expect(result.log).toContain('"reason":"closed_output_probe"');
-  });
+      expect(result.code).toBe(0);
+      expect(result.signal).toBeNull();
+      expect(result.log).toContain("first stderr line\n");
+      expect(result.log).toContain("later stdout line\n");
+      expect(result.log).toContain('"reason":"closed_output_probe"');
+    },
+  );
 
   test("preserves raw non-JSON stdout and stderr lines", async () => {
     const result = await runSupervisorFixture({
diff --git a/packages/server/src/utils/spawn.launch-regression.test.ts b/packages/server/src/utils/spawn.launch-regression.test.ts
index 847214c624..4943e68990 100644
--- a/packages/server/src/utils/spawn.launch-regression.test.ts
+++ b/packages/server/src/utils/spawn.launch-regression.test.ts
@@ -126,10 +126,15 @@ async function runFixture(params: {
   command: string;
   args: string[];
   shell?: boolean;
+  env?: NodeJS.ProcessEnv;
 }): Promise<SpawnResult> {
   const child = spawnProcess(params.command, params.args, {
     env: {
       ...process.env,
+      ...params.env,
+      // Terminal color settings must not add Node warnings to the argv fixture's stderr.
+      NO_COLOR: undefined,
+      FORCE_COLOR: undefined,
       PASEO_EXPECTED_ARGV_JSON: JSON.stringify(["--config", JSON_ARG]),
     },
     stdio: ["ignore", "pipe", "pipe"],
@@ -216,6 +221,8 @@ async function findAndLaunch(fixture: LaunchFixture): Promise<{
     const child = spawnProcess(found, fixture.args, {
       env: {
         ...process.env,
+        NO_COLOR: undefined,
+        FORCE_COLOR: undefined,
         PASEO_EXPECTED_ARGV_JSON: fixture.expectedArgvJson,
         PASEO_ARGV_SLICE_FROM: String(fixture.sliceFrom),
       },
@@ -331,18 +338,25 @@ describe.runIf(isPlatform("win32"))("Windows spawn launch regression", () => {
 });
 
 describe.skipIf(isPlatform("win32"))("spawn launch regression smoke", () => {
-  test("direct launch with a space-containing executable works on this platform", async () => {
-    const fixture = makeFixture();
+  test.each([
+    { colors: "inherited", env: {} },
+    { colors: "conflicting", env: { NO_COLOR: "1", FORCE_COLOR: "1" } },
+  ])(
+    "direct launch with a space-containing executable works with $colors colors",
+    async ({ env }) => {
+      const fixture = makeFixture();
 
-    const result = await runFixture({
-      command: fixture.fakeDaemonNode,
-      args: [fixture.assertScript, ...fixture.expectedArgs],
-      shell: false,
-    });
+      const result = await runFixture({
+        command: fixture.fakeDaemonNode,
+        args: [fixture.assertScript, ...fixture.expectedArgs],
+        shell: false,
+        env,
+      });
 
-    expect(result.error).toBeNull();
-    expect(result.code).toBe(0);
-    expect(result.stderr).toBe("");
-    expect(result.stdout.trim()).toBe("ARGV_OK");
-  });
+      expect(result.error).toBeNull();
+      expect(result.code).toBe(0);
+      expect(result.stderr).toBe("");
+      expect(result.stdout.trim()).toBe("ARGV_OK");
+    },
+  );
 });

From 40f0393064cef5ec89afb275510b75a1712aaba3 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 01:58:11 +0200
Subject: [PATCH 105/270] Record shortcuts using the keyboard layout character
 (#6652)

* fix(app): record shortcuts using the keyboard layout character

Shortcut capture stored the QWERTY position while dispatch matched the logical character, so a Dvorak B became Cmd+N. Use the existing logical key mappings for capture and preserve code fallback for named and rewritten Option keys.

* fix(app): keep named shortcut keys on their supported codes

Character capture must not advertise unsupported named keys. Restrict the logical lookup to printable mappings so keypad Enter keeps its existing unsupported behavior.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/keyboard/keyboard-shortcuts.test.ts   | 20 ++++++++++
 .../app/src/keyboard/shortcut-string.test.ts  | 39 +++++++++++++++++++
 packages/app/src/keyboard/shortcut-string.ts  | 11 +++++-
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/packages/app/src/keyboard/keyboard-shortcuts.test.ts b/packages/app/src/keyboard/keyboard-shortcuts.test.ts
index d68e731e56..2a7960c9b9 100644
--- a/packages/app/src/keyboard/keyboard-shortcuts.test.ts
+++ b/packages/app/src/keyboard/keyboard-shortcuts.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, vi } from "vitest";
 import { formatShortcut } from "@/utils/format-shortcut";
+import { keyboardEventToComboString } from "./shortcut-string";
 import {
   buildKeyboardShortcutHelpSections,
   buildEffectiveBindings,
@@ -1026,6 +1027,25 @@ describe("unassigned shortcuts", () => {
   });
 
   describe("matching", () => {
+    it("dispatches a captured Dvorak binding on the same logical key", () => {
+      const event = keyboardInput({ key: "b", code: "KeyN", metaKey: true });
+      const combo = keyboardEventToComboString(event as KeyboardEvent);
+      expect(combo).toBe("Cmd+B");
+      const bindings = buildEffectiveBindings({ "sidebar-toggle-left-mac-cmd-b": combo! });
+
+      expect(
+        resolveShortcut({ event, context: { isMac: true, isDesktop: true }, bindings }).match
+          ?.action,
+      ).toBe("sidebar.toggle.left");
+      expect(
+        resolveShortcut({
+          event: { key: "x", code: "KeyB", metaKey: true },
+          context: { isMac: true, isDesktop: true },
+          bindings,
+        }).match,
+      ).toBeNull();
+    });
+
     it("stops matching a shortcut the user unassigned", () => {
       const bindings = buildEffectiveBindings({ [TAB_NEW_BINDING]: UNASSIGNED_COMBO });
 
diff --git a/packages/app/src/keyboard/shortcut-string.test.ts b/packages/app/src/keyboard/shortcut-string.test.ts
index e7cffee597..8d48d5d986 100644
--- a/packages/app/src/keyboard/shortcut-string.test.ts
+++ b/packages/app/src/keyboard/shortcut-string.test.ts
@@ -22,6 +22,45 @@ function keyboardEvent(overrides: Partial<KeyboardEvent>): KeyboardEvent {
 }
 
 describe("keyboardEventToComboString", () => {
+  it("captures the Dvorak character rather than its QWERTY position", () => {
+    expect(
+      keyboardEventToComboString(keyboardEvent({ key: "b", code: "KeyN", metaKey: true })),
+    ).toBe("Cmd+B");
+  });
+
+  it("captures shifted Dvorak letters and punctuation at other physical positions", () => {
+    expect(
+      keyboardEventToComboString(
+        keyboardEvent({ key: "T", code: "KeyK", metaKey: true, shiftKey: true }),
+      ),
+    ).toBe("Shift+Cmd+T");
+    expect(
+      keyboardEventToComboString(keyboardEvent({ key: ";", code: "KeyZ", ctrlKey: true })),
+    ).toBe("Ctrl+;");
+    expect(
+      keyboardEventToComboString(
+        keyboardEvent({ key: "?", code: "BracketLeft", ctrlKey: true, shiftKey: true }),
+      ),
+    ).toBe("Ctrl+Shift+/");
+  });
+
+  it("keeps named keys and rewritten Option characters capturable", () => {
+    expect(keyboardEventToComboString(keyboardEvent({ key: "ArrowLeft", code: "ArrowLeft" }))).toBe(
+      "ArrowLeft",
+    );
+    expect(
+      keyboardEventToComboString(keyboardEvent({ key: "†", code: "KeyT", altKey: true })),
+    ).toBe("Alt+T");
+  });
+
+  it("does not record a named key that dispatch does not support", () => {
+    expect(
+      keyboardEventToComboString(
+        keyboardEvent({ key: "Enter", code: "NumpadEnter", ctrlKey: true }),
+      ),
+    ).toBeNull();
+  });
+
   it("captures the minus key (regression: previously returned null)", () => {
     expect(keyboardEventToComboString(keyboardEvent({ key: "-", code: "Minus" }))).toBe("-");
   });
diff --git a/packages/app/src/keyboard/shortcut-string.ts b/packages/app/src/keyboard/shortcut-string.ts
index 339d623954..8b632befbd 100644
--- a/packages/app/src/keyboard/shortcut-string.ts
+++ b/packages/app/src/keyboard/shortcut-string.ts
@@ -266,7 +266,16 @@ export function keyboardEventToComboString(event: KeyboardEvent): string | null
   if (event.shiftKey) parts.push("Shift");
   if (event.metaKey) parts.push("Cmd");
 
-  const humanKey = CODE_TO_KEY[event.code];
+  // Capture the same logical character that dispatch matches. Keep the code
+  // fallback for named keys and Option combinations whose key is rewritten.
+  const eventKey = event.key.toLowerCase();
+  const logicalKey = Object.entries(KEY_MAP).find(
+    ([, mapping]) =>
+      mapping.key?.length === 1 &&
+      (mapping.key.toLowerCase() === eventKey ||
+        (event.shiftKey && mapping.shiftedKey === event.key)),
+  )?.[0];
+  const humanKey = logicalKey ?? CODE_TO_KEY[event.code];
   if (humanKey) {
     parts.push(humanKey);
   } else {

From dc7bc8db124e837ba909ffd3b4b20e16adaebe24 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 02:49:09 +0200
Subject: [PATCH 106/270] fix(app): keep typechecking after Expo generates
 environment types (#6656)

Expo declares NODE_ENV readonly after web startup. Preserve the early test environment setup with Object.assign and exercise the real configuration with Expo types in a failing-first compiler regression.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/vitest-environment.test.ts | 30 +++++++++++++++++++++++++
 packages/app/vitest.config.ts           |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/packages/app/vitest-environment.test.ts b/packages/app/vitest-environment.test.ts
index 8d66f37e7f..95b9b9343b 100644
--- a/packages/app/vitest-environment.test.ts
+++ b/packages/app/vitest-environment.test.ts
@@ -1,4 +1,5 @@
 import { spawnSync } from "node:child_process";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -8,6 +9,35 @@ const appDir = fileURLToPath(new URL(".", import.meta.url));
 const rootDir = path.resolve(appDir, "../..");
 const require = createRequire(import.meta.url);
 const vitestEntry = path.join(path.dirname(require.resolve("vitest/package.json")), "vitest.mjs");
+const tsgoEntry = path.join(
+  path.dirname(require.resolve("@typescript/native-preview/package.json")),
+  "bin/tsgo.js",
+);
+
+it("the test configuration typechecks with Expo's generated environment declaration", () => {
+  const fixtureDir = mkdtempSync(path.join(appDir, ".vitest-expo-env-"));
+  try {
+    writeFileSync(path.join(fixtureDir, "expo-env.d.ts"), '/// <reference types="expo/types" />\n');
+    writeFileSync(
+      path.join(fixtureDir, "tsconfig.json"),
+      JSON.stringify({
+        extends: "../tsconfig.json",
+        files: ["../vitest.config.ts", "expo-env.d.ts"],
+        include: [],
+      }),
+    );
+    const result = spawnSync(
+      process.execPath,
+      [tsgoEntry, "--noEmit", "--project", path.join(fixtureDir, "tsconfig.json")],
+      { cwd: appDir, encoding: "utf8", timeout: 30_000 },
+    );
+
+    expect(result.error).toBeUndefined();
+    expect(result.status, result.stdout + result.stderr).toBe(0);
+  } finally {
+    rmSync(fixtureDir, { recursive: true, force: true });
+  }
+}, 40_000);
 
 it.each([
   {
diff --git a/packages/app/vitest.config.ts b/packages/app/vitest.config.ts
index 7fb338b040..e2d67aca70 100644
--- a/packages/app/vitest.config.ts
+++ b/packages/app/vitest.config.ts
@@ -4,7 +4,7 @@ import path from "path";
 import fs from "fs";
 
 // Set this before Vite resolves dependencies and Vitest starts its workers.
-process.env.NODE_ENV = "test";
+Object.assign(process.env, { NODE_ENV: "test" });
 
 const appNodeModules = path.resolve(__dirname, "node_modules");
 const rootNodeModules = path.resolve(__dirname, "../../node_modules");

From c364b16d403dc813c84013e598ffea25fc7b513d Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 04:00:12 +0200
Subject: [PATCH 107/270] Report canceled child tasks and wait for replacement
 tasks to finish (#6660)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(server): report canceled child turns to their callers

* fix(server): wait for replacement child tasks before notifying callers

A displaced turn emits cancellation while its replacement is still running. Notify on terminal events only once the child becomes idle, so Stop and Reload report cancellation while replacement prompts produce one eventual outcome.

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>

* test(server): remove debug output from cancellation regressions

---------

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/agent/agent-prompt.test.ts     |  10 ++
 .../server/src/server/agent/agent-prompt.ts   |  27 ++-
 .../src/server/agent/mcp-parity.e2e.test.ts   | 163 ++++++++++++++++++
 .../src/server/agent/mcp-server.test.ts       |   4 +
 4 files changed, 199 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/server/agent/agent-prompt.test.ts b/packages/server/src/server/agent/agent-prompt.test.ts
index 5a92da7bf7..dcdfdb1cbf 100644
--- a/packages/server/src/server/agent/agent-prompt.test.ts
+++ b/packages/server/src/server/agent/agent-prompt.test.ts
@@ -222,6 +222,11 @@ function createFinishNotificationScenario(
         type: "agent_state",
         agent: childAgent,
       });
+      subscriber?.({
+        type: "agent_stream",
+        agentId: "child-agent",
+        event: { type: "turn_completed", provider: "codex" },
+      });
     },
     async finishChildAndReadParentPrompt() {
       const parentPrompt = new Promise<string>((resolve) => {
@@ -540,6 +545,11 @@ it("does not notify archived callers", async () => {
     type: "agent_state",
     agent: childAgent,
   });
+  subscriber?.({
+    type: "agent_stream",
+    agentId: "child-agent",
+    event: { type: "turn_completed", provider: "codex" },
+  });
 
   await vi.waitFor(() => {
     expect(agentStorageGetSpy).toHaveBeenCalledWith("caller-agent");
diff --git a/packages/server/src/server/agent/agent-prompt.ts b/packages/server/src/server/agent/agent-prompt.ts
index aad25a79b8..4044fd84bc 100644
--- a/packages/server/src/server/agent/agent-prompt.ts
+++ b/packages/server/src/server/agent/agent-prompt.ts
@@ -407,13 +407,20 @@ export interface SetupFinishNotificationParams {
   logger: Logger;
 }
 
-type FinishNotificationReason = "finished" | "errored" | "needs permission" | "was closed";
+type FinishNotificationReason =
+  | "finished"
+  | "errored"
+  | "needs permission"
+  | "was closed"
+  | "was canceled";
 
 const finishNotificationEvents = {
   finished: "finished",
   errored: "errored",
   "needs permission": "permission-required",
   "was closed": "closed",
+  // Use the existing failure event so older clients still parse agent-message metadata.
+  "was canceled": "errored",
 } as const;
 
 const FINISH_NOTIFICATION_MESSAGE_LIMIT = 4000;
@@ -568,10 +575,8 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
       notifySafely("errored");
       return;
     }
-    if (agent.lifecycle === "idle" && hasSeenRunning) {
-      notifySafely("finished");
-      return;
-    }
+    // Idle is published before the terminal stream event for both completion
+    // and cancellation. Let that event identify the outcome instead.
     if (agent.lifecycle === "closed") {
       notifySafely("was closed");
       return;
@@ -600,6 +605,18 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
         return;
       }
 
+      if (event.event.type === "turn_completed" || event.event.type === "turn_canceled") {
+        // Replacing a turn keeps the child running through the displaced turn's
+        // cancellation. The task settles only when the child becomes idle.
+        if (agentManager.getAgent(childAgentId)?.lifecycle !== "idle") return;
+        if (event.event.type === "turn_completed" && hasSeenRunning) {
+          notifySafely("finished");
+        } else if (event.event.type === "turn_canceled" && hasSeenTurn) {
+          notifySafely("was canceled");
+        }
+        return;
+      }
+
       if (event.event.type === "permission_requested") {
         // A permission pause is an intermediate checkpoint. Forget the run
         // observed before it so an idle state during follow-up startup cannot
diff --git a/packages/server/src/server/agent/mcp-parity.e2e.test.ts b/packages/server/src/server/agent/mcp-parity.e2e.test.ts
index 6a5b360ca8..bfb6be7964 100644
--- a/packages/server/src/server/agent/mcp-parity.e2e.test.ts
+++ b/packages/server/src/server/agent/mcp-parity.e2e.test.ts
@@ -12,6 +12,8 @@ import { createTestPaseoDaemon, type TestPaseoDaemon } from "../test-utils/paseo
 import { createTestAgentClients } from "../test-utils/fake-agent-client.js";
 import type { AgentClient, AgentProvider, AgentSessionConfig } from "./agent-sdk-types.js";
 import { PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { parseAgentMessage } from "./agent-messages/index.js";
 
 interface StructuredContent {
   [key: string]: unknown;
@@ -311,6 +313,167 @@ afterAll(async () => {
 });
 
 describe("Suite A: Core Fixes", () => {
+  test.each([
+    ["Stop", "cancelAgent"],
+    ["Reload", "refreshAgent"],
+  ] as const)(
+    "%s tells the parent that a watched child was canceled",
+    async (_action, method) => {
+      let releaseChild!: () => void;
+      let childReachedGate!: () => void;
+      const heldTurn = new Promise<void>((resolve) => {
+        releaseChild = resolve;
+      });
+      const childAtGate = new Promise<void>((resolve) => {
+        childReachedGate = resolve;
+      });
+      const parentPrompts: string[] = [];
+      const daemon = await createTestPaseoDaemon({
+        agentClients: createTestAgentClients({
+          onStartTurn(prompt, config) {
+            if (config.title === "Watching parent" && typeof prompt === "string")
+              parentPrompts.push(prompt);
+          },
+          async beforeTurnComplete(prompt) {
+            if (
+              typeof prompt === "string" &&
+              parseAgentMessage(prompt).text === "Hold this child turn"
+            ) {
+              childReachedGate();
+              await heldTurn;
+            }
+          },
+        }),
+      });
+      const client = new DaemonClient({
+        url: `ws://127.0.0.1:${daemon.port}/ws`,
+        appVersion: "0.11.2",
+      });
+      let mcp: McpClient | undefined;
+      let unsubscribe: (() => void) | undefined;
+      try {
+        await client.connect();
+        await client.fetchAgents({ subscribe: {} });
+        const parent = await client.createAgent({
+          provider: "claude",
+          cwd: daemon.paseoHome,
+          title: "Watching parent",
+          modeId: "bypassPermissions",
+        });
+        mcp = await createMcpClient(
+          buildExpectedAgentMcpUrl({ host: "127.0.0.1", port: daemon.port, agentId: parent.id }),
+        );
+        const created = await callToolStructured(mcp, "create_agent", {
+          relationship: { kind: "subagent" },
+          workspace: { kind: "current" },
+          title: "Watched child",
+          provider: "codex/gpt-5.4",
+          initialPrompt: "Hold this child turn",
+          notifyOnFinish: true,
+          settings: { modeId: "full-access" },
+        });
+        const childId = str(created.agentId);
+        await childAtGate;
+        expect(daemon.daemon.agentManager.getAgent(childId)?.lifecycle).toBe("running");
+        const terminalEvents: string[] = [];
+        unsubscribe = daemon.daemon.agentManager.subscribe(
+          (event) => {
+            if (
+              event.type === "agent_stream" &&
+              event.agentId === childId &&
+              (event.event.type === "turn_completed" || event.event.type === "turn_canceled")
+            )
+              terminalEvents.push(event.event.type);
+          },
+          { agentId: childId, replayState: false },
+        );
+
+        await client[method](childId);
+        await waitFor({
+          timeoutMs: 10000,
+          label: "parent cancellation notification",
+          check: () => (parentPrompts.length === 1 ? true : null),
+        });
+        const notification = parseAgentMessage(parentPrompts[0]);
+        expect(terminalEvents).toEqual(["turn_canceled"]);
+        expect(notification.source).toEqual({
+          kind: "agent-notification",
+          agentId: childId,
+          title: "Watched child",
+          event: "errored",
+        });
+        expect(notification.text).toContain(`Agent ${childId} (Watched child) was canceled.`);
+        expect(notification.text).not.toContain("finished.");
+        await waitFor({
+          timeoutMs: 10000,
+          label: "parent notification turn drained",
+          check: () =>
+            daemon.daemon.agentManager.getAgent(parent.id)?.lifecycle === "idle" ? true : null,
+        });
+        expect(parentPrompts).toHaveLength(1);
+      } finally {
+        releaseChild();
+        unsubscribe?.();
+        await mcp?.close();
+        await client.close();
+        await daemon.close();
+      }
+    },
+    30000,
+  );
+
+  test.each([
+    { outcome: "finished", prompt: "say done and stop", status: "idle" },
+    { outcome: "errored", prompt: "Emit a turn failure", status: "error" },
+  ])(
+    "a watched child still reports $outcome after send_agent_prompt",
+    async ({ outcome, prompt, status }) => {
+      const childId = await createChildAgent({
+        title: "Follow-up child",
+        settings: { modeId: "bypassPermissions" },
+      });
+      try {
+        await waitFor({
+          timeoutMs: 10000,
+          label: "initial child turn completed",
+          check: () =>
+            daemonHandle.daemon.agentManager.getAgent(childId)?.lifecycle === "idle" ? true : null,
+        });
+        await callToolStructured(agentScopedClient, "send_agent_prompt", {
+          agentId: childId,
+          prompt,
+          notifyOnFinish: true,
+        });
+        const notifications = await waitFor({
+          timeoutMs: 10000,
+          label: `${outcome} notification`,
+          check: () => {
+            const items = daemonHandle.daemon.agentManager
+              .getTimeline(parentAgentId)
+              .filter(
+                (item) => item.type === "tool_call" && item.agentMessage?.sender.id === childId,
+              );
+            return items.length > 0 ? items : null;
+          },
+        });
+        expect(notifications).toEqual([
+          expect.objectContaining({
+            type: "tool_call",
+            agentMessage: {
+              event: outcome,
+              sender: { id: childId, title: "Follow-up child" },
+              text: expect.stringContaining(`(Follow-up child) ${outcome}.`),
+            },
+          }),
+        ]);
+        expect(daemonHandle.daemon.agentManager.getAgent(childId)?.lifecycle).toBe(status);
+      } finally {
+        await archiveAgentIfPresent(childId);
+      }
+    },
+    30000,
+  );
+
   test("AGENT_WAIT_TIMEOUT_MS is 30000", () => {
     expect(AGENT_WAIT_TIMEOUT_MS).toBe(30_000);
   });
diff --git a/packages/server/src/server/agent/mcp-server.test.ts b/packages/server/src/server/agent/mcp-server.test.ts
index 70b49e304b..f1311d31e2 100644
--- a/packages/server/src/server/agent/mcp-server.test.ts
+++ b/packages/server/src/server/agent/mcp-server.test.ts
@@ -4359,6 +4359,10 @@ describe("send_agent_prompt MCP tool", () => {
       await vi.waitFor(() => expect(finishNotifications()).not.toHaveLength(0));
       await new Promise((resolve) => setTimeout(resolve, 100));
       expect(finishNotifications()).toHaveLength(1);
+      expect(parentClient.sessions[0]!.prompts).toHaveLength(1);
+      expect(parseAgentMessage(parentClient.sessions[0]!.prompts[0])).toMatchObject({
+        source: { kind: "agent-notification", agentId: childId, event: "finished" },
+      });
     } finally {
       await removeAgentStateDir(agentManager, storage, workdir);
     }

From a310444c67f9f93150582db6dbaa3df2ee94ce7a Mon Sep 17 00:00:00 2001
From: Elowen <73627805+Mar-garet@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:58:00 +0800
Subject: [PATCH 108/270] fix: save workspace files with long valid names
 (#6658)

* fix(file-explorer): keep atomic save temporary names short

* test(file-explorer): cover saving long names through daemon RPC
---
 .../server/daemon-e2e/filesystem.e2e.test.ts  | 65 +++++++++++++++++++
 .../src/server/file-explorer/service.ts       |  2 +-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
index 140feaa569..fae56c0ec7 100644
--- a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
@@ -23,6 +23,71 @@ afterEach(async () => {
 }, 60000);
 
 describe("file explorer", () => {
+  test.each([
+    { description: "a long ASCII name", fileName: `${"a".repeat(236)}.txt` },
+    { description: "an ordinary name", fileName: "notes.txt" },
+    { description: "a long Unicode name", fileName: `${"文".repeat(76)}.txt` },
+  ])("saves text files with $description", async ({ fileName }) => {
+    const cwd = tmpCwd();
+    try {
+      const created = await ctx.client.createFileEntry({
+        cwd,
+        parentPath: ".",
+        name: fileName,
+        kind: "file",
+      });
+      expect(created).toMatchObject({ path: fileName, success: true, error: null });
+      writeFileSync(path.join(cwd, fileName), "original payload\n");
+      const initial = await ctx.client.readFile(cwd, fileName);
+
+      const saved = await ctx.client.writeFile({
+        cwd,
+        path: fileName,
+        content: "saved payload\n",
+        expectedModifiedAt: initial.modifiedAt,
+        expectedRevision: initial.revision,
+      });
+      expect(saved).toMatchObject({ status: "written", size: 14 });
+      const after = await ctx.client.readFile(cwd, fileName);
+      expect(after.path).toBe(fileName);
+      expect(new TextDecoder().decode(after.bytes)).toBe("saved payload\n");
+
+      const staleSave = await ctx.client.writeFile({
+        cwd,
+        path: fileName,
+        content: "stale payload\n",
+        expectedModifiedAt: initial.modifiedAt,
+        expectedRevision: initial.revision,
+      });
+      expect(staleSave).toMatchObject({
+        status: "conflict",
+        version: {
+          status: "ready",
+          path: fileName,
+          size: after.size,
+          modifiedAt: after.modifiedAt,
+          revision: after.revision,
+        },
+      });
+      const afterConflict = await ctx.client.readFile(cwd, fileName);
+      expect(new TextDecoder().decode(afterConflict.bytes)).toBe("saved payload\n");
+
+      const secondSave = await ctx.client.writeFile({
+        cwd,
+        path: fileName,
+        content: "second payload\n",
+        expectedModifiedAt: afterConflict.modifiedAt,
+        expectedRevision: afterConflict.revision,
+      });
+      expect(secondSave).toMatchObject({ status: "written", size: 15 });
+      const final = await ctx.client.readFile(cwd, fileName);
+      expect(new TextDecoder().decode(final.bytes)).toBe("second payload\n");
+      expect(readdirSync(cwd)).toEqual([fileName]);
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
   test.each([
     {
       query: "implementation",
diff --git a/packages/server/src/server/file-explorer/service.ts b/packages/server/src/server/file-explorer/service.ts
index 5421450c24..b371a5e4af 100644
--- a/packages/server/src/server/file-explorer/service.ts
+++ b/packages/server/src/server/file-explorer/service.ts
@@ -489,7 +489,7 @@ export async function writeExplorerFile({
 
   const temporaryPath = path.join(
     path.dirname(filePath.resolvedPath),
-    `.${path.basename(filePath.resolvedPath)}.paseo-${randomUUID()}.tmp`,
+    `.paseo-${randomUUID()}.tmp`,
   );
   let temporaryHandle: FileHandle | null = null;
   try {

From 9b92b2e25c7edb176b735c2dd291bd3d3930ea13 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 06:00:59 +0200
Subject: [PATCH 109/270] Preserve base worktree paths when merging (#6668)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(git): preserve the base worktree path when merging

* test(git): cover merging into whitespace worktree paths

* test(git): follow the server object parameter convention

* test(git): keep merge fixture line endings deterministic

Disable automatic CRLF checkout in the fixture repository so the exact-content assertion works with Windows Git defaults.

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>

---------

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/server/package.json                  |  2 +-
 .../daemon-e2e/git-operations.e2e.test.ts     | 83 ++++++++++++++++++-
 packages/server/src/utils/checkout-git.ts     | 15 ++--
 3 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index fee28237ab..b80941d56f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",
diff --git a/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts b/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts
index 64ba85eb48..be225f171d 100644
--- a/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts
@@ -1,5 +1,14 @@
 import { test, expect, beforeEach, afterEach } from "vitest";
-import { mkdtempSync, writeFileSync, existsSync, rmSync, readFileSync, realpathSync } from "fs";
+import {
+  mkdtempSync,
+  writeFileSync,
+  existsSync,
+  rmSync,
+  readFileSync,
+  realpathSync,
+  mkdirSync,
+} from "fs";
+import { execFileSync } from "node:child_process";
 import { tmpdir } from "os";
 import path from "path";
 import { createDaemonTestContext, type DaemonTestContext } from "../test-utils/index.js";
@@ -152,6 +161,78 @@ afterEach(async () => {
   await ctx.cleanup();
 }, 60000);
 
+interface GitCommandOptions {
+  cwd: string;
+  args: string[];
+}
+
+async function mergeFeatureIntoBaseWorktree(baseName: string): Promise<void> {
+  const directory = realpathSync(tmpCwd());
+  const base = path.join(directory, baseName);
+  const feature = path.join(directory, "feature");
+  function git({ cwd, args }: GitCommandOptions): string {
+    return execFileSync("git", args, { cwd, encoding: "utf8", stdio: "pipe" });
+  }
+  try {
+    mkdirSync(base);
+    git({ cwd: base, args: ["init", "-b", "main"] });
+    git({ cwd: base, args: ["config", "user.name", "Paseo Test"] });
+    git({ cwd: base, args: ["config", "user.email", "test@paseo.local"] });
+    git({ cwd: base, args: ["config", "commit.gpgsign", "false"] });
+    git({ cwd: base, args: ["config", "core.autocrlf", "false"] });
+    git({ cwd: base, args: ["commit", "--allow-empty", "-m", "base"] });
+    git({ cwd: base, args: ["worktree", "add", "-b", "feature", feature] });
+    writeFileSync(path.join(feature, "feature.txt"), "feature payload\n");
+    git({ cwd: feature, args: ["add", "feature.txt"] });
+    git({ cwd: feature, args: ["commit", "-m", "feature"] });
+    const featureCommit = git({ cwd: feature, args: ["rev-parse", "HEAD"] }).trim();
+
+    const merged = await ctx.client.checkoutMerge(feature, { baseRef: "main" });
+    expect(merged).toMatchObject({ success: true, error: null });
+    expect(git({ cwd: base, args: ["rev-parse", "HEAD"] }).trim()).toBe(featureCommit);
+    expect(readFileSync(path.join(base, "feature.txt"), "utf8")).toBe("feature payload\n");
+    expect(git({ cwd: feature, args: ["symbolic-ref", "--short", "HEAD"] }).trim()).toBe("feature");
+  } finally {
+    rmSync(directory, { recursive: true, force: true });
+  }
+}
+
+test.skipIf(isPlatform("win32")).each(["base\ncheckout", "base "])(
+  "merges into a base worktree whose path preserves %j",
+  mergeFeatureIntoBaseWorktree,
+);
+
+test.each(["base checkout", "中文 checkout"])(
+  "merges into a base worktree named %j",
+  mergeFeatureIntoBaseWorktree,
+);
+
+test("merges into a local base branch without another worktree", async () => {
+  const cwd = realpathSync(tmpCwd());
+  function git(args: string[]): string {
+    return execFileSync("git", args, { cwd, encoding: "utf8", stdio: "pipe" });
+  }
+  try {
+    git(["init", "-b", "main"]);
+    git(["config", "user.name", "Paseo Test"]);
+    git(["config", "user.email", "test@paseo.local"]);
+    git(["config", "commit.gpgsign", "false"]);
+    git(["commit", "--allow-empty", "-m", "base"]);
+    git(["checkout", "-b", "feature"]);
+    writeFileSync(path.join(cwd, "feature.txt"), "feature payload\n");
+    git(["add", "feature.txt"]);
+    git(["commit", "-m", "feature"]);
+    const featureCommit = git(["rev-parse", "HEAD"]).trim();
+
+    const merged = await ctx.client.checkoutMerge(cwd, { baseRef: "main" });
+    expect(merged).toMatchObject({ success: true, error: null });
+    expect(git(["rev-parse", "main"]).trim()).toBe(featureCommit);
+    expect(git(["symbolic-ref", "--short", "HEAD"]).trim()).toBe("feature");
+  } finally {
+    rmSync(cwd, { recursive: true, force: true });
+  }
+});
+
 test("returns diff for modified file in git repo", async () => {
   const cwd = tmpCwd();
 
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index 2e317810ba..ee3571504d 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -1187,13 +1187,16 @@ export function parseWorktreeList(output: string): GitWorktreeEntry[] {
 
 async function getWorktreePathForBranch(cwd: string, branchName: string): Promise<string | null> {
   try {
-    const { stdout } = await runGitCommand(["worktree", "list", "--porcelain"], {
-      cwd,
-      envOverlay: READ_ONLY_GIT_ENV,
-    });
-    const entries = parseWorktreeList(stdout);
     const ref = branchName.startsWith("refs/heads/") ? branchName : `refs/heads/${branchName}`;
-    return entries.find((entry) => entry.branchRef === ref)?.path ?? null;
+    const { stdout } = await runGitCommand(
+      ["for-each-ref", "--format=%(refname)%00%(worktreepath)%00", ref],
+      { cwd, envOverlay: READ_ONLY_GIT_ENV },
+    );
+    for (const record of stdout.split("\0\n")) {
+      const [reference, worktreePath] = record.split("\0");
+      if (reference === ref) return worktreePath || null;
+    }
+    return null;
   } catch {
     return null;
   }

From 06f052225835b7a793848ed35128e702c57dc801 Mon Sep 17 00:00:00 2001
From: Elowen <73627805+Mar-garet@users.noreply.github.com>
Date: Mon, 12 Oct 2026 14:58:54 +0800
Subject: [PATCH 110/270] fix(server): invalidate worktree listings after
 archive (#6545)

* fix(server): invalidate worktree listings after archive

* fix(server): clear archived worktrees across cached checkout roots
---
 .../src/server/agent/tools/paseo-tools.ts     |   2 +-
 .../test-utils/workspace-git-service-stub.ts  |   1 +
 .../server/src/server/websocket-server.ts     |   1 +
 ...orkspace-archive-record-scoped.e2e.test.ts | 103 +++++++++++++++++-
 .../server/workspace-archive-service.test.ts  |  48 ++++----
 .../src/server/workspace-archive-service.ts   |   3 +-
 .../workspace-git-service.primitive.test.ts   |  40 +++++++
 .../src/server/workspace-git-service.ts       |   8 ++
 .../src/server/worktree-session.test.ts       |   4 +
 .../server/src/server/worktree-session.ts     |   5 +-
 .../server/src/server/worktree/commands.ts    |   5 +-
 11 files changed, 196 insertions(+), 24 deletions(-)

diff --git a/packages/server/src/server/agent/tools/paseo-tools.ts b/packages/server/src/server/agent/tools/paseo-tools.ts
index 6136da3c8f..dae9c16f4f 100644
--- a/packages/server/src/server/agent/tools/paseo-tools.ts
+++ b/packages/server/src/server/agent/tools/paseo-tools.ts
@@ -112,7 +112,7 @@ export interface PaseoToolHostDependencies {
   github?: ForgeService;
   workspaceGitService?: Pick<
     WorkspaceGitService,
-    "getSnapshot" | "listWorktrees" | "resolveRepoRoot"
+    "getSnapshot" | "listWorktrees" | "resolveRepoRoot" | "invalidateWorktrees"
   >;
   findWorkspaceIdForCwd?: ArchiveDependencies["findWorkspaceIdForCwd"];
   listActiveWorkspaces?: ArchiveDependencies["listActiveWorkspaces"];
diff --git a/packages/server/src/server/test-utils/workspace-git-service-stub.ts b/packages/server/src/server/test-utils/workspace-git-service-stub.ts
index e7747f57ae..53b8a44c1e 100644
--- a/packages/server/src/server/test-utils/workspace-git-service-stub.ts
+++ b/packages/server/src/server/test-utils/workspace-git-service-stub.ts
@@ -55,6 +55,7 @@ export function createNoopWorkspaceGitService(
     suggestBranchesForCwd: async () => [],
     listStashes: async () => [],
     listWorktrees: async () => [],
+    invalidateWorktrees: () => {},
     getProjectSlug: async (cwd: string) => {
       const snapshot = createNoGitWorkspaceRuntimeSnapshot(cwd);
       return deriveProjectSlug(cwd, snapshot.git.isGit ? snapshot.git.remoteUrl : null);
diff --git a/packages/server/src/server/websocket-server.ts b/packages/server/src/server/websocket-server.ts
index 0f145d8396..219e04b0c2 100644
--- a/packages/server/src/server/websocket-server.ts
+++ b/packages/server/src/server/websocket-server.ts
@@ -246,6 +246,7 @@ function createFallbackWorkspaceGitService(): WorkspaceGitService {
     suggestBranchesForCwd: async () => [],
     listStashes: async () => [],
     listWorktrees: async () => [],
+    invalidateWorktrees: () => {},
     getProjectSlug: async (cwd: string) => {
       const snapshot = createFallbackWorkspaceGitSnapshot(cwd);
       return deriveProjectSlug(cwd, snapshot.git.isGit ? snapshot.git.remoteUrl : null);
diff --git a/packages/server/src/server/workspace-archive-record-scoped.e2e.test.ts b/packages/server/src/server/workspace-archive-record-scoped.e2e.test.ts
index cc05d496ba..87cb758ac5 100644
--- a/packages/server/src/server/workspace-archive-record-scoped.e2e.test.ts
+++ b/packages/server/src/server/workspace-archive-record-scoped.e2e.test.ts
@@ -1,10 +1,13 @@
-import { execFileSync, spawn } from "node:child_process";
+import { execFile, execFileSync, spawn } from "node:child_process";
 import { existsSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { promisify } from "node:util";
 import { afterEach, beforeEach, expect, test } from "vitest";
 
 import { getFullAccessConfig } from "./daemon-e2e/agent-configs.js";
+import { createWorktree } from "../utils/worktree.js";
 import {
   createDaemonTestContext,
   DaemonClient,
@@ -54,6 +57,32 @@ function createGitRepo(): string {
   return repoDir;
 }
 
+async function runCli(args: string[], cwd: string): Promise<string> {
+  const result = await promisify(execFile)(
+    process.execPath,
+    [
+      "--conditions=source",
+      "--import",
+      import.meta.resolve("tsx"),
+      fileURLToPath(new URL("../../../cli/src/index.ts", import.meta.url)),
+      "--host",
+      `127.0.0.1:${ctx.daemon.port}`,
+      ...args,
+    ],
+    {
+      cwd,
+      env: {
+        ...Object.fromEntries(
+          Object.entries(process.env).filter(([key]) => !key.startsWith("PASEO_")),
+        ),
+        PASEO_HOME: ctx.daemon.paseoHome,
+      },
+      timeout: 20000,
+    },
+  );
+  return result.stdout;
+}
+
 async function createLocalWorkspace(cwd: string, title: string): Promise<string> {
   const result = await ctx.client.createWorkspace({
     source: { kind: "directory", path: cwd },
@@ -248,6 +277,78 @@ test("renaming a workspace updates every subscribed client", async () => {
   }
 });
 
+test.each(["worktree", "workspace"] as const)(
+  "%s archive immediately removes the deleted worktree from a warm CLI listing",
+  async (command) => {
+    const repoDir = createGitRepo();
+    const created = await ctx.client.createWorkspace({
+      source: {
+        kind: "worktree",
+        cwd: repoDir,
+        worktreeSlug: "cached-worktree",
+        baseBranch: "main",
+      },
+    });
+    const workspace = created.workspace;
+    if (!workspace?.workspaceDirectory) {
+      throw new Error(created.error ?? "Failed to create worktree workspace");
+    }
+    const worktreePath = workspace.workspaceDirectory;
+    const name = path.basename(worktreePath);
+    const before = JSON.parse(await runCli(["worktree", "ls", "--json"], repoDir));
+    expect(before).toEqual([expect.objectContaining({ name, cwd: worktreePath })]);
+
+    await runCli(
+      [command, "archive", command === "worktree" ? name : workspace.id, "--json"],
+      repoDir,
+    );
+    expect(existsSync(worktreePath)).toBe(false);
+    expect(
+      execFileSync("git", ["worktree", "list", "--porcelain"], { cwd: repoDir }).toString(),
+    ).not.toContain(worktreePath);
+    const after = JSON.parse(await runCli(["worktree", "ls", "--json"], repoDir));
+    console.log(
+      `${command} archive: warm listing=${JSON.stringify(before)}\nimmediate listing=${JSON.stringify(after)}`,
+    );
+    expect(after).toEqual([]);
+  },
+  60000,
+);
+
+test("archiving an unregistered worktree in a bare repo clears the main checkout listing", async () => {
+  const sourceRepo = createGitRepo();
+  const repoRoot = makeTempDir("workspace-archive-bare-");
+  const bareRepo = path.join(repoRoot, "repo.git");
+  const mainCheckout = path.join(repoRoot, "main");
+  execFileSync("git", ["clone", "--bare", sourceRepo, bareRepo], { stdio: "pipe" });
+  execFileSync("git", ["worktree", "add", mainCheckout, "main"], {
+    cwd: bareRepo,
+    stdio: "pipe",
+  });
+  const { worktreePath } = await createWorktree({
+    cwd: mainCheckout,
+    source: { kind: "branch-off", baseBranch: "main", branchName: "cached-bare-worktree" },
+    worktreeSlug: "cached-bare-worktree",
+    runSetup: false,
+    paseoHome: ctx.daemon.paseoHome,
+  });
+  expect(await activeWorkspaceIds()).toEqual(new Set());
+  const name = path.basename(worktreePath);
+  const before = JSON.parse(await runCli(["worktree", "ls", "--json"], mainCheckout));
+  expect(before).toEqual([expect.objectContaining({ name, cwd: worktreePath })]);
+
+  await runCli(["worktree", "archive", name, "--json"], mainCheckout);
+  expect(existsSync(worktreePath)).toBe(false);
+  expect(
+    execFileSync("git", ["worktree", "list", "--porcelain"], { cwd: mainCheckout }).toString(),
+  ).not.toContain(worktreePath);
+  const after = JSON.parse(await runCli(["worktree", "ls", "--json"], mainCheckout));
+  console.log(
+    `bare repo archive: warm listing=${JSON.stringify(before)}\nimmediate listing=${JSON.stringify(after)}`,
+  );
+  expect(after).toEqual([]);
+}, 60000);
+
 test("archiving the last reference to a worktree removes it from disk regardless of the disk flag", async () => {
   const repoDir = createGitRepo();
 
diff --git a/packages/server/src/server/workspace-archive-service.test.ts b/packages/server/src/server/workspace-archive-service.test.ts
index c3b77f7070..d1cfb8ada7 100644
--- a/packages/server/src/server/workspace-archive-service.test.ts
+++ b/packages/server/src/server/workspace-archive-service.test.ts
@@ -140,7 +140,8 @@ function createArchiveDeps(input: ArchiveDepsInput): ArchiveTestDependencies {
     github: createGitHubServiceStub(),
     workspaceGitService: {
       getSnapshot: vi.fn(async () => null),
-    } as unknown as Pick<WorkspaceGitService, "getSnapshot">,
+      invalidateWorktrees: () => {},
+    } as unknown as Pick<WorkspaceGitService, "getSnapshot" | "invalidateWorktrees">,
     agentManager: {
       listAgents: () => [],
       getAgent: () => null,
@@ -617,28 +618,37 @@ describe("archiveByScope", () => {
     expect(deps.emitWorkspaceUpdatesForWorkspaceIds).not.toHaveBeenCalled();
   });
 
-  test("worktree scope removes an owned directory with zero matching records", async () => {
-    const { tempDir, repoDir } = createGitRepo();
-    const paseoHome = path.join(tempDir, ".paseo");
-    const worktree = await createPaseoOwnedWorktree(repoDir, paseoHome, "zero-records");
+  test.each(["intact", "missing"] as const)(
+    "worktree scope removes an owned directory with zero matching records and %s Git administration",
+    async (gitAdministration) => {
+      const { tempDir, repoDir } = createGitRepo();
+      const paseoHome = path.join(tempDir, ".paseo");
+      const worktree = await createPaseoOwnedWorktree(repoDir, paseoHome, "zero-records");
+      if (gitAdministration === "missing") {
+        const gitDir = execFileSync("git", ["rev-parse", "--absolute-git-dir"], {
+          cwd: worktree.worktreePath,
+        })
+          .toString()
+          .trim();
+        rmSync(gitDir, { recursive: true, force: true });
+      }
+      const dependencies = createArchiveDeps({ paseoHome, activeWorkspaces: [] });
+      const invalidateWorktrees = vi.fn();
+      dependencies.workspaceGitService.invalidateWorktrees = invalidateWorktrees;
 
-    const result = await archiveByScope(
-      createArchiveDeps({
-        paseoHome,
-        activeWorkspaces: [],
-      }),
-      {
+      const result = await archiveByScope(dependencies, {
         scope: { kind: "worktree", targetPath: worktree.worktreePath },
         requestId: "req-zero-records",
-      },
-    );
+      });
 
-    assertArchiveResult(result, {
-      archivedWorkspaceIds: [],
-      removedDirectory: true,
-    });
-    expect(existsSync(worktree.worktreePath)).toBe(false);
-  });
+      assertArchiveResult(result, {
+        archivedWorkspaceIds: [],
+        removedDirectory: true,
+      });
+      expect(existsSync(worktree.worktreePath)).toBe(false);
+      expect(invalidateWorktrees).toHaveBeenCalledTimes(1);
+    },
+  );
 
   test("marks archiving, emits an upsert carrying the archiving state, then clears it and emits a remove", async () => {
     const { tempDir, repoDir } = createGitRepo();
diff --git a/packages/server/src/server/workspace-archive-service.ts b/packages/server/src/server/workspace-archive-service.ts
index 4c61dcb172..e9e58681a1 100644
--- a/packages/server/src/server/workspace-archive-service.ts
+++ b/packages/server/src/server/workspace-archive-service.ts
@@ -32,7 +32,7 @@ export interface ArchiveDependencies {
   // Base directory that may hold worktrees across repositories.
   paseoWorktreesBaseRoot?: string;
   github: ForgeService;
-  workspaceGitService: Pick<WorkspaceGitService, "getSnapshot">;
+  workspaceGitService: Pick<WorkspaceGitService, "getSnapshot" | "invalidateWorktrees">;
   agentManager: Pick<AgentManager, "listAgents" | "getAgent" | "archiveAgent" | "archiveSnapshot">;
   agentStorage: Pick<AgentStorage, "listByWorkspace">;
   // Resolves the worktree at a path to its workspaceId for archive-by-path. The
@@ -408,6 +408,7 @@ async function maybeRemoveDirectory(
       paseoHome: dependencies.paseoHome,
       worktreesBaseRoot: dependencies.paseoWorktreesBaseRoot,
     });
+    dependencies.workspaceGitService.invalidateWorktrees();
     dependencies.github.invalidate({ cwd: backing.path });
     return true;
   } catch (error) {
diff --git a/packages/server/src/server/workspace-git-service.primitive.test.ts b/packages/server/src/server/workspace-git-service.primitive.test.ts
index 65eb4a0ad5..ce052cdd7c 100644
--- a/packages/server/src/server/workspace-git-service.primitive.test.ts
+++ b/packages/server/src/server/workspace-git-service.primitive.test.ts
@@ -1819,6 +1819,46 @@ describe("WorkspaceGitServiceImpl D2 read methods", () => {
     service.dispose();
   });
 
+  test("invalidating worktrees discards warm listings across checkout roots and in-flight reads", async () => {
+    const worktrees = [
+      {
+        path: "/tmp/paseo-home/worktrees/repo/feature",
+        createdAt: "2026-04-12T00:00:00.000Z",
+        branchName: "feature",
+      },
+    ];
+    const readStarted = createDeferred<void>();
+    const oldRead = createDeferred<typeof worktrees>();
+    const alternateCheckout = resolvePath("/tmp/alternate-checkout");
+    let reads = 0;
+    const service = createService({
+      listPaseoWorktrees: async () => {
+        reads += 1;
+        if (reads <= 2) return worktrees;
+        if (reads === 3) {
+          readStarted.resolve();
+          return oldRead.promise;
+        }
+        return [];
+      },
+    });
+    try {
+      await expect(service.listWorktrees(REPO_CWD)).resolves.toEqual(worktrees);
+      await expect(service.listWorktrees(alternateCheckout)).resolves.toEqual(worktrees);
+      const pending = service.listWorktrees(REPO_CWD, { force: true, reason: "test" });
+      await readStarted.promise;
+      service.invalidateWorktrees();
+      await expect(service.listWorktrees(REPO_CWD)).resolves.toEqual([]);
+      await expect(service.listWorktrees(alternateCheckout)).resolves.toEqual([]);
+      oldRead.resolve(worktrees);
+      await expect(pending).resolves.toEqual(worktrees);
+      await expect(service.listWorktrees(REPO_CWD)).resolves.toEqual([]);
+    } finally {
+      oldRead.resolve(worktrees);
+      await service.dispose();
+    }
+  });
+
   test("listWorktrees shares one repo-root scoped read across sibling workspace cwds", async () => {
     const tempDir = realpathSync(mkdtempSync(join(tmpdir(), "workspace-git-service-")));
     const repoDir = join(tempDir, "repo");
diff --git a/packages/server/src/server/workspace-git-service.ts b/packages/server/src/server/workspace-git-service.ts
index e62720e1c1..2f3483cb6f 100644
--- a/packages/server/src/server/workspace-git-service.ts
+++ b/packages/server/src/server/workspace-git-service.ts
@@ -241,6 +241,7 @@ export interface WorkspaceGitService {
     cwdOrRepoRoot: string,
     options?: WorkspaceGitReadOptions,
   ): Promise<WorkspaceGitWorktreeInfo[]>;
+  invalidateWorktrees(): void;
   getProjectSlug(cwd: string, options?: WorkspaceGitReadOptions): Promise<string>;
   resolveRepoRoot(cwd: string, options?: WorkspaceGitReadOptions): Promise<string>;
   resolveDefaultBranch(cwdOrRepoRoot: string, options?: WorkspaceGitReadOptions): Promise<string>;
@@ -918,6 +919,13 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
       : (snapshot.git.repoRoot ?? resolve(cwd));
   }
 
+  invalidateWorktrees(): void {
+    this.assertNotDisposed();
+    // Checkout paths can cache the same list under different roots, including bare repos.
+    // Detach in-flight reads too, so a pre-mutation result cannot refill the cache.
+    this.worktreeListCache.clear();
+  }
+
   async resolveDefaultBranch(
     cwdOrRepoRoot: string,
     options?: WorkspaceGitReadOptions,
diff --git a/packages/server/src/server/worktree-session.test.ts b/packages/server/src/server/worktree-session.test.ts
index 744ba0726a..b146c59f31 100644
--- a/packages/server/src/server/worktree-session.test.ts
+++ b/packages/server/src/server/worktree-session.test.ts
@@ -2017,6 +2017,7 @@ describe("handlePaseoWorktreeArchiveRequest worktree scope", () => {
         workspaceGitService: {
           getSnapshot: vi.fn(async () => null),
           listWorktrees: vi.fn(async () => []),
+          invalidateWorktrees: () => {},
         },
         agentManager: {
           listAgents: () => [],
@@ -2088,6 +2089,7 @@ describe("handlePaseoWorktreeArchiveRequest worktree scope", () => {
         workspaceGitService: {
           getSnapshot: vi.fn(async () => null),
           listWorktrees: vi.fn(async () => []),
+          invalidateWorktrees: () => {},
         },
         agentManager: {
           listAgents: () => [],
@@ -2164,6 +2166,7 @@ describe("handlePaseoWorktreeArchiveRequest worktree scope", () => {
         workspaceGitService: {
           getSnapshot: vi.fn(async () => null),
           listWorktrees: vi.fn(async () => []),
+          invalidateWorktrees: () => {},
         },
         agentManager: {
           listAgents: () => [],
@@ -2240,6 +2243,7 @@ describe("handlePaseoWorktreeArchiveRequest worktree scope", () => {
       workspaceGitService: {
         getSnapshot: vi.fn(async () => null),
         listWorktrees: vi.fn(async () => []),
+        invalidateWorktrees: () => {},
       },
       agentManager: {
         listAgents: () => [],
diff --git a/packages/server/src/server/worktree-session.ts b/packages/server/src/server/worktree-session.ts
index 6087e6c82a..cdb0119b64 100644
--- a/packages/server/src/server/worktree-session.ts
+++ b/packages/server/src/server/worktree-session.ts
@@ -501,7 +501,10 @@ export async function handlePaseoWorktreeArchiveRequest(
     "emitWorkspaceUpdatesForWorkspaceIds" | "workspaceGitService"
   > & {
     emit: EmitSessionMessage;
-    workspaceGitService: Pick<WorkspaceGitService, "getSnapshot" | "listWorktrees">;
+    workspaceGitService: Pick<
+      WorkspaceGitService,
+      "getSnapshot" | "listWorktrees" | "invalidateWorktrees"
+    >;
     emitWorkspaceUpdatesForWorkspaceIds: (workspaceIds: Iterable<string>) => Promise<void>;
   },
   msg: Extract<SessionInboundMessage, { type: "paseo_worktree_archive_request" }>,
diff --git a/packages/server/src/server/worktree/commands.ts b/packages/server/src/server/worktree/commands.ts
index cedc5013c9..4f76cb1887 100644
--- a/packages/server/src/server/worktree/commands.ts
+++ b/packages/server/src/server/worktree/commands.ts
@@ -93,7 +93,10 @@ export interface ArchiveCommandDependencies extends Omit<
   ArchiveDependencies,
   "workspaceGitService"
 > {
-  workspaceGitService: Pick<WorkspaceGitService, "getSnapshot" | "listWorktrees">;
+  workspaceGitService: Pick<
+    WorkspaceGitService,
+    "getSnapshot" | "listWorktrees" | "invalidateWorktrees"
+  >;
 }
 
 export interface ArchiveCommandInput {

From 9246813fd2acd6afc7012c5fde79a164b8f8592e Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 10:25:18 +0200
Subject: [PATCH 111/270] Preserve spaces in project folder names for Changes
 and worktrees (#6686)

* fix(workspaces): preserve spaces in project directory names

Git path output and app workspace descriptors each stripped significant path whitespace. Preserve directory names while retaining single-record Git output validation and workspace separator normalization.

* test(workspaces): capture Changes after files appear

* test(workspaces): release fixtures when setup fails

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../e2e/browser/project-path-spaces.spec.ts   | 64 ++++++++++++++++
 .../app/src/utils/workspace-directory.test.ts |  4 +
 packages/app/src/utils/workspace-identity.ts  |  5 +-
 .../project-path-spaces.e2e.test.ts           | 73 +++++++++++++++++++
 .../src/utils/git-rev-parse-path.test.ts      | 26 +++++++
 .../server/src/utils/git-rev-parse-path.ts    | 15 +---
 6 files changed, 172 insertions(+), 15 deletions(-)
 create mode 100644 packages/app/e2e/browser/project-path-spaces.spec.ts
 create mode 100644 packages/server/src/server/daemon-e2e/project-path-spaces.e2e.test.ts
 create mode 100644 packages/server/src/utils/git-rev-parse-path.test.ts

diff --git a/packages/app/e2e/browser/project-path-spaces.spec.ts b/packages/app/e2e/browser/project-path-spaces.spec.ts
new file mode 100644
index 0000000000..3b3478f5bb
--- /dev/null
+++ b/packages/app/e2e/browser/project-path-spaces.spec.ts
@@ -0,0 +1,64 @@
+import { execFileSync } from "node:child_process";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test as base } from "../support/fixtures";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import { openChangesTreePanel } from "../support/helpers/workspace-tabs";
+
+const test = base.extend<{ projectWithTrailingSpace: string }>({
+  projectWithTrailingSpace: async ({ e2eWorkerClient: client }, provide) => {
+    const root = await mkdtemp(path.join(tmpdir(), "paseo-project-path-spaces-"));
+    try {
+      const repoPath = path.join(root, "repo ");
+      execFileSync("git", ["init", "-b", "main", repoPath], { stdio: "pipe" });
+      execFileSync(
+        "git",
+        [
+          "-c",
+          "user.name=Paseo Test",
+          "-c",
+          "user.email=test@getpaseo.local",
+          "-c",
+          "commit.gpgsign=false",
+          "commit",
+          "--allow-empty",
+          "-m",
+          "initial",
+        ],
+        { cwd: repoPath, stdio: "pipe" },
+      );
+      await writeFile(path.join(repoPath, "visible-change.txt"), "a change\n");
+      const added = await client.addProject(repoPath);
+      expect(added.error).toBeNull();
+      const projectId = added.project!.projectId;
+      try {
+        const created = await client.createWorkspace({
+          source: { kind: "directory", path: repoPath, projectId },
+        });
+        expect(created.error).toBeNull();
+        await provide(created.workspace!.id);
+      } finally {
+        await client.removeProject(projectId);
+      }
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  },
+});
+
+test.skip(
+  process.platform === "win32",
+  "Windows does not preserve trailing spaces in folder names",
+);
+
+test("Changes shows files in a project whose folder ends in a space", async ({
+  page,
+  projectWithTrailingSpace,
+}, testInfo) => {
+  await gotoWorkspace(page, projectWithTrailingSpace);
+  await openChangesTreePanel(page);
+  await expect(page.getByText("visible-change.txt", { exact: true }).first()).toBeVisible();
+  await expect(page.getByText("Not a git repository", { exact: true })).toHaveCount(0);
+  await page.screenshot({ path: testInfo.outputPath("changes.png") });
+});
diff --git a/packages/app/src/utils/workspace-directory.test.ts b/packages/app/src/utils/workspace-directory.test.ts
index b40bdd9705..b3973fb7b6 100644
--- a/packages/app/src/utils/workspace-directory.test.ts
+++ b/packages/app/src/utils/workspace-directory.test.ts
@@ -2,6 +2,10 @@ import { describe, expect, it } from "vitest";
 import { requireWorkspaceDirectory, resolveWorkspaceDirectory } from "./workspace-directory";
 
 describe("resolveWorkspaceDirectory", () => {
+  it("preserves significant whitespace in a workspace folder name", () => {
+    expect(resolveWorkspaceDirectory({ workspaceDirectory: "/repo " })).toBe("/repo ");
+    expect(requireWorkspaceDirectory({ workspaceDirectory: "/repo /" })).toBe("/repo ");
+  });
   it("canonicalizes a workspace directory and returns null when blank", () => {
     expect(resolveWorkspaceDirectory({ workspaceDirectory: "C:\\repo\\app\\" })).toBe(
       "C:/repo/app",
diff --git a/packages/app/src/utils/workspace-identity.ts b/packages/app/src/utils/workspace-identity.ts
index 8c778372d9..3cf3134939 100644
--- a/packages/app/src/utils/workspace-identity.ts
+++ b/packages/app/src/utils/workspace-identity.ts
@@ -13,11 +13,10 @@ export function normalizeWorkspaceOpaqueId(value: string | null | undefined): st
 }
 
 export function normalizeWorkspacePath(value: string | null | undefined): string | null {
-  const trimmed = trimNonEmpty(value);
-  if (!trimmed) {
+  if (typeof value !== "string" || value.trim().length === 0) {
     return null;
   }
-  const withUnixSeparators = trimmed.replace(/\\/g, "/");
+  const withUnixSeparators = value.replace(/\\/g, "/");
   if (withUnixSeparators === "/") {
     return withUnixSeparators;
   }
diff --git a/packages/server/src/server/daemon-e2e/project-path-spaces.e2e.test.ts b/packages/server/src/server/daemon-e2e/project-path-spaces.e2e.test.ts
new file mode 100644
index 0000000000..89385c67db
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/project-path-spaces.e2e.test.ts
@@ -0,0 +1,73 @@
+import { execFileSync } from "node:child_process";
+import { mkdtempSync, realpathSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { beforeEach, expect, onTestFinished, test } from "vitest";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+
+// Windows does not preserve trailing spaces in folder names.
+const testOnPosix = test.skipIf(process.platform === "win32");
+
+let client: DaemonClient;
+let repoDir: string;
+let projectId: string;
+
+beforeEach(async () => {
+  const root = realpathSync(mkdtempSync(join(tmpdir(), "paseo-project-path-spaces-")));
+  onTestFinished(() => rmSync(root, { recursive: true, force: true }));
+  repoDir = join(root, "repo ");
+  execFileSync("git", ["init", "-b", "main", repoDir], { stdio: "pipe" });
+  execFileSync(
+    "git",
+    [
+      "-c",
+      "user.name=Paseo Test",
+      "-c",
+      "user.email=test@getpaseo.local",
+      "-c",
+      "commit.gpgsign=false",
+      "commit",
+      "--allow-empty",
+      "-m",
+      "initial",
+    ],
+    { cwd: repoDir, stdio: "pipe" },
+  );
+  const daemon = await createTestPaseoDaemon();
+  onTestFinished(() => daemon.close());
+  client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  const testClient = client;
+  onTestFinished(() => testClient.close());
+  await client.connect();
+  const added = await client.addProject(repoDir);
+  expect(added.error).toBeNull();
+  expect(added.project?.projectRootPath).toBe(repoDir);
+  projectId = added.project!.projectId;
+});
+
+testOnPosix("a project folder ending in a space keeps its Git status", async () => {
+  const opened = await client.createWorkspace({
+    source: { kind: "directory", path: repoDir, projectId },
+  });
+  expect(opened.error).toBeNull();
+  expect(opened.workspace?.workspaceDirectory).toBe(repoDir);
+  const status = await client.getCheckoutStatus(repoDir);
+  expect(status.isGit).toBe(true);
+  expect(status.repoRoot).toBe(repoDir);
+  expect(status.currentBranch).toBe("main");
+});
+
+testOnPosix("a project folder ending in a space can create a worktree", async () => {
+  const created = await client.createWorkspace({
+    source: {
+      kind: "worktree",
+      projectId,
+      action: "branch-off",
+      branchName: "feature/spaces",
+      baseBranch: "main",
+    },
+  });
+  expect(created.error).toBeNull();
+  expect(created.workspace?.gitRuntime?.currentBranch).toBe("feature/spaces");
+});
diff --git a/packages/server/src/utils/git-rev-parse-path.test.ts b/packages/server/src/utils/git-rev-parse-path.test.ts
new file mode 100644
index 0000000000..7614b7dec8
--- /dev/null
+++ b/packages/server/src/utils/git-rev-parse-path.test.ts
@@ -0,0 +1,26 @@
+import { resolve } from "node:path";
+import { describe, expect, it } from "vitest";
+import { parseGitRevParsePath, resolveGitRevParsePath } from "./git-rev-parse-path.js";
+
+describe("Git path output", () => {
+  it.each(["\n", "\r\n", ""])("preserves path whitespace with delimiter %j", (delimiter) => {
+    expect(parseGitRevParsePath(`/repo ${delimiter}`)).toBe("/repo ");
+    expect(parseGitRevParsePath(` relative path ${delimiter}`)).toBe(" relative path ");
+  });
+
+  it.each([
+    "",
+    "\n",
+    "\r\n",
+    "--path-format=absolute\n",
+    "--path-format=absolute\n/repo\n",
+    "/repo\n/another\n",
+    "/repo\n\n",
+  ])("rejects invalid output %j", (output) => {
+    expect(parseGitRevParsePath(output)).toBeNull();
+  });
+
+  it("resolves a relative path without stripping its trailing space", () => {
+    expect(resolveGitRevParsePath("/base", "repo \n")).toBe(resolve("/base", "repo "));
+  });
+});
diff --git a/packages/server/src/utils/git-rev-parse-path.ts b/packages/server/src/utils/git-rev-parse-path.ts
index b799815056..2f027d5020 100644
--- a/packages/server/src/utils/git-rev-parse-path.ts
+++ b/packages/server/src/utils/git-rev-parse-path.ts
@@ -1,18 +1,9 @@
 import { resolve } from "node:path";
 
 export function parseGitRevParsePath(stdout: string): string | null {
-  const trimmed = stdout.trim();
-  if (!trimmed) {
-    return null;
-  }
-
-  const lines = trimmed.split(/\r?\n/);
-  if (lines.length !== 1) {
-    return null;
-  }
-
-  const path = lines[0]?.trim() ?? "";
-  if (!path || path.startsWith("--")) {
+  // Remove Git's record delimiter, not whitespace belonging to the path.
+  const path = stdout.replace(/\r?\n$/, "");
+  if (!path || /[\r\n]/.test(path) || path.startsWith("--")) {
     return null;
   }
 

From 750cb82fbb296b66d38198b07ac632c7dc6efd7a Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Mon, 12 Oct 2026 16:26:01 +0700
Subject: [PATCH 112/270] Keep long mobile drafts readable with fullscreen
 editing (#6531)

* feat(app): add fullscreen editing to the compact composer

* fix(app): preserve read-only terminal command previews

Static command previews must render their published source; the live editor buffer is updated after render and has no mounted input to repaint read-only content.

* fix(app): import React for composer editing scope rendering

Workspace pane unit tests use the classic JSX transform, so the editing-scope provider needs React in scope when mounted.

* fix(app): preserve fullscreen composer controls and editing

Keep the fullscreen frame inside the visual viewport, gate hidden autocomplete keys, apply replacement commands to local line measurement, and return to inline before starting voice so its controls stay accessible.

* test(app): cover draft replacement through the production composer

Replace the measurement-hook fixture with profile switching and typing through the real composer. Keep measurement state inside its production surface; Android manual red/green evidence covers the native replacement flow.
---
 .../browser/composer-email-mentions.spec.ts   |  49 ++
 .../e2e/browser/composer-whitespace.spec.ts   | 321 ++++++++-
 .../new-workspace-dictation-submit.spec.ts    |  58 ++
 .../new-workspace-launch-terminal.spec.ts     |  57 +-
 packages/app/e2e/support/helpers/composer.ts  | 130 ++++
 packages/app/src/app/_layout.tsx              |   7 +-
 .../ui/text-input/text-input.native.test.tsx  |  38 ++
 .../ui/text-input/text-input.native.tsx       |  96 +--
 .../ui/text-input/text-input.web.tsx          |  54 +-
 .../app/src/components/ui/text-input/types.ts |   1 +
 .../app/src/composer/dock/index.native.tsx    |   5 +-
 packages/app/src/composer/dock/index.tsx      |  22 +-
 .../composer/dock/internal/capacity.test.ts   |  13 +
 .../src/composer/dock/internal/capacity.ts    |  10 +
 .../app/src/composer/draft/input-draft.ts     |   2 +
 .../composer/editing-session/index.test.ts    |  52 ++
 .../src/composer/editing-session/index.tsx    | 142 ++++
 packages/app/src/composer/index.tsx           |  15 +-
 .../composer/input/fullscreen-host.native.tsx |  57 ++
 .../src/composer/input/fullscreen-host.tsx    |  77 +++
 .../app/src/composer/input/height.native.ts   |   2 +
 packages/app/src/composer/input/height.web.ts |  19 +-
 packages/app/src/composer/input/input.tsx     | 633 +++++++++++++-----
 .../app/src/composer/input/presentation.tsx   | 146 ++++
 packages/app/src/composer/input/state.test.ts |  24 +
 packages/app/src/composer/input/state.ts      |  10 +-
 .../input/text-input.web.browser.test.tsx     |  29 +
 packages/app/src/composer/types.ts            |   1 +
 packages/app/src/i18n/resources/ar.ts         |   2 +
 packages/app/src/i18n/resources/en.ts         |   2 +
 packages/app/src/i18n/resources/es.ts         |   2 +
 packages/app/src/i18n/resources/fr.ts         |   2 +
 packages/app/src/i18n/resources/ja.ts         |   2 +
 packages/app/src/i18n/resources/ko.ts         |   2 +
 packages/app/src/i18n/resources/pt-BR.ts      |   2 +
 packages/app/src/i18n/resources/ru.ts         |   2 +
 packages/app/src/i18n/resources/zh-CN.ts      |   2 +
 .../app/src/screens/new-workspace-screen.tsx  |   2 +-
 .../workspace/workspace-pane-content.tsx      |   8 +-
 .../screens/workspace/workspace-screen.tsx    |  15 +-
 40 files changed, 1852 insertions(+), 261 deletions(-)
 create mode 100644 packages/app/src/composer/editing-session/index.test.ts
 create mode 100644 packages/app/src/composer/editing-session/index.tsx
 create mode 100644 packages/app/src/composer/input/fullscreen-host.native.tsx
 create mode 100644 packages/app/src/composer/input/fullscreen-host.tsx
 create mode 100644 packages/app/src/composer/input/presentation.tsx

diff --git a/packages/app/e2e/browser/composer-email-mentions.spec.ts b/packages/app/e2e/browser/composer-email-mentions.spec.ts
index 29b0686c20..283fca26ca 100644
--- a/packages/app/e2e/browser/composer-email-mentions.spec.ts
+++ b/packages/app/e2e/browser/composer-email-mentions.spec.ts
@@ -4,6 +4,10 @@ import {
   expectComposerDraft,
   expectComposerVisible,
   fillComposerDraft,
+  enterComposerFullscreen,
+  exitComposerFullscreen,
+  resizeComposerViewport,
+  selectComposerDraftRange,
 } from "../support/helpers/composer";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 
@@ -53,3 +57,48 @@ for (const email of [
     }
   });
 }
+
+test("fullscreen mention keys edit the draft while inline keys still complete files", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-fullscreen-mention-",
+    title: "Fullscreen mention keys",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    const draft = "First line\nSecond line\n@README";
+    await fillComposerDraft(page, draft);
+    await expect(fileSuggestions(page).getByText("README.md", { exact: true })).toBeVisible();
+    await enterComposerFullscreen(page);
+    await expect(fileSuggestions(page)).not.toBeVisible();
+    await selectComposerDraftRange(page, draft.length, draft.length);
+    await composerLocator(page).press("ArrowUp");
+    await expect
+      .poll(() =>
+        composerLocator(page).evaluate((element) => {
+          const input = element as HTMLTextAreaElement;
+          return input.selectionStart === input.selectionEnd && input.selectionStart < 23;
+        }),
+      )
+      .toBe(true);
+    await selectComposerDraftRange(page, draft.length, draft.length);
+    await composerLocator(page).press("Enter");
+    await expectComposerDraft(page, `${draft}\n`);
+    await exitComposerFullscreen(page);
+    await selectReadmeMention(page);
+    const commandDraft = "/cl\nSecond line\nThird line";
+    await fillComposerDraft(page, commandDraft);
+    await selectComposerDraftRange(page, 2, 2);
+    await composerLocator(page).press("ArrowRight");
+    await expect(fileSuggestions(page).getByText("/clear", { exact: true }).first()).toBeVisible();
+    await enterComposerFullscreen(page);
+    await expect(fileSuggestions(page)).not.toBeVisible();
+    await composerLocator(page).press("Enter");
+    await expectComposerDraft(page, "/cl\n\nSecond line\nThird line");
+  } finally {
+    await agent.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/composer-whitespace.spec.ts b/packages/app/e2e/browser/composer-whitespace.spec.ts
index 024446967f..35611a32c0 100644
--- a/packages/app/e2e/browser/composer-whitespace.spec.ts
+++ b/packages/app/e2e/browser/composer-whitespace.spec.ts
@@ -1,3 +1,5 @@
+import { createMockIdleAgent, openWorkspaceWithAgents } from "../support/helpers/archive-tab";
+import { seedWorkspace } from "../support/helpers/seed-client";
 import { expect, test, type Page } from "../support/fixtures";
 import {
   expectNearBottom,
@@ -5,7 +7,27 @@ import {
   waitForScrollableChat,
 } from "../support/helpers/agent-bottom-anchor";
 import { awaitAssistantMessage } from "../support/helpers/agent-stream";
-import { composerLocator, expectComposerVisible } from "../support/helpers/composer";
+import {
+  attachComposerTestImage,
+  pasteComposerTestImage,
+  enterComposerFullscreen,
+  exitComposerFullscreen,
+  resizeComposerViewport,
+  selectComposerDraftRange,
+  expectComposerDraftSelection,
+  expectComposerFullscreenControls,
+  sendComposerWithButton,
+  queueComposerWithButton,
+  configureComposerQueueSend,
+  activateRetainedComposerTab,
+  recordVisibleComposerGeometry,
+  expectNoCollapsedVisibleComposer,
+  expectAttachmentPill,
+  expectQueuedMessageButton,
+  startRunningMockAgent,
+  composerLocator,
+  expectComposerVisible,
+} from "../support/helpers/composer";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 
 async function composerHeight(page: Page): Promise<number> {
@@ -133,3 +155,300 @@ test("composer growth keeps a bottom-pinned chat at the bottom", async ({ page }
     await agent.cleanup();
   }
 });
+
+async function writeCompactDraft(page: Page, text: string): Promise<void> {
+  await composerLocator(page).fill(text);
+  await expect(composerLocator(page)).toHaveValue(text);
+}
+
+test("compact long drafts stop growing before the header", async ({ page }) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-cap-",
+    title: "Composer cap",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await writeCompactDraft(page, "A long draft line\n".repeat(40));
+    await expect.poll(() => composerHeight(page)).toBeLessThanOrEqual(160);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("compact fullscreen editing preserves the live draft and selection and stays open after send", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-fullscreen-",
+    title: "Fullscreen composer",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await attachComposerTestImage(page);
+    await expectAttachmentPill(page, "composer-image-attachment-pill");
+    await writeCompactDraft(page, "First line\nSecond line");
+    await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toHaveCount(0);
+    await writeCompactDraft(page, "First line\nSecond line\nThird line");
+    await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toBeVisible();
+    await writeCompactDraft(
+      page,
+      "A sentence with enough words to wrap across several rendered lines in a narrow input. ".repeat(
+        4,
+      ),
+    );
+    await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toBeVisible();
+    await selectComposerDraftRange(page, 4, 17);
+    await enterComposerFullscreen(page);
+    await expectComposerFullscreenControls(page);
+    await expectComposerDraftSelection(page, 4, 17);
+    await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(0);
+    await writeCompactDraft(page, "Edited fullscreen draft\nSecond line\nThird line");
+    await selectComposerDraftRange(page, 3, 12);
+    await exitComposerFullscreen(page);
+    await expect(composerLocator(page)).toHaveValue(
+      "Edited fullscreen draft\nSecond line\nThird line",
+    );
+    await expectComposerDraftSelection(page, 3, 12);
+    await expectAttachmentPill(page, "composer-image-attachment-pill");
+    await expect(composerLocator(page)).toBeFocused();
+    await enterComposerFullscreen(page);
+    await writeCompactDraft(page, "Short draft");
+    await expectComposerFullscreenControls(page);
+    await selectComposerDraftRange(page, 0, 5);
+    await resizeComposerViewport(page, "landscape");
+    await expectComposerFullscreenControls(page);
+    await expectComposerDraftSelection(page, 0, 5);
+    await expect(composerLocator(page)).toHaveValue("Short draft");
+    await expect(composerLocator(page)).toBeFocused();
+    await resizeComposerViewport(page, "portrait");
+    await sendComposerWithButton(page);
+    await expect(composerLocator(page)).toHaveValue("");
+    await expectComposerFullscreenControls(page);
+    await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeDisabled();
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("fullscreen submit rejection retains the editable draft and supports retry", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-fullscreen-retry-",
+    title: "Fullscreen retry",
+    featureValues: { mockPromptRejections: 1 },
+  });
+  const draft = "First line\nSecond line\nThird line";
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await writeCompactDraft(page, draft);
+    await enterComposerFullscreen(page);
+    await sendComposerWithButton(page);
+    await expect(page.getByTestId("composer-fullscreen").getByRole("alert")).toHaveText(
+      "Requested mock prompt rejection",
+    );
+    await expect(composerLocator(page)).toHaveValue(draft);
+    await expect(composerLocator(page)).toBeEditable();
+    await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeEnabled();
+    await sendComposerWithButton(page);
+    await expect(composerLocator(page)).toHaveValue("");
+    await expectComposerFullscreenControls(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("fullscreen Send keeps the configured queue behavior while an agent runs", async ({
+  page,
+}) => {
+  await configureComposerQueueSend(page);
+  await resizeComposerViewport(page, "portrait");
+  const agent = await startRunningMockAgent(page, {
+    prefix: "composer-fullscreen-queue-",
+    model: "one-minute-stream",
+    prompt: "Stay running for fullscreen queue test.",
+  });
+  try {
+    await writeCompactDraft(page, "Queued first line\nSecond line\nThird line");
+    await enterComposerFullscreen(page);
+    await expectComposerFullscreenControls(page);
+    await queueComposerWithButton(page);
+    await expect(composerLocator(page)).toHaveValue("");
+    await expectComposerFullscreenControls(page);
+    await exitComposerFullscreen(page);
+    await expectQueuedMessageButton(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("image paste stays attached to the active editor across fullscreen entry and exit", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-paste-remount-",
+    title: "Composer paste",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await writeCompactDraft(page, "First line\nSecond line\nThird line");
+    expect(await pasteComposerTestImage(page)).toBe(true);
+    await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(1);
+    await enterComposerFullscreen(page);
+    expect(await pasteComposerTestImage(page)).toBe(true);
+    await exitComposerFullscreen(page);
+    await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(2);
+    expect(await pasteComposerTestImage(page)).toBe(true);
+    await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(3);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("retained agent tabs preserve fullscreen editing and paste when switched away and back", async ({
+  page,
+}) => {
+  const workspace = await seedWorkspace({ repoPrefix: "composer-retained-fullscreen-" });
+  try {
+    const first = await createMockIdleAgent(workspace.client, {
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "First retained chat",
+    });
+    const second = await createMockIdleAgent(workspace.client, {
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Second retained chat",
+    });
+    await openWorkspaceWithAgents(page, [first, second]);
+    await resizeComposerViewport(page, "portrait");
+    const draft = "Live first line\nLive second line\nLive third line";
+    await writeCompactDraft(page, draft);
+    await enterComposerFullscreen(page);
+    await selectComposerDraftRange(page, 4, 17);
+    await activateRetainedComposerTab(page, first.title);
+    await expect(page.getByRole("button", { name: "Exit fullscreen", exact: true })).toHaveCount(0);
+    await writeCompactDraft(page, "Other tab draft");
+    await shrinkVisibleViewport(page);
+    await activateRetainedComposerTab(page, second.title);
+    await expectComposerFullscreenControls(page);
+    await expect(composerLocator(page)).toHaveValue(draft);
+    await expectFullscreenInsideVisibleViewport(page);
+    await expectComposerDraftSelection(page, 4, 17);
+    await expect(composerLocator(page)).toBeFocused();
+    expect(await pasteComposerTestImage(page)).toBe(true);
+    await exitComposerFullscreen(page);
+    await expectAttachmentPill(page, "composer-image-attachment-pill");
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+test("retained inline composers keep usable capacity through hidden tab geometry", async ({
+  page,
+}) => {
+  const workspace = await seedWorkspace({ repoPrefix: "composer-retained-capacity-" });
+  try {
+    const first = await createMockIdleAgent(workspace.client, {
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "First capacity chat",
+    });
+    const second = await createMockIdleAgent(workspace.client, {
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Second capacity chat",
+    });
+    await openWorkspaceWithAgents(page, [first, second]);
+    await resizeComposerViewport(page, "portrait");
+    const draft = "Retained long line\n".repeat(40);
+    await writeCompactDraft(page, draft);
+    await recordVisibleComposerGeometry(page);
+    await activateRetainedComposerTab(page, first.title);
+    await writeCompactDraft(page, "Other visible draft");
+    await activateRetainedComposerTab(page, second.title);
+    await expect(composerLocator(page)).toHaveValue(draft);
+    await expect.poll(() => composerHeight(page)).toBeLessThanOrEqual(160);
+    await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeVisible();
+    await expectNoCollapsedVisibleComposer(page);
+  } finally {
+    await workspace.cleanup();
+  }
+});
+
+async function shrinkVisibleViewport(page: Page): Promise<void> {
+  const cdp = await page.context().newCDPSession(page);
+  await cdp.send("Emulation.setPageScaleFactor", { pageScaleFactor: 2 });
+  await expect.poll(() => page.evaluate(() => window.visualViewport!.height)).toBe(422);
+  await cdp.detach();
+}
+
+async function panVisibleViewport(page: Page): Promise<void> {
+  const cdp = await page.context().newCDPSession(page);
+  await cdp.send("Input.dispatchTouchEvent", {
+    type: "touchStart",
+    touchPoints: [{ x: 4, y: 300 }],
+  });
+  for (let y = 290; y >= 100; y -= 10) {
+    await cdp.send("Input.dispatchTouchEvent", {
+      type: "touchMove",
+      touchPoints: [{ x: 4, y }],
+    });
+  }
+  await cdp.send("Input.dispatchTouchEvent", { type: "touchEnd", touchPoints: [] });
+  await expect.poll(() => page.evaluate(() => window.visualViewport!.offsetTop)).toBeGreaterThan(0);
+  await cdp.detach();
+}
+
+async function expectFullscreenInsideVisibleViewport(page: Page): Promise<void> {
+  await expect
+    .poll(() =>
+      page.getByTestId("composer-fullscreen").evaluate((element) => {
+        const viewport = window.visualViewport!;
+        const frame = element.getBoundingClientRect();
+        const send = element.querySelector('[aria-label="Send message"]')!.getBoundingClientRect();
+        return {
+          frameFits:
+            Math.abs(frame.top - viewport.offsetTop) < 1 &&
+            Math.abs(frame.left - viewport.offsetLeft) < 1 &&
+            Math.abs(frame.height - viewport.height) < 1 &&
+            Math.abs(frame.width - viewport.width) < 1,
+          sendFits:
+            send.top >= viewport.offsetTop &&
+            send.bottom <= viewport.offsetTop + viewport.height &&
+            send.left >= viewport.offsetLeft &&
+            send.right <= viewport.offsetLeft + viewport.width,
+        };
+      }),
+    )
+    .toEqual({ frameFits: true, sendFits: true });
+}
+
+test("fullscreen Send follows the visible viewport when it shrinks and pans", async ({ page }) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-visible-viewport-",
+    title: "Visible viewport composer",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await writeCompactDraft(page, "First line\nSecond line\nThird line");
+    await enterComposerFullscreen(page);
+    await expectFullscreenInsideVisibleViewport(page);
+    await shrinkVisibleViewport(page);
+    await expectFullscreenInsideVisibleViewport(page);
+    await panVisibleViewport(page);
+    await expectFullscreenInsideVisibleViewport(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/new-workspace-dictation-submit.spec.ts b/packages/app/e2e/browser/new-workspace-dictation-submit.spec.ts
index d4444d6f22..22b2b8a6c5 100644
--- a/packages/app/e2e/browser/new-workspace-dictation-submit.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-dictation-submit.spec.ts
@@ -6,6 +6,15 @@ import {
   selectWorkspaceIsolation,
 } from "../support/helpers/new-workspace";
 import { seedWorkspace } from "../support/helpers/seed-client";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import {
+  composerLocator,
+  expectComposerVisible,
+  fillComposerDraft,
+  enterComposerFullscreen,
+  resizeComposerViewport,
+  expectComposerFullscreenControls,
+} from "../support/helpers/composer";
 import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
 
 type WebSocketMessage = string | Buffer;
@@ -196,3 +205,52 @@ test.describe("New Workspace dictation submit", () => {
     }
   });
 });
+
+async function startDictationWithShortcut(page: Page): Promise<void> {
+  await composerLocator(page).press("Control+d");
+}
+
+test("dictation shortcut leaves retained fullscreen and exposes recording controls", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "fullscreen-dictation-",
+    title: "Fullscreen dictation shortcut",
+  });
+  await installSyntheticMicrophone(page);
+  const harness = await installDictationFailureHarness(page);
+  const draft = "First line\nSecond line\nThird line";
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await fillComposerDraft(page, draft);
+    await enterComposerFullscreen(page);
+    await resizeComposerViewport(page, "landscape");
+    await expectComposerFullscreenControls(page);
+    await startDictationWithShortcut(page);
+    await harness.waitForAudio();
+    await expect(page.getByRole("button", { name: "Exit fullscreen", exact: true })).toHaveCount(0);
+    await expect(page.getByRole("button", { name: "Cancel dictation", exact: true })).toBeVisible();
+    await expect(
+      page.getByRole("button", { name: "Insert transcription", exact: true }),
+    ).toBeVisible();
+    await expect(
+      page.getByRole("button", { name: "Insert transcription and send", exact: true }),
+    ).toBeVisible();
+    await page.getByRole("button", { name: "Cancel dictation", exact: true }).click();
+    await expect(composerLocator(page)).toBeEditable();
+    await expect(composerLocator(page)).toHaveValue(draft);
+    await resizeComposerViewport(page, "portrait");
+    await enterComposerFullscreen(page);
+    await resizeComposerViewport(page, "landscape");
+    await composerLocator(page).press("Control+Shift+d");
+    await expect(page.getByRole("button", { name: "Exit fullscreen", exact: true })).toHaveCount(0);
+    await expect(
+      page.getByText("Realtime voice is disabled in this test.", { exact: true }),
+    ).toBeVisible();
+    await expect(composerLocator(page)).toHaveValue(draft);
+  } finally {
+    await agent.cleanup();
+  }
+});
diff --git a/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts b/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts
index 16b277b537..a4fbd15edf 100644
--- a/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts
@@ -9,13 +9,12 @@ import {
   expectTerminalPreviewCommand,
   expectWorkspaceOpensWithTerminalTab,
   fillTerminalPrompt,
-  seedTerminalProfiles,
+  launchTrigger,
   selectLaunchOption,
   submitTerminalLaunch,
   terminalLaunchSubmit,
   terminalPromptInput,
   type TerminalProfile,
-  type TerminalProfileSeed,
 } from "../support/helpers/new-workspace-launch";
 
 // Someone who wants a terminal agent instead of a chat: they pick a profile
@@ -42,17 +41,18 @@ const BARE_PROFILE: TerminalProfile = {
   args: ["-c", "echo bare-launch-static-line; exec cat"],
 };
 
+test.use({
+  e2eDaemonConfig: { version: 1, daemon: { terminalProfiles: [PROMPT_PROFILE, BARE_PROFILE] } },
+});
+
 test.describe("New workspace: launching a terminal", () => {
   let workspace: SeededWorkspace;
-  let profileSeed: TerminalProfileSeed;
 
   test.beforeEach(async () => {
     workspace = await seedWorkspace({ repoPrefix: "launch-terminal-" });
-    profileSeed = await seedTerminalProfiles([PROMPT_PROFILE, BARE_PROFILE]);
   });
 
   test.afterEach(async () => {
-    await profileSeed.restore();
     await workspace?.cleanup();
   });
 
@@ -97,4 +97,51 @@ test.describe("New workspace: launching a terminal", () => {
       await expectTerminalOutputContains(page, "bare-launch-static-line");
     });
   });
+
+  test("switching terminal profiles restores the prompt and its fullscreen affordance", async ({
+    page,
+  }) => {
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    await openNewWorkspaceComposer(page, {
+      projectKey: workspace.projectKey,
+      projectDisplayName: workspace.projectDisplayName,
+    });
+    await page.setViewportSize({ width: 390, height: 844 });
+    const prompt = "First replacement line\nSecond replacement line\nThird replacement line";
+    const selectProfile = async (profile: TerminalProfile) => {
+      await launchTrigger(page).click();
+      const option = page.getByRole("menuitem").filter({ hasText: profile.name });
+      await option.click();
+      await expect(option).not.toBeVisible();
+    };
+    const fullscreen = page.getByRole("button", { name: "Fullscreen", exact: true });
+
+    await test.step("restore a multiline prompt after a read-only profile", async () => {
+      await selectProfile(PROMPT_PROFILE);
+      await fillTerminalPrompt(page, prompt);
+      await expect(fullscreen).toBeVisible();
+      await selectProfile(BARE_PROFILE);
+      await expect(terminalPromptInput(page)).toHaveCount(0);
+      await selectProfile(PROMPT_PROFILE);
+      await expect(terminalPromptInput(page)).toHaveValue(prompt);
+      await expect(fullscreen).toBeVisible();
+    });
+
+    await test.step("restore the locally edited prompt and measure subsequent typing", async () => {
+      await fillTerminalPrompt(page, "Short draft");
+      await expect(fullscreen).toHaveCount(0);
+      await selectProfile(BARE_PROFILE);
+      await selectProfile(PROMPT_PROFILE);
+      await expect(terminalPromptInput(page)).toHaveValue("Short draft");
+      await expect(fullscreen).toHaveCount(0);
+      await terminalPromptInput(page).press("End");
+      await terminalPromptInput(page).press("Shift+Enter");
+      await terminalPromptInput(page).pressSequentially("Second");
+      await terminalPromptInput(page).press("Shift+Enter");
+      await terminalPromptInput(page).pressSequentially("Third");
+      await expect(terminalPromptInput(page)).toHaveValue("Short draft\nSecond\nThird");
+      await expect(fullscreen).toBeVisible();
+    });
+  });
 });
diff --git a/packages/app/e2e/support/helpers/composer.ts b/packages/app/e2e/support/helpers/composer.ts
index de8ddf0c9b..01b9a39d58 100644
--- a/packages/app/e2e/support/helpers/composer.ts
+++ b/packages/app/e2e/support/helpers/composer.ts
@@ -316,3 +316,133 @@ export async function openGithubWorkspace(
     },
   };
 }
+
+const COMPOSER_TEST_IMAGE_BASE64 =
+  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
+
+export async function attachComposerTestImage(page: Page): Promise<void> {
+  await attachImageFromMenu(page, {
+    name: "fullscreen.png",
+    mimeType: "image/png",
+    buffer: Buffer.from(COMPOSER_TEST_IMAGE_BASE64, "base64"),
+  });
+}
+
+export async function pasteComposerTestImage(page: Page): Promise<boolean> {
+  return composerInput(page).evaluate((input, base64) => {
+    const bytes = Uint8Array.from(atob(base64), (character) => character.charCodeAt(0));
+    const clipboardData = new DataTransfer();
+    clipboardData.items.add(new File([bytes], "pasted.png", { type: "image/png" }));
+    const event = new ClipboardEvent("paste", { clipboardData, bubbles: true, cancelable: true });
+    input.dispatchEvent(event);
+    return event.defaultPrevented;
+  }, COMPOSER_TEST_IMAGE_BASE64);
+}
+
+export async function enterComposerFullscreen(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Fullscreen", exact: true }).click();
+}
+export async function exitComposerFullscreen(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Exit fullscreen", exact: true }).click();
+}
+export async function resizeComposerViewport(
+  page: Page,
+  orientation: "portrait" | "landscape" | "short",
+): Promise<void> {
+  const sizes = {
+    portrait: { width: 390, height: 844 },
+    landscape: { width: 844, height: 390 },
+    short: { width: 390, height: 390 },
+  };
+  await page.setViewportSize(sizes[orientation]);
+}
+export async function selectComposerDraftRange(
+  page: Page,
+  start: number,
+  end: number,
+): Promise<void> {
+  await composerInput(page).focus();
+  await composerInput(page).evaluate(
+    (element, selection) => {
+      const input = element as HTMLTextAreaElement;
+      input.setSelectionRange(selection.start, selection.end);
+      input.dispatchEvent(new Event("select", { bubbles: true }));
+    },
+    { start, end },
+  );
+}
+export async function expectComposerDraftSelection(
+  page: Page,
+  start: number,
+  end: number,
+): Promise<void> {
+  await expect
+    .poll(() =>
+      composerInput(page).evaluate((element) => {
+        const input = element as HTMLTextAreaElement;
+        return [input.selectionStart, input.selectionEnd];
+      }),
+    )
+    .toEqual([start, end]);
+}
+export async function expectComposerFullscreenControls(page: Page): Promise<void> {
+  await expect(page.getByRole("button", { name: "Exit fullscreen", exact: true })).toBeVisible();
+  await expect(page.getByTestId("composer-fullscreen").getByRole("button")).toHaveCount(2);
+  await expect(composerInput(page)).toHaveCount(1);
+}
+export async function sendComposerWithButton(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Send message", exact: true }).click();
+}
+export async function queueComposerWithButton(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Queue message", exact: true }).click();
+}
+export async function configureComposerQueueSend(page: Page): Promise<void> {
+  await page.addInitScript(() =>
+    localStorage.setItem("@paseo:app-settings", JSON.stringify({ sendBehavior: "queue" })),
+  );
+}
+
+/** Drive the real tab chooser's commands even when fullscreen covers its pointer surface.
+ * This exercises retained activity changes, not a claim that covered chrome is clickable.
+ */
+export async function activateRetainedComposerTab(page: Page, title: string): Promise<void> {
+  await page
+    .getByTestId("workspace-tab-switcher-trigger")
+    .evaluate((element) => (element as HTMLElement).click());
+  const option = page.getByText(title, { exact: true }).filter({ visible: true }).last();
+  await expect(option).toBeVisible();
+  await option.evaluate((element) => (element as HTMLElement).click());
+}
+
+export async function recordVisibleComposerGeometry(page: Page): Promise<void> {
+  await page.evaluate(() => {
+    const frames: { input: number; root: number }[] = [];
+    Reflect.set(window, "__composerGeometryFrames", frames);
+    let running = true;
+    const tick = () => {
+      if (!running) return;
+      for (const root of document.querySelectorAll('[data-testid="message-input-root"]')) {
+        if (root.getClientRects().length === 0) continue;
+        const input = root.querySelector("textarea");
+        if (input)
+          frames.push({
+            input: input.getBoundingClientRect().height,
+            root: root.getBoundingClientRect().height,
+          });
+      }
+      requestAnimationFrame(tick);
+    };
+    requestAnimationFrame(tick);
+    Reflect.set(window, "__stopComposerGeometry", () => {
+      running = false;
+    });
+  });
+}
+export async function expectNoCollapsedVisibleComposer(page: Page): Promise<void> {
+  const frames = await page.evaluate(() => {
+    Reflect.get(window, "__stopComposerGeometry")?.();
+    return Reflect.get(window, "__composerGeometryFrames") as { input: number; root: number }[];
+  });
+  expect(frames.length).toBeGreaterThan(0);
+  expect(frames.filter((frame) => frame.root < 42 || frame.input < 42)).toEqual([]);
+}
diff --git a/packages/app/src/app/_layout.tsx b/packages/app/src/app/_layout.tsx
index aa740a1d52..9c028aa2ce 100644
--- a/packages/app/src/app/_layout.tsx
+++ b/packages/app/src/app/_layout.tsx
@@ -1,3 +1,4 @@
+import { ComposerEditingSessionsProvider } from "@/composer/editing-session";
 import "@/styles/unistyles";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
 import { PortalProvider } from "@gorhom/portal";
@@ -625,7 +626,11 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
     surface
   );
 
-  return <CommandCenterProvider>{content}</CommandCenterProvider>;
+  return (
+    <ComposerEditingSessionsProvider>
+      <CommandCenterProvider>{content}</CommandCenterProvider>
+    </ComposerEditingSessionsProvider>
+  );
 }
 
 function SidebarChrome({
diff --git a/packages/app/src/components/ui/text-input/text-input.native.test.tsx b/packages/app/src/components/ui/text-input/text-input.native.test.tsx
index 4fa604d657..b52d7b9923 100644
--- a/packages/app/src/components/ui/text-input/text-input.native.test.tsx
+++ b/packages/app/src/components/ui/text-input/text-input.native.test.tsx
@@ -56,6 +56,16 @@ afterEach(() => {
 
 function noop() {}
 
+function createHandleRecorder() {
+  const handleRef = createRef<EditingTextInputHandle>();
+  const received: (EditingTextInputHandle | null)[] = [];
+  function assignHandle(handle: EditingTextInputHandle | null) {
+    received.push(handle);
+    handleRef.current = handle;
+  }
+  return { handleRef, received, assignHandle };
+}
+
 describe("EditingTextInputNative", () => {
   it("uses the bottom-sheet input only inside a bottom sheet", () => {
     act(() => {
@@ -76,6 +86,32 @@ describe("EditingTextInputNative", () => {
     expect(bottomSheetTextInputRender.mock.calls[0]?.[0]).toMatchObject({ testID: "inside" });
   });
 
+  it("keeps its editing handle and selection when native editing rerenders the leaf", () => {
+    const { handleRef, received, assignHandle } = createHandleRecorder();
+    act(() =>
+      root?.render(<EditingTextInput ref={assignHandle} initialValue="initial" multiline />),
+    );
+    const input = container?.querySelector("textarea");
+    if (!input) throw new Error("Expected native editing surface");
+    const handle = handleRef.current;
+    act(() => {
+      handle?.focus();
+      const setValue = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, "value")?.set;
+      if (!setValue) throw new Error("Expected input value setter");
+      setValue.call(input, "native edit");
+      input.setSelectionRange(2, 5);
+      input.dispatchEvent(new InputEvent("input", { bubbles: true, data: "native edit" }));
+    });
+    expect(handleRef.current).toBe(handle);
+    expect(received).toEqual([handle]);
+    expect(handle?.getText()).toBe("native edit");
+    expect([input.selectionStart, input.selectionEnd]).toEqual([2, 5]);
+    expect(document.activeElement).toBe(input);
+    act(() => root?.unmount());
+    root = null;
+    expect(received).toEqual([handle, null]);
+  });
+
   it("clears text via clear() when replaceText receives an empty string", () => {
     const handleRef = createRef<EditingTextInputHandle>();
 
@@ -105,12 +141,14 @@ describe("EditingTextInputNative", () => {
       );
     });
     const grownInput = container?.querySelector("input");
+    const handle = handleRef.current;
 
     act(() => {
       handleRef.current?.reset();
     });
 
     expect(container?.querySelector("input")).not.toBe(grownInput);
+    expect(handleRef.current).toBe(handle);
   });
 
   it("restores focus after replacing a reset native input", () => {
diff --git a/packages/app/src/components/ui/text-input/text-input.native.tsx b/packages/app/src/components/ui/text-input/text-input.native.tsx
index 72a15a9b8e..243e813f26 100644
--- a/packages/app/src/components/ui/text-input/text-input.native.tsx
+++ b/packages/app/src/components/ui/text-input/text-input.native.tsx
@@ -69,52 +69,56 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
       setReplacement((current) => ({ ...current, autoFocus }));
     }, []);
 
-    useImperativeHandle(ref, () => ({
-      focus: () => {
-        if (isAwaitingReplacementRef.current) {
-          setReplacementFocus(true);
-          return;
-        }
-        inputRef.current?.focus();
-      },
-      blur: () => {
-        if (isAwaitingReplacementRef.current) {
-          setReplacementFocus(false);
-          return;
-        }
-        inputRef.current?.blur();
-      },
-      isFocused: () => inputRef.current?.isFocused?.() ?? false,
-      getText: () => textRef.current,
-      replaceText: (nextText, selection) => {
-        textRef.current = nextText;
-        if (inputRef.current?.replaceText) {
-          inputRef.current.replaceText(nextText, selection);
-          return;
-        }
-        if (nextText === "") {
-          inputRef.current?.clear?.();
-          return;
-        }
-        inputRef.current?.setNativeProps?.({
-          text: nextText,
-          ...(selection ? { selection } : {}),
-        });
-        if (selection) inputRef.current?.setSelection?.(selection.start, selection.end);
-      },
-      reset: () => {
-        textRef.current = "";
-        const autoFocus = inputRef.current?.isFocused?.() ?? false;
-        if (inputRef.current?.replaceText) {
-          inputRef.current.replaceText("");
-        } else {
-          inputRef.current?.clear?.();
-        }
-        isAwaitingReplacementRef.current = true;
-        setReplacement((current) => ({ revision: current.revision + 1, autoFocus }));
-      },
-      getNativeRef: () => inputRef.current?.getNativeRef?.() ?? inputRef.current,
-    }));
+    useImperativeHandle(
+      ref,
+      () => ({
+        focus: () => {
+          if (isAwaitingReplacementRef.current) {
+            setReplacementFocus(true);
+            return;
+          }
+          inputRef.current?.focus();
+        },
+        blur: () => {
+          if (isAwaitingReplacementRef.current) {
+            setReplacementFocus(false);
+            return;
+          }
+          inputRef.current?.blur();
+        },
+        isFocused: () => inputRef.current?.isFocused?.() ?? false,
+        getText: () => textRef.current,
+        replaceText: (nextText, selection) => {
+          textRef.current = nextText;
+          if (inputRef.current?.replaceText) {
+            inputRef.current.replaceText(nextText, selection);
+            return;
+          }
+          if (nextText === "") {
+            inputRef.current?.clear?.();
+            return;
+          }
+          inputRef.current?.setNativeProps?.({
+            text: nextText,
+            ...(selection ? { selection } : {}),
+          });
+          if (selection) inputRef.current?.setSelection?.(selection.start, selection.end);
+        },
+        reset: () => {
+          textRef.current = "";
+          const autoFocus = inputRef.current?.isFocused?.() ?? false;
+          if (inputRef.current?.replaceText) {
+            inputRef.current.replaceText("");
+          } else {
+            inputRef.current?.clear?.();
+          }
+          isAwaitingReplacementRef.current = true;
+          setReplacement((current) => ({ revision: current.revision + 1, autoFocus }));
+        },
+        getNativeRef: () => inputRef.current?.getNativeRef?.() ?? inputRef.current,
+      }),
+      [setReplacementFocus],
+    );
 
     const handleChangeText = useCallback(
       (nextText: string) => {
diff --git a/packages/app/src/components/ui/text-input/text-input.web.tsx b/packages/app/src/components/ui/text-input/text-input.web.tsx
index 100ae185df..30ee0c6eba 100644
--- a/packages/app/src/components/ui/text-input/text-input.web.tsx
+++ b/packages/app/src/components/ui/text-input/text-input.web.tsx
@@ -57,31 +57,35 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
       onChangeTextRef.current?.(nextText);
     }, []);
 
-    useImperativeHandle(ref, () => ({
-      focus: () => inputRef.current?.focus(),
-      blur: () => inputRef.current?.blur(),
-      isFocused: () => document.activeElement === inputRef.current,
-      getText: () => {
-        const input = inputRef.current as WebTextInputElement | null;
-        const nextText = input?.value ?? textRef.current;
-        textRef.current = nextText;
-        return nextText;
-      },
-      replaceText: (nextText, selection) => {
-        textRef.current = nextText;
-        const input = inputRef.current as WebTextInputElement | null;
-        if (input && "value" in input) input.value = nextText;
-        if (selection && typeof input?.setSelectionRange === "function") {
-          input.setSelectionRange(selection.start, selection.end);
-        }
-      },
-      reset: () => {
-        textRef.current = "";
-        const input = inputRef.current as WebTextInputElement | null;
-        if (input && "value" in input) input.value = "";
-      },
-      getNativeRef: () => inputRef.current,
-    }));
+    useImperativeHandle(
+      ref,
+      () => ({
+        focus: () => inputRef.current?.focus(),
+        blur: () => inputRef.current?.blur(),
+        isFocused: () => document.activeElement === inputRef.current,
+        getText: () => {
+          const input = inputRef.current as WebTextInputElement | null;
+          const nextText = input?.value ?? textRef.current;
+          textRef.current = nextText;
+          return nextText;
+        },
+        replaceText: (nextText, selection) => {
+          textRef.current = nextText;
+          const input = inputRef.current as WebTextInputElement | null;
+          if (input && "value" in input) input.value = nextText;
+          if (selection && typeof input?.setSelectionRange === "function") {
+            input.setSelectionRange(selection.start, selection.end);
+          }
+        },
+        reset: () => {
+          textRef.current = "";
+          const input = inputRef.current as WebTextInputElement | null;
+          if (input && "value" in input) input.value = "";
+        },
+        getNativeRef: () => inputRef.current,
+      }),
+      [],
+    );
 
     return (
       <TextInput
diff --git a/packages/app/src/components/ui/text-input/types.ts b/packages/app/src/components/ui/text-input/types.ts
index 6a1daacbcc..9f746bd656 100644
--- a/packages/app/src/components/ui/text-input/types.ts
+++ b/packages/app/src/components/ui/text-input/types.ts
@@ -1,6 +1,7 @@
 import type { TextInputProps } from "react-native";
 import type { NativePastedFile } from "@/composer/native-pasted-image";
 
+/** Stable for the mounted editor lifetime; reset() owns any inner input replacement. */
 export interface EditingTextInputHandle {
   focus(): void;
   blur(): void;
diff --git a/packages/app/src/composer/dock/index.native.tsx b/packages/app/src/composer/dock/index.native.tsx
index 718d49a245..a668c00743 100644
--- a/packages/app/src/composer/dock/index.native.tsx
+++ b/packages/app/src/composer/dock/index.native.tsx
@@ -2,6 +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 { useIsCompactFormFactor } from "@/constants/layout";
 import { HEADER_INNER_HEIGHT } from "@/constants/layout";
 import { resolveContentMaxWidth, useAppSettings } from "@/hooks/use-settings";
 import { KeyboardTranslateView } from "@/keyboard/shift";
@@ -17,6 +18,7 @@ import Animated, {
 import { useKeyboardShift } from "@/keyboard/shift";
 import {
   resolveCenteredClearance,
+  resolveInlineComposerCapacity,
   updateComposerCapacity,
   type ComposerCapacity,
 } from "./internal/capacity";
@@ -71,12 +73,13 @@ function ComposerViewport({
 
 /** Bound the complete composer (including its controls), not just the text input. */
 function ComposerViewportContent({ style, ...props }: ViewProps) {
+  const compact = useIsCompactFormFactor();
   const capacity = useContext(ViewportCapacity);
   if (!capacity) throw new Error("ComposerViewportContent requires ComposerViewport");
   const constraint = useAnimatedStyle(() => ({
     // Only viewport changes and keyboard start/end events trigger layout. Motion
     // stays in KeyboardTranslateView and never changes this constraint per frame.
-    maxHeight: capacity.value,
+    maxHeight: resolveInlineComposerCapacity(capacity.value, compact),
   }));
 
   return (
diff --git a/packages/app/src/composer/dock/index.tsx b/packages/app/src/composer/dock/index.tsx
index d39439f325..3f41118696 100644
--- a/packages/app/src/composer/dock/index.tsx
+++ b/packages/app/src/composer/dock/index.tsx
@@ -1,8 +1,10 @@
 export { ComposerDockBackground } from "./internal/background";
 import { ScrollView } from "@/components/ui/scroll-view";
-import type { ReactNode } from "react";
+import { useState, useCallback, useMemo, type ReactNode } from "react";
 import { View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
+import { resolveInlineComposerCapacity } from "./internal/capacity";
+import { useIsCompactFormFactor } from "@/constants/layout";
 import { HEADER_INNER_HEIGHT } from "@/constants/layout";
 
 interface ComposerDockProps {
@@ -14,23 +16,33 @@ export function ComposerDock({
   children: [content, composer, overlay],
   centered = false,
 }: ComposerDockProps) {
+  const compact = useIsCompactFormFactor();
+  const [availableHeight, setAvailableHeight] = useState<number>();
+  const constraint = useMemo(
+    () => ({ maxHeight: resolveInlineComposerCapacity(availableHeight, compact) }),
+    [availableHeight, compact],
+  );
+  const measureViewport = useCallback((event: import("react-native").LayoutChangeEvent) => {
+    const { height } = event.nativeEvent.layout;
+    if (height > 0) setAvailableHeight(height);
+  }, []);
   if (centered) {
     return (
-      <View style={styles.centered}>
+      <View style={styles.centered} onLayout={measureViewport}>
         <View style={styles.form}>
           <ScrollView style={styles.setup} keyboardShouldPersistTaps="handled">
             {content}
           </ScrollView>
-          <View style={styles.centeredComposer}>{composer}</View>
+          <View style={[styles.centeredComposer, constraint]}>{composer}</View>
           {overlay}
         </View>
       </View>
     );
   }
   return (
-    <View style={styles.surface}>
+    <View style={styles.surface} onLayout={measureViewport}>
       <View style={styles.content}>{content}</View>
-      <View style={styles.composer}>{composer}</View>
+      <View style={[styles.composer, constraint]}>{composer}</View>
       {overlay}
     </View>
   );
diff --git a/packages/app/src/composer/dock/internal/capacity.test.ts b/packages/app/src/composer/dock/internal/capacity.test.ts
index 87796f23d4..7e98b7ef3d 100644
--- a/packages/app/src/composer/dock/internal/capacity.test.ts
+++ b/packages/app/src/composer/dock/internal/capacity.test.ts
@@ -1,11 +1,24 @@
 import { describe, expect, it } from "vitest";
 import {
   resolveCenteredClearance,
+  resolveInlineComposerCapacity,
   resolveComposerCapacity,
   updateComposerCapacity,
 } from "./capacity";
 
 describe("composer viewport", () => {
+  it("caps the complete compact composer at sixty percent of keyboard-reserved space", () => {
+    const open = updateComposerCapacity(undefined, {
+      height: 582,
+      bottomInset: 24,
+      safeAreaBottom: 0,
+      centered: false,
+      keyboardShift: 308,
+    });
+    expect(resolveInlineComposerCapacity(open.capacity, true)).toBe(147);
+    expect(resolveInlineComposerCapacity(open.capacity, false)).toBe(245);
+    expect(resolveInlineComposerCapacity(undefined, true)).toBeUndefined();
+  });
   it("preserves the editing capacity when the keyboard closes", () => {
     const viewport = { height: 582, bottomInset: 24, safeAreaBottom: 0, centered: false };
     const open = updateComposerCapacity(undefined, { ...viewport, keyboardShift: 308 });
diff --git a/packages/app/src/composer/dock/internal/capacity.ts b/packages/app/src/composer/dock/internal/capacity.ts
index eb5e4a66bd..ca4fed2991 100644
--- a/packages/app/src/composer/dock/internal/capacity.ts
+++ b/packages/app/src/composer/dock/internal/capacity.ts
@@ -50,3 +50,13 @@ export function updateComposerCapacity(
     capacity: resolveComposerCapacity({ ...input, keyboardShift: keyboardReserve }),
   };
 }
+
+/** Compact editing leaves conversation space above the complete composer. */
+export function resolveInlineComposerCapacity(
+  capacity: number | undefined,
+  compact: boolean,
+): number | undefined {
+  "worklet";
+  if (capacity === undefined) return undefined;
+  return compact ? capacity * 0.6 : capacity;
+}
diff --git a/packages/app/src/composer/draft/input-draft.ts b/packages/app/src/composer/draft/input-draft.ts
index 0812fb280d..7e6805b0b3 100644
--- a/packages/app/src/composer/draft/input-draft.ts
+++ b/packages/app/src/composer/draft/input-draft.ts
@@ -115,6 +115,7 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
   const isHydrated = hydratedDraftKey === draftKey;
   const textReplacementRevisionRef = useRef(0);
   const [textReplacement, setTextReplacement] = useState<TextReplacement>(() => ({
+    kind: "initial",
     key: `${draftKey}:0`,
     text: textSource.getSnapshot(),
   }));
@@ -123,6 +124,7 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
     (nextText: string) => {
       textReplacementRevisionRef.current += 1;
       setTextReplacement({
+        kind: "replace",
         key: `${draftKey}:${textReplacementRevisionRef.current}`,
         text: nextText,
       });
diff --git a/packages/app/src/composer/editing-session/index.test.ts b/packages/app/src/composer/editing-session/index.test.ts
new file mode 100644
index 0000000000..d593e5a64e
--- /dev/null
+++ b/packages/app/src/composer/editing-session/index.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it } from "vitest";
+import { ComposerEditingSession } from "./index";
+
+function leaveLiveDraft(session: ComposerEditingSession) {
+  session.captureForRemount({
+    snapshot: { text: "Unpublished live draft", selection: { start: 4, end: 17 } },
+    focused: true,
+    replacementKey: "draft:applied",
+  });
+}
+
+describe("composer editing remount handoff", () => {
+  it("keeps live text and selection when remounting from an initial draft publication", () => {
+    const session = new ComposerEditingSession();
+    leaveLiveDraft(session);
+    const handoff = session.takeHandoff({ kind: "initial", key: "draft:initial", text: "stale" });
+    expect(handoff?.snapshot).toEqual({
+      text: "Unpublished live draft",
+      selection: { start: 4, end: 17 },
+    });
+    expect(handoff?.focused).toBe(true);
+  });
+
+  it("keeps local edits when the last applied replacement is still current", () => {
+    const session = new ComposerEditingSession();
+    leaveLiveDraft(session);
+    const handoff = session.takeHandoff({
+      kind: "replace",
+      key: "draft:applied",
+      text: "old replacement",
+    });
+    expect(handoff?.snapshot).toEqual({
+      text: "Unpublished live draft",
+      selection: { start: 4, end: 17 },
+    });
+  });
+
+  it.each(["New explicit draft", ""])(
+    "honors an explicit replacement made while the editor is absent: %j",
+    (text) => {
+      const session = new ComposerEditingSession();
+      leaveLiveDraft(session);
+      const handoff = session.takeHandoff({ kind: "replace", key: "draft:new", text });
+      expect(handoff?.snapshot).toEqual({
+        text,
+        selection: { start: text.length, end: text.length },
+      });
+      expect(handoff?.focused).toBe(true);
+      expect(session.takeHandoff({ kind: "replace", key: "draft:new", text })).toBeNull();
+    },
+  );
+});
diff --git a/packages/app/src/composer/editing-session/index.tsx b/packages/app/src/composer/editing-session/index.tsx
new file mode 100644
index 0000000000..97f7a79c51
--- /dev/null
+++ b/packages/app/src/composer/editing-session/index.tsx
@@ -0,0 +1,142 @@
+import React, {
+  createContext,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+  useSyncExternalStore,
+  type ReactNode,
+} from "react";
+import type { TextReplacement } from "@/composer/types";
+import type { ComposerInputMode } from "@/composer/input-mode";
+
+export interface ComposerEditingHandoff {
+  snapshot: { text: string; selection: { start: number; end: number } };
+  focused: boolean;
+  replacementKey: string;
+}
+
+/** Editing metadata outlives a layout's input; draft text still belongs to its draft owner. */
+export class ComposerEditingSession {
+  private fullscreen = false;
+  private handoff: ComposerEditingHandoff | null = null;
+  private listeners = new Set<() => void>();
+  getFullscreen = () => this.fullscreen;
+  subscribe = (listener: () => void) => {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  };
+  changePresentation(fullscreen: boolean, handoff: ComposerEditingHandoff) {
+    this.captureForRemount(handoff);
+    if (fullscreen === this.fullscreen) return;
+    this.fullscreen = fullscreen;
+    for (const listener of this.listeners) listener();
+  }
+  captureForRemount(handoff: ComposerEditingHandoff) {
+    this.handoff = handoff;
+  }
+  peekHandoff(replacement: TextReplacement): ComposerEditingHandoff | null {
+    const handoff = this.handoff;
+    if (!handoff || replacement.kind === "initial" || replacement.key === handoff.replacementKey)
+      return handoff;
+    // A replacement command issued since capture supersedes the old editor's live buffer.
+    return {
+      snapshot: {
+        text: replacement.text,
+        selection: { start: replacement.text.length, end: replacement.text.length },
+      },
+      focused: handoff.focused,
+      replacementKey: replacement.key,
+    };
+  }
+  takeHandoff(replacement: TextReplacement) {
+    const handoff = this.peekHandoff(replacement);
+    this.handoff = null;
+    return handoff;
+  }
+}
+
+class ComposerEditingSessions {
+  private workspaces = new Map<
+    string,
+    Map<string, { targetKey: string; sessions: Map<ComposerInputMode, ComposerEditingSession> }>
+  >();
+  get(workspaceKey: string, tabId: string, targetKey: string, purpose: ComposerInputMode) {
+    let workspace = this.workspaces.get(workspaceKey);
+    if (!workspace) {
+      workspace = new Map();
+      this.workspaces.set(workspaceKey, workspace);
+    }
+    let tab = workspace.get(tabId);
+    if (!tab || tab.targetKey !== targetKey) {
+      tab = { targetKey, sessions: new Map() };
+      workspace.set(tabId, tab);
+    }
+    let session = tab.sessions.get(purpose);
+    if (!session) {
+      session = new ComposerEditingSession();
+      tab.sessions.set(purpose, session);
+    }
+    return session;
+  }
+  retain(workspaceKey: string, tabIds: readonly string[]) {
+    const workspace = this.workspaces.get(workspaceKey);
+    if (!workspace) return;
+    const retained = new Set(tabIds);
+    for (const tabId of workspace.keys()) if (!retained.has(tabId)) workspace.delete(tabId);
+    if (workspace.size === 0) this.workspaces.delete(workspaceKey);
+  }
+}
+
+const SessionsContext = createContext<ComposerEditingSessions | null>(null);
+const WorkspaceContext = createContext<string | null>(null);
+const ScopeContext = createContext<{ tabId: string; targetKey: string } | null>(null);
+
+/** App-container ownership survives replacement of both the gesture shell and tab layout. */
+export function ComposerEditingSessionsProvider({ children }: { children: ReactNode }) {
+  const [sessions] = useState(() => new ComposerEditingSessions());
+  return <SessionsContext.Provider value={sessions}>{children}</SessionsContext.Provider>;
+}
+export function WorkspaceComposerEditingSessionsProvider({
+  workspaceKey,
+  tabIds,
+  children,
+}: {
+  workspaceKey: string;
+  tabIds: readonly string[];
+  children: ReactNode;
+}) {
+  const sessions = useContext(SessionsContext);
+  useEffect(() => sessions?.retain(workspaceKey, tabIds), [sessions, workspaceKey, tabIds]);
+  return <WorkspaceContext.Provider value={workspaceKey}>{children}</WorkspaceContext.Provider>;
+}
+export function ComposerEditingScope({
+  tabId,
+  targetKey,
+  children,
+}: {
+  tabId: string;
+  targetKey: string;
+  children: ReactNode;
+}) {
+  const scope = useMemo(() => ({ tabId, targetKey }), [tabId, targetKey]);
+  return <ScopeContext.Provider value={scope}>{children}</ScopeContext.Provider>;
+}
+export function useComposerEditingSession(
+  purpose: ComposerInputMode,
+  provided?: ComposerEditingSession,
+): ComposerEditingSession {
+  const sessions = useContext(SessionsContext);
+  const scope = useContext(ScopeContext);
+  const workspaceKey = useContext(WorkspaceContext);
+  const [local] = useState(() => provided ?? new ComposerEditingSession());
+  if (provided) return provided;
+  return sessions && scope && workspaceKey
+    ? sessions.get(workspaceKey, scope.tabId, scope.targetKey, purpose)
+    : local;
+}
+export function useComposerFullscreen(session: ComposerEditingSession): boolean {
+  return useSyncExternalStore(session.subscribe, session.getFullscreen, session.getFullscreen);
+}
diff --git a/packages/app/src/composer/index.tsx b/packages/app/src/composer/index.tsx
index c36d7f9e41..c77b39d332 100644
--- a/packages/app/src/composer/index.tsx
+++ b/packages/app/src/composer/index.tsx
@@ -1,3 +1,4 @@
+import { useComposerEditingSession, useComposerFullscreen } from "./editing-session";
 import type { ComposerTextSource } from "./text-source";
 import { createStore, type StoreApi } from "zustand/vanilla";
 import { useStore } from "zustand";
@@ -1003,8 +1004,10 @@ function ComposerAutocompleteBinding({
     cursorIndex: Math.min(cursorIndex, userInput.length),
     onAutocompleteApplied: () => inputRef.current?.focus(),
   });
-  useImperativeHandle(ref, () => ({ onKeyPress: autocomplete.onKeyPress }), [
-    autocomplete.onKeyPress,
+  const handleKeyPress = autocomplete.onKeyPress;
+  useImperativeHandle(ref, () => ({ onKeyPress: (event) => show && handleKeyPress(event) }), [
+    show,
+    handleKeyPress,
   ]);
   const selectOption = autocomplete.onSelectOption;
   const onSelect = useCallback(
@@ -1336,6 +1339,8 @@ function ComposerContentImpl({
   const nextPendingFileId = useRef(0);
   const isUploadingFile = pendingFiles.length > 0;
   const [pendingNativeImagePastes, setPendingNativeImagePastes] = useState(0);
+  const editingSession = useComposerEditingSession(inputMode);
+  const isFullscreen = useComposerFullscreen(editingSession);
   const [sendError, setSendError] = useState<string | null>(null);
   const [isMessageInputFocused, setIsMessageInputFocused] = useState(false);
   const [isGithubPickerOpen, setIsGithubPickerOpen] = useState(false);
@@ -2364,7 +2369,7 @@ function ComposerContentImpl({
         <View style={inputAreaContainerStyle}>
           <View style={styles.inputAreaContent}>
             {queueList}
-            {sendErrorNode}
+            {!isFullscreen && sendErrorNode}
 
             <View ref={messageInputContainerRef} style={styles.messageInputContainer}>
               <ComposerAutocompleteBinding
@@ -2372,7 +2377,7 @@ function ComposerContentImpl({
                 cursor={cursor}
                 inputRef={messageInputRef}
                 anchorRef={messageInputContainerRef}
-                show={mode.showAutocomplete}
+                show={mode.showAutocomplete && !isFullscreen}
                 ref={autocompleteRef}
                 configuration={autocompleteConfiguration}
               />
@@ -2387,6 +2392,8 @@ function ComposerContentImpl({
               <RenderProfile id="MessageInput">
                 <StableMessageInput
                   ref={messageInputRef}
+                  editingSession={editingSession}
+                  submissionError={sendErrorNode}
                   value={textSource.getSnapshot()}
                   onChangeText={setUserInput}
                   onSubmit={handleSubmit}
diff --git a/packages/app/src/composer/input/fullscreen-host.native.tsx b/packages/app/src/composer/input/fullscreen-host.native.tsx
new file mode 100644
index 0000000000..22ce0052bf
--- /dev/null
+++ b/packages/app/src/composer/input/fullscreen-host.native.tsx
@@ -0,0 +1,57 @@
+import { useEffect, type ReactNode } from "react";
+import { Portal } from "@gorhom/portal";
+import { BackHandler, View, useWindowDimensions } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { StyleSheet } from "react-native-unistyles";
+import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { DEFAULT_FLOATING_PANEL_PORTAL_HOST } from "@/components/ui/floating-panel-portal";
+import { useKeyboardShift } from "@/keyboard/shift";
+
+/** Same-window host keeps the IME attached while escaping the dock's clipping. */
+export function ComposerFullscreenHost({
+  children,
+  onExit,
+  active,
+}: {
+  children: ReactNode;
+  onExit: () => void;
+  active: boolean;
+}) {
+  useEffect(() => {
+    if (!active) return;
+    const handler = BackHandler.addEventListener("hardwareBackPress", () => {
+      onExit();
+      return true;
+    });
+    return () => handler.remove();
+  }, [active, onExit]);
+  const insets = useSafeAreaInsets();
+  const { height } = useWindowDimensions();
+  const { layoutShift } = useKeyboardShift();
+  const frame = useAnimatedStyle(() => ({
+    height: Math.max(0, height - layoutShift.value),
+    paddingTop: insets.top,
+    paddingBottom: insets.bottom,
+    paddingLeft: insets.left,
+    paddingRight: insets.right,
+  }));
+  return (
+    <Portal hostName={DEFAULT_FLOATING_PANEL_PORTAL_HOST}>
+      <View style={[styles.background, !active && styles.hidden]}>
+        <Animated.View style={[{ width: "100%" }, frame]}>{children}</Animated.View>
+      </View>
+    </Portal>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  hidden: { display: "none" },
+  background: {
+    position: "absolute",
+    top: 0,
+    bottom: 0,
+    left: 0,
+    right: 0,
+    backgroundColor: theme.colors.surface1,
+  },
+}));
diff --git a/packages/app/src/composer/input/fullscreen-host.tsx b/packages/app/src/composer/input/fullscreen-host.tsx
new file mode 100644
index 0000000000..ba634b268d
--- /dev/null
+++ b/packages/app/src/composer/input/fullscreen-host.tsx
@@ -0,0 +1,77 @@
+import { useMemo, useLayoutEffect, useState, type ReactNode } from "react";
+import { createPortal } from "react-dom";
+import { View } from "react-native";
+import {
+  getOverlayRoot,
+  useOverlayLayer,
+  OverlayLayerProvider,
+  useWebOverlayRegistration,
+} from "@/lib/overlay-root";
+
+export function ComposerFullscreenHost({
+  children,
+  onExit,
+  active,
+}: {
+  children: ReactNode;
+  onExit: () => void;
+  active: boolean;
+}) {
+  const layer = useOverlayLayer("modal");
+  const registration = useWebOverlayRegistration({
+    active,
+    layer,
+    onKeyDown: (event) => {
+      if (event.key !== "Escape") return false;
+      event.preventDefault();
+      onExit();
+      return true;
+    },
+  });
+  const [viewport, setViewport] = useState(readVisibleViewport);
+  useLayoutEffect(() => {
+    if (!active) return;
+    const update = () => setViewport(readVisibleViewport());
+    const visualViewport = window.visualViewport;
+    update();
+    visualViewport?.addEventListener("resize", update);
+    visualViewport?.addEventListener("scroll", update);
+    window.addEventListener("resize", update);
+    return () => {
+      visualViewport?.removeEventListener("resize", update);
+      visualViewport?.removeEventListener("scroll", update);
+      window.removeEventListener("resize", update);
+    };
+  }, [active]);
+  const frameStyle = useMemo(
+    () => ({
+      display: active ? ("flex" as const) : ("none" as const),
+      position: "absolute" as const,
+      top: viewport.top,
+      left: viewport.left,
+      width: viewport.width,
+      zIndex: layer,
+      pointerEvents: "auto" as const,
+      height: viewport.height,
+    }),
+    [active, layer, viewport],
+  );
+  return createPortal(
+    <OverlayLayerProvider layer={layer}>
+      <View ref={registration} style={frameStyle}>
+        {children}
+      </View>
+    </OverlayLayerProvider>,
+    getOverlayRoot(),
+  );
+}
+
+function readVisibleViewport() {
+  const viewport = window.visualViewport;
+  return {
+    top: viewport?.offsetTop ?? 0,
+    left: viewport?.offsetLeft ?? 0,
+    width: viewport?.width ?? window.innerWidth,
+    height: viewport?.height ?? window.innerHeight,
+  };
+}
diff --git a/packages/app/src/composer/input/height.native.ts b/packages/app/src/composer/input/height.native.ts
index 21178db4e1..a36839e2e7 100644
--- a/packages/app/src/composer/input/height.native.ts
+++ b/packages/app/src/composer/input/height.native.ts
@@ -7,6 +7,8 @@ interface ComposerHeightArgs {
   textareaRef: RefObject<unknown>;
   minHeight: number;
   maxHeight: number;
+  onRenderedLinesChange?: (lines: number) => void;
+  presentationKey?: boolean;
 }
 
 export function useComposerHeight({
diff --git a/packages/app/src/composer/input/height.web.ts b/packages/app/src/composer/input/height.web.ts
index c732bf3599..6b8c1ec561 100644
--- a/packages/app/src/composer/input/height.web.ts
+++ b/packages/app/src/composer/input/height.web.ts
@@ -7,6 +7,8 @@ interface ComposerHeightArgs {
   textareaRef: RefObject<HTMLElement | null>;
   minHeight: number;
   maxHeight: number;
+  onRenderedLinesChange?: (lines: number) => void;
+  presentationKey?: boolean;
 }
 
 const COPIED_STYLES = [
@@ -36,11 +38,13 @@ export function useComposerHeight({
   textareaRef,
   minHeight,
   maxHeight,
+  onRenderedLinesChange,
+  presentationKey,
 }: ComposerHeightArgs): ComposerHeightResult {
   const [height, setHeight] = useState(minHeight);
   const heightRef = useRef(minHeight);
-  const paramsRef = useRef({ getText, minHeight, maxHeight });
-  paramsRef.current = { getText, minHeight, maxHeight };
+  const paramsRef = useRef({ getText, minHeight, maxHeight, onRenderedLinesChange });
+  paramsRef.current = { getText, minHeight, maxHeight, onRenderedLinesChange };
   const mirrorRef = useRef<HTMLTextAreaElement | null>(null);
 
   const setBoundedHeight = useCallback((nextHeight: number) => {
@@ -65,6 +69,13 @@ export function useComposerHeight({
       }
       mirror.style.width = `${sourceWidth}px`;
       mirror.value = text.endsWith("\n") ? `${text} ` : text;
+      const padding =
+        parseFloat(computedStyle.paddingTop) + parseFloat(computedStyle.paddingBottom);
+      const lineHeight = parseFloat(computedStyle.lineHeight);
+      if (lineHeight > 0)
+        paramsRef.current.onRenderedLinesChange?.(
+          Math.round((mirror.scrollHeight - padding) / lineHeight),
+        );
       setBoundedHeight(mirror.scrollHeight);
     },
     [setBoundedHeight, textareaRef],
@@ -101,7 +112,7 @@ export function useComposerHeight({
 
   useLayoutEffect(() => {
     measure(getText());
-  }, [maxHeight, minHeight, getText, measure]);
+  }, [maxHeight, minHeight, getText, measure, presentationKey]);
 
   useEffect(() => {
     const source = textareaRef.current;
@@ -115,7 +126,7 @@ export function useComposerHeight({
     });
     observer.observe(source);
     return () => observer.disconnect();
-  }, [measure, textareaRef]);
+  }, [measure, textareaRef, presentationKey]);
 
   const onTextChange = useCallback(
     (_previousText: string, nextText: string) => measure(nextText),
diff --git a/packages/app/src/composer/input/input.tsx b/packages/app/src/composer/input/input.tsx
index e15a00018e..a0476ff7a7 100644
--- a/packages/app/src/composer/input/input.tsx
+++ b/packages/app/src/composer/input/input.tsx
@@ -1,3 +1,8 @@
+import {
+  useComposerEditingSession,
+  useComposerFullscreen,
+  type ComposerEditingSession,
+} from "@/composer/editing-session";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import {
   View,
@@ -56,6 +61,7 @@ import { useIsCompactFormFactor } from "@/constants/layout";
 import { useComposerKeyboardScope } from "@/composer/keyboard-scope";
 import { RenderProfile } from "@/utils/render-profiler";
 import { useComposerHeight } from "./height";
+import { ComposerInputPresentation } from "./presentation";
 import { resolveComposerInputMode, type ComposerInputMode } from "@/composer/input-mode";
 import type { NativePastedFile } from "@/composer/native-pasted-image";
 import {
@@ -77,6 +83,7 @@ import {
   applyDictationTranscript,
   computeCanStartDictation,
   resolveComposerSurfacePresentation,
+  resolveComposerSurfaceText,
   runAlternateSendAction,
   runDefaultSendAction,
   runMessageInputKeyboardAction,
@@ -106,6 +113,8 @@ export interface ComposerKeyPressEvent {
 }
 
 export interface MessageInputProps {
+  editingSession?: ComposerEditingSession;
+  submissionError?: React.ReactNode;
   value: string;
   onChangeText: (text: string) => void;
   onSubmit: (payload: MessagePayload) => void;
@@ -206,6 +215,7 @@ type WebTextInputKeyPressEvent = NativeSyntheticEvent<
 >;
 
 interface TextAreaHandle {
+  value?: string;
   scrollHeight?: number;
   clientHeight?: number;
   offsetHeight?: number;
@@ -215,7 +225,7 @@ interface TextAreaHandle {
   style?: {
     height?: string;
     overflowY?: string;
-  } & Record<string, unknown>;
+  };
 }
 
 function AttachButtonIcon({
@@ -433,7 +443,7 @@ function getTextInputNativeElement(current: ComposerTextInputHandle | null): HTM
 }
 
 interface PasteImagesEffectArgs {
-  getWebTextArea: () => TextAreaHandle | null;
+  textarea: HTMLElement | null;
   isConnected: boolean;
   disabled: boolean;
   isDictating: boolean;
@@ -443,7 +453,7 @@ interface PasteImagesEffectArgs {
 
 function usePasteImagesEffect(args: PasteImagesEffectArgs): void {
   const {
-    getWebTextArea,
+    textarea,
     isConnected,
     disabled,
     isDictating,
@@ -454,19 +464,7 @@ function usePasteImagesEffect(args: PasteImagesEffectArgs): void {
   useEffect(() => {
     if (!isWeb || !onAddImages) return;
 
-    const textarea = getWebTextArea() as
-      | (TextAreaHandle & {
-          addEventListener?: (type: string, listener: (e: ClipboardEvent) => void) => void;
-          removeEventListener?: (type: string, listener: (e: ClipboardEvent) => void) => void;
-        })
-      | null;
-    if (
-      !textarea ||
-      typeof textarea.addEventListener !== "function" ||
-      typeof textarea.removeEventListener !== "function"
-    ) {
-      return;
-    }
+    if (!textarea) return;
 
     let disposed = false;
     const handlePaste = (event: ClipboardEvent) => {
@@ -493,14 +491,7 @@ function usePasteImagesEffect(args: PasteImagesEffectArgs): void {
       disposed = true;
       textarea.removeEventListener?.("paste", handlePaste);
     };
-  }, [
-    disabled,
-    getWebTextArea,
-    isConnected,
-    isDictating,
-    isRealtimeVoiceForCurrentAgent,
-    onAddImages,
-  ]);
+  }, [disabled, textarea, isConnected, isDictating, isRealtimeVoiceForCurrentAgent, onAddImages]);
 }
 
 function useAutoFocusOnWebEffect(
@@ -628,6 +619,7 @@ function FocusHint({
 interface ComposerTextSurfaceProps {
   readOnly: boolean;
   value: string;
+  textReplacementKey: string;
   textInputRef: React.Ref<ComposerTextInputHandle>;
   textInputStyle: EditingTextInputProps["style"];
   readOnlyTextStyle: React.ComponentProps<typeof Text>["style"];
@@ -643,6 +635,9 @@ interface ComposerTextSurfaceProps {
   onSelectionChange: (event: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => void;
   onPasteImages: ((files: readonly NativePastedFile[]) => void) | undefined;
   onPasteError: (message: string) => void;
+  fullscreen: boolean;
+  compact: boolean;
+  onRenderedLinesChange: (lines: number) => void;
   focusHintVisible: boolean;
   focusInputKeys: ShortcutChord | null | undefined;
   focusHintLabel: string;
@@ -654,6 +649,23 @@ interface ComposerTextSurfaceProps {
  * state of this composer rather than a second one.
  */
 function ComposerTextSurface(props: ComposerTextSurfaceProps): React.ReactElement {
+  const { onChangeText, onRenderedLinesChange } = props;
+  const [measurementText, setMeasurementText] = useState(props.value);
+  useEffect(() => {
+    if (!isWeb) setMeasurementText(props.value);
+  }, [props.value, props.textReplacementKey]);
+  const handleTextChange = useCallback(
+    (text: string) => {
+      if (!isWeb) setMeasurementText(text);
+      onChangeText(text);
+    },
+    [onChangeText, setMeasurementText],
+  );
+  const measureLines = useCallback(
+    (event: import("react-native").TextLayoutEvent) =>
+      onRenderedLinesChange(event.nativeEvent.lines.length),
+    [onRenderedLinesChange],
+  );
   if (props.readOnly) {
     return (
       <View style={styles.textInputScrollWrapper}>
@@ -664,12 +676,28 @@ function ComposerTextSurface(props: ComposerTextSurfaceProps): React.ReactElemen
     );
   }
   return (
-    <View style={styles.textInputScrollWrapper}>
+    <View
+      style={[
+        styles.textInputScrollWrapper,
+        props.fullscreen && styles.fullscreenTextSurface,
+        props.compact && !props.fullscreen && styles.compactTextSurface,
+      ]}
+    >
+      {!isWeb && props.compact && !props.fullscreen ? (
+        <Text
+          accessible={false}
+          pointerEvents="none"
+          style={[props.textInputStyle, styles.lineMeasurement]}
+          onTextLayout={measureLines}
+        >
+          {`${measurementText}\u200b`}
+        </Text>
+      ) : null}
       <ComposerTextInput
         ref={props.textInputRef}
         dataSet={COMPOSER_INPUT_DATASET}
         initialValue={props.value}
-        onChangeText={props.onChangeText}
+        onChangeText={handleTextChange}
         placeholder={props.placeholder}
         accessibilityLabel={props.accessibilityLabel}
         onFocus={props.onFocus}
@@ -843,6 +871,7 @@ interface ToggleRealtimeVoiceContext {
   handleStopRealtimeVoice: () => Promise<unknown> | void;
   toast: { error: (msg: string) => void };
   interruptBeforeVoiceMessage: string;
+  exitFullscreen: () => void;
 }
 
 function toggleRealtimeVoiceImpl(ctx: ToggleRealtimeVoiceContext): void {
@@ -858,6 +887,7 @@ function toggleRealtimeVoiceImpl(ctx: ToggleRealtimeVoiceContext): void {
     ctx.toast.error(ctx.interruptBeforeVoiceMessage);
     return;
   }
+  ctx.exitFullscreen();
   void ctx.voice.startVoice(ctx.voiceServerId, ctx.voiceAgentId).catch((error) => {
     console.error("[MessageInput] Failed to start realtime voice", error);
     const message = extractErrorMessage(error);
@@ -872,6 +902,7 @@ interface StartDictationContext {
   canStartDictation: () => boolean;
   toast: { error: (msg: string) => void };
   startDictation: () => Promise<void>;
+  exitFullscreen: () => void;
 }
 
 async function startDictationIfAvailableImpl(ctx: StartDictationContext): Promise<void> {
@@ -882,6 +913,7 @@ async function startDictationIfAvailableImpl(ctx: StartDictationContext): Promis
   if (!ctx.canStartDictation()) {
     return;
   }
+  ctx.exitFullscreen();
   await ctx.startDictation();
 }
 
@@ -983,7 +1015,8 @@ function computeIsDictationStartEnabled(
   return (isReadyForDictation ?? isConnected) && !disabled;
 }
 
-function resolveMaxInputHeight(windowHeight: number): number {
+function resolveMaxInputHeight(windowHeight: number, compact: boolean): number {
+  if (compact) return DEFAULT_MAX_INPUT_HEIGHT;
   if (!Number.isFinite(windowHeight) || windowHeight <= 0) return DEFAULT_MAX_INPUT_HEIGHT;
   return Math.max(DEFAULT_MAX_INPUT_HEIGHT, Math.floor(windowHeight * MAX_INPUT_VIEWPORT_RATIO));
 }
@@ -1007,9 +1040,12 @@ function getComposerInputSnapshot(
   current: ComposerTextInputHandle | null,
   fallbackText: string,
   fallbackSelection: ComposerInputSnapshot["selection"],
+  mountedTextArea?: TextAreaHandle | null,
 ): ComposerInputSnapshot {
-  const text = current?.getText() ?? fallbackText;
-  const textArea = getWebTextAreaImpl(current);
+  // The inner DOM ref can detach before the outer editing handle. Keep the mounted
+  // element available until this owner's ref callback captures the remount handoff.
+  const textArea = mountedTextArea ?? getWebTextAreaImpl(current);
+  const text = textArea?.value ?? current?.getText() ?? fallbackText;
   const start = textArea?.selectionStart ?? fallbackSelection.start;
   const end = textArea?.selectionEnd ?? fallbackSelection.end;
   return { text, selection: { start, end } };
@@ -1139,6 +1175,28 @@ function extractErrorMessage(error: unknown): string | null {
   return null;
 }
 
+function resolvePresentationSendDisabled(input: {
+  fullscreen: boolean;
+  disabled: boolean;
+  hasText: boolean;
+  attachments: ComposerAttachment[];
+  hasExternalContent: boolean;
+  allowEmpty: boolean;
+}): boolean {
+  return (
+    input.disabled || (input.fullscreen && !input.allowEmpty && !hasSendableComposerContent(input))
+  );
+}
+
+function shouldShowFullscreenControl(
+  compact: boolean,
+  readOnly: boolean,
+  overlayVisible: boolean,
+  renderedLines: number,
+) {
+  return compact && !readOnly && !overlayVisible && renderedLines > 2;
+}
+
 export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
   function MessageInput(props, ref) {
     const {
@@ -1186,11 +1244,15 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       textReplacement,
       submitLabel,
     } = resolveMessageInputProps(props);
+    const { isActiveComposer } = useComposerKeyboardScope();
     const mode = resolveComposerInputMode(inputMode);
     const { t } = useTranslation();
     const isCompact = useIsCompactFormFactor();
     const { height: windowHeight } = useWindowDimensions();
-    const maxInputHeight = resolveMaxInputHeight(windowHeight);
+    const editingSession = useComposerEditingSession(inputMode, props.editingSession);
+    const isFullscreen = useComposerFullscreen(editingSession);
+    const [renderedLines, setRenderedLines] = useState(1);
+    const maxInputHeight = resolveMaxInputHeight(windowHeight, isCompact);
     const buttonIconSize = isWeb ? ICON_SIZE.md : ICON_SIZE.lg;
     const toast = useToast();
     const voice = useVoiceOptional();
@@ -1207,27 +1269,19 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     const inputWrapperRef = useRef<View | null>(null);
     const textInputRef = useRef<ComposerTextInputHandle | null>(null);
     const isInputFocusedRef = useRef(false);
-    const valueRef = useRef(value);
-    const selectionRef = useRef({ start: value.length, end: value.length });
-    const appliedTextReplacementKeyRef = useRef(textReplacement.key);
-    const webTextareaRef = useRef<HTMLElement | null>(null);
-    const getLiveText = useCallback(() => valueRef.current, []);
-    const composerHeight = useComposerHeight({
-      getText: getLiveText,
-      textareaRef: webTextareaRef,
-      minHeight: MIN_INPUT_HEIGHT,
-      maxHeight: maxInputHeight,
-    });
-    const { style: composerHeightStyle, scrollEnabled: isComposerScrollEnabled } = composerHeight;
-    const measuredComposerHeight = composerHeight.mode === "measured" ? composerHeight : undefined;
-    const updateComposerHeightForText = measuredComposerHeight?.onTextChange;
-    const resetComposerHeight = measuredComposerHeight?.reset;
-
-    const handleComposerLayout = useCallback(
-      (event: LayoutChangeEvent) => onHeightChange?.(event.nativeEvent.layout.height),
-      [onHeightChange],
+    const handoff = editingSession.peekHandoff(textReplacement);
+    const focusIntentRef = useRef(Boolean(handoff?.focused));
+    const valueRef = useRef(handoff?.snapshot.text ?? value);
+    const selectionRef = useRef(
+      handoff?.snapshot.selection ?? { start: value.length, end: value.length },
     );
-
+    const activeComposerRef = useRef(isActiveComposer);
+    activeComposerRef.current = isActiveComposer;
+    const [webTextArea, setWebTextArea] = useState<HTMLElement | null>(null);
+    const appliedTextReplacementKeyRef = useRef(textReplacement.key);
+    const textReplacementRef = useRef(textReplacement);
+    textReplacementRef.current = textReplacement;
+    const webTextareaRef = useRef<HTMLElement | null>(null);
     const updateLiveTextPresence = useCallback((text: string) => {
       const nextHasLiveText = text.trim().length > 0;
       if (hasLiveTextRef.current === nextHasLiveText) return;
@@ -1235,6 +1289,82 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       setHasLiveText(nextHasLiveText);
     }, []);
 
+    const assignTextInput = useCallback(
+      (input: ComposerTextInputHandle | null) => {
+        const previous = textInputRef.current;
+        if (!input && previous) {
+          editingSession.captureForRemount({
+            snapshot: getComposerInputSnapshot(
+              previous,
+              valueRef.current,
+              selectionRef.current,
+              webTextareaRef.current,
+            ),
+            focused: previous.isFocused() || isInputFocusedRef.current,
+            replacementKey: appliedTextReplacementKeyRef.current,
+          });
+        }
+        textInputRef.current = input;
+        if (isWeb) {
+          const element = getWebTextAreaImpl(input) as HTMLElement | null;
+          webTextareaRef.current = element;
+          setWebTextArea(element);
+        }
+        if (!input) return;
+        const transfer = editingSession.takeHandoff(textReplacementRef.current);
+        if (transfer) {
+          appliedTextReplacementKeyRef.current = textReplacementRef.current.key;
+          valueRef.current = transfer.snapshot.text;
+          updateLiveTextPresence(transfer.snapshot.text);
+          selectionRef.current = transfer.snapshot.selection;
+          input.replaceText(transfer.snapshot.text, transfer.snapshot.selection);
+          if (transfer.focused && activeComposerRef.current) input.focus();
+        }
+      },
+      [editingSession, updateLiveTextPresence],
+    );
+    useLayoutEffect(() => {
+      if (isActiveComposer && focusIntentRef.current) textInputRef.current?.focus();
+    }, [isActiveComposer]);
+    const getLiveText = useCallback(() => valueRef.current, []);
+    const composerHeight = useComposerHeight({
+      getText: getLiveText,
+      textareaRef: webTextareaRef,
+      minHeight: MIN_INPUT_HEIGHT,
+      maxHeight: maxInputHeight,
+      onRenderedLinesChange: setRenderedLines,
+      presentationKey: isFullscreen,
+    });
+    const { style: composerHeightStyle, scrollEnabled: isComposerScrollEnabled } = composerHeight;
+    const measuredComposerHeight = composerHeight.mode === "measured" ? composerHeight : undefined;
+    const updateComposerHeightForText = measuredComposerHeight?.onTextChange;
+    const resetComposerHeight = measuredComposerHeight?.reset;
+
+    const changePresentation = useCallback(
+      (fullscreen: boolean) => {
+        if (editingSession.getFullscreen() === fullscreen) return;
+        const snapshot = getComposerInputSnapshot(
+          textInputRef.current,
+          valueRef.current,
+          selectionRef.current,
+        );
+        editingSession.changePresentation(fullscreen, {
+          snapshot,
+          focused: textInputRef.current?.isFocused() ?? isInputFocusedRef.current,
+          replacementKey: appliedTextReplacementKeyRef.current,
+        });
+        valueRef.current = snapshot.text;
+        selectionRef.current = snapshot.selection;
+      },
+      [editingSession],
+    );
+    const exitFullscreen = useCallback(() => changePresentation(false), [changePresentation]);
+
+    const handleComposerLayout = useCallback(
+      (event: LayoutChangeEvent) => onHeightChange?.(event.nativeEvent.layout.height),
+      [onHeightChange],
+    );
+
     const replaceText = useCallback(
       (nextText: string, selection?: { start: number; end: number }) => {
         updateComposerHeightForText?.(valueRef.current, nextText);
@@ -1412,8 +1542,9 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
           canStartDictation,
           toast,
           startDictation,
+          exitFullscreen,
         }),
-      [canStartDictation, dictationUnavailableMessage, startDictation, toast],
+      [canStartDictation, dictationUnavailableMessage, startDictation, toast, exitFullscreen],
     );
 
     const handleVoicePress = useCallback(
@@ -1485,10 +1616,12 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         handleStopRealtimeVoice,
         toast,
         interruptBeforeVoiceMessage: t("composer.voice.interruptBeforeVoice"),
+        exitFullscreen,
       });
     }, [
       disabled,
       handleStopRealtimeVoice,
+      exitFullscreen,
       isAgentRunning,
       isConnected,
       t,
@@ -1572,10 +1705,10 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       if (isWeb) {
         webTextareaRef.current = getWebTextArea() as HTMLElement | null;
       }
-    }, [getWebTextArea]);
+    }, [getWebTextArea, isFullscreen]);
 
     usePasteImagesEffect({
-      getWebTextArea,
+      textarea: webTextArea,
       isConnected,
       disabled,
       isDictating,
@@ -1596,16 +1729,30 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     const shouldHandleWebKeyPress = isWeb;
     const shouldSubmitOnEnter = isWeb && !isCompact;
 
-    function handleDesktopKeyPress(event: WebTextInputKeyPressEvent) {
-      if (!shouldHandleWebKeyPress) return;
-      handleDesktopKeyPressImpl(event, {
+    const handleDesktopKeyPress = useCallback(
+      (event: WebTextInputKeyPressEvent) => {
+        if (!shouldHandleWebKeyPress) return;
+        handleDesktopKeyPressImpl(event, {
+          onKeyPressCallback,
+          input: getComposerInputSnapshot(
+            textInputRef.current,
+            valueRef.current,
+            selectionRef.current,
+          ),
+          submitOnEnter: shouldSubmitOnEnter,
+          isAgentRunning,
+          onQueue,
+          isSubmitDisabled,
+          isSubmitLoading,
+          disabled,
+          handleAlternateSendAction,
+          handleDefaultSendAction,
+        });
+      },
+      [
+        shouldHandleWebKeyPress,
         onKeyPressCallback,
-        input: getComposerInputSnapshot(
-          textInputRef.current,
-          valueRef.current,
-          selectionRef.current,
-        ),
-        submitOnEnter: shouldSubmitOnEnter,
+        shouldSubmitOnEnter,
         isAgentRunning,
         onQueue,
         isSubmitDisabled,
@@ -1613,8 +1760,8 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         disabled,
         handleAlternateSendAction,
         handleDefaultSendAction,
-      });
-    }
+      ],
+    );
 
     const primaryActionKind = resolvePrimaryActionKind({
       hasSendableContent: hasSendableComposerContent({
@@ -1678,16 +1825,18 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     );
 
     const handleInputFocus = useCallback(() => {
+      focusIntentRef.current = true;
       isInputFocusedRef.current = true;
       setIsInputFocused(true);
       onFocusChange?.(true);
     }, [onFocusChange]);
 
     const handleInputBlur = useCallback(() => {
+      if (activeComposerRef.current && !isFullscreen) focusIntentRef.current = false;
       isInputFocusedRef.current = false;
       setIsInputFocused(false);
       onFocusChange?.(false);
-    }, [onFocusChange]);
+    }, [isFullscreen, onFocusChange]);
 
     const handlePasteError = useCallback(
       (message: string) => {
@@ -1735,8 +1884,12 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     // `fontFamily` here is silently dropped while every other property lands.
     // An inline style outranks both classes. See docs/unistyles.md.
     const textInputStyle = useMemo(
-      () => [styles.textInput, mode.isMonospace && styles.textInputMonospace, composerHeightStyle],
-      [composerHeightStyle, mode.isMonospace],
+      () => [
+        styles.textInput,
+        mode.isMonospace && styles.textInputMonospace,
+        isFullscreen ? styles.fullscreenTextInput : composerHeightStyle,
+      ],
+      [composerHeightStyle, mode.isMonospace, isFullscreen],
     );
     // Static content has no textarea to mirror, so it grows with its own text
     // instead of the measured input height.
@@ -1780,107 +1933,192 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       [isDictating, isRealtimeVoiceForCurrentAgent, voice?.isMuted, buttonIconSize],
     );
 
-    return (
-      <View
-        ref={rootRef}
-        style={styles.container}
-        testID="message-input-root"
-        onLayout={handleComposerLayout}
-      >
-        <MessageInputAutoFocus
-          enabled={autoFocus}
-          autoFocusKey={autoFocusKey}
-          textInputRef={textInputRef}
+    const sendButton = useMemo(
+      () => (
+        <PrimaryAction
+          kind={isFullscreen ? "send" : primaryActionKind}
+          activeActionContent={activeActionContent}
+          shouldShow
+          canPressLoadingButton={canPressLoadingButton}
+          onSubmitLoadingPress={onSubmitLoadingPress}
+          onDefaultSendAction={handleDefaultSendAction}
+          isSendButtonDisabled={resolvePresentationSendDisabled({
+            fullscreen: isFullscreen,
+            disabled: isSendButtonDisabled,
+            hasText: hasLiveText,
+            attachments,
+            hasExternalContent,
+            allowEmpty: allowEmptySubmit,
+          })}
+          submitAccessibilityLabel={submitAccessibilityLabel}
+          sendButtonCombinedStyle={sendButtonCombinedStyle}
+          isSubmitLoading={isSubmitLoading}
+          submitIcon={submitIcon}
+          submitLabel={submitLabel}
+          submitButtonTestID={submitButtonTestID}
+          buttonIconSize={buttonIconSize}
+          sendKeys={DEFAULT_SEND_KEYS}
+          sendTooltipLabel={sendTooltipLabel}
         />
-        {/* Regular input */}
-        <View
-          ref={inputWrapperRef}
-          style={inputWrapperCombinedStyle}
-          pointerEvents={surfacePresentation.input.pointerEvents}
-        >
-          {attachmentSlot}
-          {/* Text input */}
-          <RenderProfile id="ComposerTextSurface">
-            <ComposerTextSurface
-              readOnly={readOnly}
-              value={value}
-              textInputRef={textInputRef}
-              textInputStyle={textInputStyle}
-              readOnlyTextStyle={readOnlyTextStyle}
-              placeholder={placeholder ?? t("composer.placeholders.fallback")}
-              accessibilityLabel={t(mode.accessibilityLabelKey)}
-              onChangeText={handleInputChange}
-              onFocus={handleInputFocus}
-              onBlur={handleInputBlur}
-              editable={!isDictating && !isRealtimeVoiceForCurrentAgent && !disabled}
-              scrollEnabled={isComposerScrollEnabled}
-              autoFocus={false}
-              onKeyPress={shouldHandleWebKeyPress ? handleDesktopKeyPress : undefined}
-              onSelectionChange={handleSelectionChange}
-              onPasteImages={onPasteImages}
-              onPasteError={handlePasteError}
-              focusHintVisible={isWeb && !isInputFocused && !value}
-              focusInputKeys={focusInputKeys}
-              focusHintLabel={t("composer.input.focusHint", {
-                shortcut: focusInputKeys ? formatShortcut(focusInputKeys[0], getShortcutOs()) : "",
-              })}
+      ),
+      [
+        isFullscreen,
+        primaryActionKind,
+        activeActionContent,
+        canPressLoadingButton,
+        onSubmitLoadingPress,
+        handleDefaultSendAction,
+        isSendButtonDisabled,
+        hasLiveText,
+        attachments,
+        hasExternalContent,
+        allowEmptySubmit,
+        submitAccessibilityLabel,
+        sendButtonCombinedStyle,
+        isSubmitLoading,
+        submitIcon,
+        submitLabel,
+        submitButtonTestID,
+        buttonIconSize,
+        sendTooltipLabel,
+      ],
+    );
+    const textSurface = useMemo(
+      () => (
+        <RenderProfile id="ComposerTextSurface">
+          <ComposerTextSurface
+            readOnly={readOnly}
+            value={
+              readOnly
+                ? value
+                : resolveComposerSurfaceText(
+                    valueRef.current,
+                    textReplacement,
+                    appliedTextReplacementKeyRef.current,
+                  )
+            }
+            textReplacementKey={textReplacement.key}
+            textInputRef={assignTextInput}
+            textInputStyle={textInputStyle}
+            readOnlyTextStyle={readOnlyTextStyle}
+            placeholder={placeholder ?? t("composer.placeholders.fallback")}
+            accessibilityLabel={t(mode.accessibilityLabelKey)}
+            onChangeText={handleInputChange}
+            onFocus={handleInputFocus}
+            onBlur={handleInputBlur}
+            editable={!isDictating && !isRealtimeVoiceForCurrentAgent && !disabled}
+            scrollEnabled={isComposerScrollEnabled}
+            autoFocus={
+              Boolean(editingSession.peekHandoff(textReplacement)?.focused) && isActiveComposer
+            }
+            onKeyPress={shouldHandleWebKeyPress ? handleDesktopKeyPress : undefined}
+            onSelectionChange={handleSelectionChange}
+            onPasteImages={onPasteImages}
+            onPasteError={handlePasteError}
+            fullscreen={isFullscreen}
+            compact={isCompact}
+            onRenderedLinesChange={setRenderedLines}
+            focusHintVisible={!isFullscreen && isWeb && !isInputFocused && !value}
+            focusInputKeys={focusInputKeys}
+            focusHintLabel={t("composer.input.focusHint", {
+              shortcut: focusInputKeys ? formatShortcut(focusInputKeys[0], getShortcutOs()) : "",
+            })}
+          />
+        </RenderProfile>
+      ),
+      [
+        readOnly,
+        textReplacement,
+        editingSession,
+        isActiveComposer,
+        assignTextInput,
+        textInputStyle,
+        readOnlyTextStyle,
+        placeholder,
+        t,
+        mode.accessibilityLabelKey,
+        handleInputChange,
+        handleInputFocus,
+        handleInputBlur,
+        isDictating,
+        isRealtimeVoiceForCurrentAgent,
+        disabled,
+        isComposerScrollEnabled,
+        shouldHandleWebKeyPress,
+        handleDesktopKeyPress,
+        handleSelectionChange,
+        onPasteImages,
+        handlePasteError,
+        isFullscreen,
+        isCompact,
+        isInputFocused,
+        value,
+        focusInputKeys,
+      ],
+    );
+    const toolbar = useMemo(
+      () => (
+        <View style={styles.buttonRow}>
+          {/* Toolbar left: attachment button + agent controls */}
+          <View style={styles.leftButtonGroup}>
+            <AttachmentDropdown
+              visible={mode.showAttachments}
+              isConnected={isConnected}
+              disabled={disabled}
+              attachButtonStyle={attachButtonStyle}
+              renderAttachButtonIcon={renderAttachButtonIcon}
+              attachmentMenuItems={attachmentMenuItems}
+              addAttachmentLabel={t("composer.input.addAttachment")}
             />
-          </RenderProfile>
+            {leftContent}
+          </View>
 
-          {/* Button row */}
-          <View style={styles.buttonRow}>
-            {/* Toolbar left: attachment button + agent controls */}
-            <View style={styles.leftButtonGroup}>
-              <AttachmentDropdown
-                visible={mode.showAttachments}
-                isConnected={isConnected}
-                disabled={disabled}
-                attachButtonStyle={attachButtonStyle}
-                renderAttachButtonIcon={renderAttachButtonIcon}
-                attachmentMenuItems={attachmentMenuItems}
-                addAttachmentLabel={t("composer.input.addAttachment")}
-              />
-              {leftContent}
-            </View>
-
-            {/* Right: voice button, contextual button (realtime/send/cancel) */}
-            <View style={styles.rightButtonGroup}>
-              {beforeVoiceContent}
-              <VoiceButtonTooltip
-                visible={mode.showVoice}
-                onVoicePress={handleVoicePress}
-                isDictationStartEnabled={isDictationStartEnabled}
-                voiceButtonAccessibilityLabel={voiceButtonAccessibilityLabel}
-                voiceButtonStyle={voiceButtonStyle}
-                renderVoiceButtonIcon={renderVoiceButtonIcon}
-                voiceTooltipText={voiceTooltipText}
-                isRealtimeVoiceForCurrentAgent={isRealtimeVoiceForCurrentAgent}
-                voiceMuteToggleKeys={voiceMuteToggleKeys}
-                dictationToggleKeys={dictationToggleKeys}
-              />
-              {rightContent}
-              <PrimaryAction
-                kind={primaryActionKind}
-                activeActionContent={activeActionContent}
-                shouldShow
-                canPressLoadingButton={canPressLoadingButton}
-                onSubmitLoadingPress={onSubmitLoadingPress}
-                onDefaultSendAction={handleDefaultSendAction}
-                isSendButtonDisabled={isSendButtonDisabled}
-                submitAccessibilityLabel={submitAccessibilityLabel}
-                sendButtonCombinedStyle={sendButtonCombinedStyle}
-                isSubmitLoading={isSubmitLoading}
-                submitIcon={submitIcon}
-                submitLabel={submitLabel}
-                submitButtonTestID={submitButtonTestID}
-                buttonIconSize={buttonIconSize}
-                sendKeys={DEFAULT_SEND_KEYS}
-                sendTooltipLabel={sendTooltipLabel}
-              />
-            </View>
+          {/* Right: voice button, contextual button (realtime/send/cancel) */}
+          <View style={styles.rightButtonGroup}>
+            {beforeVoiceContent}
+            <VoiceButtonTooltip
+              visible={mode.showVoice}
+              onVoicePress={handleVoicePress}
+              isDictationStartEnabled={isDictationStartEnabled}
+              voiceButtonAccessibilityLabel={voiceButtonAccessibilityLabel}
+              voiceButtonStyle={voiceButtonStyle}
+              renderVoiceButtonIcon={renderVoiceButtonIcon}
+              voiceTooltipText={voiceTooltipText}
+              isRealtimeVoiceForCurrentAgent={isRealtimeVoiceForCurrentAgent}
+              voiceMuteToggleKeys={voiceMuteToggleKeys}
+              dictationToggleKeys={dictationToggleKeys}
+            />
+            {rightContent}
+            {sendButton}
           </View>
         </View>
-
+      ),
+      [
+        mode.showAttachments,
+        isConnected,
+        disabled,
+        attachButtonStyle,
+        renderAttachButtonIcon,
+        attachmentMenuItems,
+        t,
+        leftContent,
+        beforeVoiceContent,
+        mode.showVoice,
+        handleVoicePress,
+        isDictationStartEnabled,
+        voiceButtonAccessibilityLabel,
+        voiceButtonStyle,
+        renderVoiceButtonIcon,
+        voiceTooltipText,
+        isRealtimeVoiceForCurrentAgent,
+        voiceMuteToggleKeys,
+        dictationToggleKeys,
+        rightContent,
+        sendButton,
+      ],
+    );
+    const voiceOverlay = useMemo(
+      () => (
         <View
           style={overlayContainerStyle}
           pointerEvents={surfacePresentation.overlay.pointerEvents}
@@ -1903,6 +2141,62 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
             onRealtimeVoiceStop={handleRealtimeVoiceStop}
           />
         </View>
+      ),
+      [
+        overlayContainerStyle,
+        surfacePresentation.overlay.pointerEvents,
+        showDictationOverlay,
+        showRealtimeOverlay,
+        voice,
+        dictationVolume,
+        dictationDuration,
+        isDictating,
+        isDictationProcessing,
+        dictationStatus,
+        dictationError,
+        handleCancelRecording,
+        handleAcceptRecording,
+        handleAcceptAndSendRecording,
+        handleRetryFailedRecording,
+        handleDiscardFailedRecording,
+        handleRealtimeVoiceStop,
+      ],
+    );
+    const enterFullscreen = useCallback(() => changePresentation(true), [changePresentation]);
+    return (
+      <View
+        ref={rootRef}
+        style={styles.container}
+        testID="message-input-root"
+        onLayout={handleComposerLayout}
+      >
+        <MessageInputAutoFocus
+          enabled={autoFocus}
+          autoFocusKey={autoFocusKey}
+          textInputRef={textInputRef}
+        />
+        <ComposerInputPresentation
+          fullscreen={isFullscreen}
+          iconSize={buttonIconSize}
+          active={isActiveComposer}
+          surface={textSurface}
+          toolbar={toolbar}
+          send={sendButton}
+          error={props.submissionError}
+          onExit={exitFullscreen}
+          inputWrapperRef={inputWrapperRef}
+          inputWrapperStyle={inputWrapperCombinedStyle}
+          inputPointerEvents={surfacePresentation.input.pointerEvents}
+          attachmentSlot={attachmentSlot}
+          showFullscreenButton={shouldShowFullscreenControl(
+            isCompact,
+            readOnly,
+            showOverlay,
+            renderedLines,
+          )}
+          onEnter={enterFullscreen}
+          overlay={voiceOverlay}
+        />
       </View>
     );
   },
@@ -1947,6 +2241,19 @@ const styles = StyleSheet.create((theme: Theme) => ({
   inputWrapperReadOnly: {
     borderStyle: "dotted",
   },
+  compactTextSurface: { paddingRight: 36 },
+  fullscreenTextSurface: { flex: 1, minHeight: 0 },
+  fullscreenTextInput: { flex: 1, height: "100%", textAlignVertical: "top" },
+  lineMeasurement: {
+    position: "absolute",
+    top: 0,
+    left: 0,
+    right: 36,
+    opacity: 0,
+    maxHeight: undefined,
+    minHeight: undefined,
+    height: undefined,
+  },
   textInputScrollWrapper: {
     flexShrink: 1,
     position: "relative",
diff --git a/packages/app/src/composer/input/presentation.tsx b/packages/app/src/composer/input/presentation.tsx
new file mode 100644
index 0000000000..d02821696a
--- /dev/null
+++ b/packages/app/src/composer/input/presentation.tsx
@@ -0,0 +1,146 @@
+import { useCallback, useMemo, type ReactNode, type Ref } from "react";
+import { View, type ViewProps } from "react-native";
+import { Maximize2, Minimize2 } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
+import { isWeb } from "@/constants/platform";
+import { StyleSheet } from "react-native-unistyles";
+import { ComposerFullscreenHost } from "./fullscreen-host";
+
+function keepEditorFocused(event: import("react-native").PointerEvent) {
+  if (isWeb) event.preventDefault();
+}
+
+/** Both presentations receive the same editing surface and send capability. */
+export function ComposerInputPresentation({
+  fullscreen,
+  iconSize,
+  active,
+  surface,
+  toolbar,
+  send,
+  error,
+  onExit,
+  inputWrapperRef,
+  inputWrapperStyle,
+  inputPointerEvents,
+  attachmentSlot,
+  showFullscreenButton,
+  onEnter,
+  overlay,
+}: {
+  fullscreen: boolean;
+  iconSize: number;
+  active: boolean;
+  surface: ReactNode;
+  toolbar: ReactNode;
+  send: ReactNode;
+  error: ReactNode;
+  onExit: () => void;
+  inputWrapperRef: Ref<View>;
+  inputWrapperStyle: ViewProps["style"];
+  inputPointerEvents: ViewProps["pointerEvents"];
+  attachmentSlot: ReactNode;
+  showFullscreenButton: boolean;
+  onEnter: () => void;
+  overlay: ReactNode;
+}) {
+  const { t } = useTranslation();
+  // ArrowUp ends at x19; the fullscreen glyphs end at x21 in Lucide's 24px viewBox.
+  // Compensate for that difference to align visible ink with Send, not just boxes.
+  const railAdjustment = iconSize / 12;
+  const maximizeIcon = useCallback(
+    (color: string) => <Maximize2 color={color} size={iconSize} />,
+    [iconSize],
+  );
+  const minimizeIcon = useCallback(
+    (color: string) => <Minimize2 color={color} size={iconSize} />,
+    [iconSize],
+  );
+  const enterStyle = useMemo(
+    () => [styles.fullscreenButton, { right: -6 + railAdjustment }],
+    [railAdjustment],
+  );
+  const exitStyle = useMemo(
+    () => [styles.iconButton, { marginRight: railAdjustment }],
+    [railAdjustment],
+  );
+  if (!fullscreen)
+    return (
+      <>
+        <View ref={inputWrapperRef} style={inputWrapperStyle} pointerEvents={inputPointerEvents}>
+          {attachmentSlot}
+          <View style={styles.inlineTextSurface}>
+            {surface}
+            {showFullscreenButton ? (
+              <Button
+                variant="ghost"
+                size="xs"
+                accessibilityLabel={t("composer.input.fullscreen")}
+                leftIcon={maximizeIcon}
+                onPointerDown={keepEditorFocused}
+                onPress={onEnter}
+                style={enterStyle}
+                hitSlop={8}
+              >
+                {null}
+              </Button>
+            ) : null}
+          </View>
+          {toolbar}
+        </View>
+        {overlay}
+      </>
+    );
+  return (
+    <ComposerFullscreenHost onExit={onExit} active={active}>
+      <View style={styles.fullscreen} testID="composer-fullscreen">
+        <View style={styles.exitRow}>
+          <Button
+            variant="ghost"
+            size="xs"
+            accessibilityLabel={t("composer.input.exitFullscreen")}
+            onPointerDown={keepEditorFocused}
+            onPress={onExit}
+            style={exitStyle}
+            leftIcon={minimizeIcon}
+            hitSlop={8}
+          >
+            {null}
+          </Button>
+        </View>
+        {surface}
+        {error}
+        <View style={styles.sendRow}>{send}</View>
+      </View>
+    </ComposerFullscreenHost>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  inlineTextSurface: { flexShrink: 1, position: "relative" },
+  iconButton: {
+    width: 28,
+    height: 28,
+    padding: 0,
+    borderWidth: 0,
+    borderRadius: theme.borderRadius.full,
+  },
+  fullscreenButton: {
+    position: "absolute",
+    top: 0,
+    width: 28,
+    height: 28,
+    padding: 0,
+    borderWidth: 0,
+    borderRadius: theme.borderRadius.full,
+  },
+  fullscreen: {
+    flex: 1,
+    backgroundColor: theme.colors.surface1,
+    padding: theme.spacing[4],
+    gap: theme.spacing[3],
+  },
+  exitRow: { alignItems: "flex-end", flexShrink: 0 },
+  sendRow: { flexShrink: 0, alignItems: "flex-end" },
+}));
diff --git a/packages/app/src/composer/input/state.test.ts b/packages/app/src/composer/input/state.test.ts
index 5503ea1512..a7f4113b28 100644
--- a/packages/app/src/composer/input/state.test.ts
+++ b/packages/app/src/composer/input/state.test.ts
@@ -4,6 +4,7 @@ import {
   computeCanStartDictation,
   resolveActiveSendBehavior,
   resolveComposerSurfacePresentation,
+  resolveComposerSurfaceText,
   runAlternateSendAction,
   runDefaultSendAction,
   runMessageInputKeyboardAction,
@@ -316,3 +317,26 @@ describe("stopRealtimeVoice", () => {
     expect(calls).toEqual(["cancel agent", "stop voice"]);
   });
 });
+
+describe("composer surface text", () => {
+  it("measures a new nonempty replacement before it reaches the editing handle", () => {
+    const replacement = { kind: "replace" as const, key: "draft:2", text: "First\nSecond\nThird" };
+    expect(resolveComposerSurfaceText("Short draft", replacement, "draft:1")).toBe(
+      replacement.text,
+    );
+  });
+
+  it("keeps live typing once the replacement is applied", () => {
+    const replacement = { kind: "replace" as const, key: "draft:2", text: "First\nSecond\nThird" };
+    expect(resolveComposerSurfaceText("Edited live draft", replacement, "draft:2")).toBe(
+      "Edited live draft",
+    );
+  });
+
+  it("uses the live handoff when its replacement has already been applied", () => {
+    const replacement = { kind: "initial" as const, key: "draft:0", text: "Stale publication" };
+    expect(resolveComposerSurfaceText("Live remount handoff", replacement, "draft:0")).toBe(
+      "Live remount handoff",
+    );
+  });
+});
diff --git a/packages/app/src/composer/input/state.ts b/packages/app/src/composer/input/state.ts
index a63aeb02dc..3786613eb2 100644
--- a/packages/app/src/composer/input/state.ts
+++ b/packages/app/src/composer/input/state.ts
@@ -1,6 +1,6 @@
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { ActiveTurnBehavior } from "@getpaseo/protocol/messages";
-import type { MessagePayload } from "@/composer/types";
+import type { MessagePayload, TextReplacement } from "@/composer/types";
 import type { MessageInputKeyboardActionKind } from "@/keyboard/actions";
 
 export type SendBehavior = ActiveTurnBehavior | "queue";
@@ -192,3 +192,11 @@ export async function stopRealtimeVoice(ctx: StopRealtimeVoiceContext): Promise<
 
   await ctx.voice.stopVoice();
 }
+
+export function resolveComposerSurfaceText(
+  liveText: string,
+  replacement: TextReplacement,
+  appliedReplacementKey: string,
+): string {
+  return replacement.key === appliedReplacementKey ? liveText : replacement.text;
+}
diff --git a/packages/app/src/composer/input/text-input.web.browser.test.tsx b/packages/app/src/composer/input/text-input.web.browser.test.tsx
index 6e70fa3edf..29df20012c 100644
--- a/packages/app/src/composer/input/text-input.web.browser.test.tsx
+++ b/packages/app/src/composer/input/text-input.web.browser.test.tsx
@@ -96,6 +96,35 @@ describe("ComposerTextInput web IME composition", () => {
     expect(document.activeElement).toBe(mounted.textarea);
   });
 
+  it("keeps its editing handle and selection across a rerender during composition", () => {
+    const recorder = createTextRecorder();
+    const mounted = mountInput(recorder.onChangeText);
+    const handle = mounted.inputRef.current;
+    act(() => {
+      handle?.focus();
+      dispatchComposition(mounted.textarea, "compositionstart");
+      typeFromIme(mounted.textarea, "你好");
+      mounted.textarea.setSelectionRange(1, 2);
+      mounted.root.render(
+        <ComposerTextInput
+          ref={mounted.inputRef}
+          initialValue="stale publication"
+          multiline
+          onChangeText={recorder.onChangeText}
+          placeholder="updated presentation"
+        />,
+      );
+    });
+    expect(mounted.inputRef.current).toBe(handle);
+    expect(handle?.getNativeRef()).toBe(mounted.textarea);
+    expect([mounted.textarea.selectionStart, mounted.textarea.selectionEnd]).toEqual([1, 2]);
+    expect(document.activeElement).toBe(mounted.textarea);
+    expect(recorder.changes).toEqual([]);
+    act(() => dispatchComposition(mounted.textarea, "compositionend"));
+    expect(recorder.changes).toEqual(["你好"]);
+    expect(handle?.getText()).toBe("你好");
+  });
+
   it("keeps locally typed text when its parent rerenders with a stale value", () => {
     const recorder = createTextRecorder();
     const mounted = mountInput(recorder.onChangeText);
diff --git a/packages/app/src/composer/types.ts b/packages/app/src/composer/types.ts
index 2f03b7e89a..ee01144ed7 100644
--- a/packages/app/src/composer/types.ts
+++ b/packages/app/src/composer/types.ts
@@ -10,6 +10,7 @@ export interface MessagePayload {
 }
 
 export interface TextReplacement {
+  kind: "initial" | "replace";
   key: string;
   text: string;
 }
diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index 79355f7110..ca402264f2 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -124,6 +124,8 @@ export const ar: TranslationResources = {
     input: {
       accessibilityLabel: "وكيل الرسائل...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "ملء الشاشة",
+      exitFullscreen: "الخروج من ملء الشاشة",
       focusHint: "{{shortcut}}للتركيز",
       addAttachment: "إضافة مرفق",
       interruptAgent: "عامل المقاطعة",
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 35606c853e..92dbb3f78c 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -120,6 +120,8 @@ export const en = {
     input: {
       accessibilityLabel: "Message agent...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "Fullscreen",
+      exitFullscreen: "Exit fullscreen",
       focusHint: "{{shortcut}} to focus",
       addAttachment: "Add attachment",
       interruptAgent: "Interrupt agent",
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index 721b56cbec..bc53c8b2aa 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -125,6 +125,8 @@ export const es: TranslationResources = {
     input: {
       accessibilityLabel: "Agente de mensajes...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "Pantalla completa",
+      exitFullscreen: "Salir de pantalla completa",
       focusHint: "{{shortcut}}para enfocar",
       addAttachment: "Agregar archivo adjunto",
       interruptAgent: "agente de interrupción",
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index 0e8937d4d8..78a9b2e82b 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -126,6 +126,8 @@ export const fr: TranslationResources = {
     input: {
       accessibilityLabel: "Écrire à l’agent…",
       terminalAccessibilityLabel: "Prompt du terminal",
+      fullscreen: "Plein écran",
+      exitFullscreen: "Quitter le plein écran",
       focusHint: "{{shortcut}} pour saisir",
       addAttachment: "Ajouter une pièce jointe",
       interruptAgent: "Interrompre l’agent",
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index 076ac32536..9899d0ff2b 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -125,6 +125,8 @@ export const ja: TranslationResources = {
     input: {
       accessibilityLabel: "エージェントにメッセージ...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "全画面表示",
+      exitFullscreen: "全画面表示を終了",
       focusHint: "{{shortcut}}でフォーカス",
       addAttachment: "添付ファイルを追加",
       interruptAgent: "エージェントを中断",
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index 8b832de6e8..c6a8f17b3c 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -124,6 +124,8 @@ export const ko: TranslationResources = {
     input: {
       accessibilityLabel: "에이전트에게 메시지...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "전체 화면",
+      exitFullscreen: "전체 화면 종료",
       focusHint: "{{shortcut}}로 포커스",
       addAttachment: "첨부 추가",
       interruptAgent: "에이전트 중단",
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index 0bc2968560..66a25e9f03 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -125,6 +125,8 @@ export const ptBR: TranslationResources = {
     input: {
       accessibilityLabel: "Enviar mensagem ao agente...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "Tela cheia",
+      exitFullscreen: "Sair da tela cheia",
       focusHint: "{{shortcut}} para focar",
       addAttachment: "Adicionar anexo",
       interruptAgent: "Interromper agente",
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index afd0ffad95..c06e53eda0 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -125,6 +125,8 @@ export const ru: TranslationResources = {
     input: {
       accessibilityLabel: "Написать агенту...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "Полный экран",
+      exitFullscreen: "Выйти из полноэкранного режима",
       focusHint: "{{shortcut}}, для фокуса",
       addAttachment: "Добавить вложение",
       interruptAgent: "Прервать агента",
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index 9398e6020d..27a0d62ac1 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -124,6 +124,8 @@ export const zhCN: TranslationResources = {
     input: {
       accessibilityLabel: "给 Agent 发消息...",
       terminalAccessibilityLabel: "Terminal prompt",
+      fullscreen: "全屏",
+      exitFullscreen: "退出全屏",
       focusHint: "{{shortcut}} 聚焦",
       addAttachment: "添加附件",
       interruptAgent: "中断 Agent",
diff --git a/packages/app/src/screens/new-workspace-screen.tsx b/packages/app/src/screens/new-workspace-screen.tsx
index 27c96c08b8..1cf8d76f23 100644
--- a/packages/app/src/screens/new-workspace-screen.tsx
+++ b/packages/app/src/screens/new-workspace-screen.tsx
@@ -1723,7 +1723,7 @@ export function NewWorkspaceScreen({
     [terminalComposerValue],
   );
   const terminalTextReplacement = useMemo(
-    () => ({ key: launchFocusKey, text: terminalComposerValue }),
+    () => ({ kind: "replace" as const, key: launchFocusKey, text: terminalComposerValue }),
     [launchFocusKey, terminalComposerValue],
   );
 
diff --git a/packages/app/src/screens/workspace/workspace-pane-content.tsx b/packages/app/src/screens/workspace/workspace-pane-content.tsx
index e9534769b3..0ef496a94b 100644
--- a/packages/app/src/screens/workspace/workspace-pane-content.tsx
+++ b/packages/app/src/screens/workspace/workspace-pane-content.tsx
@@ -1,3 +1,4 @@
+import { ComposerEditingScope } from "@/composer/editing-session";
 import React, { useMemo, type ComponentType } from "react";
 import invariant from "tiny-invariant";
 import {
@@ -156,7 +157,12 @@ export function WorkspacePaneContent({
     >
       <PaneProvider value={stablePaneContextValue}>
         <PaneFocusProvider value={paneFocusValue}>
-          <Component key={key} />
+          <ComposerEditingScope
+            tabId={paneContextValue.tabId}
+            targetKey={JSON.stringify(paneContextValue.target)}
+          >
+            <Component key={key} />
+          </ComposerEditingScope>
         </PaneFocusProvider>
       </PaneProvider>
     </RenderProfile>
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index dacc17fd3b..55a186cbab 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -1,3 +1,4 @@
+import { WorkspaceComposerEditingSessionsProvider } from "@/composer/editing-session";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import type { JsonValue } from "@getpaseo/protocol/agent-types";
 import { getOpenAgentTabLabel } from "@getpaseo/protocol/agent-labels";
@@ -753,14 +754,20 @@ function WorkspaceContentProviders({
 function WorkspacePanelContent({
   launcher,
   content,
+  tabIds,
+  workspaceKey,
 }: {
+  workspaceKey: string;
   launcher: NewTabLauncher;
   content: ReactNode;
+  tabIds: readonly string[];
 }) {
   return (
-    <NewTabLauncherProvider value={launcher}>
-      <View style={styles.content}>{content}</View>
-    </NewTabLauncherProvider>
+    <WorkspaceComposerEditingSessionsProvider workspaceKey={workspaceKey} tabIds={tabIds}>
+      <NewTabLauncherProvider value={launcher}>
+        <View style={styles.content}>{content}</View>
+      </NewTabLauncherProvider>
+    </WorkspaceComposerEditingSessionsProvider>
   );
 }
 
@@ -3491,6 +3498,8 @@ function WorkspaceScreenContent({
   const workspacePanelContent = (
     <WorkspacePanelContent
       launcher={newTabLauncher}
+      workspaceKey={`${normalizedServerId}:${normalizedWorkspaceId}`}
+      tabIds={uiTabs.map((tab) => tab.tabId)}
       content={isMobile ? content : desktopContent}
     />
   );

From 99e4b53aa093a9e1eb6569d69eeec863cc90aa6e Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 12:10:54 +0200
Subject: [PATCH 113/270] fix(app): restore outline jumps to prompts rendered
 by plugins (#6690)

* fix(app): jump the chat outline to prompts a timeline plugin draws

A timeline transformer replaces a stream item with plugin rows whose ids
are "<pluginId>/<itemId>". The chat outline, chat find and history reveal
look a message up by the source item's id, so once a plugin drew the
prompts the outline found no row: the rail showed the prompts and
clicking one did nothing, for mounted, virtualized and unloaded prompts
alike.

Projected plugin rows now carry the id of the item they replaced, and
getStreamItemMessageId answers with it. Row wrappers, the virtualized
index lookup, the visible-message set and history reveal all read that
function, so they now find the plugin row.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* test(app): verify outline jumps to virtualized plugin prompts

Replacing every prompt keeps all loaded rows mounted, so the original plugin regression never exercised a virtualized target. Retain newer native prompts and verify that a loaded unmounted plugin prompt lands without fetching.

Co-authored-by: luopeihuan <luopeihuan@roundreddot.com>

* test(app): retain outline navigation screenshots

---------

Co-authored-by: luopeihuan <luopeihuan@roundreddot.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/e2e/browser/chat-outline.spec.ts |  60 ++++++++
 .../e2e/support/helpers/plugin-timeline.ts    | 145 ++++++++++++++----
 .../app/src/agent-stream/presentation.test.ts |  21 ++-
 packages/app/src/agent-stream/presentation.ts |   8 +-
 .../app/src/plugins/timeline/projection.ts    |   1 +
 packages/app/src/types/stream.ts              |   2 +
 6 files changed, 205 insertions(+), 32 deletions(-)

diff --git a/packages/app/e2e/browser/chat-outline.spec.ts b/packages/app/e2e/browser/chat-outline.spec.ts
index 9dd3c33313..640b141f53 100644
--- a/packages/app/e2e/browser/chat-outline.spec.ts
+++ b/packages/app/e2e/browser/chat-outline.spec.ts
@@ -25,6 +25,12 @@ import {
   expectReadingStreamedMarkdown,
 } from "../support/helpers/chat-outline";
 import { createCreationScenario } from "../support/helpers/creation";
+import {
+  attachPromptTimelineEvidence,
+  expectPromptsDrawnByPlugin,
+  expectVirtualizedPluginPromptVisible,
+  withPromptTimelinePlugin,
+} from "../support/helpers/plugin-timeline";
 import {
   expectTimelineAtMaximumScrollWithPromptVisible,
   expectTimelinePromptNotMounted,
@@ -105,6 +111,60 @@ test.describe("desktop chat outline", () => {
     }
   });
 
+  test("jumps to prompts a timeline plugin draws", async ({ page }) => {
+    test.setTimeout(180_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    try {
+      await withPromptTimelinePlugin(async () => {
+        await page.setViewportSize(WIDE_VIEWPORT);
+        await openAgentTimeline(page, agent);
+        await expectChatOutlinePrompts(page, 80);
+        await expectPromptsDrawnByPlugin(page);
+        await expectTimelinePromptNotMounted(page, agent.prompts[39]);
+
+        // Unloaded, then loaded, then near the newest edge.
+        await clickChatOutlineRowEdge(page, 40);
+        await expectTimelinePromptLandedBelowTop(page, agent.prompts[39]);
+        await attachPromptTimelineEvidence(page, test.info());
+        await clickChatOutlineRowEdge(page, 45);
+        await expectTimelinePromptLandedBelowTop(page, agent.prompts[44]);
+        await clickChatOutlineRowEdge(page, 78);
+        await expectTimelineAtMaximumScrollWithPromptVisible(page, agent.prompts[77]);
+        await expectPromptsDrawnByPlugin(page);
+      });
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("jumps to a loaded virtualized prompt a timeline plugin draws without fetching", async ({
+    page,
+  }) => {
+    test.setTimeout(180_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    const prompt = agent.prompts[29]!;
+    try {
+      await withPromptTimelinePlugin(async () => {
+        const history = await holdOlderHistoryPages(page, agent);
+        await page.setViewportSize(WIDE_VIEWPORT);
+        await openAgentTimeline(page, agent);
+        await expectChatOutlinePrompts(page, 80);
+        await scrollThroughOlderHistoryPages(page, 2, history);
+        await scrollTimelineToNewestLoadedEdge(page);
+        await expectTimelinePromptNotMounted(page, prompt);
+        const requestsBeforeJump = history.requestCount();
+
+        await clickChatOutlineRowEdge(page, 30);
+        await expectTimelinePromptLandedBelowTop(page, prompt);
+        await expectVirtualizedPluginPromptVisible(page, prompt);
+        await attachPromptTimelineEvidence(page, test.info());
+        expect(history.requestCount()).toBe(requestsBeforeJump);
+      }, [prompt]);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
   test.describe("with the whole conversation loaded", () => {
     let agent: LongTimelineAgent;
 
diff --git a/packages/app/e2e/support/helpers/plugin-timeline.ts b/packages/app/e2e/support/helpers/plugin-timeline.ts
index d6656f3d3a..8ad7e0a632 100644
--- a/packages/app/e2e/support/helpers/plugin-timeline.ts
+++ b/packages/app/e2e/support/helpers/plugin-timeline.ts
@@ -47,6 +47,65 @@ export default function contribute(client) {
   return () => {};
 }`;
 
+const PROMPT_PLUGIN_ID = "timeline-prompt-e2e";
+
+function promptClientSource(prompts?: readonly string[]): string {
+  return `import React from "react";
+import { Text, View } from "react-native";
+import { z } from "zod";
+
+const selectedPrompts = ${JSON.stringify(prompts ?? null)};
+
+function PromptCard({ item }) {
+  return <View testID="plugin-prompt"><Text>{item.data.text}</Text></View>;
+}
+
+export default function contribute(client) {
+  client.addTimelineTransformer({
+    id: "prompt",
+    query: { itemType: "user_message" },
+    transform({ item }) {
+      if (selectedPrompts && !selectedPrompts.includes(item.text)) return undefined;
+      return { items: [{ type: "plugin", kind: "prompt", version: 1, data: { text: item.text } }] };
+    },
+  });
+  client.addTimelineRenderer({
+    kind: "prompt", version: 1,
+    schema: z.object({ text: z.string() }),
+    Component: PromptCard,
+  });
+  return () => {};
+}`;
+}
+
+async function withDirectoryPlugin(options: {
+  pluginId: string;
+  source: string;
+  run: () => Promise<void>;
+}): Promise<void> {
+  const { pluginId, source, run } = options;
+  const directory = await mkdtemp(path.join(tmpdir(), "paseo-timeline-plugin-"));
+  const pluginClient = await connectNewWorkspaceDaemonClient({ ownProjects: false });
+  const previous = await pluginClient.getDaemonConfig();
+  try {
+    await writeFile(
+      path.join(directory, "paseo-plugin.json"),
+      JSON.stringify({ id: pluginId, requirements: pluginRequirements }),
+    );
+    await writeFile(path.join(directory, "index.client.tsx"), source);
+    await pluginClient.patchDaemonConfig({ pluginsEnabled: true });
+    await pluginClient.installDirectoryPlugin(directory);
+    await run();
+  } finally {
+    await pluginClient.removePlugin(pluginId);
+    await pluginClient.patchDaemonConfig({
+      pluginsEnabled: previous.config.pluginsEnabled ?? false,
+    });
+    await pluginClient.close();
+    await rm(directory, { recursive: true, force: true });
+  }
+}
+
 export async function withTimelinePlugin(
   page: Page,
   info: TestInfo,
@@ -60,7 +119,6 @@ export async function withTimelinePlugin(
       JSON.stringify({ toolCallDetailLevel: "overview" }),
     );
   });
-  const directory = await mkdtemp(path.join(tmpdir(), "paseo-timeline-plugin-"));
   const agent = await seedMockAgentWorkspace({
     repoPrefix: "timeline-plugin-",
     title: "Timeline plugin regression",
@@ -73,40 +131,53 @@ export async function withTimelinePlugin(
           }
         : {},
   });
-  const pluginClient = await connectNewWorkspaceDaemonClient({ ownProjects: false });
-  const previous = await pluginClient.getDaemonConfig();
   try {
-    await writeFile(
-      path.join(directory, "paseo-plugin.json"),
-      JSON.stringify({ id: PLUGIN_ID, requirements: pluginRequirements }),
-    );
-    await writeFile(path.join(directory, "index.client.tsx"), CLIENT_SOURCE);
-    await pluginClient.patchDaemonConfig({ pluginsEnabled: true });
-    await pluginClient.installDirectoryPlugin(directory);
-    await openAgentRoute(page, agent);
-    await expect(page.getByRole("textbox", { name: "Message agent..." }).first()).toBeVisible();
-    await run(agent);
-    await info.attach("timeline-plugin", {
-      body: await page.screenshot({ path: info.outputPath("timeline-plugin.png") }),
-      contentType: "image/png",
+    await withDirectoryPlugin({
+      pluginId: PLUGIN_ID,
+      source: CLIENT_SOURCE,
+      run: async () => {
+        try {
+          await openAgentRoute(page, agent);
+          await expect(
+            page.getByRole("textbox", { name: "Message agent..." }).first(),
+          ).toBeVisible();
+          await run(agent);
+          await info.attach("timeline-plugin", {
+            body: await page.screenshot({ path: info.outputPath("timeline-plugin.png") }),
+            contentType: "image/png",
+          });
+        } catch (error) {
+          await info.attach("timeline-before-cleanup", {
+            body: await page.screenshot({ path: info.outputPath("timeline-before-cleanup.png") }),
+            contentType: "image/png",
+          });
+          throw error;
+        }
+      },
     });
-  } catch (error) {
-    await info.attach("timeline-before-cleanup", {
-      body: await page.screenshot({ path: info.outputPath("timeline-before-cleanup.png") }),
-      contentType: "image/png",
-    });
-    throw error;
   } finally {
-    await pluginClient.removePlugin(PLUGIN_ID);
-    await pluginClient.patchDaemonConfig({
-      pluginsEnabled: previous.config.pluginsEnabled ?? false,
-    });
-    await pluginClient.close();
     await agent.cleanup();
-    await rm(directory, { recursive: true, force: true });
   }
 }
 
+/** Draws all prompts, or only the selected prompts, as plugin cards. */
+export async function withPromptTimelinePlugin(
+  run: () => Promise<void>,
+  prompts?: readonly string[],
+): Promise<void> {
+  await withDirectoryPlugin({
+    pluginId: PROMPT_PLUGIN_ID,
+    source: promptClientSource(prompts),
+    run,
+  });
+}
+
+export async function expectPromptsDrawnByPlugin(page: Page): Promise<void> {
+  const timeline = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
+  await expect(timeline.getByTestId("plugin-prompt").first()).toBeVisible({ timeout: 30_000 });
+  await expect(timeline.getByTestId("user-message")).toHaveCount(0);
+}
+
 export async function requestPluginTimeline(agent: MockAgentWorkspace): Promise<void> {
   await agent.client.sendAgentMessage(agent.agentId, "Exercise timeline transforms.");
 }
@@ -142,3 +213,21 @@ export async function expectBothConsecutiveTools(page: Page): Promise<void> {
   await grep.scrollIntoViewIfNeeded();
   await expect(grep).toBeVisible();
 }
+
+/** The row belongs to the virtualized history, not the always-mounted recent window. */
+export async function expectVirtualizedPluginPromptVisible(
+  page: Page,
+  prompt: string,
+): Promise<void> {
+  const timeline = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
+  await expect(
+    timeline.locator("[data-index]").getByTestId("plugin-prompt").filter({ hasText: prompt }),
+  ).toBeVisible();
+}
+
+export async function attachPromptTimelineEvidence(page: Page, info: TestInfo): Promise<void> {
+  await info.attach("plugin-outline-jump", {
+    body: await page.screenshot({ path: info.outputPath("plugin-outline-jump.png") }),
+    contentType: "image/png",
+  });
+}
diff --git a/packages/app/src/agent-stream/presentation.test.ts b/packages/app/src/agent-stream/presentation.test.ts
index 54160ebcb9..70ed8862ae 100644
--- a/packages/app/src/agent-stream/presentation.test.ts
+++ b/packages/app/src/agent-stream/presentation.test.ts
@@ -11,7 +11,7 @@ import {
   type UserMessageItem,
 } from "@/types/stream";
 import { transformTimelineItem, type TimelineItemTransform } from "@/plugins/timeline/model";
-import { createStreamPresentation } from "./presentation";
+import { createStreamPresentation, getStreamItemMessageId } from "./presentation";
 import { buildAgentStreamRenderModel } from "./model";
 
 const runtime = {
@@ -29,7 +29,7 @@ const runtime = {
 } as unknown as PluginClientRuntime;
 
 function installProbe(
-  itemType: "assistant_message" | "tool_call" | "reasoning",
+  itemType: "user_message" | "assistant_message" | "tool_call" | "reasoning",
   condition = "true",
 ): InstalledPlugin {
   const clientBundle = `(function() {
@@ -160,6 +160,23 @@ describe("stream presentation through installed plugins", () => {
     },
   );
 
+  it("addresses a prompt a plugin replaced by the prompt's own id", () => {
+    const harness = streamHarness(installedTransform(installProbe("user_message")));
+    const rendered = rows(
+      harness.send({
+        type: "timeline",
+        provider: "claude",
+        item: { type: "user_message", messageId: "prompt-1", text: "Earlier prompt" },
+      }),
+    );
+    const source = rows(harness.source());
+
+    expect(source).toMatchObject([{ kind: "user_message", id: "prompt-1" }]);
+    expect(rendered).toMatchObject([{ kind: "plugin", id: "probe-plugin/prompt-1/0" }]);
+    // The chat outline jumps to the source id; the row it lands on is the plugin's.
+    expect(rendered.map(getStreamItemMessageId)).toEqual(["prompt-1"]);
+  });
+
   it("finishes one message before streaming a different message ID", () => {
     const harness = streamHarness(installedTransform(installProbe("assistant_message")));
     harness.send(assistant("First\n\nBody", "first"));
diff --git a/packages/app/src/agent-stream/presentation.ts b/packages/app/src/agent-stream/presentation.ts
index 8300996348..b89f91f6c0 100644
--- a/packages/app/src/agent-stream/presentation.ts
+++ b/packages/app/src/agent-stream/presentation.ts
@@ -26,10 +26,14 @@ function retainItems(previous: StreamItem[], next: StreamItem[]): StreamItem[] {
 /**
  * The source message a display row belongs to. Every assistant message is split into
  * Markdown blocks, so an assistant row id never equals its message id; anything that
- * addresses a message — find, scroll-to-message, history reveal — asks for this.
+ * addresses a message — find, scroll-to-message, history reveal — asks for this. A
+ * plugin row a timeline transformer projected answers for the item it replaced, whose
+ * id is what the chat outline and find hold.
  */
 export function getStreamItemMessageId(item: StreamItem): string {
-  return item.kind === "assistant_message" ? (item.blockGroupId ?? item.id) : item.id;
+  if (item.kind === "assistant_message") return item.blockGroupId ?? item.id;
+  if (item.kind === "plugin") return item.sourceId ?? item.id;
+  return item.id;
 }
 
 /**
diff --git a/packages/app/src/plugins/timeline/projection.ts b/packages/app/src/plugins/timeline/projection.ts
index 22f65f05a0..0750bdb66a 100644
--- a/packages/app/src/plugins/timeline/projection.ts
+++ b/packages/app/src/plugins/timeline/projection.ts
@@ -104,6 +104,7 @@ function transformSourceItem(
     const projected: PluginTimelineStreamItem = {
       kind: "plugin",
       id: `${pluginItem.pluginId}/${pluginItem.id}`,
+      sourceId: item.id,
       timestamp: item.timestamp,
       pluginId: pluginItem.pluginId,
       pluginItemId: pluginItem.id,
diff --git a/packages/app/src/types/stream.ts b/packages/app/src/types/stream.ts
index 7b057b0c4c..56cf14558b 100644
--- a/packages/app/src/types/stream.ts
+++ b/packages/app/src/types/stream.ts
@@ -804,6 +804,8 @@ export interface CompactionItem {
 export interface PluginTimelineStreamItem {
   kind: "plugin";
   id: string;
+  /** The id of the stream item a timeline transformer replaced; set only by projection. */
+  sourceId?: string;
   timelineCursor?: TimelinePosition;
   turnId?: string;
   timestamp: Date;

From a2b040869d6494277fc071b4555a8506d88d9525 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 12:59:46 +0200
Subject: [PATCH 114/270] fix(claude): count input reported late in the context
 meter (#6703)

* fix(claude): read cumulative input usage from message_delta

The context meter took input_tokens only from message_start. Backends behind a
translating gateway report 0 there and the real cumulative counts on
message_delta, so contextWindowUsedTokens collapsed to output_tokens.

Keep the message_start counters per field and let a counter present on
message_delta replace it, the same rule the Anthropic SDK MessageStream uses.
A missing counter keeps the message_start value, so a delta without cache
fields does not drop cache_read_input_tokens.

Closes #4294

* test(claude): ignore a message_delta that precedes its message_start

A canceled request can leave its terminal message_delta queued ahead of the
next turn. Pin that such a straggler neither emits usage_updated nor leaks
into the next request's counters.

* test(claude): take the message_delta usage object as a single parameter

Keep createMessageDeltaEvent(outputTokens) for existing call sites and add
createMessageDeltaUsageEvent(usage) for the tests that set input counters on
the delta, instead of a second positional parameter.

* test(claude): verify late input usage through the real provider process

Compare start-side and delta-side counters through two real provider turns against a local Messages API fixture, including omitted cache counters. The delta cases fail on the baseline with output-only context totals.

Co-authored-by: kywoo26 <kywoo26@naver.com>

* test(claude): always close the context usage fixture

---------

Co-authored-by: kywoo26 <kywoo26@naver.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../agent.context-usage.local.e2e.test.ts     | 133 ++++++++++++++++++
 .../agent/providers/claude/agent.test.ts      | 121 +++++++++++++++-
 .../server/agent/providers/claude/agent.ts    |  99 +++++++++----
 3 files changed, 319 insertions(+), 34 deletions(-)
 create mode 100644 packages/server/src/server/agent/providers/claude/agent.context-usage.local.e2e.test.ts

diff --git a/packages/server/src/server/agent/providers/claude/agent.context-usage.local.e2e.test.ts b/packages/server/src/server/agent/providers/claude/agent.context-usage.local.e2e.test.ts
new file mode 100644
index 0000000000..3008f3d4d5
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/agent.context-usage.local.e2e.test.ts
@@ -0,0 +1,133 @@
+import { createServer } from "node:http";
+import { mkdir, mkdtemp, rm } from "node:fs/promises";
+import path from "node:path";
+import pino from "pino";
+import { expect, test } from "vitest";
+import { collectSessionTurnEvents } from "../test-utils/session-stream-adapter.js";
+import { ClaudeAgentClient } from "./agent.js";
+
+// Exercise the real Claude Code process against a local Messages API fixture.
+// The input counter's location is the only difference between the two backends.
+test.each([
+  { placement: "start", cacheTokens: 0 },
+  { placement: "delta", cacheTokens: 0 },
+  { placement: "start", cacheTokens: 1_000 },
+  { placement: "delta", cacheTokens: 1_000 },
+])(
+  "counts $placement input and $cacheTokens cached tokens through Claude Code",
+  async ({ placement, cacheTokens }) => {
+    const cwd = await mkdtemp(path.resolve(".claude-context-usage-"));
+    const configDir = path.join(cwd, "config");
+    await mkdir(configDir);
+    let requestCount = 0;
+    const server = createServer(async (request, response) => {
+      for await (const chunk of request) {
+        void chunk;
+      }
+      if (!request.url?.startsWith("/v1/messages")) {
+        response.writeHead(200, { "content-type": "application/json" });
+        response.end("{}");
+        return;
+      }
+      if (request.url.includes("count_tokens")) {
+        response.writeHead(200, { "content-type": "application/json" });
+        response.end(JSON.stringify({ input_tokens: 20_236 }));
+        return;
+      }
+      const inputTokens = 20_236 + requestCount++;
+      response.writeHead(200, { "content-type": "text/event-stream" });
+      const emit = (data: { type: string; [key: string]: unknown }) => {
+        response.write(`event: ${data.type}\ndata: ${JSON.stringify(data)}\n\n`);
+      };
+      emit({
+        type: "message_start",
+        message: {
+          id: `msg_context_usage_${requestCount}`,
+          type: "message",
+          role: "assistant",
+          model: "claude-sonnet-4-6",
+          content: [],
+          stop_reason: null,
+          stop_sequence: null,
+          usage: {
+            input_tokens: placement === "start" ? inputTokens : 0,
+            output_tokens: 0,
+            cache_creation_input_tokens: 0,
+            cache_read_input_tokens: cacheTokens,
+          },
+        },
+      });
+      emit({ type: "content_block_start", index: 0, content_block: { type: "text", text: "" } });
+      emit({ type: "content_block_delta", index: 0, delta: { type: "text_delta", text: "hello" } });
+      emit({ type: "content_block_stop", index: 0 });
+      emit({
+        type: "message_delta",
+        delta: { stop_reason: "end_turn", stop_sequence: null },
+        usage: {
+          output_tokens: 64,
+          ...(placement === "delta" ? { input_tokens: inputTokens } : {}),
+        },
+      });
+      emit({ type: "message_stop" });
+      response.end();
+    });
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Fixture has no TCP address");
+    const client = new ClaudeAgentClient({
+      logger: pino({ level: "silent" }),
+      runtimeSettings: {
+        env: {
+          ANTHROPIC_BASE_URL: `http://127.0.0.1:${address.port}`,
+          ANTHROPIC_AUTH_TOKEN: "fixture-token",
+          ANTHROPIC_API_KEY: "",
+          CLAUDE_CONFIG_DIR: configDir,
+          CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1",
+        },
+      },
+    });
+    const session = await client.createSession(
+      { provider: "claude", cwd, model: "claude-sonnet-4-6" },
+      undefined,
+      { persistSession: false },
+    );
+    try {
+      for (let turn = 0; turn < 2; turn++) {
+        const events = await collectSessionTurnEvents(session, "say hello", {
+          signal: AbortSignal.timeout(20_000),
+        });
+        const expectedTokens = 20_236 + turn + cacheTokens + 64;
+        expect(events).toContainEqual(
+          expect.objectContaining({
+            type: "turn_completed",
+            usage: expect.objectContaining({
+              inputTokens: 20_236 + turn,
+              outputTokens: 64,
+              cachedInputTokens: cacheTokens,
+              contextWindowUsedTokens: expectedTokens,
+            }),
+          }),
+        );
+        expect(events).toContainEqual(
+          expect.objectContaining({
+            type: "usage_updated",
+            usage: expect.objectContaining({ contextWindowUsedTokens: expectedTokens }),
+          }),
+        );
+      }
+      expect(requestCount).toBe(2);
+    } finally {
+      try {
+        await session.close();
+      } finally {
+        try {
+          server.closeAllConnections();
+          await new Promise<void>((resolve) => server.close(() => resolve()));
+        } finally {
+          await rm(cwd, { recursive: true, force: true });
+        }
+      }
+    }
+  },
+  60_000,
+);
diff --git a/packages/server/src/server/agent/providers/claude/agent.test.ts b/packages/server/src/server/agent/providers/claude/agent.test.ts
index 5a5e1132a1..5e26e6a55a 100644
--- a/packages/server/src/server/agent/providers/claude/agent.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.test.ts
@@ -2135,13 +2135,15 @@ describe("ClaudeAgentSession context window usage", () => {
   }
 
   function createMessageDeltaEvent(outputTokens: number): Record<string, unknown> {
+    return createMessageDeltaUsageEvent({ output_tokens: outputTokens });
+  }
+
+  function createMessageDeltaUsageEvent(usage: Record<string, unknown>): Record<string, unknown> {
     return {
       type: "stream_event",
       event: {
         type: "message_delta",
-        usage: {
-          output_tokens: outputTokens,
-        },
+        usage,
       },
       session_id: "session-1",
     };
@@ -2887,6 +2889,119 @@ describe("ClaudeAgentSession context window usage", () => {
     }
   });
 
+  test("message_delta input usage replaces an empty message_start count", async () => {
+    // Translating gateways (LiteLLM in front of an OpenAI-compatible backend) do not know the
+    // prompt size when message_start is emitted, so they report input_tokens: 0 there and send
+    // the cumulative counts on message_delta, as the Anthropic Messages API allows.
+    const session = await createSessionForTurns([
+      [
+        createInitMessage(),
+        createMessageStartEvent({
+          input_tokens: 0,
+          cache_creation_input_tokens: 0,
+          cache_read_input_tokens: 0,
+        }),
+        createMessageDeltaUsageEvent({ input_tokens: 20_236, output_tokens: 64 }),
+        createSuccessResult({
+          usage: {
+            input_tokens: 20_236,
+            cache_creation_input_tokens: 0,
+            cache_read_input_tokens: 0,
+            output_tokens: 64,
+            iterations: [],
+          },
+        }),
+      ],
+    ]);
+
+    try {
+      const events = await collectStreamEvents(session);
+
+      expect(events).toContainEqual(
+        expect.objectContaining({
+          type: "usage_updated",
+          provider: "claude",
+          usage: {
+            contextWindowUsedTokens: 20_300,
+          },
+        }),
+      );
+      expect(events).toContainEqual(
+        expect.objectContaining({
+          type: "turn_completed",
+          usage: expect.objectContaining({
+            inputTokens: 20_236,
+            outputTokens: 64,
+            contextWindowUsedTokens: 20_300,
+          }),
+        }),
+      );
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("message_delta without cache counters keeps the message_start cache usage", async () => {
+    const session = await createSessionForTurns([
+      [
+        createInitMessage(),
+        createMessageStartEvent({
+          input_tokens: 5,
+          cache_creation_input_tokens: 0,
+          cache_read_input_tokens: 1_000,
+        }),
+        createMessageDeltaUsageEvent({ input_tokens: 5, output_tokens: 64 }),
+        createSuccessResult(),
+      ],
+    ]);
+
+    try {
+      const events = await collectStreamEvents(session);
+
+      expect(events).toContainEqual(
+        expect.objectContaining({
+          type: "usage_updated",
+          provider: "claude",
+          usage: {
+            contextWindowUsedTokens: 1_069,
+          },
+        }),
+      );
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("message_delta before this request's message_start does not seed usage", async () => {
+    // A canceled request can leave its terminal message_delta queued behind the next turn.
+    // Nothing is known about the new request until its message_start, so that straggler
+    // must not produce a usage_updated event or leak into the next request's counters.
+    const session = await createSessionForTurns([
+      [
+        createInitMessage(),
+        createMessageDeltaUsageEvent({ input_tokens: 20_236, output_tokens: 64 }),
+        createMessageStartEvent({
+          input_tokens: 40,
+          cache_creation_input_tokens: 5,
+          cache_read_input_tokens: 10,
+        }),
+        createMessageDeltaEvent(7),
+        createSuccessResult(),
+      ],
+    ]);
+
+    try {
+      const events = await collectStreamEvents(session);
+
+      const usedTokens = events
+        .filter((event) => event.type === "usage_updated")
+        .map((event) => event.usage.contextWindowUsedTokens);
+      expect(usedTokens).toEqual([55, 62]);
+    } finally {
+      await session.close();
+    }
+  });
+
   test("per-request stream usage is not cumulative across API calls in a turn", async () => {
     const session = await createSessionForTurns([
       [
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index 6c73f1f643..51885f74e8 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -1855,30 +1855,59 @@ function extractContextWindowSize(modelUsage: unknown): number | undefined {
   return maxContextWindow;
 }
 
-function readStreamRequestInputTokens(event: Record<string, unknown>): number | undefined {
-  const messageUsage = toObjectRecord(toObjectRecord(event.message)?.usage);
-  if (!messageUsage) {
+interface StreamRequestInputUsage {
+  inputTokens: number;
+  cacheCreationInputTokens: number;
+  cacheReadInputTokens: number;
+}
+
+function readUsageCount(usage: Record<string, unknown>, key: string): number | undefined {
+  const value = usage[key];
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
     return undefined;
   }
-  const usage = messageUsage;
-  const inputTokens =
-    typeof usage.input_tokens === "number" && Number.isFinite(usage.input_tokens)
-      ? usage.input_tokens
-      : undefined;
-  const cacheCreationInputTokens =
-    typeof usage.cache_creation_input_tokens === "number" &&
-    Number.isFinite(usage.cache_creation_input_tokens)
-      ? usage.cache_creation_input_tokens
-      : 0;
-  const cacheReadInputTokens =
-    typeof usage.cache_read_input_tokens === "number" &&
-    Number.isFinite(usage.cache_read_input_tokens)
-      ? usage.cache_read_input_tokens
-      : 0;
-  if (typeof inputTokens !== "number" || inputTokens < 0) {
+  return value;
+}
+
+function readStreamRequestInputUsage(
+  event: Record<string, unknown>,
+): StreamRequestInputUsage | undefined {
+  const usage = toObjectRecord(toObjectRecord(event.message)?.usage);
+  if (!usage) {
     return undefined;
   }
-  return inputTokens + cacheCreationInputTokens + cacheReadInputTokens;
+  const inputTokens = readUsageCount(usage, "input_tokens");
+  if (inputTokens === undefined) {
+    return undefined;
+  }
+  return {
+    inputTokens,
+    cacheCreationInputTokens: readUsageCount(usage, "cache_creation_input_tokens") ?? 0,
+    cacheReadInputTokens: readUsageCount(usage, "cache_read_input_tokens") ?? 0,
+  };
+}
+
+/**
+ * The input counters on `message_delta.usage` are cumulative whole-request totals and are
+ * optional. Mirror the Anthropic SDK's MessageStream: a counter present on the delta replaces
+ * the `message_start` value, a missing counter keeps it. Translating gateways report
+ * `input_tokens: 0` on `message_start` and only know the real count by `message_delta`.
+ */
+function mergeStreamDeltaInputUsage(
+  current: StreamRequestInputUsage,
+  event: Record<string, unknown>,
+): StreamRequestInputUsage {
+  const usage = toObjectRecord(event.usage);
+  if (!usage) {
+    return current;
+  }
+  return {
+    inputTokens: readUsageCount(usage, "input_tokens") ?? current.inputTokens,
+    cacheCreationInputTokens:
+      readUsageCount(usage, "cache_creation_input_tokens") ?? current.cacheCreationInputTokens,
+    cacheReadInputTokens:
+      readUsageCount(usage, "cache_read_input_tokens") ?? current.cacheReadInputTokens,
+  };
 }
 
 function readStreamRequestOutputTokens(event: Record<string, unknown>): number | undefined {
@@ -1958,7 +1987,7 @@ function readClaudeParentToolUseId(message: SDKMessage): string | null {
 
 class ClaudeContextUsageState {
   private contextWindowMaxTokens: number | undefined;
-  private streamRequestInputTokens: number | undefined;
+  private streamRequestInputUsage: StreamRequestInputUsage | undefined;
   private streamRequestOutputTokens: number | undefined;
   private compactedContextWindowUsedTokens: number | undefined;
   private completedResultTurns = 0;
@@ -1968,7 +1997,7 @@ class ClaudeContextUsageState {
   }
 
   beginTurn(): void {
-    this.streamRequestInputTokens = undefined;
+    this.streamRequestInputUsage = undefined;
     this.streamRequestOutputTokens = undefined;
     this.compactedContextWindowUsedTokens = undefined;
   }
@@ -1992,11 +2021,11 @@ class ClaudeContextUsageState {
     }
     const eventType = readTrimmedString(streamEvent.type);
     if (eventType === "message_start") {
-      const inputTokens = readStreamRequestInputTokens(streamEvent);
-      if (typeof inputTokens !== "number") {
+      const inputUsage = readStreamRequestInputUsage(streamEvent);
+      if (!inputUsage) {
         return null;
       }
-      this.streamRequestInputTokens = inputTokens;
+      this.streamRequestInputUsage = inputUsage;
       this.streamRequestOutputTokens = 0;
     } else if (eventType === "message_delta") {
       const outputTokens = readStreamRequestOutputTokens(streamEvent);
@@ -2004,6 +2033,12 @@ class ClaudeContextUsageState {
         return null;
       }
       this.streamRequestOutputTokens = outputTokens;
+      if (this.streamRequestInputUsage) {
+        this.streamRequestInputUsage = mergeStreamDeltaInputUsage(
+          this.streamRequestInputUsage,
+          streamEvent,
+        );
+      }
     } else {
       return null;
     }
@@ -2050,13 +2085,15 @@ class ClaudeContextUsageState {
   }
 
   private streamUsedTokens(): number | undefined {
-    if (
-      typeof this.streamRequestInputTokens !== "number" ||
-      typeof this.streamRequestOutputTokens !== "number"
-    ) {
+    const inputUsage = this.streamRequestInputUsage;
+    if (!inputUsage || typeof this.streamRequestOutputTokens !== "number") {
       return undefined;
     }
-    const usedTokens = this.streamRequestInputTokens + this.streamRequestOutputTokens;
+    const usedTokens =
+      inputUsage.inputTokens +
+      inputUsage.cacheCreationInputTokens +
+      inputUsage.cacheReadInputTokens +
+      this.streamRequestOutputTokens;
     return usedTokens > 0 ? usedTokens : undefined;
   }
 
@@ -2075,7 +2112,7 @@ class ClaudeContextUsageState {
   }
 
   buildCompactionUsageEvent(postTokens: number | undefined): AgentStreamEvent {
-    this.streamRequestInputTokens = undefined;
+    this.streamRequestInputUsage = undefined;
     this.streamRequestOutputTokens = undefined;
     this.compactedContextWindowUsedTokens = postTokens;
     const usage: AgentUsage = {};

From acb3a8f2079244ad790b8eb407fb71cfefd4e27f Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Mon, 12 Oct 2026 18:08:34 +0700
Subject: [PATCH 115/270] Add Vercel Sandbox to related projects (#6708)

Co-authored-by: paseo-bot[bot] <paseo-bot[bot]@users.noreply.github.com>
---
 public-docs/community.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public-docs/community.md b/public-docs/community.md
index 72f949bc83..33ba212056 100644
--- a/public-docs/community.md
+++ b/public-docs/community.md
@@ -30,7 +30,8 @@ us, so read a plugin's source before installing it.
 
 ## Hosting and infrastructure
 
-| Project                                                            | What it does                                                                                         |
-| ------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------- |
-| [Paseo Self-hosted](https://github.com/blockfeed/paseo-selfhosted) | Packages the Paseo web UI and a local daemon as a Docker deployment.                                 |
-| [Devbox Fleet](https://github.com/omrihaviv/devbox-fleet)          | Provisions and maintains per-developer GCP devboxes with Paseo, coding agents, and Tailscale access. |
+| Project                                                                     | What it does                                                                                                                                                             |
+| --------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| [Paseo Self-hosted](https://github.com/blockfeed/paseo-selfhosted)          | Packages the Paseo web UI and a local daemon as a Docker deployment.                                                                                                     |
+| [Devbox Fleet](https://github.com/omrihaviv/devbox-fleet)                   | Provisions and maintains per-developer GCP devboxes with Paseo, coding agents, and Tailscale access.                                                                     |
+| [Paseo Vercel Sandbox](https://github.com/vercel-labs/paseo-vercel-sandbox) | Creates persistent Vercel Sandboxes running a Paseo daemon with Codex, Claude Code, OpenCode, or Pi through Vercel AI Gateway. Pair each sandbox as a remote Paseo host. |

From 8d03ccfbf0b45db8958071ff41c88c85d9c00d4b Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Mon, 12 Oct 2026 18:47:48 +0700
Subject: [PATCH 116/270] Sort What's new plugins by submission time (#6713)

Co-authored-by: paseo-bot[bot] <paseo-bot[bot]@users.noreply.github.com>
---
 packages/website/src/plugins/registry.test.ts | 45 ++++++++++---------
 packages/website/src/plugins/registry.ts      |  8 ++--
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/packages/website/src/plugins/registry.test.ts b/packages/website/src/plugins/registry.test.ts
index ec6724137d..9dd132f1b5 100644
--- a/packages/website/src/plugins/registry.test.ts
+++ b/packages/website/src/plugins/registry.test.ts
@@ -76,33 +76,38 @@ describe("plugin registry", () => {
     ]);
     expect(featuredPlugins(listed, ["acme/not-published"])).toEqual([]);
   });
-  it("lists what's new by first-listing date, not submission or update dates", () => {
-    const listedFirst = {
+  it("lists what's new by submission time, not review, listing or update dates", () => {
+    const submittedFirst = {
       ...plugin,
-      id: "acme/listed-first",
-      submittedAt: "2026-09-20",
-      reviewedAt: "2026-09-21",
-      updatedAt: "2026-10-02",
-      publishedAt: "2026-09-02",
+      id: "acme/submitted-first",
+      submittedAt: "2026-09-02T00:00:00.000Z",
+      reviewedAt: "2026-10-02T00:00:00.000Z",
+      updatedAt: "2026-10-02T00:00:00.000Z",
+      publishedAt: "2026-10-02T00:00:00.000Z",
     };
-    const listedLater = {
+    const submittedLater = {
       ...plugin,
-      id: "acme/listed-later",
-      submittedAt: "2026-09-01",
-      reviewedAt: "2026-09-01",
-      updatedAt: "2026-09-01",
-      publishedAt: "2026-09-30",
+      id: "acme/submitted-later",
+      submittedAt: "2026-09-30T00:00:00.000Z",
+      reviewedAt: "2026-09-30T00:00:00.000Z",
+      updatedAt: "2026-09-30T00:00:00.000Z",
+      publishedAt: "2026-09-30T00:00:00.000Z",
     };
-    expect(newestFirst([listedFirst, listedLater]).map((p) => p.id)).toEqual([
-      "acme/listed-later",
-      "acme/listed-first",
+    expect(newestFirst([submittedFirst, submittedLater]).map((p) => p.id)).toEqual([
+      "acme/submitted-later",
+      "acme/submitted-first",
     ]);
     const now = "2026-10-03T12:00:00.000Z";
-    expect(addedAgo(listedLater, now)).toBe("3d ago");
-    expect(addedAgo(listedFirst, now)).toBe("4w ago");
+    expect(addedAgo(submittedLater, now)).toBe("3d ago");
+    expect(addedAgo(submittedFirst, now)).toBe("4w ago");
   });
-  it("orders by listing date and by installs in a window, keeping index order for ties", () => {
-    const older = { ...plugin, id: "acme/older", publishedAt: "2026-09-01" };
+  it("orders same-day submissions by their time", () => {
+    const morning = { ...plugin, id: "acme/morning", submittedAt: "2026-10-12T00:00:00.000Z" };
+    const noon = { ...plugin, id: "acme/noon", submittedAt: "2026-10-12T11:38:00.000Z" };
+    expect(newestFirst([morning, noon]).map((p) => p.id)).toEqual(["acme/noon", "acme/morning"]);
+  });
+  it("orders by submission time and by installs in a window, keeping index order for ties", () => {
+    const older = { ...plugin, id: "acme/older", submittedAt: "2026-09-01" };
     const twin = { ...plugin, id: "acme/twin" };
     expect(newestFirst([older, plugin, twin]).map((p) => p.id)).toEqual([
       "acme/example",
diff --git a/packages/website/src/plugins/registry.ts b/packages/website/src/plugins/registry.ts
index 37a4455d0c..c55741ecdc 100644
--- a/packages/website/src/plugins/registry.ts
+++ b/packages/website/src/plugins/registry.ts
@@ -106,9 +106,9 @@ export function featuredPlugins(plugins: Plugin[], featured: string[]): Plugin[]
   const byId = new Map(plugins.map((plugin) => [plugin.id, plugin]));
   return [...new Set(featured)].flatMap((id) => byId.get(id) ?? []);
 }
-/** Most recently listed first; equal dates keep index order. */
+/** Most recently submitted first, so updates never resurface a plugin; equal times keep index order. */
 export function newestFirst(plugins: Plugin[]): Plugin[] {
-  return [...plugins].sort((a, b) => b.publishedAt.localeCompare(a.publishedAt));
+  return [...plugins].sort((a, b) => Date.parse(b.submittedAt) - Date.parse(a.submittedAt));
 }
 /** Most installs in the window first; equal counts keep index order. */
 export function mostInstalled(
@@ -119,9 +119,9 @@ export function mostInstalled(
   const count = (plugin: Plugin) => installs[plugin.id]?.[window] ?? 0;
   return [...plugins].sort((a, b) => count(b) - count(a));
 }
-/** How long ago the plugin was first listed, relative to the loader's clock. */
+/** How long ago the plugin was submitted, relative to the loader's clock. */
 export function addedAgo(plugin: Plugin, now: string): string {
-  const days = Math.floor((Date.parse(now) - Date.parse(plugin.publishedAt)) / DAY_MS);
+  const days = Math.floor((Date.parse(now) - Date.parse(plugin.submittedAt)) / DAY_MS);
   if (days <= 0) return "today";
   if (days === 1) return "yesterday";
   if (days < 14) return `${days}d ago`;

From 283a985fb6d1e4e7646c82fe7fc770612454ea4f Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 14:04:41 +0200
Subject: [PATCH 117/270] fix(app): keep Android status icons readable as
 themes change (#6707)

* fix(app): sync Android system bar icon style with app theme

With edge-to-edge enabled the app draws under the Android system bars,
but the bars keep their default light icon style regardless of theme,
so the status bar clock/battery/icons are invisible on light themes
(white on white). Call SystemBars.setStyle from the appearance provider
whenever the theme is applied: dark icons on light themes, light icons
on dark themes, auto following the system for adaptive themes and
plugin-contributed themes.

Refs #1272 (runtime only; the splash screen phase is not covered).

* fix(app): keep Android status icons readable as themes change

Keep system-bar contrast subscribed to the resolved app theme so automatic appearance changes update the icons as well as the app surface. Add a native regression covering explicit and automatic themes.

Co-authored-by: TeraYang <4110825+terayang@users.noreply.github.com>

* fix(app): map system-bar appearance through color scheme

Unistyles reserves style mappings for React Native style objects. Keep SystemBars style selection inside its appearance adapter and map the colorScheme prop instead.

---------

Co-authored-by: TeraYang <4110825+terayang@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../app/e2e/mobile/system-bars/android.mjs    | 62 +++++++++++++++++++
 packages/app/src/appearance/provider.tsx      |  6 +-
 .../src/appearance/system-bars.android.tsx    | 11 ++++
 packages/app/src/appearance/system-bars.tsx   |  3 +
 4 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 packages/app/e2e/mobile/system-bars/android.mjs
 create mode 100644 packages/app/src/appearance/system-bars.android.tsx
 create mode 100644 packages/app/src/appearance/system-bars.tsx

diff --git a/packages/app/e2e/mobile/system-bars/android.mjs b/packages/app/e2e/mobile/system-bars/android.mjs
new file mode 100644
index 0000000000..8201f3dc12
--- /dev/null
+++ b/packages/app/e2e/mobile/system-bars/android.mjs
@@ -0,0 +1,62 @@
+// Open Settings > Appearance in a native Android app loaded from this checkout.
+// AGENT_DEVICE_STATE_DIR=<state-dir> node packages/app/e2e/mobile/system-bars/android.mjs <session> <adb-serial> <app-id>
+// Requires English UI and a dedicated emulator. Leaves System theme and light OS appearance.
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { setTimeout as delay } from "node:timers/promises";
+
+const [, , session, serial, appId] = process.argv;
+assert(session && serial && appId, "Pass the agent-device session, adb serial, and app ID");
+
+function ad(...args) {
+  return execFileSync("agent-device", [...args, "--session", session], {
+    encoding: "utf8",
+    timeout: 60_000,
+  });
+}
+
+function windowState() {
+  const state = execFileSync("adb", ["-s", serial, "shell", "dumpsys", "window"], {
+    encoding: "utf8",
+    timeout: 10_000,
+  });
+  assert(state.match(/mCurrentFocus=.*\n/)?.[0].includes(`${appId}/`), "App must be focused");
+  const regions = state.match(/mLastStatusBarAppearanceRegions=\s*\n([^\n]+)/)?.[1];
+  assert(regions, "Android must report the status-bar appearance region");
+  return regions.includes("LIGHT_STATUS_BARS");
+}
+
+async function expectDarkIcons(expected, context) {
+  const deadline = Date.now() + 5_000;
+  do {
+    if (windowState() === expected) {
+      console.log(`PASS: ${context}`);
+      return;
+    }
+    await delay(100);
+  } while (Date.now() < deadline);
+  assert.equal(windowState(), expected, context);
+}
+
+function selectTheme(theme) {
+  const current = ad("snapshot", "-i").match(/"Theme: ([^"]+)"/)?.[1];
+  assert(current, "Start on Settings > Appearance");
+  ad("press", `label="Theme: ${current}"`, "--settle");
+  ad("press", `label="${theme}"`, "--settle");
+  ad("wait", "text", `Theme: ${theme}`, "5000");
+}
+
+ad("settings", "appearance", "light");
+selectTheme("Light");
+await expectDarkIcons(true, "Light app theme uses dark status icons");
+selectTheme("Dark");
+await expectDarkIcons(false, "Dark app theme uses light status icons");
+selectTheme("System");
+await expectDarkIcons(true, "System theme starts with dark icons on light OS appearance");
+ad("settings", "appearance", "dark");
+await expectDarkIcons(
+  false,
+  "System theme follows an OS change to dark without reopening settings",
+);
+ad("settings", "appearance", "light");
+await expectDarkIcons(true, "System theme follows an OS change back to light");
diff --git a/packages/app/src/appearance/provider.tsx b/packages/app/src/appearance/provider.tsx
index d52864e435..77addad9a3 100644
--- a/packages/app/src/appearance/provider.tsx
+++ b/packages/app/src/appearance/provider.tsx
@@ -21,6 +21,7 @@ import {
 } from "@/plugins/themes";
 import { PLUGIN_THEME_NAMES, PLUGIN_THEME_PREFERENCE, THEME_TO_UNISTYLES } from "@/styles/theme";
 import { applyAppearance } from "./apply";
+import { AppearanceSystemBars } from "./system-bars";
 
 interface ContributedThemes {
   options: PluginThemeOption[];
@@ -107,7 +108,10 @@ export function AppearanceProvider({ children }: { children: ReactNode }) {
   if (!hasAppliedAppearance) return null;
 
   return (
-    <ContributedThemesContext.Provider value={value}>{children}</ContributedThemesContext.Provider>
+    <ContributedThemesContext.Provider value={value}>
+      <AppearanceSystemBars />
+      {children}
+    </ContributedThemesContext.Provider>
   );
 }
 
diff --git a/packages/app/src/appearance/system-bars.android.tsx b/packages/app/src/appearance/system-bars.android.tsx
new file mode 100644
index 0000000000..f36fb60599
--- /dev/null
+++ b/packages/app/src/appearance/system-bars.android.tsx
@@ -0,0 +1,11 @@
+import { SystemBars } from "react-native-edge-to-edge";
+import { withUnistyles } from "react-native-unistyles";
+import type { Theme } from "@/styles/theme";
+
+function ThemeSystemBars({ colorScheme }: Pick<Theme, "colorScheme">) {
+  return <SystemBars style={colorScheme === "light" ? "dark" : "light"} />;
+}
+
+export const AppearanceSystemBars = withUnistyles(ThemeSystemBars, (theme) => ({
+  colorScheme: theme.colorScheme,
+}));
diff --git a/packages/app/src/appearance/system-bars.tsx b/packages/app/src/appearance/system-bars.tsx
new file mode 100644
index 0000000000..930579bc4a
--- /dev/null
+++ b/packages/app/src/appearance/system-bars.tsx
@@ -0,0 +1,3 @@
+export function AppearanceSystemBars() {
+  return null;
+}

From 7321d8a4884efe8f7d4b1d977ef5eeb25fdbaf3f Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Mon, 12 Oct 2026 19:47:02 +0700
Subject: [PATCH 118/270] List new plugins by first listing, add Recently
 updated, show authors on grid cards (#6718)

* List new plugins by first listing, add Recently updated, and show authors on grid cards

What's new and the Newest tab sort by publishedAt, which the registry now keeps
at the first listing. Recently updated lists plugins whose current version was
approved after their first listing, on the directory and as a browse tab. Browse
and author grid cards show the author's avatar and name like the directory cards.

* Rename the card image helper so it does not shadow a test parameter

---------

Co-authored-by: paseo-bot[bot] <paseo-bot[bot]@users.noreply.github.com>
---
 packages/website/e2e/plugins.spec.ts          | 35 ++++++++-
 packages/website/e2e/registry.fixture.json    | 72 +++++++++----------
 packages/website/src/plugins/browse-page.tsx  | 63 ++++++++++++----
 packages/website/src/plugins/links.ts         |  6 +-
 .../website/src/plugins/overview.test.tsx     | 21 ++++--
 packages/website/src/plugins/plugin-card.tsx  | 25 ++-----
 .../website/src/plugins/plugin-search.tsx     |  2 +-
 packages/website/src/plugins/registry.test.ts | 65 +++++++++++------
 packages/website/src/plugins/registry.ts      | 24 +++++--
 .../website/src/plugins/thumbnails.test.ts    | 19 +++--
 packages/website/src/routes/plugins/index.tsx | 41 ++++++++---
 11 files changed, 248 insertions(+), 125 deletions(-)

diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 93da12f78f..346183a201 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -96,7 +96,9 @@ test("browses from the directory into a category, a plugin, and its author", asy
   await expect(page.getByRole("link", { name: /Defer/ })).toHaveCount(0);
 });
 
-test("ranks plugins on browse pages by installs in a window or by newest", async ({ page }) => {
+test("ranks plugins on browse pages by installs in a window, by newest, or by latest update", async ({
+  page,
+}) => {
   await page.goto("/plugins/all");
   await expect(page.getByRole("heading", { level: 1, name: /^All plugins/ })).toBeVisible();
   await expect(page.getByRole("link", { name: "Most installed" })).toHaveAttribute(
@@ -116,6 +118,21 @@ test("ranks plugins on browse pages by installs in a window or by newest", async
   await expect(page.getByRole("main").getByRole("link", { name: /Base2Tone/ })).toContainText(
     "ago",
   );
+
+  await page.getByRole("link", { name: "Recently updated" }).click();
+  await expect(page).toHaveURL(/\/plugins\/all\?sort=updated$/);
+  await expect(page.getByRole("heading", { level: 1 })).toHaveText(/^All plugins\s*2$/);
+  await expect(page.getByRole("main").getByRole("link", { name: /Defer|OMP/ })).toHaveText([
+    /Defer/,
+    /OMP/,
+  ]);
+});
+
+test("shows each plugin's author with their avatar on browse cards", async ({ page }) => {
+  await page.goto("/plugins/all");
+  const card = page.getByRole("main").getByRole("link", { name: /Defer/ });
+  await expect(card).toContainText("Tom Gringauz");
+  await expect(card.locator('img[src="https://github.com/tomgrin10.png?size=80"]')).toHaveCount(1);
 });
 
 test("filters by search and clears to all plugins", async ({ page }) => {
@@ -577,7 +594,9 @@ test.describe("registry fixture layout", () => {
   test("shows the plugin tile on cards when its media has no image", async ({ page }) => {
     await page.goto("/plugins/all");
     const card = page.getByRole("main").getByRole("link", { name: /launchd Jobs/ });
-    await expect(card.locator("img, video")).toHaveCount(0);
+    // The only image is the author's avatar.
+    await expect(card.locator("img, video")).toHaveCount(1);
+    await expect(card.locator('img[src^="https://github.com/gpambrozio.png"]')).toHaveCount(1);
     await card.click();
     await expect(
       page.getByRole("link", { name: "launchd Jobs video 1" }).locator("video"),
@@ -611,6 +630,18 @@ test.describe("registry fixture layout", () => {
       /Defer/,
     ]);
   });
+
+  test("lists only plugins updated since they were listed under Recently updated", async ({
+    page,
+  }) => {
+    await openPlugins(page);
+    await expect(pluginCards(page, "Recently updated")).toHaveText([/Defer/, /OMP/]);
+    await page
+      .getByRole("region", { name: "Recently updated" })
+      .getByRole("link", { name: "See all" })
+      .click();
+    await expect(page).toHaveURL(/\/plugins\/all\?sort=updated$/);
+  });
 });
 
 function galleryTiles(links: Element[]) {
diff --git a/packages/website/e2e/registry.fixture.json b/packages/website/e2e/registry.fixture.json
index 2f6560780c..6f7cd1b23c 100644
--- a/packages/website/e2e/registry.fixture.json
+++ b/packages/website/e2e/registry.fixture.json
@@ -84,9 +84,9 @@
         "https://raw.githubusercontent.com/alhassanaraouf/paseo-themes/main/packages/paseo-base2tone-theme/preview.png"
       ],
       "submittedAt": "2026-09-24T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-24T00:00:00.000Z",
       "publishedAt": "2026-09-24T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-24T00:00:00.000Z",
       "installs": 0,
       "readme": "# Base2Tone\n\n## Behavior\n\nBase2Tone theme for Paseo, ported from the Obsidian theme deathau/Base2Tone-For-Obsidian.md."
     },
@@ -117,9 +117,9 @@
         "https://raw.githubusercontent.com/dorasto/sayr/main/packages/paseo-plugin/assets/paseo-plugin-2.png"
       ],
       "submittedAt": "2026-09-22T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-22T00:00:00.000Z",
       "publishedAt": "2026-09-22T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-22T00:00:00.000Z",
       "installs": 0,
       "readme": "# Sayr\n\n## Behavior\n\nA paseo plugin for viewing and managing your Sayr tasks"
     },
@@ -150,9 +150,9 @@
         "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/github-board/docs/detail-panel.png"
       ],
       "submittedAt": "2026-09-19T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-19T00:00:00.000Z",
       "publishedAt": "2026-09-19T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-19T00:00:00.000Z",
       "installs": 0,
       "readme": "# GitHub Board\n\n## Behavior\n\nPaseo plugin: a GitHub sidebar board of your issues, draft and open pull requests, and discussions"
     },
@@ -183,9 +183,9 @@
         "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/herald/docs/timeline-card.png"
       ],
       "submittedAt": "2026-09-19T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-19T00:00:00.000Z",
       "publishedAt": "2026-09-19T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-19T00:00:00.000Z",
       "installs": 0,
       "readme": "# Herald\n\n## Behavior\n\nPaseo plugin: speaks one sentence when an agent needs you, and lists everything waiting in a sidebar panel"
     },
@@ -215,9 +215,9 @@
         "https://raw.githubusercontent.com/web-platform-tests/wpt/master/media/movie_5.mp4"
       ],
       "submittedAt": "2026-09-19T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-19T00:00:00.000Z",
       "publishedAt": "2026-09-19T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-19T00:00:00.000Z",
       "installs": 0,
       "readme": "# launchd Jobs\n\n## Behavior\n\nPaseo plugin: schedule shell commands on your Mac through launchd, from a sidebar panel"
     },
@@ -247,9 +247,9 @@
         "https://raw.githubusercontent.com/gpambrozio/paseo-plugins/main/model-pricing/docs/screenshot.png"
       ],
       "submittedAt": "2026-09-19T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-19T00:00:00.000Z",
       "publishedAt": "2026-09-19T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-19T00:00:00.000Z",
       "installs": 0,
       "readme": "# Model Pricing\n\n## Behavior\n\nPaseo plugin: a sidebar table of what every model costs, across Anthropic, OpenAI, Fireworks AI, Ollama Cloud and OpenRouter"
     },
@@ -277,9 +277,9 @@
       },
       "media": [],
       "submittedAt": "2026-09-19T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-19T00:00:00.000Z",
       "publishedAt": "2026-09-19T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-19T00:00:00.000Z",
       "installs": 0,
       "readme": "# Skills\n\n## Behavior\n\nPaseo plugin: lists the skills an agent can use, shows where each comes from, renders its SKILL.md, and invokes it"
     },
@@ -309,9 +309,9 @@
         "https://raw.githubusercontent.com/hungcuong9125/paseo-prompt-kit/main/docs/images/settings-direct-api.png"
       ],
       "submittedAt": "2026-09-22T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-22T00:00:00.000Z",
       "publishedAt": "2026-09-22T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-22T00:00:00.000Z",
       "installs": 0,
       "readme": "# PromptKit\n\n## Behavior\n\nPromptKit - rewrite and transform prompts directly from the Paseo composer."
     },
@@ -342,9 +342,9 @@
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/agent-monitor/docs/images/agent-monitor-settings.png"
       ],
       "submittedAt": "2026-09-17T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-17T00:00:00.000Z",
       "publishedAt": "2026-09-17T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-17T00:00:00.000Z",
       "installs": 0,
       "readme": "# Agent Monitor\n\n## Behavior\n\nA Paseo plugin that provides a host-wide agent triage roster."
     },
@@ -375,9 +375,9 @@
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-beads/docs/images/paseo-beads-compact.png"
       ],
       "submittedAt": "2026-09-17T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-17T00:00:00.000Z",
       "publishedAt": "2026-09-17T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-17T00:00:00.000Z",
       "installs": 0,
       "readme": "# Beads\n\n## Behavior\n\nA dependency-aware Beads work queue for each Paseo workspace."
     },
@@ -409,9 +409,9 @@
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-dracula/screenshot-alucard.png"
       ],
       "submittedAt": "2026-09-17T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-17T00:00:00.000Z",
       "publishedAt": "2026-09-17T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-17T00:00:00.000Z",
       "installs": 0,
       "readme": "# Dracula\n\n## Behavior\n\nDracula Classic and Alucard Classic themes for Paseo."
     },
@@ -442,9 +442,9 @@
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/fresh-worktrees/docs/images/fresh-worktrees-settings.png"
       ],
       "submittedAt": "2026-09-18T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-18T00:00:00.000Z",
       "publishedAt": "2026-09-18T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-18T00:00:00.000Z",
       "installs": 0,
       "readme": "# Fresh Worktrees\n\n## Behavior\n\nFast-forwards clean local base branches before Paseo creates branch-off worktrees"
     },
@@ -475,9 +475,9 @@
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-omp/docs/images/workspace-settings.png"
       ],
       "submittedAt": "2026-09-17T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-10-03T09:00:00.000Z",
       "publishedAt": "2026-09-17T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-10-03T09:00:00.000Z",
       "installs": 0,
       "readme": "# OMP\n\n## Behavior\n\nPaseo integration for OMP, including its direct provider and workspace tooling."
     },
@@ -505,9 +505,9 @@
       },
       "media": [],
       "submittedAt": "2026-09-17T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-17T00:00:00.000Z",
       "publishedAt": "2026-09-17T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-17T00:00:00.000Z",
       "installs": 0,
       "readme": "# PR Radar\n\n## Behavior\n\nA viewer-aware delivery queue for pull requests linked to Paseo workspaces."
     },
@@ -538,9 +538,9 @@
         "https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-shared-browser/docs/images/shared-browser-compact.png"
       ],
       "submittedAt": "2026-09-18T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-18T00:00:00.000Z",
       "publishedAt": "2026-09-18T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-18T00:00:00.000Z",
       "installs": 0,
       "readme": "# Shared Browser\n\n## Behavior\n\nOne real Chromium session per Paseo workspace, shared live across every connected client."
     },
@@ -568,9 +568,9 @@
       },
       "media": [],
       "submittedAt": "2026-09-17T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-17T00:00:00.000Z",
       "publishedAt": "2026-09-17T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-17T00:00:00.000Z",
       "installs": 0,
       "readme": "# Tell Agent\n\n## Behavior\n\nSend messages to agents in other workspaces on the same Paseo host."
     },
@@ -599,9 +599,9 @@
         "https://raw.githubusercontent.com/tomgrin10/paseo-defer/main/docs/defer-popover.png"
       ],
       "submittedAt": "2026-09-22T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-10-03T15:00:00.000Z",
       "publishedAt": "2026-09-22T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-10-03T15:00:00.000Z",
       "installs": 0,
       "readme": "# Defer\n\n## Behavior\n\nDefer messages to Paseo coding agents until a chosen time or usage-window reset."
     },
@@ -628,9 +628,9 @@
       },
       "media": [],
       "submittedAt": "2026-09-22T00:00:00.000Z",
-      "reviewedAt": "2026-10-03T00:00:00.000Z",
+      "reviewedAt": "2026-09-22T00:00:00.000Z",
       "publishedAt": "2026-09-22T00:00:00.000Z",
-      "updatedAt": "2026-10-03T00:00:00.000Z",
+      "updatedAt": "2026-09-22T00:00:00.000Z",
       "installs": 0,
       "readme": "# Graphite\n\n## Behavior\n\nWorkspace-native Graphite stack status and PR action radar for Paseo."
     }
diff --git a/packages/website/src/plugins/browse-page.tsx b/packages/website/src/plugins/browse-page.tsx
index 274c68a5c0..38b6393662 100644
--- a/packages/website/src/plugins/browse-page.tsx
+++ b/packages/website/src/plugins/browse-page.tsx
@@ -16,7 +16,9 @@ import {
   mostInstalled,
   newestFirst,
   type Plugin,
+  recentlyUpdated,
   searchPlugins,
+  updatedAgo,
 } from "./registry";
 import { WindowSwitch } from "./window-switch";
 
@@ -34,7 +36,7 @@ const TAB_OFF = `${TAB_BASE} border-transparent text-muted-foreground hover:text
 const CLEAR_CLASS =
   "text-sm text-extra-muted-foreground transition-colors hover:text-muted-foreground";
 
-/** All plugins or one category: sidebar, Most installed / Newest tabs, and the card grid. */
+/** All plugins or one category: sidebar, Most installed / Newest / Recently updated tabs, and the card grid. */
 export function BrowsePage({
   plugins,
   installs,
@@ -47,8 +49,7 @@ export function BrowsePage({
   query: BrowseQuery;
 }) {
   const category = query.category ? getCategory(query.category) : null;
-  const ordered =
-    query.sort === "new" ? newestFirst(plugins) : mostInstalled(plugins, installs, query.window);
+  const ordered = sortPlugins(plugins, installs, query);
   // Search ranks by relevance; the tab's order breaks ties.
   const matches = query.q ? searchPlugins(ordered, query.q) : ordered;
   const results = category ? getPluginsInCategory(matches, category.slug) : matches;
@@ -89,21 +90,19 @@ export function BrowsePage({
               </div>
             )}
             {results.length === 0 && !query.q && (
-              <p className="text-sm text-muted-foreground">No plugins in this category yet.</p>
+              <p className="text-sm text-muted-foreground">
+                {query.sort === "updated"
+                  ? "No plugins have been updated since they were listed."
+                  : "No plugins in this category yet."}
+              </p>
             )}
             {results.length > 0 && (
               <div className={PLUGIN_GRID_CLASS}>
-                {results.map((plugin) =>
-                  query.sort === "new" ? (
-                    <PluginCard key={plugin.id} plugin={plugin}>
-                      {addedAgo(plugin, now)}
-                    </PluginCard>
-                  ) : (
-                    <PluginCard key={plugin.id} plugin={plugin}>
-                      <InstallCount count={installs[plugin.id]?.[query.window] ?? 0} />
-                    </PluginCard>
-                  ),
-                )}
+                {results.map((plugin) => (
+                  <PluginCard key={plugin.id} plugin={plugin}>
+                    <CardDetail plugin={plugin} installs={installs} now={now} query={query} />
+                  </PluginCard>
+                ))}
               </div>
             )}
           </PluginSection>
@@ -113,6 +112,33 @@ export function BrowsePage({
   );
 }
 
+function sortPlugins(
+  plugins: Plugin[],
+  installs: Record<string, InstallCounts>,
+  query: BrowseQuery,
+): Plugin[] {
+  if (query.sort === "new") return newestFirst(plugins);
+  if (query.sort === "updated") return recentlyUpdated(plugins);
+  return mostInstalled(plugins, installs, query.window);
+}
+
+/** What the card shows beside the author: the date the tab sorts by, or the install count. */
+function CardDetail({
+  plugin,
+  installs,
+  now,
+  query,
+}: {
+  plugin: Plugin;
+  installs: Record<string, InstallCounts>;
+  now: string;
+  query: BrowseQuery;
+}) {
+  if (query.sort === "new") return addedAgo(plugin, now);
+  if (query.sort === "updated") return updatedAgo(plugin, now);
+  return <InstallCount count={installs[plugin.id]?.[query.window] ?? 0} />;
+}
+
 interface NavEntry {
   href: string;
   label: string;
@@ -208,6 +234,13 @@ function SortTabs({ query }: { query: BrowseQuery }) {
           >
             Newest
           </a>
+          <a
+            href={browseHref({ ...query, sort: "updated" })}
+            aria-current={query.sort === "updated" ? "page" : undefined}
+            className={query.sort === "updated" ? TAB_ON : TAB_OFF}
+          >
+            Recently updated
+          </a>
         </div>
         {windowSwitch && <div className="hidden pb-2 sm:block">{windowSwitch}</div>}
       </div>
diff --git a/packages/website/src/plugins/links.ts b/packages/website/src/plugins/links.ts
index 6e785b4df0..18eab1535f 100644
--- a/packages/website/src/plugins/links.ts
+++ b/packages/website/src/plugins/links.ts
@@ -5,7 +5,7 @@ export const DOCS_URL = "/docs/plugins";
 export const SUBMIT_URL =
   "https://github.com/getpaseo/plugins/issues/new?template=submit-plugin.yml";
 
-export type BrowseSort = "installs" | "new";
+export type BrowseSort = "installs" | "new" | "updated";
 export interface BrowseQuery {
   /** Absent for all plugins. */
   category?: CategorySlug;
@@ -24,7 +24,7 @@ export function parseSearchTerm(value: unknown): string | undefined {
   return typeof value === "string" && value.trim() ? value : undefined;
 }
 export function parseSort(value: unknown): BrowseSort | undefined {
-  return value === "new" ? value : undefined;
+  return value === "new" || value === "updated" ? value : undefined;
 }
 
 export function pluginHref(id: string): string {
@@ -37,7 +37,7 @@ export function browseHref({ category, sort, window, q }: BrowseQuery): string {
   const path = category ? categoryHref(category) : "/plugins/all";
   const params = new URLSearchParams();
   if (q) params.set("q", q);
-  if (sort === "new") params.set("sort", sort);
+  if (sort !== "installs") params.set("sort", sort);
   else if (window !== DEFAULT_WINDOW) params.set("window", window);
   const search = params.toString();
   return search ? `${path}?${search}` : path;
diff --git a/packages/website/src/plugins/overview.test.tsx b/packages/website/src/plugins/overview.test.tsx
index c9e6591c94..45bccecb37 100644
--- a/packages/website/src/plugins/overview.test.tsx
+++ b/packages/website/src/plugins/overview.test.tsx
@@ -1,7 +1,7 @@
 import registry from "../../e2e/registry.fixture.json";
 import { PluginTile } from "./plugin-tile";
 import { PluginCard } from "./plugin-card";
-import type { Plugin } from "./registry";
+import { authorAvatarUrl, getAuthor, type Plugin } from "./registry";
 import React, { createElement } from "react";
 import { renderToStaticMarkup } from "react-dom/server";
 import { parseFragment, type DefaultTreeAdapterMap } from "parse5";
@@ -25,6 +25,15 @@ function render(markdown: string) {
 function attribute(element: Element, name: string) {
   return element.attrs.find((attr) => attr.name === name)?.value;
 }
+function imageSources(html: string) {
+  return elements(html)
+    .filter((node) => node.tagName === "img")
+    .map((node) => attribute(node, "src"));
+}
+/** Cards show the author's GitHub avatar beside the plugin's own images. */
+function avatarUrl(plugin: Plugin) {
+  return authorAvatarUrl(getAuthor(plugin));
+}
 const allowedTags = new Set([
   "div",
   "p",
@@ -118,7 +127,7 @@ describe("registry images", () => {
       createElement(PluginCard, { plugin }),
     ]) {
       expect(
-        elements(renderToStaticMarkup(component)).filter((node) => node.tagName === "img"),
+        imageSources(renderToStaticMarkup(component)).filter((src) => src !== avatarUrl(plugin)),
       ).toEqual([]);
     }
   });
@@ -131,8 +140,8 @@ it("uses the first HTTPS screenshot when an earlier screenshot is rejected", ()
     icon: undefined,
     media: ["data:image/png;base64,AAAA", source],
   } as Plugin;
-  const nodes = elements(renderToStaticMarkup(createElement(PluginCard, { plugin })));
-  expect(
-    nodes.filter((node) => node.tagName === "img").map((node) => attribute(node, "src")),
-  ).toEqual([source]);
+  expect(imageSources(renderToStaticMarkup(createElement(PluginCard, { plugin })))).toEqual([
+    source,
+    avatarUrl(plugin),
+  ]);
 });
diff --git a/packages/website/src/plugins/plugin-card.tsx b/packages/website/src/plugins/plugin-card.tsx
index b68ae654db..543876afbe 100644
--- a/packages/website/src/plugins/plugin-card.tsx
+++ b/packages/website/src/plugins/plugin-card.tsx
@@ -35,13 +35,13 @@ function PluginShot({ plugin }: { plugin: Plugin }) {
 }
 
 /**
- * What's new and Featured card, in three rows under the screenshot: tile and name, description,
- * then author and `children`, such as when the plugin was added or its install count.
+ * Gallery card, in three rows under the screenshot: tile and name, description, then author and
+ * `children`, such as when the plugin was added or its install count.
  */
-export function NewPluginCard({ plugin, children }: { plugin: Plugin; children?: ReactNode }) {
+export function PluginCard({ plugin, children }: { plugin: Plugin; children?: ReactNode }) {
   const author = getAuthor(plugin);
   return (
-    <a href={pluginHref(plugin.id)} className="group block w-[70%] flex-shrink-0 sm:w-auto">
+    <a href={pluginHref(plugin.id)} className="group block">
       <PluginShot plugin={plugin} />
       <div className="mt-3 flex items-center gap-2">
         <PluginTile plugin={plugin} size="xs" />
@@ -64,23 +64,6 @@ export function NewPluginCard({ plugin, children }: { plugin: Plugin; children?:
   );
 }
 
-/** Grid card: screenshot; tile, name, and `children` such as an install count; description. */
-export function PluginCard({ plugin, children }: { plugin: Plugin; children?: ReactNode }) {
-  return (
-    <a href={pluginHref(plugin.id)} className="group block">
-      <PluginShot plugin={plugin} />
-      <div className="mt-3 flex items-center gap-2">
-        <PluginTile plugin={plugin} size="xs" />
-        <p className="min-w-0 flex-1 truncate text-sm font-medium text-white">{plugin.name}</p>
-        <span className="flex-shrink-0 text-xs text-extra-muted-foreground">{children}</span>
-      </div>
-      <p className="mt-2 line-clamp-2 min-h-10 text-xs leading-5 text-muted-foreground">
-        {plugin.description}
-      </p>
-    </a>
-  );
-}
-
 /** Ranked row for the directory's Most installed list. */
 export function PluginRankRow({
   plugin,
diff --git a/packages/website/src/plugins/plugin-search.tsx b/packages/website/src/plugins/plugin-search.tsx
index ab648bbd58..400341d5a4 100644
--- a/packages/website/src/plugins/plugin-search.tsx
+++ b/packages/website/src/plugins/plugin-search.tsx
@@ -76,7 +76,7 @@ export function PluginSearch({
       onSubmit={handleSubmit}
       className={className}
     >
-      {scope.sort === "new" && <input type="hidden" name="sort" value="new" />}
+      {scope.sort !== "installs" && <input type="hidden" name="sort" value={scope.sort} />}
       {scope.sort === "installs" && scope.window !== DEFAULT_WINDOW && (
         <input type="hidden" name="window" value={scope.window} />
       )}
diff --git a/packages/website/src/plugins/registry.test.ts b/packages/website/src/plugins/registry.test.ts
index 9dd132f1b5..cf3af56794 100644
--- a/packages/website/src/plugins/registry.test.ts
+++ b/packages/website/src/plugins/registry.test.ts
@@ -10,7 +10,9 @@ import {
   newestFirst,
   type Plugin,
   readmeBody,
+  recentlyUpdated,
   searchPlugins,
+  updatedAgo,
 } from "./registry";
 import { readInstallCounts, recordInstall } from "./installs";
 import { handlePluginRegistryRequest, loadRegistryIndex, loadRegistryPlugin } from "./published";
@@ -76,38 +78,57 @@ describe("plugin registry", () => {
     ]);
     expect(featuredPlugins(listed, ["acme/not-published"])).toEqual([]);
   });
-  it("lists what's new by submission time, not review, listing or update dates", () => {
-    const submittedFirst = {
+  it("lists what's new by first listing time, so neither a slow review nor an update moves a plugin", () => {
+    const listedFirst = {
       ...plugin,
-      id: "acme/submitted-first",
-      submittedAt: "2026-09-02T00:00:00.000Z",
+      id: "acme/listed-first",
+      submittedAt: "2026-09-30T00:00:00.000Z",
+      publishedAt: "2026-09-30T06:00:00.000Z",
       reviewedAt: "2026-10-02T00:00:00.000Z",
       updatedAt: "2026-10-02T00:00:00.000Z",
-      publishedAt: "2026-10-02T00:00:00.000Z",
     };
-    const submittedLater = {
+    const listedLater = {
       ...plugin,
-      id: "acme/submitted-later",
-      submittedAt: "2026-09-30T00:00:00.000Z",
-      reviewedAt: "2026-09-30T00:00:00.000Z",
-      updatedAt: "2026-09-30T00:00:00.000Z",
-      publishedAt: "2026-09-30T00:00:00.000Z",
+      id: "acme/listed-later",
+      submittedAt: "2026-09-02T00:00:00.000Z",
+      publishedAt: "2026-09-30T08:00:00.000Z",
+      reviewedAt: "2026-09-30T08:00:00.000Z",
+      updatedAt: "2026-09-30T08:00:00.000Z",
     };
-    expect(newestFirst([submittedFirst, submittedLater]).map((p) => p.id)).toEqual([
-      "acme/submitted-later",
-      "acme/submitted-first",
+    expect(newestFirst([listedFirst, listedLater]).map((p) => p.id)).toEqual([
+      "acme/listed-later",
+      "acme/listed-first",
     ]);
     const now = "2026-10-03T12:00:00.000Z";
-    expect(addedAgo(submittedLater, now)).toBe("3d ago");
-    expect(addedAgo(submittedFirst, now)).toBe("4w ago");
+    expect(addedAgo(listedLater, now)).toBe("3d ago");
+    expect(updatedAgo(listedFirst, now)).toBe("yesterday");
   });
-  it("orders same-day submissions by their time", () => {
-    const morning = { ...plugin, id: "acme/morning", submittedAt: "2026-10-12T00:00:00.000Z" };
-    const noon = { ...plugin, id: "acme/noon", submittedAt: "2026-10-12T11:38:00.000Z" };
-    expect(newestFirst([morning, noon]).map((p) => p.id)).toEqual(["acme/noon", "acme/morning"]);
+  it("lists only plugins updated after their first listing as recently updated, latest update first", () => {
+    const bumped = {
+      ...plugin,
+      id: "acme/bumped",
+      publishedAt: "2026-09-10T00:00:00.000Z",
+      updatedAt: "2026-10-01T09:00:00.000Z",
+    };
+    const bumpedLater = {
+      ...plugin,
+      id: "acme/bumped-later",
+      publishedAt: "2026-09-20T00:00:00.000Z",
+      updatedAt: "2026-10-01T17:00:00.000Z",
+    };
+    const neverUpdated = {
+      ...plugin,
+      id: "acme/never-updated",
+      publishedAt: "2026-10-02T00:00:00.000Z",
+      updatedAt: "2026-10-02T00:00:00.000Z",
+    };
+    expect(recentlyUpdated([bumped, neverUpdated, bumpedLater]).map((p) => p.id)).toEqual([
+      "acme/bumped-later",
+      "acme/bumped",
+    ]);
   });
-  it("orders by submission time and by installs in a window, keeping index order for ties", () => {
-    const older = { ...plugin, id: "acme/older", submittedAt: "2026-09-01" };
+  it("orders by first listing time and by installs in a window, keeping index order for ties", () => {
+    const older = { ...plugin, id: "acme/older", publishedAt: "2026-09-01" };
     const twin = { ...plugin, id: "acme/twin" };
     expect(newestFirst([older, plugin, twin]).map((p) => p.id)).toEqual([
       "acme/example",
diff --git a/packages/website/src/plugins/registry.ts b/packages/website/src/plugins/registry.ts
index c55741ecdc..df8dfb4ca6 100644
--- a/packages/website/src/plugins/registry.ts
+++ b/packages/website/src/plugins/registry.ts
@@ -106,9 +106,18 @@ export function featuredPlugins(plugins: Plugin[], featured: string[]): Plugin[]
   const byId = new Map(plugins.map((plugin) => [plugin.id, plugin]));
   return [...new Set(featured)].flatMap((id) => byId.get(id) ?? []);
 }
-/** Most recently submitted first, so updates never resurface a plugin; equal times keep index order. */
+/**
+ * Most recently listed first. A slow review does not push a plugin down, and an update does not
+ * bring it back up. Equal times keep index order.
+ */
 export function newestFirst(plugins: Plugin[]): Plugin[] {
-  return [...plugins].sort((a, b) => Date.parse(b.submittedAt) - Date.parse(a.submittedAt));
+  return [...plugins].sort((a, b) => Date.parse(b.publishedAt) - Date.parse(a.publishedAt));
+}
+/** Plugins with a version approved after their first listing, most recent update first. */
+export function recentlyUpdated(plugins: Plugin[]): Plugin[] {
+  return plugins
+    .filter((plugin) => Date.parse(plugin.updatedAt) > Date.parse(plugin.publishedAt))
+    .sort((a, b) => Date.parse(b.updatedAt) - Date.parse(a.updatedAt));
 }
 /** Most installs in the window first; equal counts keep index order. */
 export function mostInstalled(
@@ -119,9 +128,16 @@ export function mostInstalled(
   const count = (plugin: Plugin) => installs[plugin.id]?.[window] ?? 0;
   return [...plugins].sort((a, b) => count(b) - count(a));
 }
-/** How long ago the plugin was submitted, relative to the loader's clock. */
+/** How long ago the plugin was first listed, relative to the loader's clock. */
 export function addedAgo(plugin: Plugin, now: string): string {
-  const days = Math.floor((Date.parse(now) - Date.parse(plugin.submittedAt)) / DAY_MS);
+  return ago(plugin.publishedAt, now);
+}
+/** How long ago the plugin's current version was approved, relative to the loader's clock. */
+export function updatedAgo(plugin: Plugin, now: string): string {
+  return ago(plugin.updatedAt, now);
+}
+function ago(date: string, now: string): string {
+  const days = Math.floor((Date.parse(now) - Date.parse(date)) / DAY_MS);
   if (days <= 0) return "today";
   if (days === 1) return "yesterday";
   if (days < 14) return `${days}d ago`;
diff --git a/packages/website/src/plugins/thumbnails.test.ts b/packages/website/src/plugins/thumbnails.test.ts
index fb9a571b93..aaaaf47418 100644
--- a/packages/website/src/plugins/thumbnails.test.ts
+++ b/packages/website/src/plugins/thumbnails.test.ts
@@ -2,7 +2,7 @@ import { createElement } from "react";
 import { renderToStaticMarkup } from "react-dom/server";
 import { describe, expect, it } from "vitest";
 import { handlePluginThumbnailRequest, pluginCardScreenshot } from "./thumbnails";
-import { NewPluginCard, PluginCard } from "./plugin-card";
+import { PluginCard } from "./plugin-card";
 import type { Plugin } from "./registry";
 
 const source = "https://cdn.jsdelivr.net/npm/paseo-example@1.2.3/preview.png";
@@ -29,6 +29,8 @@ const plugin: Plugin = {
   installs: 42,
 };
 
+const avatar = 'src="https://github.com/acme.png?size=80"';
+
 describe("plugin card thumbnails", () => {
   it("uses the first image in the plugin's media, skipping a leading video", () => {
     const html = renderToStaticMarkup(
@@ -42,7 +44,7 @@ describe("plugin card thumbnails", () => {
     const html = renderToStaticMarkup(
       createElement(PluginCard, { plugin: { ...plugin, media: [video] } }),
     );
-    expect(html).not.toContain("<img");
+    expect(html.match(/<img [^>]*>/g)).toEqual([expect.stringContaining(avatar)]);
     expect(html).not.toContain("<video");
     expect(html).toContain(">E</div>");
   });
@@ -56,11 +58,14 @@ describe("plugin card thumbnails", () => {
     expect(html).not.toContain("/plugins/thumb/");
   });
 
-  it.each([
-    ["PluginCard", () => createElement(PluginCard, { plugin }, "today")],
-    ["NewPluginCard", () => createElement(NewPluginCard, { plugin }, "today")],
-  ])("renders a thumbnail instead of downloading the original screenshot (%s)", (_name, card) => {
-    const html = renderToStaticMarkup(card());
+  it("shows the author's avatar and name beside the card detail", () => {
+    const html = renderToStaticMarkup(createElement(PluginCard, { plugin }, "today"));
+    expect(html).toContain(avatar);
+    expect(html).toMatch(/>acme<\/span><span aria-hidden="true">·<\/span><span[^>]*>today<\/span>/);
+  });
+
+  it("renders a thumbnail instead of downloading the original screenshot", () => {
+    const html = renderToStaticMarkup(createElement(PluginCard, { plugin }, "today"));
     expect(html).toContain(
       `src="/plugins/thumb/592/${encodeURIComponent(source)}?plugin=acme%2Fexample"`,
     );
diff --git a/packages/website/src/routes/plugins/index.tsx b/packages/website/src/routes/plugins/index.tsx
index 505b8177fc..613afc375c 100644
--- a/packages/website/src/routes/plugins/index.tsx
+++ b/packages/website/src/routes/plugins/index.tsx
@@ -27,6 +27,8 @@ import {
   mostInstalled,
   newestFirst,
   pluginOwner,
+  recentlyUpdated,
+  updatedAgo,
 } from "~/plugins";
 import { ContributeSection } from "~/plugins/contribute-links";
 import { PluginsHero } from "~/plugins/hero";
@@ -41,7 +43,7 @@ import {
   parseWindow,
 } from "~/plugins/links";
 import { InstallCount } from "~/plugins/install-count";
-import { NewPluginCard, PluginRankRow } from "~/plugins/plugin-card";
+import { PluginCard, PluginRankRow } from "~/plugins/plugin-card";
 import { PluginSection, PluginSectionHeader, PluginSectionTitle } from "~/plugins/section";
 import { WindowSwitch } from "~/plugins/window-switch";
 import "~/styles.css";
@@ -61,9 +63,9 @@ const CATEGORY_ICONS: Record<CategorySlug, LucideIcon> = {
   utils: Wrench,
 };
 
-// What's new and Featured cards: a swipeable row on phones, a grid from `sm` up.
+// Card sections: a swipeable row on phones, a grid from `sm` up.
 const CARD_ROW_CLASS =
-  "-mx-6 flex gap-4 overflow-x-auto px-6 pb-1 sm:mx-0 sm:grid sm:grid-cols-2 sm:px-0 lg:grid-cols-4";
+  "-mx-6 flex gap-4 overflow-x-auto px-6 pb-1 *:w-[70%] *:flex-shrink-0 sm:mx-0 sm:grid sm:grid-cols-2 sm:px-0 sm:*:w-auto lg:grid-cols-4";
 const SEE_ALL_CLASS =
   "inline-flex items-center gap-0.5 text-sm text-muted-foreground transition-colors hover:text-foreground";
 
@@ -79,7 +81,7 @@ export const Route = createFileRoute("/plugins/")({
     const sort = parseSort(params.get("sort")) ?? "installs";
     const window = parseWindow(params.get("window")) ?? DEFAULT_WINDOW;
     const q = parseSearchTerm(params.get("q"));
-    if (category || sort === "new" || q)
+    if (category || sort !== "installs" || q)
       throw redirect({
         href: browseHref({ category: category?.slug, sort, window, q }),
         statusCode: 301,
@@ -100,6 +102,7 @@ function PluginsPage() {
   const window = Route.useSearch().window ?? DEFAULT_WINDOW;
   const featured = featuredPlugins(plugins, featuredIds);
   const newest = newestFirst(plugins).slice(0, NEW_COUNT);
+  const updated = recentlyUpdated(plugins).slice(0, NEW_COUNT);
   const top = mostInstalled(plugins, installs, window).slice(0, TOP_COUNT);
   const windowHrefs = useMemo(
     () => ({
@@ -138,9 +141,9 @@ function PluginsPage() {
             </PluginSectionHeader>
             <div className={CARD_ROW_CLASS}>
               {featured.map((plugin) => (
-                <NewPluginCard key={plugin.id} plugin={plugin}>
+                <PluginCard key={plugin.id} plugin={plugin}>
                   <InstallCount count={installs[plugin.id]?.all ?? 0} />
-                </NewPluginCard>
+                </PluginCard>
               ))}
             </div>
           </PluginSection>
@@ -156,13 +159,35 @@ function PluginsPage() {
           </PluginSectionHeader>
           <div className={CARD_ROW_CLASS}>
             {newest.map((plugin) => (
-              <NewPluginCard key={plugin.id} plugin={plugin}>
+              <PluginCard key={plugin.id} plugin={plugin}>
                 {addedAgo(plugin, now)}
-              </NewPluginCard>
+              </PluginCard>
             ))}
           </div>
         </PluginSection>
 
+        {updated.length > 0 && (
+          <PluginSection labelledBy="recently-updated">
+            <PluginSectionHeader>
+              <PluginSectionTitle id="recently-updated">Recently updated</PluginSectionTitle>
+              <a
+                href={browseHref({ sort: "updated", window: DEFAULT_WINDOW })}
+                className={SEE_ALL_CLASS}
+              >
+                See all
+                <ChevronRight className="h-3.5 w-3.5" />
+              </a>
+            </PluginSectionHeader>
+            <div className={CARD_ROW_CLASS}>
+              {updated.map((plugin) => (
+                <PluginCard key={plugin.id} plugin={plugin}>
+                  {updatedAgo(plugin, now)}
+                </PluginCard>
+              ))}
+            </div>
+          </PluginSection>
+        )}
+
         <PluginSection labelledBy="categories">
           <PluginSectionTitle id="categories">Categories</PluginSectionTitle>
           <div className="grid grid-cols-2 gap-2 sm:grid-cols-3">

From e1b01df9058c2b32f5fe4a6b16cd7a95a1c739cf Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Mon, 12 Oct 2026 20:22:34 +0700
Subject: [PATCH 119/270] Keep gallery cards inside their grid column on phones
 (#6722)

A card whose description has an unbreakable word, such as xpufx/slash's raw
README HTML, sized its grid column to that word and widened browse pages to
564px at a 390px viewport. The card now has min-width 0 and its description
wraps long words.

Co-authored-by: paseo-bot[bot] <paseo-bot[bot]@users.noreply.github.com>
---
 packages/website/e2e/plugins.spec.ts         | 10 ++++++++++
 packages/website/e2e/registry.fixture.json   |  2 +-
 packages/website/src/plugins/plugin-card.tsx |  5 +++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index 346183a201..bc6b5ad6d0 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -24,6 +24,16 @@ test("scrolls mobile plugin carousels without widening the page", async ({ page
   await expectPageWithinViewport(page);
 });
 
+// Graphite's fixture description ends in raw README HTML with an unbreakable srcset URL.
+test("keeps browse grids within a phone's width when a description has an unbreakable word", async ({
+  page,
+}) => {
+  await page.setViewportSize({ width: 390, height: 844 });
+  await page.goto("/plugins/all");
+  await expect(page.getByRole("heading", { level: 1, name: /^All plugins/ })).toBeVisible();
+  await expectPageWithinViewport(page);
+});
+
 async function expectPageWithinViewport(page: Page) {
   expect(await page.evaluate(() => document.documentElement.scrollWidth)).toBeLessThanOrEqual(
     await page.evaluate(() => document.documentElement.clientWidth),
diff --git a/packages/website/e2e/registry.fixture.json b/packages/website/e2e/registry.fixture.json
index 6f7cd1b23c..4ad4eabf1b 100644
--- a/packages/website/e2e/registry.fixture.json
+++ b/packages/website/e2e/registry.fixture.json
@@ -608,7 +608,7 @@
     {
       "id": "tomgrin10/graphite",
       "name": "Graphite",
-      "description": "Workspace-native Graphite stack status and PR action radar for Paseo.",
+      "description": "Workspace-native Graphite stack status and PR action radar for Paseo. <p align=\"center\">   <picture>     <source media=\"(prefers-color-scheme: dark)\" srcset=\"https://raw.githubusercontent.com/xpufx/paseo/main/plugins/slash/docs/screenshots/slash-logo-for-dark-bg.png\">     <source media=\"(prefers-color-scheme: light)\" srcset",
       "artifact": {
         "kind": "npm",
         "package": "paseo-graphite",
diff --git a/packages/website/src/plugins/plugin-card.tsx b/packages/website/src/plugins/plugin-card.tsx
index 543876afbe..c46b9f553a 100644
--- a/packages/website/src/plugins/plugin-card.tsx
+++ b/packages/website/src/plugins/plugin-card.tsx
@@ -41,13 +41,14 @@ function PluginShot({ plugin }: { plugin: Plugin }) {
 export function PluginCard({ plugin, children }: { plugin: Plugin; children?: ReactNode }) {
   const author = getAuthor(plugin);
   return (
-    <a href={pluginHref(plugin.id)} className="group block">
+    // Grid items size to their content by default; min-w-0 keeps the card in its column.
+    <a href={pluginHref(plugin.id)} className="group block min-w-0">
       <PluginShot plugin={plugin} />
       <div className="mt-3 flex items-center gap-2">
         <PluginTile plugin={plugin} size="xs" />
         <p className="min-w-0 truncate text-sm font-medium text-white">{plugin.name}</p>
       </div>
-      <p className="mt-2 line-clamp-2 min-h-10 text-xs leading-5 text-muted-foreground">
+      <p className="mt-2 line-clamp-2 min-h-10 break-words text-xs leading-5 text-muted-foreground">
         {plugin.description}
       </p>
       <p className="mt-2 flex min-w-0 items-center gap-1.5 text-xs text-extra-muted-foreground">

From 8bc5f47b1c426bab0196c2dea16a3e4e15bb192c Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Mon, 12 Oct 2026 20:51:22 +0700
Subject: [PATCH 120/270] Add a Report a bug button to plugin detail pages
 (#6721)

Links to a new issue on the plugin's GitHub repository, from the registry's repository URL. Monorepo folder URLs resolve to the repository; non-GitHub sources show no button.

Co-authored-by: paseo-bot[bot] <paseo-bot[bot]@users.noreply.github.com>
---
 packages/website/e2e/plugins.spec.ts            |  6 ++++++
 packages/website/src/plugins/registry.test.ts   | 15 +++++++++++++++
 packages/website/src/plugins/registry.ts        | 13 +++++++++++++
 .../src/routes/plugins/$owner_.$slug.tsx        | 17 +++++++++++++++--
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/packages/website/e2e/plugins.spec.ts b/packages/website/e2e/plugins.spec.ts
index bc6b5ad6d0..6eb9f7d816 100644
--- a/packages/website/e2e/plugins.spec.ts
+++ b/packages/website/e2e/plugins.spec.ts
@@ -98,6 +98,11 @@ test("browses from the directory into a category, a plugin, and its author", asy
     "href",
     "/plugins/category/git",
   );
+  // The source is a folder in a monorepo; issues are filed on the repository.
+  await expect(page.getByRole("link", { name: "Report a bug" })).toHaveAttribute(
+    "href",
+    "https://github.com/omercnet/paseo-plugins/issues/new",
+  );
 
   await page.getByRole("link", { name: "Omer Cohen" }).click();
   await expect(page).toHaveURL(/\/plugins\/omercnet$/);
@@ -764,6 +769,7 @@ async function expectPluginOverviewSafe(page: Page) {
   });
   expect(violations).toEqual([]);
   await expect(page.getByRole("link", { name: "Source", exact: true })).toHaveCount(0);
+  await expect(page.getByRole("link", { name: "Report a bug" })).toHaveCount(0);
   await expect(page.getByRole("img", { name: /screenshot/ })).toHaveCount(0);
   await expect(page.getByRole("heading", { level: 1 })).toHaveText(securityPlugin.name);
   await expect(
diff --git a/packages/website/src/plugins/registry.test.ts b/packages/website/src/plugins/registry.test.ts
index cf3af56794..d8f343b266 100644
--- a/packages/website/src/plugins/registry.test.ts
+++ b/packages/website/src/plugins/registry.test.ts
@@ -11,6 +11,7 @@ import {
   type Plugin,
   readmeBody,
   recentlyUpdated,
+  reportBugUrl,
   searchPlugins,
   updatedAgo,
 } from "./registry";
@@ -292,6 +293,20 @@ describe("plugin registry", () => {
     expect(installCommand(plugin)).toBe("paseo plugin add acme/example");
     expect(formatInstalls(1250)).toBe("1.3k");
   });
+  it("reports bugs on the source repository's GitHub issue tracker", () => {
+    const at = (url: string) => reportBugUrl({ ...plugin, repository: { url } });
+    expect(at("https://github.com/acme/example")).toBe(
+      "https://github.com/acme/example/issues/new",
+    );
+    expect(at("https://github.com/acme/plugins.git")).toBe(
+      "https://github.com/acme/plugins/issues/new",
+    );
+    expect(at("https://github.com/acme/plugins/tree/HEAD/packages/example")).toBe(
+      "https://github.com/acme/plugins/issues/new",
+    );
+    expect(at("https://gitlab.com/acme/example")).toBeUndefined();
+    expect(at("javascript:alert(1)")).toBeUndefined();
+  });
 });
 
 /** In-memory stand-in for the website KV namespace, covering the calls the counter makes. */
diff --git a/packages/website/src/plugins/registry.ts b/packages/website/src/plugins/registry.ts
index df8dfb4ca6..7d99cb6789 100644
--- a/packages/website/src/plugins/registry.ts
+++ b/packages/website/src/plugins/registry.ts
@@ -1,4 +1,9 @@
 import type { z } from "zod";
+import {
+  isGitHubHost,
+  parseGitHubRemoteIdentity,
+  parseGitRemoteLocation,
+} from "@getpaseo/protocol/git-remote";
 import { pluginOverviewUrl } from "@getpaseo/protocol/plugin-overview";
 import { pluginMediaKind, type PublishedPluginSchema } from "@getpaseo/protocol/plugin-registry";
 import { scoreTextFields } from "@getpaseo/protocol/search/text-match";
@@ -53,6 +58,14 @@ export function npmUrl(plugin: Plugin): string | undefined {
     ? `https://www.npmjs.com/package/${plugin.artifact.package}`
     : undefined;
 }
+/** A new issue on the plugin's GitHub repository; absent when the source is hosted elsewhere. */
+export function reportBugUrl(plugin: Plugin): string | undefined {
+  const location = parseGitRemoteLocation(plugin.repository.url);
+  if (!location || !isGitHubHost(location.host)) return undefined;
+  // A monorepo source points at the plugin's folder; issues belong to the repository.
+  const repository = parseGitHubRemoteIdentity(location.path.split("/").slice(0, 2).join("/"));
+  return repository ? `https://github.com/${repository.repo}/issues/new` : undefined;
+}
 export function authorNpmUrl(author: Author): string | undefined {
   return author.npm ? `https://www.npmjs.com/~${author.npm}` : undefined;
 }
diff --git a/packages/website/src/routes/plugins/$owner_.$slug.tsx b/packages/website/src/routes/plugins/$owner_.$slug.tsx
index 2000067e00..b3d02177aa 100644
--- a/packages/website/src/routes/plugins/$owner_.$slug.tsx
+++ b/packages/website/src/routes/plugins/$owner_.$slug.tsx
@@ -1,5 +1,6 @@
 import { createFileRoute, notFound } from "@tanstack/react-router";
 import { ExternalLink } from "lucide-react";
+import { GitHubIcon } from "~/components/brand-icons";
 import { CodeBlock } from "~/components/code-block";
 import { PluginOverview, PluginContentLink } from "~/plugins/overview";
 import { SiteShell } from "~/components/site-shell";
@@ -14,6 +15,7 @@ import {
   npmUrl,
   pluginVersion,
   readmeBody,
+  reportBugUrl,
 } from "~/plugins";
 import { AuthorAvatar, AuthorLink } from "~/plugins/author-link";
 import { InstallCount } from "~/plugins/install-count";
@@ -48,6 +50,8 @@ export const Route = createFileRoute("/plugins/$owner_/$slug")({
 
 const META_LINK_CLASS =
   "inline-flex items-center gap-1 text-xs text-extra-muted-foreground transition-colors hover:text-muted-foreground";
+const REPORT_BUG_CLASS =
+  "inline-flex items-center gap-2 rounded-lg border border-white/12 px-3 py-2 text-sm text-muted-foreground transition-colors hover:bg-white/10 hover:text-foreground";
 const AUTHOR_LINK_CLASS =
   "inline-flex items-center gap-1.5 text-xs text-extra-muted-foreground transition-colors hover:text-muted-foreground";
 
@@ -56,6 +60,7 @@ function PluginPage() {
   const category = getCategory(plugin.categories[0]);
   const author = getAuthor(plugin);
   const npm = npmUrl(plugin);
+  const reportBug = reportBugUrl(plugin);
 
   return (
     <SiteShell width="default">
@@ -64,8 +69,16 @@ function PluginPage() {
       </a>
       <h1 className="mt-4 text-3xl font-medium tracking-tight">{plugin.name}</h1>
       <p className="mt-3 text-lg leading-relaxed text-white/70">{plugin.description}</p>
-      <div className="mt-6 w-fit max-w-full">
-        <CodeBlock size="sm">{installCommand(plugin)}</CodeBlock>
+      <div className="mt-6 flex flex-wrap items-center gap-3">
+        <div className="w-fit max-w-full">
+          <CodeBlock size="sm">{installCommand(plugin)}</CodeBlock>
+        </div>
+        {reportBug && (
+          <PluginContentLink href={reportBug} className={REPORT_BUG_CLASS}>
+            <GitHubIcon className="h-4 w-4" />
+            Report a bug
+          </PluginContentLink>
+        )}
       </div>
       <div className="mt-3 flex flex-wrap items-center gap-x-2 gap-y-2 text-xs text-extra-muted-foreground [&>*+*]:before:mr-2 [&>*+*]:before:content-['·'_/_'']">
         <AuthorLink author={author} className={AUTHOR_LINK_CLASS}>

From 6f62125ee018c5c44e6897c160094594b151036f Mon Sep 17 00:00:00 2001
From: Elowen <73627805+Mar-garet@users.noreply.github.com>
Date: Mon, 12 Oct 2026 23:14:54 +0800
Subject: [PATCH 121/270] fix: return dot-prefixed paths in workspace
 suggestions (#6720)

* fix(paths): allow double-dot names in contained paths

* test(paths): cover dot-prefixed workspace suggestions
---
 .../server/daemon-e2e/filesystem.e2e.test.ts  | 83 +++++++++++++++++++
 packages/server/src/utils/path.test.ts        | 29 +++++++
 packages/server/src/utils/path.ts             |  9 +-
 3 files changed, 117 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
index fae56c0ec7..c0e14d72b8 100644
--- a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
@@ -23,6 +23,89 @@ afterEach(async () => {
 }, 60000);
 
 describe("file explorer", () => {
+  test.each(["..", "..."])(
+    "workspace suggestions resolve exact paths starting with %s",
+    async (prefix) => {
+      const cwd = tmpCwd();
+      const directoryName = `${prefix}docs`;
+      const nestedPath = `${directoryName}/notes.md`;
+      const fileName = `${prefix}notes.md`;
+      try {
+        mkdirSync(path.join(cwd, directoryName));
+        writeFileSync(path.join(cwd, nestedPath), "nested payload\n");
+        writeFileSync(path.join(cwd, fileName), "direct payload\n");
+        const file = await ctx.client.readFile(cwd, nestedPath);
+        expect(new TextDecoder().decode(file.bytes)).toBe("nested payload\n");
+
+        const nestedEntry = { path: nestedPath, kind: "file" };
+        const entries = [
+          nestedEntry,
+          { path: directoryName, kind: "directory" },
+          { path: fileName, kind: "file" },
+        ];
+        const cases = entries.flatMap((entry) => [
+          { query: `./${entry.path}`, entry },
+          { query: path.resolve(cwd, entry.path), entry },
+        ]);
+        cases.unshift({ query: nestedPath, entry: nestedEntry });
+        for (const { query, entry } of cases) {
+          const response = await ctx.client.getDirectorySuggestions({
+            cwd,
+            query,
+            limit: 1,
+            includeFiles: true,
+            includeDirectories: true,
+            matchMode: "suffix",
+          });
+          expect(response.error).toBeNull();
+          expect(response.entries).toEqual([entry]);
+        }
+      } finally {
+        rmSync(cwd, { recursive: true, force: true });
+      }
+    },
+  );
+
+  test("workspace suggestions exclude exact parent and sibling paths", async () => {
+    const directory = tmpCwd();
+    const cwd = path.join(directory, "workspace");
+    const sibling = path.join(directory, "workspace-other");
+    try {
+      mkdirSync(cwd);
+      mkdirSync(sibling);
+      writeFileSync(path.join(cwd, "visible.txt"), "inside payload\n");
+      writeFileSync(path.join(sibling, "outside.txt"), "outside payload\n");
+      for (const query of [
+        "./..",
+        "../workspace-other/outside.txt",
+        path.join(sibling, "outside.txt"),
+      ]) {
+        const response = await ctx.client.getDirectorySuggestions({
+          cwd,
+          query,
+          limit: 1,
+          includeFiles: true,
+          includeDirectories: true,
+          matchMode: "suffix",
+        });
+        expect(response.error).toBeNull();
+        expect(response.entries).toEqual([]);
+      }
+      const control = await ctx.client.getDirectorySuggestions({
+        cwd,
+        query: "./visible.txt",
+        limit: 1,
+        includeFiles: true,
+        includeDirectories: false,
+        matchMode: "suffix",
+      });
+      expect(control.error).toBeNull();
+      expect(control.entries).toEqual([{ path: "visible.txt", kind: "file" }]);
+    } finally {
+      rmSync(directory, { recursive: true, force: true });
+    }
+  });
+
   test.each([
     { description: "a long ASCII name", fileName: `${"a".repeat(236)}.txt` },
     { description: "an ordinary name", fileName: "notes.txt" },
diff --git a/packages/server/src/utils/path.test.ts b/packages/server/src/utils/path.test.ts
index f72f5d82b2..bb279d6c2f 100644
--- a/packages/server/src/utils/path.test.ts
+++ b/packages/server/src/utils/path.test.ts
@@ -42,6 +42,35 @@ describe("path equivalence", () => {
     );
   });
 
+  test.each([
+    { root: "/repo", candidate: "/repo/..notes.txt", inside: true },
+    { root: "/repo", candidate: "/repo/..drafts/notes.md", inside: true },
+    { root: "/repo", candidate: "/repo/...drafts/notes.md", inside: true },
+    { root: "/repo", candidate: "/repo/docs/..notes.txt", inside: true },
+    { root: "/repo", candidate: "/repo", inside: true },
+    { root: "/repo", candidate: "/repo/../sibling/notes.md", inside: false },
+    { root: "/repo", candidate: "/repo/..drafts/../../outside.txt", inside: false },
+    { root: "/repo", candidate: "/repo-other/notes.md", inside: false },
+    { root: "C:\\Repo", candidate: "c:/repo/..notes.txt", inside: true },
+    { root: "C:\\Repo", candidate: "C:\\Repo\\..drafts\\notes.md", inside: true },
+    { root: "C:\\Repo", candidate: "C:\\Repo\\...drafts\\notes.md", inside: true },
+    { root: "C:\\Repo", candidate: "C:\\Repo\\..\\sibling\\notes.md", inside: false },
+    { root: "C:\\Repo", candidate: "C:\\Repo-other\\notes.md", inside: false },
+    { root: "C:\\Repo", candidate: "D:\\Repo\\..notes.txt", inside: false },
+    {
+      root: String.raw`\\server\share\repo`,
+      candidate: String.raw`\\server\share\repo\..drafts\notes.md`,
+      inside: true,
+    },
+    {
+      root: String.raw`\\?\C:\Repo`,
+      candidate: "C:\\Repo\\..notes.txt",
+      inside: true,
+    },
+  ])("checks named path containment for $candidate", ({ root, candidate, inside }) => {
+    expect(isPathInsideRoot(root, candidate)).toBe(inside);
+  });
+
   test("preserves the casing of Windows relative suffixes", () => {
     expect(getRealpathAwareRelativePath("C:\\Repo\\.git", "c:\\repo\\.git\\HEAD")).toBe("HEAD");
     expect(
diff --git a/packages/server/src/utils/path.ts b/packages/server/src/utils/path.ts
index 577e48efb4..a0ec908fbb 100644
--- a/packages/server/src/utils/path.ts
+++ b/packages/server/src/utils/path.ts
@@ -114,10 +114,11 @@ function getRelativePathInsideRoot(root: string, candidate: string): string | nu
   const normalizedCandidate = normalizePathForComparison(candidate, compareAsWindows);
   const comparableRelative = platformPath.relative(normalizedRoot, normalizedCandidate);
 
-  if (
-    comparableRelative !== "" &&
-    (comparableRelative.startsWith("..") || platformPath.isAbsolute(comparableRelative))
-  ) {
+  const isOutsideRoot =
+    comparableRelative === ".." ||
+    comparableRelative.startsWith(`..${platformPath.sep}`) ||
+    platformPath.isAbsolute(comparableRelative);
+  if (isOutsideRoot) {
     return null;
   }
 

From 9551b2cc11328170416b3d9753c7ec9a10ed35e7 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 18:05:04 +0200
Subject: [PATCH 122/270] Open loaded Linux desktop windows when hidden
 rendering stalls (#6726)

* fix(desktop): show the window when ready-to-show never fires on Linux

Reveal hidden Linux windows that do not receive an initial compositor frame.

* fix(desktop): open loaded Linux windows without waiting for a frame

A hidden Linux window can finish loading without painting, so waiting only for ready-to-show leaves the application invisible. Reveal the loaded document and retain the frame-ready path on other platforms.

Co-authored-by: mistop <jhlim@mistop.org>

---------

Co-authored-by: mistop <jhlim@mistop.org>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 docs/development.md                           | 16 ++++++
 packages/desktop/e2e/window-startup.e2e.mjs   | 48 ++++++++++++++++
 packages/desktop/package.json                 |  3 +-
 packages/desktop/src/main.ts                  |  5 +-
 .../src/window/show-when-ready.test.ts        | 57 +++++++++++++++++++
 .../desktop/src/window/show-when-ready.ts     | 25 ++++++++
 6 files changed, 151 insertions(+), 3 deletions(-)
 create mode 100644 packages/desktop/e2e/window-startup.e2e.mjs
 create mode 100644 packages/desktop/src/window/show-when-ready.test.ts
 create mode 100644 packages/desktop/src/window/show-when-ready.ts

diff --git a/docs/development.md b/docs/development.md
index caba38adc9..437b635fec 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -311,6 +311,22 @@ frames non-stop, pinning ProMotion displays at 120Hz forever and draining the
 battery while the app is idle — so do not re-add it. The probe's visibility
 guards already prevent throttling from causing a false stall.
 
+### Desktop Linux hidden-window fallback
+
+On Wayland (seen on ChromeOS Linux) a window created with `show: false` can sit
+forever without a single compositor frame: the renderer loads and runs, but
+`ready-to-show` never fires, so the window is never shown and the app looks like
+it did not start while every process is alive. `showWindowWhenReady`
+(`packages/desktop/src/window/show-when-ready.ts`) shows the main window when
+the document finishes loading if the event has not arrived. The fallback is
+Linux-only; macOS and Windows keep waiting for `ready-to-show`.
+
+Run the startup regression on Linux with an isolated display:
+
+```bash
+xvfb-run -a npm run test:e2e:window-startup --workspace=@getpaseo/desktop
+```
+
 ### Daemon logs
 
 Check `$PASEO_HOME/daemon.log` for daemon logs. The default level is `info`; set
diff --git a/packages/desktop/e2e/window-startup.e2e.mjs b/packages/desktop/e2e/window-startup.e2e.mjs
new file mode 100644
index 0000000000..e6654c09c2
--- /dev/null
+++ b/packages/desktop/e2e/window-startup.e2e.mjs
@@ -0,0 +1,48 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { _electron as electron, expect } from "playwright/test";
+
+const root = await mkdtemp(path.join(tmpdir(), "paseo-window-startup-"));
+const modulePath = fileURLToPath(new URL("../dist/window/show-when-ready.js", import.meta.url));
+
+async function launchWindowWithoutHiddenFrames() {
+  const main = path.join(root, "main.cjs");
+  await writeFile(
+    main,
+    `const { app, BrowserWindow } = require("electron");
+     const { showWindowWhenReady } = require(${JSON.stringify(modulePath)});
+     app.setPath("userData", ${JSON.stringify(path.join(root, "user-data"))});
+     app.whenReady().then(async () => {
+       const win = global.mainWindow = new BrowserWindow({ show: false, paintWhenInitiallyHidden: false });
+       showWindowWhenReady(win, { showOnLoad: true });
+       await win.loadURL("data:text/html,<h1>Desktop ready</h1>");
+       global.visibleAfterLoad = win.isVisible();
+     });`,
+  );
+  const env = Object.fromEntries(
+    Object.entries(process.env).filter(([key]) => key !== "ELECTRON_RUN_AS_NODE"),
+  );
+  const displayArgs = process.platform === "linux" ? ["--ozone-platform=x11", "--disable-gpu"] : [];
+  return electron.launch({
+    args: ["--no-sandbox", ...displayArgs, main],
+    env,
+  });
+}
+
+async function expectLoadedDesktopIsShown(desktop) {
+  await expect.poll(() => desktop.evaluate(() => global.visibleAfterLoad)).toBe(true);
+  const page = await desktop.firstWindow();
+  await expect(page.getByRole("heading", { name: "Desktop ready" })).toBeVisible();
+}
+
+let desktop;
+try {
+  desktop = await launchWindowWithoutHiddenFrames();
+  await expectLoadedDesktopIsShown(desktop);
+  console.log("Loaded desktop is visible without hidden compositor frames");
+} finally {
+  await desktop?.close();
+  await rm(root, { recursive: true, force: true });
+}
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 481fa05e64..e6e2dbd567 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -25,7 +25,8 @@
     "verify:electron-cdp": "node ./scripts/verify-electron-cdp.mjs",
     "test": "install-electron && vitest run --exclude \"e2e/**\"",
     "typecheck": "tsgo --noEmit -p tsconfig.json",
-    "test:e2e:lifecycle": "npm run build:main && node ./e2e/daemon-lifecycle.e2e.mjs"
+    "test:e2e:lifecycle": "npm run build:main && node ./e2e/daemon-lifecycle.e2e.mjs",
+    "test:e2e:window-startup": "npm run build:main && node ./e2e/window-startup.e2e.mjs"
   },
   "dependencies": {
     "@getpaseo/cli": "*",
diff --git a/packages/desktop/src/main.ts b/packages/desktop/src/main.ts
index 63ab83281a..9acf329216 100644
--- a/packages/desktop/src/main.ts
+++ b/packages/desktop/src/main.ts
@@ -43,6 +43,7 @@ import {
   buildStandardContextMenuItems,
 } from "./window/window-manager.js";
 import { setupDarwinCompositorWatchdog } from "./window/compositor-watchdog/index.js";
+import { showWindowWhenReady } from "./window/show-when-ready.js";
 import { resolveDesktopWindowChromeMode, windowChromeModeArgument } from "./window/chrome.js";
 import { registerDialogHandlers } from "./features/dialogs.js";
 import {
@@ -773,8 +774,8 @@ async function createWindow(
     registerBrowserWebviewNavigationGuards(contents);
   });
 
-  mainWindow.once("ready-to-show", () => {
-    mainWindow.show();
+  showWindowWhenReady(mainWindow, {
+    showOnLoad: process.platform === "linux",
   });
 
   if (!app.isPackaged) {
diff --git a/packages/desktop/src/window/show-when-ready.test.ts b/packages/desktop/src/window/show-when-ready.test.ts
new file mode 100644
index 0000000000..756ad24cc2
--- /dev/null
+++ b/packages/desktop/src/window/show-when-ready.test.ts
@@ -0,0 +1,57 @@
+import { EventEmitter } from "node:events";
+import { describe, expect, it } from "vitest";
+import { showWindowWhenReady } from "./show-when-ready.js";
+
+class Window extends EventEmitter {
+  webContents = new EventEmitter();
+  shows = 0;
+  destroyed = false;
+  show() {
+    this.shows += 1;
+  }
+  isDestroyed() {
+    return this.destroyed;
+  }
+  close() {
+    this.destroyed = true;
+    this.emit("closed");
+  }
+}
+
+describe("showWindowWhenReady", () => {
+  it("shows a loaded Linux window even when no initial frame was painted", () => {
+    const win = new Window();
+    showWindowWhenReady(win, { showOnLoad: true });
+    expect(win.shows).toBe(0);
+    win.webContents.emit("did-finish-load");
+    expect(win.shows).toBe(1);
+    win.emit("ready-to-show");
+    expect(win.shows).toBe(1);
+  });
+
+  it("shows on the first frame without showing again after load", () => {
+    const win = new Window();
+    showWindowWhenReady(win, { showOnLoad: true });
+    win.emit("ready-to-show");
+    win.webContents.emit("did-finish-load");
+    expect(win.shows).toBe(1);
+  });
+
+  it("preserves waiting for the initial frame when show on load is disabled", () => {
+    const win = new Window();
+    showWindowWhenReady(win, { showOnLoad: false });
+    win.webContents.emit("did-finish-load");
+    expect(win.shows).toBe(0);
+    win.emit("ready-to-show");
+    expect(win.shows).toBe(1);
+  });
+
+  it("keeps a closed window closed when readiness arrives later", () => {
+    const win = new Window();
+    showWindowWhenReady(win, { showOnLoad: true });
+    win.close();
+    win.webContents.emit("did-finish-load");
+    win.emit("ready-to-show");
+    expect(win.shows).toBe(0);
+  });
+});
diff --git a/packages/desktop/src/window/show-when-ready.ts b/packages/desktop/src/window/show-when-ready.ts
new file mode 100644
index 0000000000..e49c8518af
--- /dev/null
+++ b/packages/desktop/src/window/show-when-ready.ts
@@ -0,0 +1,25 @@
+interface ReadyToShowWindow {
+  once(event: "ready-to-show", listener: () => void): unknown;
+  webContents: {
+    once(event: "did-finish-load", listener: () => void): unknown;
+  };
+  show(): void;
+  isDestroyed(): boolean;
+}
+
+export function showWindowWhenReady(
+  win: ReadyToShowWindow,
+  options: { showOnLoad: boolean },
+): void {
+  let shown = false;
+  const show = () => {
+    if (shown || win.isDestroyed()) return;
+    shown = true;
+    win.show();
+  };
+
+  win.once("ready-to-show", show);
+  // On Linux a hidden window can wait for compositor frames until it is shown.
+  // Loading the document is sufficient to reveal it without depending on a frame.
+  if (options.showOnLoad) win.webContents.once("did-finish-load", show);
+}

From bfe38d92f67c715fccc9d22992ecaf82979ac9ad Mon Sep 17 00:00:00 2001
From: Sevn Chen <chenlei0214@outlook.com>
Date: Tue, 13 Oct 2026 04:01:25 +0800
Subject: [PATCH 123/270] fix(pi): mark turn-limited tintinweb subagents as
 completed (#6594)

Co-authored-by: Chen-DaYi <12897415+Chen-DaYi@users.noreply.github.com>
---
 .../tintinweb-pi-subagents/index.test.ts      | 150 ++++++++++++++++++
 .../tintinweb-pi-subagents/index.ts           |   3 +-
 2 files changed, 152 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.test.ts b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.test.ts
index b03c17c6ec..ad666bb4d3 100644
--- a/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.test.ts
+++ b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, test } from "vitest";
 import { fileURLToPath } from "node:url";
 import { createPiExtensionHost } from "../index.js";
 import { readSubagentFixture, verifySubagentFixture } from "../subagent-fixture-test.js";
+import type { PiAgentMessage } from "../../rpc-types.js";
 
 describe("@tintinweb/pi-subagents adapter", () => {
   test("exposes the background output file while the child is running", () => {
@@ -22,6 +23,27 @@ describe("@tintinweb/pi-subagents adapter", () => {
     ]);
     expect(mapping?.childSessions).toEqual([{ id: "call-1", file: "/tmp/child.output" }]);
   });
+  test("marks a foreground child that wrapped up at its turn limit as completed", () => {
+    const mapping = createPiExtensionHost().mapToolCall({
+      callId: "call-1",
+      toolName: "Agent",
+      args: { subagent_type: "Explore", prompt: "Inspect" },
+      status: "completed",
+      result: {
+        details: { agentId: "native-1", status: "steered" },
+        content: [{ type: "text", text: "Wrapped up (turn limit)" }],
+      },
+    });
+    expect(mapping?.subagents).toEqual([
+      expect.objectContaining({ id: "call-1", status: "completed" }),
+    ]);
+    expect(mapping?.detail).toEqual({
+      type: "sub_agent",
+      subAgentType: "Explore",
+      description: "Inspect",
+      log: "Wrapped up (turn limit)",
+    });
+  });
   test("maps captured foreground lifecycle live and on replay", async () => {
     const events = await verifySubagentFixture(
       readSubagentFixture(new URL("./fixtures/foreground.json", import.meta.url)),
@@ -65,6 +87,134 @@ describe("@tintinweb/pi-subagents adapter", () => {
       call_277179: "completed",
     });
   });
+  test.each(["subagent-notification", "subagent-update"])(
+    "completes turn-limited children in a grouped %s",
+    (customType) => {
+      const host = createPiExtensionHost();
+      for (const id of ["1", "2", "3"]) {
+        host.mapToolCall({
+          callId: `call-${id}`,
+          toolName: "Agent",
+          args: { subagent_type: "Explore", prompt: "Inspect" },
+          status: "completed",
+          result: { details: { agentId: `native-${id}`, status: "background" } },
+        });
+      }
+      const mapping = host.mapCustomMessage({
+        role: "custom",
+        customType,
+        content: "Wrapped up (turn limit)",
+        display: true,
+        timestamp: 0,
+        details: {
+          id: "native-1",
+          status: "steered",
+          others: [
+            { id: "native-2", status: "steered" },
+            { id: "native-3", status: "running" },
+          ],
+        },
+      });
+      expect(mapping?.subagents).toEqual([
+        expect.objectContaining({ id: "call-1", status: "completed" }),
+        expect.objectContaining({ id: "call-2", status: "completed" }),
+        expect.objectContaining({ id: "call-3", status: "running" }),
+      ]);
+    },
+  );
+  test.each(["get_subagent_result", "steer_subagent"])(
+    "completes a turn-limited child when collected through %s",
+    (toolName) => {
+      const host = createPiExtensionHost();
+      host.mapToolCall({
+        callId: "call-1",
+        toolName: "Agent",
+        args: { subagent_type: "Explore", prompt: "Inspect" },
+        status: "completed",
+        result: { details: { agentId: "native-1", status: "background" } },
+      });
+      const mapping = host.mapToolCall({
+        callId: "followup-1",
+        toolName,
+        args: { agent_id: "native-1" },
+        status: "completed",
+        result: {
+          details: { agentId: "native-1", status: "steered" },
+          content: [{ type: "text", text: "Wrapped up (turn limit)" }],
+        },
+      });
+      expect(mapping?.subagents).toEqual([{ type: "upsert", id: "call-1", status: "completed" }]);
+      expect(mapping?.detail).toEqual({
+        type: "sub_agent",
+        description: undefined,
+        log: "Wrapped up (turn limit)",
+      });
+    },
+  );
+  test.each([
+    ["background", "running"],
+    ["queued", "running"],
+    ["running", "running"],
+    ["completed", "completed"],
+    ["error", "failed"],
+    ["aborted", "canceled"],
+    ["stopped", "canceled"],
+    ["unknown", "running"],
+  ])("preserves the mapping of %s to %s", (status, expected) => {
+    const mapping = createPiExtensionHost().mapToolCall({
+      callId: "call-1",
+      toolName: "Agent",
+      args: { subagent_type: "Explore", prompt: "Inspect" },
+      status: "completed",
+      result: { details: { agentId: "native-1", status } },
+    });
+    expect(mapping?.subagents).toEqual([
+      expect.objectContaining({ id: "call-1", status: expected }),
+    ]);
+  });
+  test("completes a turn-limited background child live and on history replay", async () => {
+    const path = new URL("./fixtures/background.json", import.meta.url);
+    const source = readSubagentFixture(path);
+    const notification = source.messages.find((message) => message.role === "custom");
+    const notificationDetails = notification?.details;
+    if (
+      !notificationDetails ||
+      typeof notificationDetails !== "object" ||
+      !("outputFile" in notificationDetails) ||
+      typeof notificationDetails.outputFile !== "string"
+    ) {
+      throw new Error("Background fixture is missing its child output file");
+    }
+    const fixture = readSubagentFixture(path, {
+      from: notificationDetails.outputFile,
+      to: fileURLToPath(new URL("./fixtures/child-session.jsonl", import.meta.url)),
+    });
+    function wrapUp(message: PiAgentMessage): PiAgentMessage {
+      if (message.role !== "custom") return message;
+      const details = message.details;
+      if (!details || typeof details !== "object") {
+        throw new Error("Background fixture is missing its notification details");
+      }
+      return {
+        ...message,
+        content: "Wrapped up (turn limit)",
+        details: { ...details, status: "steered" },
+      };
+    }
+    const events = await verifySubagentFixture({
+      ...fixture,
+      events: fixture.events.map((event) =>
+        event.type === "message_end" ? { ...event, message: wrapUp(event.message) } : event,
+      ),
+      messages: fixture.messages.map(wrapUp),
+    });
+    expect(
+      events
+        .filter((event) => event.event.type === "upsert")
+        .map((event) => (event.event.type === "upsert" ? event.event.status : null)),
+    ).toEqual(["running", "running", "completed"]);
+    expect(events.filter((event) => event.event.type === "timeline").length).toBeGreaterThan(0);
+  });
   test("declines foreign Agent results", () => {
     expect(
       createPiExtensionHost().mapToolCall({
diff --git a/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.ts b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.ts
index 9c6ef9917e..56b5935172 100644
--- a/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.ts
+++ b/packages/server/src/server/agent/providers/pi/extensions/tintinweb-pi-subagents/index.ts
@@ -33,7 +33,8 @@ const Notification = NotificationEntry.extend({
   others: z.array(NotificationEntry).optional(),
 });
 const status = (value: string): "running" | "completed" | "failed" | "canceled" => {
-  if (value === "completed") return "completed";
+  // A soft turn-limit wrap-up has finished; it is not an in-flight steering request.
+  if (value === "completed" || value === "steered") return "completed";
   if (value === "error") return "failed";
   if (value === "aborted" || value === "stopped") return "canceled";
   return "running";

From e867773932c7b8522c2f09a4d499a88bbf18ebab Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 22:59:25 +0200
Subject: [PATCH 124/270] Restore native app startup (#6734)

* fix(app): install navigator polyfill before any app module loads

@xterm/headless reads navigator.userAgent at module evaluation. Since
#6455 the root layout transitively imports it, so the layout's
module-level polyfillNavigator() ran too late and native builds crashed
at launch with "Cannot read property 'includes' of undefined".

Install the crypto, navigator and screen.orientation polyfills from a
side-effect module imported first by index.ts. Calls written in index.ts
itself ran after all hoisted imports had evaluated.

Fixes #6504

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* test(app): isolate native startup regression from shared globals

Exercise the real navigator polyfill and terminal dependency in fresh VM contexts, including the pre-initialization failure. Preserve a check that entry imports install navigator before the app loads.

Co-authored-by: panrafal <rl@stamina.pl>

* test(app): follow startup import lint rule

---------

Co-authored-by: panrafal <rl@stamina.pl>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/index.ts                         | 10 +---
 packages/app/src/app/_layout.tsx              |  2 -
 packages/app/src/polyfills/install-early.ts   | 12 ++++
 .../src/polyfills/navigator-startup.test.ts   | 56 +++++++++++++++++++
 4 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 packages/app/src/polyfills/install-early.ts
 create mode 100644 packages/app/src/polyfills/navigator-startup.test.ts

diff --git a/packages/app/index.ts b/packages/app/index.ts
index 03b518fd2c..82d47bfe8c 100644
--- a/packages/app/index.ts
+++ b/packages/app/index.ts
@@ -1,10 +1,6 @@
-// Polyfill crypto.randomUUID for React Native before any other imports
-import { polyfillCrypto } from "./src/polyfills/crypto";
-polyfillCrypto();
-
-// Polyfill screen.orientation for WebKitGTK desktop runtimes that lack the API.
-import { polyfillScreenOrientation } from "./src/polyfills/screen-orientation";
-polyfillScreenOrientation();
+// Install runtime polyfills before any other module evaluates. Keep this the first import.
+// oxlint-disable-next-line import/no-unassigned-import -- Polyfills install on import.
+import "./src/polyfills/install-early";
 
 // Configure Unistyles before Expo Router pulls in any components using StyleSheet.
 import "./src/styles/unistyles";
diff --git a/packages/app/src/app/_layout.tsx b/packages/app/src/app/_layout.tsx
index 9c028aa2ce..869c93a0b2 100644
--- a/packages/app/src/app/_layout.tsx
+++ b/packages/app/src/app/_layout.tsx
@@ -103,7 +103,6 @@ import {
   useKeyboardActionDispatcher,
 } from "@/keyboard/keyboard-action-dispatcher-context";
 import { polyfillCrypto } from "@/polyfills/crypto";
-import { polyfillNavigator } from "@/polyfills/navigator";
 import {
   getHostRuntimeStore,
   hasConfiguredLocalDaemonOverride,
@@ -139,7 +138,6 @@ import {
   type WebNotificationClickDetail,
 } from "@/utils/os-notifications";
 
-polyfillNavigator();
 polyfillCrypto();
 
 export interface HostRuntimeBootstrapState {
diff --git a/packages/app/src/polyfills/install-early.ts b/packages/app/src/polyfills/install-early.ts
new file mode 100644
index 0000000000..0ee6ca02fa
--- /dev/null
+++ b/packages/app/src/polyfills/install-early.ts
@@ -0,0 +1,12 @@
+// Side-effect module imported first by index.ts. Babel hoists imports above
+// statements, so polyfill calls written in index.ts would run only after every
+// imported module had evaluated. Modules that read these globals at load time,
+// such as @xterm/headless reading navigator.userAgent, need them installed here.
+import { polyfillCrypto } from "./crypto";
+import { polyfillNavigator } from "./navigator";
+import { polyfillScreenOrientation } from "./screen-orientation";
+
+polyfillCrypto();
+polyfillNavigator();
+// Polyfill screen.orientation for WebKitGTK desktop runtimes that lack the API.
+polyfillScreenOrientation();
diff --git a/packages/app/src/polyfills/navigator-startup.test.ts b/packages/app/src/polyfills/navigator-startup.test.ts
new file mode 100644
index 0000000000..49a0fc69a2
--- /dev/null
+++ b/packages/app/src/polyfills/navigator-startup.test.ts
@@ -0,0 +1,56 @@
+import { readFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import { createContext, runInContext } from "node:vm";
+import ts from "typescript";
+import { expect, it } from "vitest";
+
+it("installs navigator before the app entry loads its other dependencies", () => {
+  const entry = ts.createSourceFile(
+    "index.ts",
+    readFileSync(new URL("../../index.ts", import.meta.url), "utf8"),
+    ts.ScriptTarget.Latest,
+  );
+  const firstImport = entry.statements.find(ts.isImportDeclaration);
+  expect(firstImport?.moduleSpecifier.getText(entry)).toBe('"./src/polyfills/install-early"');
+  const early = ts.createSourceFile(
+    "install-early.ts",
+    readFileSync(new URL("./install-early.ts", import.meta.url), "utf8"),
+    ts.ScriptTarget.Latest,
+  );
+  expect(
+    early.statements.some(
+      (statement) =>
+        ts.isExpressionStatement(statement) &&
+        ts.isCallExpression(statement.expression) &&
+        statement.expression.expression.getText(early) === "polyfillNavigator",
+    ),
+  ).toBe(true);
+});
+
+it("initializes the native navigator before evaluating the real terminal dependency", () => {
+  const require = createRequire(import.meta.url);
+  const terminalSource = readFileSync(require.resolve("@xterm/headless"), "utf8");
+  const navigatorSource = ts.transpileModule(
+    readFileSync(new URL("./navigator.ts", import.meta.url), "utf8"),
+    { compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022 } },
+  ).outputText;
+  // Each VM owns its globals, so the native navigator shape never replaces
+  // globals in the test runner or needs a native-module mock.
+  const uninitialized = createContext({
+    navigator: {},
+    window: {},
+    module: { exports: {} },
+    exports: {},
+  });
+  expect(() => runInContext(terminalSource, uninitialized)).toThrow(/includes/);
+
+  const initialized = createContext({
+    navigator: {},
+    window: {},
+    module: { exports: {} },
+    exports: {},
+  });
+  runInContext(navigatorSource, initialized);
+  runInContext("exports.polyfillNavigator()", initialized);
+  expect(() => runInContext(terminalSource, initialized)).not.toThrow();
+});

From 196dc3acd33a0d4a6a2bc24c5aab3da402572bfa Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 23:56:31 +0200
Subject: [PATCH 125/270] fix(pi): update thinking levels when extensions
 change them (#6741)

Publish the existing thinking-option event as soon as Pi changes its effective level, keeping subscribers and persistence in sync before the next state refresh.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../server/agent/providers/pi/agent.test.ts   | 42 +++++++++++++++++++
 .../src/server/agent/providers/pi/agent.ts    | 11 +++++
 .../server/agent/providers/pi/rpc-types.ts    |  1 +
 3 files changed, 54 insertions(+)

diff --git a/packages/server/src/server/agent/providers/pi/agent.test.ts b/packages/server/src/server/agent/providers/pi/agent.test.ts
index c6384e1fa2..927a9defd2 100644
--- a/packages/server/src/server/agent/providers/pi/agent.test.ts
+++ b/packages/server/src/server/agent/providers/pi/agent.test.ts
@@ -1943,6 +1943,48 @@ describe("PiRpcAgentSession", () => {
     expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe("off");
   });
 
+  test.each(["high", "off", "max"] as const)(
+    "publishes an extension's thinking change to %s before refreshing state",
+    async (level) => {
+      const { pi, session } = await createSession();
+      onTestFinished(() => session.close());
+      const changes: AgentStreamEvent[] = [];
+      session.subscribe((event) => {
+        if (event.type === "thinking_option_changed") {
+          expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe(level);
+          changes.push(event);
+        }
+      });
+      const runtime = pi.latestSession();
+      runtime.state = { ...runtime.state, thinkingLevel: level };
+      runtime.emit({ type: "thinking_level_changed", level });
+
+      expect(changes).toEqual([
+        { type: "thinking_option_changed", provider: "pi", thinkingOptionId: level },
+      ]);
+      expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe(level);
+      await expect(session.getRuntimeInfo()).resolves.toMatchObject({ thinkingOptionId: level });
+    },
+  );
+
+  test.each([undefined, null, "invalid", 123])(
+    "ignores a thinking change with invalid level %s",
+    async (level) => {
+      const { pi, session } = await createSession();
+      onTestFinished(() => session.close());
+      const initialThinking = session.describePersistence()?.metadata?.thinkingOptionId;
+      const changes: AgentStreamEvent[] = [];
+      session.subscribe((event) => {
+        if (event.type === "thinking_option_changed") changes.push(event);
+      });
+
+      pi.latestSession().emit({ type: "thinking_level_changed", level });
+
+      expect(changes).toEqual([]);
+      expect(session.describePersistence()?.metadata?.thinkingOptionId).toBe(initialThinking);
+    },
+  );
+
   test("surfaces state refresh failures after a Pi thinking update", async () => {
     const { pi, session } = await createSession();
     onTestFinished(() => session.close());
diff --git a/packages/server/src/server/agent/providers/pi/agent.ts b/packages/server/src/server/agent/providers/pi/agent.ts
index 38a1f9815f..146b56b36f 100644
--- a/packages/server/src/server/agent/providers/pi/agent.ts
+++ b/packages/server/src/server/agent/providers/pi/agent.ts
@@ -1005,6 +1005,8 @@ function isProcessExitEvent(
 
 function isPiAgentSessionEvent(event: PiRuntimeEvent): event is PiAgentSessionEvent {
   switch (event.type) {
+    case "thinking_level_changed":
+      return typeof event.level === "string" && normalizePiThinkingOption(event.level) !== null;
     case "agent_start":
     case "turn_start":
     case "message_start":
@@ -2136,6 +2138,15 @@ export class PiRpcAgentSession implements AgentSession {
     }
 
     switch (event.type) {
+      case "thinking_level_changed":
+        this.state = { ...this.state, thinkingLevel: event.level };
+        this.config.thinkingOptionId = event.level;
+        this.emit({
+          type: "thinking_option_changed",
+          provider: this.provider,
+          thinkingOptionId: event.level,
+        });
+        return;
       case "agent_start":
         this.activeTurnStarted = true;
         this.clearNoTurnBuffers();
diff --git a/packages/server/src/server/agent/providers/pi/rpc-types.ts b/packages/server/src/server/agent/providers/pi/rpc-types.ts
index cfa09daeb6..3e488c028c 100644
--- a/packages/server/src/server/agent/providers/pi/rpc-types.ts
+++ b/packages/server/src/server/agent/providers/pi/rpc-types.ts
@@ -160,6 +160,7 @@ export type PiAssistantMessageEvent =
   | { type: "start" | "text_start" | "text_end" | "thinking_start" | "thinking_end" | "done" };
 
 export type PiAgentSessionEvent =
+  | { type: "thinking_level_changed"; level: PiThinkingLevel }
   | { type: "agent_start" }
   | { type: "turn_start" }
   | { type: "message_start"; message: PiAgentMessage }

From be0acb29358be6c7ded74e8b64773cb9a9b920ed Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 00:53:44 +0200
Subject: [PATCH 126/270] fix(app): keep Diff updates alive after the first
 edit (#6745)

Hidden retained panels overwrite shared query metadata when a clean checkout becomes dirty. Resolve subscription demand from attached observers so a hidden panel cannot cancel the visible Diff tab.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../e2e/browser/changes-first-edit.spec.ts    | 122 ++++++++++++++++++
 packages/app/src/data/push-router.test.ts     |  65 ++++++++++
 packages/app/src/data/push-router.ts          |  10 +-
 3 files changed, 196 insertions(+), 1 deletion(-)
 create mode 100644 packages/app/e2e/browser/changes-first-edit.spec.ts

diff --git a/packages/app/e2e/browser/changes-first-edit.spec.ts b/packages/app/e2e/browser/changes-first-edit.spec.ts
new file mode 100644
index 0000000000..72c3890936
--- /dev/null
+++ b/packages/app/e2e/browser/changes-first-edit.spec.ts
@@ -0,0 +1,122 @@
+import { appendFile } from "node:fs/promises";
+import path from "node:path";
+import type { Page } from "@playwright/test";
+import { test, expect } from "../support/fixtures";
+import { openChangesTreePanel } from "../support/helpers/workspace-tabs";
+
+function changesTree(page: Page) {
+  return page.getByTestId("changes-tree-panel").filter({ visible: true });
+}
+
+async function expectEmptyChanges(page: Page) {
+  await expect(changesTree(page).getByText("No changes to display", { exact: true })).toBeVisible();
+}
+
+async function editReadme(repoPath: string, text: string) {
+  await appendFile(path.join(repoPath, "README.md"), text);
+}
+
+async function expectReadmeChanges(page: Page, additions: number) {
+  await expect(changesTree(page).getByText("README.md", { exact: true })).toBeVisible({
+    timeout: 30_000,
+  });
+  await expect(changesTree(page)).toContainText(`+${additions}`);
+}
+
+async function openEmptyDiff(page: Page) {
+  await changesTree(page).getByTestId("changes-options-menu").click();
+  await page.getByTestId("changes-open-tab").click();
+  await expect(
+    page
+      .getByTestId("working-diff-panel")
+      .filter({ visible: true })
+      .getByText("No changes to display", { exact: true }),
+  ).toBeVisible();
+}
+
+async function expectReadmeDiff(page: Page, additions: number) {
+  await expect(
+    page.getByTestId("working-diff-panel").filter({ visible: true }).getByTestId("diff-file-0"),
+  ).toHaveAccessibleName(`README.md, +${additions}, -0`, { timeout: 30_000 });
+}
+
+async function openDiffFromNewTabMenu(page: Page) {
+  await page.getByTestId("workspace-new-tab-button").filter({ visible: true }).first().click();
+  await page.getByTestId("workspace-new-tab-menu-diff").filter({ visible: true }).first().click();
+  await expect(
+    page
+      .getByTestId("working-diff-panel")
+      .filter({ visible: true })
+      .getByText("No changes to display", { exact: true }),
+  ).toBeVisible();
+}
+
+async function refreshDiff(page: Page) {
+  await page
+    .getByTestId("working-diff-panel")
+    .filter({ visible: true })
+    .getByTestId("changes-refresh")
+    .click();
+}
+
+async function reloadWorkspace(page: Page) {
+  await page.reload();
+}
+
+test("Changes follows the first edit to a clean workspace without reloading", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace();
+  await page.setViewportSize({ width: 1400, height: 900 });
+  await workspace.navigateTo();
+  await openChangesTreePanel(page);
+  await expectEmptyChanges(page);
+
+  await editReadme(workspace.repoPath, "first edit\n");
+  await expectReadmeChanges(page, 1);
+
+  await editReadme(workspace.repoPath, "second edit\n");
+  await expectReadmeChanges(page, 2);
+});
+
+test("the full diff follows the first edit to a clean workspace without reloading", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace();
+  await page.setViewportSize({ width: 1400, height: 900 });
+  await workspace.navigateTo();
+  await openChangesTreePanel(page);
+  await expectEmptyChanges(page);
+  await openEmptyDiff(page);
+
+  await editReadme(workspace.repoPath, "first edit\n");
+  await expectReadmeDiff(page, 1);
+
+  await editReadme(workspace.repoPath, "second edit\n");
+  await expectReadmeDiff(page, 2);
+});
+
+test("a directly opened Diff tab follows the first edit without an active Changes tree", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace();
+  await page.setViewportSize({ width: 1400, height: 900 });
+  await workspace.navigateTo();
+  await openDiffFromNewTabMenu(page);
+
+  await editReadme(workspace.repoPath, "first edit\n");
+  await expectReadmeDiff(page, 1);
+
+  await editReadme(workspace.repoPath, "second edit\n");
+  await expectReadmeDiff(page, 2);
+
+  await refreshDiff(page);
+  await expectReadmeDiff(page, 2);
+  await reloadWorkspace(page);
+  await expectReadmeDiff(page, 2);
+  await editReadme(workspace.repoPath, "third edit\n");
+  await expectReadmeDiff(page, 3);
+});
diff --git a/packages/app/src/data/push-router.test.ts b/packages/app/src/data/push-router.test.ts
index 01fba418a9..3bf9e99f9b 100644
--- a/packages/app/src/data/push-router.test.ts
+++ b/packages/app/src/data/push-router.test.ts
@@ -199,6 +199,71 @@ function providerUpdate(generatedAt: string): ProvidersSnapshotUpdateMessage {
 }
 
 describe("server data push router", () => {
+  it("keeps a visible diff subscribed when a hidden panel switches to the same comparison", () => {
+    const queryClient = new QueryClient();
+    const fake = createFakeClient();
+    const serverId = "server-1";
+    const cwd = "/repo";
+    const options = (mode: "base" | "uncommitted", enabled: boolean) => {
+      const queryKey = checkoutDiffQueryKey(
+        serverId,
+        cwd,
+        mode,
+        mode === "base" ? "main" : undefined,
+      );
+      return {
+        queryKey,
+        queryFn: skipToken as typeof skipToken,
+        gcTime: Infinity,
+        meta: checkoutDiffPushRoute({
+          enabled,
+          serverId,
+          cwd,
+          subscriptionId: `checkoutDiff:${JSON.stringify(queryKey)}`,
+          compare: { mode, ...(mode === "base" ? { baseRef: "main" } : {}) },
+        }),
+      };
+    };
+    const visible = new QueryObserver(queryClient, options("base", true));
+    const hidden = new QueryObserver(queryClient, options("base", false));
+    const unsubscribeVisible = visible.subscribe(() => {});
+    const unsubscribeHidden = hidden.subscribe(() => {});
+    const unmount = mountServerDataPushRouter({ queryClient, client: fake.client, serverId });
+    try {
+      visible.setOptions(options("uncommitted", true));
+      hidden.setOptions(options("uncommitted", false));
+      const subscription = fake.subscribeCheckoutDiffCalls.findLast(
+        (call) => call.compare.mode === "uncommitted",
+      )!;
+      const files = [
+        {
+          path: "README.md",
+          isNew: false,
+          isDeleted: false,
+          additions: 1,
+          deletions: 0,
+          hunks: [],
+        },
+      ];
+      fake.emit({
+        type: "checkout_diff_update",
+        payload: { subscriptionId: subscription.subscriptionId, cwd, files, error: null },
+      });
+      expect(queryClient.getQueryData(options("uncommitted", true).queryKey)).toMatchObject({
+        files,
+      });
+      expect(fake.unsubscribeCheckoutDiffCalls).not.toContain(subscription.subscriptionId);
+
+      unsubscribeVisible();
+      expect(fake.unsubscribeCheckoutDiffCalls).toContain(subscription.subscriptionId);
+    } finally {
+      unsubscribeVisible();
+      unsubscribeHidden();
+      unmount();
+      queryClient.clear();
+    }
+  });
+
   it("retains equal diff files without reconstructing changed file bodies", () => {
     const queryClient = new QueryClient();
     const fake = createFakeClient();
diff --git a/packages/app/src/data/push-router.ts b/packages/app/src/data/push-router.ts
index fc6d51ce4f..5ab3069bd0 100644
--- a/packages/app/src/data/push-router.ts
+++ b/packages/app/src/data/push-router.ts
@@ -494,6 +494,14 @@ function getActiveServerDataRoute(
   if (query.getObserversCount() === 0) {
     return null;
   }
+  // Query metadata belongs to the last observer that updated its options. A
+  // retained hidden panel must not cancel demand from another visible panel.
+  const observerRoutes = query.observers
+    .map((observer) => getServerDataRoute({ meta: observer.options.meta }))
+    .filter((route): route is ServerDataRoute => route !== null);
+  if (observerRoutes.length > 0) {
+    return observerRoutes.find((route) => route.enabled && route.serverId === serverId) ?? null;
+  }
   const route = getServerDataRoute(query);
   if (route) {
     return route.enabled && route.serverId === serverId ? route : null;
@@ -590,7 +598,7 @@ function canEventChangeDesiredSubscriptions(type: QueryCacheNotifyEvent["type"])
   );
 }
 
-function getServerDataRoute(query: Query): ServerDataRoute | null {
+function getServerDataRoute(query: Pick<Query, "meta">): ServerDataRoute | null {
   const meta = query.meta;
   if (!isRecord(meta) || !isRecord(meta.serverData)) {
     return null;

From 9eaf7ad0c1be74995b07dc82c81d9a010e932418 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 01:51:07 +0200
Subject: [PATCH 127/270] Render local images in Markdown file previews (#6750)

* fix(app): render local relative images in markdown file preview

File preview dropped relative images because it only accepted http/data URIs and never resolved paths against the opened markdown file.

* test(app): cover local relative images in markdown preview e2e

* fix(app): show local images in Markdown file previews

Carry forward document-relative image loading and preserve the host home
directory when resolving images beside home-relative Markdown files.
Decode file URIs once, and require decoded images in the file-pane regression.

Co-authored-by: Ouyang Xingyuan <galaxyroaming@qq.com>

* fix(app): resolve local Markdown image URL suffixes

---------

Co-authored-by: Ouyang Xingyuan <galaxyroaming@qq.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/e2e/browser/file-editing.spec.ts |  43 +++++
 .../markdown-preview/image-source.test.ts     | 165 ++++++++++++++++++
 .../markdown-preview/image-source.ts          | 150 ++++++++++++++++
 .../src/file-pane/markdown-preview/index.tsx  |  54 +++++-
 .../markdown-preview/preview-image.tsx        | 151 ++++++++++++++++
 packages/app/src/file-pane/pane.tsx           |  29 ++-
 6 files changed, 588 insertions(+), 4 deletions(-)
 create mode 100644 packages/app/src/file-pane/markdown-preview/image-source.test.ts
 create mode 100644 packages/app/src/file-pane/markdown-preview/image-source.ts
 create mode 100644 packages/app/src/file-pane/markdown-preview/preview-image.tsx

diff --git a/packages/app/e2e/browser/file-editing.spec.ts b/packages/app/e2e/browser/file-editing.spec.ts
index c0a20dc6d0..7726c581f3 100644
--- a/packages/app/e2e/browser/file-editing.spec.ts
+++ b/packages/app/e2e/browser/file-editing.spec.ts
@@ -2,6 +2,7 @@ import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
 import {
+  expandFolder,
   openFileExplorer,
   openFileFromExplorer,
   expectFileTabOpen,
@@ -70,6 +71,14 @@ async function selectFileView(page: Page, view: "Preview" | "Source"): Promise<v
   await expect(option).toHaveAttribute("aria-selected", "true");
 }
 
+async function expectMarkdownImageLoaded(page: Page, name: string): Promise<void> {
+  const image = page.getByRole("img", { name, exact: true });
+  await expect(image).toBeVisible();
+  await expect
+    .poll(() => image.locator("img").evaluate((element: HTMLImageElement) => element.naturalWidth))
+    .toBeGreaterThan(0);
+}
+
 function watchRequestsTo(page: Page, origin: string): string[] {
   const requests: string[] = [];
   page.on("request", (request) => {
@@ -684,6 +693,40 @@ test.describe("CodeMirror workspace file editing", () => {
     await expect.poll(() => image.getAttribute("src")).not.toBe(initialSource);
   });
 
+  test("renders local relative images inside Markdown preview", async ({ page, withWorkspace }) => {
+    test.setTimeout(90_000);
+    const workspace = await withWorkspace({ prefix: "file-md-relative-image-" });
+    await mkdir(path.join(workspace.repoPath, "docs"), { recursive: true });
+    await mkdir(path.join(workspace.repoPath, "data", "cache"), { recursive: true });
+    await writeFile(path.join(workspace.repoPath, "docs", "sibling.png"), RED_PIXEL);
+    await writeFile(path.join(workspace.repoPath, "data", "cache", "hero.png"), RED_PIXEL);
+    await writeFile(
+      path.join(workspace.repoPath, "docs", "guide.md"),
+      [
+        "# Guide",
+        "",
+        "![sibling](./sibling.png)",
+        "",
+        "![hero](../data/cache/hero.png?v=2#preview)",
+        "",
+      ].join("\n"),
+      "utf8",
+    );
+    await workspace.navigateTo();
+    await openFileExplorer(page);
+    await expandFolder(page, "docs");
+    await openFileFromExplorer(page, "guide.md");
+    await expectFileTabOpen(page, "docs/guide.md");
+
+    const visibleFilePane = page.getByTestId("workspace-file-pane").filter({ visible: true });
+    await expect(visibleFilePane.getByText("Guide", { exact: true })).toBeVisible();
+    await expectMarkdownImageLoaded(page, "sibling");
+    await expectMarkdownImageLoaded(page, "hero");
+    await visibleFilePane.screenshot({
+      path: test.info().outputPath("markdown-relative-images.png"),
+    });
+  });
+
   test("previews and refreshes an HTML plan while preserving source access", async ({
     page,
     withWorkspace,
diff --git a/packages/app/src/file-pane/markdown-preview/image-source.test.ts b/packages/app/src/file-pane/markdown-preview/image-source.test.ts
new file mode 100644
index 0000000000..8277e57492
--- /dev/null
+++ b/packages/app/src/file-pane/markdown-preview/image-source.test.ts
@@ -0,0 +1,165 @@
+import { describe, expect, it } from "vitest";
+
+import { resolveMarkdownFileDirectory, resolveMarkdownPreviewImageSource } from "./image-source";
+
+describe("resolveMarkdownFileDirectory", () => {
+  it("uses the parent of an absolute markdown path", () => {
+    expect(
+      resolveMarkdownFileDirectory({
+        markdownPath: "/Users/test/project/docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/Users/test/project/docs");
+  });
+
+  it("joins a workspace-relative markdown path to the workspace root", () => {
+    expect(
+      resolveMarkdownFileDirectory({
+        markdownPath: "docs/星谷云/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/Users/test/project/docs/星谷云");
+  });
+
+  it("preserves the host home directory for home-relative markdown paths", () => {
+    expect(
+      resolveMarkdownFileDirectory({
+        markdownPath: "~/.paseo/plans/note.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("~/.paseo/plans");
+  });
+});
+
+describe("resolveMarkdownPreviewImageSource", () => {
+  it("passes through remote and data URIs", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "https://example.com/image.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("https://example.com/image.png");
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "data:image/png;base64,abc",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("data:image/png;base64,abc");
+  });
+
+  it("resolves a sibling image against the markdown file", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "./images/hero.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/Users/test/project/docs/images/hero.png");
+  });
+
+  it("ignores local URL query strings and fragments", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "./images/hero.png?v=2#preview",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/workspace",
+      }),
+    ).toBe("/workspace/docs/images/hero.png");
+  });
+
+  it("preserves encoded filename characters when stripping URL suffixes", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "./hero%23draft%3Fv.png?v=2#preview",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/workspace",
+      }),
+    ).toBe("/workspace/docs/hero#draft?v.png");
+  });
+
+  it("preserves remote URL query strings and fragments", () => {
+    const source = "https://example.com/hero.png?v=2#preview";
+    expect(resolveMarkdownPreviewImageSource({ source, markdownPath: "docs/guide.md" })).toBe(
+      source,
+    );
+  });
+
+  it("resolves parent-relative images that stay inside the workspace", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "../../data/cache/xinggu_docs/12-linkedin/token.png",
+        markdownPath: "docs/星谷云/12-LinkedIn.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/Users/test/project/data/cache/xinggu_docs/12-linkedin/token.png");
+  });
+
+  it("keeps absolute and home-relative image paths", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "/tmp/screenshot.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/tmp/screenshot.png");
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "~/.paseo/screenshots/output.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("~/.paseo/screenshots/output.png");
+  });
+
+  it("normalizes file URIs into host paths", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "file:///tmp/paseo-preview.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("/tmp/paseo-preview.png");
+  });
+
+  it("resolves images beside a home-relative document without using the workspace root", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "screenshots/output.png",
+        markdownPath: "~/.paseo/plans/note.md",
+        workspaceRoot: "/Users/test/project",
+      }),
+    ).toBe("~/.paseo/plans/screenshots/output.png");
+  });
+
+  it("decodes a file URI exactly once", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "file:///tmp/hero%2520image.png",
+        markdownPath: "docs/guide.md",
+        workspaceRoot: "/workspace",
+      }),
+    ).toBe("/tmp/hero%20image.png");
+  });
+
+  it("resolves parent segments from a home-relative document", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "../images/hero.png",
+        markdownPath: "~/docs/guide.md",
+        workspaceRoot: "/workspace",
+      }),
+    ).toBe("~/images/hero.png");
+  });
+
+  it("resolves Windows relative images against a drive-rooted markdown file", () => {
+    expect(
+      resolveMarkdownPreviewImageSource({
+        source: "..\\images\\hero.png",
+        markdownPath: "C:\\Users\\test\\repo\\docs\\guide.md",
+        workspaceRoot: "C:\\Users\\test\\repo",
+      }),
+    ).toBe("C:/Users/test/repo/images/hero.png");
+  });
+});
diff --git a/packages/app/src/file-pane/markdown-preview/image-source.ts b/packages/app/src/file-pane/markdown-preview/image-source.ts
new file mode 100644
index 0000000000..5316d94279
--- /dev/null
+++ b/packages/app/src/file-pane/markdown-preview/image-source.ts
@@ -0,0 +1,150 @@
+import { localFileSourceToPath } from "@/attachments/utils";
+import { isAbsolutePath } from "@/utils/path";
+
+function trimTrailingSeparators(value: string): string {
+  if (value === "/" || /^[A-Za-z]:[\\/]?$/.test(value)) {
+    return value.replace(/\\/g, "/");
+  }
+  return value.replace(/[\\/]+$/, "");
+}
+
+function normalizePathSegments(value: string): string {
+  const segments: string[] = [];
+  for (const segment of value.split("/")) {
+    if (!segment || segment === ".") {
+      continue;
+    }
+    if (segment === "..") {
+      if (segments.length > 0) {
+        segments.pop();
+      }
+      continue;
+    }
+    segments.push(segment);
+  }
+  return segments.join("/");
+}
+
+function normalizeAbsolutePath(value: string): string | null {
+  const normalizedInput = trimTrailingSeparators(value.replace(/\\/g, "/"));
+  if (isHomeRelativePath(normalizedInput)) {
+    return `~/${normalizePathSegments(normalizedInput.slice(2))}`;
+  }
+  if (!isAbsolutePath(normalizedInput)) {
+    return null;
+  }
+
+  const drivePath = /^([A-Za-z]:)\/(.*)$/.exec(normalizedInput);
+  if (drivePath) {
+    return trimTrailingSeparators(`${drivePath[1]}/${normalizePathSegments(drivePath[2])}`);
+  }
+
+  const prefix = normalizedInput.startsWith("//") ? "//" : "/";
+  return trimTrailingSeparators(
+    `${prefix}${normalizePathSegments(normalizedInput.replace(/^\/+/, ""))}`,
+  );
+}
+
+function parentDirectory(path: string): string | null {
+  const normalized = trimTrailingSeparators(path.replace(/\\/g, "/"));
+  if (!normalized) {
+    return null;
+  }
+  if (normalized === "/" || /^[A-Za-z]:\/?$/.test(normalized)) {
+    return normalized.endsWith("/") ? normalized : `${normalized}/`;
+  }
+
+  const index = normalized.lastIndexOf("/");
+  if (index < 0) {
+    return null;
+  }
+  if (index === 0) {
+    return "/";
+  }
+  const parent = normalized.slice(0, index);
+  if (/^[A-Za-z]:$/.test(parent)) {
+    return `${parent}/`;
+  }
+  return parent;
+}
+
+function joinAbsolute(baseDirectory: string, relativePath: string): string | null {
+  const directory = trimTrailingSeparators(baseDirectory.replace(/\\/g, "/"));
+  const relative = relativePath.replace(/\\/g, "/").replace(/^\/+/, "");
+  if (!directory) {
+    return null;
+  }
+  return normalizeAbsolutePath(`${directory}/${relative}`);
+}
+
+function isHomeRelativePath(value: string): boolean {
+  return value === "~" || value.startsWith("~/") || value.startsWith("~\\");
+}
+
+function decodeRelativeSource(source: string): string {
+  try {
+    return decodeURIComponent(source);
+  } catch {
+    return source;
+  }
+}
+
+export function resolveMarkdownFileDirectory(input: {
+  markdownPath: string;
+  workspaceRoot?: string;
+}): string | null {
+  const markdownPath = input.markdownPath.trim().replace(/\\/g, "/");
+  if (!markdownPath) {
+    return null;
+  }
+
+  if (isAbsolutePath(markdownPath) || isHomeRelativePath(markdownPath)) {
+    const absolute = normalizeAbsolutePath(markdownPath);
+    return absolute ? parentDirectory(absolute) : null;
+  }
+
+  const workspaceRoot = input.workspaceRoot?.trim();
+  if (!workspaceRoot || !isAbsolutePath(workspaceRoot)) {
+    return null;
+  }
+
+  const absoluteMarkdown = joinAbsolute(workspaceRoot, markdownPath);
+  return absoluteMarkdown ? parentDirectory(absoluteMarkdown) : null;
+}
+
+export function resolveMarkdownPreviewImageSource(input: {
+  source: string;
+  markdownPath: string;
+  workspaceRoot?: string;
+}): string | null {
+  const source = input.source.trim();
+  if (!source) {
+    return null;
+  }
+
+  if (/^(https?:|data:|blob:)/i.test(source)) {
+    return source;
+  }
+
+  const pathSource = source.replace(/[?#].*$/, "");
+  const path = localFileSourceToPath(
+    pathSource.startsWith("file://") ? pathSource : decodeRelativeSource(pathSource),
+  );
+  if (!path) {
+    return null;
+  }
+
+  if (isHomeRelativePath(path) || isAbsolutePath(path)) {
+    return path;
+  }
+
+  const directory = resolveMarkdownFileDirectory({
+    markdownPath: input.markdownPath,
+    workspaceRoot: input.workspaceRoot,
+  });
+  if (!directory) {
+    return path;
+  }
+
+  return joinAbsolute(directory, path);
+}
diff --git a/packages/app/src/file-pane/markdown-preview/index.tsx b/packages/app/src/file-pane/markdown-preview/index.tsx
index e8d172c61b..a79705323f 100644
--- a/packages/app/src/file-pane/markdown-preview/index.tsx
+++ b/packages/app/src/file-pane/markdown-preview/index.tsx
@@ -1,11 +1,59 @@
 import { useMemo } from "react";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { ASTNode, RenderRules } from "react-native-markdown-display";
 import { Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
-import { MarkdownRenderer } from "@/components/markdown/renderer";
+import {
+  createSharedMarkdownRules,
+  MarkdownRenderer,
+  type MarkdownStyles,
+} from "@/components/markdown/renderer";
 import { parseMarkdownPreviewDocument } from "./document";
+import { resolveMarkdownPreviewImageSource } from "./image-source";
+import { FileMarkdownPreviewImage } from "./preview-image";
 
-export function FileMarkdownPreview({ source }: { source: string }) {
+export function FileMarkdownPreview({
+  source,
+  filePath,
+  workspaceRoot,
+  client,
+  serverId,
+}: {
+  source: string;
+  filePath: string;
+  workspaceRoot?: string;
+  client?: DaemonClient | null;
+  serverId?: string;
+}) {
   const document = useMemo(() => parseMarkdownPreviewDocument(source), [source]);
+  const rules = useMemo<RenderRules>(
+    () => ({
+      ...createSharedMarkdownRules(),
+      image: (node: ASTNode, _children, _parent: ASTNode[], _styles: MarkdownStyles) => {
+        const resolved = resolveMarkdownPreviewImageSource({
+          source: String(node.attributes?.src ?? ""),
+          markdownPath: filePath,
+          workspaceRoot,
+        });
+        if (!resolved) {
+          return null;
+        }
+
+        return (
+          <FileMarkdownPreviewImage
+            key={node.key}
+            source={resolved}
+            occurrenceKey={`${filePath}:${node.key}`}
+            alt={typeof node.attributes?.alt === "string" ? node.attributes.alt : undefined}
+            client={client}
+            workspaceRoot={workspaceRoot}
+            serverId={serverId}
+          />
+        );
+      },
+    }),
+    [client, filePath, serverId, workspaceRoot],
+  );
 
   return (
     <View style={styles.outerGutter}>
@@ -31,7 +79,7 @@ export function FileMarkdownPreview({ source }: { source: string }) {
             ))}
           </View>
         ) : null}
-        <MarkdownRenderer text={document.body} />
+        <MarkdownRenderer text={document.body} rules={rules} />
       </View>
     </View>
   );
diff --git a/packages/app/src/file-pane/markdown-preview/preview-image.tsx b/packages/app/src/file-pane/markdown-preview/preview-image.tsx
new file mode 100644
index 0000000000..ef27c14978
--- /dev/null
+++ b/packages/app/src/file-pane/markdown-preview/preview-image.tsx
@@ -0,0 +1,151 @@
+import { useCallback, useMemo, useState } from "react";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { useTranslation } from "react-i18next";
+import { Image, Pressable, Text, View, type StyleProp, type ViewStyle } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { useAssistantImage } from "@/assistant-image/use-assistant-image";
+import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
+import { LoadingSpinner } from "@/components/ui/loading-spinner";
+import type { Theme } from "@/styles/theme";
+
+const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
+const foregroundMutedColorMapping = (theme: Theme) => ({
+  color: theme.colors.foregroundMuted,
+});
+
+const PREVIEW_IMAGE_MIN_HEIGHT = 160;
+
+export function FileMarkdownPreviewImage({
+  source,
+  occurrenceKey,
+  alt,
+  client,
+  workspaceRoot,
+  serverId,
+}: {
+  source: string;
+  occurrenceKey: string;
+  alt?: string;
+  client?: DaemonClient | null;
+  workspaceRoot?: string;
+  serverId?: string;
+}) {
+  const { t } = useTranslation();
+  const [viewerOpen, setViewerOpen] = useState(false);
+  const openViewer = useCallback(() => setViewerOpen(true), []);
+  const closeViewer = useCallback(() => setViewerOpen(false), []);
+  const image = useAssistantImage({
+    source,
+    occurrenceKey,
+    client,
+    workspaceRoot,
+    serverId,
+  });
+  const binding = image.status === "failed" ? null : image.binding;
+  const aspectRatio = image.status === "failed" ? null : image.aspectRatio;
+  const imageUri = binding?.uri ?? "";
+  const imageSource = useMemo(() => ({ uri: imageUri }), [imageUri]);
+  const imageSizeStyle = useMemo<ViewStyle>(() => {
+    if (aspectRatio) {
+      return { aspectRatio };
+    }
+    return { height: PREVIEW_IMAGE_MIN_HEIGHT };
+  }, [aspectRatio]);
+  const surfaceStyle = useMemo<StyleProp<ViewStyle>>(
+    () => [styles.surface, imageSizeStyle],
+    [imageSizeStyle],
+  );
+  const lightboxSource = useMemo<ImageLightboxSource | null>(() => {
+    if (!viewerOpen || !imageUri) return null;
+    return {
+      type: "uri",
+      uri: imageUri,
+      contentSize: aspectRatio ? { width: aspectRatio, height: 1 } : undefined,
+    };
+  }, [aspectRatio, imageUri, viewerOpen]);
+
+  if (image.status === "failed") {
+    return (
+      <View style={[styles.frame, styles.state]} testID="markdown-preview-image-failed">
+        <Text style={styles.errorText}>{image.message}</Text>
+      </View>
+    );
+  }
+
+  if (!binding) {
+    return (
+      <View style={[styles.frame, styles.state]} testID="markdown-preview-image-loading">
+        <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
+      </View>
+    );
+  }
+
+  return (
+    <View style={styles.frame} testID="markdown-preview-image">
+      <Pressable
+        accessibilityLabel={t("composer.attachments.openImage")}
+        accessibilityRole="button"
+        disabled={image.status !== "loaded"}
+        onPress={openViewer}
+        style={surfaceStyle}
+      >
+        <View style={styles.image} accessibilityRole="image" accessibilityLabel={alt}>
+          <Image
+            ref={binding.onRef}
+            source={imageSource}
+            style={styles.image}
+            resizeMode="contain"
+            onLoad={binding.onLoad}
+            onError={binding.onError}
+          />
+          {image.status === "loading" ? (
+            <View pointerEvents="none" style={styles.loadingOverlay}>
+              <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
+            </View>
+          ) : null}
+        </View>
+      </Pressable>
+      <AttachmentLightbox source={lightboxSource} onClose={closeViewer} />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  frame: {
+    width: "100%",
+    marginBottom: theme.spacing[4],
+  },
+  surface: {
+    width: "100%",
+    overflow: "hidden",
+    borderRadius: theme.borderRadius.md,
+    backgroundColor: theme.colors.surface2,
+  },
+  image: {
+    width: "100%",
+    height: "100%",
+  },
+  state: {
+    minHeight: PREVIEW_IMAGE_MIN_HEIGHT,
+    alignItems: "center",
+    justifyContent: "center",
+    paddingHorizontal: theme.spacing[4],
+    paddingVertical: theme.spacing[6],
+    backgroundColor: theme.colors.surface2,
+    borderRadius: theme.borderRadius.md,
+  },
+  loadingOverlay: {
+    position: "absolute",
+    top: 0,
+    right: 0,
+    bottom: 0,
+    left: 0,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  errorText: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.base,
+    textAlign: "center",
+  },
+}));
diff --git a/packages/app/src/file-pane/pane.tsx b/packages/app/src/file-pane/pane.tsx
index a5630ed82f..ea3c5b1edb 100644
--- a/packages/app/src/file-pane/pane.tsx
+++ b/packages/app/src/file-pane/pane.tsx
@@ -54,6 +54,9 @@ interface FilePreviewBodyProps {
   location: WorkspaceFileLocation;
   navigationRevision: number;
   imagePreviewUri: string | null;
+  workspaceRoot: string;
+  client: DaemonClient | null;
+  serverId: string;
 }
 
 type TextExplorerFile = ExplorerFile & { kind: "text" };
@@ -135,6 +138,9 @@ function FilePreviewBody({
   location,
   navigationRevision,
   imagePreviewUri,
+  workspaceRoot,
+  client,
+  serverId,
 }: FilePreviewBodyProps) {
   const { t } = useTranslation();
   const filePath = location.path;
@@ -182,7 +188,13 @@ function FilePreviewBody({
             style={styles.previewContent}
             showsVerticalScrollIndicator
           >
-            <FileMarkdownPreview source={preview.content ?? ""} />
+            <FileMarkdownPreview
+              source={preview.content ?? ""}
+              filePath={filePath}
+              workspaceRoot={workspaceRoot}
+              client={client}
+              serverId={serverId}
+            />
           </RNScrollView>
         </View>
       );
@@ -297,6 +309,7 @@ export function FilePane({
   return (
     <FilePanePresentation
       serverId={serverId}
+      workspaceRoot={normalizedWorkspaceRoot}
       client={client}
       readTarget={readTarget}
       preview={preview}
@@ -338,6 +351,7 @@ function isEditableTextFile(input: {
 
 function FilePanePresentation({
   serverId,
+  workspaceRoot,
   client,
   readTarget,
   preview,
@@ -359,6 +373,7 @@ function FilePanePresentation({
   imagePreviewUri,
 }: {
   serverId: string;
+  workspaceRoot: string;
   client: DaemonClient | null;
   readTarget: { cwd: string; path: string } | null;
   preview: ExplorerFile | null;
@@ -393,6 +408,8 @@ function FilePanePresentation({
     return (
       <EditableFilePane
         key={`${serverId}:${readTarget.cwd}:${readTarget.path}`}
+        serverId={serverId}
+        workspaceRoot={workspaceRoot}
         client={client}
         cwd={readTarget.cwd}
         path={readTarget.path}
@@ -449,12 +466,17 @@ function FilePanePresentation({
         location={location}
         navigationRevision={navigationRevision}
         imagePreviewUri={imagePreviewUri}
+        workspaceRoot={workspaceRoot}
+        client={client}
+        serverId={serverId}
       />
     </View>
   );
 }
 
 function EditableFilePane({
+  serverId,
+  workspaceRoot,
   client,
   cwd,
   path,
@@ -470,6 +492,8 @@ function EditableFilePane({
   location,
   navigationRevision,
 }: {
+  serverId: string;
+  workspaceRoot: string;
   client: DaemonClient;
   cwd: string;
   path: string;
@@ -622,6 +646,9 @@ function EditableFilePane({
           location={location}
           navigationRevision={navigationRevision}
           imagePreviewUri={null}
+          workspaceRoot={workspaceRoot}
+          client={client}
+          serverId={serverId}
         />
       )}
     </View>

From e8108d9092a43c88fabebc0bf938584d34e462d6 Mon Sep 17 00:00:00 2001
From: CtrlCreeper <robomaster004@gmail.com>
Date: Tue, 13 Oct 2026 08:59:26 +0800
Subject: [PATCH 128/270] fix(app): only offer Remove for providers defined in
 config.json (#6568)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(app): only offer Remove for providers defined in config.json

Plugin-registered providers (Antigravity, Muse Code) share source: "custom"
with config-defined ones, so Settings → Providers offered Remove on them.
The removeProviders patch only deletes config.json entries, so the action
succeeded silently while the plugin re-registered the provider.

Gate the Remove menu on the provider having an extends entry in config —
the actual definition custom providers live behind. Plugin providers keep
their enable/disable switch.

Fixes #6349

* Address review: named ownership check, E2E coverage for plugin providers

- Name the config-owned provider check instead of combining three
  conditions inline in canRemove.
- Replace the JSDOM component tests with a Playwright case in the
  existing provider-removal suite: a plugin-registered provider renders
  without the Remove action and survives a removeProviders patch.
---
 .gitignore                                    |  3 +
 .../app/e2e/browser/provider-removal.spec.ts  | 56 ++++++++++++++++++-
 .../screens/settings/providers-section.tsx    | 14 ++++-
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 53a2169c67..6d6bb279b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,6 @@ app.json
 
 # Heap snapshots dumped by --heapsnapshot-near-heap-limit; keep them for debugging.
 *.heapsnapshot
+
+# Project-local Serena configuration and memories.
+.serena/
diff --git a/packages/app/e2e/browser/provider-removal.spec.ts b/packages/app/e2e/browser/provider-removal.spec.ts
index 7e17a1fbe0..b72fb868d6 100644
--- a/packages/app/e2e/browser/provider-removal.spec.ts
+++ b/packages/app/e2e/browser/provider-removal.spec.ts
@@ -10,16 +10,29 @@ import {
   openSettingsHost,
   openSettingsHostSection,
 } from "../support/helpers/settings";
+import { copyPluginExample } from "../support/helpers/plugin-fixture";
 
 const CUSTOM_PROVIDER = {
   id: "junie",
   name: "Junie",
 } as const;
 
+const PLUGIN_PROVIDER = {
+  id: "direct-example",
+  name: "Direct provider example",
+  pluginId: "provider-direct-example",
+} as const;
+
 interface ProviderRemovalDaemonClient {
   connect(): Promise<void>;
   close(): Promise<void>;
-  patchDaemonConfig(config: { removeProviders?: string[] }): Promise<unknown>;
+  getDaemonConfig(): Promise<{ config: { pluginsEnabled?: boolean } }>;
+  patchDaemonConfig(config: {
+    removeProviders?: string[];
+    pluginsEnabled?: boolean;
+  }): Promise<unknown>;
+  installDirectoryPlugin(path: string): Promise<unknown>;
+  removePlugin(pluginId: string): Promise<void>;
   getProvidersSnapshot(): Promise<{
     entries: Array<{ provider: string; source?: "builtin" | "custom" }>;
   }>;
@@ -93,4 +106,45 @@ test.describe("provider removal", () => {
       await client.close().catch(() => undefined);
     }
   });
+
+  test("does not offer Remove for a plugin-registered provider", async ({ page }) => {
+    test.setTimeout(120_000);
+    const client = await connectDaemonClient<ProviderRemovalDaemonClient>({
+      clientIdPrefix: "provider-removal-e2e",
+    });
+
+    const plugin = await copyPluginExample("provider-direct");
+    try {
+      const previous = await client.getDaemonConfig();
+      try {
+        await client.patchDaemonConfig({ pluginsEnabled: true });
+        await client.installDirectoryPlugin(plugin.directory);
+
+        await gotoAppShell(page);
+        await openSettings(page);
+        await openSettingsHost(page, getServerId());
+        await openSettingsHostSection(page, getServerId(), "providers");
+
+        const pluginProviderRow = page.getByRole("button", {
+          name: `${PLUGIN_PROVIDER.name} provider details`,
+          exact: true,
+        });
+        await expect(pluginProviderRow).toBeVisible();
+        await expect(page.getByTestId(`provider-actions-${PLUGIN_PROVIDER.id}`)).toHaveCount(0);
+
+        // The provider survives a removeProviders patch pointed at it: the
+        // plugin, not config.json, owns the definition.
+        await client.patchDaemonConfig({ removeProviders: [PLUGIN_PROVIDER.id] });
+        await expect(pluginProviderRow).toBeVisible();
+      } finally {
+        await client.removePlugin(PLUGIN_PROVIDER.pluginId).catch(() => undefined);
+        await client
+          .patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled })
+          .catch(() => undefined);
+      }
+    } finally {
+      await client.close().catch(() => undefined);
+      await plugin.cleanup();
+    }
+  });
 });
diff --git a/packages/app/src/screens/settings/providers-section.tsx b/packages/app/src/screens/settings/providers-section.tsx
index 4495acba83..4fb0a43278 100644
--- a/packages/app/src/screens/settings/providers-section.tsx
+++ b/packages/app/src/screens/settings/providers-section.tsx
@@ -328,7 +328,7 @@ export function ProvidersSection({ serverId }: ProvidersSectionProps) {
   const isConnected = useHostRuntimeIsConnected(serverId);
   const supportsProviderRemoval = useHostFeature(serverId, "providerRemoval");
   const { entries, isLoading, refresh } = useProvidersSnapshot(serverId);
-  const { patchConfig } = useDaemonConfig(serverId);
+  const { config, patchConfig } = useDaemonConfig(serverId);
   const openProviderSettings = useProviderSettingsStore((state) => state.open);
   const [pendingProviderId, setPendingProviderId] = useState<string | null>(null);
   const [removingProviderId, setRemovingProviderId] = useState<string | null>(null);
@@ -338,6 +338,12 @@ export function ProvidersSection({ serverId }: ProvidersSectionProps) {
   const providerDefinitions = useMemo(() => buildProviderDefinitions(entries), [entries]);
   const hasServer = serverId.length > 0;
 
+  /** Custom providers are deletable only when config.json holds their `extends` definition. */
+  const isConfigOwnedProvider = useCallback(
+    (providerId: string) => Boolean(config?.providers?.[providerId]?.extends),
+    [config],
+  );
+
   const handleOpenProviderSettings = useCallback(
     (providerId: string) => {
       openProviderSettings({ serverId, provider: providerId });
@@ -444,7 +450,11 @@ export function ProvidersSection({ serverId }: ProvidersSectionProps) {
                   enabled={entry.enabled ?? true}
                   isToggling={pendingProviderId === def.id}
                   isRemoving={removingProviderId === def.id}
-                  canRemove={supportsProviderRemoval && entry.source === "custom"}
+                  canRemove={
+                    supportsProviderRemoval &&
+                    entry.source === "custom" &&
+                    isConfigOwnedProvider(def.id)
+                  }
                   isFirst={index === 0}
                   onPress={handleOpenProviderSettings}
                   onToggleEnabled={handleToggleEnabled}

From b0f054de90bdf0773a1a9281972294410f35837a Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 03:57:12 +0200
Subject: [PATCH 129/270] Reach IPv6-only workspace services through their
 proxy URLs (#6753)

* fix(server): reach IPv6-only workspace services

Workspace service forwarding and health probes forced IPv4 loopback,
returning 502 and unhealthy for a reachable IPv6-only service. Select
between both literal loopback addresses for HTTP, upgrades, and probes,
without relying on the system's localhost DNS entries.

Co-authored-by: Marcelo Barbosa <celocb@gmail.com>

* test(server): keep proxy POST mechanics in a helper

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: Marcelo Barbosa <celocb@gmail.com>
---
 docs/service-proxy.md                         |   2 +-
 .../src/server/local-service-connection.ts    |  27 +++++
 .../src/server/script-health-monitor.test.ts  |  43 ++++++-
 .../src/server/script-health-monitor.ts       |   4 +-
 .../server/src/server/service-proxy.test.ts   | 108 ++++++++++++++++--
 packages/server/src/server/service-proxy.ts   |   7 +-
 6 files changed, 176 insertions(+), 15 deletions(-)
 create mode 100644 packages/server/src/server/local-service-connection.ts

diff --git a/docs/service-proxy.md b/docs/service-proxy.md
index 3ec3144289..cab7f42774 100644
--- a/docs/service-proxy.md
+++ b/docs/service-proxy.md
@@ -4,7 +4,7 @@ Paseo proxies HTTP traffic to services running inside your workspaces. Localhost
 
 ## How it works
 
-When a `paseo.json` script of `"type": "service"` starts, Paseo assigns it a local port and registers a route in the service proxy. Incoming requests whose `Host` header matches the script's generated hostname are forwarded to that port.
+When a `paseo.json` script of `"type": "service"` starts, Paseo assigns it a local port and registers a route in the service proxy. Incoming requests whose `Host` header matches the script's generated hostname are forwarded to that port. HTTP requests, WebSocket upgrades, and service health checks select the reachable IPv4 or IPv6 loopback address. Services can bind to `127.0.0.1` or `::1` without changing their proxy URL.
 
 The generated hostname is built from the script name, branch, and project:
 
diff --git a/packages/server/src/server/local-service-connection.ts b/packages/server/src/server/local-service-connection.ts
new file mode 100644
index 0000000000..a96a0a7094
--- /dev/null
+++ b/packages/server/src/server/local-service-connection.ts
@@ -0,0 +1,27 @@
+import http from "node:http";
+import net from "node:net";
+
+// A host can support IPv6 loopback without listing ::1 for localhost in DNS.
+const lookupLoopback: net.LookupFunction = (_hostname, _options, callback) => {
+  callback(null, [
+    { address: "127.0.0.1", family: 4 },
+    { address: "::1", family: 6 },
+  ]);
+};
+
+export function connectToLocalService(port: number): net.Socket {
+  return net.connect({ host: "localhost", port, autoSelectFamily: true, lookup: lookupLoopback });
+}
+
+export function requestLocalService(
+  options: Pick<http.RequestOptions, "port" | "path" | "method" | "headers">,
+  onResponse: (response: http.IncomingMessage) => void,
+): http.ClientRequest {
+  const requestOptions = {
+    ...options,
+    hostname: "localhost",
+    autoSelectFamily: true,
+    lookup: lookupLoopback,
+  };
+  return http.request(requestOptions, onResponse);
+}
diff --git a/packages/server/src/server/script-health-monitor.test.ts b/packages/server/src/server/script-health-monitor.test.ts
index bbc5acf3c7..96af0133ca 100644
--- a/packages/server/src/server/script-health-monitor.test.ts
+++ b/packages/server/src/server/script-health-monitor.test.ts
@@ -99,14 +99,14 @@ function createStubTerminalManager(
   };
 }
 
-async function startTcpServer(): Promise<TcpServerHandle> {
+async function startTcpServer(host = "127.0.0.1"): Promise<TcpServerHandle> {
   const server = net.createServer((socket) => {
     socket.end();
   });
 
   await new Promise<void>((resolve, reject) => {
     server.once("error", reject);
-    server.listen(0, "127.0.0.1", () => {
+    server.listen(0, host, () => {
       server.off("error", reject);
       resolve();
     });
@@ -153,6 +153,45 @@ describe("ScriptHealthMonitor", () => {
     servers.clear();
   });
 
+  it.each(["127.0.0.1", "::1"])("reports a service bound only to %s as healthy", async (host) => {
+    const service = await startTcpServer(host);
+    servers.add(service.server);
+    const serviceProxy = new ScriptRouteStore();
+    serviceProxy.registerWorkspaceService({
+      workspaceId: "workspace-a",
+      projectSlug: "repo",
+      branchName: "main",
+      scriptName: "api",
+      port: service.port,
+    });
+    const updates: ScriptHealthEntry[][] = [];
+    const monitor = new ScriptHealthMonitor({
+      serviceProxy,
+      onChange: (_workspaceId, scripts) => updates.push(scripts),
+      pollIntervalMs: 10,
+      probeTimeoutMs: 100,
+      graceMs: 0,
+      failuresBeforeStopped: 1,
+    });
+    monitor.start();
+    try {
+      await vi.waitFor(() => {
+        expect(updates).toEqual([
+          [
+            {
+              scriptName: "api",
+              hostname: "api--repo.localhost",
+              port: service.port,
+              health: "healthy",
+            },
+          ],
+        ]);
+      });
+    } finally {
+      monitor.stop();
+    }
+  });
+
   it("starts new service routes in pending and transitions to healthy after the grace period", async () => {
     vi.useFakeTimers();
 
diff --git a/packages/server/src/server/script-health-monitor.ts b/packages/server/src/server/script-health-monitor.ts
index 810518f999..7992608f24 100644
--- a/packages/server/src/server/script-health-monitor.ts
+++ b/packages/server/src/server/script-health-monitor.ts
@@ -1,4 +1,4 @@
-import net from "node:net";
+import { connectToLocalService } from "./local-service-connection.js";
 import type { ServiceProxyHealthTarget, ServiceProxySubsystem } from "./service-proxy.js";
 
 export type ScriptHealthState = "pending" | "healthy" | "unhealthy";
@@ -208,7 +208,7 @@ export class ScriptHealthMonitor {
 
   private probeRoute(port: number): Promise<boolean> {
     return new Promise((resolve) => {
-      const socket = net.connect({ host: "127.0.0.1", port });
+      const socket = connectToLocalService(port);
       let settled = false;
 
       const finish = (healthy: boolean) => {
diff --git a/packages/server/src/server/service-proxy.test.ts b/packages/server/src/server/service-proxy.test.ts
index 5313b01d2d..5764b19539 100644
--- a/packages/server/src/server/service-proxy.test.ts
+++ b/packages/server/src/server/service-proxy.test.ts
@@ -32,15 +32,20 @@ function readServerSourceFiles(dir = path.resolve(import.meta.dirname)): string[
 }
 
 interface HttpGetOptions {
+  hostname?: string;
   path?: string;
   headers?: Record<string, string>;
 }
 
 function httpGet(port: number, host: string, options: HttpGetOptions = {}) {
-  const { path: requestPath = "/api/health", headers: extraHeaders = {} } = options;
+  const {
+    hostname = "127.0.0.1",
+    path: requestPath = "/api/health",
+    headers: extraHeaders = {},
+  } = options;
   return new Promise<{ status: number; body: string }>((resolve, reject) => {
     const req = http.get(
-      { hostname: "127.0.0.1", port, path: requestPath, headers: { host, ...extraHeaders } },
+      { hostname, port, path: requestPath, headers: { host, ...extraHeaders } },
       (res) => {
         let body = "";
         res.on("data", (chunk: Buffer) => {
@@ -53,6 +58,31 @@ function httpGet(port: number, host: string, options: HttpGetOptions = {}) {
   });
 }
 
+function httpPost(port: number, host: string, requestPath: string, payload: string) {
+  return new Promise<{ status: number; body: string }>((resolve, reject) => {
+    const request = http.request(
+      {
+        hostname: "127.0.0.1",
+        port,
+        method: "POST",
+        path: requestPath,
+        headers: { host, "content-type": "application/json" },
+      },
+      (res) => {
+        let body = "";
+        res.on("data", (chunk: Buffer) => {
+          body += chunk.toString();
+        });
+        res.on("end", () => resolve({ status: res.statusCode ?? 0, body }));
+        res.on("error", reject);
+      },
+    );
+    request.on("error", reject);
+    request.write(payload.slice(0, 5));
+    request.end(payload.slice(5));
+  });
+}
+
 describe("service proxy subsystem shape", () => {
   it("keeps production imports behind the service-proxy entrypoint", () => {
     const offenders: string[] = [];
@@ -303,6 +333,7 @@ describe("service proxy subsystem shape", () => {
 });
 
 interface ForwardedFixture {
+  upstreamPort: number;
   daemonPort: number;
   hostname: string;
   close(): Promise<void>;
@@ -313,11 +344,16 @@ interface ForwardedFixture {
  * echoes the headers it received so tests can assert what actually crossed the
  * proxy, not what a helper returned.
  */
-async function startForwardedHeadersFixture(): Promise<ForwardedFixture> {
-  const upstreamPort = await findFreePort();
+async function startForwardedHeadersFixture(upstreamHost = "127.0.0.1"): Promise<ForwardedFixture> {
   const upstream = http.createServer((req, res) => {
-    res.writeHead(200, { "content-type": "application/json" });
-    res.end(JSON.stringify(req.headers));
+    let body = "";
+    req.on("data", (chunk: Buffer) => {
+      body += chunk.toString();
+    });
+    req.on("end", () => {
+      res.writeHead(200, { "content-type": "application/json" });
+      res.end(JSON.stringify({ ...req.headers, method: req.method, url: req.url, body }));
+    });
   });
   const upgradeSockets: net.Socket[] = [];
   upstream.on("upgrade", (req, socket) => {
@@ -331,7 +367,11 @@ async function startForwardedHeadersFixture(): Promise<ForwardedFixture> {
       `HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nX-Echo-Length: ${payload.length}\r\n\r\n${payload}`,
     );
   });
-  await new Promise<void>((resolve) => upstream.listen(upstreamPort, "127.0.0.1", resolve));
+  await new Promise<void>((resolve, reject) => {
+    upstream.once("error", reject);
+    upstream.listen(0, upstreamHost, resolve);
+  });
+  const upstreamPort = (upstream.address() as net.AddressInfo).port;
 
   const serviceProxy = createServiceProxySubsystem({ logger });
   const route = serviceProxy.registerWorkspaceService({
@@ -354,6 +394,7 @@ async function startForwardedHeadersFixture(): Promise<ForwardedFixture> {
   await new Promise<void>((resolve) => daemon.listen(daemonPort, "127.0.0.1", resolve));
 
   return {
+    upstreamPort,
     daemonPort,
     hostname: route.hostname,
     async close() {
@@ -416,6 +457,59 @@ function upgradeThroughProxy(
   });
 }
 
+describe("service proxy loopback services", () => {
+  it.each(["127.0.0.1", "::1"])("forwards HTTP to a service bound only to %s", async (host) => {
+    const fixture = await startForwardedHeadersFixture(host);
+    try {
+      const direct = await httpGet(fixture.upstreamPort, fixture.hostname, { hostname: host });
+      expect(direct.status).toBe(200);
+
+      const response = await httpGet(fixture.daemonPort, fixture.hostname);
+      expect(response.status).toBe(200);
+      expect(JSON.parse(response.body).host).toBe(fixture.hostname);
+    } finally {
+      await fixture.close();
+    }
+  });
+
+  it.each(["127.0.0.1", "::1"])(
+    "streams POST bodies to a service bound only to %s",
+    async (host) => {
+      const fixture = await startForwardedHeadersFixture(host);
+      try {
+        const payload = JSON.stringify({ message: "hello" });
+        const response = await httpPost(
+          fixture.daemonPort,
+          fixture.hostname,
+          "/submit?q=one%20two",
+          payload,
+        );
+        expect(response.status).toBe(200);
+        expect(JSON.parse(response.body)).toMatchObject({
+          host: fixture.hostname,
+          "content-type": "application/json",
+          method: "POST",
+          url: "/submit?q=one%20two",
+          body: payload,
+        });
+      } finally {
+        await fixture.close();
+      }
+    },
+  );
+
+  it.each(["127.0.0.1", "::1"])("forwards upgrades to a service bound only to %s", async (host) => {
+    const fixture = await startForwardedHeadersFixture(host);
+    try {
+      const headers = await upgradeThroughProxy(fixture.daemonPort, fixture.hostname);
+      expect(headers.host).toBe(fixture.hostname);
+      expect(headers.upgrade).toBe("websocket");
+    } finally {
+      await fixture.close();
+    }
+  });
+});
+
 describe("service proxy forwarded headers", () => {
   it("forwards the client authority with its port so services build reachable URLs", async () => {
     const fixture = await startForwardedHeadersFixture();
diff --git a/packages/server/src/server/service-proxy.ts b/packages/server/src/server/service-proxy.ts
index 525a95ac5d..ef93a27f9a 100644
--- a/packages/server/src/server/service-proxy.ts
+++ b/packages/server/src/server/service-proxy.ts
@@ -1,5 +1,6 @@
 import http, { createServer as createHTTPServer } from "node:http";
 import net from "node:net";
+import { connectToLocalService, requestLocalService } from "./local-service-connection.js";
 import { createHash } from "node:crypto";
 import { existsSync, unlinkSync } from "node:fs";
 import type { IncomingMessage } from "node:http";
@@ -328,9 +329,8 @@ function proxyHttpRequest({
 }): void {
   const forwardedHeaders = buildForwardedHeaders({ req, route, protocol: req.protocol });
 
-  const proxyReq = http.request(
+  const proxyReq = requestLocalService(
     {
-      hostname: "127.0.0.1",
       port: route.port,
       path: req.originalUrl,
       method: req.method,
@@ -368,7 +368,8 @@ function proxyUpgradeRequest({
   route: ServiceProxyRoute;
   logger: Logger;
 }): void {
-  const targetSocket = net.connect({ host: "127.0.0.1", port: route.port }, () => {
+  const targetSocket = connectToLocalService(route.port);
+  targetSocket.on("connect", () => {
     const forwardedHeaders = buildForwardedHeaders({ req, route, protocol: "http" });
     forwardedHeaders.connection = "Upgrade";
     forwardedHeaders.upgrade = req.headers.upgrade ?? "websocket";

From b5e51cf839b8ba852c60bd750903b9ca6f8ed72b Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 05:00:54 +0200
Subject: [PATCH 130/270] Run letter shortcuts with non-Latin keyboard layouts
 (#6755)

* fix(app): run recorded letter shortcuts with non-Latin layouts

Recording unsupported letters saves the physical A-Z key, but dispatch rejected that same event. Accept its letter code while keeping ASCII character matching for layouts such as Dvorak.

* fix(app): run recorded dotted-letter shortcuts

Check the original single-letter key before case folding expands uppercase dotted I into two code points.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/keyboard/keyboard-shortcuts.test.ts   | 65 +++++++++++++++++++
 .../app/src/keyboard/keyboard-shortcuts.ts    |  6 ++
 2 files changed, 71 insertions(+)

diff --git a/packages/app/src/keyboard/keyboard-shortcuts.test.ts b/packages/app/src/keyboard/keyboard-shortcuts.test.ts
index 2a7960c9b9..571474643b 100644
--- a/packages/app/src/keyboard/keyboard-shortcuts.test.ts
+++ b/packages/app/src/keyboard/keyboard-shortcuts.test.ts
@@ -1027,6 +1027,71 @@ describe("unassigned shortcuts", () => {
   });
 
   describe("matching", () => {
+    it("dispatches a captured Russian letter shortcut on the same key", () => {
+      const event = keyboardInput({ key: "и", code: "KeyB", ctrlKey: true });
+      const combo = keyboardEventToComboString(event as KeyboardEvent);
+      expect(combo).toBe("Ctrl+B");
+      const bindings = buildEffectiveBindings({
+        "sidebar-toggle-left-ctrl-period-non-mac": combo!,
+      });
+
+      expect(resolveShortcut({ event, context: desktopNonMac, bindings }).match?.action).toBe(
+        "sidebar.toggle.left",
+      );
+    });
+
+    it("dispatches a recorded dotted-uppercase letter with Shift held", () => {
+      const event = keyboardInput({ key: "İ", code: "KeyS", ctrlKey: true, shiftKey: true });
+      const combo = keyboardEventToComboString(event as KeyboardEvent);
+      expect(combo).toBe("Ctrl+Shift+S");
+      const bindings = buildEffectiveBindings({
+        "sidebar-toggle-left-ctrl-period-non-mac": combo!,
+      });
+      expect(resolveShortcut({ event, context: desktopNonMac, bindings }).match?.action).toBe(
+        "sidebar.toggle.left",
+      );
+    });
+
+    it.each(["и", "И", "β", "ش", "ב", "é"])(
+      "matches default and recorded letter bindings for unsupported letter %s",
+      (key) => {
+        const event = keyboardInput({ key, code: "KeyB", ctrlKey: true });
+        expectShortcutResolution({
+          event,
+          context: desktopNonMac,
+          action: "sidebar.toggle.left",
+        });
+        const combo = keyboardEventToComboString(event as KeyboardEvent);
+        expect(combo).toBe("Ctrl+B");
+        expect(
+          resolveShortcut({
+            event,
+            context: desktopNonMac,
+            bindings: buildEffectiveBindings({
+              "sidebar-toggle-left-ctrl-period-non-mac": combo!,
+            }),
+          }).match?.action,
+        ).toBe("sidebar.toggle.left");
+      },
+    );
+
+    it.each(["v", "†", "Dead", "Unidentified", ""])(
+      "does not match an unrelated character or named key %s by physical letter",
+      (key) => {
+        expectNoShortcutResolution({
+          event: { key, code: "KeyB", ctrlKey: true },
+          context: desktopNonMac,
+        });
+      },
+    );
+
+    it("does not match non-letter bindings by physical key for unsupported letters", () => {
+      expectNoShortcutResolution({
+        event: { key: "ю", code: "Period", ctrlKey: true },
+        context: desktopNonMac,
+      });
+    });
+
     it("dispatches a captured Dvorak binding on the same logical key", () => {
       const event = keyboardInput({ key: "b", code: "KeyN", metaKey: true });
       const combo = keyboardEventToComboString(event as KeyboardEvent);
diff --git a/packages/app/src/keyboard/keyboard-shortcuts.ts b/packages/app/src/keyboard/keyboard-shortcuts.ts
index 4a843124f2..54d2b59cdb 100644
--- a/packages/app/src/keyboard/keyboard-shortcuts.ts
+++ b/packages/app/src/keyboard/keyboard-shortcuts.ts
@@ -1285,6 +1285,12 @@ function matchesKeyOrCode(combo: KeyCombo, event: KeyboardShortcutInput): boolea
   if (combo.shift === true && combo.shiftedKey !== undefined && eventKey === combo.shiftedKey) {
     return true;
   }
+  // Recording an unsupported letter (for example Cyrillic и on KeyB)
+  // stores its physical A-Z key. Dispatch must accept that same key without
+  // giving Latin layouts such as Dvorak a second physical-key binding.
+  if (/^[a-z]$/.test(combo.key) && /^\p{Letter}$/u.test(event.key) && !/^[a-z]$/.test(eventKey)) {
+    return event.code === combo.code;
+  }
   // macOS rewrites event.key when Option is held (Option+T -> "†",
   // Option+[ -> "“"), so Alt-bound letter / bracket bindings can only
   // match by event.code. Stay key-first for non-Alt bindings so Dvorak

From ec6393f31ff18ffc7052010e6c4b53f36380f32d Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 05:57:41 +0200
Subject: [PATCH 131/270] Keep pairing QR codes fully visible on mobile (#6758)

* Keep pairing QR code within compact tile

* Move pairing screenshot after viewport assertion

* test(pairing): verify the complete QR code on Android

The native regression failed with the fixed-size SVG because the code was clipped at both screen edges. Verify the complete square and visible margins through the Android app, and keep browser geometry assertions in the pairing helper.

Co-authored-by: fdkevin <25277753+fdkevin0@users.noreply.github.com>

---------

Co-authored-by: fdkevin <25277753+fdkevin0@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../app/e2e/browser/pair-device-relay.spec.ts | 19 ++++++++
 .../app/e2e/mobile/pair-device/android.mjs    | 43 +++++++++++++++++++
 .../app/e2e/support/helpers/pair-device.ts    | 21 +++++++++
 .../components/pair-device-section.tsx        |  8 +---
 4 files changed, 85 insertions(+), 6 deletions(-)
 create mode 100644 packages/app/e2e/mobile/pair-device/android.mjs

diff --git a/packages/app/e2e/browser/pair-device-relay.spec.ts b/packages/app/e2e/browser/pair-device-relay.spec.ts
index 8c4e306a1e..dbd3814d38 100644
--- a/packages/app/e2e/browser/pair-device-relay.spec.ts
+++ b/packages/app/e2e/browser/pair-device-relay.spec.ts
@@ -1,6 +1,8 @@
 import { test } from "../support/fixtures";
 import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
 import {
+  expectPairingOffer,
+  expectCompletePairingQr,
   expectRelayConsent,
   openPairDeviceModal,
   preparePairingHost,
@@ -18,3 +20,20 @@ test("opens relay consent in browser web", async ({ page }) => {
     await daemon.close();
   }
 });
+
+test("keeps the pairing QR code inside its compact tile", async ({ page }, testInfo) => {
+  const daemon = await startIsolatedHostDaemon("pair-device-browser-compact", {
+    mutableRelay: { enabled: true },
+  });
+  try {
+    await preparePairingHost(page, daemon);
+    await page.setViewportSize({ width: 320, height: 568 });
+    await openPairDeviceModal(page);
+    await expectPairingOffer(page);
+
+    await expectCompletePairingQr(page);
+    await page.screenshot({ path: testInfo.outputPath("pairing-compact.png") });
+  } finally {
+    await daemon.close();
+  }
+});
diff --git a/packages/app/e2e/mobile/pair-device/android.mjs b/packages/app/e2e/mobile/pair-device/android.mjs
new file mode 100644
index 0000000000..7ab660c2b0
--- /dev/null
+++ b/packages/app/e2e/mobile/pair-device/android.mjs
@@ -0,0 +1,43 @@
+// Start on Settings > Host > Pair device with relay enabled in the Android app.
+// node packages/app/e2e/mobile/pair-device/android.mjs <agent-device-session>
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+
+const [, , session] = process.argv;
+assert(session, "Pass the agent-device session for the connected Android app");
+
+function ad(...args) {
+  return execFileSync("agent-device", [...args, "--session", session], {
+    encoding: "utf8",
+    timeout: 60_000,
+  });
+}
+
+ad(
+  "press",
+  'label="Pair a device, Scan a QR code or copy a link to connect your phone to this host"',
+  "--settle",
+);
+ad("wait", "text", "Pairing QR code", "10000");
+const { data } = JSON.parse(ad("snapshot", "-i", "--json"));
+const sheet = data.nodes.find((node) => node.label === "Bottom Sheet");
+const qr = data.nodes.find((node) => node.label === "Pairing QR code");
+assert(sheet?.rect, "Pairing sheet must be visible");
+assert(qr?.rect, "Pairing QR code must be visible");
+assert(qr.rect.x > sheet.rect.x, "QR must have an unclipped left margin inside the sheet");
+assert(
+  qr.rect.x + qr.rect.width < sheet.rect.x + sheet.rect.width,
+  "QR must have an unclipped right margin inside the sheet",
+);
+assert(Math.abs(qr.rect.width - qr.rect.height) <= 1, "Complete QR must remain square");
+assert(qr.rect.y >= sheet.rect.y, "QR top must be visible inside the sheet");
+assert(
+  qr.rect.y + qr.rect.height <= sheet.rect.y + sheet.rect.height,
+  "QR bottom must be visible inside the sheet",
+);
+assert(
+  data.nodes.some((node) => node.label === "Copy" && node.enabled),
+  "Copy must remain available",
+);
+console.log("PASS: complete square QR fits inside the pairing sheet", qr.rect);
+ad("press", 'label="Close"', "--settle");
diff --git a/packages/app/e2e/support/helpers/pair-device.ts b/packages/app/e2e/support/helpers/pair-device.ts
index d8908015b8..46cdda5ed9 100644
--- a/packages/app/e2e/support/helpers/pair-device.ts
+++ b/packages/app/e2e/support/helpers/pair-device.ts
@@ -220,3 +220,24 @@ export function expectDaemonPidUnchanged(
   expect(before).toBeDefined();
   expect(after).toBe(before);
 }
+
+export async function expectCompletePairingQr(page: Page): Promise<void> {
+  const qr = page.getByRole("img", { name: "Pairing QR code" });
+  await qr.scrollIntoViewIfNeeded();
+  // IntersectionObserver rounds fractional sheet/scroll coordinates.
+  await expect(qr).toBeInViewport({ ratio: 0.999 });
+  const bounds = await qr.evaluate((element) => {
+    const tile = element.parentElement;
+    if (!tile) throw new Error("Pairing QR tile is missing");
+    const qrRect = element.getBoundingClientRect();
+    const tileRect = tile.getBoundingClientRect();
+    return {
+      qr: { x: qrRect.x, y: qrRect.y, right: qrRect.right, bottom: qrRect.bottom },
+      tile: { x: tileRect.x, y: tileRect.y, right: tileRect.right, bottom: tileRect.bottom },
+    };
+  });
+  expect(bounds.qr.x).toBeGreaterThanOrEqual(bounds.tile.x);
+  expect(bounds.qr.y).toBeGreaterThanOrEqual(bounds.tile.y);
+  expect(bounds.qr.right).toBeLessThanOrEqual(bounds.tile.right);
+  expect(bounds.qr.bottom).toBeLessThanOrEqual(bounds.tile.bottom);
+}
diff --git a/packages/app/src/desktop/components/pair-device-section.tsx b/packages/app/src/desktop/components/pair-device-section.tsx
index 9209f6fcbf..982469008a 100644
--- a/packages/app/src/desktop/components/pair-device-section.tsx
+++ b/packages/app/src/desktop/components/pair-device-section.tsx
@@ -80,7 +80,6 @@ export function PairDeviceSection({ serverId, onClose }: PairDeviceSectionProps)
         type: "svg",
         errorCorrectionLevel: "M",
         margin: 1,
-        width: 480,
       }),
     enabled: Boolean(pairingQuery.data?.url),
     dataShape: "value",
@@ -275,7 +274,8 @@ function PairingQr({ svg, isError }: { svg: string | null; isError: boolean }) {
     return (
       <SvgXml
         xml={svg}
-        style={styles.qrImage}
+        width="100%"
+        height="100%"
         accessibilityRole="image"
         accessibilityLabel={t("pairing.device.qrAccessibility")}
       />
@@ -365,10 +365,6 @@ const styles = StyleSheet.create((theme) => ({
     borderColor: theme.colors.border,
     backgroundColor: theme.colors.palette.white,
   },
-  qrImage: {
-    width: "100%",
-    height: "100%",
-  },
   linkRow: {
     flexDirection: "row",
     alignItems: "center",

From 1839de5b1d3ea3f668ae6d031f79ebb0590258cc Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 06:58:33 +0200
Subject: [PATCH 132/270] Restore provider readiness for mobile plugins (#6760)

* fix(client): restore provider readiness on mobile

React Native uses an AbortSignal without throwIfAborted. Check aborted with the existing API disposal error so readiness works while preserving cleanup and cancellation.

Co-authored-by: GeorgeR <897457+GeorgeR@users.noreply.github.com>

* test(plugins): run mobile readiness regression in CI

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: GeorgeR <897457+GeorgeR@users.noreply.github.com>
---
 packages/client/src/index.ts                  |  2 +-
 .../plugins/plugin-paseo-api.e2e.test.ts      | 57 +++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index 5bccc94009..058ec158ef 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -1051,7 +1051,7 @@ async function waitForProvidersReady(
 
   try {
     await observation.ready;
-    signal.throwIfAborted();
+    if (signal.aborted) throw new Error("Paseo API is disposed");
     return await new Promise<PaseoProviderSnapshotResult>((resolve, reject) => {
       let settled = false;
       let requestId: string | null = null;
diff --git a/packages/server/src/server/plugins/plugin-paseo-api.e2e.test.ts b/packages/server/src/server/plugins/plugin-paseo-api.e2e.test.ts
index d0ad016cec..5da355d5df 100644
--- a/packages/server/src/server/plugins/plugin-paseo-api.e2e.test.ts
+++ b/packages/server/src/server/plugins/plugin-paseo-api.e2e.test.ts
@@ -1,3 +1,7 @@
+import { createRequire } from "node:module";
+import { runInNewContext } from "node:vm";
+import { fileURLToPath } from "node:url";
+import { build } from "esbuild";
 import { EventEmitter, once } from "node:events";
 import { resolveDaemonVersion } from "../daemon-version.js";
 import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
@@ -15,6 +19,59 @@ afterEach(async () => {
   await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })));
 });
 
+test.each(["React Native", "native"])(
+  "provider readiness works with %s AbortController",
+  async (runtime) => {
+    const require = createRequire(import.meta.url);
+    const reactNativeRequire = createRequire(require.resolve("react-native/package.json"));
+    const { AbortController: ReactNativeAbortController } = reactNativeRequire(
+      "abort-controller/dist/abort-controller",
+    );
+    const bundle = await build({
+      entryPoints: [fileURLToPath(new URL("../../../../client/src/index.ts", import.meta.url))],
+      bundle: true,
+      write: false,
+      format: "iife",
+      globalName: "paseoSdk",
+      platform: "browser",
+    });
+    // A separate runtime starts with React Native's real abort implementation.
+    // Node's globals and the daemon's runtime remain unchanged.
+    const sdk: typeof import("@getpaseo/client") = runInNewContext(
+      `${bundle.outputFiles[0]!.text}\npaseoSdk`,
+      {
+        AbortController: runtime === "React Native" ? ReactNativeAbortController : AbortController,
+        setTimeout,
+        clearTimeout,
+        queueMicrotask,
+        TextEncoder,
+        TextDecoder,
+      },
+    );
+    const daemon = await createTestPaseoDaemon({ mcpEnabled: false });
+    const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+    const api = sdk.createPaseoApi(client);
+    try {
+      await client.connect();
+      const snapshot = await api.providers.waitForReady({ cwd: daemon.staticDir });
+      expect(snapshot.entries.length).toBeGreaterThan(0);
+      expect(snapshot.entries.every((entry) => entry.status !== "loading")).toBe(true);
+      const waiting = api.providers.waitForReady({ cwd: daemon.staticDir });
+      const canceled = expect(waiting).rejects.toThrow(/disposed|released/);
+      await api.dispose();
+      await canceled;
+      const { diagnostic } = await client.collectDiagnostics();
+      expect(diagnostic).toContain("Source registrations: 0");
+      expect(diagnostic).toContain("Producer listeners: 0");
+      expect(() => api.providers.waitForReady()).toThrow("disposed");
+    } finally {
+      await api.dispose();
+      await client.close();
+      await daemon.close();
+    }
+  },
+);
+
 test("plugin handlers create workspaces and agents through their Paseo API", async () => {
   const pluginDirectory = await mkdtemp(path.join(tmpdir(), "paseo-api-plugin-"));
   const workspaceDirectory = await mkdtemp(path.join(tmpdir(), "paseo-api-workspace-"));

From eb051ea81ea510eacb294911ddf3a4d9be72574c Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 08:00:47 +0200
Subject: [PATCH 133/270] Render Astro diffs containing empty expressions
 (#6763)

* fix(highlight): render Astro diffs containing empty expressions

Empty Astro expressions produced zero-length nested JavaScript ranges, which rejected the whole diff. Leave those expressions in the markup tree and preserve highlighting around them.

* test(highlight): make empty Astro expression assertions explicit

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/__tests__/highlighter.test.ts         | 28 +++++++++++++++++++
 packages/highlight/src/astro/parser.ts        | 10 ++++---
 .../src/server/utils/diff-highlighter.test.ts | 22 +++++++++++++++
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/packages/highlight/src/__tests__/highlighter.test.ts b/packages/highlight/src/__tests__/highlighter.test.ts
index c245d42da1..a943e6dd4a 100644
--- a/packages/highlight/src/__tests__/highlighter.test.ts
+++ b/packages/highlight/src/__tests__/highlighter.test.ts
@@ -144,6 +144,34 @@ const title = "Hello";
     );
   });
 
+  it("highlights Astro markup containing only an empty expression", () => {
+    const code = "<p>{}</p>";
+
+    const tokens = highlightCode(code, "Empty.astro").flat();
+
+    expect(tokens.map((token) => token.text).join("")).toBe(code);
+    expect(tokens).toContainEqual({ text: "p", style: "tag" });
+  });
+
+  it.each([
+    "<p>{title} {} {title}</p>",
+    '<p class="{} {title}">{title}</p>',
+    "<p class={} title={title}>{title}</p>",
+  ])("highlights Astro containing an empty expression: %s", (markup) => {
+    const code = `---\nconst title = "Hello";\n---\n${markup}\n<style>.page { color: red; }</style>`;
+
+    const lines = highlightCode(code, "Empty.astro");
+
+    expect(lines).toHaveLength(code.split("\n").length);
+    for (const [index, tokens] of lines.entries()) {
+      expect(tokens.map((token) => token.text).join("")).toBe(code.split("\n")[index]);
+    }
+    expect(lines.flat()).toContainEqual({ text: "const", style: "keyword" });
+    expect(lines.flat()).toContainEqual({ text: "p", style: "tag" });
+    expect(lines.flat()).toContainEqual({ text: "color", style: "property" });
+    expect(lines.flat()).toContainEqual({ text: "title", style: "variable" });
+  });
+
   it("keeps an Astro expression open through nested template strings", () => {
     const code = "<p>{`a ${`}`} b`}</p>";
 
diff --git a/packages/highlight/src/astro/parser.ts b/packages/highlight/src/astro/parser.ts
index 202c921252..cef0748b5a 100644
--- a/packages/highlight/src/astro/parser.ts
+++ b/packages/highlight/src/astro/parser.ts
@@ -45,10 +45,12 @@ function maskExpressions(text: string): string {
 }
 
 function expressionOverlays(node: SyntaxNodeRef, input: Input): Range[] | null {
-  const overlays = findExpressions(input.read(node.from, node.to)).map(({ from, to }) => ({
-    from: node.from + from + 1,
-    to: node.from + to,
-  }));
+  const overlays = findExpressions(input.read(node.from, node.to))
+    .filter(({ from, to }) => to > from + 1)
+    .map(({ from, to }) => ({
+      from: node.from + from + 1,
+      to: node.from + to,
+    }));
   return overlays.length > 0 ? overlays : null;
 }
 
diff --git a/packages/server/src/server/utils/diff-highlighter.test.ts b/packages/server/src/server/utils/diff-highlighter.test.ts
index 56f77fc706..5ca1177799 100644
--- a/packages/server/src/server/utils/diff-highlighter.test.ts
+++ b/packages/server/src/server/utils/diff-highlighter.test.ts
@@ -625,6 +625,28 @@ describe("highlightDiffFromHunks", () => {
 });
 
 describe("highlightDiffWithFileContent", () => {
+  it("renders an Astro diff with an empty expression and keeps surrounding highlighting", async () => {
+    const diff = ASTRO_DIFF.replace("{title}", "{title} {}");
+    const file = parseDiff(diff)[0];
+    const highlighted = await highlightDiffWithFileContent(file, ".", {
+      oldFileContent:
+        '---\nconst title = "Hello";\n---\n<main class="page">\n  <h1>{title} {}</h1>\n</main>',
+      newFileContent:
+        '---\nconst title = "Hello, Astro";\n---\n<main class="page">\n  <h1>{title} {}</h1>\n</main>',
+    });
+
+    expect(highlighted.hunks[0].lines.find((line) => line.type === "add")?.tokens).toContainEqual({
+      text: '"Hello, Astro"',
+      style: "string",
+    });
+    expect(highlighted.hunks[0].lines.map(({ content }) => content)).toEqual(
+      file.hunks[0].lines.map(({ content }) => content),
+    );
+    expect(
+      highlightDiffFromHunks(file).hunks[0].lines.find((line) => line.type === "add")?.tokens,
+    ).toContainEqual({ text: '"Hello, Astro"', style: "string" });
+  });
+
   it("leaves files with an oversized line unhighlighted", async () => {
     const oversizedLine = `const payload = "${"x".repeat(10_001)}";`;
     const [file] = parseDiff(

From 058375dac8f0f1e1bd3d348a4cfa0793141e819a Mon Sep 17 00:00:00 2001
From: Galaxy Roaming <45086632+apple-ouyang@users.noreply.github.com>
Date: Tue, 13 Oct 2026 15:05:02 +0800
Subject: [PATCH 134/270] fix(server): release ACP provider process after
 history resume (#6766)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(server): release ACP provider process after history resume

Resuming a persisted agent with purpose "history" only replays the
session into the canonical timeline, but ACP sessions kept the spawned
CLI process resident afterwards. Every client that fetches an archived
agent's timeline (the app reconnects fetching every visible agent)
therefore re-materialized a provider process per archived agent and
nothing ever released it — measured ~280 MB resident per dsh agent.

After the replay and configured overrides finish, a history-purpose
resume now settles the commands gate, drops the connection, and
terminates the child. The session object stays registered with the
replayed history so read paths keep working; the existing
`this.child !== child` exit guard already ignores the released
process, and interactive use goes through reloadAgentSession which
spawns a fresh process. This matches the runtime-only contract the
Codex provider already implements.

* fix(server): retain child refs when history-runtime release times out

Addresses Greptile review: if terminateProcess returns kill-timeout the
child stays registered so close() can retry instead of leaking an
untracked process. The test now asserts the process is already dead when
resumeSession resolves, which pins the documented release-before-return
contract instead of a post-hoc poll.

Greptile iteration 1.
---
 docs/agent-lifecycle.md                       | 11 ++--
 .../src/server/agent/providers/acp-agent.ts   | 30 ++++++++-
 ...generic-acp-agent.archived-history.test.ts | 63 ++++++++++++++++++-
 3 files changed, 96 insertions(+), 8 deletions(-)

diff --git a/docs/agent-lifecycle.md b/docs/agent-lifecycle.md
index ee763aa1f9..d699d8519a 100644
--- a/docs/agent-lifecycle.md
+++ b/docs/agent-lifecycle.md
@@ -151,11 +151,12 @@ lifecycle queue. Resume chooses its history or interactive purpose from the dura
 entering that queue. Shutdown must finish before the manager releases runtime ownership; a failed
 close retains the runtime for cleanup and blocks replacement through that close operation.
 
-Authoritative timeline catch-up can use a runtime-only `history` resume purpose. For Codex, that
-purpose initializes a temporary app-server, reads the persisted thread and child histories, and
-releases the process before returning. It never loads, resumes, or unarchives a native thread,
-including legacy records whose native archive failed. The retained history session contains only
-the read results. Interactive resume remains responsible for repairing a provider session archived
+Authoritative timeline catch-up can use a runtime-only `history` resume purpose. The retained
+history session contains only the read results and must release its provider process once replay
+finishes. Codex reads the persisted thread and child histories on a temporary app-server and never
+loads, resumes, or unarchives a native thread, including legacy records whose native archive failed.
+ACP providers spawn the CLI, replay the session through `session/load`, and terminate the process
+before returning. Interactive resume remains responsible for repairing a provider session archived
 outside Paseo while its Paseo agent is active.
 
 Provider session connection owns every process it spawns until the session is registered with
diff --git a/packages/server/src/server/agent/providers/acp-agent.ts b/packages/server/src/server/agent/providers/acp-agent.ts
index 6bded49feb..169421fca9 100644
--- a/packages/server/src/server/agent/providers/acp-agent.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.ts
@@ -1750,6 +1750,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
   private fallbackAssistantMessageId: string | null = null;
   private closed = false;
   private historyPending = false;
+  private historyRuntimeReleased = false;
   private replayingHistory = false;
   private bootstrapThreadEventPending = false;
   private readonly terminateProcess: ProcessTerminator;
@@ -1867,11 +1868,38 @@ export class ACPAgentSession implements AgentSession, ACPClient {
       }
 
       await this.applyConfiguredOverrides();
+
+      if (this.resumePurpose === "history") {
+        await this.releaseHistoryRuntime();
+      }
     } catch (error) {
       await this.closeAfterInitializationFailure(error);
     }
   }
 
+  // History resumes exist to replay persisted events into the canonical
+  // timeline; the provider process is released once replay finishes so
+  // archived agents hold no resident runtime. Interactive work goes through
+  // reloadAgentSession, which spawns a fresh process.
+  private async releaseHistoryRuntime(): Promise<void> {
+    const child = this.child;
+    if (child) {
+      const result = await this.terminateProcess(child, {
+        gracefulTimeoutMs: 2_000,
+        forceTimeoutMs: 2_000,
+      });
+      if (result === "kill-timeout") {
+        // Keep the child registered so close() can retry the shutdown.
+        this.logger.warn("ACP history resume could not release the provider process");
+        return;
+      }
+    }
+    this.historyRuntimeReleased = true;
+    this.connection = null;
+    this.child = null;
+    this.settleCommandsReady();
+  }
+
   private async closeAfterInitializationFailure(error: unknown): Promise<never> {
     try {
       await this.close();
@@ -2841,7 +2869,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     });
     const spawnError = rejectOnSpawnError(child, stderrChunks);
     child.once("exit", (code, signal) => {
-      if (this.closed) {
+      if (this.closed || this.historyRuntimeReleased) {
         return;
       }
       if (this.activeForegroundTurnId) {
diff --git a/packages/server/src/server/agent/providers/generic-acp-agent.archived-history.test.ts b/packages/server/src/server/agent/providers/generic-acp-agent.archived-history.test.ts
index ec17dd7ecf..fdddb4941c 100644
--- a/packages/server/src/server/agent/providers/generic-acp-agent.archived-history.test.ts
+++ b/packages/server/src/server/agent/providers/generic-acp-agent.archived-history.test.ts
@@ -1,4 +1,4 @@
-import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 
@@ -68,8 +68,60 @@ describe("GenericACPAgentClient archived history", () => {
       ).rejects.toThrow("ENOENT");
     });
   });
+
+  test("releases the provider process once an archived session's history is replayed", async () => {
+    await withFakeACPAgent(async ({ command, removedCwd, pidPath }) => {
+      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+
+      const session = await client.resumeSession(
+        { provider: "acp", sessionId: "archived-session", metadata: { cwd: removedCwd } },
+        undefined,
+        undefined,
+        { purpose: "history" },
+      );
+      try {
+        const pid = Number(await readFile(pidPath, "utf8"));
+        expect(isProcessAlive(pid)).toBe(false);
+        expect(await collectTimelineText(session.streamHistory())).toEqual([
+          "user_message:What is in the README?",
+          "assistant_message:It describes the project.",
+        ]);
+      } finally {
+        await session.close();
+      }
+    });
+  });
+
+  test("keeps the provider process for an interactive resume", async () => {
+    await withFakeACPAgent(async ({ command, removedCwd, pidPath }) => {
+      await mkdir(removedCwd, { recursive: true });
+      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+
+      const session = await client.resumeSession(
+        { provider: "acp", sessionId: "archived-session", metadata: { cwd: removedCwd } },
+        undefined,
+        undefined,
+        { purpose: "interactive" },
+      );
+      try {
+        const pid = Number(await readFile(pidPath, "utf8"));
+        expect(isProcessAlive(pid)).toBe(true);
+      } finally {
+        await session.close();
+      }
+    });
+  });
 });
 
+function isProcessAlive(pid: number): boolean {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 async function collectTimelineText(events: AsyncGenerator<AgentStreamEvent>): Promise<string[]> {
   const text: string[] = [];
   for await (const event of events) {
@@ -88,17 +140,20 @@ async function withFakeACPAgent(
     command: [string, ...string[]];
     removedCwd: string;
     loadRequestsPath: string;
+    pidPath: string;
   }) => Promise<void>,
 ): Promise<void> {
   const testDir = await mkdtemp(path.join(tmpdir(), "paseo-acp-archived-history-"));
   try {
     const scriptPath = path.join(testDir, "fake-acp-agent.cjs");
     const loadRequestsPath = path.join(testDir, "load-requests.json");
+    const pidPath = path.join(testDir, "agent.pid");
     await writeFile(scriptPath, fakeACPAgentScript, "utf8");
     await run({
-      command: [process.execPath, scriptPath, loadRequestsPath],
+      command: [process.execPath, scriptPath, loadRequestsPath, pidPath],
       removedCwd: path.join(testDir, "removed-worktree"),
       loadRequestsPath,
+      pidPath,
     });
   } finally {
     await rm(testDir, { recursive: true, force: true });
@@ -110,6 +165,10 @@ const fs = require("node:fs");
 const readline = require("node:readline");
 
 const loadRequestsPath = process.argv[2];
+const pidPath = process.argv[3];
+if (pidPath) {
+  fs.writeFileSync(pidPath, String(process.pid));
+}
 const loadRequests = [];
 const rl = readline.createInterface({ input: process.stdin });
 

From b923cde6cfda7c04ce9886b41552a4159e33ba6f Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 10:30:03 +0200
Subject: [PATCH 135/270] fix(claude): show custom model context limits during
 the first turn (#6767)

Seed active usage from the explicit 1M modifier and the model resolved by Claude Code initialization. Preserve SDK-reported limits on repeated initialization and reset them when the selected model changes.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../agent.context-usage.local.e2e.test.ts     |  27 +++--
 .../claude/agent.context-window.test.ts       | 112 ++++++++++++++++++
 .../agent/providers/claude/agent.test.ts      |  15 ++-
 .../server/agent/providers/claude/agent.ts    |  12 +-
 .../agent/providers/claude/models.test.ts     |  22 +++-
 .../server/agent/providers/claude/models.ts   |   9 ++
 6 files changed, 182 insertions(+), 15 deletions(-)
 create mode 100644 packages/server/src/server/agent/providers/claude/agent.context-window.test.ts

diff --git a/packages/server/src/server/agent/providers/claude/agent.context-usage.local.e2e.test.ts b/packages/server/src/server/agent/providers/claude/agent.context-usage.local.e2e.test.ts
index 3008f3d4d5..7c3883986a 100644
--- a/packages/server/src/server/agent/providers/claude/agent.context-usage.local.e2e.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.context-usage.local.e2e.test.ts
@@ -1,5 +1,5 @@
 import { createServer } from "node:http";
-import { mkdir, mkdtemp, rm } from "node:fs/promises";
+import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
 import pino from "pino";
 import { expect, test } from "vitest";
@@ -13,12 +13,18 @@ test.each([
   { placement: "delta", cacheTokens: 0 },
   { placement: "start", cacheTokens: 1_000 },
   { placement: "delta", cacheTokens: 1_000 },
+  { placement: "start", cacheTokens: 0, model: "glm-5.2[1m]" },
+  { placement: "start", cacheTokens: 0, model: "sonnet", resolvedModel: "glm-5.2[1m]" },
 ])(
-  "counts $placement input and $cacheTokens cached tokens through Claude Code",
-  async ({ placement, cacheTokens }) => {
+  "counts $placement input and $cacheTokens cached tokens through Claude Code ($model)",
+  async ({ placement, cacheTokens, model = "claude-sonnet-4-6", resolvedModel = model }) => {
     const cwd = await mkdtemp(path.resolve(".claude-context-usage-"));
     const configDir = path.join(cwd, "config");
     await mkdir(configDir);
+    await writeFile(
+      path.join(configDir, "settings.json"),
+      JSON.stringify({ env: { ANTHROPIC_DEFAULT_SONNET_MODEL: resolvedModel } }),
+    );
     let requestCount = 0;
     const server = createServer(async (request, response) => {
       for await (const chunk of request) {
@@ -45,7 +51,7 @@ test.each([
           id: `msg_context_usage_${requestCount}`,
           type: "message",
           role: "assistant",
-          model: "claude-sonnet-4-6",
+          model: resolvedModel,
           content: [],
           stop_reason: null,
           stop_sequence: null,
@@ -86,11 +92,9 @@ test.each([
         },
       },
     });
-    const session = await client.createSession(
-      { provider: "claude", cwd, model: "claude-sonnet-4-6" },
-      undefined,
-      { persistSession: false },
-    );
+    const session = await client.createSession({ provider: "claude", cwd, model }, undefined, {
+      persistSession: false,
+    });
     try {
       for (let turn = 0; turn < 2; turn++) {
         const events = await collectSessionTurnEvents(session, "say hello", {
@@ -111,7 +115,10 @@ test.each([
         expect(events).toContainEqual(
           expect.objectContaining({
             type: "usage_updated",
-            usage: expect.objectContaining({ contextWindowUsedTokens: expectedTokens }),
+            usage: expect.objectContaining({
+              contextWindowUsedTokens: expectedTokens,
+              contextWindowMaxTokens: resolvedModel.endsWith("[1m]") ? 1_000_000 : 200_000,
+            }),
           }),
         );
       }
diff --git a/packages/server/src/server/agent/providers/claude/agent.context-window.test.ts b/packages/server/src/server/agent/providers/claude/agent.context-window.test.ts
new file mode 100644
index 0000000000..1f0c5bd36c
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/agent.context-window.test.ts
@@ -0,0 +1,112 @@
+import { expect, test } from "vitest";
+import { createTestLogger } from "../../../../test-utils/test-logger.js";
+import { collectSessionTurnEvents } from "../test-utils/session-stream-adapter.js";
+import { ClaudeAgentClient } from "./agent.js";
+import type { ClaudeQueryFactory } from "./query.js";
+
+// A query dependency that speaks the same stream interface as Claude Code.
+// Each request repeats init so a second turn exercises runtime-limit retention.
+function contextQuery(runtimeModel: string, reportedLimit: number): ClaudeQueryFactory {
+  return ({ prompt }) => {
+    let model = runtimeModel;
+    const messages = (async function* () {
+      if (typeof prompt === "string") throw new Error("Expected streaming input");
+      for await (const _message of prompt) {
+        yield {
+          type: "system",
+          subtype: "init",
+          session_id: "context-session",
+          permissionMode: "default",
+          model,
+        };
+        yield {
+          type: "stream_event",
+          session_id: "context-session",
+          event: { type: "message_start", message: { usage: { input_tokens: 249_950 } } },
+        };
+        yield {
+          type: "stream_event",
+          session_id: "context-session",
+          event: { type: "message_delta", usage: { output_tokens: 50 } },
+        };
+        yield {
+          type: "result",
+          subtype: "success",
+          session_id: "context-session",
+          duration_ms: 1,
+          duration_api_ms: 1,
+          is_error: false,
+          num_turns: 1,
+          result: "done",
+          stop_reason: null,
+          total_cost_usd: 0,
+          usage: { input_tokens: 249_950, output_tokens: 50, cache_read_input_tokens: 0 },
+          modelUsage: { [model]: { contextWindow: reportedLimit } },
+          permission_denials: [],
+          uuid: "context-result",
+        };
+      }
+    })();
+    return Object.assign(messages, {
+      close: () => {
+        void messages.return();
+      },
+      interrupt: async () => undefined,
+      setModel: async (value: string) => {
+        model = value;
+      },
+      setPermissionMode: async () => undefined,
+      supportedModels: async () => [],
+      supportedCommands: async () => [],
+    }) as ReturnType<ClaudeQueryFactory>;
+  };
+}
+
+test.each([
+  { selected: "glm-5.2[1m]", runtime: "glm-5.2[1m]", expected: 1_000_000 },
+  { selected: "sonnet", runtime: "glm-5.2[1m]", expected: 1_000_000 },
+  { selected: "glm-5.2", runtime: "glm-5.2", expected: undefined },
+])(
+  "streams the context limit for $selected resolved as $runtime",
+  async ({ selected, runtime, expected }) => {
+    const client = new ClaudeAgentClient({
+      logger: createTestLogger(),
+      queryFactory: contextQuery(runtime, 800_000),
+      resolveBinary: async () => process.execPath,
+    });
+    const session = await client.createSession({
+      provider: "claude",
+      cwd: process.cwd(),
+      model: selected,
+    });
+    try {
+      const first = await collectSessionTurnEvents(session, "first turn");
+      const live = first.filter((event) => event.type === "usage_updated");
+      expect(live.map((event) => event.usage.contextWindowMaxTokens)).toEqual([expected, expected]);
+      expect(live.map((event) => event.usage.contextWindowUsedTokens)).toEqual([249_950, 250_000]);
+      expect(first).toContainEqual(
+        expect.objectContaining({
+          type: "turn_completed",
+          usage: expect.objectContaining({ contextWindowMaxTokens: 800_000 }),
+        }),
+      );
+
+      const second = await collectSessionTurnEvents(session, "second turn");
+      expect(
+        second
+          .filter((event) => event.type === "usage_updated")
+          .map((event) => event.usage.contextWindowMaxTokens),
+      ).toEqual([800_000, 800_000]);
+
+      await session.setModel?.("another-custom-model");
+      const switched = await collectSessionTurnEvents(session, "after model switch");
+      expect(
+        switched
+          .filter((event) => event.type === "usage_updated")
+          .map((event) => event.usage.contextWindowMaxTokens),
+      ).toEqual([undefined, undefined]);
+    } finally {
+      await session.close();
+    }
+  },
+);
diff --git a/packages/server/src/server/agent/providers/claude/agent.test.ts b/packages/server/src/server/agent/providers/claude/agent.test.ts
index 5e26e6a55a..d07b0572b7 100644
--- a/packages/server/src/server/agent/providers/claude/agent.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.test.ts
@@ -2805,6 +2805,7 @@ describe("ClaudeAgentSession context window usage", () => {
           type: "usage_updated",
           provider: "claude",
           usage: {
+            contextWindowMaxTokens: 200_000,
             contextWindowUsedTokens: 150,
           },
         }),
@@ -2840,7 +2841,13 @@ describe("ClaudeAgentSession context window usage", () => {
 
   test("selected 1M Claude models seed active context window usage from the catalog", async () => {
     const session = await createSessionForTurns(
-      [[createInitMessage(), createMessageStartEvent(), createSuccessResult()]],
+      [
+        [
+          { ...createInitMessage(), model: "claude-sonnet-5[1m]" },
+          createMessageStartEvent(),
+          createSuccessResult(),
+        ],
+      ],
       { model: "claude-sonnet-5[1m]" },
     );
 
@@ -2880,6 +2887,7 @@ describe("ClaudeAgentSession context window usage", () => {
           type: "usage_updated",
           provider: "claude",
           usage: {
+            contextWindowMaxTokens: 200_000,
             contextWindowUsedTokens: 175,
           },
         }),
@@ -2922,6 +2930,7 @@ describe("ClaudeAgentSession context window usage", () => {
           type: "usage_updated",
           provider: "claude",
           usage: {
+            contextWindowMaxTokens: 200_000,
             contextWindowUsedTokens: 20_300,
           },
         }),
@@ -2963,6 +2972,7 @@ describe("ClaudeAgentSession context window usage", () => {
           type: "usage_updated",
           provider: "claude",
           usage: {
+            contextWindowMaxTokens: 200_000,
             contextWindowUsedTokens: 1_069,
           },
         }),
@@ -3026,6 +3036,7 @@ describe("ClaudeAgentSession context window usage", () => {
           type: "usage_updated",
           provider: "claude",
           usage: {
+            contextWindowMaxTokens: 200_000,
             contextWindowUsedTokens: 55,
           },
         }),
@@ -3035,6 +3046,7 @@ describe("ClaudeAgentSession context window usage", () => {
           type: "usage_updated",
           provider: "claude",
           usage: {
+            contextWindowMaxTokens: 200_000,
             contextWindowUsedTokens: 62,
           },
         }),
@@ -3072,6 +3084,7 @@ describe("ClaudeAgentSession context window usage", () => {
           type: "usage_updated",
           provider: "claude",
           usage: {
+            contextWindowMaxTokens: 200_000,
             contextWindowUsedTokens: 704,
           },
         }),
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index 51885f74e8..9936969e7d 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -31,7 +31,7 @@ import {
   readTaskNotificationToolUseIdFromHistoryRecord,
 } from "./task-notification-tool-call.js";
 import {
-  findClaudeModel,
+  getClaudeContextWindowMaxTokens,
   getClaudeModelsWithSettings,
   normalizeClaudeRuntimeModelId,
   resolveConfiguredClaudeModel,
@@ -2240,7 +2240,7 @@ class ClaudeAgentSession implements AgentSession {
     this.resolveBinary = options.resolveBinary;
     this.rewindSdk = options.rewindSdk ?? realClaudeRewindSdk;
     this.contextUsage = new ClaudeContextUsageState(
-      findClaudeModel(this.config.model)?.contextWindowMaxTokens,
+      getClaudeContextWindowMaxTokens(this.config.model),
     );
     const handle = options.handle;
 
@@ -2572,7 +2572,7 @@ class ClaudeAgentSession implements AgentSession {
       await this.applyFastModeFeature(false, activeQuery);
     }
     this.contextUsage.setInitialContextWindowMaxTokens(
-      findClaudeModel(this.config.model)?.contextWindowMaxTokens,
+      getClaudeContextWindowMaxTokens(this.config.model),
     );
     this.lastOptionsModel = normalizedModelId ?? this.lastOptionsModel;
     this.lastRuntimeModel = null;
@@ -4821,6 +4821,12 @@ class ClaudeAgentSession implements AgentSession {
     this.observePermissionMode(message.permissionMode);
     this.persistence = null;
     if (message.model) {
+      const runtimeContextWindowMaxTokens = getClaudeContextWindowMaxTokens(message.model);
+      // Seed usage before the first result, including settings-resolved aliases.
+      // A repeated init for the same model must retain the SDK's reported limit.
+      if (message.model !== this.lastRuntimeModel && runtimeContextWindowMaxTokens !== undefined) {
+        this.contextUsage.setInitialContextWindowMaxTokens(runtimeContextWindowMaxTokens);
+      }
       const normalizedRuntimeModel = normalizeClaudeRuntimeModelId(message.model);
       this.logger.debug(
         { runtimeModel: message.model, normalizedRuntimeModel },
diff --git a/packages/server/src/server/agent/providers/claude/models.test.ts b/packages/server/src/server/agent/providers/claude/models.test.ts
index 1ef8177bbf..16d13b9d68 100644
--- a/packages/server/src/server/agent/providers/claude/models.test.ts
+++ b/packages/server/src/server/agent/providers/claude/models.test.ts
@@ -15,7 +15,27 @@ import {
 } from "./model-manifest.js";
 import { discoverClaudeModels } from "./model-discovery.js";
 import type { ModelInfo } from "@anthropic-ai/claude-agent-sdk";
-import { findClaudeModel, getClaudeModels, normalizeClaudeRuntimeModelId } from "./models.js";
+import {
+  findClaudeModel,
+  getClaudeContextWindowMaxTokens,
+  getClaudeModels,
+  normalizeClaudeRuntimeModelId,
+} from "./models.js";
+
+describe("getClaudeContextWindowMaxTokens", () => {
+  it.each([
+    ["glm-5.2[1m]", 1_000_000],
+    [" glm-5.2[1M] ", 1_000_000],
+    ["claude-sonnet-4-6", 200_000],
+    ["claude-sonnet-4-6[1m]", 1_000_000],
+    ["glm-5.2", undefined],
+    ["glm-5.2[1m]-other", undefined],
+    [undefined, undefined],
+    [null, undefined],
+  ])("resolves %s to %s without guessing unknown models", (model, expected) => {
+    expect(getClaudeContextWindowMaxTokens(model)).toBe(expected);
+  });
+});
 
 const createdClaudeConfigDirs: string[] = [];
 
diff --git a/packages/server/src/server/agent/providers/claude/models.ts b/packages/server/src/server/agent/providers/claude/models.ts
index 39e0dcf1dd..2a9b801fdb 100644
--- a/packages/server/src/server/agent/providers/claude/models.ts
+++ b/packages/server/src/server/agent/providers/claude/models.ts
@@ -48,6 +48,15 @@ export function findClaudeModel(
   return getClaudeModels().find((model) => model.id === normalizedModelId);
 }
 
+export function getClaudeContextWindowMaxTokens(
+  modelId: string | null | undefined,
+): number | undefined {
+  if (modelId?.trim().toLowerCase().endsWith("[1m]")) {
+    return 1_000_000;
+  }
+  return findClaudeModel(modelId)?.contextWindowMaxTokens;
+}
+
 export async function getClaudeModelsWithSettings(
   logger: Logger,
   configDir: string,

From 337e81a9c6d4551dbcede5930c21408776d06b1b Mon Sep 17 00:00:00 2001
From: Elowen <73627805+Mar-garet@users.noreply.github.com>
Date: Tue, 13 Oct 2026 16:56:43 +0800
Subject: [PATCH 136/270] fix(files): preserve relative symlinks when
 duplicating entries (#6771)

* fix(files): preserve relative symlinks when duplicating entries

* test(files): verify duplicated symlink targets through daemon RPC
---
 .../server/daemon-e2e/filesystem.e2e.test.ts  | 88 ++++++++++++++++++-
 .../src/server/file-explorer/service.ts       |  1 +
 2 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
index c0e14d72b8..5a6187db71 100644
--- a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
@@ -1,5 +1,13 @@
 import { describe, test, expect, beforeEach, afterEach } from "vitest";
-import { mkdtempSync, writeFileSync, rmSync, mkdirSync, symlinkSync, readdirSync } from "fs";
+import {
+  mkdtempSync,
+  writeFileSync,
+  rmSync,
+  mkdirSync,
+  symlinkSync,
+  readdirSync,
+  readlinkSync,
+} from "fs";
 import { tmpdir } from "os";
 import path from "path";
 import { createDaemonTestContext, type DaemonTestContext } from "../test-utils/index.js";
@@ -387,6 +395,84 @@ describe("file explorer", () => {
     }
   });
 
+  test.skipIf(process.platform === "win32")(
+    "duplicating a folder keeps relative symlinks inside the copy",
+    async () => {
+      const cwd = tmpCwd();
+      try {
+        mkdirSync(path.join(cwd, "template"));
+        writeFileSync(path.join(cwd, "template", "data.txt"), "original payload\n");
+        symlinkSync("data.txt", path.join(cwd, "template", "alias.txt"));
+
+        const duplicated = await ctx.client.duplicateFileEntry({ cwd, path: "template" });
+        expect(duplicated).toMatchObject({
+          duplicatedPath: "template copy",
+          success: true,
+          error: null,
+        });
+        expect(readlinkSync(path.join(cwd, "template copy", "alias.txt"))).toBe("data.txt");
+
+        const copiedTarget = await ctx.client.readFile(cwd, "template copy/data.txt");
+        const targetWrite = await ctx.client.writeFile({
+          cwd,
+          path: "template copy/data.txt",
+          content: "copy payload\n",
+          expectedModifiedAt: copiedTarget.modifiedAt,
+          expectedRevision: copiedTarget.revision,
+        });
+        expect(targetWrite.status).toBe("written");
+        const copiedAlias = await ctx.client.readFile(cwd, "template copy/alias.txt");
+        expect(new TextDecoder().decode(copiedAlias.bytes)).toBe("copy payload\n");
+
+        const aliasWrite = await ctx.client.writeFile({
+          cwd,
+          path: "template copy/alias.txt",
+          content: "edited through copied alias\n",
+          expectedModifiedAt: copiedAlias.modifiedAt,
+          expectedRevision: copiedAlias.revision,
+        });
+        expect(aliasWrite.status).toBe("written");
+        const original = await ctx.client.readFile(cwd, "template/data.txt");
+        expect(new TextDecoder().decode(original.bytes)).toBe("original payload\n");
+        const editedCopy = await ctx.client.readFile(cwd, "template copy/data.txt");
+        expect(new TextDecoder().decode(editedCopy.bytes)).toBe("edited through copied alias\n");
+
+        const deleted = await ctx.client.deleteFileEntry({ cwd, path: "template" });
+        expect(deleted).toMatchObject({ success: true, error: null });
+        const survivingAlias = await ctx.client.readFile(cwd, "template copy/alias.txt");
+        expect(new TextDecoder().decode(survivingAlias.bytes)).toBe(
+          "edited through copied alias\n",
+        );
+      } finally {
+        rmSync(cwd, { recursive: true, force: true });
+      }
+    },
+  );
+
+  test.skipIf(process.platform === "win32")(
+    "duplicating a file symlink preserves an explicit absolute target",
+    async () => {
+      const cwd = tmpCwd();
+      const targetPath = path.join(cwd, "data.txt");
+      try {
+        writeFileSync(targetPath, "absolute target payload\n");
+        symlinkSync(targetPath, path.join(cwd, "alias.txt"));
+
+        const duplicated = await ctx.client.duplicateFileEntry({ cwd, path: "alias.txt" });
+        expect(duplicated).toMatchObject({
+          duplicatedPath: "alias copy.txt",
+          success: true,
+          error: null,
+        });
+        expect(readlinkSync(path.join(cwd, "alias copy.txt"))).toBe(targetPath);
+        const copy = await ctx.client.readFile(cwd, "alias copy.txt");
+        expect(new TextDecoder().decode(copy.bytes)).toBe("absolute target payload\n");
+      } finally {
+        rmSync(cwd, { recursive: true, force: true });
+      }
+    },
+  );
+
   test("lists directory contents", async () => {
     const cwd = tmpCwd();
 
diff --git a/packages/server/src/server/file-explorer/service.ts b/packages/server/src/server/file-explorer/service.ts
index b371a5e4af..d99c97616b 100644
--- a/packages/server/src/server/file-explorer/service.ts
+++ b/packages/server/src/server/file-explorer/service.ts
@@ -669,6 +669,7 @@ export async function duplicateExplorerEntry({
       errorOnExist: true,
       force: false,
       preserveTimestamps: true,
+      verbatimSymlinks: true,
     });
     return { status: "ok", path: normalizeRelativePath({ root, targetPath }) };
   } catch (error) {

From 4400445edb3c25b13370009794fabfc2e02251b6 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 13:55:25 +0200
Subject: [PATCH 137/270] Allow worktree creation after Git initialization
 (#6785)

* fix(server): allow worktree creation after Git initialization

Fresh project checkout reads could publish Git capability while worktree creation retained a cached non-Git snapshot. Refresh an existing snapshot when the fresh read observes a classification change, before returning the new capability.

* test(server): cover Git initialization in the standard integration suite

* test(server): separate stress-test writes from deletion delivery

Wait for active classifications and queued deliveries between the distinct write and deletion phases. Otherwise a late create and delete coalesce as update, leaving the strict deletion assertion waiting indefinitely. Preserve every event assertion without waiting for scheduled native safety audits.

* test(server): compare canonical repository paths on Windows

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../project-becomes-git.e2e.test.ts           | 85 +++++++++++++++++--
 .../src/server/file-observer/index.test.ts    | 18 +++-
 ...it-service.observation.integration.test.ts | 21 +++++
 .../src/server/workspace-git-service.ts       | 10 +++
 4 files changed, 124 insertions(+), 10 deletions(-)

diff --git a/packages/server/src/server/daemon-e2e/project-becomes-git.e2e.test.ts b/packages/server/src/server/daemon-e2e/project-becomes-git.e2e.test.ts
index a4db7ce7bf..16dae500f4 100644
--- a/packages/server/src/server/daemon-e2e/project-becomes-git.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/project-becomes-git.e2e.test.ts
@@ -1,6 +1,6 @@
 import { execFile as execFileCallback } from "node:child_process";
 import { mkdtempSync, realpathSync } from "node:fs";
-import { readFile, rm } from "node:fs/promises";
+import { readFile, rm, writeFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { promisify } from "node:util";
@@ -63,10 +63,12 @@ test("an empty project becomes Git without changing its identity or creating a w
   cleanupClients.add(client);
   await client.connect();
   await client.fetchAgents({ subscribe: {} });
+  const projectEvents = client.observeEvents(["project.update"]);
+  await projectEvents.ready;
 
   const added = await client.addProject(projectRoot);
 
-  expect(added).toEqual({
+  expect(added).toMatchObject({
     requestId: expect.any(String),
     project: {
       projectId: expect.stringMatching(/^prj_[0-9a-f]{16}$/),
@@ -77,7 +79,11 @@ test("an empty project becomes Git without changing its identity or creating a w
     },
     error: null,
   });
-  const project = added.project!;
+  const {
+    projectIconRevision: _icon,
+    projectCustomIconRevision: _customIcon,
+    ...project
+  } = added.project!;
   const beforeGitInit = await client.fetchWorkspaces({ filter: { projectId: project.projectId } });
   expect(beforeGitInit).toMatchObject({ entries: [], emptyProjects: [project] });
 
@@ -96,15 +102,15 @@ test("an empty project becomes Git without changing its identity or creating a w
     label: "project.update after git init",
   });
 
-  expect(update).toEqual({
+  expect(update).toMatchObject({
     kind: "upsert",
-    project: { ...project, projectKind: "git" },
+    project: { ...project, projectKind: "git", projectKey: expect.any(String) },
   });
 
   const afterGitInit = await client.fetchWorkspaces({ filter: { projectId: project.projectId } });
   expect(afterGitInit).toMatchObject({
     entries: [],
-    emptyProjects: [{ ...project, projectKind: "git" }],
+    emptyProjects: [{ ...project, projectKind: "git", projectKey: expect.any(String) }],
   });
 
   const persistedProjects = JSON.parse(
@@ -119,5 +125,72 @@ test("an empty project becomes Git without changing its identity or creating a w
     createdAt: expect.any(String),
     updatedAt: expect.any(String),
     archivedAt: null,
+    projectKey: expect.any(String),
+    customIconRevision: null,
   });
 }, 30_000);
+
+test("a failed worktree attempt before git init does not prevent creation afterward", async () => {
+  const projectRoot = realpathSync(mkdtempSync(path.join(os.tmpdir(), "paseo-init-worktree-")));
+  const paseoHomeRoot = realpathSync(mkdtempSync(path.join(os.tmpdir(), "paseo-init-home-")));
+  cleanupPaths.add(projectRoot);
+  cleanupPaths.add(paseoHomeRoot);
+  await writeFile(path.join(projectRoot, "README.md"), "hi\n");
+
+  const daemon = await createTestPaseoDaemon({ paseoHomeRoot, cleanup: false });
+  cleanupDaemons.add(daemon);
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  cleanupClients.add(client);
+  await client.connect();
+  await client.fetchAgents({ subscribe: {} });
+  const projectEvents = client.observeEvents(["project.update"]);
+  await projectEvents.ready;
+  const added = await client.addProject(projectRoot);
+  expect(added.project?.projectKind).toBe("non_git");
+  const source = {
+    kind: "worktree" as const,
+    cwd: projectRoot,
+    projectId: added.project!.projectId,
+    action: "branch-off" as const,
+    refName: "main",
+    branchName: "after-init",
+    worktreeSlug: "after-init",
+  };
+  const before = await client.createWorkspace({ source });
+  expect(before.error).toBe("Create worktree requires a git repository");
+
+  const gitProjectUpdate = waitForProjectUpdate(
+    client,
+    (payload) =>
+      payload.kind === "upsert" &&
+      payload.project.projectId === added.project!.projectId &&
+      payload.project.projectKind === "git",
+  );
+  await execFile("git", ["init", "-b", "main"], { cwd: projectRoot });
+  await execFile("git", ["add", "README.md"], { cwd: projectRoot });
+  await execFile(
+    "git",
+    [
+      "-c",
+      "user.name=Paseo Test",
+      "-c",
+      "user.email=test@getpaseo.dev",
+      "-c",
+      "commit.gpgSign=false",
+      "commit",
+      "-m",
+      "initial",
+    ],
+    { cwd: projectRoot },
+  );
+  await withTimeout({ promise: gitProjectUpdate, timeoutMs: 10_000, label: "project becomes Git" });
+  const projects = await client.fetchWorkspaces({
+    filter: { projectId: added.project!.projectId },
+  });
+  expect(projects.emptyProjects[0]?.projectKind).toBe("git");
+
+  const created = await client.createWorkspace({ source });
+  expect(created.error).toBeNull();
+  expect(created.workspace?.workspaceKind).toBe("worktree");
+  expect(created.workspace?.projectId).toBe(added.project!.projectId);
+}, 30_000);
diff --git a/packages/server/src/server/file-observer/index.test.ts b/packages/server/src/server/file-observer/index.test.ts
index 711b826348..95fe416c54 100644
--- a/packages/server/src/server/file-observer/index.test.ts
+++ b/packages/server/src/server/file-observer/index.test.ts
@@ -236,7 +236,8 @@ test("observes a thousand concurrent writes and remains healthy after delete and
   const deletions = expectFileChanges(removedPaths, "delete");
   const movedFiles = expectFileChanges(movedPaths);
   const recovery = expectFileChanges([sentinel]);
-  const subscription = await subscribeToFileChanges(root, (error, events) => {
+  const observer = createObserver();
+  const subscription = await observer.subscribe(root, (error, events) => {
     expect(error).toBeNull();
     for (const event of events) {
       population.record(event);
@@ -254,9 +255,18 @@ test("observes a thousand concurrent writes and remains healthy after delete and
   await Promise.all(paths.map((path, index) => writeFile(path, `${index}`)));
   await writes.complete;
 
-  // A native watcher may recover coalesced paths through its safety audit.
-  // Completion comes from the delivered deletions, not an idle diagnostic or
-  // a deadline shorter than that recovery cycle.
+  // The first notice for each write can arrive before its remaining
+  // classifications. Drain those deliveries before starting a separate deletion
+  // phase, so a late create cannot coalesce with the expected delete as update.
+  await expect
+    .poll(() => observer.getDiagnostics(), { timeout: 10_000 })
+    .toMatchObject({
+      pendingEventCount: 0,
+      pendingClassificationCount: 0,
+      reconciliationInFlightCount: 0,
+    });
+
+  // Completion still requires the delivered deletion notices.
   await Promise.all(removedPaths.map((path) => rm(path)));
   await deletions.complete;
 
diff --git a/packages/server/src/server/workspace-git-service.observation.integration.test.ts b/packages/server/src/server/workspace-git-service.observation.integration.test.ts
index a98dcda0fd..8ac1ef0018 100644
--- a/packages/server/src/server/workspace-git-service.observation.integration.test.ts
+++ b/packages/server/src/server/workspace-git-service.observation.integration.test.ts
@@ -63,6 +63,27 @@ afterEach(async () => {
   }
 });
 
+test("a fresh checkout read makes a newly initialized repository available to cached readers", async () => {
+  const root = realpathSync(mkdtempSync(path.join(tmpdir(), "paseo-checkout-init-")));
+  const repo = path.join(root, "repo");
+  mkdirSync(repo);
+  const service = new WorkspaceGitServiceImpl({
+    logger: pino({ enabled: false }),
+    paseoHome: path.join(root, "home"),
+  });
+  cleanup.push(async () => {
+    await service.dispose();
+    rmSync(root, { recursive: true, force: true });
+  });
+
+  expect((await service.getSnapshot(repo, { includeForge: false })).git.isGit).toBe(false);
+  execFileSync("git", ["init", "-b", "main"], { cwd: repo, stdio: "pipe" });
+
+  expect((await service.getCheckout(repo)).isGit).toBe(true);
+  const repoRoot = await service.resolveRepoRoot(repo);
+  expect(realpathSync.native(repoRoot)).toBe(realpathSync.native(repo));
+}, 30_000);
+
 test("recursive observation updates tracked state and prunes ignored storms", async () => {
   const tempDir = realpathSync(mkdtempSync(path.join(tmpdir(), "paseo-git-observation-")));
   const repoDir = path.join(tempDir, "repo");
diff --git a/packages/server/src/server/workspace-git-service.ts b/packages/server/src/server/workspace-git-service.ts
index 2f3483cb6f..a2b89bed39 100644
--- a/packages/server/src/server/workspace-git-service.ts
+++ b/packages/server/src/server/workspace-git-service.ts
@@ -765,6 +765,16 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
       worktreesRoot: this.worktreesRoot,
       logger: this.logger,
     });
+    const cached = this.peekSnapshot(normalizedCwd);
+    if (cached && cached.git.isGit !== status.isGit) {
+      // A fresh checkout read discovered a repository transition. Keep the
+      // shared snapshot current before exposing the new project capability.
+      await this.getSnapshot(normalizedCwd, {
+        force: true,
+        includeForge: false,
+        reason: "checkout-classification-changed",
+      });
+    }
     if (!status.isGit) {
       return checkoutLiteFromGitSnapshot(normalizedCwd, {
         isGit: false,

From 5805b776c2deaa745a2abe6590f12e25ddc1b9c2 Mon Sep 17 00:00:00 2001
From: Elowen <73627805+Mar-garet@users.noreply.github.com>
Date: Tue, 13 Oct 2026 21:52:54 +0800
Subject: [PATCH 138/270] fix(git): open commit diffs from subdirectory
 workspaces (#6801)

* fix(git): resolve commit file diffs from the worktree root

* test(git): cover commit diffs from nested workspaces through daemon RPC
---
 .../server/daemon-e2e/filesystem.e2e.test.ts  | 63 ++++++++++++++++++-
 packages/server/src/utils/checkout-git.ts     |  9 +--
 2 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
index 5a6187db71..7fee55e216 100644
--- a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
@@ -1,4 +1,4 @@
-import { describe, test, expect, beforeEach, afterEach } from "vitest";
+import { describe, test, expect, beforeEach, afterEach, onTestFinished } from "vitest";
 import {
   mkdtempSync,
   writeFileSync,
@@ -10,6 +10,7 @@ import {
 } from "fs";
 import { tmpdir } from "os";
 import path from "path";
+import { execFileSync } from "node:child_process";
 import { createDaemonTestContext, type DaemonTestContext } from "../test-utils/index.js";
 
 function tmpCwd(): string {
@@ -575,3 +576,63 @@ describe("file explorer", () => {
     rmSync(cwd, { recursive: true, force: true });
   }, 60000); // 1 minute timeout
 });
+
+describe("commit file diffs", () => {
+  test.each([".", "apps/web"])("opens committed files from %s workspaces", async (relativePath) => {
+    const cwd = tmpCwd();
+    onTestFinished(() =>
+      rmSync(cwd, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 }),
+    );
+    const workspace = path.join(cwd, relativePath);
+    const filePath = "apps/web/notes.txt";
+    function git(args: string[]): string {
+      return execFileSync("git", args, { cwd, encoding: "utf8" });
+    }
+    git(["init", "-b", "main"]);
+    git(["config", "user.name", "Test"]);
+    git(["config", "user.email", "test@example.com"]);
+    git(["config", "core.autocrlf", "false"]);
+    mkdirSync(path.join(cwd, "apps", "web"), { recursive: true });
+    writeFileSync(path.join(cwd, filePath), "before\n");
+    writeFileSync(path.join(cwd, "apps/web/untouched.txt"), "unchanged\n");
+    git(["add", "."]);
+    git(["-c", "commit.gpgsign=false", "commit", "-m", "initial"]);
+    git(["checkout", "-b", "feature"]);
+    writeFileSync(path.join(cwd, filePath), "after\n");
+    git(["add", "."]);
+    git(["-c", "commit.gpgsign=false", "commit", "-m", "edit"]);
+    const sha = git(["rev-parse", "HEAD"]).trim();
+
+    const history = await ctx.client.listCheckoutCommits(workspace);
+    const commit = history.commits.find((entry) => entry.sha === sha);
+    expect(commit?.files).toEqual([
+      { path: filePath, additions: 1, deletions: 1, status: "modified" },
+    ]);
+    const result = await ctx.client.getCommitFileDiff(workspace, sha, filePath);
+    expect(result).toEqual({
+      file: {
+        path: filePath,
+        isNew: false,
+        isDeleted: false,
+        additions: 1,
+        deletions: 1,
+        hunks: [
+          {
+            oldStart: 1,
+            oldCount: 1,
+            newStart: 1,
+            newCount: 1,
+            lines: [
+              { type: "header", content: "@@ -1 +1 @@" },
+              { type: "remove", content: "before" },
+              { type: "add", content: "after" },
+            ],
+          },
+        ],
+      },
+    });
+    expect(await ctx.client.getCommitFileDiff(workspace, sha, "apps/web/untouched.txt")).toEqual({
+      file: null,
+    });
+  });
+});
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index ee3571504d..caa7e65cb0 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -2665,10 +2665,11 @@ export async function getCommitFileDiff({
   sha: string;
   path: string;
 }): Promise<ParsedDiffFile | null> {
+  const worktreeRoot = await requireGitWorktreeRoot(cwd);
   const { stdout } = await runGitCommand(
     ["show", sha, "--format=", "--diff-merges=first-parent", ...GIT_PATCH_FORMAT_ARGS, "--", path],
     {
-      cwd,
+      cwd: worktreeRoot,
       envOverlay: READ_ONLY_GIT_ENV,
     },
   );
@@ -2677,9 +2678,9 @@ export async function getCommitFileDiff({
     return null;
   }
 
-  const parsedFiles = await parseAndHighlightDiff(stdout, cwd, {
-    getOldFileContent: (file) => readGitFileContentAtRef(cwd, `${sha}^`, file.path),
-    getNewFileContent: (file) => readGitFileContentAtRef(cwd, sha, file.path),
+  const parsedFiles = await parseAndHighlightDiff(stdout, worktreeRoot, {
+    getOldFileContent: (file) => readGitFileContentAtRef(worktreeRoot, `${sha}^`, file.path),
+    getNewFileContent: (file) => readGitFileContentAtRef(worktreeRoot, sha, file.path),
   });
 
   // `--` scopes the diff to a single pathspec, so there is at most one real

From 17562fcb665082b59b808b92b5c72e2d509eda52 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 18:16:33 +0200
Subject: [PATCH 139/270] fix(app): stop New workspace sending a mode the
 provider doesn't offer (#5847)

The New workspace screen submitted the composer's remembered mode as-is,
so a saved mode for a provider that offers no modes (or no longer offers
that one) failed creation with "Invalid mode '<mode>' for provider
'<provider>'". A new chat tab and the workspace setup dialog already
reconciled the mode against the provider's modes, each with its own copy
of the rule.

The draft composer state now exposes effectiveModeId, the mode the picker
shows, and all three create paths submit it. While the provider is still
loading, the selected mode is kept because its modes aren't known yet.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: Matt Cowger <matt@cowger.us>
---
 .../src/components/workspace-setup-dialog.tsx | 14 +----
 .../app/src/composer/draft/input-draft.ts     | 10 ++++
 .../app/src/composer/draft/workspace-tab.tsx  | 44 +++++----------
 .../provider-selection.test.ts                | 54 +++++++++++++++++++
 .../provider-selection/provider-selection.ts  | 17 ++++++
 .../app/src/screens/new-workspace-screen.tsx  |  6 +--
 6 files changed, 98 insertions(+), 47 deletions(-)

diff --git a/packages/app/src/components/workspace-setup-dialog.tsx b/packages/app/src/components/workspace-setup-dialog.tsx
index 1954394176..3a326aed3d 100644
--- a/packages/app/src/components/workspace-setup-dialog.tsx
+++ b/packages/app/src/components/workspace-setup-dialog.tsx
@@ -125,8 +125,7 @@ function buildCreateAgentOptions({
   provider,
 }: {
   composerState: {
-    modeOptions: { id: string }[];
-    selectedMode: string;
+    effectiveModeId: string;
     effectiveModelId: string | null;
     effectiveThinkingOptionId: string | null;
   };
@@ -137,20 +136,11 @@ function buildCreateAgentOptions({
   workspaceId: string;
   provider: CreateAgentRequestOptions["provider"];
 }): CreateAgentRequestOptions {
-  // Reconcile the selected mode against the discovered modes. The mode picker
-  // shows modeOptions[0] when the stored mode isn't in the list (e.g. a stale
-  // globally-remembered mode this workspace's provider config no longer
-  // defines), so the submitted mode must match that display rather than send a
-  // stale mode the provider would reject.
-  const modeOptionIds = composerState.modeOptions.map((mode) => mode.id);
-  const reconciledMode = modeOptionIds.includes(composerState.selectedMode)
-    ? composerState.selectedMode
-    : (modeOptionIds[0] ?? "");
   return {
     provider,
     cwd: workspaceDirectory,
     workspaceId,
-    ...(reconciledMode !== "" ? { modeId: reconciledMode } : {}),
+    ...(composerState.effectiveModeId ? { modeId: composerState.effectiveModeId } : {}),
     ...(composerState.effectiveModelId ? { model: composerState.effectiveModelId } : {}),
     ...(composerState.effectiveThinkingOptionId
       ? { thinkingOptionId: composerState.effectiveThinkingOptionId }
diff --git a/packages/app/src/composer/draft/input-draft.ts b/packages/app/src/composer/draft/input-draft.ts
index 7e6805b0b3..c64753694a 100644
--- a/packages/app/src/composer/draft/input-draft.ts
+++ b/packages/app/src/composer/draft/input-draft.ts
@@ -17,6 +17,7 @@ import {
 } from "@/composer/draft/input-draft-core";
 import {
   buildDraftCommandTarget,
+  resolveEffectiveComposerModeId,
   resolveEffectiveComposerModelId,
   resolveEffectiveComposerThinkingOptionId,
   type ProviderSelectionState,
@@ -46,6 +47,7 @@ interface UseAgentInputDraftInput {
 
 type DraftComposerState = UseAgentFormStateResult & {
   workingDir: string;
+  effectiveModeId: string;
   effectiveModelId: string;
   effectiveThinkingOptionId: string;
   featureValues: Record<string, unknown> | undefined;
@@ -256,6 +258,11 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
     ],
   );
 
+  const effectiveModeId = useMemo(
+    () => resolveEffectiveComposerModeId(providerSelection, formState.isModelLoading),
+    [formState.isModelLoading, providerSelection],
+  );
+
   const effectiveModelId = useMemo(
     () => resolveEffectiveComposerModelId(providerSelection),
     [providerSelection],
@@ -315,6 +322,7 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
     return {
       ...formState,
       workingDir,
+      effectiveModeId,
       effectiveModelId,
       effectiveThinkingOptionId,
       featureValues: draftFeatureValues,
@@ -329,6 +337,7 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
   }, [
     commandDraft,
     composerOptions,
+    effectiveModeId,
     effectiveModelId,
     effectiveThinkingOptionId,
     draftFeatures,
@@ -355,6 +364,7 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
 
 export const __private__ = {
   resolveDraftKey,
+  resolveEffectiveComposerModeId,
   resolveEffectiveComposerModelId,
   resolveEffectiveComposerThinkingOptionId,
   buildDraftCommandTarget,
diff --git a/packages/app/src/composer/draft/workspace-tab.tsx b/packages/app/src/composer/draft/workspace-tab.tsx
index 6e9c45eab5..4aa22a324d 100644
--- a/packages/app/src/composer/draft/workspace-tab.tsx
+++ b/packages/app/src/composer/draft/workspace-tab.tsx
@@ -86,46 +86,30 @@ function resolveAutoSubmitConfig(
   };
 }
 
-// Reconcile the form's selected mode against the currently discovered modes.
-// The mode picker displays modeOptions[0] when the stored mode isn't in the
-// list (e.g. a globally-remembered "plan" that this workspace's OpenCode config
-// no longer defines), so the submitted mode must match that display — otherwise
-// we'd send a stale mode the provider rejects while the UI showed a valid one.
-function reconcileSelectedMode(modeOptionIds: readonly string[], selectedMode: string): string {
-  if (modeOptionIds.length === 0) {
-    return "";
-  }
-  return modeOptionIds.includes(selectedMode) ? selectedMode : (modeOptionIds[0] ?? "");
-}
-
 function resolveDraftModeIdOverride(input: {
   autoSubmitConfig: AutoSubmitConfig | null;
-  modeOptionIds: readonly string[];
-  selectedMode: string;
+  effectiveModeId: string;
 }): { modeId: string } | Record<string, never> {
-  const { autoSubmitConfig, modeOptionIds, selectedMode } = input;
+  const { autoSubmitConfig, effectiveModeId } = input;
   if (autoSubmitConfig?.modeId) {
     return { modeId: autoSubmitConfig.modeId };
   }
-  const reconciled = reconcileSelectedMode(modeOptionIds, selectedMode);
-  if (reconciled !== "") {
-    return { modeId: reconciled };
+  if (effectiveModeId !== "") {
+    return { modeId: effectiveModeId };
   }
   return {};
 }
 
 function resolveDraftModeId(input: {
   autoSubmitConfig: AutoSubmitConfig | null;
-  modeOptionIds: readonly string[];
-  selectedMode: string;
+  effectiveModeId: string;
 }): string | null {
-  const { autoSubmitConfig, modeOptionIds, selectedMode } = input;
+  const { autoSubmitConfig, effectiveModeId } = input;
   if (autoSubmitConfig?.modeId !== undefined) {
     return autoSubmitConfig.modeId;
   }
-  const reconciled = reconcileSelectedMode(modeOptionIds, selectedMode);
-  if (reconciled !== "") {
-    return reconciled;
+  if (effectiveModeId !== "") {
+    return effectiveModeId;
   }
   return null;
 }
@@ -143,8 +127,7 @@ async function submitDraftCreateRequest(input: {
   autoSubmitConfig: AutoSubmitConfig | null;
   composerState: {
     selectedProvider: string | null;
-    selectedMode: string;
-    modeOptions: readonly { id: string }[];
+    effectiveModeId: string;
     effectiveModelId: string | null;
     effectiveThinkingOptionId: string | null;
     featureValues: Record<string, unknown> | undefined;
@@ -177,8 +160,7 @@ async function submitDraftCreateRequest(input: {
   }
   const modeIdOverride = resolveDraftModeIdOverride({
     autoSubmitConfig,
-    modeOptionIds: composerState.modeOptions.map((mode) => mode.id),
-    selectedMode: composerState.selectedMode,
+    effectiveModeId: composerState.effectiveModeId,
   });
   const config = buildWorkspaceDraftAgentConfig({
     provider,
@@ -219,8 +201,7 @@ function buildDraftAgentSnapshot(input: {
   composerState: {
     effectiveModelId: string | null;
     effectiveThinkingOptionId: string | null;
-    modeOptions: readonly { id: string }[];
-    selectedMode: string;
+    effectiveModeId: string;
     selectedProvider: string | null;
     agentControls: { features?: Agent["features"] };
   };
@@ -234,8 +215,7 @@ function buildDraftAgentSnapshot(input: {
     autoSubmitConfig?.thinkingOptionId ?? (composerState.effectiveThinkingOptionId || null);
   const modeId = resolveDraftModeId({
     autoSubmitConfig,
-    modeOptionIds: composerState.modeOptions.map((mode) => mode.id),
-    selectedMode: composerState.selectedMode,
+    effectiveModeId: composerState.effectiveModeId,
   });
   const provider = autoSubmitConfig?.provider ?? composerState.selectedProvider;
   if (!provider) {
diff --git a/packages/app/src/provider-selection/provider-selection.test.ts b/packages/app/src/provider-selection/provider-selection.test.ts
index 690bd439af..6c13ad3d83 100644
--- a/packages/app/src/provider-selection/provider-selection.test.ts
+++ b/packages/app/src/provider-selection/provider-selection.test.ts
@@ -9,6 +9,7 @@ import {
   buildSelectedTriggerLabel,
   filterAndRankModelRows,
   matchesModelSearch,
+  resolveEffectiveComposerModeId,
   resolveSelectedModelLabel,
   resolveSubmissionReadiness,
 } from "./provider-selection";
@@ -441,3 +442,56 @@ function getAllModelLabels(providers: ReturnType<typeof buildSelectableProviderS
       : [],
   );
 }
+
+describe("resolveEffectiveComposerModeId", () => {
+  const selection = {
+    provider: "pi",
+    modelId: "",
+    thinkingOptionId: "",
+    availableModels: [],
+  };
+
+  it("drops a remembered mode when the provider offers no modes", () => {
+    expect(
+      resolveEffectiveComposerModeId({ ...selection, modeId: "build", modeOptions: [] }, false),
+    ).toBe("");
+  });
+
+  it("submits the mode the picker shows when the remembered mode is not offered", () => {
+    expect(
+      resolveEffectiveComposerModeId(
+        {
+          ...selection,
+          modeId: "plan",
+          modeOptions: [
+            { id: "build", label: "Build" },
+            { id: "ask", label: "Ask" },
+          ],
+        },
+        false,
+      ),
+    ).toBe("build");
+  });
+
+  it("keeps a selected mode the provider offers", () => {
+    expect(
+      resolveEffectiveComposerModeId(
+        {
+          ...selection,
+          modeId: "ask",
+          modeOptions: [
+            { id: "build", label: "Build" },
+            { id: "ask", label: "Ask" },
+          ],
+        },
+        false,
+      ),
+    ).toBe("ask");
+  });
+
+  it("keeps the selected mode while the provider's modes are still loading", () => {
+    expect(
+      resolveEffectiveComposerModeId({ ...selection, modeId: "build", modeOptions: [] }, true),
+    ).toBe("build");
+  });
+});
diff --git a/packages/app/src/provider-selection/provider-selection.ts b/packages/app/src/provider-selection/provider-selection.ts
index ae00dd9528..f66a1b1476 100644
--- a/packages/app/src/provider-selection/provider-selection.ts
+++ b/packages/app/src/provider-selection/provider-selection.ts
@@ -272,6 +272,23 @@ export function resolveEffectiveComposerModelId(selection: ProviderSelectionStat
   );
 }
 
+// The mode picker shows the first offered mode when the selected one isn't
+// offered (e.g. a remembered mode the provider no longer advertises), so the
+// submitted mode must match that display. A provider with no modes gets none.
+// While the provider is still loading its modes aren't known yet, so the
+// selected mode is kept.
+export function resolveEffectiveComposerModeId(
+  selection: ProviderSelectionState,
+  isModelLoading: boolean,
+): string {
+  const selectedModeId = selection.modeId.trim();
+  if (isModelLoading) {
+    return selectedModeId;
+  }
+  const modeIds = selection.modeOptions.map((mode) => mode.id);
+  return modeIds.includes(selectedModeId) ? selectedModeId : (modeIds[0] ?? "");
+}
+
 export function resolveEffectiveComposerThinkingOptionId(
   selection: ProviderSelectionState,
   effectiveModelId: string,
diff --git a/packages/app/src/screens/new-workspace-screen.tsx b/packages/app/src/screens/new-workspace-screen.tsx
index 1cf8d76f23..39c414d9e7 100644
--- a/packages/app/src/screens/new-workspace-screen.tsx
+++ b/packages/app/src/screens/new-workspace-screen.tsx
@@ -891,7 +891,7 @@ function buildWorkspaceDraftSetupFromComposer(input: {
   return {
     provider: input.provider,
     cwd: input.cwd,
-    modeId: input.composerState.selectedMode || null,
+    modeId: input.composerState.effectiveModeId || null,
     model: input.composerState.effectiveModelId || null,
     thinkingOptionId: input.composerState.effectiveThinkingOptionId || null,
     featureValues: input.composerState.featureValues ?? {},
@@ -971,7 +971,7 @@ async function createWorkspaceChatAgent(input: CreateChatAgentInput): Promise<Su
     config: {
       provider,
       cwd,
-      modeId: composerState.selectedMode || undefined,
+      modeId: composerState.effectiveModeId || undefined,
       model: composerState.effectiveModelId || undefined,
       thinkingOptionId: composerState.effectiveThinkingOptionId || undefined,
       featureValues: composerState.featureValues,
@@ -1094,7 +1094,7 @@ function resolveWorkspaceDraftSubmissionConfig(input: {
   return {
     cwd: workspaceDirectory,
     provider,
-    modeId: composerState.selectedMode || null,
+    modeId: composerState.effectiveModeId || null,
     model: composerState.effectiveModelId || null,
     thinkingOptionId: composerState.effectiveThinkingOptionId || null,
     featureValues: composerState.featureValues,

From 335a11eb820d4d2e5cff6c1965c886bcf8ab519a Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 19:07:45 +0200
Subject: [PATCH 140/270] Reopen Codex chats containing U+2028 or U+2029 on
 Node 24 (#5999)

* fix(codex): split app-server stdout on newline only, not U+2028/U+2029

node:readline treats U+2028 and U+2029 as line terminators, but the Codex
app-server writes them raw inside JSON strings. Any message containing them
(e.g. tool output or code that mentions JS whitespace) was split into
fragments that failed JSON.parse and were dropped as "non-JSON stdout lines".

Dropped live events could leave an agent stuck in "running", and a
thread/resume response containing them never resolved, leaving the UI on
"Updating messages" indefinitely.

Replace readline with a newline-only line reader (StringDecoder for UTF-8
chunk boundaries) and add a regression test.

* fix(codex): read large app-server stdout lines in linear time

The newline-only stdout reader rescanned the whole accumulated line on
every chunk, so a multi-megabyte thread/resume response took seconds to
frame. Search only the newly decoded text and join the unterminated
parts once the line ends.

Co-authored-by: James Tsang <wtzeng1@gmail.com>

* test(codex): check the large chunked line without a wall-clock limit

Co-authored-by: bebeebebbebebbe <54549544+kotusenka@users.noreply.github.com>

---------

Co-authored-by: Graham <graham@eger.dev>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: James Tsang <wtzeng1@gmail.com>
Co-authored-by: bebeebebbebebbe <54549544+kotusenka@users.noreply.github.com>
---
 .../codex/app-server-transport.test.ts        | 38 ++++++++++++++++
 .../providers/codex/app-server-transport.ts   | 44 ++++++++++++++++---
 2 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/server/agent/providers/codex/app-server-transport.test.ts b/packages/server/src/server/agent/providers/codex/app-server-transport.test.ts
index 5c9dbe956c..cc32a3c013 100644
--- a/packages/server/src/server/agent/providers/codex/app-server-transport.test.ts
+++ b/packages/server/src/server/agent/providers/codex/app-server-transport.test.ts
@@ -22,6 +22,44 @@ describe("Codex app-server transport", () => {
     child.stdin.end();
   });
 
+  test("keeps a JSON message intact when it contains raw U+2028/U+2029", async () => {
+    const child = createCodexAppServerChildProcess();
+    const client = new CodexAppServerClient(child, createTestLogger());
+
+    const request = client.request("thread/resume", {});
+    const text = "a\u2028b\u2029c\u0085d";
+    // Codex does not escape U+2028/U+2029 in JSON output, so write them raw.
+    const message = `{"id":1,"result":{"text":"${text}"}}\n`;
+    const bytes = Buffer.from(message, "utf8");
+    // Split mid-way (inside a multi-byte character) to exercise chunk boundaries.
+    child.stdout.write(bytes.subarray(0, 28));
+    child.stdout.write(bytes.subarray(28));
+
+    await expect(request).resolves.toEqual({ text });
+    child.stdout.end();
+    child.stderr.end();
+    child.stdin.end();
+  });
+
+  test("reads a multi-megabyte JSON message arriving in 64 KB chunks", async () => {
+    const child = createCodexAppServerChildProcess();
+    const client = new CodexAppServerClient(child, createTestLogger());
+
+    const request = client.request("thread/resume", {});
+    // A resumed long thread arrives as one large line, split into 64 KB stdout chunks.
+    const text = "x".repeat(32 * 1024 * 1024);
+    const bytes = Buffer.from(`{"id":1,"result":{"text":"${text}"}}\n`, "utf8");
+    const chunkSize = 64 * 1024;
+    for (let offset = 0; offset < bytes.length; offset += chunkSize) {
+      child.stdout.write(bytes.subarray(offset, offset + chunkSize));
+    }
+
+    await expect(request).resolves.toEqual({ text });
+    child.stdout.end();
+    child.stderr.end();
+    child.stdin.end();
+  });
+
   test("dispose rejects pending requests instead of leaving them hanging", async () => {
     const child = createCodexAppServerChildProcess();
     const client = new CodexAppServerClient(child, createTestLogger());
diff --git a/packages/server/src/server/agent/providers/codex/app-server-transport.ts b/packages/server/src/server/agent/providers/codex/app-server-transport.ts
index 1720118c63..acb5e76341 100644
--- a/packages/server/src/server/agent/providers/codex/app-server-transport.ts
+++ b/packages/server/src/server/agent/providers/codex/app-server-transport.ts
@@ -1,5 +1,5 @@
 import type { ChildProcessWithoutNullStreams } from "node:child_process";
-import readline from "node:readline";
+import { StringDecoder } from "node:string_decoder";
 import type { Logger } from "pino";
 import { z } from "zod";
 
@@ -167,8 +167,41 @@ function readProviderTurnId(params: unknown): string | undefined {
   return isRecord(turn) && typeof turn.id === "string" ? turn.id : undefined;
 }
 
+/**
+ * Splits stdout into lines on "\n" only. `node:readline` additionally treats U+2028 and U+2029
+ * as line terminators, but Codex emits those characters raw inside JSON strings, so readline
+ * would cut a single JSON-RPC message into pieces that fail to parse.
+ */
+function createNewlineLineReader(
+  input: NodeJS.ReadableStream,
+  onLine: (line: string) => void,
+): { close(): void } {
+  const decoder = new StringDecoder("utf8");
+  // Text after the last "\n", kept as parts and joined once its line ends, so a large line
+  // arriving in many chunks is scanned and copied once instead of once per chunk.
+  let unterminated: string[] = [];
+  const onData = (chunk: Buffer | string): void => {
+    const text = typeof chunk === "string" ? chunk : decoder.write(chunk);
+    let lineStart = 0;
+    let index = text.indexOf("\n");
+    while (index !== -1) {
+      unterminated.push(text.slice(lineStart, index));
+      const line = unterminated.join("");
+      unterminated = [];
+      onLine(line.endsWith("\r") ? line.slice(0, -1) : line);
+      lineStart = index + 1;
+      index = text.indexOf("\n", lineStart);
+    }
+    if (lineStart < text.length) {
+      unterminated.push(text.slice(lineStart));
+    }
+  };
+  input.on("data", onData);
+  return { close: () => void input.off("data", onData) };
+}
+
 export class CodexAppServerClient {
-  private readonly rl: readline.Interface;
+  private readonly stdoutLineReader: { close(): void };
   private readonly pending = new Map<number, PendingRequest>();
   private readonly requestHandlers = new Map<string, RequestHandler>();
   private notificationHandler: NotificationHandler | null = null;
@@ -182,8 +215,7 @@ export class CodexAppServerClient {
     private readonly logger: Logger,
     private readonly getTraceContext: () => CodexAppServerTraceContext = () => ({}),
   ) {
-    this.rl = readline.createInterface({ input: child.stdout });
-    this.rl.on("line", (line) => {
+    this.stdoutLineReader = createNewlineLineReader(child.stdout, (line) => {
       void this.handleLine(line).catch((error) => {
         this.logger.warn({ error, line }, "Failed to handle Codex app-server stdout line");
       });
@@ -259,7 +291,7 @@ export class CodexAppServerClient {
   async dispose(): Promise<void> {
     this.disposed = true;
     this.unexpectedTerminationHandler = null;
-    this.rl.close();
+    this.stdoutLineReader.close();
     this.rejectPending(new Error("Codex app-server client is closed"));
     try {
       this.child.stdin.end();
@@ -286,7 +318,7 @@ export class CodexAppServerClient {
       return;
     }
     this.disposed = true;
-    this.rl.close();
+    this.stdoutLineReader.close();
     this.rejectPending(error);
     const handler = this.unexpectedTerminationHandler;
     this.unexpectedTerminationHandler = null;

From e135e9c101700b31671fc374325d17b608467a91 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 14 Oct 2026 00:20:10 +0700
Subject: [PATCH 141/270] Open files and subagents in a closable sheet on
 phones (#6827)

* feat(app): open files and subagents in a closable sheet on compact

On phones, opening a file, a provider subagent, or a Paseo subagent now shows it
in a bottom sheet over the current tab instead of adding a tab, so the tab strip
stays for terminals and root agents. Paseo subagents get "Open as tab" to move
the same tab (same tabId and state) into a full tab with a composer; agents in a
sheet hide the composer.

The decision lives in the workspace layout store's openTab, driven by a
per-kind `compactSheet` rule in the panel manifest, so every open path (chat
links, Explorer, subagents track, notifications, plugins) follows it without
call-site branching, and a new kind opts in with one manifest entry. The app
shell publishes the layout mode (compact / single-pane / split-panes) once, so
callers stop passing isCompact for placement.

A sheet holding unsaved edits is never implicitly displaced; later opens go to
tabs underneath, and closing it goes through the existing discard guard. The
editor host is position: sticky because CodeMirror's scrollIntoView otherwise
scrolls the bottom sheet's container and drags the sheet to full height.

* test(app): fail the compact sheet snap check when the sheet is oversized

---------

Co-authored-by: paseo-bot[bot] <paseo-bot[bot]@users.noreply.github.com>
---
 CLAUDE.md                                     |   2 +-
 docs/agent-lifecycle.md                       |   2 +-
 docs/explorer-sidebar.md                      |  23 +-
 docs/floating-panels.md                       |   4 +-
 docs/glossary.md                              |   1 +
 .../browser/compact-workspace-sheet.spec.ts   | 106 ++++
 packages/app/e2e/support/helpers/subagents.ts |  42 +-
 .../e2e/support/helpers/workspace-sheet.ts    |  94 +++
 packages/app/src/app/_layout.tsx              |   2 +
 .../app/src/file-pane/editor/view.web.tsx     |   5 +-
 packages/app/src/i18n/resources/ar.ts         |   3 +
 packages/app/src/i18n/resources/en.ts         |   3 +
 packages/app/src/i18n/resources/es.ts         |   3 +
 packages/app/src/i18n/resources/fr.ts         |   3 +
 packages/app/src/i18n/resources/ja.ts         |   3 +
 packages/app/src/i18n/resources/ko.ts         |   3 +
 packages/app/src/i18n/resources/pt-BR.ts      |   3 +
 packages/app/src/i18n/resources/ru.ts         |   3 +
 packages/app/src/i18n/resources/zh-CN.ts      |   3 +
 packages/app/src/panels/agent-panel.tsx       |   6 +-
 packages/app/src/panels/agent-tracks.tsx      |  50 +-
 .../src/panels/panel-instance-attributes.ts   |  15 +-
 .../app/src/panels/panel-manifest.test.ts     |   8 +
 packages/app/src/panels/panel-manifest.ts     |  57 +-
 .../src/plugins/workspace-panels/locations.ts |   2 +-
 .../workspace/visible-agent-ids.test.ts       |  22 +
 .../screens/workspace/visible-agent-ids.ts    |  17 +-
 .../screens/workspace/workspace-screen.tsx    | 114 +++-
 .../workspace/workspace-sheet-host.tsx        | 245 ++++++++
 .../src/stores/workspace-layout-store.test.ts | 583 +++++++++++++++++-
 .../app/src/stores/workspace-layout-store.ts  | 385 +++++++++++-
 .../app/src/workspace-tabs/compact-sheet.ts   |  38 ++
 .../workspace-tabs/layout-mode-publisher.tsx  |  21 +
 .../src/workspace-tabs/open-beside.test.ts    | 177 ++++++
 .../app/src/workspace-tabs/open-beside.ts     |  28 +-
 .../workspace-tabs/open-supporting-view.ts    |   2 -
 36 files changed, 1959 insertions(+), 119 deletions(-)
 create mode 100644 packages/app/e2e/browser/compact-workspace-sheet.spec.ts
 create mode 100644 packages/app/e2e/support/helpers/workspace-sheet.ts
 create mode 100644 packages/app/src/screens/workspace/workspace-sheet-host.tsx
 create mode 100644 packages/app/src/workspace-tabs/compact-sheet.ts
 create mode 100644 packages/app/src/workspace-tabs/layout-mode-publisher.tsx
 create mode 100644 packages/app/src/workspace-tabs/open-beside.test.ts

diff --git a/CLAUDE.md b/CLAUDE.md
index e1ac653338..7076471ff9 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -54,7 +54,7 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [docs/qa.md](docs/qa.md)                                             | QA evidence bar for pull requests — platform matrix, version drift, performance, UI proof                                      |
 | [docs/mobile-testing.md](docs/mobile-testing.md)                     | Maestro and mobile test workflows                                                                                              |
 | [docs/mobile-panels.md](docs/mobile-panels.md)                       | Compact left/center/right panel ownership, worklet motion, gesture revisions, and Fabric constraints                           |
-| [docs/explorer-sidebar.md](docs/explorer-sidebar.md)                 | Explorer sidebar and ordinary side-pane host contracts, lifecycle, placement, and routing preferences                          |
+| [docs/explorer-sidebar.md](docs/explorer-sidebar.md)                 | Explorer sidebar, side-pane, and compact workspace sheet host contracts, lifecycle, placement, routing preferences             |
 | [docs/ad-hoc-daemon-testing.md](docs/ad-hoc-daemon-testing.md)       | Isolated in-process daemon test harness                                                                                        |
 | [docs/browser-capture-harness.md](docs/browser-capture-harness.md)   | Real-Electron browser screenshot harness and compositor-surface gotcha                                                         |
 | [docs/android.md](docs/android.md)                                   | App variants, local/cloud builds, EAS workflows, version codes, F-Droid source builds and store metadata                       |
diff --git a/docs/agent-lifecycle.md b/docs/agent-lifecycle.md
index d699d8519a..f501538270 100644
--- a/docs/agent-lifecycle.md
+++ b/docs/agent-lifecycle.md
@@ -212,7 +212,7 @@ parentAgentId === thisAgent.id  AND  !archivedAt
 
 - **Provider subagents** are child executions owned by Claude, Codex, or OpenCode. They are not inserted into `AgentManager` as managed agents. Providers emit a separate descriptor and timeline stream through `agent.provider_subagents.*`; the client keeps that state outside the normal agent store and merges only the presentation rows into the track. A descriptor's optional `parentSubagentId` identifies its direct provider-subagent parent; an absent value identifies a direct child of the managed agent.
 
-Clicking either kind opens a workspace tab. A Paseo subagent tab is a normal interactive agent pane. A provider subagent tab is a read-only timeline pane with no composer, archive, detach, rewind, or fork actions. It shows its own direct children in a subagents track. Both panes use `AgentStreamView`, so message, reasoning, tool-call, and layout rendering stay identical.
+Clicking either kind opens a workspace tab. On compact layouts it opens in the [workspace sheet](explorer-sidebar.md#workspace-sheet) instead; the sheet hides the composer, and a Paseo subagent's sheet offers **Open as tab** to get it back. A Paseo subagent tab is a normal interactive agent pane. A provider subagent tab is a read-only timeline pane with no composer, archive, detach, rewind, or fork actions. It shows its own direct children in a subagents track. Both panes use `AgentStreamView`, so message, reasoning, tool-call, and layout rendering stay identical.
 
 Provider timelines use the same structural timeline item format but deliberately have a separate lifecycle and transport. A provider thread/session identifier is not a Paseo agent identifier, and closing its tab is always layout-only.
 
diff --git a/docs/explorer-sidebar.md b/docs/explorer-sidebar.md
index f1e27ac548..abd95fc35f 100644
--- a/docs/explorer-sidebar.md
+++ b/docs/explorer-sidebar.md
@@ -7,6 +7,7 @@ contracts.
 | ---------------- | ---------------------------- | ------------------------------------------ |
 | Explorer sidebar | Files and Changes navigation | Cmd+E shows or hides the dedicated dock    |
 | Side pane        | Ordinary workspace content   | Created and closed like any workspace pane |
+| Workspace sheet  | Compact look-ups             | Holds one tab; closes or becomes a tab     |
 
 ## Panel host contract
 
@@ -22,6 +23,24 @@ can move between Explorer and main panes.
 Keep panel implementations independent of either shell. `WorkspacePanelHost` owns mounting and
 retention, while each shell owns its tabs, focus, dragging, resizing, and shortcuts.
 
+## Workspace sheet
+
+On compact layouts, files and subagents open in a closable sheet over the workspace, so the tab
+switcher keeps only agents and terminals. A panel kind opts in with `compactSheet` in its manifest
+(`packages/app/src/panels/panel-manifest.ts`), and the layout store's `openTab` decides between
+sheet and tab, so callers open targets the same way on every layout. The sheet holds one ordinary
+`WorkspaceTab`, which is not persisted.
+
+The sheet is modal and covers the whole compact column, header included. It renders in the
+workspace tree rather than through `IsolatedBottomSheetModal`: its panel needs the navigator and
+every workspace provider an ordinary pane has, and a portal drops them
+([floating-panels.md Gotcha 7](floating-panels.md#gotcha-7--a-sheet-cannot-read-context-from-its-call-site)).
+
+A sheet holding unsaved work is never implicitly displaced; only its guarded close removes it.
+Moving its tab to another host remounts the panel, and the file editor keeps unsaved text in the
+mounted view, so the move would drop it. Widening the layout is the known exception: it still moves
+the sheet's tab into a pane, and edits the autosave has not started writing are lost.
+
 ## Explorer sidebar
 
 `packages/app/src/workspace-tabs/explorer-sidebar.ts` owns show, hide, toggle, and view selection.
@@ -62,7 +81,9 @@ lifecycle.
 
 `packages/app/src/workspace-tabs/open-beside.ts` owns content opened beside the user's work. The
 layout store remembers one ordinary pane per workspace. The first side open creates a full-height
-right split around the workspace root; later side opens reuse it.
+right split around the workspace root; later side opens reuse it. Only the `split-panes` layout
+mode opens beside. Compact and single-pane layouts (touch tablets) open the same target in the main
+pane, so callers never check whether splits render.
 
 Removing a pane clears its remembered id; a later side open creates a new pane. The last visible
 ordinary pane stays when its final tab closes and shows the New launcher. An empty workspace does
diff --git a/docs/floating-panels.md b/docs/floating-panels.md
index 0d3983c343..73df983a50 100644
--- a/docs/floating-panels.md
+++ b/docs/floating-panels.md
@@ -304,7 +304,9 @@ track phase.
 
 All sheets use the app-wide Gorhom modal provider through `IsolatedBottomSheetModal`. This
 includes native centered dialogs: separate React Native Modals cannot present a root-owned
-sibling dialog over an existing iOS presenter.
+sibling dialog over an existing iOS presenter. The one exception is the
+[workspace sheet](explorer-sidebar.md#workspace-sheet), an in-tree Gorhom `BottomSheet` that hosts a
+whole workspace panel.
 
 The wrapper must give Gorhom an object ref. Gorhom accepts a callback ref at the React boundary
 but stores it in the modal queue and later reads `.current`; provider dismissal, replacement,
diff --git a/docs/glossary.md b/docs/glossary.md
index 3ed97d1fc3..ac988e8d2b 100644
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -21,6 +21,7 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Repository / Remote** — Internal Git observations. They may produce mutable kind, branch, and project-grouping metadata but never the host-local project ID, root, display name, or workspace membership. No UI label.
 - **Sidebar items** — The configurable entries of the app sidebar, in two sections. Header: the rows at the head of the sidebar — New workspace, History, Search, Schedules, and plugin header items. Footer: the full-width rows between Add project and the footer icon row — Usage and plugin footer items. Add project and the icon row (Hosts, Help and support, Settings) are fixed and are not sidebar items. A plugin item may render several rows, such as one per bot; it is still one item that moves and hides as a block. Each section's order and visibility is one per-device preference (`AppSettings.sidebarNavItems`, `AppSettings.sidebarFooterItems`); every item may be off. UI: the Header and Footer cards on the Sidebar settings page. Code: `packages/app/src/sidebar-nav/model.ts` resolves a section, and the sidebar (`components/sidebar/sidebar-nav-rows.tsx`, the footer in `components/left-sidebar.tsx`) and the settings page (`screens/settings/sidebar/sidebar-nav-section.tsx`) read it through `useSidebarNavItems(section)`. Never hardcode one of these entries or add a second place that decides which ones show. Don't confuse with **Explorer sidebar**.
 - **Explorer sidebar** — The dedicated navigation dock containing the Files and Changes trees. UI: "Explorer sidebar". Code: `packages/app/src/workspace-tabs/explorer-sidebar.ts`; persisted pane identifiers retain the `explorer` spelling. See [explorer-sidebar.md](explorer-sidebar.md).
+- **Workspace sheet** — The compact sheet that holds one file or subagent tab over the workspace without adding it to the tab switcher. UI action: "Open as tab". Code: `sheetByWorkspace` in `packages/app/src/stores/workspace-layout-store.ts`, `WorkspaceSheetHost` (`packages/app/src/screens/workspace/workspace-sheet-host.tsx`). See [explorer-sidebar.md](explorer-sidebar.md#workspace-sheet).
 - **Side pane** — An ordinary right-side workspace pane used for content opened beside the user's work. It closes and participates in workspace splits like every other main-host pane. See [explorer-sidebar.md](explorer-sidebar.md#side-pane). Forbidden: "Side panel".
 - **Directory-backed surface** — A right-sidebar surface whose content is determined by the workspace's `cwd`, so two workspaces on the same directory see identical content: git diff/status, forge change-request info, file preview/explorer contents. Keyed by `(serverId, cwd)`, never `workspaceId`. See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
 - **Workspace-owned state** — Per-workspace state that never leaks to a same-`cwd` sibling: tabs, agents, terminals, panes, title, plus review drafts, diff-mode overrides, composer attachments, and file-explorer open/expand state. Keyed by `workspaceId` (`cwd` only as a fallback for old payloads). See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
diff --git a/packages/app/e2e/browser/compact-workspace-sheet.spec.ts b/packages/app/e2e/browser/compact-workspace-sheet.spec.ts
new file mode 100644
index 0000000000..474a498353
--- /dev/null
+++ b/packages/app/e2e/browser/compact-workspace-sheet.spec.ts
@@ -0,0 +1,106 @@
+import { readFile, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { expect, test } from "../support/fixtures";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { openSubagentFromCompactTrack, seedSubagent } from "../support/helpers/subagents";
+import {
+  closeWorkspaceSheet,
+  expectOpenTabCount,
+  openWorkspaceSheetAsTab,
+  expectDeclinedDiscardPrompt,
+  expectWorkspaceSheetAtSnap,
+  replaceWorkspaceSheetFileText,
+  selectTabFromSwitcher,
+  tapWorkspaceSheetBackdrop,
+  workspaceSheet,
+} from "../support/helpers/workspace-sheet";
+
+const FILE_LINK = "linked.ts:3";
+
+function promptMentioning(target: string): string {
+  return [
+    "Generate a title and a git branch name for a coding agent from the user prompt and attachments.",
+    "Return JSON only with fields 'title' and 'branch'.",
+    "",
+    "<user-prompt>",
+    `Open \`${target}\` now`,
+    "</user-prompt>",
+  ].join("\n");
+}
+
+test("compact opens files and subagents in a sheet, leaving the tabs for agents", async ({
+  page,
+}) => {
+  await page.setViewportSize({ width: 390, height: 844 });
+  const workspace = await seedMockAgentWorkspace({
+    repoPrefix: "compact-workspace-sheet-",
+    title: "Sheet parent",
+    initialPrompt: promptMentioning(FILE_LINK),
+  });
+  try {
+    const gate = await installDaemonWebSocketGate(page);
+    const linkedPath = path.join(workspace.cwd, "linked.ts");
+    await writeFile(linkedPath, "one\ntwo\nthree\n", "utf8");
+    const child = await seedSubagent(
+      { client: workspace.client, repoPath: workspace.cwd, workspaceId: workspace.workspaceId },
+      { parentId: workspace.agentId, title: "Sheet child" },
+    );
+    await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: workspace.agentId });
+    await expectOpenTabCount(page, 1);
+
+    await test.step("a chat file link opens the file in a sheet", async () => {
+      const fileLink = page.getByText(FILE_LINK, { exact: true });
+      await expect(fileLink).toBeVisible({ timeout: 15_000 });
+      await fileLink.click();
+
+      const sheet = workspaceSheet(page, "linked.ts");
+      await expect(sheet).toBeVisible();
+      await expect(sheet.getByText("three")).toBeVisible();
+      await expectWorkspaceSheetAtSnap(page, "linked.ts");
+      await expect(sheet.getByRole("button", { name: "Open as tab" })).toHaveCount(0);
+      await expectOpenTabCount(page, 1);
+      await closeWorkspaceSheet(page, "linked.ts");
+    });
+
+    await test.step("a subagent opens in a sheet without its composer", async () => {
+      await openSubagentFromCompactTrack(page, child.id);
+
+      const sheet = workspaceSheet(page, child.title);
+      await expect(sheet).toBeVisible();
+      await expectWorkspaceSheetAtSnap(page, child.title);
+      await expect(sheet.getByRole("textbox", { name: "Message agent..." })).toHaveCount(0);
+      await expectOpenTabCount(page, 1);
+    });
+
+    await test.step("Open as tab promotes the subagent to a full tab", async () => {
+      await openWorkspaceSheetAsTab(page, child.title);
+      await expectOpenTabCount(page, 2);
+      await expectComposerVisible(page);
+    });
+
+    await test.step("a sheet with unsaved edits closes only through the guarded close", async () => {
+      await selectTabFromSwitcher(page, "Sheet parent");
+      await page.getByText(FILE_LINK, { exact: true }).click();
+      const sheet = workspaceSheet(page, "linked.ts");
+      await expect(sheet).toBeVisible();
+      // Hold the autosave so the edit stays unsaved.
+      gate.holdNextClientRequest("fs.file.write.request");
+      await replaceWorkspaceSheetFileText(page, "linked.ts", "edited in the sheet");
+      await gate.waitForHeldClientRequest();
+
+      await expectDeclinedDiscardPrompt(page, () => tapWorkspaceSheetBackdrop(page));
+      await expect(sheet.locator(".cm-content")).toHaveText("edited in the sheet");
+      await expectDeclinedDiscardPrompt(page, () =>
+        sheet.getByRole("button", { name: "Close" }).click(),
+      );
+      await expect(sheet.locator(".cm-content")).toHaveText("edited in the sheet");
+
+      gate.releaseHeldClientRequest();
+      await expect.poll(() => readFile(linkedPath, "utf8")).toBe("edited in the sheet");
+    });
+  } finally {
+    await workspace.cleanup();
+  }
+});
diff --git a/packages/app/e2e/support/helpers/subagents.ts b/packages/app/e2e/support/helpers/subagents.ts
index d9c59e702e..f3a5ca7c71 100644
--- a/packages/app/e2e/support/helpers/subagents.ts
+++ b/packages/app/e2e/support/helpers/subagents.ts
@@ -49,31 +49,37 @@ export async function seedParentWithSubagent(
     modeId: "load-test",
     model: "ten-second-stream",
   });
-  const child = await workspace.client.createAgent({
-    provider: "mock",
-    cwd: workspace.repoPath,
-    workspaceId: workspace.workspaceId,
-    title: input.childTitle,
-    modeId: "load-test",
-    model: "ten-second-stream",
-    labels: {
-      [PARENT_AGENT_ID_LABEL]: parent.id,
-    },
-  });
+  const child = await seedSubagent(workspace, { parentId: parent.id, title: input.childTitle });
 
   return {
     parent: {
       id: parent.id,
       title: input.parentTitle,
     },
-    child: {
-      id: child.id,
-      title: input.childTitle,
-    },
+    child,
     workspaceId: workspace.workspaceId,
   };
 }
 
+/** Seeds an idle Paseo subagent of an existing agent in the same workspace. */
+export async function seedSubagent(
+  workspace: Pick<SeededWorkspace, "client" | "repoPath" | "workspaceId">,
+  input: { parentId: string; title: string },
+): Promise<{ id: string; title: string }> {
+  const child = await workspace.client.createAgent({
+    provider: "mock",
+    cwd: workspace.repoPath,
+    workspaceId: workspace.workspaceId,
+    title: input.title,
+    modeId: "load-test",
+    model: "ten-second-stream",
+    labels: {
+      [PARENT_AGENT_ID_LABEL]: input.parentId,
+    },
+  });
+  return { id: child.id, title: input.title };
+}
+
 export async function seedParentWithCrossWorkspaceSubagent(
   workspace: Pick<SeededWorkspace, "client" | "repoPath" | "workspaceId" | "projectId">,
   input: { parentTitle: string; childTitle: string },
@@ -141,6 +147,12 @@ export async function openSubagentsTrack(page: Page): Promise<void> {
   await expect(panel).toBeVisible({ timeout: 30_000 });
 }
 
+/** On compact the track opens as a sheet, which closes once a row is chosen. */
+export async function openSubagentFromCompactTrack(page: Page, childId: string): Promise<void> {
+  await page.getByTestId("subagents-track-header").click();
+  await page.getByTestId(`subagents-track-row-${childId}`).click();
+}
+
 export async function expectSubagentRowVisible(page: Page, childId: string): Promise<void> {
   await expect(page.getByTestId(`subagents-track-row-${childId}`)).toBeVisible({
     timeout: 30_000,
diff --git a/packages/app/e2e/support/helpers/workspace-sheet.ts b/packages/app/e2e/support/helpers/workspace-sheet.ts
new file mode 100644
index 0000000000..8865073c81
--- /dev/null
+++ b/packages/app/e2e/support/helpers/workspace-sheet.ts
@@ -0,0 +1,94 @@
+import { expect, type Locator, type Page } from "@playwright/test";
+
+/** The compact workspace sheet, named after the tab it hosts. */
+export function workspaceSheet(page: Page, label: string): Locator {
+  return page.getByRole("dialog", { name: label });
+}
+
+/** Sheet height as a fraction of the viewport; mirrors the host's 92% snap point. */
+const SHEET_SNAP_FRACTION = 0.92;
+/** The dialog starts below the sheet's drag handle. */
+const SHEET_HANDLE_MAX_HEIGHT = 32;
+
+/**
+ * The sheet rests at its snap point, docked to the bottom edge. A sheet pushed up past it
+ * covers the workspace header; a sheet sunk below it hides content.
+ */
+export async function expectWorkspaceSheetAtSnap(page: Page, label: string): Promise<void> {
+  const viewportHeight = page.viewportSize()?.height ?? 0;
+  const snapTop = Math.round(viewportHeight * (1 - SHEET_SNAP_FRACTION));
+  const sheet = workspaceSheet(page, label);
+  await expect
+    .poll(async () => {
+      const box = await sheet.boundingBox();
+      if (!box) return null;
+      const top = Math.round(box.y);
+      return {
+        dockedToBottom: Math.round(box.y + box.height) === viewportHeight,
+        topAtSnap: top >= snapTop && top <= snapTop + SHEET_HANDLE_MAX_HEIGHT,
+      };
+    })
+    .toEqual({ dockedToBottom: true, topAtSnap: true });
+}
+
+export async function expectOpenTabCount(page: Page, count: number): Promise<void> {
+  await expect(
+    page.getByRole("button", { name: `Switch tabs (${count} open)` }).filter({ visible: true }),
+  ).toBeVisible();
+}
+
+export async function closeWorkspaceSheet(page: Page, label: string): Promise<void> {
+  const sheet = workspaceSheet(page, label);
+  await sheet.getByRole("button", { name: "Close" }).click();
+  await expect(sheet).toHaveCount(0);
+}
+
+export async function openWorkspaceSheetAsTab(page: Page, label: string): Promise<void> {
+  const sheet = workspaceSheet(page, label);
+  await sheet.getByRole("button", { name: "Open as tab" }).click();
+  await expect(sheet).toHaveCount(0);
+}
+
+export async function replaceWorkspaceSheetFileText(
+  page: Page,
+  label: string,
+  content: string,
+): Promise<void> {
+  const editor = workspaceSheet(page, label)
+    .getByTestId("file-source-editor")
+    .locator(".cm-content");
+  await editor.click();
+  await editor.press("ControlOrMeta+A");
+  await editor.pressSequentially(content);
+}
+
+export async function selectTabFromSwitcher(page: Page, label: string): Promise<void> {
+  await page
+    .getByRole("button", { name: /Switch tabs/ })
+    .filter({ visible: true })
+    .click();
+  const option = page.getByText(label, { exact: true }).filter({ visible: true }).last();
+  await expect(option).toBeVisible();
+  await option.click();
+  await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+}
+
+export async function tapWorkspaceSheetBackdrop(page: Page): Promise<void> {
+  await page
+    .getByRole("button", { name: "Bottom sheet backdrop" })
+    .click({ position: { x: 10, y: 10 } });
+}
+
+/** Runs a close that hits the unsaved-changes guard, and declines the discard. */
+export async function expectDeclinedDiscardPrompt(
+  page: Page,
+  close: () => Promise<void>,
+): Promise<void> {
+  const prompt = page.waitForEvent("dialog").then(async (dialog) => {
+    const message = dialog.message();
+    await dialog.dismiss();
+    return message;
+  });
+  await close();
+  expect(await prompt).toContain("discard the draft");
+}
diff --git a/packages/app/src/app/_layout.tsx b/packages/app/src/app/_layout.tsx
index 869c93a0b2..72989bd83d 100644
--- a/packages/app/src/app/_layout.tsx
+++ b/packages/app/src/app/_layout.tsx
@@ -116,6 +116,7 @@ import { usePanelStore } from "@/stores/panel-store";
 import { flushDraftPersistStorage } from "@/stores/draft-store";
 import { getNextThemePreference, ICON_STROKE_WIDTH } from "@/styles/theme";
 import { useSessionStore } from "@/stores/session-store";
+import { WorkspaceLayoutModePublisher } from "@/workspace-tabs/layout-mode-publisher";
 import { installWebScrollbarStyles } from "@/styles/install-web-scrollbar-styles";
 import type { HostProfile } from "@/types/host-connection";
 import {
@@ -549,6 +550,7 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
   }
   const workspaceChrome = (
     <View style={rowStyle}>
+      <WorkspaceLayoutModePublisher />
       {!isCompactLayout ? (
         <WindowChromeRegion corners={appChromeLayout.sidebarCorners}>
           {themedSidebarChrome}
diff --git a/packages/app/src/file-pane/editor/view.web.tsx b/packages/app/src/file-pane/editor/view.web.tsx
index d396697c41..8b04590d28 100644
--- a/packages/app/src/file-pane/editor/view.web.tsx
+++ b/packages/app/src/file-pane/editor/view.web.tsx
@@ -165,4 +165,7 @@ const FRAME_STYLE = {
   minHeight: 0,
   minWidth: 0,
 } as const;
-const HOST_STYLE = { flex: 1, minHeight: 0, overflow: "hidden" } as const;
+// CodeMirror's scrollIntoView scrolls every overflowing ancestor and stops at a fixed or sticky
+// one. Sticky (with no offsets it lays out like relative) keeps line reveals inside the editor, so
+// they don't shift the host around it, such as the compact workspace sheet.
+const HOST_STYLE = { flex: 1, minHeight: 0, overflow: "hidden", position: "sticky" } as const;
diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index ca402264f2..5f00d8f70c 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -613,6 +613,9 @@ export const ar: TranslationResources = {
       updateHost: "حدّث المضيف لاستخدام عارض الطرفية الأصلي.",
       unableToSubscribe: "غير قادر على الاشتراك في المحطة",
     },
+    sheet: {
+      openAsTab: "فتح كعلامة تبويب",
+    },
     tabs: {
       loading: "تحميل...",
       modified: "تغييرات غير محفوظة",
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 92dbb3f78c..91e7e2c92f 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -610,6 +610,9 @@ export const en = {
       updateHost: "Update the host to use the native terminal renderer.",
       unableToSubscribe: "Unable to subscribe to terminal",
     },
+    sheet: {
+      openAsTab: "Open as tab",
+    },
     tabs: {
       loading: "Loading...",
       modified: "Unsaved changes",
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index bc53c8b2aa..6aff72fdd7 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -619,6 +619,9 @@ export const es: TranslationResources = {
       updateHost: "Actualiza el host para usar el renderizador de terminal nativo.",
       unableToSubscribe: "No se puede suscribir al terminal",
     },
+    sheet: {
+      openAsTab: "Abrir como pestaña",
+    },
     tabs: {
       loading: "Cargando...",
       modified: "Cambios sin guardar",
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index 78a9b2e82b..a4471f594c 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -618,6 +618,9 @@ export const fr: TranslationResources = {
       updateHost: "Mettez à jour l’hôte pour utiliser le rendu natif du terminal.",
       unableToSubscribe: "Impossible de s’abonner au terminal",
     },
+    sheet: {
+      openAsTab: "Ouvrir dans un onglet",
+    },
     tabs: {
       loading: "Chargement…",
       modified: "Modifications non enregistrées",
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index 9899d0ff2b..9cbc630da2 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -619,6 +619,9 @@ export const ja: TranslationResources = {
       updateHost: "ネイティブターミナルを使用するにはホストを更新してください。",
       unableToSubscribe: "ターミナルに接続できません",
     },
+    sheet: {
+      openAsTab: "タブで開く",
+    },
     tabs: {
       loading: "読み込み中...",
       modified: "未保存の変更",
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index c6a8f17b3c..98598d39dd 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -614,6 +614,9 @@ export const ko: TranslationResources = {
       updateHost: "기본 터미널 렌더러를 사용하도록 호스트를 업데이트합니다.",
       unableToSubscribe: "터미널을 구독할 수 없습니다",
     },
+    sheet: {
+      openAsTab: "탭으로 열기",
+    },
     tabs: {
       loading: "불러오는 중...",
       modified: "저장되지 않은 변경사항",
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index 66a25e9f03..c3ca4994d3 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -618,6 +618,9 @@ export const ptBR: TranslationResources = {
       updateHost: "Atualize o host para usar o renderizador de terminal nativo.",
       unableToSubscribe: "Não foi possível assinar o terminal",
     },
+    sheet: {
+      openAsTab: "Abrir como aba",
+    },
     tabs: {
       loading: "Carregando...",
       modified: "Alterações não salvas",
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index c06e53eda0..57616a22a7 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -620,6 +620,9 @@ export const ru: TranslationResources = {
       updateHost: "Обновите хост, чтобы использовать нативный рендерер терминала.",
       unableToSubscribe: "Не удалось подключиться к терминалу",
     },
+    sheet: {
+      openAsTab: "Открыть во вкладке",
+    },
     tabs: {
       loading: "Загрузка...",
       modified: "Несохранённые изменения",
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index 27a0d62ac1..99088e068a 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -613,6 +613,9 @@ export const zhCN: TranslationResources = {
       updateHost: "请更新主机以使用原生终端渲染器。",
       unableToSubscribe: "无法订阅 Terminal",
     },
+    sheet: {
+      openAsTab: "作为标签页打开",
+    },
     tabs: {
       loading: "正在加载...",
       modified: "未保存的更改",
diff --git a/packages/app/src/panels/agent-panel.tsx b/packages/app/src/panels/agent-panel.tsx
index 2d8a605c3f..bb51832aa0 100644
--- a/packages/app/src/panels/agent-panel.tsx
+++ b/packages/app/src/panels/agent-panel.tsx
@@ -1153,6 +1153,8 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   onOpenWorkspaceFile?: (request: WorkspaceFileOpenRequest) => void;
 }) {
   const { t } = useTranslation();
+  // The workspace sheet is for looking; Open as tab brings the agent back with its composer.
+  const showsComposer = usePaneContext().host !== "sheet";
   const subagentRows = useSubagentsForParent({ serverId, parentAgentId: agentId });
   const tasks = useSessionStore((state): TodoEntry[] | undefined =>
     state.sessions[serverId]?.agentTasks.get(agentId),
@@ -1216,7 +1218,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
       composerState,
     ],
   );
-  const composerSection = (
+  const composerSection = showsComposer ? (
     <RenderProfile id={`AgentComposerSection:${agentId}`}>
       <AgentComposerSection
         agentId={agentId}
@@ -1233,7 +1235,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
         onMessageSent={handleMessageSent}
       />
     </RenderProfile>
-  );
+  ) : null;
   const streamContent = (
     <View style={animatedStaticStyles.content}>
       <RenderProfile id={`AgentStreamSection:${agentId}`}>
diff --git a/packages/app/src/panels/agent-tracks.tsx b/packages/app/src/panels/agent-tracks.tsx
index 962e095b89..3e1634c113 100644
--- a/packages/app/src/panels/agent-tracks.tsx
+++ b/packages/app/src/panels/agent-tracks.tsx
@@ -3,7 +3,7 @@ import { WorkspaceDiffStatPill } from "@/composer/diff-stat-pill";
 import { useWorkspaceHasDiffStat } from "@/composer/workspace-diff-stat";
 import { AgentTaskList } from "@/composer/task-list";
 import { ComposerTrackBar } from "@/composer/tracks";
-import { supportsDesktopPaneSplits, useIsCompactFormFactor } from "@/constants/layout";
+import { useIsCompactFormFactor } from "@/constants/layout";
 import { usePaneContext } from "@/panels/pane-context";
 import { useSettings } from "@/hooks/use-settings";
 import { PluginComposerPills } from "@/plugins";
@@ -17,7 +17,7 @@ import {
 import { SubagentsTrack } from "@/subagents/track";
 import type { TodoEntry } from "@/types/stream";
 import { navigateToAgent } from "@/utils/navigate-to-agent";
-import { buildWorkspaceTabPersistenceKey } from "@/workspace-tabs/model";
+import { buildWorkspaceTabPersistenceKey, type WorkspaceTabTarget } from "@/workspace-tabs/model";
 import { openPreferredWorkspaceTarget } from "@/workspace-tabs/open-beside";
 import { openComposerChanges } from "@/workspace-tabs/open-supporting-view";
 
@@ -49,10 +49,9 @@ export const AgentTracks = memo(function AgentTracks({
   onArchiveFinished: () => void;
   hasPluginComposerPills: boolean;
 }): ReactElement | null {
-  const { tabId, openTab } = usePaneContext();
+  const { tabId } = usePaneContext();
   const hasWorkspaceDiffStat = useWorkspaceHasDiffStat(serverId, workspaceId);
   const isCompact = useIsCompactFormFactor();
-  const canSplit = supportsDesktopPaneSplits() && !isCompact;
   const openInSidePane = useSettings((settings) => settings.openInSidePane);
   const workspaceKey = buildWorkspaceTabPersistenceKey({ serverId, workspaceId });
   const canDetachSubagents = useSessionStore(
@@ -60,45 +59,36 @@ export const AgentTracks = memo(function AgentTracks({
   );
   const archiveSubagent = useArchiveSubagent({ serverId });
   const detachSubagent = useDetachSubagent({ serverId });
+  const openSubagentTarget = useCallback(
+    (target: WorkspaceTabTarget) => {
+      openPreferredWorkspaceTarget({
+        workspaceKey,
+        target,
+        source: "subagents",
+        preferences: openInSidePane,
+        parentTabId: tabId,
+      });
+    },
+    [openInSidePane, tabId, workspaceKey],
+  );
   const handleOpenSubagent = useCallback(
     (subagentId: string) => {
       const session = useSessionStore.getState().sessions[serverId];
       const agent = session?.agents.get(subagentId) ?? session?.agentDetails.get(subagentId);
+      // A subagent in another workspace lives in that workspace's tabs.
       if (agent?.workspaceId && agent.workspaceId !== workspaceId) {
         navigateToAgent({ serverId, agentId: subagentId });
         return;
       }
-      if (canSplit && workspaceKey) {
-        openPreferredWorkspaceTarget({
-          isCompact,
-          workspaceKey,
-          target: { kind: "agent", agentId: subagentId },
-          source: "subagents",
-          preferences: openInSidePane,
-          parentTabId: tabId,
-        });
-        return;
-      }
-      navigateToAgent({ serverId, agentId: subagentId });
+      openSubagentTarget({ kind: "agent", agentId: subagentId });
     },
-    [canSplit, isCompact, openInSidePane, serverId, tabId, workspaceId, workspaceKey],
+    [openSubagentTarget, serverId, workspaceId],
   );
   const handleOpenProviderSubagent = useCallback(
     (parentAgentId: string, subagentId: string) => {
-      if (canSplit && workspaceKey) {
-        openPreferredWorkspaceTarget({
-          isCompact,
-          workspaceKey,
-          target: { kind: "provider_subagent", parentAgentId, subagentId },
-          source: "subagents",
-          preferences: openInSidePane,
-          parentTabId: tabId,
-        });
-        return;
-      }
-      openTab({ kind: "provider_subagent", parentAgentId, subagentId });
+      openSubagentTarget({ kind: "provider_subagent", parentAgentId, subagentId });
     },
-    [canSplit, isCompact, openInSidePane, openTab, tabId, workspaceKey],
+    [openSubagentTarget],
   );
   const handleOpenChanges = useCallback(() => {
     if (!workspaceKey) {
diff --git a/packages/app/src/panels/panel-instance-attributes.ts b/packages/app/src/panels/panel-instance-attributes.ts
index 6ef49b0e4e..6fb414943c 100644
--- a/packages/app/src/panels/panel-instance-attributes.ts
+++ b/packages/app/src/panels/panel-instance-attributes.ts
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo, useSyncExternalStore } from "react";
 import { usePaneContext } from "@/panels/pane-context";
+import { buildWorkspaceTabPersistenceKey } from "@/workspace-tabs/model";
 
 export interface PanelInstanceIdentity {
   serverId: string;
@@ -18,8 +19,20 @@ const listenersByPanel = new Map<string, Set<() => void>>();
 const allListeners = new Set<() => void>();
 let attributesRevision = 0;
 
+function buildWorkspacePanelKey(workspaceKey: string, tabId: string): string {
+  return `${workspaceKey}:${tabId}`;
+}
+
 export function buildPanelInstanceKey(identity: PanelInstanceIdentity): string {
-  return `${identity.serverId}:${identity.workspaceId}:${identity.tabId}`;
+  return buildWorkspacePanelKey(buildWorkspaceTabPersistenceKey(identity) ?? "", identity.tabId);
+}
+
+/** Looks a panel up by the workspace key the layout store uses. */
+export function getWorkspacePanelAttributes(
+  workspaceKey: string,
+  tabId: string,
+): PanelInstanceAttributes {
+  return attributesByPanel.get(buildWorkspacePanelKey(workspaceKey, tabId)) ?? DEFAULT_ATTRIBUTES;
 }
 
 export function getPanelInstanceAttributes(
diff --git a/packages/app/src/panels/panel-manifest.test.ts b/packages/app/src/panels/panel-manifest.test.ts
index c06a87864d..0766003f84 100644
--- a/packages/app/src/panels/panel-manifest.test.ts
+++ b/packages/app/src/panels/panel-manifest.test.ts
@@ -18,6 +18,14 @@ describe("panel manifest", () => {
     expect(panelSupportsHost("setup", "explorer")).toBe(false);
   });
 
+  it("supports the sheet exactly for kinds with a compact sheet rule", () => {
+    expect(panelSupportsHost("file", "sheet")).toBe(true);
+    expect(panelSupportsHost("agent", "sheet")).toBe(true);
+    expect(panelSupportsHost("provider_subagent", "sheet")).toBe(true);
+    expect(panelSupportsHost("terminal", "sheet")).toBe(false);
+    expect(panelSupportsHost("plugin", "sheet")).toBe(false);
+  });
+
   it("lets navigation tabs hide their close button without losing their close action", () => {
     expect(getPanelManifest("files").showCloseButton).toBe(false);
     expect(getPanelManifest("changes_tree").showCloseButton).toBe(false);
diff --git a/packages/app/src/panels/panel-manifest.ts b/packages/app/src/panels/panel-manifest.ts
index 4122da80f1..90fdf1931e 100644
--- a/packages/app/src/panels/panel-manifest.ts
+++ b/packages/app/src/panels/panel-manifest.ts
@@ -1,12 +1,38 @@
 import type { WorkspaceTabTarget } from "@/workspace-tabs/model";
 
-export type PaneHost = "main" | "explorer";
+/** Where a tab renders: a split pane, the Explorer dock, or the compact workspace sheet. */
+export type PaneHost = "main" | "explorer" | "sheet";
+
+/** How a target behaves while it is shown in the compact workspace sheet. */
+export interface CompactSheetPolicy {
+  /** The sheet offers Open as tab, which moves the same tab into the focused pane. */
+  openAsTab: boolean;
+}
+
+/** Facts about a target that live outside the layout, resolved lazily by the workspace. */
+export interface PanelTargetFacts {
+  isWorkspaceRootAgent(agentId: string): boolean;
+}
+
+type CompactSheetRule<K extends WorkspaceTabTarget["kind"]> =
+  | CompactSheetPolicy
+  | null
+  | ((
+      target: Extract<WorkspaceTabTarget, { kind: K }>,
+      facts: PanelTargetFacts,
+    ) => CompactSheetPolicy | null);
 
 export interface PanelManifest<K extends WorkspaceTabTarget["kind"] = WorkspaceTabTarget["kind"]> {
   kind: K;
-  supportedHosts: readonly PaneHost[];
+  /** The sheet is never listed: a kind renders there exactly when it has a `compactSheet` rule. */
+  supportedHosts: readonly Exclude<PaneHost, "sheet">[];
   showCloseButton: boolean;
   singleton: boolean;
+  /**
+   * On compact layouts, revealing this target opens it in the workspace sheet over the current
+   * tab instead of adding a tab. `null` keeps it in the tab strip.
+   */
+  compactSheet: CompactSheetRule<K>;
   resourceKey(target: Extract<WorkspaceTabTarget, { kind: K }>): string;
 }
 
@@ -20,6 +46,7 @@ const manifests = {
     supportedHosts: ["main", "explorer"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: null,
     resourceKey: () => "new_tab",
   },
   draft: {
@@ -27,6 +54,7 @@ const manifests = {
     supportedHosts: ["main", "explorer"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: null,
     resourceKey: (target) => target.draftId,
   },
   agent: {
@@ -34,6 +62,8 @@ const manifests = {
     supportedHosts: ["main", "explorer"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: (target, facts) =>
+      facts.isWorkspaceRootAgent(target.agentId) ? null : { openAsTab: true },
     resourceKey: (target) => target.agentId,
   },
   provider_subagent: {
@@ -41,6 +71,7 @@ const manifests = {
     supportedHosts: ["main", "explorer"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: { openAsTab: false },
     resourceKey: (target) => `${target.parentAgentId}:${target.subagentId}`,
   },
   terminal: {
@@ -48,6 +79,7 @@ const manifests = {
     supportedHosts: ["main", "explorer"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: null,
     resourceKey: (target) => target.terminalId,
   },
   browser: {
@@ -55,6 +87,7 @@ const manifests = {
     supportedHosts: ["main"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: null,
     resourceKey: (target) => target.browserId,
   },
   changes_tree: {
@@ -62,6 +95,7 @@ const manifests = {
     supportedHosts: ["explorer"],
     showCloseButton: false,
     singleton: true,
+    compactSheet: null,
     resourceKey: () => "changes_tree",
   },
   files: {
@@ -69,6 +103,7 @@ const manifests = {
     supportedHosts: ["explorer"],
     showCloseButton: false,
     singleton: true,
+    compactSheet: null,
     resourceKey: () => "files",
   },
   pull_request: {
@@ -76,6 +111,7 @@ const manifests = {
     supportedHosts: ["main", "explorer"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: null,
     resourceKey: () => "pull_request",
   },
   file: {
@@ -83,6 +119,7 @@ const manifests = {
     supportedHosts: ["main", "explorer"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: { openAsTab: false },
     resourceKey: (target) => target.path,
   },
   working_diff: {
@@ -90,6 +127,7 @@ const manifests = {
     supportedHosts: ["main", "explorer"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: null,
     resourceKey: () => "working_diff",
   },
   plugin: {
@@ -98,6 +136,7 @@ const manifests = {
     supportedHosts: ["main", "explorer"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: null,
     resourceKey: (target) =>
       target.context === "agent"
         ? `${target.pluginId}:${target.panelId}:agent:${target.agentId}`
@@ -108,6 +147,7 @@ const manifests = {
     supportedHosts: ["main"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: null,
     resourceKey: (target) => target.workspaceId,
   },
   commit_diff: {
@@ -115,6 +155,7 @@ const manifests = {
     supportedHosts: ["main", "explorer"],
     showCloseButton: true,
     singleton: false,
+    compactSheet: null,
     resourceKey: (target) => target.sha,
   },
 } satisfies PanelManifestByKind;
@@ -124,7 +165,17 @@ export function getPanelManifest<K extends WorkspaceTabTarget["kind"]>(kind: K):
 }
 
 export function panelSupportsHost(kind: WorkspaceTabTarget["kind"], host: PaneHost): boolean {
-  return getPanelManifest(kind).supportedHosts.includes(host);
+  const manifest = getPanelManifest(kind);
+  if (host === "sheet") return manifest.compactSheet !== null;
+  return manifest.supportedHosts.includes(host);
+}
+
+export function panelCompactSheetPolicy(
+  target: WorkspaceTabTarget,
+  facts: PanelTargetFacts,
+): CompactSheetPolicy | null {
+  const rule = getPanelManifest(target.kind).compactSheet as CompactSheetRule<typeof target.kind>;
+  return typeof rule === "function" ? rule(target as never, facts) : rule;
 }
 
 export function panelCanLaunchInPane(
diff --git a/packages/app/src/plugins/workspace-panels/locations.ts b/packages/app/src/plugins/workspace-panels/locations.ts
index 1c8cfbfb90..5800aecf72 100644
--- a/packages/app/src/plugins/workspace-panels/locations.ts
+++ b/packages/app/src/plugins/workspace-panels/locations.ts
@@ -50,7 +50,7 @@ export function panelTargetSupportsHost(
   target: WorkspaceTabTarget,
   host: PaneHost,
 ): boolean {
-  if (target.kind !== "plugin") return panelSupportsHost(target.kind, host);
+  if (target.kind !== "plugin" || host === "sheet") return panelSupportsHost(target.kind, host);
   const panel = findPluginPanel(serverId, target);
   // Preserve a persisted unavailable panel where the user left it until its plugin loads again.
   if (!panel) return true;
diff --git a/packages/app/src/screens/workspace/visible-agent-ids.test.ts b/packages/app/src/screens/workspace/visible-agent-ids.test.ts
index 6620889475..d7b6f33a72 100644
--- a/packages/app/src/screens/workspace/visible-agent-ids.test.ts
+++ b/packages/app/src/screens/workspace/visible-agent-ids.test.ts
@@ -110,3 +110,25 @@ test("pane retargeting replaces the viewed agent and duplicate panes collapse to
     }),
   }).toEqual({ duplicate: ["agent-a"], retargeted: ["agent-a", "agent-b"] });
 });
+
+test("the agent shown in the workspace sheet is viewed alongside the pane under it", () => {
+  const layout: WorkspaceLayout = {
+    focusedPaneId: "main",
+    root: { kind: "pane", pane: { id: "main", tabIds: ["a"], focusedTabId: "a" } },
+  };
+  const tabs: WorkspaceTab[] = [
+    { tabId: "a", target: { kind: "agent", agentId: "agent-a" }, createdAt: 1 },
+  ];
+  const sheetTab: WorkspaceTab = {
+    tabId: "sheet",
+    target: { kind: "agent", agentId: "agent-child" },
+    createdAt: 2,
+  };
+
+  expect(
+    selectVisibleAgentIds({ layout, tabs, sheetTab, routeFocused: true, focusedPaneOnly: true }),
+  ).toEqual(["agent-a", "agent-child"]);
+  expect(
+    selectVisibleAgentIds({ layout, tabs, sheetTab, routeFocused: false, focusedPaneOnly: true }),
+  ).toEqual([]);
+});
diff --git a/packages/app/src/screens/workspace/visible-agent-ids.ts b/packages/app/src/screens/workspace/visible-agent-ids.ts
index 6fdd246a9b..324d4121c3 100644
--- a/packages/app/src/screens/workspace/visible-agent-ids.ts
+++ b/packages/app/src/screens/workspace/visible-agent-ids.ts
@@ -6,6 +6,8 @@ import { deriveWorkspacePaneState } from "./workspace-pane-state";
 export function selectVisibleAgentIds(input: {
   layout: WorkspaceLayout | null;
   tabs: WorkspaceTab[];
+  /** The workspace sheet's tab, shown over the panes. */
+  sheetTab?: WorkspaceTab | null;
   routeFocused: boolean;
   focusedPaneOnly: boolean;
 }): string[] {
@@ -16,20 +18,21 @@ export function selectVisibleAgentIds(input: {
     ? collectAllPanes(input.layout.root).filter((pane) => pane.id === input.layout?.focusedPaneId)
     : collectAllPanes(input.layout.root);
 
+  const targets = panes.flatMap((pane) => {
+    const target = deriveWorkspacePaneState({ pane, tabs: input.tabs }).activeTab?.descriptor
+      .target;
+    return target ? [target] : [];
+  });
+  if (input.sheetTab) targets.push(input.sheetTab.target);
   return [
-    ...new Set(
-      panes.flatMap((pane) => {
-        const target = deriveWorkspacePaneState({ pane, tabs: input.tabs }).activeTab?.descriptor
-          .target;
-        return target?.kind === "agent" ? [target.agentId] : [];
-      }),
-    ),
+    ...new Set(targets.flatMap((target) => (target.kind === "agent" ? [target.agentId] : []))),
   ].sort();
 }
 
 export function useVisibleAgentIds(input: {
   layout: WorkspaceLayout | null;
   tabs: WorkspaceTab[];
+  sheetTab: WorkspaceTab | null;
   routeFocused: boolean;
   focusedPaneOnly: boolean;
 }): string[] {
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index 55a186cbab..62c9ee4fa6 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -73,6 +73,7 @@ import {
   getFocusedBrowserId,
   FOCUSED_PANE_PLACEMENT,
   selectExplorerSidebarPaneId,
+  selectPaneFocusSuspended,
   type WorkspaceLayout,
   type WorkspaceTabPlacement,
   useWorkspaceLayoutStore,
@@ -160,6 +161,8 @@ import {
   type WorkspacePaneContentModel,
 } from "@/screens/workspace/workspace-pane-content";
 import { useMountedTabSet } from "@/screens/workspace/use-mounted-tab-set";
+import { WorkspaceSheetHost } from "@/screens/workspace/workspace-sheet-host";
+import type { PaneHost } from "@/panels/panel-manifest";
 import { WorkspaceFocusProvider } from "@/workspace/focus";
 import { DiffDocumentWorkspaceCacheProvider } from "@/git/diff-document/workspace-cache";
 import type { NewTabSelection } from "@/workspace-tabs/new-tab";
@@ -751,22 +754,20 @@ function WorkspaceContentProviders({
   );
 }
 
-function WorkspacePanelContent({
+function WorkspacePanelProviders({
   launcher,
-  content,
+  children,
   tabIds,
   workspaceKey,
 }: {
   workspaceKey: string;
   launcher: NewTabLauncher;
-  content: ReactNode;
+  children: ReactNode;
   tabIds: readonly string[];
 }) {
   return (
     <WorkspaceComposerEditingSessionsProvider workspaceKey={workspaceKey} tabIds={tabIds}>
-      <NewTabLauncherProvider value={launcher}>
-        <View style={styles.content}>{content}</View>
-      </NewTabLauncherProvider>
+      <NewTabLauncherProvider value={launcher}>{children}</NewTabLauncherProvider>
     </WorkspaceComposerEditingSessionsProvider>
   );
 }
@@ -1267,6 +1268,9 @@ function WorkspaceScreenContent({
   const explorerSidebarPaneId = useWorkspaceLayoutStore((state) =>
     persistenceKey ? selectExplorerSidebarPaneId(state, persistenceKey) : null,
   );
+  const paneFocusSuspended = useWorkspaceLayoutStore((state) =>
+    persistenceKey ? selectPaneFocusSuspended(state, persistenceKey) : false,
+  );
   const lastMainPaneRef = useLastMainPane({
     workspaceKey: persistenceKey,
     layout: workspaceLayout,
@@ -1305,6 +1309,9 @@ function WorkspaceScreenContent({
   const focusWorkspaceTab = useWorkspaceLayoutStore((state) => state.focusTab);
   const selectWorkspaceTabInPane = useWorkspaceLayoutStore((state) => state.selectTabInPane);
   const closeWorkspaceTab = useWorkspaceLayoutStore((state) => state.closeTab);
+  const sheetTab = useWorkspaceLayoutStore((state) =>
+    persistenceKey ? (state.sheetByWorkspace[persistenceKey]?.tab ?? null) : null,
+  );
   const unpinWorkspaceAgent = useWorkspaceLayoutStore((state) => state.unpinAgent);
   const hideWorkspaceAgent = useWorkspaceLayoutStore((state) => state.hideAgent);
   const setWorkspaceTabState = useWorkspaceLayoutStore((state) => state.setTabState);
@@ -1377,6 +1384,7 @@ function WorkspaceScreenContent({
   const visibleAgentIds = useVisibleAgentIds({
     layout: workspaceLayout,
     tabs: uiTabs,
+    sheetTab,
     routeFocused: isRouteFocused,
     focusedPaneOnly: syncFocusedPaneOnly,
   });
@@ -1678,7 +1686,6 @@ function WorkspaceScreenContent({
       }
 
       const tabId = openPreferredWorkspaceTarget({
-        isCompact: isMobile,
         workspaceKey: persistenceKey,
         target: createWorkspaceFileTabTarget(location),
         source: "chatFiles",
@@ -2062,6 +2069,12 @@ function WorkspaceScreenContent({
 
   const handleCloseTabById = useCallback(
     async (tabId: string) => {
+      if (persistenceKey && sheetTab?.tabId === tabId) {
+        if (await confirmDiscardModifiedTab(tabId)) {
+          closeWorkspaceTab(persistenceKey, tabId);
+        }
+        return;
+      }
       const tab = allTabDescriptorsById.get(tabId);
       if (!tab) {
         return;
@@ -2081,10 +2094,13 @@ function WorkspaceScreenContent({
     },
     [
       allTabDescriptorsById,
+      closeWorkspaceTab,
       confirmDiscardModifiedTab,
       handleCloseAgentTab,
       handleClosePassiveTab,
       handleCloseTerminalTab,
+      persistenceKey,
+      sheetTab,
     ],
   );
 
@@ -2918,17 +2934,19 @@ function WorkspaceScreenContent({
       tab: WorkspaceTabDescriptor;
       paneId?: string | null;
       focusPaneBeforeOpen?: boolean;
+      host?: PaneHost;
     }) =>
       buildWorkspacePaneContentModel({
         tab: input.tab,
         normalizedServerId,
         normalizedWorkspaceId,
         host:
-          canRenderDesktopPaneSplits &&
+          input.host ??
+          (canRenderDesktopPaneSplits &&
           input.paneId !== null &&
           input.paneId === explorerSidebarPaneId
             ? "explorer"
-            : "main",
+            : "main"),
         fileNavigationRevision: fileNavigationRevisionByTabId[input.tab.tabId] ?? 0,
         onOpenTab: (target) => {
           if (!persistenceKey) {
@@ -2947,7 +2965,6 @@ function WorkspaceScreenContent({
         onOpenPreferredTarget: (target, source) => {
           if (!persistenceKey) return;
           const tabId = openPreferredWorkspacePreview({
-            isCompact: isMobile,
             workspaceKey: persistenceKey,
             serverId: normalizedServerId,
             workspaceId: normalizedWorkspaceId,
@@ -3009,7 +3026,6 @@ function WorkspaceScreenContent({
       canRenderDesktopPaneSplits,
       openImportSheet,
       openInSidePane,
-      isMobile,
       requestFileNavigation,
       revealWorkspaceChildTab,
       persistenceKey,
@@ -3053,6 +3069,17 @@ function WorkspaceScreenContent({
     },
     [buildPaneContentModel],
   );
+  const buildSheetPaneContentModel = useCallback(
+    function buildSheetPaneContentModel(tab: WorkspaceTabDescriptor) {
+      return buildPaneContentModel({
+        tab,
+        paneId: null,
+        focusPaneBeforeOpen: false,
+        host: "sheet",
+      });
+    },
+    [buildPaneContentModel],
+  );
   const handleFocusPane = useStableEvent(function handleFocusPane(paneId: string) {
     if (!persistenceKey || paneFocusSuppressedRef.current) {
       return;
@@ -3068,7 +3095,8 @@ function WorkspaceScreenContent({
     focusedPaneTabDescriptorMap,
     isRouteFocused,
     focusedPaneId,
-    paneFocusSuspended: Boolean(unfocusedPaneId),
+    // The sheet owns input while it covers the tab.
+    paneFocusSuspended,
     onFocusPane: handleFocusPane,
     buildMobilePaneContentModel,
   });
@@ -3495,28 +3523,42 @@ function WorkspaceScreenContent({
   const desktopContent = desktopSplitContent ?? content;
   const rendersDesktopSplitContent = !isMobile && desktopSplitContent !== null;
 
-  const workspacePanelContent = (
-    <WorkspacePanelContent
-      launcher={newTabLauncher}
-      workspaceKey={`${normalizedServerId}:${normalizedWorkspaceId}`}
-      tabIds={uiTabs.map((tab) => tab.tabId)}
-      content={isMobile ? content : desktopContent}
-    />
+  const workspacePanelTabIds = useMemo(
+    () => [...uiTabs.map((tab) => tab.tabId), ...(sheetTab ? [sheetTab.tabId] : [])],
+    [uiTabs, sheetTab],
   );
+  const workspacePanelKey = `${normalizedServerId}:${normalizedWorkspaceId}`;
 
+  // The sheet is the column's last child, so it covers the compact header as a modal.
   const workspaceCenterColumn = isMobile ? (
-    <View style={styles.centerColumn}>
-      <FloatingHeaderLayout
-        header={compactWorkspaceHeader}
-        floating={floatsHeaderOverContent(activeTabDescriptor)}
-      >
-        {(topOverlayInset) => (
-          <StreamTopOverlayProvider value={topOverlayInset}>
-            {workspacePanelContent}
-          </StreamTopOverlayProvider>
-        )}
-      </FloatingHeaderLayout>
-    </View>
+    <WorkspacePanelProviders
+      launcher={newTabLauncher}
+      workspaceKey={workspacePanelKey}
+      tabIds={workspacePanelTabIds}
+    >
+      <View style={styles.centerColumn}>
+        <FloatingHeaderLayout
+          header={compactWorkspaceHeader}
+          floating={floatsHeaderOverContent(activeTabDescriptor)}
+        >
+          {(topOverlayInset) => (
+            <StreamTopOverlayProvider value={topOverlayInset}>
+              <View style={styles.content}>{content}</View>
+            </StreamTopOverlayProvider>
+          )}
+        </FloatingHeaderLayout>
+        <StreamTopOverlayProvider value={0}>
+          <WorkspaceSheetHost
+            workspaceKey={persistenceKey}
+            serverId={normalizedServerId}
+            workspaceId={normalizedWorkspaceId}
+            isWorkspaceFocused={isRouteFocused}
+            buildContent={buildSheetPaneContentModel}
+            onCloseTab={handleCloseTabById}
+          />
+        </StreamTopOverlayProvider>
+      </View>
+    </WorkspacePanelProviders>
   ) : (
     <View style={styles.centerColumn}>
       {rendersDesktopSplitContent ? null : renderWorkspaceScreenHeader()}
@@ -3549,7 +3591,15 @@ function WorkspaceScreenContent({
         </NewTabLauncherProvider>
       ) : null}
 
-      <View style={styles.centerContent}>{workspacePanelContent}</View>
+      <View style={styles.centerContent}>
+        <WorkspacePanelProviders
+          launcher={newTabLauncher}
+          workspaceKey={workspacePanelKey}
+          tabIds={workspacePanelTabIds}
+        >
+          <View style={styles.content}>{desktopContent}</View>
+        </WorkspacePanelProviders>
+      </View>
     </View>
   );
 
diff --git a/packages/app/src/screens/workspace/workspace-sheet-host.tsx b/packages/app/src/screens/workspace/workspace-sheet-host.tsx
new file mode 100644
index 0000000000..d44bdb6cc9
--- /dev/null
+++ b/packages/app/src/screens/workspace/workspace-sheet-host.tsx
@@ -0,0 +1,245 @@
+import BottomSheet, {
+  BottomSheetBackdrop,
+  type BottomSheetBackdropProps,
+} from "@gorhom/bottom-sheet";
+import { useIsFocused } from "@react-navigation/native";
+import { type ComponentType, useCallback, useEffect, useMemo, useRef } from "react";
+import { BackHandler, View } from "react-native";
+import { useTranslation } from "react-i18next";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { SheetHeaderView } from "@/components/adaptive-modal-sheet";
+import { Button } from "@/components/ui/button";
+import { isNative } from "@/constants/platform";
+import type { PanelIconProps } from "@/panels/panel-registry";
+import { getPanelRegistration } from "@/panels/panel-registry";
+import { ensurePanelsRegistered } from "@/panels/register-panels";
+import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
+import {
+  WorkspacePaneContent,
+  type WorkspacePaneContentModel,
+} from "@/screens/workspace/workspace-pane-content";
+import { useWorkspaceLayoutStore, type WorkspaceSheet } from "@/stores/workspace-layout-store";
+
+const SNAP_POINTS = ["92%"];
+
+const ThemedBottomSheet = withUnistyles(BottomSheet, (theme) => ({
+  backgroundStyle: {
+    backgroundColor: theme.colors.surface0,
+    borderTopLeftRadius: theme.borderRadius["2xl"],
+    borderTopRightRadius: theme.borderRadius["2xl"],
+  },
+  handleIndicatorStyle: {
+    backgroundColor: theme.colors.palette.zinc[600],
+  },
+}));
+
+function PanelIcon({
+  icon: Icon,
+  size,
+  color,
+}: { icon: ComponentType<PanelIconProps> } & PanelIconProps) {
+  return <Icon size={size} color={color} />;
+}
+
+const ThemedPanelIcon = withUnistyles(PanelIcon, (theme) => ({
+  color: theme.colors.foregroundMuted,
+}));
+
+function renderBackdrop(props: BottomSheetBackdropProps) {
+  return (
+    <BottomSheetBackdrop
+      {...props}
+      appearsOnIndex={0}
+      disappearsOnIndex={-1}
+      opacity={0.45}
+      pressBehavior="close"
+    />
+  );
+}
+
+export interface WorkspaceSheetHostProps {
+  workspaceKey: string | null;
+  serverId: string;
+  workspaceId: string;
+  isWorkspaceFocused: boolean;
+  buildContent: (tab: WorkspaceTabDescriptor) => WorkspacePaneContentModel;
+  /** The workspace's ordinary tab close, including its unsaved-changes guard. */
+  onCloseTab: (tabId: string) => Promise<void>;
+}
+
+interface WorkspaceSheetPresentationProps extends Omit<
+  WorkspaceSheetHostProps,
+  "workspaceKey" | "onCloseTab"
+> {
+  sheet: WorkspaceSheet;
+  onClose: () => Promise<void>;
+  onOpenAsTab: () => void;
+}
+
+/**
+ * Hosts the workspace's sheet tab over the compact tab strip. It renders in the workspace tree,
+ * not through a portal, so the panel keeps every context an ordinary pane has.
+ */
+export function WorkspaceSheetHost({ workspaceKey, onCloseTab, ...rest }: WorkspaceSheetHostProps) {
+  const sheet = useWorkspaceLayoutStore((state) =>
+    workspaceKey ? (state.sheetByWorkspace[workspaceKey] ?? null) : null,
+  );
+  const openSheetAsTab = useWorkspaceLayoutStore((state) => state.openSheetAsTab);
+  const sheetTabId = sheet?.tab.tabId ?? null;
+  const handleClose = useCallback(async () => {
+    if (sheetTabId) await onCloseTab(sheetTabId);
+  }, [onCloseTab, sheetTabId]);
+  const handleOpenAsTab = useCallback(() => {
+    if (workspaceKey) openSheetAsTab(workspaceKey);
+  }, [openSheetAsTab, workspaceKey]);
+  if (!sheet) return null;
+  return (
+    <WorkspaceSheetPresentation
+      {...rest}
+      sheet={sheet}
+      onClose={handleClose}
+      onOpenAsTab={handleOpenAsTab}
+    />
+  );
+}
+
+function WorkspaceSheetPresentation({
+  sheet,
+  serverId,
+  workspaceId,
+  isWorkspaceFocused,
+  buildContent,
+  onClose,
+  onOpenAsTab,
+}: WorkspaceSheetPresentationProps) {
+  const sheetRef = useRef<BottomSheet>(null);
+  const isScreenFocused = useIsFocused();
+  const ownsBackPress = isNative && isWorkspaceFocused && isScreenFocused;
+  const handleChange = useCallback(
+    (index: number) => {
+      if (index !== -1) return;
+      // A declined close (unsaved changes) leaves the tab in the sheet, so bring it back up.
+      void onClose().then(() => sheetRef.current?.snapToIndex(0));
+    },
+    [onClose],
+  );
+  useEffect(() => {
+    // Hidden workspaces stay mounted in the deck and under Settings; only the visible one owns back.
+    if (!ownsBackPress) return;
+    const subscription = BackHandler.addEventListener("hardwareBackPress", () => {
+      void onClose();
+      return true;
+    });
+    return () => subscription.remove();
+  }, [onClose, ownsBackPress]);
+
+  return (
+    <View style={styles.host} pointerEvents="box-none">
+      <ThemedBottomSheet
+        ref={sheetRef}
+        index={0}
+        snapPoints={SNAP_POINTS}
+        enableDynamicSizing={false}
+        enablePanDownToClose
+        enableContentPanningGesture={false}
+        backdropComponent={renderBackdrop}
+        onChange={handleChange}
+      >
+        <WorkspaceSheetBody
+          key={`${sheet.tab.tabId}:${sheet.tab.target.kind}`}
+          sheet={sheet}
+          serverId={serverId}
+          workspaceId={workspaceId}
+          isWorkspaceFocused={isWorkspaceFocused}
+          buildContent={buildContent}
+          onClose={onClose}
+          onOpenAsTab={onOpenAsTab}
+        />
+      </ThemedBottomSheet>
+    </View>
+  );
+}
+
+function WorkspaceSheetBody({
+  sheet,
+  serverId,
+  workspaceId,
+  isWorkspaceFocused,
+  buildContent,
+  onClose,
+  onOpenAsTab,
+}: WorkspaceSheetPresentationProps) {
+  const { t } = useTranslation();
+  const { tab } = sheet;
+  ensurePanelsRegistered();
+  const registration = getPanelRegistration(tab.target.kind);
+  if (!registration) {
+    throw new Error(`No panel registration for kind: ${tab.target.kind}`);
+  }
+  // The body is keyed by tab id and kind, so the registration and its descriptor hook stay fixed.
+  const descriptor = registration.useDescriptor(tab.target as never, {
+    serverId,
+    workspaceId,
+    tabId: tab.tabId,
+  });
+  const tabDescriptor = useMemo<WorkspaceTabDescriptor>(
+    () => ({
+      key: tab.tabId,
+      tabId: tab.tabId,
+      kind: tab.target.kind,
+      target: tab.target,
+      state: tab.state,
+    }),
+    [tab],
+  );
+  const content = useMemo(() => buildContent(tabDescriptor), [buildContent, tabDescriptor]);
+  const handleClose = useCallback(() => {
+    void onClose();
+  }, [onClose]);
+  // The sheet reaches the bottom of the screen, so it owns the system navigation inset.
+  const { bottom: bottomInset } = useSafeAreaInsets();
+  const contentStyle = useMemo(
+    () => [styles.content, { paddingBottom: bottomInset }],
+    [bottomInset],
+  );
+  const header = useMemo(
+    () => ({
+      title: descriptor.label,
+      leading: <ThemedPanelIcon icon={descriptor.icon} size={16} />,
+      actions: sheet.policy.openAsTab ? (
+        <Button size="sm" variant="secondary" onPress={onOpenAsTab}>
+          {t("workspace.sheet.openAsTab")}
+        </Button>
+      ) : undefined,
+    }),
+    [descriptor.icon, descriptor.label, onOpenAsTab, sheet.policy.openAsTab, t],
+  );
+
+  return (
+    <View style={styles.body} role="dialog" aria-label={descriptor.label}>
+      <SheetHeaderView header={header} onClose={handleClose} />
+      <View style={contentStyle}>
+        <WorkspacePaneContent
+          content={content}
+          isWorkspaceFocused={isWorkspaceFocused}
+          isPaneFocused={isWorkspaceFocused}
+        />
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  host: {
+    ...StyleSheet.absoluteFillObject,
+  },
+  body: {
+    flex: 1,
+    minHeight: 0,
+  },
+  content: {
+    flex: 1,
+    minHeight: 0,
+  },
+});
diff --git a/packages/app/src/stores/workspace-layout-store.test.ts b/packages/app/src/stores/workspace-layout-store.test.ts
index d1a4768cb5..8c061d18b3 100644
--- a/packages/app/src/stores/workspace-layout-store.test.ts
+++ b/packages/app/src/stores/workspace-layout-store.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 vi.mock("@react-native-async-storage/async-storage", () => {
   const storage = new Map<string, string>();
@@ -16,6 +16,9 @@ vi.mock("@react-native-async-storage/async-storage", () => {
 });
 
 import AsyncStorage from "@react-native-async-storage/async-storage";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { useSessionStore, type Agent } from "@/stores/session-store";
+import { setPanelInstanceAttributes } from "@/panels/panel-instance-attributes";
 import { createViewedTimelineSync } from "@/timeline/viewed-timeline-sync";
 import { buildWorkspaceTabPersistenceKey, type WorkspaceTab } from "@/workspace-tabs/model";
 import { defaultChangesState, type ChangesState } from "@/panels/changes/state";
@@ -24,6 +27,7 @@ import {
   canDismissPaneInLayout,
   collectAllPanes,
   collectAllTabs,
+  selectPaneFocusSuspended,
   createWorkspaceLayoutStore,
   observeOpenWorkspaceAgentIds,
   createDefaultLayout,
@@ -4438,3 +4442,580 @@ it("persists the once-only PR add after closing, and clears it when purging the
   expect(restored.getState().pullRequestTabAutoOpenedByWorkspace[workspaceKey]).toBeUndefined();
   expect(restored.getState().autoOpenPullRequestTab(workspaceKey, placement)).toBe("pull_request");
 });
+
+describe("compact workspace sheet", () => {
+  const workspaceKey = "server-1:sheet-ws";
+  const fileTarget = { kind: "file" as const, path: "src/index.ts" };
+
+  function createCompactStore() {
+    const store = createWorkspaceLayoutStore(workspaceLayoutIds);
+    store.setState({ layoutByWorkspace: {}, sheetByWorkspace: {} });
+    store.getState().setLayoutMode("compact");
+    store.getState().openTab({
+      workspaceKey,
+      target: { kind: "terminal", terminalId: "term-1" },
+      intent: "reveal",
+    });
+    return store;
+  }
+
+  function tabKinds(store: ReturnType<typeof createCompactStore>): string[] {
+    const layout = store.getState().layoutByWorkspace[workspaceKey];
+    const tabsById = new Map(collectAllTabs(layout.root).map((tab) => [tab.tabId, tab]));
+    return (findPaneById(layout.root, "main")?.tabIds ?? []).map(
+      (tabId) => tabsById.get(tabId)?.target.kind ?? "missing",
+    );
+  }
+
+  function seedAgents(agents: Array<Pick<Agent, "id" | "parentAgentId" | "workspaceId">>): void {
+    const timestamp = new Date("2026-04-21T10:00:00.000Z");
+    useSessionStore.getState().initializeSession("server-1", null as unknown as DaemonClient);
+    useSessionStore.getState().setAgents(
+      "server-1",
+      new Map(
+        agents.map((agent) => [
+          agent.id,
+          {
+            serverId: "server-1",
+            provider: "codex",
+            status: "idle",
+            turn: { phase: "idle", cancellationRequestId: null },
+            createdAt: timestamp,
+            updatedAt: timestamp,
+            lastUserMessageAt: null,
+            lastActivityAt: timestamp,
+            capabilities: {
+              supportsStreaming: true,
+              supportsSessionPersistence: true,
+              supportsDynamicModes: true,
+              supportsMcpServers: true,
+              supportsReasoningStream: true,
+              supportsToolInvocations: true,
+            },
+            currentModeId: null,
+            availableModes: [],
+            pendingPermissions: [],
+            persistence: null,
+            runtimeInfo: undefined,
+            lastUsage: undefined,
+            lastError: null,
+            title: agent.id,
+            cwd: "/repo",
+            model: null,
+            features: undefined,
+            thinkingOptionId: undefined,
+            requiresAttention: false,
+            attentionReason: null,
+            attentionTimestamp: null,
+            archivedAt: null,
+            labels: {},
+            projectPlacement: null,
+            ...agent,
+          } satisfies Agent,
+        ]),
+      ),
+    );
+  }
+
+  it("reveals a file in the sheet and leaves the tab strip unchanged", () => {
+    const store = createCompactStore();
+    const before = tabKinds(store);
+
+    const tabId = store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+
+    expect(store.getState().sheetByWorkspace[workspaceKey]?.tab).toEqual({
+      tabId,
+      target: fileTarget,
+      createdAt: expect.any(Number),
+    });
+    expect(tabKinds(store)).toEqual(before);
+  });
+
+  it("focuses a target that is already open as a tab instead of using the sheet", () => {
+    const store = createCompactStore();
+    store.getState().setLayoutMode("split-panes");
+    const fileTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+    store.getState().openTab({
+      workspaceKey,
+      target: { kind: "terminal", terminalId: "term-1" },
+      intent: "reveal",
+    });
+    store.getState().setLayoutMode("compact");
+
+    const tabId = store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+
+    expect(tabId).toBe(fileTabId);
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    const layout = store.getState().layoutByWorkspace[workspaceKey];
+    expect(findPaneContainingTab(layout.root, fileTabId ?? "")?.focusedTabId).toBe(fileTabId);
+  });
+
+  it("replaces the sheet content with the next sheet target", () => {
+    const store = createCompactStore();
+    store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+
+    const nextTarget = { kind: "file" as const, path: "src/other.ts" };
+    store.getState().openTab({ workspaceKey, target: nextTarget, intent: "reveal" });
+
+    expect(store.getState().sheetByWorkspace[workspaceKey]?.tab.target).toEqual(nextTarget);
+    expect(tabKinds(store)).toEqual(["terminal"]);
+  });
+
+  it("closes the sheet when a tab target is revealed, and keeps it for background opens", () => {
+    const store = createCompactStore();
+    store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+
+    store.getState().openTab({
+      workspaceKey,
+      target: { kind: "file", path: "src/background.ts" },
+      intent: "background",
+    });
+    expect(store.getState().sheetByWorkspace[workspaceKey]?.tab.target).toEqual(fileTarget);
+    expect(tabKinds(store)).toEqual(["terminal", "file"]);
+
+    store.getState().openTab({
+      workspaceKey,
+      target: { kind: "terminal", terminalId: "term-2" },
+      intent: "reveal",
+    });
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+  });
+
+  it("moves the sheet tab into the focused pane with the same tab id and state", () => {
+    const store = createCompactStore();
+    const sheetTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+    if (!sheetTabId) throw new Error("Expected a sheet tab");
+    store.getState().setTabState(workspaceKey, sheetTabId, { scrollTop: 120 });
+
+    const tabId = store.getState().openSheetAsTab(workspaceKey);
+
+    expect(tabId).toBe(sheetTabId);
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    const layout = store.getState().layoutByWorkspace[workspaceKey];
+    const pane = findPaneContainingTab(layout.root, sheetTabId);
+    expect(pane?.id).toBe(layout.focusedPaneId);
+    expect(pane?.focusedTabId).toBe(sheetTabId);
+    expect(collectAllTabs(layout.root).find((tab) => tab.tabId === sheetTabId)?.state).toEqual({
+      scrollTop: 120,
+    });
+  });
+
+  it("closes the sheet through the ordinary close and ignores focus requests for it", () => {
+    const store = createCompactStore();
+    const sheetTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+    if (!sheetTabId) throw new Error("Expected a sheet tab");
+    const layoutBefore = store.getState().layoutByWorkspace[workspaceKey];
+
+    store.getState().focusTab(workspaceKey, sheetTabId);
+    expect(store.getState().layoutByWorkspace[workspaceKey]).toBe(layoutBefore);
+
+    store.getState().closeTab(workspaceKey, sheetTabId);
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(tabKinds(store)).toEqual(["terminal"]);
+  });
+
+  it("suspends pane focus while the sheet covers the panes", () => {
+    const store = createCompactStore();
+    expect(selectPaneFocusSuspended(store.getState(), workspaceKey)).toBe(false);
+
+    const sheetTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+    expect(selectPaneFocusSuspended(store.getState(), workspaceKey)).toBe(true);
+
+    store.getState().closeTab(workspaceKey, sheetTabId ?? "");
+    expect(selectPaneFocusSuspended(store.getState(), workspaceKey)).toBe(false);
+  });
+
+  it("never uses the sheet on wide layouts", () => {
+    const store = createCompactStore();
+    store.getState().setLayoutMode("split-panes");
+
+    store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+
+    expect(store.getState().sheetByWorkspace).toEqual({});
+    expect(tabKinds(store)).toEqual(["terminal", "file"]);
+  });
+
+  it("keeps the sheet content as a tab when the layout widens", () => {
+    const store = createCompactStore();
+    const sheetTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+
+    store.getState().setLayoutMode("split-panes");
+
+    expect(store.getState().sheetByWorkspace).toEqual({});
+    const layout = store.getState().layoutByWorkspace[workspaceKey];
+    expect(findPaneContainingTab(layout.root, sheetTabId ?? "")?.focusedTabId).toBe(sheetTabId);
+  });
+
+  it("opens subagents and provider subagents in the sheet but keeps root agents as tabs", () => {
+    seedAgents([
+      { id: "root", parentAgentId: null, workspaceId: "sheet-ws" },
+      { id: "child", parentAgentId: "root", workspaceId: "sheet-ws" },
+      { id: "other-workspace-child", parentAgentId: "root", workspaceId: "other-ws" },
+    ]);
+    const store = createCompactStore();
+
+    store.getState().openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "child" },
+      intent: "reveal",
+    });
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toMatchObject({
+      tab: { target: { kind: "agent", agentId: "child" } },
+      policy: { openAsTab: true },
+    });
+
+    store.getState().openTab({
+      workspaceKey,
+      target: { kind: "provider_subagent", parentAgentId: "root", subagentId: "task-1" },
+      intent: "reveal",
+    });
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toMatchObject({
+      tab: { target: { kind: "provider_subagent", subagentId: "task-1" } },
+      policy: { openAsTab: false },
+    });
+
+    for (const agentId of ["root", "other-workspace-child"]) {
+      store
+        .getState()
+        .openTab({ workspaceKey, target: { kind: "agent", agentId }, intent: "reveal" });
+    }
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(tabKinds(store)).toEqual(["terminal", "agent", "agent"]);
+  });
+
+  it("gives a sheet target opened from inside the sheet the sheet's own parent", () => {
+    seedAgents([
+      { id: "root", parentAgentId: null, workspaceId: "sheet-ws" },
+      { id: "child", parentAgentId: "root", workspaceId: "sheet-ws" },
+    ]);
+    const store = createCompactStore();
+    const rootTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: { kind: "agent", agentId: "root" }, intent: "reveal" });
+    const childSheetTabId = store.getState().openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "child" },
+      intent: "reveal",
+      parentTabId: rootTabId ?? undefined,
+    });
+
+    const fileSheetTabId = store.getState().openTab({
+      workspaceKey,
+      target: fileTarget,
+      intent: "reveal",
+      parentTabId: childSheetTabId ?? undefined,
+    });
+    expect(store.getState().sheetByWorkspace[workspaceKey]?.parentTabId).toBe(rootTabId);
+
+    store.getState().openSheetAsTab(workspaceKey);
+    const layout = store.getState().layoutByWorkspace[workspaceKey];
+    expect(layout.parentTabIdByTabId?.[fileSheetTabId ?? ""]).toBe(rootTabId);
+  });
+
+  it("closes the sheet and reveals the tab when a tab target is opened from inside the sheet", () => {
+    seedAgents([
+      { id: "root", parentAgentId: null, workspaceId: "sheet-ws" },
+      { id: "child", parentAgentId: "root", workspaceId: "sheet-ws" },
+      { id: "second-root", parentAgentId: null, workspaceId: "sheet-ws" },
+    ]);
+    const store = createCompactStore();
+    const rootTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: { kind: "agent", agentId: "root" }, intent: "reveal" });
+    const openChildSheet = () =>
+      store.getState().openTab({
+        workspaceKey,
+        target: { kind: "agent", agentId: "child" },
+        intent: "reveal",
+        parentTabId: rootTabId ?? undefined,
+      }) ?? undefined;
+
+    const terminalTabId = store.getState().openTab({
+      workspaceKey,
+      target: { kind: "terminal", terminalId: "term-1" },
+      intent: "reveal",
+      parentTabId: openChildSheet(),
+    });
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    let layout = store.getState().layoutByWorkspace[workspaceKey];
+    expect(findPaneById(layout.root, "main")?.focusedTabId).toBe(terminalTabId);
+
+    const secondRootTabId = store.getState().openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "second-root" },
+      intent: "reveal",
+      parentTabId: openChildSheet(),
+    });
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    layout = store.getState().layoutByWorkspace[workspaceKey];
+    expect(findPaneById(layout.root, "main")?.focusedTabId).toBe(secondRootTabId);
+    expect(layout.parentTabIdByTabId?.[secondRootTabId ?? ""]).toBe(rootTabId);
+    expect(tabKinds(store)).toEqual(["terminal", "agent", "agent"]);
+  });
+
+  describe("unsaved sheet work", () => {
+    const sheetPanel = (tabId: string) => ({
+      serverId: "server-1",
+      workspaceId: "sheet-ws",
+      tabId,
+    });
+    let modifiedTabId: string | null = null;
+
+    function openModifiedFileSheet(store: ReturnType<typeof createCompactStore>): string {
+      const tabId = store
+        .getState()
+        .openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+      if (!tabId) throw new Error("Expected a sheet tab");
+      store.getState().setTabState(workspaceKey, tabId, { scrollTop: 40 });
+      setPanelInstanceAttributes(sheetPanel(tabId), { modified: true });
+      modifiedTabId = tabId;
+      return tabId;
+    }
+
+    function stripTab(store: ReturnType<typeof createCompactStore>, tabId: string) {
+      const layout = store.getState().layoutByWorkspace[workspaceKey];
+      return collectAllTabs(layout.root).find((tab) => tab.tabId === tabId) ?? null;
+    }
+
+    function focusedTabId(store: ReturnType<typeof createCompactStore>): string | null {
+      const layout = store.getState().layoutByWorkspace[workspaceKey];
+      return findPaneById(layout.root, layout.focusedPaneId)?.focusedTabId ?? null;
+    }
+
+    afterEach(() => {
+      if (modifiedTabId) setPanelInstanceAttributes(sheetPanel(modifiedTabId), { modified: false });
+      modifiedTabId = null;
+    });
+
+    function sheetTabId(store: ReturnType<typeof createCompactStore>): string | null {
+      return store.getState().sheetByWorkspace[workspaceKey]?.tab.tabId ?? null;
+    }
+
+    it("opens the next sheet target as a tab under a modified sheet", () => {
+      const store = createCompactStore();
+      const modifiedSheetTabId = openModifiedFileSheet(store);
+
+      const nextTarget = { kind: "file" as const, path: "src/other.ts" };
+      const nextTabId = store
+        .getState()
+        .openTab({ workspaceKey, target: nextTarget, intent: "reveal" });
+
+      expect(sheetTabId(store)).toBe(modifiedSheetTabId);
+      expect(store.getState().sheetByWorkspace[workspaceKey]?.tab.state).toEqual({ scrollTop: 40 });
+      expect(stripTab(store, nextTabId ?? "")).toMatchObject({ target: nextTarget });
+      expect(focusedTabId(store)).toBe(nextTabId);
+    });
+
+    it("opens a tab target under a modified sheet without closing it", () => {
+      const store = createCompactStore();
+      const modifiedSheetTabId = openModifiedFileSheet(store);
+
+      const terminalTabId = store.getState().openTab({
+        workspaceKey,
+        target: { kind: "terminal", terminalId: "term-2" },
+        intent: "reveal",
+      });
+
+      expect(sheetTabId(store)).toBe(modifiedSheetTabId);
+      expect(focusedTabId(store)).toBe(terminalTabId);
+    });
+
+    it("keeps a modified sheet open when another tab is chosen", () => {
+      const store = createCompactStore();
+      const secondTabId = store.getState().openTab({
+        workspaceKey,
+        target: { kind: "terminal", terminalId: "term-2" },
+        intent: "reveal",
+      });
+      const firstTabId = store.getState().getWorkspaceTabs(workspaceKey)[0]?.tabId ?? "";
+      const modifiedSheetTabId = openModifiedFileSheet(store);
+
+      store.getState().focusTab(workspaceKey, firstTabId);
+      expect(sheetTabId(store)).toBe(modifiedSheetTabId);
+      expect(focusedTabId(store)).toBe(firstTabId);
+
+      store.getState().selectTabInPane(workspaceKey, "main", secondTabId ?? "");
+      expect(sheetTabId(store)).toBe(modifiedSheetTabId);
+      expect(focusedTabId(store)).toBe(secondTabId);
+
+      store.getState().closeTab(workspaceKey, modifiedSheetTabId);
+      expect(sheetTabId(store)).toBeNull();
+      expect(tabKinds(store)).toEqual(["terminal", "terminal"]);
+    });
+
+    it("replaces an unmodified sheet with the next sheet target", () => {
+      const store = createCompactStore();
+      store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+
+      store.getState().openTab({
+        workspaceKey,
+        target: { kind: "file", path: "src/other.ts" },
+        intent: "reveal",
+      });
+
+      expect(store.getState().sheetByWorkspace[workspaceKey]?.tab.target).toEqual({
+        kind: "file",
+        path: "src/other.ts",
+      });
+      expect(tabKinds(store)).toEqual(["terminal"]);
+    });
+
+    it("closes an unmodified sheet when another tab is chosen", () => {
+      const store = createCompactStore();
+      const secondTabId = store.getState().openTab({
+        workspaceKey,
+        target: { kind: "terminal", terminalId: "term-2" },
+        intent: "reveal",
+      });
+      const firstTabId = store.getState().getWorkspaceTabs(workspaceKey)[0]?.tabId ?? "";
+
+      store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+      store.getState().focusTab(workspaceKey, firstTabId);
+      expect(sheetTabId(store)).toBeNull();
+      expect(focusedTabId(store)).toBe(firstTabId);
+
+      store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+      store.getState().selectTabInPane(workspaceKey, "main", secondTabId ?? "");
+      expect(sheetTabId(store)).toBeNull();
+      expect(focusedTabId(store)).toBe(secondTabId);
+      expect(tabKinds(store)).toEqual(["terminal", "terminal"]);
+    });
+  });
+
+  it("closes the sheet when its agent leaves the workspace", () => {
+    seedAgents([
+      { id: "root", parentAgentId: null, workspaceId: "sheet-ws" },
+      { id: "child", parentAgentId: "root", workspaceId: "sheet-ws" },
+    ]);
+    const store = createCompactStore();
+    store.getState().openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "child" },
+      intent: "reveal",
+    });
+    const snapshot = {
+      terminalsHydrated: false,
+      activeAgentIds: ["root"],
+      autoOpenAgentIds: [],
+      knownTerminalIds: ["term-1"],
+      standaloneTerminalIds: ["term-1"],
+      hasActivePendingTerminalCreate: false,
+    };
+
+    store.getState().reconcileTabs(workspaceKey, { ...snapshot, agentsHydrated: false });
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeDefined();
+
+    store.getState().reconcileTabs(workspaceKey, { ...snapshot, agentsHydrated: true });
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+  });
+
+  it("closes the sheet when its agent stops being a subagent, leaving one tab for it", () => {
+    seedAgents([
+      { id: "root", parentAgentId: null, workspaceId: "sheet-ws" },
+      { id: "child", parentAgentId: "root", workspaceId: "sheet-ws" },
+    ]);
+    const store = createCompactStore();
+    const sheetTabId = store.getState().openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "child" },
+      intent: "reveal",
+    });
+    const snapshot = {
+      agentsHydrated: true,
+      terminalsHydrated: false,
+      activeAgentIds: ["root", "child"],
+      autoOpenAgentIds: ["child"],
+      knownTerminalIds: ["term-1"],
+      standaloneTerminalIds: ["term-1"],
+      hasActivePendingTerminalCreate: false,
+    };
+
+    store.getState().reconcileTabs(workspaceKey, { ...snapshot, autoOpenAgentIds: [] });
+    expect(store.getState().sheetByWorkspace[workspaceKey]?.tab.tabId).toBe(sheetTabId);
+
+    seedAgents([
+      { id: "root", parentAgentId: null, workspaceId: "sheet-ws" },
+      { id: "child", parentAgentId: null, workspaceId: "sheet-ws" },
+    ]);
+    store.getState().reconcileTabs(workspaceKey, snapshot);
+
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    const layout = store.getState().layoutByWorkspace[workspaceKey];
+    expect(
+      collectAllTabs(layout.root).filter(
+        (tab) => tab.target.kind === "agent" && tab.target.agentId === "child",
+      ),
+    ).toHaveLength(1);
+  });
+
+  it("re-resolves the sheet policy when the sheet tab gets another target", () => {
+    seedAgents([
+      { id: "root", parentAgentId: null, workspaceId: "sheet-ws" },
+      { id: "child", parentAgentId: "root", workspaceId: "sheet-ws" },
+    ]);
+    const store = createCompactStore();
+    const sheetTabId = store.getState().openTab({
+      workspaceKey,
+      target: { kind: "provider_subagent", parentAgentId: "root", subagentId: "task-1" },
+      intent: "reveal",
+    });
+
+    const replacedTabId = store
+      .getState()
+      .replaceTab(workspaceKey, sheetTabId ?? "", { kind: "agent", agentId: "child" });
+
+    expect(replacedTabId).toBe(sheetTabId);
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toMatchObject({
+      tab: { tabId: sheetTabId, target: { kind: "agent", agentId: "child" } },
+      policy: { openAsTab: true },
+    });
+  });
+
+  it("moves the sheet tab into the tab strip when it gets a target the sheet does not host", () => {
+    const store = createCompactStore();
+    const sheetTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+
+    const replacedTabId = store.getState().replaceTab(workspaceKey, sheetTabId ?? "", {
+      kind: "terminal",
+      terminalId: "term-2",
+    });
+
+    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(replacedTabId).toBe(sheetTabId);
+    const layout = store.getState().layoutByWorkspace[workspaceKey];
+    expect(findPaneById(layout.root, "main")?.focusedTabId).toBe(sheetTabId);
+    expect(tabKinds(store)).toEqual(["terminal", "terminal"]);
+  });
+
+  it("keeps a chat shown in the sheet open for timeline sync until the sheet closes", () => {
+    const store = createCompactStore();
+    seedAgents([
+      { id: "root", parentAgentId: null, workspaceId: "sheet-ws" },
+      { id: "child", parentAgentId: "root", workspaceId: "sheet-ws" },
+    ]);
+    const received: string[][] = [];
+    const stop = observeOpenWorkspaceAgentIds("server-1", (ids) => received.push(ids), store);
+
+    store.getState().openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "child" },
+      intent: "reveal",
+    });
+    store.getState().closeSheet(workspaceKey);
+    stop();
+
+    expect(received).toEqual([[], ["child"], []]);
+  });
+});
diff --git a/packages/app/src/stores/workspace-layout-store.ts b/packages/app/src/stores/workspace-layout-store.ts
index 5de128b631..226265860a 100644
--- a/packages/app/src/stores/workspace-layout-store.ts
+++ b/packages/app/src/stores/workspace-layout-store.ts
@@ -59,7 +59,12 @@ import {
   type WorkspaceTabSnapshot,
   type WorkspaceLayout,
 } from "@/stores/workspace-layout-actions";
-import { normalizeWorkspaceTabTarget } from "@/workspace-tabs/identity";
+import {
+  buildDeterministicWorkspaceTabId,
+  normalizeWorkspaceTabTarget,
+} from "@/workspace-tabs/identity";
+import { isSheetTabModified, resolveCompactSheetPolicy } from "@/workspace-tabs/compact-sheet";
+import { panelResourceKey, type CompactSheetPolicy } from "@/panels/panel-manifest";
 import { createValidatedPersistStorage } from "@/storage/validated-persist-storage";
 import { panelTargetSupportsHostForWorkspaceKey } from "@/plugins/workspace-panels/locations";
 
@@ -105,7 +110,24 @@ export interface OpenWorkspaceTabInput {
   state?: JsonValue;
 }
 
+/**
+ * How the app shell lays out a workspace: compact (one tab at a time, plus the sheet), a single
+ * wide pane (touch tablets, which cannot render splits), or split panes.
+ */
+export type WorkspaceLayoutMode = "compact" | "single-pane" | "split-panes";
+
+/** A tab hosted by the compact workspace sheet instead of a pane. */
+export interface WorkspaceSheet {
+  tab: WorkspaceTab;
+  policy: CompactSheetPolicy;
+  parentTabId: string | null;
+}
+
 interface WorkspaceLayoutStore {
+  /** Published once by the app shell; callers never pass a form factor to open a tab. */
+  layoutMode: WorkspaceLayoutMode;
+  /** At most one sheet tab per workspace. Not persisted: a reload returns to the tab strip. */
+  sheetByWorkspace: Record<string, WorkspaceSheet>;
   layoutByWorkspace: Record<string, WorkspaceLayout>;
   splitSizesByWorkspace: Record<string, Record<string, number[]>>;
   explorerSidebarWidthByWorkspace: Record<string, number>;
@@ -116,7 +138,19 @@ interface WorkspaceLayoutStore {
   sidePaneIdByWorkspace: Record<string, string | null>;
   /** Workspaces where PR detection already added its tab once; a closed tab never returns. */
   pullRequestTabAutoOpenedByWorkspace: Record<string, true>;
+  /**
+   * The one entry point for showing a target. On compact layouts a target whose panel declares
+   * `compactSheet` opens in the workspace sheet; the returned tab id is the sheet tab's id.
+   */
   openTab: (input: OpenWorkspaceTabInput) => string | null;
+  /** Whether `openTab` with this input would show the target in the sheet. */
+  opensInSheet: (
+    input: Pick<OpenWorkspaceTabInput, "workspaceKey" | "target" | "intent">,
+  ) => boolean;
+  setLayoutMode: (mode: WorkspaceLayoutMode) => void;
+  closeSheet: (workspaceKey: string) => void;
+  /** Moves the sheet's tab, keeping its tab id, into the focused pane. */
+  openSheetAsTab: (workspaceKey: string) => string | null;
   /** Placement resolves lazily so an already acknowledged workspace never creates a side pane. */
   autoOpenPullRequestTab: (
     workspaceKey: string,
@@ -472,6 +506,17 @@ export function selectExplorerSidebarPaneId(
   return resolveExplorerSidebarPaneId(layout, state.explorerSidebarPaneIdByWorkspace[workspaceKey]);
 }
 
+/** A workspace's panes give up keyboard focus while focus is parked or the sheet covers them. */
+export function selectPaneFocusSuspended(
+  state: Pick<WorkspaceLayoutStore, "focusRestorationByWorkspace" | "sheetByWorkspace">,
+  workspaceKey: string,
+): boolean {
+  return (
+    Boolean(state.focusRestorationByWorkspace[workspaceKey]?.restorePaneId) ||
+    workspaceKey in state.sheetByWorkspace
+  );
+}
+
 /** Whether the Explorer sidebar pane is currently on screen. */
 export function selectIsExplorerSidebarVisible(
   state: ExplorerSidebarState,
@@ -637,6 +682,189 @@ function attachParentTab(input: {
   });
 }
 
+function withoutSheet(
+  state: Pick<WorkspaceLayoutStore, "sheetByWorkspace">,
+  workspaceKey: string,
+): Pick<WorkspaceLayoutStore, "sheetByWorkspace"> {
+  if (!(workspaceKey in state.sheetByWorkspace)) {
+    return { sheetByWorkspace: state.sheetByWorkspace };
+  }
+  const { [workspaceKey]: _removed, ...sheetByWorkspace } = state.sheetByWorkspace;
+  return { sheetByWorkspace };
+}
+
+function isTargetOpenAsTab(layout: WorkspaceLayout | undefined, target: WorkspaceTabTarget) {
+  if (!layout) return false;
+  const resourceKey = panelResourceKey(target);
+  return collectAllTabs(layout.root).some((tab) => panelResourceKey(tab.target) === resourceKey);
+}
+
+function resolveSheetPolicy(
+  state: Pick<WorkspaceLayoutStore, "layoutMode" | "layoutByWorkspace">,
+  workspaceKey: string,
+  target: WorkspaceTabTarget,
+  intent: WorkspaceTabOpenIntent,
+): CompactSheetPolicy | null {
+  if (state.layoutMode !== "compact" || intent === "background") return null;
+  if (intent === "reveal" && isTargetOpenAsTab(state.layoutByWorkspace[workspaceKey], target)) {
+    return null;
+  }
+  return resolveCompactSheetPolicy(workspaceKey, target);
+}
+
+/**
+ * The parent a newly opened tab links to. A target opened from inside the sheet names the sheet's
+ * tab, which the open replaces or closes, so it inherits the sheet's own parent instead.
+ */
+function resolveOpenParentTabId(
+  state: Pick<WorkspaceLayoutStore, "sheetByWorkspace">,
+  workspaceKey: string,
+  parentTabId: string | undefined,
+): string | null {
+  const sheet = state.sheetByWorkspace[workspaceKey];
+  if (sheet && parentTabId === sheet.tab.tabId) return sheet.parentTabId;
+  return parentTabId ?? null;
+}
+
+/** A reveal of the resource the sheet already shows keeps the sheet's tab. */
+function sheetKeepsTabFor(
+  sheet: WorkspaceSheet | undefined,
+  target: WorkspaceTabTarget,
+  intent: WorkspaceTabOpenIntent,
+): sheet is WorkspaceSheet {
+  return (
+    intent === "reveal" &&
+    sheet !== undefined &&
+    panelResourceKey(sheet.tab.target) === panelResourceKey(target)
+  );
+}
+
+function placeTargetInSheet(input: {
+  /** The sheet whose tab the target keeps, if any. */
+  kept: WorkspaceSheet | undefined;
+  target: WorkspaceTabTarget;
+  intent: WorkspaceTabOpenIntent;
+  policy: CompactSheetPolicy;
+  parentTabId: string | null;
+  state: JsonValue | undefined;
+}): WorkspaceSheet {
+  if (input.kept) {
+    return { ...input.kept, tab: { ...input.kept.tab, target: input.target } };
+  }
+  return {
+    tab: {
+      tabId:
+        input.intent === "reveal"
+          ? buildDeterministicWorkspaceTabId(input.target)
+          : createWorkspaceTabInstanceId(),
+      target: input.target,
+      createdAt: Date.now(),
+      ...(input.state !== undefined ? { state: input.state } : {}),
+    },
+    policy: input.policy,
+    parentTabId: input.parentTabId,
+  };
+}
+
+/** Moves a workspace's sheet tab into its focused pane, keeping its tab id and state. */
+function promoteSheetToTab(
+  state: WorkspaceLayoutStore,
+  workspaceKey: string,
+): { tabId: string; patch: Partial<WorkspaceLayoutStore> } | null {
+  const sheet = state.sheetByWorkspace[workspaceKey];
+  if (!sheet) return null;
+  const { tab } = sheet;
+  const placement = getOpenTabPlacement(state, workspaceKey, tab.target, FOCUSED_PANE_PLACEMENT);
+  const input = {
+    ...placement,
+    target: tab.target,
+    now: tab.createdAt,
+    createTabId: () => tab.tabId,
+    state: tab.state,
+  };
+  const result = isTargetOpenAsTab(placement.layout, tab.target)
+    ? revealTargetInLayout(input)
+    : createTabInLayout(input);
+  if (!result) return null;
+  const nextLayout = attachParentTab({
+    layout: keepWorkspaceFocusOutOfExplorerSidebar(
+      result.layout,
+      placement.explorerSidebarPaneId,
+      placement.layout.focusedPaneId,
+    ),
+    childTabId: result.tabId,
+    parentTabId: sheet.parentTabId,
+  });
+  return {
+    tabId: result.tabId,
+    patch: {
+      ...withoutSheet(state, workspaceKey),
+      ...withoutFocusRestoration(state, workspaceKey),
+      hiddenAgentIdsByWorkspace:
+        tab.target.kind === "agent"
+          ? removeAgentIdFromWorkspaceSet(
+              state.hiddenAgentIdsByWorkspace,
+              workspaceKey,
+              tab.target.agentId,
+            )
+          : state.hiddenAgentIdsByWorkspace,
+      layoutByWorkspace: { ...state.layoutByWorkspace, [workspaceKey]: nextLayout },
+    },
+  };
+}
+
+/**
+ * A sheet holding unsaved work is never implicitly displaced: moving its tab would remount the
+ * panel and drop the work. Only the explicit, guarded close removes it.
+ */
+function sheetHoldsUnsavedWork(
+  state: Pick<WorkspaceLayoutStore, "sheetByWorkspace">,
+  workspaceKey: string,
+): boolean {
+  const sheet = state.sheetByWorkspace[workspaceKey];
+  return sheet !== undefined && isSheetTabModified(workspaceKey, sheet.tab.tabId);
+}
+
+/**
+ * Where an open lands in the sheet, or null when it opens as a tab. A reveal of the resource the
+ * sheet shows keeps its tab; any other target never displaces unsaved work and opens as a tab.
+ */
+function resolveSheetPlacement(
+  state: WorkspaceLayoutStore,
+  workspaceKey: string,
+  target: WorkspaceTabTarget,
+  intent: WorkspaceTabOpenIntent,
+): { policy: CompactSheetPolicy; kept: WorkspaceSheet | undefined } | null {
+  const policy = resolveSheetPolicy(state, workspaceKey, target, intent);
+  if (!policy) return null;
+  const sheet = state.sheetByWorkspace[workspaceKey];
+  if (sheetKeepsTabFor(sheet, target, intent)) return { policy, kept: sheet };
+  return sheetHoldsUnsavedWork(state, workspaceKey) ? null : { policy, kept: undefined };
+}
+
+/** Closes the sheet because navigation moved on underneath it, unless it holds unsaved work. */
+function dismissSheet(
+  state: WorkspaceLayoutStore,
+  workspaceKey: string,
+): Partial<WorkspaceLayoutStore> {
+  return sheetHoldsUnsavedWork(state, workspaceKey) ? {} : withoutSheet(state, workspaceKey);
+}
+
+/**
+ * A sheet agent closes once the workspace no longer has it (archived or gone), like its tab would,
+ * and once it stops being a subagent: as a root agent, reconcile gives it its own tab, and the sheet
+ * would hold a second tab with the same id.
+ */
+function sheetAgentNoLongerFits(
+  workspaceKey: string,
+  sheet: WorkspaceSheet | undefined,
+  snapshot: WorkspaceTabSnapshot,
+): boolean {
+  if (sheet?.tab.target.kind !== "agent" || !snapshot.agentsHydrated) return false;
+  if (!new Set(snapshot.activeAgentIds).has(sheet.tab.target.agentId)) return true;
+  return resolveCompactSheetPolicy(workspaceKey, sheet.tab.target) === null;
+}
+
 /**
  * Splits an Explorer sidebar out of the pane the user is in. Only reached by layouts saved
  * before the Explorer became part of the default tree; new ones are born with it.
@@ -676,6 +904,8 @@ export function createWorkspaceLayoutStore(
           }
           return tabId;
         },
+        layoutMode: "split-panes",
+        sheetByWorkspace: {},
         layoutByWorkspace: {},
         splitSizesByWorkspace: {},
         explorerSidebarWidthByWorkspace: {},
@@ -691,6 +921,31 @@ export function createWorkspaceLayoutStore(
           if (!normalizedWorkspaceKey || !normalizedTarget) {
             return null;
           }
+          const parentTabId = resolveOpenParentTabId(
+            get(),
+            normalizedWorkspaceKey,
+            input.parentTabId,
+          );
+          const sheetPlacement = resolveSheetPlacement(
+            get(),
+            normalizedWorkspaceKey,
+            normalizedTarget,
+            input.intent,
+          );
+          if (sheetPlacement) {
+            const sheet = placeTargetInSheet({
+              kept: sheetPlacement.kept,
+              target: normalizedTarget,
+              intent: input.intent,
+              policy: sheetPlacement.policy,
+              parentTabId,
+              state: input.state,
+            });
+            set((state) => ({
+              sheetByWorkspace: { ...state.sheetByWorkspace, [normalizedWorkspaceKey]: sheet },
+            }));
+            return sheet.tab.tabId;
+          }
           const placement = getOpenTabPlacement(
             get(),
             normalizedWorkspaceKey,
@@ -734,6 +989,8 @@ export function createWorkspaceLayoutStore(
           const shouldPinAgent = input.pin === true && normalizedTarget.kind === "agent";
           set((state) => ({
             ...withoutFocusRestoration(state, normalizedWorkspaceKey),
+            // A tab brought to the front dismisses the sheet over it.
+            ...(input.intent === "background" ? {} : dismissSheet(state, normalizedWorkspaceKey)),
             hiddenAgentIdsByWorkspace:
               normalizedTarget.kind !== "agent"
                 ? state.hiddenAgentIdsByWorkspace
@@ -751,17 +1008,52 @@ export function createWorkspaceLayoutStore(
               : state.pinnedAgentIdsByWorkspace,
             layoutByWorkspace: {
               ...state.layoutByWorkspace,
-              [normalizedWorkspaceKey]: input.parentTabId
+              [normalizedWorkspaceKey]: parentTabId
                 ? attachParentTab({
                     layout: nextLayout,
                     childTabId: result.tabId,
-                    parentTabId: input.parentTabId,
+                    parentTabId,
                   })
                 : nextLayout,
             },
           }));
           return result.tabId;
         },
+        opensInSheet: (input) => {
+          const normalizedWorkspaceKey = trimNonEmpty(input.workspaceKey);
+          const normalizedTarget = normalizeWorkspaceTabTarget(input.target);
+          if (!normalizedWorkspaceKey || !normalizedTarget) return false;
+          return (
+            resolveSheetPlacement(get(), normalizedWorkspaceKey, normalizedTarget, input.intent) !==
+            null
+          );
+        },
+        setLayoutMode: (mode) => {
+          set((state) => {
+            if (state.layoutMode === mode) return state;
+            if (mode === "compact") return { layoutMode: mode };
+            // Widening keeps whatever the user had open in the sheet as an ordinary tab.
+            const next: WorkspaceLayoutStore = { ...state, layoutMode: mode };
+            for (const workspaceKey of Object.keys(state.sheetByWorkspace)) {
+              const promoted = promoteSheetToTab(next, workspaceKey);
+              Object.assign(next, promoted?.patch ?? withoutSheet(next, workspaceKey));
+            }
+            return next;
+          });
+        },
+        closeSheet: (workspaceKey) => {
+          const normalizedWorkspaceKey = trimNonEmpty(workspaceKey);
+          if (!normalizedWorkspaceKey) return;
+          set((state) => withoutSheet(state, normalizedWorkspaceKey));
+        },
+        openSheetAsTab: (workspaceKey) => {
+          const normalizedWorkspaceKey = trimNonEmpty(workspaceKey);
+          if (!normalizedWorkspaceKey) return null;
+          const promoted = promoteSheetToTab(get(), normalizedWorkspaceKey);
+          if (!promoted) return null;
+          set(promoted.patch);
+          return promoted.tabId;
+        },
         showExplorerSidebar: (workspaceKey) => {
           const normalizedWorkspaceKey = trimNonEmpty(workspaceKey);
           if (!normalizedWorkspaceKey) {
@@ -881,6 +1173,9 @@ export function createWorkspaceLayoutStore(
           }
 
           set((state) => {
+            if (state.sheetByWorkspace[normalizedWorkspaceKey]?.tab.tabId === normalizedTabId) {
+              return withoutSheet(state, normalizedWorkspaceKey);
+            }
             const layout = getWorkspaceLayout(state.layoutByWorkspace, normalizedWorkspaceKey);
             const explorerSidebarPaneId = resolveExplorerSidebarPaneId(
               layout,
@@ -988,6 +1283,8 @@ export function createWorkspaceLayoutStore(
 
             return {
               ...withoutFocusRestoration(state, normalizedWorkspaceKey),
+              // Choosing a tab dismisses the sheet that covers it.
+              ...dismissSheet(state, normalizedWorkspaceKey),
               layoutByWorkspace: {
                 ...state.layoutByWorkspace,
                 [normalizedWorkspaceKey]: nextLayout,
@@ -1011,6 +1308,8 @@ export function createWorkspaceLayoutStore(
             });
             return nextLayout
               ? {
+                  // Choosing a tab dismisses the sheet that covers it.
+                  ...dismissSheet(state, normalizedWorkspaceKey),
                   layoutByWorkspace: {
                     ...state.layoutByWorkspace,
                     [normalizedWorkspaceKey]: nextLayout,
@@ -1024,6 +1323,31 @@ export function createWorkspaceLayoutStore(
           const normalizedTabId = trimNonEmpty(tabId);
           const normalizedTarget = normalizeWorkspaceTabTarget(target);
           if (!normalizedWorkspaceKey || !normalizedTabId || !normalizedTarget) return null;
+          const sheet = get().sheetByWorkspace[normalizedWorkspaceKey];
+          if (sheet?.tab.tabId === normalizedTabId) {
+            const policy = resolveCompactSheetPolicy(normalizedWorkspaceKey, normalizedTarget);
+            const replaced: WorkspaceSheet = {
+              ...sheet,
+              policy: policy ?? sheet.policy,
+              tab: {
+                ...sheet.tab,
+                target: normalizedTarget,
+                ...(tabState !== undefined ? { state: tabState } : {}),
+              },
+            };
+            const next: WorkspaceLayoutStore = {
+              ...get(),
+              sheetByWorkspace: { ...get().sheetByWorkspace, [normalizedWorkspaceKey]: replaced },
+            };
+            if (policy) {
+              set({ sheetByWorkspace: next.sheetByWorkspace });
+              return normalizedTabId;
+            }
+            // A target the sheet does not host becomes the tab it would have opened as.
+            const promoted = promoteSheetToTab(next, normalizedWorkspaceKey);
+            set(promoted?.patch ?? withoutSheet(next, normalizedWorkspaceKey));
+            return promoted?.tabId ?? null;
+          }
           const result = replaceTabTargetInLayout({
             layout: getWorkspaceLayout(get().layoutByWorkspace, normalizedWorkspaceKey),
             tabId: normalizedTabId,
@@ -1054,6 +1378,19 @@ export function createWorkspaceLayoutStore(
           const normalizedTabId = trimNonEmpty(tabId);
           if (!normalizedWorkspaceKey || !normalizedTabId) return;
           set((state) => {
+            const sheet = state.sheetByWorkspace[normalizedWorkspaceKey];
+            if (sheet?.tab.tabId === normalizedTabId) {
+              const { state: _previous, ...tab } = sheet.tab;
+              return {
+                sheetByWorkspace: {
+                  ...state.sheetByWorkspace,
+                  [normalizedWorkspaceKey]: {
+                    ...sheet,
+                    tab: tabState === undefined ? tab : { ...tab, state: tabState },
+                  },
+                },
+              };
+            }
             const layout = setTabStateInLayout({
               layout: getWorkspaceLayout(state.layoutByWorkspace, normalizedWorkspaceKey),
               tabId: normalizedTabId,
@@ -1148,15 +1485,22 @@ export function createWorkspaceLayoutStore(
                 );
               }
             }
+            const sheetAgentGone = sheetAgentNoLongerFits(
+              normalizedWorkspaceKey,
+              state.sheetByWorkspace[normalizedWorkspaceKey],
+              snapshot,
+            );
             if (
               state.layoutByWorkspace[normalizedWorkspaceKey] &&
               nextLayout === rawLayout &&
-              pinnedAgentIdsByWorkspace === state.pinnedAgentIdsByWorkspace
+              pinnedAgentIdsByWorkspace === state.pinnedAgentIdsByWorkspace &&
+              !sheetAgentGone
             ) {
               return state;
             }
 
             return {
+              ...(sheetAgentGone ? withoutSheet(state, normalizedWorkspaceKey) : {}),
               pinnedAgentIdsByWorkspace,
               layoutByWorkspace: {
                 ...state.layoutByWorkspace,
@@ -1661,7 +2005,8 @@ export function createWorkspaceLayoutStore(
               normalizedWorkspaceKey in state.focusRestorationByWorkspace ||
               normalizedWorkspaceKey in state.explorerSidebarPaneIdByWorkspace ||
               normalizedWorkspaceKey in state.sidePaneIdByWorkspace ||
-              normalizedWorkspaceKey in state.pullRequestTabAutoOpenedByWorkspace;
+              normalizedWorkspaceKey in state.pullRequestTabAutoOpenedByWorkspace ||
+              normalizedWorkspaceKey in state.sheetByWorkspace;
             if (!hasAny) {
               return state;
             }
@@ -1690,6 +2035,7 @@ export function createWorkspaceLayoutStore(
             const { [normalizedWorkspaceKey]: _sidePane, ...sidePaneIdByWorkspace } =
               state.sidePaneIdByWorkspace;
             return {
+              ...withoutSheet(state, normalizedWorkspaceKey),
               pullRequestTabAutoOpenedByWorkspace,
               layoutByWorkspace,
               splitSizesByWorkspace,
@@ -1795,10 +2141,10 @@ export function createWorkspaceLayoutStore(
 export const useWorkspaceLayoutStore = createWorkspaceLayoutStore();
 
 /**
- * The agent tabs that exist right now, across every workspace of this host, independently
- * of which workspace views are mounted. Timeline sync uses this to release a chat when its
- * tab closes. It is not a subscription source: this layout is restored from disk at launch,
- * so subscribing to it would resume every agent the user has ever opened.
+ * The agent tabs that exist right now, including sheet tabs, across every workspace of this host,
+ * independently of which workspace views are mounted. Timeline sync uses this to release a chat
+ * when its tab closes. It is not a subscription source: this layout is restored from disk at
+ * launch, so subscribing to it would resume every agent the user has ever opened.
  */
 export function observeOpenWorkspaceAgentIds(
   serverId: string,
@@ -1806,11 +2152,19 @@ export function observeOpenWorkspaceAgentIds(
   store = useWorkspaceLayoutStore,
 ): () => void {
   let previous: string[] | undefined;
-  const publish = (state: Pick<WorkspaceLayoutStore, "layoutByWorkspace">) => {
+  const publish = (state: Pick<WorkspaceLayoutStore, "layoutByWorkspace" | "sheetByWorkspace">) => {
     const ids = new Set<string>();
-    for (const [workspaceKey, layout] of Object.entries(state.layoutByWorkspace)) {
+    const tabsByWorkspace = [
+      ...Object.entries(state.layoutByWorkspace).map(
+        ([workspaceKey, layout]) => [workspaceKey, collectAllTabs(layout.root)] as const,
+      ),
+      ...Object.entries(state.sheetByWorkspace).map(
+        ([workspaceKey, sheet]) => [workspaceKey, [sheet.tab]] as const,
+      ),
+    ];
+    for (const [workspaceKey, tabs] of tabsByWorkspace) {
       if (!workspaceKey.startsWith(`${serverId}:`)) continue;
-      for (const tab of collectAllTabs(layout.root)) {
+      for (const tab of tabs) {
         if (tab.target.kind === "agent") ids.add(tab.target.agentId);
       }
     }
@@ -1821,7 +2175,12 @@ export function observeOpenWorkspaceAgentIds(
     listener(next);
   };
   const unsubscribe = store.subscribe((state, before) => {
-    if (state.layoutByWorkspace !== before.layoutByWorkspace) publish(state);
+    if (
+      state.layoutByWorkspace !== before.layoutByWorkspace ||
+      state.sheetByWorkspace !== before.sheetByWorkspace
+    ) {
+      publish(state);
+    }
   });
   publish(store.getState());
   return unsubscribe;
diff --git a/packages/app/src/workspace-tabs/compact-sheet.ts b/packages/app/src/workspace-tabs/compact-sheet.ts
new file mode 100644
index 0000000000..947d4904c5
--- /dev/null
+++ b/packages/app/src/workspace-tabs/compact-sheet.ts
@@ -0,0 +1,38 @@
+import { getWorkspacePanelAttributes } from "@/panels/panel-instance-attributes";
+import { panelCompactSheetPolicy, type CompactSheetPolicy } from "@/panels/panel-manifest";
+import { useSessionStore, type Agent } from "@/stores/session-store";
+import { isWorkspaceRootAgent } from "@/subagents/policies";
+import type { WorkspaceTabTarget } from "@/workspace-tabs/model";
+
+function workspaceAgentLookup(workspaceKey: string): (agentId: string) => Agent | null {
+  const sessions = useSessionStore.getState().sessions;
+  const serverId = Object.keys(sessions)
+    .filter((candidate) => workspaceKey.startsWith(`${candidate}:`))
+    .sort((left, right) => right.length - left.length)[0];
+  const session = serverId ? sessions[serverId] : undefined;
+  return (agentId) => session?.agents.get(agentId) ?? session?.agentDetails.get(agentId) ?? null;
+}
+
+/**
+ * The single target-aware boundary deciding whether a compact reveal lands in the workspace
+ * sheet. An agent the client has not loaded yet counts as a root agent and stays a tab.
+ */
+export function resolveCompactSheetPolicy(
+  workspaceKey: string,
+  target: WorkspaceTabTarget,
+): CompactSheetPolicy | null {
+  return panelCompactSheetPolicy(target, {
+    isWorkspaceRootAgent: (agentId) => {
+      const getAgent = workspaceAgentLookup(workspaceKey);
+      const agent = getAgent(agentId);
+      if (!agent) return true;
+      const parent = agent.parentAgentId ? (getAgent(agent.parentAgentId) ?? undefined) : undefined;
+      return isWorkspaceRootAgent(agent, parent);
+    },
+  });
+}
+
+/** Whether the sheet's tab holds unsaved work, which must never be discarded with the sheet. */
+export function isSheetTabModified(workspaceKey: string, tabId: string): boolean {
+  return getWorkspacePanelAttributes(workspaceKey, tabId).modified;
+}
diff --git a/packages/app/src/workspace-tabs/layout-mode-publisher.tsx b/packages/app/src/workspace-tabs/layout-mode-publisher.tsx
new file mode 100644
index 0000000000..03df9b695a
--- /dev/null
+++ b/packages/app/src/workspace-tabs/layout-mode-publisher.tsx
@@ -0,0 +1,21 @@
+import { useLayoutEffect } from "react";
+import { supportsDesktopPaneSplits, useIsCompactFormFactor } from "@/constants/layout";
+import { useWorkspaceLayoutStore, type WorkspaceLayoutMode } from "@/stores/workspace-layout-store";
+
+function resolveWorkspaceLayoutMode(isCompact: boolean): WorkspaceLayoutMode {
+  if (isCompact) return "compact";
+  return supportsDesktopPaneSplits() ? "split-panes" : "single-pane";
+}
+
+/**
+ * Publishes the shell's workspace layout to the layout store, which decides where opened targets
+ * land. Render it before the routes: React runs an earlier sibling's layout effects before a later
+ * sibling's subtree, so a route sees the mode even from its first layout effect.
+ */
+export function WorkspaceLayoutModePublisher(): null {
+  const isCompact = useIsCompactFormFactor();
+  useLayoutEffect(() => {
+    useWorkspaceLayoutStore.getState().setLayoutMode(resolveWorkspaceLayoutMode(isCompact));
+  }, [isCompact]);
+  return null;
+}
diff --git a/packages/app/src/workspace-tabs/open-beside.test.ts b/packages/app/src/workspace-tabs/open-beside.test.ts
new file mode 100644
index 0000000000..ac181eeb75
--- /dev/null
+++ b/packages/app/src/workspace-tabs/open-beside.test.ts
@@ -0,0 +1,177 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("@react-native-async-storage/async-storage", () => ({
+  default: {
+    getItem: vi.fn(async () => null),
+    setItem: vi.fn(async () => undefined),
+    removeItem: vi.fn(async () => undefined),
+  },
+}));
+
+import { DEFAULT_APP_SETTINGS } from "@/hooks/use-settings";
+import { setPanelInstanceAttributes } from "@/panels/panel-instance-attributes";
+import {
+  collectAllPanes,
+  collectAllTabs,
+  findPaneById,
+  useWorkspaceLayoutStore,
+} from "@/stores/workspace-layout-store";
+import {
+  openPreferredWorkspacePreview,
+  openPreferredWorkspaceTarget,
+  openWorkspaceTargetBeside,
+} from "@/workspace-tabs/open-beside";
+
+const WORKSPACE_KEY = "server-1:workspace-1";
+
+beforeEach(() => {
+  useWorkspaceLayoutStore.setState({
+    layoutMode: "split-panes",
+    sheetByWorkspace: {},
+    layoutByWorkspace: {},
+    explorerSidebarPaneIdByWorkspace: {},
+    sidePaneIdByWorkspace: {},
+  });
+});
+
+describe("openPreferredWorkspacePreview", () => {
+  it("opens a compact file preview in the sheet instead of replacing the active file tab", () => {
+    const store = useWorkspaceLayoutStore.getState();
+    const fileTabId = store.openTab({
+      workspaceKey: WORKSPACE_KEY,
+      target: { kind: "file", path: "src/open.ts" },
+      intent: "reveal",
+    });
+    store.setLayoutMode("compact");
+
+    const tabId = openPreferredWorkspacePreview({
+      workspaceKey: WORKSPACE_KEY,
+      serverId: "server-1",
+      workspaceId: "workspace-1",
+      explorerSidebarPaneId: "explorer",
+      lastMainPaneId: "main",
+      target: { kind: "file", path: "src/preview.ts" },
+      source: "explorerFiles",
+      preferences: DEFAULT_APP_SETTINGS.openInSidePane,
+    });
+
+    const state = useWorkspaceLayoutStore.getState();
+    expect(state.sheetByWorkspace[WORKSPACE_KEY]?.tab).toMatchObject({
+      tabId,
+      target: { kind: "file", path: "src/preview.ts" },
+    });
+    const root = state.layoutByWorkspace[WORKSPACE_KEY].root;
+    expect(findPaneById(root, "main")?.tabIds).toEqual([fileTabId]);
+    expect(collectAllTabs(root).find((tab) => tab.tabId === fileTabId)?.target).toEqual({
+      kind: "file",
+      path: "src/open.ts",
+    });
+  });
+});
+
+describe("previews under a sheet with unsaved work", () => {
+  const sheetTarget = { kind: "file" as const, path: "src/draft.ts" };
+  let sheetTabId: string | null = null;
+
+  afterEach(() => {
+    if (sheetTabId) {
+      setPanelInstanceAttributes(
+        { serverId: "server-1", workspaceId: "workspace-1", tabId: sheetTabId },
+        { modified: false },
+      );
+    }
+    sheetTabId = null;
+  });
+
+  function previewFile(path: string): string | null {
+    return openPreferredWorkspacePreview({
+      workspaceKey: WORKSPACE_KEY,
+      serverId: "server-1",
+      workspaceId: "workspace-1",
+      explorerSidebarPaneId: "explorer",
+      lastMainPaneId: "main",
+      target: { kind: "file", path },
+      source: "explorerFiles",
+      preferences: DEFAULT_APP_SETTINGS.openInSidePane,
+    });
+  }
+
+  it("reuses one preview tab instead of adding a tab per link", () => {
+    const store = useWorkspaceLayoutStore.getState();
+    store.openTab({
+      workspaceKey: WORKSPACE_KEY,
+      target: { kind: "terminal", terminalId: "term-1" },
+      intent: "reveal",
+    });
+    store.setLayoutMode("compact");
+    sheetTabId = store.openTab({
+      workspaceKey: WORKSPACE_KEY,
+      target: sheetTarget,
+      intent: "reveal",
+    });
+    setPanelInstanceAttributes(
+      { serverId: "server-1", workspaceId: "workspace-1", tabId: sheetTabId ?? "" },
+      { modified: true },
+    );
+
+    const firstPreviewTabId = previewFile("src/first.ts");
+    const secondPreviewTabId = previewFile("src/second.ts");
+
+    const state = useWorkspaceLayoutStore.getState();
+    expect(state.sheetByWorkspace[WORKSPACE_KEY]?.tab.target).toEqual(sheetTarget);
+    expect(secondPreviewTabId).toBe(firstPreviewTabId);
+    const root = state.layoutByWorkspace[WORKSPACE_KEY].root;
+    const tabsById = new Map(collectAllTabs(root).map((tab) => [tab.tabId, tab.target]));
+    expect(findPaneById(root, "main")?.tabIds.map((tabId) => tabsById.get(tabId))).toEqual([
+      { kind: "terminal", terminalId: "term-1" },
+      { kind: "file", path: "src/second.ts" },
+    ]);
+  });
+});
+
+describe("opening beside", () => {
+  const sidePreference = { ...DEFAULT_APP_SETTINGS.openInSidePane, subagents: true };
+
+  function openSubagentWithSidePreference(): string | null {
+    useWorkspaceLayoutStore.getState().openTab({
+      workspaceKey: WORKSPACE_KEY,
+      target: { kind: "file", path: "src/open.ts" },
+      intent: "reveal",
+    });
+    return openPreferredWorkspaceTarget({
+      workspaceKey: WORKSPACE_KEY,
+      target: { kind: "file", path: "src/subagent.ts" },
+      source: "subagents",
+      preferences: sidePreference,
+    });
+  }
+
+  function paneIdHolding(tabId: string | null): string | undefined {
+    const root = useWorkspaceLayoutStore.getState().layoutByWorkspace[WORKSPACE_KEY].root;
+    return collectAllPanes(root).find((pane) => pane.tabIds.includes(tabId ?? ""))?.id;
+  }
+
+  it("follows the side preference where the workspace renders split panes", () => {
+    useWorkspaceLayoutStore.getState().setLayoutMode("split-panes");
+
+    const tabId = openSubagentWithSidePreference();
+
+    const sidePaneId = useWorkspaceLayoutStore.getState().sidePaneIdByWorkspace[WORKSPACE_KEY];
+    expect(sidePaneId).toEqual(expect.any(String));
+    expect(paneIdHolding(tabId)).toBe(sidePaneId);
+  });
+
+  it("keeps a single-pane workspace in one pane despite the side preference", () => {
+    useWorkspaceLayoutStore.getState().setLayoutMode("single-pane");
+
+    const preferredTabId = openSubagentWithSidePreference();
+    const besideTabId = openWorkspaceTargetBeside({
+      workspaceKey: WORKSPACE_KEY,
+      target: { kind: "file", path: "src/beside.ts" },
+    });
+
+    expect(useWorkspaceLayoutStore.getState().sidePaneIdByWorkspace[WORKSPACE_KEY]).toBeFalsy();
+    expect(paneIdHolding(preferredTabId)).toBe("main");
+    expect(paneIdHolding(besideTabId)).toBe("main");
+  });
+});
diff --git a/packages/app/src/workspace-tabs/open-beside.ts b/packages/app/src/workspace-tabs/open-beside.ts
index b36d227c3b..0c0c9ebdf5 100644
--- a/packages/app/src/workspace-tabs/open-beside.ts
+++ b/packages/app/src/workspace-tabs/open-beside.ts
@@ -22,13 +22,11 @@ interface OpenWorkspaceTargetInput {
 }
 
 export interface OpenPreferredWorkspaceTargetInput extends OpenWorkspaceTargetInput {
-  isCompact: boolean;
   source: OpenInSidePaneSource;
   preferences: OpenInSidePanePreferences;
 }
 
 interface OpenWorkspaceTargetAtLocationInput extends OpenWorkspaceTargetInput {
-  isCompact: boolean;
   location: WorkspaceTargetOpenLocation;
 }
 
@@ -39,6 +37,11 @@ interface OpenPreferredWorkspacePreviewInput extends OpenPreferredWorkspaceTarge
   lastMainPaneId: string | null;
 }
 
+/** A side pane exists only where the workspace renders split panes. */
+function canOpenBeside(): boolean {
+  return useWorkspaceLayoutStore.getState().layoutMode === "split-panes";
+}
+
 function resolveMainPane(input: {
   workspaceKey: string;
   explorerSidebarPaneId: string | null;
@@ -86,7 +89,6 @@ export function openPreferredWorkspaceTarget(
   input: OpenPreferredWorkspaceTargetInput,
 ): string | null {
   return openWorkspaceTargetAtLocation({
-    isCompact: input.isCompact,
     workspaceKey: input.workspaceKey,
     target: input.target,
     location: input.preferences[input.source] ? "side" : "main",
@@ -105,7 +107,7 @@ export function openWorkspaceTargetAtLocation(
     layout &&
     collectAllTabs(layout.root).some((tab) => workspaceTabTargetsEqual(tab.target, input.target)),
   );
-  const shouldOpenBeside = !input.isCompact && input.location === "side";
+  const shouldOpenBeside = canOpenBeside() && input.location === "side";
   let placement: WorkspaceTabPlacement | undefined;
   if (shouldOpenBeside && !targetAlreadyExists) {
     const paneId = store.ensureSidePane(input.workspaceKey);
@@ -135,7 +137,13 @@ export function openPreferredWorkspacePreview(
   const existing = collectAllTabs(layout.root).some((tab) =>
     workspaceTabTargetsEqual(tab.target, input.target),
   );
-  if (existing) return openPreferredWorkspaceTarget(input);
+  // The sheet is already a single replaceable slot, so it needs no preview tab.
+  if (
+    existing ||
+    store.opensInSheet({ workspaceKey: input.workspaceKey, target: input.target, intent: "reveal" })
+  ) {
+    return openPreferredWorkspaceTarget(input);
+  }
 
   const mainPane = resolveMainPane({
     workspaceKey: input.workspaceKey,
@@ -143,7 +151,7 @@ export function openPreferredWorkspacePreview(
     lastMainPaneId: input.lastMainPaneId,
   });
   const destinationPaneId =
-    !input.isCompact && input.preferences[input.source]
+    canOpenBeside() && input.preferences[input.source]
       ? store.ensureSidePane(input.workspaceKey)
       : mainPane?.id;
   if (!destinationPaneId) return null;
@@ -173,9 +181,15 @@ export function openPreferredWorkspacePreview(
   });
 }
 
-/** Explicit Open to Side: creates the side pane and places the target there. */
+/**
+ * Explicit Open to Side: creates the side pane and places the target there. Without split panes
+ * the target opens like any other.
+ */
 export function openWorkspaceTargetBeside(input: OpenWorkspaceTargetInput): string | null {
   if (!input.workspaceKey) return null;
+  if (!canOpenBeside()) {
+    return openWorkspaceTargetAtLocation({ ...input, location: "main" });
+  }
   const store = useWorkspaceLayoutStore.getState();
   const paneId = store.ensureSidePane(input.workspaceKey);
   return store.openTab({
diff --git a/packages/app/src/workspace-tabs/open-supporting-view.ts b/packages/app/src/workspace-tabs/open-supporting-view.ts
index b91bf732c9..bb567d4bd0 100644
--- a/packages/app/src/workspace-tabs/open-supporting-view.ts
+++ b/packages/app/src/workspace-tabs/open-supporting-view.ts
@@ -46,7 +46,6 @@ export function openWorkspaceChanges(input: OpenWorkspaceChangesInput): string |
     return null;
   }
   return openPreferredWorkspaceTarget({
-    isCompact: input.isCompact,
     workspaceKey: input.workspaceKey,
     target: { kind: "working_diff" },
     source: "diffs",
@@ -70,7 +69,6 @@ export function openWorkspacePullRequest(input: OpenWorkspacePullRequestInput):
     return null;
   }
   return openWorkspaceTargetAtLocation({
-    isCompact: input.isCompact,
     workspaceKey: input.workspaceKey,
     target: { kind: "pull_request" },
     location: input.destination,

From 0614e96ee0c448d7badb3523ee1560b1847f36ae Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2026 21:12:33 +0000
Subject: [PATCH 142/270] fix(claude): rewind works when the provider sets
 CLAUDE_CONFIG_DIR (#6325)

* fix(claude): rewind a session that lives in the provider's CLAUDE_CONFIG_DIR

Rewinding the conversation forks the Claude session through the SDK's
forkSession, which looks for the transcript under the daemon's own
CLAUDE_CONFIG_DIR or ~/.claude. A provider whose env sets CLAUDE_CONFIG_DIR
has its transcripts elsewhere, so every rewind failed with
"Session <id> not found".

Fork through a session store rooted at the folder of the transcript the
agent already resolves with the provider's config dir, so the SDK reads
the session where Claude Code wrote it and writes the fork beside it.

Closes #6321

* fix(claude): pass only transcript entries to the rewind session store

The session store parsed each transcript line and cast it to a session
entry without checking it. Keep only JSON objects with a string type, and
cover transcripts with non-entry lines in the real-SDK rewind test.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../server/agent/providers/claude/agent.ts    |   4 +-
 .../agent/providers/claude/rewind.test.ts     | 133 +++++++++++++++++-
 .../server/agent/providers/claude/rewind.ts   |  70 ++++++++-
 .../claude/test-rewind-claude-sdk.ts          |   2 +-
 4 files changed, 202 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index 9936969e7d..8ea12610ea 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -2898,9 +2898,11 @@ class ClaudeAgentSession implements AgentSession {
       this.startFreshConversationSession();
       return;
     }
+    const currentSessionId = this.claudeSessionId;
     await revertClaudeConversation({
       sdk: this.rewindSdk,
-      sessionId: this.claudeSessionId,
+      sessionId: currentSessionId,
+      transcriptPath: currentSessionId ? this.resolveHistoryPath(currentSessionId) : null,
       messageId: target.messageId,
       resolveMessageId: (messageId) => this.resolveClaudeMessageId(messageId),
       setSessionId: (sessionId) => {
diff --git a/packages/server/src/server/agent/providers/claude/rewind.test.ts b/packages/server/src/server/agent/providers/claude/rewind.test.ts
index 99243bb9c4..2d6d3853c2 100644
--- a/packages/server/src/server/agent/providers/claude/rewind.test.ts
+++ b/packages/server/src/server/agent/providers/claude/rewind.test.ts
@@ -1,10 +1,15 @@
-import { describe, expect, test } from "vitest";
+import { randomUUID } from "node:crypto";
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { afterEach, describe, expect, test } from "vitest";
 import type { Query } from "@anthropic-ai/claude-agent-sdk";
 
 import {
   revertClaudeConversation,
   revertClaudeConversationAndFiles,
   revertClaudeFiles,
+  realClaudeRewindSdk,
 } from "./rewind.js";
 import { FakeClaudeSdk } from "./test-rewind-claude-sdk.js";
 
@@ -16,6 +21,7 @@ describe("Claude rewind", () => {
     await revertClaudeConversation({
       sdk: claude,
       sessionId,
+      transcriptPath: "/claude/projects/repo/original-session.jsonl",
       messageId: "user-message-1",
       setSessionId: (nextSessionId) => {
         sessionId = nextSessionId;
@@ -33,6 +39,7 @@ describe("Claude rewind", () => {
     await revertClaudeConversation({
       sdk: claude,
       sessionId,
+      transcriptPath: "/claude/projects/repo/original-session.jsonl",
       messageId: "timeline-message-1",
       resolveMessageId: () => "claude-jsonl-message-1",
       setSessionId: (nextSessionId) => {
@@ -76,6 +83,7 @@ describe("Claude rewind", () => {
       sdk: claude,
       query: claude.createQuery() as Query,
       sessionId,
+      transcriptPath: "/claude/projects/repo/original-session.jsonl",
       messageId: "user-message-1",
       setSessionId: (nextSessionId) => {
         sessionId = nextSessionId;
@@ -87,3 +95,126 @@ describe("Claude rewind", () => {
     expect(sessionId).toBe("forked-before-rehydrate");
   });
 });
+
+interface TranscriptLine {
+  type: "user" | "assistant";
+  uuid: string;
+  parentUuid: string | null;
+  text: string;
+}
+
+function writeTranscript(
+  transcriptPath: string,
+  sessionId: string,
+  lines: Array<TranscriptLine | string>,
+): void {
+  const entries = lines.map((line) => {
+    if (typeof line === "string") return line;
+    const { type, uuid, parentUuid, text } = line;
+    return JSON.stringify({
+      type,
+      uuid,
+      parentUuid,
+      sessionId,
+      cwd: "/repo",
+      timestamp: new Date().toISOString(),
+      message: { role: type, content: text },
+    });
+  });
+  writeFileSync(transcriptPath, `${entries.join("\n")}\n`, "utf8");
+}
+
+function readMessageTexts(transcriptPath: string): string[] {
+  const entries = readFileSync(transcriptPath, "utf8")
+    .trim()
+    .split("\n")
+    .map((line) => JSON.parse(line) as { message?: { content: string } });
+  return entries.flatMap((entry) => (entry.message ? [entry.message.content] : []));
+}
+
+describe("Claude rewind against the Claude SDK", () => {
+  let tempRoot: string | null = null;
+  const previousConfigDir = process.env.CLAUDE_CONFIG_DIR;
+
+  afterEach(() => {
+    if (tempRoot) rmSync(tempRoot, { recursive: true, force: true });
+    tempRoot = null;
+    if (previousConfigDir === undefined) {
+      delete process.env.CLAUDE_CONFIG_DIR;
+    } else {
+      process.env.CLAUDE_CONFIG_DIR = previousConfigDir;
+    }
+  });
+
+  test("forks a session that lives in a provider's own CLAUDE_CONFIG_DIR", async () => {
+    tempRoot = mkdtempSync(path.join(tmpdir(), "claude-rewind-config-dir-"));
+    // The provider sets CLAUDE_CONFIG_DIR for Claude Code; the daemon's own environment does not.
+    delete process.env.CLAUDE_CONFIG_DIR;
+    const projectDir = path.join(tempRoot, "custom-claude-dir", "projects", "-repo");
+    mkdirSync(projectDir, { recursive: true });
+    const sessionId = randomUUID();
+    const firstUser = randomUUID();
+    const firstReply = randomUUID();
+    const secondUser = randomUUID();
+    const transcriptPath = path.join(projectDir, `${sessionId}.jsonl`);
+    writeTranscript(transcriptPath, sessionId, [
+      { type: "user", uuid: firstUser, parentUuid: null, text: "first" },
+      { type: "assistant", uuid: firstReply, parentUuid: firstUser, text: "first reply" },
+      { type: "user", uuid: secondUser, parentUuid: firstReply, text: "second" },
+      { type: "assistant", uuid: randomUUID(), parentUuid: secondUser, text: "second reply" },
+    ]);
+    let currentSessionId = sessionId;
+
+    await revertClaudeConversation({
+      sdk: realClaudeRewindSdk,
+      sessionId,
+      transcriptPath,
+      messageId: firstReply,
+      setSessionId: (nextSessionId) => {
+        currentSessionId = nextSessionId;
+      },
+    });
+
+    expect(currentSessionId).not.toBe(sessionId);
+    expect(readMessageTexts(path.join(projectDir, `${currentSessionId}.jsonl`))).toEqual([
+      "first",
+      "first reply",
+    ]);
+  });
+
+  test("skips transcript lines that are not entries when forking", async () => {
+    tempRoot = mkdtempSync(path.join(tmpdir(), "claude-rewind-config-dir-"));
+    delete process.env.CLAUDE_CONFIG_DIR;
+    const projectDir = path.join(tempRoot, "custom-claude-dir", "projects", "-repo");
+    mkdirSync(projectDir, { recursive: true });
+    const sessionId = randomUUID();
+    const firstUser = randomUUID();
+    const firstReply = randomUUID();
+    const transcriptPath = path.join(projectDir, `${sessionId}.jsonl`);
+    writeTranscript(transcriptPath, sessionId, [
+      "null",
+      { type: "user", uuid: firstUser, parentUuid: null, text: "first" },
+      "[1, 2]",
+      '"text"',
+      "{}",
+      { type: "assistant", uuid: firstReply, parentUuid: firstUser, text: "first reply" },
+      { type: "user", uuid: randomUUID(), parentUuid: firstReply, text: "second" },
+    ]);
+    let currentSessionId = sessionId;
+
+    await revertClaudeConversation({
+      sdk: realClaudeRewindSdk,
+      sessionId,
+      transcriptPath,
+      messageId: firstReply,
+      setSessionId: (nextSessionId) => {
+        currentSessionId = nextSessionId;
+      },
+    });
+
+    expect(readMessageTexts(path.join(projectDir, `${currentSessionId}.jsonl`))).toEqual([
+      "first",
+      "first reply",
+    ]);
+  });
+});
diff --git a/packages/server/src/server/agent/providers/claude/rewind.ts b/packages/server/src/server/agent/providers/claude/rewind.ts
index 9c3e3d708d..3b228aacc6 100644
--- a/packages/server/src/server/agent/providers/claude/rewind.ts
+++ b/packages/server/src/server/agent/providers/claude/rewind.ts
@@ -1,29 +1,90 @@
-import { forkSession as claudeForkSession, type Query } from "@anthropic-ai/claude-agent-sdk";
+import { appendFile, readFile } from "node:fs/promises";
+import path from "node:path";
+import {
+  forkSession as claudeForkSession,
+  type Query,
+  type SessionStore,
+  type SessionStoreEntry,
+} from "@anthropic-ai/claude-agent-sdk";
 
 export interface ClaudeRewindSdk {
   forkSession(
     sessionId: string,
-    options: { upToMessageId: string },
+    options: { upToMessageId: string; transcriptPath: string },
   ): Promise<{ sessionId: string }>;
 }
 
+// On its own, the SDK looks for the session under the daemon's CLAUDE_CONFIG_DIR, while a
+// provider can point Claude Code at another one. Forking through a store rooted at the
+// transcript's folder reads the session where Claude Code wrote it and writes the fork beside it.
 export const realClaudeRewindSdk: ClaudeRewindSdk = {
-  forkSession: claudeForkSession,
+  forkSession: (sessionId, options) =>
+    claudeForkSession(sessionId, {
+      upToMessageId: options.upToMessageId,
+      sessionStore: projectFolderSessionStore(path.dirname(options.transcriptPath)),
+    }),
 };
 
+function projectFolderSessionStore(projectFolder: string): SessionStore {
+  const transcriptPath = (sessionId: string) => path.join(projectFolder, `${sessionId}.jsonl`);
+  return {
+    async load({ sessionId }) {
+      let text: string;
+      try {
+        text = await readFile(transcriptPath(sessionId), "utf8");
+      } catch (error) {
+        if ((error as NodeJS.ErrnoException).code === "ENOENT") return null;
+        throw error;
+      }
+      return parseTranscriptEntries(text);
+    },
+    async append({ sessionId }, entries) {
+      const lines = entries.map((entry) => `${JSON.stringify(entry)}\n`).join("");
+      await appendFile(transcriptPath(sessionId), lines, "utf8");
+    },
+  };
+}
+
+function parseTranscriptEntries(text: string): SessionStoreEntry[] {
+  const entries: SessionStoreEntry[] = [];
+  for (const line of text.split("\n")) {
+    if (!line.trim()) continue;
+    let parsed: unknown;
+    try {
+      parsed = JSON.parse(line);
+    } catch {
+      // Skip a line that is not JSON, as the SDK's own transcript reader does.
+      continue;
+    }
+    if (isSessionStoreEntry(parsed)) entries.push(parsed);
+  }
+  return entries;
+}
+
+function isSessionStoreEntry(value: unknown): value is SessionStoreEntry {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    !Array.isArray(value) &&
+    typeof (value as { type?: unknown }).type === "string"
+  );
+}
+
 export async function revertClaudeConversation(input: {
   sdk: ClaudeRewindSdk;
   sessionId: string | null;
+  transcriptPath: string | null;
   messageId: string;
   resolveMessageId?: (messageId: string) => string | Promise<string>;
   setSessionId: (sessionId: string) => void;
 }): Promise<void> {
-  if (!input.sessionId) {
+  if (!input.sessionId || !input.transcriptPath) {
     throw new Error("Claude session is not ready for rewind");
   }
   const messageId = (await input.resolveMessageId?.(input.messageId)) ?? input.messageId;
   const fork = await input.sdk.forkSession(input.sessionId, {
     upToMessageId: messageId,
+    transcriptPath: input.transcriptPath,
   });
   input.setSessionId(fork.sessionId);
 }
@@ -44,6 +105,7 @@ export async function revertClaudeConversationAndFiles(input: {
   sdk: ClaudeRewindSdk;
   query: Query;
   sessionId: string | null;
+  transcriptPath: string | null;
   messageId: string;
   resolveMessageId?: (messageId: string) => string | Promise<string>;
   setSessionId: (sessionId: string) => void;
diff --git a/packages/server/src/server/agent/providers/claude/test-rewind-claude-sdk.ts b/packages/server/src/server/agent/providers/claude/test-rewind-claude-sdk.ts
index 496d3bc209..d607b5c063 100644
--- a/packages/server/src/server/agent/providers/claude/test-rewind-claude-sdk.ts
+++ b/packages/server/src/server/agent/providers/claude/test-rewind-claude-sdk.ts
@@ -12,7 +12,7 @@ export class FakeClaudeSdk implements ClaudeRewindSdk {
 
   async forkSession(
     _sessionId: string,
-    options: { upToMessageId: string },
+    options: { upToMessageId: string; transcriptPath: string },
   ): Promise<{ sessionId: string }> {
     this.recordedForks.push({ upToMessageId: options.upToMessageId });
     return { sessionId: this.nextSessionId };

From 12aaded6c5da2b859db92cfc861d4857dc6185f6 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 01:05:05 +0200
Subject: [PATCH 143/270] fix(app): show the configured label for the xhigh
 thinking option (#6005)

* fix(app): respect provider label for xhigh thinking option

Only fall back to the localized Extra high string for bare forms.
Custom labels such as XHigh (56 | 8m) now render with their suffix.

* fix(app): show Extra high only for a bare xhigh label

A configured xhigh label with extra detail keeps its text; only a label
that is just xhigh or Extra high uses the localized string.

Co-authored-by: Elior Fureraj <efureraj@gmail.com>

---------

Co-authored-by: Elior Fureraj <efureraj@gmail.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/src/agent-controls/labels.test.ts | 11 +++++++++++
 packages/app/src/agent-controls/labels.ts      |  3 +--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/agent-controls/labels.test.ts b/packages/app/src/agent-controls/labels.test.ts
index 4f1302fd1b..7310464896 100644
--- a/packages/app/src/agent-controls/labels.test.ts
+++ b/packages/app/src/agent-controls/labels.test.ts
@@ -29,4 +29,15 @@ describe("formatThinkingOptionLabel", () => {
     expect(formatThinkingOptionLabel({ id: "think-hard", label: "think-hard" })).toBe("Think hard");
     expect(formatThinkingOptionLabel({ id: "xhigh", label: "XHigh" })).toBe("Extra high");
   });
+
+  it("preserves provider-supplied xhigh labels with extra detail", () => {
+    expect(formatThinkingOptionLabel({ id: "xhigh", label: "XHigh (56 | 8m)" })).toBe(
+      "X high (56 | 8m)",
+    );
+    expect(formatThinkingOptionLabel({ id: "xhigh", label: "XHigh (45 | 6m)" })).toBe(
+      "X high (45 | 6m)",
+    );
+    expect(formatThinkingOptionLabel({ id: "xhigh" })).toBe("Extra high");
+    expect(formatThinkingOptionLabel({ id: "xhigh", label: "Extra high" })).toBe("Extra high");
+  });
 });
diff --git a/packages/app/src/agent-controls/labels.ts b/packages/app/src/agent-controls/labels.ts
index ff32aaf4dc..704298f78c 100644
--- a/packages/app/src/agent-controls/labels.ts
+++ b/packages/app/src/agent-controls/labels.ts
@@ -34,10 +34,9 @@ export function formatAgentModeLabel(mode: ControlLabelInput): string {
 
 export function formatThinkingOptionLabel(option: ControlLabelInput): string {
   const rawLabel = (option.label ?? option.id).trim();
-  const compactId = option.id.replace(/[\s_-]+/g, "").toLowerCase();
   const compactLabel = rawLabel.replace(/[\s_-]+/g, "").toLowerCase();
 
-  if (compactId === "xhigh" || compactLabel === "xhigh") {
+  if (compactLabel === "xhigh" || compactLabel === "extrahigh") {
     return i18n.t("agentControls.thinking.extraHigh");
   }
 

From b1a638482d3f26a2e3c767f14d62cd0c791e715a Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 02:05:44 +0200
Subject: [PATCH 144/270] Cover child completion before create_agent returns
 (#6008)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds a regression test for #5928: a child that finishes its initial turn before its turn start returns still sends one finish notification to its parent. The fix itself is on main from 0009a7e.

Co-authored-by: Ahmet İzgi <ahmetizgi@gmail.com>
---
 .../src/server/agent/mcp-server.test.ts       | 60 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/server/agent/mcp-server.test.ts b/packages/server/src/server/agent/mcp-server.test.ts
index f1311d31e2..de0099cecf 100644
--- a/packages/server/src/server/agent/mcp-server.test.ts
+++ b/packages/server/src/server/agent/mcp-server.test.ts
@@ -3296,6 +3296,50 @@ describe("create_agent MCP tool", () => {
     );
   });
 
+  it("notifies the caller when a created child finishes its initial turn before the turn start returns", async () => {
+    const workdir = await mkdtemp(join(tmpdir(), "mcp-create-fast-child-"));
+    const storage = new AgentStorage(join(workdir, "agents"), logger);
+    const parentClient = new HeldTurnAgentClient("claude", false);
+    const childClient = new HeldTurnAgentClient("codex", false, { finishTurnsDuringStart: true });
+    const agentManager = new AgentManager({
+      clients: { claude: parentClient, codex: childClient },
+      registry: storage,
+      logger,
+    });
+
+    try {
+      const parent = await agentManager.createAgent(
+        { provider: "claude", cwd: existingCwd },
+        undefined,
+        { workspaceId: "wks_parent" },
+      );
+      const server = await createAgentMcpServer({
+        agentManager,
+        agentStorage: storage,
+        callerAgentId: parent.id,
+        providerSnapshotManager: createOpenCodeManager().manager,
+        logger,
+      });
+
+      const response = await invokeToolWithParsedInput(registeredTool(server, "create_agent"), {
+        ...subagentCurrentWorkspace(),
+        title: "Fast Child",
+        provider: "codex/gpt-5.4",
+        initialPrompt: "Finish immediately",
+      });
+      const childId = z.object({ agentId: z.string() }).parse(response.structuredContent).agentId;
+
+      await vi.waitFor(() => {
+        const parentPrompts = parentClient.sessions[0]!.prompts;
+        expect(parentPrompts).toHaveLength(1);
+        expect(parentPrompts[0]).toContain(childId);
+        expect(parentPrompts[0]).toContain("finished");
+      });
+    } finally {
+      await removeAgentStateDir(agentManager, storage, workdir);
+    }
+  });
+
   it("creates detached caller agents without a parent label", async () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
@@ -3770,6 +3814,11 @@ const HELD_TURN_CAPABILITIES = {
   supportsToolInvocations: false,
 } as const;
 
+interface HeldTurnOptions {
+  /** Run the whole turn before the turn-start request returns. */
+  finishTurnsDuringStart?: boolean;
+}
+
 /**
  * Provider session that records every prompt it receives. With `holdTurns`, a started
  * turn stays running until `finishTurn()` so a caller's bounded wait can run out first.
@@ -3786,6 +3835,7 @@ class HeldTurnAgentSession implements AgentSession {
   constructor(
     readonly provider: AgentProvider,
     private readonly holdTurns: boolean,
+    private readonly options: HeldTurnOptions = {},
   ) {}
 
   /** Hold the next turn's acknowledgment, as a provider awaiting its turn-start request does. */
@@ -3819,6 +3869,13 @@ class HeldTurnAgentSession implements AgentSession {
       throw error;
     }
     const turnId = randomUUID();
+    if (this.options.finishTurnsDuringStart) {
+      // The whole turn runs before the turn-start request returns, as a provider whose
+      // start acknowledgment arrives together with the turn's completion does.
+      this.pushEvent({ type: "turn_started", provider: this.provider, turnId });
+      this.pushEvent({ type: "turn_completed", provider: this.provider, turnId });
+      return { turnId };
+    }
     this.activeTurnId = turnId;
     this.pushEvent({
       type: "timeline",
@@ -3926,6 +3983,7 @@ class HeldTurnAgentClient implements AgentClient {
   constructor(
     readonly provider: AgentProvider,
     private readonly holdTurns: boolean,
+    private readonly options: HeldTurnOptions = {},
   ) {}
 
   async isAvailable(): Promise<boolean> {
@@ -3933,7 +3991,7 @@ class HeldTurnAgentClient implements AgentClient {
   }
 
   async createSession(): Promise<AgentSession> {
-    const session = new HeldTurnAgentSession(this.provider, this.holdTurns);
+    const session = new HeldTurnAgentSession(this.provider, this.holdTurns, this.options);
     this.sessions.push(session);
     return session;
   }

From bd9af256bdbd29815c90e98fb352c0ceb4e8e31c Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 03:06:36 +0200
Subject: [PATCH 145/270] Keep a symlinked config.json linked when Paseo saves
 it (#6023)

* fix(server): keep a symlinked config.json linked when saving

Paseo saved config.json by renaming a temporary file over its path, which
replaced a symlink with a regular file and left the linked file unchanged.
Private file writes now resolve the symlink and replace the file it points at.

Closes #5932

* test(server): check a symlinked config.json stays private

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/persisted-config.test.ts       | 44 ++++++++++++++++++-
 packages/server/src/server/private-files.ts   | 23 +++++++---
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/server/persisted-config.test.ts b/packages/server/src/server/persisted-config.test.ts
index f443f84865..4c626fde8f 100644
--- a/packages/server/src/server/persisted-config.test.ts
+++ b/packages/server/src/server/persisted-config.test.ts
@@ -1,4 +1,14 @@
-import { chmodSync, mkdtempSync, rmSync, statSync, writeFileSync } from "node:fs";
+import {
+  chmodSync,
+  lstatSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  statSync,
+  symlinkSync,
+  writeFileSync,
+} from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { describe, expect, test } from "vitest";
@@ -843,3 +853,35 @@ describe.skipIf(process.platform === "win32")("persisted config file permissions
     }
   });
 });
+
+describe.skipIf(process.platform === "win32")(
+  "config.json symlinked from another directory",
+  () => {
+    test("saving writes through the symlink and leaves it in place", () => {
+      const parent = createTempHome();
+      const home = path.join(parent, "home");
+      const dotfiles = path.join(parent, "dotfiles");
+      const linkedConfigPath = path.join(dotfiles, "config.json");
+      const configPath = path.join(home, "config.json");
+      try {
+        mkdirSync(home);
+        mkdirSync(dotfiles, { mode: 0o755 });
+        chmodSync(dotfiles, 0o755);
+        writeFileSync(linkedConfigPath, '{ "version": 1 }\n');
+        symlinkSync(linkedConfigPath, configPath);
+
+        savePersistedConfig(home, { version: 1, daemon: { relay: { enabled: false } } });
+
+        expect(lstatSync(configPath).isSymbolicLink()).toBe(true);
+        expect(JSON.parse(readFileSync(linkedConfigPath, "utf8"))).toEqual({
+          version: 1,
+          daemon: { relay: { enabled: false } },
+        });
+        expect(modeOf(dotfiles)).toBe(0o755);
+        expect(modeOf(linkedConfigPath)).toBe(PRIVATE_FILE_MODE);
+      } finally {
+        rmSync(parent, { recursive: true, force: true });
+      }
+    });
+  },
+);
diff --git a/packages/server/src/server/private-files.ts b/packages/server/src/server/private-files.ts
index 8b162f292b..0e12457be1 100644
--- a/packages/server/src/server/private-files.ts
+++ b/packages/server/src/server/private-files.ts
@@ -1,4 +1,4 @@
-import { chmodSync, mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { chmodSync, mkdirSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { randomUUID } from "node:crypto";
 import path from "node:path";
 
@@ -28,14 +28,27 @@ export function writePrivateFileAtomicSync(
   data: string | NodeJS.ArrayBufferView,
 ): void {
   ensurePrivateDirectory(path.dirname(filePath));
-  const parent = path.dirname(filePath);
-  const temporary = path.join(parent, `.${path.basename(filePath)}.${process.pid}.${randomUUID()}`);
+  const destination = resolveSymlinkedFile(filePath);
+  const temporary = path.join(
+    path.dirname(destination),
+    `.${path.basename(destination)}.${process.pid}.${randomUUID()}`,
+  );
   try {
     writeFileSync(temporary, data, { mode: PRIVATE_FILE_MODE });
-    renameSync(temporary, filePath);
-    ensurePrivateFile(filePath);
+    renameSync(temporary, destination);
+    ensurePrivateFile(destination);
   } catch (error) {
     rmSync(temporary, { force: true });
     throw error;
   }
 }
+
+// Renaming onto a symlink replaces the link, so write to the file it points at.
+function resolveSymlinkedFile(filePath: string): string {
+  try {
+    return realpathSync(filePath);
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") return filePath;
+    throw error;
+  }
+}

From a4b15455b7c2ff82bee656f93c53d4895a57118c Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 03:55:27 +0200
Subject: [PATCH 146/270] fix(cli): list every agent in paseo agent ls, past
 the first 200 (#6033)

* fix(cli): list every agent page in agent ls

agent ls made one fetch_agents call and ignored pageInfo.nextCursor, so
it stopped at the daemon's default page of 200 agents without saying
more existed. Follow the cursor until the daemon reports no next page,
as workspace ls and agent delete already do.

Co-authored-by: HTeo <hteo1337@gmail.com>

* fix(cli): page agent ls in creation order

fetch_agents defaults to updated_at order, so an agent that updated
after the first page moved ahead of the cursor and was skipped. Page by
created_at, which never changes; ls sorts the rows itself afterwards.

* test(cli): exercise agent listing with a supplied client

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: HTeo <hteo1337@gmail.com>
---
 packages/cli/src/commands/agent/ls.test.ts | 67 +++++++++++++++++++++-
 packages/cli/src/commands/agent/ls.ts      | 34 ++++++++++-
 2 files changed, 97 insertions(+), 4 deletions(-)

diff --git a/packages/cli/src/commands/agent/ls.test.ts b/packages/cli/src/commands/agent/ls.test.ts
index 8aedf73fad..76b1787ce3 100644
--- a/packages/cli/src/commands/agent/ls.test.ts
+++ b/packages/cli/src/commands/agent/ls.test.ts
@@ -1,5 +1,60 @@
 import { describe, expect, it } from "vitest";
-import { buildAgentLsFetchOptions } from "./ls.js";
+import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
+import { buildAgentLsFetchOptions, listAgents } from "./ls.js";
+
+const daemonTarget = { kind: "endpoint" as const, host: "example.test:12345" };
+
+function createPagingClient() {
+  const daemonAgents: AgentSnapshotPayload[] = [3, 2, 1].map((n) => ({
+    id: `${n}${n}${n}${n}${n}${n}${n}${n}-0000-4000-8000-000000000000`,
+    provider: "codex",
+    title: `agent ${n}`,
+    status: "closed",
+    archivedAt: null,
+    cwd: "/tmp/project",
+    createdAt: `2026-10-0${n}T00:00:00.000Z`,
+    updatedAt: `2026-10-0${n}T00:00:00.000Z`,
+    labels: {},
+    model: null,
+    lastUserMessageAt: null,
+    currentModeId: null,
+    availableModes: [],
+    pendingPermissions: [],
+    persistence: null,
+    capabilities: {
+      supportsStreaming: true,
+      supportsSessionPersistence: true,
+      supportsDynamicModes: false,
+      supportsMcpServers: true,
+      supportsReasoningStream: true,
+      supportsToolInvocations: true,
+    },
+  }));
+
+  // The fake daemon pages two agents at a time, newest first by the requested key
+  // (updated_at by default), and agent 1 is updated right after the first page is served.
+  const fetchAgents = async (options?: {
+    sort?: { key: string }[];
+    page?: { cursor?: string };
+  }) => {
+    const key: "createdAt" | "updatedAt" =
+      options?.sort?.[0]?.key === "created_at" ? "createdAt" : "updatedAt";
+    const cursor = options?.page?.cursor;
+    const ordered = daemonAgents
+      .filter((agent) => cursor === undefined || agent[key] < cursor)
+      .sort((left, right) => right[key].localeCompare(left[key]));
+    const page = ordered.slice(0, 2);
+    const hasMore = ordered.length > 2;
+    if (cursor === undefined) {
+      daemonAgents[2]!.updatedAt = "2026-10-09T00:00:00.000Z";
+    }
+    return {
+      entries: page.map((agent) => ({ agent })),
+      pageInfo: { nextCursor: hasMore ? page[page.length - 1]![key] : null },
+    };
+  };
+  return { fetchAgents, close: async () => {} };
+}
 
 describe("buildAgentLsFetchOptions", () => {
   it("fetches active agents by default", () => {
@@ -66,3 +121,13 @@ describe("buildAgentLsFetchOptions", () => {
     });
   });
 });
+
+describe("runLsCommand", () => {
+  it("lists agents on every page, including one updated during the listing", async () => {
+    const result = await listAgents({ daemonTarget, all: true, global: true }, async () =>
+      createPagingClient(),
+    );
+
+    expect(result.data.map((item) => item.name)).toEqual(["agent 3", "agent 2", "agent 1"]);
+  });
+});
diff --git a/packages/cli/src/commands/agent/ls.ts b/packages/cli/src/commands/agent/ls.ts
index 0990446bc5..55674a2f87 100644
--- a/packages/cli/src/commands/agent/ls.ts
+++ b/packages/cli/src/commands/agent/ls.ts
@@ -165,6 +165,14 @@ export function buildAgentLsFetchOptions(
   return fetchOptions;
 }
 
+interface AgentLsClient {
+  fetchAgents(options?: FetchAgentsOptions): Promise<{
+    entries: { agent: AgentSnapshotPayload }[];
+    pageInfo: { nextCursor: string | null };
+  }>;
+  close(): Promise<void>;
+}
+
 /**
  * Agent ls command semantics:
  * - `paseo agent ls`    → active non-archived agents
@@ -176,7 +184,16 @@ export async function runLsCommand(
   options: AgentLsOptions,
   _command: Command,
 ): Promise<AgentLsResult> {
-  const client = await connectToDaemon({ target: options.daemonTarget });
+  return listAgents(options);
+}
+
+export async function listAgents(
+  options: AgentLsOptions,
+  connect: (
+    options: Parameters<typeof connectToDaemon>[0],
+  ) => Promise<AgentLsClient> = connectToDaemon,
+): Promise<AgentLsResult> {
+  const client = await connect({ target: options.daemonTarget });
 
   try {
     const normalizedThinkingOptionId = options.thinking?.trim();
@@ -189,8 +206,19 @@ export async function runLsCommand(
     }
 
     const labelFilters = parseLabelFilters(options.label);
-    const fetchPayload = await client.fetchAgents(buildAgentLsFetchOptions(options));
-    let agents = fetchPayload.entries.map((entry) => entry.agent);
+    const fetchOptions = buildAgentLsFetchOptions(options);
+    let agents: AgentSnapshotPayload[] = [];
+    let cursor: string | undefined;
+    // createdAt never changes, so agents cannot move past the cursor while the pages are read.
+    do {
+      const payload = await client.fetchAgents({
+        ...fetchOptions,
+        sort: [{ key: "created_at", direction: "desc" }],
+        page: { limit: 200, ...(cursor ? { cursor } : {}) },
+      });
+      agents.push(...payload.entries.map((entry) => entry.agent));
+      cursor = payload.pageInfo.nextCursor ?? undefined;
+    } while (cursor);
 
     // By default, exclude archived agents. `-a` includes them.
     if (!options.all) {

From a4f1df3aedc49dee97ab3f659ba067aa2a0ddc1f Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 05:10:35 +0200
Subject: [PATCH 147/270] Let voice mode TTS use the model and voice an
 OpenAI-compatible server serves (#6060)

* fix(server): accept voice and model names from self-hosted speech servers

features.voiceMode.tts.voice and TTS_VOICE were validated against the
OpenAI voice catalog, so a server whose voices live under other names
could not be configured at all: config.json failed to parse and an env
var threw inside the speech config resolver, which config.ts calls
without a catch, so the daemon refused to start. TTS_MODEL had the same
problem for model ids the server serves itself. Both are free-form now,
with model ids keeping their case because rosters use values like
kokoro-v1:Q8_0. Regenerate the config JSON schema.

* fix(server): send TTS voice names as written and keep the config schema current

A self-hosted OpenAI-compatible server owns its voice ids and their case, so
lowercasing the configured voice could turn a valid id into one the server
does not know. Keep the published config schema in its existing form and
change only the voice field.

Co-authored-by: khimaros <me@khimaros.com>

* fix(server): drop the TTS baseUrl from the init log

The configured baseUrl can carry a token in its query string, and logging
it is not needed to accept self-hosted voice and model names.

* test(server): await bounded worktree fixture cleanup on Windows

---------

Co-authored-by: khimaros <me@khimaros.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/server/.env.example                  |  5 +--
 .../src/server/persisted-config.test.ts       | 13 +++++++
 .../server/src/server/persisted-config.ts     |  3 +-
 .../speech/providers/openai/config.test.ts    | 36 +++++++++++++++++++
 .../server/speech/providers/openai/config.ts  | 16 +++------
 .../src/server/speech/providers/openai/tts.ts |  4 +--
 packages/server/src/utils/worktree.test.ts    |  5 +--
 .../public/schemas/paseo.config.v1.json       |  2 +-
 8 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/packages/server/.env.example b/packages/server/.env.example
index ba031a16b5..55a2bded69 100644
--- a/packages/server/.env.example
+++ b/packages/server/.env.example
@@ -11,9 +11,10 @@ OPENAI_TTS_BASE_URL=
 
 # TTS Configuration (optional - defaults shown)
 TTS_VOICE=alloy
-# Available voices: alloy, echo, fable, onyx, nova, shimmer
+# Any voice the server knows: OpenAI ships alloy, echo, fable, onyx, nova, shimmer
 TTS_MODEL=tts-1
-# Available models: tts-1 (faster), tts-1-hd (higher quality)
+# OpenAI ships tts-1 (faster) and tts-1-hd (higher quality); self-hosted
+# servers accept whatever model id they serve. Case sensitive.
 
 # Server Configuration
 # Location for runtime state (agents.json, etc.). Defaults to ~/.paseo
diff --git a/packages/server/src/server/persisted-config.test.ts b/packages/server/src/server/persisted-config.test.ts
index 4c626fde8f..6b23a6f365 100644
--- a/packages/server/src/server/persisted-config.test.ts
+++ b/packages/server/src/server/persisted-config.test.ts
@@ -674,6 +674,19 @@ describe("PersistedConfigSchema voice mode config", () => {
     expect(parsed.features?.dictation?.stt?.language).toBe("fr");
     expect(parsed.features?.voiceMode?.stt?.language).toBe("de");
   });
+
+  test("accepts a voice and model from a self-hosted OpenAI-compatible server", () => {
+    const parsed = PersistedConfigSchema.parse({
+      features: {
+        voiceMode: {
+          tts: { provider: "openai", model: "kokoro-v1:Q8_0", voice: "aiden" },
+        },
+      },
+    });
+
+    expect(parsed.features?.voiceMode?.tts?.model).toBe("kokoro-v1:Q8_0");
+    expect(parsed.features?.voiceMode?.tts?.voice).toBe("aiden");
+  });
 });
 
 describe("loadPersistedConfig", () => {
diff --git a/packages/server/src/server/persisted-config.ts b/packages/server/src/server/persisted-config.ts
index 4998455713..11d94495b1 100644
--- a/packages/server/src/server/persisted-config.ts
+++ b/packages/server/src/server/persisted-config.ts
@@ -144,7 +144,8 @@ const FeatureVoiceModeSchema = z
       .object({
         provider: SpeechProviderIdSchema.optional(),
         model: z.string().min(1).optional(),
-        voice: z.enum(["alloy", "echo", "fable", "onyx", "nova", "shimmer"]).optional(),
+        // Free-form: self-hosted OpenAI-compatible servers expose their own voice names.
+        voice: z.string().trim().min(1).optional(),
         speakerId: z.number().int().optional(),
         speed: z.number().optional(),
       })
diff --git a/packages/server/src/server/speech/providers/openai/config.test.ts b/packages/server/src/server/speech/providers/openai/config.test.ts
index 55da430edc..1f3433a347 100644
--- a/packages/server/src/server/speech/providers/openai/config.test.ts
+++ b/packages/server/src/server/speech/providers/openai/config.test.ts
@@ -203,4 +203,40 @@ describe("resolveOpenAiSpeechConfig", () => {
     expect(resolved?.stt?.apiKey).toBe("stt-only-key");
     expect(resolved?.tts).toBeUndefined();
   });
+
+  test("sends the model and voice an OpenAI-compatible server serves, as written", () => {
+    const persisted = PersistedConfigSchema.parse({
+      providers: {
+        openai: { tts: { apiKey: "tts-key", baseUrl: "https://tts.example.com/v1" } },
+      },
+      features: {
+        voiceMode: { tts: { provider: "openai", model: "kokoro-v1:Q8_0", voice: "Aiden" } },
+      },
+    });
+
+    const resolved = resolveOpenAiSpeechConfig({
+      env: {} as NodeJS.ProcessEnv,
+      persisted,
+      providers: ALL_OPENAI,
+    });
+
+    expect(resolved?.tts?.model).toBe("kokoro-v1:Q8_0");
+    expect(resolved?.tts?.voice).toBe("Aiden");
+  });
+
+  test("accepts OpenAI's own gpt-4o-mini-tts model", () => {
+    const persisted = PersistedConfigSchema.parse({
+      providers: { openai: { tts: { apiKey: "tts-key" } } },
+      features: { voiceMode: { tts: { provider: "openai", model: "gpt-4o-mini-tts" } } },
+    });
+
+    const resolved = resolveOpenAiSpeechConfig({
+      env: {} as NodeJS.ProcessEnv,
+      persisted,
+      providers: ALL_OPENAI,
+    });
+
+    expect(resolved?.tts?.model).toBe("gpt-4o-mini-tts");
+    expect(resolved?.tts?.voice).toBe("alloy");
+  });
 });
diff --git a/packages/server/src/server/speech/providers/openai/config.ts b/packages/server/src/server/speech/providers/openai/config.ts
index ac8d2ffa3a..efb25bffaf 100644
--- a/packages/server/src/server/speech/providers/openai/config.ts
+++ b/packages/server/src/server/speech/providers/openai/config.ts
@@ -12,10 +12,6 @@ export interface OpenAiSpeechProviderConfig {
   tts?: Partial<TTSConfig> & { apiKey?: string };
 }
 
-const OpenAiTtsVoiceSchema = z.enum(["alloy", "echo", "fable", "onyx", "nova", "shimmer"]);
-
-const OpenAiTtsModelSchema = z.enum(["tts-1", "tts-1-hd"]);
-
 const NumberLikeSchema = z.union([z.number(), z.string().trim().min(1)]);
 
 const OptionalFiniteNumberSchema = NumberLikeSchema.pipe(
@@ -44,14 +40,12 @@ const OpenAiSttOptionsSchema = z.object({
   sttModel: OptionalTrimmedStringSchema,
 });
 
+// Voice and model are free-form so a self-hosted server can use its own ids; the
+// OpenAI catalog is only the default. Both are sent as written, because the
+// server owns those ids and their case (rosters use ids like kokoro-v1:Q8_0).
 const OpenAiTtsOptionsSchema = z.object({
-  ttsVoice: z.string().trim().toLowerCase().pipe(OpenAiTtsVoiceSchema).default("alloy"),
-  ttsModel: z
-    .string()
-    .trim()
-    .toLowerCase()
-    .pipe(OpenAiTtsModelSchema)
-    .default(DEFAULT_OPENAI_TTS_MODEL),
+  ttsVoice: z.string().trim().default("alloy"),
+  ttsModel: z.string().trim().default(DEFAULT_OPENAI_TTS_MODEL),
 });
 
 function isOpenAiProviderActive(provider: { enabled?: boolean; provider: string }): boolean {
diff --git a/packages/server/src/server/speech/providers/openai/tts.ts b/packages/server/src/server/speech/providers/openai/tts.ts
index 6cc7e5c5bb..31f7b5b263 100644
--- a/packages/server/src/server/speech/providers/openai/tts.ts
+++ b/packages/server/src/server/speech/providers/openai/tts.ts
@@ -8,8 +8,8 @@ export type { SpeechStreamResult };
 export interface TTSConfig {
   apiKey: string;
   baseUrl?: string;
-  model?: "tts-1" | "tts-1-hd";
-  voice?: "alloy" | "echo" | "fable" | "onyx" | "nova" | "shimmer";
+  model?: "tts-1" | "tts-1-hd" | (string & {});
+  voice?: "alloy" | "echo" | "fable" | "onyx" | "nova" | "shimmer" | (string & {});
   responseFormat?: "mp3" | "opus" | "aac" | "flac" | "wav" | "pcm";
 }
 
diff --git a/packages/server/src/utils/worktree.test.ts b/packages/server/src/utils/worktree.test.ts
index 479d4cfeab..9b0cba2643 100644
--- a/packages/server/src/utils/worktree.test.ts
+++ b/packages/server/src/utils/worktree.test.ts
@@ -10,6 +10,7 @@ import {
   type WorktreeConfig,
 } from "./worktree";
 import { execFileSync } from "child_process";
+import { rm } from "node:fs/promises";
 import {
   mkdtempSync,
   mkdirSync,
@@ -89,8 +90,8 @@ describe("paseo worktree manager", () => {
     });
   });
 
-  afterEach(() => {
-    rmSync(tempDir, { recursive: true, force: true });
+  afterEach(async () => {
+    await rm(tempDir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
   });
 
   it("treats a worktree as paseo-owned even when its .git admin is missing", async () => {
diff --git a/packages/website/public/schemas/paseo.config.v1.json b/packages/website/public/schemas/paseo.config.v1.json
index 415d307ca0..0ba1cdbc7f 100644
--- a/packages/website/public/schemas/paseo.config.v1.json
+++ b/packages/website/public/schemas/paseo.config.v1.json
@@ -711,7 +711,7 @@
                 },
                 "voice": {
                   "type": "string",
-                  "enum": ["alloy", "echo", "fable", "onyx", "nova", "shimmer"]
+                  "minLength": 1
                 },
                 "speakerId": {
                   "type": "integer",

From 4a3ff87eecb2540ec0c67db37caecd50a9690bd1 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 06:10:51 +0200
Subject: [PATCH 148/270] fix(omp): show manual /compact progress and refresh
 the context meter (#6106)

* fix(omp): show manual compaction progress and refresh context usage

OMP answers a manual compact with its RPC response alone, without
compaction_start or compaction_end, so /compact on an OMP agent showed no
row and left the context meter at the pre-compaction value until the next
turn. The compact request now emits the loading and completed rows itself
and publishes the session's context usage once it returns.

The fake OMP runtime no longer emits compaction events for a manual
compact, matching what OMP sends.

Closes #5966

* fix(omp): keep a running turn's usage polling through a manual compact

Refresh the compacted context usage without ending the active turn's
poll, wait for the usage update in the real OMP test, and cover a failed
manual compact.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../server/agent/providers/omp/agent.test.ts  |  49 +++++++++
 .../src/server/agent/providers/omp/agent.ts   | 104 ++++++------------
 .../providers/omp/test-utils/fake-omp.ts      |   6 +-
 .../providers/omp/test-utils/omp-harness.ts   |  19 +++-
 .../agent/providers/omp/usage-poller.test.ts  |  21 ++++
 .../agent/providers/omp/usage-poller.ts       |  11 ++
 .../server/daemon-e2e/omp.real.e2e.test.ts    |  67 ++++++++++-
 7 files changed, 199 insertions(+), 78 deletions(-)

diff --git a/packages/server/src/server/agent/providers/omp/agent.test.ts b/packages/server/src/server/agent/providers/omp/agent.test.ts
index c0e6193bb5..a1dc9130a8 100644
--- a/packages/server/src/server/agent/providers/omp/agent.test.ts
+++ b/packages/server/src/server/agent/providers/omp/agent.test.ts
@@ -215,6 +215,55 @@ function createToolCatalog(): PaseoToolCatalog {
 }
 
 describe("OMP agent client and session", () => {
+  test("failed manual compact closes its progress row and shows the error", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+
+    const events = await omp.compact({}, new Error("compaction refused"));
+
+    expect(events).toEqual([
+      expect.objectContaining({
+        item: { type: "compaction", status: "loading", trigger: "manual" },
+      }),
+      expect.objectContaining({
+        item: { type: "compaction", status: "completed", trigger: "manual" },
+      }),
+      expect.objectContaining({
+        item: {
+          type: "assistant_message",
+          text: "[Error] Failed to compact context: compaction refused",
+        },
+      }),
+    ]);
+  });
+
+  test("manual compact shows its progress and publishes the compacted context usage", async () => {
+    const omp = new OmpHarness();
+    await omp.start();
+
+    const events = await omp.compact({
+      contextUsage: { tokens: 13_447, contextWindow: 272_000 },
+    });
+
+    expect(events).toEqual([
+      expect.objectContaining({
+        type: "timeline",
+        item: { type: "compaction", status: "loading", trigger: "manual" },
+      }),
+      expect.objectContaining({
+        type: "timeline",
+        item: { type: "compaction", status: "completed", trigger: "manual" },
+      }),
+      expect.objectContaining({
+        type: "usage_updated",
+        usage: expect.objectContaining({
+          contextWindowUsedTokens: 13_447,
+          contextWindowMaxTokens: 272_000,
+        }),
+      }),
+    ]);
+  });
+
   test("owns launch configuration and registers native host tools", async () => {
     const omp = new OmpHarness();
     await omp.start({ modeId: "ask" }, createToolCatalog());
diff --git a/packages/server/src/server/agent/providers/omp/agent.ts b/packages/server/src/server/agent/providers/omp/agent.ts
index 2dc6c58dea..5413364cdb 100644
--- a/packages/server/src/server/agent/providers/omp/agent.ts
+++ b/packages/server/src/server/agent/providers/omp/agent.ts
@@ -714,9 +714,7 @@ export class OmpAgentSession implements AgentSession {
   private readonly pendingPromptResults = new Map<string, OmpPromptResult>();
   private pendingNoTurnCompletionAbort: AbortController | null = null;
   private lastKnownThinkingOptionId: string | null;
-  private outOfBandCompactionEmit: ((event: AgentStreamEvent) => void) | null = null;
-  private outOfBandCompactionStarted = false;
-  private outOfBandCompactionCompleted = false;
+  private manualCompactionRunning = false;
   private commandCache: AgentSlashCommand[] | null = null;
   private readonly subagentIndex = new OmpSubagentIndex();
   private readonly subagentCardTracker: OmpSubagentCardTracker;
@@ -1407,30 +1405,24 @@ export class OmpAgentSession implements AgentSession {
     customInstructions: string | undefined,
     emit: (event: AgentStreamEvent) => void,
   ): Promise<void> {
-    if (this.outOfBandCompactionEmit) {
+    if (this.manualCompactionRunning) {
       throw new Error("An OMP compact command is already running");
     }
-    this.outOfBandCompactionEmit = emit;
-    this.outOfBandCompactionStarted = false;
-    this.outOfBandCompactionCompleted = false;
+    // OMP answers a manual compact with its RPC response alone, without
+    // compaction_start or compaction_end, so the request owns both rows.
+    this.manualCompactionRunning = true;
+    const emitCompaction = (status: "loading" | "completed") =>
+      emit({
+        type: "timeline",
+        provider: this.provider,
+        item: { type: "compaction", status, trigger: "manual" },
+      });
+    emitCompaction("loading");
     try {
       await this.runtimeSession.compact(customInstructions);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      if (
-        this.outOfBandCompactionEmit === emit &&
-        this.outOfBandCompactionStarted &&
-        !this.outOfBandCompactionCompleted
-      ) {
-        this.emitCompactionTimeline({
-          turnId: undefined,
-          item: {
-            type: "compaction",
-            status: "completed",
-            trigger: "manual",
-          },
-        });
-      }
+      emitCompaction("completed");
       emit({
         type: "timeline",
         provider: this.provider,
@@ -1439,13 +1431,12 @@ export class OmpAgentSession implements AgentSession {
           text: `[Error] Failed to compact context: ${message}`,
         },
       });
+      return;
     } finally {
-      if (this.outOfBandCompactionEmit === emit && !this.outOfBandCompactionStarted) {
-        this.outOfBandCompactionEmit = null;
-        this.outOfBandCompactionStarted = false;
-        this.outOfBandCompactionCompleted = false;
-      }
+      this.manualCompactionRunning = false;
     }
+    emitCompaction("completed");
+    await this.usagePoller.refresh();
   }
 
   private async executeAutoCompactCommand(
@@ -1853,24 +1844,8 @@ export class OmpAgentSession implements AgentSession {
         return;
       }
       case "compaction_start":
-        this.emitCompactionTimeline({
-          turnId,
-          item: {
-            type: "compaction",
-            status: "loading",
-            trigger: event.reason === "manual" ? "manual" : "auto",
-          },
-        });
-        return;
       case "compaction_end":
-        this.emitCompactionTimeline({
-          turnId,
-          item: {
-            type: "compaction",
-            status: "completed",
-            trigger: event.reason === "manual" ? "manual" : "auto",
-          },
-        });
+        this.handleCompactionEvent(event, turnId);
         return;
       case "agent_end": {
         const messages = event.messages ?? [];
@@ -1924,35 +1899,24 @@ export class OmpAgentSession implements AgentSession {
     }
   }
 
-  private emitCompactionTimeline(input: {
-    turnId: string | undefined;
-    item: Extract<AgentStreamEvent, { type: "timeline" }>["item"];
-  }): void {
-    const emitOutOfBand = this.outOfBandCompactionEmit;
-    if (emitOutOfBand && input.item.type === "compaction") {
-      if (input.item.status === "loading") {
-        this.outOfBandCompactionStarted = true;
-      }
-      if (input.item.status === "completed") {
-        this.outOfBandCompactionCompleted = true;
-      }
-    }
-    const event: AgentStreamEvent = {
-      type: "timeline",
-      provider: this.provider,
-      ...(emitOutOfBand ? {} : { turnId: input.turnId }),
-      item: input.item,
-    };
-    if (emitOutOfBand) {
-      emitOutOfBand(event);
-      if (input.item.type === "compaction" && input.item.status === "completed") {
-        this.outOfBandCompactionEmit = null;
-        this.outOfBandCompactionStarted = false;
-        this.outOfBandCompactionCompleted = false;
-      }
+  private handleCompactionEvent(
+    event: Extract<OmpAgentSessionEvent, { type: "compaction_start" | "compaction_end" }>,
+    turnId: string | undefined,
+  ): void {
+    // A manual compact emits its own rows around the request.
+    if (this.manualCompactionRunning) {
       return;
     }
-    this.emit(event);
+    this.emit({
+      type: "timeline",
+      provider: this.provider,
+      turnId,
+      item: {
+        type: "compaction",
+        status: event.type === "compaction_start" ? "loading" : "completed",
+        trigger: event.reason === "manual" ? "manual" : "auto",
+      },
+    });
   }
 
   private handleMessageUpdate(
diff --git a/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts b/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts
index 403a389647..58688c245d 100644
--- a/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts
+++ b/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts
@@ -168,7 +168,6 @@ export class FakeOmpSession implements OmpRuntimeSession {
   subagents: FakeOmpSubagentSnapshot[] = [];
   readonly subagentSubscriptionErrors = new Map<FakeOmpSubagentSubscriptionLevel, Error>();
   compactError: Error | null = null;
-  emitCompactEnd = true;
   getStateError: Error | null = null;
   promptAck: OmpPromptAck = {};
   branchResponse: { text?: string; cancelled?: boolean } = { text: "" };
@@ -266,11 +265,8 @@ export class FakeOmpSession implements OmpRuntimeSession {
   }
 
   async compact(customInstructions?: string): Promise<void> {
+    // Like OMP, answer a manual compact with the response alone, no compaction events.
     this.compactRequests.push(customInstructions === undefined ? {} : { customInstructions });
-    this.emit({ type: "compaction_start", reason: "manual" });
-    if (this.emitCompactEnd) {
-      this.emit({ type: "compaction_end", reason: "manual" });
-    }
     if (this.compactError) {
       throw this.compactError;
     }
diff --git a/packages/server/src/server/agent/providers/omp/test-utils/omp-harness.ts b/packages/server/src/server/agent/providers/omp/test-utils/omp-harness.ts
index 1820c187c9..8be53f1742 100644
--- a/packages/server/src/server/agent/providers/omp/test-utils/omp-harness.ts
+++ b/packages/server/src/server/agent/providers/omp/test-utils/omp-harness.ts
@@ -19,7 +19,12 @@ import {
   type OmpProviderIdleScheduler,
 } from "../agent.js";
 import type { OmpUsagePollScheduler } from "../usage-poller.js";
-import type { OmpAgentMessage, OmpRpcSlashCommand, OmpRuntimeEvent } from "../rpc-types.js";
+import type {
+  OmpAgentMessage,
+  OmpRpcSlashCommand,
+  OmpRuntimeEvent,
+  OmpSessionStats,
+} from "../rpc-types.js";
 import { FakeOmp } from "./fake-omp.js";
 
 const CWD = "/tmp/paseo-omp-agent-test";
@@ -169,6 +174,18 @@ export class OmpHarness {
     return events;
   }
 
+  async compact(statsAfter: OmpSessionStats, error?: Error): Promise<AgentStreamEvent[]> {
+    const handler = this.requireSession().tryHandleOutOfBand("/compact");
+    if (!handler) throw new Error("OMP session did not handle /compact out-of-band");
+    const runtime = this.omp.latestSession();
+    const sessionEventCount = this.events.length;
+    const emitted: AgentStreamEvent[] = [];
+    runtime.stats = statsAfter;
+    runtime.compactError = error ?? null;
+    await handler.run({ emit: (event) => emitted.push(event) });
+    return [...emitted, ...this.events.slice(sessionEventCount)];
+  }
+
   async runPrompt(
     input: string,
     output: string,
diff --git a/packages/server/src/server/agent/providers/omp/usage-poller.test.ts b/packages/server/src/server/agent/providers/omp/usage-poller.test.ts
index 9750ec59ef..56b9dc667a 100644
--- a/packages/server/src/server/agent/providers/omp/usage-poller.test.ts
+++ b/packages/server/src/server/agent/providers/omp/usage-poller.test.ts
@@ -36,6 +36,27 @@ function deferred<T>() {
 }
 
 describe("OMP usage poller", () => {
+  test("refresh publishes usage without ending an active turn's polling", async () => {
+    const scheduler = new ManualPollScheduler();
+    const used: Array<number | undefined> = [];
+    let stats: OmpSessionStats = { contextUsage: { contextWindow: 200_000, tokens: 9_000 } };
+    const poller = new OmpUsagePoller({
+      scheduler,
+      readStats: async () => stats,
+      onUsage: (update) => used.push(update.contextWindowUsedTokens),
+      onPollError: (error) => {
+        throw error;
+      },
+    });
+
+    poller.startTurn();
+    stats = { contextUsage: { contextWindow: 200_000, tokens: 2_000 } };
+    await poller.refresh();
+
+    expect(used).toEqual([2_000]);
+    expect(scheduler.activePollCount()).toBe(1);
+  });
+
   test("emits only changed usage while active", async () => {
     const scheduler = new ManualPollScheduler();
     const updates: AgentUsage[] = [];
diff --git a/packages/server/src/server/agent/providers/omp/usage-poller.ts b/packages/server/src/server/agent/providers/omp/usage-poller.ts
index 4e41708b5a..bc3bc1c968 100644
--- a/packages/server/src/server/agent/providers/omp/usage-poller.ts
+++ b/packages/server/src/server/agent/providers/omp/usage-poller.ts
@@ -105,6 +105,17 @@ export class OmpUsagePoller {
     this.publishUsage(usage, turnId);
   }
 
+  async refresh(): Promise<void> {
+    let usage: AgentUsage | undefined;
+    try {
+      usage = toAgentUsage(await this.options.readStats());
+    } catch (error) {
+      if (!this.closed) this.options.onPollError(error);
+      return;
+    }
+    if (!this.closed) this.publishUsage(usage);
+  }
+
   close(): void {
     this.closed = true;
     this.active = false;
diff --git a/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
index 7149b16864..ab407e31bc 100644
--- a/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
@@ -131,10 +131,10 @@ async function timeline(client: DaemonClient, agentId: string): Promise<AgentTim
   return result.entries.map((entry) => entry.item);
 }
 
-function compactionFiller(): string {
+function compactionFiller(records = 1200): string {
   const teas = ["assam", "darjeeling", "sencha", "oolong"];
   return Array.from(
-    { length: 1200 },
+    { length: records },
     (_, index) =>
       `Record ${String(index).padStart(5, "0")}: tea=${teas[index % teas.length]} origin=region-${index % 37} notes=lorem ipsum dolor sit amet`,
   ).join("\n");
@@ -234,6 +234,27 @@ afterEach(() => {
   roots.clear();
 });
 
+async function waitForTimelineItem(
+  client: DaemonClient,
+  agentId: string,
+  predicate: (item: AgentTimelineItem) => boolean,
+): Promise<AgentTimelineItem> {
+  const deadline = Date.now() + 60_000;
+  let items: AgentTimelineItem[] = [];
+  while (Date.now() < deadline) {
+    items = await timeline(client, agentId);
+    const item = items.find(predicate);
+    if (item) return item;
+    await new Promise((resolve) => setTimeout(resolve, 250));
+  }
+  throw new Error(`Timed out waiting for OMP timeline item: ${JSON.stringify(items)}`);
+}
+
+async function contextWindowUsedTokens(client: DaemonClient, agentId: string) {
+  const result = await client.fetchAgent(agentId);
+  return result?.agent.lastUsage?.contextWindowUsedTokens;
+}
+
 describe("daemon E2E (real OMP)", () => {
   test(
     "a prompt OMP rejects before its agent runs fails the turn with OMP's error",
@@ -258,6 +279,48 @@ describe("daemon E2E (real OMP)", () => {
     TIMEOUT_MS,
   );
 
+  test(
+    "manual compact shows its progress and refreshes context usage",
+    async () => {
+      const harness = await createHarness();
+      try {
+        const agent = await createAgent(harness, "manual-compact");
+        await promptAndFinish(harness, agent.id, "Reply exactly: ready");
+        await promptAndFinish(
+          harness,
+          agent.id,
+          `${compactionFiller(2500)}\n\nWhich tea is in record 00007? Reply with one word.`,
+        );
+        await promptAndFinish(harness, agent.id, "Reply exactly: after-filler");
+        const usedBefore = await contextWindowUsedTokens(harness.client, agent.id);
+        expect(usedBefore).toBeGreaterThan(20_000);
+
+        await harness.client.sendMessage(agent.id, "/compact");
+        await waitForTimelineItem(
+          harness.client,
+          agent.id,
+          (item) => item.type === "compaction" && item.status === "completed",
+        );
+
+        expect(await timeline(harness.client, agent.id)).toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({ type: "compaction", status: "loading", trigger: "manual" }),
+            expect.objectContaining({ type: "compaction", status: "completed", trigger: "manual" }),
+          ]),
+        );
+        await harness.client.waitForAgentUpsert(
+          agent.id,
+          (snapshot) =>
+            (snapshot.lastUsage?.contextWindowUsedTokens ?? Infinity) < (usedBefore ?? 0),
+          60_000,
+        );
+      } finally {
+        await closeHarness(harness);
+      }
+    },
+    TIMEOUT_MS,
+  );
+
   test(
     "prompt, native tool, and resumed follow-up",
     async () => {

From 019e5279e9c453bce5692a9a8f656c5fcbb13cb7 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 07:13:06 +0200
Subject: [PATCH 149/270] Show Claude option previews in the question card,
 readable on Android (#6171)

* Show Claude option previews in the question card

* Wrap long lines in question option previews

* Check option previews under the option that owns them

* Show the whole option preview on native so every line is reachable

On Android, a slow drag inside a preview capped at 240px did not scroll
it, so lines past the cap could not be read. The preview's nested
scroll sits inside the option's Pressable; the same drag scrolls it
once the preview is outside the Pressable. Native now renders the
preview at full height so the chat scroll reaches every line, and a tap
on it still selects the option. Web keeps the 240px cap.

The mock agent's rollout preview is now taller than the cap so the
Android replay can check the last line.

---------

Co-authored-by: Gabriel Giordano <hello@gabrielgiordano.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../question-prompt-pagination.spec.ts        |  5 ++++
 ...e-question-option-preview-preconditions.md |  7 ++++++
 .../native-question-option-preview.android.ad | 10 ++++++++
 packages/app/e2e/support/helpers/questions.ts |  9 +++++++
 .../question-form-card-core.test.ts           | 25 +++++++++++++++++++
 .../src/components/question-form-card-core.ts |  2 ++
 .../app/src/components/question-form-card.tsx | 22 ++++++++++++++++
 .../agent/providers/mock-load-test-agent.ts   | 16 +++++++++++-
 8 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 packages/app/e2e/mobile/agent-device/native-question-option-preview-preconditions.md
 create mode 100644 packages/app/e2e/mobile/agent-device/native-question-option-preview.android.ad

diff --git a/packages/app/e2e/browser/question-prompt-pagination.spec.ts b/packages/app/e2e/browser/question-prompt-pagination.spec.ts
index b014b2d1cd..1d75ae2839 100644
--- a/packages/app/e2e/browser/question-prompt-pagination.spec.ts
+++ b/packages/app/e2e/browser/question-prompt-pagination.spec.ts
@@ -7,6 +7,7 @@ import {
   expectQuestionDismissEnabled,
   expectQuestionHidden,
   expectQuestionNavigationEnabled,
+  expectQuestionOptionPreview,
   expectQuestionOptionSelected,
   expectQuestionPrimaryActionDisabled,
   expectQuestionPrimaryActionEnabled,
@@ -61,6 +62,10 @@ test.describe("Question prompt pagination", () => {
       await expectQuestionOptionSelected(page, "App");
 
       await openQuestion(page, { index: 2, total: TOTAL_QUESTIONS });
+      await expectQuestionOptionPreview(page, {
+        option: "Behind feature flag",
+        preview: 'flags.enabled("new-surface")',
+      });
       await chooseQuestionOption(page, "Behind feature flag");
       await expectCurrentQuestion(page, {
         index: 3,
diff --git a/packages/app/e2e/mobile/agent-device/native-question-option-preview-preconditions.md b/packages/app/e2e/mobile/agent-device/native-question-option-preview-preconditions.md
new file mode 100644
index 0000000000..ac920aa0e7
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-question-option-preview-preconditions.md
@@ -0,0 +1,7 @@
+# Native question option preview
+
+`native-question-option-preview.android.ad` checks that every line of a long option preview is reachable on Android. Before replay, open a mock agent prompted with `emit synthetic questions` so its question card shows the first question, on a phone-sized emulator (validated on a 1080×1920 API 35 AVD). The flow opens the `rollout` question, drags slowly up from inside the "Behind feature flag" preview, and asserts the preview's last line is visible.
+
+```sh
+agent-device replay packages/app/e2e/mobile/agent-device/native-question-option-preview.android.ad --platform android --serial emulator-5554
+```
diff --git a/packages/app/e2e/mobile/agent-device/native-question-option-preview.android.ad b/packages/app/e2e/mobile/agent-device/native-question-option-preview.android.ad
new file mode 100644
index 0000000000..f6cd42bbab
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-question-option-preview.android.ad
@@ -0,0 +1,10 @@
+context platform=android timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+
+open "${APP_ID}"
+wait "label=\"rollout\"" 20000
+press "label=\"rollout\""
+wait "id=\"question-form-option-preview\"" 10000
+gesture pan 570 1120 0 -440 600
+is visible "text=\"// LAST PREVIEW LINE\""
+close
diff --git a/packages/app/e2e/support/helpers/questions.ts b/packages/app/e2e/support/helpers/questions.ts
index ebe13aead5..a26bd9a975 100644
--- a/packages/app/e2e/support/helpers/questions.ts
+++ b/packages/app/e2e/support/helpers/questions.ts
@@ -43,6 +43,15 @@ export async function expectQuestionOptionSelected(page: Page, option: string):
   await expect(questionOption(page, option)).toHaveAttribute("aria-checked", "true");
 }
 
+export async function expectQuestionOptionPreview(
+  page: Page,
+  input: { option: string; preview: string },
+): Promise<void> {
+  await expect(
+    questionOption(page, input.option).getByTestId("question-form-option-preview"),
+  ).toContainText(input.preview);
+}
+
 export async function openQuestion(
   page: Page,
   input: { index: number; total: number },
diff --git a/packages/app/src/components/question-form-card-core.test.ts b/packages/app/src/components/question-form-card-core.test.ts
index 40692d4acf..293bf24ba8 100644
--- a/packages/app/src/components/question-form-card-core.test.ts
+++ b/packages/app/src/components/question-form-card-core.test.ts
@@ -147,4 +147,29 @@ describe("question form card core", () => {
       Response: "custom",
     });
   });
+
+  test("keeps option previews so options can be compared", () => {
+    const questions = parseQuestionFormQuestions({
+      questions: [
+        {
+          question: "Which layout?",
+          header: "Layout",
+          options: [
+            {
+              label: "Tabs",
+              description: "One tab per section",
+              preview: "<Tabs>\n  <Tab />\n</Tabs>",
+            },
+            { label: "Single page" },
+          ],
+          multiSelect: false,
+        },
+      ],
+    });
+
+    expect(questions?.[0]?.options).toEqual([
+      { label: "Tabs", description: "One tab per section", preview: "<Tabs>\n  <Tab />\n</Tabs>" },
+      { label: "Single page", description: undefined, preview: undefined },
+    ]);
+  });
 });
diff --git a/packages/app/src/components/question-form-card-core.ts b/packages/app/src/components/question-form-card-core.ts
index 0dea6c706e..78007dba2e 100644
--- a/packages/app/src/components/question-form-card-core.ts
+++ b/packages/app/src/components/question-form-card-core.ts
@@ -1,6 +1,7 @@
 export interface QuestionOption {
   label: string;
   description?: string;
+  preview?: string;
 }
 
 export interface QuestionFormQuestion {
@@ -46,6 +47,7 @@ export function parseQuestionFormQuestions(input: unknown): QuestionFormQuestion
       options.push({
         label: o.label,
         description: typeof o.description === "string" ? o.description : undefined,
+        preview: readOptionalString(o, "preview"),
       });
     }
     questions.push({
diff --git a/packages/app/src/components/question-form-card.tsx b/packages/app/src/components/question-form-card.tsx
index 5b3b146f4e..655e01d210 100644
--- a/packages/app/src/components/question-form-card.tsx
+++ b/packages/app/src/components/question-form-card.tsx
@@ -10,6 +10,7 @@ import type { AgentPermissionResponse } from "@getpaseo/protocol/agent-types";
 import { isWeb } from "@/constants/platform";
 import { EditingTextInput as TextInput } from "@/components/ui/text-input";
 import type { EditingTextInputHandle } from "@/components/ui/text-input/types";
+import { ScrollableCodeSurface } from "@/components/ui/scrollable-code-surface";
 import {
   areQuestionsAnswered,
   buildQuestionFormAnswers,
@@ -29,6 +30,9 @@ interface QuestionFormCardProps {
 }
 
 const IS_WEB = isWeb;
+// Native previews are uncapped: inside the option's Pressable, Android never hands a
+// drag to the preview's nested scroll, so lines past a cap would be unreachable.
+const OPTION_PREVIEW_MAX_HEIGHT = IS_WEB ? 240 : undefined;
 
 function getQuestionInputPlaceholder({
   question,
@@ -133,6 +137,20 @@ function QuestionOptionRow({
           {option.description ? (
             <Text style={optionDescriptionStyle}>{option.description}</Text>
           ) : null}
+          {option.preview ? (
+            // Shown for every option at once so they can be compared before picking.
+            // Long lines wrap, as in Claude Code, since most previews are prose.
+            <ScrollableCodeSurface
+              tone="surface0"
+              maxHeight={OPTION_PREVIEW_MAX_HEIGHT}
+              horizontal={false}
+              selectable={false}
+              textStyle={styles.optionPreviewText}
+              testID="question-form-option-preview"
+            >
+              {option.preview}
+            </ScrollableCodeSurface>
+          ) : null}
         </View>
       </View>
     </Pressable>
@@ -704,6 +722,10 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
     lineHeight: 20,
   },
+  optionPreviewText: {
+    lineHeight: 20,
+    ...(isWeb ? { whiteSpace: "pre-wrap", overflowWrap: "break-word" } : null),
+  },
   selectionControl: {
     width: 18,
     height: 18,
diff --git a/packages/server/src/server/agent/providers/mock-load-test-agent.ts b/packages/server/src/server/agent/providers/mock-load-test-agent.ts
index 14733e0601..ce9714c5f2 100644
--- a/packages/server/src/server/agent/providers/mock-load-test-agent.ts
+++ b/packages/server/src/server/agent/providers/mock-load-test-agent.ts
@@ -232,6 +232,7 @@ type SteeringReplayShape = "claude" | "codex";
 interface MockQuestionOption {
   label: string;
   description?: string;
+  preview?: string;
 }
 
 interface MockQuestionPromptQuestion {
@@ -271,6 +272,16 @@ function parseSettledAssistantImageMarkdown(prompt: AgentPromptInput): string |
   return match?.[1] ?? null;
 }
 
+const ROLLOUT_FLAG_PREVIEW = [
+  "Ship it dark behind the new-surface flag, then turn it on for internal users before everyone else.",
+  "",
+  'if (flags.enabled("new-surface")) {',
+  "  render(<NewSurface />);",
+  "}",
+  ...Array.from({ length: 40 }, (_, i) => `// rollout step ${i + 1}`),
+  "// LAST PREVIEW LINE",
+].join("\n");
+
 function parseMockQuestionPrompt(prompt: AgentPromptInput): MockQuestionPromptRequest | null {
   const text = promptToText(prompt);
   if (!/emit\s+(?:a\s+)?synthetic\s+questions?/i.test(text)) {
@@ -309,7 +320,10 @@ function parseMockQuestionPrompt(prompt: AgentPromptInput): MockQuestionPromptRe
       {
         question: "Which rollout should we use?",
         header: "rollout",
-        options: [{ label: "Immediately" }, { label: "Behind feature flag" }],
+        options: [
+          { label: "Immediately" },
+          { label: "Behind feature flag", preview: ROLLOUT_FLAG_PREVIEW },
+        ],
         multiSelect: false,
       },
       {

From fc8f085b9e128b7ccd54ef4900501c195cc1c8a1 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 08:20:40 +0200
Subject: [PATCH 150/270] Reject oversized messages without disconnecting the
 host (#6285)

* fix(client): reject a message over the daemon's size limit instead of reconnecting in a loop

The daemon closes the WebSocket with 1009 when a message exceeds its 100 MiB
limit. A workspace or agent creation that loses its connection mid-request
stays pending and, after reconnecting, finds no record of itself on the
daemon (the oversized frame was never read), so it resubmits the same frame
and the connection drops again every couple of seconds until the app reloads.

The client now checks each outbound frame against the same limit, which
protocol exports and the daemon sets explicitly, and fails that request with
a size error while the connection stays up.

Refs #5501

* test(client): cover the UTF-8 byte count at the message size limit

* fix(client): reject oversized relay messages without disconnecting

Check the encrypted wire size synchronously before submission, so a frame below the direct limit cannot close the relay and leave workspace creation resubmitting forever. Keep the relay limit shared with the existing checkout diff budget.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/daemon-client-relay-e2ee-transport.ts | 15 +++-
 .../src/daemon-client-transport-utils.ts      |  7 ++
 packages/client/src/daemon-client.test.ts     | 26 ++++++
 packages/client/src/daemon-client.ts          | 17 ++++
 .../protocol/src/websocket-message-limit.ts   |  5 ++
 packages/server/package.json                  |  2 +-
 .../daemon-e2e/oversized-message.e2e.test.ts  | 58 ++++++++++++
 .../daemon-e2e/relay-transport.e2e.test.ts    | 89 +++++++++++++++++--
 .../server/src/server/websocket-server.ts     |  2 +
 packages/server/src/utils/checkout-git.ts     |  5 +-
 10 files changed, 215 insertions(+), 11 deletions(-)
 create mode 100644 packages/protocol/src/websocket-message-limit.ts
 create mode 100644 packages/server/src/server/daemon-e2e/oversized-message.e2e.test.ts

diff --git a/packages/client/src/daemon-client-relay-e2ee-transport.ts b/packages/client/src/daemon-client-relay-e2ee-transport.ts
index 1bc175bf1b..e25779a7bb 100644
--- a/packages/client/src/daemon-client-relay-e2ee-transport.ts
+++ b/packages/client/src/daemon-client-relay-e2ee-transport.ts
@@ -1,3 +1,4 @@
+import { MAX_RELAY_WEBSOCKET_MESSAGE_BYTES } from "@getpaseo/protocol/websocket-message-limit";
 import {
   createClientChannel,
   type EncryptedChannel,
@@ -8,7 +9,11 @@ import type {
   DaemonTransportFactory,
   TransportLogger,
 } from "./daemon-client-transport-types.js";
-import { extractRelayMessage, normalizeTransportPayload } from "./daemon-client-transport-utils.js";
+import {
+  extractRelayMessage,
+  normalizeTransportPayload,
+  messageTooLargeError,
+} from "./daemon-client-transport-utils.js";
 
 type OpenHandler = () => void;
 type CloseHandler = (event?: unknown) => void;
@@ -137,7 +142,13 @@ export function createEncryptedTransport(
       if (!channel) {
         throw new Error("Encrypted channel not ready");
       }
-      void channel.send(normalizeTransportPayload(data)).catch((error) => {
+      const payload = normalizeTransportPayload(data);
+      // Reject synchronously so the requesting operation fails without closing the transport.
+      const wireBytes = channel.outboundWireByteLength(payload);
+      if (wireBytes > MAX_RELAY_WEBSOCKET_MESSAGE_BYTES) {
+        throw messageTooLargeError(wireBytes, MAX_RELAY_WEBSOCKET_MESSAGE_BYTES);
+      }
+      void channel.send(payload).catch((error) => {
         emitError(error);
       });
     },
diff --git a/packages/client/src/daemon-client-transport-utils.ts b/packages/client/src/daemon-client-transport-utils.ts
index 3b39cf5114..cb767c1d87 100644
--- a/packages/client/src/daemon-client-transport-utils.ts
+++ b/packages/client/src/daemon-client-transport-utils.ts
@@ -133,3 +133,10 @@ export function encodeUtf8String(value: string): Uint8Array {
   }
   return out;
 }
+
+export function messageTooLargeError(size: number, limit: number): Error {
+  const toMiB = (bytes: number) => (bytes / (1024 * 1024)).toFixed(1);
+  return new Error(
+    `Message is too large to send (${toMiB(size)} MiB). The limit is ${toMiB(limit)} MiB, so send fewer or smaller attachments.`,
+  );
+}
diff --git a/packages/client/src/daemon-client.test.ts b/packages/client/src/daemon-client.test.ts
index 95921a96a0..f62f46b733 100644
--- a/packages/client/src/daemon-client.test.ts
+++ b/packages/client/src/daemon-client.test.ts
@@ -7527,3 +7527,29 @@ test.each([false, true])(
     await send;
   },
 );
+
+test("measures an outbound message in UTF-8 bytes against the daemon's message limit", async () => {
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "message_limit_unit_test",
+    transportFactory: () => mock.transport,
+    reconnect: { enabled: false },
+  });
+  clients.push(client);
+  const connectPromise = client.connect();
+  mock.triggerOpen();
+  await connectPromise;
+  const mib = 1024 * 1024;
+
+  // "é" is one UTF-16 unit but two UTF-8 bytes, so this text is ~98 MiB on the wire.
+  void client.sendMessage("agent-1", "é".repeat(49 * mib)).catch(() => undefined);
+  expect(mock.sent).toHaveLength(1);
+
+  // ~60M characters is under the 100 MiB limit; ~120 MiB of UTF-8 is over it.
+  await expect(client.sendMessage("agent-1", "é".repeat(60 * mib))).rejects.toThrow(
+    "Message is too large to send (120.0 MiB). The limit is 100.0 MiB",
+  );
+  expect(mock.sent).toHaveLength(1);
+  expect(client.getConnectionState().status).toBe("connected");
+});
diff --git a/packages/client/src/daemon-client.ts b/packages/client/src/daemon-client.ts
index f900fe41e5..2bd19f2974 100644
--- a/packages/client/src/daemon-client.ts
+++ b/packages/client/src/daemon-client.ts
@@ -1,3 +1,4 @@
+import { messageTooLargeError } from "./daemon-client-transport-utils.js";
 import { legacyUsageIcon } from "./legacy-usage-icons.js";
 import { subscribeTimeline, type TimelineMessage } from "./timeline-subscription/index.js";
 import { ProviderSnapshotUpdates } from "./provider-snapshots/index.js";
@@ -13,6 +14,7 @@ import type { z } from "zod";
 import type { SessionEventSubscription } from "@getpaseo/protocol/messages";
 import type { ClientCapability } from "@getpaseo/protocol/client-capabilities";
 import type { AgentAttentionNotificationPayload } from "@getpaseo/protocol/agent-attention-notification";
+import { MAX_WEBSOCKET_MESSAGE_BYTES } from "@getpaseo/protocol/websocket-message-limit";
 import {
   AgentCreateFailedStatusPayloadSchema,
   AgentCreatedStatusPayloadSchema,
@@ -1132,6 +1134,19 @@ function getTransportFrameSize(frame: string | Uint8Array | ArrayBuffer): number
   return frame.byteLength;
 }
 
+function assertTransportFrameFits(frame: string | Uint8Array | ArrayBuffer): void {
+  if (typeof frame !== "string") {
+    if (frame.byteLength > MAX_WEBSOCKET_MESSAGE_BYTES)
+      throw messageTooLargeError(frame.byteLength, MAX_WEBSOCKET_MESSAGE_BYTES);
+    return;
+  }
+  // UTF-8 needs at most three bytes per UTF-16 unit, so only a string near the limit is measured.
+  if (frame.length * 3 <= MAX_WEBSOCKET_MESSAGE_BYTES) return;
+  const size = new TextEncoder().encode(frame).byteLength;
+  if (size > MAX_WEBSOCKET_MESSAGE_BYTES)
+    throw messageTooLargeError(size, MAX_WEBSOCKET_MESSAGE_BYTES);
+}
+
 function describeInboundTransportFrame(
   frame: unknown,
   rawBytes: Uint8Array | null,
@@ -1767,6 +1782,8 @@ export class DaemonClient {
     if (!this.transport) {
       throw new DaemonConnectionError("Transport not connected");
     }
+    // The daemon closes the connection on an oversized message, and creations resubmit on reconnect.
+    assertTransportFrameFits(frame);
     const isOpen = this.beginTraceSection("paseo.ws.frame.outbound", {
       kind: typeof frame === "string" ? "text" : "binary",
       size: String(getTransportFrameSize(frame)),
diff --git a/packages/protocol/src/websocket-message-limit.ts b/packages/protocol/src/websocket-message-limit.ts
new file mode 100644
index 0000000000..9e2bb48e21
--- /dev/null
+++ b/packages/protocol/src/websocket-message-limit.ts
@@ -0,0 +1,5 @@
+/** Largest WebSocket message the daemon accepts. A bigger one closes the connection with 1009. */
+export const MAX_WEBSOCKET_MESSAGE_BYTES = 100 * 1024 * 1024;
+
+/** Largest encrypted frame the relay accepts. */
+export const MAX_RELAY_WEBSOCKET_MESSAGE_BYTES = 32 * 1024 * 1024;
diff --git a/packages/server/package.json b/packages/server/package.json
index b80941d56f..541cf5eba1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\" && vitest run --maxWorkers=1 src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"oversized attachments\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",
diff --git a/packages/server/src/server/daemon-e2e/oversized-message.e2e.test.ts b/packages/server/src/server/daemon-e2e/oversized-message.e2e.test.ts
new file mode 100644
index 0000000000..fc68fe44f4
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/oversized-message.e2e.test.ts
@@ -0,0 +1,58 @@
+import { describe, test, expect, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, rmSync } from "fs";
+import { tmpdir } from "os";
+import path from "path";
+import { createDaemonTestContext, type DaemonTestContext } from "../test-utils/index.js";
+
+let ctx: DaemonTestContext;
+let cwd: string;
+
+beforeEach(async () => {
+  ctx = await createDaemonTestContext();
+  cwd = mkdtempSync(path.join(tmpdir(), "daemon-e2e-"));
+});
+
+afterEach(async () => {
+  await ctx.cleanup();
+  rmSync(cwd, { recursive: true, force: true });
+}, 60000);
+
+describe("a message larger than the daemon accepts", () => {
+  const oversizedImage = { data: "A".repeat(101 * 1024 * 1024), mimeType: "image/png" };
+
+  test("fails the creation and keeps the connection up", async () => {
+    const statuses: string[] = [];
+    const unsubscribe = ctx.client.subscribeConnectionStatus((state) => {
+      statuses.push(state.status);
+    });
+
+    await expect(
+      ctx.client.createAgent({
+        provider: "claude",
+        cwd,
+        title: "Oversized first message",
+        initialPrompt: "Describe these screens.",
+        images: [oversizedImage],
+      }),
+    ).rejects.toThrow(/too large/);
+    unsubscribe();
+
+    expect(statuses).toEqual(["connected"]);
+    expect((await ctx.client.fetchAgents()).entries).toEqual([]);
+  }, 30000);
+
+  test("fails the send and keeps the connection up", async () => {
+    const agent = await ctx.client.createAgent({ provider: "claude", cwd, title: "Agent" });
+    const statuses: string[] = [];
+    const unsubscribe = ctx.client.subscribeConnectionStatus((state) => {
+      statuses.push(state.status);
+    });
+
+    await expect(
+      ctx.client.sendMessage(agent.id, "Describe these screens.", { images: [oversizedImage] }),
+    ).rejects.toThrow(/too large/);
+    unsubscribe();
+
+    expect(statuses).toEqual(["connected"]);
+  }, 30000);
+});
diff --git a/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts b/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts
index 3edede83d3..d204842e0c 100644
--- a/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts
@@ -1,4 +1,6 @@
 import { describe, expect, test } from "vitest";
+import { withTimeout } from "../../utils/promise-timeout.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
 import { WebSocket } from "ws";
 import pino from "pino";
 import { Writable } from "node:stream";
@@ -202,12 +204,20 @@ async function waitForCapturedLog(
     if (options.useLocalRelay) {
       relayArgs.push("--var", "PASEO_RELAY_UPSTREAM:");
     }
-    relayProcess = spawn("npx", relayArgs, {
-      cwd: relayDir,
-      env: { ...process.env },
-      stdio: ["ignore", "pipe", "pipe"],
-      detached: false,
-    });
+    relayProcess = spawn(
+      process.execPath,
+      [
+        "--experimental-vm-modules",
+        path.resolve(relayDir, "../../node_modules/wrangler/wrangler-dist/cli.js"),
+        ...relayArgs.slice(1),
+      ],
+      {
+        cwd: relayDir,
+        env: { ...process.env },
+        stdio: ["ignore", "pipe", "pipe"],
+        detached: false,
+      },
+    );
 
     relayProcess.stdout?.on("data", (data: Buffer) => {
       const lines = data
@@ -241,6 +251,73 @@ async function waitForCapturedLog(
     relayProcess = null;
   };
 
+  test("oversized attachments fail without disconnecting or resubmitting over the relay", async () => {
+    await startRelay({ useLocalRelay: true });
+    const daemon = await createTestPaseoDaemon({
+      relayEnabled: true,
+      relayEndpoint: `127.0.0.1:${relayPort}`,
+      relayUseTls: false,
+      relayPublicUseTls: false,
+    });
+    let client: DaemonClient | null = null;
+    try {
+      const offerUrl = await getPairingOfferUrl({
+        paseoHome: daemon.paseoHome,
+        relayEnabled: true,
+        relayEndpoint: daemon.config.relayEndpoint,
+      });
+      const { serverId, daemonPublicKeyB64 } = decodeOfferFromFragmentUrl(offerUrl);
+      client = new DaemonClient({
+        url: buildRelayWebSocketUrl({
+          endpoint: `127.0.0.1:${relayPort}`,
+          useTls: false,
+          serverId,
+          role: "client",
+        }),
+        e2ee: { enabled: true, daemonPublicKeyB64 },
+        reconnect: { baseDelayMs: 100, maxDelayMs: 100 },
+      });
+      await client.connect();
+      const statuses: string[] = [];
+      client.subscribeConnectionStatus((state) => statuses.push(state.status));
+      for (const imageMiB of [30, 61]) {
+        // Attachments are base64 in the JSON, then E2EE base64 expands the frame again.
+        const images = [
+          { data: "A".repeat(4 * Math.ceil((imageMiB * 1024 * 1024) / 3)), mimeType: "image/png" },
+        ];
+        await expect(
+          withTimeout(
+            client.createWorkspace({
+              source: { kind: "directory", path: daemon.staticDir },
+              agent: {
+                provider: "claude",
+                cwd: daemon.staticDir,
+                initialPrompt: "Describe these screens.",
+                images,
+              },
+            }),
+            10000,
+            "Workspace creation did not settle",
+          ),
+        ).rejects.toThrow(/too large.*32\.0 MiB/);
+        expect((await client.fetchAgents()).entries).toEqual([]);
+      }
+      const agent = await client.createAgent({ provider: "claude", cwd: daemon.staticDir });
+      await expect(
+        client.sendMessage(agent.id, "Describe these screens.", {
+          images: [{ data: "A".repeat(40 * 1024 * 1024), mimeType: "image/png" }],
+        }),
+      ).rejects.toThrow(/too large.*32\.0 MiB/);
+      await client.sendMessage(agent.id, "A small follow-up still works.");
+      expect((await client.fetchAgents()).entries).toHaveLength(1);
+      expect(statuses).toEqual(["connected"]);
+    } finally {
+      await client?.close();
+      await daemon.close();
+      await stopRelay();
+    }
+  }, 60000);
+
   test("daemon connects to relay and client ping/pong works through relay", async () => {
     process.env.PASEO_PRIMARY_LAN_IP = "192.168.1.12";
 
diff --git a/packages/server/src/server/websocket-server.ts b/packages/server/src/server/websocket-server.ts
index 219e04b0c2..5e93681a66 100644
--- a/packages/server/src/server/websocket-server.ts
+++ b/packages/server/src/server/websocket-server.ts
@@ -33,6 +33,7 @@ import {
 } from "./messages.js";
 import { asUint8Array, decodeBinaryFrame } from "@getpaseo/protocol/binary-frames/index";
 import type { TerminalActivity } from "@getpaseo/protocol/terminal-activity";
+import { MAX_WEBSOCKET_MESSAGE_BYTES } from "@getpaseo/protocol/websocket-message-limit";
 import type { HostnamesConfig } from "./hostnames.js";
 import { isHostnameAllowed } from "./hostnames.js";
 import {
@@ -822,6 +823,7 @@ export class VoiceAssistantWebSocketServer {
     const wss = new WebSocketServer({
       server,
       path: "/ws",
+      maxPayload: MAX_WEBSOCKET_MESSAGE_BYTES,
       handleProtocols: (protocols) => selectWebSocketProtocol(protocols, password),
       verifyClient: ({ req }, callback) => {
         this.verifyWsUpgrade(
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index caa7e65cb0..7a53c753b9 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -1,3 +1,4 @@
+import { MAX_RELAY_WEBSOCKET_MESSAGE_BYTES } from "@getpaseo/protocol/websocket-message-limit";
 import { resolve, dirname, basename } from "path";
 import { existsSync, realpathSync } from "fs";
 import { open as openFile, readFile, stat as statFile } from "fs/promises";
@@ -2152,13 +2153,13 @@ export async function getCheckoutSnapshotFacts(
 
 const PER_FILE_DIFF_MAX_BYTES = 1024 * 1024; // 1MB
 const TOTAL_DIFF_MAX_BYTES = 2 * 1024 * 1024; // 2MB
-const RELAY_MAX_FRAME_BYTES = 32 * 1024 * 1024;
 const CHECKOUT_DIFF_FRAME_HEADROOM_BYTES = 1024 * 1024;
 // Temporary until diffs load lazily per file. The Paseo relay's 32 MiB frame limit is
 // binding: string frames are encrypted and base64-encoded. Reserve 1 MiB plaintext for
 // the surrounding WebSocket JSON envelope after inverting that exact wire expansion.
 export const CHECKOUT_DIFF_MAX_STRUCTURED_BYTES =
-  maxBase64EncryptedPlaintextByteLength(RELAY_MAX_FRAME_BYTES) - CHECKOUT_DIFF_FRAME_HEADROOM_BYTES;
+  maxBase64EncryptedPlaintextByteLength(MAX_RELAY_WEBSOCKET_MESSAGE_BYTES) -
+  CHECKOUT_DIFF_FRAME_HEADROOM_BYTES;
 
 interface StructuredDiffAccumulator {
   files: ParsedDiffFile[];

From ada7ba43f022a6b0036140ab26a209f1eefdbd40 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 10:21:52 +0200
Subject: [PATCH 151/270] Keep long custom models removable in provider
 settings (#6507)

* fix(app): keep long custom models removable

Custom model labels and IDs could consume the row width and push Remove outside the sheet. Allow those text cells to shrink while preserving the button width and short-name alignment.

* test(app): wait for legacy agent creation before checking prompts

Agent-list membership includes initialization. Waiting for finish at that point can return on the initial idle transition before the initial prompt starts. Wait for the matching creation response before checking each completed turn, preserving the existing exact-once assertions.

* test(app): wait for directory search keyboard focus

The search page becomes visible before its deferred focus callback runs. Wait for the input to own keyboard focus so the journey types its query rather than dropping it during navigation.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../app/e2e/browser/add-project-flow.spec.ts  |  1 +
 .../e2e/browser/creation-old-daemon.spec.ts   | 25 ++++++++++++-
 .../e2e/browser/custom-model-removal.spec.ts  | 29 +++++++++++++++
 .../app/e2e/support/helpers/custom-models.ts  | 37 +++++++++++++++++++
 .../components/provider-diagnostic-sheet.tsx  |  9 ++++-
 5 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 packages/app/e2e/browser/custom-model-removal.spec.ts
 create mode 100644 packages/app/e2e/support/helpers/custom-models.ts

diff --git a/packages/app/e2e/browser/add-project-flow.spec.ts b/packages/app/e2e/browser/add-project-flow.spec.ts
index 027d6156e7..9fd7f9413d 100644
--- a/packages/app/e2e/browser/add-project-flow.spec.ts
+++ b/packages/app/e2e/browser/add-project-flow.spec.ts
@@ -223,6 +223,7 @@ test.describe("Add Project command-center flow", () => {
 
     await page.keyboard.press("Enter");
     await expectAddProjectPage(page, "directory-search");
+    await expect(addProjectFlowInput(page)).toBeFocused();
     await page.keyboard.type(projectPickerFixture.fuzzyQuery);
     await expect(addProjectFlow(page)).toContainText(projectPickerFixture.projectName, {
       timeout: 30_000,
diff --git a/packages/app/e2e/browser/creation-old-daemon.spec.ts b/packages/app/e2e/browser/creation-old-daemon.spec.ts
index ff28d513ef..4b418b304a 100644
--- a/packages/app/e2e/browser/creation-old-daemon.spec.ts
+++ b/packages/app/e2e/browser/creation-old-daemon.spec.ts
@@ -116,6 +116,7 @@ for (const version of ["0.2.5", "0.7.2", "0.8.0"]) {
       );
       expect(workspaces).toHaveLength(1);
       gate.release();
+      await gate.waitForCreated();
       await expect.poll(async () => (await client.fetchAgents()).entries.length).toBe(1);
       const first = (await client.fetchAgents()).entries[0]!.agent;
       await client.waitForFinish(first.id, 20_000);
@@ -128,6 +129,7 @@ for (const version of ["0.2.5", "0.7.2", "0.8.0"]) {
       const secondPrompt = "Create another agent: emit 1 coalesced agent stream updates";
       await fillComposerDraft(page, secondPrompt);
       await pressSubmitBeforeTheNextRender(page, "Send message");
+      await gate.waitForCreated();
       await expect.poll(async () => (await client.fetchAgents()).entries.length).toBe(2);
       const second = (await client.fetchAgents()).entries.find(
         ({ agent }) => agent.id !== first.id,
@@ -206,21 +208,40 @@ for (const version of ["0.2.5", "0.7.2", "0.8.0"]) {
 async function holdLegacyAgentCreation(page: Page, port: number) {
   const readers = await loadSessionMessageReaders();
   const arrived = Promise.withResolvers<void>();
+  let created = Promise.withResolvers<void>();
+  let createRequestId: string | undefined;
   let release = () => {};
   let holding = true;
   await page.routeWebSocket(new RegExp(`:${port}/ws`), (browser) => {
     const server = browser.connectToServer();
     browser.onMessage((frame) => {
-      if (holding && readers.client(frame)?.type === "create_agent_request") {
+      const message = readers.client(frame);
+      if (message?.type === "create_agent_request") createRequestId = message.requestId;
+      if (holding && message?.type === "create_agent_request") {
         holding = false;
         release = () => server.send(frame);
         arrived.resolve();
       } else server.send(frame);
     });
-    server.onMessage((frame) => browser.send(frame));
+    server.onMessage((frame) => {
+      const message = readers.server(frame);
+      if (
+        message?.type === "status" &&
+        message.payload.status === "agent_created" &&
+        message.payload.requestId === createRequestId
+      ) {
+        created.resolve();
+      }
+      browser.send(frame);
+    });
   });
   return {
     waitForRequest: () => arrived.promise,
+    async waitForCreated() {
+      // Agent-list membership includes initialization, before the initial prompt starts.
+      await created.promise;
+      created = Promise.withResolvers<void>();
+    },
     release() {
       const send = release;
       release = () => {};
diff --git a/packages/app/e2e/browser/custom-model-removal.spec.ts b/packages/app/e2e/browser/custom-model-removal.spec.ts
new file mode 100644
index 0000000000..dc6fd84616
--- /dev/null
+++ b/packages/app/e2e/browser/custom-model-removal.spec.ts
@@ -0,0 +1,29 @@
+import { test } from "../support/fixtures";
+import {
+  addCustomModel,
+  expectCustomModelRetained,
+  openCustomModels,
+  removeCustomModel,
+} from "../support/helpers/custom-models";
+
+const longModelId = "custom-model-with-a-long-name-".repeat(6);
+const shortModelId = "custom-short";
+
+for (const width of [1200, 390]) {
+  test(`removes a long custom model at ${width}px without removing another model`, async ({
+    page,
+  }) => {
+    await page.setViewportSize({ width: 1200, height: 1000 });
+    await openCustomModels(page);
+    await addCustomModel(page, shortModelId);
+    await addCustomModel(page, longModelId);
+
+    await test.step("remove the long model at the target width", async () => {
+      await page.setViewportSize({ width, height: 1000 });
+      await removeCustomModel(page, longModelId);
+      await expectCustomModelRetained(page, shortModelId);
+    });
+
+    await removeCustomModel(page, shortModelId);
+  });
+}
diff --git a/packages/app/e2e/support/helpers/custom-models.ts b/packages/app/e2e/support/helpers/custom-models.ts
new file mode 100644
index 0000000000..11933a0dfa
--- /dev/null
+++ b/packages/app/e2e/support/helpers/custom-models.ts
@@ -0,0 +1,37 @@
+import { expect, type Page } from "@playwright/test";
+import { gotoAppShell, openSettings } from "./app";
+import { openSettingsHostSection } from "./settings";
+import { getServerId } from "./server-id";
+
+export async function openCustomModels(page: Page): Promise<void> {
+  await gotoAppShell(page);
+  await openSettings(page);
+  await openSettingsHostSection(page, getServerId(), "providers");
+  await page.getByRole("button", { name: "Claude provider details", exact: true }).click();
+  await expect(page.getByRole("textbox", { name: "Search models" })).toBeVisible();
+}
+
+export async function addCustomModel(page: Page, id: string): Promise<void> {
+  await page.getByRole("button", { name: "Add model", exact: true }).click();
+  await page.getByPlaceholder("e.g. openai/gpt-5").fill(id);
+  await page
+    .getByTestId("add-custom-model-sheet")
+    .getByRole("button", { name: "Add", exact: true })
+    .click();
+  await expect(page.getByRole("button", { name: `Remove ${id}`, exact: true })).toHaveCount(1);
+}
+
+export async function removeCustomModel(page: Page, id: string): Promise<void> {
+  await page.getByRole("textbox", { name: "Search models" }).fill(id);
+  const remove = page.getByRole("button", { name: `Remove ${id}`, exact: true });
+  await expect(remove).toBeInViewport({ ratio: 1 });
+  await remove.click();
+  await expect(remove).toHaveCount(0);
+}
+
+export async function expectCustomModelRetained(page: Page, id: string): Promise<void> {
+  await page.getByRole("textbox", { name: "Search models" }).fill(id);
+  await expect(page.getByRole("button", { name: `Remove ${id}`, exact: true })).toBeInViewport({
+    ratio: 1,
+  });
+}
diff --git a/packages/app/src/components/provider-diagnostic-sheet.tsx b/packages/app/src/components/provider-diagnostic-sheet.tsx
index bf2d1c1b95..61d42882e8 100644
--- a/packages/app/src/components/provider-diagnostic-sheet.tsx
+++ b/packages/app/src/components/provider-diagnostic-sheet.tsx
@@ -95,11 +95,11 @@ function CustomModelRow({
 
   return (
     <View style={sheetStyles.modelRow}>
-      <Text style={sheetStyles.modelTitle} numberOfLines={1}>
+      <Text style={[sheetStyles.modelTitle, sheetStyles.customModelText]} numberOfLines={1}>
         {model.label}
       </Text>
       <Text
-        style={sheetStyles.monoHint}
+        style={[sheetStyles.monoHint, sheetStyles.customModelText]}
         numberOfLines={1}
         selectable
         dataSet={CODE_SURFACE_DATASET}
@@ -762,6 +762,7 @@ const sheetStyles = StyleSheet.create((theme) => ({
   iconButton: {
     width: 28,
     height: 28,
+    flexShrink: 0,
     borderRadius: theme.borderRadius.full,
     alignItems: "center",
     justifyContent: "center",
@@ -807,6 +808,10 @@ const sheetStyles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
     flexShrink: 0,
   },
+  customModelText: {
+    flexShrink: 1,
+    minWidth: 0,
+  },
   modelRowFiller: {
     flex: 1,
   },

From d57096a4568cd2db106f35a0c5011627de53a646 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 11:07:06 +0200
Subject: [PATCH 152/270] Start newly configured workspace services without
 restarting (#6542)

* fix(server): start newly configured workspace services without restarting

Extend the workspace port plan when paseo.json declares another service, preserving existing peer ports. Serialize extensions and roll back only their new reservations on failure.

* fix(server): serialize service restarts with port plan extensions

Keep concurrent restart and newly added service allocations in the same workspace update transaction so neither overwrites the other.

* fix(server): keep service port update failures scoped and release cancelled reservations

* test(hub): show creation errors in re-enrollment failures

Assert the error field along with success so failed CI reports include the reason agent creation was rejected.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../hub/relationship-controller.test.ts       |   8 +-
 .../workspace-service-port-registry.test.ts   | 224 +++++++++++++++++-
 .../server/workspace-service-port-registry.ts | 142 +++++++----
 .../src/server/worktree-bootstrap.test.ts     |  48 ++++
 4 files changed, 365 insertions(+), 57 deletions(-)

diff --git a/packages/server/src/server/hub/relationship-controller.test.ts b/packages/server/src/server/hub/relationship-controller.test.ts
index 51596b2384..d994a7280e 100644
--- a/packages/server/src/server/hub/relationship-controller.test.ts
+++ b/packages/server/src/server/hub/relationship-controller.test.ts
@@ -773,8 +773,12 @@ describe("Hub relationship", () => {
     const second = await relationship.ownedCreateResult("second-create");
 
     expect(relationship.relationshipFile()?.relationship.daemonId).toBe(daemonId);
-    expect(first).toMatchObject({ payload: { success: true, executionId: "first-execution" } });
-    expect(second).toMatchObject({ payload: { success: true, executionId: "second-execution" } });
+    expect(first).toMatchObject({
+      payload: { success: true, executionId: "first-execution", error: null },
+    });
+    expect(second).toMatchObject({
+      payload: { success: true, executionId: "second-execution", error: null },
+    });
     expect(await relationship.durableOwnedAgentIds()).toHaveLength(2);
   });
 
diff --git a/packages/server/src/server/workspace-service-port-registry.test.ts b/packages/server/src/server/workspace-service-port-registry.test.ts
index 3bf455ba57..b61bbb0f1d 100644
--- a/packages/server/src/server/workspace-service-port-registry.test.ts
+++ b/packages/server/src/server/workspace-service-port-registry.test.ts
@@ -33,7 +33,7 @@ describe("ensureWorkspaceServicePortPlan", () => {
     expect(allocatedServices).toEqual(["api", "web", "worker"]);
   });
 
-  it("returns the existing plan without calling the allocator on later calls", async () => {
+  it("extends the existing plan with newly declared services without reallocating peers", async () => {
     let allocationCount = 0;
 
     const firstPlan = await ensureWorkspaceServicePortPlan({
@@ -54,9 +54,11 @@ describe("ensureWorkspaceServicePortPlan", () => {
       },
     });
 
-    expect(Array.from(secondPlan.entries())).toEqual(Array.from(firstPlan.entries()));
-    expect(secondPlan.has("new-service")).toBe(false);
-    expect(allocationCount).toBe(2);
+    expect(Array.from(secondPlan.entries())).toEqual([
+      ...firstPlan.entries(),
+      ["new-service", 4300],
+    ]);
+    expect(allocationCount).toBe(3);
   });
 
   it("shares one first-plan build across concurrent callers", async () => {
@@ -101,6 +103,103 @@ describe("ensureWorkspaceServicePortPlan", () => {
     expect(allocationCount).toBe(2);
   });
 
+  it("extends a pending plan for a concurrent caller with another service", async () => {
+    const allocation = createDeferredPort();
+    const workspaceId = "registry-concurrent-extension-workspace";
+    const firstPlan = ensureWorkspaceServicePortPlan({
+      workspaceId,
+      services: [{ scriptName: "backend-dev" }],
+      allocatePort: async () => allocation.promise,
+    });
+    let allocations = 0;
+    const secondPlan = ensureWorkspaceServicePortPlan({
+      workspaceId,
+      services: [{ scriptName: "backend-dev" }, { scriptName: "web" }],
+      allocatePort: async () => {
+        allocations += 1;
+        return 6101;
+      },
+    });
+    allocation.resolve(6100);
+    expect(Array.from((await firstPlan).entries())).toEqual([["backend-dev", 6100]]);
+    expect(Array.from((await secondPlan).entries())).toEqual([
+      ["backend-dev", 6100],
+      ["web", 6101],
+    ]);
+    expect(allocations).toBe(1);
+    releaseWorkspaceServicePortPlan(workspaceId);
+  });
+
+  it("keeps the previous plan and reservations when an extension fails", async () => {
+    const workspaceId = "registry-failed-extension-workspace";
+    await ensureWorkspaceServicePortPlan({
+      workspaceId,
+      services: [{ scriptName: "backend-dev" }],
+      allocatePort: async () => 6200,
+    });
+    let allocations = 0;
+    await expect(
+      ensureWorkspaceServicePortPlan({
+        workspaceId,
+        services: [{ scriptName: "backend-dev" }, { scriptName: "web" }, { scriptName: "worker" }],
+        allocatePort: async () => {
+          allocations += 1;
+          if (allocations === 1) return 6201;
+          throw new Error("Allocation failed");
+        },
+      }),
+    ).rejects.toThrow("Allocation failed");
+    const priorPlan = await ensureWorkspaceServicePortPlan({
+      workspaceId,
+      services: [{ scriptName: "backend-dev" }],
+      allocatePort: async () => {
+        throw new Error("Existing port must survive");
+      },
+    });
+    expect(Array.from(priorPlan.entries())).toEqual([["backend-dev", 6200]]);
+    const otherWorkspace = "registry-failed-extension-other-workspace";
+    const reusedPlan = await ensureWorkspaceServicePortPlan({
+      workspaceId: otherWorkspace,
+      services: [{ scriptName: "web" }],
+      allocatePort: async ({ reservedPorts }) => {
+        expect(reservedPorts.has(6200)).toBe(true);
+        expect(reservedPorts.has(6201)).toBe(false);
+        return 6201;
+      },
+    });
+    expect(reusedPlan.get("web")).toBe(6201);
+    releaseWorkspaceServicePortPlan(workspaceId);
+    releaseWorkspaceServicePortPlan(otherWorkspace);
+  });
+
+  it("rejects a new explicit port that collides with an existing service", async () => {
+    const workspaceId = "registry-extension-explicit-collision-workspace";
+    await ensureWorkspaceServicePortPlan({
+      workspaceId,
+      services: [{ scriptName: "backend-dev" }],
+      allocatePort: async () => 6300,
+    });
+    await expect(
+      ensureWorkspaceServicePortPlan({
+        workspaceId,
+        services: [{ scriptName: "backend-dev" }, { scriptName: "web", port: 6300 }],
+        allocatePort: async () => 6301,
+      }),
+    ).rejects.toThrow("Service 'web' has a duplicate port 6300");
+    const plan = await ensureWorkspaceServicePortPlan({
+      workspaceId,
+      services: [{ scriptName: "backend-dev" }, { scriptName: "web", port: 6301 }],
+      allocatePort: async () => {
+        throw new Error("No allocation needed");
+      },
+    });
+    expect(Array.from(plan.entries())).toEqual([
+      ["backend-dev", 6300],
+      ["web", 6301],
+    ]);
+    releaseWorkspaceServicePortPlan(workspaceId);
+  });
+
   it("uses explicit configured ports without calling the allocator", async () => {
     let allocationCount = 0;
 
@@ -312,6 +411,123 @@ describe("refreshWorkspaceServicePort", () => {
     ]);
   });
 
+  it("preserves a concurrent service addition while refreshing a stopped service", async () => {
+    const workspaceId = "registry-refresh-and-extend-workspace";
+    await ensureWorkspaceServicePortPlan({
+      workspaceId,
+      services: [{ scriptName: "backend-dev" }],
+      allocatePort: async () => 6400,
+    });
+    const allocation = createDeferredPort();
+    const refreshing = refreshWorkspaceServicePort({
+      workspaceId,
+      service: { scriptName: "backend-dev" },
+      allocatePort: async () => allocation.promise,
+    });
+    const extending = ensureWorkspaceServicePortPlan({
+      workspaceId,
+      services: [{ scriptName: "backend-dev" }, { scriptName: "web", port: 6402 }],
+      allocatePort: async () => {
+        throw new Error("Explicit addition needs no allocation");
+      },
+    });
+    allocation.resolve(6401);
+    expect(await refreshing).toBe(6401);
+    await extending;
+    const plan = await ensureWorkspaceServicePortPlan({
+      workspaceId,
+      services: [],
+      allocatePort: async () => {
+        throw new Error("No allocation needed");
+      },
+    });
+    expect(Array.from(plan.entries())).toEqual([
+      ["backend-dev", 6401],
+      ["web", 6402],
+    ]);
+    releaseWorkspaceServicePortPlan(workspaceId);
+  });
+
+  it.each(["reused port", "allocation failure"])(
+    "cancels a pending refresh and its waiter after workspace release (%s)",
+    async (outcome) => {
+      const workspaceId = "registry-cancelled-refresh-workspace";
+      await ensureWorkspaceServicePortPlan({
+        workspaceId,
+        services: [{ scriptName: "api" }],
+        allocatePort: async () => 6500,
+      });
+      const allocation = createDeferredPort();
+      const refreshing = refreshWorkspaceServicePort({
+        workspaceId,
+        service: { scriptName: "api" },
+        allocatePort: async () => {
+          const port = await allocation.promise;
+          if (outcome === "allocation failure") throw new Error("Allocation failed");
+          return port;
+        },
+      });
+      const waiting = refreshWorkspaceServicePort({
+        workspaceId,
+        service: { scriptName: "web", port: 6501 },
+        allocatePort: async () => 6501,
+      });
+      const assertions = Promise.all([
+        expect(refreshing).rejects.toThrow("Workspace service port plan was released"),
+        expect(waiting).rejects.toThrow("Workspace service port plan was released"),
+      ]);
+      releaseWorkspaceServicePortPlan(workspaceId);
+      allocation.resolve(6500);
+      await assertions;
+      const reusedPlan = await ensureWorkspaceServicePortPlan({
+        workspaceId: "registry-after-cancelled-refresh-workspace",
+        services: [{ scriptName: "api" }],
+        allocatePort: async () => 6500,
+      });
+      expect(reusedPlan.get("api")).toBe(6500);
+      releaseWorkspaceServicePortPlan("registry-after-cancelled-refresh-workspace");
+    },
+  );
+
+  it("lets a waiting service restart allocate after another service's restart fails", async () => {
+    const workspaceId = "registry-independent-refresh-failure-workspace";
+    await ensureWorkspaceServicePortPlan({
+      workspaceId,
+      services: [{ scriptName: "api" }, { scriptName: "web" }],
+      allocatePort: createSequentialPortAllocator(6600),
+    });
+    const allocation = createDeferredPort();
+    const failedRefresh = refreshWorkspaceServicePort({
+      workspaceId,
+      service: { scriptName: "api" },
+      allocatePort: async () => {
+        await allocation.promise;
+        throw new Error("API port script failed");
+      },
+    });
+    const failedAssertion = expect(failedRefresh).rejects.toThrow("API port script failed");
+    const waitingRefresh = refreshWorkspaceServicePort({
+      workspaceId,
+      service: { scriptName: "web" },
+      allocatePort: async () => 6602,
+    });
+    allocation.resolve(0);
+    await failedAssertion;
+    expect(await waitingRefresh).toBe(6602);
+    const plan = await ensureWorkspaceServicePortPlan({
+      workspaceId,
+      services: [],
+      allocatePort: async () => {
+        throw new Error("No allocation needed");
+      },
+    });
+    expect(Array.from(plan.entries())).toEqual([
+      ["api", 6600],
+      ["web", 6602],
+    ]);
+    releaseWorkspaceServicePortPlan(workspaceId);
+  });
+
   it("uses an explicit configured port without calling the allocator", async () => {
     let allocationCount = 0;
 
diff --git a/packages/server/src/server/workspace-service-port-registry.ts b/packages/server/src/server/workspace-service-port-registry.ts
index be41a8d123..ea6cebfa35 100644
--- a/packages/server/src/server/workspace-service-port-registry.ts
+++ b/packages/server/src/server/workspace-service-port-registry.ts
@@ -24,6 +24,24 @@ interface PendingWorkspaceServicePortPlanToken {
   isReleased: boolean;
 }
 
+class WorkspaceServicePortPlanReleasedError extends Error {
+  constructor(workspaceId: string) {
+    super(`Workspace service port plan was released while being created for '${workspaceId}'`);
+  }
+}
+
+async function waitForWorkspaceServicePortPlanUpdate(
+  pendingPlan: Promise<Map<string, number>>,
+): Promise<void> {
+  try {
+    await pendingPlan;
+  } catch (error) {
+    // Allocation failure belongs to the original request. A waiting request
+    // retries against the rolled-back plan; workspace archival cancels both.
+    if (error instanceof WorkspaceServicePortPlanReleasedError) throw error;
+  }
+}
+
 const workspaceServicePortPlans = new Map<string, Map<string, number>>();
 const pendingWorkspaceServicePortPlans = new Map<string, Promise<Map<string, number>>>();
 const pendingWorkspaceServicePortPlanTokens = new Map<
@@ -37,25 +55,19 @@ const MAX_DYNAMIC_PORT_ALLOCATION_ATTEMPTS = 10;
 export async function ensureWorkspaceServicePortPlan(
   options: EnsureWorkspaceServicePortPlanOptions,
 ): Promise<ReadonlyMap<string, number>> {
-  const existingPlan = workspaceServicePortPlans.get(options.workspaceId);
-  if (existingPlan) {
+  const pendingPlan = pendingWorkspaceServicePortPlans.get(options.workspaceId);
+  if (pendingPlan) {
+    await waitForWorkspaceServicePortPlanUpdate(pendingPlan);
+    return ensureWorkspaceServicePortPlan(options);
+  }
+
+  const existingPlan =
+    workspaceServicePortPlans.get(options.workspaceId) ?? new Map<string, number>();
+  if (options.services.every((service) => existingPlan.has(service.scriptName))) {
     return new Map(existingPlan);
   }
 
-  let pendingPlan = pendingWorkspaceServicePortPlans.get(options.workspaceId);
-  if (!pendingPlan) {
-    const token: PendingWorkspaceServicePortPlanToken = { isReleased: false };
-    pendingPlan = createPendingWorkspaceServicePortPlan({
-      workspaceId: options.workspaceId,
-      services: options.services,
-      allocatePort: options.allocatePort,
-      token,
-    });
-    pendingWorkspaceServicePortPlans.set(options.workspaceId, pendingPlan);
-    pendingWorkspaceServicePortPlanTokens.set(options.workspaceId, token);
-  }
-
-  return new Map(await pendingPlan);
+  return new Map(await startWorkspaceServicePortPlanUpdate({ ...options, existingPlan }));
 }
 
 export function requirePlannedWorkspaceServicePort(
@@ -82,27 +94,62 @@ export function releaseWorkspaceServicePortPlan(workspaceId: string): void {
   dynamicPortsByWorkspace.delete(workspaceId);
 }
 
-async function createPendingWorkspaceServicePortPlan(options: {
-  workspaceId: string;
-  services: readonly WorkspaceServicePortDeclaration[];
-  allocatePort: (request: WorkspaceServicePortAllocationRequest) => Promise<number>;
-  token: PendingWorkspaceServicePortPlanToken;
-}): Promise<Map<string, number>> {
+interface WorkspaceServicePortPlanUpdateOptions extends EnsureWorkspaceServicePortPlanOptions {
+  existingPlan: ReadonlyMap<string, number>;
+  refreshScriptName?: string;
+}
+
+function startWorkspaceServicePortPlanUpdate(
+  options: WorkspaceServicePortPlanUpdateOptions,
+): Promise<Map<string, number>> {
+  const token: PendingWorkspaceServicePortPlanToken = { isReleased: false };
+  const plan = createPendingWorkspaceServicePortPlan({ ...options, token });
+  pendingWorkspaceServicePortPlans.set(options.workspaceId, plan);
+  pendingWorkspaceServicePortPlanTokens.set(options.workspaceId, token);
+  return plan;
+}
+
+async function createPendingWorkspaceServicePortPlan(
+  options: WorkspaceServicePortPlanUpdateOptions & { token: PendingWorkspaceServicePortPlanToken },
+): Promise<Map<string, number>> {
+  const previousDynamicPorts = new Map(dynamicPortsByWorkspace.get(options.workspaceId));
+  const retainedPlan = new Map(options.existingPlan);
+  if (options.refreshScriptName !== undefined) retainedPlan.delete(options.refreshScriptName);
   try {
-    const plan = await buildWorkspaceServicePortPlan({
+    const updatedPlan = await buildWorkspaceServicePortPlan({
       workspaceId: options.workspaceId,
       services: options.services,
       allocatePort: options.allocatePort,
+      existingPlan: retainedPlan,
     });
+    const plan = new Map(options.existingPlan);
+    for (const [scriptName, port] of updatedPlan) plan.set(scriptName, port);
     if (options.token.isReleased) {
-      throw new Error(
-        `Workspace service port plan was released while being created for '${options.workspaceId}'`,
-      );
+      throw new WorkspaceServicePortPlanReleasedError(options.workspaceId);
+    }
+    for (const [scriptName, port] of previousDynamicPorts) {
+      if (plan.get(scriptName) !== port) {
+        releaseDynamicPort({ workspaceId: options.workspaceId, scriptName, port });
+      }
     }
     workspaceServicePortPlans.set(options.workspaceId, plan);
     return plan;
   } catch (error) {
-    releaseWorkspaceServicePortPlan(options.workspaceId);
+    const dynamicPorts = dynamicPortsByWorkspace.get(options.workspaceId);
+    if (dynamicPorts) {
+      for (const [scriptName, port] of dynamicPorts) {
+        if (options.token.isReleased || previousDynamicPorts.get(scriptName) !== port) {
+          releaseDynamicPort({ workspaceId: options.workspaceId, scriptName, port });
+        }
+      }
+    }
+    if (!options.token.isReleased) {
+      for (const [scriptName, port] of previousDynamicPorts) {
+        reserveDynamicPort({ workspaceId: options.workspaceId, scriptName, port });
+      }
+    }
+    if (options.token.isReleased)
+      throw new WorkspaceServicePortPlanReleasedError(options.workspaceId);
     throw error;
   } finally {
     pendingWorkspaceServicePortPlans.delete(options.workspaceId);
@@ -111,12 +158,16 @@ async function createPendingWorkspaceServicePortPlan(options: {
 }
 
 async function buildWorkspaceServicePortPlan(options: {
+  existingPlan: ReadonlyMap<string, number>;
   workspaceId: string;
   services: readonly WorkspaceServicePortDeclaration[];
   allocatePort: (request: WorkspaceServicePortAllocationRequest) => Promise<number>;
 }): Promise<Map<string, number>> {
-  const explicitPortOwners = new Map<number, string>();
+  const explicitPortOwners = new Map<number, string>(
+    Array.from(options.existingPlan, ([scriptName, port]) => [port, scriptName]),
+  );
   for (const service of options.services) {
+    if (options.existingPlan.has(service.scriptName)) continue;
     if (service.port === undefined) continue;
     if (explicitPortOwners.has(service.port)) {
       throw new Error(`Service '${service.scriptName}' has a duplicate port ${service.port}`);
@@ -124,8 +175,9 @@ async function buildWorkspaceServicePortPlan(options: {
     explicitPortOwners.set(service.port, service.scriptName);
   }
 
-  const plan = new Map<string, number>();
+  const plan = new Map(options.existingPlan);
   for (const service of options.services) {
+    if (plan.has(service.scriptName)) continue;
     if (service.port !== undefined) {
       plan.set(service.scriptName, service.port);
       continue;
@@ -148,32 +200,20 @@ async function buildWorkspaceServicePortPlan(options: {
 export async function refreshWorkspaceServicePort(
   options: RefreshWorkspaceServicePortOptions,
 ): Promise<number> {
-  const plan = workspaceServicePortPlans.get(options.workspaceId) ?? new Map<string, number>();
+  const pendingPlan = pendingWorkspaceServicePortPlans.get(options.workspaceId);
+  if (pendingPlan) {
+    await waitForWorkspaceServicePortPlanUpdate(pendingPlan);
+    return refreshWorkspaceServicePort(options);
+  }
 
-  const reservedPorts = new Set(plan.values());
-  const previousPort = plan.get(options.service.scriptName);
-  if (previousPort !== undefined) {
-    reservedPorts.delete(previousPort);
-  }
-  const oldDynamicPort = dynamicPortsByWorkspace
-    .get(options.workspaceId)
-    ?.get(options.service.scriptName);
-  const port = await resolveServicePort({
-    service: options.service,
+  const plan = await startWorkspaceServicePortPlanUpdate({
     workspaceId: options.workspaceId,
+    services: [options.service],
     allocatePort: options.allocatePort,
-    reservedPorts,
+    existingPlan: workspaceServicePortPlans.get(options.workspaceId) ?? new Map<string, number>(),
+    refreshScriptName: options.service.scriptName,
   });
-  if (oldDynamicPort !== undefined && oldDynamicPort !== port) {
-    releaseDynamicPort({
-      workspaceId: options.workspaceId,
-      scriptName: options.service.scriptName,
-      port: oldDynamicPort,
-    });
-  }
-  plan.set(options.service.scriptName, port);
-  workspaceServicePortPlans.set(options.workspaceId, plan);
-  return port;
+  return requirePlannedWorkspaceServicePort(plan, options.service.scriptName);
 }
 
 async function resolveServicePort(options: {
diff --git a/packages/server/src/server/worktree-bootstrap.test.ts b/packages/server/src/server/worktree-bootstrap.test.ts
index c878ef1387..5e5ac1762e 100644
--- a/packages/server/src/server/worktree-bootstrap.test.ts
+++ b/packages/server/src/server/worktree-bootstrap.test.ts
@@ -837,6 +837,54 @@ describe("runAsyncWorktreeBootstrap", () => {
     });
   });
 
+  it("starts a service added to paseo.json without restarting the daemon", async () => {
+    const backend = {
+      type: "service" as const,
+      command: "uv run uvicorn app.main:app --reload --port $PASEO_PORT",
+    };
+    commitPaseoScripts({ "backend-dev": backend });
+
+    const serviceProxy = new ScriptRouteStore();
+    const runtimeStore = new WorkspaceScriptRuntimeStore();
+    const createTerminalCalls: CreateTerminalCall[] = [];
+    const terminalRecords: StubTerminalRecord[] = [];
+    const options = {
+      repoRoot: repoDir,
+      workspaceId: repoDir,
+      projectSlug: "repo",
+      branchName: "feature-added-service",
+      daemonPort: 6767,
+      serviceProxy,
+      runtimeStore,
+      terminalManager: createStubTerminalManager(createTerminalCalls, terminalRecords),
+    };
+    const backendResult = await spawnWorkspaceScript({ ...options, scriptName: "backend-dev" });
+
+    writeFileSync(
+      join(repoDir, "paseo.json"),
+      JSON.stringify({
+        scripts: {
+          "backend-dev": backend,
+          web: { type: "service", command: "pnpm run dev -- --port $PASEO_PORT" },
+        },
+      }),
+    );
+    const webResult = await spawnWorkspaceScript({ ...options, scriptName: "web" });
+
+    expect(webResult.port).toEqual(expect.any(Number));
+    expect(webResult.port).not.toBe(backendResult.port);
+    expect(terminalRecords[1]?.sentInputs).toEqual(["pnpm run dev -- --port $PASEO_PORT\r"]);
+    expect(createTerminalCalls[1]?.env?.PASEO_PORT).toBe(String(webResult.port));
+    expect(createTerminalCalls[1]?.env?.PASEO_SERVICE_BACKEND_DEV_PORT).toBe(
+      String(backendResult.port),
+    );
+    expect(serviceProxy.listRoutes()).toHaveLength(2);
+    expect(runtimeStore.get({ workspaceId: repoDir, scriptName: "backend-dev" })).toMatchObject({
+      lifecycle: "running",
+      terminalId: backendResult.terminalId,
+    });
+  });
+
   it("spawns services with public aliases and public service URLs", async () => {
     commitPaseoScripts(
       {

From 938c4e2632fb3236ab2d8b8065aa8ec10f8b6978 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 12:09:47 +0200
Subject: [PATCH 153/270] Show Git diffs for filenames with quotes and control
 characters (#6583)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(diff): decode quoted Git patch paths

* fix(server): preserve Git paths in diff and commit listings

* refactor(diff): make quoted-path conversions explicit

* test(server): verify quoted filename diffs through daemon RPC

Keep the checkout and commit-file regression on the public client interface, and align the large-file command assertion with NUL-delimited statistics.

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>

* test(server): run filename RPC regression in integration checks

---------

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/server/package.json                  |   2 +-
 .../src/server/git-filename-diffs.e2e.test.ts |  62 ++++++
 .../src/server/utils/diff-highlighter.test.ts |  79 +++++++
 .../src/server/utils/diff-highlighter.ts      |  14 +-
 .../utils/checkout-git.patch-format.test.ts   | 205 +++++++++++++++++-
 .../server/src/utils/checkout-git.test.ts     |   2 +-
 packages/server/src/utils/checkout-git.ts     |  65 +++---
 packages/server/src/utils/git-quoted-path.ts  |  34 +++
 8 files changed, 424 insertions(+), 39 deletions(-)
 create mode 100644 packages/server/src/server/git-filename-diffs.e2e.test.ts
 create mode 100644 packages/server/src/utils/git-quoted-path.ts

diff --git a/packages/server/package.json b/packages/server/package.json
index 541cf5eba1..beffa3b4ce 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\" && vitest run --maxWorkers=1 src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"oversized attachments\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\" && vitest run --maxWorkers=1 src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"oversized attachments\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",
diff --git a/packages/server/src/server/git-filename-diffs.e2e.test.ts b/packages/server/src/server/git-filename-diffs.e2e.test.ts
new file mode 100644
index 0000000000..343e1c81c8
--- /dev/null
+++ b/packages/server/src/server/git-filename-diffs.e2e.test.ts
@@ -0,0 +1,62 @@
+import { test, expect } from "vitest";
+import { execFileSync } from "node:child_process";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { createTestPaseoDaemon, DaemonClient } from "./test-utils/index.js";
+
+test.skipIf(process.platform === "win32")(
+  "checkout and commit diffs preserve filenames that Git quotes",
+  async () => {
+    const cwd = mkdtempSync(join(tmpdir(), "git-filename-diffs-"));
+    const git = (...args: string[]) => execFileSync("git", args, { cwd, encoding: "utf8" }).trim();
+    const names = [
+      'report "draft".txt',
+      "back\\slash.txt",
+      "tab\tname.txt",
+      "normal.txt",
+      "with spaces.txt",
+    ];
+    const editLines = expect.arrayContaining([
+      expect.objectContaining({ type: "remove", content: "before" }),
+      expect.objectContaining({ type: "add", content: "after" }),
+    ]);
+    const daemon = await createTestPaseoDaemon({ agentClients: {} });
+    const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+    try {
+      git("init", "-b", "main");
+      git("config", "user.name", "Test");
+      git("config", "user.email", "test@example.com");
+      git("config", "core.quotepath", "false");
+      for (const name of names) writeFileSync(join(cwd, name), "before\n");
+      git("add", ".");
+      git("-c", "commit.gpgsign=false", "commit", "-m", "initial");
+      for (const name of names) writeFileSync(join(cwd, name), "after\n");
+
+      await client.connect();
+      const checkout = await client.getCheckoutDiff(cwd, { mode: "uncommitted" });
+      expect(checkout.error).toBeNull();
+      expect(checkout.files.map((file) => file.path).sort()).toEqual([...names].sort());
+      for (const file of checkout.files) {
+        expect(file).toMatchObject({ status: "ok", additions: 1, deletions: 1 });
+        expect(file.hunks.flatMap((hunk) => hunk.lines)).toEqual(editLines);
+      }
+
+      git("add", ".");
+      git("-c", "commit.gpgsign=false", "commit", "-m", "edit");
+      const sha = git("rev-parse", "HEAD");
+      for (const name of names) {
+        const commit = await client.getCommitFileDiff(cwd, sha, name);
+        expect(commit.file).toMatchObject({ path: name, additions: 1, deletions: 1 });
+        expect(commit.file?.hunks.flatMap((hunk) => hunk.lines)).toEqual(editLines);
+        const file = await client.readFile(cwd, name);
+        expect(file.kind).toBe("text");
+        expect(new TextDecoder().decode(file.bytes)).toBe("after\n");
+      }
+    } finally {
+      await client.close();
+      await daemon.close();
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  },
+);
diff --git a/packages/server/src/server/utils/diff-highlighter.test.ts b/packages/server/src/server/utils/diff-highlighter.test.ts
index 5ca1177799..fda98d6cbf 100644
--- a/packages/server/src/server/utils/diff-highlighter.test.ts
+++ b/packages/server/src/server/utils/diff-highlighter.test.ts
@@ -218,6 +218,85 @@ index 1234567..abcdefg 100644
     },
   );
 
+  it("decodes quoted Git patch paths before matching files", () => {
+    const files = parseDiff(
+      [
+        'diff --git "a/report \\"draft\\".txt" "b/report \\"draft\\".txt"',
+        "index 1234567..abcdefg 100644",
+        '--- "a/report \\"draft\\".txt"',
+        '+++ "b/report \\"draft\\".txt"',
+        "@@ -1 +1 @@",
+        "-before",
+        "+after",
+        "",
+      ].join("\n"),
+    );
+
+    expect(files).toEqual([
+      {
+        path: 'report "draft".txt',
+        isNew: false,
+        isDeleted: false,
+        additions: 1,
+        deletions: 1,
+        hunks: [
+          {
+            oldStart: 1,
+            oldCount: 1,
+            newStart: 1,
+            newCount: 1,
+            lines: [
+              { type: "header", content: "@@ -1 +1 @@" },
+              { type: "remove", content: "before" },
+              { type: "add", content: "after" },
+            ],
+          },
+        ],
+      },
+    ]);
+  });
+
+  it.each([
+    ["tab\\tname.txt", "tab\tname.txt"],
+    ["line\\nname.txt", "line\nname.txt"],
+    ["back\\\\slash.txt", "back\\slash.txt"],
+    ["bell\\aname.txt", "bell\u0007name.txt"],
+    ["vertical\\vname.txt", "vertical\u000bname.txt"],
+    ["\\346\\265\\213\\350\\257\\225.txt", "测试.txt"],
+    ['测试 \\"draft\\".txt', '测试 "draft".txt'],
+  ])("decodes C-quoted path %s without changing its diff lines", (encoded, path) => {
+    const files = parseDiff(
+      [
+        'diff --git "a/' + encoded + '" "b/' + encoded + '"',
+        "index 1234567..abcdefg 100644",
+        '--- "a/' + encoded + '"',
+        '+++ "b/' + encoded + '"',
+        "@@ -1 +1 @@",
+        "-before",
+        "+after",
+        "",
+      ].join("\n"),
+    );
+
+    expect(files).toHaveLength(1);
+    expect(files[0]).toMatchObject({ path, additions: 1, deletions: 1 });
+    expect(files[0].hunks[0].lines).toEqual([
+      { type: "header", content: "@@ -1 +1 @@" },
+      { type: "remove", content: "before" },
+      { type: "add", content: "after" },
+    ]);
+  });
+
+  it.each([
+    ['"a/old \\"draft\\".txt" b/new with spaces.txt', "new with spaces.txt"],
+    ['a/old with spaces.txt "b/new \\"draft\\".txt"', 'new "draft".txt'],
+    ['"report \\"draft\\".txt" "report \\"draft\\".txt"', 'report "draft".txt'],
+  ])("reads quoted paths from header-only patches: %s", (header, path) => {
+    expect(parseDiff("diff --git " + header + "\nsimilarity index 100%\n")).toEqual([
+      { path, isNew: false, isDeleted: false, additions: 0, deletions: 0, hunks: [] },
+    ]);
+  });
+
   it("parses a simple diff with one hunk", () => {
     const files = parseDiff(SIMPLE_DIFF);
 
diff --git a/packages/server/src/server/utils/diff-highlighter.ts b/packages/server/src/server/utils/diff-highlighter.ts
index 97d68d1fcd..3c2df279e2 100644
--- a/packages/server/src/server/utils/diff-highlighter.ts
+++ b/packages/server/src/server/utils/diff-highlighter.ts
@@ -1,6 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
 import { highlightCode, isLanguageSupported, type HighlightToken } from "@getpaseo/highlight";
+import { unquoteGitPath } from "../../utils/git-quoted-path.js";
 
 const MAX_DIFF_HIGHLIGHT_LINE_CHARS = 10_000;
 
@@ -53,7 +54,7 @@ function extractPathFromMetadata(lines: string[], prefix: "--- " | "+++ "): stri
     return null;
   }
 
-  const path = line.slice(prefix.length).replace(/\t.*$/, "").trimEnd();
+  const path = unquoteGitPath(line.slice(prefix.length).replace(/\t.*$/, ""));
   return path === "/dev/null" ? null : path;
 }
 
@@ -64,6 +65,17 @@ function extractPathFromDiffHeader(lines: string[]): string {
     return prefixedPathMatch[2];
   }
 
+  const quotedPathMatch =
+    firstLine.match(/^("(?:\\.|[^"\\])*") (.+)$/) ?? firstLine.match(/^(.+) ("(?:\\.|[^"\\])*")$/);
+  if (quotedPathMatch) {
+    const oldPath = unquoteGitPath(quotedPathMatch[1]);
+    const newPath = unquoteGitPath(quotedPathMatch[2]);
+    if (usesDiffPathPrefixes(oldPath, newPath)) {
+      return newPath.slice(2);
+    }
+    return newPath;
+  }
+
   const metadataPath =
     extractPathFromMetadata(lines, "+++ ") ?? extractPathFromMetadata(lines, "--- ");
   if (metadataPath) {
diff --git a/packages/server/src/utils/checkout-git.patch-format.test.ts b/packages/server/src/utils/checkout-git.patch-format.test.ts
index d30ae1d7ce..61e864a401 100644
--- a/packages/server/src/utils/checkout-git.patch-format.test.ts
+++ b/packages/server/src/utils/checkout-git.patch-format.test.ts
@@ -3,15 +3,218 @@ import { existsSync, mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { getCheckoutDiff, getCommitFileDiff } from "./checkout-git.js";
+import {
+  getCheckoutDiff,
+  getCheckoutShortstat,
+  getCommitFileDiff,
+  listCheckoutCommits,
+} from "./checkout-git.js";
 
 const repos: string[] = [];
 
+const EDITED_TEXT_DIFF = {
+  isNew: false,
+  isDeleted: false,
+  additions: 1,
+  deletions: 1,
+  hunks: [
+    {
+      oldStart: 1,
+      oldCount: 1,
+      newStart: 1,
+      newCount: 1,
+      lines: [
+        { type: "header", content: "@@ -1 +1 @@" },
+        { type: "remove", content: "before" },
+        { type: "add", content: "after" },
+      ],
+    },
+  ],
+};
+
 afterEach(() => {
   vi.unstubAllEnvs();
   for (const repo of repos.splice(0)) rmSync(repo, { recursive: true, force: true });
 });
 
+it.skipIf(process.platform === "win32")(
+  "returns a quoted filename and its uncommitted diff using its actual path",
+  async () => {
+    const cwd = createChangedRepo("core.quotepath=false");
+    const name = 'report "draft".txt';
+    writeFileSync(join(cwd, "file.txt"), "before\n");
+    writeFileSync(join(cwd, name), "before\n");
+    git(cwd, "add", "--", name);
+    git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "add quoted filename");
+    writeFileSync(join(cwd, name), "after\n");
+
+    const result = await getCheckoutDiff(cwd, { mode: "uncommitted", includeStructured: true });
+
+    expect(result.structured).toHaveLength(1);
+    expect(result.structured?.[0]).toMatchObject({
+      path: name,
+      status: "ok",
+      ...EDITED_TEXT_DIFF,
+    });
+  },
+);
+
+describe.skipIf(process.platform === "win32")("quoted paths from real Git", () => {
+  const names = [
+    "normal.txt",
+    "with spaces.txt",
+    'report "draft".txt',
+    "back\\slash.txt",
+    "tab\tname.txt",
+    "line\nname.txt",
+    " leading and trailing .txt ",
+    'report "old => draft".txt',
+  ];
+
+  function createQuotedPathsRepo(): string {
+    const cwd = createChangedRepo("core.quotepath=false");
+    writeFileSync(join(cwd, "file.txt"), "before\n");
+    for (const name of names) writeFileSync(join(cwd, name), "before\n");
+    git(cwd, "add", "--", ...names);
+    git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "add filenames");
+    git(cwd, "checkout", "-b", "feature");
+    for (const name of names) writeFileSync(join(cwd, name), "after\n");
+    return cwd;
+  }
+
+  it("preserves tracked and untracked paths, diff lines and summary counts", async () => {
+    const cwd = createQuotedPathsRepo();
+    const untrackedNames = names.map((name) => "untracked-" + name);
+    for (const name of untrackedNames) writeFileSync(join(cwd, name), "new file\n");
+
+    const result = await getCheckoutDiff(cwd, { mode: "uncommitted", includeStructured: true });
+
+    expect(result.structured?.map((file) => file.path).sort()).toEqual(
+      [...names, ...untrackedNames].sort(),
+    );
+    for (const name of names) {
+      expect(result.structured?.find((file) => file.path === name)).toMatchObject({
+        path: name,
+        status: "ok",
+        ...EDITED_TEXT_DIFF,
+      });
+    }
+    for (const name of untrackedNames) {
+      expect(result.structured?.find((file) => file.path === name)).toMatchObject({
+        path: name,
+        status: "ok",
+        isNew: true,
+        isDeleted: false,
+        additions: 1,
+        deletions: 0,
+        hunks: [
+          {
+            oldStart: 0,
+            oldCount: 0,
+            newStart: 1,
+            newCount: 1,
+            lines: [
+              { type: "header", content: "@@ -0,0 +1 @@" },
+              { type: "add", content: "new file" },
+            ],
+          },
+        ],
+      });
+    }
+    expect(await getCheckoutShortstat(cwd)).toEqual({
+      additions: names.length + untrackedNames.length,
+      deletions: names.length,
+    });
+  });
+
+  it("opens base and commit diffs using the actual paths from the commit list", async () => {
+    const cwd = createQuotedPathsRepo();
+    git(cwd, "add", "--", ...names);
+    git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit filenames");
+    const sha = git(cwd, "rev-parse", "HEAD").trim();
+
+    const base = await getCheckoutDiff(cwd, {
+      mode: "base",
+      baseRef: "main",
+      includeStructured: true,
+    });
+    expect(base.structured?.map((file) => file.path).sort()).toEqual([...names].sort());
+    for (const name of names) {
+      expect(base.structured?.find((file) => file.path === name)).toMatchObject({
+        path: name,
+        status: "ok",
+        ...EDITED_TEXT_DIFF,
+      });
+    }
+
+    const history = await listCheckoutCommits({ cwd });
+    const commit = history.commits[0];
+    expect(commit.sha).toBe(sha);
+    expect(commit.files).toEqual(
+      [...names].sort().map((name) => ({
+        path: name,
+        additions: 1,
+        deletions: 1,
+        status: "modified",
+      })),
+    );
+    for (const file of commit.files) {
+      expect(await getCommitFileDiff({ cwd, sha, path: file.path })).toMatchObject({
+        path: file.path,
+        ...EDITED_TEXT_DIFF,
+      });
+    }
+  });
+
+  it("preserves quoted rename destinations and binary paths in diff and commit lists", async () => {
+    const cwd = createChangedRepo("core.quotepath=false");
+    const oldPath = 'old "draft".txt';
+    const newPath = 'new "draft".txt';
+    const binaryPath = "image\tdata.bin";
+    writeFileSync(join(cwd, "file.txt"), "before\n");
+    writeFileSync(join(cwd, oldPath), "unchanged\n");
+    writeFileSync(join(cwd, binaryPath), Buffer.from([0, 1, 2]));
+    git(cwd, "add", "--", oldPath, binaryPath);
+    git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "add rename and binary files");
+    git(cwd, "checkout", "-b", "feature");
+    git(cwd, "mv", "--", oldPath, newPath);
+    writeFileSync(join(cwd, binaryPath), Buffer.from([0, 3, 4]));
+
+    const result = await getCheckoutDiff(cwd, { mode: "uncommitted", includeStructured: true });
+    expect(
+      result.structured?.map(({ path, oldPath: sourcePath, status }) => ({
+        path,
+        oldPath: sourcePath,
+        status,
+      })),
+    ).toEqual([
+      { path: binaryPath, oldPath: undefined, status: "binary" },
+      {
+        path: newPath,
+        oldPath,
+        status: "ok",
+      },
+    ]);
+    expect(result.structured?.[0]).toEqual({
+      path: binaryPath,
+      isNew: false,
+      isDeleted: false,
+      additions: 0,
+      deletions: 0,
+      hunks: [],
+      status: "binary",
+    });
+
+    git(cwd, "add", "--", binaryPath);
+    git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "rename file and edit binary");
+    const history = await listCheckoutCommits({ cwd });
+    expect(history.commits[0].files).toEqual([
+      { path: binaryPath, additions: 0, deletions: 0, status: "modified" },
+      { path: newPath, additions: 0, deletions: 0, status: "renamed" },
+    ]);
+  });
+});
+
 it.each(["diff.mnemonicPrefix=true", "color.diff=always", "diff.noprefix=true"])(
   "preserves batched paths, spaces and literal prefix directories with %s",
   async (config) => {
diff --git a/packages/server/src/utils/checkout-git.test.ts b/packages/server/src/utils/checkout-git.test.ts
index 21791fa49e..e361c41921 100644
--- a/packages/server/src/utils/checkout-git.test.ts
+++ b/packages/server/src/utils/checkout-git.test.ts
@@ -1628,7 +1628,7 @@ const x = 1;
     expect(diff.diff).toContain(`-export const value = "old";`);
     expect(diff.diff).toContain(`+export const value = "new";`);
     expect(commands).toContain(
-      "diff --no-ext-diff --no-color --src-prefix=a/ --dst-prefix=b/ --numstat HEAD",
+      "diff --no-ext-diff --no-color --src-prefix=a/ --dst-prefix=b/ -z --numstat HEAD",
     );
     expect(commands).toContain(
       "diff --no-ext-diff --no-color --src-prefix=a/ --dst-prefix=b/ HEAD -- :(literal)generated.js :(literal)small.ts",
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index 7a53c753b9..0f34a1ea73 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -32,6 +32,7 @@ import {
 import { parseGitRevParsePath, resolveGitRevParsePath } from "./git-rev-parse-path.js";
 import { runGitCommand, type RunGitCommand } from "./run-git-command.js";
 import { readGitFileContents } from "./git-file-contents.js";
+import { unquoteGitPath } from "./git-quoted-path.js";
 import { isPaseoOwnedWorktreeCwd, resolvePaseoWorktreesBaseRoot } from "./worktree.js";
 import {
   branchNameFromRef,
@@ -515,22 +516,18 @@ async function listCheckoutFileChanges(
   const { stdout: nameStatusOut } = await runGitCommand(
     buildGitDiffArgs({
       ignoreWhitespace,
-      extra: ["--name-status", ...getCheckoutDiffRefArgs(refs)],
+      extra: ["-z", "--name-status", ...getCheckoutDiffRefArgs(refs)],
     }),
     { cwd, envOverlay: READ_ONLY_GIT_ENV },
   );
-  for (const line of nameStatusOut
-    .split("\n")
-    .map((l) => l.trim())
-    .filter(Boolean)) {
-    // `--name-status` uses TAB separators, which preserves filenames with spaces.
-    const tabParts = line.split("\t");
-    const rawStatus = (tabParts[0] ?? "").trim();
+  const nameStatusFields = nameStatusOut.split("\0");
+  for (let index = 0; index < nameStatusFields.length; ) {
+    const rawStatus = nameStatusFields[index++];
     if (!rawStatus) continue;
 
     if (rawStatus.startsWith("R") || rawStatus.startsWith("C")) {
-      const oldPath = tabParts[1];
-      const newPath = tabParts[2];
+      const oldPath = nameStatusFields[index++];
+      const newPath = nameStatusFields[index++];
       if (newPath) {
         changes.push({
           path: newPath,
@@ -543,7 +540,7 @@ async function listCheckoutFileChanges(
       continue;
     }
 
-    const path = tabParts[1];
+    const path = nameStatusFields[index++];
     if (!path) continue;
     const code = rawStatus[0];
     changes.push({
@@ -556,16 +553,13 @@ async function listCheckoutFileChanges(
 
   if (refs.includeUntracked) {
     const { stdout: untrackedOut } = await runGitCommand(
-      ["ls-files", "--others", "--exclude-standard"],
+      ["ls-files", "-z", "--others", "--exclude-standard"],
       {
         cwd,
         envOverlay: READ_ONLY_GIT_ENV,
       },
     );
-    for (const file of untrackedOut
-      .split("\n")
-      .map((l) => l.trim())
-      .filter(Boolean)) {
+    for (const file of untrackedOut.split("\0").filter(Boolean)) {
       changes.push({
         path: file,
         status: "U",
@@ -623,18 +617,22 @@ async function tryResolveMergeBase(cwd: string, baseRef: string): Promise<string
 type FileStat = { additions: number; deletions: number; isBinary: boolean } | null;
 
 function normalizeNumstatPath(pathField: string): string {
+  if (/^"(?:\\.|[^"\\])*"$/.test(pathField)) {
+    return unquoteGitPath(pathField);
+  }
+
   const braceRenameMatch = pathField.match(/^(.*)\{(.*) => (.*)\}(.*)$/);
   if (braceRenameMatch) {
     const [, prefix, , renamed, suffix] = braceRenameMatch;
-    return `${prefix}${renamed}${suffix}`;
+    return unquoteGitPath(`${prefix}${renamed}${suffix}`);
   }
 
   const inlineRenameMatch = pathField.match(/^(.*) => (.*)$/);
   if (inlineRenameMatch) {
-    return inlineRenameMatch[2] ?? pathField;
+    return unquoteGitPath(inlineRenameMatch[2] ?? pathField);
   }
 
-  return pathField;
+  return unquoteGitPath(pathField);
 }
 
 // Parsed patches need a stable wire format regardless of terminal presentation settings.
@@ -669,7 +667,7 @@ async function getTrackedNumstatByPath(
   const result = await runGitCommand(
     buildGitDiffArgs({
       ignoreWhitespace,
-      extra: ["--numstat", ...getCheckoutDiffRefArgs(refs)],
+      extra: ["-z", "--numstat", ...getCheckoutDiffRefArgs(refs)],
     }),
     {
       cwd,
@@ -680,21 +678,21 @@ async function getTrackedNumstatByPath(
   );
 
   const stats = new Map<string, FileStat>();
-  const lines = result.stdout
-    .split("\n")
-    .map((line) => line.trim())
-    .filter(Boolean);
-
-  for (const line of lines) {
-    const parts = line.split("\t");
+  const records = result.stdout.split("\0");
+  for (let index = 0; index < records.length; index += 1) {
+    const parts = records[index].split("\t");
     if (parts.length < 3) {
       continue;
     }
 
     const additionsField = parts[0] ?? "";
     const deletionsField = parts[1] ?? "";
-    const rawPath = parts.slice(2).join("\t");
-    const path = normalizeNumstatPath(rawPath);
+    let path = parts.slice(2).join("\t");
+    if (!path) {
+      // A rename has an empty path here, followed by separate old/new NUL fields.
+      path = records[index + 2];
+      index += 2;
+    }
 
     if (!path) {
       continue;
@@ -2424,7 +2422,7 @@ function parseRawStatusLine(line: string, statuses: Map<string, CheckoutCommitFi
   if (!path) {
     return;
   }
-  statuses.set(path, status);
+  statuses.set(unquoteGitPath(path), status);
 }
 
 // A `--numstat` line: `<adds>\t<dels>\t<path>` (renames use `old => new`, binary
@@ -2738,16 +2736,13 @@ async function countUntrackedAdditions(
 ): Promise<number> {
   try {
     const { stdout } = await getRunGitCommand(context)(
-      ["ls-files", "--others", "--exclude-standard"],
+      ["ls-files", "-z", "--others", "--exclude-standard"],
       {
         cwd,
         envOverlay: READ_ONLY_GIT_ENV,
       },
     );
-    const files = stdout
-      .split("\n")
-      .map((l) => l.trim())
-      .filter(Boolean);
+    const files = stdout.split("\0").filter(Boolean);
 
     let additions = 0;
     for (const file of files.slice(0, UNTRACKED_SHORTSTAT_MAX_FILES)) {
diff --git a/packages/server/src/utils/git-quoted-path.ts b/packages/server/src/utils/git-quoted-path.ts
new file mode 100644
index 0000000000..cb5a9d45eb
--- /dev/null
+++ b/packages/server/src/utils/git-quoted-path.ts
@@ -0,0 +1,34 @@
+const GIT_PATH_ESCAPE_BYTES: Record<string, number> = {
+  a: 7,
+  b: 8,
+  t: 9,
+  n: 10,
+  v: 11,
+  f: 12,
+  r: 13,
+  '"': 34,
+  "\\": 92,
+};
+
+// core.quotepath=false still quotes control characters, double quotes and backslashes.
+export function unquoteGitPath(value: string): string {
+  if (!value.startsWith('"') || !value.endsWith('"')) return value;
+
+  const encoded = value.slice(1, -1);
+  const parts: Buffer[] = [];
+  let offset = 0;
+  for (const match of encoded.matchAll(/\\([0-7]{1,3}|[abfnrtv"\\])/g)) {
+    parts.push(Buffer.from(encoded.slice(offset, match.index)));
+    const escape = match[1];
+    let byte: number;
+    if (/^[0-7]/.test(escape)) {
+      byte = Number.parseInt(escape, 8);
+    } else {
+      byte = GIT_PATH_ESCAPE_BYTES[escape];
+    }
+    parts.push(Buffer.from([byte]));
+    offset = match.index + match[0].length;
+  }
+  parts.push(Buffer.from(encoded.slice(offset)));
+  return Buffer.concat(parts).toString("utf8");
+}

From cafa04d3fbdbc7e4a3fe8f4d4bea80f15cd4a1d0 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 13:14:08 +0200
Subject: [PATCH 154/270] fix(app): traverse workspaces beyond nine (#6586)

Relative navigation shared the list capped for digit shortcuts, so it wrapped at the ninth workspace. Keep all sidebar targets and cap only numbered badges. Carry forward #4128 with keyboard-routing and browser regressions.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: Raisal P Wardana <IEatCodeDaily@users.noreply.github.com>
---
 .../workspace-relative-navigation.spec.ts     | 74 +++++++++++++++++++
 .../app/src/utils/sidebar-shortcuts.test.ts   | 49 +++++++++++-
 packages/app/src/utils/sidebar-shortcuts.ts   |  9 +--
 3 files changed, 123 insertions(+), 9 deletions(-)
 create mode 100644 packages/app/e2e/browser/workspace-relative-navigation.spec.ts

diff --git a/packages/app/e2e/browser/workspace-relative-navigation.spec.ts b/packages/app/e2e/browser/workspace-relative-navigation.spec.ts
new file mode 100644
index 0000000000..4853e9daa4
--- /dev/null
+++ b/packages/app/e2e/browser/workspace-relative-navigation.spec.ts
@@ -0,0 +1,74 @@
+import type { Page } from "@playwright/test";
+import { test, expect } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  expectSidebarWorkspaceSelected,
+  switchWorkspaceViaSidebar,
+} from "../support/helpers/workspace-ui";
+
+async function readVisibleWorkspaceOrder(page: Page): Promise<string[]> {
+  const rows = page.getByRole("button", { name: /^Workspace \d{2}$/ });
+  await expect(rows).toHaveCount(12);
+  return rows.evaluateAll(
+    (elements, prefix) =>
+      elements.map((element) => element.getAttribute("data-testid")!.slice(prefix.length)),
+    `sidebar-workspace-row-${getServerId()}:`,
+  );
+}
+
+async function navigateWorkspace(
+  page: Page,
+  direction: "next" | "previous",
+  workspaceId: string,
+): Promise<void> {
+  await page.keyboard.press(direction === "next" ? "Alt+]" : "Alt+[");
+  await expectSidebarWorkspaceSelected({ page, serverId: getServerId(), workspaceId });
+  await expect(page).toHaveURL(new RegExp(`/workspace/${workspaceId}$`));
+}
+
+test("previous and next traverse every visible workspace while digit shortcuts stop at nine", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const project = await seedWorkspace({
+    repoPrefix: "relative-navigation-",
+    title: "Workspace 01",
+  });
+  try {
+    for (let index = 2; index <= 12; index += 1) {
+      const created = await project.client.createWorkspace({
+        source: { kind: "directory", path: project.repoPath },
+        title: `Workspace ${String(index).padStart(2, "0")}`,
+      });
+      expect(created.error).toBeNull();
+    }
+    await page.setViewportSize({ width: 1440, height: 1100 });
+    await gotoAppShell(page);
+    const order = await readVisibleWorkspaceOrder(page);
+
+    await test.step("next crosses the ninth workspace and previous returns to it", async () => {
+      await switchWorkspaceViaSidebar({ page, serverId: getServerId(), workspaceId: order[8] });
+      await navigateWorkspace(page, "next", order[9]);
+      await navigateWorkspace(page, "previous", order[8]);
+    });
+
+    await test.step("wrapping uses the true first and last visible workspace", async () => {
+      await switchWorkspaceViaSidebar({ page, serverId: getServerId(), workspaceId: order[0] });
+      await navigateWorkspace(page, "previous", order[11]);
+      await navigateWorkspace(page, "next", order[0]);
+    });
+
+    await test.step("the ninth digit shortcut still selects the ninth workspace", async () => {
+      await page.keyboard.press("Alt+9");
+      await expectSidebarWorkspaceSelected({
+        page,
+        serverId: getServerId(),
+        workspaceId: order[8],
+      });
+    });
+  } finally {
+    await project.cleanup();
+  }
+});
diff --git a/packages/app/src/utils/sidebar-shortcuts.test.ts b/packages/app/src/utils/sidebar-shortcuts.test.ts
index ac9663c6da..b05c930123 100644
--- a/packages/app/src/utils/sidebar-shortcuts.test.ts
+++ b/packages/app/src/utils/sidebar-shortcuts.test.ts
@@ -5,6 +5,7 @@ import type {
   SidebarWorkspaceEntry,
 } from "@/hooks/use-sidebar-workspaces-list";
 import { buildStatusGroups } from "@/hooks/sidebar-status-view-model";
+import { routeKeyboardShortcut } from "@/keyboard/route-shortcut";
 
 import {
   buildSidebarShortcutModel,
@@ -65,6 +66,46 @@ function project(projectKey: string, workspaces: SidebarWorkspaceEntry[]): Sideb
 }
 
 describe("buildSidebarShortcutModel", () => {
+  it.each([
+    [9, 1, 10],
+    [10, -1, 9],
+    [12, 1, 1],
+    [1, -1, 12],
+  ] as const)(
+    "navigates from workspace %i by %i to workspace %i across the full visible sidebar",
+    (current, delta, next) => {
+      const workspaces = Array.from({ length: 12 }, (_, index) =>
+        workspace({
+          serverId: "s",
+          workspaceId: `ws-${index + 1}`,
+          workspaceDirectory: `/repo/w${index + 1}`,
+          name: `w${index + 1}`,
+        }),
+      );
+      const model = buildSidebarShortcutModel({
+        projects: [project("p", workspaces)],
+        collapsedProjectKeys: new Set<string>(),
+      });
+
+      expect(
+        routeKeyboardShortcut(
+          { action: "workspace.navigate.relative", payload: { delta } },
+          {
+            pathname: `/h/s/workspace/ws-${current}`,
+            isMobile: false,
+            sidebarShortcutTargets: model.shortcutTargets,
+            navigationActiveWorkspace: null,
+            commandCenterOpen: false,
+            shortcutsDialogOpen: false,
+          },
+        ),
+      ).toEqual({ kind: "navigate-workspace", serverId: "s", workspaceId: `ws-${next}` });
+      expect(model.shortcutIndexByWorkspaceKey.size).toBe(9);
+      expect(model.shortcutIndexByWorkspaceKey.get("s:ws-9")).toBe(9);
+      expect(model.shortcutIndexByWorkspaceKey.has("s:ws-10")).toBe(false);
+    },
+  );
+
   it("builds shortcut targets in visual order and excludes collapsed projects", () => {
     const projects = [
       project("p1", [
@@ -111,7 +152,7 @@ describe("buildSidebarShortcutModel", () => {
     expect(model.shortcutIndexByWorkspaceKey.get("s1:ws-repo2-main")).toBeUndefined();
   });
 
-  it("limits shortcuts to 9", () => {
+  it("keeps all traversal targets while numbering only the first 9", () => {
     const workspaces = Array.from({ length: 20 }, (_, index) =>
       workspace({
         serverId: "s",
@@ -127,9 +168,11 @@ describe("buildSidebarShortcutModel", () => {
       collapsedProjectKeys: new Set<string>(),
     });
 
-    expect(model.shortcutTargets).toHaveLength(9);
-    expect(model.shortcutTargets[0]).toEqual({ serverId: "s", workspaceId: "ws-1" });
+    expect(model.shortcutTargets).toHaveLength(20);
     expect(model.shortcutTargets[8]).toEqual({ serverId: "s", workspaceId: "ws-9" });
+    expect(model.shortcutTargets[9]).toEqual({ serverId: "s", workspaceId: "ws-10" });
+    expect(model.shortcutIndexByWorkspaceKey.get("s:ws-9")).toBe(9);
+    expect(model.shortcutIndexByWorkspaceKey.get("s:ws-10")).toBeUndefined();
   });
 
   it("excludes a collapsed project's workspaces regardless of project kind", () => {
diff --git a/packages/app/src/utils/sidebar-shortcuts.ts b/packages/app/src/utils/sidebar-shortcuts.ts
index 86540357e6..d08cba927c 100644
--- a/packages/app/src/utils/sidebar-shortcuts.ts
+++ b/packages/app/src/utils/sidebar-shortcuts.ts
@@ -70,13 +70,10 @@ export function buildSidebarShortcutSections(input: {
     }
 
     for (const workspace of section.workspaces) {
-      if (shortcutTargets.length >= maxShortcuts) {
-        break;
-      }
-
-      const shortcutNumber = shortcutTargets.length + 1;
       shortcutTargets.push(createShortcutTarget(workspace));
-      shortcutIndexByWorkspaceKey.set(workspace.workspaceKey, shortcutNumber);
+      if (shortcutTargets.length <= maxShortcuts) {
+        shortcutIndexByWorkspaceKey.set(workspace.workspaceKey, shortcutTargets.length);
+      }
     }
   }
 

From 14e638451652e443ac8b9f74c50c9bfd4b967cb6 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 15:27:12 +0200
Subject: [PATCH 155/270] fix(desktop): keep running when launcher console
 pipes close (#6639)

Desktop logging reaches inherited stdout and stderr before the CLI guards run. A launcher that closes its output reader raised an uncaught EPIPE dialog. Handle closed console pipes at desktop startup while preserving console logging and surfacing other stream errors.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/diagnostics/console-streams.test.ts   | 88 +++++++++++++++++++
 .../src/diagnostics/console-streams.ts        | 11 +++
 packages/desktop/src/main.ts                  |  3 +
 3 files changed, 102 insertions(+)
 create mode 100644 packages/desktop/src/diagnostics/console-streams.test.ts
 create mode 100644 packages/desktop/src/diagnostics/console-streams.ts

diff --git a/packages/desktop/src/diagnostics/console-streams.test.ts b/packages/desktop/src/diagnostics/console-streams.test.ts
new file mode 100644
index 0000000000..14ad337b7e
--- /dev/null
+++ b/packages/desktop/src/diagnostics/console-streams.test.ts
@@ -0,0 +1,88 @@
+import { spawn } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { describe, expect, it } from "vitest";
+
+const modulePath = fileURLToPath(new URL("./console-streams.ts", import.meta.url));
+
+type Output = "stdout" | "stderr";
+
+async function writeToConsole(input: { closed?: Output; invalidStdout?: boolean } = {}) {
+  const child = spawn(
+    process.execPath,
+    [
+      "--import",
+      "tsx",
+      "-e",
+      `
+        const { protectConsoleStreams } = require(${JSON.stringify(modulePath)});
+        protectConsoleStreams();
+        process.send("ready");
+        process.once("message", () => {
+          if (${JSON.stringify(input.invalidStdout)}) require("node:fs").closeSync(1);
+          console.info("desktop info");
+          console.warn("desktop warning");
+          setImmediate(() => { process.send("alive"); process.disconnect(); });
+        });
+      `,
+    ],
+    {
+      cwd: fileURLToPath(new URL(".", import.meta.url)),
+      stdio: ["ignore", "pipe", "pipe", "ipc"],
+      env: Object.fromEntries(Object.entries(process.env).filter(([key]) => key !== "FORCE_COLOR")),
+    },
+  );
+  let stdout = "";
+  let stderr = "";
+  let alive = false;
+  child.stdout.setEncoding("utf8").on("data", (text: string) => {
+    stdout += text;
+  });
+  child.stderr.setEncoding("utf8").on("data", (text: string) => {
+    stderr += text;
+  });
+  child.on("message", (message) => {
+    if (message === "ready") {
+      if (input.closed) child[input.closed].destroy();
+      child.send("write");
+    }
+    if (message === "alive") alive = true;
+  });
+  const code = await new Promise<number | null>((resolve, reject) => {
+    child.once("close", resolve);
+    child.once("error", reject);
+  });
+  return { code, stdout, stderr, alive };
+}
+
+describe("desktop console streams", () => {
+  for (const stream of ["stdout", "stderr"] as const) {
+    it(`keeps running when the launcher closes ${stream}`, async () => {
+      const result = await writeToConsole({ closed: stream });
+      expect(result.code, result.stderr).toBe(0);
+      expect(result.alive).toBe(true);
+      expect(result[stream === "stdout" ? "stderr" : "stdout"]).toBe(
+        stream === "stdout" ? "desktop warning\n" : "desktop info\n",
+      );
+    });
+  }
+
+  // Windows stdout uses a native handle rather than the POSIX fd closed here.
+  it.skipIf(process.platform === "win32")(
+    "does not suppress a console failure other than a closed pipe",
+    async () => {
+      const result = await writeToConsole({ invalidStdout: true });
+      expect(result.code).toBe(1);
+      expect(result.alive).toBe(false);
+      expect(result.stderr).toContain("EBADF");
+    },
+  );
+
+  it("preserves logging while the console has readers", async () => {
+    expect(await writeToConsole()).toEqual({
+      code: 0,
+      stdout: "desktop info\n",
+      stderr: "desktop warning\n",
+      alive: true,
+    });
+  });
+});
diff --git a/packages/desktop/src/diagnostics/console-streams.ts b/packages/desktop/src/diagnostics/console-streams.ts
new file mode 100644
index 0000000000..686505bb40
--- /dev/null
+++ b/packages/desktop/src/diagnostics/console-streams.ts
@@ -0,0 +1,11 @@
+function ignoreClosedConsole(error: NodeJS.ErrnoException): void {
+  if (error.code !== "EPIPE") {
+    throw error;
+  }
+}
+
+/** Keep desktop logging independent of the program that launched its console. */
+export function protectConsoleStreams(): void {
+  process.stdout.on("error", ignoreClosedConsole);
+  process.stderr.on("error", ignoreClosedConsole);
+}
diff --git a/packages/desktop/src/main.ts b/packages/desktop/src/main.ts
index 9acf329216..072f96a26d 100644
--- a/packages/desktop/src/main.ts
+++ b/packages/desktop/src/main.ts
@@ -1,3 +1,6 @@
+import { protectConsoleStreams } from "./diagnostics/console-streams.js";
+protectConsoleStreams();
+
 process.emitWarning = (() => {}) as typeof process.emitWarning;
 
 import log from "electron-log/main";

From 56448842f0d91b7ae3c4316b76d8ce0c078b5538 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 17:25:31 +0200
Subject: [PATCH 156/270] Download files over the connected host (#6595)

* Let readFile callers disable the request timeout

readFile resolves only when FileEnd arrives, so the default 60 s request
timeout bounds the whole transfer. A large file over a slow relay fails
before it finishes even though every chunk is arriving. Thread an optional
timeout through requestFileExplorer; 0 disables the timer, as the
workspace.create request already does, and a dead connection still rejects
on disconnect.

The relay e2e case reads a 1 MiB file through a real daemon and a local
relay with timeout 0 and compares SHA-256 digests with the source.

* Reject a binary file transfer whose byte count differs from FileBegin.size

concatByteChunks allocated FileBegin.size bytes and copied the chunks in:
a short transfer resolved as a zero-padded file, and a long one threw a
RangeError inside the transport callback and left the request pending.
Count the received bytes at FileEnd and reject the read when they differ
from the announced size.

* Download files over the session socket when no direct connection is active

The download store only knew the HTTP token route and picked the first
directTcp connection in the host profile, whatever connection the host
runtime was using. A relay-only host has none, so every download ended in
"Download host is unavailable." (#543). SSH, socket and pipe hosts failed
the same way, and a stale directTcp entry won over a working relay (#3753).

Choose the transport from the active connection: directTcp keeps the HTTP
token download unchanged; anything else reads the file over the session
socket with the binary frames previews already use, then hands the bytes
to the browser's download manager on web and Electron or writes them to
the cache directory and offers the share sheet on native. Files over
64 MiB are refused before any byte moves, using the existing fileTooLarge
string, and a daemon response without content fails instead of saving an
empty file.

* fix(app): enforce the session download size limit during the read

The token size is sampled before the file is read. Pass the download byte budget through the actual read so a changed file cannot bypass the in-memory limit.

Co-authored-by: Michael Vandesompel <mv@droggol.be>
Co-authored-by: YASICJUNWOO <joonoo3@naver.com>
Co-authored-by: JrDw0 <JrDw0@users.noreply.github.com>

* test: verify TCP downloads and own relay fixture cleanup

---------

Co-authored-by: Michael Vandesompel <mv@droggol.be>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: YASICJUNWOO <joonoo3@naver.com>
Co-authored-by: JrDw0 <JrDw0@users.noreply.github.com>
---
 .../file-explorer-context-actions.spec.ts     |  26 +-
 .../app/e2e/support/helpers/file-explorer.ts  |   9 +-
 packages/app/src/hooks/use-file-download.ts   |  20 +-
 .../src/hooks/use-file-explorer-actions.ts    |  16 ++
 .../app/src/stores/download-store.test.ts     | 265 ++++++++++++++++++
 packages/app/src/stores/download-store.ts     | 119 +++++++-
 packages/client/src/daemon-client.test.ts     |  96 +++++++
 packages/client/src/daemon-client.ts          |  21 ++
 .../daemon-e2e/relay-transport.e2e.test.ts    |  71 +++++
 9 files changed, 621 insertions(+), 22 deletions(-)
 create mode 100644 packages/app/src/stores/download-store.test.ts

diff --git a/packages/app/e2e/browser/file-explorer-context-actions.spec.ts b/packages/app/e2e/browser/file-explorer-context-actions.spec.ts
index bbc73b797e..faf7285a62 100644
--- a/packages/app/e2e/browser/file-explorer-context-actions.spec.ts
+++ b/packages/app/e2e/browser/file-explorer-context-actions.spec.ts
@@ -2,10 +2,10 @@ import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { expect, type Page } from "@playwright/test";
 import { test } from "../support/fixtures";
-import { openFileExplorer } from "../support/helpers/file-explorer";
+import { downloadFileFromExplorer, openFileExplorer } from "../support/helpers/file-explorer";
 import { openChangesPanel } from "../support/helpers/workspace-tabs";
 import { gotoWorkspace } from "../support/helpers/launcher";
-import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import { daemonWsRoutePattern, getE2EDaemonPort } from "../support/helpers/daemon-port";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 
 let workspace: SeededWorkspace;
@@ -444,3 +444,25 @@ test("hides unsupported file operations and revert actions", async ({ page }) =>
   await expect(page.getByTestId("diff-file-0-duplicate")).toHaveCount(0);
   await expect(page.getByTestId("diff-file-0-revert")).toHaveCount(0);
 });
+
+test("downloads a file over direct TCP with its original filename and bytes", async ({
+  page,
+}, testInfo) => {
+  const fileName = "rapport données.bin";
+  const source = Buffer.from([0, 1, 2, 127, 128, 255, 10]);
+  await writeFile(path.join(workspace.workspaceDirectory, fileName), source);
+  await gotoWorkspace(page, workspace.workspaceId);
+  await openFileExplorer(page);
+
+  const downloaded = await downloadFileFromExplorer(page, fileName);
+  const url = new URL(downloaded.url());
+  expect(url.protocol).toBe("http:");
+  expect(url.port).toBe(getE2EDaemonPort());
+  expect(url.pathname).toBe("/api/files/download");
+  expect(url.searchParams.get("token")).toBeTruthy();
+  expect(downloaded.suggestedFilename()).toBe(fileName);
+  const savedFile = testInfo.outputPath(fileName);
+  await downloaded.saveAs(savedFile);
+  expect(await downloaded.failure()).toBeNull();
+  expect(await readFile(savedFile)).toEqual(source);
+});
diff --git a/packages/app/e2e/support/helpers/file-explorer.ts b/packages/app/e2e/support/helpers/file-explorer.ts
index 519f955536..a40adc5ad2 100644
--- a/packages/app/e2e/support/helpers/file-explorer.ts
+++ b/packages/app/e2e/support/helpers/file-explorer.ts
@@ -1,4 +1,4 @@
-import { expect, type Page } from "@playwright/test";
+import { expect, type Download, type Page } from "@playwright/test";
 import { openFilesPanel } from "./workspace-tabs";
 
 function fileExplorerTree(page: Page) {
@@ -39,3 +39,10 @@ export async function expectFileTabOpen(page: Page, filePath: string): Promise<v
     timeout: 30_000,
   });
 }
+
+export async function downloadFileFromExplorer(page: Page, fileName: string): Promise<Download> {
+  await fileExplorerEntry(page, fileName).click({ button: "right" });
+  const downloaded = page.waitForEvent("download");
+  await page.getByRole("menuitem", { name: "Download", exact: true }).click();
+  return downloaded;
+}
diff --git a/packages/app/src/hooks/use-file-download.ts b/packages/app/src/hooks/use-file-download.ts
index 91a88170b8..683b7a2381 100644
--- a/packages/app/src/hooks/use-file-download.ts
+++ b/packages/app/src/hooks/use-file-download.ts
@@ -1,5 +1,5 @@
 import { useCallback, useMemo } from "react";
-import { useHosts } from "@/runtime/host-runtime";
+import { getHostRuntimeStore, useHosts } from "@/runtime/host-runtime";
 import { useDownloadStore } from "@/stores/download-store";
 import { useFileExplorerActions } from "@/hooks/use-file-explorer-actions";
 
@@ -12,8 +12,9 @@ interface UseFileDownloadParams {
 /**
  * Returns a stable callback that downloads a single workspace file by its
  * workspace-relative path. Shared by the file explorer tree and the git diff
- * pane so both surfaces download through the same host token + download-store
- * pipeline instead of duplicating the plumbing.
+ * pane so both surfaces download through the same download-store pipeline instead
+ * of duplicating the plumbing: the HTTP token download over a direct TCP connection,
+ * the session socket over anything else.
  */
 export function useFileDownload({
   serverId,
@@ -30,7 +31,7 @@ export function useFileDownload({
     () => workspaceId?.trim() || normalizedWorkspaceRoot,
     [normalizedWorkspaceRoot, workspaceId],
   );
-  const { requestFileDownloadToken } = useFileExplorerActions({
+  const { requestFileDownloadToken, requestFileBytes } = useFileExplorerActions({
     serverId,
     workspaceId,
     workspaceRoot: normalizedWorkspaceRoot,
@@ -48,9 +49,18 @@ export function useFileDownload({
         fileName,
         path,
         daemonProfile,
+        activeConnectionId: getHostRuntimeStore().getSnapshot(serverId)?.activeConnectionId ?? null,
         requestFileDownloadToken: (targetPath) => requestFileDownloadToken(targetPath),
+        readFile: requestFileBytes,
       });
     },
-    [daemonProfile, requestFileDownloadToken, serverId, startDownload, workspaceScopeId],
+    [
+      daemonProfile,
+      requestFileBytes,
+      requestFileDownloadToken,
+      serverId,
+      startDownload,
+      workspaceScopeId,
+    ],
   );
 }
diff --git a/packages/app/src/hooks/use-file-explorer-actions.ts b/packages/app/src/hooks/use-file-explorer-actions.ts
index 53714e37b3..c29feb5241 100644
--- a/packages/app/src/hooks/use-file-explorer-actions.ts
+++ b/packages/app/src/hooks/use-file-explorer-actions.ts
@@ -253,6 +253,21 @@ export function useFileExplorerActions(params: { serverId: string } & FileExplor
     [client, normalizedWorkspaceRoot, t],
   );
 
+  const requestFileBytes = useCallback(
+    async (path: string, maxBytes: number) => {
+      if (!normalizedWorkspaceRoot) {
+        throw new Error(t("workspace.fileExplorer.states.unavailable"));
+      }
+      if (!client) {
+        throw new Error(t("workspace.terminal.hostDisconnected"));
+      }
+      // No request timeout: a large file over a slow relay legitimately takes longer than the
+      // 60 s default, and a dead connection still rejects on disconnect.
+      return client.readFile(normalizedWorkspaceRoot, path, undefined, maxBytes, 0);
+    },
+    [client, normalizedWorkspaceRoot, t],
+  );
+
   const createEntry = useCallback(
     async (input: { parentPath: string; name: string; kind: "file" | "directory" }) => {
       if (!client || !normalizedWorkspaceRoot) {
@@ -342,6 +357,7 @@ export function useFileExplorerActions(params: { serverId: string } & FileExplor
     requestDirectoryListing,
     requestFilePreview,
     requestFileDownloadToken,
+    requestFileBytes,
     createEntry,
     renameEntry,
     duplicateEntry,
diff --git a/packages/app/src/stores/download-store.test.ts b/packages/app/src/stores/download-store.test.ts
new file mode 100644
index 0000000000..d3657b4c34
--- /dev/null
+++ b/packages/app/src/stores/download-store.test.ts
@@ -0,0 +1,265 @@
+import { beforeEach, describe, expect, it } from "vitest";
+import { defaultHostAppearance } from "@/hosts/appearance";
+import { i18n } from "@/i18n/i18next";
+import {
+  MAX_SESSION_DOWNLOAD_BYTES,
+  useDownloadStore,
+  type Download,
+  type DownloadedBytes,
+} from "@/stores/download-store";
+import type {
+  DirectTcpHostConnection,
+  HostProfile,
+  RelayHostConnection,
+} from "@/types/host-connection";
+
+const FILE_BYTES = new TextEncoder().encode("relay download payload");
+const FILE_PATH = "reports/données été.bin";
+const FILE_NAME = "données été.bin";
+const MIME_TYPE = "application/octet-stream";
+
+const relayConnection: RelayHostConnection = {
+  id: "relay:relay.paseo.sh:443",
+  type: "relay",
+  relayEndpoint: "relay.paseo.sh:443",
+  daemonPublicKeyB64: "cHVibGljLWtleQ==",
+};
+
+// The #3753 shape: the relay hostname stored as a directTcp entry that nothing can reach.
+const staleTcpConnection: DirectTcpHostConnection = {
+  id: "direct:relay.paseo.sh:443",
+  type: "directTcp",
+  endpoint: "relay.paseo.sh:443",
+};
+
+const localTcpConnection: DirectTcpHostConnection = {
+  id: "direct:localhost:6767",
+  type: "directTcp",
+  endpoint: "localhost:6767",
+};
+
+function profileWith(connections: HostProfile["connections"]): HostProfile {
+  return {
+    serverId: "srv_remote",
+    label: "Remote",
+    appearance: defaultHostAppearance(),
+    lifecycle: {},
+    connections,
+    preferredConnectionId: null,
+    createdAt: "2026-01-01T00:00:00.000Z",
+    updatedAt: "2026-01-01T00:00:00.000Z",
+  };
+}
+
+function createTokenRequest(size: number | null = FILE_BYTES.byteLength) {
+  const requested: string[] = [];
+  return {
+    requested,
+    request: async (path: string) => {
+      requested.push(path);
+      return { token: "tok", fileName: FILE_NAME, mimeType: MIME_TYPE, size, error: null };
+    },
+  };
+}
+
+function createFileReader(read: () => Promise<{ bytes: Uint8Array; size: number }>) {
+  const requested: string[] = [];
+  return {
+    requested,
+    read: async (path: string) => {
+      requested.push(path);
+      return read();
+    },
+  };
+}
+
+function createFileSaver() {
+  const savedFiles: DownloadedBytes[] = [];
+  return {
+    savedFiles,
+    save: async (file: DownloadedBytes) => {
+      savedFiles.push(file);
+      return null;
+    },
+  };
+}
+
+interface StartInput {
+  profile: HostProfile;
+  activeConnectionId: string | null;
+  token?: ReturnType<typeof createTokenRequest>;
+  reader?: ReturnType<typeof createFileReader>;
+  saver?: ReturnType<typeof createFileSaver>;
+}
+
+async function startDownload(input: StartInput): Promise<Download | undefined> {
+  const token = input.token ?? createTokenRequest();
+  const reader =
+    input.reader ??
+    createFileReader(async () => ({ bytes: FILE_BYTES, size: FILE_BYTES.byteLength }));
+  const saver = input.saver ?? createFileSaver();
+  await useDownloadStore.getState().startDownload({
+    serverId: "srv_remote",
+    scopeId: "workspace-1",
+    fileName: FILE_NAME,
+    path: FILE_PATH,
+    daemonProfile: input.profile,
+    activeConnectionId: input.activeConnectionId,
+    requestFileDownloadToken: token.request,
+    readFile: reader.read,
+    saveFile: saver.save,
+  });
+  const { activeDownloadId, downloads } = useDownloadStore.getState();
+  return activeDownloadId ? downloads.get(activeDownloadId) : undefined;
+}
+
+describe("download store transport selection", () => {
+  beforeEach(() => {
+    useDownloadStore.setState({ downloads: new Map(), activeDownloadId: null });
+  });
+
+  it("downloads over the session when the active connection is the relay", async () => {
+    const token = createTokenRequest();
+    const reader = createFileReader(async () => ({
+      bytes: FILE_BYTES,
+      size: FILE_BYTES.byteLength,
+    }));
+    const saver = createFileSaver();
+
+    const download = await startDownload({
+      profile: profileWith([relayConnection]),
+      activeConnectionId: relayConnection.id,
+      token,
+      reader,
+      saver,
+    });
+
+    expect(download).toMatchObject({ fileName: FILE_NAME, status: "complete" });
+    expect(token.requested).toEqual([FILE_PATH]);
+    expect(reader.requested).toEqual([FILE_PATH]);
+    expect(saver.savedFiles).toEqual([
+      { bytes: FILE_BYTES, fileName: FILE_NAME, mimeType: MIME_TYPE },
+    ]);
+  });
+
+  it("bounds the session read even when the token reports a smaller file", async () => {
+    const readRequests: Array<{ path: string; maxBytes: number }> = [];
+    const saver = createFileSaver();
+    await useDownloadStore.getState().startDownload({
+      serverId: "srv_remote",
+      scopeId: "workspace-1",
+      fileName: FILE_NAME,
+      path: FILE_PATH,
+      daemonProfile: profileWith([relayConnection]),
+      activeConnectionId: relayConnection.id,
+      requestFileDownloadToken: createTokenRequest(1).request,
+      readFile: async (path: string, maxBytes: number) => {
+        readRequests.push({ path, maxBytes });
+        return { bytes: FILE_BYTES, size: FILE_BYTES.byteLength };
+      },
+      saveFile: saver.save,
+    });
+    expect(readRequests).toEqual([{ path: FILE_PATH, maxBytes: MAX_SESSION_DOWNLOAD_BYTES }]);
+    expect(saver.savedFiles).toEqual([
+      { bytes: FILE_BYTES, fileName: FILE_NAME, mimeType: MIME_TYPE },
+    ]);
+  });
+
+  it("ignores a directTcp entry that is not the active connection", async () => {
+    const reader = createFileReader(async () => ({
+      bytes: FILE_BYTES,
+      size: FILE_BYTES.byteLength,
+    }));
+    const saver = createFileSaver();
+
+    const download = await startDownload({
+      profile: profileWith([staleTcpConnection, relayConnection]),
+      activeConnectionId: relayConnection.id,
+      reader,
+      saver,
+    });
+
+    expect(download).toMatchObject({ status: "complete" });
+    expect(reader.requested).toEqual([FILE_PATH]);
+    expect(saver.savedFiles).toHaveLength(1);
+  });
+
+  it("keeps the HTTP token download when the active connection is directTcp", async () => {
+    const reader = createFileReader(async () => ({
+      bytes: FILE_BYTES,
+      size: FILE_BYTES.byteLength,
+    }));
+    const saver = createFileSaver();
+
+    const download = await startDownload({
+      profile: profileWith([localTcpConnection, relayConnection]),
+      activeConnectionId: localTcpConnection.id,
+      reader,
+      saver,
+    });
+
+    expect(download).toMatchObject({ status: "complete" });
+    expect(reader.requested).toEqual([]);
+    expect(saver.savedFiles).toEqual([]);
+  });
+
+  it("fails the download and saves nothing when the session read fails", async () => {
+    const reader = createFileReader(async () => {
+      throw new Error("Connection lost");
+    });
+    const saver = createFileSaver();
+
+    const download = await startDownload({
+      profile: profileWith([relayConnection]),
+      activeConnectionId: relayConnection.id,
+      reader,
+      saver,
+    });
+
+    expect(download).toMatchObject({ status: "error", message: "Connection lost" });
+    expect(saver.savedFiles).toEqual([]);
+  });
+
+  it("refuses a file over the session size limit before reading it", async () => {
+    const token = createTokenRequest(MAX_SESSION_DOWNLOAD_BYTES + 1);
+    const reader = createFileReader(async () => ({
+      bytes: FILE_BYTES,
+      size: FILE_BYTES.byteLength,
+    }));
+    const saver = createFileSaver();
+
+    const download = await startDownload({
+      profile: profileWith([relayConnection]),
+      activeConnectionId: relayConnection.id,
+      token,
+      reader,
+      saver,
+    });
+
+    expect(download).toMatchObject({
+      status: "error",
+      message: i18n.t("composer.errors.fileTooLarge", { fileName: FILE_NAME, size: "64 MB" }),
+    });
+    expect(download?.message).toContain("64 MB");
+    expect(reader.requested).toEqual([]);
+    expect(saver.savedFiles).toEqual([]);
+  });
+
+  it("fails instead of saving an empty file when the daemon returns no content", async () => {
+    const reader = createFileReader(async () => ({ bytes: new Uint8Array(), size: 6 }));
+    const saver = createFileSaver();
+
+    const download = await startDownload({
+      profile: profileWith([relayConnection]),
+      activeConnectionId: relayConnection.id,
+      reader,
+      saver,
+    });
+
+    expect(download).toMatchObject({
+      status: "error",
+      message: "File transfer incomplete: expected 6 bytes, received 0.",
+    });
+    expect(saver.savedFiles).toEqual([]);
+  });
+});
diff --git a/packages/app/src/stores/download-store.ts b/packages/app/src/stores/download-store.ts
index 6d13b3ed3c..790fbd7dee 100644
--- a/packages/app/src/stores/download-store.ts
+++ b/packages/app/src/stores/download-store.ts
@@ -16,6 +16,16 @@ interface DownloadProgress {
   eta: number;
 }
 
+// The session path holds the file in memory two to three times over (client chunks, the
+// concatenated result, then the Blob or native write). Lift once the client streams chunks to disk.
+export const MAX_SESSION_DOWNLOAD_BYTES = 64 * 1024 * 1024;
+
+export interface DownloadedBytes {
+  bytes: Uint8Array;
+  fileName: string;
+  mimeType: string | null;
+}
+
 export interface Download {
   id: string;
   serverId: string;
@@ -37,12 +47,18 @@ interface DownloadState {
     fileName: string;
     path: string;
     daemonProfile: HostProfile | undefined;
+    /** Connection the host runtime is using right now; `null` while disconnected. */
+    activeConnectionId: string | null;
     requestFileDownloadToken: (path: string) => Promise<{
       token: string | null;
       fileName: string | null;
       mimeType: string | null;
+      size: number | null;
       error: string | null;
     }>;
+    /** Reads the whole file over the session socket; used when no direct HTTP endpoint is active. */
+    readFile: (path: string, maxBytes: number) => Promise<{ bytes: Uint8Array; size: number }>;
+    saveFile?: typeof saveDownloadedBytes;
   }) => Promise<void>;
 
   updateProgress: (id: string, progress: DownloadProgress) => void;
@@ -66,7 +82,10 @@ export const useDownloadStore = create<DownloadState>()((set, get) => ({
     fileName,
     path,
     daemonProfile,
+    activeConnectionId,
     requestFileDownloadToken,
+    readFile,
+    saveFile = saveDownloadedBytes,
   }) => {
     const id = generateDownloadId();
     const download: Download = {
@@ -89,12 +108,42 @@ export const useDownloadStore = create<DownloadState>()((set, get) => ({
         throw new Error(tokenResponse.error ?? i18n.t("downloads.requestTokenFailed"));
       }
 
-      const downloadTarget = resolveDaemonDownloadTarget(daemonProfile);
+      const resolvedFileName = tokenResponse.fileName ?? fileName;
+      const downloadTarget = resolveDaemonDownloadTarget(daemonProfile, activeConnectionId);
+      if (!downloadTarget) {
+        // Relay, SSH, socket and pipe hosts have no HTTP endpoint: read the file over the
+        // session socket that is already connected (#543).
+        if (
+          typeof tokenResponse.size === "number" &&
+          tokenResponse.size > MAX_SESSION_DOWNLOAD_BYTES
+        ) {
+          throw new Error(
+            i18n.t("composer.errors.fileTooLarge", { fileName: resolvedFileName, size: "64 MB" }),
+          );
+        }
+        const { bytes, size } = await readFile(path, MAX_SESSION_DOWNLOAD_BYTES);
+        // A daemon without a binary channel answers `encoding: "none"` for a binary file: no
+        // content, real size. Never save that as a complete download.
+        if (bytes.byteLength !== size) {
+          throw new Error(
+            `File transfer incomplete: expected ${size} bytes, received ${bytes.byteLength}.`,
+          );
+        }
+        const savedUri = await saveFile({
+          bytes,
+          fileName: resolvedFileName,
+          mimeType: tokenResponse.mimeType,
+        });
+        get().completeDownload(id);
+        if (savedUri !== null) {
+          await shareSavedFile(savedUri, tokenResponse.mimeType, resolvedFileName);
+        }
+        return;
+      }
       if (!downloadTarget.baseUrl) {
         throw new Error(i18n.t("downloads.hostUnavailable"));
       }
 
-      const resolvedFileName = tokenResponse.fileName ?? fileName;
       const downloadUrl = buildDownloadUrl(
         downloadTarget.baseUrl,
         tokenResponse.token,
@@ -146,14 +195,7 @@ export const useDownloadStore = create<DownloadState>()((set, get) => ({
 
       get().completeDownload(id);
 
-      if (await Sharing.isAvailableAsync()) {
-        await Sharing.shareAsync(result.uri, {
-          mimeType: tokenResponse.mimeType ?? undefined,
-          dialogTitle: resolvedFileName
-            ? i18n.t("downloads.shareFileNamed", { fileName: resolvedFileName })
-            : i18n.t("downloads.shareFile"),
-        });
-      }
+      await shareSavedFile(result.uri, tokenResponse.mimeType, resolvedFileName);
     } catch (error) {
       const message = error instanceof Error ? error.message : i18n.t("downloads.failed");
       if (isWeb) {
@@ -244,10 +286,18 @@ interface DownloadTarget {
   authCredentials: { username: string; password: string } | null;
 }
 
-function resolveDaemonDownloadTarget(daemon?: HostProfile): DownloadTarget {
-  const connection = daemon?.connections.find((conn) => conn.type === "directTcp") ?? null;
-  if (!connection) {
-    return { baseUrl: null, authHeader: null, authCredentials: null };
+/**
+ * The HTTP download route is only reachable over a direct TCP connection. Returns `null` when
+ * the connection in use is anything else (relay, SSH, socket, pipe, or none yet), so the caller
+ * reads the file over the session socket instead.
+ */
+function resolveDaemonDownloadTarget(
+  daemon: HostProfile | undefined,
+  activeConnectionId: string | null,
+): DownloadTarget | null {
+  const connection = daemon?.connections.find((conn) => conn.id === activeConnectionId);
+  if (connection?.type !== "directTcp") {
+    return null;
   }
 
   let parsed: URL;
@@ -299,6 +349,47 @@ function buildDownloadUrl(
   return url.toString();
 }
 
+/**
+ * Saves bytes read over the session. Web and Electron hand them to the browser's download
+ * manager and return `null`; native writes the file and returns its URI for the share sheet.
+ */
+async function saveDownloadedBytes({
+  bytes,
+  fileName,
+  mimeType,
+}: DownloadedBytes): Promise<string | null> {
+  if (isWeb) {
+    const buffer = new ArrayBuffer(bytes.byteLength);
+    new Uint8Array(buffer).set(bytes);
+    const url = URL.createObjectURL(
+      new Blob([buffer], { type: mimeType ?? "application/octet-stream" }),
+    );
+    triggerBrowserDownload(url, fileName);
+    // The browser may still be reading the blob while its save prompt is open.
+    setTimeout(() => URL.revokeObjectURL(url), 60_000);
+    return null;
+  }
+  // Resolve and write in one tick so two downloads of the same name cannot pick the same path.
+  const targetFile = resolveDownloadTargetFile(fileName);
+  targetFile.write(bytes);
+  return targetFile.uri;
+}
+
+async function shareSavedFile(
+  uri: string,
+  mimeType: string | null,
+  fileName: string,
+): Promise<void> {
+  if (await Sharing.isAvailableAsync()) {
+    await Sharing.shareAsync(uri, {
+      mimeType: mimeType ?? undefined,
+      dialogTitle: fileName
+        ? i18n.t("downloads.shareFileNamed", { fileName })
+        : i18n.t("downloads.shareFile"),
+    });
+  }
+}
+
 function triggerBrowserDownload(url: string, fileName: string) {
   if (typeof document === "undefined") {
     if (typeof window !== "undefined") {
diff --git a/packages/client/src/daemon-client.test.ts b/packages/client/src/daemon-client.test.ts
index f62f46b733..c02e1720cb 100644
--- a/packages/client/src/daemon-client.test.ts
+++ b/packages/client/src/daemon-client.test.ts
@@ -2801,6 +2801,102 @@ test("readFile drops an old daemon's over-budget binary chunks and reports the r
   await expect(responsePromise).rejects.toThrow("File is too large to display");
 });
 
+async function connectFileClient(clientId: string) {
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId,
+    logger: createMockLogger(),
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+  const connectPromise = client.connect();
+  mock.triggerOpen();
+  await connectPromise;
+  return { mock, client };
+}
+
+function sendBinaryFile(
+  mock: ReturnType<typeof createMockTransport>,
+  requestId: string,
+  announcedSize: number,
+  chunks: string[],
+) {
+  mock.triggerMessage(
+    encodeFileTransferFrame({
+      opcode: FileTransferOpcode.FileBegin,
+      requestId,
+      metadata: {
+        mime: "application/octet-stream",
+        size: announcedSize,
+        encoding: "binary",
+        modifiedAt: "2026-05-02T00:00:00.000Z",
+      },
+    }),
+  );
+  for (const chunk of chunks) {
+    mock.triggerMessage(
+      encodeFileTransferFrame({
+        opcode: FileTransferOpcode.FileChunk,
+        requestId,
+        payload: new TextEncoder().encode(chunk),
+      }),
+    );
+  }
+}
+
+test("readFile with timeout 0 outlives the default request timeout", async () => {
+  useHeartbeatClock();
+  const { mock, client } = await connectFileClient("clsk_file_no_timeout");
+
+  const responsePromise = client.readFile("/tmp/project", "slow.bin", "req-slow", undefined, 0);
+  await vi.advanceTimersByTimeAsync(60_001);
+
+  sendBinaryFile(mock, "req-slow", 5, ["hello"]);
+  mock.triggerMessage(
+    encodeFileTransferFrame({ opcode: FileTransferOpcode.FileEnd, requestId: "req-slow" }),
+  );
+
+  const result = await responsePromise;
+  expect(result.size).toBe(5);
+  expect(new TextDecoder().decode(result.bytes)).toBe("hello");
+});
+
+test("readFile rejects a binary transfer that ends before the announced size", async () => {
+  const { mock, client } = await connectFileClient("clsk_file_short");
+
+  const responsePromise = client.readFile("/tmp/project", "short.bin", "req-short");
+  sendBinaryFile(mock, "req-short", 10, ["hello"]);
+  mock.triggerMessage(
+    encodeFileTransferFrame({ opcode: FileTransferOpcode.FileEnd, requestId: "req-short" }),
+  );
+
+  await expect(responsePromise).rejects.toThrow(
+    "File transfer incomplete: expected 10 bytes, received 5.",
+  );
+});
+
+test("readFile rejects a binary transfer that exceeds the announced size", async () => {
+  const { mock, client } = await connectFileClient("clsk_file_long");
+
+  const responsePromise = client.readFile("/tmp/project", "long.bin", "req-long");
+  const settled = responsePromise.then(
+    () => null,
+    (error: unknown) => error,
+  );
+  sendBinaryFile(mock, "req-long", 4, ["hello!"]);
+
+  expect(() =>
+    mock.triggerMessage(
+      encodeFileTransferFrame({ opcode: FileTransferOpcode.FileEnd, requestId: "req-long" }),
+    ),
+  ).not.toThrow();
+  expect(await settled).toMatchObject({
+    message: "File transfer incomplete: expected 4 bytes, received 6.",
+  });
+});
+
 test("uploadFile sends metadata request and file bytes as binary chunks", async () => {
   const logger = createMockLogger();
   const mock = createMockTransport();
diff --git a/packages/client/src/daemon-client.ts b/packages/client/src/daemon-client.ts
index 2bd19f2974..1aa0d3e995 100644
--- a/packages/client/src/daemon-client.ts
+++ b/packages/client/src/daemon-client.ts
@@ -4758,6 +4758,7 @@ export class DaemonClient {
     requestId?: string,
     acceptBinary = false,
     maxBytes?: number,
+    timeout?: number,
   ): Promise<FileExplorerPayload> {
     return this.sendCorrelatedSessionRequest({
       requestId,
@@ -4770,6 +4771,7 @@ export class DaemonClient {
         ...(maxBytes ? { maxBytes } : {}),
       },
       responseType: "file_explorer_response",
+      timeout,
     });
   }
 
@@ -4788,11 +4790,17 @@ export class DaemonClient {
     return payload.directory;
   }
 
+  /**
+   * `timeout` bounds the whole transfer, not each frame. `0` disables the timer (as
+   * `workspace.create` does) for files that legitimately take longer than the default over a
+   * slow link; a dead connection still rejects on disconnect.
+   */
   async readFile(
     cwd: string,
     path: string,
     requestId?: string,
     maxBytes?: number,
+    timeout?: number,
   ): Promise<FileReadResult> {
     const resolvedRequestId = this.createRequestId(requestId);
     this.pendingBinaryFileReads.set(resolvedRequestId, { cwd, path, maxBytes });
@@ -4804,6 +4812,7 @@ export class DaemonClient {
         resolvedRequestId,
         true,
         maxBytes,
+        timeout,
       );
       if (payload.error) {
         throw new Error(payload.error);
@@ -6540,6 +6549,18 @@ export class DaemonClient {
       return;
     }
 
+    const received = transfer.chunks.reduce((total, chunk) => total + chunk.byteLength, 0);
+    if (received !== transfer.size) {
+      this.activeBinaryFileTransfers.delete(frame.requestId);
+      this.rejectWaitersForRequestId(
+        frame.requestId,
+        new Error(
+          `File transfer incomplete: expected ${transfer.size} bytes, received ${received}.`,
+        ),
+      );
+      return;
+    }
+
     const bytes = concatByteChunks(transfer.chunks, transfer.size);
     this.activeBinaryFileTransfers.delete(frame.requestId);
     this.completedBinaryFileReads.set(frame.requestId, {
diff --git a/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts b/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts
index d204842e0c..4da97d6eba 100644
--- a/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts
@@ -8,9 +8,13 @@ import net from "node:net";
 import path from "node:path";
 import { spawn, type ChildProcess } from "node:child_process";
 import { Buffer } from "node:buffer";
+import { createHash, randomBytes } from "node:crypto";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
 
 import { generateLocalPairingOffer } from "../pairing-offer.js";
 import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+import { FILE_EXPLORER_STREAM_CHUNK_BYTES } from "../file-explorer/service.js";
 import { createClientChannel, type Transport } from "@getpaseo/relay/e2ee";
 import {
   deriveSharedKey,
@@ -75,6 +79,10 @@ function decodeOfferFromFragmentUrl(url: string): {
   return { serverId: offer.serverId, daemonPublicKeyB64: offer.daemonPublicKeyB64 };
 }
 
+function sha256(bytes: Uint8Array): string {
+  return createHash("sha256").update(bytes).digest("hex");
+}
+
 function encodeCiphertext(ciphertext: ArrayBuffer): string {
   return Buffer.from(new Uint8Array(ciphertext)).toString("base64");
 }
@@ -860,4 +868,67 @@ async function waitForCapturedLog(
       await stopRelay();
     }
   }, 90000);
+
+  test("reads a workspace file over the E2EE relay session byte-for-byte", async () => {
+    process.env.PASEO_PRIMARY_LAN_IP = "192.168.1.12";
+
+    const { logger, lines } = createCapturingLogger();
+    let daemon: Awaited<ReturnType<typeof createTestPaseoDaemon>> | null = null;
+    let workspaceDir: string | null = null;
+    const fileName = "rapport données.bin";
+    const source = randomBytes(4 * FILE_EXPLORER_STREAM_CHUNK_BYTES + 123);
+    let client: DaemonClient | null = null;
+
+    try {
+      await startRelay({ useLocalRelay: true });
+      daemon = await createTestPaseoDaemon({
+        listen: "127.0.0.1",
+        logger,
+        relayEnabled: true,
+        relayEndpoint: `127.0.0.1:${relayPort}`,
+      });
+      workspaceDir = await mkdtemp(path.join(os.tmpdir(), "paseo-relay-download-"));
+      await writeFile(path.join(workspaceDir, fileName), source);
+      const offerUrl = await getPairingOfferUrl({
+        paseoHome: daemon.paseoHome,
+        relayEnabled: daemon.config.relayEnabled,
+        relayEndpoint: daemon.config.relayEndpoint,
+        relayPublicEndpoint: daemon.config.relayPublicEndpoint,
+        appBaseUrl: daemon.config.appBaseUrl,
+      });
+      const { serverId, daemonPublicKeyB64 } = decodeOfferFromFragmentUrl(offerUrl);
+
+      client = new DaemonClient({
+        url: buildRelayWebSocketUrl({
+          endpoint: `127.0.0.1:${relayPort}`,
+          useTls: false,
+          serverId,
+          role: "client",
+        }),
+        clientType: "cli",
+        connectTimeoutMs: 30_000,
+        e2ee: { enabled: true, daemonPublicKeyB64 },
+        reconnect: { enabled: false },
+      });
+      await client.connect();
+
+      const result = await client.readFile(workspaceDir, fileName, undefined, undefined, 0);
+
+      expect(result.size).toBe(source.byteLength);
+      expect(result.bytes.byteLength).toBe(source.byteLength);
+      expect(sha256(result.bytes)).toBe(sha256(source));
+    } catch (err) {
+      const tail = lines.slice(-50).join("");
+      // eslint-disable-next-line no-console
+      console.error("daemon logs (tail):\n", tail);
+      throw err;
+    } finally {
+      await client?.close().catch(() => undefined);
+      await daemon?.close();
+      await stopRelay();
+      if (workspaceDir) {
+        await rm(workspaceDir, { recursive: true, force: true });
+      }
+    }
+  }, 90000);
 });

From 1bf3a57a1c3d11c8adcae84b14aaf9750c95f84f Mon Sep 17 00:00:00 2001
From: truelecter <andrew.panassiouk@gmail.com>
Date: Wed, 14 Oct 2026 18:32:26 +0300
Subject: [PATCH 157/270] fix(nix): raise Node heap for the desktop build
 (#6537)

Metro's transform worker runs out of heap on the generated ws-outbound.aot.js validator on machines where Node's default heap is 2 GB, such as the 7 GB macOS runner of the Nix workflow. Set NODE_OPTIONS=--max-old-space-size=4096 in the desktop derivation, as desktop-release.yml already does.

Closes #6535
---
 nix/desktop-package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nix/desktop-package.nix b/nix/desktop-package.nix
index dae45db386..3fd5f47093 100644
--- a/nix/desktop-package.nix
+++ b/nix/desktop-package.nix
@@ -86,6 +86,12 @@ buildNpmPackage {
     # Expo's web build pulls in some pre-bundled assets; ensure it doesn't try
     # to phone home during the build.
     CI = "1";
+    # Metro's worker runs out of heap transforming the generated
+    # ws-outbound.aot.js validator (about 12 MB). Node's default heap limit is
+    # 2 GB on machines with less than 15 GB of memory, such as GitHub's 7 GB
+    # macOS runners, and 4 GB above that. 4096 MB is that 4 GB ceiling, so this
+    # only raises the limit on smaller builders, like desktop-release.yml does.
+    NODE_OPTIONS = "--max-old-space-size=4096";
   };
 
   buildPhase = ''

From b58af43a0675f2cd83d7b44489dd6cb58da79268 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 18:14:08 +0200
Subject: [PATCH 158/270] fix(app): render mixed HTML headings without literal
 tags (#6650)

Keep a matched heading together before splitting its image and text contents. Splitting first stranded the opening heading tag in a text slice without its closing tag.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/components/markdown/html-ish.test.ts  | 65 +++++++++++++++++++
 .../app/src/components/markdown/html-ish.ts   | 50 ++++++++++++--
 2 files changed, 110 insertions(+), 5 deletions(-)

diff --git a/packages/app/src/components/markdown/html-ish.test.ts b/packages/app/src/components/markdown/html-ish.test.ts
index d8b45ae415..f8606d2714 100644
--- a/packages/app/src/components/markdown/html-ish.test.ts
+++ b/packages/app/src/components/markdown/html-ish.test.ts
@@ -3,6 +3,71 @@ import { describe, expect, it } from "vitest";
 import { normalizeHtmlishMarkdown, splitHtmlishMarkdown } from "./html-ish";
 
 describe("splitHtmlishMarkdown", () => {
+  it("renders heading text beside a linked picture without literal heading tags", () => {
+    const source =
+      '<h2><a href="https://example.com/r"><picture><source srcset="https://example.com/d.svg"><img alt="Retrigger" src="https://example.com/l.svg"></picture></a>Confidence Score: 5/5</h2>';
+
+    expect(splitHtmlishMarkdown(source)).toEqual([
+      {
+        kind: "inlineImage",
+        alt: "Retrigger",
+        src: "https://example.com/l.svg",
+        href: "https://example.com/r",
+        flowsWithText: true,
+      },
+      { kind: "markdown", text: "Confidence Score: 5/5" },
+    ]);
+  });
+
+  it.each(["h1", "h2", "h3", "h4", "h5", "h6"])(
+    "keeps a mixed %s heading together after preceding markdown",
+    (heading) => {
+      const source = `Intro\n\n<${heading}><img alt="Icon" src="https://example.com/icon.svg">Caption</${heading}>\n\nOutro`;
+
+      expect(splitHtmlishMarkdown(source)).toEqual([
+        { kind: "markdown", text: "Intro\n\n" },
+        {
+          kind: "inlineImage",
+          alt: "Icon",
+          src: "https://example.com/icon.svg",
+          flowsWithText: true,
+        },
+        { kind: "markdown", text: "Caption\n\nOutro" },
+      ]);
+    },
+  );
+
+  it("preserves formatted text before and after images in a details heading", () => {
+    const source =
+      '<details><summary>More</summary><h2><strong>Before</strong><img alt="Icon" src="https://example.com/icon.svg"><em>After</em></h2></details>';
+
+    expect(splitHtmlishMarkdown(source)).toEqual([
+      {
+        kind: "details",
+        summary: "More",
+        body: "**Before***After*",
+        bodyParts: [
+          { kind: "markdown", text: "**Before**" },
+          { kind: "inlineImage", alt: "Icon", src: "https://example.com/icon.svg" },
+          { kind: "markdown", text: "*After*" },
+        ],
+      },
+    ]);
+  });
+
+  it("keeps mixed HTML headings literal in code examples", () => {
+    const heading = '<h2><img src="https://example.com/icon.svg">Caption</h2>';
+    const source = `Use \`${heading}\`\n\n\`\`\`html\n${heading}\n\`\`\``;
+
+    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
+  });
+
+  it("preserves unknown wrappers around text-only headings", () => {
+    expect(splitHtmlishMarkdown("<section><h2>Heading</h2></section>")).toEqual([
+      { kind: "markdown", text: "<section>Heading</section>" },
+    ]);
+  });
+
   const inlineImageBody = [
     '<a href="#"><img alt="Priority" src="https://example.com/assets/priority.svg?v=9" align="top"></a> Spoofed browser User-Agent allows access control bypass',
     "",
diff --git a/packages/app/src/components/markdown/html-ish.ts b/packages/app/src/components/markdown/html-ish.ts
index bd095c60b3..94eb7cab5b 100644
--- a/packages/app/src/components/markdown/html-ish.ts
+++ b/packages/app/src/components/markdown/html-ish.ts
@@ -125,9 +125,20 @@ function splitHtmlishTokens(tokens: HtmlToken[]): MarkdownDisplayPart[] {
       continue;
     }
 
-    const nextDetailsIndex = findNextOpenTag(tokens, cursor + 1, "details");
-    const nextInlineImageIndex = findNextInlineImageIndex(tokens, cursor + 1);
-    const end = Math.min(nextDetailsIndex ?? tokens.length, nextInlineImageIndex ?? tokens.length);
+    if (isHeadingTag(token)) {
+      const closeIndex = findMixedHeadingClose(tokens, cursor);
+      if (closeIndex !== null) {
+        // Headings render as their contents. Split those contents together so an
+        // embedded image cannot strand the opening heading tag in a text slice.
+        for (const part of splitHtmlishTokens(tokens.slice(cursor + 1, closeIndex))) {
+          appendDisplayPart(parts, part);
+        }
+        cursor = closeIndex + 1;
+        continue;
+      }
+    }
+
+    const end = findNextDisplayPartIndex(tokens, cursor + 1) ?? tokens.length;
     appendMarkdownPart(parts, renderInlineTokens(tokens.slice(cursor, end)));
     cursor = end;
   }
@@ -259,15 +270,44 @@ function flowsWithFollowingText(tokens: HtmlToken[], start: number, end: number)
   return false;
 }
 
-function findNextInlineImageIndex(tokens: HtmlToken[], start: number): number | null {
+function findNextDisplayPartIndex(tokens: HtmlToken[], start: number): number | null {
   for (let index = start; index < tokens.length; index += 1) {
-    if (parseInlineImageAt(tokens, index)) {
+    if (
+      isOpenTag(tokens[index], "details") ||
+      findMixedHeadingClose(tokens, index) !== null ||
+      parseInlineImageAt(tokens, index)
+    ) {
       return index;
     }
   }
   return null;
 }
 
+function findMixedHeadingClose(tokens: HtmlToken[], start: number): number | null {
+  const token = tokens[start];
+  if (!isHeadingTag(token)) {
+    return null;
+  }
+  const closeIndex = findMatchingClose(tokens, start, token.name);
+  if (closeIndex === null) {
+    return null;
+  }
+  for (let index = start + 1; index < closeIndex; index += 1) {
+    if (parseInlineImageAt(tokens, index)) {
+      return closeIndex;
+    }
+  }
+  return null;
+}
+
+function appendDisplayPart(parts: MarkdownDisplayPart[], part: MarkdownDisplayPart): void {
+  if (part.kind === "markdown") {
+    appendMarkdownPart(parts, part.text);
+  } else {
+    parts.push(part);
+  }
+}
+
 function appendMarkdownPart(parts: MarkdownDisplayPart[], text: string): void {
   if (!text) {
     return;

From e1a5664d9b615dcfcf88f4b3a0ba05234b219dce Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 19:17:06 +0200
Subject: [PATCH 159/270] fix(app): keep malformed font settings from breaking
 the UI (#6695)

Unfinished CSS strings in font preferences consumed the shared theme stylesheet. Reject incomplete syntax at the settings boundary, recover persisted malformed values through the existing default path, and restore rejected edits in the font field.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../browser/appearance-font-family.spec.ts    | 48 +++++++++++++++++++
 .../src/hooks/use-settings/storage.test.ts    | 32 +++++++++++++
 .../app/src/hooks/use-settings/storage.ts     | 19 +++++++-
 .../appearance/appearance-section.tsx         | 14 ++++--
 4 files changed, 108 insertions(+), 5 deletions(-)
 create mode 100644 packages/app/e2e/browser/appearance-font-family.spec.ts

diff --git a/packages/app/e2e/browser/appearance-font-family.spec.ts b/packages/app/e2e/browser/appearance-font-family.spec.ts
new file mode 100644
index 0000000000..6ec8600017
--- /dev/null
+++ b/packages/app/e2e/browser/appearance-font-family.spec.ts
@@ -0,0 +1,48 @@
+import { expect, test } from "../support/fixtures";
+import type { Page } from "@playwright/test";
+import { openSettingsSection } from "../support/helpers/settings";
+
+async function openAppearance(page: Page) {
+  await page.goto("/settings");
+  await openSettingsSection(page, "appearance");
+}
+
+async function setFontFamily(page: Page, name: string, family: string) {
+  const input = page.getByRole("textbox", { name });
+  await input.fill(family);
+  await input.press("Tab");
+}
+
+for (const name of ["Code font family", "Interface font family"]) {
+  test(`keeps settings usable after an unfinished quote in ${name}`, async ({ page }, testInfo) => {
+    await openAppearance(page);
+    await setFontFamily(page, name, "'Fira Code', monospace");
+    await expect(page.getByRole("textbox", { name })).toHaveValue("'Fira Code', monospace");
+
+    await setFontFamily(page, name, "'foo");
+    await expect(page.getByRole("textbox", { name })).toHaveValue("'Fira Code', monospace");
+    await expect(page.getByRole("button", { name: "Appearance", exact: true })).toBeInViewport();
+    await expect(page.getByText("Theme", { exact: true }).first()).toHaveCSS("font-size", "12px");
+
+    await page.screenshot({ path: testInfo.outputPath("rejected-font.png") });
+    await page.reload();
+    await expect(page.getByRole("textbox", { name })).toHaveValue("'Fira Code', monospace");
+    await expect(page.getByRole("button", { name: "Appearance", exact: true })).toBeInViewport();
+    await setFontFamily(page, name, "");
+    await expect(page.getByRole("textbox", { name })).toHaveValue("");
+  });
+}
+
+test("opens settings with defaults when a malformed font was already saved", async ({ page }) => {
+  await page.addInitScript(() => {
+    localStorage.setItem(
+      "@paseo:app-settings",
+      JSON.stringify({ monoFontFamily: "'foo", uiFontFamily: '"foo' }),
+    );
+  });
+  await openAppearance(page);
+  await expect(page.getByRole("textbox", { name: "Code font family" })).toHaveValue("");
+  await expect(page.getByRole("textbox", { name: "Interface font family" })).toHaveValue("");
+  await expect(page.getByRole("button", { name: "Appearance", exact: true })).toBeInViewport();
+  await expect(page.getByText("Theme", { exact: true }).first()).toHaveCSS("font-size", "12px");
+});
diff --git a/packages/app/src/hooks/use-settings/storage.test.ts b/packages/app/src/hooks/use-settings/storage.test.ts
index d396f26d9a..6d9c8d4c7c 100644
--- a/packages/app/src/hooks/use-settings/storage.test.ts
+++ b/packages/app/src/hooks/use-settings/storage.test.ts
@@ -15,6 +15,7 @@ import {
   parseClampedFontSize,
   parseTerminalScrollbackLines,
   resolveContentMaxWidth,
+  sanitizeFontFamily,
   saveAppSettings,
   type SettingsDeps,
 } from "./storage";
@@ -1094,3 +1095,34 @@ describe("content max width", () => {
     expect((await load("wide")).contentMaxWidth).toBeNull();
   });
 });
+
+describe("font family CSS safety", () => {
+  it.each(["'foo", '"foo', "Menlo, 'foo", "foo\\", "foo/*", "foo(", "foo["])(
+    "rejects unfinished CSS syntax: %s",
+    (value) => expect(sanitizeFontFamily(value)).toBeNull(),
+  );
+
+  it.each([
+    "Menlo",
+    "'Fira Code', monospace",
+    '"Fira Code", monospace',
+    "'Font\\'s name'",
+    "Font\\ Name",
+    "'Font (Mono)'",
+    "'Font [Mono]'",
+  ])("preserves complete font families: %s", (value) =>
+    expect(sanitizeFontFamily(value)).toBe(value),
+  );
+
+  it.each(["uiFontFamily", "monoFontFamily"])(
+    "recovers a persisted unmatched quote in %s",
+    async (field) => {
+      const deps = makeDeps({
+        storage: createInMemoryKeyValueStorage({
+          [APP_SETTINGS_KEY]: JSON.stringify({ [field]: "'foo" }),
+        }),
+      });
+      expect(await loadAppSettingsFromStorage(deps)).toMatchObject({ [field]: "" });
+    },
+  );
+});
diff --git a/packages/app/src/hooks/use-settings/storage.ts b/packages/app/src/hooks/use-settings/storage.ts
index 6c44546668..54ee6b10bc 100644
--- a/packages/app/src/hooks/use-settings/storage.ts
+++ b/packages/app/src/hooks/use-settings/storage.ts
@@ -522,7 +522,24 @@ export function sanitizeFontFamily(value: unknown): string | null {
   if ([...trimmed].some((char) => char.charCodeAt(0) <= 0x1f)) {
     return null; // control chars would corrupt the font-family string
   }
-  return trimmed; // quotes/commas are legit in stacks
+  // Unistyles serializes theme values into one shared stylesheet. An unfinished
+  // string, escape, comment, or block consumes the declarations that follow.
+  let quote: string | null = null;
+  let escaped = false;
+  for (const char of trimmed) {
+    if (escaped) {
+      escaped = false;
+    } else if (char === "\\") {
+      escaped = true;
+    } else if (quote !== null) {
+      if (char === quote) quote = null;
+    } else if (char === "'" || char === '"') {
+      quote = char;
+    } else if (/[()[\]/*]/.test(char)) {
+      return null;
+    }
+  }
+  return quote === null && !escaped ? trimmed : null;
 }
 
 async function loadLegacyDesktopSettingsFromStorage(storage: KeyValueStorage): Promise<{
diff --git a/packages/app/src/screens/settings/appearance/appearance-section.tsx b/packages/app/src/screens/settings/appearance/appearance-section.tsx
index 6e98819323..2dfea09fd0 100644
--- a/packages/app/src/screens/settings/appearance/appearance-section.tsx
+++ b/packages/app/src/screens/settings/appearance/appearance-section.tsx
@@ -241,7 +241,7 @@ interface FontFamilyRowProps {
   draft: string;
   withBorder: boolean;
   onChangeDraft: (value: string) => void;
-  onCommit: (value: string) => void;
+  onCommit: (value: string) => string;
 }
 
 function FontFamilyRow({
@@ -255,13 +255,16 @@ function FontFamilyRow({
   onChangeDraft,
   onCommit,
 }: FontFamilyRowProps) {
+  const inputRef = useRef<EditingTextInputHandle>(null);
   const handleCommit = useCallback(() => {
-    onCommit(draft);
+    const committed = onCommit(draft);
+    inputRef.current?.replaceText(committed);
   }, [draft, onCommit]);
 
   // Resync from the committed value when it changes elsewhere.
   useEffect(() => {
     onChangeDraft(value);
+    inputRef.current?.replaceText(value);
     // Only resync on external value changes, not on local keystrokes.
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [value]);
@@ -273,6 +276,7 @@ function FontFamilyRow({
         <Text style={settingsStyles.rowHint}>{hint}</Text>
       </View>
       <TextInput
+        ref={inputRef}
         initialValue={draft}
         onChangeText={onChangeDraft}
         onBlur={handleCommit}
@@ -533,12 +537,13 @@ export function AppearanceSection() {
       const sanitized = sanitizeFontFamily(value);
       if (sanitized === null) {
         setUiFontDraft(settings.uiFontFamily);
-        return;
+        return settings.uiFontFamily;
       }
       setUiFontDraft(sanitized);
       if (sanitized !== settings.uiFontFamily) {
         void updateSettings({ uiFontFamily: sanitized });
       }
+      return sanitized;
     },
     [settings.uiFontFamily, updateSettings],
   );
@@ -548,12 +553,13 @@ export function AppearanceSection() {
       const sanitized = sanitizeFontFamily(value);
       if (sanitized === null) {
         setMonoFontDraft(settings.monoFontFamily);
-        return;
+        return settings.monoFontFamily;
       }
       setMonoFontDraft(sanitized);
       if (sanitized !== settings.monoFontFamily) {
         void updateSettings({ monoFontFamily: sanitized });
       }
+      return sanitized;
     },
     [settings.monoFontFamily, updateSettings],
   );

From 6d43a8c5b05123d945ebd8995c5645818aff31cb Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 20:02:03 +0200
Subject: [PATCH 160/270] Restore selected changes from subdirectory workspaces
 (#6777)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(git): discard repository paths from the worktree root

* test(git): cover discard from nested workspaces through daemon RPC

* test(git): close the daemon before removing discard fixtures

Windows CI reaches the discard assertions but cannot remove the observed
repository while the test daemon is alive. Run fixture removal after the
daemon's afterEach cleanup, preserving all behavioral assertions.

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>

---------

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../server/daemon-e2e/filesystem.e2e.test.ts  | 75 +++++++++++++++++++
 packages/server/src/utils/checkout-git.ts     | 12 +--
 2 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
index 7fee55e216..0c99744e62 100644
--- a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
@@ -31,6 +31,81 @@ afterEach(async () => {
   await ctx.cleanup();
 }, 60000);
 
+describe("checkout discard", () => {
+  test.each([".", "apps/web"])(
+    "discards selected Changes from the %s workspace without changing siblings",
+    async (workspacePath) => {
+      const cwd = tmpCwd();
+      function git(args: string[]): string {
+        return execFileSync("git", args, { cwd, encoding: "utf8", stdio: "pipe" });
+      }
+      try {
+        git(["init", "-b", "main"]);
+        git(["config", "user.name", "Paseo Test"]);
+        git(["config", "user.email", "test@getpaseo.local"]);
+        git(["config", "core.autocrlf", "false"]);
+        const nested = path.join(cwd, "apps", "web");
+        mkdirSync(nested, { recursive: true });
+        writeFileSync(path.join(nested, "target[ab].txt"), "target base\n");
+        writeFileSync(path.join(nested, "targeta.txt"), "sibling base\n");
+        writeFileSync(path.join(nested, "deleted.txt"), "deleted base\n");
+        git(["add", "."]);
+        git(["-c", "commit.gpgsign=false", "commit", "-m", "initial"]);
+        const creation = await ctx.client.createWorkspace({
+          source: { kind: "directory", path: path.join(cwd, workspacePath) },
+          title: "Discard regression",
+        });
+        const workspaceCwd = creation.workspace?.workspaceDirectory;
+        if (!workspaceCwd) {
+          throw new Error(creation.error ?? "Workspace creation failed");
+        }
+
+        writeFileSync(path.join(nested, "target[ab].txt"), "target edited\n");
+        writeFileSync(path.join(nested, "targeta.txt"), "sibling edited\n");
+        writeFileSync(path.join(nested, "staged.txt"), "staged new file\n");
+        writeFileSync(path.join(nested, "scratch.txt"), "untracked file\n");
+        git(["--literal-pathspecs", "add", "--", "apps/web/target[ab].txt", "apps/web/staged.txt"]);
+        git(["rm", "apps/web/deleted.txt"]);
+
+        const subscription = ctx.client.observeCheckoutDiff(workspaceCwd, { mode: "uncommitted" });
+        try {
+          const changes = await subscription.ready;
+          expect(changes.error).toBeNull();
+          expect(changes.files.map((file) => file.path).sort()).toEqual([
+            "apps/web/deleted.txt",
+            "apps/web/scratch.txt",
+            "apps/web/staged.txt",
+            "apps/web/target[ab].txt",
+            "apps/web/targeta.txt",
+          ]);
+          const selectedPaths = changes.files
+            .filter((file) => file.path !== "apps/web/targeta.txt")
+            .map((file) => file.path);
+          const discarded = await ctx.client.checkoutDiscardChanges(workspaceCwd, {
+            paths: selectedPaths,
+          });
+          expect(discarded).toMatchObject({ success: true, error: null });
+
+          const target = await ctx.client.readFile(cwd, "apps/web/target[ab].txt");
+          expect(new TextDecoder().decode(target.bytes)).toBe("target base\n");
+          const restored = await ctx.client.readFile(cwd, "apps/web/deleted.txt");
+          expect(new TextDecoder().decode(restored.bytes)).toBe("deleted base\n");
+          const sibling = await ctx.client.readFile(cwd, "apps/web/targeta.txt");
+          expect(new TextDecoder().decode(sibling.bytes)).toBe("sibling edited\n");
+          await expect(ctx.client.readFile(cwd, "apps/web/staged.txt")).rejects.toThrow(/ENOENT/);
+          await expect(ctx.client.readFile(cwd, "apps/web/scratch.txt")).rejects.toThrow(/ENOENT/);
+          expect(git(["status", "--porcelain=v1", "-z"])).toBe(" M apps/web/targeta.txt\0");
+        } finally {
+          await subscription.release();
+        }
+      } finally {
+        // afterEach shuts down the daemon and its repository observers first.
+        onTestFinished(() => rmSync(cwd, { recursive: true, force: true }));
+      }
+    },
+  );
+});
+
 describe("file explorer", () => {
   test.each(["..", "..."])(
     "workspace suggestions resolve exact paths starting with %s",
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index 0f34a1ea73..bda89506b5 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -3553,13 +3553,13 @@ export async function commitAll(cwd: string, message: string): Promise<void> {
 }
 
 export async function discardChanges(cwd: string, pathspecs: string[]): Promise<void> {
-  await requireGitRepo(cwd);
+  const worktreeRoot = await requireGitWorktreeRoot(cwd);
   if (pathspecs.length === 0) {
     return;
   }
   try {
     await runGitCommand(["--literal-pathspecs", "reset", "-q", "HEAD", "--", ...pathspecs], {
-      cwd,
+      cwd: worktreeRoot,
       timeout: DISCARD_CHANGES_TIMEOUT_MS,
     });
   } catch {
@@ -3567,7 +3567,7 @@ export async function discardChanges(cwd: string, pathspecs: string[]): Promise<
     await runGitCommand(
       ["--literal-pathspecs", "rm", "--cached", "-r", "-q", "--ignore-unmatch", "--", ...pathspecs],
       {
-        cwd,
+        cwd: worktreeRoot,
         timeout: DISCARD_CHANGES_TIMEOUT_MS,
       },
     );
@@ -3579,7 +3579,7 @@ export async function discardChanges(cwd: string, pathspecs: string[]): Promise<
   const status = await runGitCommand(
     ["--literal-pathspecs", "status", "--porcelain=v1", "-z", "--", ...pathspecs],
     {
-      cwd,
+      cwd: worktreeRoot,
       timeout: DISCARD_CHANGES_TIMEOUT_MS,
     },
   );
@@ -3605,13 +3605,13 @@ export async function discardChanges(cwd: string, pathspecs: string[]): Promise<
   }
   if (tracked.length > 0) {
     await runGitCommand(["--literal-pathspecs", "checkout", "-q", "--", ...tracked], {
-      cwd,
+      cwd: worktreeRoot,
       timeout: DISCARD_CHANGES_TIMEOUT_MS,
     });
   }
   if (untracked.length > 0) {
     await runGitCommand(["--literal-pathspecs", "clean", "-fd", "-q", "--", ...untracked], {
-      cwd,
+      cwd: worktreeRoot,
       timeout: DISCARD_CHANGES_TIMEOUT_MS,
     });
   }

From 404d08d24be8b7a6badf85c85c540c7a184ce455 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 23:02:39 +0200
Subject: [PATCH 161/270] Report failed terminal launches and remove early
 exits (#6792)

* fix(server): report a terminal whose command cannot start instead of leaving a dead tab

Opening a terminal profile whose command is not installed left a tab that could
never be closed. Two problems sat on the same path.

A terminal that dies during creation was resurrected by its own create. The
worker sends terminalCreated, the createTerminal response and terminalExit in
the same tick, so the parent drains all three before the awaiting create
continuation resumes; that continuation called registerRecord a second time and
put back a terminal the exit had just removed. Removal is owned solely by the
terminalExit event and that event never comes twice, so the record outlived
every close attempt: getTerminals kept listing it, capture returned nothing,
kill was a silent no-op that still reported success, and only a daemon restart
cleared it.

The parent now tracks the ids with a create in flight and keeps the finished
record when an exit removes one of them, so the create continuation returns the
exited session instead of registering a live one. Removal still happens exactly
once, in the terminalExit path.

With the stuck tab gone, a missing command produced nothing at all: no tab and
no message. node-pty spawns directly through execve on POSIX, with no shell, so
a command that does not exist fails inside the spawn helper and surfaces as exit
code 1 with no output -- exactly what `false` produces, so the exit carries no
usable signal. createTerminal now resolves the command before spawning and fails
the create when it cannot be found, so the daemon answers create_terminal with a
null terminal and "<command>: command not found", which the app already renders.
A command that starts and then exits non-zero still opens its tab.

That resolution has to match what execve will do in the child, or a working
profile is refused: it uses the terminal's own environment, built first so the
check sees the per-cwd registered PATH and the entries buildTerminalEnvironment
prepends, and it resolves a command containing a separator against the
terminal's cwd rather than through PATH. Windows keeps resolving inside
resolveTerminalSpawnCommand, which has its own shim handling and fallback.

* fix(terminal): check exact executable names and verify launch output

---------

Co-authored-by: KiraPC <pasqualecarmine.carbone@gmail.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../executable-resolution.ts                  |  24 +++
 .../terminal-workspace-sdk.e2e.test.ts        |  25 +++
 packages/server/src/terminal/terminal.test.ts | 188 +++++++++++++++++-
 packages/server/src/terminal/terminal.ts      | 105 +++++++++-
 .../terminal/worker-terminal-manager.test.ts  | 136 +++++++++++++
 .../src/terminal/worker-terminal-manager.ts   |  30 +--
 6 files changed, 485 insertions(+), 23 deletions(-)

diff --git a/packages/server/src/executable-resolution/executable-resolution.ts b/packages/server/src/executable-resolution/executable-resolution.ts
index 59c218511b..97bb8af3a3 100644
--- a/packages/server/src/executable-resolution/executable-resolution.ts
+++ b/packages/server/src/executable-resolution/executable-resolution.ts
@@ -1,5 +1,6 @@
 import { createRequire } from "node:module";
 import { existsSync } from "node:fs";
+import { delimiter, resolve } from "node:path";
 import type { ProcessEnvRecord } from "../server/paseo-env.js";
 import { execCommand } from "../utils/spawn.js";
 import { windowsExecutableResolution } from "./windows.js";
@@ -120,6 +121,29 @@ export function executableExists(
   return exists(executablePath) ? executablePath : null;
 }
 
+// PATH lookup that never runs the candidate, unlike findExecutable which probes
+// each one with `--version`. A terminal spawn path cannot afford that probe: it
+// would execute the profile command once before the terminal even opens.
+// `path` overrides the PATH to search, so a caller can resolve against the
+// environment its child process will actually get rather than the daemon's own.
+export async function findExecutableWithoutProbing(
+  name: string,
+  options: { path?: string; cwd: string },
+): Promise<string | null> {
+  if (!name) {
+    return null;
+  }
+  const path =
+    options.path === undefined
+      ? undefined
+      : options.path
+          .split(delimiter)
+          .map((entry) => resolve(options.cwd, entry))
+          .join(delimiter);
+  const candidates = await enumerateCandidatesViaLibrary(name, { PATH: path });
+  return candidates[0] ?? null;
+}
+
 export interface ExecutableResolutionOptions {
   probeTimeoutMs?: number;
   env?: ProcessEnvRecord;
diff --git a/packages/server/src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts b/packages/server/src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts
index 19ccdf45e8..80c9409cef 100644
--- a/packages/server/src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts
@@ -244,3 +244,28 @@ async function observeScriptLifecycles(
   await subscription.ready;
   return lifecycles;
 }
+
+test.runIf(process.platform !== "win32")(
+  "a missing command fails creation without leaving a terminal listed",
+  async () => {
+    const workspaceId = await createWorkspace("Missing command");
+    await expect(
+      sdk.terminals.create({
+        workspaceId,
+        name: "Missing command",
+        command: "paseo-test-absent-terminal-command",
+      }),
+    ).rejects.toThrow("paseo-test-absent-terminal-command: command not found");
+    expect((await sdk.terminals.list({ workspaceId })).entries).toEqual([]);
+    const control = await sdk.terminals.create({
+      workspaceId,
+      command: process.execPath,
+      args: ["-e", "process.stdin.resume()"],
+    });
+    expect((await sdk.terminals.list({ workspaceId })).entries.map((entry) => entry.id)).toEqual([
+      control.id,
+    ]);
+    await control.kill();
+    expect((await sdk.terminals.list({ workspaceId })).entries).toEqual([]);
+  },
+);
diff --git a/packages/server/src/terminal/terminal.test.ts b/packages/server/src/terminal/terminal.test.ts
index f83b6b9ba3..751fb1b33a 100644
--- a/packages/server/src/terminal/terminal.test.ts
+++ b/packages/server/src/terminal/terminal.test.ts
@@ -2,6 +2,7 @@ import { describe, it, expect, afterEach, vi } from "vitest";
 import { isPlatform } from "../test-utils/platform.js";
 import {
   buildTerminalEnvironment,
+  assertTerminalCommandCanStart,
   createTerminal,
   ensureNodePtySpawnHelperExecutableForCurrentPlatform,
   resolveDefaultTerminalShell,
@@ -26,7 +27,7 @@ import { spawnSync } from "node:child_process";
 import * as pty from "node-pty";
 import xterm from "@xterm/headless";
 import { renderTerminalSnapshotToAnsi } from "@getpaseo/protocol/terminal-snapshot";
-import { join } from "node:path";
+import { delimiter, join } from "node:path";
 import { tmpdir } from "node:os";
 import { setImmediate as waitForImmediate, setTimeout as delay } from "node:timers/promises";
 import { stripVTControlCharacters } from "node:util";
@@ -637,6 +638,151 @@ describe("createTerminal", () => {
     expect(exitInfo.lastOutputLines.length).toBeGreaterThan(0);
     expect(exitInfo.lastOutputLines[exitInfo.lastOutputLines.length - 1]).toBe("line-2999");
   });
+
+  it.runIf(isPlatform("linux", "darwin"))(
+    "rejects a profile command that is not installed instead of opening a terminal",
+    async () => {
+      await expect(
+        createTerminal({
+          workspaceId: "ws-test",
+          cwd: realpathSync(tmpdir()),
+          name: "Codex",
+          command: "paseo-qa-absent-codex",
+          args: [],
+        }),
+      ).rejects.toThrow("paseo-qa-absent-codex: command not found");
+    },
+  );
+
+  it.runIf(isPlatform("linux", "darwin"))(
+    "opens a command found only on the PATH carried by the env option",
+    async () => {
+      // execve resolves the command against the child's PATH, which carries the
+      // per-cwd registered environment. A version-manager shim lives there and
+      // not necessarily on the daemon's own PATH.
+      const binDir = mkdtempSync(join(tmpdir(), "terminal-envpath-bin-"));
+      temporaryDirs.push(binDir);
+      const toolPath = join(binDir, "paseo-qa-envpath-tool");
+      writeFileSync(toolPath, "#!/usr/bin/env bash\nprintf 'paseo-launch-ok\\n'\nsleep 30\n");
+      chmodSync(toolPath, 0o755);
+
+      const session = trackSession(
+        await createTerminal({
+          workspaceId: "ws-test",
+          cwd: realpathSync(tmpdir()),
+          name: "Shim",
+          command: "paseo-qa-envpath-tool",
+          args: [],
+          env: { PATH: `${binDir}${delimiter}${process.env.PATH ?? ""}` },
+        }),
+      );
+
+      await waitForLines(session, ["paseo-launch-ok"]);
+      expect(getLines(session.getState())[0]).toBe("paseo-launch-ok");
+    },
+  );
+
+  it.runIf(isPlatform("linux", "darwin"))(
+    "reports command not found when the command is on neither PATH",
+    async () => {
+      await expect(
+        createTerminal({
+          workspaceId: "ws-test",
+          cwd: realpathSync(tmpdir()),
+          name: "Codex",
+          command: "paseo-qa-absent-codex",
+          args: [],
+          env: { PATH: `/paseo-qa-empty${delimiter}${process.env.PATH ?? ""}` },
+        }),
+      ).rejects.toThrow("paseo-qa-absent-codex: command not found");
+    },
+  );
+
+  it.runIf(isPlatform("linux", "darwin"))(
+    "opens a relative command path resolved against the terminal cwd",
+    async () => {
+      // execve resolves a path-ish command against the child's cwd, never the
+      // daemon's own working directory.
+      const projectDir = mkdtempSync(join(tmpdir(), "terminal-relative-cmd-"));
+      temporaryDirs.push(projectDir);
+      mkdirSync(join(projectDir, "scripts"));
+      const scriptPath = join(projectDir, "scripts", "dev.sh");
+      writeFileSync(scriptPath, "#!/usr/bin/env bash\nprintf 'paseo-launch-ok\\n'\nsleep 30\n");
+      chmodSync(scriptPath, 0o755);
+
+      const session = trackSession(
+        await createTerminal({
+          workspaceId: "ws-test",
+          cwd: realpathSync(projectDir),
+          name: "Dev script",
+          command: "./scripts/dev.sh",
+          args: [],
+        }),
+      );
+
+      await waitForLines(session, ["paseo-launch-ok"]);
+      expect(getLines(session.getState())[0]).toBe("paseo-launch-ok");
+    },
+  );
+
+  it.runIf(isPlatform("linux", "darwin"))("opens an absolute command path", async () => {
+    const projectDir = mkdtempSync(join(tmpdir(), "terminal-absolute-cmd-"));
+    temporaryDirs.push(projectDir);
+    const scriptPath = join(projectDir, "run.sh");
+    writeFileSync(scriptPath, "#!/usr/bin/env bash\nprintf 'paseo-launch-ok\\n'\nsleep 30\n");
+    chmodSync(scriptPath, 0o755);
+
+    const session = trackSession(
+      await createTerminal({
+        workspaceId: "ws-test",
+        cwd: realpathSync(tmpdir()),
+        name: "Absolute",
+        command: scriptPath,
+        args: [],
+      }),
+    );
+
+    await waitForLines(session, ["paseo-launch-ok"]);
+    expect(getLines(session.getState())[0]).toBe("paseo-launch-ok");
+  });
+
+  it("leaves the command check to the terminal itself on Windows", async () => {
+    // Windows resolves inside resolveTerminalSpawnCommand, which has its own
+    // shim handling and its own fallback for an unresolved command.
+    await expect(
+      assertTerminalCommandCanStart({
+        command: "paseo-qa-absent-codex",
+        cwd: realpathSync(tmpdir()),
+        env: { PATH: "/paseo-qa-empty" },
+        platform: "win32",
+      }),
+    ).resolves.toBeUndefined();
+  });
+
+  it.runIf(isPlatform("linux", "darwin"))(
+    "still opens a terminal for an installed command that exits non-zero",
+    async () => {
+      // A profile running a failing test suite must keep opening a tab with its
+      // output. Only a command that cannot start at all is reported as an error,
+      // and "exited non-zero" does not distinguish the two: a missing binary and
+      // `false` both surface as exit code 1 from node-pty.
+      const session = trackSession(
+        await createTerminal({
+          workspaceId: "ws-test",
+          cwd: realpathSync(tmpdir()),
+          name: "Failing suite",
+          command: "false",
+          args: [],
+        }),
+      );
+
+      const exitInfo = await new Promise<{ exitCode: number | null }>((resolve) => {
+        session.onExit((info) => resolve({ exitCode: info.exitCode }));
+      });
+
+      expect(exitInfo).toEqual({ exitCode: 1 });
+    },
+  );
 });
 
 describe.skipIf(isPlatform("win32"))("send input", () => {
@@ -1388,3 +1534,43 @@ describe.runIf(isPlatform("win32"))(".cmd shim argv round-trip on Windows", () =
     expect(await roundTrip("first\nsecond")).toEqual(["first second"]);
   });
 });
+
+it.runIf(isPlatform("linux", "darwin"))(
+  "opens a profile command from a PATH entry relative to the terminal cwd",
+  async () => {
+    const projectDir = mkdtempSync(join(tmpdir(), "terminal-relative-path-"));
+    mkdirSync(join(projectDir, "bin"));
+    const script = join(projectDir, "bin", "paseo-relative-path-tool");
+    writeFileSync(script, "#!/bin/sh\nprintf 'paseo-launch-ok\\n'\nexec /bin/sleep 30\n");
+    chmodSync(script, 0o755);
+    let session: TerminalSession | undefined;
+    try {
+      session = await createTerminal({
+        workspaceId: "ws-test",
+        cwd: realpathSync(projectDir),
+        command: "paseo-relative-path-tool",
+        env: { PATH: "bin" },
+      });
+      await waitForLines(session, ["paseo-launch-ok"]);
+      expect(getLines(session.getState())[0]).toBe("paseo-launch-ok");
+      expect(session.cwd).toBe(realpathSync(projectDir));
+      expect(session.getExitInfo()).toBeNull();
+    } finally {
+      await session?.killAndWait({ gracefulTimeoutMs: 1000, forceTimeoutMs: 500 });
+      rmSync(projectDir, { recursive: true, force: true });
+    }
+  },
+);
+
+it.runIf(isPlatform("linux", "darwin"))(
+  "checks the exact command rather than accepting a trimmed executable name",
+  async () => {
+    await expect(
+      createTerminal({
+        workspaceId: "ws-test",
+        cwd: realpathSync(tmpdir()),
+        command: " node ",
+      }),
+    ).rejects.toThrow(" node : command not found");
+  },
+);
diff --git a/packages/server/src/terminal/terminal.ts b/packages/server/src/terminal/terminal.ts
index 1e708062b8..24f243b6ea 100644
--- a/packages/server/src/terminal/terminal.ts
+++ b/packages/server/src/terminal/terminal.ts
@@ -1,14 +1,25 @@
 import * as pty from "node-pty";
 import xterm, { type Terminal as TerminalType } from "@xterm/headless";
 import { randomUUID } from "crypto";
-import { chmodSync, existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
+import {
+  accessSync,
+  chmodSync,
+  constants,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  statSync,
+} from "node:fs";
 import { tmpdir, userInfo } from "node:os";
 import { basename, delimiter, dirname, extname, join, resolve as resolvePath } from "node:path";
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 import { createExternalProcessEnv } from "../server/paseo-env.js";
 import { writePrivateFileAtomicSync } from "../server/private-files.js";
-import { findExecutable } from "../executable-resolution/executable-resolution.js";
+import {
+  findExecutable,
+  findExecutableWithoutProbing,
+} from "../executable-resolution/executable-resolution.js";
 import type { TerminalCell, TerminalState } from "@getpaseo/protocol/messages";
 import { TerminalInputModeTracker } from "@getpaseo/protocol/terminal-input-mode";
 import { TerminalActivityTracker } from "./activity/terminal-activity-tracker.js";
@@ -33,6 +44,20 @@ export interface TerminalExitInfo {
   lastOutputLines: string[];
 }
 
+// The field is assigned explicitly rather than declared as a constructor
+// parameter property: the terminal worker loads this module under
+// --experimental-strip-types, which erases types but cannot emit the
+// assignment a parameter property implies.
+export class TerminalCommandNotFoundError extends Error {
+  readonly command: string;
+
+  constructor(command: string) {
+    super(`${command}: command not found`);
+    this.name = "TerminalCommandNotFoundError";
+    this.command = command;
+  }
+}
+
 export interface TerminalCommandFinishedInfo {
   exitCode: number | null;
 }
@@ -886,6 +911,62 @@ function extractLastOutputLinesFromText(text: string, limit: number): string[] {
   return lines.slice(-limit);
 }
 
+function isExecutableFile(path: string): boolean {
+  try {
+    if (!statSync(path).isFile()) {
+      return false;
+    }
+    accessSync(path, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export interface AssertTerminalCommandCanStartInput {
+  command: string | undefined;
+  // The terminal's own cwd and environment, not the daemon's: execve in the
+  // child resolves against those, so anything else produces false negatives.
+  cwd: string;
+  env: Record<string, string>;
+  platform?: NodeJS.Platform;
+}
+
+// node-pty spawns directly through execve on POSIX, with no shell, so a command
+// that does not exist fails inside the spawn helper and surfaces as exit code 1
+// with no output -- indistinguishable from `false` or any program that simply
+// failed. Resolving it up front is the only signal that separates "cannot start"
+// from "ran and exited non-zero", and it lets the create report the failure
+// instead of handing back a terminal that dies immediately. Windows keeps
+// resolving inside resolveTerminalSpawnCommand, which has its own shim handling
+// and its own fallback for an unresolved command.
+export async function assertTerminalCommandCanStart(
+  input: AssertTerminalCommandCanStartInput,
+): Promise<void> {
+  const { command, cwd, env } = input;
+  const platform = input.platform ?? process.platform;
+  if (command === undefined || platform === "win32") {
+    return;
+  }
+
+  // A path-ish command is resolved by execve against the child's cwd, never
+  // through PATH and never against the daemon's working directory.
+  if (command.includes("/")) {
+    if (isExecutableFile(resolvePath(cwd, command))) {
+      return;
+    }
+    throw new TerminalCommandNotFoundError(command);
+  }
+
+  const resolved = await findExecutableWithoutProbing(command, {
+    path: env[getPathEnvKey(env)],
+    cwd,
+  });
+  if (!resolved) {
+    throw new TerminalCommandNotFoundError(command);
+  }
+}
+
 export async function createTerminal(options: CreateTerminalOptions): Promise<TerminalSession> {
   const {
     cwd,
@@ -945,19 +1026,23 @@ export async function createTerminal(options: CreateTerminalOptions): Promise<Te
   const { command: spawnCommand, args: spawnArgs } = command
     ? await resolveTerminalSpawnCommand(command, args)
     : { command: resolvedShell, args: [] as string[] };
+  const terminalEnv = buildTerminalEnvironment({
+    shell: spawnCommand,
+    env: {
+      ...env,
+      ...activityEnv,
+      PASEO_WORKSPACE_ID: workspaceId,
+    },
+  });
+
+  await assertTerminalCommandCanStart({ command, cwd, env: terminalEnv });
+
   const ptyProcess = pty.spawn(spawnCommand, spawnArgs, {
     name: "xterm-256color",
     cols,
     rows,
     cwd,
-    env: buildTerminalEnvironment({
-      shell: spawnCommand,
-      env: {
-        ...env,
-        ...activityEnv,
-        PASEO_WORKSPACE_ID: workspaceId,
-      },
-    }),
+    env: terminalEnv,
   });
 
   function emitTitleChange(nextTitle: string | undefined): void {
diff --git a/packages/server/src/terminal/worker-terminal-manager.test.ts b/packages/server/src/terminal/worker-terminal-manager.test.ts
index efccd3dfb6..e11c9eca9f 100644
--- a/packages/server/src/terminal/worker-terminal-manager.test.ts
+++ b/packages/server/src/terminal/worker-terminal-manager.test.ts
@@ -968,3 +968,139 @@ it("removes a killed worker terminal from terminalExit without duplicate snapsho
     },
   ]);
 });
+
+it("does not resurrect a terminal that exited before its create response was handled", async () => {
+  const worker = new FakeTerminalWorker();
+  manager = createWorkerTerminalManager({
+    requestTimeoutMs: 50,
+    forkWorker: () => worker,
+  });
+
+  const snapshots: Array<{ cwd: string; terminalIds: string[] }> = [];
+  manager.subscribeTerminalsChanged((event) => {
+    snapshots.push({ cwd: event.cwd, terminalIds: event.terminals.map((terminal) => terminal.id) });
+  });
+
+  const created = manager.createTerminal({
+    id: "terminal-a",
+    cwd: "/workspace",
+    workspaceId: "ws-test",
+  });
+  const request = worker.sentMessages.find((message) => message.type === "createTerminal");
+  if (!request) {
+    throw new Error("createTerminal request not sent");
+  }
+
+  // The worker delivers all three messages in one tick, so the awaiting
+  // createTerminal continuation resumes only after the exit was processed.
+  const terminal = {
+    id: "terminal-a",
+    name: "Shell",
+    cwd: "/workspace",
+    workspaceId: "ws-test",
+    activity: null,
+  };
+  const state = createTerminalState();
+  const exitInfo = { exitCode: 0, signal: null, lastOutputLines: [] };
+  worker.emitWorkerMessage({ type: "terminalCreated", terminal, state });
+  worker.emitWorkerMessage({
+    type: "response",
+    requestId: request.requestId,
+    ok: true,
+    result: { terminal, state },
+  });
+  worker.emitWorkerMessage({ type: "terminalExit", terminalId: "terminal-a", info: exitInfo });
+
+  const session = await created;
+
+  expect(manager.getTerminal("terminal-a")).toBeUndefined();
+  expect(await manager.getTerminals("/workspace")).toEqual([]);
+  expect(session.getExitInfo()).toEqual(exitInfo);
+  expect(snapshots).toEqual([
+    { cwd: "/workspace", terminalIds: ["terminal-a"] },
+    { cwd: "/workspace", terminalIds: [] },
+  ]);
+});
+
+it("replays the exit to a listener attached after a create that lost the race", async () => {
+  const worker = new FakeTerminalWorker();
+  manager = createWorkerTerminalManager({
+    requestTimeoutMs: 50,
+    forkWorker: () => worker,
+  });
+
+  const created = manager.createTerminal({
+    id: "terminal-a",
+    cwd: "/workspace",
+    workspaceId: "ws-test",
+  });
+  const request = worker.sentMessages.find((message) => message.type === "createTerminal");
+  if (!request) {
+    throw new Error("createTerminal request not sent");
+  }
+
+  const terminal = {
+    id: "terminal-a",
+    name: "Shell",
+    cwd: "/workspace",
+    workspaceId: "ws-test",
+    activity: null,
+  };
+  const state = createTerminalState();
+  const exitInfo = { exitCode: 0, signal: null, lastOutputLines: [] };
+  worker.emitWorkerMessage({ type: "terminalCreated", terminal, state });
+  worker.emitWorkerMessage({
+    type: "response",
+    requestId: request.requestId,
+    ok: true,
+    result: { terminal, state },
+  });
+  worker.emitWorkerMessage({ type: "terminalExit", terminalId: "terminal-a", info: exitInfo });
+
+  const session = await created;
+
+  // The session controller subscribes only after createTerminal resolves; that
+  // subscription is what turns into a terminal_exit for the client.
+  const observedExits: Array<{ exitCode: number | null }> = [];
+  session.onExit((info) => {
+    observedExits.push({ exitCode: info.exitCode });
+  });
+  await new Promise((resolve) => setImmediate(resolve));
+
+  expect(observedExits).toEqual([{ exitCode: 0 }]);
+});
+
+it("rejects createTerminal and registers nothing when the worker cannot start the command", async () => {
+  const worker = new FakeTerminalWorker();
+  manager = createWorkerTerminalManager({
+    requestTimeoutMs: 50,
+    forkWorker: () => worker,
+  });
+
+  const snapshots: Array<{ cwd: string; terminalIds: string[] }> = [];
+  manager.subscribeTerminalsChanged((event) => {
+    snapshots.push({ cwd: event.cwd, terminalIds: event.terminals.map((terminal) => terminal.id) });
+  });
+
+  const created = manager.createTerminal({
+    id: "terminal-a",
+    cwd: "/workspace",
+    workspaceId: "ws-test",
+    command: "paseo-qa-absent-codex",
+  });
+  const request = worker.sentMessages.find((message) => message.type === "createTerminal");
+  if (!request) {
+    throw new Error("createTerminal request not sent");
+  }
+  worker.emitWorkerMessage({
+    type: "response",
+    requestId: request.requestId,
+    ok: false,
+    error: "paseo-qa-absent-codex: command not found",
+  });
+
+  await expect(created).rejects.toThrow("paseo-qa-absent-codex: command not found");
+  expect(manager.getTerminal("terminal-a")).toBeUndefined();
+  expect(await manager.getTerminals("/workspace")).toEqual([]);
+  expect(snapshots).toEqual([]);
+});
diff --git a/packages/server/src/terminal/worker-terminal-manager.ts b/packages/server/src/terminal/worker-terminal-manager.ts
index 0f0243d7a8..ca84cfe622 100644
--- a/packages/server/src/terminal/worker-terminal-manager.ts
+++ b/packages/server/src/terminal/worker-terminal-manager.ts
@@ -156,6 +156,9 @@ export function createWorkerTerminalManager(
   const recordsById = new Map<string, WorkerTerminalRecord>();
   const terminalIdsByCwd = new Map<string, Set<string>>();
   const terminalActivityTokenById = new Map<string, string>();
+  // Creation owns a reference to the session independently of the live-terminal
+  // index. Only terminalCreated registers it; terminalExit removes it permanently.
+  const pendingCreationsById = new Map<string, { session: TerminalSession | null }>();
   const terminalsChangedListeners = new Set<TerminalsChangedListener>();
   const terminalActivityListeners = new Set<TerminalActivityListener>();
   const terminalWorkspaceContributionChangedListeners =
@@ -542,10 +545,14 @@ export function createWorkerTerminalManager(
   function handleWorkerEvent(message: TerminalWorkerToParentMessage): void {
     switch (message.type) {
       case "terminalCreated": {
-        registerRecord({
+        const session = registerRecord({
           info: asRequiredWorkerTerminalInfo(message.terminal),
           state: message.state,
         });
+        const pendingCreation = pendingCreationsById.get(message.terminal.id);
+        if (pendingCreation) {
+          pendingCreation.session = session;
+        }
         emitTerminalsChanged({
           cwd: message.terminal.cwd,
           terminals: listTerminalItemsForCwd(message.terminal.cwd),
@@ -686,12 +693,10 @@ export function createWorkerTerminalManager(
       const activityToken = createActivityToken();
       const terminalActivityUrl = managerOptions.getTerminalActivityUrl?.() ?? null;
       terminalActivityTokenById.set(terminalId, activityToken);
-      let result: {
-        terminal: RequiredWorkerTerminalInfo;
-        state: TerminalState;
-      };
+      const creation = { session: null as TerminalSession | null };
+      pendingCreationsById.set(terminalId, creation);
       try {
-        result = (await sendRequest({
+        await sendRequest({
           type: "createTerminal",
           options: {
             ...options,
@@ -699,16 +704,17 @@ export function createWorkerTerminalManager(
             activityToken,
             activityUrl: terminalActivityUrl,
           },
-        })) as {
-          terminal: RequiredWorkerTerminalInfo;
-          state: TerminalState;
-        };
+        });
+        if (!creation.session) {
+          throw new Error("Terminal worker completed creation without a terminalCreated event");
+        }
+        return creation.session;
       } catch (error) {
         terminalActivityTokenById.delete(terminalId);
         throw error;
+      } finally {
+        pendingCreationsById.delete(terminalId);
       }
-      const session = registerRecord({ info: result.terminal, state: result.state });
-      return session;
     },
 
     registerCwdEnv(options: { cwd: string; env: Record<string, string> }): void {

From f3ddf99fe35020353954e63829ed64e87f97d58a Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 06:30:13 +0700
Subject: [PATCH 162/270] fix(app): restore fullscreen composer keyboard motion
 and clearing (#6902)

* fix(app): keep fullscreen composer in the keyboard dock

* fix(app): preserve composer caret and scope keyboard actions
---
 docs/floating-panels.md                       |  34 ++
 .../e2e/browser/composer-autocomplete.spec.ts |  35 +-
 .../e2e/browser/composer-whitespace.spec.ts   | 327 ++++++++++++++----
 .../new-workspace-launch-terminal.spec.ts     | 129 ++++++-
 packages/app/e2e/support/helpers/composer.ts  |  49 +++
 packages/app/src/app/_layout.tsx              |   2 +-
 packages/app/src/app/new.tsx                  |  37 +-
 .../ui/text-input/text-input.native.tsx       |   7 +
 .../ui/text-input/text-input.web.tsx          |   4 +
 .../app/src/components/ui/text-input/types.ts |   1 +
 .../app/src/composer/dock/index.native.tsx    |  94 ++++-
 packages/app/src/composer/dock/index.tsx      |  45 ++-
 .../composer/dock/internal/capacity.test.ts   |  15 +
 .../src/composer/dock/internal/capacity.ts    |  19 +
 .../dock/internal/fullscreen.native.tsx       |  39 +++
 .../src/composer/dock/internal/fullscreen.tsx |  89 +++++
 .../composer/draft/input-draft.live.test.tsx  |   3 +
 .../app/src/composer/draft/input-draft.ts     |   8 +-
 .../app/src/composer/draft/workspace-tab.tsx  |  10 +-
 .../composer/editing-session/index.test.ts    |  97 +++---
 .../src/composer/editing-session/index.tsx    | 114 ++++--
 packages/app/src/composer/index.tsx           |  72 +++-
 .../composer/input/fullscreen-exit.native.ts  |  18 +
 .../app/src/composer/input/fullscreen-exit.ts |  23 ++
 .../composer/input/fullscreen-host.native.tsx |  57 ---
 .../src/composer/input/fullscreen-host.tsx    |  77 -----
 packages/app/src/composer/input/input.tsx     | 202 +++++------
 .../app/src/composer/input/presentation.tsx   | 147 ++++----
 packages/app/src/composer/input/state.test.ts |  28 +-
 packages/app/src/composer/input/state.ts      |  28 ++
 packages/app/src/composer/types.ts            |   6 +-
 packages/app/src/panels/agent-panel.tsx       |  23 +-
 .../app/src/screens/new-workspace-screen.tsx  |  77 +++--
 .../screens/workspace/workspace-screen.tsx    |  25 +-
 34 files changed, 1376 insertions(+), 565 deletions(-)
 create mode 100644 packages/app/src/composer/dock/internal/fullscreen.native.tsx
 create mode 100644 packages/app/src/composer/dock/internal/fullscreen.tsx
 create mode 100644 packages/app/src/composer/input/fullscreen-exit.native.ts
 create mode 100644 packages/app/src/composer/input/fullscreen-exit.ts
 delete mode 100644 packages/app/src/composer/input/fullscreen-host.native.tsx
 delete mode 100644 packages/app/src/composer/input/fullscreen-host.tsx

diff --git a/docs/floating-panels.md b/docs/floating-panels.md
index 73df983a50..cb51c8f7dd 100644
--- a/docs/floating-panels.md
+++ b/docs/floating-panels.md
@@ -198,6 +198,40 @@ viewport keeps the last keyboard reservation until the next opening replaces
 it, so a capped draft keeps one height through every keyboard transition
 instead of expanding on close and shrinking again on open.
 
+Fullscreen is a layout mode of the dock, not a second editor. `ComposerDock
+fullscreen` fills the stationary viewport with the composer slot over the
+still-mounted content, paints its own surface under the safe areas, and turns
+the surface translation off. The composer's single tree keeps the editing
+surface at the same position in both modes, so the mounted editor, its native
+buffer, selection, and focus survive the toggle and Send's clear always reaches
+the live input. The one remount left is a viewport crossing the compact
+breakpoint: the app shell swaps its gesture wrapper and the workspace screen
+mounts tabs in different trees, so every screen below remounts. The draft owner
+restores the text and the editing session restores the caret and focus intent.
+New workspace keys its sessions by draft in the app-level store for the same
+reason. The centered form honors fullscreen by style alone: no centering, no
+translation, setup fields hidden, slot filling the stationary viewport. The
+global exit action (Escape, hardware back) is registered only for the active
+composer: a retained tab keeps its fullscreen editor mounted while hidden, the
+sheet suspends pane focus, and the composer gives up input from the moment the
+user asks for the compact agent list or explorer, before the panel's motion
+settles. Pane focus itself stays put under those panels: the agent panel reads
+it as "the user is in this chat" for attention clearing, and opening the agent
+list must not clear the attention it shows.
+The band beside the inline editor where the fullscreen glyph sits is the input's
+own right padding, so a tap anywhere in it focuses the editor whether or not the
+glyph shows. On web the slot is a fixed box over the visible viewport, which is
+also what lets a zoomed mobile page pan under it. Inside the slot, `ComposerFullscreenBody` reserves the keyboard
+height as a bottom margin at move start and end (boundary-time, like the
+capacity reservation) while `ComposerFullscreenFooter` rides the keyboard per
+frame with `KeyboardTranslateView`, so Send lands on the keyboard without a gap
+and without animating the editor's height. The screen that owns the chrome
+unmounts it: the workspace screen reads `useComposerTabFullscreen` for the
+active tab and New workspace reads the mounted composer's session. Hosts that
+render the dock pass the same `ComposerEditingSession` to the `Composer` so the
+dock, chrome, and editor agree on one fullscreen state. Escape (web overlay
+registration, focus untouched) and the Android back button leave fullscreen.
+
 Keep setup fields out of the composer's shrink chain. New workspace supplies its
 setup fields as the first dock child so they move up under the header as the draft
 grows. Putting the fields and composer in one bounded, shrinkable column made
diff --git a/packages/app/e2e/browser/composer-autocomplete.spec.ts b/packages/app/e2e/browser/composer-autocomplete.spec.ts
index d30e69b18c..d83046d8b2 100644
--- a/packages/app/e2e/browser/composer-autocomplete.spec.ts
+++ b/packages/app/e2e/browser/composer-autocomplete.spec.ts
@@ -9,7 +9,12 @@ import { expectWorkspaceTabVisible, openSessions } from "../support/helpers/arch
 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 {
+  closeMobileAgentSidebar,
+  expectMobileAgentSidebarHidden,
+  expectMobileAgentSidebarVisible,
+  openMobileAgentSidebar,
+} from "../support/helpers/sidebar";
 import { expectNewWorkspaceProjectSelected } from "../support/helpers/new-workspace";
 
 const TEST_COMMANDS = [
@@ -96,16 +101,6 @@ interface PopoverFrameRecorderWindow extends Window {
   __stopComposerAutocompleteFrameRecorder?: () => void;
 }
 
-async function getTopTestIdAtPoint(page: Page, x: number, y: number) {
-  return page.evaluate(
-    ([pointX, pointY]) => {
-      const element = document.elementFromPoint(pointX, pointY);
-      return element?.closest("[data-testid]")?.getAttribute("data-testid") ?? null;
-    },
-    [x, y],
-  );
-}
-
 async function installListCommandsStub(page: Page): Promise<void> {
   await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
     const server = ws.connectToServer();
@@ -701,19 +696,15 @@ test.describe("Composer autocomplete", () => {
           timeout: 30_000,
         });
 
-        await page.getByRole("button", { name: "Open menu" }).click();
+        // The sidebar covers the composer, so the composer gives up its popover while the
+        // sidebar is open and brings it back once the sidebar closes.
+        await openMobileAgentSidebar(page);
         await expectMobileAgentSidebarVisible(page);
+        await expect(popover).toHaveCount(0);
 
-        const popoverBox = await popover.boundingBox();
-        expect(popoverBox).not.toBeNull();
-
-        const topTestId = await getTopTestIdAtPoint(
-          page,
-          popoverBox!.x + popoverBox!.width / 2,
-          popoverBox!.y + popoverBox!.height / 2,
-        );
-
-        expect(topTestId).not.toBe("composer-autocomplete-popover");
+        await closeMobileAgentSidebar(page);
+        await expectMobileAgentSidebarHidden(page);
+        await expect(popover.getByText("/help", { exact: true }).first()).toBeVisible();
       } finally {
         await agent.cleanup();
       }
diff --git a/packages/app/e2e/browser/composer-whitespace.spec.ts b/packages/app/e2e/browser/composer-whitespace.spec.ts
index 35611a32c0..0c74fc7630 100644
--- a/packages/app/e2e/browser/composer-whitespace.spec.ts
+++ b/packages/app/e2e/browser/composer-whitespace.spec.ts
@@ -20,6 +20,9 @@ import {
   queueComposerWithButton,
   configureComposerQueueSend,
   activateRetainedComposerTab,
+  switchComposerTabWithKeyboard,
+  expectWorkspaceHeaderHidden,
+  expectWorkspaceHeaderVisible,
   recordVisibleComposerGeometry,
   expectNoCollapsedVisibleComposer,
   expectAttachmentPill,
@@ -27,8 +30,14 @@ import {
   startRunningMockAgent,
   composerLocator,
   expectComposerVisible,
+  expectComposerFullscreenFitsVisibleViewport,
 } from "../support/helpers/composer";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import {
+  closeMobileAgentSidebar,
+  expectMobileAgentSidebarHidden,
+  expectMobileAgentSidebarVisible,
+} from "../support/helpers/sidebar";
 
 async function composerHeight(page: Page): Promise<number> {
   return composerLocator(page).evaluate((element) => element.getBoundingClientRect().height);
@@ -156,6 +165,36 @@ test("composer growth keeps a bottom-pinned chat at the bottom", async ({ page }
   }
 });
 
+async function swipeOpenMobileAgentSidebar(page: Page): Promise<void> {
+  const viewport = page.viewportSize();
+  if (!viewport) throw new Error("viewport size is required");
+  const y = Math.round(viewport.height / 2);
+  await page.mouse.move(8, y);
+  await page.mouse.down();
+  await page.mouse.move(40, y, { steps: 4 });
+  await page.mouse.move(Math.round(viewport.width * 0.7), y, { steps: 12 });
+  await page.mouse.up();
+}
+
+/** Freeze the page's timers and animation frames until `page.clock.resume()`. */
+async function pausePageClock(page: Page): Promise<void> {
+  const now = Date.now();
+  await page.clock.install({ time: now });
+  await page.clock.pauseAt(now);
+}
+
+/** The send error shares the footer with Send, so whatever keeps Send visible keeps it visible. */
+async function expectFullscreenErrorAboveSend(page: Page): Promise<void> {
+  const frame = page.getByTestId("composer-fullscreen");
+  const alertBox = (await frame.getByRole("alert").boundingBox())!;
+  const sendBox = (await page
+    .getByRole("button", { name: "Send message", exact: true })
+    .boundingBox())!;
+  const editorBox = (await composerLocator(page).boundingBox())!;
+  expect(alertBox.y).toBeGreaterThanOrEqual(editorBox.y + editorBox.height);
+  expect(alertBox.y + alertBox.height).toBeLessThanOrEqual(sendBox.y);
+}
+
 async function writeCompactDraft(page: Page, text: string): Promise<void> {
   await composerLocator(page).fill(text);
   await expect(composerLocator(page)).toHaveValue(text);
@@ -188,47 +227,107 @@ test("compact fullscreen editing preserves the live draft and selection and stay
     await resizeComposerViewport(page, "portrait");
     await openAgentRoute(page, agent);
     await expectComposerVisible(page);
-    await attachComposerTestImage(page);
-    await expectAttachmentPill(page, "composer-image-attachment-pill");
-    await writeCompactDraft(page, "First line\nSecond line");
-    await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toHaveCount(0);
-    await writeCompactDraft(page, "First line\nSecond line\nThird line");
-    await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toBeVisible();
-    await writeCompactDraft(
-      page,
-      "A sentence with enough words to wrap across several rendered lines in a narrow input. ".repeat(
-        4,
-      ),
-    );
-    await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toBeVisible();
-    await selectComposerDraftRange(page, 4, 17);
-    await enterComposerFullscreen(page);
-    await expectComposerFullscreenControls(page);
-    await expectComposerDraftSelection(page, 4, 17);
-    await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(0);
-    await writeCompactDraft(page, "Edited fullscreen draft\nSecond line\nThird line");
-    await selectComposerDraftRange(page, 3, 12);
-    await exitComposerFullscreen(page);
-    await expect(composerLocator(page)).toHaveValue(
-      "Edited fullscreen draft\nSecond line\nThird line",
-    );
-    await expectComposerDraftSelection(page, 3, 12);
-    await expectAttachmentPill(page, "composer-image-attachment-pill");
-    await expect(composerLocator(page)).toBeFocused();
-    await enterComposerFullscreen(page);
-    await writeCompactDraft(page, "Short draft");
-    await expectComposerFullscreenControls(page);
-    await selectComposerDraftRange(page, 0, 5);
-    await resizeComposerViewport(page, "landscape");
-    await expectComposerFullscreenControls(page);
-    await expectComposerDraftSelection(page, 0, 5);
-    await expect(composerLocator(page)).toHaveValue("Short draft");
-    await expect(composerLocator(page)).toBeFocused();
+    await test.step("the affordance appears after two rendered lines, including soft wraps", async () => {
+      await attachComposerTestImage(page);
+      await expectAttachmentPill(page, "composer-image-attachment-pill");
+      await writeCompactDraft(page, "First line\nSecond line");
+      await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toHaveCount(0);
+      await writeCompactDraft(page, "First line\nSecond line\nThird line");
+      await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toBeVisible();
+      await writeCompactDraft(
+        page,
+        "A sentence with enough words to wrap across several rendered lines in a narrow input. ".repeat(
+          4,
+        ),
+      );
+      await expect(page.getByRole("button", { name: "Fullscreen", exact: true })).toBeVisible();
+    });
+    await test.step("fullscreen covers the header and keeps the live draft and selection", async () => {
+      await selectComposerDraftRange(page, 4, 17);
+      await enterComposerFullscreen(page);
+      await expectComposerFullscreenControls(page);
+      await expectWorkspaceHeaderHidden(page);
+      await expectComposerDraftSelection(page, 4, 17);
+      await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(0);
+      await writeCompactDraft(page, "Edited fullscreen draft\nSecond line\nThird line");
+      await selectComposerDraftRange(page, 3, 12);
+    });
+    await test.step("exit restores the inline composer with the fullscreen edits", async () => {
+      await exitComposerFullscreen(page);
+      await expectWorkspaceHeaderVisible(page);
+      await expect(composerLocator(page)).toHaveValue(
+        "Edited fullscreen draft\nSecond line\nThird line",
+      );
+      await expectComposerDraftSelection(page, 3, 12);
+      await expectAttachmentPill(page, "composer-image-attachment-pill");
+      await expect(composerLocator(page)).toBeFocused();
+    });
+    await test.step("sending inline after a fullscreen edit clears the visible editor", async () => {
+      await sendComposerWithButton(page);
+      await expect(composerLocator(page)).toHaveValue("");
+      await expect(page.getByTestId("composer-image-attachment-pill")).toHaveCount(0);
+      await writeCompactDraft(page, "Typed after the fullscreen cycle");
+      await sendComposerWithButton(page);
+      await expect(composerLocator(page)).toHaveValue("");
+    });
+    await test.step("sending inside fullscreen clears the editor and keeps fullscreen open", async () => {
+      await writeCompactDraft(page, "First line\nSecond line\nThird line");
+      await enterComposerFullscreen(page);
+      await writeCompactDraft(page, "Short draft");
+      await expectComposerFullscreenControls(page);
+      await selectComposerDraftRange(page, 0, 5);
+      await resizeComposerViewport(page, "landscape");
+      await expectComposerFullscreenControls(page);
+      await expectComposerDraftSelection(page, 0, 5);
+      await expect(composerLocator(page)).toHaveValue("Short draft");
+      await expect(composerLocator(page)).toBeFocused();
+      await resizeComposerViewport(page, "portrait");
+      await sendComposerWithButton(page);
+      await expect(composerLocator(page)).toHaveValue("");
+      await expectComposerFullscreenControls(page);
+      await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeDisabled();
+    });
+    await test.step("typing and sending keep working after leaving fullscreen again", async () => {
+      await writeCompactDraft(page, "Typed inside fullscreen");
+      await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeEnabled();
+      await exitComposerFullscreen(page);
+      await expectWorkspaceHeaderVisible(page);
+      await expect(composerLocator(page)).toHaveValue("Typed inside fullscreen");
+      await writeCompactDraft(page, "Typed inside fullscreen, finished inline");
+      await sendComposerWithButton(page);
+      await expect(composerLocator(page)).toHaveValue("");
+      await writeCompactDraft(page, "One more inline message");
+      await sendComposerWithButton(page);
+      await expect(composerLocator(page)).toHaveValue("");
+    });
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("a caret inside an unpublished edit survives a breakpoint remount", async ({ page }) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-remount-caret-",
+    title: "Remount caret",
+  });
+  try {
     await resizeComposerViewport(page, "portrait");
-    await sendComposerWithButton(page);
-    await expect(composerLocator(page)).toHaveValue("");
-    await expectComposerFullscreenControls(page);
-    await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeDisabled();
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    await writeCompactDraft(page, "Short draft");
+    await selectComposerDraftRange(page, 5, 5);
+    // The draft owner publishes web edits after the next paint. A rotation inside that
+    // window remounts the editor before the edit has reached the draft store; the paused
+    // clock holds the page there instead of racing the frame.
+    await pausePageClock(page);
+    await composerLocator(page).press("X");
+    await resizeComposerViewport(page, "landscape");
+    await page.clock.resume();
+    await expect(composerLocator(page)).toHaveValue("ShortX draft");
+    await expectComposerDraftSelection(page, 6, 6);
+    await expect(composerLocator(page)).toBeFocused();
+    await composerLocator(page).press("Y");
+    await expect(composerLocator(page)).toHaveValue("ShortXY draft");
   } finally {
     await agent.cleanup();
   }
@@ -253,6 +352,7 @@ test("fullscreen submit rejection retains the editable draft and supports retry"
     await expect(page.getByTestId("composer-fullscreen").getByRole("alert")).toHaveText(
       "Requested mock prompt rejection",
     );
+    await expectFullscreenErrorAboveSend(page);
     await expect(composerLocator(page)).toHaveValue(draft);
     await expect(composerLocator(page)).toBeEditable();
     await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeEnabled();
@@ -264,6 +364,76 @@ test("fullscreen submit rejection retains the editable draft and supports retry"
   }
 });
 
+async function blurComposer(page: Page): Promise<void> {
+  await composerLocator(page).blur();
+  await expect(composerLocator(page)).not.toBeFocused();
+}
+
+/** Mid-band at the given height and near the editor's bottom edge. */
+async function reservedBandPoints(
+  page: Page,
+  bandX: number,
+  topY: number,
+): Promise<Array<{ x: number; y: number }>> {
+  const editor = (await composerLocator(page).boundingBox())!;
+  return [
+    { x: bandX, y: topY },
+    { x: bandX, y: editor.y + editor.height - 6 },
+  ];
+}
+
+test("the reserved band beside the inline editor focuses it", async ({ page }) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-band-focus-",
+    title: "Composer band focus",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+    const exitButton = page.getByRole("button", { name: "Exit fullscreen", exact: true });
+    const fullscreenButton = page.getByRole("button", { name: "Fullscreen", exact: true });
+    const longDraft = "Band first line\nBand second line\nBand third line";
+    await writeCompactDraft(page, longDraft);
+    await expect(fullscreenButton).toBeVisible();
+    const button = (await fullscreenButton.boundingBox())!;
+    const bandX = button.x + button.width / 2;
+
+    await test.step("with the fullscreen button shown, the band under it focuses the editor", async () => {
+      for (const point of await reservedBandPoints(page, bandX, button.y + button.height + 10)) {
+        await blurComposer(page);
+        await page.mouse.click(point.x, point.y);
+        await expect(composerLocator(page)).toBeFocused();
+        await expect(composerLocator(page)).toHaveValue(longDraft);
+        await expect(exitButton).toHaveCount(0);
+      }
+    });
+
+    await test.step("the button itself still toggles fullscreen", async () => {
+      await fullscreenButton.click();
+      await expectComposerFullscreenControls(page);
+      await exitComposerFullscreen(page);
+      await expect(exitButton).toHaveCount(0);
+      await expect(composerLocator(page)).toHaveValue(longDraft);
+    });
+
+    await test.step("with no fullscreen button, the whole band still focuses the editor", async () => {
+      await writeCompactDraft(page, "Short");
+      await expect(fullscreenButton).toHaveCount(0);
+      const editor = (await composerLocator(page).boundingBox())!;
+      for (const point of await reservedBandPoints(page, bandX, editor.y + 6)) {
+        await blurComposer(page);
+        await page.mouse.click(point.x, point.y);
+        await expect(composerLocator(page)).toBeFocused();
+        await expect(composerLocator(page)).toHaveValue("Short");
+        await expect(exitButton).toHaveCount(0);
+      }
+    });
+  } finally {
+    await agent.cleanup();
+  }
+});
+
 test("fullscreen Send keeps the configured queue behavior while an agent runs", async ({
   page,
 }) => {
@@ -333,15 +503,28 @@ test("retained agent tabs preserve fullscreen editing and paste when switched aw
     const draft = "Live first line\nLive second line\nLive third line";
     await writeCompactDraft(page, draft);
     await enterComposerFullscreen(page);
+    await expectWorkspaceHeaderHidden(page);
     await selectComposerDraftRange(page, 4, 17);
-    await activateRetainedComposerTab(page, first.title);
+    // Fullscreen covers the compact header, so a phone leaves the tab by exiting first;
+    // a desktop-width window still has the tab shortcut.
+    await resizeComposerViewport(page, "landscape");
+    await switchComposerTabWithKeyboard(page, "previous");
     await expect(page.getByRole("button", { name: "Exit fullscreen", exact: true })).toHaveCount(0);
+    // The exit action belongs to the active pane: Escape here leaves the hidden tab alone.
+    await composerLocator(page).press("Escape");
+    await switchComposerTabWithKeyboard(page, "next");
+    await expectComposerFullscreenControls(page);
+    await switchComposerTabWithKeyboard(page, "previous");
+    await expect(page.getByRole("button", { name: "Exit fullscreen", exact: true })).toHaveCount(0);
+    await resizeComposerViewport(page, "portrait");
+    await expectWorkspaceHeaderVisible(page);
     await writeCompactDraft(page, "Other tab draft");
     await shrinkVisibleViewport(page);
     await activateRetainedComposerTab(page, second.title);
     await expectComposerFullscreenControls(page);
+    await expectWorkspaceHeaderHidden(page);
     await expect(composerLocator(page)).toHaveValue(draft);
-    await expectFullscreenInsideVisibleViewport(page);
+    await expectComposerFullscreenFitsVisibleViewport(page);
     await expectComposerDraftSelection(page, 4, 17);
     await expect(composerLocator(page)).toBeFocused();
     expect(await pasteComposerTestImage(page)).toBe(true);
@@ -352,6 +535,36 @@ test("retained agent tabs preserve fullscreen editing and paste when switched aw
   }
 });
 
+test("the compact sidebar over a fullscreen editor leaves the exit action alone", async ({
+  page,
+}) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-fullscreen-sidebar-",
+    title: "Fullscreen under sidebar",
+  });
+  try {
+    await resizeComposerViewport(page, "portrait");
+    await openAgentRoute(page, agent);
+    const draft = "Line one\nLine two\nLine three";
+    await writeCompactDraft(page, draft);
+    await enterComposerFullscreen(page);
+    await expectWorkspaceHeaderHidden(page);
+    // Fullscreen hides the header's menu button; the edge swipe still opens the list over it.
+    await swipeOpenMobileAgentSidebar(page);
+    await expectMobileAgentSidebarVisible(page);
+    // The list covers the pane, so the editor's exit action is not armed.
+    await page.keyboard.press("Escape");
+    await closeMobileAgentSidebar(page);
+    await expectMobileAgentSidebarHidden(page);
+    await expectComposerFullscreenControls(page);
+    await expect(composerLocator(page)).toHaveValue(draft);
+    await exitComposerFullscreen(page);
+    await expectWorkspaceHeaderVisible(page);
+  } finally {
+    await agent.cleanup();
+  }
+});
+
 test("retained inline composers keep usable capacity through hidden tab geometry", async ({
   page,
 }) => {
@@ -408,30 +621,6 @@ async function panVisibleViewport(page: Page): Promise<void> {
   await cdp.detach();
 }
 
-async function expectFullscreenInsideVisibleViewport(page: Page): Promise<void> {
-  await expect
-    .poll(() =>
-      page.getByTestId("composer-fullscreen").evaluate((element) => {
-        const viewport = window.visualViewport!;
-        const frame = element.getBoundingClientRect();
-        const send = element.querySelector('[aria-label="Send message"]')!.getBoundingClientRect();
-        return {
-          frameFits:
-            Math.abs(frame.top - viewport.offsetTop) < 1 &&
-            Math.abs(frame.left - viewport.offsetLeft) < 1 &&
-            Math.abs(frame.height - viewport.height) < 1 &&
-            Math.abs(frame.width - viewport.width) < 1,
-          sendFits:
-            send.top >= viewport.offsetTop &&
-            send.bottom <= viewport.offsetTop + viewport.height &&
-            send.left >= viewport.offsetLeft &&
-            send.right <= viewport.offsetLeft + viewport.width,
-        };
-      }),
-    )
-    .toEqual({ frameFits: true, sendFits: true });
-}
-
 test("fullscreen Send follows the visible viewport when it shrinks and pans", async ({ page }) => {
   const agent = await seedMockAgentWorkspace({
     repoPrefix: "composer-visible-viewport-",
@@ -443,11 +632,11 @@ test("fullscreen Send follows the visible viewport when it shrinks and pans", as
     await expectComposerVisible(page);
     await writeCompactDraft(page, "First line\nSecond line\nThird line");
     await enterComposerFullscreen(page);
-    await expectFullscreenInsideVisibleViewport(page);
+    await expectComposerFullscreenFitsVisibleViewport(page);
     await shrinkVisibleViewport(page);
-    await expectFullscreenInsideVisibleViewport(page);
+    await expectComposerFullscreenFitsVisibleViewport(page);
     await panVisibleViewport(page);
-    await expectFullscreenInsideVisibleViewport(page);
+    await expectComposerFullscreenFitsVisibleViewport(page);
   } finally {
     await agent.cleanup();
   }
diff --git a/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts b/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts
index a4fbd15edf..d393966ee8 100644
--- a/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-launch-terminal.spec.ts
@@ -1,7 +1,18 @@
-import { expect, test } from "../support/fixtures";
+import { expect, test, type Page } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
-import { openNewWorkspaceComposer } from "../support/helpers/new-workspace";
+import {
+  expectNewWorkspaceDraft,
+  fillNewWorkspaceDraft,
+  openNewWorkspaceComposer,
+} from "../support/helpers/new-workspace";
+import {
+  composerLocator,
+  enterComposerFullscreen,
+  exitComposerFullscreen,
+  expectComposerFullscreenControls,
+  resizeComposerViewport,
+} from "../support/helpers/composer";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 import {
   expectTerminalLaunchSelected,
@@ -145,3 +156,117 @@ test.describe("New workspace: launching a terminal", () => {
     });
   });
 });
+
+async function expectNewWorkspaceHeaderHidden(page: Page): Promise<void> {
+  await expect(page.getByTestId("menu-button").filter({ visible: true })).toHaveCount(0);
+}
+
+async function expectNewWorkspaceHeaderVisible(page: Page): Promise<void> {
+  await expect(page.getByTestId("menu-button").filter({ visible: true }).first()).toBeVisible();
+}
+
+/**
+ * Fullscreen fills the content area top to bottom and out to the right edge (a pinned
+ * sidebar keeps its column), covers the form, and shows only exit and the mode's submit.
+ */
+async function expectNewWorkspaceFullscreen(page: Page, submitLabel: string): Promise<void> {
+  const frame = page.getByTestId("composer-fullscreen");
+  await expect(page.getByRole("button", { name: "Exit fullscreen", exact: true })).toBeVisible();
+  await expect(frame.getByRole("button")).toHaveCount(2);
+  await expect(frame.getByRole("button", { name: submitLabel })).toBeVisible();
+  await expectNewWorkspaceHeaderHidden(page);
+  const picker = (await page.getByRole("button", { name: "Workspace project" }).boundingBox())!;
+  await expect
+    .poll(() =>
+      frame.evaluate(
+        (element, point) => {
+          const viewport = window.visualViewport!;
+          const box = element.getBoundingClientRect();
+          const covering = document.elementFromPoint(point.x, point.y);
+          return {
+            fillsHeight:
+              Math.abs(box.top - viewport.offsetTop) < 1 &&
+              Math.abs(box.height - viewport.height) < 1,
+            reachesRightEdge:
+              Math.abs(box.right - (viewport.offsetLeft + viewport.width)) < 1 &&
+              box.left >= viewport.offsetLeft,
+            coversForm: element.contains(covering),
+          };
+        },
+        { x: picker.x + picker.width / 2, y: picker.y + picker.height / 2 },
+      ),
+    )
+    .toEqual({ fillsHeight: true, reachesRightEdge: true, coversForm: true });
+}
+
+test.describe("New workspace: fullscreen composer across the compact breakpoint", () => {
+  let workspace: SeededWorkspace;
+
+  test.beforeEach(async () => {
+    workspace = await seedWorkspace({ repoPrefix: "launch-fullscreen-" });
+  });
+
+  test.afterEach(async () => {
+    await workspace?.cleanup();
+  });
+
+  test("chat fullscreen survives widening and terminal fullscreen fills the phone", async ({
+    page,
+  }) => {
+    test.setTimeout(90_000);
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    await openNewWorkspaceComposer(page, {
+      projectKey: workspace.projectKey,
+      projectDisplayName: workspace.projectDisplayName,
+    });
+    const projectPicker = page.getByRole("button", { name: "Workspace project" });
+
+    await test.step("chat: fullscreen covers the centered form and exits back into it", async () => {
+      await resizeComposerViewport(page, "portrait");
+      const draft = "Chat first line\nChat second line\nChat third line";
+      await fillNewWorkspaceDraft(page, draft);
+      await enterComposerFullscreen(page);
+      await expectComposerFullscreenControls(page);
+      await expectNewWorkspaceHeaderHidden(page);
+      await resizeComposerViewport(page, "landscape");
+      await expectComposerFullscreenControls(page);
+      await expectNewWorkspaceFullscreen(page, "Create");
+      // The desktop form's own import button is dropped from the fullscreen slot.
+      await expect(
+        page.getByTestId("new-workspace-import-session").filter({ visible: true }),
+      ).toHaveCount(0);
+      await composerLocator(page).press("End");
+      await composerLocator(page).pressSequentially(" wide");
+      await exitComposerFullscreen(page);
+      await expectNewWorkspaceHeaderVisible(page);
+      await expect(projectPicker).toBeVisible();
+      await expect(
+        page.getByTestId("new-workspace-import-session").filter({ visible: true }),
+      ).toBeVisible();
+      await expectNewWorkspaceDraft(page, `${draft} wide`);
+    });
+
+    // Terminal mode and its prompt are screen state, and the shell remounts the screen
+    // at the breakpoint, so the terminal prompt's fullscreen is exercised on the phone
+    // layout only.
+    await test.step("terminal: the prompt's fullscreen shows only exit and Launch", async () => {
+      await resizeComposerViewport(page, "portrait");
+      // The compact launch control opens a sheet, not the desktop menu.
+      await launchTrigger(page).click();
+      const option = page.getByRole("menuitem").filter({ hasText: PROMPT_PROFILE.name });
+      await option.click();
+      await expect(option).not.toBeVisible();
+      await expectTerminalLaunchSelected(page, PROMPT_PROFILE.name);
+      const prompt = "Prompt first line\nPrompt second line\nPrompt third line";
+      await fillTerminalPrompt(page, prompt);
+      await enterComposerFullscreen(page);
+      await expect(terminalPromptInput(page)).toBeVisible();
+      await expectNewWorkspaceFullscreen(page, "Launch");
+      await exitComposerFullscreen(page);
+      await expectNewWorkspaceHeaderVisible(page);
+      await expect(projectPicker).toBeVisible();
+      await expect(terminalPromptInput(page)).toHaveValue(prompt);
+    });
+  });
+});
diff --git a/packages/app/e2e/support/helpers/composer.ts b/packages/app/e2e/support/helpers/composer.ts
index 01b9a39d58..efd9266657 100644
--- a/packages/app/e2e/support/helpers/composer.ts
+++ b/packages/app/e2e/support/helpers/composer.ts
@@ -355,6 +355,12 @@ export async function resizeComposerViewport(
     short: { width: 390, height: 390 },
   };
   await page.setViewportSize(sizes[orientation]);
+  // Before the app has loaded there is no layout to wait for.
+  if (page.url() === "about:blank") return;
+  // Crossing the compact breakpoint remounts the shell and the editor. Anything that
+  // follows (a shortcut, a locator) belongs to the layout the new size implies, so
+  // wait for that layout before returning.
+  await expect(page.getByTestId("compact-shell")).toHaveCount(orientation === "landscape" ? 0 : 1);
 }
 export async function selectComposerDraftRange(
   page: Page,
@@ -390,6 +396,33 @@ export async function expectComposerFullscreenControls(page: Page): Promise<void
   await expect(page.getByTestId("composer-fullscreen").getByRole("button")).toHaveCount(2);
   await expect(composerInput(page)).toHaveCount(1);
 }
+/** The fullscreen frame and its submit button sit inside the browser's visible viewport. */
+export async function expectComposerFullscreenFitsVisibleViewport(
+  page: Page,
+  submitLabel = "Send message",
+): Promise<void> {
+  await expect
+    .poll(() =>
+      page.getByTestId("composer-fullscreen").evaluate((element, label) => {
+        const viewport = window.visualViewport!;
+        const frame = element.getBoundingClientRect();
+        const send = element.querySelector(`[aria-label="${label}"]`)!.getBoundingClientRect();
+        return {
+          frameFits:
+            Math.abs(frame.top - viewport.offsetTop) < 1 &&
+            Math.abs(frame.left - viewport.offsetLeft) < 1 &&
+            Math.abs(frame.height - viewport.height) < 1 &&
+            Math.abs(frame.width - viewport.width) < 1,
+          sendFits:
+            send.top >= viewport.offsetTop &&
+            send.bottom <= viewport.offsetTop + viewport.height &&
+            send.left >= viewport.offsetLeft &&
+            send.right <= viewport.offsetLeft + viewport.width,
+        };
+      }, submitLabel),
+    )
+    .toEqual({ frameFits: true, sendFits: true });
+}
 export async function sendComposerWithButton(page: Page): Promise<void> {
   await page.getByRole("button", { name: "Send message", exact: true }).click();
 }
@@ -405,6 +438,22 @@ export async function configureComposerQueueSend(page: Page): Promise<void> {
 /** Drive the real tab chooser's commands even when fullscreen covers its pointer surface.
  * This exercises retained activity changes, not a claim that covered chrome is clickable.
  */
+/** Needs a desktop-width viewport: compact layouts have no keyboard shortcuts. */
+export async function switchComposerTabWithKeyboard(
+  page: Page,
+  direction: "previous" | "next",
+): Promise<void> {
+  await page.keyboard.press(
+    direction === "previous" ? "Alt+Shift+BracketLeft" : "Alt+Shift+BracketRight",
+  );
+}
+export async function expectWorkspaceHeaderHidden(page: Page): Promise<void> {
+  await expect(page.getByTestId("workspace-tab-switcher-trigger")).toHaveCount(0);
+}
+export async function expectWorkspaceHeaderVisible(page: Page): Promise<void> {
+  await expect(page.getByTestId("workspace-tab-switcher-trigger")).toBeVisible();
+}
+
 export async function activateRetainedComposerTab(page: Page, title: string): Promise<void> {
   await page
     .getByTestId("workspace-tab-switcher-trigger")
diff --git a/packages/app/src/app/_layout.tsx b/packages/app/src/app/_layout.tsx
index 72989bd83d..2d6525b27f 100644
--- a/packages/app/src/app/_layout.tsx
+++ b/packages/app/src/app/_layout.tsx
@@ -665,7 +665,7 @@ function MobileGestureWrapper({
 
   return (
     <GestureDetector gesture={openGesture} touchAction={MOBILE_WEB_GESTURE_TOUCH_ACTION}>
-      <View collapsable={false} style={layoutStyles.surfaceFill}>
+      <View collapsable={false} style={layoutStyles.surfaceFill} testID="compact-shell">
         {children}
       </View>
     </GestureDetector>
diff --git a/packages/app/src/app/new.tsx b/packages/app/src/app/new.tsx
index 281ec33555..67db3c2c96 100644
--- a/packages/app/src/app/new.tsx
+++ b/packages/app/src/app/new.tsx
@@ -1,6 +1,15 @@
 import { useLocalSearchParams } from "expo-router";
+import { useMemo } from "react";
 import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
+import {
+  ComposerEditingScope,
+  WorkspaceComposerEditingSessionsProvider,
+} from "@/composer/editing-session";
 import { NewWorkspaceScreen } from "@/screens/new-workspace-screen";
+import { buildNewWorkspaceDraftKey } from "@/stores/draft-keys";
+
+/** New workspace drafts share one editing-session home, keyed like a tab by draft. */
+const NEW_WORKSPACE_SESSIONS_KEY = "new-workspace";
 
 export default function NewWorkspaceRoute() {
   const params = useLocalSearchParams<{
@@ -23,16 +32,28 @@ export default function NewWorkspaceRoute() {
     draftId ?? null,
   ]);
 
+  // The shell remounts this route when the viewport crosses the compact breakpoint;
+  // the draft's editing session (fullscreen, retained caret) lives above the shell.
+  const draftKey = buildNewWorkspaceDraftKey(draftId);
+  const sessionTabIds = useMemo(() => [draftKey], [draftKey]);
+
   return (
     <HostRouteBootstrapBoundary>
-      <NewWorkspaceScreen
-        key={screenKey}
-        serverId={serverId}
-        sourceDirectory={sourceDirectory}
-        displayName={displayName}
-        projectId={projectId}
-        draftId={draftId}
-      />
+      <WorkspaceComposerEditingSessionsProvider
+        workspaceKey={NEW_WORKSPACE_SESSIONS_KEY}
+        tabIds={sessionTabIds}
+      >
+        <ComposerEditingScope tabId={draftKey} targetKey={draftKey}>
+          <NewWorkspaceScreen
+            key={screenKey}
+            serverId={serverId}
+            sourceDirectory={sourceDirectory}
+            displayName={displayName}
+            projectId={projectId}
+            draftId={draftId}
+          />
+        </ComposerEditingScope>
+      </WorkspaceComposerEditingSessionsProvider>
     </HostRouteBootstrapBoundary>
   );
 }
diff --git a/packages/app/src/components/ui/text-input/text-input.native.tsx b/packages/app/src/components/ui/text-input/text-input.native.tsx
index 243e813f26..4ff773cefa 100644
--- a/packages/app/src/components/ui/text-input/text-input.native.tsx
+++ b/packages/app/src/components/ui/text-input/text-input.native.tsx
@@ -104,6 +104,13 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
           });
           if (selection) inputRef.current?.setSelection?.(selection.start, selection.end);
         },
+        setSelection: (selection) => {
+          if (inputRef.current?.setSelection) {
+            inputRef.current.setSelection(selection.start, selection.end);
+            return;
+          }
+          inputRef.current?.setNativeProps?.({ selection });
+        },
         reset: () => {
           textRef.current = "";
           const autoFocus = inputRef.current?.isFocused?.() ?? false;
diff --git a/packages/app/src/components/ui/text-input/text-input.web.tsx b/packages/app/src/components/ui/text-input/text-input.web.tsx
index 30ee0c6eba..021e3b8e0c 100644
--- a/packages/app/src/components/ui/text-input/text-input.web.tsx
+++ b/packages/app/src/components/ui/text-input/text-input.web.tsx
@@ -77,6 +77,10 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
             input.setSelectionRange(selection.start, selection.end);
           }
         },
+        setSelection: (selection) => {
+          const input = inputRef.current as WebTextInputElement | null;
+          input?.setSelectionRange?.(selection.start, selection.end);
+        },
         reset: () => {
           textRef.current = "";
           const input = inputRef.current as WebTextInputElement | null;
diff --git a/packages/app/src/components/ui/text-input/types.ts b/packages/app/src/components/ui/text-input/types.ts
index 9f746bd656..fbc14e4726 100644
--- a/packages/app/src/components/ui/text-input/types.ts
+++ b/packages/app/src/components/ui/text-input/types.ts
@@ -8,6 +8,7 @@ export interface EditingTextInputHandle {
   isFocused(): boolean;
   getText(): string;
   replaceText(text: string, selection?: { start: number; end: number }): void;
+  setSelection(selection: { start: number; end: number }): void;
   /** Clear the editor and reset its intrinsic layout, preserving focus intent. */
   reset(): void;
   getNativeRef(): unknown;
diff --git a/packages/app/src/composer/dock/index.native.tsx b/packages/app/src/composer/dock/index.native.tsx
index a668c00743..4b6407c872 100644
--- a/packages/app/src/composer/dock/index.native.tsx
+++ b/packages/app/src/composer/dock/index.native.tsx
@@ -1,5 +1,6 @@
 import { ComposerDockBackground } from "./internal/background";
 export { ComposerDockBackground } from "./internal/background";
+export { ComposerFullscreenBody, ComposerFullscreenFooter } from "./internal/fullscreen";
 import { ScrollView } from "@/components/ui/scroll-view";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -8,22 +9,22 @@ import { resolveContentMaxWidth, useAppSettings } from "@/hooks/use-settings";
 import { KeyboardTranslateView } from "@/keyboard/shift";
 import { createContext, useCallback, useContext, useState, type ReactNode } from "react";
 import { View, type LayoutChangeEvent, type ViewProps, StyleSheet } from "react-native";
+import { StyleSheet as ThemedStyleSheet } from "react-native-unistyles";
 import Animated, {
   useAnimatedStyle,
   useSharedValue,
-  useDerivedValue,
   useAnimatedReaction,
   type SharedValue,
 } from "react-native-reanimated";
 import { useKeyboardShift } from "@/keyboard/shift";
 import {
   resolveCenteredClearance,
-  resolveInlineComposerCapacity,
+  resolveComposerSlotCapacity,
   updateComposerCapacity,
   type ComposerCapacity,
 } from "./internal/capacity";
 
-const ViewportCapacity = createContext<SharedValue<number | undefined> | null>(null);
+const ViewportSizing = createContext<SharedValue<ComposerCapacity | undefined> | null>(null);
 
 interface ComposerViewportProps extends ViewProps {
   bottomInset?: number;
@@ -55,7 +56,6 @@ function ComposerViewport({
     },
     [],
   );
-  const capacity = useDerivedValue(() => sizing.value?.capacity);
   const measureViewport = useCallback(
     (event: LayoutChangeEvent) => {
       measuredHeight.value = event.nativeEvent.layout.height;
@@ -66,20 +66,24 @@ function ComposerViewport({
 
   return (
     <View testID="composer-viewport" {...props} onLayout={measureViewport} collapsable={false}>
-      <ViewportCapacity.Provider value={capacity}>{children}</ViewportCapacity.Provider>
+      <ViewportSizing.Provider value={sizing}>{children}</ViewportSizing.Provider>
     </View>
   );
 }
 
 /** Bound the complete composer (including its controls), not just the text input. */
-function ComposerViewportContent({ style, ...props }: ViewProps) {
+function ComposerViewportContent({
+  style,
+  fullscreen = false,
+  ...props
+}: ViewProps & { fullscreen?: boolean }) {
   const compact = useIsCompactFormFactor();
-  const capacity = useContext(ViewportCapacity);
-  if (!capacity) throw new Error("ComposerViewportContent requires ComposerViewport");
+  const sizing = useContext(ViewportSizing);
+  if (!sizing) throw new Error("ComposerViewportContent requires ComposerViewport");
   const constraint = useAnimatedStyle(() => ({
     // Only viewport changes and keyboard start/end events trigger layout. Motion
     // stays in KeyboardTranslateView and never changes this constraint per frame.
-    maxHeight: resolveInlineComposerCapacity(capacity.value, compact),
+    maxHeight: resolveComposerSlotCapacity(sizing.value, { compact, fullscreen }),
   }));
 
   return (
@@ -108,37 +112,71 @@ function useCenteredClearance(safeAreaBottom: number) {
 interface ComposerDockProps {
   children: [ReactNode, ReactNode, ReactNode?];
   centered?: boolean;
+  /**
+   * Fullscreen is a layout mode of the same mounted composer: the slot fills the
+   * stationary viewport over the content and lays out the keyboard itself, so the
+   * surface stops translating. The screen that owns the chrome hides it.
+   */
+  fullscreen?: boolean;
 }
 
 /** The stationary viewport, translated surface, and bounded composer are one owner. */
 export function ComposerDock({
   children: [content, composer, overlay],
   centered = false,
+  fullscreen = false,
 }: ComposerDockProps) {
   const insets = useSafeAreaInsets();
   const contentMaxWidth = resolveContentMaxWidth(useAppSettings().settings);
   const centeredClearance = useCenteredClearance(insets.bottom);
   // Preserve the existing centered form's visual balance on tablets.
-  const bottomInset = centered ? HEADER_INNER_HEIGHT + 24 : 0;
+  const bottomInset = centered && !fullscreen ? HEADER_INNER_HEIGHT + 24 : 0;
+  const fullscreenSurface = [
+    themedStyles.fullscreenComposer,
+    {
+      paddingTop: insets.top,
+      paddingBottom: insets.bottom,
+      paddingLeft: insets.left,
+      paddingRight: insets.right,
+    },
+  ];
   if (centered) {
+    // Same tree in both modes. Fullscreen stops centering and translating, hides the
+    // setup fields, and lets the composer slot take the whole stationary viewport.
     return (
       <ComposerViewport
-        style={[dockStyles.centeredViewport, { paddingBottom: bottomInset }]}
+        style={
+          fullscreen
+            ? dockStyles.viewport
+            : [dockStyles.centeredViewport, { paddingBottom: bottomInset }]
+        }
         bottomInset={bottomInset}
         centered
         onLayout={centeredClearance.measureViewport}
       >
         <KeyboardTranslateView
-          style={[dockStyles.centered, { maxWidth: contentMaxWidth }]}
+          style={
+            fullscreen ? dockStyles.surface : [dockStyles.centered, { maxWidth: contentMaxWidth }]
+          }
+          enabled={!fullscreen}
           bottomClearance={centeredClearance.value}
           onLayout={centeredClearance.measureForm}
         >
-          <ComposerViewportContent style={dockStyles.composer}>
-            <ScrollView style={dockStyles.setup} keyboardShouldPersistTaps="handled">
+          <ComposerViewportContent
+            style={fullscreen ? dockStyles.surface : dockStyles.composer}
+            fullscreen={fullscreen}
+          >
+            <ScrollView
+              style={fullscreen ? dockStyles.hiddenSetup : dockStyles.setup}
+              keyboardShouldPersistTaps="handled"
+            >
               {content}
             </ScrollView>
-            <ComposerViewportContent style={dockStyles.centeredComposer}>
-              {composer}
+            <ComposerViewportContent
+              style={fullscreen ? dockStyles.surface : dockStyles.centeredComposer}
+              fullscreen={fullscreen}
+            >
+              <View style={fullscreen ? fullscreenSurface : dockStyles.composer}>{composer}</View>
             </ComposerViewportContent>
           </ComposerViewportContent>
           {overlay}
@@ -148,7 +186,7 @@ export function ComposerDock({
   }
   return (
     <ComposerViewport style={dockStyles.viewport}>
-      <KeyboardTranslateView style={dockStyles.surface}>
+      <KeyboardTranslateView style={dockStyles.surface} enabled={!fullscreen}>
         <View
           testID="composer-dock-content"
           collapsable={false}
@@ -162,8 +200,19 @@ export function ComposerDock({
             {content}
           </View>
         </View>
-        <ComposerViewportContent style={dockStyles.composer}>
-          <View style={[dockStyles.composer, { paddingBottom: insets.bottom }]}>{composer}</View>
+        <ComposerViewportContent
+          style={fullscreen ? dockStyles.fullscreenSlot : dockStyles.composer}
+          fullscreen={fullscreen}
+        >
+          <View
+            style={
+              fullscreen
+                ? fullscreenSurface
+                : [dockStyles.composer, { paddingBottom: insets.bottom }]
+            }
+          >
+            {composer}
+          </View>
         </ComposerViewportContent>
         {overlay}
       </KeyboardTranslateView>
@@ -178,9 +227,16 @@ const dockStyles = StyleSheet.create({
   surface: { flex: 1 },
   content: { flex: 1, justifyContent: "flex-end" },
   composer: { width: "100%", flexShrink: 1 },
+  fullscreenSlot: { position: "absolute", top: 0, left: 0, right: 0, bottom: 0 },
   centeredViewport: { flex: 1, alignItems: "center", justifyContent: "center" },
   centered: { flexShrink: 1, width: "100%" },
   // 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 },
+  hiddenSetup: { display: "none" },
 });
+
+// The fullscreen composer paints its own surface, including under the safe areas.
+const themedStyles = ThemedStyleSheet.create((theme) => ({
+  fullscreenComposer: { flex: 1, backgroundColor: theme.colors.surface1 },
+}));
diff --git a/packages/app/src/composer/dock/index.tsx b/packages/app/src/composer/dock/index.tsx
index 3f41118696..421002352e 100644
--- a/packages/app/src/composer/dock/index.tsx
+++ b/packages/app/src/composer/dock/index.tsx
@@ -1,48 +1,69 @@
 export { ComposerDockBackground } from "./internal/background";
+export { ComposerFullscreenBody, ComposerFullscreenFooter } from "./internal/fullscreen";
 import { ScrollView } from "@/components/ui/scroll-view";
-import { useState, useCallback, useMemo, type ReactNode } from "react";
+import { useState, useCallback, useMemo, useRef, type ReactNode } from "react";
 import { View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { resolveInlineComposerCapacity } from "./internal/capacity";
+import { useFullscreenSlotFrame } from "./internal/fullscreen";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { HEADER_INNER_HEIGHT } from "@/constants/layout";
 
 interface ComposerDockProps {
   children: [ReactNode, ReactNode, ReactNode?];
   centered?: boolean;
+  /** See the native dock: the same mounted composer fills the visible surface. */
+  fullscreen?: boolean;
 }
 
 export function ComposerDock({
   children: [content, composer, overlay],
   centered = false,
+  fullscreen = false,
 }: ComposerDockProps) {
   const compact = useIsCompactFormFactor();
-  const [availableHeight, setAvailableHeight] = useState<number>();
+  const [surfaceSize, setSurfaceSize] = useState<{ width: number; height: number }>();
+  const surfaceRef = useRef<View>(null);
+  const fullscreenFrame = useFullscreenSlotFrame(fullscreen, surfaceRef, surfaceSize);
   const constraint = useMemo(
-    () => ({ maxHeight: resolveInlineComposerCapacity(availableHeight, compact) }),
-    [availableHeight, compact],
+    () => ({ maxHeight: resolveInlineComposerCapacity(surfaceSize?.height, compact) }),
+    [surfaceSize?.height, compact],
   );
   const measureViewport = useCallback((event: import("react-native").LayoutChangeEvent) => {
-    const { height } = event.nativeEvent.layout;
-    if (height > 0) setAvailableHeight(height);
+    const { width, height } = event.nativeEvent.layout;
+    if (height > 0) setSurfaceSize({ width, height });
   }, []);
   if (centered) {
     return (
-      <View style={styles.centered} onLayout={measureViewport}>
+      <View ref={surfaceRef} style={styles.centered} onLayout={measureViewport}>
         <View style={styles.form}>
           <ScrollView style={styles.setup} keyboardShouldPersistTaps="handled">
             {content}
           </ScrollView>
-          <View style={[styles.centeredComposer, constraint]}>{composer}</View>
+          <View
+            style={
+              fullscreen
+                ? [styles.fullscreenComposer, fullscreenFrame]
+                : [styles.centeredComposer, constraint]
+            }
+          >
+            {composer}
+          </View>
           {overlay}
         </View>
       </View>
     );
   }
   return (
-    <View style={styles.surface} onLayout={measureViewport}>
+    <View ref={surfaceRef} style={styles.surface} onLayout={measureViewport}>
       <View style={styles.content}>{content}</View>
-      <View style={[styles.composer, constraint]}>{composer}</View>
+      <View
+        style={
+          fullscreen ? [styles.fullscreenComposer, fullscreenFrame] : [styles.composer, constraint]
+        }
+      >
+        {composer}
+      </View>
       {overlay}
     </View>
   );
@@ -52,6 +73,10 @@ const styles = StyleSheet.create((theme) => ({
   surface: { flex: 1, overflow: "hidden" },
   content: { flex: 1, justifyContent: "flex-end" },
   composer: { width: "100%", flexShrink: 1 },
+  // Fixed, not absolute: a touch pan that starts inside an overflow-hidden ancestor
+  // never reaches the zoomed visual viewport, while a fixed box chains to the viewport
+  // directly. React Native Web renders `fixed`; React Native's style type omits it.
+  fullscreenComposer: { position: "fixed" as "absolute" },
   centered: {
     flex: 1,
     alignItems: "center",
diff --git a/packages/app/src/composer/dock/internal/capacity.test.ts b/packages/app/src/composer/dock/internal/capacity.test.ts
index 7e98b7ef3d..44e79e6ef9 100644
--- a/packages/app/src/composer/dock/internal/capacity.test.ts
+++ b/packages/app/src/composer/dock/internal/capacity.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   resolveCenteredClearance,
+  resolveComposerSlotCapacity,
   resolveInlineComposerCapacity,
   resolveComposerCapacity,
   updateComposerCapacity,
@@ -19,6 +20,20 @@ describe("composer viewport", () => {
     expect(resolveInlineComposerCapacity(open.capacity, false)).toBe(245);
     expect(resolveInlineComposerCapacity(undefined, true)).toBeUndefined();
   });
+  it("lets a fullscreen composer fill the viewport while inline keeps its cap", () => {
+    const open = updateComposerCapacity(undefined, {
+      height: 582,
+      bottomInset: 24,
+      safeAreaBottom: 0,
+      centered: false,
+      keyboardShift: 308,
+    });
+    expect(resolveComposerSlotCapacity(open, { compact: true, fullscreen: true })).toBe(582);
+    expect(resolveComposerSlotCapacity(open, { compact: true, fullscreen: false })).toBe(147);
+    expect(resolveComposerSlotCapacity(undefined, { compact: true, fullscreen: true })).toBe(
+      undefined,
+    );
+  });
   it("preserves the editing capacity when the keyboard closes", () => {
     const viewport = { height: 582, bottomInset: 24, safeAreaBottom: 0, centered: false };
     const open = updateComposerCapacity(undefined, { ...viewport, keyboardShift: 308 });
diff --git a/packages/app/src/composer/dock/internal/capacity.ts b/packages/app/src/composer/dock/internal/capacity.ts
index ca4fed2991..9c460e1729 100644
--- a/packages/app/src/composer/dock/internal/capacity.ts
+++ b/packages/app/src/composer/dock/internal/capacity.ts
@@ -10,6 +10,8 @@ interface ComposerGeometry {
 export interface ComposerCapacity {
   keyboardReserve: number;
   capacity: number;
+  /** The stationary viewport; a fullscreen composer fills it and lays out the keyboard itself. */
+  viewportHeight: number;
 }
 
 export function resolveComposerCapacity(input: ComposerGeometry): number {
@@ -48,6 +50,7 @@ export function updateComposerCapacity(
   return {
     keyboardReserve,
     capacity: resolveComposerCapacity({ ...input, keyboardShift: keyboardReserve }),
+    viewportHeight: input.height,
   };
 }
 
@@ -60,3 +63,19 @@ export function resolveInlineComposerCapacity(
   if (capacity === undefined) return undefined;
   return compact ? capacity * 0.6 : capacity;
 }
+
+export interface ComposerSlotLayout {
+  compact: boolean;
+  fullscreen: boolean;
+}
+
+/** The bound on the composer slot: inline capacity, or the whole viewport in fullscreen. */
+export function resolveComposerSlotCapacity(
+  sizing: ComposerCapacity | undefined,
+  layout: ComposerSlotLayout,
+): number | undefined {
+  "worklet";
+  if (sizing === undefined) return undefined;
+  if (layout.fullscreen) return sizing.viewportHeight;
+  return resolveInlineComposerCapacity(sizing.capacity, layout.compact);
+}
diff --git a/packages/app/src/composer/dock/internal/fullscreen.native.tsx b/packages/app/src/composer/dock/internal/fullscreen.native.tsx
new file mode 100644
index 0000000000..9f27befa4c
--- /dev/null
+++ b/packages/app/src/composer/dock/internal/fullscreen.native.tsx
@@ -0,0 +1,39 @@
+import type { ReactNode } from "react";
+import { StyleSheet, type ViewProps } from "react-native";
+import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { KeyboardTranslateView, useKeyboardShift } from "@/keyboard/shift";
+
+/**
+ * The editing region of a composer. Inline it only continues the shrink chain. In
+ * fullscreen it fills the stationary frame and reserves the keyboard's space at
+ * motion boundaries, the same boundary-time layout the dock capacity uses: the
+ * keyboard start/end events write `layoutShift`; frames in between move the footer.
+ */
+export function ComposerFullscreenBody({
+  fullscreen,
+  children,
+}: {
+  fullscreen: boolean;
+  children: ReactNode;
+}) {
+  const { layoutShift } = useKeyboardShift();
+  const reservation = useAnimatedStyle(() => ({
+    marginBottom: fullscreen ? layoutShift.value : 0,
+  }));
+  return (
+    <Animated.View style={[fullscreen ? styles.fullscreen : styles.inline, reservation]}>
+      {children}
+    </Animated.View>
+  );
+}
+
+/** The Send row of a fullscreen composer rides the keyboard like the inline dock surface. */
+export function ComposerFullscreenFooter({ children, ...props }: ViewProps) {
+  return <KeyboardTranslateView {...props}>{children}</KeyboardTranslateView>;
+}
+
+// Plain React Native styles: these land on Reanimated views (docs/unistyles.md).
+const styles = StyleSheet.create({
+  inline: { flexShrink: 1 },
+  fullscreen: { flex: 1, minHeight: 0 },
+});
diff --git a/packages/app/src/composer/dock/internal/fullscreen.tsx b/packages/app/src/composer/dock/internal/fullscreen.tsx
new file mode 100644
index 0000000000..36291181c1
--- /dev/null
+++ b/packages/app/src/composer/dock/internal/fullscreen.tsx
@@ -0,0 +1,89 @@
+import { useLayoutEffect, useState, type ReactNode, type RefObject } from "react";
+import { StyleSheet, View, type ViewProps } from "react-native";
+
+/** The editing region of a composer; see the native file for the keyboard contract. */
+export function ComposerFullscreenBody({
+  fullscreen,
+  children,
+}: {
+  fullscreen: boolean;
+  children: ReactNode;
+}) {
+  return <View style={fullscreen ? styles.fullscreen : styles.inline}>{children}</View>;
+}
+
+export function ComposerFullscreenFooter({ children, ...props }: ViewProps) {
+  return <View {...props}>{children}</View>;
+}
+
+export interface ComposerSlotFrame {
+  top: number;
+  left: number;
+  width: number;
+  height: number;
+}
+
+/**
+ * Where a fullscreen composer sits, in layout-viewport coordinates for a fixed box: the
+ * part of the dock surface the browser's visible viewport shows. A mobile browser
+ * keyboard shrinks or pans that viewport without resizing the page, so the frame
+ * follows it instead of the layout.
+ */
+export function useFullscreenSlotFrame(
+  active: boolean,
+  surfaceRef: RefObject<View | null>,
+  surfaceSize: { width: number; height: number } | undefined,
+): ComposerSlotFrame | undefined {
+  const [frame, setFrame] = useState<ComposerSlotFrame>();
+  useLayoutEffect(() => {
+    if (!active) {
+      setFrame(undefined);
+      return;
+    }
+    const update = () => {
+      const surface = surfaceRef.current as unknown as HTMLElement | null;
+      if (!surface) return;
+      setFrame(resolveVisibleSurfaceFrame(surface.getBoundingClientRect(), readVisibleViewport()));
+    };
+    const visualViewport = window.visualViewport;
+    update();
+    visualViewport?.addEventListener("resize", update);
+    visualViewport?.addEventListener("scroll", update);
+    window.addEventListener("resize", update);
+    return () => {
+      visualViewport?.removeEventListener("resize", update);
+      visualViewport?.removeEventListener("scroll", update);
+      window.removeEventListener("resize", update);
+    };
+  }, [active, surfaceRef, surfaceSize]);
+  return frame;
+}
+
+function readVisibleViewport() {
+  const viewport = window.visualViewport;
+  return {
+    top: viewport?.offsetTop ?? 0,
+    left: viewport?.offsetLeft ?? 0,
+    width: viewport?.width ?? window.innerWidth,
+    height: viewport?.height ?? window.innerHeight,
+  };
+}
+
+function resolveVisibleSurfaceFrame(
+  surface: { top: number; left: number; right: number; bottom: number },
+  viewport: { top: number; left: number; width: number; height: number },
+): ComposerSlotFrame {
+  const top = Math.max(viewport.top, surface.top);
+  const left = Math.max(viewport.left, surface.left);
+  return {
+    top,
+    left,
+    width: Math.max(0, Math.min(viewport.left + viewport.width, surface.right) - left),
+    height: Math.max(0, Math.min(viewport.top + viewport.height, surface.bottom) - top),
+  };
+}
+
+const styles = StyleSheet.create({
+  inline: { flexShrink: 1 },
+  fullscreen: { flex: 1, minHeight: 0 },
+});
diff --git a/packages/app/src/composer/draft/input-draft.live.test.tsx b/packages/app/src/composer/draft/input-draft.live.test.tsx
index 33041cceb6..8bc31bb176 100644
--- a/packages/app/src/composer/draft/input-draft.live.test.tsx
+++ b/packages/app/src/composer/draft/input-draft.live.test.tsx
@@ -210,6 +210,8 @@ describe("useAgentInputDraft live contract", () => {
     });
 
     const hydratedTextReplacement = getLatest().textReplacement;
+    // The editor applies a retained caret to the hydrated text, so hydration announces itself.
+    expect(hydratedTextReplacement.kind).toBe("hydrated");
 
     await act(async () => {
       getLatest().editText("hello world");
@@ -223,6 +225,7 @@ describe("useAgentInputDraft live contract", () => {
     });
 
     expect(getLatest().textReplacement).not.toBe(hydratedTextReplacement);
+    expect(getLatest().textReplacement.kind).toBe("replace");
     expect(getLatest().textReplacement.text).toBe("replacement text");
 
     await act(async () => {
diff --git a/packages/app/src/composer/draft/input-draft.ts b/packages/app/src/composer/draft/input-draft.ts
index c64753694a..c14db9a119 100644
--- a/packages/app/src/composer/draft/input-draft.ts
+++ b/packages/app/src/composer/draft/input-draft.ts
@@ -123,10 +123,10 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
   }));
 
   const publishTextReplacement = useCallback(
-    (nextText: string) => {
+    (kind: "hydrated" | "replace", nextText: string) => {
       textReplacementRevisionRef.current += 1;
       setTextReplacement({
-        kind: "replace",
+        kind,
         key: `${draftKey}:${textReplacementRevisionRef.current}`,
         text: nextText,
       });
@@ -176,7 +176,7 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
     (nextText: string) => {
       textPublication.cancel();
       useDraftStore.getState().editDraftText({ draftKey, text: nextText });
-      publishTextReplacement(nextText);
+      publishTextReplacement("replace", nextText);
     },
     [draftKey, publishTextReplacement, textPublication],
   );
@@ -229,7 +229,7 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
       await useDraftStore.getState().hydrateDraftInput({ draftKey });
       if (!cancelled) {
         const hydratedText = useDraftStore.getState().getDraftInput(draftKey)?.text ?? "";
-        publishTextReplacement(hydratedText);
+        publishTextReplacement("hydrated", hydratedText);
         setHydratedDraftKey(draftKey);
       }
     })();
diff --git a/packages/app/src/composer/draft/workspace-tab.tsx b/packages/app/src/composer/draft/workspace-tab.tsx
index 4aa22a324d..b54b344a36 100644
--- a/packages/app/src/composer/draft/workspace-tab.tsx
+++ b/packages/app/src/composer/draft/workspace-tab.tsx
@@ -6,6 +6,7 @@ import { ComposerDock } from "@/composer/dock";
 import { useContainerWidthBelow } from "@/hooks/use-container-width";
 import invariant from "tiny-invariant";
 import { Composer } from "@/composer";
+import { useComposerEditingSession, useComposerFullscreen } from "@/composer/editing-session";
 import { FileDropZone } from "@/components/file-drop/file-drop-zone";
 import { ComposerImportPill } from "@/composer/draft/import-pill";
 import { COMPOSER_PILL_CLEARANCE } from "@/composer/pill-styles";
@@ -385,6 +386,8 @@ export function WorkspaceDraftAgentTab({
   }, [pendingCreateAttempt]);
   const allowsEmptyAutoSubmit = pendingAutoSubmit?.allowEmptyText === true;
   const isCompactFormFactor = useIsCompactFormFactor();
+  const editingSession = useComposerEditingSession("chat");
+  const isComposerFullscreen = useComposerFullscreen(editingSession);
   const { onLayout: onInputAreaLayout, isBelow: isCompactComposerLayout } = useContainerWidthBelow(
     COMPACT_FORM_FACTOR_WIDTH,
     { initialIsBelow: isCompactFormFactor },
@@ -628,10 +631,10 @@ export function WorkspaceDraftAgentTab({
 
   return (
     <FileDropZone style={styles.container}>
-      <ComposerDock>
+      <ComposerDock fullscreen={isComposerFullscreen}>
         {dockContent}
         <View style={animatedStaticStyles.inputAreaWrapper} onLayout={onInputAreaLayout}>
-          {importPillPress ? (
+          {importPillPress && !isComposerFullscreen ? (
             <View style={styles.importPillRow}>
               <View style={styles.importPillContent}>
                 <ComposerImportPill onPress={importPillPress} />
@@ -655,6 +658,7 @@ export function WorkspaceDraftAgentTab({
             onChangeAttachments={draftInput.setAttachments}
             cwd={composerState.workingDir}
             clearDraft={draftInput.clear}
+            editingSession={editingSession}
             autoFocus={shouldAutoFocusWorkspaceDraftComposer({ isPaneFocused, isSubmitting })}
             autoFocusKey={String(draftInput.attachmentFocusRequestId)}
             onFocusInput={handleFocusInputCallback}
@@ -672,6 +676,8 @@ const animatedStaticStyles = RNStyleSheet.create({
   inputAreaWrapper: {
     width: "100%",
     flexShrink: 1,
+    // Content-sized inline; fills the dock's fullscreen slot.
+    flexGrow: 1,
   },
 });
 
diff --git a/packages/app/src/composer/editing-session/index.test.ts b/packages/app/src/composer/editing-session/index.test.ts
index d593e5a64e..31c3765426 100644
--- a/packages/app/src/composer/editing-session/index.test.ts
+++ b/packages/app/src/composer/editing-session/index.test.ts
@@ -1,52 +1,61 @@
 import { describe, expect, it } from "vitest";
-import { ComposerEditingSession } from "./index";
+import { ComposerEditingSession, ComposerEditingSessions } from "./index";
 
-function leaveLiveDraft(session: ComposerEditingSession) {
-  session.captureForRemount({
-    snapshot: { text: "Unpublished live draft", selection: { start: 4, end: 17 } },
-    focused: true,
-    replacementKey: "draft:applied",
-  });
-}
-
-describe("composer editing remount handoff", () => {
-  it("keeps live text and selection when remounting from an initial draft publication", () => {
+describe("composer editing session", () => {
+  it("publishes fullscreen changes once per transition", () => {
     const session = new ComposerEditingSession();
-    leaveLiveDraft(session);
-    const handoff = session.takeHandoff({ kind: "initial", key: "draft:initial", text: "stale" });
-    expect(handoff?.snapshot).toEqual({
-      text: "Unpublished live draft",
-      selection: { start: 4, end: 17 },
-    });
-    expect(handoff?.focused).toBe(true);
+    const changes: boolean[] = [];
+    session.subscribe(() => changes.push(session.getFullscreen()));
+    session.setFullscreen(true);
+    session.setFullscreen(true);
+    session.setFullscreen(false);
+    expect(changes).toEqual([true, false]);
   });
 
-  it("keeps local edits when the last applied replacement is still current", () => {
+  it("hands the retained caret and focus intent to exactly one later mount", () => {
     const session = new ComposerEditingSession();
-    leaveLiveDraft(session);
-    const handoff = session.takeHandoff({
-      kind: "replace",
-      key: "draft:applied",
-      text: "old replacement",
-    });
-    expect(handoff?.snapshot).toEqual({
-      text: "Unpublished live draft",
-      selection: { start: 4, end: 17 },
-    });
+    expect(session.takeEditor()).toBeNull();
+    session.retainEditor({ selection: { start: 4, end: 17 }, focused: true });
+    expect(session.takeEditor()).toEqual({ selection: { start: 4, end: 17 }, focused: true });
+    expect(session.takeEditor()).toBeNull();
+  });
+});
+
+describe("composer editing sessions", () => {
+  const workspace = "server:workspace";
+  const target = JSON.stringify({ kind: "agent", agentId: "a" });
+
+  it("keeps one session per tab and purpose until the tab target changes", () => {
+    const sessions = new ComposerEditingSessions();
+    const chat = sessions.get(workspace, "tab-1", target, "chat");
+    expect(sessions.get(workspace, "tab-1", target, "chat")).toBe(chat);
+    expect(sessions.get(workspace, "tab-1", target, "terminal")).not.toBe(chat);
+    const retargeted = JSON.stringify({ kind: "agent", agentId: "b" });
+    expect(sessions.get(workspace, "tab-1", retargeted, "chat")).not.toBe(chat);
+  });
+
+  it("reports a tab as fullscreen while any of its composers is fullscreen", () => {
+    const sessions = new ComposerEditingSessions();
+    const notifications: boolean[] = [];
+    sessions.subscribe(() => notifications.push(sessions.isTabFullscreen(workspace, "tab-1")));
+    const chat = sessions.get(workspace, "tab-1", target, "chat");
+    sessions.get(workspace, "tab-2", target, "chat").setFullscreen(true);
+    expect(sessions.isTabFullscreen(workspace, "tab-1")).toBe(false);
+    expect(sessions.isTabFullscreen(workspace, null)).toBe(false);
+    chat.setFullscreen(true);
+    expect(sessions.isTabFullscreen(workspace, "tab-1")).toBe(true);
+    chat.setFullscreen(false);
+    expect(notifications).toEqual([false, true, false]);
+  });
+
+  it("drops sessions for closed tabs and keeps retained ones", () => {
+    const sessions = new ComposerEditingSessions();
+    const kept = sessions.get(workspace, "tab-1", target, "chat");
+    kept.setFullscreen(true);
+    sessions.get(workspace, "tab-2", target, "chat").setFullscreen(true);
+    sessions.retain(workspace, ["tab-1"]);
+    expect(sessions.get(workspace, "tab-1", target, "chat")).toBe(kept);
+    expect(sessions.isTabFullscreen(workspace, "tab-2")).toBe(false);
+    expect(sessions.get(workspace, "tab-2", target, "chat").getFullscreen()).toBe(false);
   });
-
-  it.each(["New explicit draft", ""])(
-    "honors an explicit replacement made while the editor is absent: %j",
-    (text) => {
-      const session = new ComposerEditingSession();
-      leaveLiveDraft(session);
-      const handoff = session.takeHandoff({ kind: "replace", key: "draft:new", text });
-      expect(handoff?.snapshot).toEqual({
-        text,
-        selection: { start: text.length, end: text.length },
-      });
-      expect(handoff?.focused).toBe(true);
-      expect(session.takeHandoff({ kind: "replace", key: "draft:new", text })).toBeNull();
-    },
-  );
 });
diff --git a/packages/app/src/composer/editing-session/index.tsx b/packages/app/src/composer/editing-session/index.tsx
index 97f7a79c51..6ad84d632d 100644
--- a/packages/app/src/composer/editing-session/index.tsx
+++ b/packages/app/src/composer/editing-session/index.tsx
@@ -1,5 +1,6 @@
 import React, {
   createContext,
+  useCallback,
   useContext,
   useEffect,
   useMemo,
@@ -7,62 +8,72 @@ import React, {
   useSyncExternalStore,
   type ReactNode,
 } from "react";
-import type { TextReplacement } from "@/composer/types";
 import type { ComposerInputMode } from "@/composer/input-mode";
 
-export interface ComposerEditingHandoff {
-  snapshot: { text: string; selection: { start: number; end: number } };
-  focused: boolean;
-  replacementKey: string;
+export interface ComposerSelection {
+  start: number;
+  end: number;
 }
 
-/** Editing metadata outlives a layout's input; draft text still belongs to its draft owner. */
+/** What an unmounting editor leaves for the next mount of the same session. */
+export interface ComposerRetainedEditor {
+  selection: ComposerSelection;
+  /** The editor was focused, or meant to regain focus once its pane became active. */
+  focused: boolean;
+}
+
+/**
+ * Editing state that outlives the editor's mount. Draft text belongs to its draft
+ * owner; the editor keeps its own live buffer across layout modes. Switching between
+ * the compact and desktop screens remounts the editor, so the session carries the
+ * caret and focus intent across that remount while the draft owner carries the text.
+ */
 export class ComposerEditingSession {
   private fullscreen = false;
-  private handoff: ComposerEditingHandoff | null = null;
+  private retained: ComposerRetainedEditor | null = null;
   private listeners = new Set<() => void>();
+  constructor(private readonly onChange?: () => void) {}
   getFullscreen = () => this.fullscreen;
+  /** Called by the unmounting editor; the next mount of this session takes it. */
+  retainEditor(retained: ComposerRetainedEditor) {
+    this.retained = retained;
+  }
+  takeEditor(): ComposerRetainedEditor | null {
+    const retained = this.retained;
+    this.retained = null;
+    return retained;
+  }
   subscribe = (listener: () => void) => {
     this.listeners.add(listener);
     return () => {
       this.listeners.delete(listener);
     };
   };
-  changePresentation(fullscreen: boolean, handoff: ComposerEditingHandoff) {
-    this.captureForRemount(handoff);
+  setFullscreen(fullscreen: boolean) {
     if (fullscreen === this.fullscreen) return;
     this.fullscreen = fullscreen;
     for (const listener of this.listeners) listener();
-  }
-  captureForRemount(handoff: ComposerEditingHandoff) {
-    this.handoff = handoff;
-  }
-  peekHandoff(replacement: TextReplacement): ComposerEditingHandoff | null {
-    const handoff = this.handoff;
-    if (!handoff || replacement.kind === "initial" || replacement.key === handoff.replacementKey)
-      return handoff;
-    // A replacement command issued since capture supersedes the old editor's live buffer.
-    return {
-      snapshot: {
-        text: replacement.text,
-        selection: { start: replacement.text.length, end: replacement.text.length },
-      },
-      focused: handoff.focused,
-      replacementKey: replacement.key,
-    };
-  }
-  takeHandoff(replacement: TextReplacement) {
-    const handoff = this.peekHandoff(replacement);
-    this.handoff = null;
-    return handoff;
+    this.onChange?.();
   }
 }
 
-class ComposerEditingSessions {
-  private workspaces = new Map<
-    string,
-    Map<string, { targetKey: string; sessions: Map<ComposerInputMode, ComposerEditingSession> }>
-  >();
+interface TabSessions {
+  targetKey: string;
+  sessions: Map<ComposerInputMode, ComposerEditingSession>;
+}
+
+export class ComposerEditingSessions {
+  private workspaces = new Map<string, Map<string, TabSessions>>();
+  private listeners = new Set<() => void>();
+  private notify = () => {
+    for (const listener of this.listeners) listener();
+  };
+  subscribe = (listener: () => void) => {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  };
   get(workspaceKey: string, tabId: string, targetKey: string, purpose: ComposerInputMode) {
     let workspace = this.workspaces.get(workspaceKey);
     if (!workspace) {
@@ -76,17 +87,31 @@ class ComposerEditingSessions {
     }
     let session = tab.sessions.get(purpose);
     if (!session) {
-      session = new ComposerEditingSession();
+      session = new ComposerEditingSession(this.notify);
       tab.sessions.set(purpose, session);
     }
     return session;
   }
+  /** A tab is fullscreen when any of its composers is; the screen hides its chrome for it. */
+  isTabFullscreen(workspaceKey: string, tabId: string | null): boolean {
+    if (tabId === null) return false;
+    const tab = this.workspaces.get(workspaceKey)?.get(tabId);
+    if (!tab) return false;
+    for (const session of tab.sessions.values()) if (session.getFullscreen()) return true;
+    return false;
+  }
   retain(workspaceKey: string, tabIds: readonly string[]) {
     const workspace = this.workspaces.get(workspaceKey);
     if (!workspace) return;
     const retained = new Set(tabIds);
-    for (const tabId of workspace.keys()) if (!retained.has(tabId)) workspace.delete(tabId);
+    let changed = false;
+    for (const tabId of workspace.keys()) {
+      if (retained.has(tabId)) continue;
+      workspace.delete(tabId);
+      changed = true;
+    }
     if (workspace.size === 0) this.workspaces.delete(workspaceKey);
+    if (changed) this.notify();
   }
 }
 
@@ -140,3 +165,16 @@ export function useComposerEditingSession(
 export function useComposerFullscreen(session: ComposerEditingSession): boolean {
   return useSyncExternalStore(session.subscribe, session.getFullscreen, session.getFullscreen);
 }
+/** Whether the composer of a workspace tab is fullscreen, for the chrome that tab sits under. */
+export function useComposerTabFullscreen(workspaceKey: string, tabId: string | null): boolean {
+  const sessions = useContext(SessionsContext);
+  const subscribe = useCallback(
+    (listener: () => void) => sessions?.subscribe(listener) ?? (() => {}),
+    [sessions],
+  );
+  const read = useCallback(
+    () => sessions?.isTabFullscreen(workspaceKey, tabId) ?? false,
+    [sessions, workspaceKey, tabId],
+  );
+  return useSyncExternalStore(subscribe, read, read);
+}
diff --git a/packages/app/src/composer/index.tsx b/packages/app/src/composer/index.tsx
index c77b39d332..21bf7f6679 100644
--- a/packages/app/src/composer/index.tsx
+++ b/packages/app/src/composer/index.tsx
@@ -1,4 +1,8 @@
-import { useComposerEditingSession, useComposerFullscreen } from "./editing-session";
+import {
+  useComposerEditingSession,
+  useComposerFullscreen,
+  type ComposerEditingSession,
+} from "./editing-session";
 import type { ComposerTextSource } from "./text-source";
 import { createStore, type StoreApi } from "zustand/vanilla";
 import { useStore } from "zustand";
@@ -27,6 +31,7 @@ import {
 import { useTranslation } from "react-i18next";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
+import { usePanelStore } from "@/stores/panel-store";
 import { useHasFinePointer } from "@/hooks/use-fine-pointer";
 import { useShallow } from "zustand/shallow";
 import {
@@ -967,6 +972,12 @@ interface ComposerProps {
   submitLabel?: string;
   /** Overrides the mode's default placeholder, for text only the caller can build. */
   placeholder?: string;
+  /**
+   * The host that also lays out the dock and chrome shares this session so its
+   * fullscreen state and the composer's agree. Defaults to the tab's session for
+   * `inputMode`.
+   */
+  editingSession?: ComposerEditingSession;
 }
 
 const EMPTY_ARRAY: readonly QueuedMessage[] = [];
@@ -1182,8 +1193,14 @@ function ComposerVoiceModeButton({
 }
 
 export function Composer({ isPaneFocused, ...props }: ComposerProps) {
+  // A compact overlay panel (agent list, explorer) covers the pane without taking its
+  // focus. The composer gives up input from the moment the user asks for the panel,
+  // not when its motion settles, so the exit action and autocomplete never race it.
+  const isCompact = useIsCompactFormFactor();
+  const overlayPanelRequested = usePanelStore((state) => state.mobilePanel.target !== "agent");
+  const coveredByOverlayPanel = isCompact && overlayPanelRequested;
   return (
-    <ComposerKeyboardScopeProvider isActiveComposer={isPaneFocused}>
+    <ComposerKeyboardScopeProvider isActiveComposer={isPaneFocused && !coveredByOverlayPanel}>
       <RenderProfile id="ComposerContent">
         <ComposerContent {...props} />
       </RenderProfile>
@@ -1234,6 +1251,7 @@ function ComposerContentImpl({
   inputWrapperStyle,
   isCompactLayout: isCompactLayoutOverride,
   inputMode = "chat",
+  editingSession: providedEditingSession,
   readOnly = false,
   submitLabel,
   placeholder,
@@ -1339,7 +1357,7 @@ function ComposerContentImpl({
   const nextPendingFileId = useRef(0);
   const isUploadingFile = pendingFiles.length > 0;
   const [pendingNativeImagePastes, setPendingNativeImagePastes] = useState(0);
-  const editingSession = useComposerEditingSession(inputMode);
+  const editingSession = useComposerEditingSession(inputMode, providedEditingSession);
   const isFullscreen = useComposerFullscreen(editingSession);
   const [sendError, setSendError] = useState<string | null>(null);
   const [isMessageInputFocused, setIsMessageInputFocused] = useState(false);
@@ -2250,9 +2268,23 @@ function ComposerContentImpl({
     [githubSearchItems, selectedAttachments, handleToggleGithubItem],
   );
 
+  // Fullscreen fills the dock slot: the chain down to the input stretches and drops
+  // the inline padding, which the fullscreen presentation supplies itself.
   const inputAreaContainerStyle = useMemo(
-    () => [styles.inputAreaContainer, isComposerLocked && styles.inputAreaLocked],
-    [isComposerLocked],
+    () => [
+      styles.inputAreaContainer,
+      isComposerLocked && styles.inputAreaLocked,
+      isFullscreen && styles.inputAreaFullscreen,
+    ],
+    [isComposerLocked, isFullscreen],
+  );
+  const inputAreaContentStyle = useMemo(
+    () => [styles.inputAreaContent, isFullscreen && styles.fullscreenFill],
+    [isFullscreen],
+  );
+  const messageInputContainerStyle = useMemo(
+    () => [styles.messageInputContainer, isFullscreen && styles.fullscreenFill],
+    [isFullscreen],
   );
 
   const attachmentTray = useMemo(
@@ -2363,15 +2395,19 @@ function ComposerContentImpl({
         focusMessageInputForKeyboardAction={focusMessageInputForKeyboardAction}
         isMessageInputFocused={isMessageInputFocused}
       />
-      <View style={animatedStaticStyles.container}>
+      <View
+        style={
+          isFullscreen ? animatedStaticStyles.fullscreenContainer : animatedStaticStyles.container
+        }
+      >
         <AttachmentLightbox source={lightboxSource} onClose={handleLightboxClose} />
         {/* Input area */}
         <View style={inputAreaContainerStyle}>
-          <View style={styles.inputAreaContent}>
-            {queueList}
+          <View style={inputAreaContentStyle}>
+            {isFullscreen ? null : queueList}
             {!isFullscreen && sendErrorNode}
 
-            <View ref={messageInputContainerRef} style={styles.messageInputContainer}>
+            <View ref={messageInputContainerRef} style={messageInputContainerStyle}>
               <ComposerAutocompleteBinding
                 text={textSource}
                 cursor={cursor}
@@ -2475,6 +2511,12 @@ const animatedStaticStyles = RNStyleSheet.create({
     flexShrink: 1,
     position: "relative",
   },
+  fullscreenContainer: {
+    flexDirection: "column",
+    flex: 1,
+    minHeight: 0,
+    position: "relative",
+  },
 });
 
 const styles = StyleSheet.create((theme: Theme) => ({
@@ -2496,6 +2538,18 @@ const styles = StyleSheet.create((theme: Theme) => ({
   inputAreaLocked: {
     opacity: 0.6,
   },
+  inputAreaFullscreen: {
+    flex: 1,
+    minHeight: 0,
+    alignItems: "stretch",
+    paddingHorizontal: 0,
+    paddingBottom: 0,
+  },
+  fullscreenFill: {
+    flex: 1,
+    minHeight: 0,
+    maxWidth: "100%",
+  },
   inputAreaContent: {
     flexShrink: 1,
     width: "100%",
diff --git a/packages/app/src/composer/input/fullscreen-exit.native.ts b/packages/app/src/composer/input/fullscreen-exit.native.ts
new file mode 100644
index 0000000000..c2344d50b0
--- /dev/null
+++ b/packages/app/src/composer/input/fullscreen-exit.native.ts
@@ -0,0 +1,18 @@
+import { useEffect } from "react";
+import { BackHandler } from "react-native";
+
+/** The hardware back button leaves fullscreen instead of the screen. */
+export function useComposerFullscreenExit(
+  active: boolean,
+  onExit: () => void,
+): ((node: unknown) => void) | undefined {
+  useEffect(() => {
+    if (!active) return;
+    const subscription = BackHandler.addEventListener("hardwareBackPress", () => {
+      onExit();
+      return true;
+    });
+    return () => subscription.remove();
+  }, [active, onExit]);
+  return undefined;
+}
diff --git a/packages/app/src/composer/input/fullscreen-exit.ts b/packages/app/src/composer/input/fullscreen-exit.ts
new file mode 100644
index 0000000000..b76eeed5fc
--- /dev/null
+++ b/packages/app/src/composer/input/fullscreen-exit.ts
@@ -0,0 +1,23 @@
+import { useOverlayLayer, useWebOverlayRegistration } from "@/lib/overlay-root";
+
+/**
+ * Escape leaves fullscreen before app shortcuts see it. The registration only claims
+ * keys; focus stays where the user left it because the editor never remounts.
+ */
+export function useComposerFullscreenExit(
+  active: boolean,
+  onExit: () => void,
+): ((node: unknown) => void) | undefined {
+  const layer = useOverlayLayer("modal");
+  return useWebOverlayRegistration({
+    active,
+    layer,
+    manageFocus: false,
+    onKeyDown: (event) => {
+      if (event.key !== "Escape") return false;
+      event.preventDefault();
+      onExit();
+      return true;
+    },
+  });
+}
diff --git a/packages/app/src/composer/input/fullscreen-host.native.tsx b/packages/app/src/composer/input/fullscreen-host.native.tsx
deleted file mode 100644
index 22ce0052bf..0000000000
--- a/packages/app/src/composer/input/fullscreen-host.native.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { useEffect, type ReactNode } from "react";
-import { Portal } from "@gorhom/portal";
-import { BackHandler, View, useWindowDimensions } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { StyleSheet } from "react-native-unistyles";
-import Animated, { useAnimatedStyle } from "react-native-reanimated";
-import { DEFAULT_FLOATING_PANEL_PORTAL_HOST } from "@/components/ui/floating-panel-portal";
-import { useKeyboardShift } from "@/keyboard/shift";
-
-/** Same-window host keeps the IME attached while escaping the dock's clipping. */
-export function ComposerFullscreenHost({
-  children,
-  onExit,
-  active,
-}: {
-  children: ReactNode;
-  onExit: () => void;
-  active: boolean;
-}) {
-  useEffect(() => {
-    if (!active) return;
-    const handler = BackHandler.addEventListener("hardwareBackPress", () => {
-      onExit();
-      return true;
-    });
-    return () => handler.remove();
-  }, [active, onExit]);
-  const insets = useSafeAreaInsets();
-  const { height } = useWindowDimensions();
-  const { layoutShift } = useKeyboardShift();
-  const frame = useAnimatedStyle(() => ({
-    height: Math.max(0, height - layoutShift.value),
-    paddingTop: insets.top,
-    paddingBottom: insets.bottom,
-    paddingLeft: insets.left,
-    paddingRight: insets.right,
-  }));
-  return (
-    <Portal hostName={DEFAULT_FLOATING_PANEL_PORTAL_HOST}>
-      <View style={[styles.background, !active && styles.hidden]}>
-        <Animated.View style={[{ width: "100%" }, frame]}>{children}</Animated.View>
-      </View>
-    </Portal>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  hidden: { display: "none" },
-  background: {
-    position: "absolute",
-    top: 0,
-    bottom: 0,
-    left: 0,
-    right: 0,
-    backgroundColor: theme.colors.surface1,
-  },
-}));
diff --git a/packages/app/src/composer/input/fullscreen-host.tsx b/packages/app/src/composer/input/fullscreen-host.tsx
deleted file mode 100644
index ba634b268d..0000000000
--- a/packages/app/src/composer/input/fullscreen-host.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { useMemo, useLayoutEffect, useState, type ReactNode } from "react";
-import { createPortal } from "react-dom";
-import { View } from "react-native";
-import {
-  getOverlayRoot,
-  useOverlayLayer,
-  OverlayLayerProvider,
-  useWebOverlayRegistration,
-} from "@/lib/overlay-root";
-
-export function ComposerFullscreenHost({
-  children,
-  onExit,
-  active,
-}: {
-  children: ReactNode;
-  onExit: () => void;
-  active: boolean;
-}) {
-  const layer = useOverlayLayer("modal");
-  const registration = useWebOverlayRegistration({
-    active,
-    layer,
-    onKeyDown: (event) => {
-      if (event.key !== "Escape") return false;
-      event.preventDefault();
-      onExit();
-      return true;
-    },
-  });
-  const [viewport, setViewport] = useState(readVisibleViewport);
-  useLayoutEffect(() => {
-    if (!active) return;
-    const update = () => setViewport(readVisibleViewport());
-    const visualViewport = window.visualViewport;
-    update();
-    visualViewport?.addEventListener("resize", update);
-    visualViewport?.addEventListener("scroll", update);
-    window.addEventListener("resize", update);
-    return () => {
-      visualViewport?.removeEventListener("resize", update);
-      visualViewport?.removeEventListener("scroll", update);
-      window.removeEventListener("resize", update);
-    };
-  }, [active]);
-  const frameStyle = useMemo(
-    () => ({
-      display: active ? ("flex" as const) : ("none" as const),
-      position: "absolute" as const,
-      top: viewport.top,
-      left: viewport.left,
-      width: viewport.width,
-      zIndex: layer,
-      pointerEvents: "auto" as const,
-      height: viewport.height,
-    }),
-    [active, layer, viewport],
-  );
-  return createPortal(
-    <OverlayLayerProvider layer={layer}>
-      <View ref={registration} style={frameStyle}>
-        {children}
-      </View>
-    </OverlayLayerProvider>,
-    getOverlayRoot(),
-  );
-}
-
-function readVisibleViewport() {
-  const viewport = window.visualViewport;
-  return {
-    top: viewport?.offsetTop ?? 0,
-    left: viewport?.offsetLeft ?? 0,
-    width: viewport?.width ?? window.innerWidth,
-    height: viewport?.height ?? window.innerHeight,
-  };
-}
diff --git a/packages/app/src/composer/input/input.tsx b/packages/app/src/composer/input/input.tsx
index a0476ff7a7..a1b8c0fdbb 100644
--- a/packages/app/src/composer/input/input.tsx
+++ b/packages/app/src/composer/input/input.tsx
@@ -84,6 +84,7 @@ import {
   computeCanStartDictation,
   resolveComposerSurfacePresentation,
   resolveComposerSurfaceText,
+  resolveRetainedSelection,
   runAlternateSendAction,
   runDefaultSendAction,
   runMessageInputKeyboardAction,
@@ -676,13 +677,7 @@ function ComposerTextSurface(props: ComposerTextSurfaceProps): React.ReactElemen
     );
   }
   return (
-    <View
-      style={[
-        styles.textInputScrollWrapper,
-        props.fullscreen && styles.fullscreenTextSurface,
-        props.compact && !props.fullscreen && styles.compactTextSurface,
-      ]}
-    >
+    <View style={[styles.textInputScrollWrapper, props.fullscreen && styles.fullscreenTextSurface]}>
       {!isWeb && props.compact && !props.fullscreen ? (
         <Text
           accessible={false}
@@ -1040,11 +1035,8 @@ function getComposerInputSnapshot(
   current: ComposerTextInputHandle | null,
   fallbackText: string,
   fallbackSelection: ComposerInputSnapshot["selection"],
-  mountedTextArea?: TextAreaHandle | null,
 ): ComposerInputSnapshot {
-  // The inner DOM ref can detach before the outer editing handle. Keep the mounted
-  // element available until this owner's ref callback captures the remount handoff.
-  const textArea = mountedTextArea ?? getWebTextAreaImpl(current);
+  const textArea = getWebTextAreaImpl(current);
   const text = textArea?.value ?? current?.getText() ?? fallbackText;
   const start = textArea?.selectionStart ?? fallbackSelection.start;
   const end = textArea?.selectionEnd ?? fallbackSelection.end;
@@ -1269,18 +1261,13 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     const inputWrapperRef = useRef<View | null>(null);
     const textInputRef = useRef<ComposerTextInputHandle | null>(null);
     const isInputFocusedRef = useRef(false);
-    const handoff = editingSession.peekHandoff(textReplacement);
-    const focusIntentRef = useRef(Boolean(handoff?.focused));
-    const valueRef = useRef(handoff?.snapshot.text ?? value);
-    const selectionRef = useRef(
-      handoff?.snapshot.selection ?? { start: value.length, end: value.length },
-    );
+    const focusIntentRef = useRef(false);
+    const valueRef = useRef(value);
+    const selectionRef = useRef({ start: value.length, end: value.length });
     const activeComposerRef = useRef(isActiveComposer);
     activeComposerRef.current = isActiveComposer;
     const [webTextArea, setWebTextArea] = useState<HTMLElement | null>(null);
     const appliedTextReplacementKeyRef = useRef(textReplacement.key);
-    const textReplacementRef = useRef(textReplacement);
-    textReplacementRef.current = textReplacement;
     const webTextareaRef = useRef<HTMLElement | null>(null);
     const updateLiveTextPresence = useCallback((text: string) => {
       const nextHasLiveText = text.trim().length > 0;
@@ -1289,43 +1276,49 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       setHasLiveText(nextHasLiveText);
     }, []);
 
-    const assignTextInput = useCallback(
-      (input: ComposerTextInputHandle | null) => {
-        const previous = textInputRef.current;
-        if (!input && previous) {
-          editingSession.captureForRemount({
-            snapshot: getComposerInputSnapshot(
-              previous,
-              valueRef.current,
-              selectionRef.current,
-              webTextareaRef.current,
-            ),
-            focused: previous.isFocused() || isInputFocusedRef.current,
-            replacementKey: appliedTextReplacementKeyRef.current,
-          });
-        }
-        textInputRef.current = input;
-        if (isWeb) {
-          const element = getWebTextAreaImpl(input) as HTMLElement | null;
-          webTextareaRef.current = element;
-          setWebTextArea(element);
-        }
-        if (!input) return;
-        const transfer = editingSession.takeHandoff(textReplacementRef.current);
-        if (transfer) {
-          appliedTextReplacementKeyRef.current = textReplacementRef.current.key;
-          valueRef.current = transfer.snapshot.text;
-          updateLiveTextPresence(transfer.snapshot.text);
-          selectionRef.current = transfer.snapshot.selection;
-          input.replaceText(transfer.snapshot.text, transfer.snapshot.selection);
-          if (transfer.focused && activeComposerRef.current) input.focus();
-        }
-      },
-      [editingSession, updateLiveTextPresence],
-    );
+    // One editor stays mounted through every layout mode, so this ref only follows
+    // the editor's own mount and unmount.
+    const assignTextInput = useCallback((input: ComposerTextInputHandle | null) => {
+      textInputRef.current = input;
+      if (!isWeb) return;
+      const element = getWebTextAreaImpl(input) as HTMLElement | null;
+      webTextareaRef.current = element;
+      setWebTextArea(element);
+    }, []);
     useLayoutEffect(() => {
       if (isActiveComposer && focusIntentRef.current) textInputRef.current?.focus();
     }, [isActiveComposer]);
+    // The compact and desktop screens mount the editor in different trees, so a
+    // viewport that crosses the breakpoint remounts it. The draft owner brings the
+    // text back; the session brings the caret and focus intent back. On web the
+    // owner may still hold an unpublished edit while the new editor mounts, so the
+    // caret is placed now against the text on screen and again when the owner's
+    // hydrated text arrives.
+    const retainedSelectionRef = useRef<{ start: number; end: number } | null>(null);
+    useLayoutEffect(() => {
+      const retained = editingSession.takeEditor();
+      if (retained) {
+        const text = textInputRef.current?.getText() ?? valueRef.current;
+        const selection = resolveRetainedSelection(retained.selection, text.length);
+        retainedSelectionRef.current = retained.selection;
+        selectionRef.current = selection;
+        textInputRef.current?.setSelection(selection);
+        if (retained.focused) {
+          focusIntentRef.current = true;
+          if (activeComposerRef.current) textInputRef.current?.focus();
+        }
+      }
+      return () => {
+        editingSession.retainEditor({
+          selection: getComposerInputSnapshot(
+            textInputRef.current,
+            valueRef.current,
+            selectionRef.current,
+          ).selection,
+          focused: isInputFocusedRef.current || focusIntentRef.current,
+        });
+      };
+    }, [editingSession]);
     const getLiveText = useCallback(() => valueRef.current, []);
     const composerHeight = useComposerHeight({
       getText: getLiveText,
@@ -1340,29 +1333,15 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     const updateComposerHeightForText = measuredComposerHeight?.onTextChange;
     const resetComposerHeight = measuredComposerHeight?.reset;
 
-    const changePresentation = useCallback(
-      (fullscreen: boolean) => {
-        if (editingSession.getFullscreen() === fullscreen) return;
-        const snapshot = getComposerInputSnapshot(
-          textInputRef.current,
-          valueRef.current,
-          selectionRef.current,
-        );
-        editingSession.changePresentation(fullscreen, {
-          snapshot,
-          focused: textInputRef.current?.isFocused() ?? isInputFocusedRef.current,
-          replacementKey: appliedTextReplacementKeyRef.current,
-        });
-        valueRef.current = snapshot.text;
-        selectionRef.current = snapshot.selection;
-      },
-      [editingSession],
-    );
-    const exitFullscreen = useCallback(() => changePresentation(false), [changePresentation]);
+    const exitFullscreen = useCallback(() => editingSession.setFullscreen(false), [editingSession]);
+    const enterFullscreen = useCallback(() => editingSession.setFullscreen(true), [editingSession]);
 
+    // The conversation sizes itself against the inline composer; fullscreen covers it.
     const handleComposerLayout = useCallback(
-      (event: LayoutChangeEvent) => onHeightChange?.(event.nativeEvent.layout.height),
-      [onHeightChange],
+      (event: LayoutChangeEvent) => {
+        if (!isFullscreen) onHeightChange?.(event.nativeEvent.layout.height);
+      },
+      [isFullscreen, onHeightChange],
     );
 
     const replaceText = useCallback(
@@ -1427,8 +1406,15 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       updateComposerHeightForText?.(valueRef.current, textReplacement.text);
       valueRef.current = textReplacement.text;
       updateLiveTextPresence(textReplacement.text);
+      const retainedSelection =
+        textReplacement.kind === "hydrated" ? retainedSelectionRef.current : null;
+      retainedSelectionRef.current = null;
       if (textReplacement.text === "") {
         textInputRef.current?.reset();
+      } else if (retainedSelection) {
+        const selection = resolveRetainedSelection(retainedSelection, textReplacement.text.length);
+        selectionRef.current = selection;
+        textInputRef.current?.replaceText(textReplacement.text, selection);
       } else {
         textInputRef.current?.replaceText(textReplacement.text);
       }
@@ -1696,17 +1682,6 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       });
     }, [defaultSendBehavior, isAgentRunning, handleSendMessage, handleQueueMessage, onQueue]);
 
-    const getWebTextArea = useCallback(
-      (): TextAreaHandle | null => getWebTextAreaImpl(textInputRef.current),
-      [],
-    );
-
-    useLayoutEffect(() => {
-      if (isWeb) {
-        webTextareaRef.current = getWebTextArea() as HTMLElement | null;
-      }
-    }, [getWebTextArea, isFullscreen]);
-
     usePasteImagesEffect({
       textarea: webTextArea,
       isConnected,
@@ -1832,6 +1807,8 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     }, [onFocusChange]);
 
     const handleInputBlur = useCallback(() => {
+      // Fullscreen is nothing but the editor, so a blur there (a retained tab being
+      // hidden, the keyboard dismissed) keeps the intent: showing it again refocuses.
       if (activeComposerRef.current && !isFullscreen) focusIntentRef.current = false;
       isInputFocusedRef.current = false;
       setIsInputFocused(false);
@@ -1888,8 +1865,9 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         styles.textInput,
         mode.isMonospace && styles.textInputMonospace,
         isFullscreen ? styles.fullscreenTextInput : composerHeightStyle,
+        isCompact && !isFullscreen && styles.compactTextInput,
       ],
-      [composerHeightStyle, mode.isMonospace, isFullscreen],
+      [composerHeightStyle, mode.isMonospace, isFullscreen, isCompact],
     );
     // Static content has no textarea to mirror, so it grows with its own text
     // instead of the measured input height.
@@ -1897,13 +1875,22 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       () => [styles.textInput, mode.isMonospace && styles.textInputMonospace, styles.readOnlyText],
       [mode.isMonospace],
     );
+    // Fullscreen always shows Send; without content it is disabled, and looks it.
+    const isPresentedSendDisabled = resolvePresentationSendDisabled({
+      fullscreen: isFullscreen,
+      disabled: isSendButtonDisabled,
+      hasText: hasLiveText,
+      attachments,
+      hasExternalContent,
+      allowEmpty: allowEmptySubmit,
+    });
     const sendButtonCombinedStyle = useMemo(
       () => [
         styles.sendButton,
         submitLabel ? styles.sendButtonLabeled : undefined,
-        isSendButtonDisabled && styles.buttonDisabled,
+        isPresentedSendDisabled && styles.buttonDisabled,
       ],
-      [isSendButtonDisabled, submitLabel],
+      [isPresentedSendDisabled, submitLabel],
     );
     const overlayContainerStyle = useMemo(
       () => [styles.overlayContainer, { opacity: surfacePresentation.overlay.opacity }],
@@ -1942,14 +1929,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
           canPressLoadingButton={canPressLoadingButton}
           onSubmitLoadingPress={onSubmitLoadingPress}
           onDefaultSendAction={handleDefaultSendAction}
-          isSendButtonDisabled={resolvePresentationSendDisabled({
-            fullscreen: isFullscreen,
-            disabled: isSendButtonDisabled,
-            hasText: hasLiveText,
-            attachments,
-            hasExternalContent,
-            allowEmpty: allowEmptySubmit,
-          })}
+          isSendButtonDisabled={isPresentedSendDisabled}
           submitAccessibilityLabel={submitAccessibilityLabel}
           sendButtonCombinedStyle={sendButtonCombinedStyle}
           isSubmitLoading={isSubmitLoading}
@@ -1968,11 +1948,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         canPressLoadingButton,
         onSubmitLoadingPress,
         handleDefaultSendAction,
-        isSendButtonDisabled,
-        hasLiveText,
-        attachments,
-        hasExternalContent,
-        allowEmptySubmit,
+        isPresentedSendDisabled,
         submitAccessibilityLabel,
         sendButtonCombinedStyle,
         isSubmitLoading,
@@ -2008,9 +1984,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
             onBlur={handleInputBlur}
             editable={!isDictating && !isRealtimeVoiceForCurrentAgent && !disabled}
             scrollEnabled={isComposerScrollEnabled}
-            autoFocus={
-              Boolean(editingSession.peekHandoff(textReplacement)?.focused) && isActiveComposer
-            }
+            autoFocus={false}
             onKeyPress={shouldHandleWebKeyPress ? handleDesktopKeyPress : undefined}
             onSelectionChange={handleSelectionChange}
             onPasteImages={onPasteImages}
@@ -2029,8 +2003,6 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       [
         readOnly,
         textReplacement,
-        editingSession,
-        isActiveComposer,
         assignTextInput,
         textInputStyle,
         readOnlyTextStyle,
@@ -2162,11 +2134,10 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         handleRealtimeVoiceStop,
       ],
     );
-    const enterFullscreen = useCallback(() => changePresentation(true), [changePresentation]);
     return (
       <View
         ref={rootRef}
-        style={styles.container}
+        style={isFullscreen ? styles.fullscreenContainer : styles.container}
         testID="message-input-root"
         onLayout={handleComposerLayout}
       >
@@ -2177,8 +2148,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         />
         <ComposerInputPresentation
           fullscreen={isFullscreen}
-          iconSize={buttonIconSize}
-          active={isActiveComposer}
+          sendIconSize={buttonIconSize}
           surface={textSurface}
           toolbar={toolbar}
           send={sendButton}
@@ -2207,6 +2177,10 @@ const styles = StyleSheet.create((theme: Theme) => ({
     flexShrink: 1,
     position: "relative",
   },
+  fullscreenContainer: {
+    flex: 1,
+    position: "relative",
+  },
   inputWrapper: {
     flexShrink: 1,
     flexDirection: "column",
@@ -2241,14 +2215,18 @@ const styles = StyleSheet.create((theme: Theme) => ({
   inputWrapperReadOnly: {
     borderStyle: "dotted",
   },
-  compactTextSurface: { paddingRight: 36 },
+  // The band the fullscreen glyph sits in is the input's own padding, so a tap
+  // anywhere in it (under the glyph, or where the glyph would be) is a tap on the
+  // editor: it focuses, shows the keyboard, and places the caret. Reserved whether
+  // or not the glyph shows, so text never reflows when it appears.
+  compactTextInput: { paddingRight: 36 },
   fullscreenTextSurface: { flex: 1, minHeight: 0 },
   fullscreenTextInput: { flex: 1, height: "100%", textAlignVertical: "top" },
   lineMeasurement: {
     position: "absolute",
     top: 0,
     left: 0,
-    right: 36,
+    right: 0,
     opacity: 0,
     maxHeight: undefined,
     minHeight: undefined,
diff --git a/packages/app/src/composer/input/presentation.tsx b/packages/app/src/composer/input/presentation.tsx
index d02821696a..64697999f5 100644
--- a/packages/app/src/composer/input/presentation.tsx
+++ b/packages/app/src/composer/input/presentation.tsx
@@ -3,19 +3,31 @@ import { View, type ViewProps } from "react-native";
 import { Maximize2, Minimize2 } from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
+import { ComposerFullscreenBody, ComposerFullscreenFooter } from "@/composer/dock";
+import { useComposerKeyboardScope } from "@/composer/keyboard-scope";
 import { isWeb } from "@/constants/platform";
+import { ICON_SIZE } from "@/styles/theme";
 import { StyleSheet } from "react-native-unistyles";
-import { ComposerFullscreenHost } from "./fullscreen-host";
+import { useComposerFullscreenExit } from "./fullscreen-exit";
+import { resolveGlyphRailOffset } from "./state";
+
+const CONTROL_SIZE = 28;
+const FULLSCREEN_GLYPH_SIZE = ICON_SIZE.md;
 
 function keepEditorFocused(event: import("react-native").PointerEvent) {
   if (isWeb) event.preventDefault();
 }
 
-/** Both presentations receive the same editing surface and send capability. */
+/**
+ * One tree for both layout modes. The editing surface keeps its position so the
+ * mounted editor, its native buffer, selection, and focus survive every toggle;
+ * only the chrome around it changes. Fullscreen shows exit top right and Send
+ * bottom right, both on the rail the inline Send button uses; a send error sits
+ * in the same footer as Send.
+ */
 export function ComposerInputPresentation({
   fullscreen,
-  iconSize,
-  active,
+  sendIconSize,
   surface,
   toolbar,
   send,
@@ -30,8 +42,7 @@ export function ComposerInputPresentation({
   overlay,
 }: {
   fullscreen: boolean;
-  iconSize: number;
-  active: boolean;
+  sendIconSize: number;
   surface: ReactNode;
   toolbar: ReactNode;
   send: ReactNode;
@@ -46,55 +57,33 @@ export function ComposerInputPresentation({
   overlay: ReactNode;
 }) {
   const { t } = useTranslation();
-  // ArrowUp ends at x19; the fullscreen glyphs end at x21 in Lucide's 24px viewBox.
-  // Compensate for that difference to align visible ink with Send, not just boxes.
-  const railAdjustment = iconSize / 12;
+  // A retained tab keeps its fullscreen editor mounted while hidden; the global exit
+  // action (Escape, hardware back) belongs only to the pane the user is in.
+  const { isActiveComposer } = useComposerKeyboardScope();
+  const exitScopeRef = useComposerFullscreenExit(fullscreen && isActiveComposer, onExit);
+  const railOffset = resolveGlyphRailOffset({
+    controlSize: CONTROL_SIZE,
+    sendIconSize,
+    glyphIconSize: FULLSCREEN_GLYPH_SIZE,
+  });
   const maximizeIcon = useCallback(
-    (color: string) => <Maximize2 color={color} size={iconSize} />,
-    [iconSize],
+    (color: string) => <Maximize2 color={color} size={FULLSCREEN_GLYPH_SIZE} />,
+    [],
   );
   const minimizeIcon = useCallback(
-    (color: string) => <Minimize2 color={color} size={iconSize} />,
-    [iconSize],
+    (color: string) => <Minimize2 color={color} size={FULLSCREEN_GLYPH_SIZE} />,
+    [],
   );
-  const enterStyle = useMemo(
-    () => [styles.fullscreenButton, { right: -6 + railAdjustment }],
-    [railAdjustment],
-  );
-  const exitStyle = useMemo(
-    () => [styles.iconButton, { marginRight: railAdjustment }],
-    [railAdjustment],
-  );
-  if (!fullscreen)
-    return (
-      <>
-        <View ref={inputWrapperRef} style={inputWrapperStyle} pointerEvents={inputPointerEvents}>
-          {attachmentSlot}
-          <View style={styles.inlineTextSurface}>
-            {surface}
-            {showFullscreenButton ? (
-              <Button
-                variant="ghost"
-                size="xs"
-                accessibilityLabel={t("composer.input.fullscreen")}
-                leftIcon={maximizeIcon}
-                onPointerDown={keepEditorFocused}
-                onPress={onEnter}
-                style={enterStyle}
-                hitSlop={8}
-              >
-                {null}
-              </Button>
-            ) : null}
-          </View>
-          {toolbar}
-        </View>
-        {overlay}
-      </>
-    );
+  // The toolbar row bleeds 6px past the input padding; the inline glyph sits on that edge.
+  const enterStyle = useMemo(() => [styles.enterButton, { right: -6 + railOffset }], [railOffset]);
+  const exitStyle = useMemo(() => [styles.iconButton, { marginRight: railOffset }], [railOffset]);
   return (
-    <ComposerFullscreenHost onExit={onExit} active={active}>
-      <View style={styles.fullscreen} testID="composer-fullscreen">
+    <View
+      ref={exitScopeRef}
+      style={fullscreen ? styles.fullscreen : styles.inline}
+      testID={fullscreen ? "composer-fullscreen" : undefined}
+    >
+      {fullscreen ? (
         <View style={styles.exitRow}>
           <Button
             variant="ghost"
@@ -109,28 +98,60 @@ export function ComposerInputPresentation({
             {null}
           </Button>
         </View>
-        {surface}
-        {error}
-        <View style={styles.sendRow}>{send}</View>
-      </View>
-    </ComposerFullscreenHost>
+      ) : null}
+      <ComposerFullscreenBody fullscreen={fullscreen}>
+        <View
+          ref={inputWrapperRef}
+          style={fullscreen ? styles.fullscreenInputWrapper : inputWrapperStyle}
+          pointerEvents={inputPointerEvents}
+        >
+          {fullscreen ? null : attachmentSlot}
+          <View style={fullscreen ? styles.fullscreenTextSurface : styles.inlineTextSurface}>
+            {surface}
+            {showFullscreenButton && !fullscreen ? (
+              <Button
+                variant="ghost"
+                size="xs"
+                accessibilityLabel={t("composer.input.fullscreen")}
+                leftIcon={maximizeIcon}
+                onPointerDown={keepEditorFocused}
+                onPress={onEnter}
+                style={enterStyle}
+                hitSlop={8}
+              >
+                {null}
+              </Button>
+            ) : null}
+          </View>
+          {fullscreen ? null : toolbar}
+        </View>
+      </ComposerFullscreenBody>
+      {fullscreen ? (
+        <ComposerFullscreenFooter style={styles.footer}>
+          {error}
+          <View style={styles.sendRow}>{send}</View>
+        </ComposerFullscreenFooter>
+      ) : null}
+      {overlay}
+    </View>
   );
 }
 
 const styles = StyleSheet.create((theme) => ({
+  inline: { flexShrink: 1, position: "relative" },
   inlineTextSurface: { flexShrink: 1, position: "relative" },
   iconButton: {
-    width: 28,
-    height: 28,
+    width: CONTROL_SIZE,
+    height: CONTROL_SIZE,
     padding: 0,
     borderWidth: 0,
     borderRadius: theme.borderRadius.full,
   },
-  fullscreenButton: {
+  enterButton: {
     position: "absolute",
     top: 0,
-    width: 28,
-    height: 28,
+    width: CONTROL_SIZE,
+    height: CONTROL_SIZE,
     padding: 0,
     borderWidth: 0,
     borderRadius: theme.borderRadius.full,
@@ -141,6 +162,10 @@ const styles = StyleSheet.create((theme) => ({
     padding: theme.spacing[4],
     gap: theme.spacing[3],
   },
+  fullscreenInputWrapper: { flex: 1, minHeight: 0 },
+  fullscreenTextSurface: { flex: 1, minHeight: 0 },
   exitRow: { alignItems: "flex-end", flexShrink: 0 },
-  sendRow: { flexShrink: 0, alignItems: "flex-end" },
+  // The send error rides the keyboard with Send; below the body it would sit behind it.
+  footer: { flexShrink: 0, gap: theme.spacing[3] },
+  sendRow: { alignItems: "flex-end" },
 }));
diff --git a/packages/app/src/composer/input/state.test.ts b/packages/app/src/composer/input/state.test.ts
index a7f4113b28..6f2cdef74d 100644
--- a/packages/app/src/composer/input/state.test.ts
+++ b/packages/app/src/composer/input/state.test.ts
@@ -5,6 +5,8 @@ import {
   resolveActiveSendBehavior,
   resolveComposerSurfacePresentation,
   resolveComposerSurfaceText,
+  resolveGlyphRailOffset,
+  resolveRetainedSelection,
   runAlternateSendAction,
   runDefaultSendAction,
   runMessageInputKeyboardAction,
@@ -333,10 +335,30 @@ describe("composer surface text", () => {
     );
   });
 
-  it("uses the live handoff when its replacement has already been applied", () => {
+  it("keeps the live buffer when the initial publication is already applied", () => {
     const replacement = { kind: "initial" as const, key: "draft:0", text: "Stale publication" };
-    expect(resolveComposerSurfaceText("Live remount handoff", replacement, "draft:0")).toBe(
-      "Live remount handoff",
+    expect(resolveComposerSurfaceText("Live edited draft", replacement, "draft:0")).toBe(
+      "Live edited draft",
     );
   });
 });
+
+describe("retained selection", () => {
+  it("keeps a caret that fits and clamps one that no longer does", () => {
+    expect(resolveRetainedSelection({ start: 4, end: 17 }, 40)).toEqual({ start: 4, end: 17 });
+    expect(resolveRetainedSelection({ start: 4, end: 17 }, 10)).toEqual({ start: 4, end: 10 });
+    expect(resolveRetainedSelection({ start: 12, end: 17 }, 10)).toEqual({ start: 10, end: 10 });
+    expect(resolveRetainedSelection({ start: -1, end: 3 }, 10)).toEqual({ start: 0, end: 3 });
+  });
+});
+
+describe("fullscreen glyph rail", () => {
+  it("nudges 16px fullscreen glyphs onto the Send arrow's ink edge", () => {
+    expect(
+      resolveGlyphRailOffset({ controlSize: 28, sendIconSize: 16, glyphIconSize: 16 }),
+    ).toBeCloseTo(4 / 3);
+    expect(
+      resolveGlyphRailOffset({ controlSize: 28, sendIconSize: 20, glyphIconSize: 16 }),
+    ).toBeCloseTo(1 / 6);
+  });
+});
diff --git a/packages/app/src/composer/input/state.ts b/packages/app/src/composer/input/state.ts
index 3786613eb2..698965b5ac 100644
--- a/packages/app/src/composer/input/state.ts
+++ b/packages/app/src/composer/input/state.ts
@@ -193,6 +193,24 @@ export async function stopRealtimeVoice(ctx: StopRealtimeVoiceContext): Promise<
   await ctx.voice.stopVoice();
 }
 
+/**
+ * Offset that aligns a glyph's visible ink with the Send arrow's ink when both sit in
+ * equal controls on the same right rail. In Lucide's 24px viewBox ArrowUp ends at
+ * x19 while Maximize2/Minimize2 end at x21, so equal boxes leave the fullscreen
+ * glyphs visibly past the arrow.
+ */
+export function resolveGlyphRailOffset(input: {
+  controlSize: number;
+  sendIconSize: number;
+  glyphIconSize: number;
+}): number {
+  const arrowInkInset =
+    (input.controlSize - input.sendIconSize) / 2 + (5 * input.sendIconSize) / 24;
+  const glyphInkInset =
+    (input.controlSize - input.glyphIconSize) / 2 + (3 * input.glyphIconSize) / 24;
+  return arrowInkInset - glyphInkInset;
+}
+
 export function resolveComposerSurfaceText(
   liveText: string,
   replacement: TextReplacement,
@@ -200,3 +218,13 @@ export function resolveComposerSurfaceText(
 ): string {
   return replacement.key === appliedReplacementKey ? liveText : replacement.text;
 }
+
+/** A retained caret must fit the text the remounted editor shows. */
+export function resolveRetainedSelection(
+  retained: { start: number; end: number },
+  textLength: number,
+): { start: number; end: number } {
+  const end = Math.min(Math.max(retained.end, 0), textLength);
+  const start = Math.min(Math.max(retained.start, 0), end);
+  return { start, end };
+}
diff --git a/packages/app/src/composer/types.ts b/packages/app/src/composer/types.ts
index ee01144ed7..cb46412de0 100644
--- a/packages/app/src/composer/types.ts
+++ b/packages/app/src/composer/types.ts
@@ -9,8 +9,12 @@ export interface MessagePayload {
   forceSend?: boolean;
 }
 
+/**
+ * Text the draft owner hands the editor. `hydrated` is the owner's answer to a mount:
+ * the draft's text as persisted or still pending from the editor that unmounted.
+ */
 export interface TextReplacement {
-  kind: "initial" | "replace";
+  kind: "initial" | "hydrated" | "replace";
   key: string;
   text: string;
 }
diff --git a/packages/app/src/panels/agent-panel.tsx b/packages/app/src/panels/agent-panel.tsx
index bb51832aa0..f857bbb349 100644
--- a/packages/app/src/panels/agent-panel.tsx
+++ b/packages/app/src/panels/agent-panel.tsx
@@ -27,6 +27,11 @@ import { FileDropZone } from "@/components/file-drop/file-drop-zone";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { RetainedChatContent } from "./retained-chat-content";
 import { Composer } from "@/composer";
+import {
+  useComposerEditingSession,
+  useComposerFullscreen,
+  type ComposerEditingSession,
+} from "@/composer/editing-session";
 import { useWorkspaceHasDiffStat } from "@/composer/workspace-diff-stat";
 import {
   resolveComposerTrackControlClearance,
@@ -1155,6 +1160,9 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   const { t } = useTranslation();
   // The workspace sheet is for looking; Open as tab brings the agent back with its composer.
   const showsComposer = usePaneContext().host !== "sheet";
+  // The dock lays out fullscreen for the same session the composer edits in.
+  const composerEditingSession = useComposerEditingSession("chat");
+  const isComposerFullscreen = useComposerFullscreen(composerEditingSession);
   const subagentRows = useSubagentsForParent({ serverId, parentAgentId: agentId });
   const tasks = useSessionStore((state): TodoEntry[] | undefined =>
     state.sessions[serverId]?.agentTasks.get(agentId),
@@ -1229,6 +1237,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
         cwd={cwd}
         isSubmitLoading={false}
         agentInputDraft={agentInputDraft}
+        editingSession={composerEditingSession}
         onAttentionInputFocus={onAttentionInputFocus}
         onAttentionPromptSend={onAttentionPromptSend}
         onComposerHeightChange={handleComposerHeightChange}
@@ -1292,7 +1301,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   );
 
   const dock = (
-    <ChatSurface disabled={isArchivingCurrentAgent}>
+    <ChatSurface disabled={isArchivingCurrentAgent} fullscreen={isComposerFullscreen}>
       {dockContent}
       {composerSection}
       {dockOverlay}
@@ -1323,13 +1332,15 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
 function ChatSurface({
   children,
   disabled,
+  fullscreen,
 }: {
   children: [ReactNode, ReactNode, ReactNode];
   disabled: boolean;
+  fullscreen: boolean;
 }) {
   return (
     <FileDropZone style={styles.container} disabled={disabled}>
-      <ComposerDock>{children}</ComposerDock>
+      <ComposerDock fullscreen={fullscreen}>{children}</ComposerDock>
     </FileDropZone>
   );
 }
@@ -1473,6 +1484,7 @@ const AgentComposerSection = memo(function AgentComposerSection({
   cwd,
   isSubmitLoading,
   agentInputDraft,
+  editingSession,
   onAttentionInputFocus,
   onAttentionPromptSend,
   onComposerHeightChange,
@@ -1486,6 +1498,7 @@ const AgentComposerSection = memo(function AgentComposerSection({
   cwd: string;
   isSubmitLoading: boolean;
   agentInputDraft: AgentInputDraft;
+  editingSession: ComposerEditingSession;
   onAttentionInputFocus: () => void;
   onAttentionPromptSend: () => void;
   onComposerHeightChange: (height: number) => void;
@@ -1509,6 +1522,7 @@ const AgentComposerSection = memo(function AgentComposerSection({
       cwd={cwd}
       isSubmitLoading={isSubmitLoading}
       agentInputDraft={agentInputDraft}
+      editingSession={editingSession}
       onAttentionInputFocus={onAttentionInputFocus}
       onAttentionPromptSend={onAttentionPromptSend}
       onComposerHeightChange={onComposerHeightChange}
@@ -1524,6 +1538,7 @@ function ActiveAgentComposer({
   cwd,
   isSubmitLoading,
   agentInputDraft,
+  editingSession,
   onAttentionInputFocus,
   onAttentionPromptSend,
   onComposerHeightChange,
@@ -1535,6 +1550,7 @@ function ActiveAgentComposer({
   cwd: string;
   isSubmitLoading: boolean;
   agentInputDraft: AgentInputDraft;
+  editingSession: ComposerEditingSession;
   onAttentionInputFocus: () => void;
   onAttentionPromptSend: () => void;
   onComposerHeightChange: (height: number) => void;
@@ -1631,6 +1647,7 @@ function ActiveAgentComposer({
         onChangeAttachments={agentInputDraft.setAttachments}
         cwd={cwd}
         clearDraft={agentInputDraft.clear}
+        editingSession={editingSession}
         autoFocus
         autoFocusKey={String(agentInputDraft.attachmentFocusRequestId)}
         isSubmitLoading={isSubmitLoading}
@@ -1723,6 +1740,8 @@ const animatedStaticStyles = RNStyleSheet.create({
   inputAreaWrapper: {
     width: "100%",
     flexShrink: 1,
+    // Content-sized inline; fills the dock's fullscreen slot.
+    flexGrow: 1,
   },
 });
 
diff --git a/packages/app/src/screens/new-workspace-screen.tsx b/packages/app/src/screens/new-workspace-screen.tsx
index 39c414d9e7..6d8fd3de5a 100644
--- a/packages/app/src/screens/new-workspace-screen.tsx
+++ b/packages/app/src/screens/new-workspace-screen.tsx
@@ -17,6 +17,7 @@ import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { ChevronDown, Folder, FolderPlus, GitBranch, GitPullRequest } from "lucide-react-native";
 import { Composer } from "@/composer";
 import { ComposerDock } from "@/composer/dock";
+import { useComposerEditingSession, useComposerFullscreen } from "@/composer/editing-session";
 import { FileDropZone } from "@/components/file-drop/file-drop-zone";
 import {
   resolveComposerAttachmentSubmitFormat,
@@ -1636,6 +1637,8 @@ export function NewWorkspaceScreen({
   const { t } = useTranslation();
   const isCompact = useIsCompactFormFactor();
   const toast = useToast();
+  const composerEditing = useNewWorkspaceComposerEditing();
+  const { leaveFullscreen } = composerEditing;
   const mergeWorkspaces = useCallback(
     (targetServerId: string, workspaces: Iterable<WorkspaceDescriptor>) => {
       getHostRuntimeStore().acceptWorkspaceSnapshots(targetServerId, Array.from(workspaces));
@@ -2121,6 +2124,7 @@ export function NewWorkspaceScreen({
                 return;
               }
               outcome = "navigated";
+              leaveFullscreen();
               navigateToWorkspace({ serverId: targetServerId, workspaceId });
             },
           });
@@ -2171,6 +2175,7 @@ export function NewWorkspaceScreen({
       forkDraftSetup,
       isStillOnCreateScreen,
       launchTarget,
+      leaveFullscreen,
       selectedServerId,
       supportsForgeSearch,
       t,
@@ -2227,6 +2232,7 @@ export function NewWorkspaceScreen({
             return;
           }
           outcome = "navigated";
+          leaveFullscreen();
           navigateToWorkspace({ serverId: targetServerId, workspaceId, target });
         },
       });
@@ -2250,6 +2256,7 @@ export function NewWorkspaceScreen({
     t,
     terminalPromptText,
     toast,
+    leaveFullscreen,
     updateFormPreferences,
     withConnectedClient,
   ]);
@@ -2369,10 +2376,12 @@ export function NewWorkspaceScreen({
 
   const importSession = useImportSession({ serverId: selectedServerId });
 
+  const isComposerFullscreen = composerEditing.isFullscreen(isTerminalLaunch);
   const composer = isTerminalLaunch ? (
     <Composer
       key="terminal"
       inputMode="terminal"
+      editingSession={composerEditing.terminal}
       readOnly={!terminalTakesPrompt}
       placeholder={terminalPlaceholder}
       submitLabel={terminalSubmitLabel}
@@ -2399,6 +2408,7 @@ export function NewWorkspaceScreen({
   ) : (
     <Composer
       key="chat"
+      editingSession={composerEditing.chat}
       agentId={draftKey}
       serverId={selectedServerId}
       isPaneFocused={true}
@@ -2429,32 +2439,53 @@ export function NewWorkspaceScreen({
   );
   return (
     <FileDropZone style={styles.container}>
-      <MenuHeader borderless />
-      <View style={styles.content}>
-        <TitlebarDragRegion />
-        <NewWorkspaceLayout
-          isCompact={isCompact}
-          title={t("newWorkspace.title")}
-          formStack={formStack}
-          onImportSession={importSession.open}
-        >
-          {composer}
-          {errorMessage ? <Text style={styles.errorText}>{errorMessage}</Text> : null}
-        </NewWorkspaceLayout>
-      </View>
+      <NewWorkspaceLayout
+        isCompact={isCompact}
+        fullscreen={isComposerFullscreen}
+        title={t("newWorkspace.title")}
+        formStack={formStack}
+        onImportSession={importSession.open}
+      >
+        {composer}
+        {errorMessage ? <Text style={styles.errorText}>{errorMessage}</Text> : null}
+      </NewWorkspaceLayout>
       {importSession.sheet}
     </FileDropZone>
   );
 }
 
+/** Terminal and chat launches edit in separate sessions; the screen follows the mounted one. */
+function useNewWorkspaceComposerEditing() {
+  const terminal = useComposerEditingSession("terminal");
+  const chat = useComposerEditingSession("chat");
+  const isTerminalFullscreen = useComposerFullscreen(terminal);
+  const isChatFullscreen = useComposerFullscreen(chat);
+  // The sessions outlive the screen (its draft keeps them), so a launch that leaves
+  // the screen also leaves fullscreen; the next draft starts inline.
+  const leaveFullscreen = useCallback(() => {
+    terminal.setFullscreen(false);
+    chat.setFullscreen(false);
+  }, [chat, terminal]);
+  return {
+    terminal,
+    chat,
+    leaveFullscreen,
+    isFullscreen: (isTerminalLaunch: boolean) =>
+      isTerminalLaunch ? isTerminalFullscreen : isChatFullscreen,
+  };
+}
+
 function NewWorkspaceLayout({
   isCompact,
+  fullscreen,
   title,
   formStack,
   onImportSession,
   children,
 }: {
   isCompact: boolean;
+  /** The composer covers the screen; the header leaves and the dock fills the content. */
+  fullscreen: boolean;
   title: string;
   formStack: ReactNode;
   onImportSession: () => void;
@@ -2472,13 +2503,19 @@ function NewWorkspaceLayout({
     </>
   );
   return (
-    <ComposerDock centered={!isCompact}>
-      {setupFields}
-      <>
-        {children}
-        {isCompact ? null : importSessionButton}
-      </>
-    </ComposerDock>
+    <>
+      {fullscreen ? null : <MenuHeader borderless />}
+      <View style={styles.content}>
+        <TitlebarDragRegion />
+        <ComposerDock centered={!isCompact} fullscreen={fullscreen}>
+          {setupFields}
+          <>
+            {children}
+            {isCompact || fullscreen ? null : importSessionButton}
+          </>
+        </ComposerDock>
+      </View>
+    </>
   );
 }
 
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index 62c9ee4fa6..a8089b6112 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -1,4 +1,7 @@
-import { WorkspaceComposerEditingSessionsProvider } from "@/composer/editing-session";
+import {
+  WorkspaceComposerEditingSessionsProvider,
+  useComposerTabFullscreen,
+} from "@/composer/editing-session";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import type { JsonValue } from "@getpaseo/protocol/agent-types";
 import { getOpenAgentTabLabel } from "@getpaseo/protocol/agent-labels";
@@ -824,6 +827,16 @@ function floatsHeaderOverContent(activeTab: WorkspaceTabDescriptor | null): bool
   return supportsStreamTopOverlay && activeTab?.kind === "agent";
 }
 
+/** A fullscreen composer covers the compact header; the column lays out without it. */
+function resolveCompactHeaderLayout(input: {
+  header: ReactNode;
+  activeTab: WorkspaceTabDescriptor | null;
+  composerFullscreen: boolean;
+}): { header: ReactNode; floating: boolean } {
+  if (input.composerFullscreen) return { header: null, floating: false };
+  return { header: input.header, floating: floatsHeaderOverContent(input.activeTab) };
+}
+
 function shouldShowWorkspaceScreenHeader(input: {
   isFocusModeEnabled: boolean;
   isMobile: boolean;
@@ -3095,7 +3108,6 @@ function WorkspaceScreenContent({
     focusedPaneTabDescriptorMap,
     isRouteFocused,
     focusedPaneId,
-    // The sheet owns input while it covers the tab.
     paneFocusSuspended,
     onFocusPane: handleFocusPane,
     buildMobilePaneContentModel,
@@ -3528,6 +3540,11 @@ function WorkspaceScreenContent({
     [uiTabs, sheetTab],
   );
   const workspacePanelKey = `${normalizedServerId}:${normalizedWorkspaceId}`;
+  const compactHeaderLayout = resolveCompactHeaderLayout({
+    header: compactWorkspaceHeader,
+    activeTab: activeTabDescriptor,
+    composerFullscreen: useComposerTabFullscreen(workspacePanelKey, activeTabId),
+  });
 
   // The sheet is the column's last child, so it covers the compact header as a modal.
   const workspaceCenterColumn = isMobile ? (
@@ -3538,8 +3555,8 @@ function WorkspaceScreenContent({
     >
       <View style={styles.centerColumn}>
         <FloatingHeaderLayout
-          header={compactWorkspaceHeader}
-          floating={floatsHeaderOverContent(activeTabDescriptor)}
+          header={compactHeaderLayout.header}
+          floating={compactHeaderLayout.floating}
         >
           {(topOverlayInset) => (
             <StreamTopOverlayProvider value={topOverlayInset}>

From 6ad124758cb57698320e1287a4c27bcbad2652ae Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 06:30:17 +0700
Subject: [PATCH 163/270] Stack workspace sheets and tighten sidebar density
 (#6885)

* Stack workspace sheets and tighten sidebar density

- Workspace sheets stack: opening a target from a sheet covers it, Back and
  drag close only the top sheet, and the header is the sheet's drag handle.
- The workspace sheet reuses the shared sheet handle, background and header.
- Fix the shared sheet handle indicator rendering black.
- Sidebar text returns to semantic sizes; Pinned and Workspaces share one
  section header.

* Pause covered workspace sheets and mock the shared sheet handle in tests

* Export BottomSheetHandle from the browser test Gorhom stub

* Let a stacked sheet's backdrop catch taps on iOS

* Bring a revealed sheet to the top instead of duplicating it as a tab
---
 docs/explorer-sidebar.md                      |  17 +-
 docs/glossary.md                              |   2 +-
 .../e2e/support/helpers/workspace-sheet.ts    |  18 +-
 .../src/components/adaptive-modal-sheet.tsx   |  49 ++-
 packages/app/src/components/left-sidebar.tsx  |  51 +--
 .../src/components/sidebar-workspace-list.tsx |  18 +-
 .../sidebar/pinned-section-header.tsx         |  62 ----
 .../sidebar/project-leading-visual.tsx        |   9 +-
 .../sidebar/sidebar-group-toggle-row.tsx      |   6 +-
 .../components/sidebar/sidebar-header-row.tsx |   4 +-
 .../sidebar/sidebar-section-header.tsx        | 115 +++++++
 .../sidebar/sidebar-status-list.tsx           |  14 +-
 .../sidebar/sidebar-workspace-row-content.tsx |  11 +-
 .../ui/isolated-bottom-sheet-modal/index.tsx  |   1 +
 .../screens/settings/plugins-page.test.tsx    |   1 +
 .../screens/workspace/workspace-screen.tsx    |  16 +-
 .../workspace/workspace-sheet-host.tsx        | 321 +++++++++++-------
 .../src/stores/workspace-layout-store.test.ts | 201 ++++++++---
 .../app/src/stores/workspace-layout-store.ts  | 298 +++++++++-------
 packages/app/src/styles/density.ts            |  12 +-
 .../src/workspace-tabs/open-beside.test.ts    |  21 +-
 .../app/test-stubs/gorhom-bottom-sheet.ts     |   1 +
 22 files changed, 786 insertions(+), 462 deletions(-)
 delete mode 100644 packages/app/src/components/sidebar/pinned-section-header.tsx
 create mode 100644 packages/app/src/components/sidebar/sidebar-section-header.tsx

diff --git a/docs/explorer-sidebar.md b/docs/explorer-sidebar.md
index abd95fc35f..9415abd85a 100644
--- a/docs/explorer-sidebar.md
+++ b/docs/explorer-sidebar.md
@@ -7,7 +7,7 @@ contracts.
 | ---------------- | ---------------------------- | ------------------------------------------ |
 | Explorer sidebar | Files and Changes navigation | Cmd+E shows or hides the dedicated dock    |
 | Side pane        | Ordinary workspace content   | Created and closed like any workspace pane |
-| Workspace sheet  | Compact look-ups             | Holds one tab; closes or becomes a tab     |
+| Workspace sheet  | Compact look-ups             | Stacks tabs; each closes or becomes a tab  |
 
 ## Panel host contract
 
@@ -28,12 +28,17 @@ retention, while each shell owns its tabs, focus, dragging, resizing, and shortc
 On compact layouts, files and subagents open in a closable sheet over the workspace, so the tab
 switcher keeps only agents and terminals. A panel kind opts in with `compactSheet` in its manifest
 (`packages/app/src/panels/panel-manifest.ts`), and the layout store's `openTab` decides between
-sheet and tab, so callers open targets the same way on every layout. The sheet holds one ordinary
-`WorkspaceTab`, which is not persisted.
+sheet and tab, so callers open targets the same way on every layout. Each sheet holds one ordinary
+`WorkspaceTab`, and sheets stack: a target opened from a sheet covers it, and closing the top sheet
+(drag, Close, backdrop, or Android Back) uncovers the one below. Revealing a target that already has
+a sheet brings that sheet back to the top and closes the sheets above it, except ones holding unsaved
+work. Opening a sheet as a tab dismisses the sheets above it, since the
+tab would sit under them. The stack is not persisted.
 
-The sheet is modal and covers the whole compact column, header included. It renders in the
-workspace tree rather than through `IsolatedBottomSheetModal`: its panel needs the navigator and
-every workspace provider an ordinary pane has, and a portal drops them
+Sheets are modal and cover the whole compact column, header included. A sheet's header is its drag
+handle, because the panel scrolls on its own and content panning would fight it. Sheets render in
+the workspace tree rather than through `IsolatedBottomSheetModal`: their panels need the navigator
+and every workspace provider an ordinary pane has, and a portal drops them
 ([floating-panels.md Gotcha 7](floating-panels.md#gotcha-7--a-sheet-cannot-read-context-from-its-call-site)).
 
 A sheet holding unsaved work is never implicitly displaced; only its guarded close removes it.
diff --git a/docs/glossary.md b/docs/glossary.md
index ac988e8d2b..dcf8178bc7 100644
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -21,7 +21,7 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Repository / Remote** — Internal Git observations. They may produce mutable kind, branch, and project-grouping metadata but never the host-local project ID, root, display name, or workspace membership. No UI label.
 - **Sidebar items** — The configurable entries of the app sidebar, in two sections. Header: the rows at the head of the sidebar — New workspace, History, Search, Schedules, and plugin header items. Footer: the full-width rows between Add project and the footer icon row — Usage and plugin footer items. Add project and the icon row (Hosts, Help and support, Settings) are fixed and are not sidebar items. A plugin item may render several rows, such as one per bot; it is still one item that moves and hides as a block. Each section's order and visibility is one per-device preference (`AppSettings.sidebarNavItems`, `AppSettings.sidebarFooterItems`); every item may be off. UI: the Header and Footer cards on the Sidebar settings page. Code: `packages/app/src/sidebar-nav/model.ts` resolves a section, and the sidebar (`components/sidebar/sidebar-nav-rows.tsx`, the footer in `components/left-sidebar.tsx`) and the settings page (`screens/settings/sidebar/sidebar-nav-section.tsx`) read it through `useSidebarNavItems(section)`. Never hardcode one of these entries or add a second place that decides which ones show. Don't confuse with **Explorer sidebar**.
 - **Explorer sidebar** — The dedicated navigation dock containing the Files and Changes trees. UI: "Explorer sidebar". Code: `packages/app/src/workspace-tabs/explorer-sidebar.ts`; persisted pane identifiers retain the `explorer` spelling. See [explorer-sidebar.md](explorer-sidebar.md).
-- **Workspace sheet** — The compact sheet that holds one file or subagent tab over the workspace without adding it to the tab switcher. UI action: "Open as tab". Code: `sheetByWorkspace` in `packages/app/src/stores/workspace-layout-store.ts`, `WorkspaceSheetHost` (`packages/app/src/screens/workspace/workspace-sheet-host.tsx`). See [explorer-sidebar.md](explorer-sidebar.md#workspace-sheet).
+- **Workspace sheet** — A compact sheet that holds one file or subagent tab over the workspace without adding it to the tab switcher; opening another target from a sheet stacks a new one on top. UI action: "Open as tab". Code: `sheetsByWorkspace` in `packages/app/src/stores/workspace-layout-store.ts`, `WorkspaceSheetHost` (`packages/app/src/screens/workspace/workspace-sheet-host.tsx`). See [explorer-sidebar.md](explorer-sidebar.md#workspace-sheet).
 - **Side pane** — An ordinary right-side workspace pane used for content opened beside the user's work. It closes and participates in workspace splits like every other main-host pane. See [explorer-sidebar.md](explorer-sidebar.md#side-pane). Forbidden: "Side panel".
 - **Directory-backed surface** — A right-sidebar surface whose content is determined by the workspace's `cwd`, so two workspaces on the same directory see identical content: git diff/status, forge change-request info, file preview/explorer contents. Keyed by `(serverId, cwd)`, never `workspaceId`. See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
 - **Workspace-owned state** — Per-workspace state that never leaks to a same-`cwd` sibling: tabs, agents, terminals, panes, title, plus review drafts, diff-mode overrides, composer attachments, and file-explorer open/expand state. Keyed by `workspaceId` (`cwd` only as a fallback for old payloads). See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
diff --git a/packages/app/e2e/support/helpers/workspace-sheet.ts b/packages/app/e2e/support/helpers/workspace-sheet.ts
index 8865073c81..b0544f7df6 100644
--- a/packages/app/e2e/support/helpers/workspace-sheet.ts
+++ b/packages/app/e2e/support/helpers/workspace-sheet.ts
@@ -7,8 +7,8 @@ export function workspaceSheet(page: Page, label: string): Locator {
 
 /** Sheet height as a fraction of the viewport; mirrors the host's 92% snap point. */
 const SHEET_SNAP_FRACTION = 0.92;
-/** The dialog starts below the sheet's drag handle. */
-const SHEET_HANDLE_MAX_HEIGHT = 32;
+/** The header starts below the sheet's drag indicator, inside the handle. */
+const SHEET_INDICATOR_MAX_HEIGHT = 32;
 
 /**
  * The sheet rests at its snap point, docked to the bottom edge. A sheet pushed up past it
@@ -18,14 +18,16 @@ export async function expectWorkspaceSheetAtSnap(page: Page, label: string): Pro
   const viewportHeight = page.viewportSize()?.height ?? 0;
   const snapTop = Math.round(viewportHeight * (1 - SHEET_SNAP_FRACTION));
   const sheet = workspaceSheet(page, label);
+  const header = sheet.getByTestId("workspace-sheet-header");
+  const body = sheet.getByTestId("workspace-sheet-body");
   await expect
     .poll(async () => {
-      const box = await sheet.boundingBox();
-      if (!box) return null;
-      const top = Math.round(box.y);
+      const [headerBox, bodyBox] = await Promise.all([header.boundingBox(), body.boundingBox()]);
+      if (!headerBox || !bodyBox) return null;
+      const top = Math.round(headerBox.y);
       return {
-        dockedToBottom: Math.round(box.y + box.height) === viewportHeight,
-        topAtSnap: top >= snapTop && top <= snapTop + SHEET_HANDLE_MAX_HEIGHT,
+        dockedToBottom: Math.round(bodyBox.y + bodyBox.height) === viewportHeight,
+        topAtSnap: top >= snapTop && top <= snapTop + SHEET_INDICATOR_MAX_HEIGHT,
       };
     })
     .toEqual({ dockedToBottom: true, topAtSnap: true });
@@ -73,9 +75,11 @@ export async function selectTabFromSwitcher(page: Page, label: string): Promise<
   await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
 }
 
+/** Taps the top sheet's backdrop; each stacked sheet renders its own, top last. */
 export async function tapWorkspaceSheetBackdrop(page: Page): Promise<void> {
   await page
     .getByRole("button", { name: "Bottom sheet backdrop" })
+    .last()
     .click({ position: { x: 10, y: 10 } });
 }
 
diff --git a/packages/app/src/components/adaptive-modal-sheet.tsx b/packages/app/src/components/adaptive-modal-sheet.tsx
index 707c0e8622..f7b4d4056c 100644
--- a/packages/app/src/components/adaptive-modal-sheet.tsx
+++ b/packages/app/src/components/adaptive-modal-sheet.tsx
@@ -1,10 +1,10 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
-import type { ReactNode } from "react";
+import type { ComponentProps, ReactNode } from "react";
 import { createPortal } from "react-dom";
 import { useTranslation } from "react-i18next";
 import { Keyboard, Pressable, Text, View } from "react-native";
 import type { DimensionValue, StyleProp, ViewStyle } from "react-native";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import {
   getOverlayRoot,
@@ -12,7 +12,7 @@ import {
   useGlobalWebOverlayLayer,
   useWebOverlayRegistration,
 } from "../lib/overlay-root";
-import { type BottomSheetBackgroundProps } from "@gorhom/bottom-sheet";
+import { BottomSheetHandle, type BottomSheetBackgroundProps } from "@gorhom/bottom-sheet";
 import Animated from "react-native-reanimated";
 import { ArrowLeft, Search, X } from "lucide-react-native";
 import {
@@ -223,7 +223,8 @@ const styles = StyleSheet.create((theme) => ({
 
 const WEB_EXIT_DURATION_MS = 160;
 
-function SheetBackground({ style }: BottomSheetBackgroundProps) {
+/** The compact sheet's surface: Gorhom's `backgroundComponent` for every bottom sheet. */
+export function SheetBackground({ style }: BottomSheetBackgroundProps) {
   const { theme } = useUnistyles();
   const combinedStyle = useMemo(
     () => [
@@ -239,6 +240,39 @@ function SheetBackground({ style }: BottomSheetBackgroundProps) {
   return <Animated.View pointerEvents="none" style={combinedStyle} />;
 }
 
+const ThemedBottomSheetHandle = withUnistyles(BottomSheetHandle, (theme) => ({
+  indicatorStyle: { backgroundColor: theme.colors.palette.zinc[600] },
+}));
+
+const HANDLE_WITH_CONTENT_STYLE = { paddingHorizontal: 0, paddingBottom: 0 };
+
+/**
+ * The compact sheet's drag handle: Gorhom's `handleComponent` for every bottom sheet. Children
+ * join the handle, so a header passed here drags the sheet like the indicator does. That is how a
+ * sheet whose content scrolls on its own keeps its header draggable without content panning.
+ */
+export function SheetHandle({
+  children,
+  // Gorhom passes `indicatorStyle={undefined}`, which would override the themed indicator.
+  indicatorStyle: _indicatorStyle,
+  ...props
+}: ComponentProps<typeof BottomSheetHandle>) {
+  if (!children) return <ThemedBottomSheetHandle {...props} />;
+  // The children carry their own semantics; the handle's slider role would swallow them on web.
+  return (
+    <ThemedBottomSheetHandle
+      {...props}
+      style={HANDLE_WITH_CONTENT_STYLE}
+      accessible={false}
+      accessibilityRole={null}
+      accessibilityLabel={null}
+      accessibilityHint={null}
+    >
+      {children}
+    </ThemedBottomSheetHandle>
+  );
+}
+
 /**
  * The sheet body, indented to the sheet's content inset.
  *
@@ -449,7 +483,6 @@ export function AdaptiveModalSheet({
   bodyStyle,
   contextBridge = null,
 }: AdaptiveModalSheetProps) {
-  const { theme } = useUnistyles();
   const { t } = useTranslation();
   const isMobile = useIsCompactFormFactor();
   const insets = useSafeAreaInsets();
@@ -481,10 +514,6 @@ export function AdaptiveModalSheet({
       ) : null,
     [footer, footerClearanceStyle, footerContainerStyle],
   );
-  const handleIndicatorStyle = useMemo(
-    () => ({ 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
@@ -600,7 +629,7 @@ export function AdaptiveModalSheet({
         backdropOpacity={0.45}
         enablePanDownToClose
         backgroundComponent={SheetBackground}
-        handleIndicatorStyle={handleIndicatorStyle}
+        handleComponent={SheetHandle}
         keyboardBehavior="extend"
         keyboardBlurBehavior="restore"
         accessible={false}
diff --git a/packages/app/src/components/left-sidebar.tsx b/packages/app/src/components/left-sidebar.tsx
index 087a3ffca8..f054668347 100644
--- a/packages/app/src/components/left-sidebar.tsx
+++ b/packages/app/src/components/left-sidebar.tsx
@@ -35,6 +35,7 @@ import { SidebarNavRows } from "@/components/sidebar/sidebar-nav-rows";
 import { SidebarHelpMenu } from "@/components/sidebar/sidebar-help-menu";
 import { SidebarResizeHandle } from "@/components/sidebar-resize-handle";
 import { DensityIcon } from "@/components/ui/density-icon";
+import { SidebarSectionHeader } from "@/components/sidebar/sidebar-section-header";
 import { Shortcut } from "@/components/ui/shortcut";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { HEADER_INNER_HEIGHT, useIsCompactFormFactor } from "@/constants/layout";
@@ -805,21 +806,18 @@ function DesktopSidebar({
 
 function WorkspacesSectionHeader() {
   return (
-    <View style={styles.workspacesSectionHeader}>
-      <Text style={styles.workspacesSectionTitle}>Workspaces</Text>
-      <View style={styles.workspacesSectionActions}>
-        <Tooltip delayDuration={300}>
-          <TooltipTrigger asChild>
-            <View>
-              <SidebarDisplayPreferencesMenu />
-            </View>
-          </TooltipTrigger>
-          <TooltipContent side="bottom" align="center" offset={8}>
-            <IconTooltipContent label="Display preferences" />
-          </TooltipContent>
-        </Tooltip>
-      </View>
-    </View>
+    <SidebarSectionHeader title="Workspaces">
+      <Tooltip delayDuration={300}>
+        <TooltipTrigger asChild>
+          <View>
+            <SidebarDisplayPreferencesMenu />
+          </View>
+        </TooltipTrigger>
+        <TooltipContent side="bottom" align="center" offset={8}>
+          <IconTooltipContent label="Display preferences" />
+        </TooltipContent>
+      </Tooltip>
+    </SidebarSectionHeader>
   );
 }
 
@@ -850,29 +848,6 @@ const styles = StyleSheet.create((theme) => ({
   sidebarHeaderGroupBelowChrome: {
     paddingTop: 0,
   },
-  workspacesSectionHeader: {
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "space-between",
-    gap: theme.spacing[2],
-    // Rendered inside the scroll's listContent (paddingHorizontal spacing[2]). The title
-    // lands at spacing[2] left to align with project icons. Settings2's painted path stops
-    // inside its 14px SVG, so 4px aligns the ink rather than the SVG box to the row rail.
-    paddingLeft: theme.spacing[2],
-    paddingRight: 4,
-    paddingTop: theme.spacing[1],
-    paddingBottom: theme.spacing[1],
-  },
-  workspacesSectionTitle: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.normal,
-  },
-  workspacesSectionActions: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-  },
   sidebarContent: {
     flex: 1,
     minHeight: 0,
diff --git a/packages/app/src/components/sidebar-workspace-list.tsx b/packages/app/src/components/sidebar-workspace-list.tsx
index bbda666436..c750121368 100644
--- a/packages/app/src/components/sidebar-workspace-list.tsx
+++ b/packages/app/src/components/sidebar-workspace-list.tsx
@@ -30,7 +30,7 @@ import {
   type ActiveWorkspaceSelection,
 } from "@/stores/navigation-active-workspace-store";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { density, densityFontSize, densityIconBox } from "@/styles/density";
+import { density, densityIconBox } from "@/styles/density";
 import type { Theme } from "@/styles/theme";
 import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
 import { getSidebarRowBackdrop } from "@/components/sidebar/sidebar-row-backdrop";
@@ -93,7 +93,7 @@ import {
   SidebarWorkspaceMenu,
 } from "@/components/sidebar/sidebar-workspace-menu";
 import { useLongPressDragInteraction } from "@/components/sidebar/use-long-press-drag-interaction";
-import { PinnedSectionHeader } from "@/components/sidebar/pinned-section-header";
+import { SidebarSectionHeader } from "@/components/sidebar/sidebar-section-header";
 import { SidebarGroupToggleRow } from "@/components/sidebar/sidebar-group-toggle-row";
 import { useLimitedSidebarGroup } from "@/components/sidebar/use-limited-sidebar-group";
 import {
@@ -2114,6 +2114,7 @@ function ProjectModeList({
   onToggleWorkspacePin: ToggleSidebarWorkspacePin;
   onPinnedWorkspaceReorder: (workspaces: SidebarWorkspacePlacement[]) => void;
 }) {
+  const { t } = useTranslation();
   const hasActiveHostFilter = useSidebarViewStore((state) => state.hostFilters.length > 0);
   const [creatingWorkspaceIds, setCreatingWorkspaceIds] = useState<Set<string>>(() => new Set());
   const creatingWorkspaceTimeoutsRef = useRef<Map<string, ReturnType<typeof setTimeout>>>(
@@ -2413,7 +2414,12 @@ function ProjectModeList({
     <>
       {pinnedChats.length > 0 ? (
         <View style={styles.pinnedSection} testID="sidebar-pinned-section">
-          <PinnedSectionHeader collapsed={pinnedCollapsed} onToggle={togglePinnedCollapsed} />
+          <SidebarSectionHeader
+            title={t("sidebar.pinned.title")}
+            collapsed={pinnedCollapsed}
+            onToggle={togglePinnedCollapsed}
+            testID="sidebar-pinned-section-header"
+          />
           {pinnedCollapsed ? null : (
             <>
               <DraggableList
@@ -2550,12 +2556,12 @@ const styles = StyleSheet.create((theme) => ({
   },
   newWorkspaceGhostText: {
     color: theme.colors.foregroundMuted,
-    fontSize: densityFontSize(theme, "base"),
+    fontSize: theme.fontSize.base,
     minWidth: 0,
     flexShrink: 1,
   },
   newWorkspaceGhostTextHovered: {
-    fontSize: densityFontSize(theme, "base"),
+    fontSize: theme.fontSize.base,
     minWidth: 0,
     flexShrink: 1,
     color: theme.colors.foreground,
@@ -2603,7 +2609,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   projectTitle: {
     color: theme.colors.foregroundMuted,
-    fontSize: densityFontSize(theme, "base"),
+    fontSize: theme.fontSize.base,
     fontWeight: "400",
     minWidth: 0,
     flexShrink: 1,
diff --git a/packages/app/src/components/sidebar/pinned-section-header.tsx b/packages/app/src/components/sidebar/pinned-section-header.tsx
deleted file mode 100644
index 2169492a08..0000000000
--- a/packages/app/src/components/sidebar/pinned-section-header.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { ChevronDown, ChevronRight } from "lucide-react-native";
-import { Pressable, Text } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { DensityIcon } from "@/components/ui/density-icon";
-import { useIsCompactFormFactor } from "@/constants/layout";
-import { isNative } from "@/constants/platform";
-import { density, densityFontSize } from "@/styles/density";
-
-export function PinnedSectionHeader({
-  collapsed,
-  onToggle,
-}: {
-  collapsed: boolean;
-  onToggle: () => void;
-}) {
-  const { t } = useTranslation();
-  const isCompact = useIsCompactFormFactor();
-  const accessibilityState = useMemo(() => ({ expanded: !collapsed }), [collapsed]);
-
-  return (
-    <Pressable
-      accessibilityRole="button"
-      accessibilityState={accessibilityState}
-      onPress={onToggle}
-      style={styles.header}
-      testID="sidebar-pinned-section-header"
-    >
-      {({ hovered }) => (
-        <>
-          <Text style={styles.title}>{t("sidebar.pinned.title")}</Text>
-          {hovered || isNative || isCompact ? (
-            <DensityIcon
-              icon={collapsed ? ChevronRight : ChevronDown}
-              size="xs"
-              color="foregroundMuted"
-            />
-          ) : null}
-        </>
-      )}
-    </Pressable>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  header: {
-    minHeight: density.rowHeight,
-    flexDirection: "row",
-    alignItems: "center",
-    alignSelf: "flex-start",
-    gap: theme.spacing[1],
-    paddingHorizontal: theme.spacing[2],
-    paddingVertical: theme.spacing[1],
-    userSelect: "none",
-  },
-  title: {
-    color: theme.colors.foregroundMuted,
-    fontSize: densityFontSize(theme, "sm"),
-    fontWeight: theme.fontWeight.normal,
-  },
-}));
diff --git a/packages/app/src/components/sidebar/project-leading-visual.tsx b/packages/app/src/components/sidebar/project-leading-visual.tsx
index 3f31181220..1830e3fa10 100644
--- a/packages/app/src/components/sidebar/project-leading-visual.tsx
+++ b/packages/app/src/components/sidebar/project-leading-visual.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import { ChevronDown, ChevronRight, CircleAlert } from "lucide-react-native";
 import { ProjectIconView } from "@/components/project-icon-view";
 import { getStatusBucketLabel } from "@/hooks/sidebar-status-view-model";
-import { density, densityIconBox, densityIconProps } from "@/styles/density";
+import { densityIconBox, densityIconProps } from "@/styles/density";
 import type { Theme } from "@/styles/theme";
 import type { SidebarStateBucket } from "@/utils/sidebar-agent-state";
 import {
@@ -24,6 +24,9 @@ import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
 
 // Every surfaced status shares one badge shell, so the badge never changes size or position
 // between states. Only the thing inside it changes.
+// Matches the workspace title's lineHeight (sidebar-workspace-row-content's
+// workspaceBranchText) so the icon centers on the title rather than floating above it.
+const LEADING_SLOT_HEIGHT = 20;
 const STATUS_BADGE_SIZE = 12;
 // How far the badge overhangs the icon's bottom-right corner. Well short of half the badge:
 // centered on the corner it reads as hanging off the icon rather than sitting on it, and the
@@ -273,10 +276,10 @@ const styles = StyleSheet.create((theme) => {
     // The slot is as tall as the title's line box, not as tall as the icon, and centers the
     // icon inside it. Rows lay their leading visual out with alignItems:flex-start, so a slot
     // only as tall as the icon puts it above the title and the kebab — which is why the
-    // workspace status indicator shares the same `rowLineHeight`.
+    // workspace status indicator is as tall as `LEADING_SLOT_HEIGHT`.
     projectLeadingVisualSlot: {
       width: densityIconBox("md"),
-      height: density.rowLineHeight,
+      height: LEADING_SLOT_HEIGHT,
       flexShrink: 0,
       alignItems: "center",
       justifyContent: "center",
diff --git a/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx b/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx
index 3d437ae0ca..01e07eedd4 100644
--- a/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx
+++ b/packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx
@@ -6,7 +6,7 @@ import { StyleSheet } from "react-native-unistyles";
 import { isWeb } from "@/constants/platform";
 import { sidebarWorkspaceRowStyles } from "@/components/sidebar/sidebar-workspace-row-content";
 import { DensityIcon } from "@/components/ui/density-icon";
-import { density, densityFontSize, densityIconBox } from "@/styles/density";
+import { density, densityIconBox } from "@/styles/density";
 
 /**
  * The row that ends a truncated group. It is a workspace row that happens to say "Show more", so
@@ -100,13 +100,13 @@ const styles = StyleSheet.create((theme) => ({
   },
   text: {
     color: theme.colors.foregroundMuted,
-    fontSize: densityFontSize(theme, "base"),
+    fontSize: theme.fontSize.base,
     minWidth: 0,
     flexShrink: 1,
   },
   textHovered: {
     color: theme.colors.foreground,
-    fontSize: densityFontSize(theme, "base"),
+    fontSize: theme.fontSize.base,
     minWidth: 0,
     flexShrink: 1,
   },
diff --git a/packages/app/src/components/sidebar/sidebar-header-row.tsx b/packages/app/src/components/sidebar/sidebar-header-row.tsx
index 7001bf66a6..2eeded947d 100644
--- a/packages/app/src/components/sidebar/sidebar-header-row.tsx
+++ b/packages/app/src/components/sidebar/sidebar-header-row.tsx
@@ -4,7 +4,7 @@ import { StyleSheet } from "react-native-unistyles";
 import { HEADER_INNER_HEIGHT, HEADER_INNER_HEIGHT_MOBILE } from "@/constants/layout";
 import { DensityIcon } from "@/components/ui/density-icon";
 import { Shortcut } from "@/components/ui/shortcut";
-import { density, densityFontSize, densityIconBox } from "@/styles/density";
+import { density, densityIconBox } from "@/styles/density";
 import type { ShortcutKey } from "@/utils/format-shortcut";
 
 type SidebarHeaderRowVariant = "header" | "compact" | "inline";
@@ -152,7 +152,7 @@ const styles = StyleSheet.create((theme) => ({
   iconSpacerCompact: { width: densityIconBox("sm"), height: densityIconBox("sm") },
   label: {
     flexShrink: 1,
-    fontSize: densityFontSize(theme, "base"),
+    fontSize: theme.fontSize.base,
     fontWeight: theme.fontWeight.normal,
     color: theme.colors.foregroundMuted,
   },
diff --git a/packages/app/src/components/sidebar/sidebar-section-header.tsx b/packages/app/src/components/sidebar/sidebar-section-header.tsx
new file mode 100644
index 0000000000..7a959435bc
--- /dev/null
+++ b/packages/app/src/components/sidebar/sidebar-section-header.tsx
@@ -0,0 +1,115 @@
+import { useMemo, type ReactNode } from "react";
+import { ChevronDown, ChevronRight } from "lucide-react-native";
+import { Pressable, Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { DensityIcon } from "@/components/ui/density-icon";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { isNative } from "@/constants/platform";
+import { density } from "@/styles/density";
+
+/** A sidebar section label such as "Pinned" or "Workspaces". A section with `onToggle`
+ * collapses from its title; children sit at the trailing edge as its actions. */
+export function SidebarSectionHeader({
+  title,
+  collapsed,
+  onToggle,
+  testID,
+  children,
+}: {
+  title: string;
+  collapsed?: boolean;
+  onToggle?: () => void;
+  testID?: string;
+  children?: ReactNode;
+}) {
+  return (
+    <View style={styles.header}>
+      {onToggle ? (
+        <CollapsibleTitle
+          title={title}
+          collapsed={collapsed ?? false}
+          onToggle={onToggle}
+          testID={testID}
+        />
+      ) : (
+        <Text style={styles.title} testID={testID}>
+          {title}
+        </Text>
+      )}
+      {children ? <View style={styles.actions}>{children}</View> : null}
+    </View>
+  );
+}
+
+function CollapsibleTitle({
+  title,
+  collapsed,
+  onToggle,
+  testID,
+}: {
+  title: string;
+  collapsed: boolean;
+  onToggle: () => void;
+  testID?: string;
+}) {
+  const isCompact = useIsCompactFormFactor();
+  const accessibilityState = useMemo(() => ({ expanded: !collapsed }), [collapsed]);
+
+  return (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityState={accessibilityState}
+      onPress={onToggle}
+      style={styles.toggle}
+      testID={testID}
+    >
+      {({ hovered }) => (
+        <>
+          <Text style={styles.title}>{title}</Text>
+          {hovered || isNative || isCompact ? (
+            <DensityIcon
+              icon={collapsed ? ChevronRight : ChevronDown}
+              size="xs"
+              color="foregroundMuted"
+            />
+          ) : null}
+        </>
+      )}
+    </Pressable>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  header: {
+    minHeight: density.rowHeight,
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "space-between",
+    gap: theme.spacing[2],
+    // The title lands at spacing[2] to align with the rows' leading icons. Trailing actions
+    // are icon buttons whose painted glyph stops inside the SVG box, so 4px aligns the ink
+    // rather than the box to the row rail.
+    paddingLeft: theme.spacing[2],
+    paddingRight: 4,
+    userSelect: "none",
+  },
+  // The toggle reaches back over the header's leading padding so the whole label edge is pressable.
+  toggle: {
+    alignSelf: "stretch",
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1],
+    marginLeft: -theme.spacing[2],
+    paddingHorizontal: theme.spacing[2],
+  },
+  title: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.normal,
+  },
+  actions: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1],
+  },
+}));
diff --git a/packages/app/src/components/sidebar/sidebar-status-list.tsx b/packages/app/src/components/sidebar/sidebar-status-list.tsx
index 85c0d524f8..baffc3a010 100644
--- a/packages/app/src/components/sidebar/sidebar-status-list.tsx
+++ b/packages/app/src/components/sidebar/sidebar-status-list.tsx
@@ -28,7 +28,7 @@ import type { HostBadgeModel } from "@/hosts/appearance";
 import { isWeb as platformIsWeb, isNative as platformIsNative } from "@/constants/platform";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { StyleSheet } from "react-native-unistyles";
-import { density, densityFontSize, densityIconBox, densityIconProps } from "@/styles/density";
+import { density, densityIconBox, densityIconProps } from "@/styles/density";
 import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
 import { withUnistyles } from "react-native-unistyles";
 import {
@@ -73,7 +73,7 @@ import {
   SidebarWorkspaceContextMenu,
   SidebarWorkspaceMenu,
 } from "@/components/sidebar/sidebar-workspace-menu";
-import { PinnedSectionHeader } from "@/components/sidebar/pinned-section-header";
+import { SidebarSectionHeader } from "@/components/sidebar/sidebar-section-header";
 import { SidebarGroupToggleRow } from "@/components/sidebar/sidebar-group-toggle-row";
 import { useLimitedSidebarGroup } from "@/components/sidebar/use-limited-sidebar-group";
 import type { ToggleSidebarWorkspacePin } from "@/hooks/use-sidebar-workspace-pin";
@@ -146,6 +146,7 @@ export function SidebarStatusWorkspaceList({
   parentGestureRef,
   dragGestureHostActive,
 }: StatusWorkspaceListProps) {
+  const { t } = useTranslation();
   const collapsedWorkspaceGroupKeys = useSidebarCollapsedSectionsStore(
     (state) => state.collapsedWorkspaceGroupKeys,
   );
@@ -202,7 +203,12 @@ export function SidebarStatusWorkspaceList({
     <>
       {pinnedWorkspaces.length > 0 ? (
         <View style={styles.pinnedSection} testID="sidebar-pinned-section">
-          <PinnedSectionHeader collapsed={pinnedCollapsed} onToggle={togglePinnedCollapsed} />
+          <SidebarSectionHeader
+            title={t("sidebar.pinned.title")}
+            collapsed={pinnedCollapsed}
+            onToggle={togglePinnedCollapsed}
+            testID="sidebar-pinned-section-header"
+          />
           {pinnedCollapsed ? null : (
             <>
               <DraggableList
@@ -1099,7 +1105,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   statusGroupTitle: {
     color: theme.colors.foregroundMuted,
-    fontSize: densityFontSize(theme, "base"),
+    fontSize: theme.fontSize.base,
     fontWeight: "400",
     minWidth: 0,
     flexShrink: 1,
diff --git a/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx b/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
index 33f14afcb5..7fc904f3b3 100644
--- a/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
+++ b/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
@@ -16,7 +16,7 @@ import {
   type SidebarWorkspaceTrailing,
 } from "@/components/sidebar/workspace-trailing";
 import { useAppSettings } from "@/hooks/use-settings";
-import { density, densityFontSize, densityIconBox } from "@/styles/density";
+import { densityIconBox } from "@/styles/density";
 import type { Theme } from "@/styles/theme";
 import type { SidebarStateBucket } from "@/utils/sidebar-agent-state";
 import { getStatusDotColor } from "@/utils/status-dot-color";
@@ -453,6 +453,9 @@ export function SidebarWorkspaceTrailingActionOverlay({
   );
 }
 
+// The status dot centres on the title's first line, so both share its line height.
+const TITLE_LINE_HEIGHT = 20;
+
 const styles = StyleSheet.create((theme) => ({
   workspaceRowContent: {
     position: "relative",
@@ -481,7 +484,7 @@ const styles = StyleSheet.create((theme) => ({
   workspaceStatusDot: {
     position: "relative",
     width: densityIconBox("md"),
-    height: density.rowLineHeight,
+    height: TITLE_LINE_HEIGHT,
     borderRadius: theme.borderRadius.full,
     flexShrink: 0,
     alignItems: "center",
@@ -513,9 +516,9 @@ const styles = StyleSheet.create((theme) => ({
   // to the meta row, so it takes the full width the trailing slot leaves behind.
   workspaceBranchText: {
     color: theme.colors.foreground,
-    fontSize: densityFontSize(theme, "base"),
+    fontSize: theme.fontSize.base,
     fontWeight: "400",
-    lineHeight: density.rowLineHeight,
+    lineHeight: TITLE_LINE_HEIGHT,
     opacity: 0.76,
     flex: 1,
     minWidth: 0,
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
index 8dd55e5678..55e475b424 100644
--- a/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
@@ -154,3 +154,4 @@ export function useIsolatedBottomSheetVisibility({
 }
 
 export { SheetVisibleFrame } from "./visible-frame";
+export { systemBackPress } from "./back-press";
diff --git a/packages/app/src/screens/settings/plugins-page.test.tsx b/packages/app/src/screens/settings/plugins-page.test.tsx
index 0ede3f803b..8a502749db 100644
--- a/packages/app/src/screens/settings/plugins-page.test.tsx
+++ b/packages/app/src/screens/settings/plugins-page.test.tsx
@@ -80,6 +80,7 @@ vi.mock("@gorhom/bottom-sheet", async () => {
     await vi.importActual<typeof import("react-native")>("react-native");
   return {
     BottomSheetBackdrop: () => null,
+    BottomSheetHandle: () => null,
     BottomSheetModal: ReactModule.forwardRef(() => null),
     BottomSheetScrollView: ScrollView,
     BottomSheetTextInput: TextInput,
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index a8089b6112..ef5b6aa779 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -78,6 +78,7 @@ import {
   selectExplorerSidebarPaneId,
   selectPaneFocusSuspended,
   type WorkspaceLayout,
+  type WorkspaceSheet,
   type WorkspaceTabPlacement,
   useWorkspaceLayoutStore,
   useWorkspaceLayoutStoreHydrated,
@@ -207,6 +208,7 @@ import { RenderProfile } from "@/utils/render-profiler";
 import { useWorkspaceCheckoutStatus } from "@/screens/workspace/use-workspace-checkout-status";
 import { useHasPullRequest, usePullRequestAutoAdd } from "@/panels/pull-request";
 
+const NO_SHEETS: readonly WorkspaceSheet[] = [];
 const WORKSPACE_FLOATING_PANEL_PORTAL_HOST_PREFIX = "workspace-floating-panels";
 const EMPTY_UI_TABS: WorkspaceTab[] = [];
 const EMPTY_WORKSPACE_SCRIPTS: WorkspaceDescriptor["scripts"] = [];
@@ -1322,8 +1324,12 @@ function WorkspaceScreenContent({
   const focusWorkspaceTab = useWorkspaceLayoutStore((state) => state.focusTab);
   const selectWorkspaceTabInPane = useWorkspaceLayoutStore((state) => state.selectTabInPane);
   const closeWorkspaceTab = useWorkspaceLayoutStore((state) => state.closeTab);
+  const sheets = useWorkspaceLayoutStore((state) =>
+    persistenceKey ? (state.sheetsByWorkspace[persistenceKey] ?? NO_SHEETS) : NO_SHEETS,
+  );
+  // Only the top sheet is on screen.
   const sheetTab = useWorkspaceLayoutStore((state) =>
-    persistenceKey ? (state.sheetByWorkspace[persistenceKey]?.tab ?? null) : null,
+    persistenceKey ? (state.sheetsByWorkspace[persistenceKey]?.at(-1)?.tab ?? null) : null,
   );
   const unpinWorkspaceAgent = useWorkspaceLayoutStore((state) => state.unpinAgent);
   const hideWorkspaceAgent = useWorkspaceLayoutStore((state) => state.hideAgent);
@@ -2082,7 +2088,7 @@ function WorkspaceScreenContent({
 
   const handleCloseTabById = useCallback(
     async (tabId: string) => {
-      if (persistenceKey && sheetTab?.tabId === tabId) {
+      if (persistenceKey && sheets.some((sheet) => sheet.tab.tabId === tabId)) {
         if (await confirmDiscardModifiedTab(tabId)) {
           closeWorkspaceTab(persistenceKey, tabId);
         }
@@ -2113,7 +2119,7 @@ function WorkspaceScreenContent({
       handleClosePassiveTab,
       handleCloseTerminalTab,
       persistenceKey,
-      sheetTab,
+      sheets,
     ],
   );
 
@@ -3536,8 +3542,8 @@ function WorkspaceScreenContent({
   const rendersDesktopSplitContent = !isMobile && desktopSplitContent !== null;
 
   const workspacePanelTabIds = useMemo(
-    () => [...uiTabs.map((tab) => tab.tabId), ...(sheetTab ? [sheetTab.tabId] : [])],
-    [uiTabs, sheetTab],
+    () => [...uiTabs.map((tab) => tab.tabId), ...sheets.map((sheet) => sheet.tab.tabId)],
+    [uiTabs, sheets],
   );
   const workspacePanelKey = `${normalizedServerId}:${normalizedWorkspaceId}`;
   const compactHeaderLayout = resolveCompactHeaderLayout({
diff --git a/packages/app/src/screens/workspace/workspace-sheet-host.tsx b/packages/app/src/screens/workspace/workspace-sheet-host.tsx
index d44bdb6cc9..a46ea2c1c7 100644
--- a/packages/app/src/screens/workspace/workspace-sheet-host.tsx
+++ b/packages/app/src/screens/workspace/workspace-sheet-host.tsx
@@ -1,16 +1,31 @@
 import BottomSheet, {
   BottomSheetBackdrop,
   type BottomSheetBackdropProps,
+  type BottomSheetHandleProps,
 } from "@gorhom/bottom-sheet";
 import { useIsFocused } from "@react-navigation/native";
-import { type ComponentType, useCallback, useEffect, useMemo, useRef } from "react";
-import { BackHandler, View } from "react-native";
+import {
+  type ComponentType,
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+} from "react";
+import { View } from "react-native";
 import { useTranslation } from "react-i18next";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { SheetHeaderView } from "@/components/adaptive-modal-sheet";
+import {
+  SheetBackground,
+  SheetHandle,
+  SheetHeaderView,
+  type SheetHeader,
+} from "@/components/adaptive-modal-sheet";
+import { systemBackPress } from "@/components/ui/isolated-bottom-sheet-modal";
+import { RetainedPanelActivity } from "@/components/retained-panel";
 import { Button } from "@/components/ui/button";
-import { isNative } from "@/constants/platform";
 import type { PanelIconProps } from "@/panels/panel-registry";
 import { getPanelRegistration } from "@/panels/panel-registry";
 import { ensurePanelsRegistered } from "@/panels/register-panels";
@@ -22,17 +37,7 @@ import {
 import { useWorkspaceLayoutStore, type WorkspaceSheet } from "@/stores/workspace-layout-store";
 
 const SNAP_POINTS = ["92%"];
-
-const ThemedBottomSheet = withUnistyles(BottomSheet, (theme) => ({
-  backgroundStyle: {
-    backgroundColor: theme.colors.surface0,
-    borderTopLeftRadius: theme.borderRadius["2xl"],
-    borderTopRightRadius: theme.borderRadius["2xl"],
-  },
-  handleIndicatorStyle: {
-    backgroundColor: theme.colors.palette.zinc[600],
-  },
-}));
+const NO_SHEETS: readonly WorkspaceSheet[] = [];
 
 function PanelIcon({
   icon: Icon,
@@ -46,6 +51,8 @@ const ThemedPanelIcon = withUnistyles(PanelIcon, (theme) => ({
   color: theme.colors.foregroundMuted,
 }));
 
+// The workspace sheet is a Gorhom sheet rendered in place rather than a portaled modal, so the
+// backdrop closes the sheet itself instead of dismissing the top of the modal stack.
 function renderBackdrop(props: BottomSheetBackdropProps) {
   return (
     <BottomSheetBackdrop
@@ -58,6 +65,45 @@ function renderBackdrop(props: BottomSheetBackdropProps) {
   );
 }
 
+// Stacked sheets share the bottom sheet's dim rather than darkening it again, but still catch the
+// tap so it closes the top sheet. The backdrop is clear rather than transparent: iOS skips views
+// under 0.01 opacity when hit testing, which would hand the tap to the sheet below.
+function renderStackedBackdrop(props: BottomSheetBackdropProps) {
+  return (
+    <BottomSheetBackdrop
+      {...props}
+      style={styles.clearBackdrop}
+      appearsOnIndex={0}
+      disappearsOnIndex={-1}
+      opacity={1}
+      pressBehavior="close"
+    />
+  );
+}
+
+interface WorkspaceSheetHandleValue {
+  header: SheetHeader;
+  onClose: () => void;
+}
+
+const WorkspaceSheetHandleContext = createContext<WorkspaceSheetHandleValue | null>(null);
+
+// Gorhom renders `handleComponent` as a component type, so it stays one module-level component and
+// reads the header from context; a per-render function would remount the header on every change.
+function WorkspaceSheetHandle(props: BottomSheetHandleProps) {
+  const value = useContext(WorkspaceSheetHandleContext);
+  if (!value) throw new Error("WorkspaceSheetHandle must render inside a workspace sheet");
+  return (
+    <SheetHandle {...props}>
+      <SheetHeaderView
+        header={value.header}
+        onClose={value.onClose}
+        testID="workspace-sheet-header"
+      />
+    </SheetHandle>
+  );
+}
+
 export interface WorkspaceSheetHostProps {
   workspaceKey: string | null;
   serverId: string;
@@ -73,96 +119,54 @@ interface WorkspaceSheetPresentationProps extends Omit<
   "workspaceKey" | "onCloseTab"
 > {
   sheet: WorkspaceSheet;
-  onClose: () => Promise<void>;
-  onOpenAsTab: () => void;
+  /** Only the bottom sheet dims the workspace; the ones above share its dim. */
+  isBottom: boolean;
+  /** Only the top sheet answers Android Back; the ones below wait their turn. */
+  isTop: boolean;
+  onClose: (tabId: string) => Promise<void>;
+  onOpenAsTab: (tabId: string) => void;
 }
 
 /**
- * Hosts the workspace's sheet tab over the compact tab strip. It renders in the workspace tree,
- * not through a portal, so the panel keeps every context an ordinary pane has.
+ * Hosts the workspace's sheets over the compact tab strip, one Gorhom sheet per entry, top last.
+ * They render in the workspace tree, not through a portal, so each panel keeps every context an
+ * ordinary pane has. The shared sheet parts (`SheetBackground`, `SheetHandle`, `SheetHeaderView`)
+ * keep them looking and dragging like every other sheet.
  */
 export function WorkspaceSheetHost({ workspaceKey, onCloseTab, ...rest }: WorkspaceSheetHostProps) {
-  const sheet = useWorkspaceLayoutStore((state) =>
-    workspaceKey ? (state.sheetByWorkspace[workspaceKey] ?? null) : null,
+  const sheets = useWorkspaceLayoutStore((state) =>
+    workspaceKey ? (state.sheetsByWorkspace[workspaceKey] ?? NO_SHEETS) : NO_SHEETS,
   );
   const openSheetAsTab = useWorkspaceLayoutStore((state) => state.openSheetAsTab);
-  const sheetTabId = sheet?.tab.tabId ?? null;
-  const handleClose = useCallback(async () => {
-    if (sheetTabId) await onCloseTab(sheetTabId);
-  }, [onCloseTab, sheetTabId]);
-  const handleOpenAsTab = useCallback(() => {
-    if (workspaceKey) openSheetAsTab(workspaceKey);
-  }, [openSheetAsTab, workspaceKey]);
-  if (!sheet) return null;
+  const handleOpenAsTab = useCallback(
+    (tabId: string) => {
+      if (workspaceKey) openSheetAsTab(workspaceKey, tabId);
+    },
+    [openSheetAsTab, workspaceKey],
+  );
+  if (sheets.length === 0) return null;
   return (
-    <WorkspaceSheetPresentation
-      {...rest}
-      sheet={sheet}
-      onClose={handleClose}
-      onOpenAsTab={handleOpenAsTab}
-    />
+    <View style={styles.host} pointerEvents="box-none">
+      {sheets.map((sheet, index) => (
+        <WorkspaceSheetPresentation
+          // Keyed by tab id and kind, so the registration and its descriptor hook stay fixed.
+          key={`${sheet.tab.tabId}:${sheet.tab.target.kind}`}
+          {...rest}
+          sheet={sheet}
+          isBottom={index === 0}
+          isTop={index === sheets.length - 1}
+          onClose={onCloseTab}
+          onOpenAsTab={handleOpenAsTab}
+        />
+      ))}
+    </View>
   );
 }
 
 function WorkspaceSheetPresentation({
   sheet,
-  serverId,
-  workspaceId,
-  isWorkspaceFocused,
-  buildContent,
-  onClose,
-  onOpenAsTab,
-}: WorkspaceSheetPresentationProps) {
-  const sheetRef = useRef<BottomSheet>(null);
-  const isScreenFocused = useIsFocused();
-  const ownsBackPress = isNative && isWorkspaceFocused && isScreenFocused;
-  const handleChange = useCallback(
-    (index: number) => {
-      if (index !== -1) return;
-      // A declined close (unsaved changes) leaves the tab in the sheet, so bring it back up.
-      void onClose().then(() => sheetRef.current?.snapToIndex(0));
-    },
-    [onClose],
-  );
-  useEffect(() => {
-    // Hidden workspaces stay mounted in the deck and under Settings; only the visible one owns back.
-    if (!ownsBackPress) return;
-    const subscription = BackHandler.addEventListener("hardwareBackPress", () => {
-      void onClose();
-      return true;
-    });
-    return () => subscription.remove();
-  }, [onClose, ownsBackPress]);
-
-  return (
-    <View style={styles.host} pointerEvents="box-none">
-      <ThemedBottomSheet
-        ref={sheetRef}
-        index={0}
-        snapPoints={SNAP_POINTS}
-        enableDynamicSizing={false}
-        enablePanDownToClose
-        enableContentPanningGesture={false}
-        backdropComponent={renderBackdrop}
-        onChange={handleChange}
-      >
-        <WorkspaceSheetBody
-          key={`${sheet.tab.tabId}:${sheet.tab.target.kind}`}
-          sheet={sheet}
-          serverId={serverId}
-          workspaceId={workspaceId}
-          isWorkspaceFocused={isWorkspaceFocused}
-          buildContent={buildContent}
-          onClose={onClose}
-          onOpenAsTab={onOpenAsTab}
-        />
-      </ThemedBottomSheet>
-    </View>
-  );
-}
-
-function WorkspaceSheetBody({
-  sheet,
+  isBottom,
+  isTop,
   serverId,
   workspaceId,
   isWorkspaceFocused,
@@ -172,17 +176,110 @@ function WorkspaceSheetBody({
 }: WorkspaceSheetPresentationProps) {
   const { t } = useTranslation();
   const { tab } = sheet;
+  const sheetRef = useRef<BottomSheet>(null);
+  const isScreenFocused = useIsFocused();
   ensurePanelsRegistered();
   const registration = getPanelRegistration(tab.target.kind);
   if (!registration) {
     throw new Error(`No panel registration for kind: ${tab.target.kind}`);
   }
-  // The body is keyed by tab id and kind, so the registration and its descriptor hook stay fixed.
   const descriptor = registration.useDescriptor(tab.target as never, {
     serverId,
     workspaceId,
     tabId: tab.tabId,
   });
+
+  const handleClose = useCallback(() => onClose(tab.tabId), [onClose, tab.tabId]);
+  const handleChange = useCallback(
+    (index: number) => {
+      if (index !== -1) return;
+      // A declined close (unsaved changes) leaves the tab in the sheet, so bring it back up.
+      void handleClose().then(() => sheetRef.current?.snapToIndex(0));
+    },
+    [handleClose],
+  );
+  // Hidden workspaces stay mounted in the deck and under Settings; only the visible one owns back.
+  const ownsBackPress = isTop && isWorkspaceFocused && isScreenFocused;
+  useEffect(() => {
+    if (!ownsBackPress) return;
+    return systemBackPress.subscribe(() => {
+      void handleClose();
+      return true;
+    });
+  }, [handleClose, ownsBackPress]);
+
+  const handleOpenAsTab = useCallback(() => onOpenAsTab(tab.tabId), [onOpenAsTab, tab.tabId]);
+  const header = useMemo<SheetHeader>(
+    () => ({
+      title: descriptor.label,
+      leading: <ThemedPanelIcon icon={descriptor.icon} size={16} />,
+      actions: sheet.policy.openAsTab ? (
+        <Button size="sm" variant="secondary" onPress={handleOpenAsTab}>
+          {t("workspace.sheet.openAsTab")}
+        </Button>
+      ) : undefined,
+    }),
+    [descriptor.icon, descriptor.label, handleOpenAsTab, sheet.policy.openAsTab, t],
+  );
+  const handleHeaderClose = useCallback(() => {
+    void handleClose();
+  }, [handleClose]);
+  const handleValue = useMemo<WorkspaceSheetHandleValue>(
+    () => ({ header, onClose: handleHeaderClose }),
+    [handleHeaderClose, header],
+  );
+
+  return (
+    // Gorhom renders the handle beside the content, so the dialog wraps the whole sheet.
+    <View
+      style={styles.sheetLayer}
+      pointerEvents="box-none"
+      role="dialog"
+      aria-label={descriptor.label}
+    >
+      {/* The header is the sheet's handle: the panel scrolls on its own, so dragging the content
+          would fight it, and the header is where people reach to pull the sheet down. */}
+      <WorkspaceSheetHandleContext.Provider value={handleValue}>
+        <BottomSheet
+          ref={sheetRef}
+          index={0}
+          snapPoints={SNAP_POINTS}
+          enableDynamicSizing={false}
+          enablePanDownToClose
+          enableContentPanningGesture={false}
+          backgroundComponent={SheetBackground}
+          handleComponent={WorkspaceSheetHandle}
+          backdropComponent={isBottom ? renderBackdrop : renderStackedBackdrop}
+          onChange={handleChange}
+          accessible={false}
+        >
+          {/* A covered sheet keeps its state but stops its live work until it is on top again. */}
+          <RetainedPanelActivity active={isTop}>
+            <WorkspaceSheetBody
+              tab={tab}
+              isPaneFocused={isTop && isWorkspaceFocused}
+              isWorkspaceFocused={isWorkspaceFocused}
+              buildContent={buildContent}
+            />
+          </RetainedPanelActivity>
+        </BottomSheet>
+      </WorkspaceSheetHandleContext.Provider>
+    </View>
+  );
+}
+
+function WorkspaceSheetBody({
+  tab,
+  isPaneFocused,
+  isWorkspaceFocused,
+  buildContent,
+}: {
+  tab: WorkspaceSheet["tab"];
+  /** Only the top sheet's pane is focused; the ones below are covered. */
+  isPaneFocused: boolean;
+  isWorkspaceFocused: boolean;
+  buildContent: (tab: WorkspaceTabDescriptor) => WorkspacePaneContentModel;
+}) {
   const tabDescriptor = useMemo<WorkspaceTabDescriptor>(
     () => ({
       key: tab.tabId,
@@ -194,38 +291,20 @@ function WorkspaceSheetBody({
     [tab],
   );
   const content = useMemo(() => buildContent(tabDescriptor), [buildContent, tabDescriptor]);
-  const handleClose = useCallback(() => {
-    void onClose();
-  }, [onClose]);
   // The sheet reaches the bottom of the screen, so it owns the system navigation inset.
   const { bottom: bottomInset } = useSafeAreaInsets();
   const contentStyle = useMemo(
     () => [styles.content, { paddingBottom: bottomInset }],
     [bottomInset],
   );
-  const header = useMemo(
-    () => ({
-      title: descriptor.label,
-      leading: <ThemedPanelIcon icon={descriptor.icon} size={16} />,
-      actions: sheet.policy.openAsTab ? (
-        <Button size="sm" variant="secondary" onPress={onOpenAsTab}>
-          {t("workspace.sheet.openAsTab")}
-        </Button>
-      ) : undefined,
-    }),
-    [descriptor.icon, descriptor.label, onOpenAsTab, sheet.policy.openAsTab, t],
-  );
 
   return (
-    <View style={styles.body} role="dialog" aria-label={descriptor.label}>
-      <SheetHeaderView header={header} onClose={handleClose} />
-      <View style={contentStyle}>
-        <WorkspacePaneContent
-          content={content}
-          isWorkspaceFocused={isWorkspaceFocused}
-          isPaneFocused={isWorkspaceFocused}
-        />
-      </View>
+    <View style={contentStyle} testID="workspace-sheet-body">
+      <WorkspacePaneContent
+        content={content}
+        isWorkspaceFocused={isWorkspaceFocused}
+        isPaneFocused={isPaneFocused}
+      />
     </View>
   );
 }
@@ -234,9 +313,11 @@ const styles = StyleSheet.create({
   host: {
     ...StyleSheet.absoluteFillObject,
   },
-  body: {
-    flex: 1,
-    minHeight: 0,
+  clearBackdrop: {
+    backgroundColor: "transparent",
+  },
+  sheetLayer: {
+    ...StyleSheet.absoluteFillObject,
   },
   content: {
     flex: 1,
diff --git a/packages/app/src/stores/workspace-layout-store.test.ts b/packages/app/src/stores/workspace-layout-store.test.ts
index 8c061d18b3..fc973f442d 100644
--- a/packages/app/src/stores/workspace-layout-store.test.ts
+++ b/packages/app/src/stores/workspace-layout-store.test.ts
@@ -4449,7 +4449,7 @@ describe("compact workspace sheet", () => {
 
   function createCompactStore() {
     const store = createWorkspaceLayoutStore(workspaceLayoutIds);
-    store.setState({ layoutByWorkspace: {}, sheetByWorkspace: {} });
+    store.setState({ layoutByWorkspace: {}, sheetsByWorkspace: {} });
     store.getState().setLayoutMode("compact");
     store.getState().openTab({
       workspaceKey,
@@ -4459,6 +4459,16 @@ describe("compact workspace sheet", () => {
     return store;
   }
 
+  function topSheet(store: ReturnType<typeof createCompactStore>) {
+    return store.getState().sheetsByWorkspace[workspaceKey]?.at(-1);
+  }
+
+  function sheetTargets(store: ReturnType<typeof createCompactStore>) {
+    return (store.getState().sheetsByWorkspace[workspaceKey] ?? []).map(
+      (sheet) => sheet.tab.target,
+    );
+  }
+
   function tabKinds(store: ReturnType<typeof createCompactStore>): string[] {
     const layout = store.getState().layoutByWorkspace[workspaceKey];
     const tabsById = new Map(collectAllTabs(layout.root).map((tab) => [tab.tabId, tab]));
@@ -4523,7 +4533,7 @@ describe("compact workspace sheet", () => {
 
     const tabId = store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
 
-    expect(store.getState().sheetByWorkspace[workspaceKey]?.tab).toEqual({
+    expect(topSheet(store)?.tab).toEqual({
       tabId,
       target: fileTarget,
       createdAt: expect.any(Number),
@@ -4547,22 +4557,71 @@ describe("compact workspace sheet", () => {
     const tabId = store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
 
     expect(tabId).toBe(fileTabId);
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(topSheet(store)).toBeUndefined();
     const layout = store.getState().layoutByWorkspace[workspaceKey];
     expect(findPaneContainingTab(layout.root, fileTabId ?? "")?.focusedTabId).toBe(fileTabId);
   });
 
-  it("replaces the sheet content with the next sheet target", () => {
+  it("stacks the next sheet target over the open sheet", () => {
     const store = createCompactStore();
     store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
 
+    const nextTarget = { kind: "file" as const, path: "src/other.ts" };
+    const nextTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: nextTarget, intent: "reveal" });
+
+    expect(sheetTargets(store)).toEqual([fileTarget, nextTarget]);
+    expect(tabKinds(store)).toEqual(["terminal"]);
+
+    store.getState().closeTab(workspaceKey, nextTabId ?? "");
+    expect(sheetTargets(store)).toEqual([fileTarget]);
+  });
+
+  it("closes a lower sheet and keeps the sheets above it", () => {
+    const store = createCompactStore();
+    const fileTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
     const nextTarget = { kind: "file" as const, path: "src/other.ts" };
     store.getState().openTab({ workspaceKey, target: nextTarget, intent: "reveal" });
 
-    expect(store.getState().sheetByWorkspace[workspaceKey]?.tab.target).toEqual(nextTarget);
+    store.getState().closeTab(workspaceKey, fileTabId ?? "");
+
+    expect(sheetTargets(store)).toEqual([nextTarget]);
     expect(tabKinds(store)).toEqual(["terminal"]);
   });
 
+  it("brings a stacked target back to the top by dropping the sheets above it", () => {
+    const store = createCompactStore();
+    const fileTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+    store
+      .getState()
+      .openTab({ workspaceKey, target: { kind: "file", path: "src/other.ts" }, intent: "reveal" });
+
+    const tabId = store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+
+    expect(tabId).toBe(fileTabId);
+    expect(sheetTargets(store)).toEqual([fileTarget]);
+  });
+
+  it("opens the top sheet as a tab and dismisses the sheets that would cover it", () => {
+    const store = createCompactStore();
+    store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+    const nextTabId = store
+      .getState()
+      .openTab({ workspaceKey, target: { kind: "file", path: "src/other.ts" }, intent: "reveal" });
+
+    store.getState().openSheetAsTab(workspaceKey, nextTabId ?? "");
+
+    expect(sheetTargets(store)).toEqual([]);
+    expect(tabKinds(store)).toEqual(["terminal", "file"]);
+    const layout = store.getState().layoutByWorkspace[workspaceKey];
+    expect(findPaneById(layout.root, "main")?.focusedTabId).toBe(nextTabId);
+  });
+
   it("closes the sheet when a tab target is revealed, and keeps it for background opens", () => {
     const store = createCompactStore();
     store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
@@ -4572,7 +4631,7 @@ describe("compact workspace sheet", () => {
       target: { kind: "file", path: "src/background.ts" },
       intent: "background",
     });
-    expect(store.getState().sheetByWorkspace[workspaceKey]?.tab.target).toEqual(fileTarget);
+    expect(topSheet(store)?.tab.target).toEqual(fileTarget);
     expect(tabKinds(store)).toEqual(["terminal", "file"]);
 
     store.getState().openTab({
@@ -4580,7 +4639,7 @@ describe("compact workspace sheet", () => {
       target: { kind: "terminal", terminalId: "term-2" },
       intent: "reveal",
     });
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(topSheet(store)).toBeUndefined();
   });
 
   it("moves the sheet tab into the focused pane with the same tab id and state", () => {
@@ -4591,10 +4650,10 @@ describe("compact workspace sheet", () => {
     if (!sheetTabId) throw new Error("Expected a sheet tab");
     store.getState().setTabState(workspaceKey, sheetTabId, { scrollTop: 120 });
 
-    const tabId = store.getState().openSheetAsTab(workspaceKey);
+    const tabId = store.getState().openSheetAsTab(workspaceKey, sheetTabId);
 
     expect(tabId).toBe(sheetTabId);
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(topSheet(store)).toBeUndefined();
     const layout = store.getState().layoutByWorkspace[workspaceKey];
     const pane = findPaneContainingTab(layout.root, sheetTabId);
     expect(pane?.id).toBe(layout.focusedPaneId);
@@ -4616,7 +4675,7 @@ describe("compact workspace sheet", () => {
     expect(store.getState().layoutByWorkspace[workspaceKey]).toBe(layoutBefore);
 
     store.getState().closeTab(workspaceKey, sheetTabId);
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(topSheet(store)).toBeUndefined();
     expect(tabKinds(store)).toEqual(["terminal"]);
   });
 
@@ -4639,19 +4698,21 @@ describe("compact workspace sheet", () => {
 
     store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
 
-    expect(store.getState().sheetByWorkspace).toEqual({});
+    expect(store.getState().sheetsByWorkspace).toEqual({});
     expect(tabKinds(store)).toEqual(["terminal", "file"]);
   });
 
-  it("keeps the sheet content as a tab when the layout widens", () => {
+  it("keeps every stacked sheet as a tab when the layout widens, focusing the top one", () => {
     const store = createCompactStore();
+    store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
     const sheetTabId = store
       .getState()
-      .openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+      .openTab({ workspaceKey, target: { kind: "file", path: "src/other.ts" }, intent: "reveal" });
 
     store.getState().setLayoutMode("split-panes");
 
-    expect(store.getState().sheetByWorkspace).toEqual({});
+    expect(store.getState().sheetsByWorkspace).toEqual({});
+    expect(tabKinds(store)).toEqual(["terminal", "file", "file"]);
     const layout = store.getState().layoutByWorkspace[workspaceKey];
     expect(findPaneContainingTab(layout.root, sheetTabId ?? "")?.focusedTabId).toBe(sheetTabId);
   });
@@ -4669,7 +4730,7 @@ describe("compact workspace sheet", () => {
       target: { kind: "agent", agentId: "child" },
       intent: "reveal",
     });
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toMatchObject({
+    expect(topSheet(store)).toMatchObject({
       tab: { target: { kind: "agent", agentId: "child" } },
       policy: { openAsTab: true },
     });
@@ -4679,7 +4740,7 @@ describe("compact workspace sheet", () => {
       target: { kind: "provider_subagent", parentAgentId: "root", subagentId: "task-1" },
       intent: "reveal",
     });
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toMatchObject({
+    expect(topSheet(store)).toMatchObject({
       tab: { target: { kind: "provider_subagent", subagentId: "task-1" } },
       policy: { openAsTab: false },
     });
@@ -4689,7 +4750,7 @@ describe("compact workspace sheet", () => {
         .getState()
         .openTab({ workspaceKey, target: { kind: "agent", agentId }, intent: "reveal" });
     }
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(topSheet(store)).toBeUndefined();
     expect(tabKinds(store)).toEqual(["terminal", "agent", "agent"]);
   });
 
@@ -4715,9 +4776,9 @@ describe("compact workspace sheet", () => {
       intent: "reveal",
       parentTabId: childSheetTabId ?? undefined,
     });
-    expect(store.getState().sheetByWorkspace[workspaceKey]?.parentTabId).toBe(rootTabId);
+    expect(topSheet(store)?.parentTabId).toBe(rootTabId);
 
-    store.getState().openSheetAsTab(workspaceKey);
+    store.getState().openSheetAsTab(workspaceKey, fileSheetTabId ?? "");
     const layout = store.getState().layoutByWorkspace[workspaceKey];
     expect(layout.parentTabIdByTabId?.[fileSheetTabId ?? ""]).toBe(rootTabId);
   });
@@ -4746,7 +4807,7 @@ describe("compact workspace sheet", () => {
       intent: "reveal",
       parentTabId: openChildSheet(),
     });
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(topSheet(store)).toBeUndefined();
     let layout = store.getState().layoutByWorkspace[workspaceKey];
     expect(findPaneById(layout.root, "main")?.focusedTabId).toBe(terminalTabId);
 
@@ -4756,7 +4817,7 @@ describe("compact workspace sheet", () => {
       intent: "reveal",
       parentTabId: openChildSheet(),
     });
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(topSheet(store)).toBeUndefined();
     layout = store.getState().layoutByWorkspace[workspaceKey];
     expect(findPaneById(layout.root, "main")?.focusedTabId).toBe(secondRootTabId);
     expect(layout.parentTabIdByTabId?.[secondRootTabId ?? ""]).toBe(rootTabId);
@@ -4798,22 +4859,45 @@ describe("compact workspace sheet", () => {
     });
 
     function sheetTabId(store: ReturnType<typeof createCompactStore>): string | null {
-      return store.getState().sheetByWorkspace[workspaceKey]?.tab.tabId ?? null;
+      return topSheet(store)?.tab.tabId ?? null;
     }
 
-    it("opens the next sheet target as a tab under a modified sheet", () => {
+    it("stacks the next sheet target over a modified sheet", () => {
       const store = createCompactStore();
-      const modifiedSheetTabId = openModifiedFileSheet(store);
+      openModifiedFileSheet(store);
 
       const nextTarget = { kind: "file" as const, path: "src/other.ts" };
       const nextTabId = store
         .getState()
         .openTab({ workspaceKey, target: nextTarget, intent: "reveal" });
 
-      expect(sheetTabId(store)).toBe(modifiedSheetTabId);
-      expect(store.getState().sheetByWorkspace[workspaceKey]?.tab.state).toEqual({ scrollTop: 40 });
-      expect(stripTab(store, nextTabId ?? "")).toMatchObject({ target: nextTarget });
-      expect(focusedTabId(store)).toBe(nextTabId);
+      expect(sheetTabId(store)).toBe(nextTabId);
+      expect(sheetTargets(store)).toEqual([fileTarget, nextTarget]);
+      expect(store.getState().sheetsByWorkspace[workspaceKey]?.[0]?.tab.state).toEqual({
+        scrollTop: 40,
+      });
+    });
+
+    it("brings a covered sheet back to the top and keeps a modified sheet above it beneath", () => {
+      const store = createCompactStore();
+      const otherTarget = { kind: "file" as const, path: "src/other.ts" };
+      const otherTabId = store
+        .getState()
+        .openTab({ workspaceKey, target: otherTarget, intent: "reveal" });
+      const modifiedSheetTabId = openModifiedFileSheet(store);
+      const focusedBefore = focusedTabId(store);
+
+      const tabId = store
+        .getState()
+        .openTab({ workspaceKey, target: otherTarget, intent: "reveal" });
+
+      expect(tabId).toBe(otherTabId);
+      expect(sheetTargets(store)).toEqual([fileTarget, otherTarget]);
+      expect(store.getState().sheetsByWorkspace[workspaceKey]?.[0]?.tab.tabId).toBe(
+        modifiedSheetTabId,
+      );
+      expect(stripTab(store, tabId ?? "")).toBeNull();
+      expect(focusedTabId(store)).toBe(focusedBefore);
     });
 
     it("opens a tab target under a modified sheet without closing it", () => {
@@ -4853,23 +4937,6 @@ describe("compact workspace sheet", () => {
       expect(tabKinds(store)).toEqual(["terminal", "terminal"]);
     });
 
-    it("replaces an unmodified sheet with the next sheet target", () => {
-      const store = createCompactStore();
-      store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
-
-      store.getState().openTab({
-        workspaceKey,
-        target: { kind: "file", path: "src/other.ts" },
-        intent: "reveal",
-      });
-
-      expect(store.getState().sheetByWorkspace[workspaceKey]?.tab.target).toEqual({
-        kind: "file",
-        path: "src/other.ts",
-      });
-      expect(tabKinds(store)).toEqual(["terminal"]);
-    });
-
     it("closes an unmodified sheet when another tab is chosen", () => {
       const store = createCompactStore();
       const secondTabId = store.getState().openTab({
@@ -4913,10 +4980,38 @@ describe("compact workspace sheet", () => {
     };
 
     store.getState().reconcileTabs(workspaceKey, { ...snapshot, agentsHydrated: false });
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeDefined();
+    expect(topSheet(store)).toBeDefined();
 
     store.getState().reconcileTabs(workspaceKey, { ...snapshot, agentsHydrated: true });
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(topSheet(store)).toBeUndefined();
+  });
+
+  it("drops a departed agent's sheet from the middle of the stack", () => {
+    seedAgents([
+      { id: "root", parentAgentId: null, workspaceId: "sheet-ws" },
+      { id: "child", parentAgentId: "root", workspaceId: "sheet-ws" },
+    ]);
+    const store = createCompactStore();
+    const nextTarget = { kind: "file" as const, path: "src/other.ts" };
+    store.getState().openTab({ workspaceKey, target: fileTarget, intent: "reveal" });
+    store.getState().openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "child" },
+      intent: "reveal",
+    });
+    store.getState().openTab({ workspaceKey, target: nextTarget, intent: "reveal" });
+
+    store.getState().reconcileTabs(workspaceKey, {
+      agentsHydrated: true,
+      terminalsHydrated: false,
+      activeAgentIds: ["root"],
+      autoOpenAgentIds: [],
+      knownTerminalIds: ["term-1"],
+      standaloneTerminalIds: ["term-1"],
+      hasActivePendingTerminalCreate: false,
+    });
+
+    expect(sheetTargets(store)).toEqual([fileTarget, nextTarget]);
   });
 
   it("closes the sheet when its agent stops being a subagent, leaving one tab for it", () => {
@@ -4941,7 +5036,7 @@ describe("compact workspace sheet", () => {
     };
 
     store.getState().reconcileTabs(workspaceKey, { ...snapshot, autoOpenAgentIds: [] });
-    expect(store.getState().sheetByWorkspace[workspaceKey]?.tab.tabId).toBe(sheetTabId);
+    expect(topSheet(store)?.tab.tabId).toBe(sheetTabId);
 
     seedAgents([
       { id: "root", parentAgentId: null, workspaceId: "sheet-ws" },
@@ -4949,7 +5044,7 @@ describe("compact workspace sheet", () => {
     ]);
     store.getState().reconcileTabs(workspaceKey, snapshot);
 
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(topSheet(store)).toBeUndefined();
     const layout = store.getState().layoutByWorkspace[workspaceKey];
     expect(
       collectAllTabs(layout.root).filter(
@@ -4975,7 +5070,7 @@ describe("compact workspace sheet", () => {
       .replaceTab(workspaceKey, sheetTabId ?? "", { kind: "agent", agentId: "child" });
 
     expect(replacedTabId).toBe(sheetTabId);
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toMatchObject({
+    expect(topSheet(store)).toMatchObject({
       tab: { tabId: sheetTabId, target: { kind: "agent", agentId: "child" } },
       policy: { openAsTab: true },
     });
@@ -4992,7 +5087,7 @@ describe("compact workspace sheet", () => {
       terminalId: "term-2",
     });
 
-    expect(store.getState().sheetByWorkspace[workspaceKey]).toBeUndefined();
+    expect(topSheet(store)).toBeUndefined();
     expect(replacedTabId).toBe(sheetTabId);
     const layout = store.getState().layoutByWorkspace[workspaceKey];
     expect(findPaneById(layout.root, "main")?.focusedTabId).toBe(sheetTabId);
@@ -5008,12 +5103,12 @@ describe("compact workspace sheet", () => {
     const received: string[][] = [];
     const stop = observeOpenWorkspaceAgentIds("server-1", (ids) => received.push(ids), store);
 
-    store.getState().openTab({
+    const sheetTabId = store.getState().openTab({
       workspaceKey,
       target: { kind: "agent", agentId: "child" },
       intent: "reveal",
     });
-    store.getState().closeSheet(workspaceKey);
+    store.getState().closeTab(workspaceKey, sheetTabId ?? "");
     stop();
 
     expect(received).toEqual([[], ["child"], []]);
diff --git a/packages/app/src/stores/workspace-layout-store.ts b/packages/app/src/stores/workspace-layout-store.ts
index 226265860a..ba186b655a 100644
--- a/packages/app/src/stores/workspace-layout-store.ts
+++ b/packages/app/src/stores/workspace-layout-store.ts
@@ -126,8 +126,11 @@ export interface WorkspaceSheet {
 interface WorkspaceLayoutStore {
   /** Published once by the app shell; callers never pass a form factor to open a tab. */
   layoutMode: WorkspaceLayoutMode;
-  /** At most one sheet tab per workspace. Not persisted: a reload returns to the tab strip. */
-  sheetByWorkspace: Record<string, WorkspaceSheet>;
+  /**
+   * Each workspace's open sheets, bottom to top; only the top one is on screen. A workspace with
+   * no sheet has no entry. Not persisted: a reload returns to the tab strip.
+   */
+  sheetsByWorkspace: Record<string, readonly WorkspaceSheet[]>;
   layoutByWorkspace: Record<string, WorkspaceLayout>;
   splitSizesByWorkspace: Record<string, Record<string, number[]>>;
   explorerSidebarWidthByWorkspace: Record<string, number>;
@@ -148,9 +151,8 @@ interface WorkspaceLayoutStore {
     input: Pick<OpenWorkspaceTabInput, "workspaceKey" | "target" | "intent">,
   ) => boolean;
   setLayoutMode: (mode: WorkspaceLayoutMode) => void;
-  closeSheet: (workspaceKey: string) => void;
-  /** Moves the sheet's tab, keeping its tab id, into the focused pane. */
-  openSheetAsTab: (workspaceKey: string) => string | null;
+  /** Moves a sheet's tab, keeping its tab id, into the focused pane. */
+  openSheetAsTab: (workspaceKey: string, tabId: string) => string | null;
   /** Placement resolves lazily so an already acknowledged workspace never creates a side pane. */
   autoOpenPullRequestTab: (
     workspaceKey: string,
@@ -508,12 +510,12 @@ export function selectExplorerSidebarPaneId(
 
 /** A workspace's panes give up keyboard focus while focus is parked or the sheet covers them. */
 export function selectPaneFocusSuspended(
-  state: Pick<WorkspaceLayoutStore, "focusRestorationByWorkspace" | "sheetByWorkspace">,
+  state: Pick<WorkspaceLayoutStore, "focusRestorationByWorkspace" | "sheetsByWorkspace">,
   workspaceKey: string,
 ): boolean {
   return (
     Boolean(state.focusRestorationByWorkspace[workspaceKey]?.restorePaneId) ||
-    workspaceKey in state.sheetByWorkspace
+    workspaceKey in state.sheetsByWorkspace
   );
 }
 
@@ -682,15 +684,63 @@ function attachParentTab(input: {
   });
 }
 
-function withoutSheet(
-  state: Pick<WorkspaceLayoutStore, "sheetByWorkspace">,
+const NO_SHEETS: readonly WorkspaceSheet[] = [];
+
+function getSheets(
+  state: Pick<WorkspaceLayoutStore, "sheetsByWorkspace">,
   workspaceKey: string,
-): Pick<WorkspaceLayoutStore, "sheetByWorkspace"> {
-  if (!(workspaceKey in state.sheetByWorkspace)) {
-    return { sheetByWorkspace: state.sheetByWorkspace };
+): readonly WorkspaceSheet[] {
+  return state.sheetsByWorkspace[workspaceKey] ?? NO_SHEETS;
+}
+
+function findSheet(
+  state: Pick<WorkspaceLayoutStore, "sheetsByWorkspace">,
+  workspaceKey: string,
+  tabId: string,
+): WorkspaceSheet | undefined {
+  return getSheets(state, workspaceKey).find((sheet) => sheet.tab.tabId === tabId);
+}
+
+function withSheets(
+  state: Pick<WorkspaceLayoutStore, "sheetsByWorkspace">,
+  workspaceKey: string,
+  sheets: readonly WorkspaceSheet[],
+): Pick<WorkspaceLayoutStore, "sheetsByWorkspace"> {
+  if (sheets.length > 0) {
+    return { sheetsByWorkspace: { ...state.sheetsByWorkspace, [workspaceKey]: sheets } };
   }
-  const { [workspaceKey]: _removed, ...sheetByWorkspace } = state.sheetByWorkspace;
-  return { sheetByWorkspace };
+  if (!(workspaceKey in state.sheetsByWorkspace)) {
+    return { sheetsByWorkspace: state.sheetsByWorkspace };
+  }
+  const { [workspaceKey]: _removed, ...sheetsByWorkspace } = state.sheetsByWorkspace;
+  return { sheetsByWorkspace };
+}
+
+function withoutSheet(
+  state: Pick<WorkspaceLayoutStore, "sheetsByWorkspace">,
+  workspaceKey: string,
+  tabId: string,
+): Pick<WorkspaceLayoutStore, "sheetsByWorkspace"> {
+  return withSheets(
+    state,
+    workspaceKey,
+    getSheets(state, workspaceKey).filter((sheet) => sheet.tab.tabId !== tabId),
+  );
+}
+
+function withSheetTab(
+  state: Pick<WorkspaceLayoutStore, "sheetsByWorkspace">,
+  workspaceKey: string,
+  tabId: string,
+  update: (sheet: WorkspaceSheet) => WorkspaceSheet,
+): Pick<WorkspaceLayoutStore, "sheetsByWorkspace"> {
+  return withSheets(
+    state,
+    workspaceKey,
+    getSheets(state, workspaceKey).map((sheet) =>
+      sheet.tab.tabId === tabId ? update(sheet) : sheet,
+    ),
+  );
 }
 
 function isTargetOpenAsTab(layout: WorkspaceLayout | undefined, target: WorkspaceTabTarget) {
@@ -713,30 +763,16 @@ function resolveSheetPolicy(
 }
 
 /**
- * The parent a newly opened tab links to. A target opened from inside the sheet names the sheet's
- * tab, which the open replaces or closes, so it inherits the sheet's own parent instead.
+ * The parent a newly opened tab links to. A sheet tab is not in the layout, so a target opened
+ * from inside a sheet inherits that sheet's own parent instead.
  */
 function resolveOpenParentTabId(
-  state: Pick<WorkspaceLayoutStore, "sheetByWorkspace">,
+  state: Pick<WorkspaceLayoutStore, "sheetsByWorkspace">,
   workspaceKey: string,
   parentTabId: string | undefined,
 ): string | null {
-  const sheet = state.sheetByWorkspace[workspaceKey];
-  if (sheet && parentTabId === sheet.tab.tabId) return sheet.parentTabId;
-  return parentTabId ?? null;
-}
-
-/** A reveal of the resource the sheet already shows keeps the sheet's tab. */
-function sheetKeepsTabFor(
-  sheet: WorkspaceSheet | undefined,
-  target: WorkspaceTabTarget,
-  intent: WorkspaceTabOpenIntent,
-): sheet is WorkspaceSheet {
-  return (
-    intent === "reveal" &&
-    sheet !== undefined &&
-    panelResourceKey(sheet.tab.target) === panelResourceKey(target)
-  );
+  if (!parentTabId) return null;
+  return findSheet(state, workspaceKey, parentTabId)?.parentTabId ?? parentTabId;
 }
 
 function placeTargetInSheet(input: {
@@ -766,12 +802,16 @@ function placeTargetInSheet(input: {
   };
 }
 
-/** Moves a workspace's sheet tab into its focused pane, keeping its tab id and state. */
+/**
+ * Moves one sheet's tab into the workspace's focused pane, keeping its tab id and state. The
+ * other sheets stay; callers that bring the tab to the front dismiss them.
+ */
 function promoteSheetToTab(
   state: WorkspaceLayoutStore,
   workspaceKey: string,
+  tabId: string,
 ): { tabId: string; patch: Partial<WorkspaceLayoutStore> } | null {
-  const sheet = state.sheetByWorkspace[workspaceKey];
+  const sheet = findSheet(state, workspaceKey, tabId);
   if (!sheet) return null;
   const { tab } = sheet;
   const placement = getOpenTabPlacement(state, workspaceKey, tab.target, FOCUSED_PANE_PLACEMENT);
@@ -798,7 +838,7 @@ function promoteSheetToTab(
   return {
     tabId: result.tabId,
     patch: {
-      ...withoutSheet(state, workspaceKey),
+      ...withoutSheet(state, workspaceKey, tab.tabId),
       ...withoutFocusRestoration(state, workspaceKey),
       hiddenAgentIdsByWorkspace:
         tab.target.kind === "agent"
@@ -817,37 +857,55 @@ function promoteSheetToTab(
  * A sheet holding unsaved work is never implicitly displaced: moving its tab would remount the
  * panel and drop the work. Only the explicit, guarded close removes it.
  */
-function sheetHoldsUnsavedWork(
-  state: Pick<WorkspaceLayoutStore, "sheetByWorkspace">,
-  workspaceKey: string,
-): boolean {
-  const sheet = state.sheetByWorkspace[workspaceKey];
-  return sheet !== undefined && isSheetTabModified(workspaceKey, sheet.tab.tabId);
+function sheetHoldsUnsavedWork(workspaceKey: string, sheet: WorkspaceSheet): boolean {
+  return isSheetTabModified(workspaceKey, sheet.tab.tabId);
 }
 
 /**
- * Where an open lands in the sheet, or null when it opens as a tab. A reveal of the resource the
- * sheet shows keeps its tab; any other target never displaces unsaved work and opens as a tab.
+ * Where an open lands in the sheet stack, or null when it opens as a tab. A new target goes on
+ * top. A reveal of a resource a sheet already shows keeps that sheet's tab and brings it back to
+ * the top; the sheets above it close, except ones holding unsaved work, which stay beneath it.
  */
 function resolveSheetPlacement(
   state: WorkspaceLayoutStore,
   workspaceKey: string,
   target: WorkspaceTabTarget,
   intent: WorkspaceTabOpenIntent,
-): { policy: CompactSheetPolicy; kept: WorkspaceSheet | undefined } | null {
+): { policy: CompactSheetPolicy; keptIndex: number | null } | null {
   const policy = resolveSheetPolicy(state, workspaceKey, target, intent);
   if (!policy) return null;
-  const sheet = state.sheetByWorkspace[workspaceKey];
-  if (sheetKeepsTabFor(sheet, target, intent)) return { policy, kept: sheet };
-  return sheetHoldsUnsavedWork(state, workspaceKey) ? null : { policy, kept: undefined };
+  if (intent !== "reveal") return { policy, keptIndex: null };
+  const sheets = getSheets(state, workspaceKey);
+  const resourceKey = panelResourceKey(target);
+  const index = sheets.findIndex((sheet) => panelResourceKey(sheet.tab.target) === resourceKey);
+  return { policy, keptIndex: index === -1 ? null : index };
 }
 
-/** Closes the sheet because navigation moved on underneath it, unless it holds unsaved work. */
-function dismissSheet(
+/** Closes the sheets because navigation moved on underneath them, except ones with unsaved work. */
+function dismissSheets(
+  state: Pick<WorkspaceLayoutStore, "sheetsByWorkspace">,
+  workspaceKey: string,
+): Pick<WorkspaceLayoutStore, "sheetsByWorkspace"> {
+  return withSheets(
+    state,
+    workspaceKey,
+    getSheets(state, workspaceKey).filter((sheet) => sheetHoldsUnsavedWork(workspaceKey, sheet)),
+  );
+}
+
+/** Moves a sheet's tab to the front of the tab strip, dismissing the sheets that would cover it. */
+function openSheetTabInFront(
   state: WorkspaceLayoutStore,
   workspaceKey: string,
-): Partial<WorkspaceLayoutStore> {
-  return sheetHoldsUnsavedWork(state, workspaceKey) ? {} : withoutSheet(state, workspaceKey);
+  tabId: string,
+): { tabId: string; patch: Partial<WorkspaceLayoutStore> } | null {
+  const promoted = promoteSheetToTab(state, workspaceKey, tabId);
+  if (!promoted) return null;
+  const next = { ...state, ...promoted.patch };
+  return {
+    tabId: promoted.tabId,
+    patch: { ...promoted.patch, ...dismissSheets(next, workspaceKey) },
+  };
 }
 
 /**
@@ -857,10 +915,10 @@ function dismissSheet(
  */
 function sheetAgentNoLongerFits(
   workspaceKey: string,
-  sheet: WorkspaceSheet | undefined,
+  sheet: WorkspaceSheet,
   snapshot: WorkspaceTabSnapshot,
 ): boolean {
-  if (sheet?.tab.target.kind !== "agent" || !snapshot.agentsHydrated) return false;
+  if (sheet.tab.target.kind !== "agent" || !snapshot.agentsHydrated) return false;
   if (!new Set(snapshot.activeAgentIds).has(sheet.tab.target.agentId)) return true;
   return resolveCompactSheetPolicy(workspaceKey, sheet.tab.target) === null;
 }
@@ -905,7 +963,7 @@ export function createWorkspaceLayoutStore(
           return tabId;
         },
         layoutMode: "split-panes",
-        sheetByWorkspace: {},
+        sheetsByWorkspace: {},
         layoutByWorkspace: {},
         splitSizesByWorkspace: {},
         explorerSidebarWidthByWorkspace: {},
@@ -933,17 +991,26 @@ export function createWorkspaceLayoutStore(
             input.intent,
           );
           if (sheetPlacement) {
+            const sheets = getSheets(get(), normalizedWorkspaceKey);
+            const { keptIndex } = sheetPlacement;
             const sheet = placeTargetInSheet({
-              kept: sheetPlacement.kept,
+              kept: keptIndex === null ? undefined : sheets[keptIndex],
               target: normalizedTarget,
               intent: input.intent,
               policy: sheetPlacement.policy,
               parentTabId,
               state: input.state,
             });
-            set((state) => ({
-              sheetByWorkspace: { ...state.sheetByWorkspace, [normalizedWorkspaceKey]: sheet },
-            }));
+            const below =
+              keptIndex === null
+                ? sheets
+                : [
+                    ...sheets.slice(0, keptIndex),
+                    ...sheets
+                      .slice(keptIndex + 1)
+                      .filter((above) => sheetHoldsUnsavedWork(normalizedWorkspaceKey, above)),
+                  ];
+            set((state) => withSheets(state, normalizedWorkspaceKey, [...below, sheet]));
             return sheet.tab.tabId;
           }
           const placement = getOpenTabPlacement(
@@ -990,7 +1057,7 @@ export function createWorkspaceLayoutStore(
           set((state) => ({
             ...withoutFocusRestoration(state, normalizedWorkspaceKey),
             // A tab brought to the front dismisses the sheet over it.
-            ...(input.intent === "background" ? {} : dismissSheet(state, normalizedWorkspaceKey)),
+            ...(input.intent === "background" ? {} : dismissSheets(state, normalizedWorkspaceKey)),
             hiddenAgentIdsByWorkspace:
               normalizedTarget.kind !== "agent"
                 ? state.hiddenAgentIdsByWorkspace
@@ -1032,24 +1099,25 @@ export function createWorkspaceLayoutStore(
           set((state) => {
             if (state.layoutMode === mode) return state;
             if (mode === "compact") return { layoutMode: mode };
-            // Widening keeps whatever the user had open in the sheet as an ordinary tab.
+            // Widening keeps whatever the user had open in sheets as ordinary tabs.
             const next: WorkspaceLayoutStore = { ...state, layoutMode: mode };
-            for (const workspaceKey of Object.keys(state.sheetByWorkspace)) {
-              const promoted = promoteSheetToTab(next, workspaceKey);
-              Object.assign(next, promoted?.patch ?? withoutSheet(next, workspaceKey));
+            for (const [workspaceKey, sheets] of Object.entries(state.sheetsByWorkspace)) {
+              for (const sheet of sheets) {
+                const promoted = promoteSheetToTab(next, workspaceKey, sheet.tab.tabId);
+                Object.assign(
+                  next,
+                  promoted?.patch ?? withoutSheet(next, workspaceKey, sheet.tab.tabId),
+                );
+              }
             }
             return next;
           });
         },
-        closeSheet: (workspaceKey) => {
+        openSheetAsTab: (workspaceKey, tabId) => {
           const normalizedWorkspaceKey = trimNonEmpty(workspaceKey);
-          if (!normalizedWorkspaceKey) return;
-          set((state) => withoutSheet(state, normalizedWorkspaceKey));
-        },
-        openSheetAsTab: (workspaceKey) => {
-          const normalizedWorkspaceKey = trimNonEmpty(workspaceKey);
-          if (!normalizedWorkspaceKey) return null;
-          const promoted = promoteSheetToTab(get(), normalizedWorkspaceKey);
+          const normalizedTabId = trimNonEmpty(tabId);
+          if (!normalizedWorkspaceKey || !normalizedTabId) return null;
+          const promoted = openSheetTabInFront(get(), normalizedWorkspaceKey, normalizedTabId);
           if (!promoted) return null;
           set(promoted.patch);
           return promoted.tabId;
@@ -1173,8 +1241,8 @@ export function createWorkspaceLayoutStore(
           }
 
           set((state) => {
-            if (state.sheetByWorkspace[normalizedWorkspaceKey]?.tab.tabId === normalizedTabId) {
-              return withoutSheet(state, normalizedWorkspaceKey);
+            if (findSheet(state, normalizedWorkspaceKey, normalizedTabId)) {
+              return withoutSheet(state, normalizedWorkspaceKey, normalizedTabId);
             }
             const layout = getWorkspaceLayout(state.layoutByWorkspace, normalizedWorkspaceKey);
             const explorerSidebarPaneId = resolveExplorerSidebarPaneId(
@@ -1283,8 +1351,8 @@ export function createWorkspaceLayoutStore(
 
             return {
               ...withoutFocusRestoration(state, normalizedWorkspaceKey),
-              // Choosing a tab dismisses the sheet that covers it.
-              ...dismissSheet(state, normalizedWorkspaceKey),
+              // Choosing a tab dismisses the sheets that cover it.
+              ...dismissSheets(state, normalizedWorkspaceKey),
               layoutByWorkspace: {
                 ...state.layoutByWorkspace,
                 [normalizedWorkspaceKey]: nextLayout,
@@ -1308,8 +1376,8 @@ export function createWorkspaceLayoutStore(
             });
             return nextLayout
               ? {
-                  // Choosing a tab dismisses the sheet that covers it.
-                  ...dismissSheet(state, normalizedWorkspaceKey),
+                  // Choosing a tab dismisses the sheets that cover it.
+                  ...dismissSheets(state, normalizedWorkspaceKey),
                   layoutByWorkspace: {
                     ...state.layoutByWorkspace,
                     [normalizedWorkspaceKey]: nextLayout,
@@ -1323,29 +1391,27 @@ export function createWorkspaceLayoutStore(
           const normalizedTabId = trimNonEmpty(tabId);
           const normalizedTarget = normalizeWorkspaceTabTarget(target);
           if (!normalizedWorkspaceKey || !normalizedTabId || !normalizedTarget) return null;
-          const sheet = get().sheetByWorkspace[normalizedWorkspaceKey];
-          if (sheet?.tab.tabId === normalizedTabId) {
+          if (findSheet(get(), normalizedWorkspaceKey, normalizedTabId)) {
             const policy = resolveCompactSheetPolicy(normalizedWorkspaceKey, normalizedTarget);
-            const replaced: WorkspaceSheet = {
-              ...sheet,
-              policy: policy ?? sheet.policy,
-              tab: {
-                ...sheet.tab,
-                target: normalizedTarget,
-                ...(tabState !== undefined ? { state: tabState } : {}),
-              },
-            };
             const next: WorkspaceLayoutStore = {
               ...get(),
-              sheetByWorkspace: { ...get().sheetByWorkspace, [normalizedWorkspaceKey]: replaced },
+              ...withSheetTab(get(), normalizedWorkspaceKey, normalizedTabId, (sheet) => ({
+                ...sheet,
+                policy: policy ?? sheet.policy,
+                tab: {
+                  ...sheet.tab,
+                  target: normalizedTarget,
+                  ...(tabState !== undefined ? { state: tabState } : {}),
+                },
+              })),
             };
             if (policy) {
-              set({ sheetByWorkspace: next.sheetByWorkspace });
+              set({ sheetsByWorkspace: next.sheetsByWorkspace });
               return normalizedTabId;
             }
-            // A target the sheet does not host becomes the tab it would have opened as.
-            const promoted = promoteSheetToTab(next, normalizedWorkspaceKey);
-            set(promoted?.patch ?? withoutSheet(next, normalizedWorkspaceKey));
+            // A target sheets do not host becomes the tab it would have opened as.
+            const promoted = openSheetTabInFront(next, normalizedWorkspaceKey, normalizedTabId);
+            set(promoted?.patch ?? withoutSheet(next, normalizedWorkspaceKey, normalizedTabId));
             return promoted?.tabId ?? null;
           }
           const result = replaceTabTargetInLayout({
@@ -1378,18 +1444,14 @@ export function createWorkspaceLayoutStore(
           const normalizedTabId = trimNonEmpty(tabId);
           if (!normalizedWorkspaceKey || !normalizedTabId) return;
           set((state) => {
-            const sheet = state.sheetByWorkspace[normalizedWorkspaceKey];
-            if (sheet?.tab.tabId === normalizedTabId) {
-              const { state: _previous, ...tab } = sheet.tab;
-              return {
-                sheetByWorkspace: {
-                  ...state.sheetByWorkspace,
-                  [normalizedWorkspaceKey]: {
-                    ...sheet,
-                    tab: tabState === undefined ? tab : { ...tab, state: tabState },
-                  },
-                },
-              };
+            if (findSheet(state, normalizedWorkspaceKey, normalizedTabId)) {
+              return withSheetTab(state, normalizedWorkspaceKey, normalizedTabId, (sheet) => {
+                const { state: _previous, ...tab } = sheet.tab;
+                return {
+                  ...sheet,
+                  tab: tabState === undefined ? tab : { ...tab, state: tabState },
+                };
+              });
             }
             const layout = setTabStateInLayout({
               layout: getWorkspaceLayout(state.layoutByWorkspace, normalizedWorkspaceKey),
@@ -1485,11 +1547,11 @@ export function createWorkspaceLayoutStore(
                 );
               }
             }
-            const sheetAgentGone = sheetAgentNoLongerFits(
-              normalizedWorkspaceKey,
-              state.sheetByWorkspace[normalizedWorkspaceKey],
-              snapshot,
+            const sheets = getSheets(state, normalizedWorkspaceKey);
+            const fittingSheets = sheets.filter(
+              (sheet) => !sheetAgentNoLongerFits(normalizedWorkspaceKey, sheet, snapshot),
             );
+            const sheetAgentGone = fittingSheets.length !== sheets.length;
             if (
               state.layoutByWorkspace[normalizedWorkspaceKey] &&
               nextLayout === rawLayout &&
@@ -1500,7 +1562,7 @@ export function createWorkspaceLayoutStore(
             }
 
             return {
-              ...(sheetAgentGone ? withoutSheet(state, normalizedWorkspaceKey) : {}),
+              ...(sheetAgentGone ? withSheets(state, normalizedWorkspaceKey, fittingSheets) : {}),
               pinnedAgentIdsByWorkspace,
               layoutByWorkspace: {
                 ...state.layoutByWorkspace,
@@ -2006,7 +2068,7 @@ export function createWorkspaceLayoutStore(
               normalizedWorkspaceKey in state.explorerSidebarPaneIdByWorkspace ||
               normalizedWorkspaceKey in state.sidePaneIdByWorkspace ||
               normalizedWorkspaceKey in state.pullRequestTabAutoOpenedByWorkspace ||
-              normalizedWorkspaceKey in state.sheetByWorkspace;
+              normalizedWorkspaceKey in state.sheetsByWorkspace;
             if (!hasAny) {
               return state;
             }
@@ -2035,7 +2097,7 @@ export function createWorkspaceLayoutStore(
             const { [normalizedWorkspaceKey]: _sidePane, ...sidePaneIdByWorkspace } =
               state.sidePaneIdByWorkspace;
             return {
-              ...withoutSheet(state, normalizedWorkspaceKey),
+              ...withSheets(state, normalizedWorkspaceKey, NO_SHEETS),
               pullRequestTabAutoOpenedByWorkspace,
               layoutByWorkspace,
               splitSizesByWorkspace,
@@ -2152,14 +2214,16 @@ export function observeOpenWorkspaceAgentIds(
   store = useWorkspaceLayoutStore,
 ): () => void {
   let previous: string[] | undefined;
-  const publish = (state: Pick<WorkspaceLayoutStore, "layoutByWorkspace" | "sheetByWorkspace">) => {
+  const publish = (
+    state: Pick<WorkspaceLayoutStore, "layoutByWorkspace" | "sheetsByWorkspace">,
+  ) => {
     const ids = new Set<string>();
     const tabsByWorkspace = [
       ...Object.entries(state.layoutByWorkspace).map(
         ([workspaceKey, layout]) => [workspaceKey, collectAllTabs(layout.root)] as const,
       ),
-      ...Object.entries(state.sheetByWorkspace).map(
-        ([workspaceKey, sheet]) => [workspaceKey, [sheet.tab]] as const,
+      ...Object.entries(state.sheetsByWorkspace).map(
+        ([workspaceKey, sheets]) => [workspaceKey, sheets.map((sheet) => sheet.tab)] as const,
       ),
     ];
     for (const [workspaceKey, tabs] of tabsByWorkspace) {
@@ -2177,7 +2241,7 @@ export function observeOpenWorkspaceAgentIds(
   const unsubscribe = store.subscribe((state, before) => {
     if (
       state.layoutByWorkspace !== before.layoutByWorkspace ||
-      state.sheetByWorkspace !== before.sheetByWorkspace
+      state.sheetsByWorkspace !== before.sheetsByWorkspace
     ) {
       publish(state);
     }
diff --git a/packages/app/src/styles/density.ts b/packages/app/src/styles/density.ts
index 5b452bcb93..2383685d24 100644
--- a/packages/app/src/styles/density.ts
+++ b/packages/app/src/styles/density.ts
@@ -2,7 +2,7 @@ import { isCompactBreakpoint } from "@/constants/layout";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 
 /**
- * Density sizes for surfaces that opt into touch sizing: rows, icons, and text grow on compact
+ * Density sizes for surfaces that opt into touch sizing: rows and icons grow on compact
  * layouts and keep their desktop sizes from the `md` breakpoint up. Plain theme tokens stay
  * desktop-sized everywhere, so a surface migrates by swapping its sizes for these.
  *
@@ -11,10 +11,8 @@ import { ICON_SIZE, type Theme } from "@/styles/theme";
  */
 
 export type DensityIconSize = keyof typeof ICON_SIZE;
-type TextSize = "sm" | "base";
 
 const COMPACT_ICON_SIZE: Record<DensityIconSize, number> = { xs: 14, sm: 18, md: 20, lg: 24 };
-const COMPACT_TEXT_SIZE: Record<TextSize, keyof Theme["fontSize"]> = { sm: "base", base: "lg" };
 
 // Compact layouts end where `md` begins; see `isCompactBreakpoint`.
 function byLayout<T>(compact: T, desktop: T) {
@@ -25,9 +23,7 @@ export const density = {
   /** A list row such as a sidebar entry. */
   rowHeight: byLayout(44, 36),
   /** A row in a tight group, such as the sidebar's navigation rows. */
-  tightRowHeight: byLayout(40, 28),
-  /** The line height of a row's `base` text; slots that align to its first line share it. */
-  rowLineHeight: byLayout(22, 20),
+  tightRowHeight: byLayout(36, 28),
   /** A square icon-only button that sits in a row or toolbar. */
   iconButton: byLayout(44, 28),
 };
@@ -37,10 +33,6 @@ export function densityIconBox(size: DensityIconSize) {
   return byLayout(COMPACT_ICON_SIZE[size], ICON_SIZE[size]);
 }
 
-export function densityFontSize(theme: Theme, size: TextSize) {
-  return byLayout(theme.fontSize[COMPACT_TEXT_SIZE[size]], theme.fontSize[size]);
-}
-
 export function densityIconSize(rt: { breakpoint?: string }, size: DensityIconSize): number {
   return isCompactBreakpoint(rt.breakpoint) ? COMPACT_ICON_SIZE[size] : ICON_SIZE[size];
 }
diff --git a/packages/app/src/workspace-tabs/open-beside.test.ts b/packages/app/src/workspace-tabs/open-beside.test.ts
index ac181eeb75..9e80745db8 100644
--- a/packages/app/src/workspace-tabs/open-beside.test.ts
+++ b/packages/app/src/workspace-tabs/open-beside.test.ts
@@ -27,7 +27,7 @@ const WORKSPACE_KEY = "server-1:workspace-1";
 beforeEach(() => {
   useWorkspaceLayoutStore.setState({
     layoutMode: "split-panes",
-    sheetByWorkspace: {},
+    sheetsByWorkspace: {},
     layoutByWorkspace: {},
     explorerSidebarPaneIdByWorkspace: {},
     sidePaneIdByWorkspace: {},
@@ -56,7 +56,7 @@ describe("openPreferredWorkspacePreview", () => {
     });
 
     const state = useWorkspaceLayoutStore.getState();
-    expect(state.sheetByWorkspace[WORKSPACE_KEY]?.tab).toMatchObject({
+    expect(state.sheetsByWorkspace[WORKSPACE_KEY]?.at(-1)?.tab).toMatchObject({
       tabId,
       target: { kind: "file", path: "src/preview.ts" },
     });
@@ -96,7 +96,7 @@ describe("previews under a sheet with unsaved work", () => {
     });
   }
 
-  it("reuses one preview tab instead of adding a tab per link", () => {
+  it("stacks link previews over the sheet instead of dropping its unsaved work", () => {
     const store = useWorkspaceLayoutStore.getState();
     store.openTab({
       workspaceKey: WORKSPACE_KEY,
@@ -114,18 +114,17 @@ describe("previews under a sheet with unsaved work", () => {
       { modified: true },
     );
 
-    const firstPreviewTabId = previewFile("src/first.ts");
-    const secondPreviewTabId = previewFile("src/second.ts");
+    previewFile("src/first.ts");
+    previewFile("src/second.ts");
 
     const state = useWorkspaceLayoutStore.getState();
-    expect(state.sheetByWorkspace[WORKSPACE_KEY]?.tab.target).toEqual(sheetTarget);
-    expect(secondPreviewTabId).toBe(firstPreviewTabId);
-    const root = state.layoutByWorkspace[WORKSPACE_KEY].root;
-    const tabsById = new Map(collectAllTabs(root).map((tab) => [tab.tabId, tab.target]));
-    expect(findPaneById(root, "main")?.tabIds.map((tabId) => tabsById.get(tabId))).toEqual([
-      { kind: "terminal", terminalId: "term-1" },
+    expect(state.sheetsByWorkspace[WORKSPACE_KEY]?.map((sheet) => sheet.tab.target)).toEqual([
+      sheetTarget,
+      { kind: "file", path: "src/first.ts" },
       { kind: "file", path: "src/second.ts" },
     ]);
+    const root = state.layoutByWorkspace[WORKSPACE_KEY].root;
+    expect(findPaneById(root, "main")?.tabIds).toHaveLength(1);
   });
 });
 
diff --git a/packages/app/test-stubs/gorhom-bottom-sheet.ts b/packages/app/test-stubs/gorhom-bottom-sheet.ts
index 784a7569ff..5f3e8c7e8f 100644
--- a/packages/app/test-stubs/gorhom-bottom-sheet.ts
+++ b/packages/app/test-stubs/gorhom-bottom-sheet.ts
@@ -8,6 +8,7 @@ export default Stub;
 export const BottomSheetModal = Stub;
 export const BottomSheetModalProvider = PassThrough;
 export const BottomSheetBackdrop = Stub;
+export const BottomSheetHandle = Stub;
 export const BottomSheetScrollView = PassThrough;
 export const BottomSheetView = PassThrough;
 export const BottomSheetTextInput = Stub;

From 73221ce5bd25b5f003efcb041a0d107d3c766805 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 03:14:42 +0200
Subject: [PATCH 164/270] fix(app): render local Markdown images with encoded
 paths (#6877)

Decode assistant Markdown image destinations before resolving a filesystem read. Keep plain filesystem paths and direct image URIs unchanged so Markdown Preview and literal percent filenames are decoded only once.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../browser/agent-tab-image-stability.spec.ts | 37 ++++++++++++
 .../e2e/support/helpers/assistant-images.ts   |  3 +-
 packages/app/src/attachments/utils.test.ts    | 12 ++++
 packages/app/src/attachments/utils.ts         | 11 +++-
 packages/app/src/components/message.tsx       |  3 +-
 .../assistant-markdown-image-source.test.ts   | 58 +++++++++++++++++++
 6 files changed, 120 insertions(+), 4 deletions(-)
 create mode 100644 packages/app/src/utils/assistant-markdown-image-source.test.ts

diff --git a/packages/app/e2e/browser/agent-tab-image-stability.spec.ts b/packages/app/e2e/browser/agent-tab-image-stability.spec.ts
index 5f70bdafe3..841314343f 100644
--- a/packages/app/e2e/browser/agent-tab-image-stability.spec.ts
+++ b/packages/app/e2e/browser/agent-tab-image-stability.spec.ts
@@ -16,6 +16,7 @@ import {
 } from "../support/helpers/assistant-images";
 import { expectAgentReadyToInterrupt } from "../support/helpers/agent-stream";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import path from "node:path";
 
 const test = base.extend<{ imageWorkspace: SeededWorkspace }>({
   imageWorkspace: async ({ page: _page }, provide) => {
@@ -28,6 +29,42 @@ const test = base.extend<{ imageWorkspace: SeededWorkspace }>({
   },
 });
 
+test("assistant images at paths with spaces, Unicode and literal percent escapes render", async ({
+  imageWorkspace: workspace,
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const image = await createSmallAssistantPng(workspace, {
+    alt: "Angle destination image",
+    fileName: "My image Мои.png",
+  });
+  const agent = await createSettledMockAgent(workspace, "Encoded image paths");
+  await emitSettledAssistantImage(workspace.client, agent, image, `<${image.relativePath}>`);
+  await openAssistantImageTimeline(page, agent);
+  await expectAssistantImageRendered(page, image);
+
+  const encodedImage = { ...image, alt: "Encoded destination image" };
+  await emitSettledAssistantImage(
+    workspace.client,
+    agent,
+    encodedImage,
+    encodeURI(path.join(workspace.repoPath, image.relativePath)),
+  );
+  await expectAssistantImageRendered(page, encodedImage);
+
+  const literalPercentImage = await createSmallAssistantPng(workspace, {
+    alt: "Literal percent filename image",
+    fileName: "literal%20name.png",
+  });
+  await emitSettledAssistantImage(
+    workspace.client,
+    agent,
+    literalPercentImage,
+    encodeURI(literalPercentImage.relativePath),
+  );
+  await expectAssistantImageRendered(page, literalPercentImage);
+});
+
 test("switching between settled agent tabs keeps a real assistant PNG rendered", async ({
   imageWorkspace: workspace,
   page,
diff --git a/packages/app/e2e/support/helpers/assistant-images.ts b/packages/app/e2e/support/helpers/assistant-images.ts
index 63bc182eaf..c4200c7c75 100644
--- a/packages/app/e2e/support/helpers/assistant-images.ts
+++ b/packages/app/e2e/support/helpers/assistant-images.ts
@@ -87,10 +87,11 @@ export async function emitSettledAssistantImage(
   client: SeedDaemonClient,
   agent: ArchiveTabAgent,
   image: AssistantImageFixture,
+  destination: string = image.relativePath,
 ): Promise<void> {
   await client.sendAgentMessage(
     agent.id,
-    `Emit settled assistant image Markdown: ![${image.alt}](${image.relativePath})`,
+    `Emit settled assistant image Markdown: ![${image.alt}](${destination})`,
   );
   const result = await client.waitForFinish(agent.id, 30_000);
   if (result.status !== "idle" || result.final?.lastError) {
diff --git a/packages/app/src/attachments/utils.test.ts b/packages/app/src/attachments/utils.test.ts
index d6fce078f2..9bf982c6e8 100644
--- a/packages/app/src/attachments/utils.test.ts
+++ b/packages/app/src/attachments/utils.test.ts
@@ -42,6 +42,18 @@ describe("fileUriToPath", () => {
 });
 
 describe("localFileSourceToPath", () => {
+  it.each([
+    "https://example.com/image%20name.png",
+    "data:image/png;base64,abc%20",
+    "blob:https://example.com/image%20name",
+  ])("preserves a direct Markdown image URI: %s", (source) => {
+    expect(localFileSourceToPath(source, { decodeHref: true })).toBe(source);
+  });
+
+  it("preserves malformed percent escapes rather than throwing", () => {
+    expect(localFileSourceToPath("/tmp/100%.png", { decodeHref: true })).toBe("/tmp/100%.png");
+  });
+
   it("decodes markdown-encoded Windows drive-letter paths", () => {
     expect(localFileSourceToPath("C:%5CUsers%5Cfile.txt")).toBe("C:/Users/file.txt");
   });
diff --git a/packages/app/src/attachments/utils.ts b/packages/app/src/attachments/utils.ts
index 5fa0334359..46483bf0e7 100644
--- a/packages/app/src/attachments/utils.ts
+++ b/packages/app/src/attachments/utils.ts
@@ -173,11 +173,18 @@ export function fileUriToPath(uri: string): string {
   return normalizeWindowsDrivePath(decodedPath.replace(/^\/([A-Za-z]:[\\/])/, "$1"));
 }
 
-export function localFileSourceToPath(source: string): string {
+export function localFileSourceToPath(
+  source: string,
+  // Markdown destinations are URI-encoded; plain filesystem paths are not.
+  { decodeHref = false }: { decodeHref?: boolean } = {},
+): string {
+  if (/^(https?:|data:|blob:)/i.test(source)) {
+    return source;
+  }
   let path = source;
   if (source.startsWith("file://")) {
     path = fileUriToPath(source);
-  } else if (isMarkdownEncodedWindowsDrivePath(source)) {
+  } else if (decodeHref || isMarkdownEncodedWindowsDrivePath(source)) {
     path = decodeFilePathSource(source);
   }
   return normalizeWindowsDrivePath(path);
diff --git a/packages/app/src/components/message.tsx b/packages/app/src/components/message.tsx
index 4587556ebe..7915832470 100644
--- a/packages/app/src/components/message.tsx
+++ b/packages/app/src/components/message.tsx
@@ -95,6 +95,7 @@ import {
 } from "@/assistant-file-links";
 import { getCompactionMarkerLabel } from "./message-compaction-label";
 import { useAssistantImage } from "@/assistant-image/use-assistant-image";
+import { localFileSourceToPath } from "@/attachments/utils";
 import {
   AttachmentFrame,
   AttachmentLabel,
@@ -1945,7 +1946,7 @@ export const AssistantMessage = memo(function AssistantMessage({
         return (
           <AssistantMarkdownImage
             key={node.key}
-            source={String(node.attributes?.src ?? "")}
+            source={localFileSourceToPath(String(node.attributes?.src ?? ""), { decodeHref: true })}
             occurrenceKey={`${occurrenceKey}:${node.key}`}
             alt={typeof node.attributes?.alt === "string" ? node.attributes.alt : undefined}
             hasLeadingContent={hasLeadingContent}
diff --git a/packages/app/src/utils/assistant-markdown-image-source.test.ts b/packages/app/src/utils/assistant-markdown-image-source.test.ts
new file mode 100644
index 0000000000..edc02a4eb7
--- /dev/null
+++ b/packages/app/src/utils/assistant-markdown-image-source.test.ts
@@ -0,0 +1,58 @@
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { localFileSourceToPath } from "@/attachments/utils";
+import { createAssistantMarkdownParser } from "./assistant-markdown-parser";
+import { resolveAssistantImageSource } from "./assistant-image-source";
+
+describe("local assistant Markdown images", () => {
+  let workspaceRoot: string;
+  const imageBytes = Buffer.from(
+    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==",
+    "base64",
+  );
+
+  beforeEach(async () => {
+    workspaceRoot = await mkdtemp(path.join(os.tmpdir(), "assistant-markdown-image-"));
+    await mkdir(path.join(workspaceRoot, "My Apps", "Мои"), { recursive: true });
+    await writeFile(path.join(workspaceRoot, "My Apps", "Мои", "test.png"), imageBytes);
+    await writeFile(path.join(workspaceRoot, "literal%20name.png"), imageBytes);
+  });
+
+  afterEach(async () => {
+    await rm(workspaceRoot, { recursive: true, force: true });
+  });
+
+  it.each([
+    "absolute angle",
+    "absolute encoded",
+    "relative angle",
+    "relative encoded",
+    "file URI",
+    "literal percent",
+  ])("reads the actual image for the %s destination", async (form) => {
+    const absolute = path.join(workspaceRoot, "My Apps", "Мои", "test.png");
+    const destinations: Record<string, string> = {
+      "absolute angle": `<${absolute}>`,
+      "absolute encoded": encodeURI(absolute),
+      "relative angle": "<My Apps/Мои/test.png>",
+      "relative encoded": encodeURI("My Apps/Мои/test.png"),
+      "file URI": `file://${encodeURI(absolute)}`,
+      "literal percent": `${workspaceRoot}/literal%2520name.png`,
+    };
+    const tokens = createAssistantMarkdownParser().parseInline(
+      `![test](${destinations[form]})`,
+      {},
+    );
+    const image = tokens
+      .flatMap((token) => token.children ?? [])
+      .find((token) => token.type === "image");
+    expect(image).toBeDefined();
+    const source = localFileSourceToPath(image!.attrGet("src")!, { decodeHref: true });
+    const target = resolveAssistantImageSource({ source, workspaceRoot });
+    expect(target?.kind).toBe("file_rpc");
+    if (target?.kind !== "file_rpc") throw new Error("Expected a local image read target");
+    await expect(readFile(path.resolve(target.cwd, target.path))).resolves.toEqual(imageBytes);
+  });
+});

From 6db47b3c37f702b8647a6c8667b685bfe74091f0 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 08:59:49 +0700
Subject: [PATCH 165/270] fix(app): keep the keyboard closed after mobile
 sidebar dismissal (#6945)

Separate composer keyboard eligibility from pane focus restoration. A sidebar dismisses the keyboard without hiding the pane, so its close must not restore editing focus.
---
 docs/floating-panels.md                       |  9 +-
 .../app/e2e/browser/composer-focus.spec.ts    | 90 +++++++++++++++++++
 .../e2e/browser/composer-whitespace.spec.ts   | 12 +--
 packages/app/e2e/support/helpers/composer.ts  |  6 ++
 packages/app/e2e/support/helpers/sidebar.ts   | 38 ++++++++
 packages/app/src/composer/index.tsx           |  7 +-
 packages/app/src/composer/input/input.tsx     | 26 +++---
 packages/app/src/composer/keyboard-scope.tsx  | 19 +++-
 8 files changed, 181 insertions(+), 26 deletions(-)

diff --git a/docs/floating-panels.md b/docs/floating-panels.md
index cb51c8f7dd..9241cec56d 100644
--- a/docs/floating-panels.md
+++ b/docs/floating-panels.md
@@ -217,7 +217,14 @@ sheet suspends pane focus, and the composer gives up input from the moment the
 user asks for the compact agent list or explorer, before the panel's motion
 settles. Pane focus itself stays put under those panels: the agent panel reads
 it as "the user is in this chat" for attention clearing, and opening the agent
-list must not clear the attention it shows.
+list must not clear the attention it shows. Focus restoration follows pane
+focus, not the active composer. The editor keeps its focus intent only across
+a blur that lands while its pane is not the user's (a retained tab hidden, a
+sheet over it) and refocuses when the pane comes back. A blur while the pane is
+theirs drops the intent in every layout mode, and the keyboard the compact
+panels dismiss when they settle is such a blur, so closing the agent list or
+explorer never reopens the keyboard. Keying restoration on the active composer
+made that dismiss look like a hidden-tab blur and refocused on close.
 The band beside the inline editor where the fullscreen glyph sits is the input's
 own right padding, so a tap anywhere in it focuses the editor whether or not the
 glyph shows. On web the slot is a fixed box over the visible viewport, which is
diff --git a/packages/app/e2e/browser/composer-focus.spec.ts b/packages/app/e2e/browser/composer-focus.spec.ts
index b79cfd9255..cbc710a94a 100644
--- a/packages/app/e2e/browser/composer-focus.spec.ts
+++ b/packages/app/e2e/browser/composer-focus.spec.ts
@@ -1,13 +1,30 @@
 import { expect, test, type Page } from "../support/fixtures";
 import {
+  composerLocator,
+  blurComposerInput,
+  enterComposerFullscreen,
+  exitComposerFullscreen,
   expectComposerDraft,
   expectComposerFocused,
+  expectComposerFullscreenControls,
   expectComposerNotFocused,
   expectComposerVisible,
+  expectWorkspaceHeaderVisible,
+  resizeComposerViewport,
   submitMessage,
   typeIntoFocusedComposer,
 } from "../support/helpers/composer";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import {
+  closeMobileAgentSidebar,
+  closeMobileExplorer,
+  expectMobileAgentSidebarHidden,
+  expectMobileAgentSidebarVisible,
+  expectMobileExplorerHidden,
+  expectMobileExplorerVisible,
+  swipeOpenMobileAgentSidebar,
+  swipeOpenMobileExplorer,
+} from "../support/helpers/sidebar";
 
 test("submitting a message leaves the composer ready for the next message", async ({ page }) => {
   const agent = await seedMockAgentWorkspace({
@@ -76,3 +93,76 @@ test.describe("touch screen wide enough for the desktop layout", () => {
     }
   });
 });
+
+const COMPACT_PANELS = [
+  {
+    name: "agent list",
+    open: swipeOpenMobileAgentSidebar,
+    expectOpen: expectMobileAgentSidebarVisible,
+    close: closeMobileAgentSidebar,
+    expectClosed: expectMobileAgentSidebarHidden,
+  },
+  {
+    name: "Explorer",
+    open: swipeOpenMobileExplorer,
+    expectOpen: expectMobileExplorerVisible,
+    close: closeMobileExplorer,
+    expectClosed: expectMobileExplorerHidden,
+  },
+] as const;
+
+for (const panel of COMPACT_PANELS) {
+  test(`closing the compact ${panel.name} does not restore composer focus`, async ({ page }) => {
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "composer-focus-panel-",
+      title: `Composer focus under ${panel.name}`,
+    });
+    const draft = "Line one\nLine two\nLine three";
+    try {
+      await resizeComposerViewport(page, "portrait");
+      await openAgentRoute(page, agent);
+      await expectComposerVisible(page);
+
+      await test.step("an untouched editor stays untouched", async () => {
+        await expectComposerNotFocused(page);
+        await panel.open(page);
+        await panel.expectOpen(page);
+        await panel.close(page);
+        await panel.expectClosed(page);
+        await expectComposerNotFocused(page);
+      });
+
+      await test.step("an inline editor blurred under the panel stays blurred", async () => {
+        await composerLocator(page).fill(draft);
+        await composerLocator(page).click();
+        await expectComposerFocused(page);
+        await panel.open(page);
+        await panel.expectOpen(page);
+        await blurComposerInput(page);
+        await panel.close(page);
+        await panel.expectClosed(page);
+        await expectComposerNotFocused(page);
+        await expectComposerDraft(page, draft);
+      });
+
+      await test.step("a fullscreen editor blurred under the panel stays blurred", async () => {
+        await composerLocator(page).click();
+        await enterComposerFullscreen(page);
+        await expectComposerFullscreenControls(page);
+        await expectComposerFocused(page);
+        await panel.open(page);
+        await panel.expectOpen(page);
+        await blurComposerInput(page);
+        await panel.close(page);
+        await panel.expectClosed(page);
+        await expectComposerNotFocused(page);
+        await expectComposerFullscreenControls(page);
+        await expectComposerDraft(page, draft);
+        await exitComposerFullscreen(page);
+        await expectWorkspaceHeaderVisible(page);
+      });
+    } finally {
+      await agent.cleanup();
+    }
+  });
+}
diff --git a/packages/app/e2e/browser/composer-whitespace.spec.ts b/packages/app/e2e/browser/composer-whitespace.spec.ts
index 0c74fc7630..ca8704ed25 100644
--- a/packages/app/e2e/browser/composer-whitespace.spec.ts
+++ b/packages/app/e2e/browser/composer-whitespace.spec.ts
@@ -37,6 +37,7 @@ import {
   closeMobileAgentSidebar,
   expectMobileAgentSidebarHidden,
   expectMobileAgentSidebarVisible,
+  swipeOpenMobileAgentSidebar,
 } from "../support/helpers/sidebar";
 
 async function composerHeight(page: Page): Promise<number> {
@@ -165,17 +166,6 @@ test("composer growth keeps a bottom-pinned chat at the bottom", async ({ page }
   }
 });
 
-async function swipeOpenMobileAgentSidebar(page: Page): Promise<void> {
-  const viewport = page.viewportSize();
-  if (!viewport) throw new Error("viewport size is required");
-  const y = Math.round(viewport.height / 2);
-  await page.mouse.move(8, y);
-  await page.mouse.down();
-  await page.mouse.move(40, y, { steps: 4 });
-  await page.mouse.move(Math.round(viewport.width * 0.7), y, { steps: 12 });
-  await page.mouse.up();
-}
-
 /** Freeze the page's timers and animation frames until `page.clock.resume()`. */
 async function pausePageClock(page: Page): Promise<void> {
   const now = Date.now();
diff --git a/packages/app/e2e/support/helpers/composer.ts b/packages/app/e2e/support/helpers/composer.ts
index efd9266657..d4ef8fc2f4 100644
--- a/packages/app/e2e/support/helpers/composer.ts
+++ b/packages/app/e2e/support/helpers/composer.ts
@@ -56,6 +56,12 @@ export async function expectComposerNotFocused(page: Page): Promise<void> {
   await expect(composerInput(page)).not.toBeFocused();
 }
 
+/** Blur the editor without anything else taking focus. */
+export async function blurComposerInput(page: Page): Promise<void> {
+  await composerInput(page).blur();
+  await expectComposerNotFocused(page);
+}
+
 export async function submitMessage(page: Page, text: string): Promise<void> {
   const input = composerInput(page);
   await expect(input).toBeEditable({ timeout: 30_000 });
diff --git a/packages/app/e2e/support/helpers/sidebar.ts b/packages/app/e2e/support/helpers/sidebar.ts
index 1909b4f31b..500ce8bd41 100644
--- a/packages/app/e2e/support/helpers/sidebar.ts
+++ b/packages/app/e2e/support/helpers/sidebar.ts
@@ -250,3 +250,41 @@ export async function expectMobileAgentSidebarVisible(page: Page): Promise<void>
 export async function expectMobileAgentSidebarHidden(page: Page): Promise<void> {
   await expect(page.getByTestId("sidebar-sessions")).not.toBeInViewport({ timeout: 5_000 });
 }
+
+/** Drag from the left edge: the only way to open the list while fullscreen hides the header. */
+export async function swipeOpenMobileAgentSidebar(page: Page): Promise<void> {
+  const viewport = page.viewportSize();
+  if (!viewport) throw new Error("viewport size is required");
+  const y = Math.round(viewport.height / 2);
+  await page.mouse.move(8, y);
+  await page.mouse.down();
+  await page.mouse.move(40, y, { steps: 4 });
+  await page.mouse.move(Math.round(viewport.width * 0.7), y, { steps: 12 });
+  await page.mouse.up();
+}
+
+/** Drag from the right edge to open the compact Explorer over the agent. */
+export async function swipeOpenMobileExplorer(page: Page): Promise<void> {
+  const viewport = page.viewportSize();
+  if (!viewport) throw new Error("viewport size is required");
+  const y = Math.round(viewport.height / 2);
+  await page.mouse.move(viewport.width - 8, y);
+  await page.mouse.down();
+  await page.mouse.move(viewport.width - 40, y, { steps: 4 });
+  await page.mouse.move(Math.round(viewport.width * 0.3), y, { steps: 12 });
+  await page.mouse.up();
+}
+
+export async function closeMobileExplorer(page: Page): Promise<void> {
+  const closeButton = page.getByTestId("explorer-close");
+  await expect(closeButton).toBeInViewport({ ratio: 1, timeout: 5_000 });
+  await closeButton.click();
+}
+
+export async function expectMobileExplorerVisible(page: Page): Promise<void> {
+  await expect(page.getByTestId("explorer-header")).toBeInViewport({ ratio: 1, timeout: 5_000 });
+}
+
+export async function expectMobileExplorerHidden(page: Page): Promise<void> {
+  await expect(page.getByTestId("explorer-header")).not.toBeInViewport({ timeout: 5_000 });
+}
diff --git a/packages/app/src/composer/index.tsx b/packages/app/src/composer/index.tsx
index 21bf7f6679..10d670fcae 100644
--- a/packages/app/src/composer/index.tsx
+++ b/packages/app/src/composer/index.tsx
@@ -1196,11 +1196,16 @@ export function Composer({ isPaneFocused, ...props }: ComposerProps) {
   // A compact overlay panel (agent list, explorer) covers the pane without taking its
   // focus. The composer gives up input from the moment the user asks for the panel,
   // not when its motion settles, so the exit action and autocomplete never race it.
+  // Pane focus stays put, so the keyboard the panel dismisses is a blur in the
+  // user's own pane: closing the panel does not bring focus back.
   const isCompact = useIsCompactFormFactor();
   const overlayPanelRequested = usePanelStore((state) => state.mobilePanel.target !== "agent");
   const coveredByOverlayPanel = isCompact && overlayPanelRequested;
   return (
-    <ComposerKeyboardScopeProvider isActiveComposer={isPaneFocused && !coveredByOverlayPanel}>
+    <ComposerKeyboardScopeProvider
+      isPaneFocused={isPaneFocused}
+      isActiveComposer={isPaneFocused && !coveredByOverlayPanel}
+    >
       <RenderProfile id="ComposerContent">
         <ComposerContent {...props} />
       </RenderProfile>
diff --git a/packages/app/src/composer/input/input.tsx b/packages/app/src/composer/input/input.tsx
index a1b8c0fdbb..01051bd52c 100644
--- a/packages/app/src/composer/input/input.tsx
+++ b/packages/app/src/composer/input/input.tsx
@@ -524,8 +524,8 @@ function MessageInputAutoFocus({
   autoFocusKey: string | undefined;
   textInputRef: React.MutableRefObject<ComposerTextInputHandle | null>;
 }) {
-  const { isActiveComposer } = useComposerKeyboardScope();
-  useAutoFocusOnWebEffect(textInputRef, enabled && isActiveComposer, autoFocusKey);
+  const { isPaneFocused } = useComposerKeyboardScope();
+  useAutoFocusOnWebEffect(textInputRef, enabled && isPaneFocused, autoFocusKey);
   return null;
 }
 
@@ -1236,7 +1236,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       textReplacement,
       submitLabel,
     } = resolveMessageInputProps(props);
-    const { isActiveComposer } = useComposerKeyboardScope();
+    const { isPaneFocused } = useComposerKeyboardScope();
     const mode = resolveComposerInputMode(inputMode);
     const { t } = useTranslation();
     const isCompact = useIsCompactFormFactor();
@@ -1264,8 +1264,8 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     const focusIntentRef = useRef(false);
     const valueRef = useRef(value);
     const selectionRef = useRef({ start: value.length, end: value.length });
-    const activeComposerRef = useRef(isActiveComposer);
-    activeComposerRef.current = isActiveComposer;
+    const paneFocusedRef = useRef(isPaneFocused);
+    paneFocusedRef.current = isPaneFocused;
     const [webTextArea, setWebTextArea] = useState<HTMLElement | null>(null);
     const appliedTextReplacementKeyRef = useRef(textReplacement.key);
     const webTextareaRef = useRef<HTMLElement | null>(null);
@@ -1285,9 +1285,13 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       webTextareaRef.current = element;
       setWebTextArea(element);
     }, []);
+    // Focus intent outlives a blur only while the pane is not the user's pane (a retained
+    // tab hidden, a sheet over it); the pane coming back restores focus. A blur while the
+    // pane is theirs drops it, whatever the layout mode: the user dismissed the keyboard,
+    // or a compact overlay panel did on their behalf, and nothing later refocuses.
     useLayoutEffect(() => {
-      if (isActiveComposer && focusIntentRef.current) textInputRef.current?.focus();
-    }, [isActiveComposer]);
+      if (isPaneFocused && focusIntentRef.current) textInputRef.current?.focus();
+    }, [isPaneFocused]);
     // The compact and desktop screens mount the editor in different trees, so a
     // viewport that crosses the breakpoint remounts it. The draft owner brings the
     // text back; the session brings the caret and focus intent back. On web the
@@ -1305,7 +1309,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         textInputRef.current?.setSelection(selection);
         if (retained.focused) {
           focusIntentRef.current = true;
-          if (activeComposerRef.current) textInputRef.current?.focus();
+          if (paneFocusedRef.current) textInputRef.current?.focus();
         }
       }
       return () => {
@@ -1807,13 +1811,11 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     }, [onFocusChange]);
 
     const handleInputBlur = useCallback(() => {
-      // Fullscreen is nothing but the editor, so a blur there (a retained tab being
-      // hidden, the keyboard dismissed) keeps the intent: showing it again refocuses.
-      if (activeComposerRef.current && !isFullscreen) focusIntentRef.current = false;
+      if (paneFocusedRef.current) focusIntentRef.current = false;
       isInputFocusedRef.current = false;
       setIsInputFocused(false);
       onFocusChange?.(false);
-    }, [isFullscreen, onFocusChange]);
+    }, [onFocusChange]);
 
     const handlePasteError = useCallback(
       (message: string) => {
diff --git a/packages/app/src/composer/keyboard-scope.tsx b/packages/app/src/composer/keyboard-scope.tsx
index b254c53a51..20b57dde28 100644
--- a/packages/app/src/composer/keyboard-scope.tsx
+++ b/packages/app/src/composer/keyboard-scope.tsx
@@ -7,18 +7,35 @@ import {
 } from "react";
 
 interface ComposerKeyboardScopeValue {
+  /**
+   * The pane this composer sits in is the user's pane. Focus restoration follows it:
+   * the editor keeps its focus intent across blurs that happen while the pane is not
+   * the user's (a retained tab hidden, a sheet over it) and brings focus back when
+   * the pane is theirs again.
+   */
+  isPaneFocused: boolean;
+  /**
+   * The composer takes input right now: keyboard actions, shortcuts, autocomplete,
+   * and the fullscreen exit action. False while a compact overlay panel covers the
+   * pane, which does not take pane focus.
+   */
   isActiveComposer: boolean;
 }
 
 const ComposerKeyboardScopeContext = createContext<ComposerKeyboardScopeValue>({
+  isPaneFocused: false,
   isActiveComposer: false,
 });
 
 export function ComposerKeyboardScopeProvider({
+  isPaneFocused,
   isActiveComposer,
   children,
 }: PropsWithChildren<ComposerKeyboardScopeValue>): ReactElement {
-  const value = useMemo(() => ({ isActiveComposer }), [isActiveComposer]);
+  const value = useMemo(
+    () => ({ isPaneFocused, isActiveComposer }),
+    [isPaneFocused, isActiveComposer],
+  );
   return (
     <ComposerKeyboardScopeContext.Provider value={value}>
       {children}

From 8ff2424da1ae807999fd84fa61b10250a97e34ed Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 05:08:39 +0200
Subject: [PATCH 166/270] Return checkout diff hunks from subdirectory
 workspaces (#6882)

* fix(git): return checkout diff hunks from subdirectory workspaces

Checkout paths are repository-relative, but one-shot diff reads used the workspace subdirectory for Git pathspecs. Resolve the worktree root once so patch selection and file reads use the same coordinates as the live subscription.

* test(server): await bounded discard fixture cleanup on Windows

The discard assertions pass but Windows can retain a directory lock during cleanup. Await asynchronous removal with bounded retries after daemon shutdown, preserving failure for persistent locks. Matches the verified cleanup correction in #6912 for #6918.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/server/package.json                  |  2 +-
 .../checkout-diff-content.e2e.test.ts         | 75 ++++++++++++++++++-
 .../server/daemon-e2e/filesystem.e2e.test.ts  |  5 +-
 packages/server/src/utils/checkout-git.ts     |  2 +-
 4 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index beffa3b4ce..a69a2c3c2a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\" && vitest run --maxWorkers=1 src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"oversized attachments\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/checkout-diff-content.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\" && vitest run --maxWorkers=1 src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"oversized attachments\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",
diff --git a/packages/server/src/server/daemon-e2e/checkout-diff-content.e2e.test.ts b/packages/server/src/server/daemon-e2e/checkout-diff-content.e2e.test.ts
index f0cd4495e1..75302d4168 100644
--- a/packages/server/src/server/daemon-e2e/checkout-diff-content.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/checkout-diff-content.e2e.test.ts
@@ -1,5 +1,5 @@
 import { execFileSync } from "node:child_process";
-import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { expect, test } from "vitest";
@@ -85,3 +85,76 @@ test.each(["uncommitted", "base", "commit"] as const)(
   },
   60_000,
 );
+
+test.each(
+  (["uncommitted", "base"] as const).flatMap((mode) =>
+    (["single", "batch", "rename"] as const).map((shape) => ({ mode, shape })),
+  ),
+)(
+  "$mode $shape diff includes hunks from a repository subdirectory",
+  async ({ mode, shape }) => {
+    const ctx = await createDaemonTestContext();
+    const cwd = mkdtempSync(join(tmpdir(), "checkout-diff-subdirectory-"));
+
+    try {
+      git(cwd, "init", "-b", "main");
+      git(cwd, "config", "user.name", "Test");
+      git(cwd, "config", "user.email", "test@example.com");
+      git(cwd, "config", "core.autocrlf", "false");
+      const subdirectory = join(cwd, "sub");
+      mkdirSync(subdirectory);
+      const unchangedLines = "unchanged\n".repeat(10);
+      writeFileSync(join(subdirectory, "normal.txt"), `before\n${unchangedLines}`);
+      if (shape === "batch") {
+        writeFileSync(join(cwd, "sibling.txt"), "old sibling\n");
+      }
+      git(cwd, "add", ".");
+      git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "initial");
+      if (mode === "base") {
+        git(cwd, "checkout", "-b", "feature");
+      }
+      const filename = shape === "rename" ? "renamed.txt" : "normal.txt";
+      if (shape === "rename") {
+        git(cwd, "mv", "sub/normal.txt", `sub/${filename}`);
+      }
+      writeFileSync(join(subdirectory, filename), `after\n${unchangedLines}`);
+      if (shape === "batch") {
+        writeFileSync(join(cwd, "sibling.txt"), "new sibling\n");
+      }
+      if (mode === "base") {
+        git(cwd, "add", ".");
+        git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit");
+      }
+
+      const compare = { mode, baseRef: "main" };
+      const rootDiff = await ctx.client.getCheckoutDiff(cwd, compare);
+      const subdirectoryDiff = await ctx.client.getCheckoutDiff(subdirectory, compare);
+      const subscription = ctx.client.observeCheckoutDiff(subdirectory, compare);
+      const liveDiff = await subscription.ready;
+      await subscription.release();
+
+      expect(rootDiff.error).toBeNull();
+      expect(subdirectoryDiff.error).toBeNull();
+      expect(liveDiff.error).toBeNull();
+      expect(liveDiff.files).toEqual(rootDiff.files);
+      expect(rootDiff.files).toHaveLength(shape === "batch" ? 2 : 1);
+      const file = rootDiff.files.find((candidate) => candidate.path === `sub/${filename}`);
+      expect(file).toMatchObject({
+        additions: 1,
+        deletions: 1,
+        ...(shape === "rename" ? { oldPath: "sub/normal.txt" } : {}),
+      });
+      expect(file?.hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ type: "remove", content: "before" }),
+          expect.objectContaining({ type: "add", content: "after" }),
+        ]),
+      );
+      expect(subdirectoryDiff.files).toEqual(rootDiff.files);
+    } finally {
+      await ctx.cleanup();
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  },
+  60_000,
+);
diff --git a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
index 0c99744e62..da52c4dac4 100644
--- a/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/filesystem.e2e.test.ts
@@ -8,6 +8,7 @@ import {
   readdirSync,
   readlinkSync,
 } from "fs";
+import { rm } from "node:fs/promises";
 import { tmpdir } from "os";
 import path from "path";
 import { execFileSync } from "node:child_process";
@@ -100,7 +101,9 @@ describe("checkout discard", () => {
         }
       } finally {
         // afterEach shuts down the daemon and its repository observers first.
-        onTestFinished(() => rmSync(cwd, { recursive: true, force: true }));
+        onTestFinished(() =>
+          rm(cwd, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 }),
+        );
       }
     },
   );
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index bda89506b5..64148c26e4 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -3423,7 +3423,7 @@ export async function getCheckoutDiff(
   compare: CheckoutDiffCompare,
   context?: CheckoutContext,
 ): Promise<CheckoutDiffResult> {
-  await requireGitRepo(cwd);
+  cwd = await requireGitWorktreeRoot(cwd);
 
   const refsForDiff = await resolveCheckoutDiffRefs(cwd, compare, context);
   if (!refsForDiff) {

From 9ab99a6e1e004fdcffde43203e8c7adebf971f85 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 11:19:32 +0700
Subject: [PATCH 167/270] feat(website): show sponsors on paseo.sh and at the
 top of the README (#6956)

---
 README.ja.md                                  |  17 ++-
 README.ko.md                                  |  17 ++-
 README.md                                     |  17 ++-
 README.zh-CN.md                               |  17 ++-
 packages/website/e2e/sponsors.spec.ts         |  20 ++++
 .../public/sponsors/hoplite-on-dark.svg       |   1 +
 .../public/sponsors/hoplite-on-light.svg      |   1 +
 .../src/components/docs-source-footer.tsx     |  13 +-
 .../website/src/components/landing-page.tsx   |   4 +-
 .../website/src/components/site-footer.tsx    |   6 +-
 .../website/src/components/sponsorship.tsx    | 112 +++++++++++-------
 packages/website/src/data/sponsors.test.ts    |  64 ++++++++++
 packages/website/src/data/sponsors.ts         |  56 ++++++---
 packages/website/src/routes/docs.tsx          |   2 +
 packages/website/src/styles.css               |  17 ---
 15 files changed, 271 insertions(+), 93 deletions(-)
 create mode 100644 packages/website/e2e/sponsors.spec.ts
 create mode 100644 packages/website/public/sponsors/hoplite-on-dark.svg
 create mode 100644 packages/website/public/sponsors/hoplite-on-light.svg
 create mode 100644 packages/website/src/data/sponsors.test.ts

diff --git a/README.ja.md b/README.ja.md
index c2d1ad88a0..5d1c8f5ebb 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -53,6 +53,17 @@
 - **クロスデバイス:** iOS、Android、デスクトップ、Web、CLI に対応。机で作業を始め、スマートフォンで確認し、ターミナルから自動化できます。
 - **プライバシー優先:** Paseo にはテレメトリー・トラッキング・強制ログインは一切ありません。
 
+## スポンサー
+
+<!-- Sponsors: one cell per sponsor in the order of packages/website/src/data/sponsors.ts, then "become a sponsor" cells up to three. -->
+<table>
+  <tr>
+    <td align="center" width="33%"><a href="https://hoplite.sh/?utm_source=paseo&utm_medium=readme&utm_campaign=sponsor"><picture><source media="(prefers-color-scheme: dark)" srcset="packages/website/public/sponsors/hoplite-on-dark.svg"><img src="packages/website/public/sponsors/hoplite-on-light.svg" alt="Hoplite" height="40"></picture></a><br><sub>Cloud coding agents</sub></td>
+    <td align="center" width="33%"><a href="https://paseo.sh/sponsor">Paseo のスポンサーになる</a></td>
+    <td align="center" width="33%"><a href="https://paseo.sh/sponsor">Paseo のスポンサーになる</a></td>
+  </tr>
+</table>
+
 ## はじめかた
 
 Paseo はコーディングエージェントを管理するローカルサーバー（デーモン）を起動します。デスクトップアプリ・モバイルアプリ・Web アプリ・CLI などのクライアントがこのデーモンに接続します。
@@ -151,11 +162,9 @@ npm run build:server
 npm run typecheck
 ```
 
-## スポンサー
+## Paseo を支援する
 
-Paseo は一人で開発しており、使ってくれる人たちの支援で成り立っています。[GitHub Sponsors](https://github.com/sponsors/boudra) で支援できます。企業として毎月[スポンサー](https://paseo.sh/sponsor#spot)になっていただくと、ロゴをここと paseo.sh のホームページに掲載します。
-
-<!-- Sponsor logos go here, in the same order as packages/website/src/data/sponsors.ts -->
+Paseo は一人で開発しており、使ってくれる人たちの支援で成り立っています。[GitHub Sponsors](https://github.com/sponsors/boudra) で支援できます。企業として毎月[スポンサー](https://paseo.sh/sponsor#spot)になっていただくと、ロゴをこの README の冒頭と、paseo.sh のトップページおよびドキュメントに掲載します。
 
 ## 関連プロジェクト
 
diff --git a/README.ko.md b/README.ko.md
index 60581767cd..7f2098221d 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -47,6 +47,17 @@
 - **여러 기기 지원:** iOS, Android, 데스크톱, 웹, CLI를 지원합니다. 데스크톱에서 시작해 휴대폰으로 확인하고 터미널에서 자동화할 수 있습니다.
 - **개인정보 보호 우선:** Paseo는 텔레메트리, 추적, 강제 로그인을 사용하지 않습니다.
 
+## 스폰서
+
+<!-- Sponsors: one cell per sponsor in the order of packages/website/src/data/sponsors.ts, then "become a sponsor" cells up to three. -->
+<table>
+  <tr>
+    <td align="center" width="33%"><a href="https://hoplite.sh/?utm_source=paseo&utm_medium=readme&utm_campaign=sponsor"><picture><source media="(prefers-color-scheme: dark)" srcset="packages/website/public/sponsors/hoplite-on-dark.svg"><img src="packages/website/public/sponsors/hoplite-on-light.svg" alt="Hoplite" height="40"></picture></a><br><sub>Cloud coding agents</sub></td>
+    <td align="center" width="33%"><a href="https://paseo.sh/sponsor">Paseo 스폰서 되기</a></td>
+    <td align="center" width="33%"><a href="https://paseo.sh/sponsor">Paseo 스폰서 되기</a></td>
+  </tr>
+</table>
+
 ## 시작하기
 
 Paseo는 코딩 에이전트를 관리하는 로컬 서버인 데몬을 실행합니다. 데스크톱 앱, 모바일 앱, 웹 앱, CLI 같은 클라이언트가 이 데몬에 연결합니다.
@@ -161,11 +172,9 @@ npm run build:server
 npm run typecheck
 ```
 
-## 스폰서
+## Paseo 후원하기
 
-Paseo는 한 사람이 개발하며, 사용하는 분들의 후원으로 운영됩니다. [GitHub Sponsors](https://github.com/sponsors/boudra)로 후원할 수 있습니다. 회사는 매월 [Paseo를 후원](https://paseo.sh/sponsor#spot)하고 로고를 이곳과 paseo.sh 홈페이지에 게재할 수 있습니다.
-
-<!-- Sponsor logos go here, in the same order as packages/website/src/data/sponsors.ts -->
+Paseo는 한 사람이 개발하며, 사용하는 분들의 후원으로 운영됩니다. [GitHub Sponsors](https://github.com/sponsors/boudra)로 후원할 수 있습니다. 회사는 매월 [Paseo를 후원](https://paseo.sh/sponsor#spot)하고 로고를 이 README 상단과 paseo.sh 홈페이지 및 문서에 게재할 수 있습니다.
 
 ## 관련 프로젝트
 
diff --git a/README.md b/README.md
index 2fc0fc8f3d..91310cd7c7 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,17 @@ Paseo is an open source agentic development environment for desktop, mobile, web
 
 [Run parallel tasks in Paseo](https://paseo.sh/docs/parallel-development): start agents in separate worktrees, review their diffs, run each app, and check it in the built-in browser.
 
+## Sponsors
+
+<!-- Sponsors: one cell per sponsor in the order of packages/website/src/data/sponsors.ts, then "become a sponsor" cells up to three. -->
+<table>
+  <tr>
+    <td align="center" width="33%"><a href="https://hoplite.sh/?utm_source=paseo&utm_medium=readme&utm_campaign=sponsor"><picture><source media="(prefers-color-scheme: dark)" srcset="packages/website/public/sponsors/hoplite-on-dark.svg"><img src="packages/website/public/sponsors/hoplite-on-light.svg" alt="Hoplite" height="40"></picture></a><br><sub>Cloud coding agents</sub></td>
+    <td align="center" width="33%"><a href="https://paseo.sh/sponsor">Become a sponsor</a></td>
+    <td align="center" width="33%"><a href="https://paseo.sh/sponsor">Become a sponsor</a></td>
+  </tr>
+</table>
+
 ## Plugins
 
 Plugins run on the daemon and show up in every client you connect, with the same UI on desktop, web,
@@ -207,11 +218,9 @@ npm run build:server
 npm run typecheck
 ```
 
-## Sponsors
+## Support Paseo
 
-Paseo is an independent project used by tens of thousands of developers daily, built by one person and funded by the people who use it. Support the work on [GitHub Sponsors](https://github.com/sponsors/boudra). Companies can [sponsor Paseo](https://paseo.sh/sponsor#spot) monthly and have their logo shown here and on the paseo.sh homepage.
-
-<!-- Sponsor logos go here, in the same order as packages/website/src/data/sponsors.ts -->
+Paseo is an independent project used by tens of thousands of developers daily, built by one person and funded by the people who use it. Support the work on [GitHub Sponsors](https://github.com/sponsors/boudra). Companies can [sponsor Paseo](https://paseo.sh/sponsor#spot) monthly and have their logo shown at the top of this README and on the paseo.sh homepage and docs.
 
 ## Related projects
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
index dfdf673b2e..745071f0fe 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -53,6 +53,17 @@
 - **跨设备：** 支持 iOS、Android、桌面端、Web 和 CLI。在桌前开始工作，用手机查看进度，也可以从终端脚本化操作。
 - **隐私优先：** Paseo 没有遥测、追踪，也不会强制登录。
 
+## 赞助商
+
+<!-- Sponsors: one cell per sponsor in the order of packages/website/src/data/sponsors.ts, then "become a sponsor" cells up to three. -->
+<table>
+  <tr>
+    <td align="center" width="33%"><a href="https://hoplite.sh/?utm_source=paseo&utm_medium=readme&utm_campaign=sponsor"><picture><source media="(prefers-color-scheme: dark)" srcset="packages/website/public/sponsors/hoplite-on-dark.svg"><img src="packages/website/public/sponsors/hoplite-on-light.svg" alt="Hoplite" height="40"></picture></a><br><sub>Cloud coding agents</sub></td>
+    <td align="center" width="33%"><a href="https://paseo.sh/sponsor">成为 Paseo 赞助商</a></td>
+    <td align="center" width="33%"><a href="https://paseo.sh/sponsor">成为 Paseo 赞助商</a></td>
+  </tr>
+</table>
+
 ## 快速开始
 
 Paseo 会运行一个名为 daemon 的本地服务，用来管理你的 coding agents。桌面 app、移动 app、Web app 和 CLI 等客户端都会连接到它。
@@ -151,11 +162,9 @@ npm run build:server
 npm run typecheck
 ```
 
-## 赞助
+## 支持 Paseo
 
-Paseo 由一个人开发，靠使用它的人来资助。你可以通过 [GitHub Sponsors](https://github.com/sponsors/boudra) 支持这项工作。公司也可以按月[赞助 Paseo](https://paseo.sh/sponsor#spot)，logo 会展示在这里和 paseo.sh 首页上。
-
-<!-- Sponsor logos go here, in the same order as packages/website/src/data/sponsors.ts -->
+Paseo 由一个人开发，靠使用它的人来资助。你可以通过 [GitHub Sponsors](https://github.com/sponsors/boudra) 支持这项工作。公司也可以按月[赞助 Paseo](https://paseo.sh/sponsor#spot)，logo 会展示在本 README 顶部，以及 paseo.sh 的首页和文档中。
 
 ## 相关项目
 
diff --git a/packages/website/e2e/sponsors.spec.ts b/packages/website/e2e/sponsors.spec.ts
new file mode 100644
index 0000000000..5dc9aae92d
--- /dev/null
+++ b/packages/website/e2e/sponsors.spec.ts
@@ -0,0 +1,20 @@
+import { expect, test } from "playwright/test";
+
+const PAGES = ["/", "/docs/connectivity", "/changelog"];
+
+for (const path of PAGES) {
+  test(`${path} shows the sponsors and invites the next one`, async ({ page }) => {
+    await page.goto(path);
+
+    const sponsors = page.getByRole("region", { name: /^(Sponsors|Sponsored by)$/ });
+    await expect(sponsors.getByRole("link", { name: "Hoplite" })).toHaveAttribute(
+      "href",
+      "https://hoplite.sh/?utm_source=paseo&utm_medium=website&utm_campaign=sponsor",
+    );
+    await expect(sponsors.getByText("Cloud coding agents", { exact: true })).toBeVisible();
+    await expect(sponsors.getByRole("link", { name: "Become a sponsor" })).toHaveAttribute(
+      "href",
+      "/sponsor#spot",
+    );
+  });
+}
diff --git a/packages/website/public/sponsors/hoplite-on-dark.svg b/packages/website/public/sponsors/hoplite-on-dark.svg
new file mode 100644
index 0000000000..55b1da0592
--- /dev/null
+++ b/packages/website/public/sponsors/hoplite-on-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="543" height="132" viewBox="0 0 543.36 131.55" fill="none" role="img" aria-label="Hoplite"><g transform="translate(8 21.057) scale(0.573290)"><path d="M302.691 155.065H288.942C287.892 155.065 287.041 154.214 287.041 153.164V147.506C287.041 146.804 286.654 146.159 286.035 145.829L261.463 132.724C260.165 132.032 260.111 130.192 261.366 129.425L274.298 121.522C275.075 121.047 276.079 121.19 276.693 121.862L304.095 151.883C305.209 153.103 304.343 155.065 302.691 155.065Z" fill="#eaeaea"></path><path d="M252.762 108.228L233.61 107.75H98.3204C97.9834 107.75 97.6525 107.84 97.3615 108.01L37.0718 143.236L27.0043 148.614C26.3855 148.944 25.9991 149.589 25.9991 150.29V153.149C25.9991 154.205 25.1389 155.058 24.0833 155.05L4.18116 154.894C2.54933 154.881 1.69116 152.953 2.77368 151.732L47.3957 101.396C47.4864 101.293 47.5658 101.181 47.6325 101.062L53.6519 90.2923C54.5951 88.6046 52.7097 86.7502 51.0379 87.7212L35.8453 96.5457C24.2461 103.283 9.39029 99.5363 2.37343 88.1041L0.280818 84.6947C0.097197 84.3956 0 84.0514 0 83.7004V58.3505C0 56.4105 2.56456 55.7168 3.54252 57.3923L10.4681 69.2575C15.7292 78.271 27.2735 81.357 36.3303 76.171L58.8584 63.2712C59.4456 62.935 59.8097 62.312 59.8147 61.6355L59.8659 54.615C59.8766 53.1519 58.2994 52.2258 57.0268 52.948L33.8106 66.1245C28.937 68.8905 22.7405 66.8612 20.4473 61.7481L0.166472 16.5284C0.0567329 16.2838 7.51957e-06 16.0186 2.20646e-05 15.7505L0.000767057 2.01526C0.000821237 1.01636 0.810609 0.206616 1.80951 0.206616C17.8277 0.206616 33.7837 2.20008 49.3095 6.14104L70.7728 11.5891C71.9741 11.8941 73.1413 10.9862 73.1413 9.74669V1.59489C73.1413 0.828169 73.7628 0.206616 74.5296 0.206616C88.0714 0.206616 101.274 4.44343 112.287 12.3233L137.017 30.0176C137.339 30.2484 137.726 30.3725 138.123 30.3725H161.504C162.554 30.3725 163.405 29.5215 163.405 28.4717V25.5583C163.405 24.5085 162.554 23.6575 161.504 23.6575H138.446C136.536 23.6575 135.819 21.1555 137.44 20.1441L152.071 11.0128C163.603 3.81567 176.923 0 190.517 0C203.224 0 215.708 3.33443 226.723 9.67017L231.117 12.1975C232.347 12.9051 232.396 14.6625 231.207 15.4376L212.014 27.9505C211.476 28.3014 211.151 28.9004 211.151 29.5429V35.984C211.151 36.6551 210.797 37.2766 210.22 37.6189L203.831 41.4081C202.133 42.4151 200.215 40.4867 201.231 38.7944L202.078 37.3845C202.839 36.1175 201.927 34.5048 200.449 34.5048H192.32C190.287 34.5048 189.673 37.2658 191.514 38.1273L198.321 41.3127C199.687 41.9517 199.8 43.8498 198.521 44.6474L186.136 52.3701C185.834 52.5582 185.486 52.6579 185.13 52.6579H179.616C178.581 52.6579 177.742 53.497 177.742 54.532C177.742 55.567 178.581 56.4061 179.616 56.4061H189.794C190.136 56.4061 190.471 56.314 190.765 56.1395L267.664 10.4567C276.712 5.08166 288.289 6.78035 295.411 14.5282C295.556 14.6857 295.636 14.8917 295.636 15.1055V20.8068C295.636 22.457 297.595 23.3234 298.816 22.2134L303.82 17.6635C305.042 16.5534 307 17.4198 307 19.07V81.8818C307 82.9316 306.149 83.7827 305.099 83.7827H296.529C295.963 83.7827 295.427 83.5307 295.066 83.0953L276.998 61.3111C276.255 60.4154 274.889 60.3915 274.116 61.2606L259.05 78.1821C258.276 79.0519 258.458 80.4071 259.435 81.0408L290.165 100.974C291.35 101.742 291.313 103.489 290.096 104.206L242.218 132.42C240.989 133.144 239.43 132.307 239.355 130.882L238.675 117.953C238.617 116.865 239.484 115.952 240.573 115.952H248.301C248.767 115.952 249.216 115.781 249.564 115.472L253.977 111.549C255.266 110.404 254.486 108.271 252.762 108.228Z" fill="#eaeaea"></path><path d="M137.364 113.639H111.169C110.831 113.639 110.499 113.729 110.208 113.9L80.0946 131.554C78.7781 132.326 78.862 134.256 80.2405 134.911L107.275 147.751C107.938 148.066 108.361 148.734 108.361 149.468V153.164C108.361 154.214 109.212 155.065 110.262 155.065H126.237C127.886 155.065 128.753 153.109 127.645 151.888L112.427 135.099C111.618 134.207 111.832 132.797 112.87 132.185L138.329 117.177C139.997 116.194 139.299 113.639 137.364 113.639Z" fill="#eaeaea"></path></g><path fill="#eaeaea" d="M94.51 109.18Q93.17 109.18 92.00 108.67Q90.84 108.17 89.94 107.28Q89.05 106.39 88.55 105.22Q88.05 104.06 88.05 102.72Q88.05 101.38 88.55 100.21Q89.05 99.05 89.94 98.15Q90.84 97.26 92.00 96.76Q93.17 96.26 94.51 96.26Q95.85 96.26 97.01 96.76Q98.18 97.26 99.07 98.15Q99.96 99.05 100.47 100.21Q100.97 101.38 100.97 102.72Q100.97 104.06 100.47 105.22Q99.96 106.39 99.07 107.28Q98.18 108.17 97.01 108.67Q95.85 109.18 94.51 109.18ZM94.51 107.82Q95.57 107.82 96.49 107.42Q97.41 107.02 98.11 106.32Q98.82 105.62 99.21 104.69Q99.61 103.77 99.61 102.72Q99.61 101.65 99.21 100.73Q98.82 99.81 98.11 99.11Q97.41 98.40 96.49 98.01Q95.57 97.62 94.51 97.62Q93.45 97.62 92.53 98.01Q91.60 98.40 90.90 99.11Q90.20 99.81 89.81 100.73Q89.41 101.65 89.41 102.72Q89.41 103.77 89.81 104.69Q90.20 105.62 90.90 106.32Q91.60 107.02 92.53 107.42Q93.45 107.82 94.51 107.82ZM94.53 106.13Q93.63 106.13 92.92 105.71Q92.21 105.29 91.80 104.52Q91.38 103.74 91.38 102.72Q91.38 101.67 91.80 100.91Q92.21 100.14 92.92 99.72Q93.63 99.30 94.53 99.30Q95.63 99.30 96.42 99.92Q97.22 100.53 97.43 101.73H95.84Q95.71 101.15 95.36 100.88Q95.01 100.61 94.53 100.61Q93.80 100.61 93.36 101.19Q92.92 101.77 92.92 102.72Q92.92 103.64 93.36 104.21Q93.80 104.78 94.53 104.78Q95.05 104.78 95.41 104.49Q95.77 104.21 95.91 103.61H97.45Q97.27 104.87 96.45 105.50Q95.62 106.13 94.53 106.13Z"/><path fill="#eaeaea" d="M232.45 100.43V35.44H241.63V62.78H279.09V35.44H288.27V100.43H279.09V70.68H241.63V100.43ZM322.81 101.40Q315.31 101.40 309.76 98.31Q304.21 95.21 301.15 89.59Q298.09 83.98 298.09 76.35Q298.09 68.72 301.12 63.10Q304.14 57.49 309.73 54.41Q315.32 51.33 322.82 51.33Q330.46 51.33 335.96 54.37Q341.46 57.42 344.48 63.04Q347.49 68.66 347.49 76.36Q347.49 83.98 344.48 89.64Q341.46 95.30 335.92 98.35Q330.38 101.40 322.81 101.40ZM322.81 93.56Q330.27 93.56 334.39 89.01Q338.50 84.47 338.50 76.35Q338.50 68.16 334.39 63.66Q330.27 59.16 322.81 59.16Q315.39 59.16 311.24 63.69Q307.08 68.22 307.08 76.34Q307.08 84.47 311.24 89.01Q315.39 93.56 322.81 93.56ZM357.92 119.69V61.60H353.27V52.29H362.90V59.67H366.27Q368.71 55.61 372.85 53.47Q377.00 51.33 382.84 51.33Q390.08 51.33 395.15 54.37Q400.22 57.41 402.90 63.02Q405.58 68.64 405.58 76.36Q405.58 84.08 402.95 89.71Q400.32 95.33 395.39 98.36Q390.47 101.40 383.61 101.40Q377.90 101.40 373.67 99.13Q369.44 96.85 367.23 92.65H366.91V119.69ZM381.45 93.69Q388.69 93.69 392.64 89.12Q396.60 84.55 396.60 76.36Q396.60 68.18 392.64 63.60Q388.69 59.03 381.45 59.03Q374.87 59.03 370.89 62.79Q366.91 66.56 366.91 72.86V79.86Q366.91 86.17 370.89 89.93Q374.87 93.69 381.45 93.69ZM414.43 100.43V33.03H423.41V100.43ZM435.45 100.43V52.29H444.44V100.43ZM439.95 45.69Q437.68 45.69 436.09 44.11Q434.50 42.52 434.50 40.25Q434.50 37.99 436.09 36.40Q437.68 34.81 439.94 34.81Q442.21 34.81 443.80 36.40Q445.38 37.98 445.38 40.25Q445.38 42.51 443.80 44.10Q442.21 45.69 439.95 45.69ZM468.00 100.43Q464.18 100.43 462.05 98.48Q459.92 96.53 459.92 92.60V59.22H450.94V52.29H460.02V37.84H468.81V52.29H481.46V59.22H468.91V93.37H482.71V100.43ZM511.09 101.40Q503.59 101.40 498.05 98.31Q492.52 95.22 489.51 89.53Q486.50 83.84 486.50 76.20Q486.50 68.56 489.49 62.98Q492.49 57.41 497.93 54.37Q503.38 51.33 510.72 51.33Q517.71 51.33 522.80 54.13Q527.89 56.93 530.69 62.06Q533.49 67.20 533.49 74.24V77.89H495.12Q495.55 85.43 499.77 89.62Q503.99 93.82 511.01 93.82Q515.96 93.82 519.33 91.78Q522.69 89.73 523.97 85.78H533.09Q531.31 93.20 525.51 97.30Q519.72 101.40 511.09 101.40ZM495.49 71.34H524.82Q524.23 65.34 520.50 62.05Q516.77 58.77 510.67 58.77Q504.59 58.77 500.59 62.06Q496.59 65.35 495.49 71.34Z"/></svg>
diff --git a/packages/website/public/sponsors/hoplite-on-light.svg b/packages/website/public/sponsors/hoplite-on-light.svg
new file mode 100644
index 0000000000..144d1a59c9
--- /dev/null
+++ b/packages/website/public/sponsors/hoplite-on-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="543" height="132" viewBox="0 0 543.36 131.55" fill="none" role="img" aria-label="Hoplite"><g transform="translate(8 21.057) scale(0.573290)"><path d="M302.691 155.065H288.942C287.892 155.065 287.041 154.214 287.041 153.164V147.506C287.041 146.804 286.654 146.159 286.035 145.829L261.463 132.724C260.165 132.032 260.111 130.192 261.366 129.425L274.298 121.522C275.075 121.047 276.079 121.19 276.693 121.862L304.095 151.883C305.209 153.103 304.343 155.065 302.691 155.065Z" fill="#121212"></path><path d="M252.762 108.228L233.61 107.75H98.3204C97.9834 107.75 97.6525 107.84 97.3615 108.01L37.0718 143.236L27.0043 148.614C26.3855 148.944 25.9991 149.589 25.9991 150.29V153.149C25.9991 154.205 25.1389 155.058 24.0833 155.05L4.18116 154.894C2.54933 154.881 1.69116 152.953 2.77368 151.732L47.3957 101.396C47.4864 101.293 47.5658 101.181 47.6325 101.062L53.6519 90.2923C54.5951 88.6046 52.7097 86.7502 51.0379 87.7212L35.8453 96.5457C24.2461 103.283 9.39029 99.5363 2.37343 88.1041L0.280818 84.6947C0.097197 84.3956 0 84.0514 0 83.7004V58.3505C0 56.4105 2.56456 55.7168 3.54252 57.3923L10.4681 69.2575C15.7292 78.271 27.2735 81.357 36.3303 76.171L58.8584 63.2712C59.4456 62.935 59.8097 62.312 59.8147 61.6355L59.8659 54.615C59.8766 53.1519 58.2994 52.2258 57.0268 52.948L33.8106 66.1245C28.937 68.8905 22.7405 66.8612 20.4473 61.7481L0.166472 16.5284C0.0567329 16.2838 7.51957e-06 16.0186 2.20646e-05 15.7505L0.000767057 2.01526C0.000821237 1.01636 0.810609 0.206616 1.80951 0.206616C17.8277 0.206616 33.7837 2.20008 49.3095 6.14104L70.7728 11.5891C71.9741 11.8941 73.1413 10.9862 73.1413 9.74669V1.59489C73.1413 0.828169 73.7628 0.206616 74.5296 0.206616C88.0714 0.206616 101.274 4.44343 112.287 12.3233L137.017 30.0176C137.339 30.2484 137.726 30.3725 138.123 30.3725H161.504C162.554 30.3725 163.405 29.5215 163.405 28.4717V25.5583C163.405 24.5085 162.554 23.6575 161.504 23.6575H138.446C136.536 23.6575 135.819 21.1555 137.44 20.1441L152.071 11.0128C163.603 3.81567 176.923 0 190.517 0C203.224 0 215.708 3.33443 226.723 9.67017L231.117 12.1975C232.347 12.9051 232.396 14.6625 231.207 15.4376L212.014 27.9505C211.476 28.3014 211.151 28.9004 211.151 29.5429V35.984C211.151 36.6551 210.797 37.2766 210.22 37.6189L203.831 41.4081C202.133 42.4151 200.215 40.4867 201.231 38.7944L202.078 37.3845C202.839 36.1175 201.927 34.5048 200.449 34.5048H192.32C190.287 34.5048 189.673 37.2658 191.514 38.1273L198.321 41.3127C199.687 41.9517 199.8 43.8498 198.521 44.6474L186.136 52.3701C185.834 52.5582 185.486 52.6579 185.13 52.6579H179.616C178.581 52.6579 177.742 53.497 177.742 54.532C177.742 55.567 178.581 56.4061 179.616 56.4061H189.794C190.136 56.4061 190.471 56.314 190.765 56.1395L267.664 10.4567C276.712 5.08166 288.289 6.78035 295.411 14.5282C295.556 14.6857 295.636 14.8917 295.636 15.1055V20.8068C295.636 22.457 297.595 23.3234 298.816 22.2134L303.82 17.6635C305.042 16.5534 307 17.4198 307 19.07V81.8818C307 82.9316 306.149 83.7827 305.099 83.7827H296.529C295.963 83.7827 295.427 83.5307 295.066 83.0953L276.998 61.3111C276.255 60.4154 274.889 60.3915 274.116 61.2606L259.05 78.1821C258.276 79.0519 258.458 80.4071 259.435 81.0408L290.165 100.974C291.35 101.742 291.313 103.489 290.096 104.206L242.218 132.42C240.989 133.144 239.43 132.307 239.355 130.882L238.675 117.953C238.617 116.865 239.484 115.952 240.573 115.952H248.301C248.767 115.952 249.216 115.781 249.564 115.472L253.977 111.549C255.266 110.404 254.486 108.271 252.762 108.228Z" fill="#121212"></path><path d="M137.364 113.639H111.169C110.831 113.639 110.499 113.729 110.208 113.9L80.0946 131.554C78.7781 132.326 78.862 134.256 80.2405 134.911L107.275 147.751C107.938 148.066 108.361 148.734 108.361 149.468V153.164C108.361 154.214 109.212 155.065 110.262 155.065H126.237C127.886 155.065 128.753 153.109 127.645 151.888L112.427 135.099C111.618 134.207 111.832 132.797 112.87 132.185L138.329 117.177C139.997 116.194 139.299 113.639 137.364 113.639Z" fill="#121212"></path></g><path fill="#121212" d="M94.51 109.18Q93.17 109.18 92.00 108.67Q90.84 108.17 89.94 107.28Q89.05 106.39 88.55 105.22Q88.05 104.06 88.05 102.72Q88.05 101.38 88.55 100.21Q89.05 99.05 89.94 98.15Q90.84 97.26 92.00 96.76Q93.17 96.26 94.51 96.26Q95.85 96.26 97.01 96.76Q98.18 97.26 99.07 98.15Q99.96 99.05 100.47 100.21Q100.97 101.38 100.97 102.72Q100.97 104.06 100.47 105.22Q99.96 106.39 99.07 107.28Q98.18 108.17 97.01 108.67Q95.85 109.18 94.51 109.18ZM94.51 107.82Q95.57 107.82 96.49 107.42Q97.41 107.02 98.11 106.32Q98.82 105.62 99.21 104.69Q99.61 103.77 99.61 102.72Q99.61 101.65 99.21 100.73Q98.82 99.81 98.11 99.11Q97.41 98.40 96.49 98.01Q95.57 97.62 94.51 97.62Q93.45 97.62 92.53 98.01Q91.60 98.40 90.90 99.11Q90.20 99.81 89.81 100.73Q89.41 101.65 89.41 102.72Q89.41 103.77 89.81 104.69Q90.20 105.62 90.90 106.32Q91.60 107.02 92.53 107.42Q93.45 107.82 94.51 107.82ZM94.53 106.13Q93.63 106.13 92.92 105.71Q92.21 105.29 91.80 104.52Q91.38 103.74 91.38 102.72Q91.38 101.67 91.80 100.91Q92.21 100.14 92.92 99.72Q93.63 99.30 94.53 99.30Q95.63 99.30 96.42 99.92Q97.22 100.53 97.43 101.73H95.84Q95.71 101.15 95.36 100.88Q95.01 100.61 94.53 100.61Q93.80 100.61 93.36 101.19Q92.92 101.77 92.92 102.72Q92.92 103.64 93.36 104.21Q93.80 104.78 94.53 104.78Q95.05 104.78 95.41 104.49Q95.77 104.21 95.91 103.61H97.45Q97.27 104.87 96.45 105.50Q95.62 106.13 94.53 106.13Z"/><path fill="#121212" d="M232.45 100.43V35.44H241.63V62.78H279.09V35.44H288.27V100.43H279.09V70.68H241.63V100.43ZM322.81 101.40Q315.31 101.40 309.76 98.31Q304.21 95.21 301.15 89.59Q298.09 83.98 298.09 76.35Q298.09 68.72 301.12 63.10Q304.14 57.49 309.73 54.41Q315.32 51.33 322.82 51.33Q330.46 51.33 335.96 54.37Q341.46 57.42 344.48 63.04Q347.49 68.66 347.49 76.36Q347.49 83.98 344.48 89.64Q341.46 95.30 335.92 98.35Q330.38 101.40 322.81 101.40ZM322.81 93.56Q330.27 93.56 334.39 89.01Q338.50 84.47 338.50 76.35Q338.50 68.16 334.39 63.66Q330.27 59.16 322.81 59.16Q315.39 59.16 311.24 63.69Q307.08 68.22 307.08 76.34Q307.08 84.47 311.24 89.01Q315.39 93.56 322.81 93.56ZM357.92 119.69V61.60H353.27V52.29H362.90V59.67H366.27Q368.71 55.61 372.85 53.47Q377.00 51.33 382.84 51.33Q390.08 51.33 395.15 54.37Q400.22 57.41 402.90 63.02Q405.58 68.64 405.58 76.36Q405.58 84.08 402.95 89.71Q400.32 95.33 395.39 98.36Q390.47 101.40 383.61 101.40Q377.90 101.40 373.67 99.13Q369.44 96.85 367.23 92.65H366.91V119.69ZM381.45 93.69Q388.69 93.69 392.64 89.12Q396.60 84.55 396.60 76.36Q396.60 68.18 392.64 63.60Q388.69 59.03 381.45 59.03Q374.87 59.03 370.89 62.79Q366.91 66.56 366.91 72.86V79.86Q366.91 86.17 370.89 89.93Q374.87 93.69 381.45 93.69ZM414.43 100.43V33.03H423.41V100.43ZM435.45 100.43V52.29H444.44V100.43ZM439.95 45.69Q437.68 45.69 436.09 44.11Q434.50 42.52 434.50 40.25Q434.50 37.99 436.09 36.40Q437.68 34.81 439.94 34.81Q442.21 34.81 443.80 36.40Q445.38 37.98 445.38 40.25Q445.38 42.51 443.80 44.10Q442.21 45.69 439.95 45.69ZM468.00 100.43Q464.18 100.43 462.05 98.48Q459.92 96.53 459.92 92.60V59.22H450.94V52.29H460.02V37.84H468.81V52.29H481.46V59.22H468.91V93.37H482.71V100.43ZM511.09 101.40Q503.59 101.40 498.05 98.31Q492.52 95.22 489.51 89.53Q486.50 83.84 486.50 76.20Q486.50 68.56 489.49 62.98Q492.49 57.41 497.93 54.37Q503.38 51.33 510.72 51.33Q517.71 51.33 522.80 54.13Q527.89 56.93 530.69 62.06Q533.49 67.20 533.49 74.24V77.89H495.12Q495.55 85.43 499.77 89.62Q503.99 93.82 511.01 93.82Q515.96 93.82 519.33 91.78Q522.69 89.73 523.97 85.78H533.09Q531.31 93.20 525.51 97.30Q519.72 101.40 511.09 101.40ZM495.49 71.34H524.82Q524.23 65.34 520.50 62.05Q516.77 58.77 510.67 58.77Q504.59 58.77 500.59 62.06Q496.59 65.35 495.49 71.34Z"/></svg>
diff --git a/packages/website/src/components/docs-source-footer.tsx b/packages/website/src/components/docs-source-footer.tsx
index 69a9711e80..2b5ea3f131 100644
--- a/packages/website/src/components/docs-source-footer.tsx
+++ b/packages/website/src/components/docs-source-footer.tsx
@@ -1,3 +1,4 @@
+import { ExternalLink } from "lucide-react";
 import type { Doc } from "~/docs";
 
 const GITHUB_BASE_URL = "https://github.com/getpaseo/paseo/blob/main";
@@ -6,9 +7,15 @@ export function DocsSourceFooter({ doc }: { doc: Doc }) {
   const sourceUrl = `${GITHUB_BASE_URL}/${doc.sourcePath}`;
 
   return (
-    <footer className="docs-source-footer">
-      <a href={sourceUrl} target="_blank" rel="noreferrer">
-        View this page on GitHub
+    <footer className="mt-12 border-t border-white/10 py-8 text-sm">
+      <a
+        href={sourceUrl}
+        target="_blank"
+        rel="noreferrer"
+        className="inline-flex items-center gap-1.5 font-medium text-white/60 underline-offset-4 transition-colors hover:text-foreground hover:underline"
+      >
+        View on GitHub
+        <ExternalLink aria-hidden="true" className="size-3.5" />
       </a>
     </footer>
   );
diff --git a/packages/website/src/components/landing-page.tsx b/packages/website/src/components/landing-page.tsx
index a5b573a1d6..79382e64e8 100644
--- a/packages/website/src/components/landing-page.tsx
+++ b/packages/website/src/components/landing-page.tsx
@@ -134,11 +134,11 @@ export function LandingPage({ title, subtitle }: LandingPageProps) {
             <ExtensibleSection />
             <FAQ />
             <PhilosophySection />
+            <SponsorsSection placement="page" />
             <SponsorSection />
-            <SponsorsSection />
           </div>
         </main>
-        <SiteFooter />
+        <SiteFooter sponsors={false} />
       </div>
     </CursorFieldProvider>
   );
diff --git a/packages/website/src/components/site-footer.tsx b/packages/website/src/components/site-footer.tsx
index 198a60c9ce..7c34376dbc 100644
--- a/packages/website/src/components/site-footer.tsx
+++ b/packages/website/src/components/site-footer.tsx
@@ -1,9 +1,12 @@
 import { PLUGINS_LINKED } from "~/plugins/launch";
 import { getAlternativePages } from "~/data/alternative-pages";
 import { appStoreUrl, playStoreUrl, webAppUrl } from "~/downloads";
+import { SponsorsSection } from "~/components/sponsorship";
 
 interface SiteFooterProps {
   width?: "default" | "prose" | "wide";
+  /** Pages that show the sponsors in their content turn the footer band off. */
+  sponsors?: boolean;
 }
 
 const WIDTH_CLASSES: Record<NonNullable<SiteFooterProps["width"]>, string> = {
@@ -12,11 +15,12 @@ const WIDTH_CLASSES: Record<NonNullable<SiteFooterProps["width"]>, string> = {
   wide: "max-w-7xl p-6 md:p-20 md:pt-0",
 };
 
-export function SiteFooter({ width = "default" }: SiteFooterProps) {
+export function SiteFooter({ width = "default", sponsors = true }: SiteFooterProps) {
   const widthClasses = WIDTH_CLASSES[width];
   const alternatives = getAlternativePages();
   return (
     <footer className={`${widthClasses} mx-auto mt-12 md:mt-16`}>
+      {sponsors ? <SponsorsSection placement="footer" /> : null}
       <div className="border-t border-white/10 pt-8 pb-4 grid grid-cols-2 sm:grid-cols-5 gap-8 text-sm">
         <div className="space-y-3">
           <p className="text-extra-muted-foreground">Product</p>
diff --git a/packages/website/src/components/sponsorship.tsx b/packages/website/src/components/sponsorship.tsx
index 05a04362de..0693f1877b 100644
--- a/packages/website/src/components/sponsorship.tsx
+++ b/packages/website/src/components/sponsorship.tsx
@@ -3,12 +3,13 @@ import { BuyMeACoffeeIcon, GitHubIcon, OpenCollectiveIcon } from "~/components/b
 import {
   BUY_ME_A_COFFEE_URL,
   GITHUB_SPONSORS_URL,
-  HOMEPAGE_SPONSORS,
-  HOMEPAGE_SPOT_PRICE,
   OPEN_COLLECTIVE_URL,
+  SPONSORS,
   SPONSOR_CONTACT_EMAIL,
   SPONSOR_SPOT_CHECKOUT_URL,
+  SPONSOR_SPOT_PRICE,
   openSpotCount,
+  sponsorHref,
 } from "~/data/sponsors";
 
 function SectionHeading({
@@ -148,30 +149,11 @@ export function BackingOptions() {
   );
 }
 
-function SponsorLogoRow() {
-  return (
-    <ul className="grid grid-cols-2 gap-4">
-      {HOMEPAGE_SPONSORS.map((sponsor) => (
-        <li key={sponsor.href}>
-          <a
-            href={sponsor.href}
-            target="_blank"
-            rel="noopener noreferrer sponsored"
-            className="flex h-32 items-center justify-center rounded-xl border border-white/10 bg-white/[0.02] px-6 transition-colors hover:border-white/20 hover:bg-white/[0.05]"
-          >
-            <img src={sponsor.logo} alt={sponsor.name} className="max-h-10 max-w-full opacity-80" />
-          </a>
-        </li>
-      ))}
-    </ul>
-  );
-}
-
 const SPOT_FEATURES: ReadonlyArray<string> = [
-  "Your logo on the homepage of paseo.sh, around 70,000 visitors a month",
+  "Your logo on the paseo.sh homepage and docs, around 70,000 visitors a month",
   "Your logo in the GitHub README, around 30,000 visitors a month",
   "An announcement in the Discord, around 2,000 members",
-  "A mention in the changelog",
+  "An announcement from me on X",
 ];
 
 export function SponsorSpotSection() {
@@ -181,11 +163,11 @@ export function SponsorSpotSection() {
       <SectionHeading
         as="h2"
         title="Sponsor as a company"
-        description="If your team relies on Paseo, a monthly sponsorship funds its development directly. As a thank you, your logo goes on the homepage and in the README."
+        description="Support Paseo financially and get visibility for your company"
       />
       <div className="space-y-8">
         <div className="flex items-end gap-2">
-          <span className="text-4xl font-medium tracking-tight">{HOMEPAGE_SPOT_PRICE}</span>
+          <span className="text-4xl font-medium tracking-tight">{SPONSOR_SPOT_PRICE}</span>
           <span className="mb-1 text-sm text-white/45">a month</span>
         </div>
         <ul className="grid max-w-2xl gap-3 text-white/70">
@@ -259,23 +241,73 @@ export function SponsorSection() {
   );
 }
 
-/** Homepage: the companies sponsoring Paseo. Renders nothing until there is one. */
-export function SponsorsSection() {
-  if (HOMEPAGE_SPONSORS.length === 0) return null;
+const SPONSORS_PLACEMENTS = {
+  page: {
+    title: "Sponsors",
+    section: "space-y-10",
+    heading: "text-3xl font-medium tracking-tight",
+    link: "",
+    logo: "h-14",
+    description: "mt-2 text-sm text-white/55",
+    button: "h-12 px-5 text-sm",
+  },
+  footer: {
+    title: "Sponsored by",
+    section: "space-y-5 border-t border-white/10 py-8",
+    heading: "text-sm text-extra-muted-foreground",
+    link: "opacity-85 transition-opacity hover:opacity-100",
+    logo: "h-10",
+    description: "mt-1.5 text-xs text-white/45",
+    button: "h-9 px-3.5 text-sm",
+  },
+} as const;
+
+interface SponsorsSectionProps {
+  /** `page` is a homepage section; `footer` is the band above other pages' footers. */
+  placement: keyof typeof SPONSORS_PLACEMENTS;
+}
+
+/**
+ * The companies sponsoring Paseo: one monochrome logo per sponsor and, while
+ * spots are open, a quiet invitation. Every page shows it once.
+ */
+export function SponsorsSection({ placement }: SponsorsSectionProps) {
+  const style = SPONSORS_PLACEMENTS[placement];
+  const open = openSpotCount();
   return (
-    <section>
-      <SectionHeading as="h2" title="Sponsors" />
-      <div className="space-y-4">
-        <SponsorLogoRow />
-        {openSpotCount() > 0 ? (
-          <a
-            href="/sponsor#spot"
-            className="inline-block text-sm text-white/50 underline transition-colors hover:text-white/80"
-          >
-            Become a sponsor
-          </a>
+    <section aria-labelledby="sponsors-heading" className={style.section}>
+      <h2 id="sponsors-heading" className={style.heading}>
+        {style.title}
+      </h2>
+      <ul className="flex flex-wrap items-center gap-x-14 gap-y-8">
+        {SPONSORS.map((sponsor) => (
+          <li key={sponsor.url}>
+            <a
+              href={sponsorHref(sponsor, "website")}
+              target="_blank"
+              rel="noopener noreferrer sponsored"
+              className={`block ${style.link}`}
+            >
+              <img
+                src={sponsor.logo.onDark}
+                alt={sponsor.name}
+                className={`${style.logo} w-auto`}
+              />
+            </a>
+            <p className={style.description}>{sponsor.description}</p>
+          </li>
+        ))}
+        {open > 0 ? (
+          <li>
+            <a
+              href="/sponsor#spot"
+              className={`inline-flex items-center rounded-md border border-dashed border-white/15 text-white/45 transition-colors hover:border-white/30 hover:text-white/75 ${style.button}`}
+            >
+              Become a sponsor
+            </a>
+          </li>
         ) : null}
-      </div>
+      </ul>
     </section>
   );
 }
diff --git a/packages/website/src/data/sponsors.test.ts b/packages/website/src/data/sponsors.test.ts
new file mode 100644
index 0000000000..f586cb9557
--- /dev/null
+++ b/packages/website/src/data/sponsors.test.ts
@@ -0,0 +1,64 @@
+import { existsSync, readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { describe, expect, it } from "vitest";
+import { SPONSORS, sponsorHref } from "./sponsors";
+
+const REPO_ROOT = fileURLToPath(new URL("../../../../", import.meta.url));
+const WEBSITE_PUBLIC = fileURLToPath(new URL("../../public", import.meta.url));
+const READMES = ["README.md", "README.zh-CN.md", "README.ja.md", "README.ko.md"];
+const README_SPONSOR_CELLS = 3;
+const SPONSOR_PAGE_URL = "https://paseo.sh/sponsor";
+
+describe("sponsorHref", () => {
+  it("tags the link with the placement it is shown in", () => {
+    const sponsor = {
+      name: "Acme",
+      url: "https://acme.dev",
+      logo: { onDark: "", onLight: "" },
+      description: "",
+    };
+
+    expect(sponsorHref(sponsor, "website")).toBe(
+      "https://acme.dev/?utm_source=paseo&utm_medium=website&utm_campaign=sponsor",
+    );
+    expect(sponsorHref(sponsor, "x")).toBe(
+      "https://acme.dev/?utm_source=paseo&utm_medium=x&utm_campaign=sponsor",
+    );
+  });
+});
+
+function readmeSponsorCells(readme: string) {
+  const text = readFileSync(`${REPO_ROOT}${readme}`, "utf8");
+  const table = text.slice(text.indexOf("<!-- Sponsors:")).split("</table>")[0];
+  return [...table.matchAll(/<td[^>]*>(.*?)<\/td>/g)].map(([, cell]) => {
+    const logo = cell.match(
+      /^<a href="([^"]+)"><picture><source media="\(prefers-color-scheme: dark\)" srcset="([^"]+)"><img src="([^"]+)"[^>]*><\/picture><\/a><br><sub>([^<]+)<\/sub>$/,
+    );
+    if (logo) {
+      const [, href, onDark, onLight, description] = logo;
+      return { href, onDark, onLight, description };
+    }
+    return { invite: cell.match(/^<a href="([^"]+)">/)?.[1] };
+  });
+}
+
+describe("SPONSORS", () => {
+  it.each(SPONSORS)("ships both logo inks for $name", (sponsor) => {
+    expect(existsSync(`${WEBSITE_PUBLIC}${sponsor.logo.onDark}`)).toBe(true);
+    expect(existsSync(`${WEBSITE_PUBLIC}${sponsor.logo.onLight}`)).toBe(true);
+  });
+
+  it.each(READMES)("fill the sponsors table in %s, followed by invitations", (readme) => {
+    const openCells = Math.max(0, README_SPONSOR_CELLS - SPONSORS.length);
+
+    expect(readmeSponsorCells(readme)).toEqual([
+      ...SPONSORS.map((sponsor) => ({
+        href: sponsorHref(sponsor, "readme"),
+        onDark: `packages/website/public${sponsor.logo.onDark}`,
+        onLight: `packages/website/public${sponsor.logo.onLight}`,
+        description: sponsor.description,
+      })),
+      ...Array.from({ length: openCells }, () => ({ invite: SPONSOR_PAGE_URL })),
+    ]);
+  });
+});
diff --git a/packages/website/src/data/sponsors.ts b/packages/website/src/data/sponsors.ts
index 22466c09d1..94d1e4b51a 100644
--- a/packages/website/src/data/sponsors.ts
+++ b/packages/website/src/data/sponsors.ts
@@ -1,31 +1,59 @@
 /**
- * Homepage sponsor spots. This file is the inventory: the site shows one open
- * placeholder for every spot not listed in `HOMEPAGE_SPONSORS`.
+ * Company sponsors. This file is the inventory: every page of the site shows
+ * these logos above the footer, and the open spots invite the next sponsor.
  *
  * Approving a sponsor means three edits, or the site promises something it does
  * not deliver:
  *
- * 1. Add the entry below and drop its logo in `public/sponsors/`.
- * 2. Add the logo under the `## Sponsors` marker in `README.md`,
- *    `README.zh-CN.md`, `README.ja.md` and `README.ko.md`, in this same order.
+ * 1. Add the entry below and drop both logo inks in `public/sponsors/`.
+ * 2. In the sponsors table after the intro of `README.md`, `README.zh-CN.md`,
+ *    `README.ja.md` and `README.ko.md`, replace a "become a sponsor" cell with
+ *    the logo and its description, in this same order, linked to `sponsorHref(sponsor, "readme")`
+ *    with both inks referenced from `packages/website/public`, so the README
+ *    renders from the repository and never waits on a site deploy.
+ *    `sponsors.test.ts` fails until they match.
  * 3. Remove all of it when the subscription ends.
  *
- * The Stripe payment link caps itself at `HOMEPAGE_SPOT_COUNT` completed
+ * The Stripe payment link caps itself at `SPONSOR_SPOT_COUNT` completed
  * checkouts, and a checkout you decline and refund still counts against that
  * cap. When you refund one, raise the link's completed-session limit by one, or
  * the page will offer a spot the link refuses to sell.
  */
-export interface HomepageSponsor {
+export interface Sponsor {
   name: string;
-  href: string;
-  /** Path under `public/`, e.g. `/sponsors/acme.svg`. Keep logos monochrome white. */
-  logo: string;
+  /** The sponsor's own URL, without tracking. Links go through `sponsorHref`. */
+  url: string;
+  /** Paths under `public/`, one per ground. Use the sponsor's official lockup. */
+  logo: { onDark: string; onLight: string };
+  /** What the product is, in a few words from the sponsor's own site. Shown under the logo. */
+  description: string;
 }
 
-export const HOMEPAGE_SPONSORS: ReadonlyArray<HomepageSponsor> = [];
+export const SPONSORS: ReadonlyArray<Sponsor> = [
+  {
+    name: "Hoplite",
+    url: "https://hoplite.sh",
+    logo: {
+      onDark: "/sponsors/hoplite-on-dark.svg",
+      onLight: "/sponsors/hoplite-on-light.svg",
+    },
+    description: "Cloud coding agents",
+  },
+];
 
-export const HOMEPAGE_SPOT_COUNT = 4;
-export const HOMEPAGE_SPOT_PRICE = "$500";
+/** Where a sponsor link is shown. Becomes the link's `utm_medium`. */
+export type SponsorPlacement = "website" | "readme" | "discord" | "x";
+
+export function sponsorHref(sponsor: Sponsor, placement: SponsorPlacement): string {
+  const url = new URL(sponsor.url);
+  url.searchParams.set("utm_source", "paseo");
+  url.searchParams.set("utm_medium", placement);
+  url.searchParams.set("utm_campaign", "sponsor");
+  return url.toString();
+}
+
+export const SPONSOR_SPOT_COUNT = 4;
+export const SPONSOR_SPOT_PRICE = "$500";
 
 /** Stripe Payment Link for the monthly spot subscription. */
 export const SPONSOR_SPOT_CHECKOUT_URL = "https://buy.stripe.com/8x24gBczR7LNaokcve2sM00";
@@ -38,5 +66,5 @@ export const OPEN_COLLECTIVE_URL =
 export const BUY_ME_A_COFFEE_URL = "https://buymeacoffee.com/paseo";
 
 export function openSpotCount(): number {
-  return Math.max(0, HOMEPAGE_SPOT_COUNT - HOMEPAGE_SPONSORS.length);
+  return Math.max(0, SPONSOR_SPOT_COUNT - SPONSORS.length);
 }
diff --git a/packages/website/src/routes/docs.tsx b/packages/website/src/routes/docs.tsx
index b58934cb75..f1c5632cf1 100644
--- a/packages/website/src/routes/docs.tsx
+++ b/packages/website/src/routes/docs.tsx
@@ -4,6 +4,7 @@ import { useCallback, useMemo, useState } from "react";
 import { DocsBreadcrumbs } from "~/components/docs-breadcrumbs";
 import { DocsNav } from "~/components/docs-nav";
 import { DocsOutline } from "~/components/docs-outline";
+import { SponsorsSection } from "~/components/sponsorship";
 import { buildDocsNavTree, getDoc, getDocs } from "~/docs";
 import "~/styles.css";
 
@@ -63,6 +64,7 @@ function DocsLayout() {
           <div className="max-w-prose mx-auto">
             {doc && <DocsBreadcrumbs doc={doc} tree={tree} />}
             <Outlet />
+            <SponsorsSection placement="footer" />
           </div>
         </main>
 
diff --git a/packages/website/src/styles.css b/packages/website/src/styles.css
index bae421ff22..47da4f3c47 100644
--- a/packages/website/src/styles.css
+++ b/packages/website/src/styles.css
@@ -561,23 +561,6 @@
   margin-bottom: 2rem;
 }
 
-.docs-source-footer {
-  border-top: 1px solid var(--color-border);
-  margin-top: 3rem;
-  padding-top: 1.25rem;
-  font-size: 0.875rem;
-}
-
-.docs-source-footer a {
-  color: rgba(255, 255, 255, 0.5);
-  font-weight: 500;
-  text-decoration: none;
-}
-
-.docs-source-footer a:hover {
-  color: var(--color-foreground);
-}
-
 /* Blog post prose styles — adapted from moboudra.com */
 .blog-prose {
   color: rgba(250, 250, 250, 0.82);

From 5c108f345c9ecad19a69873b6d10fb81d3022e1f Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 07:05:42 +0200
Subject: [PATCH 168/270] Preserve renames in committed file diffs (#6895)

* fix(git): preserve renames in committed file diffs

Follow the requested destination through rename detection so the patch agrees with commit history instead of showing the whole file as newly added.

* test(git): keep rename fixtures valid across platforms

* fix(git): keep added copies out of committed rename diffs

Detect rename sources across the first-parent commit before narrowing the patch. Follow mode also detected copies, causing added files to open as partial diffs against unchanged files.

* perf(git): share committed rename discovery across file requests

Opening a commit requests all of its file diffs concurrently. Share pending and completed rename scans for immutable commit IDs in a bounded cache, while symbolic refs always read fresh metadata.

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/git-filename-diffs.e2e.test.ts |  38 ++++
 .../checkout-git.commit-file-diff.test.ts     | 197 +++++++++++++++++-
 packages/server/src/utils/checkout-git.ts     |  72 ++++++-
 3 files changed, 303 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/server/git-filename-diffs.e2e.test.ts b/packages/server/src/server/git-filename-diffs.e2e.test.ts
index 343e1c81c8..c32ee040b8 100644
--- a/packages/server/src/server/git-filename-diffs.e2e.test.ts
+++ b/packages/server/src/server/git-filename-diffs.e2e.test.ts
@@ -5,6 +5,44 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { createTestPaseoDaemon, DaemonClient } from "./test-utils/index.js";
 
+test("a rename-only commit returns zero added or deleted lines through the client", async () => {
+  const cwd = mkdtempSync(join(tmpdir(), "commit-rename-diff-"));
+  const git = (...args: string[]) => execFileSync("git", args, { cwd, encoding: "utf8" }).trim();
+  const daemon = await createTestPaseoDaemon({ agentClients: {} });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  try {
+    git("init", "-b", "main");
+    git("config", "user.name", "Test");
+    git("config", "user.email", "test@example.com");
+    writeFileSync(join(cwd, "old.txt"), "same\n");
+    git("add", ".");
+    git("-c", "commit.gpgsign=false", "commit", "-m", "initial");
+    git("mv", "old.txt", "new.txt");
+    git("-c", "commit.gpgsign=false", "commit", "-m", "rename");
+    const sha = git("rev-parse", "HEAD");
+
+    await client.connect();
+    const history = await client.listCheckoutCommits(cwd);
+    expect(history.commits.find((commit) => commit.sha === sha)?.files).toEqual([
+      { path: "new.txt", additions: 0, deletions: 0, status: "renamed" },
+    ]);
+    expect(await client.getCommitFileDiff(cwd, sha, "new.txt")).toEqual({
+      file: {
+        path: "new.txt",
+        isNew: false,
+        isDeleted: false,
+        additions: 0,
+        deletions: 0,
+        hunks: [],
+      },
+    });
+  } finally {
+    await client.close();
+    await daemon.close();
+    rmSync(cwd, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
+  }
+});
+
 test.skipIf(process.platform === "win32")(
   "checkout and commit diffs preserve filenames that Git quotes",
   async () => {
diff --git a/packages/server/src/utils/checkout-git.commit-file-diff.test.ts b/packages/server/src/utils/checkout-git.commit-file-diff.test.ts
index fbb22fe3b9..576e9b0c80 100644
--- a/packages/server/src/utils/checkout-git.commit-file-diff.test.ts
+++ b/packages/server/src/utils/checkout-git.commit-file-diff.test.ts
@@ -3,7 +3,8 @@ import { mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "fs"
 import { tmpdir } from "os";
 import { join } from "path";
 import { afterEach, describe, expect, it } from "vitest";
-import { getCommitFileDiff } from "./checkout-git.js";
+import { getCommitFileDiff, listCheckoutCommits } from "./checkout-git.js";
+import { startGitCommandMetrics, stopGitCommandMetrics } from "./run-git-command.js";
 
 const tempDirs: string[] = [];
 
@@ -44,6 +45,75 @@ function headSha(repoDir: string): string {
 }
 
 describe("getCommitFileDiff", () => {
+  it.each(["new.txt", "with spaces.txt"])("preserves a rename-only commit to %s", async (name) => {
+    const repoDir = initRepo();
+    commitFile(repoDir, "old.txt", "same\n", "initial");
+    git(["mv", "old.txt", name], repoDir);
+    git(["-c", "commit.gpgsign=false", "commit", "-m", "rename"], repoDir);
+    const sha = headSha(repoDir);
+
+    const history = await listCheckoutCommits({ cwd: repoDir });
+    expect(history.commits.find((commit) => commit.sha === sha)?.files).toEqual([
+      { path: name, status: "renamed", additions: 0, deletions: 0 },
+    ]);
+    expect(await getCommitFileDiff({ cwd: repoDir, sha, path: name })).toEqual({
+      path: name,
+      isNew: false,
+      isDeleted: false,
+      additions: 0,
+      deletions: 0,
+      hunks: [],
+    });
+  });
+
+  it.each(["new.txt", "目录.txt"])(
+    "preserves the edits in a committed rename to %s",
+    async (name) => {
+      const repoDir = initRepo();
+      commitFile(repoDir, "old.txt", "same\nkeep\nlast\n", "initial");
+      git(["mv", "old.txt", name], repoDir);
+      writeFileSync(join(repoDir, name), "same\nKEEP\nlast\n");
+      git(["add", "."], repoDir);
+      git(["-c", "commit.gpgsign=false", "commit", "-m", "rename and edit"], repoDir);
+      const sha = headSha(repoDir);
+
+      const history = await listCheckoutCommits({ cwd: repoDir });
+      expect(history.commits.find((commit) => commit.sha === sha)?.files).toEqual([
+        { path: name, status: "renamed", additions: 1, deletions: 1 },
+      ]);
+      const file = await getCommitFileDiff({ cwd: repoDir, sha, path: name });
+      expect(file).toMatchObject({
+        path: name,
+        isNew: false,
+        isDeleted: false,
+        additions: 1,
+        deletions: 1,
+      });
+      expect(file?.hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ type: "remove", content: "keep" }),
+          expect.objectContaining({ type: "add", content: "KEEP" }),
+        ]),
+      );
+    },
+  );
+
+  it.skipIf(process.platform === "win32")("preserves a rename to a quoted filename", async () => {
+    const repoDir = initRepo();
+    const name = 'new "draft".txt';
+    commitFile(repoDir, "old.txt", "same\n", "initial");
+    git(["mv", "old.txt", name], repoDir);
+    git(["-c", "commit.gpgsign=false", "commit", "-m", "rename"], repoDir);
+    expect(await getCommitFileDiff({ cwd: repoDir, sha: headSha(repoDir), path: name })).toEqual({
+      path: name,
+      isNew: false,
+      isDeleted: false,
+      additions: 0,
+      deletions: 0,
+      hunks: [],
+    });
+  });
+
   it("returns the parsed diff for a modified file in a commit", async () => {
     const repoDir = initRepo();
     commitFile(repoDir, "foo.txt", "a\nb\nc\n", "initial");
@@ -78,6 +148,78 @@ describe("getCommitFileDiff", () => {
     expect(file?.deletions).toBe(0);
   });
 
+  it.each([
+    ["exact", "line1\nline2\nline3\nline4\nline5\nline6\n"],
+    ["edited", "line1\nline2\nline3\nline4\nline5\nCHANGED\n"],
+  ])("shows an added %s copy as a new file", async (_kind, addedContent) => {
+    const repoDir = initRepo();
+    commitFile(repoDir, "source.txt", "line1\nline2\nline3\nline4\nline5\nline6\n", "initial");
+    commitFile(repoDir, "added.txt", addedContent, "add similar file");
+    const sha = headSha(repoDir);
+
+    const history = await listCheckoutCommits({ cwd: repoDir });
+    expect(history.commits.find((commit) => commit.sha === sha)?.files).toEqual([
+      { path: "added.txt", status: "added", additions: 6, deletions: 0 },
+    ]);
+    const file = await getCommitFileDiff({ cwd: repoDir, sha, path: "added.txt" });
+    expect(file).toMatchObject({
+      path: "added.txt",
+      isNew: true,
+      isDeleted: false,
+      additions: 6,
+      deletions: 0,
+    });
+    expect(
+      file?.hunks
+        .flatMap((hunk) => hunk.lines)
+        .filter((line) => line.type !== "header")
+        .map(({ type, content }) => ({ type, content })),
+    ).toEqual(
+      addedContent
+        .trimEnd()
+        .split("\n")
+        .map((content) => ({ type: "add", content })),
+    );
+  });
+
+  it("shares commit rename discovery across concurrent and later file requests", async () => {
+    const repoDir = initRepo();
+    commitFile(repoDir, "old.txt", "same\n", "initial");
+    git(["mv", "old.txt", "new.txt"], repoDir);
+    commitFile(repoDir, "added.txt", "added\n", "rename and add");
+    const sha = headSha(repoDir);
+
+    startGitCommandMetrics();
+    try {
+      const [renamed, added] = await Promise.all([
+        getCommitFileDiff({ cwd: repoDir, sha, path: "new.txt" }),
+        getCommitFileDiff({ cwd: repoDir, sha, path: "added.txt" }),
+      ]);
+      expect(renamed).toMatchObject({ isNew: false, additions: 0, deletions: 0 });
+      expect(added).toMatchObject({ isNew: true, additions: 1, deletions: 0 });
+      expect(await getCommitFileDiff({ cwd: repoDir, sha, path: "new.txt" })).toEqual(renamed);
+    } finally {
+      const metrics = stopGitCommandMetrics();
+      expect(metrics.commands.filter(({ args }) => args.includes("--name-status"))).toHaveLength(1);
+    }
+  });
+
+  it("rediscovers renames when a symbolic commit ref moves", async () => {
+    const repoDir = initRepo();
+    commitFile(repoDir, "old.txt", "same\n", "initial");
+    expect(await getCommitFileDiff({ cwd: repoDir, sha: "HEAD", path: "old.txt" })).toMatchObject({
+      isNew: true,
+      additions: 1,
+    });
+    git(["mv", "old.txt", "new.txt"], repoDir);
+    git(["-c", "commit.gpgsign=false", "commit", "-m", "rename"], repoDir);
+    expect(await getCommitFileDiff({ cwd: repoDir, sha: "HEAD", path: "new.txt" })).toMatchObject({
+      isNew: false,
+      additions: 0,
+      deletions: 0,
+    });
+  });
+
   it("returns null for a path not changed in the commit", async () => {
     const repoDir = initRepo();
     commitFile(repoDir, "foo.txt", "a\n", "initial");
@@ -89,6 +231,59 @@ describe("getCommitFileDiff", () => {
     expect(file).toBeNull();
   });
 
+  it("does not follow an unchanged file back to an earlier commit", async () => {
+    const repoDir = initRepo();
+    commitFile(repoDir, "foo.txt", "same\n", "initial");
+    commitFile(repoDir, "other.txt", "other\n", "unrelated change");
+    expect(
+      await getCommitFileDiff({ cwd: repoDir, sha: headSha(repoDir), path: "foo.txt" }),
+    ).toBeNull();
+  });
+
+  it("returns the added file in a root commit and the deleted file in its deletion commit", async () => {
+    const repoDir = initRepo();
+    commitFile(repoDir, "foo.txt", "same\n", "initial");
+    expect(
+      await getCommitFileDiff({ cwd: repoDir, sha: headSha(repoDir), path: "foo.txt" }),
+    ).toMatchObject({
+      isNew: true,
+      isDeleted: false,
+      additions: 1,
+      deletions: 0,
+    });
+    git(["rm", "foo.txt"], repoDir);
+    git(["-c", "commit.gpgsign=false", "commit", "-m", "delete"], repoDir);
+    expect(
+      await getCommitFileDiff({ cwd: repoDir, sha: headSha(repoDir), path: "foo.txt" }),
+    ).toMatchObject({
+      isNew: false,
+      isDeleted: true,
+      additions: 0,
+      deletions: 1,
+    });
+  });
+
+  it("preserves a rename introduced by a merge against its first parent", async () => {
+    const repoDir = initRepo();
+    commitFile(repoDir, "old.txt", "same\n", "initial");
+    git(["checkout", "-b", "feature"], repoDir);
+    git(["mv", "old.txt", "new.txt"], repoDir);
+    git(["-c", "commit.gpgsign=false", "commit", "-m", "rename"], repoDir);
+    git(["checkout", "main"], repoDir);
+    commitFile(repoDir, "main.txt", "main\n", "advance main");
+    git(["merge", "--no-ff", "feature", "-m", "merge feature"], repoDir);
+    expect(
+      await getCommitFileDiff({ cwd: repoDir, sha: headSha(repoDir), path: "new.txt" }),
+    ).toMatchObject({
+      path: "new.txt",
+      isNew: false,
+      isDeleted: false,
+      additions: 0,
+      deletions: 0,
+      hunks: [],
+    });
+  });
+
   it("returns a merge commit diff against its first parent", async () => {
     const repoDir = initRepo();
     commitFile(repoDir, "README.md", "base\n", "initial");
diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index 64148c26e4..ce00702908 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -2643,6 +2643,60 @@ export async function listCheckoutCommits({
   return { baseRef: comparisonBaseRef, commits };
 }
 
+const commitRenamesCache = new TTLCache<string, Promise<ReadonlyMap<string, string>>>({
+  max: 100,
+  ttl: 60_000,
+  checkAgeOnGet: true,
+});
+
+function getCommitRenames(cwd: string, sha: string): Promise<ReadonlyMap<string, string>> {
+  // Symbolic refs and abbreviated IDs can resolve to a different commit later.
+  if (!/^(?:[0-9a-f]{40}|[0-9a-f]{64})$/i.test(sha)) {
+    return readCommitRenames(cwd, sha);
+  }
+  const key = JSON.stringify([cwd, sha]);
+  const cached = commitRenamesCache.get(key);
+  if (cached) {
+    return cached;
+  }
+  const lookup = readCommitRenames(cwd, sha).catch((error: unknown) => {
+    if (commitRenamesCache.get(key) === lookup) {
+      commitRenamesCache.delete(key);
+    }
+    throw error;
+  });
+  // Store the pending lookup too, so concurrent file requests share the scan.
+  commitRenamesCache.set(key, lookup);
+  return lookup;
+}
+
+// Discover renames across the commit before narrowing the patch to a file.
+// --follow also detects copies, which would disagree with history's -M-only list.
+async function readCommitRenames(cwd: string, sha: string): Promise<ReadonlyMap<string, string>> {
+  const result = await runGitCommand(
+    [
+      "show",
+      sha,
+      "--format=",
+      "--diff-merges=first-parent",
+      "--name-status",
+      "-z",
+      "-M",
+      "--diff-filter=R",
+    ],
+    { cwd, envOverlay: READ_ONLY_GIT_ENV },
+  );
+  if (result.truncated) {
+    throw new Error("Commit renames exceeded the git output limit");
+  }
+  const renames = new Map<string, string>();
+  const fields = result.stdout.split("\0");
+  for (let index = 0; index + 2 < fields.length; index += 3) {
+    renames.set(fields[index + 2]!, fields[index + 1]!);
+  }
+  return renames;
+}
+
 /**
  * Fetches the unified diff of a single file as introduced by one commit and
  * parses it into the same {@link ParsedDiffFile} shape the diff subscription
@@ -2665,8 +2719,20 @@ export async function getCommitFileDiff({
   path: string;
 }): Promise<ParsedDiffFile | null> {
   const worktreeRoot = await requireGitWorktreeRoot(cwd);
+  const renames = await getCommitRenames(worktreeRoot, sha);
+  const oldPath = renames.get(path);
+  const paths = oldPath === undefined ? [path] : [oldPath, path];
   const { stdout } = await runGitCommand(
-    ["show", sha, "--format=", "--diff-merges=first-parent", ...GIT_PATCH_FORMAT_ARGS, "--", path],
+    [
+      "show",
+      sha,
+      "--format=",
+      "--diff-merges=first-parent",
+      "-M",
+      ...GIT_PATCH_FORMAT_ARGS,
+      "--",
+      ...paths.map((filePath) => `:(literal)${filePath}`),
+    ],
     {
       cwd: worktreeRoot,
       envOverlay: READ_ONLY_GIT_ENV,
@@ -2682,8 +2748,8 @@ export async function getCommitFileDiff({
     getNewFileContent: (file) => readGitFileContentAtRef(worktreeRoot, sha, file.path),
   });
 
-  // `--` scopes the diff to a single pathspec, so there is at most one real
-  // entry. Pick by path to drop any stray header-only section the parser emits.
+  // Including the rename source lets Git pair it with the destination. Select
+  // the requested entry if another change also matches the source path.
   const file = parsedFiles.find((candidate) => candidate.path === path) ?? null;
   if (!file) {
     return null;

From e5124b039ab20755ac97ee207d03ca9903e5cfb7 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 12:16:45 +0700
Subject: [PATCH 169/270] Put sheets on one stack and show an agent's facts in
 its sheet (#6958)

* Put sheet tabs on the one sheet stack

Sheets are one primitive with one stack. A sheet opened from any sheet
stacks on top of it, and closing it uncovers the sheet underneath. The
compact workspace's file and subagent sheets were an in-tree Gorhom
BottomSheet with their own stacking, so a subagent chosen from the
subagents list sheet replaced the list instead of covering it.

- SheetHostScope: a subtree hosts the sheets presented inside it, so the
  sheet tabs draw inside the compact column and read the workspace
  providers while still joining the app-wide stack. Needs Gorhom's
  BottomSheetModalInternalProvider, which the patch exports.
- IsolatedBottomSheetModal takes enableDismissOnClose; false keeps the
  content mounted through a close so the unsaved-changes guard can veto
  it. Its backdrop then closes the sheet rather than dismissing the top
  modal. The Gorhom patch also keeps a dismissing modal's status through
  its final onChange(-1), without which such a modal unmounting while
  presented never left the portal.
- SheetTabs (was WorkspaceSheetHost) renders one IsolatedBottomSheetModal
  per store entry. The store never reorders sheets; a reveal of a covered
  sheet drops the unmodified sheets above it.
- Subagent rows that open a sheet keep the list open (closeOnSelect
  false); rows that open a tab still close it.
- A menu closes when its retained panel goes inactive, instead of hiding
  and reappearing with the panel on the next tab switch.

Co-Authored-By: Claude <noreply@anthropic.com>

* Show an agent's model and thinking in its sheet, and fit Open as tab in the header rail

A Paseo agent shown in a sheet has no composer, so the facts the composer's
model and thinking controls would show now sit in one line under the sheet
header, the same row provider subagents already get from the daemon. The line
resolves exactly as the controls do (resolveAgentModelSelection), from the
session agent and the providers snapshot, and shows wherever the pane host is
a sheet.

Open as tab becomes the full-screen glyph beside Close, drawn by the shared
SheetHeaderIconButton, so the title keeps its width. The tab switcher sheet is
titled "Workspace tabs" so it reads as what it lists.

Co-Authored-By: Claude <noreply@anthropic.com>

* Show mode and context usage in the sheet facts line

The line under a sheet's header now carries everything the composer's
controls and context meter show: model, thinking, mode, and used/max context
tokens with the share, each resolved as its control resolves it.

Co-Authored-By: Claude <noreply@anthropic.com>

* Re-render subagent rows when the workspace's tabs change

A row decides at render time whether choosing it opens a sheet or reveals
a tab, and keeps the list open only for a sheet. The hook behind it only
subscribed to the layout mode, so a row rendered while its agent was a
full tab kept closing the list after that tab was gone: on iOS, promoting
a managed child, closing its tab, and reopening it from the list dropped
the list under the sheet. Subscribe to the workspace's layout too.

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
---
 docs/agent-lifecycle.md                       |   2 +-
 docs/explorer-sidebar.md                      |  35 +-
 docs/floating-panels.md                       |  26 +-
 docs/glossary.md                              |   3 +-
 docs/menus.md                                 |   8 +
 .../browser/compact-workspace-sheet.spec.ts   | 106 ++++--
 .../helpers/{workspace-sheet.ts => sheet.ts}  |  41 +--
 .../src/components/adaptive-modal-sheet.tsx   |  47 ++-
 .../host-scope.tsx                            |  91 +++++
 .../ui/isolated-bottom-sheet-modal/index.tsx  |  19 +-
 .../sheet-backdrop.tsx                        |  12 +-
 .../sheet-backdrop.web.tsx                    |  20 +-
 .../src/components/ui/menu/menu-surface.tsx   |   8 +-
 .../composer/tracks-panel.browser.test.tsx    |  40 ++-
 packages/app/src/i18n/resources/ar.ts         |   2 +-
 packages/app/src/i18n/resources/en.ts         |   2 +-
 packages/app/src/i18n/resources/es.ts         |   2 +-
 packages/app/src/i18n/resources/fr.ts         |   2 +-
 packages/app/src/i18n/resources/ja.ts         |   2 +-
 packages/app/src/i18n/resources/ko.ts         |   2 +-
 packages/app/src/i18n/resources/pt-BR.ts      |   2 +-
 packages/app/src/i18n/resources/ru.ts         |   2 +-
 packages/app/src/i18n/resources/zh-CN.ts      |   2 +-
 .../app/src/panels/agent-facts-line.test.ts   |  86 +++++
 packages/app/src/panels/agent-facts-line.ts   |  59 ++++
 packages/app/src/panels/agent-panel.tsx       |  34 ++
 packages/app/src/panels/agent-tracks.tsx      |   3 +
 packages/app/src/panels/pane-subtitle.tsx     |  30 ++
 .../src/panels/provider-subagent-panel.tsx    |  36 +-
 .../app/src/screens/workspace/sheet-tabs.tsx  | 311 +++++++++++++++++
 .../screens/workspace/workspace-screen.tsx    |  32 +-
 .../workspace/workspace-sheet-host.tsx        | 326 ------------------
 .../src/stores/workspace-layout-store.test.ts |  14 +-
 .../app/src/stores/workspace-layout-store.ts  |  61 ++--
 packages/app/src/subagents/index.ts           |   1 +
 .../app/src/subagents/opens-in-sheet.test.tsx | 133 +++++++
 packages/app/src/subagents/opens-in-sheet.ts  |  29 ++
 packages/app/src/subagents/track.tsx          |  10 +
 .../app/test-stubs/gorhom-bottom-sheet.ts     |  22 +-
 patches/@gorhom+bottom-sheet+5.2.14.patch     | 116 +++++++
 scripts/postinstall-patches.mjs               |   8 +
 41 files changed, 1282 insertions(+), 505 deletions(-)
 rename packages/app/e2e/support/helpers/{workspace-sheet.ts => sheet.ts} (66%)
 create mode 100644 packages/app/src/components/ui/isolated-bottom-sheet-modal/host-scope.tsx
 create mode 100644 packages/app/src/panels/agent-facts-line.test.ts
 create mode 100644 packages/app/src/panels/agent-facts-line.ts
 create mode 100644 packages/app/src/panels/pane-subtitle.tsx
 create mode 100644 packages/app/src/screens/workspace/sheet-tabs.tsx
 delete mode 100644 packages/app/src/screens/workspace/workspace-sheet-host.tsx
 create mode 100644 packages/app/src/subagents/opens-in-sheet.test.tsx
 create mode 100644 packages/app/src/subagents/opens-in-sheet.ts
 create mode 100644 patches/@gorhom+bottom-sheet+5.2.14.patch

diff --git a/docs/agent-lifecycle.md b/docs/agent-lifecycle.md
index f501538270..378a0070ea 100644
--- a/docs/agent-lifecycle.md
+++ b/docs/agent-lifecycle.md
@@ -212,7 +212,7 @@ parentAgentId === thisAgent.id  AND  !archivedAt
 
 - **Provider subagents** are child executions owned by Claude, Codex, or OpenCode. They are not inserted into `AgentManager` as managed agents. Providers emit a separate descriptor and timeline stream through `agent.provider_subagents.*`; the client keeps that state outside the normal agent store and merges only the presentation rows into the track. A descriptor's optional `parentSubagentId` identifies its direct provider-subagent parent; an absent value identifies a direct child of the managed agent.
 
-Clicking either kind opens a workspace tab. On compact layouts it opens in the [workspace sheet](explorer-sidebar.md#workspace-sheet) instead; the sheet hides the composer, and a Paseo subagent's sheet offers **Open as tab** to get it back. A Paseo subagent tab is a normal interactive agent pane. A provider subagent tab is a read-only timeline pane with no composer, archive, detach, rewind, or fork actions. It shows its own direct children in a subagents track. Both panes use `AgentStreamView`, so message, reasoning, tool-call, and layout rendering stay identical.
+Clicking either kind opens a workspace tab. On compact layouts it opens in a [sheet](explorer-sidebar.md#sheets) over the subagents list instead; the sheet hides the composer and shows the agent's model and thinking as one line in its place (`PaneSubtitle`, the row provider subagents already use), and a Paseo subagent's sheet offers **Open as tab** (the full-screen glyph in the header) to get the composer back. A Paseo subagent tab is a normal interactive agent pane. A provider subagent tab is a read-only timeline pane with no composer, archive, detach, rewind, or fork actions. It shows its own direct children in a subagents track. Both panes use `AgentStreamView`, so message, reasoning, tool-call, and layout rendering stay identical.
 
 Provider timelines use the same structural timeline item format but deliberately have a separate lifecycle and transport. A provider thread/session identifier is not a Paseo agent identifier, and closing its tab is always layout-only.
 
diff --git a/docs/explorer-sidebar.md b/docs/explorer-sidebar.md
index 9415abd85a..c9a89f8a58 100644
--- a/docs/explorer-sidebar.md
+++ b/docs/explorer-sidebar.md
@@ -7,7 +7,7 @@ contracts.
 | ---------------- | ---------------------------- | ------------------------------------------ |
 | Explorer sidebar | Files and Changes navigation | Cmd+E shows or hides the dedicated dock    |
 | Side pane        | Ordinary workspace content   | Created and closed like any workspace pane |
-| Workspace sheet  | Compact look-ups             | Stacks tabs; each closes or becomes a tab  |
+| Sheets           | Compact look-ups             | One tab each, on the app-wide sheet stack  |
 
 ## Panel host contract
 
@@ -23,23 +23,30 @@ can move between Explorer and main panes.
 Keep panel implementations independent of either shell. `WorkspacePanelHost` owns mounting and
 retention, while each shell owns its tabs, focus, dragging, resizing, and shortcuts.
 
-## Workspace sheet
+## Sheets
 
-On compact layouts, files and subagents open in a closable sheet over the workspace, so the tab
-switcher keeps only agents and terminals. A panel kind opts in with `compactSheet` in its manifest
+On compact layouts, files and subagents open in a sheet over the workspace, so the tab switcher
+keeps only agents and terminals. A panel kind opts in with `compactSheet` in its manifest
 (`packages/app/src/panels/panel-manifest.ts`), and the layout store's `openTab` decides between
-sheet and tab, so callers open targets the same way on every layout. Each sheet holds one ordinary
-`WorkspaceTab`, and sheets stack: a target opened from a sheet covers it, and closing the top sheet
-(drag, Close, backdrop, or Android Back) uncovers the one below. Revealing a target that already has
-a sheet brings that sheet back to the top and closes the sheets above it, except ones holding unsaved
-work. Opening a sheet as a tab dismisses the sheets above it, since the
-tab would sit under them. The stack is not persisted.
+sheet and tab, so callers open targets the same way on every layout. Each such sheet holds one
+ordinary `WorkspaceTab` (`SheetTab` in the store) and is an `IsolatedBottomSheetModal` like every
+other sheet in the app, so it sits on the one app-wide stack: a sheet opened from any sheet, a
+subagent chosen from the subagents list included, lands on top of it, and closing the top sheet
+(drag, Close, backdrop, or Android Back) uncovers the one below. The list stays open under the
+sheet it opened; see [menus.md](menus.md#selecting-an-item-on-ios) for the row contract.
+
+The store keeps `sheetsByWorkspace` in opening order and never reorders it, because moving a sheet
+remounts its panel. Revealing a target that already has a sheet uncovers that sheet by closing the
+ones above it, except ones holding unsaved work, which stay where they are. Opening a sheet as a tab
+dismisses the sheets above it, since the tab would sit under them. The stack is not persisted.
 
 Sheets are modal and cover the whole compact column, header included. A sheet's header is its drag
-handle, because the panel scrolls on its own and content panning would fight it. Sheets render in
-the workspace tree rather than through `IsolatedBottomSheetModal`: their panels need the navigator
-and every workspace provider an ordinary pane has, and a portal drops them
-([floating-panels.md Gotcha 7](floating-panels.md#gotcha-7--a-sheet-cannot-read-context-from-its-call-site)).
+handle, because the panel scrolls on its own and content panning would fight it. Its trailing rail
+holds icon buttons only (`SheetHeaderIconButton`): Open as tab is the full-screen glyph beside
+Close, so the title keeps its width. The sheets present
+from inside the compact column's `SheetHostScope`, so their panels read the navigator and every
+workspace provider an ordinary pane has without a context bridge
+([floating-panels.md Gotcha 6](floating-panels.md#gotcha-6--bottom-sheet-refs-are-not-lifecycle-truth)).
 
 A sheet holding unsaved work is never implicitly displaced; only its guarded close removes it.
 Moving its tab to another host remounts the panel, and the file editor keeps unsaved text in the
diff --git a/docs/floating-panels.md b/docs/floating-panels.md
index 9241cec56d..1af71ac4c9 100644
--- a/docs/floating-panels.md
+++ b/docs/floating-panels.md
@@ -343,11 +343,20 @@ Do not treat `onChange(-1)` as a close by itself. In a stacked
 another pushed sheet. Close React state from `onDismiss`; use `onChange` only to
 track phase.
 
-All sheets use the app-wide Gorhom modal provider through `IsolatedBottomSheetModal`. This
-includes native centered dialogs: separate React Native Modals cannot present a root-owned
-sibling dialog over an existing iOS presenter. The one exception is the
-[workspace sheet](explorer-sidebar.md#workspace-sheet), an in-tree Gorhom `BottomSheet` that hosts a
-whole workspace panel.
+All sheets use the app-wide Gorhom modal provider through `IsolatedBottomSheetModal`, with no
+exceptions: one stack means a sheet opened from any sheet lands on top of it and uncovers it on
+close. This includes native centered dialogs: separate React Native Modals cannot present a
+root-owned sibling dialog over an existing iOS presenter. A sheet that must draw inside a subtree
+(the [sheet tabs](explorer-sidebar.md#sheets) draw inside the compact workspace column so their
+panels read the workspace providers) presents from inside a `SheetHostScope`, which moves the
+portal host and container measurement while the sheet still joins the same stack. That export is
+what `patches/@gorhom+bottom-sheet+*.patch` adds.
+
+A sheet whose owner may veto the close (unsaved work) passes `enableDismissOnClose={false}`. Every
+close path then parks the sheet at index -1 with its content mounted; the owner hears
+`onChange(-1)`, runs its guard, and either snaps back to 0 or drops its state, which unmounts the
+sheet and takes it off the stack. Calling `dismiss()` on such a sheet bypasses the guard and
+unmounts it, so its backdrop and Back press call `close()`.
 
 The wrapper must give Gorhom an object ref. Gorhom accepts a callback ref at the React boundary
 but stores it in the modal queue and later reads `.current`; provider dismissal, replacement,
@@ -357,9 +366,10 @@ forwards commands to the current Gorhom handle.
 Request a backdrop with `backdropOpacity`; do not install a caller-owned backdrop. On web,
 Gorhom's default backdrop closes its own sheet, even when another modal is above it. Its animated
 pointer-event changes can expose a lower backdrop during a transition. The shared web backdrop
-keeps its press target until portal teardown and asks the provider to dismiss the top modal.
-Gorhom's presentation queue remains the authority; backdrop mount order is irrelevant. Native
-retains Gorhom's gesture backdrop and the same push/replace presentation semantics.
+keeps its press target until portal teardown and asks the provider to dismiss the top modal
+(a guarded sheet closes itself instead, see above). Gorhom's presentation queue remains the
+authority; backdrop mount order is irrelevant. Native retains Gorhom's gesture backdrop and the
+same push/replace presentation semantics.
 
 ## Gotcha 7 — A sheet cannot read context from its call site
 
diff --git a/docs/glossary.md b/docs/glossary.md
index dcf8178bc7..644c109d44 100644
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -21,7 +21,8 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Repository / Remote** — Internal Git observations. They may produce mutable kind, branch, and project-grouping metadata but never the host-local project ID, root, display name, or workspace membership. No UI label.
 - **Sidebar items** — The configurable entries of the app sidebar, in two sections. Header: the rows at the head of the sidebar — New workspace, History, Search, Schedules, and plugin header items. Footer: the full-width rows between Add project and the footer icon row — Usage and plugin footer items. Add project and the icon row (Hosts, Help and support, Settings) are fixed and are not sidebar items. A plugin item may render several rows, such as one per bot; it is still one item that moves and hides as a block. Each section's order and visibility is one per-device preference (`AppSettings.sidebarNavItems`, `AppSettings.sidebarFooterItems`); every item may be off. UI: the Header and Footer cards on the Sidebar settings page. Code: `packages/app/src/sidebar-nav/model.ts` resolves a section, and the sidebar (`components/sidebar/sidebar-nav-rows.tsx`, the footer in `components/left-sidebar.tsx`) and the settings page (`screens/settings/sidebar/sidebar-nav-section.tsx`) read it through `useSidebarNavItems(section)`. Never hardcode one of these entries or add a second place that decides which ones show. Don't confuse with **Explorer sidebar**.
 - **Explorer sidebar** — The dedicated navigation dock containing the Files and Changes trees. UI: "Explorer sidebar". Code: `packages/app/src/workspace-tabs/explorer-sidebar.ts`; persisted pane identifiers retain the `explorer` spelling. See [explorer-sidebar.md](explorer-sidebar.md).
-- **Workspace sheet** — A compact sheet that holds one file or subagent tab over the workspace without adding it to the tab switcher; opening another target from a sheet stacks a new one on top. UI action: "Open as tab". Code: `sheetsByWorkspace` in `packages/app/src/stores/workspace-layout-store.ts`, `WorkspaceSheetHost` (`packages/app/src/screens/workspace/workspace-sheet-host.tsx`). See [explorer-sidebar.md](explorer-sidebar.md#workspace-sheet).
+- **Sheet** — Any bottom sheet; there is one kind and one app-wide stack, so a sheet opened from a sheet lands on top of it and closing it uncovers the one below. Code: `IsolatedBottomSheetModal` (`packages/app/src/components/ui/isolated-bottom-sheet-modal`). Forbidden: "Workspace sheet", "modal sheet" as a distinct kind. See [floating-panels.md](floating-panels.md).
+- **Sheet tab** — A compact-layout sheet holding one file or subagent tab over the workspace without adding it to the tab switcher. UI action: "Open as tab". Code: `SheetTab` and `sheetsByWorkspace` in `packages/app/src/stores/workspace-layout-store.ts`, `SheetTabs` (`packages/app/src/screens/workspace/sheet-tabs.tsx`). See [explorer-sidebar.md](explorer-sidebar.md#sheets).
 - **Side pane** — An ordinary right-side workspace pane used for content opened beside the user's work. It closes and participates in workspace splits like every other main-host pane. See [explorer-sidebar.md](explorer-sidebar.md#side-pane). Forbidden: "Side panel".
 - **Directory-backed surface** — A right-sidebar surface whose content is determined by the workspace's `cwd`, so two workspaces on the same directory see identical content: git diff/status, forge change-request info, file preview/explorer contents. Keyed by `(serverId, cwd)`, never `workspaceId`. See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
 - **Workspace-owned state** — Per-workspace state that never leaks to a same-`cwd` sibling: tabs, agents, terminals, panes, title, plus review drafts, diff-mode overrides, composer attachments, and file-explorer open/expand state. Keyed by `workspaceId` (`cwd` only as a fallback for old payloads). See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
diff --git a/docs/menus.md b/docs/menus.md
index 50434b9e9d..9dc3e26cae 100644
--- a/docs/menus.md
+++ b/docs/menus.md
@@ -52,6 +52,11 @@ is another, with its own icons and hover-revealed actions — but both hand the
 and take `closeOnSelect` to say whether choosing them ends the surface. A row that owns its press
 outright leaves the surface open behind whatever it opened, and skips the iOS wait.
 
+A row whose result opens a sheet passes `closeOnSelect={false}`: the sheet stacks over the menu
+sheet and uncovers it on close, so the menu is where the user lands next. A row that opens a tab
+closes, because the tab replaces the pane the menu belongs to. The subagents track asks the layout
+store which one a row is (`useSubagentOpensInSheet`), since the answer changes with the layout.
+
 ## Pages
 
 A submenu is a page, declared as data on the surface and reached by a `MenuSubTrigger` whose `id`
@@ -193,6 +198,9 @@ its own.
   backdrop, so there is exactly one `Modal` on native no matter how deep the menu goes.
 - **Sheet stacking and backdrop dismissal belong to `IsolatedBottomSheetModal`.** Menus only
   request a backdrop opacity. See [floating-panels.md](floating-panels.md#gotcha-6--bottom-sheet-refs-are-not-lifecycle-truth).
+- **A menu closes when its panel leaves the screen.** `MenuSurface` closes the menu when its
+  retained panel goes inactive. Hiding the surface alone leaves the open state behind, and the
+  menu would reappear with the panel on the next tab switch.
 - **Retained panels own visibility.** The shared menu surface unmounts when its panel becomes
   inactive. An async action can navigate before its menu closes; a hidden panel must not leave a
   portal backdrop blocking the destination. On web the chat suspends one commit after it goes
diff --git a/packages/app/e2e/browser/compact-workspace-sheet.spec.ts b/packages/app/e2e/browser/compact-workspace-sheet.spec.ts
index 474a498353..77a2a0882b 100644
--- a/packages/app/e2e/browser/compact-workspace-sheet.spec.ts
+++ b/packages/app/e2e/browser/compact-workspace-sheet.spec.ts
@@ -4,18 +4,23 @@ import { expect, test } from "../support/fixtures";
 import { expectComposerVisible } from "../support/helpers/composer";
 import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
-import { openSubagentFromCompactTrack, seedSubagent } from "../support/helpers/subagents";
 import {
-  closeWorkspaceSheet,
+  expectSubagentRowVisible,
+  openSubagentFromCompactTrack,
+  seedSubagent,
+} from "../support/helpers/subagents";
+import {
+  closeSheet,
   expectOpenTabCount,
-  openWorkspaceSheetAsTab,
+  openSheetAsTab,
   expectDeclinedDiscardPrompt,
-  expectWorkspaceSheetAtSnap,
-  replaceWorkspaceSheetFileText,
+  expectSheetAtSnap,
+  replaceSheetFileText,
   selectTabFromSwitcher,
-  tapWorkspaceSheetBackdrop,
-  workspaceSheet,
-} from "../support/helpers/workspace-sheet";
+  sheet,
+  sheetHeader,
+  tapSheetBackdrop,
+} from "../support/helpers/sheet";
 
 const FILE_LINK = "linked.ts:3";
 
@@ -55,47 +60,90 @@ test("compact opens files and subagents in a sheet, leaving the tabs for agents"
       await expect(fileLink).toBeVisible({ timeout: 15_000 });
       await fileLink.click();
 
-      const sheet = workspaceSheet(page, "linked.ts");
-      await expect(sheet).toBeVisible();
-      await expect(sheet.getByText("three")).toBeVisible();
-      await expectWorkspaceSheetAtSnap(page, "linked.ts");
-      await expect(sheet.getByRole("button", { name: "Open as tab" })).toHaveCount(0);
+      const fileSheet = sheet(page, "linked.ts");
+      await expect(fileSheet).toBeVisible();
+      await expect(fileSheet.getByText("three")).toBeVisible();
+      await expectSheetAtSnap(page, "linked.ts");
+      await expect(
+        sheetHeader(page, "linked.ts").getByRole("button", { name: "Open as tab" }),
+      ).toHaveCount(0);
       await expectOpenTabCount(page, 1);
-      await closeWorkspaceSheet(page, "linked.ts");
+      await closeSheet(page, "linked.ts");
     });
 
-    await test.step("a subagent opens in a sheet without its composer", async () => {
+    await test.step("a subagent opens in a sheet over the subagents list", async () => {
       await openSubagentFromCompactTrack(page, child.id);
 
-      const sheet = workspaceSheet(page, child.title);
-      await expect(sheet).toBeVisible();
-      await expectWorkspaceSheetAtSnap(page, child.title);
-      await expect(sheet.getByRole("textbox", { name: "Message agent..." })).toHaveCount(0);
+      const childSheet = sheet(page, child.title);
+      await expect(childSheet).toBeVisible();
+      await expectSheetAtSnap(page, child.title);
+      await expect(childSheet.getByRole("textbox", { name: "Message agent..." })).toHaveCount(0);
+      // The composer's model, thinking, and mode stand in for it, resolved the same way. An idle
+      // seeded agent has no context usage yet.
+      await expect(childSheet.getByTestId("agent-pane-subtitle")).toHaveText(
+        "Ten second stream · Low · Load test",
+      );
       await expectOpenTabCount(page, 1);
     });
 
-    await test.step("Open as tab promotes the subagent to a full tab", async () => {
-      await openWorkspaceSheetAsTab(page, child.title);
+    await test.step("closing the subagent's sheet uncovers the list", async () => {
+      await closeSheet(page, child.title);
+      await expectSubagentRowVisible(page, child.id);
+    });
+
+    await test.step("Open as tab promotes the subagent to a full tab and ends the list", async () => {
+      await page.getByTestId(`subagents-track-row-${child.id}`).click();
+      await expectSheetAtSnap(page, child.title);
+      await openSheetAsTab(page, child.title);
+      await expect(page.getByTestId(`subagents-track-row-${child.id}`)).toHaveCount(0);
       await expectOpenTabCount(page, 2);
       await expectComposerVisible(page);
     });
 
-    await test.step("a sheet with unsaved edits closes only through the guarded close", async () => {
+    await test.step("the list the subagent was opened from closed with its tab", async () => {
       await selectTabFromSwitcher(page, "Sheet parent");
+      await expect(page.getByTestId(`subagents-track-row-${child.id}`)).toHaveCount(0);
+    });
+
+    await test.step("once its tab closes, the subagent reopens in a sheet that keeps the list", async () => {
+      await page
+        .getByRole("button", { name: /Switch tabs/ })
+        .filter({ visible: true })
+        .click();
+      await expect(page.getByText("Workspace tabs", { exact: true })).toBeVisible();
+      const menuBase = `workspace-tab-menu-agent_${child.id}`;
+      await page.getByTestId(`${menuBase}-trigger`).click();
+      await page.getByTestId(`${menuBase}-close`).click();
+      await expectOpenTabCount(page, 1);
+      // Closing a tab keeps the switcher open, with the parent as the tab left. Its backdrop is
+      // tapped once the row menu's own sheet has gone.
+      await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(1);
+      await tapSheetBackdrop(page);
+      await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+
+      await openSubagentFromCompactTrack(page, child.id);
+      await expectSheetAtSnap(page, child.title);
+      await closeSheet(page, child.title);
+      await expectSubagentRowVisible(page, child.id);
+      await tapSheetBackdrop(page);
+      await expect(page.getByRole("button", { name: "Bottom sheet backdrop" })).toHaveCount(0);
+    });
+
+    await test.step("a sheet with unsaved edits closes only through the guarded close", async () => {
       await page.getByText(FILE_LINK, { exact: true }).click();
-      const sheet = workspaceSheet(page, "linked.ts");
-      await expect(sheet).toBeVisible();
+      const fileSheet = sheet(page, "linked.ts");
+      await expect(fileSheet).toBeVisible();
       // Hold the autosave so the edit stays unsaved.
       gate.holdNextClientRequest("fs.file.write.request");
-      await replaceWorkspaceSheetFileText(page, "linked.ts", "edited in the sheet");
+      await replaceSheetFileText(page, "linked.ts", "edited in the sheet");
       await gate.waitForHeldClientRequest();
 
-      await expectDeclinedDiscardPrompt(page, () => tapWorkspaceSheetBackdrop(page));
-      await expect(sheet.locator(".cm-content")).toHaveText("edited in the sheet");
+      await expectDeclinedDiscardPrompt(page, () => tapSheetBackdrop(page));
+      await expect(fileSheet.locator(".cm-content")).toHaveText("edited in the sheet");
       await expectDeclinedDiscardPrompt(page, () =>
-        sheet.getByRole("button", { name: "Close" }).click(),
+        sheetHeader(page, "linked.ts").getByRole("button", { name: "Close" }).click(),
       );
-      await expect(sheet.locator(".cm-content")).toHaveText("edited in the sheet");
+      await expect(fileSheet.locator(".cm-content")).toHaveText("edited in the sheet");
 
       gate.releaseHeldClientRequest();
       await expect.poll(() => readFile(linkedPath, "utf8")).toBe("edited in the sheet");
diff --git a/packages/app/e2e/support/helpers/workspace-sheet.ts b/packages/app/e2e/support/helpers/sheet.ts
similarity index 66%
rename from packages/app/e2e/support/helpers/workspace-sheet.ts
rename to packages/app/e2e/support/helpers/sheet.ts
index b0544f7df6..6288c6f9c1 100644
--- a/packages/app/e2e/support/helpers/workspace-sheet.ts
+++ b/packages/app/e2e/support/helpers/sheet.ts
@@ -1,11 +1,16 @@
 import { expect, type Locator, type Page } from "@playwright/test";
 
-/** The compact workspace sheet, named after the tab it hosts. */
-export function workspaceSheet(page: Page, label: string): Locator {
+/** A sheet tab's body, named after the tab it shows. */
+export function sheet(page: Page, label: string): Locator {
   return page.getByRole("dialog", { name: label });
 }
 
-/** Sheet height as a fraction of the viewport; mirrors the host's 92% snap point. */
+/** A sheet tab's header, which carries its title, Close, and the Open as tab glyph. */
+export function sheetHeader(page: Page, label: string): Locator {
+  return page.getByTestId("sheet-tab-header").filter({ hasText: label });
+}
+
+/** Sheet height as a fraction of the viewport; mirrors the sheet tab's 92% snap point. */
 const SHEET_SNAP_FRACTION = 0.92;
 /** The header starts below the sheet's drag indicator, inside the handle. */
 const SHEET_INDICATOR_MAX_HEIGHT = 32;
@@ -14,12 +19,11 @@ const SHEET_INDICATOR_MAX_HEIGHT = 32;
  * The sheet rests at its snap point, docked to the bottom edge. A sheet pushed up past it
  * covers the workspace header; a sheet sunk below it hides content.
  */
-export async function expectWorkspaceSheetAtSnap(page: Page, label: string): Promise<void> {
+export async function expectSheetAtSnap(page: Page, label: string): Promise<void> {
   const viewportHeight = page.viewportSize()?.height ?? 0;
   const snapTop = Math.round(viewportHeight * (1 - SHEET_SNAP_FRACTION));
-  const sheet = workspaceSheet(page, label);
-  const header = sheet.getByTestId("workspace-sheet-header");
-  const body = sheet.getByTestId("workspace-sheet-body");
+  const header = sheetHeader(page, label);
+  const body = sheet(page, label);
   await expect
     .poll(async () => {
       const [headerBox, bodyBox] = await Promise.all([header.boundingBox(), body.boundingBox()]);
@@ -39,26 +43,22 @@ export async function expectOpenTabCount(page: Page, count: number): Promise<voi
   ).toBeVisible();
 }
 
-export async function closeWorkspaceSheet(page: Page, label: string): Promise<void> {
-  const sheet = workspaceSheet(page, label);
-  await sheet.getByRole("button", { name: "Close" }).click();
-  await expect(sheet).toHaveCount(0);
+export async function closeSheet(page: Page, label: string): Promise<void> {
+  await sheetHeader(page, label).getByRole("button", { name: "Close" }).click();
+  await expect(sheet(page, label)).toHaveCount(0);
 }
 
-export async function openWorkspaceSheetAsTab(page: Page, label: string): Promise<void> {
-  const sheet = workspaceSheet(page, label);
-  await sheet.getByRole("button", { name: "Open as tab" }).click();
-  await expect(sheet).toHaveCount(0);
+export async function openSheetAsTab(page: Page, label: string): Promise<void> {
+  await sheetHeader(page, label).getByRole("button", { name: "Open as tab" }).click();
+  await expect(sheet(page, label)).toHaveCount(0);
 }
 
-export async function replaceWorkspaceSheetFileText(
+export async function replaceSheetFileText(
   page: Page,
   label: string,
   content: string,
 ): Promise<void> {
-  const editor = workspaceSheet(page, label)
-    .getByTestId("file-source-editor")
-    .locator(".cm-content");
+  const editor = sheet(page, label).getByTestId("file-source-editor").locator(".cm-content");
   await editor.click();
   await editor.press("ControlOrMeta+A");
   await editor.pressSequentially(content);
@@ -69,6 +69,7 @@ export async function selectTabFromSwitcher(page: Page, label: string): Promise<
     .getByRole("button", { name: /Switch tabs/ })
     .filter({ visible: true })
     .click();
+  await expect(page.getByText("Workspace tabs", { exact: true })).toBeVisible();
   const option = page.getByText(label, { exact: true }).filter({ visible: true }).last();
   await expect(option).toBeVisible();
   await option.click();
@@ -76,7 +77,7 @@ export async function selectTabFromSwitcher(page: Page, label: string): Promise<
 }
 
 /** Taps the top sheet's backdrop; each stacked sheet renders its own, top last. */
-export async function tapWorkspaceSheetBackdrop(page: Page): Promise<void> {
+export async function tapSheetBackdrop(page: Page): Promise<void> {
   await page
     .getByRole("button", { name: "Bottom sheet backdrop" })
     .last()
diff --git a/packages/app/src/components/adaptive-modal-sheet.tsx b/packages/app/src/components/adaptive-modal-sheet.tsx
index f7b4d4056c..d4d833e3f1 100644
--- a/packages/app/src/components/adaptive-modal-sheet.tsx
+++ b/packages/app/src/components/adaptive-modal-sheet.tsx
@@ -14,7 +14,7 @@ import {
 } from "../lib/overlay-root";
 import { BottomSheetHandle, type BottomSheetBackgroundProps } from "@gorhom/bottom-sheet";
 import Animated from "react-native-reanimated";
-import { ArrowLeft, Search, X } from "lucide-react-native";
+import { ArrowLeft, Search, X, type LucideIcon } from "lucide-react-native";
 import {
   IsolatedBottomSheetModal,
   SheetVisibleFrame,
@@ -287,6 +287,37 @@ function SheetContent({ style, children }: { style: StyleProp<ViewStyle>; childr
   return <View style={[styles.sheetContent, style]}>{children}</View>;
 }
 
+/**
+ * An icon action in a sheet header's trailing rail, drawn like the Close button so a header's
+ * actions line up with it at one size. Pass it through `SheetHeader.actions`.
+ */
+export function SheetHeaderIconButton({
+  icon: Icon,
+  accessibilityLabel,
+  onPress,
+  testID,
+}: {
+  icon: LucideIcon;
+  accessibilityLabel: string;
+  onPress: () => void;
+  testID?: string;
+}) {
+  const { theme } = useUnistyles();
+  return (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityLabel={accessibilityLabel}
+      style={styles.closeButton}
+      onPress={onPress}
+      testID={testID}
+    >
+      {({ pressed }) => (
+        <Icon size={16} color={pressed ? theme.colors.foreground : theme.colors.foregroundMuted} />
+      )}
+    </Pressable>
+  );
+}
+
 export function SheetHeaderView({
   header,
   onClose,
@@ -343,19 +374,11 @@ export function SheetHeaderView({
         </View>
         {header.actions ? <View style={styles.headerActions}>{header.actions}</View> : null}
         {showCloseButton ? (
-          <Pressable
-            accessibilityRole="button"
+          <SheetHeaderIconButton
+            icon={X}
             accessibilityLabel={t("common.actions.close")}
-            style={styles.closeButton}
             onPress={onClose}
-          >
-            {({ pressed }) => (
-              <X
-                size={16}
-                color={pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
-              />
-            )}
-          </Pressable>
+          />
         ) : null}
       </View>
       {search ? (
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/host-scope.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/host-scope.tsx
new file mode 100644
index 0000000000..d107547dcf
--- /dev/null
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/host-scope.tsx
@@ -0,0 +1,91 @@
+import {
+  BottomSheetModalInternalProvider,
+  INITIAL_CONTAINER_LAYOUT,
+  useBottomSheetModalInternal,
+} from "@gorhom/bottom-sheet";
+import { PortalHost } from "@gorhom/portal";
+import { useCallback, useId, useMemo, useRef, type ReactNode } from "react";
+import {
+  Dimensions,
+  StatusBar,
+  StyleSheet,
+  View,
+  type LayoutChangeEvent,
+  type StyleProp,
+  type ViewStyle,
+} from "react-native";
+import { useSharedValue } from "react-native-reanimated";
+
+/**
+ * Hosts the sheets presented from inside it.
+ *
+ * A sheet's content normally lands at the app root, on the far side of the portal, where every
+ * context between the root and the call site is gone (floating-panels.md Gotcha 7). Inside a
+ * scope, a sheet renders into the scope's own host instead, so its content reads the scope's
+ * contexts — the navigator, the workspace providers — without bridging each one by hand. The
+ * scope only moves where the sheet draws: it still joins the app-wide sheet stack, so stacking,
+ * Back and the backdrop treat it like every other sheet.
+ *
+ * The host fills the scope, and the sheets presented in it size and dock to the scope, not the
+ * window. Sheets presented outside the scope keep drawing at the root, above it.
+ */
+export function SheetHostScope({
+  children,
+  style,
+}: {
+  children: ReactNode;
+  style?: StyleProp<ViewStyle>;
+}) {
+  const parent = useBottomSheetModalInternal();
+  const hostName = `sheet-host-${useId()}`;
+  const containerLayoutState = useSharedValue({ ...INITIAL_CONTAINER_LAYOUT });
+  const hostRef = useRef<View>(null);
+
+  // Mirrors Gorhom's own hosting container measurement, so a sheet in the scope lays out against
+  // the scope the way a root sheet lays out against the window.
+  const handleLayout = useCallback(
+    ({ nativeEvent }: LayoutChangeEvent) => {
+      const { height } = nativeEvent.layout;
+      hostRef.current?.measure((_x, _y, _width, _height, _pageX, pageY) => {
+        const windowHeight = Dimensions.get("window").height;
+        const top = pageY ?? 0;
+        containerLayoutState.set({
+          height,
+          offset: {
+            top,
+            bottom: Math.max(0, windowHeight - (top + height + (StatusBar.currentHeight ?? 0))),
+            left: 0,
+            right: 0,
+          },
+        });
+      });
+    },
+    [containerLayoutState],
+  );
+
+  const value = useMemo(
+    () => ({ ...parent, hostName, containerLayoutState }),
+    [containerLayoutState, hostName, parent],
+  );
+
+  return (
+    <BottomSheetModalInternalProvider value={value}>
+      <View style={[styles.scope, style]}>
+        {children}
+        <View ref={hostRef} style={styles.host} pointerEvents="box-none" onLayout={handleLayout}>
+          <PortalHost name={hostName} />
+        </View>
+      </View>
+    </BottomSheetModalInternalProvider>
+  );
+}
+
+const styles = StyleSheet.create({
+  scope: {
+    flex: 1,
+    minHeight: 0,
+  },
+  host: {
+    ...StyleSheet.absoluteFillObject,
+  },
+});
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
index 55e475b424..457181c53f 100644
--- a/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx
@@ -40,6 +40,13 @@ type IsolatedBottomSheetModalProps = Omit<
   BottomSheetModalProps,
   "enableDismissOnClose" | "stackBehavior" | "children" | "backdropComponent"
 > & {
+  /**
+   * Whether closing (drag, backdrop, Back) also dismisses, which unmounts the content. Default
+   * true: the owner hears `onDismiss` and drops its state. Pass `false` for a sheet whose close the
+   * owner may veto: it parks at index -1 with its content mounted, the owner hears `onChange(-1)`,
+   * and either snaps it back or unmounts it, which dismisses it from the stack.
+   */
+  enableDismissOnClose?: boolean;
   /**
    * Nodes only. Gorhom also accepts a render function, but nothing here uses it and a bridge
    * would have to reach around it.
@@ -84,19 +91,24 @@ export const IsolatedBottomSheetModal = forwardRef<
     presentation = "push",
     contextBridge,
     backdropOpacity,
+    enableDismissOnClose = true,
     ...bottomSheetProps
   } = props;
   const renderBackdrop = useCallback(
     (backdropProps: BottomSheetBackdropProps) => (
-      <SheetBackdrop {...backdropProps} opacity={backdropOpacity} />
+      <SheetBackdrop
+        {...backdropProps}
+        opacity={backdropOpacity}
+        pressBehavior={enableDismissOnClose ? "dismiss" : "close"}
+      />
     ),
-    [backdropOpacity],
+    [backdropOpacity, enableDismissOnClose],
   );
   const modal = (
     <GorhomBottomSheetModal
       {...bottomSheetProps}
       ref={modalRef}
-      enableDismissOnClose
+      enableDismissOnClose={enableDismissOnClose}
       stackBehavior={presentation}
       backdropComponent={backdropOpacity === undefined ? undefined : renderBackdrop}
     >
@@ -155,3 +167,4 @@ export function useIsolatedBottomSheetVisibility({
 
 export { SheetVisibleFrame } from "./visible-frame";
 export { systemBackPress } from "./back-press";
+export { SheetHostScope } from "./host-scope";
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.tsx
index 1232566462..8c85ef77ca 100644
--- a/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.tsx
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.tsx
@@ -1,5 +1,15 @@
 import { BottomSheetBackdrop, type BottomSheetBackdropProps } from "@gorhom/bottom-sheet";
 
-export function SheetBackdrop(props: BottomSheetBackdropProps & { opacity?: number }) {
+/**
+ * What a backdrop tap does. `dismiss` takes the top modal off the stack and unmounts it; `close`
+ * only slides this sheet down, so a sheet that keeps its content through a close can veto it.
+ */
+export type SheetBackdropPress = "dismiss" | "close";
+
+export function SheetBackdrop({
+  pressBehavior: _pressBehavior,
+  ...props
+}: BottomSheetBackdropProps & { opacity?: number; pressBehavior: SheetBackdropPress }) {
+  // Gorhom's native backdrop closes its own sheet, which here is always the top one.
   return <BottomSheetBackdrop {...props} appearsOnIndex={0} disappearsOnIndex={-1} />;
 }
diff --git a/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.web.tsx b/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.web.tsx
index ba1e397a9e..749d89359c 100644
--- a/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.web.tsx
+++ b/packages/app/src/components/ui/isolated-bottom-sheet-modal/sheet-backdrop.web.tsx
@@ -1,16 +1,30 @@
 import {
   BottomSheetBackdrop,
+  useBottomSheet,
   useBottomSheetModal,
   type BottomSheetBackdropProps,
 } from "@gorhom/bottom-sheet";
 import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { Pressable, StyleSheet, View } from "react-native";
+import type { SheetBackdropPress } from "./sheet-backdrop";
 
-export function SheetBackdrop(props: BottomSheetBackdropProps & { opacity?: number }) {
+export type { SheetBackdropPress };
+
+export function SheetBackdrop({
+  pressBehavior,
+  ...props
+}: BottomSheetBackdropProps & { opacity?: number; pressBehavior: SheetBackdropPress }) {
   const { dismiss } = useBottomSheetModal();
+  const { close } = useBottomSheet();
   const { t } = useTranslation();
-  const dismissTopSheet = useCallback(() => dismiss(), [dismiss]);
+  const handlePress = useCallback(() => {
+    // A sheet that may veto its close slides itself down and lets its owner decide. The other
+    // sheets ask the provider for the top modal, so a lower backdrop caught mid-transition still
+    // dismisses the sheet the user sees.
+    if (pressBehavior === "close") close();
+    else dismiss();
+  }, [close, dismiss, pressBehavior]);
 
   return (
     <View style={StyleSheet.absoluteFill}>
@@ -28,7 +42,7 @@ export function SheetBackdrop(props: BottomSheetBackdropProps & { opacity?: numb
         accessibilityLabel={t("common.bottomSheetBackdrop")}
         // The provider owns presentation order, including when a lower backdrop remounts.
         // Keep this target until the portal unmounts: animation must not expose the sheet below.
-        onPress={dismissTopSheet}
+        onPress={handlePress}
         style={StyleSheet.absoluteFill}
       />
     </View>
diff --git a/packages/app/src/components/ui/menu/menu-surface.tsx b/packages/app/src/components/ui/menu/menu-surface.tsx
index 3b76d4cf2b..2f73149244 100644
--- a/packages/app/src/components/ui/menu/menu-surface.tsx
+++ b/packages/app/src/components/ui/menu/menu-surface.tsx
@@ -126,8 +126,14 @@ export interface MenuSurfaceProps {
  * popover (plus one flyout per open submenu) or a bottom sheet showing one page at a time.
  */
 export function MenuSurface(props: MenuSurfaceProps): ReactElement | null {
-  const { presentation } = useMenuContext("MenuSurface");
+  const { presentation, open, setOpen } = useMenuContext("MenuSurface");
   const active = useRetainedPanelActive();
+  // A menu belongs to the panel that opened it. When that panel leaves the screen the menu closes
+  // for good, rather than waiting hidden to reappear with the panel: a row that opened a sheet
+  // and promoted it to a tab, say, would otherwise bring the list back on the next tab switch.
+  useEffect(() => {
+    if (!active && open) setOpen(false);
+  }, [active, open, setOpen]);
   // Portals escape the hidden panel. Remove the surface in its inactive commit,
   // before freezing can suspend an async menu action's closing update.
   if (!active) return null;
diff --git a/packages/app/src/composer/tracks-panel.browser.test.tsx b/packages/app/src/composer/tracks-panel.browser.test.tsx
index 0b74c7e1da..9ebc92ed20 100644
--- a/packages/app/src/composer/tracks-panel.browser.test.tsx
+++ b/packages/app/src/composer/tracks-panel.browser.test.tsx
@@ -1,7 +1,8 @@
-import React, { act, type ReactNode } from "react";
+import React, { act, useCallback, useState, type ReactNode } from "react";
 import { createRoot, type Root } from "react-dom/client";
 import { Pressable, Text } from "react-native";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { RetainedPanelActivity } from "@/components/retained-panel";
 import { ComposerTrackPill, ComposerTrackRow, type ComposerTrackPillSegment } from "./tracks";
 
 const SUBAGENT_SEGMENTS: ComposerTrackPillSegment[] = [{ bucket: null, text: "3 subagents" }];
@@ -109,6 +110,43 @@ describe("composer track panel", () => {
     expect(row("row")).not.toBeNull();
   });
 
+  it("closes for good when the panel it belongs to leaves the screen", () => {
+    const onPress = vi.fn();
+    function Harness() {
+      const [active, setActive] = useState(true);
+      const hide = useCallback(() => setActive(false), []);
+      const show = useCallback(() => setActive(true), []);
+      return (
+        <>
+          <Pressable accessibilityRole="button" testID="hide" onPress={hide} />
+          <Pressable accessibilityRole="button" testID="show" onPress={show} />
+          <RetainedPanelActivity active={active}>
+            <ComposerTrackPill testID="pill" segments={SUBAGENT_SEGMENTS} panelTitle="Subagents">
+              <ComposerTrackRow
+                accessibilityLabel="Subagent one"
+                testID="row"
+                closeOnSelect={false}
+                onPress={onPress}
+              >
+                <Text>Subagent one</Text>
+              </ComposerTrackRow>
+            </ComposerTrackPill>
+          </RetainedPanelActivity>
+        </>
+      );
+    }
+    mount(<Harness />);
+
+    openPanel();
+    expect(isPanelOpen()).toBe(true);
+
+    click(row("hide") as Element);
+    click(row("show") as Element);
+
+    expect(isPanelOpen()).toBe(false);
+    expect(row("row")).toBeNull();
+  });
+
   it("leaves the panel alone when a row's own action button is pressed", () => {
     const onPress = vi.fn();
     const onAction = vi.fn();
diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index 5f00d8f70c..87cacb2f82 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -631,7 +631,7 @@ export const ar: TranslationResources = {
       },
       switcher: {
         trigger: "تبديل علامات التبويب (فتح{{count}})",
-        title: "علامة التبويب التبديل",
+        title: "علامات تبويب الـ Workspace",
         searchPlaceholder: "علامات تبويب البحث",
       },
       menu: {
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 91e7e2c92f..f9779a6d55 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -628,7 +628,7 @@ export const en = {
       },
       switcher: {
         trigger: "Switch tabs ({{count}} open)",
-        title: "Switch tab",
+        title: "Workspace tabs",
         searchPlaceholder: "Search tabs",
       },
       menu: {
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index 6aff72fdd7..190b36d08d 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -637,7 +637,7 @@ export const es: TranslationResources = {
       },
       switcher: {
         trigger: "Cambiar pestañas ({{count}}abierto)",
-        title: "Cambiar pestaña",
+        title: "Pestañas del workspace",
         searchPlaceholder: "Pestañas de búsqueda",
       },
       menu: {
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index a4471f594c..6cfe15b1be 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -636,7 +636,7 @@ export const fr: TranslationResources = {
       },
       switcher: {
         trigger: "Changer d’onglet ({{count}} ouverts)",
-        title: "Changer d’onglet",
+        title: "Onglets de l’espace de travail",
         searchPlaceholder: "Rechercher des onglets",
       },
       menu: {
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index 9cbc630da2..cb37dde381 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -637,7 +637,7 @@ export const ja: TranslationResources = {
       },
       switcher: {
         trigger: "タブを切り替え（{{count}}件開いています）",
-        title: "タブを切り替え",
+        title: "ワークスペースのタブ",
         searchPlaceholder: "タブを検索",
       },
       menu: {
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index 98598d39dd..418490d395 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -632,7 +632,7 @@ export const ko: TranslationResources = {
       },
       switcher: {
         trigger: "탭 전환 ({{count}}개 열림)",
-        title: "탭 전환",
+        title: "워크스페이스 탭",
         searchPlaceholder: "탭 검색",
       },
       menu: {
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index c3ca4994d3..b2fe479b74 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -636,7 +636,7 @@ export const ptBR: TranslationResources = {
       },
       switcher: {
         trigger: "Alternar abas ({{count}} abertas)",
-        title: "Alternar aba",
+        title: "Abas do workspace",
         searchPlaceholder: "Buscar abas",
       },
       menu: {
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index 57616a22a7..086cd51c01 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -638,7 +638,7 @@ export const ru: TranslationResources = {
       },
       switcher: {
         trigger: "Переключить вкладки (открыто: {{count}})",
-        title: "Переключить вкладку",
+        title: "Вкладки рабочего пространства",
         searchPlaceholder: "Поиск вкладок",
       },
       menu: {
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index 99088e068a..16dc24b3a5 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -631,7 +631,7 @@ export const zhCN: TranslationResources = {
       },
       switcher: {
         trigger: "切换标签（已打开 {{count}} 个）",
-        title: "切换标签",
+        title: "Workspace 标签",
         searchPlaceholder: "搜索标签",
       },
       menu: {
diff --git a/packages/app/src/panels/agent-facts-line.test.ts b/packages/app/src/panels/agent-facts-line.test.ts
new file mode 100644
index 0000000000..182a5ff683
--- /dev/null
+++ b/packages/app/src/panels/agent-facts-line.test.ts
@@ -0,0 +1,86 @@
+import { describe, expect, it } from "vitest";
+import { buildAgentFactsLine, type AgentFactsInput } from "./agent-facts-line";
+
+const models = [
+  {
+    provider: "claude",
+    id: "claude-fable-5-1",
+    label: "Fable 5.1",
+    thinkingOptions: [
+      { id: "medium", label: "Medium" },
+      { id: "high", label: "High" },
+    ],
+  },
+];
+
+const modes = [
+  { id: "default", label: "Default" },
+  { id: "bypassPermissions", label: "Bypass permissions" },
+];
+
+const base: AgentFactsInput = {
+  models,
+  runtimeModelId: "claude-fable-5-1",
+  configuredModelId: null,
+  runtimeThinkingOptionId: "high",
+  explicitThinkingOptionId: null,
+  availableModes: modes,
+  currentModeId: "bypassPermissions",
+  contextWindowUsedTokens: 56_200,
+  contextWindowMaxTokens: 200_000,
+};
+
+describe("buildAgentFactsLine", () => {
+  it("joins model, thinking, mode, and context usage as the controls show them", () => {
+    expect(buildAgentFactsLine(base)).toBe(
+      "Fable 5.1 · High · Bypass permissions · 56k / 200k tokens (28%)",
+    );
+  });
+
+  it("shows the raw model id before the catalog has loaded", () => {
+    expect(
+      buildAgentFactsLine({
+        ...base,
+        models: null,
+        runtimeModelId: null,
+        configuredModelId: "gpt-6.1-sol",
+        runtimeThinkingOptionId: null,
+        explicitThinkingOptionId: "medium",
+        availableModes: [],
+        contextWindowUsedTokens: null,
+        contextWindowMaxTokens: null,
+      }),
+    ).toBe("gpt-6.1-sol · Medium");
+  });
+
+  it("falls back to the provider's first mode until the agent reports one", () => {
+    expect(
+      buildAgentFactsLine({
+        ...base,
+        currentModeId: null,
+        contextWindowUsedTokens: undefined,
+        contextWindowMaxTokens: undefined,
+      }),
+    ).toBe("Fable 5.1 · High · Default");
+  });
+
+  it("leaves thinking and context out when the agent has none", () => {
+    expect(
+      buildAgentFactsLine({
+        ...base,
+        models: [{ provider: "mock", id: "m", label: "Model M" }],
+        runtimeModelId: "m",
+        runtimeThinkingOptionId: null,
+        availableModes: [],
+        contextWindowUsedTokens: 10,
+        contextWindowMaxTokens: 0,
+      }),
+    ).toBe("Model M");
+  });
+
+  it("is empty until the agent has a model", () => {
+    expect(
+      buildAgentFactsLine({ ...base, runtimeModelId: null, configuredModelId: " " }),
+    ).toBeNull();
+  });
+});
diff --git a/packages/app/src/panels/agent-facts-line.ts b/packages/app/src/panels/agent-facts-line.ts
new file mode 100644
index 0000000000..7d3cd80332
--- /dev/null
+++ b/packages/app/src/panels/agent-facts-line.ts
@@ -0,0 +1,59 @@
+import type { AgentMode, AgentModelDefinition } from "@getpaseo/protocol/agent-types";
+import { formatAgentModeLabel } from "@/agent-controls/labels";
+import { formatTokenCount } from "@/components/context-window-meter.utils";
+import { resolveAgentModelSelection } from "@/composer/agent-controls/utils";
+
+export interface AgentFactsInput {
+  models: AgentModelDefinition[] | null;
+  runtimeModelId: string | null | undefined;
+  configuredModelId: string | null | undefined;
+  runtimeThinkingOptionId: string | null | undefined;
+  explicitThinkingOptionId: string | null | undefined;
+  availableModes: AgentMode[];
+  currentModeId: string | null | undefined;
+  contextWindowUsedTokens: number | null | undefined;
+  contextWindowMaxTokens: number | null | undefined;
+}
+
+/**
+ * What the composer's controls and context meter show about a Paseo agent, as one line: model,
+ * thinking, mode, and context usage, each resolved exactly as its control resolves it. Null until
+ * the agent has a model at all.
+ */
+export function buildAgentFactsLine(input: AgentFactsInput): string | null {
+  const hasModel = Boolean(input.runtimeModelId?.trim() || input.configuredModelId?.trim());
+  if (!hasModel) return null;
+  const selection = resolveAgentModelSelection(input);
+  const parts = [selection.displayModel];
+  if (selection.selectedThinkingId) parts.push(selection.displayThinking);
+  const mode = resolveModeLabel(input.availableModes, input.currentModeId);
+  if (mode) parts.push(mode);
+  const context = formatContextUsage(input.contextWindowUsedTokens, input.contextWindowMaxTokens);
+  if (context) parts.push(context);
+  return parts.join(" · ");
+}
+
+/** The mode control shows the current mode, or the provider's first one until the agent reports. */
+function resolveModeLabel(modes: AgentMode[], currentModeId: string | null | undefined) {
+  const mode = modes.find((candidate) => candidate.id === currentModeId) ?? modes[0];
+  return mode ? formatAgentModeLabel(mode) : null;
+}
+
+/** The context meter's numbers: used of max, with the share it draws as the ring. */
+function formatContextUsage(
+  usedTokens: number | null | undefined,
+  maxTokens: number | null | undefined,
+): string | null {
+  if (
+    typeof usedTokens !== "number" ||
+    typeof maxTokens !== "number" ||
+    !Number.isFinite(usedTokens) ||
+    !Number.isFinite(maxTokens) ||
+    usedTokens < 0 ||
+    maxTokens <= 0
+  ) {
+    return null;
+  }
+  const percentage = Math.round(Math.min(100, (usedTokens / maxTokens) * 100));
+  return `${formatTokenCount(usedTokens)} / ${formatTokenCount(maxTokens)} tokens (${percentage}%)`;
+}
diff --git a/packages/app/src/panels/agent-panel.tsx b/packages/app/src/panels/agent-panel.tsx
index f857bbb349..a9e11df570 100644
--- a/packages/app/src/panels/agent-panel.tsx
+++ b/packages/app/src/panels/agent-panel.tsx
@@ -60,6 +60,9 @@ import { useContainerWidthBelow } from "@/hooks/use-container-width";
 import { reconcileMissingAgentStateWithPresentAgent } from "@/panels/agent-panel-load-state";
 import { TimelineSyncStatus } from "@/timeline/sync-status";
 import { usePaneContext, usePaneFocus } from "@/panels/pane-context";
+import { buildAgentFactsLine } from "@/panels/agent-facts-line";
+import { PaneSubtitle } from "@/panels/pane-subtitle";
+import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import { definePanel, type PanelDescriptor } from "@/panels/panel-registry";
 import { RenderProfile } from "@/utils/render-profiler";
 import { useHasPluginComposerPills } from "@/plugins";
@@ -1247,6 +1250,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   ) : null;
   const streamContent = (
     <View style={animatedStaticStyles.content}>
+      {showsComposer ? null : <SheetAgentFacts serverId={serverId} agentId={agentId} />}
       <RenderProfile id={`AgentStreamSection:${agentId}`}>
         <AgentStreamSection
           streamViewRef={streamViewRef}
@@ -1375,6 +1379,36 @@ function TimelineSyncErrorCallout({
   );
 }
 
+/**
+ * What the composer's controls and context meter would show, as one line, for an agent shown
+ * without its composer.
+ */
+function SheetAgentFacts({ serverId, agentId }: { serverId: string; agentId: string }) {
+  const agent = useSessionStore(
+    useShallow((state) => {
+      const current = state.sessions[serverId]?.agents.get(agentId);
+      return current
+        ? {
+            provider: current.provider,
+            cwd: current.cwd,
+            runtimeModelId: current.runtimeInfo?.model ?? null,
+            configuredModelId: current.model ?? null,
+            runtimeThinkingOptionId: current.runtimeInfo?.thinkingOptionId ?? null,
+            explicitThinkingOptionId: current.thinkingOptionId ?? null,
+            availableModes: current.availableModes,
+            currentModeId: current.currentModeId,
+            contextWindowUsedTokens: current.lastUsage?.contextWindowUsedTokens ?? null,
+            contextWindowMaxTokens: current.lastUsage?.contextWindowMaxTokens ?? null,
+          }
+        : null;
+    }),
+  );
+  const { entries } = useProvidersSnapshot(serverId, { cwd: agent?.cwd });
+  const models = entries?.find((entry) => entry.provider === agent?.provider)?.models ?? null;
+  const text = agent ? buildAgentFactsLine({ ...agent, models }) : null;
+  return text ? <PaneSubtitle text={text} testID="agent-pane-subtitle" /> : null;
+}
+
 const AgentStreamSection = memo(function AgentStreamSection({
   streamViewRef,
   serverId,
diff --git a/packages/app/src/panels/agent-tracks.tsx b/packages/app/src/panels/agent-tracks.tsx
index 3e1634c113..86faad329c 100644
--- a/packages/app/src/panels/agent-tracks.tsx
+++ b/packages/app/src/panels/agent-tracks.tsx
@@ -12,6 +12,7 @@ import {
   type ArchiveFinishedStatus,
   useArchiveSubagent,
   useDetachSubagent,
+  useSubagentOpensInSheet,
   type SubagentRow,
 } from "@/subagents";
 import { SubagentsTrack } from "@/subagents/track";
@@ -90,6 +91,7 @@ export const AgentTracks = memo(function AgentTracks({
     },
     [openSubagentTarget],
   );
+  const opensInSheet = useSubagentOpensInSheet(workspaceKey);
   const handleOpenChanges = useCallback(() => {
     if (!workspaceKey) {
       return;
@@ -122,6 +124,7 @@ export const AgentTracks = memo(function AgentTracks({
         rows={subagentRows}
         onOpenSubagent={handleOpenSubagent}
         onOpenProviderSubagent={handleOpenProviderSubagent}
+        opensInSheet={opensInSheet}
         onArchiveSubagent={archiveSubagent}
         onArchiveFinished={onArchiveFinished}
         archiveFinishedStatus={archiveFinishedStatus}
diff --git a/packages/app/src/panels/pane-subtitle.tsx b/packages/app/src/panels/pane-subtitle.tsx
new file mode 100644
index 0000000000..eb5292d67b
--- /dev/null
+++ b/packages/app/src/panels/pane-subtitle.tsx
@@ -0,0 +1,30 @@
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+
+/**
+ * One muted line of facts about a pane's agent, under the pane's header and above its stream:
+ * model, thinking, tokens. Provider subagents get it from the daemon; a Paseo agent shown without
+ * its composer gets it from the same facts the composer's controls show.
+ */
+export function PaneSubtitle({ text, testID }: { text: string; testID?: string }) {
+  return (
+    <View style={styles.header}>
+      <Text style={styles.text} numberOfLines={1} testID={testID}>
+        {text}
+      </Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  header: {
+    paddingHorizontal: theme.spacing[3],
+    paddingVertical: theme.spacing[1],
+    borderBottomWidth: theme.borderWidth[1],
+    borderBottomColor: theme.colors.border,
+  },
+  text: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+  },
+}));
diff --git a/packages/app/src/panels/provider-subagent-panel.tsx b/packages/app/src/panels/provider-subagent-panel.tsx
index 6c2d482403..ecd4a082bf 100644
--- a/packages/app/src/panels/provider-subagent-panel.tsx
+++ b/packages/app/src/panels/provider-subagent-panel.tsx
@@ -13,9 +13,11 @@ import { ComposerTrackBar } from "@/composer/tracks";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import type { AgentScreenAgent } from "@/hooks/use-agent-screen-state-machine";
 import { usePaneContext } from "@/panels/pane-context";
+import { PaneSubtitle } from "@/panels/pane-subtitle";
 import { definePanel, type PanelDescriptor } from "@/panels/panel-registry";
 import { useSessionStore } from "@/stores/session-store";
-import { useSubagentsForParent } from "@/subagents/select";
+import { type SubagentRow, useSubagentsForParent } from "@/subagents/select";
+import { useSubagentOpensInSheet } from "@/subagents/opens-in-sheet";
 import { SubagentsTrack } from "@/subagents/track";
 import {
   providerSubagentKey,
@@ -30,6 +32,7 @@ import type { StreamItem } from "@/types/stream";
 import { deriveSidebarStateBucket } from "@/utils/sidebar-agent-state";
 import { TIMELINE_FETCH_PAGE_SIZE } from "@/timeline/timeline-fetch-policy";
 import type { TurnPresentation } from "@/timeline/turn-liveness";
+import { buildWorkspaceTabPersistenceKey } from "@/workspace-tabs/model";
 
 const EMPTY_PERMISSIONS = new Map<string, PendingPermission>();
 const EMPTY_STREAM_ITEMS: StreamItem[] = [];
@@ -47,10 +50,12 @@ function ProviderSubagentChildTrack({
   serverId,
   rows,
   onOpenProviderSubagent,
+  opensInSheet,
 }: {
   serverId: string;
   rows: ReturnType<typeof useSubagentsForParent>;
   onOpenProviderSubagent: (parentAgentId: string, subagentId: string) => void;
+  opensInSheet: (row: SubagentRow) => boolean;
 }) {
   if (rows.length === 0) return null;
   return (
@@ -60,6 +65,7 @@ function ProviderSubagentChildTrack({
         rows={rows}
         onOpenSubagent={NOOP_SUBAGENT}
         onOpenProviderSubagent={onOpenProviderSubagent}
+        opensInSheet={opensInSheet}
         onArchiveSubagent={NOOP_SUBAGENT}
       />
     </ComposerTrackBar>
@@ -109,7 +115,7 @@ function useProviderSubagentDescriptor(
 
 function ProviderSubagentPanel() {
   const { t } = useTranslation();
-  const { serverId, target, openFileInWorkspace, openTab } = usePaneContext();
+  const { serverId, workspaceId, target, openFileInWorkspace, openTab } = usePaneContext();
   invariant(target.kind === "provider_subagent", "ProviderSubagentPanel requires provider target");
   const key = providerSubagentKey(serverId, target.parentAgentId, target.subagentId);
   const streamId = `provider:${encodeURIComponent(target.parentAgentId)}:${encodeURIComponent(target.subagentId)}`;
@@ -137,6 +143,9 @@ function ProviderSubagentPanel() {
     providerParentSubagentId: target.subagentId,
   });
   const childTrackClearance = resolveChildTrackClearance(childRows.length, isCompact);
+  const opensInSheet = useSubagentOpensInSheet(
+    buildWorkspaceTabPersistenceKey({ serverId, workspaceId }),
+  );
   const openProviderChild = useCallback(
     (parentAgentId: string, subagentId: string) => {
       openTab({ kind: "provider_subagent", parentAgentId, subagentId });
@@ -243,17 +252,7 @@ function ProviderSubagentPanel() {
 
   return (
     <View style={styles.container} testID="provider-subagent-panel">
-      {subtitle ? (
-        <View style={styles.subtitleHeader}>
-          <Text
-            style={styles.subtitleText}
-            numberOfLines={1}
-            testID="provider-subagent-pane-subtitle"
-          >
-            {subtitle}
-          </Text>
-        </View>
-      ) : null}
+      {subtitle ? <PaneSubtitle text={subtitle} testID="provider-subagent-pane-subtitle" /> : null}
       <AgentStreamView
         agentId={streamId}
         serverId={serverId}
@@ -273,6 +272,7 @@ function ProviderSubagentPanel() {
         serverId={serverId}
         rows={childRows}
         onOpenProviderSubagent={openProviderChild}
+        opensInSheet={opensInSheet}
       />
     </View>
   );
@@ -280,16 +280,6 @@ function ProviderSubagentPanel() {
 
 const styles = StyleSheet.create((theme) => ({
   container: { flex: 1, minHeight: 0 },
-  subtitleHeader: {
-    paddingHorizontal: theme.spacing[3],
-    paddingVertical: theme.spacing[1],
-    borderBottomWidth: theme.borderWidth[1],
-    borderBottomColor: theme.colors.border,
-  },
-  subtitleText: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
   unsupported: { flex: 1, alignItems: "center", justifyContent: "center", padding: 24 },
   unsupportedText: { color: theme.colors.foregroundMuted, textAlign: "center" },
 }));
diff --git a/packages/app/src/screens/workspace/sheet-tabs.tsx b/packages/app/src/screens/workspace/sheet-tabs.tsx
new file mode 100644
index 0000000000..2b4e927a13
--- /dev/null
+++ b/packages/app/src/screens/workspace/sheet-tabs.tsx
@@ -0,0 +1,311 @@
+import type { BottomSheetHandleProps } from "@gorhom/bottom-sheet";
+import { useIsFocused } from "@react-navigation/native";
+import {
+  type ComponentType,
+  type FC,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { View } from "react-native";
+import { useTranslation } from "react-i18next";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { useStore } from "zustand";
+import { createStore } from "zustand/vanilla";
+import { Maximize2 } from "lucide-react-native";
+import {
+  SheetBackground,
+  SheetHandle,
+  SheetHeaderIconButton,
+  SheetHeaderView,
+  type SheetHeader,
+} from "@/components/adaptive-modal-sheet";
+import {
+  IsolatedBottomSheetModal,
+  type IsolatedBottomSheetModalRef,
+  systemBackPress,
+} from "@/components/ui/isolated-bottom-sheet-modal";
+import type { PanelIconProps } from "@/panels/panel-registry";
+import { getPanelRegistration } from "@/panels/panel-registry";
+import { ensurePanelsRegistered } from "@/panels/register-panels";
+import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
+import {
+  WorkspacePaneContent,
+  type WorkspacePaneContentModel,
+} from "@/screens/workspace/workspace-pane-content";
+import { useWorkspaceLayoutStore, type SheetTab } from "@/stores/workspace-layout-store";
+
+const SNAP_POINTS = ["92%"];
+const NO_SHEETS: readonly SheetTab[] = [];
+
+function PanelIcon({
+  icon: Icon,
+  size,
+  color,
+}: { icon: ComponentType<PanelIconProps> } & PanelIconProps) {
+  return <Icon size={size} color={color} />;
+}
+
+const ThemedPanelIcon = withUnistyles(PanelIcon, (theme) => ({
+  color: theme.colors.foregroundMuted,
+}));
+
+interface SheetTabHandleValue {
+  header: SheetHeader;
+  onClose: () => void;
+}
+
+/**
+ * The sheet's handle, showing its header. Gorhom takes `handleComponent` as a component type and
+ * renders it on the far side of the portal: a new function per render would remount the header on
+ * every change, and no context from here reaches it. So each sheet gets one handle component for
+ * its lifetime, which reads the header through a store the sheet keeps current.
+ */
+function useSheetTabHandle(value: SheetTabHandleValue): FC<BottomSheetHandleProps> {
+  const [store] = useState(() => createStore<SheetTabHandleValue>(() => value));
+  useEffect(() => store.setState(value, true), [store, value]);
+  const [Handle] = useState(
+    () =>
+      function SheetTabHandle(props: BottomSheetHandleProps) {
+        const { header, onClose } = useStore(store);
+        return (
+          <SheetHandle {...props}>
+            <SheetHeaderView header={header} onClose={onClose} testID="sheet-tab-header" />
+          </SheetHandle>
+        );
+      },
+  );
+  return Handle;
+}
+
+export interface SheetTabsProps {
+  workspaceKey: string | null;
+  serverId: string;
+  workspaceId: string;
+  isWorkspaceFocused: boolean;
+  buildContent: (tab: WorkspaceTabDescriptor) => WorkspacePaneContentModel;
+  /** The workspace's ordinary tab close, including its unsaved-changes guard. */
+  onCloseTab: (tabId: string) => Promise<void>;
+}
+
+interface SheetTabSheetProps extends Omit<SheetTabsProps, "workspaceKey" | "onCloseTab"> {
+  sheet: SheetTab;
+  /** Only the top sheet's pane is focused and answers Android Back; the ones below wait their turn. */
+  isTop: boolean;
+  /** Runs the guarded close and resolves to whether the tab is still open. */
+  onClose: (tabId: string) => Promise<boolean>;
+  onOpenAsTab: (tabId: string) => void;
+}
+
+/**
+ * The workspace's sheet tabs, one sheet each, on the app-wide sheet stack. They present from inside
+ * the workspace's `SheetHostScope`, so each panel keeps every context an ordinary pane has, and a
+ * sheet opened from any other sheet (a subagent chosen from the subagents list, say) lands on top of
+ * it and uncovers it on close. The shared sheet parts (`SheetBackground`, `SheetHandle`,
+ * `SheetHeaderView`) keep them looking and dragging like every other sheet.
+ */
+export function SheetTabs({ workspaceKey, onCloseTab, ...rest }: SheetTabsProps) {
+  const sheets = useWorkspaceLayoutStore((state) =>
+    workspaceKey ? (state.sheetsByWorkspace[workspaceKey] ?? NO_SHEETS) : NO_SHEETS,
+  );
+  const openSheetAsTab = useWorkspaceLayoutStore((state) => state.openSheetAsTab);
+  const handleOpenAsTab = useCallback(
+    (tabId: string) => {
+      if (workspaceKey) openSheetAsTab(workspaceKey, tabId);
+    },
+    [openSheetAsTab, workspaceKey],
+  );
+  const handleClose = useCallback(
+    async (tabId: string) => {
+      await onCloseTab(tabId);
+      // A declined unsaved-changes prompt leaves the tab in its sheet.
+      const open = workspaceKey
+        ? useWorkspaceLayoutStore.getState().sheetsByWorkspace[workspaceKey]
+        : undefined;
+      return open?.some((sheet) => sheet.tab.tabId === tabId) ?? false;
+    },
+    [onCloseTab, workspaceKey],
+  );
+  return (
+    <>
+      {sheets.map((sheet, index) => (
+        <SheetTabSheet
+          // Keyed by tab id and kind, so the registration and its descriptor hook stay fixed.
+          key={`${sheet.tab.tabId}:${sheet.tab.target.kind}`}
+          {...rest}
+          sheet={sheet}
+          isTop={index === sheets.length - 1}
+          onClose={handleClose}
+          onOpenAsTab={handleOpenAsTab}
+        />
+      ))}
+    </>
+  );
+}
+
+function SheetTabSheet({
+  sheet,
+  isTop,
+  serverId,
+  workspaceId,
+  isWorkspaceFocused,
+  buildContent,
+  onClose,
+  onOpenAsTab,
+}: SheetTabSheetProps) {
+  const { t } = useTranslation();
+  const { tab } = sheet;
+  const sheetRef = useRef<IsolatedBottomSheetModalRef>(null);
+  const isScreenFocused = useIsFocused();
+  ensurePanelsRegistered();
+  const registration = getPanelRegistration(tab.target.kind);
+  if (!registration) {
+    throw new Error(`No panel registration for kind: ${tab.target.kind}`);
+  }
+  const descriptor = registration.useDescriptor(tab.target as never, {
+    serverId,
+    workspaceId,
+    tabId: tab.tabId,
+  });
+
+  // The sheet lives as long as its store entry: it presents on mount, and unmounting takes it off
+  // the stack, which uncovers the sheet below. Gorhom slides an unmounting sheet down and still
+  // reports that as `onChange(-1)`, which must not read as the user closing it: the store already
+  // moved on, and the same tab id may now be a pane tab (Open as tab).
+  const unmounted = useRef(false);
+  useEffect(() => {
+    sheetRef.current?.present();
+    return () => {
+      unmounted.current = true;
+    };
+  }, []);
+
+  // Every close path (drag, backdrop, Close, Back) slides the sheet down first; `onChange(-1)` then
+  // runs the one guarded close. The sheet keeps its content through the close, so a declined
+  // unsaved-changes prompt only has to bring it back up.
+  const close = useCallback(() => sheetRef.current?.close(), []);
+  const handleChange = useCallback(
+    (index: number) => {
+      if (index !== -1 || unmounted.current) return;
+      void onClose(tab.tabId).then((stillOpen) => {
+        if (stillOpen) sheetRef.current?.snapToIndex(0);
+        return stillOpen;
+      });
+    },
+    [onClose, tab.tabId],
+  );
+  // Hidden workspaces stay mounted in the deck and under Settings; only the visible one owns Back.
+  const ownsBackPress = isTop && isWorkspaceFocused && isScreenFocused;
+  useEffect(() => {
+    if (!ownsBackPress) return;
+    return systemBackPress.subscribe(() => {
+      close();
+      return true;
+    });
+  }, [close, ownsBackPress]);
+
+  const handleOpenAsTab = useCallback(() => onOpenAsTab(tab.tabId), [onOpenAsTab, tab.tabId]);
+  const header = useMemo<SheetHeader>(
+    () => ({
+      title: descriptor.label,
+      leading: <ThemedPanelIcon icon={descriptor.icon} size={16} />,
+      // The sheet is for looking; the full-screen glyph takes the tab out of the sheet and into
+      // the switcher, where it gets its composer back.
+      actions: sheet.policy.openAsTab ? (
+        <SheetHeaderIconButton
+          icon={Maximize2}
+          accessibilityLabel={t("workspace.sheet.openAsTab")}
+          onPress={handleOpenAsTab}
+          testID="sheet-tab-open-as-tab"
+        />
+      ) : undefined,
+    }),
+    [descriptor.icon, descriptor.label, handleOpenAsTab, sheet.policy.openAsTab, t],
+  );
+  const handleValue = useMemo<SheetTabHandleValue>(
+    () => ({ header, onClose: close }),
+    [close, header],
+  );
+  // The header is the sheet's handle: the panel scrolls on its own, so dragging the content would
+  // fight it, and the header is where people reach to pull the sheet down.
+  const SheetTabHandle = useSheetTabHandle(handleValue);
+
+  return (
+    <IsolatedBottomSheetModal
+      ref={sheetRef}
+      contextBridge={null}
+      snapPoints={SNAP_POINTS}
+      enableDynamicSizing={false}
+      enablePanDownToClose
+      enableContentPanningGesture={false}
+      enableDismissOnClose={false}
+      backgroundComponent={SheetBackground}
+      handleComponent={SheetTabHandle}
+      backdropOpacity={0.45}
+      onChange={handleChange}
+      accessible={false}
+    >
+      {/* A covered sheet stays as live as the pane under it; only focus follows the top sheet. */}
+      <SheetTabBody
+        tab={tab}
+        label={descriptor.label}
+        isPaneFocused={isTop && isWorkspaceFocused}
+        isWorkspaceFocused={isWorkspaceFocused}
+        buildContent={buildContent}
+      />
+    </IsolatedBottomSheetModal>
+  );
+}
+
+function SheetTabBody({
+  tab,
+  label,
+  isPaneFocused,
+  isWorkspaceFocused,
+  buildContent,
+}: {
+  tab: SheetTab["tab"];
+  label: string;
+  /** Only the top sheet's pane is focused; the ones below are covered. */
+  isPaneFocused: boolean;
+  isWorkspaceFocused: boolean;
+  buildContent: (tab: WorkspaceTabDescriptor) => WorkspacePaneContentModel;
+}) {
+  const tabDescriptor = useMemo<WorkspaceTabDescriptor>(
+    () => ({
+      key: tab.tabId,
+      tabId: tab.tabId,
+      kind: tab.target.kind,
+      target: tab.target,
+      state: tab.state,
+    }),
+    [tab],
+  );
+  const content = useMemo(() => buildContent(tabDescriptor), [buildContent, tabDescriptor]);
+  // The sheet reaches the bottom of the screen, so it owns the system navigation inset.
+  const { bottom: bottomInset } = useSafeAreaInsets();
+  const contentStyle = useMemo(
+    () => [styles.content, { paddingBottom: bottomInset }],
+    [bottomInset],
+  );
+
+  return (
+    <View style={contentStyle} role="dialog" aria-label={label} testID="sheet-tab-body">
+      <WorkspacePaneContent
+        content={content}
+        isWorkspaceFocused={isWorkspaceFocused}
+        isPaneFocused={isPaneFocused}
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  content: {
+    flex: 1,
+    minHeight: 0,
+  },
+});
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index ef5b6aa779..bfe131d008 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -3,6 +3,7 @@ import {
   useComposerTabFullscreen,
 } from "@/composer/editing-session";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
+import { SheetHostScope } from "@/components/ui/isolated-bottom-sheet-modal";
 import type { JsonValue } from "@getpaseo/protocol/agent-types";
 import { getOpenAgentTabLabel } from "@getpaseo/protocol/agent-labels";
 import {
@@ -78,7 +79,7 @@ import {
   selectExplorerSidebarPaneId,
   selectPaneFocusSuspended,
   type WorkspaceLayout,
-  type WorkspaceSheet,
+  type SheetTab,
   type WorkspaceTabPlacement,
   useWorkspaceLayoutStore,
   useWorkspaceLayoutStoreHydrated,
@@ -165,7 +166,7 @@ import {
   type WorkspacePaneContentModel,
 } from "@/screens/workspace/workspace-pane-content";
 import { useMountedTabSet } from "@/screens/workspace/use-mounted-tab-set";
-import { WorkspaceSheetHost } from "@/screens/workspace/workspace-sheet-host";
+import { SheetTabs } from "@/screens/workspace/sheet-tabs";
 import type { PaneHost } from "@/panels/panel-manifest";
 import { WorkspaceFocusProvider } from "@/workspace/focus";
 import { DiffDocumentWorkspaceCacheProvider } from "@/git/diff-document/workspace-cache";
@@ -208,7 +209,7 @@ import { RenderProfile } from "@/utils/render-profiler";
 import { useWorkspaceCheckoutStatus } from "@/screens/workspace/use-workspace-checkout-status";
 import { useHasPullRequest, usePullRequestAutoAdd } from "@/panels/pull-request";
 
-const NO_SHEETS: readonly WorkspaceSheet[] = [];
+const NO_SHEETS: readonly SheetTab[] = [];
 const WORKSPACE_FLOATING_PANEL_PORTAL_HOST_PREFIX = "workspace-floating-panels";
 const EMPTY_UI_TABS: WorkspaceTab[] = [];
 const EMPTY_WORKSPACE_SCRIPTS: WorkspaceDescriptor["scripts"] = [];
@@ -3552,14 +3553,15 @@ function WorkspaceScreenContent({
     composerFullscreen: useComposerTabFullscreen(workspacePanelKey, activeTabId),
   });
 
-  // The sheet is the column's last child, so it covers the compact header as a modal.
+  // Sheets opened from the compact column present inside it, so their panels read the workspace
+  // providers, and they cover the compact header as a modal.
   const workspaceCenterColumn = isMobile ? (
     <WorkspacePanelProviders
       launcher={newTabLauncher}
       workspaceKey={workspacePanelKey}
       tabIds={workspacePanelTabIds}
     >
-      <View style={styles.centerColumn}>
+      <SheetHostScope style={styles.centerColumn}>
         <FloatingHeaderLayout
           header={compactHeaderLayout.header}
           floating={compactHeaderLayout.floating}
@@ -3570,17 +3572,15 @@ function WorkspaceScreenContent({
             </StreamTopOverlayProvider>
           )}
         </FloatingHeaderLayout>
-        <StreamTopOverlayProvider value={0}>
-          <WorkspaceSheetHost
-            workspaceKey={persistenceKey}
-            serverId={normalizedServerId}
-            workspaceId={normalizedWorkspaceId}
-            isWorkspaceFocused={isRouteFocused}
-            buildContent={buildSheetPaneContentModel}
-            onCloseTab={handleCloseTabById}
-          />
-        </StreamTopOverlayProvider>
-      </View>
+        <SheetTabs
+          workspaceKey={persistenceKey}
+          serverId={normalizedServerId}
+          workspaceId={normalizedWorkspaceId}
+          isWorkspaceFocused={isRouteFocused}
+          buildContent={buildSheetPaneContentModel}
+          onCloseTab={handleCloseTabById}
+        />
+      </SheetHostScope>
     </WorkspacePanelProviders>
   ) : (
     <View style={styles.centerColumn}>
diff --git a/packages/app/src/screens/workspace/workspace-sheet-host.tsx b/packages/app/src/screens/workspace/workspace-sheet-host.tsx
deleted file mode 100644
index a46ea2c1c7..0000000000
--- a/packages/app/src/screens/workspace/workspace-sheet-host.tsx
+++ /dev/null
@@ -1,326 +0,0 @@
-import BottomSheet, {
-  BottomSheetBackdrop,
-  type BottomSheetBackdropProps,
-  type BottomSheetHandleProps,
-} from "@gorhom/bottom-sheet";
-import { useIsFocused } from "@react-navigation/native";
-import {
-  type ComponentType,
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-} from "react";
-import { View } from "react-native";
-import { useTranslation } from "react-i18next";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import {
-  SheetBackground,
-  SheetHandle,
-  SheetHeaderView,
-  type SheetHeader,
-} from "@/components/adaptive-modal-sheet";
-import { systemBackPress } from "@/components/ui/isolated-bottom-sheet-modal";
-import { RetainedPanelActivity } from "@/components/retained-panel";
-import { Button } from "@/components/ui/button";
-import type { PanelIconProps } from "@/panels/panel-registry";
-import { getPanelRegistration } from "@/panels/panel-registry";
-import { ensurePanelsRegistered } from "@/panels/register-panels";
-import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
-import {
-  WorkspacePaneContent,
-  type WorkspacePaneContentModel,
-} from "@/screens/workspace/workspace-pane-content";
-import { useWorkspaceLayoutStore, type WorkspaceSheet } from "@/stores/workspace-layout-store";
-
-const SNAP_POINTS = ["92%"];
-const NO_SHEETS: readonly WorkspaceSheet[] = [];
-
-function PanelIcon({
-  icon: Icon,
-  size,
-  color,
-}: { icon: ComponentType<PanelIconProps> } & PanelIconProps) {
-  return <Icon size={size} color={color} />;
-}
-
-const ThemedPanelIcon = withUnistyles(PanelIcon, (theme) => ({
-  color: theme.colors.foregroundMuted,
-}));
-
-// The workspace sheet is a Gorhom sheet rendered in place rather than a portaled modal, so the
-// backdrop closes the sheet itself instead of dismissing the top of the modal stack.
-function renderBackdrop(props: BottomSheetBackdropProps) {
-  return (
-    <BottomSheetBackdrop
-      {...props}
-      appearsOnIndex={0}
-      disappearsOnIndex={-1}
-      opacity={0.45}
-      pressBehavior="close"
-    />
-  );
-}
-
-// Stacked sheets share the bottom sheet's dim rather than darkening it again, but still catch the
-// tap so it closes the top sheet. The backdrop is clear rather than transparent: iOS skips views
-// under 0.01 opacity when hit testing, which would hand the tap to the sheet below.
-function renderStackedBackdrop(props: BottomSheetBackdropProps) {
-  return (
-    <BottomSheetBackdrop
-      {...props}
-      style={styles.clearBackdrop}
-      appearsOnIndex={0}
-      disappearsOnIndex={-1}
-      opacity={1}
-      pressBehavior="close"
-    />
-  );
-}
-
-interface WorkspaceSheetHandleValue {
-  header: SheetHeader;
-  onClose: () => void;
-}
-
-const WorkspaceSheetHandleContext = createContext<WorkspaceSheetHandleValue | null>(null);
-
-// Gorhom renders `handleComponent` as a component type, so it stays one module-level component and
-// reads the header from context; a per-render function would remount the header on every change.
-function WorkspaceSheetHandle(props: BottomSheetHandleProps) {
-  const value = useContext(WorkspaceSheetHandleContext);
-  if (!value) throw new Error("WorkspaceSheetHandle must render inside a workspace sheet");
-  return (
-    <SheetHandle {...props}>
-      <SheetHeaderView
-        header={value.header}
-        onClose={value.onClose}
-        testID="workspace-sheet-header"
-      />
-    </SheetHandle>
-  );
-}
-
-export interface WorkspaceSheetHostProps {
-  workspaceKey: string | null;
-  serverId: string;
-  workspaceId: string;
-  isWorkspaceFocused: boolean;
-  buildContent: (tab: WorkspaceTabDescriptor) => WorkspacePaneContentModel;
-  /** The workspace's ordinary tab close, including its unsaved-changes guard. */
-  onCloseTab: (tabId: string) => Promise<void>;
-}
-
-interface WorkspaceSheetPresentationProps extends Omit<
-  WorkspaceSheetHostProps,
-  "workspaceKey" | "onCloseTab"
-> {
-  sheet: WorkspaceSheet;
-  /** Only the bottom sheet dims the workspace; the ones above share its dim. */
-  isBottom: boolean;
-  /** Only the top sheet answers Android Back; the ones below wait their turn. */
-  isTop: boolean;
-  onClose: (tabId: string) => Promise<void>;
-  onOpenAsTab: (tabId: string) => void;
-}
-
-/**
- * Hosts the workspace's sheets over the compact tab strip, one Gorhom sheet per entry, top last.
- * They render in the workspace tree, not through a portal, so each panel keeps every context an
- * ordinary pane has. The shared sheet parts (`SheetBackground`, `SheetHandle`, `SheetHeaderView`)
- * keep them looking and dragging like every other sheet.
- */
-export function WorkspaceSheetHost({ workspaceKey, onCloseTab, ...rest }: WorkspaceSheetHostProps) {
-  const sheets = useWorkspaceLayoutStore((state) =>
-    workspaceKey ? (state.sheetsByWorkspace[workspaceKey] ?? NO_SHEETS) : NO_SHEETS,
-  );
-  const openSheetAsTab = useWorkspaceLayoutStore((state) => state.openSheetAsTab);
-  const handleOpenAsTab = useCallback(
-    (tabId: string) => {
-      if (workspaceKey) openSheetAsTab(workspaceKey, tabId);
-    },
-    [openSheetAsTab, workspaceKey],
-  );
-  if (sheets.length === 0) return null;
-  return (
-    <View style={styles.host} pointerEvents="box-none">
-      {sheets.map((sheet, index) => (
-        <WorkspaceSheetPresentation
-          // Keyed by tab id and kind, so the registration and its descriptor hook stay fixed.
-          key={`${sheet.tab.tabId}:${sheet.tab.target.kind}`}
-          {...rest}
-          sheet={sheet}
-          isBottom={index === 0}
-          isTop={index === sheets.length - 1}
-          onClose={onCloseTab}
-          onOpenAsTab={handleOpenAsTab}
-        />
-      ))}
-    </View>
-  );
-}
-
-function WorkspaceSheetPresentation({
-  sheet,
-  isBottom,
-  isTop,
-  serverId,
-  workspaceId,
-  isWorkspaceFocused,
-  buildContent,
-  onClose,
-  onOpenAsTab,
-}: WorkspaceSheetPresentationProps) {
-  const { t } = useTranslation();
-  const { tab } = sheet;
-  const sheetRef = useRef<BottomSheet>(null);
-  const isScreenFocused = useIsFocused();
-  ensurePanelsRegistered();
-  const registration = getPanelRegistration(tab.target.kind);
-  if (!registration) {
-    throw new Error(`No panel registration for kind: ${tab.target.kind}`);
-  }
-  const descriptor = registration.useDescriptor(tab.target as never, {
-    serverId,
-    workspaceId,
-    tabId: tab.tabId,
-  });
-
-  const handleClose = useCallback(() => onClose(tab.tabId), [onClose, tab.tabId]);
-  const handleChange = useCallback(
-    (index: number) => {
-      if (index !== -1) return;
-      // A declined close (unsaved changes) leaves the tab in the sheet, so bring it back up.
-      void handleClose().then(() => sheetRef.current?.snapToIndex(0));
-    },
-    [handleClose],
-  );
-  // Hidden workspaces stay mounted in the deck and under Settings; only the visible one owns back.
-  const ownsBackPress = isTop && isWorkspaceFocused && isScreenFocused;
-  useEffect(() => {
-    if (!ownsBackPress) return;
-    return systemBackPress.subscribe(() => {
-      void handleClose();
-      return true;
-    });
-  }, [handleClose, ownsBackPress]);
-
-  const handleOpenAsTab = useCallback(() => onOpenAsTab(tab.tabId), [onOpenAsTab, tab.tabId]);
-  const header = useMemo<SheetHeader>(
-    () => ({
-      title: descriptor.label,
-      leading: <ThemedPanelIcon icon={descriptor.icon} size={16} />,
-      actions: sheet.policy.openAsTab ? (
-        <Button size="sm" variant="secondary" onPress={handleOpenAsTab}>
-          {t("workspace.sheet.openAsTab")}
-        </Button>
-      ) : undefined,
-    }),
-    [descriptor.icon, descriptor.label, handleOpenAsTab, sheet.policy.openAsTab, t],
-  );
-  const handleHeaderClose = useCallback(() => {
-    void handleClose();
-  }, [handleClose]);
-  const handleValue = useMemo<WorkspaceSheetHandleValue>(
-    () => ({ header, onClose: handleHeaderClose }),
-    [handleHeaderClose, header],
-  );
-
-  return (
-    // Gorhom renders the handle beside the content, so the dialog wraps the whole sheet.
-    <View
-      style={styles.sheetLayer}
-      pointerEvents="box-none"
-      role="dialog"
-      aria-label={descriptor.label}
-    >
-      {/* The header is the sheet's handle: the panel scrolls on its own, so dragging the content
-          would fight it, and the header is where people reach to pull the sheet down. */}
-      <WorkspaceSheetHandleContext.Provider value={handleValue}>
-        <BottomSheet
-          ref={sheetRef}
-          index={0}
-          snapPoints={SNAP_POINTS}
-          enableDynamicSizing={false}
-          enablePanDownToClose
-          enableContentPanningGesture={false}
-          backgroundComponent={SheetBackground}
-          handleComponent={WorkspaceSheetHandle}
-          backdropComponent={isBottom ? renderBackdrop : renderStackedBackdrop}
-          onChange={handleChange}
-          accessible={false}
-        >
-          {/* A covered sheet keeps its state but stops its live work until it is on top again. */}
-          <RetainedPanelActivity active={isTop}>
-            <WorkspaceSheetBody
-              tab={tab}
-              isPaneFocused={isTop && isWorkspaceFocused}
-              isWorkspaceFocused={isWorkspaceFocused}
-              buildContent={buildContent}
-            />
-          </RetainedPanelActivity>
-        </BottomSheet>
-      </WorkspaceSheetHandleContext.Provider>
-    </View>
-  );
-}
-
-function WorkspaceSheetBody({
-  tab,
-  isPaneFocused,
-  isWorkspaceFocused,
-  buildContent,
-}: {
-  tab: WorkspaceSheet["tab"];
-  /** Only the top sheet's pane is focused; the ones below are covered. */
-  isPaneFocused: boolean;
-  isWorkspaceFocused: boolean;
-  buildContent: (tab: WorkspaceTabDescriptor) => WorkspacePaneContentModel;
-}) {
-  const tabDescriptor = useMemo<WorkspaceTabDescriptor>(
-    () => ({
-      key: tab.tabId,
-      tabId: tab.tabId,
-      kind: tab.target.kind,
-      target: tab.target,
-      state: tab.state,
-    }),
-    [tab],
-  );
-  const content = useMemo(() => buildContent(tabDescriptor), [buildContent, tabDescriptor]);
-  // The sheet reaches the bottom of the screen, so it owns the system navigation inset.
-  const { bottom: bottomInset } = useSafeAreaInsets();
-  const contentStyle = useMemo(
-    () => [styles.content, { paddingBottom: bottomInset }],
-    [bottomInset],
-  );
-
-  return (
-    <View style={contentStyle} testID="workspace-sheet-body">
-      <WorkspacePaneContent
-        content={content}
-        isWorkspaceFocused={isWorkspaceFocused}
-        isPaneFocused={isPaneFocused}
-      />
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  host: {
-    ...StyleSheet.absoluteFillObject,
-  },
-  clearBackdrop: {
-    backgroundColor: "transparent",
-  },
-  sheetLayer: {
-    ...StyleSheet.absoluteFillObject,
-  },
-  content: {
-    flex: 1,
-    minHeight: 0,
-  },
-});
diff --git a/packages/app/src/stores/workspace-layout-store.test.ts b/packages/app/src/stores/workspace-layout-store.test.ts
index fc973f442d..5f170bed7e 100644
--- a/packages/app/src/stores/workspace-layout-store.test.ts
+++ b/packages/app/src/stores/workspace-layout-store.test.ts
@@ -4592,7 +4592,7 @@ describe("compact workspace sheet", () => {
     expect(tabKinds(store)).toEqual(["terminal"]);
   });
 
-  it("brings a stacked target back to the top by dropping the sheets above it", () => {
+  it("uncovers a covered sheet by dropping the sheets above it", () => {
     const store = createCompactStore();
     const fileTabId = store
       .getState()
@@ -4878,13 +4878,15 @@ describe("compact workspace sheet", () => {
       });
     });
 
-    it("brings a covered sheet back to the top and keeps a modified sheet above it beneath", () => {
+    it("keeps a covered sheet in place under a modified sheet instead of reordering", () => {
       const store = createCompactStore();
       const otherTarget = { kind: "file" as const, path: "src/other.ts" };
       const otherTabId = store
         .getState()
         .openTab({ workspaceKey, target: otherTarget, intent: "reveal" });
       const modifiedSheetTabId = openModifiedFileSheet(store);
+      const unmodifiedTopTarget = { kind: "file" as const, path: "src/third.ts" };
+      store.getState().openTab({ workspaceKey, target: unmodifiedTopTarget, intent: "reveal" });
       const focusedBefore = focusedTabId(store);
 
       const tabId = store
@@ -4892,10 +4894,10 @@ describe("compact workspace sheet", () => {
         .openTab({ workspaceKey, target: otherTarget, intent: "reveal" });
 
       expect(tabId).toBe(otherTabId);
-      expect(sheetTargets(store)).toEqual([fileTarget, otherTarget]);
-      expect(store.getState().sheetsByWorkspace[workspaceKey]?.[0]?.tab.tabId).toBe(
-        modifiedSheetTabId,
-      );
+      // Moving a sheet would remount its panel, so the stack keeps its order: the modified sheet
+      // stays on top of the one revealed, and only the unmodified sheet above them closes.
+      expect(sheetTargets(store)).toEqual([otherTarget, fileTarget]);
+      expect(sheetTabId(store)).toBe(modifiedSheetTabId);
       expect(stripTab(store, tabId ?? "")).toBeNull();
       expect(focusedTabId(store)).toBe(focusedBefore);
     });
diff --git a/packages/app/src/stores/workspace-layout-store.ts b/packages/app/src/stores/workspace-layout-store.ts
index ba186b655a..2aea369df6 100644
--- a/packages/app/src/stores/workspace-layout-store.ts
+++ b/packages/app/src/stores/workspace-layout-store.ts
@@ -111,13 +111,13 @@ export interface OpenWorkspaceTabInput {
 }
 
 /**
- * How the app shell lays out a workspace: compact (one tab at a time, plus the sheet), a single
+ * How the app shell lays out a workspace: compact (one tab at a time, plus sheets), a single
  * wide pane (touch tablets, which cannot render splits), or split panes.
  */
 export type WorkspaceLayoutMode = "compact" | "single-pane" | "split-panes";
 
-/** A tab hosted by the compact workspace sheet instead of a pane. */
-export interface WorkspaceSheet {
+/** A tab shown in a sheet over the compact workspace instead of in a pane. */
+export interface SheetTab {
   tab: WorkspaceTab;
   policy: CompactSheetPolicy;
   parentTabId: string | null;
@@ -127,10 +127,12 @@ interface WorkspaceLayoutStore {
   /** Published once by the app shell; callers never pass a form factor to open a tab. */
   layoutMode: WorkspaceLayoutMode;
   /**
-   * Each workspace's open sheets, bottom to top; only the top one is on screen. A workspace with
-   * no sheet has no entry. Not persisted: a reload returns to the tab strip.
+   * Each workspace's sheet tabs in the order they opened, so the last is the sheet on top. The
+   * list never reorders: the stack belongs to the sheet primitive, and moving a sheet would remount
+   * its panel. A workspace with no sheet has no entry. Not persisted: a reload returns to the tab
+   * strip.
    */
-  sheetsByWorkspace: Record<string, readonly WorkspaceSheet[]>;
+  sheetsByWorkspace: Record<string, readonly SheetTab[]>;
   layoutByWorkspace: Record<string, WorkspaceLayout>;
   splitSizesByWorkspace: Record<string, Record<string, number[]>>;
   explorerSidebarWidthByWorkspace: Record<string, number>;
@@ -143,10 +145,10 @@ interface WorkspaceLayoutStore {
   pullRequestTabAutoOpenedByWorkspace: Record<string, true>;
   /**
    * The one entry point for showing a target. On compact layouts a target whose panel declares
-   * `compactSheet` opens in the workspace sheet; the returned tab id is the sheet tab's id.
+   * `compactSheet` opens in a sheet; the returned tab id is the sheet tab's id.
    */
   openTab: (input: OpenWorkspaceTabInput) => string | null;
-  /** Whether `openTab` with this input would show the target in the sheet. */
+  /** Whether `openTab` with this input would show the target in a sheet. */
   opensInSheet: (
     input: Pick<OpenWorkspaceTabInput, "workspaceKey" | "target" | "intent">,
   ) => boolean;
@@ -684,12 +686,12 @@ function attachParentTab(input: {
   });
 }
 
-const NO_SHEETS: readonly WorkspaceSheet[] = [];
+const NO_SHEETS: readonly SheetTab[] = [];
 
 function getSheets(
   state: Pick<WorkspaceLayoutStore, "sheetsByWorkspace">,
   workspaceKey: string,
-): readonly WorkspaceSheet[] {
+): readonly SheetTab[] {
   return state.sheetsByWorkspace[workspaceKey] ?? NO_SHEETS;
 }
 
@@ -697,14 +699,14 @@ function findSheet(
   state: Pick<WorkspaceLayoutStore, "sheetsByWorkspace">,
   workspaceKey: string,
   tabId: string,
-): WorkspaceSheet | undefined {
+): SheetTab | undefined {
   return getSheets(state, workspaceKey).find((sheet) => sheet.tab.tabId === tabId);
 }
 
 function withSheets(
   state: Pick<WorkspaceLayoutStore, "sheetsByWorkspace">,
   workspaceKey: string,
-  sheets: readonly WorkspaceSheet[],
+  sheets: readonly SheetTab[],
 ): Pick<WorkspaceLayoutStore, "sheetsByWorkspace"> {
   if (sheets.length > 0) {
     return { sheetsByWorkspace: { ...state.sheetsByWorkspace, [workspaceKey]: sheets } };
@@ -732,7 +734,7 @@ function withSheetTab(
   state: Pick<WorkspaceLayoutStore, "sheetsByWorkspace">,
   workspaceKey: string,
   tabId: string,
-  update: (sheet: WorkspaceSheet) => WorkspaceSheet,
+  update: (sheet: SheetTab) => SheetTab,
 ): Pick<WorkspaceLayoutStore, "sheetsByWorkspace"> {
   return withSheets(
     state,
@@ -777,13 +779,13 @@ function resolveOpenParentTabId(
 
 function placeTargetInSheet(input: {
   /** The sheet whose tab the target keeps, if any. */
-  kept: WorkspaceSheet | undefined;
+  kept: SheetTab | undefined;
   target: WorkspaceTabTarget;
   intent: WorkspaceTabOpenIntent;
   policy: CompactSheetPolicy;
   parentTabId: string | null;
   state: JsonValue | undefined;
-}): WorkspaceSheet {
+}): SheetTab {
   if (input.kept) {
     return { ...input.kept, tab: { ...input.kept.tab, target: input.target } };
   }
@@ -857,14 +859,14 @@ function promoteSheetToTab(
  * A sheet holding unsaved work is never implicitly displaced: moving its tab would remount the
  * panel and drop the work. Only the explicit, guarded close removes it.
  */
-function sheetHoldsUnsavedWork(workspaceKey: string, sheet: WorkspaceSheet): boolean {
+function sheetHoldsUnsavedWork(workspaceKey: string, sheet: SheetTab): boolean {
   return isSheetTabModified(workspaceKey, sheet.tab.tabId);
 }
 
 /**
- * Where an open lands in the sheet stack, or null when it opens as a tab. A new target goes on
- * top. A reveal of a resource a sheet already shows keeps that sheet's tab and brings it back to
- * the top; the sheets above it close, except ones holding unsaved work, which stay beneath it.
+ * Where an open lands among the sheet tabs, or null when it opens as a tab. A new target goes on
+ * top. A reveal of a resource a sheet already shows keeps that sheet's tab and uncovers it by
+ * closing the sheets above it, except ones holding unsaved work, which stay where they are.
  */
 function resolveSheetPlacement(
   state: WorkspaceLayoutStore,
@@ -915,7 +917,7 @@ function openSheetTabInFront(
  */
 function sheetAgentNoLongerFits(
   workspaceKey: string,
-  sheet: WorkspaceSheet,
+  sheet: SheetTab,
   snapshot: WorkspaceTabSnapshot,
 ): boolean {
   if (sheet.tab.target.kind !== "agent" || !snapshot.agentsHydrated) return false;
@@ -1001,16 +1003,17 @@ export function createWorkspaceLayoutStore(
               parentTabId,
               state: input.state,
             });
-            const below =
+            const next =
               keptIndex === null
-                ? sheets
-                : [
-                    ...sheets.slice(0, keptIndex),
-                    ...sheets
-                      .slice(keptIndex + 1)
-                      .filter((above) => sheetHoldsUnsavedWork(normalizedWorkspaceKey, above)),
-                  ];
-            set((state) => withSheets(state, normalizedWorkspaceKey, [...below, sheet]));
+                ? [...sheets, sheet]
+                : sheets.flatMap((existing, index) => {
+                    if (index === keptIndex) return [sheet];
+                    if (index < keptIndex) return [existing];
+                    return sheetHoldsUnsavedWork(normalizedWorkspaceKey, existing)
+                      ? [existing]
+                      : [];
+                  });
+            set((state) => withSheets(state, normalizedWorkspaceKey, next));
             return sheet.tab.tabId;
           }
           const placement = getOpenTabPlacement(
diff --git a/packages/app/src/subagents/index.ts b/packages/app/src/subagents/index.ts
index e93d62eb2d..9c6227a34f 100644
--- a/packages/app/src/subagents/index.ts
+++ b/packages/app/src/subagents/index.ts
@@ -9,3 +9,4 @@ export {
   type ArchiveFinishedStatus,
   type UseArchiveFinishedSubagentsInput,
 } from "./use-archive-finished";
+export { useSubagentOpensInSheet } from "./opens-in-sheet";
diff --git a/packages/app/src/subagents/opens-in-sheet.test.tsx b/packages/app/src/subagents/opens-in-sheet.test.tsx
new file mode 100644
index 0000000000..0792091135
--- /dev/null
+++ b/packages/app/src/subagents/opens-in-sheet.test.tsx
@@ -0,0 +1,133 @@
+/**
+ * @vitest-environment jsdom
+ */
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { act, renderHook } from "@testing-library/react";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { useSessionStore, type Agent } from "@/stores/session-store";
+import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
+import { buildWorkspaceTabPersistenceKey } from "@/workspace-tabs/model";
+import { useSubagentOpensInSheet } from "./opens-in-sheet";
+import { selectSubagentsForParent, type SubagentRow } from "./select";
+
+vi.mock("@react-native-async-storage/async-storage", () => {
+  const storage = new Map<string, string>();
+  return {
+    default: {
+      getItem: vi.fn(async (key: string) => storage.get(key) ?? null),
+      setItem: vi.fn(async (key: string, value: string) => {
+        storage.set(key, value);
+      }),
+      removeItem: vi.fn(async (key: string) => {
+        storage.delete(key);
+      }),
+    },
+  };
+});
+
+const SERVER_ID = "server-1";
+const WORKSPACE_ID = "ws-main";
+const AGENT_TIMESTAMP = new Date("2026-04-21T10:00:00.000Z");
+
+const AGENT_DEFAULTS: Agent = {
+  serverId: SERVER_ID,
+  id: "agent",
+  provider: "codex",
+  status: "idle",
+  turn: { phase: "idle", cancellationRequestId: null },
+  createdAt: AGENT_TIMESTAMP,
+  updatedAt: AGENT_TIMESTAMP,
+  lastUserMessageAt: null,
+  lastActivityAt: AGENT_TIMESTAMP,
+  capabilities: {
+    supportsStreaming: true,
+    supportsSessionPersistence: true,
+    supportsDynamicModes: true,
+    supportsMcpServers: true,
+    supportsReasoningStream: true,
+    supportsToolInvocations: true,
+  },
+  currentModeId: null,
+  availableModes: [],
+  pendingPermissions: [],
+  persistence: null,
+  runtimeInfo: undefined,
+  lastUsage: undefined,
+  lastError: null,
+  title: "Agent",
+  cwd: "/repo/worktree",
+  workspaceId: WORKSPACE_ID,
+  model: null,
+  features: undefined,
+  thinkingOptionId: undefined,
+  requiresAttention: false,
+  attentionReason: null,
+  attentionTimestamp: null,
+  archivedAt: null,
+  parentAgentId: null,
+  labels: {},
+  projectPlacement: null,
+};
+
+const workspaceKey = buildWorkspaceTabPersistenceKey({
+  serverId: SERVER_ID,
+  workspaceId: WORKSPACE_ID,
+});
+if (!workspaceKey) throw new Error("workspace key");
+
+function seedParentWithChild(): SubagentRow {
+  const parent: Agent = { ...AGENT_DEFAULTS, id: "parent", title: "Parent" };
+  const child: Agent = { ...AGENT_DEFAULTS, id: "child", title: "Child", parentAgentId: "parent" };
+  useSessionStore.getState().initializeSession(SERVER_ID, null as unknown as DaemonClient);
+  useSessionStore.getState().setAgents(
+    SERVER_ID,
+    new Map([
+      [parent.id, parent],
+      [child.id, child],
+    ]),
+  );
+  const [row] = selectSubagentsForParent(
+    useSessionStore.getState(),
+    { serverId: SERVER_ID, parentAgentId: "parent" },
+    new Set(),
+  );
+  if (!row) throw new Error("child row");
+  return row;
+}
+
+afterEach(() => {
+  useSessionStore.getState().clearSession(SERVER_ID);
+  useWorkspaceLayoutStore.setState({
+    layoutMode: "split-panes",
+    layoutByWorkspace: {},
+    sheetsByWorkspace: {},
+    hiddenAgentIdsByWorkspace: {},
+    pinnedAgentIdsByWorkspace: {},
+  });
+});
+
+describe("useSubagentOpensInSheet", () => {
+  it("re-renders the row's answer as the child's tab opens and closes", () => {
+    const row = seedParentWithChild();
+    const store = useWorkspaceLayoutStore.getState();
+    store.setLayoutMode("compact");
+    const target = { kind: "agent", agentId: "child" } as const;
+
+    // The row renders its answer, as the track does, so a stale render is a stale answer.
+    const { result } = renderHook(() => useSubagentOpensInSheet(workspaceKey)(row));
+    expect(result.current).toBe(true);
+
+    let tabId: string | null = null;
+    act(() => {
+      const sheetTabId = store.openTab({ workspaceKey, target, intent: "reveal" });
+      tabId = sheetTabId ? store.openSheetAsTab(workspaceKey, sheetTabId) : null;
+    });
+    expect(tabId).not.toBeNull();
+    expect(result.current).toBe(false);
+
+    act(() => {
+      store.closeTab(workspaceKey, tabId ?? "");
+    });
+    expect(result.current).toBe(true);
+  });
+});
diff --git a/packages/app/src/subagents/opens-in-sheet.ts b/packages/app/src/subagents/opens-in-sheet.ts
new file mode 100644
index 0000000000..26432ea039
--- /dev/null
+++ b/packages/app/src/subagents/opens-in-sheet.ts
@@ -0,0 +1,29 @@
+import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
+import type { WorkspaceTabTarget } from "@/workspace-tabs/model";
+import type { SubagentRow } from "./select";
+
+/** The workspace target a subagent row opens. */
+export function subagentRowTarget(row: SubagentRow): WorkspaceTabTarget {
+  return row.kind === "provider"
+    ? { kind: "provider_subagent", parentAgentId: row.parentAgentId, subagentId: row.id }
+    : { kind: "agent", agentId: row.id };
+}
+
+/** Answers, per subagent row, whether opening it in this workspace shows a sheet rather than a tab. */
+export function useSubagentOpensInSheet(
+  workspaceKey: string | null,
+): (row: SubagentRow) => boolean {
+  // The rows render the answer, so this subscribes to what the answer reads: the layout mode and
+  // the workspace's tabs. A subagent already open as a tab reveals that tab instead of a sheet,
+  // and a row rendered while that tab existed must re-render once it closes, or choosing the row
+  // would still close the list it sits in.
+  useWorkspaceLayoutStore((state) => state.layoutMode);
+  useWorkspaceLayoutStore((state) =>
+    workspaceKey ? state.layoutByWorkspace[workspaceKey] : undefined,
+  );
+  return (row) =>
+    workspaceKey !== null &&
+    useWorkspaceLayoutStore
+      .getState()
+      .opensInSheet({ workspaceKey, target: subagentRowTarget(row), intent: "reveal" });
+}
diff --git a/packages/app/src/subagents/track.tsx b/packages/app/src/subagents/track.tsx
index 601030562f..c1834587d2 100644
--- a/packages/app/src/subagents/track.tsx
+++ b/packages/app/src/subagents/track.tsx
@@ -35,6 +35,11 @@ export interface SubagentsTrackProps {
   rows: SubagentRow[];
   onOpenSubagent: (id: string) => void;
   onOpenProviderSubagent: (parentAgentId: string, subagentId: string) => void;
+  /**
+   * Whether opening this row shows it in a sheet. A sheet stacks over the list and uncovers it on
+   * close, so the list stays open; a tab replaces the list's pane, so choosing it ends the list.
+   */
+  opensInSheet: (row: SubagentRow) => boolean;
   onArchiveSubagent: (id: string) => void;
   onArchiveFinished?: () => void;
   archiveFinishedStatus?: ArchiveFinishedStatus;
@@ -63,6 +68,7 @@ export function SubagentsTrack({
   rows,
   onOpenSubagent,
   onOpenProviderSubagent,
+  opensInSheet,
   onArchiveSubagent,
   onArchiveFinished,
   archiveFinishedStatus = IDLE_ARCHIVE_FINISHED_STATUS,
@@ -103,6 +109,7 @@ export function SubagentsTrack({
           serverId={serverId}
           onOpenSubagent={onOpenSubagent}
           onOpenProviderSubagent={onOpenProviderSubagent}
+          opensInSheet={opensInSheet(row)}
           onArchiveSubagent={onArchiveSubagent}
           onDetachSubagent={onDetachSubagent}
         />
@@ -174,6 +181,7 @@ interface SubagentsTrackRowProps {
   row: SubagentRow;
   onOpenSubagent: (id: string) => void;
   onOpenProviderSubagent: (parentAgentId: string, subagentId: string) => void;
+  opensInSheet: boolean;
   onArchiveSubagent: (id: string) => void;
   onDetachSubagent?: (id: string) => void;
 }
@@ -183,6 +191,7 @@ function SubagentsTrackRow({
   row,
   onOpenSubagent,
   onOpenProviderSubagent,
+  opensInSheet,
   onArchiveSubagent,
   onDetachSubagent,
 }: SubagentsTrackRowProps): ReactElement {
@@ -245,6 +254,7 @@ function SubagentsTrackRow({
     <ComposerTrackRow
       accessibilityLabel={displayLabel}
       testID={`subagents-track-row-${row.id}`}
+      closeOnSelect={!opensInSheet}
       onPress={handlePress}
     >
       {renderRow}
diff --git a/packages/app/test-stubs/gorhom-bottom-sheet.ts b/packages/app/test-stubs/gorhom-bottom-sheet.ts
index 5f3e8c7e8f..ee27421efd 100644
--- a/packages/app/test-stubs/gorhom-bottom-sheet.ts
+++ b/packages/app/test-stubs/gorhom-bottom-sheet.ts
@@ -3,6 +3,7 @@
 // to keep the module graph importable.
 const Stub = () => null;
 const PassThrough = ({ children }: { children?: unknown }) => children;
+const sharedValue = (value: unknown) => ({ get: () => value });
 
 export default Stub;
 export const BottomSheetModal = Stub;
@@ -17,10 +18,27 @@ export function useBottomSheetModal(): never {
   throw new Error("Modal stack interactions require the real Gorhom provider in browser E2E tests");
 }
 
+// A sheet host scope only redirects where sheets draw; with no sheet drawn there is nothing to host.
+export function useBottomSheet(): never {
+  throw new Error("useBottomSheet is unavailable in tests");
+}
+export const BottomSheetModalInternalProvider = PassThrough;
+export const INITIAL_CONTAINER_LAYOUT = {
+  height: 0,
+  offset: { top: 0, bottom: 0, left: 0, right: 0 },
+};
+export function useBottomSheetModalInternal() {
+  return {
+    hostName: "stub",
+    containerLayoutState: sharedValue(INITIAL_CONTAINER_LAYOUT),
+    mountSheet: () => undefined,
+    unmountSheet: () => undefined,
+    willUnmountSheet: () => undefined,
+  };
+}
+
 // The app imports the internal layout values to compute the visible sheet body. Browser unit tests
 // never render the native sheet, but Vite still validates this module's export surface.
-const sharedValue = (value: unknown) => ({ get: () => value });
-
 export const KEYBOARD_STATUS = { SHOWN: "SHOWN" };
 export function useBottomSheetInternal() {
   return {
diff --git a/patches/@gorhom+bottom-sheet+5.2.14.patch b/patches/@gorhom+bottom-sheet+5.2.14.patch
new file mode 100644
index 0000000000..f84d46f8fd
--- /dev/null
+++ b/patches/@gorhom+bottom-sheet+5.2.14.patch
@@ -0,0 +1,116 @@
+diff --git a/node_modules/@gorhom/bottom-sheet/lib/commonjs/components/bottomSheetModal/BottomSheetModal.js b/node_modules/@gorhom/bottom-sheet/lib/commonjs/components/bottomSheetModal/BottomSheetModal.js
+index ee51e76..dc1bc17 100644
+--- a/node_modules/@gorhom/bottom-sheet/lib/commonjs/components/bottomSheetModal/BottomSheetModal.js
++++ b/node_modules/@gorhom/bottom-sheet/lib/commonjs/components/bottomSheetModal/BottomSheetModal.js
+@@ -315,7 +315,9 @@ function BottomSheetModalComponent(props, ref) {
+     }
+     currentIndexRef.current = _index;
+     nextIndexRef.current = null;
+-    statusRef.current = _index === -1 ? _constants.MODAL_STATUS.MINIMIZED : _constants.MODAL_STATUS.PRESENTED;
++    if (!(_index === -1 && statusRef.current === _constants.MODAL_STATUS.DISMISSING)) {
++      statusRef.current = _index === -1 ? _constants.MODAL_STATUS.MINIMIZED : _constants.MODAL_STATUS.PRESENTED;
++    }
+     if (_providedOnChange) {
+       _providedOnChange(_index, _position, _type);
+     }
+diff --git a/node_modules/@gorhom/bottom-sheet/lib/commonjs/index.js b/node_modules/@gorhom/bottom-sheet/lib/commonjs/index.js
+index e44ad86..96555ef 100644
+--- a/node_modules/@gorhom/bottom-sheet/lib/commonjs/index.js
++++ b/node_modules/@gorhom/bottom-sheet/lib/commonjs/index.js
+@@ -15,6 +15,7 @@ var _exportNames = {
+   useBottomSheetTimingConfigs: true,
+   useBottomSheetInternal: true,
+   useBottomSheetModalInternal: true,
++  BottomSheetModalInternalProvider: true,
+   useScrollEventsHandlersDefault: true,
+   useGestureEventsHandlersDefault: true,
+   useBottomSheetGestureHandlers: true,
+@@ -220,6 +221,13 @@ var _useBottomSheetSpringConfigs = require("./hooks/useBottomSheetSpringConfigs"
+ var _useBottomSheetTimingConfigs = require("./hooks/useBottomSheetTimingConfigs");
+ var _useBottomSheetInternal = require("./hooks/useBottomSheetInternal");
+ var _useBottomSheetModalInternal = require("./hooks/useBottomSheetModalInternal");
++var _modalInternal = require("./contexts/modal/internal");
++Object.defineProperty(exports, "BottomSheetModalInternalProvider", {
++  enumerable: true,
++  get: function () {
++    return _modalInternal.BottomSheetModalInternalProvider;
++  }
++});
+ var _useScrollEventsHandlersDefault = require("./hooks/useScrollEventsHandlersDefault");
+ var _useGestureEventsHandlersDefault = require("./hooks/useGestureEventsHandlersDefault");
+ var _useBottomSheetGestureHandlers = require("./hooks/useBottomSheetGestureHandlers");
+diff --git a/node_modules/@gorhom/bottom-sheet/lib/module/components/bottomSheetModal/BottomSheetModal.js b/node_modules/@gorhom/bottom-sheet/lib/module/components/bottomSheetModal/BottomSheetModal.js
+index 94fabdb..60ca66a 100644
+--- a/node_modules/@gorhom/bottom-sheet/lib/module/components/bottomSheetModal/BottomSheetModal.js
++++ b/node_modules/@gorhom/bottom-sheet/lib/module/components/bottomSheetModal/BottomSheetModal.js
+@@ -308,7 +308,9 @@ function BottomSheetModalComponent(props, ref) {
+     }
+     currentIndexRef.current = _index;
+     nextIndexRef.current = null;
+-    statusRef.current = _index === -1 ? MODAL_STATUS.MINIMIZED : MODAL_STATUS.PRESENTED;
++    if (!(_index === -1 && statusRef.current === MODAL_STATUS.DISMISSING)) {
++      statusRef.current = _index === -1 ? MODAL_STATUS.MINIMIZED : MODAL_STATUS.PRESENTED;
++    }
+     if (_providedOnChange) {
+       _providedOnChange(_index, _position, _type);
+     }
+diff --git a/node_modules/@gorhom/bottom-sheet/lib/module/index.js b/node_modules/@gorhom/bottom-sheet/lib/module/index.js
+index 8259637..eb057fe 100644
+--- a/node_modules/@gorhom/bottom-sheet/lib/module/index.js
++++ b/node_modules/@gorhom/bottom-sheet/lib/module/index.js
+@@ -14,6 +14,7 @@ export { useBottomSheetSpringConfigs } from './hooks/useBottomSheetSpringConfigs
+ export { useBottomSheetTimingConfigs } from './hooks/useBottomSheetTimingConfigs';
+ export { useBottomSheetInternal } from './hooks/useBottomSheetInternal';
+ export { useBottomSheetModalInternal } from './hooks/useBottomSheetModalInternal';
++export { BottomSheetModalInternalProvider } from './contexts/modal/internal';
+ export { useScrollEventsHandlersDefault } from './hooks/useScrollEventsHandlersDefault';
+ export { useGestureEventsHandlersDefault } from './hooks/useGestureEventsHandlersDefault';
+ export { useBottomSheetGestureHandlers } from './hooks/useBottomSheetGestureHandlers';
+diff --git a/node_modules/@gorhom/bottom-sheet/lib/typescript/index.d.ts b/node_modules/@gorhom/bottom-sheet/lib/typescript/index.d.ts
+index ffc6caa..550f1b3 100644
+--- a/node_modules/@gorhom/bottom-sheet/lib/typescript/index.d.ts
++++ b/node_modules/@gorhom/bottom-sheet/lib/typescript/index.d.ts
+@@ -7,6 +7,8 @@ export { useBottomSheetSpringConfigs } from './hooks/useBottomSheetSpringConfigs
+ export { useBottomSheetTimingConfigs } from './hooks/useBottomSheetTimingConfigs';
+ export { useBottomSheetInternal } from './hooks/useBottomSheetInternal';
+ export { useBottomSheetModalInternal } from './hooks/useBottomSheetModalInternal';
++export { BottomSheetModalInternalProvider } from './contexts/modal/internal';
++export type { BottomSheetModalInternalContextType } from './contexts/modal/internal';
+ export { useScrollEventsHandlersDefault } from './hooks/useScrollEventsHandlersDefault';
+ export { useGestureEventsHandlersDefault } from './hooks/useGestureEventsHandlersDefault';
+ export { useBottomSheetGestureHandlers } from './hooks/useBottomSheetGestureHandlers';
+diff --git a/node_modules/@gorhom/bottom-sheet/src/components/bottomSheetModal/BottomSheetModal.tsx b/node_modules/@gorhom/bottom-sheet/src/components/bottomSheetModal/BottomSheetModal.tsx
+index 2954b3f..7260656 100644
+--- a/node_modules/@gorhom/bottom-sheet/src/components/bottomSheetModal/BottomSheetModal.tsx
++++ b/node_modules/@gorhom/bottom-sheet/src/components/bottomSheetModal/BottomSheetModal.tsx
+@@ -432,8 +432,15 @@ function BottomSheetModalComponent<T = never>(
+       currentIndexRef.current = _index;
+       nextIndexRef.current = null;
+ 
+-      statusRef.current =
+-        _index === -1 ? MODAL_STATUS.MINIMIZED : MODAL_STATUS.PRESENTED;
++      // A sheet that is dismissing (dismiss(), or unmounting while presented) keeps that status,
++      // so `onClose` lands on DISMISSED and unmounts it; MINIMIZED would read as a user close,
++      // which with `enableDismissOnClose=false` leaves the portal mounted forever.
++      if (_index === -1 && statusRef.current === MODAL_STATUS.DISMISSING) {
++        // keep dismissing
++      } else {
++        statusRef.current =
++          _index === -1 ? MODAL_STATUS.MINIMIZED : MODAL_STATUS.PRESENTED;
++      }
+ 
+       if (_providedOnChange) {
+         _providedOnChange(_index, _position, _type);
+diff --git a/node_modules/@gorhom/bottom-sheet/src/index.ts b/node_modules/@gorhom/bottom-sheet/src/index.ts
+index 7aaea57..6a5f5a4 100644
+--- a/node_modules/@gorhom/bottom-sheet/src/index.ts
++++ b/node_modules/@gorhom/bottom-sheet/src/index.ts
+@@ -12,6 +12,8 @@ export { useBottomSheetSpringConfigs } from './hooks/useBottomSheetSpringConfigs
+ export { useBottomSheetTimingConfigs } from './hooks/useBottomSheetTimingConfigs';
+ export { useBottomSheetInternal } from './hooks/useBottomSheetInternal';
+ export { useBottomSheetModalInternal } from './hooks/useBottomSheetModalInternal';
++export { BottomSheetModalInternalProvider } from './contexts/modal/internal';
++export type { BottomSheetModalInternalContextType } from './contexts/modal/internal';
+ export { useScrollEventsHandlersDefault } from './hooks/useScrollEventsHandlersDefault';
+ export { useGestureEventsHandlersDefault } from './hooks/useGestureEventsHandlersDefault';
+ export { useBottomSheetGestureHandlers } from './hooks/useBottomSheetGestureHandlers';
diff --git a/scripts/postinstall-patches.mjs b/scripts/postinstall-patches.mjs
index 06d8892c60..3eeafc6371 100644
--- a/scripts/postinstall-patches.mjs
+++ b/scripts/postinstall-patches.mjs
@@ -26,6 +26,14 @@ const patchedPackages = [
     nodeModulesPath: "node_modules/react-native-gesture-handler",
     patchPrefix: "react-native-gesture-handler+",
   },
+  // Exports BottomSheetModalInternalProvider so a subtree can host its own sheets on the shared
+  // modal stack (see packages/app/src/components/ui/isolated-bottom-sheet-modal/host-scope.tsx), and
+  // keeps a dismissing modal's status through its final onChange(-1), so a modal with
+  // enableDismissOnClose=false that unmounts while presented still leaves the portal.
+  {
+    nodeModulesPath: "node_modules/@gorhom/bottom-sheet",
+    patchPrefix: "@gorhom+bottom-sheet+",
+  },
   {
     nodeModulesPath: "node_modules/react-native-svg",
     patchPrefix: "react-native-svg+",

From 8b1ba3ca58820f3158d25885ac3e4ae360bf7f88 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 12:52:09 +0700
Subject: [PATCH 170/270] Lighter landing sections, FAQ last, followed sponsor
 links (#6970)

* feat(website): follow sponsor links and lay landing sections on the page background

* feat(website): keep landing card copy to two lines
---
 .../website/src/components/landing-page.tsx   | 250 +++++++++---------
 .../website/src/components/sponsorship.tsx    |   2 +-
 2 files changed, 127 insertions(+), 125 deletions(-)

diff --git a/packages/website/src/components/landing-page.tsx b/packages/website/src/components/landing-page.tsx
index 79382e64e8..ff0964b751 100644
--- a/packages/website/src/components/landing-page.tsx
+++ b/packages/website/src/components/landing-page.tsx
@@ -132,10 +132,10 @@ export function LandingPage({ title, subtitle }: LandingPageProps) {
             <TurnkeySection />
             <AutomationSection />
             <ExtensibleSection />
-            <FAQ />
-            <PhilosophySection />
             <SponsorsSection placement="page" />
             <SponsorSection />
+            <PhilosophySection />
+            <FAQ />
           </div>
         </main>
         <SiteFooter sponsors={false} />
@@ -468,46 +468,35 @@ function TurnkeySection() {
       title="Run it anywhere"
       description="Use Paseo locally, from another machine, or with a team"
     >
-      <div className="overflow-hidden rounded-2xl border border-white/10 bg-white/[0.02]">
-        <div className="flex flex-col gap-6 border-b border-white/10 p-6 sm:flex-row sm:items-center sm:justify-between md:p-8">
-          <div className="flex items-start gap-4">
-            <div className="rounded-xl border border-white/10 bg-white/[0.06] p-3 text-muted-foreground">
-              <Monitor className="h-6 w-6" strokeWidth={1.5} />
-            </div>
-            <div className="space-y-0.5">
-              <h3 className="text-xl font-medium text-white/90">Desktop app</h3>
-              <p className="max-w-lg text-sm leading-relaxed text-white/50">
-                The one click experience, download the app and it just works, no server required
-              </p>
-            </div>
-          </div>
-        </div>
-
-        <div className="p-6 md:p-8">
-          <div className="grid gap-4 md:grid-cols-3">
-            <TurnkeyExtensionCard
-              icon={Smartphone}
-              title="Mobile"
-              description="Full client and native, not a WebView"
-              ctaHref="/download"
-              ctaLabel="Download"
-            />
-            <TurnkeyExtensionCard
-              icon={Laptop}
-              title="Remote machines"
-              description="Run Paseo on a home lab, or a cloud machine"
-              ctaHref="/docs#server--cli"
-              ctaLabel="Docs"
-            />
-            <TurnkeyExtensionCard
-              icon={Users}
-              title="Teams and triggers"
-              description="Share access or start work from GitHub, Slack, and Discord"
-              ctaHref="/hub"
-              ctaLabel="Paseo Hub"
-              showIntegrationIcons
-            />
-          </div>
+      <div className="space-y-8">
+        <ProductLead
+          icon={Monitor}
+          title="Desktop app"
+          description="The one click experience, download the app and it just works, no server required"
+        />
+        <div className="grid gap-4 md:grid-cols-3">
+          <TurnkeyExtensionCard
+            icon={Smartphone}
+            title="Mobile"
+            description="Full client and native, not a WebView"
+            ctaHref="/download"
+            ctaLabel="Download"
+          />
+          <TurnkeyExtensionCard
+            icon={Laptop}
+            title="Remote machines"
+            description="Run Paseo on a home lab, or a cloud machine"
+            ctaHref="/docs#server--cli"
+            ctaLabel="Docs"
+          />
+          <TurnkeyExtensionCard
+            icon={Users}
+            title="Teams and triggers"
+            description="Share access or start work from GitHub, Slack, and Discord"
+            ctaHref="/hub"
+            ctaLabel="Paseo Hub"
+            showIntegrationIcons
+          />
         </div>
       </div>
     </FeatureSection>
@@ -530,20 +519,8 @@ function TurnkeyExtensionCard({
   showIntegrationIcons?: boolean;
 }) {
   return (
-    <div className="flex min-h-48 flex-col rounded-xl border border-white/10 bg-white/[0.025] p-5">
-      <div className="mb-5 flex items-center gap-3 text-muted-foreground">
-        <Icon className="h-5 w-5" strokeWidth={1.5} />
-        {showIntegrationIcons ? (
-          <>
-            <GitHubIcon className="h-4 w-4" />
-            <SlackIcon className="h-4 w-4" />
-            <DiscordIcon className="h-4 w-4" />
-          </>
-        ) : null}
-      </div>
-      <h3 className="font-medium text-white/85">{title}</h3>
-      <p className="mt-2 text-sm leading-relaxed text-white/45">{description}</p>
-      <div className="mt-auto pt-5">
+    <FeatureCard icon={Icon} title={title} description={description}>
+      <div className="flex items-center justify-between">
         <a
           href={ctaHref}
           className="inline-flex items-center gap-1.5 rounded-full bg-foreground px-2.5 py-1.5 text-xs text-background transition-colors hover:bg-foreground/90"
@@ -551,7 +528,70 @@ function TurnkeyExtensionCard({
           {ctaLabel}
           <ArrowRight className="h-3.5 w-3.5" />
         </a>
+        {showIntegrationIcons ? INTEGRATION_ICONS : null}
       </div>
+    </FeatureCard>
+  );
+}
+
+const INTEGRATION_ICONS = (
+  <span className="flex items-center gap-2 text-extra-muted-foreground">
+    <GitHubIcon className="h-4 w-4" />
+    <SlackIcon className="h-4 w-4" />
+    <DiscordIcon className="h-4 w-4" />
+  </span>
+);
+
+/** The lead product of a section: an icon tile and title on the page background. */
+function ProductLead({
+  icon: Icon,
+  title,
+  description,
+  actions,
+}: {
+  icon: LucideIcon;
+  title: string;
+  description?: string;
+  actions?: React.ReactNode;
+}) {
+  return (
+    <div className="flex flex-col gap-6 sm:flex-row sm:items-center sm:justify-between">
+      <div className="flex items-center gap-4">
+        <div className="rounded-xl border border-white/10 bg-white/[0.06] p-3 text-muted-foreground">
+          <Icon className="h-6 w-6" strokeWidth={1.5} />
+        </div>
+        <div className="space-y-0.5">
+          <h3 className="text-xl font-medium text-white/90">{title}</h3>
+          {description ? (
+            <p className="text-sm leading-relaxed text-white/50">{description}</p>
+          ) : null}
+        </div>
+      </div>
+      {actions ? <div className="flex shrink-0 items-center gap-3">{actions}</div> : null}
+    </div>
+  );
+}
+
+/** A small card: icon and title on one line, the blurb below, an optional action last. */
+function FeatureCard({
+  icon: Icon,
+  title,
+  description,
+  children,
+}: {
+  icon: LucideIcon;
+  title: string;
+  description: string;
+  children?: React.ReactNode;
+}) {
+  return (
+    <div className="flex flex-col rounded-xl border border-white/10 bg-white/[0.025] p-5">
+      <div className="flex items-center gap-3">
+        <Icon className="h-5 w-5 shrink-0 text-extra-muted-foreground" strokeWidth={1.5} />
+        <h3 className="font-medium text-white/85">{title}</h3>
+      </div>
+      <p className="mt-3 text-sm leading-relaxed text-white/45">{description}</p>
+      {children ? <div className="mt-auto pt-5">{children}</div> : null}
     </div>
   );
 }
@@ -797,41 +837,14 @@ function ExtensibleSection() {
       title="Extend it with plugins"
       description="Add new panels and functionality that work in desktop, web and mobile"
     >
-      <div className="overflow-hidden rounded-2xl border border-white/10 bg-white/[0.02]">
-        <div className="flex flex-col gap-6 border-b border-white/10 p-6 sm:flex-row sm:items-center sm:justify-between md:p-8">
-          <div className="flex items-center gap-4">
-            <div className="rounded-xl border border-white/10 bg-white/[0.06] p-3 text-muted-foreground">
-              <Puzzle className="h-6 w-6" strokeWidth={1.5} />
-            </div>
-            <h3 className="text-xl font-medium text-white/90">Plugins</h3>
-          </div>
-          <div className="flex shrink-0 items-center gap-3">
-            <a
-              href={PLUGINS_BROWSE.href}
-              {...(PLUGINS_BROWSE.external ? { target: "_blank", rel: "noopener noreferrer" } : {})}
-              className="inline-flex items-center gap-1.5 rounded-full bg-foreground px-3 py-1.5 text-xs text-background transition-colors hover:bg-foreground/90"
-            >
-              Browse plugins
-              <ArrowRight className="h-3.5 w-3.5" />
-            </a>
-            <a
-              href="/docs/plugins"
-              className="inline-flex items-center gap-1.5 rounded-full border border-white/12 px-3 py-1.5 text-xs text-white/80 transition-colors hover:bg-white/10"
-            >
-              Plugin docs
-            </a>
-          </div>
+      <div className="space-y-8">
+        <ProductLead icon={Puzzle} title="Plugins" actions={PLUGIN_ACTIONS} />
+        <div className="grid gap-4 md:grid-cols-3">
+          {PLUGIN_CAPABILITIES.map((capability) => (
+            <FeatureCard key={capability.title} {...capability} />
+          ))}
         </div>
-
-        <div className="p-6 md:p-8">
-          <div className="grid gap-4 md:grid-cols-3">
-            {PLUGIN_CAPABILITIES.map((capability) => (
-              <PluginCapabilityCard key={capability.title} {...capability} />
-            ))}
-          </div>
-        </div>
-
-        <div className="flex flex-col gap-3 border-t border-white/10 px-6 py-5 sm:flex-row sm:items-center sm:justify-between md:px-8">
+        <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
           <p className="text-sm text-white/45">Paseo is Apache 2.0.</p>
           <a
             href="https://github.com/getpaseo/paseo"
@@ -853,6 +866,25 @@ const PLUGINS_BROWSE = PLUGINS_LINKED
   ? { href: "/plugins", external: false }
   : { href: "https://paseo.cafe", external: true };
 
+const PLUGIN_ACTIONS = (
+  <>
+    <a
+      href={PLUGINS_BROWSE.href}
+      {...(PLUGINS_BROWSE.external ? { target: "_blank", rel: "noopener noreferrer" } : {})}
+      className="inline-flex items-center gap-1.5 rounded-full bg-foreground px-3 py-1.5 text-xs text-background transition-colors hover:bg-foreground/90"
+    >
+      Browse plugins
+      <ArrowRight className="h-3.5 w-3.5" />
+    </a>
+    <a
+      href="/docs/plugins"
+      className="inline-flex items-center gap-1.5 rounded-full border border-white/12 px-3 py-1.5 text-xs text-white/80 transition-colors hover:bg-white/10"
+    >
+      Plugin docs
+    </a>
+  </>
+);
+
 const PLUGIN_CAPABILITIES: ReadonlyArray<{
   icon: LucideIcon;
   title: string;
@@ -866,36 +898,15 @@ const PLUGIN_CAPABILITIES: ReadonlyArray<{
   {
     icon: Workflow,
     title: "Agent lifecycle",
-    description:
-      "Change configuration, environment, and MCP servers. Answer permissions. Follow up when a turn ends",
+    description: "Change config and MCP servers, answer permissions, and follow up",
   },
   {
     icon: Bot,
     title: "Providers",
-    description: "Add a coding agent as a provider, used the same way as the built-in ones",
+    description: "Add a coding agent as a provider, used like the built-in ones",
   },
 ];
 
-function PluginCapabilityCard({
-  icon: Icon,
-  title,
-  description,
-}: {
-  icon: LucideIcon;
-  title: string;
-  description: string;
-}) {
-  return (
-    <div className="flex flex-col rounded-xl border border-white/10 bg-white/[0.025] p-5">
-      <div className="mb-5 text-muted-foreground">
-        <Icon className="h-5 w-5" strokeWidth={1.5} />
-      </div>
-      <h3 className="font-medium text-white/85">{title}</h3>
-      <p className="mt-2 text-sm leading-relaxed text-white/45">{description}</p>
-    </div>
-  );
-}
-
 const PRINCIPLES: ReadonlyArray<{ icon: LucideIcon; title: string; description: string }> = [
   {
     icon: Lock,
@@ -920,7 +931,7 @@ const PRINCIPLES: ReadonlyArray<{ icon: LucideIcon; title: string; description:
   {
     icon: Blocks,
     title: "Composable",
-    description: "Run agents on your laptop or a server, and connect from any device.",
+    description: "Run agents on a laptop or a server, and connect from any device.",
   },
   {
     icon: Puzzle,
@@ -937,16 +948,7 @@ function PhilosophySection() {
     >
       <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
         {PRINCIPLES.map((principle) => (
-          <div
-            key={principle.title}
-            className="rounded-xl border border-white/10 bg-white/[0.025] p-5"
-          >
-            <div className="flex items-center gap-3">
-              <principle.icon className="h-5 w-5 text-extra-muted-foreground" strokeWidth={1.5} />
-              <h3 className="font-medium text-white/85">{principle.title}</h3>
-            </div>
-            <p className="mt-3 text-sm leading-relaxed text-white/45">{principle.description}</p>
-          </div>
+          <FeatureCard key={principle.title} {...principle} />
         ))}
       </div>
     </FeatureSection>
diff --git a/packages/website/src/components/sponsorship.tsx b/packages/website/src/components/sponsorship.tsx
index 0693f1877b..9d42b1e95d 100644
--- a/packages/website/src/components/sponsorship.tsx
+++ b/packages/website/src/components/sponsorship.tsx
@@ -285,7 +285,7 @@ export function SponsorsSection({ placement }: SponsorsSectionProps) {
             <a
               href={sponsorHref(sponsor, "website")}
               target="_blank"
-              rel="noopener noreferrer sponsored"
+              rel="noopener noreferrer"
               className={`block ${style.link}`}
             >
               <img

From b2ca7dcf03058b2507c2f24dc34c8d99b41a0236 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 08:08:40 +0200
Subject: [PATCH 171/270] Check generated IDs in the daemon upload test (#6810)

* test(server): stop expecting request-derived upload IDs

* test(server): check full uuid shape for upload id

* test(server): format generated upload ID assertion

Retain the contributor correction to the stale request-derived ID expectation while satisfying the repository formatter.

Co-authored-by: hadan8977 <zc-huang23@mails.tsinghua.edu.cn>

---------

Co-authored-by: hadan8977 <zc-huang23@mails.tsinghua.edu.cn>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/server/src/server/daemon-client.e2e.test.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/server/daemon-client.e2e.test.ts b/packages/server/src/server/daemon-client.e2e.test.ts
index 0bc3310b41..b6518d773d 100644
--- a/packages/server/src/server/daemon-client.e2e.test.ts
+++ b/packages/server/src/server/daemon-client.e2e.test.ts
@@ -157,15 +157,19 @@ test("DaemonClient uploads file bytes to daemon temp storage", async () => {
       chunkSize: 5,
     });
 
+    const uploadId = result.file?.id ?? "";
+    expect(uploadId).toMatch(
+      /^upload_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/,
+    );
     expect(result).toEqual({
       requestId: "req-upload-e2e",
       file: {
         type: "uploaded_file",
-        id: "upload_req-upload-e2e",
+        id: uploadId,
         fileName: "notes.txt",
         mimeType: "text/plain",
         size: 11,
-        path: path.join(daemon.paseoHome, "uploads", "upload_req-upload-e2e", "notes.txt"),
+        path: path.join(daemon.paseoHome, "uploads", uploadId, "notes.txt"),
       },
       error: null,
     });

From 4d8bed9ddda9c896cc88cac4c3925622c36b35c0 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 09:13:13 +0200
Subject: [PATCH 172/270] Keep Claude's context meter on the active model
 (#6814)

* fix(claude): keep context meter on the active model

Claude result modelUsage accumulates models across the session. Reading its largest window replaced Haiku capacity with a previous Opus window at turn completion. Select the runtime model entry and retain the seeded limit when that entry is absent or invalid.

* refactor(claude): name context fixture inputs and simplify result usage

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../agent.context-switch.real.e2e.test.ts     |  42 +++++++
 .../claude/agent.context-window.test.ts       | 112 +++++++++++++++++-
 .../server/agent/providers/claude/agent.ts    |  47 ++++----
 3 files changed, 172 insertions(+), 29 deletions(-)
 create mode 100644 packages/server/src/server/agent/providers/claude/agent.context-switch.real.e2e.test.ts

diff --git a/packages/server/src/server/agent/providers/claude/agent.context-switch.real.e2e.test.ts b/packages/server/src/server/agent/providers/claude/agent.context-switch.real.e2e.test.ts
new file mode 100644
index 0000000000..f05a6ee271
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/agent.context-switch.real.e2e.test.ts
@@ -0,0 +1,42 @@
+import pino from "pino";
+import { expect, test } from "vitest";
+import { ClaudeAgentClient } from "./agent.js";
+import { collectSessionTurnEvents } from "../test-utils/session-stream-adapter.js";
+
+// Explicit real-provider test: run separately from the default suite.
+test("uses the active model context window after switching from a 1M model", async () => {
+  const client = new ClaudeAgentClient({ logger: pino({ level: "silent" }) });
+  const session = await client.createSession(
+    { provider: "claude", cwd: process.cwd(), model: "claude-haiku-4-5" },
+    undefined,
+    { persistSession: false },
+  );
+  try {
+    for (const [model, maxTokens] of [
+      ["claude-haiku-4-5", 200_000],
+      ["claude-opus-5-5", 1_000_000],
+      ["claude-haiku-4-5", 200_000],
+    ] as const) {
+      await session.setModel(model);
+      const events = await collectSessionTurnEvents(
+        session,
+        "Reply with exactly: OK. Do not use tools.",
+        { signal: AbortSignal.timeout(90_000) },
+      );
+      expect(events).toContainEqual(
+        expect.objectContaining({
+          type: "usage_updated",
+          usage: expect.objectContaining({ contextWindowMaxTokens: maxTokens }),
+        }),
+      );
+      expect(events).toContainEqual(
+        expect.objectContaining({
+          type: "turn_completed",
+          usage: expect.objectContaining({ contextWindowMaxTokens: maxTokens }),
+        }),
+      );
+    }
+  } finally {
+    await session.close();
+  }
+}, 300_000);
diff --git a/packages/server/src/server/agent/providers/claude/agent.context-window.test.ts b/packages/server/src/server/agent/providers/claude/agent.context-window.test.ts
index 1f0c5bd36c..84f31779e4 100644
--- a/packages/server/src/server/agent/providers/claude/agent.context-window.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.context-window.test.ts
@@ -6,12 +6,28 @@ import type { ClaudeQueryFactory } from "./query.js";
 
 // A query dependency that speaks the same stream interface as Claude Code.
 // Each request repeats init so a second turn exercises runtime-limit retention.
-function contextQuery(runtimeModel: string, reportedLimit: number): ClaudeQueryFactory {
+function contextQuery({
+  runtimeModel,
+  reportedLimit,
+  modelWindowsByTurn,
+}: {
+  runtimeModel: string;
+  reportedLimit: number;
+  modelWindowsByTurn?: Array<Record<string, number>>;
+}): ClaudeQueryFactory {
   return ({ prompt }) => {
     let model = runtimeModel;
+    let turn = 0;
     const messages = (async function* () {
       if (typeof prompt === "string") throw new Error("Expected streaming input");
       for await (const _message of prompt) {
+        const modelWindows = modelWindowsByTurn?.[turn] ?? { [model]: reportedLimit };
+        turn += 1;
+        const usageEntries = Object.entries(modelWindows).map(([id, contextWindow]) => [
+          id,
+          { contextWindow },
+        ]);
+        const modelUsage = Object.fromEntries(usageEntries);
         yield {
           type: "system",
           subtype: "init",
@@ -41,7 +57,7 @@ function contextQuery(runtimeModel: string, reportedLimit: number): ClaudeQueryF
           stop_reason: null,
           total_cost_usd: 0,
           usage: { input_tokens: 249_950, output_tokens: 50, cache_read_input_tokens: 0 },
-          modelUsage: { [model]: { contextWindow: reportedLimit } },
+          modelUsage,
           permission_denials: [],
           uuid: "context-result",
         };
@@ -71,7 +87,7 @@ test.each([
   async ({ selected, runtime, expected }) => {
     const client = new ClaudeAgentClient({
       logger: createTestLogger(),
-      queryFactory: contextQuery(runtime, 800_000),
+      queryFactory: contextQuery({ runtimeModel: runtime, reportedLimit: 800_000 }),
       resolveBinary: async () => process.execPath,
     });
     const session = await client.createSession({
@@ -110,3 +126,93 @@ test.each([
     }
   },
 );
+
+test("completed turns use the active model's window after switching both ways", async () => {
+  const haiku = "claude-haiku-4-5";
+  const opus = "claude-opus-5-5";
+  const client = new ClaudeAgentClient({
+    logger: createTestLogger(),
+    resolveBinary: async () => process.execPath,
+    queryFactory: contextQuery({
+      runtimeModel: haiku,
+      reportedLimit: 200_000,
+      modelWindowsByTurn: [
+        { [haiku]: 200_000 },
+        { [haiku]: 200_000, [opus]: 1_000_000 },
+        { [haiku]: 200_000, [opus]: 1_000_000 },
+      ],
+    }),
+  });
+  const session = await client.createSession({
+    provider: "claude",
+    cwd: process.cwd(),
+    model: haiku,
+  });
+  try {
+    for (const [model, limit] of [
+      [haiku, 200_000],
+      [opus, 1_000_000],
+      [haiku, 200_000],
+    ] as const) {
+      await session.setModel(model);
+      const events = await collectSessionTurnEvents(session, "OK");
+      expect(events).toContainEqual(
+        expect.objectContaining({
+          type: "usage_updated",
+          usage: expect.objectContaining({ contextWindowMaxTokens: limit }),
+        }),
+      );
+      expect(events).toContainEqual(
+        expect.objectContaining({
+          type: "turn_completed",
+          usage: expect.objectContaining({ contextWindowMaxTokens: limit }),
+        }),
+      );
+    }
+  } finally {
+    await session.close();
+  }
+});
+
+test.each([
+  {
+    name: "runtime-reported custom limit",
+    model: "custom-model",
+    windows: { "custom-model": 400_000, "prior-model": 1_000_000 },
+    expected: 400_000,
+  },
+  {
+    name: "missing active model entry",
+    model: "claude-haiku-4-5",
+    windows: { "prior-model": 1_000_000 },
+    expected: 200_000,
+  },
+  {
+    name: "invalid active model limit",
+    model: "claude-haiku-4-5",
+    windows: { "claude-haiku-4-5": -1, "prior-model": 1_000_000 },
+    expected: 200_000,
+  },
+])("preserves $name without using another model's window", async ({ model, windows, expected }) => {
+  const client = new ClaudeAgentClient({
+    logger: createTestLogger(),
+    resolveBinary: async () => process.execPath,
+    queryFactory: contextQuery({
+      runtimeModel: model,
+      reportedLimit: expected,
+      modelWindowsByTurn: [windows],
+    }),
+  });
+  const session = await client.createSession({ provider: "claude", cwd: process.cwd(), model });
+  try {
+    const events = await collectSessionTurnEvents(session, "OK");
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "turn_completed",
+        usage: expect.objectContaining({ contextWindowMaxTokens: expected }),
+      }),
+    );
+  } finally {
+    await session.close();
+  }
+});
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index 8ea12610ea..a8f2143832 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -1829,30 +1829,22 @@ async function resolveClaudeAuth(
   }
 }
 
-function extractContextWindowSize(modelUsage: unknown): number | undefined {
+function extractContextWindowSize(
+  modelUsage: unknown,
+  modelId: string | null | undefined,
+): number | undefined {
   const usageRecord = toObjectRecord(modelUsage);
   if (!usageRecord) {
     return undefined;
   }
 
-  let maxContextWindow: number | undefined;
-  for (const value of Object.values(usageRecord)) {
-    const valueRecord = toObjectRecord(value);
-    if (!valueRecord) {
-      continue;
-    }
-    const contextWindow = valueRecord.contextWindow;
-    if (
-      typeof contextWindow !== "number" ||
-      !Number.isFinite(contextWindow) ||
-      contextWindow <= 0
-    ) {
-      continue;
-    }
-    maxContextWindow = Math.max(maxContextWindow ?? 0, contextWindow);
-  }
-
-  return maxContextWindow;
+  // modelUsage accumulates every model used in the session, including earlier turns
+  // and subagents. Only the active model describes this turn's context capacity.
+  const modelUsageEntry = modelId ? usageRecord[modelId] : undefined;
+  const contextWindow = toObjectRecord(modelUsageEntry)?.contextWindow;
+  return typeof contextWindow === "number" && Number.isFinite(contextWindow) && contextWindow > 0
+    ? contextWindow
+    : undefined;
 }
 
 interface StreamRequestInputUsage {
@@ -2006,8 +1998,8 @@ class ClaudeContextUsageState {
     this.contextWindowMaxTokens = contextWindowMaxTokens;
   }
 
-  recordModelUsage(modelUsage: unknown): number | undefined {
-    const contextWindowMaxTokens = extractContextWindowSize(modelUsage);
+  recordModelUsage(modelUsage: unknown, modelId: string | null | undefined): number | undefined {
+    const contextWindowMaxTokens = extractContextWindowSize(modelUsage, modelId);
     if (contextWindowMaxTokens !== undefined) {
       this.contextWindowMaxTokens = contextWindowMaxTokens;
     }
@@ -2050,7 +2042,10 @@ class ClaudeContextUsageState {
     return this.createUsageUpdatedEvent(usedTokens);
   }
 
-  buildResultUsage(message: SDKResultMessage, modelUsage: unknown): AgentUsage | undefined {
+  buildResultUsage(
+    message: SDKResultMessage,
+    modelId: string | null | undefined,
+  ): AgentUsage | undefined {
     try {
       if (!message.usage) {
         return undefined;
@@ -2062,7 +2057,7 @@ class ClaudeContextUsageState {
         totalCostUsd: message.total_cost_usd,
       };
 
-      const modelContextWindowMaxTokens = this.recordModelUsage(modelUsage ?? message.modelUsage);
+      const modelContextWindowMaxTokens = this.recordModelUsage(message.modelUsage, modelId);
       if (this.contextWindowMaxTokens !== undefined) {
         usage.contextWindowMaxTokens = this.contextWindowMaxTokens;
       } else if (modelContextWindowMaxTokens !== undefined) {
@@ -4696,7 +4691,7 @@ class ClaudeAgentSession implements AgentSession {
     message: Extract<SDKMessage, { type: "result" }>,
     events: AgentStreamEvent[],
   ): void {
-    const usage = this.convertUsage(message, message.modelUsage);
+    const usage = this.convertUsage(message);
     if (message.subtype === "success") {
       events.push(...this.sidechainTracker.finishAll("completed"));
       // Built-in slash commands (e.g. /voice, /usage, "Unknown command: …")
@@ -4878,8 +4873,8 @@ class ClaudeAgentSession implements AgentSession {
     return null;
   }
 
-  private convertUsage(message: SDKResultMessage, modelUsage?: unknown): AgentUsage | undefined {
-    return this.contextUsage.buildResultUsage(message, modelUsage);
+  private convertUsage(message: SDKResultMessage): AgentUsage | undefined {
+    return this.contextUsage.buildResultUsage(message, this.lastRuntimeModel ?? this.config.model);
   }
 
   private handlePermissionRequest: CanUseTool = async (

From 12066431ade05b11bf462394c51fb74d16d39a62 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 14:36:12 +0700
Subject: [PATCH 173/270] feat(website): head the sponsors band with a heart
 and one Sponsors title (#6988)

---
 packages/website/e2e/sponsors.spec.ts         |  2 +-
 .../website/src/components/sponsorship.tsx    | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/website/e2e/sponsors.spec.ts b/packages/website/e2e/sponsors.spec.ts
index 5dc9aae92d..7b42316d54 100644
--- a/packages/website/e2e/sponsors.spec.ts
+++ b/packages/website/e2e/sponsors.spec.ts
@@ -6,7 +6,7 @@ for (const path of PAGES) {
   test(`${path} shows the sponsors and invites the next one`, async ({ page }) => {
     await page.goto(path);
 
-    const sponsors = page.getByRole("region", { name: /^(Sponsors|Sponsored by)$/ });
+    const sponsors = page.getByRole("region", { name: "Sponsors", exact: true });
     await expect(sponsors.getByRole("link", { name: "Hoplite" })).toHaveAttribute(
       "href",
       "https://hoplite.sh/?utm_source=paseo&utm_medium=website&utm_campaign=sponsor",
diff --git a/packages/website/src/components/sponsorship.tsx b/packages/website/src/components/sponsorship.tsx
index 9d42b1e95d..8eb09df4c9 100644
--- a/packages/website/src/components/sponsorship.tsx
+++ b/packages/website/src/components/sponsorship.tsx
@@ -1,4 +1,4 @@
-import { ArrowRight, Check, ExternalLink } from "lucide-react";
+import { ArrowRight, Check, ExternalLink, Heart } from "lucide-react";
 import { BuyMeACoffeeIcon, GitHubIcon, OpenCollectiveIcon } from "~/components/brand-icons";
 import {
   BUY_ME_A_COFFEE_URL,
@@ -243,18 +243,20 @@ export function SponsorSection() {
 
 const SPONSORS_PLACEMENTS = {
   page: {
-    title: "Sponsors",
     section: "space-y-10",
-    heading: "text-3xl font-medium tracking-tight",
+    heading: "gap-2.5 text-3xl font-medium tracking-tight",
+    heart: "size-6",
     link: "",
     logo: "h-14",
     description: "mt-2 text-sm text-white/55",
     button: "h-12 px-5 text-sm",
   },
   footer: {
-    title: "Sponsored by",
     section: "space-y-5 border-t border-white/10 py-8",
-    heading: "text-sm text-extra-muted-foreground",
+    // From sm up the heart hangs in the margin so the word lines up with the
+    // logos below. Phones have too little margin to hang it.
+    heading: "gap-1.5 text-sm text-extra-muted-foreground sm:-ml-[18px]",
+    heart: "size-3",
     link: "opacity-85 transition-opacity hover:opacity-100",
     logo: "h-10",
     description: "mt-1.5 text-xs text-white/45",
@@ -276,8 +278,13 @@ export function SponsorsSection({ placement }: SponsorsSectionProps) {
   const open = openSpotCount();
   return (
     <section aria-labelledby="sponsors-heading" className={style.section}>
-      <h2 id="sponsors-heading" className={style.heading}>
-        {style.title}
+      <h2 id="sponsors-heading" className={`flex items-center ${style.heading}`}>
+        <Heart
+          aria-hidden="true"
+          className={`fill-rose-300/80 text-rose-300/80 ${style.heart}`}
+          strokeWidth={1.5}
+        />
+        Sponsors
       </h2>
       <ul className="flex flex-wrap items-center gap-x-14 gap-y-8">
         {SPONSORS.map((sponsor) => (

From 74282dac123a8d1b987f4af4ec8dbf3716b91699 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 14:55:19 +0700
Subject: [PATCH 174/270] fix(app): return to chat after fullscreen submission
 (#6987)

---
 .../e2e/browser/composer-whitespace.spec.ts   | 24 ++++-----
 .../new-workspace-composer-draft.spec.ts      | 49 +++++++++++++++++++
 packages/app/src/composer/input/input.tsx     |  9 +++-
 3 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/packages/app/e2e/browser/composer-whitespace.spec.ts b/packages/app/e2e/browser/composer-whitespace.spec.ts
index ca8704ed25..8e1a527f0f 100644
--- a/packages/app/e2e/browser/composer-whitespace.spec.ts
+++ b/packages/app/e2e/browser/composer-whitespace.spec.ts
@@ -170,7 +170,8 @@ test("composer growth keeps a bottom-pinned chat at the bottom", async ({ page }
 async function pausePageClock(page: Page): Promise<void> {
   const now = Date.now();
   await page.clock.install({ time: now });
-  await page.clock.pauseAt(now);
+  // The installed clock advances between protocol calls; pause at a future time.
+  await page.clock.pauseAt(now + 60_000);
 }
 
 /** The send error shares the footer with Send, so whatever keeps Send visible keeps it visible. */
@@ -206,7 +207,7 @@ test("compact long drafts stop growing before the header", async ({ page }) => {
   }
 });
 
-test("compact fullscreen editing preserves the live draft and selection and stays open after send", async ({
+test("compact fullscreen editing preserves the live draft and selection and returns to chat after send", async ({
   page,
 }) => {
   const agent = await seedMockAgentWorkspace({
@@ -260,7 +261,7 @@ test("compact fullscreen editing preserves the live draft and selection and stay
       await sendComposerWithButton(page);
       await expect(composerLocator(page)).toHaveValue("");
     });
-    await test.step("sending inside fullscreen clears the editor and keeps fullscreen open", async () => {
+    await test.step("sending inside fullscreen returns to chat and clears the editor", async () => {
       await writeCompactDraft(page, "First line\nSecond line\nThird line");
       await enterComposerFullscreen(page);
       await writeCompactDraft(page, "Short draft");
@@ -274,10 +275,12 @@ test("compact fullscreen editing preserves the live draft and selection and stay
       await resizeComposerViewport(page, "portrait");
       await sendComposerWithButton(page);
       await expect(composerLocator(page)).toHaveValue("");
-      await expectComposerFullscreenControls(page);
-      await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeDisabled();
+      await expectWorkspaceHeaderVisible(page);
+      await expect(page.getByTestId("composer-fullscreen")).toHaveCount(0);
     });
     await test.step("typing and sending keep working after leaving fullscreen again", async () => {
+      await writeCompactDraft(page, "First line\nSecond line\nThird line");
+      await enterComposerFullscreen(page);
       await writeCompactDraft(page, "Typed inside fullscreen");
       await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeEnabled();
       await exitComposerFullscreen(page);
@@ -339,16 +342,16 @@ test("fullscreen submit rejection retains the editable draft and supports retry"
     await writeCompactDraft(page, draft);
     await enterComposerFullscreen(page);
     await sendComposerWithButton(page);
-    await expect(page.getByTestId("composer-fullscreen").getByRole("alert")).toHaveText(
-      "Requested mock prompt rejection",
-    );
+    await expectWorkspaceHeaderVisible(page);
+    await expect(page.getByRole("alert")).toHaveText("Requested mock prompt rejection");
+    await enterComposerFullscreen(page);
     await expectFullscreenErrorAboveSend(page);
     await expect(composerLocator(page)).toHaveValue(draft);
     await expect(composerLocator(page)).toBeEditable();
     await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeEnabled();
     await sendComposerWithButton(page);
     await expect(composerLocator(page)).toHaveValue("");
-    await expectComposerFullscreenControls(page);
+    await expectWorkspaceHeaderVisible(page);
   } finally {
     await agent.cleanup();
   }
@@ -440,8 +443,7 @@ test("fullscreen Send keeps the configured queue behavior while an agent runs",
     await expectComposerFullscreenControls(page);
     await queueComposerWithButton(page);
     await expect(composerLocator(page)).toHaveValue("");
-    await expectComposerFullscreenControls(page);
-    await exitComposerFullscreen(page);
+    await expectWorkspaceHeaderVisible(page);
     await expectQueuedMessageButton(page);
   } finally {
     await agent.cleanup();
diff --git a/packages/app/e2e/browser/new-workspace-composer-draft.spec.ts b/packages/app/e2e/browser/new-workspace-composer-draft.spec.ts
index e7dbde3bd9..906efcfb42 100644
--- a/packages/app/e2e/browser/new-workspace-composer-draft.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-composer-draft.spec.ts
@@ -1,7 +1,14 @@
+import {
+  composerLocator,
+  enterComposerFullscreen,
+  exitComposerFullscreen,
+  resizeComposerViewport,
+} from "../support/helpers/composer";
 import { expect, test } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { getE2EDaemonPort } from "../support/helpers/daemon-port";
 import {
+  delayBrowserWorkspaceCreatedResponse,
   expectNewWorkspaceDraft,
   expectNewWorkspaceProjectSelected,
   fillNewWorkspaceDraft,
@@ -134,3 +141,45 @@ test.describe("New workspace composer draft", () => {
     }
   });
 });
+
+test("fullscreen creation returns inline and keeps submission locked when reopened", async ({
+  page,
+}) => {
+  const project = await seedWorkspace({ repoPrefix: "fullscreen-submit-pending-" });
+  const delay = await delayBrowserWorkspaceCreatedResponse(page);
+  try {
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    await openNewWorkspaceComposer(page, project);
+    await resizeComposerViewport(page, "portrait");
+    await fillNewWorkspaceDraft(page, DRAFT);
+    await enterComposerFullscreen(page);
+    await page.getByRole("button", { name: "Create", exact: true }).click();
+    await delay.waitForCreateRequest();
+
+    await test.step("submission returns inline with the original draft and spinner", async () => {
+      await expect(page.getByTestId("composer-fullscreen")).toHaveCount(0);
+      await expect(composerLocator(page)).toHaveValue(DRAFT);
+      await expect(composerLocator(page)).not.toBeEditable();
+      await expect(page.getByRole("button", { name: "Create", exact: true })).toBeDisabled();
+      await expect(page.getByRole("progressbar")).toBeVisible();
+    });
+    await test.step("fullscreen can reopen while pending without unlocking or duplicating submission", async () => {
+      await enterComposerFullscreen(page);
+      await expect(page.getByTestId("composer-fullscreen")).toBeVisible();
+      await expect(composerLocator(page)).toHaveValue(DRAFT);
+      await expect(composerLocator(page)).not.toBeEditable();
+      await expect(page.getByRole("button", { name: "Create", exact: true })).toBeDisabled();
+      await expect(page.getByRole("progressbar")).toBeVisible();
+      await exitComposerFullscreen(page);
+    });
+    delay.release();
+    await page.waitForURL((url) => url.pathname.includes("/workspace/"));
+    await expect(composerLocator(page)).toHaveValue("");
+    await expect(composerLocator(page)).toBeEditable();
+    expect(delay.agentRequests).toHaveLength(1);
+  } finally {
+    delay.release();
+    await project.cleanup();
+  }
+});
diff --git a/packages/app/src/composer/input/input.tsx b/packages/app/src/composer/input/input.tsx
index 01051bd52c..7346095d5b 100644
--- a/packages/app/src/composer/input/input.tsx
+++ b/packages/app/src/composer/input/input.tsx
@@ -942,6 +942,7 @@ interface SendMessageContext {
   onSubmit: (payload: MessagePayload) => void;
   onMinimizeHeight: () => void;
   preserveHeightOnSubmit: boolean;
+  exitFullscreen: () => void;
 }
 
 function sendMessageImpl(ctx: SendMessageContext): void {
@@ -954,6 +955,7 @@ function sendMessageImpl(ctx: SendMessageContext): void {
   ) {
     return;
   }
+  ctx.exitFullscreen();
   ctx.onSubmit({
     text: trimmed,
     attachments: ctx.attachments,
@@ -974,12 +976,14 @@ interface QueueMessageContext {
   onQueue: ((payload: MessagePayload) => void) | undefined;
   replaceText: (text: string) => void;
   onMinimizeHeight: () => void;
+  exitFullscreen: () => void;
 }
 
 function queueMessageImpl(ctx: QueueMessageContext): void {
   if (!ctx.onQueue) return;
   const trimmed = ctx.value.trim();
   if (!trimmed && ctx.attachments.length === 0) return;
+  ctx.exitFullscreen();
   ctx.onQueue({ text: trimmed, attachments: ctx.attachments, cwd: ctx.cwd });
   ctx.replaceText("");
   ctx.onMinimizeHeight();
@@ -1640,6 +1644,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         onSubmit,
         onMinimizeHeight: minimizeInputHeight,
         preserveHeightOnSubmit,
+        exitFullscreen,
       });
     }, [
       allowEmptySubmit,
@@ -1651,6 +1656,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       minimizeInputHeight,
       preserveHeightOnSubmit,
       updateLiveTextPresence,
+      exitFullscreen,
     ]);
 
     const handleQueueMessage = useCallback(
@@ -1662,8 +1668,9 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
           onQueue,
           replaceText,
           onMinimizeHeight: minimizeInputHeight,
+          exitFullscreen,
         }),
-      [attachments, cwd, onQueue, replaceText, minimizeInputHeight],
+      [attachments, cwd, onQueue, replaceText, minimizeInputHeight, exitFullscreen],
     );
 
     const handleDefaultSendAction = useCallback(() => {

From a96c89230244c2faa4c9e6ce352381658361dd80 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 15:04:10 +0700
Subject: [PATCH 175/270] fix(website): start the sponsors band heart at the
 column edge (#6993)

---
 packages/website/src/components/sponsorship.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/website/src/components/sponsorship.tsx b/packages/website/src/components/sponsorship.tsx
index 8eb09df4c9..d82645a998 100644
--- a/packages/website/src/components/sponsorship.tsx
+++ b/packages/website/src/components/sponsorship.tsx
@@ -253,9 +253,7 @@ const SPONSORS_PLACEMENTS = {
   },
   footer: {
     section: "space-y-5 border-t border-white/10 py-8",
-    // From sm up the heart hangs in the margin so the word lines up with the
-    // logos below. Phones have too little margin to hang it.
-    heading: "gap-1.5 text-sm text-extra-muted-foreground sm:-ml-[18px]",
+    heading: "gap-1.5 text-sm text-extra-muted-foreground",
     heart: "size-3",
     link: "opacity-85 transition-opacity hover:opacity-100",
     logo: "h-10",

From 0ed57187a9b4b77fc5e8a568a80bc29f4ffa4322 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 10:10:54 +0200
Subject: [PATCH 176/270] Keep fork owners in Gitea and Forgejo checkout names
 (#6829)

* fix(gitea): prefix fork PR branches with the owner

Two forks with the same branch name (say patch-1) ended up on the same
local branch. The gitea service had no buildPrLocalBranchName or
defaultCheckoutRefs, github has both.

getPullRequestCheckoutTarget also fell back to refs/heads/<name> on
origin for fork PRs. Thats the base repo's branch, not the fork's, so
a failed refs/pull fetch checked out the wrong branch without an error.

fixes #3515

* refactor(forge): share fork branch naming with github

moved the owner normalizer and the branch name builder to
utils/change-request-checkout.ts, gitea and github both use it.

github changes a bit: a fork PR with an unknown or unusable owner (eg
deleted fork) now gets pr-N/<branch> instead of the bare branch name,
which could collide with a local branch the same way #3515 did.

* fix(gitea): PRs from a deleted fork are still cross repo

the API drops head.repo once the fork is gone, we read that as a same
repo PR and fetched refs/heads/<name> from origin

* fix(gitea): handle AGit PRs and deleted head branches

neither has a branch on origin. forgejo reports refs/pull/N/head as
head.ref for both, so skip the refs/heads fallback and dont track
origin.

also try refs/pull/N/head on upstream for clones where origin is your
fork, like github does. that list lives in the shared util now.

* test: resolver harness uses the real branch helper

plus deleted forks and same repo PRs without an origin branch

* fix(gitea): collapse pull-ref-only heads to pr-N in local branch names

buildForkLocalBranchName still used the raw headRef even when it was
just the pull ref (refs/pull/N/head), which agit prs and deleted head
branches report as their headRefName. that gave local branches literal
names like refs/heads/refs/pull/3/head.

* fix(gitea): surface hasHeadBranch on the pr checkout target

resolveForkCheckoutFacts already knew whether a pr had a real head
branch (agit flow, or head.ref == the pull ref both mean no). now that
signal reaches buildPrLocalBranchName so worktree names and local
branches stop being named after the raw pull ref.

covers same-repo, fork with owner known, and deleted fork all with no
real head branch. added an end to end gitea-service test plus resolver
cases since the worktree slug follows localBranchName too.

* refactor(forge): one head ref kind on the checkout target

hasOriginHeadBranch and hasHeadBranch could describe contradictory
states (cross-repo checkout claiming an origin head branch). collapse
both into headRefKind: "branch" | "pull-ref" and derive origin
tracking in the resolver instead of storing it separately.

Co-authored-by: Alexander Adam <alexander.adam@vade.io>

* fix(worktrees): avoid branch namespace conflicts in fork checkouts

Fork owner prefixes can name an existing branch as a parent, which Git rejects even when the full proposed name is unused. Allocate names against parent and child refs, suffixing the conflicting segment while preserving existing branches and fetched commits.

* test(worktrees): make fork fixture line endings deterministic

Windows Git converts the fixture checkout to CRLF when core.autocrlf is enabled. Set the repository fixture to preserve its written LF bytes so the content assertion checks the fetched patch on every platform. Reproduced the failure locally with inherited core.autocrlf=true and verified the corrected setup against that same configuration.

---------

Co-authored-by: Alexander Adam <alexander.adam@vade.io>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../resolve-worktree-creation-intent.test.ts  | 155 +++++++++++++-
 .../resolve-worktree-creation-intent.ts       |   3 +-
 packages/server/src/services/forge-service.ts |  10 +-
 .../server/src/services/gitea-service.test.ts | 202 +++++++++++++++++-
 packages/server/src/services/gitea-service.ts |  61 +++++-
 .../src/services/github-service.test.ts       |   1 +
 .../server/src/services/github-service.ts     |  20 +-
 .../src/services/gitlab-service.test.ts       |   1 +
 .../server/src/services/gitlab-service.ts     |   1 +
 .../src/utils/change-request-checkout.test.ts |  89 ++++++++
 .../src/utils/change-request-checkout.ts      |  47 ++++
 packages/server/src/utils/worktree.test.ts    |  59 +++++
 packages/server/src/utils/worktree.ts         |  27 ++-
 13 files changed, 633 insertions(+), 43 deletions(-)
 create mode 100644 packages/server/src/utils/change-request-checkout.test.ts
 create mode 100644 packages/server/src/utils/change-request-checkout.ts

diff --git a/packages/server/src/server/resolve-worktree-creation-intent.test.ts b/packages/server/src/server/resolve-worktree-creation-intent.test.ts
index 82895e302b..8d44b9ba80 100644
--- a/packages/server/src/server/resolve-worktree-creation-intent.test.ts
+++ b/packages/server/src/server/resolve-worktree-creation-intent.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, test } from "vitest";
 
 import type { ForgeService } from "../services/forge-service.js";
+import { buildForkLocalBranchName } from "../utils/change-request-checkout.js";
 import {
   CheckoutSourceForgeMismatchError,
   MissingCheckoutTargetError,
@@ -32,14 +33,8 @@ function createResolverHarness(overrides?: {
           defaultCheckoutRefs: ({ changeRequestNumber }) => [
             { remoteName: "origin", remoteRef: `refs/pull/${changeRequestNumber}/head` },
           ],
-          buildPrLocalBranchName: ({ headRef, checkoutTarget }) => {
-            const normalized = checkoutTarget.headOwnerLogin?.trim().toLowerCase() ?? "";
-            const owner =
-              checkoutTarget.isCrossRepository && /^[a-z0-9-]+$/.test(normalized)
-                ? normalized
-                : null;
-            return owner ? `${owner}/${headRef}` : headRef;
-          },
+          buildPrLocalBranchName: ({ headRef, checkoutTarget }) =>
+            buildForkLocalBranchName({ headRef, ...checkoutTarget }),
           supportsCrossRepoCheckoutWithoutRefs: true,
         }
       : {};
@@ -182,6 +177,28 @@ describe("resolveWorktreeCreationIntent", () => {
     expect(deps.headRefLookups).toEqual([]);
   });
 
+  test("does not track origin for a same-repo head with no origin branch", async () => {
+    const deps = createResolverHarness();
+    deps.forgeService.getPullRequestCheckoutTarget = async () => ({
+      number: 42,
+      baseRefName: "main",
+      headRefName: "ford/towel",
+      headOwnerLogin: null,
+      headRepositorySshUrl: null,
+      headRepositoryUrl: null,
+      isCrossRepository: false,
+      headRefKind: "pull-ref",
+    });
+
+    const intent = await resolveWorktreeCreationIntent(
+      { action: "checkout", githubPrNumber: 42 },
+      repoRoot,
+      deps,
+    );
+
+    expect(intent).not.toHaveProperty("trackOriginHead");
+  });
+
   test("configures the contributor remote for fork PR targets", async () => {
     const deps = createResolverHarness();
     deps.forgeService.getPullRequestCheckoutTarget = async () => ({
@@ -211,6 +228,29 @@ describe("resolveWorktreeCreationIntent", () => {
     expect(deps.headRefLookups).toEqual([]);
   });
 
+  test("prefixes the pr number when the fork was deleted", async () => {
+    const deps = createResolverHarness();
+    deps.forgeService.getPullRequestCheckoutTarget = async () => ({
+      number: 42,
+      baseRefName: "main",
+      headRefName: "towel",
+      headOwnerLogin: null,
+      headRepositorySshUrl: null,
+      headRepositoryUrl: null,
+      isCrossRepository: true,
+    });
+
+    const intent = await resolveWorktreeCreationIntent(
+      { action: "checkout", githubPrNumber: 42 },
+      repoRoot,
+      deps,
+    );
+
+    expect(intent).toMatchObject({ headRef: "towel", localBranchName: "pr-42/towel" });
+    expect(intent).not.toHaveProperty("pushRemoteUrl");
+    expect(intent).not.toHaveProperty("trackOriginHead");
+  });
+
   test("uses an explicit PR head ref without calling GitHub", async () => {
     const deps = createResolverHarness();
 
@@ -293,6 +333,105 @@ describe("resolveWorktreeCreationIntent", () => {
     expect(deps.headRefLookups).toEqual([]);
   });
 
+  test("names the local branch pr-<number> for a gitea pull-ref-only head", async () => {
+    const deps = createResolverHarness({
+      forge: "gitea",
+      forgeService: {
+        defaultCheckoutRefs: ({ changeRequestNumber }) => [
+          { remoteName: "origin", remoteRef: `refs/pull/${changeRequestNumber}/head` },
+          { remoteName: "upstream", remoteRef: `refs/pull/${changeRequestNumber}/head` },
+        ],
+        buildPrLocalBranchName: ({ headRef, checkoutTarget }) =>
+          buildForkLocalBranchName({ headRef, ...checkoutTarget }),
+        getPullRequestCheckoutTarget: async ({ number }) => ({
+          number,
+          baseRefName: "main",
+          headRefName: `refs/pull/${number}/head`,
+          headOwnerLogin: null,
+          headRepositorySshUrl: null,
+          headRepositoryUrl: null,
+          isCrossRepository: false,
+          headRefKind: "pull-ref",
+        }),
+      },
+    });
+
+    const intent = await resolveWorktreeCreationIntent(
+      { action: "checkout", checkoutSource: { kind: "change_request", number: 3 } },
+      repoRoot,
+      deps,
+    );
+
+    expect(intent).toMatchObject({ localBranchName: "pr-3" });
+    expect(intent).not.toHaveProperty("trackOriginHead");
+  });
+
+  test("names the local branch owner/pr-<number> for a gitea fork pull-ref-only head", async () => {
+    const deps = createResolverHarness({
+      forge: "gitea",
+      forgeService: {
+        defaultCheckoutRefs: ({ changeRequestNumber }) => [
+          { remoteName: "origin", remoteRef: `refs/pull/${changeRequestNumber}/head` },
+          { remoteName: "upstream", remoteRef: `refs/pull/${changeRequestNumber}/head` },
+        ],
+        buildPrLocalBranchName: ({ headRef, checkoutTarget }) =>
+          buildForkLocalBranchName({ headRef, ...checkoutTarget }),
+        supportsCrossRepoCheckoutWithoutRefs: true,
+        getPullRequestCheckoutTarget: async ({ number }) => ({
+          number,
+          baseRefName: "main",
+          headRefName: `refs/pull/${number}/head`,
+          headOwnerLogin: "contributor",
+          headRepositorySshUrl: "git@gitea.test:contributor/repo.git",
+          headRepositoryUrl: "https://gitea.test/contributor/repo",
+          isCrossRepository: true,
+          headRefKind: "pull-ref",
+        }),
+      },
+    });
+
+    const intent = await resolveWorktreeCreationIntent(
+      { action: "checkout", checkoutSource: { kind: "change_request", number: 3 } },
+      repoRoot,
+      deps,
+    );
+
+    expect(intent).toMatchObject({ localBranchName: "contributor/pr-3" });
+  });
+
+  test("does not double the pr number for a gitea deleted fork's pull-ref-only head", async () => {
+    const deps = createResolverHarness({
+      forge: "gitea",
+      forgeService: {
+        defaultCheckoutRefs: ({ changeRequestNumber }) => [
+          { remoteName: "origin", remoteRef: `refs/pull/${changeRequestNumber}/head` },
+          { remoteName: "upstream", remoteRef: `refs/pull/${changeRequestNumber}/head` },
+        ],
+        buildPrLocalBranchName: ({ headRef, checkoutTarget }) =>
+          buildForkLocalBranchName({ headRef, ...checkoutTarget }),
+        supportsCrossRepoCheckoutWithoutRefs: true,
+        getPullRequestCheckoutTarget: async ({ number }) => ({
+          number,
+          baseRefName: "main",
+          headRefName: `refs/pull/${number}/head`,
+          headOwnerLogin: null,
+          headRepositorySshUrl: null,
+          headRepositoryUrl: null,
+          isCrossRepository: true,
+          headRefKind: "pull-ref",
+        }),
+      },
+    });
+
+    const intent = await resolveWorktreeCreationIntent(
+      { action: "checkout", checkoutSource: { kind: "change_request", number: 3 } },
+      repoRoot,
+      deps,
+    );
+
+    expect(intent).toMatchObject({ localBranchName: "pr-3" });
+  });
+
   test("reports unsupported cross-repository checkout targets without a checkout ref", async () => {
     const deps = createResolverHarness({
       forge: "gitea",
diff --git a/packages/server/src/server/resolve-worktree-creation-intent.ts b/packages/server/src/server/resolve-worktree-creation-intent.ts
index 73403f5908..5eddc0ef7b 100644
--- a/packages/server/src/server/resolve-worktree-creation-intent.ts
+++ b/packages/server/src/server/resolve-worktree-creation-intent.ts
@@ -191,7 +191,8 @@ async function resolvePrCheckoutIntent(
   }) ?? [{ remoteName: "origin", remoteRef: `refs/heads/${headRef}` }];
   const localBranchName = service.buildPrLocalBranchName?.({ headRef, checkoutTarget });
   const crossRepository = resolveCrossRepositoryFields(checkoutTarget);
-  const trackOriginHead = !checkoutTarget.isCrossRepository;
+  const trackOriginHead =
+    !checkoutTarget.isCrossRepository && checkoutTarget.headRefKind !== "pull-ref";
 
   return {
     kind: "checkout-change-request",
diff --git a/packages/server/src/services/forge-service.ts b/packages/server/src/services/forge-service.ts
index fba9833cd8..8499cc8756 100644
--- a/packages/server/src/services/forge-service.ts
+++ b/packages/server/src/services/forge-service.ts
@@ -39,6 +39,8 @@ export interface PullRequestCheckoutTarget {
   headRepositorySshUrl: string | null;
   headRepositoryUrl: string | null;
   isCrossRepository: boolean;
+  /** "pull-ref" when headRefName is a synthetic pull ref, not a real branch name (agit PRs, deleted branches); undefined means "branch" */
+  headRefKind?: "branch" | "pull-ref";
 }
 
 export interface PullRequestCheckoutRef {
@@ -441,9 +443,9 @@ export interface ForgeService {
   getPullRequestCheckoutTarget(options: GetPullRequestOptions): Promise<PullRequestCheckoutTarget>;
   /**
    * Refs to fetch for a change-request checkout when the resolved checkout
-   * target carries none. Adapters that expose a universal change-request head
-   * ref (GitHub's refs/pull/N/head) return it here; others let the shell fall
-   * back to the head branch.
+   * target carries none. Adapters with a universal change-request head ref
+   * (refs/pull/N/head) return it here; others let the shell fall back to the
+   * head branch.
    */
   defaultCheckoutRefs?(params: {
     changeRequestNumber: number;
@@ -451,7 +453,7 @@ export interface ForgeService {
   }): PullRequestCheckoutRef[];
   /**
    * Local branch name for a checked-out change request when the adapter
-   * disambiguates cross-repository heads (GitHub prefixes the fork owner).
+   * disambiguates cross-repository heads (prefixes the fork owner).
    * Returns undefined to keep the head ref name as-is.
    */
   buildPrLocalBranchName?(params: {
diff --git a/packages/server/src/services/gitea-service.test.ts b/packages/server/src/services/gitea-service.test.ts
index 768f1a7f05..9e3a3ecc62 100644
--- a/packages/server/src/services/gitea-service.test.ts
+++ b/packages/server/src/services/gitea-service.test.ts
@@ -2297,11 +2297,13 @@ describe("createGiteaService", () => {
       checkoutRefs: [
         { remoteName: "origin", remoteRef: "refs/pull/5/head" },
         { remoteName: "origin", remoteRef: "refs/heads/feat/sample-change" },
+        { remoteName: "upstream", remoteRef: "refs/pull/5/head" },
       ],
       headOwnerLogin: null,
       headRepositorySshUrl: null,
       headRepositoryUrl: null,
       isCrossRepository: false,
+      headRefKind: "branch",
     });
   });
 
@@ -2332,17 +2334,215 @@ describe("createGiteaService", () => {
       headRefName: "feat/sample-change",
       checkoutRefs: [
         { remoteName: "origin", remoteRef: "refs/pull/5/head" },
-        { remoteName: "origin", remoteRef: "refs/heads/feat/sample-change" },
+        { remoteName: "upstream", remoteRef: "refs/pull/5/head" },
       ],
       headOwnerLogin: "contributor",
       headRepositorySshUrl: "git@gitea.com:contributor/sample-repo.git",
       headRepositoryUrl: "https://gitea.com/contributor/sample-repo",
       isCrossRepository: true,
+      headRefKind: "branch",
     });
 
     expect(calls).toContainEqual(["api", "repos/example-user/sample-repo/pulls/5"]);
   });
 
+  it("skips the origin branch fallback and tracking for an AGit pull request", async () => {
+    const { service } = makeService((args) =>
+      args[0] === "api"
+        ? ok(
+            JSON.stringify({
+              flow: 1,
+              head: { ref: "refs/pull/5/head", repo: { id: 1 } },
+              base: { repo: { id: 1 } },
+            }),
+          )
+        : ok(JSON.stringify(STATUS_PR_VIEW)),
+    );
+
+    const target = await service.getPullRequestCheckoutTarget({ cwd: "/repo", number: 5 });
+
+    expect(target).toMatchObject({
+      checkoutRefs: [
+        { remoteName: "origin", remoteRef: "refs/pull/5/head" },
+        { remoteName: "upstream", remoteRef: "refs/pull/5/head" },
+      ],
+      isCrossRepository: false,
+      headRefKind: "pull-ref",
+    });
+  });
+
+  it("names the local branch pr-<number> end to end for an agit pull request", async () => {
+    // the tea CLI reports head as the raw pull ref too when there's no real
+    // branch, same as the Forgejo API's head.ref
+    const { service } = makeService((args) =>
+      args[0] === "api"
+        ? ok(
+            JSON.stringify({
+              flow: 1,
+              head: { ref: "refs/pull/5/head", repo: { id: 1 } },
+              base: { repo: { id: 1 } },
+            }),
+          )
+        : ok(JSON.stringify({ ...STATUS_PR_VIEW, head: "refs/pull/5/head" })),
+    );
+
+    const target = await service.getPullRequestCheckoutTarget({ cwd: "/repo", number: 5 });
+    const localBranchName = service.buildPrLocalBranchName?.({
+      headRef: target.headRefName,
+      checkoutTarget: target,
+    });
+
+    expect(localBranchName).toBe("pr-5");
+  });
+
+  it("skips the origin branch fallback when the head branch was deleted", async () => {
+    const { service } = makeService((args) =>
+      args[0] === "api"
+        ? ok(
+            JSON.stringify({
+              head: { ref: "refs/pull/5/head", repo: { id: 1 } },
+              base: { repo: { id: 1 } },
+            }),
+          )
+        : ok(JSON.stringify(STATUS_PR_VIEW)),
+    );
+
+    const target = await service.getPullRequestCheckoutTarget({ cwd: "/repo", number: 5 });
+
+    expect(target).toMatchObject({
+      checkoutRefs: [
+        { remoteName: "origin", remoteRef: "refs/pull/5/head" },
+        { remoteName: "upstream", remoteRef: "refs/pull/5/head" },
+      ],
+      isCrossRepository: false,
+      headRefKind: "pull-ref",
+    });
+  });
+
+  it("keeps a pull request from a deleted fork cross-repository", async () => {
+    const { service } = makeService((args) =>
+      args[0] === "api"
+        ? ok(JSON.stringify({ head: { repo: null }, base: { repo: { id: 1 } } }))
+        : ok(JSON.stringify(STATUS_PR_VIEW)),
+    );
+
+    const target = await service.getPullRequestCheckoutTarget({ cwd: "/repo", number: 5 });
+
+    expect(target).toMatchObject({
+      checkoutRefs: [
+        { remoteName: "origin", remoteRef: "refs/pull/5/head" },
+        { remoteName: "upstream", remoteRef: "refs/pull/5/head" },
+      ],
+      headOwnerLogin: null,
+      isCrossRepository: true,
+      headRefKind: "branch",
+    });
+  });
+
+  it("keeps the origin branch fallback when the server sends no head ref", async () => {
+    const { service } = makeService((args) =>
+      args[0] === "api"
+        ? ok(JSON.stringify({ head: { repo: { id: 1 } }, base: { repo: { id: 1 } } }))
+        : ok(JSON.stringify(STATUS_PR_VIEW)),
+    );
+
+    const target = await service.getPullRequestCheckoutTarget({ cwd: "/repo", number: 5 });
+
+    expect(target.checkoutRefs).toContainEqual({
+      remoteName: "origin",
+      remoteRef: "refs/heads/feat/sample-change",
+    });
+    expect(target.headRefKind).toBe("branch");
+  });
+
+  it("prefixes the local branch name with the fork owner for a cross-repository checkout", () => {
+    const { service } = makeService(() => ok(""));
+
+    const localBranchName = service.buildPrLocalBranchName?.({
+      headRef: "patch-1",
+      checkoutTarget: {
+        number: 5,
+        baseRefName: "main",
+        headRefName: "patch-1",
+        headOwnerLogin: "contributor",
+        headRepositorySshUrl: null,
+        headRepositoryUrl: null,
+        isCrossRepository: true,
+      },
+    });
+
+    expect(localBranchName).toBe("contributor/patch-1");
+  });
+
+  it("names the local branch pr-<number> for a same-repo pull-ref-only head", () => {
+    const { service } = makeService(() => ok(""));
+
+    const localBranchName = service.buildPrLocalBranchName?.({
+      headRef: "refs/pull/5/head",
+      checkoutTarget: {
+        number: 5,
+        baseRefName: "main",
+        headRefName: "refs/pull/5/head",
+        headOwnerLogin: null,
+        headRepositorySshUrl: null,
+        headRepositoryUrl: null,
+        isCrossRepository: false,
+        headRefKind: "pull-ref",
+      },
+    });
+
+    expect(localBranchName).toBe("pr-5");
+  });
+
+  it("prefixes pr-<number> with the fork owner for a pull-ref-only head", () => {
+    const { service } = makeService(() => ok(""));
+
+    const localBranchName = service.buildPrLocalBranchName?.({
+      headRef: "refs/pull/5/head",
+      checkoutTarget: {
+        number: 5,
+        baseRefName: "main",
+        headRefName: "refs/pull/5/head",
+        headOwnerLogin: "contributor",
+        headRepositorySshUrl: null,
+        headRepositoryUrl: null,
+        isCrossRepository: true,
+        headRefKind: "pull-ref",
+      },
+    });
+
+    expect(localBranchName).toBe("contributor/pr-5");
+  });
+
+  it("does not double the pr number for a deleted fork's pull-ref-only head", () => {
+    const { service } = makeService(() => ok(""));
+
+    const localBranchName = service.buildPrLocalBranchName?.({
+      headRef: "refs/pull/5/head",
+      checkoutTarget: {
+        number: 5,
+        baseRefName: "main",
+        headRefName: "refs/pull/5/head",
+        headOwnerLogin: null,
+        headRepositorySshUrl: null,
+        headRepositoryUrl: null,
+        isCrossRepository: true,
+        headRefKind: "pull-ref",
+      },
+    });
+
+    expect(localBranchName).toBe("pr-5");
+  });
+
+  it("returns the pull head ref for default checkout refs", () => {
+    const { service } = makeService(() => ok(""));
+
+    expect(service.defaultCheckoutRefs?.({ changeRequestNumber: 5, headRef: "patch-1" })).toEqual([
+      { remoteName: "origin", remoteRef: "refs/pull/5/head" },
+      { remoteName: "upstream", remoteRef: "refs/pull/5/head" },
+    ]);
+  });
+
   it("creates a pull request and parses the resulting URL and index", async () => {
     const { service, calls } = makeService((args) => {
       if (args[0] === "pr" && args[1] === "create") {
diff --git a/packages/server/src/services/gitea-service.ts b/packages/server/src/services/gitea-service.ts
index 88b5caa004..892f9cc33a 100644
--- a/packages/server/src/services/gitea-service.ts
+++ b/packages/server/src/services/gitea-service.ts
@@ -5,6 +5,10 @@ import pLimit from "p-limit";
 import { parseGitHubRemoteIdentity, parseGitRemoteLocation } from "@getpaseo/protocol/git-remote";
 import { findExecutable } from "../executable-resolution/executable-resolution.js";
 import { runGitCommand } from "../utils/run-git-command.js";
+import {
+  buildForkLocalBranchName,
+  buildPullHeadCheckoutRefs,
+} from "../utils/change-request-checkout.js";
 import { execCommand } from "../utils/spawn.js";
 import {
   createCachedCliPathResolver,
@@ -75,6 +79,8 @@ const CURRENT_PR_HEAD_SHA_CACHE_TTL_MS = 30_000;
 // the sweep to the 250 most recent Actions tasks.
 const GITEA_ACTION_PAGE_LIMIT = 50;
 const GITEA_ACTION_MAX_PAGES = 5;
+// PullRequestFlowAGit in forgejo models/issues/pull.go
+const GITEA_PULL_REQUEST_FLOW_AGIT = 1;
 
 /**
  * Fields requested from `tea pr list -o json`. tea's default field set omits the
@@ -225,8 +231,12 @@ const GiteaPullRequestRepoSchema = z
 
 const GiteaPullRequestApiSchema = z
   .object({
+    flow: z.number().optional(),
     head: z
-      .object({ repo: GiteaPullRequestRepoSchema.nullable().optional() })
+      .object({
+        ref: z.string().optional(),
+        repo: GiteaPullRequestRepoSchema.nullable().optional(),
+      })
       .passthrough()
       .optional(),
     base: z
@@ -1435,17 +1445,30 @@ export function createGiteaService(options: CreateGiteaServiceOptions = {}): For
     return runJsonParse(args, runOptions, stdout, schema);
   }
 
+  function resolveHeadRefKind(
+    pr: z.infer<typeof GiteaPullRequestApiSchema>,
+    number: number,
+  ): "branch" | "pull-ref" {
+    // head.ref only becomes the branch name when the branch still exists,
+    // agit PRs and deleted branches keep the pull ref
+    const isPullRefOnly =
+      pr.flow === GITEA_PULL_REQUEST_FLOW_AGIT || pr.head?.ref === `refs/pull/${number}/head`;
+    return isPullRefOnly ? "pull-ref" : "branch";
+  }
+
   async function resolveForkCheckoutFacts(
     cwd: string,
     summary: PullRequestSummary,
   ): Promise<{
     isCrossRepository: boolean;
+    headRefKind: "branch" | "pull-ref";
     headOwnerLogin: string | null;
     headRepositorySshUrl: string | null;
     headRepositoryUrl: string | null;
   }> {
     const sameRepo = {
       isCrossRepository: false,
+      headRefKind: "branch" as const,
       headOwnerLogin: null,
       headRepositorySshUrl: null,
       headRepositoryUrl: null,
@@ -1464,14 +1487,17 @@ export function createGiteaService(options: CreateGiteaServiceOptions = {}): For
     );
     const headRepo = pr.head?.repo ?? null;
     const baseRepo = pr.base?.repo ?? null;
-    if (headRepo?.id == null || baseRepo?.id == null || headRepo.id === baseRepo.id) {
-      return sameRepo;
+    const headRefKind = resolveHeadRefKind(pr, summary.number);
+    if (baseRepo?.id == null || headRepo?.id === baseRepo.id) {
+      return { ...sameRepo, headRefKind };
     }
+    // headRepo is null when the fork was deleted
     return {
       isCrossRepository: true,
-      headOwnerLogin: headRepo.owner?.login ?? null,
-      headRepositorySshUrl: headRepo.ssh_url ?? null,
-      headRepositoryUrl: headRepo.html_url ?? null,
+      headRefKind,
+      headOwnerLogin: headRepo?.owner?.login ?? null,
+      headRepositorySshUrl: headRepo?.ssh_url ?? null,
+      headRepositoryUrl: headRepo?.html_url ?? null,
     };
   }
 
@@ -1997,17 +2023,29 @@ export function createGiteaService(options: CreateGiteaServiceOptions = {}): For
       return summary.headRefName;
     },
 
+    defaultCheckoutRefs({ changeRequestNumber }) {
+      return buildPullHeadCheckoutRefs(changeRequestNumber);
+    },
+
+    buildPrLocalBranchName({ headRef, checkoutTarget }) {
+      return buildForkLocalBranchName({ headRef, ...checkoutTarget });
+    },
+
     async getPullRequestCheckoutTarget(
       input: GetPullRequestOptions,
     ): Promise<PullRequestCheckoutTarget> {
       const summary = await this.getPullRequest(input);
-      const checkoutRefs = [
-        { remoteName: "origin", remoteRef: `refs/pull/${summary.number}/head` },
-      ];
-      if (summary.headRefName) {
+      const fork = await resolveForkCheckoutFacts(input.cwd, summary);
+      const [originPullRef, upstreamPullRef] = buildPullHeadCheckoutRefs(summary.number);
+      const checkoutRefs = [originPullRef];
+      // for a fork PR a branch with that name on origin belongs to the base repo
+      const headBranchOnOrigin =
+        !fork.isCrossRepository && fork.headRefKind === "branch" && Boolean(summary.headRefName);
+      if (headBranchOnOrigin) {
         checkoutRefs.push({ remoteName: "origin", remoteRef: `refs/heads/${summary.headRefName}` });
       }
-      const fork = await resolveForkCheckoutFacts(input.cwd, summary);
+      // upstream can hold a different PR with the same number, so it goes last
+      checkoutRefs.push(upstreamPullRef);
       return {
         number: summary.number,
         baseRefName: summary.baseRefName,
@@ -2017,6 +2055,7 @@ export function createGiteaService(options: CreateGiteaServiceOptions = {}): For
         headRepositorySshUrl: fork.headRepositorySshUrl,
         headRepositoryUrl: fork.headRepositoryUrl,
         isCrossRepository: fork.isCrossRepository,
+        headRefKind: fork.headRefKind,
       };
     },
 
diff --git a/packages/server/src/services/github-service.test.ts b/packages/server/src/services/github-service.test.ts
index ab71115f36..3109bcc63c 100644
--- a/packages/server/src/services/github-service.test.ts
+++ b/packages/server/src/services/github-service.test.ts
@@ -797,6 +797,7 @@ describe("ForgeService", () => {
       headRepositorySshUrl: "git@github.com:therainisme/paseo.git",
       headRepositoryUrl: "https://github.com/therainisme/paseo",
       isCrossRepository: true,
+      headRefKind: "branch",
     });
 
     expect(runner.calls).toHaveLength(2);
diff --git a/packages/server/src/services/github-service.ts b/packages/server/src/services/github-service.ts
index b6de0cbd6e..2dd3fdc269 100644
--- a/packages/server/src/services/github-service.ts
+++ b/packages/server/src/services/github-service.ts
@@ -6,6 +6,10 @@ import {
 } from "@getpaseo/protocol/git-remote";
 import { findExecutable } from "../executable-resolution/executable-resolution.js";
 import { runGitCommand } from "../utils/run-git-command.js";
+import {
+  buildForkLocalBranchName,
+  buildPullHeadCheckoutRefs,
+} from "../utils/change-request-checkout.js";
 import { execCommand } from "../utils/spawn.js";
 import { resolveSshHostname } from "../utils/ssh-hostname.js";
 import {
@@ -2104,17 +2108,11 @@ export function createGitHubService(options: CreateGitHubServiceOptions = {}): G
     },
 
     defaultCheckoutRefs({ changeRequestNumber }) {
-      return [
-        { remoteName: "origin", remoteRef: `refs/pull/${changeRequestNumber}/head` },
-        { remoteName: "upstream", remoteRef: `refs/pull/${changeRequestNumber}/head` },
-      ];
+      return buildPullHeadCheckoutRefs(changeRequestNumber);
     },
 
     buildPrLocalBranchName({ headRef, checkoutTarget }) {
-      const owner = checkoutTarget.isCrossRepository
-        ? normalizeGitHubOwnerForBranch(checkoutTarget.headOwnerLogin)
-        : null;
-      return owner ? `${owner}/${headRef}` : headRef;
+      return buildForkLocalBranchName({ headRef, ...checkoutTarget });
     },
 
     supportsCrossRepoCheckoutWithoutRefs: true,
@@ -2663,11 +2661,6 @@ export function createGitHubService(options: CreateGitHubServiceOptions = {}): G
   return api;
 }
 
-function normalizeGitHubOwnerForBranch(owner: string | null): string | null {
-  const normalized = owner?.trim().toLowerCase() ?? "";
-  return /^[a-z0-9-]+$/.test(normalized) ? normalized : null;
-}
-
 function getGithubStatusFacts(
   status: PullRequestCommandStatus | null | undefined,
 ): GitHubPullRequestStatusFacts | null {
@@ -3529,6 +3522,7 @@ function toPullRequestCheckoutTarget(
     headRepositorySshUrl: pullRequest.headRepository?.sshUrl || null,
     headRepositoryUrl: pullRequest.headRepository?.url || null,
     isCrossRepository: pullRequest.isCrossRepository,
+    headRefKind: "branch",
   };
 }
 
diff --git a/packages/server/src/services/gitlab-service.test.ts b/packages/server/src/services/gitlab-service.test.ts
index 371198e447..b9b6d447d4 100644
--- a/packages/server/src/services/gitlab-service.test.ts
+++ b/packages/server/src/services/gitlab-service.test.ts
@@ -477,6 +477,7 @@ describe("createGitLabService", () => {
       headRepositorySshUrl: null,
       headRepositoryUrl: null,
       isCrossRepository: false,
+      headRefKind: "branch",
     });
     expect(calls[0]).toEqual(["mr", "view", "14", "-F", "json"]);
   });
diff --git a/packages/server/src/services/gitlab-service.ts b/packages/server/src/services/gitlab-service.ts
index 1fff0e2a02..c5f54be2cb 100644
--- a/packages/server/src/services/gitlab-service.ts
+++ b/packages/server/src/services/gitlab-service.ts
@@ -1204,6 +1204,7 @@ export function createGitLabService(options: CreateGitLabServiceOptions = {}): F
           mr.target_project_id !== undefined &&
           mr.target_project_id !== null &&
           mr.source_project_id !== mr.target_project_id,
+        headRefKind: "branch",
       };
     },
 
diff --git a/packages/server/src/utils/change-request-checkout.test.ts b/packages/server/src/utils/change-request-checkout.test.ts
new file mode 100644
index 0000000000..74a57c2445
--- /dev/null
+++ b/packages/server/src/utils/change-request-checkout.test.ts
@@ -0,0 +1,89 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  buildForkLocalBranchName,
+  normalizeForgeOwnerForBranch,
+} from "./change-request-checkout.js";
+
+describe("normalizeForgeOwnerForBranch", () => {
+  it("lowercases a valid login", () => {
+    expect(normalizeForgeOwnerForBranch("Contributor")).toBe("contributor");
+  });
+
+  it("allows dots and underscores", () => {
+    expect(normalizeForgeOwnerForBranch("a.b_c")).toBe("a.b_c");
+  });
+
+  it("rejects a login starting with a dash", () => {
+    expect(normalizeForgeOwnerForBranch("-abc")).toBeNull();
+  });
+
+  it("rejects a login starting with a dot", () => {
+    expect(normalizeForgeOwnerForBranch(".hidden")).toBeNull();
+  });
+
+  it("rejects a login containing '..'", () => {
+    expect(normalizeForgeOwnerForBranch("a..b")).toBeNull();
+  });
+
+  it("rejects a login ending in .lock", () => {
+    expect(normalizeForgeOwnerForBranch("contributor.lock")).toBeNull();
+  });
+
+  it("rejects a login with a path traversal segment", () => {
+    expect(normalizeForgeOwnerForBranch("../evil")).toBeNull();
+  });
+
+  it("rejects an empty or null login", () => {
+    expect(normalizeForgeOwnerForBranch(null)).toBeNull();
+    expect(normalizeForgeOwnerForBranch("")).toBeNull();
+    expect(normalizeForgeOwnerForBranch("   ")).toBeNull();
+  });
+});
+
+describe("buildForkLocalBranchName", () => {
+  const fork = { headRef: "patch-1", number: 42, isCrossRepository: true };
+
+  it("keeps the head ref for a same-repository head", () => {
+    expect(
+      buildForkLocalBranchName({ ...fork, isCrossRepository: false, headOwnerLogin: "arthur" }),
+    ).toBe("patch-1");
+  });
+
+  it("prefixes a fork head with the lowercased owner", () => {
+    expect(buildForkLocalBranchName({ ...fork, headOwnerLogin: "Arthur" })).toBe("arthur/patch-1");
+  });
+
+  it("falls back to the pr number when the owner is unknown", () => {
+    expect(buildForkLocalBranchName({ ...fork, headOwnerLogin: null })).toBe("pr-42/patch-1");
+  });
+
+  it("falls back to the pr number when the owner is not a safe ref segment", () => {
+    expect(buildForkLocalBranchName({ ...fork, headOwnerLogin: "-zaphod" })).toBe("pr-42/patch-1");
+  });
+
+  // pull-ref-only heads (agit PRs, deleted branches) report headRef as the
+  // literal pull ref, e.g. refs/pull/42/head, not a real branch name
+  it("collapses a same-repository pull-ref-only head to pr-<number>", () => {
+    expect(
+      buildForkLocalBranchName({
+        ...fork,
+        isCrossRepository: false,
+        headOwnerLogin: "arthur",
+        headRefKind: "pull-ref",
+      }),
+    ).toBe("pr-42");
+  });
+
+  it("prefixes pr-<number> with the owner for a fork pull-ref-only head", () => {
+    expect(
+      buildForkLocalBranchName({ ...fork, headOwnerLogin: "Arthur", headRefKind: "pull-ref" }),
+    ).toBe("arthur/pr-42");
+  });
+
+  it("does not double the pr number when the fork owner is unknown and there is no head branch", () => {
+    expect(
+      buildForkLocalBranchName({ ...fork, headOwnerLogin: null, headRefKind: "pull-ref" }),
+    ).toBe("pr-42");
+  });
+});
diff --git a/packages/server/src/utils/change-request-checkout.ts b/packages/server/src/utils/change-request-checkout.ts
new file mode 100644
index 0000000000..12c779571b
--- /dev/null
+++ b/packages/server/src/utils/change-request-checkout.ts
@@ -0,0 +1,47 @@
+import type { PullRequestCheckoutRef } from "../services/forge-service.js";
+
+// upstream for clones where origin is your fork
+export function buildPullHeadCheckoutRefs(number: number): PullRequestCheckoutRef[] {
+  return [
+    { remoteName: "origin", remoteRef: `refs/pull/${number}/head` },
+    { remoteName: "upstream", remoteRef: `refs/pull/${number}/head` },
+  ];
+}
+
+// forgejo username pattern, covers github logins too
+export function normalizeForgeOwnerForBranch(owner: string | null): string | null {
+  const normalized = owner?.trim().toLowerCase() ?? "";
+  if (!/^[a-z0-9][a-z0-9_.-]*$/.test(normalized)) {
+    return null;
+  }
+  // git refuses .. and .lock, trailing dot too
+  if (normalized.includes("..") || normalized.endsWith(".") || normalized.endsWith(".lock")) {
+    return null;
+  }
+  return normalized;
+}
+
+export interface ForkLocalBranchNameInput {
+  headRef: string;
+  number: number;
+  isCrossRepository: boolean;
+  headOwnerLogin: string | null;
+  /** "pull-ref" when headRef is a synthetic pull ref, not a real branch name (agit PRs, deleted branches); undefined means "branch" */
+  headRefKind?: "branch" | "pull-ref";
+}
+
+export function buildForkLocalBranchName(params: ForkLocalBranchNameInput): string {
+  const pullRefFallback = `pr-${params.number}`;
+  // headRef is the literal pull ref (e.g. refs/pull/42/head) when there is no
+  // real branch to name after, so use the pr number instead
+  const headSegment = params.headRefKind === "pull-ref" ? pullRefFallback : params.headRef;
+  if (!params.isCrossRepository) {
+    return headSegment;
+  }
+  const owner = normalizeForgeOwnerForBranch(params.headOwnerLogin);
+  if (!owner) {
+    // don't double up pr-<n>/pr-<n> when the owner is also unknown
+    return headSegment === pullRefFallback ? headSegment : `${pullRefFallback}/${headSegment}`;
+  }
+  return `${owner}/${headSegment}`;
+}
diff --git a/packages/server/src/utils/worktree.test.ts b/packages/server/src/utils/worktree.test.ts
index 9b0cba2643..82505dc800 100644
--- a/packages/server/src/utils/worktree.test.ts
+++ b/packages/server/src/utils/worktree.test.ts
@@ -16,6 +16,7 @@ import {
   mkdirSync,
   rmSync,
   existsSync,
+  readFileSync,
   realpathSync,
   symlinkSync,
   writeFileSync,
@@ -94,6 +95,64 @@ describe("paseo worktree manager", () => {
     await rm(tempDir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
   });
 
+  it.each([
+    { existing: [], preferred: "main/patch-1", expected: "main-1/patch-1" },
+    { existing: ["main-1"], preferred: "main/patch-1", expected: "main-2/patch-1" },
+    {
+      existing: ["main-1/patch-1"],
+      preferred: "main/patch-1",
+      expected: "main-1/patch-1-2",
+    },
+    {
+      existing: ["bob/patch-1/child"],
+      preferred: "bob/patch-1",
+      expected: "bob/patch-1-1",
+    },
+  ])(
+    "checks out a fork when $preferred conflicts with existing branch paths",
+    async ({ existing, preferred, expected }) => {
+      const git = (...args: string[]) =>
+        execFileSync("git", args, { cwd: repoDir, encoding: "utf8", stdio: "pipe" }).trim();
+      git("config", "core.autocrlf", "false");
+      const baseHead = git("rev-parse", "main");
+      for (const branch of existing) git("branch", branch);
+      git("checkout", "-b", "fixture-pr");
+      writeFileSync(join(repoDir, "file.txt"), "from-pr\n");
+      git("add", "file.txt");
+      git("-c", "commit.gpgsign=false", "commit", "-m", "fork patch");
+      const prHead = git("rev-parse", "HEAD");
+      git("checkout", "main");
+      const remote = join(tempDir, "origin.git");
+      git("clone", "--bare", repoDir, remote);
+      git("remote", "add", "origin", remote);
+      git(`--git-dir=${remote}`, "update-ref", "refs/pull/1/head", prHead);
+      git("pack-refs", "--all");
+
+      const result = await createWorktreePrimitive({
+        cwd: repoDir,
+        paseoHome,
+        worktreeSlug: "fork-review",
+        runSetup: false,
+        source: {
+          kind: "checkout-change-request",
+          forge: "gitea",
+          changeRequestNumber: 1,
+          headRef: "patch-1",
+          localBranchName: preferred,
+          baseRefName: "main",
+          checkoutRefs: [{ remoteName: "origin", remoteRef: "refs/pull/1/head" }],
+        },
+      });
+
+      expect(result.branchName).toBe(expected);
+      expect(git("rev-parse", result.branchName)).toBe(prHead);
+      expect(readFileSync(join(result.worktreePath, "file.txt"), "utf8")).toBe("from-pr\n");
+      for (const branch of ["main", ...existing]) {
+        expect(git("rev-parse", branch)).toBe(baseHead);
+      }
+    },
+  );
+
   it("treats a worktree as paseo-owned even when its .git admin is missing", async () => {
     const created = await createLegacyWorktreeForTest({
       branchName: "orphan-admin-branch",
diff --git a/packages/server/src/utils/worktree.ts b/packages/server/src/utils/worktree.ts
index f454a7225a..39b64d8137 100644
--- a/packages/server/src/utils/worktree.ts
+++ b/packages/server/src/utils/worktree.ts
@@ -1778,13 +1778,30 @@ async function localBranchExists(cwd: string, branchName: string): Promise<boole
 }
 
 async function resolveUniqueLocalBranchName(cwd: string, candidateBranch: string): Promise<string> {
-  let newBranchName = candidateBranch;
+  const { stdout } = await runGitCommand(
+    ["for-each-ref", "--format=%(refname:strip=2)", "refs/heads/"],
+    { cwd, envOverlay: READ_ONLY_GIT_ENV },
+  );
+  const existingBranches = new Set(stdout.trim().split("\n").filter(Boolean));
+  const candidateSegments = candidateBranch.split("/");
+  const segments = [...candidateSegments];
   let suffix = 1;
-  while (await localBranchExists(cwd, newBranchName)) {
-    newBranchName = `${candidateBranch}-${suffix}`;
-    suffix++;
+  while (true) {
+    const branchName = segments.join("/");
+    const parentConflict = segments.findIndex((_, index) =>
+      existingBranches.has(segments.slice(0, index + 1).join("/")),
+    );
+    const childConflict = [...existingBranches].some((branch) =>
+      branch.startsWith(`${branchName}/`),
+    );
+    if (parentConflict === -1 && !childConflict) {
+      return branchName;
+    }
+    // Git refs form a namespace: a branch cannot also be another branch's
+    // parent directory. Rename the conflicting segment, preserving the rest.
+    const conflictIndex = parentConflict === -1 ? segments.length - 1 : parentConflict;
+    segments[conflictIndex] = `${candidateSegments[conflictIndex]}-${suffix++}`;
   }
-  return newBranchName;
 }
 
 async function isBranchCheckedOut(cwd: string, branchName: string): Promise<boolean> {

From d3efddb0b5a597176fc633f257373c7ab2960235 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 15:35:14 +0700
Subject: [PATCH 177/270] test(server): await provider discovery before
 readiness assertion (#6994)

Repeated snapshot reads supersede pending launch resolution and keep readiness loading. Await the refresh RPC before asserting the discovered state.
---
 .../src/server/daemon-e2e/models.e2e.test.ts      | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/server/src/server/daemon-e2e/models.e2e.test.ts b/packages/server/src/server/daemon-e2e/models.e2e.test.ts
index 1f2086c879..b9293d8c3e 100644
--- a/packages/server/src/server/daemon-e2e/models.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/models.e2e.test.ts
@@ -124,15 +124,12 @@ test("Antigravity creates an agent and answers a prompt with real agy", async ({
   try {
     await client.connect();
     await client.fetchAgents({ subscribe: {} });
-    await expect
-      .poll(
-        async () => {
-          const snapshot = await client.getProvidersSnapshot({ cwd });
-          return snapshot.entries.find((entry) => entry.provider === "antigravity")?.status;
-        },
-        { timeout: 30000 },
-      )
-      .toBe("ready");
+    // Snapshot reads start discovery again; await one refresh before checking readiness.
+    await client.refreshProvidersSnapshot({ cwd, providers: ["antigravity"] });
+    const snapshot = await client.getProvidersSnapshot({ cwd });
+    expect(snapshot.entries.find((entry) => entry.provider === "antigravity")?.status).toBe(
+      "ready",
+    );
     const agent = await client.createAgent({
       provider: "antigravity",
       cwd,

From 4d5c3c13d4b82792844b30a2b9c0eedf003be0e2 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 12:13:18 +0200
Subject: [PATCH 178/270] fix(acp): preserve slash command argument hints
 (#6920)

ACP command updates discarded input hints before the autocomplete command list reached consumers. Preserve the advertised hint, retaining the empty hint for commands without input metadata.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: bwestlund17 <brian.westlund@proton.me>
---
 .../src/server/agent/providers/acp-agent.ts   |  2 +-
 .../generic-acp-agent.commands.test.ts        | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/server/agent/providers/acp-agent.ts b/packages/server/src/server/agent/providers/acp-agent.ts
index 169421fca9..3b61fcb863 100644
--- a/packages/server/src/server/agent/providers/acp-agent.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.ts
@@ -3098,7 +3098,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
         this.cachedCommands = update.availableCommands.map((command) => ({
           name: command.name,
           description: command.description,
-          argumentHint: "",
+          argumentHint: command.input?.hint ?? "",
           kind: "command",
         }));
         this.settleCommandsReady();
diff --git a/packages/server/src/server/agent/providers/generic-acp-agent.commands.test.ts b/packages/server/src/server/agent/providers/generic-acp-agent.commands.test.ts
index 2411773a7e..3655cccb5b 100644
--- a/packages/server/src/server/agent/providers/generic-acp-agent.commands.test.ts
+++ b/packages/server/src/server/agent/providers/generic-acp-agent.commands.test.ts
@@ -8,7 +8,7 @@ import { createTestLogger } from "../../../test-utils/test-logger.js";
 import { GenericACPAgentClient } from "./generic-acp-agent.js";
 
 describe("GenericACPAgentClient slash commands", () => {
-  test("lists commands an agent advertises right after session/new", async () => {
+  test("preserves argument hints in commands advertised right after session/new", async () => {
     await withFakeACPAgent("commands-after-session-new", async (command, cwd) => {
       const client = new GenericACPAgentClient({
         logger: createTestLogger(),
@@ -17,9 +17,17 @@ describe("GenericACPAgentClient slash commands", () => {
       });
       const session = await client.createSession({ provider: "acp", cwd });
       try {
-        await expect(session.listCommands?.()).resolves.toEqual([
-          { name: "review", description: "Review the diff", argumentHint: "", kind: "command" },
-        ]);
+        const commands = [
+          {
+            name: "review",
+            description: "Review the diff",
+            argumentHint: "query",
+            kind: "command",
+          },
+          { name: "status", description: "Show status", argumentHint: "", kind: "command" },
+        ];
+        await expect(session.listCommands?.()).resolves.toEqual(commands);
+        await expect(session.listCommands?.()).resolves.toEqual(commands);
       } finally {
         await session.close();
       }
@@ -91,7 +99,10 @@ rl.on("line", (line) => {
               sessionId: "session-1",
               update: {
                 sessionUpdate: "available_commands_update",
-                availableCommands: [{ name: "review", description: "Review the diff" }],
+                availableCommands: [
+                  { name: "review", description: "Review the diff", input: { hint: "query" } },
+                  { name: "status", description: "Show status" },
+                ],
               },
             },
           },

From 0708b8295c102d1d5ea5acbfa512691c7d0e19ba Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 13:17:01 +0200
Subject: [PATCH 179/270] Preserve explicit Claude session names on import
 (#6930)

* fix(server): name an imported Claude agent after its /rename

Importing a Claude session named the agent after its first prompt even when the
session had been renamed in the CLI, so the name had to be set again by hand.
#4216 fixed the Import Session listing; the imported agent still kept the
prompt.

Read the last usable `custom-title` from the transcript and pass it as the
imported config title. The record is re-emitted on every save, so searching
backwards from the end of the file finds the current name without walking a
transcript that can reach tens of megabytes.

Only an explicit rename is carried over. Agents are named after their first
prompt line since #1563, so adopting the generated `ai-title` here would put
that LLM summary back.

Refs #2513

* refactor(server): drop unused generality from the Claude title reader

readLastClaudeTitle took content, type and field so it could read both
custom-title and ai-title records, which the listing needed before #4216 took
that over. Only the custom-title read is left, so the two extra parameters are
dead flexibility that also broke the single-object-parameter rule in
packages/server/CLAUDE.md.

Collapse it to readLastClaudeCustomTitle(content) and pull the record type into
a constant so the needle and the type check share one literal.

Hooks skipped: the repo-wide typecheck fails on two pre-existing Electron
typing errors in packages/desktop/src/main.ts that reproduce with this change
stashed. packages/server typecheck, lint and format all pass.

* test(server): drive the real resume path in the import title tests

The tests assigned an inline arrow function to client.resumeSession to keep
Claude Code from spawning. Importing replays the transcript from disk and never
starts a process, so the stub was never needed. Dropping it runs the real
resume path, which is what docs/testing.md asks for, and removes the arrow
assignment that docs/coding-standards.md rules out.

Hooks skipped: the repo-wide typecheck fails on two pre-existing Electron
typing errors in packages/desktop/src/main.ts that reproduce with this change
stashed. packages/server typecheck, lint, format and the 83 claude tests pass.

* fix(server): narrow the transcript read error instead of asserting it

The ENOENT check cast the caught value to NodeJS.ErrnoException to reach
`code`, which is the kind of assertion docs/coding-standards.md rules out:
narrow with `if`, do not silence the compiler. Add the same local type guard
pid-lock.ts already uses and test through it.

Behaviour is unchanged. A value that is not an Error still falls through to
the rethrow, exactly as reading `code` off the assertion did.

Hooks skipped: the repo-wide typecheck fails on two pre-existing Electron
typing errors in packages/desktop/src/main.ts that reproduce with this change
stashed. packages/server typecheck, lint, format and the 83 claude tests pass.

* fix(server): let claudeProjectDirSync resolve the Claude config dir

The import title reader built the config dir itself through os.homedir(),
but os is no longer imported here, so the fallback threw a ReferenceError
whenever CLAUDE_CONFIG_DIR was unset. claudeProjectDirSync already resolves
the same default.

* test(server): give the import title helpers object parameters

* fix(server): preserve imported session renames across history locations

The import title reader must use the same provider environment and transcript
lookup as history replay. Otherwise an imported session has its history but
loses its explicit name when its configuration directory or project changed.

Co-authored-by: platanus-kr <platanus.kr@gmail.com>

---------

Co-authored-by: platanus-kr <platanus.kr@gmail.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../claude/agent.import-titles.test.ts        | 239 ++++++++++++++++++
 .../server/agent/providers/claude/agent.ts    |  70 +++++
 ...aude-history-other-project-dir.e2e.test.ts |   2 +
 ...de-provider-config-dir-history.e2e.test.ts |   2 +
 4 files changed, 313 insertions(+)
 create mode 100644 packages/server/src/server/agent/providers/claude/agent.import-titles.test.ts

diff --git a/packages/server/src/server/agent/providers/claude/agent.import-titles.test.ts b/packages/server/src/server/agent/providers/claude/agent.import-titles.test.ts
new file mode 100644
index 0000000000..e20b8d6faf
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/agent.import-titles.test.ts
@@ -0,0 +1,239 @@
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
+
+import { createTestLogger } from "../../../../test-utils/test-logger.js";
+import { ClaudeAgentClient } from "./agent.js";
+import { claudeProjectDirSync } from "./project-dir.js";
+
+const SESSION_CWD = "/tmp/paseo-claude-renamed-import";
+
+interface ClaudeTranscriptRecord {
+  [key: string]: unknown;
+}
+
+let configDir: string;
+let previousConfigDir: string | undefined;
+
+interface UserRecordInput {
+  sessionId: string;
+  content: string;
+}
+
+interface WriteSessionInput {
+  sessionId: string;
+  records: ClaudeTranscriptRecord[];
+}
+
+function userRecord({ sessionId, content }: UserRecordInput): ClaudeTranscriptRecord {
+  return {
+    isSidechain: false,
+    type: "user",
+    message: { role: "user", content },
+    cwd: SESSION_CWD,
+    sessionId,
+  };
+}
+
+async function writeSession({ sessionId, records }: WriteSessionInput): Promise<void> {
+  const projectDir = claudeProjectDirSync(SESSION_CWD, { configDir });
+  await fs.mkdir(projectDir, { recursive: true });
+  await fs.writeFile(
+    path.join(projectDir, `${sessionId}.jsonl`),
+    `${records.map((record) => JSON.stringify(record)).join("\n")}\n`,
+  );
+}
+
+// Importing replays the transcript from disk, so this drives the real resume
+// path without starting Claude Code.
+async function importSession(sessionId: string) {
+  const client = new ClaudeAgentClient({
+    logger: createTestLogger(),
+    resolveBinary: async () => "/test/claude/bin",
+  });
+  return client.importSession(
+    { providerHandleId: sessionId, cwd: SESSION_CWD },
+    {
+      config: { provider: "claude", cwd: SESSION_CWD },
+      storedConfig: { provider: "claude", cwd: SESSION_CWD },
+    },
+  );
+}
+
+beforeEach(async () => {
+  configDir = await fs.mkdtemp(path.join(os.tmpdir(), "paseo-claude-renamed-"));
+  previousConfigDir = process.env.CLAUDE_CONFIG_DIR;
+  process.env.CLAUDE_CONFIG_DIR = configDir;
+});
+
+afterEach(async () => {
+  if (previousConfigDir === undefined) {
+    delete process.env.CLAUDE_CONFIG_DIR;
+  } else {
+    process.env.CLAUDE_CONFIG_DIR = previousConfigDir;
+  }
+  await fs.rm(configDir, { recursive: true, force: true });
+});
+
+describe("importing a renamed Claude session", () => {
+  test.each(["provider", "launch"])(
+    "reads the rename from the %s config directory used for history",
+    async (source) => {
+      const sessionId = "provider-directory-rename";
+      const providerConfigDir = path.join(configDir, "provider");
+      const projectDir = claudeProjectDirSync(SESSION_CWD, { configDir: providerConfigDir });
+      await fs.mkdir(projectDir, { recursive: true });
+      await fs.writeFile(
+        path.join(projectDir, `${sessionId}.jsonl`),
+        [
+          userRecord({ sessionId, content: "Review this project" }),
+          { type: "custom-title", customTitle: "My research session", sessionId },
+        ]
+          .map((record) => JSON.stringify(record))
+          .join("\n") + "\n",
+      );
+      const client = new ClaudeAgentClient({
+        logger: createTestLogger(),
+        runtimeSettings:
+          source === "provider" ? { env: { CLAUDE_CONFIG_DIR: providerConfigDir } } : undefined,
+        resolveBinary: async () => "/test/claude/bin",
+      });
+      const imported = await client.importSession(
+        { providerHandleId: sessionId, cwd: SESSION_CWD },
+        {
+          config: { provider: "claude", cwd: SESSION_CWD },
+          storedConfig: { provider: "claude", cwd: SESSION_CWD },
+          launchContext:
+            source === "launch" ? { env: { CLAUDE_CONFIG_DIR: providerConfigDir } } : undefined,
+        },
+      );
+      expect(imported.timeline.map((entry) => entry.item)).toContainEqual(
+        expect.objectContaining({ type: "user_message", text: "Review this project" }),
+      );
+      expect(imported.config.title).toBe("My research session");
+    },
+  );
+
+  test("names the imported agent after a /rename", async () => {
+    const sessionId = "renamed-session";
+    await writeSession({
+      sessionId,
+      records: [
+        userRecord({ sessionId, content: "Review this project" }),
+        { type: "custom-title", customTitle: "My research session", sessionId },
+      ],
+    });
+
+    const imported = await importSession(sessionId);
+
+    expect(imported.config.title).toBe("My research session");
+  });
+
+  test("uses the last rename when the session was renamed more than once", async () => {
+    const sessionId = "renamed-twice";
+    await writeSession({
+      sessionId,
+      records: [
+        userRecord({ sessionId, content: "Move invoices to the new schema" }),
+        { type: "custom-title", customTitle: "invoices", sessionId },
+        { type: "custom-title", customTitle: "billing rework", sessionId },
+      ],
+    });
+
+    const imported = await importSession(sessionId);
+
+    expect(imported.config.title).toBe("billing rework");
+  });
+
+  test("preserves a rename when the first prompt was /model", async () => {
+    const sessionId = "model-first";
+    await writeSession({
+      sessionId,
+      records: [
+        userRecord({ sessionId, content: "/model" }),
+        { type: "custom-title", customTitle: "My research session", sessionId },
+      ],
+    });
+
+    const imported = await importSession(sessionId);
+
+    expect(imported.config.title).toBe("My research session");
+  });
+
+  test("keeps the rename when a later record carries no usable name", async () => {
+    const sessionId = "malformed-later-record";
+    await writeSession({
+      sessionId,
+      records: [
+        userRecord({ sessionId, content: "Review this project" }),
+        { type: "custom-title", customTitle: "My research session", sessionId },
+        { type: "custom-title", sessionId },
+      ],
+    });
+
+    const imported = await importSession(sessionId);
+
+    expect(imported.config.title).toBe("My research session");
+  });
+
+  test("ignores a rename recorded on a sidechain transcript", async () => {
+    const sessionId = "sidechain-rename";
+    await writeSession({
+      sessionId,
+      records: [
+        userRecord({ sessionId, content: "Review this project" }),
+        { type: "custom-title", customTitle: "Subagent title", sessionId, isSidechain: true },
+      ],
+    });
+
+    const imported = await importSession(sessionId);
+
+    expect(imported.config.title).toBeUndefined();
+  });
+
+  test("leaves the agent untitled when the session was never renamed", async () => {
+    const sessionId = "never-renamed";
+    await writeSession({
+      sessionId,
+      records: [userRecord({ sessionId, content: "Review this project" })],
+    });
+
+    const imported = await importSession(sessionId);
+
+    expect(imported.config.title).toBeUndefined();
+  });
+
+  test("does not name the imported agent after a generated ai-title", async () => {
+    const sessionId = "auto-titled";
+    await writeSession({
+      sessionId,
+      records: [
+        userRecord({ sessionId, content: "Add pagination to the invoice list" }),
+        { type: "ai-title", aiTitle: "Invoice list pagination", sessionId },
+      ],
+    });
+
+    const imported = await importSession(sessionId);
+
+    // The Import Session list shows it, but agents are named from their first
+    // prompt line.
+    expect(imported.config.title).toBeUndefined();
+  });
+
+  test("imports a session that has no transcript on disk", async () => {
+    const imported = await importSession("no-such-session");
+
+    expect(imported.config.title).toBeUndefined();
+  });
+
+  test("surfaces an unreadable transcript instead of importing it as never renamed", async () => {
+    const sessionId = "unreadable-transcript";
+    // A directory where the transcript belongs fails the read with EISDIR, the
+    // deterministic stand-in for a permissions or I/O fault.
+    const projectDir = claudeProjectDirSync(SESSION_CWD, { configDir });
+    await fs.mkdir(path.join(projectDir, `${sessionId}.jsonl`), { recursive: true });
+
+    await expect(importSession(sessionId)).rejects.toThrow();
+  });
+});
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index a8f2143832..61ac0e3ae0 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -1693,11 +1693,21 @@ export class ClaudeAgentClient implements AgentClient {
   }
 
   async importSession(input: ImportProviderSessionInput, context: ImportProviderSessionContext) {
+    // Carry a `/rename` onto the imported agent so the name chosen in the CLI
+    // survives the import. Only an explicit rename counts: agents are named
+    // after their first prompt line since #1563, so adopting the generated
+    // `ai-title` here would put that LLM summary back.
+    const renamedTitle = await readClaudeRenamedSessionTitle({
+      cwd: input.cwd,
+      sessionId: input.providerHandleId,
+      configDir: claudeConfigDir(this.buildProviderEnv(context.launchContext?.env)),
+    });
     return importSessionFromPersistence({
       provider: "claude",
       request: input,
       context,
       resumeSession: this.resumeSession.bind(this),
+      ...(renamedTitle ? { config: { title: renamedTitle } } : {}),
     });
   }
 
@@ -6603,6 +6613,66 @@ function normalizeClaudeSessionTitle(title: string | null): string | null {
   return normalized ? normalized : null;
 }
 
+const CLAUDE_CUSTOM_TITLE_TYPE = "custom-title";
+
+/**
+ * The `custom-title` record is re-emitted every time the session is saved, so
+ * the current name is the last usable one in the file. Searching backwards finds it without
+ * walking the transcript, which matters because sessions reach tens of
+ * megabytes.
+ */
+function readLastClaudeCustomTitle(content: string): string | null {
+  const needle = `"${CLAUDE_CUSTOM_TITLE_TYPE}"`;
+  let at = content.lastIndexOf(needle);
+  while (at >= 0) {
+    const lineStart = content.lastIndexOf("\n", at) + 1;
+    const lineEnd = content.indexOf("\n", at);
+    const line = lineEnd === -1 ? content.slice(lineStart) : content.slice(lineStart, lineEnd);
+    let parsed: unknown;
+    try {
+      parsed = JSON.parse(line.trim());
+    } catch {
+      parsed = undefined;
+    }
+    const entry = toObjectRecord(parsed);
+    if (entry && !entry.isSidechain && entry.type === CLAUDE_CUSTOM_TITLE_TYPE) {
+      const title = normalizeClaudeSessionTitle(
+        typeof entry.customTitle === "string" ? entry.customTitle : null,
+      );
+      if (title) {
+        return title;
+      }
+    }
+    // The needle also matches a prompt that quotes it, and a record can carry no
+    // usable name, so keep looking backwards for one that does.
+    at = at <= 0 ? -1 : content.lastIndexOf(needle, at - 1);
+  }
+  return null;
+}
+
+function isErrnoException(error: unknown): error is NodeJS.ErrnoException {
+  return error instanceof Error && "code" in error;
+}
+
+async function readClaudeRenamedSessionTitle(input: {
+  cwd: string;
+  sessionId: string;
+  configDir: string;
+}): Promise<string | null> {
+  let content: string;
+  try {
+    content = await fsPromises.readFile(claudeTranscriptPathSync(input), "utf8");
+  } catch (error) {
+    // A session with no transcript on disk has no rename to carry over. Every
+    // other read failure is a real fault and stays explicit.
+    if (isErrnoException(error) && error.code === "ENOENT") {
+      return null;
+    }
+    throw error;
+  }
+  return readLastClaudeCustomTitle(content);
+}
+
 function normalizeImportablePromptPreview(text: string): string | null {
   const normalized = text.trim().replace(/\s+/g, " ");
   if (!normalized) return null;
diff --git a/packages/server/src/server/daemon-e2e/claude-history-other-project-dir.e2e.test.ts b/packages/server/src/server/daemon-e2e/claude-history-other-project-dir.e2e.test.ts
index 00b365881f..ad703a3885 100644
--- a/packages/server/src/server/daemon-e2e/claude-history-other-project-dir.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/claude-history-other-project-dir.e2e.test.ts
@@ -67,6 +67,7 @@ describe("daemon E2E - Claude history stored under another project folder", () =
             content: "reply from the original folder",
           },
         },
+        { type: "custom-title", customTitle: "Renamed moved session", sessionId: SESSION_ID },
       ]
         .map((entry) => `${JSON.stringify(entry)}\n`)
         .join(""),
@@ -114,6 +115,7 @@ describe("daemon E2E - Claude history stored under another project folder", () =
       sessionId: SESSION_ID,
       cwd: agentCwd,
     });
+    expect(agent.title).toBe("Renamed moved session");
     await stopDaemon();
 
     const restartedClient = await startDaemon();
diff --git a/packages/server/src/server/daemon-e2e/claude-provider-config-dir-history.e2e.test.ts b/packages/server/src/server/daemon-e2e/claude-provider-config-dir-history.e2e.test.ts
index 29779fd1ef..1715fabec9 100644
--- a/packages/server/src/server/daemon-e2e/claude-provider-config-dir-history.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/claude-provider-config-dir-history.e2e.test.ts
@@ -55,6 +55,7 @@ describe("daemon E2E - Claude history lives in the provider's CLAUDE_CONFIG_DIR"
           cwd,
           message: { role: "assistant", content: "reply from the custom config dir" },
         },
+        { type: "custom-title", customTitle: "Renamed provider session", sessionId: SESSION_ID },
       ]
         .map((entry) => `${JSON.stringify(entry)}\n`)
         .join(""),
@@ -111,6 +112,7 @@ describe("daemon E2E - Claude history lives in the provider's CLAUDE_CONFIG_DIR"
       sessionId: SESSION_ID,
       cwd,
     });
+    expect(agent.title).toBe("Renamed provider session");
     await stopDaemon();
 
     const restartedClient = await startDaemon();

From 71f575e16a63b2fcb98e3054912799252a75f0a3 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 14:21:03 +0200
Subject: [PATCH 180/270] Keep malformed Claude question answers retryable
 (#6936)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: reject a question permission that would deliver no answer

Answering an `AskUserQuestion` permission in any shape but
`updatedInput.answers` keyed by one of its questions resolves as `allow` and
delivers nothing. The waiting agent is told "The user did not answer the
questions." — an affirmative falsehood rather than silence, so neither side can
see that anything failed. The responder sees success; the agent believes the
human declined and acts on that.

The field it is most natural to reach for cannot work. `selectedActionId` is
`z.string().optional()` with no membership check, and is read only for `plan`
kinds; a question advertises `actions: undefined`, so there is no action id to
name in the first place.

It is also unrecoverable. `respondToPermission` deletes the request from
`pendingPermissions` on entry, so the malformed answer consumes it and the retry
fails with "No pending permission request". The guard runs before that delete,
and `AgentManager` drops its own copy only once the call resolves, so both maps
survive the throw and the request stays answerable.

The answer contract is per provider, so the guard is in the Claude provider
rather than in `AgentManager`. Claude keeps an answer only when its key is a
question's full text or its header and its value is a non-empty string; Codex's
`mapCodexQuestionResponseByHeader` reads headers only and deliberately selects
each question's first option when nothing maps, which a shared guard would have
rejected; OpenCode reads headers only as well.

`resolveClaudeAskUserQuestionAnswers` is extracted from
`normalizeClaudeAskUserQuestionUpdatedInput` with no change in behaviour, and
both it and the guard now use it. So "would this deliver anything" is answered
by the code that does the delivering, rather than by a second copy of its rule —
which matters more than it looks, because that rule has two details easy to
restate wrongly: `readNonEmptyString` tests `value.trim()` for emptiness but
returns the *original* string, so a question named `" Which colour? "` is keyed
by that padding; and an empty `updatedInput.questions` array is a list that wins
over the request's own questions and maps nothing, not an absent one.

Verified on a live daemon over the MCP `respond_to_permission` path against a
seat whose question text is literally `" Which colour? "`: `selectedActionId`,
the trimmed key, an empty echoed question list and a numeric answer are each
rejected with the request still pending, and
`{"answers":{" Which colour? ":"Ochre"}}` then reaches the agent.

One known limit: the WebSocket path (`session.ts handleAgentPermissionResponse`)
catches the throw and emits an `activity_log` error rather than failing the
call, because a permission response is modelled as a notification. So
`paseo permit allow` still prints `allowed` and exits 0 for a rejected shape.
The destructive half is closed on every path — the request survives and the
agent is never told a falsehood — but closing the reporting half needs a
protocol change.

* test(claude): cover the question-answer-required retry path

A non-deliverable answer to an AskUserQuestion permission is rejected, but
the pending request survives it: a corrected retry against the same request
id is accepted, and the waiting agent receives the answer.

Mutation testing on a fork found that the existing suite does not pin this
ordering — moving the deliverability check to run after the request is
deleted from pendingPermissions still leaves every existing test green. This
test reds against that change.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

---------

Co-authored-by: Thomas Van <minhthong@gmail.com>
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: paseo-bot <paseo-bot@users.noreply.github.com>
---
 .../server/agent/providers/claude/agent.ts    |  68 +++++++-
 .../claude/question-response.test.ts          | 164 ++++++++++++++++++
 2 files changed, 223 insertions(+), 9 deletions(-)
 create mode 100644 packages/server/src/server/agent/providers/claude/question-response.test.ts

diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index 61ac0e3ae0..8c5cc1a41c 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -203,24 +203,26 @@ function stripClaudeAskUserQuestionUiMetadata(input: AgentMetadata): AgentMetada
   };
 }
 
-export function normalizeClaudeAskUserQuestionUpdatedInput(
+/**
+ * The answers this response will actually deliver, keyed by full question text,
+ * or null when there is no question list and answers map to work from.
+ *
+ * Shared by the normalizer and by the check that rejects an undeliverable
+ * answer, so the two can never disagree about what "deliverable" means.
+ */
+function resolveClaudeAskUserQuestionAnswers(
   updatedInput: AgentMetadata | undefined,
   fallbackInput: AgentMetadata | undefined,
-): AgentMetadata {
+): Record<string, string> | null {
   const fallback = isMetadata(fallbackInput) ? fallbackInput : {};
   const base = isMetadata(updatedInput) ? updatedInput : {};
-  // Paseo's shared question UI serializes answers by question header, but Claude's
-  // AskUserQuestion tool expects answer keys to match the full question text. Merge
-  // the original request payload back in so provider callbacks that only return
-  // `{ answers }` still satisfy Claude's full tool input schema.
-  const merged = stripClaudeAskUserQuestionUiMetadata({ ...fallback, ...base });
   const questions =
     (Array.isArray(base.questions) ? base.questions : null) ??
     (Array.isArray(fallback.questions) ? fallback.questions : null);
   const answers = isMetadata(base.answers) ? base.answers : null;
 
   if (!questions || !answers) {
-    return merged;
+    return null;
   }
 
   const normalizedAnswers: Record<string, string> = {};
@@ -244,7 +246,23 @@ export function normalizeClaudeAskUserQuestionUpdatedInput(
     }
   }
 
-  if (Object.keys(normalizedAnswers).length === 0) {
+  return normalizedAnswers;
+}
+
+export function normalizeClaudeAskUserQuestionUpdatedInput(
+  updatedInput: AgentMetadata | undefined,
+  fallbackInput: AgentMetadata | undefined,
+): AgentMetadata {
+  const fallback = isMetadata(fallbackInput) ? fallbackInput : {};
+  const base = isMetadata(updatedInput) ? updatedInput : {};
+  // Paseo's shared question UI serializes answers by question header, but Claude's
+  // AskUserQuestion tool expects answer keys to match the full question text. Merge
+  // the original request payload back in so provider callbacks that only return
+  // `{ answers }` still satisfy Claude's full tool input schema.
+  const merged = stripClaudeAskUserQuestionUiMetadata({ ...fallback, ...base });
+  const normalizedAnswers = resolveClaudeAskUserQuestionAnswers(updatedInput, fallbackInput);
+
+  if (!normalizedAnswers || Object.keys(normalizedAnswers).length === 0) {
     return merged;
   }
 
@@ -254,6 +272,32 @@ export function normalizeClaudeAskUserQuestionUpdatedInput(
   };
 }
 
+class ClaudeQuestionAnswerRequiredError extends Error {
+  readonly code = "question_answer_required" as const;
+
+  constructor(readonly requestId: string) {
+    super(
+      `Permission request '${requestId}' requires updatedInput.answers keyed by a ` +
+        `question's full text or header, with a non-empty string value. ` +
+        `The request is still pending; retry with that shape.`,
+    );
+    this.name = "ClaudeQuestionAnswerRequiredError";
+  }
+}
+
+function assertClaudeQuestionAnswerDeliverable(
+  request: AgentPermissionRequest,
+  response: AgentPermissionResponse,
+): void {
+  if (request.kind !== "question" || response.behavior !== "allow") {
+    return;
+  }
+  const answers = resolveClaudeAskUserQuestionAnswers(response.updatedInput, request.input);
+  if (!answers || Object.keys(answers).length === 0) {
+    throw new ClaudeQuestionAnswerRequiredError(request.id);
+  }
+}
+
 function isObjectRecord(value: unknown): value is Record<string, unknown> {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
@@ -2734,6 +2778,12 @@ class ClaudeAgentSession implements AgentSession {
     if (!pending) {
       throw new Error(`No pending permission request with id '${requestId}'`);
     }
+
+    // Before the delete below, so a rejected answer leaves the request pending
+    // and answerable rather than consuming it for nothing. AgentManager only
+    // drops its own copy once this resolves, so both maps survive the throw.
+    assertClaudeQuestionAnswerDeliverable(pending.request, response);
+
     this.pendingPermissions.delete(requestId);
     pending.cleanup?.();
 
diff --git a/packages/server/src/server/agent/providers/claude/question-response.test.ts b/packages/server/src/server/agent/providers/claude/question-response.test.ts
new file mode 100644
index 0000000000..26909faab7
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/question-response.test.ts
@@ -0,0 +1,164 @@
+import { describe, expect, test } from "vitest";
+import type { CanUseTool, Query, SDKMessage } from "@anthropic-ai/claude-agent-sdk";
+import { ClaudeAgentClient } from "./agent.js";
+import type { ClaudeQueryFactory } from "./query.js";
+import type { AgentPermissionResponse } from "../../agent-sdk-types.js";
+import { createTestLogger } from "../../../../test-utils/test-logger.js";
+
+// The SDK dependency receives the same permission callback as a real Claude process.
+// Keep its stream open until close; permission state belongs entirely to the session.
+function createSdkFake() {
+  let canUseTool: CanUseTool | undefined;
+  let finish!: () => void;
+  const finished = new Promise<void>((resolve) => {
+    finish = resolve;
+  });
+  const queryFactory: ClaudeQueryFactory = ({ options }) => {
+    canUseTool = options.canUseTool;
+    return {
+      close: finish,
+      return: async () => {
+        finish();
+        return { value: undefined, done: true };
+      },
+      [Symbol.asyncIterator]() {
+        return {
+          next: async (): Promise<IteratorResult<SDKMessage, void>> => {
+            await finished;
+            return { value: undefined, done: true };
+          },
+        };
+      },
+    } as Query;
+  };
+  return {
+    queryFactory,
+    ask: (input: Record<string, unknown>) => {
+      if (!canUseTool) throw new Error("SDK permission callback was not configured");
+      return canUseTool("AskUserQuestion", input, {
+        signal: new AbortController().signal,
+        toolUseID: "question-tool-call",
+      });
+    },
+  };
+}
+
+const questionInput = {
+  questions: [{ question: "Which colour?", header: "Colour", options: [], multiSelect: false }],
+};
+
+const invalidResponses: Array<[string, AgentPermissionResponse]> = [
+  ["selectedActionId", { behavior: "allow", selectedActionId: "Viridian" }],
+  ["missing answers", { behavior: "allow", updatedInput: {} }],
+  ["unknown question", { behavior: "allow", updatedInput: { answers: { Hue: "Viridian" } } }],
+  ["blank answer", { behavior: "allow", updatedInput: { answers: { Colour: " " } } }],
+  ["non-string answer", { behavior: "allow", updatedInput: { answers: { Colour: 1 } } }],
+  [
+    "empty echoed questions",
+    { behavior: "allow", updatedInput: { questions: [], answers: { Colour: "Viridian" } } },
+  ],
+];
+
+describe("Claude question permission responses", () => {
+  test.each(invalidResponses)(
+    "rejects %s and delivers a corrected retry",
+    async (_label, response) => {
+      const sdk = createSdkFake();
+      const session = await new ClaudeAgentClient({
+        logger: createTestLogger(),
+        queryFactory: sdk.queryFactory,
+        resolveBinary: async () => "/test/claude/bin",
+      }).createSession({ provider: "claude", cwd: process.cwd(), modeId: "default" });
+      try {
+        await session.startTurn("Ask which colour");
+        const answer = sdk.ask(questionInput);
+        void answer.catch(() => undefined);
+        const request = session.getPendingPermissions()[0]!;
+        expect(request.kind).toBe("question");
+        await expect(session.respondToPermission(request.id, response)).rejects.toMatchObject({
+          code: "question_answer_required",
+          requestId: request.id,
+        });
+        expect(session.getPendingPermissions()).toEqual([request]);
+        await session.respondToPermission(request.id, {
+          behavior: "allow",
+          updatedInput: { answers: { Colour: "Viridian" } },
+        });
+        await expect(answer).resolves.toMatchObject({
+          behavior: "allow",
+          updatedInput: { answers: { "Which colour?": "Viridian" } },
+        });
+        expect(session.getPendingPermissions()).toEqual([]);
+      } finally {
+        await session.close();
+      }
+    },
+  );
+
+  test.each([
+    ["header", questionInput, { Colour: "Viridian" }, { "Which colour?": "Viridian" }],
+    ["question text", questionInput, { "Which colour?": "Ochre" }, { "Which colour?": "Ochre" }],
+    [
+      "padded question text",
+      { questions: [{ question: " Which colour? ", header: " Colour " }] },
+      { " Which colour? ": "Ochre" },
+      { " Which colour? ": "Ochre" },
+    ],
+    [
+      "padded header",
+      { questions: [{ question: " Which colour? ", header: " Colour " }] },
+      { " Colour ": "Viridian" },
+      { " Which colour? ": "Viridian" },
+    ],
+    [
+      "partial answer",
+      { questions: [...questionInput.questions, { question: "Ship it?", header: "Ship" }] },
+      { Ship: "Yes" },
+      { "Ship it?": "Yes" },
+    ],
+  ])("delivers answers keyed by %s", async (_label, input, answers, expected) => {
+    const sdk = createSdkFake();
+    const session = await new ClaudeAgentClient({
+      logger: createTestLogger(),
+      queryFactory: sdk.queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    }).createSession({ provider: "claude", cwd: process.cwd(), modeId: "default" });
+    try {
+      await session.startTurn("Ask which colour");
+      const answer = sdk.ask(input);
+      void answer.catch(() => undefined);
+      const request = session.getPendingPermissions()[0]!;
+      await session.respondToPermission(request.id, {
+        behavior: "allow",
+        updatedInput: { answers },
+      });
+      await expect(answer).resolves.toMatchObject({
+        behavior: "allow",
+        updatedInput: { answers: expected },
+      });
+      expect(session.getPendingPermissions()).toEqual([]);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("allows denying a question without answers", async () => {
+    const sdk = createSdkFake();
+    const session = await new ClaudeAgentClient({
+      logger: createTestLogger(),
+      queryFactory: sdk.queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    }).createSession({ provider: "claude", cwd: process.cwd(), modeId: "default" });
+    try {
+      await session.startTurn("Ask which colour");
+      const answer = sdk.ask(questionInput);
+      void answer.catch(() => undefined);
+      const request = session.getPendingPermissions()[0]!;
+      await session.respondToPermission(request.id, { behavior: "deny", message: "No answer" });
+      await expect(answer).resolves.toMatchObject({ behavior: "deny", message: "No answer" });
+      expect(session.getPendingPermissions()).toEqual([]);
+    } finally {
+      await session.close();
+    }
+  });
+});

From 80badb3b8f27817369bce6735e64edf9b0b70fb1 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 15:15:19 +0200
Subject: [PATCH 181/270] fix(opencode): answer multi-select v2 questions from
 the question card (#6149)

Closes #6135

Co-authored-by: Grant Ammons <grant@grant.dev>
---
 .../server/agent/providers/omp/question-ui.ts | 17 +---
 .../providers/opencode/v2/permissions.test.ts | 95 ++++++++++++++++++-
 .../providers/opencode/v2/permissions.ts      | 21 +++-
 .../providers/question-card-answer.test.ts    | 32 +++++++
 .../agent/providers/question-card-answer.ts   | 23 +++++
 5 files changed, 169 insertions(+), 19 deletions(-)
 create mode 100644 packages/server/src/server/agent/providers/question-card-answer.test.ts
 create mode 100644 packages/server/src/server/agent/providers/question-card-answer.ts

diff --git a/packages/server/src/server/agent/providers/omp/question-ui.ts b/packages/server/src/server/agent/providers/omp/question-ui.ts
index 4fdb37f61c..2a90d7288e 100644
--- a/packages/server/src/server/agent/providers/omp/question-ui.ts
+++ b/packages/server/src/server/agent/providers/omp/question-ui.ts
@@ -3,6 +3,7 @@ import type {
   AgentPermissionResponse,
   AgentProvider,
 } from "../../agent-sdk-types.js";
+import { splitMultiSelectAnswer } from "../question-card-answer.js";
 import type { OmpAgentMessage, OmpRuntimeEvent } from "./rpc-types.js";
 
 type UiRequest = Extract<OmpRuntimeEvent, { type: "extension_ui_request" }>;
@@ -176,21 +177,7 @@ function selectedAnswer(
     return labels.includes(answer)
       ? { selected: [answer], custom: null }
       : { selected: [], custom: answer };
-
-  // The shared question UI sends a comma-joined answer in click order. Consume
-  // exact option labels from the front; any remaining text is the Other answer.
-  let remaining = answer;
-  const selected: string[] = [];
-  while (remaining.length > 0) {
-    const label = labels
-      .filter((candidate) => !selected.includes(candidate))
-      .sort((left, right) => right.length - left.length)
-      .find((candidate) => remaining === candidate || remaining.startsWith(`${candidate}, `));
-    if (!label) break;
-    selected.push(label);
-    remaining = remaining === label ? "" : remaining.slice(label.length + 2);
-  }
-  return { selected, custom: remaining || null };
+  return splitMultiSelectAnswer(answer, labels);
 }
 
 /** Owns OMP question mapping and the ask tool's multi-RPC answer sequence. */
diff --git a/packages/server/src/server/agent/providers/opencode/v2/permissions.test.ts b/packages/server/src/server/agent/providers/opencode/v2/permissions.test.ts
index 50a6d98549..69da960c5c 100644
--- a/packages/server/src/server/agent/providers/opencode/v2/permissions.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/v2/permissions.test.ts
@@ -109,7 +109,7 @@ describe("OpenCode v2 question tool", () => {
               { value: "Explore", label: "Explore", description: "Map the codebase" },
               { value: "Fix a bug", label: "Fix a bug", description: "Track down a bug" },
             ],
-            multiple: false,
+            multiSelect: false,
             allowOther: true,
           },
         ],
@@ -129,6 +129,99 @@ describe("OpenCode v2 question tool", () => {
       await session.close();
     }
   });
+
+  test("answers a multi-select question with the checked options and a typed answer", async () => {
+    const harness = new V2Harness();
+    harness.api.session.form.list = async () => [
+      {
+        id: "question",
+        sessionID: "session",
+        title: "Questions",
+        fields: [
+          {
+            key: "q0",
+            title: "Fixes",
+            description: "Which fixes should I make?",
+            type: "multiselect",
+            options: [
+              { value: "delete", label: "Delete both" },
+              { value: "delete-and-fix", label: "Delete both, fix code" },
+              { value: "email", label: "Email the user" },
+            ],
+            custom: true,
+          },
+        ],
+      },
+    ];
+    const answers: Parameters<V2Api["session"]["form"]["reply"]>[0][] = [];
+    harness.api.session.form.reply = async (input) => {
+      answers.push(input);
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    try {
+      const [request] = session.getPendingPermissions();
+      expect(request.input).toMatchObject({ questions: [{ header: "Fixes", multiSelect: true }] });
+      await session.respondToPermission("question", {
+        behavior: "allow",
+        updatedInput: {
+          answers: { Fixes: "Delete both, fix code, Email the user, Also check the logs" },
+        },
+      });
+      expect(answers).toEqual([
+        {
+          sessionID: "session",
+          formID: "question",
+          answer: { q0: ["delete-and-fix", "email", "Also check the logs"] },
+        },
+      ]);
+      expect(session.getPendingPermissions()).toHaveLength(0);
+    } finally {
+      await session.close();
+    }
+  });
+
+  test("rejects typed text on a multi-select question that has no typed answer", async () => {
+    const harness = new V2Harness();
+    harness.api.session.form.list = async () => [
+      {
+        id: "question",
+        sessionID: "session",
+        title: "Questions",
+        fields: [
+          {
+            key: "q0",
+            title: "Fixes",
+            type: "multiselect",
+            options: [{ value: "delete", label: "Delete both" }],
+          },
+        ],
+      },
+    ];
+    const answers: Parameters<V2Api["session"]["form"]["reply"]>[0][] = [];
+    harness.api.session.form.reply = async (input) => {
+      answers.push(input);
+    };
+    const client = new OpenCodeV2AgentClient({
+      logger: createTestLogger(),
+      runtime: harness.runtime,
+    });
+    const session = await client.createSession({ provider: "opencode", cwd: "/tmp/project" });
+    try {
+      await expect(
+        session.respondToPermission("question", {
+          behavior: "allow",
+          updatedInput: { answers: { Fixes: "Delete both, Something else" } },
+        }),
+      ).rejects.toThrow("Invalid answer for OpenCode question q0");
+      expect(answers).toEqual([]);
+    } finally {
+      await session.close();
+    }
+  });
 });
 
 describe("OpenCode v2 permission routing", () => {
diff --git a/packages/server/src/server/agent/providers/opencode/v2/permissions.ts b/packages/server/src/server/agent/providers/opencode/v2/permissions.ts
index cc13b99e4b..cb33e0652e 100644
--- a/packages/server/src/server/agent/providers/opencode/v2/permissions.ts
+++ b/packages/server/src/server/agent/providers/opencode/v2/permissions.ts
@@ -7,6 +7,7 @@ import type {
   AgentSessionConfig,
   AgentStreamEvent,
 } from "../../../agent-sdk-types.js";
+import { splitMultiSelectAnswer } from "../../question-card-answer.js";
 
 export class SessionPermissions {
   private readonly pending = new Map<string, AgentPermissionRequest>();
@@ -109,7 +110,7 @@ export class SessionPermissions {
             header: field.title ?? field.key,
             question: field.description ?? field.title ?? field.key,
             options: "options" in field ? field.options : undefined,
-            multiple: field.type === "multiselect",
+            multiSelect: field.type === "multiselect",
             allowOther: "custom" in field && field.custom === true,
           })),
         },
@@ -143,8 +144,8 @@ function formAnswer(field: FormInfo["fields"][number], value: unknown): FormValu
     );
   };
   if (field.type === "multiselect") {
-    if (Array.isArray(value) && value.every((item: unknown) => typeof item === "string"))
-      return value.map(labelValue);
+    const selected = multiSelectAnswer(field, value);
+    if (selected) return selected.map(labelValue);
   } else if (field.type === "string" && typeof value === "string") {
     return labelValue(value);
   } else if (field.type === "boolean") {
@@ -162,3 +163,17 @@ function formAnswer(field: FormInfo["fields"][number], value: unknown): FormValu
   }
   throw new Error(`Invalid answer for OpenCode question ${field.key}`);
 }
+
+type MultiSelectField = Extract<FormInfo["fields"][number], { type: "multiselect" }>;
+
+function multiSelectAnswer(field: MultiSelectField, value: unknown): string[] | undefined {
+  if (Array.isArray(value) && value.every((item: unknown) => typeof item === "string"))
+    return value;
+  if (typeof value !== "string") return undefined;
+  const { selected, custom } = splitMultiSelectAnswer(
+    value,
+    field.options.map((option) => option.label),
+  );
+  if (custom === null) return selected;
+  return field.custom === true ? [...selected, custom] : undefined;
+}
diff --git a/packages/server/src/server/agent/providers/question-card-answer.test.ts b/packages/server/src/server/agent/providers/question-card-answer.test.ts
new file mode 100644
index 0000000000..c7049fa7dc
--- /dev/null
+++ b/packages/server/src/server/agent/providers/question-card-answer.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, test } from "vitest";
+
+import { splitMultiSelectAnswer } from "./question-card-answer.js";
+
+describe("splitMultiSelectAnswer", () => {
+  const labels = ["Delete both", "Delete both, fix code", "Email the user"];
+
+  test("splits checked labels in click order", () => {
+    expect(splitMultiSelectAnswer("Email the user, Delete both", labels)).toEqual({
+      selected: ["Email the user", "Delete both"],
+      custom: null,
+    });
+  });
+
+  test("keeps a label that contains a comma as one selection", () => {
+    expect(splitMultiSelectAnswer("Delete both, fix code, Email the user", labels)).toEqual({
+      selected: ["Delete both, fix code", "Email the user"],
+      custom: null,
+    });
+  });
+
+  test("returns trailing text as the typed answer", () => {
+    expect(splitMultiSelectAnswer("Delete both, Also check the logs", labels)).toEqual({
+      selected: ["Delete both"],
+      custom: "Also check the logs",
+    });
+    expect(splitMultiSelectAnswer("Only typed text", labels)).toEqual({
+      selected: [],
+      custom: "Only typed text",
+    });
+  });
+});
diff --git a/packages/server/src/server/agent/providers/question-card-answer.ts b/packages/server/src/server/agent/providers/question-card-answer.ts
new file mode 100644
index 0000000000..01513869c9
--- /dev/null
+++ b/packages/server/src/server/agent/providers/question-card-answer.ts
@@ -0,0 +1,23 @@
+/**
+ * The shared question card sends a multi-select answer as one string: the checked option
+ * labels in click order, then any typed answer, joined with ", ". Consume exact option
+ * labels from the front, longest first so a label containing ", " wins over its prefix;
+ * any remaining text is the typed answer.
+ */
+export function splitMultiSelectAnswer(
+  answer: string,
+  labels: string[],
+): { selected: string[]; custom: string | null } {
+  let remaining = answer;
+  const selected: string[] = [];
+  while (remaining.length > 0) {
+    const label = labels
+      .filter((candidate) => !selected.includes(candidate))
+      .sort((left, right) => right.length - left.length)
+      .find((candidate) => remaining === candidate || remaining.startsWith(`${candidate}, `));
+    if (!label) break;
+    selected.push(label);
+    remaining = remaining === label ? "" : remaining.slice(label.length + 2);
+  }
+  return { selected, custom: remaining || null };
+}

From e08389065c65630993e80c27f4c249a0b0423eb7 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 21:13:00 +0700
Subject: [PATCH 182/270] fix(plugins): allow protocol type imports without
 local dependencies (#7023)

Protocol contracts are available through the SDK peer dependency during development, but clean Git installs lack that dependency tree. Accept erased protocol type imports while retaining runtime dependency resolution and SDK ownership checks.
---
 .../src/server/plugins/compiler.test.ts       | 45 +++++++++++++++++++
 .../server/src/server/plugins/compiler.ts     |  4 ++
 2 files changed, 49 insertions(+)

diff --git a/packages/server/src/server/plugins/compiler.test.ts b/packages/server/src/server/plugins/compiler.test.ts
index facba48fdb..fc86f85db3 100644
--- a/packages/server/src/server/plugins/compiler.test.ts
+++ b/packages/server/src/server/plugins/compiler.test.ts
@@ -138,6 +138,51 @@ async function createRootAlias(directory: string): Promise<string> {
 }
 
 describe("plugin runtime entries", () => {
+  it.each([
+    'import type { AgentTimelineItem, ToolCallDetail } from "@getpaseo/protocol/agent-types"; export type Detail = ToolCallDetail; export type Item = AgentTimelineItem;',
+    'import { type AgentTimelineItem } from "@getpaseo/protocol/agent-types"; export type Item = AgentTimelineItem;',
+    'export type { AgentTimelineItem } from "@getpaseo/protocol/agent-types";',
+    'export type Item = import("@getpaseo/protocol/agent-types").AgentTimelineItem;',
+    'export type { AgentAttachment } from "@getpaseo/protocol/messages";',
+  ])("compiles protocol types without local dependencies: %s", async (typeSource) => {
+    const entries = await createSplitPlugin();
+    await writeFile(
+      path.join(entries.directory, "shared", "labels.ts"),
+      `${typeSource}\nexport const clientLabel = "Client contribution"; export const serverLabel = "Server contribution";`,
+    );
+
+    const result = await compilePlugin(entries);
+
+    expect(result.clientBundle).toContain("Client contribution");
+    expect(result.serverBundle).toContain("Server contribution");
+    expect(result.clientBundle).not.toContain("@getpaseo/protocol");
+    expect(result.serverBundle).not.toContain("@getpaseo/protocol");
+  });
+
+  it("still requires local dependencies for protocol runtime imports", async () => {
+    const entries = await createSplitPlugin();
+    await writeFile(
+      entries.server,
+      'import { TOOL_CALL_ICON_NAMES } from "@getpaseo/protocol/agent-types"; export default () => TOOL_CALL_ICON_NAMES;',
+    );
+
+    await expect(compilePlugin(entries)).rejects.toThrow(
+      'Could not resolve "@getpaseo/protocol/agent-types"',
+    );
+  });
+
+  it("still rejects missing third-party type dependencies", async () => {
+    const entries = await createSplitPlugin();
+    await writeFile(
+      entries.client,
+      'import type { Item } from "missing-types"; export default (item: Item) => item;',
+    );
+
+    await expect(compilePlugin(entries)).rejects.toThrow(
+      'Could not resolve type dependency "missing-types"',
+    );
+  });
+
   it.each([
     "react",
     "react/jsx-runtime",
diff --git a/packages/server/src/server/plugins/compiler.ts b/packages/server/src/server/plugins/compiler.ts
index 15df395d06..b48449bb50 100644
--- a/packages/server/src/server/plugins/compiler.ts
+++ b/packages/server/src/server/plugins/compiler.ts
@@ -245,6 +245,10 @@ function createRuntimeBoundaryPlugin(target: PluginBuildTarget, pluginDirectory:
             runtimeSpecifierError(packageSpecifier, owner, file) ??
             lexicalBoundaryError(specifier, path.dirname(file), pluginDirectory, owner);
           if (error) return error;
+          // Protocol types are shared host contracts, also exposed by the SDK's peer
+          // dependency during development. Erased imports need no plugin-local install;
+          // runtime imports still go through normal dependency resolution below.
+          if (typeOnly && specifier.startsWith("@getpaseo/protocol/")) continue;
           // Host modules have separately enforced SDK boundaries and need no local installation.
           if (
             (PLUGIN_SDK_SPECIFIERS as readonly string[]).includes(specifier) ||

From 16bb179e67f361817eda76537381c3b135a8ef75 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 21:25:23 +0700
Subject: [PATCH 183/270] feat(providers): add opt-in Hoplite and searchable
 provider grid (#6953)

Preserve the bundled Hoplite ACP adapter and provisioning transformer, activate it only after Add, and provide a searchable provider grid. Restore the contributor's original icon without the copyright mark.

Co-authored-by: Odin Glynn-Martin <odin.glynn@icloud.com>
---
 docs/custom-providers.md                      |   2 +-
 docs/plugins.md                               |   6 +
 .../e2e/browser/acp-provider-catalog.spec.ts  | 137 +++++++-
 .../agent-timeline-scroll-smoothness.spec.ts  |  52 +++
 packages/app/e2e/support/helpers/settings.ts  |   2 +-
 .../helpers/timeline-scroll-smoothness.ts     |  36 ++-
 packages/app/src/assets/acp-provider-icons.ts |   2 +
 .../src/assets/acp-provider-icons/hoplite.svg |   1 +
 .../src/components/provider-catalog-list.tsx  | 304 ++++++++----------
 .../provider-catalog-search.test.ts           |  45 +++
 .../src/components/provider-catalog-search.ts |  34 ++
 packages/app/src/data/acp-provider-catalog.ts |  12 +
 .../hooks/use-acp-provider-catalog.test.ts    |  27 ++
 .../app/src/hooks/use-acp-provider-catalog.ts |   6 +
 packages/app/src/i18n/resources/ar.ts         |   5 +
 packages/app/src/i18n/resources/en.ts         |   5 +
 packages/app/src/i18n/resources/es.ts         |   5 +
 packages/app/src/i18n/resources/fr.ts         |   5 +
 packages/app/src/i18n/resources/ja.ts         |   5 +
 packages/app/src/i18n/resources/ko.ts         |   5 +
 packages/app/src/i18n/resources/pt-BR.ts      |   5 +
 packages/app/src/i18n/resources/ru.ts         |   5 +
 packages/app/src/i18n/resources/zh-CN.ts      |   5 +
 .../screens/settings/providers-section.tsx    |  29 +-
 .../src/server/acp-internal/connection.ts     |  40 ++-
 packages/plugin/src/server/acp.test.ts        | 140 ++++++++
 packages/plugin/src/server/provider.ts        |   2 +
 .../src/messages.checkout-pr-schema.test.ts   |  11 +
 packages/protocol/src/messages.ts             |   2 +
 packages/protocol/src/provider-icon-names.ts  |   1 +
 .../src/server/agent/plugin-provider.test.ts  |  47 +++
 .../src/server/agent/plugin-provider.ts       |   1 +
 .../src/server/agent/provider-registry.ts     |   3 +
 .../server/agent/provider-snapshot-manager.ts |   4 +
 .../src/server/daemon-e2e/hoplite-fixture.cjs |  37 +++
 .../src/server/daemon-e2e/models.e2e.test.ts  | 125 ++++++-
 .../src/server/plugins/builtin/index.ts       |   1 +
 packages/server/src/server/plugins/index.ts   |   1 +
 .../server/plugins/plugin-process-protocol.ts |   2 +
 .../src/server/plugins/plugin-process.ts      |   1 +
 .../src/server/test-utils/session-stubs.ts    |   1 +
 .../websocket-server.relay-reconnect.test.ts  |   1 +
 .../server/src/server/websocket-server.ts     |   1 +
 packages/server/vitest.config.ts              |   6 +-
 plugins/hoplite-provider/icon.svg             |   1 +
 plugins/hoplite-provider/index.server.ts      |   7 +
 plugins/hoplite-provider/paseo-plugin.json    |   1 +
 plugins/hoplite-provider/server/provider.ts   |  17 +
 .../hoplite-provider/server/run-phase.test.ts |  74 +++++
 plugins/hoplite-provider/server/run-phase.ts  |  39 +++
 public-docs/supported-providers.md            |  16 +
 51 files changed, 1126 insertions(+), 196 deletions(-)
 create mode 100644 packages/app/src/assets/acp-provider-icons/hoplite.svg
 create mode 100644 packages/app/src/components/provider-catalog-search.test.ts
 create mode 100644 packages/app/src/components/provider-catalog-search.ts
 create mode 100644 packages/server/src/server/daemon-e2e/hoplite-fixture.cjs
 create mode 100644 plugins/hoplite-provider/icon.svg
 create mode 100644 plugins/hoplite-provider/index.server.ts
 create mode 100644 plugins/hoplite-provider/paseo-plugin.json
 create mode 100644 plugins/hoplite-provider/server/provider.ts
 create mode 100644 plugins/hoplite-provider/server/run-phase.test.ts
 create mode 100644 plugins/hoplite-provider/server/run-phase.ts

diff --git a/docs/custom-providers.md b/docs/custom-providers.md
index efc5fdf24f..a6c6cefbdc 100644
--- a/docs/custom-providers.md
+++ b/docs/custom-providers.md
@@ -484,7 +484,7 @@ The [Agent Client Protocol (ACP)](https://agentclientprotocol.com) is an open st
 
 ACP agents communicate over JSON-RPC 2.0 on stdio. Paseo spawns the agent process and talks to it through stdin/stdout.
 
-Paseo also ships an in-app ACP provider catalog for common agents, including CodeWhale, Cursor, DeepAgents, DimCode, Gemini CLI, Hermes, Qwen Code, and Kimi Code. Catalog entries create the same `extends: "acp"` provider config shown below.
+Paseo also ships an in-app ACP provider catalog for common agents, including CodeWhale, Cursor, DeepAgents, DimCode, Gemini CLI, Hermes, Qwen Code, and Kimi Code. Most catalog entries create the same `extends: "acp"` provider config shown below. Hoplite activates its [bundled provider](plugins.md#built-in-plugins) instead.
 
 ### Adding a generic ACP provider
 
diff --git a/docs/plugins.md b/docs/plugins.md
index 866c74128e..4e1985ea81 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -107,6 +107,12 @@ absent from the installed plugin list and source configuration; their client bun
 appear in the plugin catalog. Editing one in development requires a daemon restart.
 Directory, Git, and npm installs cannot use a built-in ID.
 
+A provider registration with `requiresConfiguration: true` participates only while its ID exists
+under `agents.providers`. Hoplite uses this for catalog opt-in. Add writes `{ "enabled": true }`
+without `extends`, so it selects the bundled adapter. Remove deletes the config entry; setting
+`enabled: false` keeps the entry. The bundled JavaScript still loads at startup, but an absent
+provider does not enter executable resolution or catalog discovery.
+
 Provider plugins use separate installation and provider IDs. `muse-provider` registers the
 selectable `muse` provider (Muse Code) and a usage source. Its `status({ launch })` reports
 availability and a diagnostic after the daemon resolves the executable. Configure command,
diff --git a/packages/app/e2e/browser/acp-provider-catalog.spec.ts b/packages/app/e2e/browser/acp-provider-catalog.spec.ts
index a0d94e5c02..d6ebb8f547 100644
--- a/packages/app/e2e/browser/acp-provider-catalog.spec.ts
+++ b/packages/app/e2e/browser/acp-provider-catalog.spec.ts
@@ -1,13 +1,24 @@
-import { test } from "../support/fixtures";
+import {
+  closeModelPicker,
+  openModelPicker,
+  seedAgentProfiles,
+} from "../support/helpers/agent-profiles";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { writeFile } from "node:fs/promises";
+import { expect, test } from "../support/fixtures";
 import { gotoAppShell, openSettings } from "../support/helpers/app";
 import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
 import { getServerId } from "../support/helpers/server-id";
 import {
   expectProviderInstalledInSettings,
+  findAcpCatalogProvider,
   installAcpCatalogProvider,
   openAddProviderArea,
   openSettingsHost,
   openSettingsHostSection,
+  seedSavedSettingsHosts,
 } from "../support/helpers/settings";
 
 const ACP_PROVIDER = {
@@ -16,8 +27,13 @@ const ACP_PROVIDER = {
 };
 
 interface ProviderCatalogDaemonClient {
+  getLastServerInfoMessage(): {
+    features?: { hopliteProvider?: boolean; plugins?: boolean };
+  } | null;
   connect(): Promise<void>;
   close(): Promise<void>;
+  getDaemonConfig(): Promise<{ config: { providers?: Record<string, unknown> } }>;
+  getProvidersSnapshot(): Promise<{ entries: Array<{ provider: string }> }>;
   patchDaemonConfig(config: { removeProviders?: string[] }): Promise<unknown>;
 }
 
@@ -41,3 +57,122 @@ test.describe("ACP provider catalog", () => {
     }
   });
 });
+
+for (const theme of ["light", "dark"] as const) {
+  test(`adds Hoplite from the catalog in ${theme} theme`, async ({ page }, testInfo) => {
+    const client = await connectDaemonClient<ProviderCatalogDaemonClient>({
+      clientIdPrefix: "hoplite-catalog-e2e",
+    });
+    try {
+      expect(client.getLastServerInfoMessage()?.features?.hopliteProvider).toBe(true);
+      await client.patchDaemonConfig({ removeProviders: ["hoplite"] });
+      expect(
+        (await client.getProvidersSnapshot()).entries.some((entry) => entry.provider === "hoplite"),
+      ).toBe(false);
+      await page.addInitScript((value) => {
+        localStorage.setItem("@paseo:app-settings", JSON.stringify({ theme: value }));
+      }, theme);
+      await gotoAppShell(page);
+      await openSettings(page);
+      await openSettingsHost(page, getServerId());
+      await openSettingsHostSection(page, getServerId(), "providers");
+      await expect(
+        page.getByRole("button", { name: "Hoplite provider details", exact: true }),
+      ).toHaveCount(0);
+      await openAddProviderArea(page);
+      await findAcpCatalogProvider(page, "Hoplite");
+      await page.screenshot({ path: testInfo.outputPath(`hoplite-catalog-${theme}.png`) });
+      await installAcpCatalogProvider(page, "Hoplite");
+      await expectProviderInstalledInSettings(page, "Hoplite");
+      await page.screenshot({ path: testInfo.outputPath(`hoplite-installed-${theme}.png`) });
+      expect((await client.getDaemonConfig()).config.providers?.hoplite).toEqual({ enabled: true });
+      await writeFile(
+        testInfo.outputPath(`hoplite-added-${theme}.json`),
+        JSON.stringify(await client.getProvidersSnapshot(), null, 2),
+      );
+      await removeHoplite(page);
+      await expect(
+        page.getByRole("button", { name: "Hoplite provider details", exact: true }),
+      ).toHaveCount(0);
+      expect((await client.getDaemonConfig()).config.providers?.hoplite).toBeUndefined();
+      expect(
+        (await client.getProvidersSnapshot()).entries.some((entry) => entry.provider === "hoplite"),
+      ).toBe(false);
+      await writeFile(
+        testInfo.outputPath(`hoplite-removed-${theme}.json`),
+        JSON.stringify(await client.getProvidersSnapshot(), null, 2),
+      );
+      await openAddProviderArea(page);
+      await findAcpCatalogProvider(page, "Hoplite");
+      await page.screenshot({ path: testInfo.outputPath(`hoplite-removed-${theme}.png`) });
+      await installAcpCatalogProvider(page, "Hoplite");
+      await expectProviderInstalledInSettings(page, "Hoplite");
+    } finally {
+      await client.patchDaemonConfig({ removeProviders: ["hoplite"] }).catch(() => undefined);
+      await client.close().catch(() => undefined);
+    }
+  });
+}
+
+async function removeHoplite(page: import("@playwright/test").Page): Promise<void> {
+  await page.getByTestId("provider-actions-hoplite").click();
+  page.once("dialog", (dialog) => {
+    void dialog.accept();
+  });
+  await page.getByTestId("provider-remove-hoplite").click();
+}
+
+test("unsupported host asks for an update without writing Hoplite config", async ({
+  page,
+  outdatedDaemon,
+}, testInfo) => {
+  const client = await connectDaemonClient<ProviderCatalogDaemonClient>({
+    clientIdPrefix: "hoplite-unsupported",
+    port: Number(new URL(`http://${outdatedDaemon.endpoint}`).port),
+  });
+  try {
+    expect(client.getLastServerInfoMessage()?.features?.plugins).toBe(true);
+    expect(client.getLastServerInfoMessage()?.features?.hopliteProvider).toBe(false);
+    const before = await client.getDaemonConfig();
+    await seedSavedSettingsHosts(page, [outdatedDaemon]);
+    await page.reload();
+    await openSettings(page);
+    await openSettingsHost(page, outdatedDaemon.serverId);
+    await openSettingsHostSection(page, outdatedDaemon.serverId, "providers");
+    await openAddProviderArea(page);
+    await installAcpCatalogProvider(page, "Hoplite");
+    await expect(page.getByRole("alert")).toHaveText("Update the host to add Hoplite.");
+    expect((await client.getDaemonConfig()).config).toEqual(before.config);
+    await expect(
+      page.getByRole("button", { name: "Hoplite provider details", exact: true }),
+    ).toHaveCount(0);
+    await page.screenshot({ path: testInfo.outputPath("hoplite-update-host.png") });
+  } finally {
+    await client.close();
+  }
+});
+
+test("model selector excludes Hoplite before opt-in", async ({ page }, testInfo) => {
+  const client = await connectDaemonClient<ProviderCatalogDaemonClient>({
+    clientIdPrefix: "hoplite-picker",
+  });
+  const profiles = await seedAgentProfiles([
+    { id: "hoplite-picker-anchor", name: "Picker anchor", provider: "mock" },
+  ]);
+  const workspace = await seedWorkspace({ repoPrefix: "hoplite-picker-" });
+  try {
+    await client.patchDaemonConfig({ removeProviders: ["hoplite"] });
+    await gotoWorkspace(page, workspace.workspaceId);
+    await clickNewChat(page);
+    await expectComposerVisible(page);
+    await openModelPicker(page);
+    await expect(page.getByTestId("model-provider-mock")).toBeVisible();
+    await expect(page.getByTestId("model-provider-hoplite")).toHaveCount(0);
+    await page.screenshot({ path: testInfo.outputPath("hoplite-model-selector-absent.png") });
+    await closeModelPicker(page);
+  } finally {
+    await workspace.cleanup();
+    await profiles.restore();
+    await client.close();
+  }
+});
diff --git a/packages/app/e2e/browser/agent-timeline-scroll-smoothness.spec.ts b/packages/app/e2e/browser/agent-timeline-scroll-smoothness.spec.ts
index feceed7869..73c662124f 100644
--- a/packages/app/e2e/browser/agent-timeline-scroll-smoothness.spec.ts
+++ b/packages/app/e2e/browser/agent-timeline-scroll-smoothness.spec.ts
@@ -133,6 +133,58 @@ test("scroll detector accounts for delayed wheel input and growth below the new
   ).toHaveLength(1);
 });
 
+test("scroll detector follows the entered image through resize and virtual offset correction", () => {
+  for (const height of [225, 1632]) {
+    const before: ScrollFrame = {
+      at: 1000,
+      scrollTop: 2208,
+      scrollHeight: 5000,
+      viewportHeight: 516,
+      virtualized: true,
+      loading: false,
+      rows: [
+        { id: "image", top: -704, height: 560 },
+        { id: "caption", top: -144, height: 100 },
+        { id: "old-reader", top: -44, height: 127 },
+      ],
+      anchor: "old-reader",
+      wheelTotal: 0,
+      lastWheelAt: 0,
+      inputFinishedAt: null,
+      imageLoads: 0,
+      mounted: 3,
+      unmounted: 0,
+    };
+    const resize = height - 560;
+    const after: ScrollFrame = {
+      ...before,
+      at: 1060,
+      // The virtualizer corrects 110px of estimates while the wheel moves 160px.
+      scrollTop: 1938,
+      scrollHeight: 5000 + resize - 110,
+      wheelTotal: 160,
+      lastWheelAt: 1020,
+      imageLoads: 1,
+      rows: [
+        { id: "image", top: -544, height },
+        { id: "caption", top: 16 + resize, height: 100 },
+        { id: "old-reader", top: 116 + resize, height: 127 },
+      ],
+    };
+    expect(findScrollJumps([before, after])).toEqual([]);
+    // Resizing must not excuse additional viewport movement.
+    expect(
+      findScrollJumps([
+        before,
+        {
+          ...after,
+          rows: after.rows.map((row) => ({ id: row.id, height: row.height, top: row.top + 100 })),
+        },
+      ]),
+    ).toHaveLength(1);
+  }
+});
+
 for (const cadence of scrollCadences) {
   test(`varied timeline preserves reading position during ${cadence.name} upward scrolling`, async ({
     page,
diff --git a/packages/app/e2e/support/helpers/settings.ts b/packages/app/e2e/support/helpers/settings.ts
index 1702f7fe44..6b810e6d13 100644
--- a/packages/app/e2e/support/helpers/settings.ts
+++ b/packages/app/e2e/support/helpers/settings.ts
@@ -370,7 +370,7 @@ export async function findAcpCatalogProvider(page: Page, providerName: string):
 
 export async function installAcpCatalogProvider(page: Page, providerName: string): Promise<void> {
   await findAcpCatalogProvider(page, providerName);
-  await page.getByRole("button", { name: "Add", exact: true }).click();
+  await page.getByRole("button", { name: `Add ${providerName}`, exact: true }).click();
 }
 
 export async function expectProviderInstalledInSettings(
diff --git a/packages/app/e2e/support/helpers/timeline-scroll-smoothness.ts b/packages/app/e2e/support/helpers/timeline-scroll-smoothness.ts
index 01055ce2c1..f7b62fd953 100644
--- a/packages/app/e2e/support/helpers/timeline-scroll-smoothness.ts
+++ b/packages/app/e2e/support/helpers/timeline-scroll-smoothness.ts
@@ -297,11 +297,7 @@ export function findScrollJumps(frames: ScrollFrame[]) {
     // Follow that intended row, not text now below the image.
     const recent = frames.findLast((frame) => frame.at <= previous.at - 100);
     const wheelBudget = current.wheelTotal - (recent?.wheelTotal ?? 0);
-    const frameScroll = Math.max(0, previous.scrollTop - current.scrollTop);
-    const availableScroll = Math.min(frameScroll, wheelBudget, previous.scrollTop);
-    const readingLine = 8 - availableScroll;
     const currentRows = new Map(current.rows.map((row) => [row.id, row]));
-    const intendedRow = previous.rows.find((row) => row.top + row.height > readingLine);
     const anchor = previous.anchor;
     const before = currentRows.has(anchor)
       ? previous.rows.find((row) => row.id === anchor)!
@@ -316,25 +312,33 @@ export function findScrollJumps(frames: ScrollFrame[]) {
     // A busy main thread can deliver wheel movement hundreds of milliseconds
     // after its event. Only assert idle stability after the driver stops input.
     const idle = current.inputFinishedAt !== null && previous.at - current.inputFinishedAt > 250;
-    // Wheel events can precede their scroll update, or include input already
-    // applied in earlier frames. Locate the reader with this frame's scroll,
-    // bounded by recent input. Growth below it can move the old anchor without
-    // moving the reading line.
-    const readerFollowsInput =
-      intendedRow &&
-      currentRows.has(intendedRow.id) &&
-      Math.abs(currentRows.get(intendedRow.id)!.top - intendedRow.top - availableScroll) <= 32;
-    const enteredRowGrowth = readerFollowsInput
+    // scrollTop also includes virtualizer estimate corrections. Locate the row
+    // entered by wheel input from its viewport movement instead. Its old height
+    // identifies the reader before a simultaneous image resize takes effect.
+    const intendedRow = previous.rows.find((row) => {
+      const next = currentRows.get(row.id);
+      if (!next || idle || wheelBudget <= 0) return false;
+      const travel = next.top - row.top;
+      return (
+        travel >= -8 &&
+        travel <= Math.min(wheelBudget, previous.scrollTop) + 32 &&
+        (next.top <= 8 || current.scrollTop === 0) &&
+        next.top + row.height > 8
+      );
+    });
+    const enteredRowResize = intendedRow
       ? previous.rows.reduce((growth, row) => {
           if (row.top < intendedRow.top || row.top >= before.top) return growth;
           const height = currentRows.get(row.id)?.height ?? row.height;
-          return growth + Math.max(0, height - row.height);
+          return growth + height - row.height;
         }, 0)
       : 0;
-    const excessForward = movement > wheelBudget + enteredRowGrowth + 32;
+    const readingMovement = movement - enteredRowResize;
+    const excessForward = readingMovement > wheelBudget + 32;
     // Upward wheel input moves the same text DOWN the viewport. A negative move
     // is a reversal, independent of legitimate scrollTop compensation on prepend.
-    if (movement >= -8 && (!idle || Math.abs(movement) <= 8) && !excessForward) return [];
+    if (readingMovement >= -8 && (!idle || Math.abs(readingMovement) <= 8) && !excessForward)
+      return [];
     return [
       {
         frame: index,
diff --git a/packages/app/src/assets/acp-provider-icons.ts b/packages/app/src/assets/acp-provider-icons.ts
index 65f123cb3d..cebb4ca76d 100644
--- a/packages/app/src/assets/acp-provider-icons.ts
+++ b/packages/app/src/assets/acp-provider-icons.ts
@@ -48,6 +48,8 @@ export const ACP_PROVIDER_ICON_SVGS = {
   goose:
     '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">\n  <path fill="currentColor" d="M20.9093 19.3861L19.5185 18.2413C18.7624 17.619 18.1189 16.8713 17.6157 16.0313C16.9205 14.8706 15.9599 13.8912 14.8133 13.1735L14.2533 12.8475C14.0614 12.7141 13.9276 12.5062 13.9086 12.2716C13.8963 12.1204 13.9326 11.9852 14.0171 11.8662C14.3087 11.4553 15.896 9.74698 16.1722 9.51845C16.528 9.22442 16.9243 8.97987 17.2921 8.69986C17.3443 8.66 17.3968 8.62035 17.4485 8.57989C17.4503 8.57808 17.4529 8.57668 17.4545 8.57508C17.5725 8.48195 17.6838 8.383 17.7724 8.26563C18.2036 7.76631 18.195 7.3443 18.195 7.3443C18.195 7.3443 18.1954 7.3439 18.1956 7.3437C18.1497 7.23133 17.9847 6.88163 17.6492 6.71759C17.9458 6.71178 18.2805 6.82294 18.4323 6.97156C18.6148 6.68534 18.7328 6.49967 18.9162 6.18762C18.9599 6.11352 18.9831 5.97652 18.8996 5.89981C18.8996 5.89981 18.8992 5.89981 18.8988 5.89981C18.8988 5.89981 18.8988 5.8994 18.8988 5.899C18.8972 5.8974 18.8952 5.8962 18.8936 5.8946C18.892 5.893 18.891 5.89119 18.8892 5.88939C18.8892 5.88939 18.8888 5.88939 18.8884 5.88939C18.8884 5.88939 18.8884 5.88899 18.8884 5.88859C18.885 5.88518 18.8812 5.88258 18.8776 5.87938C18.8754 5.87717 18.8736 5.87457 18.8716 5.87217C18.8692 5.87016 18.8665 5.86836 18.8643 5.86616C18.8609 5.86275 18.8587 5.85855 18.8551 5.85534C18.8551 5.85534 18.8545 5.85514 18.8543 5.85534C18.8543 5.85534 18.8543 5.85494 18.8543 5.85454C18.8527 5.85294 18.8507 5.85174 18.8491 5.85013C18.8475 5.84853 18.8463 5.84653 18.8447 5.84493C18.8447 5.84493 18.8441 5.84473 18.8439 5.84493C18.8439 5.84493 18.8439 5.84453 18.8439 5.84413C18.7672 5.7606 18.6302 5.78384 18.5561 5.8275C18.1503 6.06625 17.7555 6.32322 17.3996 6.54855C17.3996 6.54855 16.9778 6.53973 16.4783 6.97116C16.3607 7.05989 16.2618 7.17125 16.1688 7.28902C16.167 7.29082 16.1654 7.29322 16.164 7.29503C16.1234 7.3465 16.0837 7.39898 16.0441 7.45145C15.7639 7.81939 15.5195 8.21556 15.2255 8.57128C14.9971 8.84768 13.2887 10.4348 12.8777 10.7264C12.7587 10.8109 12.6237 10.8474 12.4723 10.835C12.2379 10.8161 12.0298 10.6821 11.8965 10.4903L11.5704 9.93024C10.8527 8.78318 9.87332 7.82299 8.71264 7.12778C7.87262 6.62466 7.12514 5.98092 6.50264 5.22503L5.35778 3.83421C5.3013 3.76571 5.19314 3.77693 5.15268 3.85585C5.02249 4.10941 4.77393 4.64479 4.58346 5.36483C4.57885 5.38186 4.58286 5.39988 4.59407 5.4135C4.83082 5.69952 5.37901 6.32983 6.03196 6.863C6.07742 6.90005 6.04017 6.97336 5.98369 6.95774C5.42047 6.80432 4.87288 6.55796 4.46308 6.34805C4.42964 6.33103 4.38918 6.35226 4.38437 6.38951C4.32068 6.89985 4.30425 7.46027 4.37155 8.05112C4.37355 8.07035 4.38577 8.08697 4.4036 8.09479C4.87088 8.29808 5.61816 8.59311 6.40269 8.78078C6.45958 8.7944 6.45777 8.87632 6.40029 8.88733C5.78941 9.0023 5.14968 9.02794 4.62973 9.02113C4.59327 9.02073 4.56643 9.05518 4.57625 9.09023C4.6806 9.45896 4.822 9.8339 5.00847 10.2115C5.08559 10.3811 5.16951 10.5475 5.25944 10.7104C5.27486 10.7382 5.3047 10.7548 5.33655 10.7534C5.76577 10.7324 6.28452 10.6871 6.80608 10.595C6.89501 10.5794 6.94268 10.6964 6.86757 10.7466C6.51345 10.9834 6.13571 11.1873 5.7844 11.3551C5.73733 11.3777 5.72211 11.4378 5.75315 11.4797C5.96186 11.7625 6.19139 12.0301 6.44075 12.2794C6.44075 12.2794 7.66853 13.5441 7.70198 13.6432C8.41841 12.9096 9.59612 12.0964 10.8966 11.3864C9.15488 12.8036 8.18387 13.8499 7.69517 14.4444L7.35447 14.9225C7.17742 15.1708 7.02379 15.4346 6.89541 15.7112C6.46579 16.6356 5.75756 18.5051 5.75756 18.5051C5.70328 18.6515 5.74754 18.7959 5.84168 18.89C5.84388 18.8922 5.84609 18.8944 5.84849 18.8964C5.85069 18.8986 5.8527 18.901 5.8549 18.9032C5.94924 18.9976 6.09345 19.0416 6.23986 18.9874C6.23986 18.9874 8.10897 18.2791 9.03371 17.8495C9.31031 17.7211 9.57429 17.5673 9.82245 17.3905L10.349 17.0153C10.6278 16.8166 11.0096 16.8483 11.2517 17.0904L12.4655 18.3042C12.7148 18.5535 12.9824 18.7831 13.2652 18.9918C13.3073 19.0226 13.3672 19.0076 13.3898 18.9605C13.5579 18.6094 13.7618 18.2313 13.9983 17.8774C14.0486 17.8022 14.1657 17.8501 14.1499 17.9388C14.0576 18.4606 14.0127 18.9794 13.9915 19.4084C13.9899 19.44 14.0067 19.4701 14.0345 19.4855C14.1972 19.5756 14.3636 19.6595 14.5335 19.7364C14.911 19.9229 15.2862 20.0645 15.6547 20.1687C15.6897 20.1785 15.7242 20.1516 15.7238 20.1152C15.7168 19.595 15.7424 18.9553 15.8576 18.3446C15.8684 18.2869 15.9503 18.2851 15.9641 18.3422C16.1516 19.127 16.4466 19.8742 16.6501 20.3413C16.6579 20.3591 16.6744 20.3712 16.6938 20.3734C17.2847 20.4407 17.8451 20.4242 18.3554 20.3606C18.3929 20.3559 18.4141 20.3155 18.3969 20.2818C18.187 19.872 17.9406 19.3241 17.7872 18.7612C17.7718 18.7046 17.8449 18.6675 17.8819 18.713C18.4151 19.3659 19.0454 19.9141 19.3314 20.1508C19.345 20.1621 19.3633 20.1659 19.3801 20.1615C20.1003 19.9712 20.6357 19.7226 20.8891 19.5922C20.968 19.5518 20.9792 19.4436 20.9107 19.3871L20.9093 19.3861Z"/>\n</svg>\n',
   grok: '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 1024 1024" fill="none">\n  <path fill="currentColor" d="M395.479 633.828L735.91 381.105C752.599 368.715 776.454 373.548 784.406 392.792C826.26 494.285 807.561 616.253 724.288 699.996C641.016 783.739 525.151 802.104 419.247 760.277L303.556 814.143C469.49 928.202 670.987 899.995 796.901 773.282C896.776 672.843 927.708 535.937 898.785 412.476L899.047 412.739C857.105 231.37 909.358 158.874 1016.4 10.6326C1018.93 7.11771 1021.47 3.60279 1024 0L883.144 141.651V141.212L395.392 633.916"/>\n  <path fill="currentColor" d="M325.226 695.251C206.128 580.84 226.662 403.776 328.285 301.668C403.431 226.097 526.549 195.254 634.026 240.596L749.454 186.994C728.657 171.88 702.007 155.623 671.424 144.2C533.19 86.9942 367.693 115.465 255.323 228.382C147.234 337.081 113.244 504.215 171.613 646.833C215.216 753.423 143.739 828.818 71.7385 904.916C46.2237 931.893 20.6216 958.87 0 987.429L325.139 695.339"/>\n</svg>\n',
+  hoplite:
+    '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="1.394 1.679 8.494 7.828" fill="currentColor"><path d="M8.237 7.813C8.276 7.789 8.327 7.796 8.358 7.83L9.741 9.346C9.797 9.407 9.754 9.506 9.671 9.507H8.977C8.924 9.507 8.881 9.463 8.881 9.41V9.125C8.881 9.089 8.861 9.057 8.83 9.04L7.589 8.379C7.524 8.344 7.521 8.251 7.584 8.212L8.237 7.813ZM3.944 1.679C4.502 1.679 5.052 1.82 5.54 2.09L5.962 2.323C6.024 2.358 6.029 2.446 5.97 2.486L5.091 3.09C5.065 3.108 5.05 3.137 5.05 3.169V3.495C5.05 3.529 5.032 3.561 5.003 3.578L4.68 3.769C4.594 3.82 4.498 3.722 4.549 3.637L4.592 3.566C4.63 3.502 4.584 3.421 4.51 3.421H4.028C3.925 3.421 3.894 3.562 3.989 3.604L4.377 3.775C4.448 3.806 4.455 3.904 4.389 3.944L3.77 4.323C3.755 4.332 3.737 4.337 3.72 4.337H3.361C3.309 4.337 3.268 4.379 3.268 4.431C3.268 4.484 3.309 4.526 3.361 4.526H3.779C3.797 4.526 3.814 4.521 3.829 4.513L7.599 2.272C8.135 1.954 8.815 2.008 9.294 2.407C9.307 2.418 9.314 2.434 9.314 2.451V2.729C9.315 2.812 9.413 2.856 9.475 2.8L9.728 2.57C9.789 2.514 9.888 2.558 9.888 2.641V5.812C9.888 5.865 9.845 5.908 9.792 5.908H9.359C9.331 5.908 9.303 5.895 9.285 5.873L8.374 4.773C8.337 4.728 8.268 4.728 8.229 4.771L7.468 5.625C7.429 5.669 7.438 5.737 7.487 5.769L9.038 6.776C9.098 6.815 9.096 6.903 9.035 6.939L6.618 8.363C6.556 8.4 6.478 8.358 6.474 8.286L6.439 7.633C6.437 7.578 6.48 7.532 6.535 7.532H6.925C6.948 7.532 6.971 7.523 6.988 7.508L7.211 7.31C7.276 7.252 7.236 7.144 7.148 7.142L5.991 7.118H1.49C1.437 7.118 1.394 7.075 1.394 7.022V3.308C1.394 3.255 1.437 3.212 1.49 3.212H2.544C2.597 3.212 2.64 3.169 2.64 3.116V2.969C2.64 2.916 2.597 2.873 2.544 2.873H1.461C1.366 2.873 1.329 2.75 1.408 2.697L2.134 2.221C2.672 1.867 3.301 1.679 3.944 1.679Z"/></svg>\n',
   junie:
     '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 40 40" fill="none">\n  <path d="M25 15H35V16.75C35 29 30.5001 35 16.5001 35H15V25H16.5001C22.6251 25 25 22.875 25 16.75V15Z" fill="currentColor"/>\n  <rect x="5" y="15" width="10" height="10" fill="currentColor"/>\n  <rect x="15" y="5" width="10" height="10" fill="currentColor"/>\n</svg>\n',
   kilo: '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 40 40">\n  <path fill="currentColor" d="M27.9998324,34.6666921h6.6666279v5.3333023h-8.3809037l-3.6190266-3.6190266v-8.3809037h5.3333023v6.6666279ZM39.9997627,26.2857884l-3.6190266-3.6190266h-8.3809037v5.3333023h6.6666279v6.6666279h5.3333023v-8.3809037ZM17.3332326,22.6667578h-5.3333023v5.3333023h5.3333023v-5.3333023ZM0,36.3809638l3.6190266,3.6190266h13.714206v-5.3333023H5.3333023v-11.9999302H0v13.714206ZM33.9600959,11.9999247V3.619021L30.3410693-.0000056h-7.6745392v5.3333023h5.9602634v6.6666279h-5.9602634v5.3333023h17.3332326v-5.3333023h-6.0396668ZM5.3333023,0H0v17.3332326h5.3333023v-5.9999651h6.6666279v5.9999651h5.3333023v-5.9999651l-5.3333023-5.3333023h-6.6666279V0ZM17.3332326,0h-5.3333023v5.9999651h5.3333023V0Z"/>\n</svg>\n',
diff --git a/packages/app/src/assets/acp-provider-icons/hoplite.svg b/packages/app/src/assets/acp-provider-icons/hoplite.svg
new file mode 100644
index 0000000000..4d9c443429
--- /dev/null
+++ b/packages/app/src/assets/acp-provider-icons/hoplite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="1.394 1.679 8.494 7.828" fill="currentColor"><path d="M8.237 7.813C8.276 7.789 8.327 7.796 8.358 7.83L9.741 9.346C9.797 9.407 9.754 9.506 9.671 9.507H8.977C8.924 9.507 8.881 9.463 8.881 9.41V9.125C8.881 9.089 8.861 9.057 8.83 9.04L7.589 8.379C7.524 8.344 7.521 8.251 7.584 8.212L8.237 7.813ZM3.944 1.679C4.502 1.679 5.052 1.82 5.54 2.09L5.962 2.323C6.024 2.358 6.029 2.446 5.97 2.486L5.091 3.09C5.065 3.108 5.05 3.137 5.05 3.169V3.495C5.05 3.529 5.032 3.561 5.003 3.578L4.68 3.769C4.594 3.82 4.498 3.722 4.549 3.637L4.592 3.566C4.63 3.502 4.584 3.421 4.51 3.421H4.028C3.925 3.421 3.894 3.562 3.989 3.604L4.377 3.775C4.448 3.806 4.455 3.904 4.389 3.944L3.77 4.323C3.755 4.332 3.737 4.337 3.72 4.337H3.361C3.309 4.337 3.268 4.379 3.268 4.431C3.268 4.484 3.309 4.526 3.361 4.526H3.779C3.797 4.526 3.814 4.521 3.829 4.513L7.599 2.272C8.135 1.954 8.815 2.008 9.294 2.407C9.307 2.418 9.314 2.434 9.314 2.451V2.729C9.315 2.812 9.413 2.856 9.475 2.8L9.728 2.57C9.789 2.514 9.888 2.558 9.888 2.641V5.812C9.888 5.865 9.845 5.908 9.792 5.908H9.359C9.331 5.908 9.303 5.895 9.285 5.873L8.374 4.773C8.337 4.728 8.268 4.728 8.229 4.771L7.468 5.625C7.429 5.669 7.438 5.737 7.487 5.769L9.038 6.776C9.098 6.815 9.096 6.903 9.035 6.939L6.618 8.363C6.556 8.4 6.478 8.358 6.474 8.286L6.439 7.633C6.437 7.578 6.48 7.532 6.535 7.532H6.925C6.948 7.532 6.971 7.523 6.988 7.508L7.211 7.31C7.276 7.252 7.236 7.144 7.148 7.142L5.991 7.118H1.49C1.437 7.118 1.394 7.075 1.394 7.022V3.308C1.394 3.255 1.437 3.212 1.49 3.212H2.544C2.597 3.212 2.64 3.169 2.64 3.116V2.969C2.64 2.916 2.597 2.873 2.544 2.873H1.461C1.366 2.873 1.329 2.75 1.408 2.697L2.134 2.221C2.672 1.867 3.301 1.679 3.944 1.679Z"/></svg>
diff --git a/packages/app/src/components/provider-catalog-list.tsx b/packages/app/src/components/provider-catalog-list.tsx
index 4f996fdd40..748554efde 100644
--- a/packages/app/src/components/provider-catalog-list.tsx
+++ b/packages/app/src/components/provider-catalog-list.tsx
@@ -1,19 +1,21 @@
 import { useCallback, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Pressable, Text, View } from "react-native";
+import { Text, View, type LayoutChangeEvent } from "react-native";
 import { SvgXml } from "react-native-svg";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { ExternalLink, PackagePlus, Search } from "lucide-react-native";
+import { PackagePlus } from "lucide-react-native";
 import { Button } from "@/components/ui/button";
-import { isWeb } from "@/constants/platform";
+import { ExternalLink } from "@/components/ui/external-link";
+import { SearchField } from "@/components/ui/search-field";
+import { StatusBadge } from "@/components/ui/status-badge";
+import { rankProviderCatalog } from "@/components/provider-catalog-search";
 import {
   useAcpProviderCatalog,
   type AcpProviderCatalogItem,
 } from "@/hooks/use-acp-provider-catalog";
 import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
-import type { Theme } from "@/styles/theme";
-import { openExternalUrl } from "@/utils/open-external-url";
-import { EditingTextInput as TextInput } from "@/components/ui/text-input";
+import { SPACING, type Theme } from "@/styles/theme";
+import { settingsStyles } from "@/styles/settings";
 
 interface ProviderCatalogListProps {
   serverId: string;
@@ -21,101 +23,106 @@ interface ProviderCatalogListProps {
   onInstall: (entry: AcpProviderCatalogItem) => Promise<void> | void;
 }
 
-const SEARCH_ICON_SIZE = 16;
 const PROVIDER_FALLBACK_ICON_SIZE = 20;
 const PROVIDER_REMOTE_ICON_SIZE = 24;
+const TILE_GAP = SPACING[3];
+/** Narrowest tile that keeps the type badge and install link on one line. */
+const MIN_TILE_WIDTH = 216;
+const MAX_COLUMNS = 4;
 
 const ThemedPackagePlus = withUnistyles(PackagePlus);
 const ThemedSvgXml = withUnistyles(SvgXml);
-const ThemedSearch = withUnistyles(Search);
-const ThemedExternalLink = withUnistyles(ExternalLink);
-const ThemedTextInput = withUnistyles(TextInput, (theme) => ({
-  placeholderTextColor: theme.colors.foregroundMuted,
-}));
 
 const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
-const foregroundMutedColorMapping = (theme: Theme) => ({
-  color: theme.colors.foregroundMuted,
-});
 
-function matchesSearch(entry: AcpProviderCatalogItem, query: string): boolean {
-  const normalized = query.trim().toLowerCase();
-  if (!normalized) return true;
-  return [entry.title, entry.id, entry.description].some((value) =>
-    value.toLowerCase().includes(normalized),
-  );
+function columnCountForWidth(width: number): number {
+  const fits = Math.floor((width + TILE_GAP) / (MIN_TILE_WIDTH + TILE_GAP));
+  return Math.min(MAX_COLUMNS, Math.max(1, fits));
 }
 
-interface CatalogRowProps {
+interface CatalogTileProps {
   entry: AcpProviderCatalogItem;
+  /** `undefined` until the grid is measured; a single column fills the row. */
+  width: number | undefined;
   installing: boolean;
   onInstall: (entry: AcpProviderCatalogItem) => void;
 }
 
-function CatalogRow({ entry, installing, onInstall }: CatalogRowProps) {
+function CatalogTile({ entry, width, installing, onInstall }: CatalogTileProps) {
   const { t } = useTranslation();
-  const actionLabel = installing
-    ? t("providerCatalog.actions.adding")
-    : t("providerCatalog.actions.add");
   const handleInstall = useCallback(() => {
     onInstall(entry);
   }, [entry, onInstall]);
+  const isSingleColumn = width === undefined;
+  const tileStyle = useMemo(
+    () => [settingsStyles.card, styles.tile, isSingleColumn ? styles.tileFull : { width }],
+    [isSingleColumn, width],
+  );
 
-  const handleOpenInstallLink = useCallback(() => {
-    void openExternalUrl(entry.installLink);
-  }, [entry.installLink]);
-
-  return (
-    <View style={styles.row}>
-      <View style={styles.iconFrame}>
-        {entry.iconSvg ? (
-          <ThemedSvgXml
-            xml={entry.iconSvg}
-            width={PROVIDER_REMOTE_ICON_SIZE}
-            height={PROVIDER_REMOTE_ICON_SIZE}
-            uniProps={foregroundColorMapping}
-          />
-        ) : (
-          <ThemedPackagePlus size={PROVIDER_FALLBACK_ICON_SIZE} uniProps={foregroundColorMapping} />
-        )}
-      </View>
-      <View style={styles.textColumn}>
-        <View style={styles.titleRow}>
-          <Text style={styles.name} numberOfLines={1}>
-            {entry.title}
-          </Text>
-          <Text style={styles.version} numberOfLines={1}>
-            {entry.version}
-          </Text>
-        </View>
-        <Text style={styles.description} numberOfLines={1}>
-          {entry.description || entry.id}
-        </Text>
-        <Pressable
-          accessibilityRole="link"
+  const icon = (
+    <View style={styles.iconFrame}>
+      {entry.iconSvg ? (
+        <ThemedSvgXml
+          xml={entry.iconSvg}
+          width={PROVIDER_REMOTE_ICON_SIZE}
+          height={PROVIDER_REMOTE_ICON_SIZE}
+          uniProps={foregroundColorMapping}
+        />
+      ) : (
+        <ThemedPackagePlus size={PROVIDER_FALLBACK_ICON_SIZE} uniProps={foregroundColorMapping} />
+      )}
+    </View>
+  );
+  const addButton = (
+    <Button
+      size="sm"
+      variant="outline"
+      disabled={installing}
+      loading={installing}
+      onPress={handleInstall}
+      accessibilityLabel={t("providerCatalog.actions.addProvider", { provider: entry.title })}
+      style={styles.addButton}
+      testID={`install-provider-${entry.id}`}
+    >
+      {installing ? t("providerCatalog.actions.adding") : t("providerCatalog.actions.add")}
+    </Button>
+  );
+  const details = (
+    <View style={isSingleColumn ? [styles.details, styles.detailsInRow] : styles.details}>
+      <Text style={styles.name} numberOfLines={1}>
+        {entry.title}
+      </Text>
+      <View style={styles.metaRow}>
+        {/* The catalog is the ACP registry, so every entry it offers is an ACP provider. */}
+        <StatusBadge label={t("providerCatalog.types.acp")} size="xs" />
+        <ExternalLink
+          href={entry.installLink}
+          label={t("providerCatalog.actions.installInstructions")}
           accessibilityLabel={t("providerCatalog.actions.installInstructionsFor", {
             provider: entry.title,
           })}
-          onPress={handleOpenInstallLink}
-          style={styles.installLink}
-        >
-          <Text style={styles.installLinkText} numberOfLines={1}>
-            {t("providerCatalog.actions.installInstructions")}
-          </Text>
-          <ThemedExternalLink size={12} uniProps={foregroundMutedColorMapping} />
-        </Pressable>
+        />
       </View>
-      <Button
-        size="sm"
-        variant="default"
-        disabled={installing}
-        loading={installing}
-        onPress={handleInstall}
-        style={styles.actionButton}
-        testID={`install-provider-${entry.id}`}
-      >
-        {actionLabel}
-      </Button>
+    </View>
+  );
+
+  return (
+    <View style={tileStyle} testID={`provider-catalog-tile-${entry.id}`}>
+      {isSingleColumn ? (
+        <View style={styles.singleColumnRow}>
+          {icon}
+          {details}
+          {addButton}
+        </View>
+      ) : (
+        <>
+          <View style={styles.tileHeader}>
+            {icon}
+            {addButton}
+          </View>
+          {details}
+        </>
+      )}
     </View>
   );
 }
@@ -129,6 +136,7 @@ export function ProviderCatalogList({
   const { entries: catalogEntries } = useAcpProviderCatalog();
   const { entries: providerEntries } = useProvidersSnapshot(serverId);
   const [search, setSearch] = useState("");
+  const [gridWidth, setGridWidth] = useState<number | null>(null);
 
   const installedIds = useMemo(
     () => new Set(providerEntries?.map((entry) => entry.provider) ?? []),
@@ -137,41 +145,48 @@ export function ProviderCatalogList({
 
   const availableEntries = useMemo(
     () =>
-      catalogEntries
-        .filter((entry) => !installedIds.has(entry.id))
-        .filter((entry) => matchesSearch(entry, search)),
+      rankProviderCatalog(
+        catalogEntries.filter((entry) => !installedIds.has(entry.id)),
+        search,
+      ),
     [catalogEntries, installedIds, search],
   );
 
+  const handleGridLayout = useCallback((event: LayoutChangeEvent) => {
+    setGridWidth(event.nativeEvent.layout.width);
+  }, []);
+
+  const tileWidth = useMemo(() => {
+    if (gridWidth === null) return undefined;
+    const columns = columnCountForWidth(gridWidth);
+    if (columns === 1) return undefined;
+    return Math.floor((gridWidth - TILE_GAP * (columns - 1)) / columns);
+  }, [gridWidth]);
+
   return (
     <View>
-      <View style={styles.searchField}>
-        <View style={styles.searchIcon}>
-          <ThemedSearch size={SEARCH_ICON_SIZE} uniProps={foregroundMutedColorMapping} />
-        </View>
-        <ThemedTextInput
-          testID="provider-catalog-search"
-          initialValue={search}
+      <View style={styles.searchRail}>
+        <SearchField
+          value={search}
           onChangeText={setSearch}
-          accessibilityLabel={t("providerCatalog.search")}
           placeholder={t("providerCatalog.search")}
-          // @ts-expect-error - outlineStyle is web-only
-          style={[styles.searchInput, isWeb && { outlineStyle: "none" }]}
-          autoCapitalize="none"
-          autoCorrect={false}
+          clearAccessibilityLabel={t("providerCatalog.clearSearch")}
+          testID="provider-catalog-search"
+          clearTestID="provider-catalog-search-clear"
         />
       </View>
 
       {availableEntries.length === 0 ? (
-        <View style={styles.stateBox}>
+        <View style={[settingsStyles.card, styles.stateBox]}>
           <Text style={styles.stateText}>{t("providerCatalog.noProviders")}</Text>
         </View>
       ) : (
-        <View style={styles.list}>
+        <View style={styles.grid} onLayout={handleGridLayout}>
           {availableEntries.map((entry) => (
-            <CatalogRow
+            <CatalogTile
               key={entry.id}
               entry={entry}
+              width={tileWidth}
               installing={installingProviderId === entry.id}
               onInstall={onInstall}
             />
@@ -183,101 +198,68 @@ export function ProviderCatalogList({
 }
 
 const styles = StyleSheet.create((theme) => ({
-  searchField: {
+  searchRail: {
     flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    backgroundColor: theme.colors.surface2,
-    borderRadius: theme.borderRadius.lg,
-    borderWidth: 1,
-    borderColor: theme.colors.border,
-    paddingHorizontal: theme.spacing[3],
     marginBottom: theme.spacing[3],
   },
-  searchIcon: {
-    width: 18,
+  grid: {
+    flexDirection: "row",
+    flexWrap: "wrap",
+    gap: TILE_GAP,
+  },
+  tile: {
+    gap: theme.spacing[3],
+    padding: theme.spacing[3],
+  },
+  tileFull: {
+    width: "100%",
+  },
+  tileHeader: {
+    flexDirection: "row",
     alignItems: "center",
+    justifyContent: "space-between",
+    gap: theme.spacing[2],
   },
-  searchInput: {
-    flex: 1,
-    minWidth: 0,
-    paddingVertical: theme.spacing[3],
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-  },
-  list: {
-    borderRadius: theme.borderRadius.lg,
-    borderWidth: 1,
-    borderColor: theme.colors.border,
-    overflow: "hidden",
-  },
-  row: {
+  singleColumnRow: {
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[3],
-    padding: theme.spacing[3],
-    borderBottomWidth: 1,
-    borderBottomColor: theme.colors.border,
+  },
+  details: {
+    gap: theme.spacing[1],
+  },
+  detailsInRow: {
+    flex: 1,
+    minWidth: 0,
   },
   iconFrame: {
+    flexShrink: 0,
     width: 36,
     height: 36,
     borderRadius: theme.borderRadius.md,
     backgroundColor: theme.colors.surface2,
     alignItems: "center",
     justifyContent: "center",
+  },
+  addButton: {
     flexShrink: 0,
-  },
-  textColumn: {
-    flex: 1,
-    minWidth: 0,
-    gap: theme.spacing[1],
-  },
-  titleRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    minWidth: 0,
+    minWidth: 72,
   },
   name: {
     color: theme.colors.foreground,
     fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.medium,
-    flexShrink: 1,
+    fontWeight: theme.fontWeight.normal,
   },
-  version: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-    flexShrink: 0,
-  },
-  description: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  installLink: {
-    alignSelf: "flex-start",
+  metaRow: {
     flexDirection: "row",
+    flexWrap: "wrap",
     alignItems: "center",
-    gap: theme.spacing[1],
-    maxWidth: "100%",
-  },
-  installLinkText: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  actionButton: {
-    width: 92,
-    flexShrink: 0,
+    gap: theme.spacing[2],
   },
   stateBox: {
     minHeight: 96,
-    borderRadius: theme.borderRadius.lg,
-    borderWidth: 1,
-    borderColor: theme.colors.border,
-    backgroundColor: theme.colors.surface1,
     alignItems: "center",
     justifyContent: "center",
-    gap: theme.spacing[3],
     padding: theme.spacing[4],
   },
   stateText: {
diff --git a/packages/app/src/components/provider-catalog-search.test.ts b/packages/app/src/components/provider-catalog-search.test.ts
new file mode 100644
index 0000000000..4079d79602
--- /dev/null
+++ b/packages/app/src/components/provider-catalog-search.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, it } from "vitest";
+import { rankProviderCatalog } from "./provider-catalog-search";
+
+const entries = [
+  { id: "kiro-cli", title: "Kiro CLI" },
+  { id: "goose", title: "goose" },
+  { id: "kimi", title: "Kimi Code CLI" },
+  { id: "gemini", title: "Gemini CLI" },
+  { id: "qwen-code", title: "Qwen Code" },
+  { id: "codex-acp", title: "Codex" },
+];
+
+function titles(list: { title: string }[]): string[] {
+  return list.map((entry) => entry.title);
+}
+
+describe("rankProviderCatalog", () => {
+  it("lists every provider alphabetically by name without a query", () => {
+    expect(titles(rankProviderCatalog(entries, "  "))).toEqual([
+      "Codex",
+      "Gemini CLI",
+      "goose",
+      "Kimi Code CLI",
+      "Kiro CLI",
+      "Qwen Code",
+    ]);
+  });
+
+  it("ranks the strongest match first and drops providers that do not match", () => {
+    expect(titles(rankProviderCatalog(entries, "cod"))).toEqual([
+      "Codex",
+      "Kimi Code CLI",
+      "Qwen Code",
+    ]);
+  });
+
+  it("matches in-word subsequences and multiple tokens like the other pickers", () => {
+    expect(titles(rankProviderCatalog(entries, "gmni"))).toEqual(["Gemini CLI"]);
+    expect(titles(rankProviderCatalog(entries, "qw cod"))).toEqual(["Qwen Code"]);
+  });
+
+  it("matches the provider id", () => {
+    expect(titles(rankProviderCatalog(entries, "kiro-cli"))).toEqual(["Kiro CLI"]);
+  });
+});
diff --git a/packages/app/src/components/provider-catalog-search.ts b/packages/app/src/components/provider-catalog-search.ts
new file mode 100644
index 0000000000..23303c868f
--- /dev/null
+++ b/packages/app/src/components/provider-catalog-search.ts
@@ -0,0 +1,34 @@
+import {
+  compareMatchScores,
+  scoreTextFields,
+  type MatchScore,
+} from "@getpaseo/protocol/search/text-match";
+
+export interface SearchableCatalogEntry {
+  id: string;
+  title: string;
+}
+
+function compareTitles(a: SearchableCatalogEntry, b: SearchableCatalogEntry): number {
+  return a.title.localeCompare(b.title, undefined, { sensitivity: "base" });
+}
+
+/**
+ * Orders the Add provider catalog. Without a query the list is alphabetical by
+ * name. With a query it uses the pickers' ranked matcher over the fields the
+ * tile shows (name and id), best match first, ties alphabetical.
+ */
+export function rankProviderCatalog<T extends SearchableCatalogEntry>(
+  entries: readonly T[],
+  query: string,
+): T[] {
+  if (!query.trim()) return [...entries].sort(compareTitles);
+
+  const scored: { entry: T; score: MatchScore }[] = [];
+  for (const entry of entries) {
+    const score = scoreTextFields(query, [entry.title, entry.id]);
+    if (score) scored.push({ entry, score });
+  }
+  scored.sort((a, b) => compareMatchScores(a.score, b.score) || compareTitles(a.entry, b.entry));
+  return scored.map(({ entry }) => entry);
+}
diff --git a/packages/app/src/data/acp-provider-catalog.ts b/packages/app/src/data/acp-provider-catalog.ts
index 1fdb1c6f5d..52230d6251 100644
--- a/packages/app/src/data/acp-provider-catalog.ts
+++ b/packages/app/src/data/acp-provider-catalog.ts
@@ -8,6 +8,7 @@ export interface AcpProviderCatalogEntry {
   iconSvg: string | null;
   installLink: string;
   command: readonly [string, ...string[]];
+  bundledProvider?: boolean;
   env?: Readonly<Record<string, string>>;
   params?: Readonly<Record<string, unknown>>;
 }
@@ -238,6 +239,16 @@ const CATALOG_DATA = [
     installLink: "https://hermes-agent.nousresearch.com/docs/user-guide/features/acp",
     command: ["hermes", "acp"],
   },
+  {
+    id: "hoplite",
+    bundledProvider: true,
+    title: "Hoplite",
+    description: "Cloud coding agent through the local hoplite acp bridge",
+    version: "manual",
+    iconId: "hoplite",
+    installLink: "https://hoplite.sh/docs/cli/acp",
+    command: ["hoplite", "acp"],
+  },
   {
     id: "junie",
     title: "Junie",
@@ -389,6 +400,7 @@ export const ACP_PROVIDER_CATALOG: AcpProviderCatalogEntry[] = CATALOG_DATA.map(
   version: entry.version,
   installLink: entry.installLink,
   command: entry.command,
+  bundledProvider: "bundledProvider" in entry ? entry.bundledProvider : undefined,
   env: "env" in entry ? entry.env : undefined,
   params: "params" in entry ? entry.params : undefined,
   iconSvg: entry.iconId ? (ACP_PROVIDER_ICON_SVGS[entry.iconId] ?? null) : null,
diff --git a/packages/app/src/hooks/use-acp-provider-catalog.test.ts b/packages/app/src/hooks/use-acp-provider-catalog.test.ts
index 63e360aba0..5e642e0091 100644
--- a/packages/app/src/hooks/use-acp-provider-catalog.test.ts
+++ b/packages/app/src/hooks/use-acp-provider-catalog.test.ts
@@ -44,6 +44,7 @@ describe("ACP provider catalog", () => {
     expect(findProvider("codewhale").command).toEqual(["codewhale", "serve", "--acp"]);
     expect(findProvider("devin").command).toEqual(["devin", "acp"]);
     expect(findProvider("goose").command).toEqual(["goose", "acp"]);
+    expect(findProvider("hoplite").command).toEqual(["hoplite", "acp"]);
     expect(findProvider("junie").command).toEqual(["junie", "--acp", "true"]);
     expect(findProvider("kiro").command).toEqual(["kiro-cli", "acp"]);
     expect(findProvider("poolside").command).toEqual(["pool", "acp"]);
@@ -59,6 +60,32 @@ describe("ACP provider catalog", () => {
     expect(findProvider("minimax-code").iconSvg).toContain("<svg");
   });
 
+  it("offers Hoplite through its local ACP bridge with the Hoplite mark", () => {
+    expect(findProvider("hoplite")).toMatchObject({
+      title: "Hoplite",
+      command: ["hoplite", "acp"],
+      installLink: "https://hoplite.sh/docs/cli/acp",
+    });
+    expect(buildAcpProviderConfigPatch(findProvider("hoplite"), true)).toEqual({
+      providers: {
+        hoplite: { enabled: true },
+      },
+    });
+    const ids = getAcpProviderCatalog().map((entry) => entry.id);
+    expect(ids.indexOf("hermes")).toBeLessThan(ids.indexOf("hoplite"));
+    expect(ids.indexOf("hoplite")).toBeLessThan(ids.indexOf("junie"));
+    expect(findProvider("hoplite").iconSvg).toContain('fill="currentColor"');
+  });
+
+  it.each([undefined, false])(
+    "rejects unsupported bundled Hoplite before producing a patch (%s)",
+    (supported) => {
+      expect(() => buildAcpProviderConfigPatch(findProvider("hoplite"), supported)).toThrow(
+        "Update the host to add Hoplite.",
+      );
+    },
+  );
+
   it("maps a catalog entry to the daemon provider config patch", () => {
     expect(buildAcpProviderConfigPatch(findProvider("amp-acp"))).toEqual({
       providers: {
diff --git a/packages/app/src/hooks/use-acp-provider-catalog.ts b/packages/app/src/hooks/use-acp-provider-catalog.ts
index 92f9ca07e2..f20c31caf2 100644
--- a/packages/app/src/hooks/use-acp-provider-catalog.ts
+++ b/packages/app/src/hooks/use-acp-provider-catalog.ts
@@ -10,7 +10,13 @@ export function getAcpProviderCatalog(): AcpProviderCatalogItem[] {
 
 export function buildAcpProviderConfigPatch(
   entry: AcpProviderCatalogItem,
+  supportsHopliteProvider = false,
 ): MutableDaemonConfigPatch {
+  if (entry.bundledProvider) {
+    // COMPAT(hopliteProvider): added after v0.11.2, remove after 2027-04-15 once host floor includes the bundled adapter.
+    if (!supportsHopliteProvider) throw new Error("Update the host to add Hoplite.");
+    return { providers: { [entry.id]: { enabled: true } } };
+  }
   return {
     providers: {
       [entry.id]: {
diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index 87cacb2f82..7434471ec6 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -1657,14 +1657,19 @@ export const ar: TranslationResources = {
     title: "إضافة مزود",
     search: "مقدمي البحث",
     noProviders: "لم يتم العثور على مقدمي الخدمات",
+    clearSearch: "مسح البحث",
     actions: {
       add: "يضيف",
+      addProvider: "إضافة {{provider}}",
       adding: "إضافة",
       installed: "تم التثبيت",
       cancel: "يلغي",
       installInstructions: "تعليمات التثبيت",
       installInstructionsFor: "تعليمات تثبيت{{provider}}",
     },
+    types: {
+      acp: "ACP",
+    },
     errors: {
       unableToInstall: "غير قادر على تثبيت الموفر",
     },
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index f9779a6d55..97ced3f535 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -1682,14 +1682,19 @@ export const en = {
     title: "Add provider",
     search: "Search providers",
     noProviders: "No providers found",
+    clearSearch: "Clear search",
     actions: {
       add: "Add",
+      addProvider: "Add {{provider}}",
       adding: "Adding",
       installed: "Installed",
       cancel: "Cancel",
       installInstructions: "Install instructions",
       installInstructionsFor: "{{provider}} install instructions",
     },
+    types: {
+      acp: "ACP",
+    },
     errors: {
       unableToInstall: "Unable to install provider",
     },
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index 190b36d08d..124e931497 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -1703,14 +1703,19 @@ export const es: TranslationResources = {
     title: "Agregar proveedor",
     search: "Proveedores de búsqueda",
     noProviders: "No se encontraron proveedores",
+    clearSearch: "Borrar búsqueda",
     actions: {
       add: "Agregar",
+      addProvider: "Añadir {{provider}}",
       adding: "Añadiendo",
       installed: "Instalado",
       cancel: "Cancelar",
       installInstructions: "Instrucciones de instalación",
       installInstructionsFor: "Instrucciones de instalación de{{provider}}",
     },
+    types: {
+      acp: "ACP",
+    },
     errors: {
       unableToInstall: "No se puede instalar el proveedor",
     },
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index 6cfe15b1be..8a8e01786d 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -1699,14 +1699,19 @@ export const fr: TranslationResources = {
     title: "Ajouter un fournisseur",
     search: "Rechercher des fournisseurs",
     noProviders: "Aucun fournisseur trouvé",
+    clearSearch: "Effacer la recherche",
     actions: {
       add: "Ajouter",
+      addProvider: "Ajouter {{provider}}",
       adding: "Ajout…",
       installed: "Installé",
       cancel: "Annuler",
       installInstructions: "Instructions d’installation",
       installInstructionsFor: "Instructions d’installation de {{provider}}",
     },
+    types: {
+      acp: "ACP",
+    },
     errors: {
       unableToInstall: "Impossible d’installer le fournisseur",
     },
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index cb37dde381..9f6d4eced3 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -1674,14 +1674,19 @@ export const ja: TranslationResources = {
     title: "プロバイダーを追加",
     search: "プロバイダーを検索",
     noProviders: "プロバイダーが見つかりません",
+    clearSearch: "検索をクリア",
     actions: {
       add: "追加",
+      addProvider: "{{provider}} を追加",
       adding: "追加中",
       installed: "インストール済み",
       cancel: "キャンセル",
       installInstructions: "インストール手順",
       installInstructionsFor: "{{provider}}のインストール手順",
     },
+    types: {
+      acp: "ACP",
+    },
     errors: {
       unableToInstall: "プロバイダーをインストールできません",
     },
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index 418490d395..a78d44f74b 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -1667,14 +1667,19 @@ export const ko: TranslationResources = {
     title: "프로바이더 추가",
     search: "프로바이더 검색",
     noProviders: "프로바이더를 찾을 수 없습니다",
+    clearSearch: "검색 지우기",
     actions: {
       add: "추가",
+      addProvider: "{{provider}} 추가",
       adding: "추가 중",
       installed: "설치됨",
       cancel: "취소",
       installInstructions: "설치 안내",
       installInstructionsFor: "{{provider}} 설치 안내",
     },
+    types: {
+      acp: "ACP",
+    },
     errors: {
       unableToInstall: "프로바이더를 설치할 수 없습니다",
     },
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index b2fe479b74..e5a2e3bfe4 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -1688,14 +1688,19 @@ export const ptBR: TranslationResources = {
     title: "Adicionar provedor",
     search: "Buscar provedores",
     noProviders: "Nenhum provedor encontrado",
+    clearSearch: "Limpar pesquisa",
     actions: {
       add: "Adicionar",
+      addProvider: "Adicionar {{provider}}",
       adding: "Adicionando",
       installed: "Instalado",
       cancel: "Cancelar",
       installInstructions: "Instruções de instalação",
       installInstructionsFor: "Instruções de instalação de {{provider}}",
     },
+    types: {
+      acp: "ACP",
+    },
     errors: {
       unableToInstall: "Não foi possível instalar provedor",
     },
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index 086cd51c01..ad0bac05c6 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -1686,14 +1686,19 @@ export const ru: TranslationResources = {
     title: "Добавить провайдера",
     search: "Поиск провайдеров",
     noProviders: "Провайдеры не найдены",
+    clearSearch: "Очистить поиск",
     actions: {
       add: "Добавить",
+      addProvider: "Добавить {{provider}}",
       adding: "Добавление",
       installed: "Установлено",
       cancel: "Отмена",
       installInstructions: "Инструкции по установке",
       installInstructionsFor: "Инструкции по установке {{provider}}",
     },
+    types: {
+      acp: "ACP",
+    },
     errors: {
       unableToInstall: "Не удалось установить провайдера",
     },
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index 16dc24b3a5..7b78bfbea6 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -1640,14 +1640,19 @@ export const zhCN: TranslationResources = {
     title: "添加 provider",
     search: "搜索 providers",
     noProviders: "未找到 providers",
+    clearSearch: "清除搜索",
     actions: {
       add: "添加",
+      addProvider: "添加 {{provider}}",
       adding: "正在添加",
       installed: "已安装",
       cancel: "取消",
       installInstructions: "安装说明",
       installInstructionsFor: "{{provider}} 安装说明",
     },
+    types: {
+      acp: "ACP",
+    },
     errors: {
       unableToInstall: "无法安装 provider",
     },
diff --git a/packages/app/src/screens/settings/providers-section.tsx b/packages/app/src/screens/settings/providers-section.tsx
index 4fb0a43278..11147b3a3e 100644
--- a/packages/app/src/screens/settings/providers-section.tsx
+++ b/packages/app/src/screens/settings/providers-section.tsx
@@ -19,6 +19,7 @@ import { useDaemonConfig } from "@/hooks/use-daemon-config";
 import { buildProviderDefinitions } from "@/utils/provider-definitions";
 import {
   buildAcpProviderConfigPatch,
+  getAcpProviderCatalog,
   type AcpProviderCatalogItem,
 } from "@/hooks/use-acp-provider-catalog";
 import { ProviderCatalogList } from "@/components/provider-catalog-list";
@@ -326,6 +327,8 @@ export interface ProvidersSectionProps {
 export function ProvidersSection({ serverId }: ProvidersSectionProps) {
   const { t } = useTranslation();
   const isConnected = useHostRuntimeIsConnected(serverId);
+  const supportsHopliteProvider = useHostFeature(serverId, "hopliteProvider");
+  const [installError, setInstallError] = useState<string | null>(null);
   const supportsProviderRemoval = useHostFeature(serverId, "providerRemoval");
   const { entries, isLoading, refresh } = useProvidersSnapshot(serverId);
   const { config, patchConfig } = useDaemonConfig(serverId);
@@ -338,9 +341,16 @@ export function ProvidersSection({ serverId }: ProvidersSectionProps) {
   const providerDefinitions = useMemo(() => buildProviderDefinitions(entries), [entries]);
   const hasServer = serverId.length > 0;
 
-  /** Custom providers are deletable only when config.json holds their `extends` definition. */
+  /** Config owns derived providers and opt-in bundled catalog providers. */
   const isConfigOwnedProvider = useCallback(
-    (providerId: string) => Boolean(config?.providers?.[providerId]?.extends),
+    (providerId: string) =>
+      Boolean(
+        config?.providers?.[providerId] &&
+        (config.providers[providerId].extends ||
+          getAcpProviderCatalog().some(
+            (entry) => entry.id === providerId && entry.bundledProvider,
+          )),
+      ),
     [config],
   );
 
@@ -403,20 +413,18 @@ export function ProvidersSection({ serverId }: ProvidersSectionProps) {
   const handleInstall = useCallback(
     async (entry: AcpProviderCatalogItem) => {
       if (installingProviderId) return;
+      setInstallError(null);
       setInstallingProviderId(entry.id);
       try {
-        await patchConfig(buildAcpProviderConfigPatch(entry));
+        await patchConfig(buildAcpProviderConfigPatch(entry, supportsHopliteProvider));
         await refresh([entry.id]);
       } catch (error) {
-        Alert.alert(
-          t("settings.providers.addErrorTitle"),
-          error instanceof Error ? error.message : String(error),
-        );
+        setInstallError(error instanceof Error ? error.message : String(error));
       } finally {
         setInstallingProviderId((current) => (current === entry.id ? null : current));
       }
     },
-    [installingProviderId, patchConfig, refresh, t],
+    [installingProviderId, patchConfig, refresh, supportsHopliteProvider],
   );
 
   return (
@@ -472,6 +480,11 @@ export function ProvidersSection({ serverId }: ProvidersSectionProps) {
           testID="host-page-add-provider-card"
           style={styles.addProviderSection}
         >
+          {installError ? (
+            <Text accessibilityRole="alert" style={styles.errorText}>
+              {installError}
+            </Text>
+          ) : null}
           <ProviderCatalogList
             serverId={serverId}
             installingProviderId={installingProviderId}
diff --git a/packages/plugin/src/server/acp-internal/connection.ts b/packages/plugin/src/server/acp-internal/connection.ts
index fc78d2a8c4..09984a3d14 100644
--- a/packages/plugin/src/server/acp-internal/connection.ts
+++ b/packages/plugin/src/server/acp-internal/connection.ts
@@ -359,6 +359,8 @@ class AcpRuntime {
   private emit: (event: ProviderEvent) => void;
   private readonly messages = new Map<string, string>();
   private readonly toolCalls = new Map<string, AcpToolCallSnapshot>();
+  // Running tool rows published by transformers; the turn's terminal closes any left open.
+  private readonly vendorToolCalls = new Map<string, ToolCallTimelineItem>();
   private readonly pendingCompactions = new Set<string>();
   private readonly permissions = new Map<
     string,
@@ -595,10 +597,13 @@ class AcpRuntime {
       turnId,
       state: "started",
     });
+    // The SDK dispatches notifications without awaiting them, so the prompt response can resolve
+    // while earlier session updates are still queued. Apply them before the turn ends.
     const settled = this.call(
       this.connection.prompt({ sessionId: this.nativeSessionId, prompt }),
     ).then(
-      (response): void => {
+      async (response): Promise<void> => {
+        await this.drainNotifications();
         const state = response.stopReason === "cancelled" ? "canceled" : "completed";
         this.fallbackChunkIds.clear();
         this.terminalizeTransientItems(state);
@@ -610,7 +615,8 @@ class AcpRuntime {
         });
         return undefined;
       },
-      (error): void => {
+      async (error): Promise<void> => {
+        await this.drainNotifications();
         this.fallbackChunkIds.clear();
         this.terminalizeTransientItems("failed");
         this.emit({
@@ -1027,9 +1033,17 @@ class AcpRuntime {
       this.emit({
         type: "timeline.item",
         sessionId: this.options.boundarySessionId,
-        item: toolTimelineItem(completed),
+        item: terminalToolItem(toolTimelineItem(snapshot), state),
       });
     }
+    for (const item of this.vendorToolCalls.values()) {
+      this.emit({
+        type: "timeline.item",
+        sessionId: this.options.boundarySessionId,
+        item: terminalToolItem(item, state),
+      });
+    }
+    this.vendorToolCalls.clear();
     for (const id of this.pendingCompactions) {
       this.emit({
         type: "timeline.item",
@@ -1076,6 +1090,10 @@ class AcpRuntime {
       if (this.configTransaction) this.stagedTransformerConfig = update.config;
       else this.emitConfigSnapshot(update.config);
     } else if (update.type === "timeline") {
+      if (update.item.type === "tool_call") {
+        if (update.item.status === "running") this.vendorToolCalls.set(update.item.id, update.item);
+        else this.vendorToolCalls.delete(update.item.id);
+      }
       this.emit({
         type: "timeline.item",
         sessionId: this.options.boundarySessionId,
@@ -1383,7 +1401,9 @@ function configValues(
   return Object.fromEntries(options.map((option) => [option.id, option.currentValue]));
 }
 
-function toolTimelineItem(snapshot: AcpToolCallSnapshot): ProviderTimelineItem {
+type ToolCallTimelineItem = Extract<ProviderTimelineItem, { type: "tool_call" }>;
+
+function toolTimelineItem(snapshot: AcpToolCallSnapshot): ToolCallTimelineItem {
   const input = jsonRecord(snapshot.input);
   const isEdit = snapshot.kind === "edit" || snapshot.name?.toLowerCase().includes("edit") === true;
   const detail = isEdit
@@ -1411,6 +1431,18 @@ function toolTimelineItem(snapshot: AcpToolCallSnapshot): ProviderTimelineItem {
   return { ...base, status, error: null };
 }
 
+// A row the turn left open ends with the turn. The wire contract requires a non-null error on a
+// failed tool call, so a canceled turn cancels its rows instead of failing them.
+function terminalToolItem(
+  item: ToolCallTimelineItem,
+  state: "completed" | "failed" | "canceled",
+): ToolCallTimelineItem {
+  if (state === "failed") {
+    return { ...item, status: "failed", error: item.error ?? { message: "Turn failed" } };
+  }
+  return { ...item, status: state, error: null };
+}
+
 function jsonValue(value: unknown) {
   return z.json().parse(value);
 }
diff --git a/packages/plugin/src/server/acp.test.ts b/packages/plugin/src/server/acp.test.ts
index a62b2f2c48..13d69416bb 100644
--- a/packages/plugin/src/server/acp.test.ts
+++ b/packages/plugin/src/server/acp.test.ts
@@ -619,6 +619,146 @@ lines.on("line", (line) => {
     await connection.close();
   });
 
+  it.each([
+    ["end_turn", "completed", "completed"],
+    ["cancelled", "canceled", "canceled"],
+  ] as const)(
+    "closes a transformer's running tool row when the turn ends with %s",
+    async (stopReason, turnState, rowStatus) => {
+      const harness = connectorHarness({
+        handleMessage(instance, message) {
+          if (!("method" in message) || !("id" in message)) return false;
+          if (message.method !== "session/prompt") return false;
+          instance.notify("vendor/phase", { id: "phase-1", label: "Preparing" });
+          instance.respond(message as AcpRequestMessage, { stopReason });
+          return true;
+        },
+      });
+      const registration = runAcpProvider({
+        id: "vendor-row-acp",
+        label: "Vendor row ACP",
+        connector: harness.connector,
+        transformers: [
+          {
+            notification(notification) {
+              if (notification.method !== "vendor/phase") return null;
+              return {
+                type: "timeline",
+                item: {
+                  type: "tool_call",
+                  id: "phase-1",
+                  callId: "phase-1",
+                  name: "Vendor phase",
+                  detail: { type: "plain_text", label: "Preparing" },
+                  status: "running",
+                  error: null,
+                },
+              };
+            },
+          },
+        ],
+      });
+      const connection = await registration.connect({
+        versions: [1],
+        capabilities: ["prompt.message"],
+      });
+      const events: ProviderEvent[] = [];
+      connection.onEvent((event) => events.push(event));
+      await connection.send(openInput());
+      await waitForEvent(events, (event) => event.type === "session.ready");
+
+      await connection.send({
+        type: "session.prompt",
+        sessionId: "session-1",
+        prompt: {
+          clientMessageId: "first",
+          delivery: "auto",
+          input: { type: "message", content: [{ type: "text", text: "first" }] },
+        },
+      });
+      await waitForEvent(
+        events,
+        (event) => event.type === "session.turn" && event.state === turnState,
+      );
+
+      const rows = events.flatMap((event) =>
+        event.type === "timeline.item" && event.item.id === "phase-1" ? [event.item] : [],
+      );
+      expect(rows.map((row) => row.type === "tool_call" && row.status)).toEqual([
+        "running",
+        rowStatus,
+      ]);
+      const closed = events.findIndex(
+        (event) =>
+          event.type === "timeline.item" &&
+          event.item.id === "phase-1" &&
+          event.item.type === "tool_call" &&
+          event.item.status === rowStatus,
+      );
+      const terminal = events.findIndex(
+        (event) => event.type === "session.turn" && event.state === turnState,
+      );
+      expect(closed).toBeLessThan(terminal);
+      // The wire contract only accepts a failed tool call with a non-null error.
+      expect(rows.at(-1)).toMatchObject({ error: null });
+      await connection.close();
+    },
+  );
+
+  it("cancels an in-progress ACP tool call with the canceled turn instead of failing it without an error", async () => {
+    const harness = connectorHarness({
+      handleMessage(instance, message) {
+        if (!("method" in message) || !("id" in message)) return false;
+        if (message.method !== "session/prompt") return false;
+        instance.notify("session/update", {
+          sessionId: "connector-session",
+          update: {
+            sessionUpdate: "tool_call",
+            toolCallId: "tool-1",
+            title: "Run tests",
+            kind: "execute",
+            status: "in_progress",
+          },
+        });
+        instance.respond(message as AcpRequestMessage, { stopReason: "cancelled" });
+        return true;
+      },
+    });
+    const registration = runAcpProvider({
+      id: "cancel-tool-acp",
+      label: "Cancel tool ACP",
+      connector: harness.connector,
+    });
+    const connection = await registration.connect({
+      versions: [1],
+      capabilities: ["prompt.message"],
+    });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    await connection.send(openInput());
+    await waitForEvent(events, (event) => event.type === "session.ready");
+
+    await connection.send({
+      type: "session.prompt",
+      sessionId: "session-1",
+      prompt: {
+        clientMessageId: "first",
+        delivery: "auto",
+        input: { type: "message", content: [{ type: "text", text: "first" }] },
+      },
+    });
+    await waitForEvent(
+      events,
+      (event) => event.type === "session.turn" && event.state === "canceled",
+    );
+
+    const rows = events.flatMap((event) =>
+      event.type === "timeline.item" && event.item.id === "tool-1" ? [event.item] : [],
+    );
+    expect(rows.at(-1)).toMatchObject({ type: "tool_call", status: "canceled", error: null });
+    await connection.close();
+  });
+
   it("serializes configuration mutations", async () => {
     let releaseMutation: (() => void) | null = null;
     const configOptions = [
diff --git a/packages/plugin/src/server/provider.ts b/packages/plugin/src/server/provider.ts
index 33b49ab447..1646e8473b 100644
--- a/packages/plugin/src/server/provider.ts
+++ b/packages/plugin/src/server/provider.ts
@@ -26,6 +26,8 @@ export const PROVIDER_CAPABILITIES = [
 export type ProviderCapability = (typeof PROVIDER_CAPABILITIES)[number];
 
 export interface ProviderRegistration {
+  /** Activate only while agents.providers contains this provider ID, independently of enabled. */
+  requiresConfiguration?: boolean;
   /** Equal keys share discovery within this provider. Include effective configuration and execution environment. */
   getCatalogCacheKey?(options: ProviderCatalogOptions): Promise<string | undefined>;
   /** Default executable and arguments; the daemon resolves overrides before status/connect. */
diff --git a/packages/protocol/src/messages.checkout-pr-schema.test.ts b/packages/protocol/src/messages.checkout-pr-schema.test.ts
index cf15e47962..3966d6eb71 100644
--- a/packages/protocol/src/messages.checkout-pr-schema.test.ts
+++ b/packages/protocol/src/messages.checkout-pr-schema.test.ts
@@ -812,3 +812,14 @@ describe("checkout PR schemas", () => {
     });
   });
 });
+
+test.each([undefined, false, true])(
+  "accepts optional Hoplite capability (%s)",
+  (hopliteProvider) => {
+    const features = hopliteProvider === undefined ? {} : { hopliteProvider };
+    expect(
+      ServerInfoStatusPayloadSchema.parse({ status: "server_info", serverId: "test", features })
+        .features,
+    ).toEqual(features);
+  },
+);
diff --git a/packages/protocol/src/messages.ts b/packages/protocol/src/messages.ts
index fefc104279..c8fe60ff67 100644
--- a/packages/protocol/src/messages.ts
+++ b/packages/protocol/src/messages.ts
@@ -3710,6 +3710,8 @@ export const ServerInfoStatusPayloadSchema = z
         commitBaseClassification: z.boolean().optional(),
         // COMPAT(providerRemoval): added in v0.1.105, drop the gate when floor >= v0.1.105.
         providerRemoval: z.boolean().optional(),
+        // COMPAT(hopliteProvider): added after v0.11.2, remove after 2027-04-15 once host floor includes the bundled adapter.
+        hopliteProvider: z.boolean().optional(),
         // COMPAT(importSessionWorkspaceTarget): added in v0.1.110, remove gate after 2027-01-16.
         importSessionWorkspaceTarget: z.boolean().optional(),
         // COMPAT(importSessionSearch): added in v0.8.0, remove gate after 2027-03-02.
diff --git a/packages/protocol/src/provider-icon-names.ts b/packages/protocol/src/provider-icon-names.ts
index 6265b631c3..4ca8ea44e3 100644
--- a/packages/protocol/src/provider-icon-names.ts
+++ b/packages/protocol/src/provider-icon-names.ts
@@ -31,6 +31,7 @@ export const ACP_PROVIDER_ICON_NAMES = [
   "glm-acp-agent",
   "goose",
   "grok",
+  "hoplite",
   "junie",
   "kilo",
   "kimi",
diff --git a/packages/server/src/server/agent/plugin-provider.test.ts b/packages/server/src/server/agent/plugin-provider.test.ts
index 8b894a7765..ae8ed805d7 100644
--- a/packages/server/src/server/agent/plugin-provider.test.ts
+++ b/packages/server/src/server/agent/plugin-provider.test.ts
@@ -1121,3 +1121,50 @@ describe("plugin provider launch and status", () => {
     },
   );
 });
+
+test("config-required plugin membership is independent of enablement and other providers", async () => {
+  const logger = createTestLogger();
+  const plugins = new PluginAgentClientRegistry(logger);
+  const harness = createProviderHarness();
+  let connections = 0;
+  let probes = 0;
+  plugins.replace([
+    {
+      ...harness.registration,
+      requiresConfiguration: true,
+      async status() {
+        probes++;
+        return { available: true };
+      },
+      async connect(request) {
+        connections++;
+        return harness.registration.connect(request);
+      },
+    },
+  ]);
+  const build = (providerOverrides = {}) =>
+    buildProviderRegistry(logger, {
+      pluginProviders: plugins.definitions(),
+      providerOverrides,
+    });
+  try {
+    const before = build();
+    expect(before["plugin-direct"]).toBeUndefined();
+    expect({ probes, connections }).toEqual({ probes: 0, connections: 0 });
+    const added = build({ "plugin-direct": {} });
+    expect(added["plugin-direct"].enabled).toBe(true);
+    const client = added["plugin-direct"].createClient(logger);
+    expect(await client.isAvailable()).toBe(true);
+    const catalog = await client.fetchCatalog({ scope: "global" });
+    expect(catalog.models.map((model) => model.id)).toEqual(["plugin-model"]);
+    expect({ probes, connections }).toEqual({ probes: 1, connections: 1 });
+    const disabled = build({ "plugin-direct": { enabled: false } });
+    expect(disabled["plugin-direct"].enabled).toBe(false);
+    expect(Object.keys(build())).toEqual(Object.keys(before));
+    for (const id of Object.keys(before)) {
+      expect(added[id].enabled).toBe(before[id].enabled);
+    }
+  } finally {
+    await plugins.shutdown();
+  }
+});
diff --git a/packages/server/src/server/agent/plugin-provider.ts b/packages/server/src/server/agent/plugin-provider.ts
index 58bddd07b6..e575ff0d45 100644
--- a/packages/server/src/server/agent/plugin-provider.ts
+++ b/packages/server/src/server/agent/plugin-provider.ts
@@ -885,6 +885,7 @@ function createPluginProviderDefinition(
     label: registration.label,
     description: registration.description ?? `Plugin provider ${registration.label}`,
     iconSvg: registration.icon,
+    requiresConfiguration: registration.requiresConfiguration,
     defaultModeId: null,
     modes: [],
     supportsExactMcpPreapproval: true,
diff --git a/packages/server/src/server/agent/provider-registry.ts b/packages/server/src/server/agent/provider-registry.ts
index 2698a3b2ac..9f85e4d37f 100644
--- a/packages/server/src/server/agent/provider-registry.ts
+++ b/packages/server/src/server/agent/provider-registry.ts
@@ -97,6 +97,7 @@ export interface ProviderDefinition extends AgentProviderDefinition {
 
 /** Provider metadata and an unconfigured factory; the registry owns override application. */
 export interface RegisteredProviderDefinition extends AgentProviderDefinition {
+  requiresConfiguration?: boolean;
   iconSvg?: string;
   supportsExactMcpPreapproval: boolean;
   createClient: (logger: Logger, runtimeSettings?: ProviderRuntimeSettings) => AgentClient;
@@ -925,6 +926,8 @@ export function buildProviderRegistry(
       throw new Error(`Plugin provider '${provider}' conflicts with a built-in provider`);
     }
     const override = providerOverrides[provider];
+    if (definition.requiresConfiguration && !override) continue;
+
     if (override?.extends) {
       logger.warn({ provider }, "Plugin provider shadowed by configured provider");
       continue;
diff --git a/packages/server/src/server/agent/provider-snapshot-manager.ts b/packages/server/src/server/agent/provider-snapshot-manager.ts
index 82acd13e1f..b10a4f8e02 100644
--- a/packages/server/src/server/agent/provider-snapshot-manager.ts
+++ b/packages/server/src/server/agent/provider-snapshot-manager.ts
@@ -348,6 +348,10 @@ export class ProviderSnapshotManager {
     return Object.prototype.hasOwnProperty.call(this.generation.definitions, provider);
   }
 
+  supportsConfigRequiredProvider(provider: AgentProvider): boolean {
+    return this.pluginProviders.definitions()[provider]?.requiresConfiguration === true;
+  }
+
   getProviderLabel(provider: AgentProvider): string {
     return this.generation.definitions[provider]?.label ?? provider;
   }
diff --git a/packages/server/src/server/daemon-e2e/hoplite-fixture.cjs b/packages/server/src/server/daemon-e2e/hoplite-fixture.cjs
new file mode 100644
index 0000000000..3650238ad7
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/hoplite-fixture.cjs
@@ -0,0 +1,37 @@
+// Local ACP peer for the bundled Hoplite adapter; no Hoplite service or credentials.
+const fs = require("node:fs");
+const readline = require("node:readline");
+fs.appendFileSync(process.env.HOPLITE_TEST_RECORD, "launch\n");
+const configOptions = [
+  {
+    id: "model",
+    category: "model",
+    type: "select",
+    name: "Model",
+    currentValue: "fixture-model",
+    options: [{ value: "fixture-model", name: "Fixture model" }],
+  },
+];
+const send = (message) =>
+  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", ...message }) + "\n");
+readline.createInterface({ input: process.stdin }).on("line", (line) => {
+  const request = JSON.parse(line);
+  if (request.id === undefined) return;
+  let result = {};
+  if (request.method === "initialize")
+    result = { protocolVersion: 1, agentCapabilities: {}, authMethods: [] };
+  if (request.method === "session/new")
+    result = {
+      sessionId: "hoplite-fixture",
+      configOptions,
+    };
+  if (request.method === "session/set_config_option") result = { configOptions };
+  if (request.method === "session/prompt") {
+    send({
+      method: "_hoplite/run_phase",
+      params: { runId: "fixture-run", phase: "provisioning", label: "Preparing fixture workspace" },
+    });
+    result = { stopReason: "end_turn" };
+  }
+  send({ id: request.id, result });
+});
diff --git a/packages/server/src/server/daemon-e2e/models.e2e.test.ts b/packages/server/src/server/daemon-e2e/models.e2e.test.ts
index b9293d8c3e..3447444358 100644
--- a/packages/server/src/server/daemon-e2e/models.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/models.e2e.test.ts
@@ -1,7 +1,8 @@
 import { describe, test, expect } from "vitest";
-import { mkdtemp, rm } from "node:fs/promises";
+import { mkdtemp, rm, readFile, writeFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { loadConfig } from "../config.js";
 import { findExecutable } from "../../executable-resolution/executable-resolution.js";
 import { BuiltinPluginLoader } from "../plugins/builtin/index.js";
 import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
@@ -162,3 +163,125 @@ test("Antigravity creates an agent and answers a prompt with real agy", async ({
     await rm(cwd, { recursive: true, force: true });
   }
 }, 120000);
+
+test("bundled Hoplite requires a config entry and removal survives restart", async () => {
+  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-hoplite-optin-"));
+  const record = path.join(root, "launches.txt");
+  await writeFile(record, "");
+  const options = {
+    paseoHomeRoot: root,
+    cleanup: false,
+    mcpEnabled: false,
+    builtinPlugins: new BuiltinPluginLoader(undefined, [
+      "hoplite-provider",
+      "antigravity-provider",
+    ]),
+  };
+  let daemon = await createTestPaseoDaemon(options);
+  const connect = async () => {
+    const client = new DaemonClient({
+      url: `ws://127.0.0.1:${daemon.port}/ws`,
+      appVersion: "0.11.2",
+    });
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    return client;
+  };
+  let client = await connect();
+  try {
+    const before = await client.getProvidersSnapshot();
+    expect(before.entries.some((entry) => entry.provider === "hoplite")).toBe(false);
+    expect(before.entries.some((entry) => entry.provider === "antigravity")).toBe(true);
+    expect(await readFile(record, "utf8")).toBe("");
+
+    await client.patchDaemonConfig({
+      providers: {
+        hoplite: {
+          enabled: true,
+          command: [process.execPath, path.resolve(import.meta.dirname, "hoplite-fixture.cjs")],
+          env: { HOPLITE_TEST_RECORD: record },
+        },
+      },
+    });
+    await expect
+      .poll(
+        async () =>
+          (await client.getProvidersSnapshot()).entries.find(
+            (entry) => entry.provider === "hoplite",
+          )?.status,
+      )
+      .toBe("ready");
+    expect((await client.listProviderModels("hoplite")).models.map((model) => model.id)).toEqual([
+      "fixture-model",
+    ]);
+    const agent = await client.createAgent({
+      provider: "hoplite",
+      cwd: root,
+      model: "fixture-model",
+    });
+    await client.sendMessage(agent.id, "Exercise the contributor transformer");
+    await client.waitForFinish(agent.id, 10000);
+    const timeline = await client.fetchAgentTimeline(agent.id, { limit: 100 });
+    expect(timeline.entries.map((entry) => entry.item)).toContainEqual(
+      expect.objectContaining({
+        type: "tool_call",
+        name: "Hoplite workspace",
+        status: "completed",
+      }),
+    );
+    await client.archiveAgent(agent.id);
+    expect(await readFile(record, "utf8")).toContain("launch");
+
+    await client.patchDaemonConfig({ providers: { hoplite: { enabled: false } } });
+    expect(
+      (await client.getProvidersSnapshot()).entries.find((entry) => entry.provider === "hoplite")
+        ?.enabled,
+    ).toBe(false);
+    await client.close();
+    await daemon.close();
+    daemon = await createTestPaseoDaemon({
+      ...options,
+      staticDir: daemon.staticDir,
+      providerOverrides: loadConfig(daemon.paseoHome, { env: {} }).providerOverrides,
+    });
+    client = await connect();
+    expect(
+      (await client.getProvidersSnapshot()).entries.find((entry) => entry.provider === "hoplite")
+        ?.enabled,
+    ).toBe(false);
+    await client.patchDaemonConfig({ removeProviders: ["hoplite"] });
+    expect(
+      (await client.getProvidersSnapshot()).entries.some((entry) => entry.provider === "hoplite"),
+    ).toBe(false);
+    expect((await client.getDaemonConfig()).config.providers?.hoplite).toBeUndefined();
+    const persisted = JSON.parse(
+      await readFile(path.join(daemon.paseoHome, "config.json"), "utf8"),
+    );
+    expect(persisted.agents?.providers?.hoplite).toBeUndefined();
+    const launchesAfterRemoval = await readFile(record, "utf8");
+    await client.close();
+    await daemon.close();
+    daemon = await createTestPaseoDaemon({
+      ...options,
+      staticDir: daemon.staticDir,
+      providerOverrides: loadConfig(daemon.paseoHome, { env: {} }).providerOverrides,
+    });
+    client = await connect();
+    const restarted = await client.getProvidersSnapshot();
+    expect(restarted.entries.some((entry) => entry.provider === "hoplite")).toBe(false);
+    expect(restarted.entries.map((entry) => entry.provider)).toEqual(
+      before.entries.map((entry) => entry.provider),
+    );
+    expect(await readFile(record, "utf8")).toBe(launchesAfterRemoval);
+    await client.patchDaemonConfig({ providers: { hoplite: { enabled: false } } });
+    expect(
+      (await client.getProvidersSnapshot()).entries.find((entry) => entry.provider === "hoplite")
+        ?.enabled,
+    ).toBe(false);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(root, { recursive: true, force: true });
+    await rm(daemon.staticDir, { recursive: true, force: true });
+  }
+}, 60000);
diff --git a/packages/server/src/server/plugins/builtin/index.ts b/packages/server/src/server/plugins/builtin/index.ts
index c14c027853..cf6ffe9eee 100644
--- a/packages/server/src/server/plugins/builtin/index.ts
+++ b/packages/server/src/server/plugins/builtin/index.ts
@@ -9,6 +9,7 @@ export const builtinPlugins = [
   "copilot-usage-source",
   "cursor-usage-source",
   "grok-usage-source",
+  "hoplite-provider",
   "kimi-usage-source",
   "minimax-usage-source",
   "muse-provider",
diff --git a/packages/server/src/server/plugins/index.ts b/packages/server/src/server/plugins/index.ts
index 6c4af29e62..a5ecea8097 100644
--- a/packages/server/src/server/plugins/index.ts
+++ b/packages/server/src/server/plugins/index.ts
@@ -629,6 +629,7 @@ export class PluginService {
           label: provider.label,
           description: provider.description,
           command: provider.command,
+          requiresConfiguration: provider.requiresConfiguration,
           status: provider.hasStatus
             ? (request) => {
                 if (!this.runtime.getProviderStatus)
diff --git a/packages/server/src/server/plugins/plugin-process-protocol.ts b/packages/server/src/server/plugins/plugin-process-protocol.ts
index e959780389..b3f363cb29 100644
--- a/packages/server/src/server/plugins/plugin-process-protocol.ts
+++ b/packages/server/src/server/plugins/plugin-process-protocol.ts
@@ -14,6 +14,7 @@ import {
 import { z } from "zod";
 
 export interface PluginProviderMetadata {
+  requiresConfiguration?: boolean;
   hasCatalogCacheKey?: boolean;
   hasStatus?: boolean;
   command?: readonly [string, ...string[]];
@@ -112,6 +113,7 @@ const providerMetadataSchema = z
     label: z.string().min(1),
     description: z.string().optional(),
     iconPath: z.string().optional(),
+    requiresConfiguration: z.boolean().optional(),
     hasCatalogCacheKey: z.boolean().optional(),
     hasStatus: z.boolean().optional(),
     command: z.tuple([z.string().min(1)], z.string()).optional(),
diff --git a/packages/server/src/server/plugins/plugin-process.ts b/packages/server/src/server/plugins/plugin-process.ts
index 3f11926d7d..5e6efa1925 100644
--- a/packages/server/src/server/plugins/plugin-process.ts
+++ b/packages/server/src/server/plugins/plugin-process.ts
@@ -158,6 +158,7 @@ export function createPluginWorker(options: {
       label: provider.label,
       description: provider.description,
       iconPath: provider.icon,
+      requiresConfiguration: provider.requiresConfiguration,
       hasCatalogCacheKey: provider.getCatalogCacheKey !== undefined,
       hasStatus: provider.status !== undefined,
       command: provider.command,
diff --git a/packages/server/src/server/test-utils/session-stubs.ts b/packages/server/src/server/test-utils/session-stubs.ts
index 50c0ee3c76..c5cf271ad3 100644
--- a/packages/server/src/server/test-utils/session-stubs.ts
+++ b/packages/server/src/server/test-utils/session-stubs.ts
@@ -240,6 +240,7 @@ export function createProviderSnapshotManagerStub(): {
   const off = vi.fn();
   const destroy = vi.fn<ProviderSnapshotManager["destroy"]>();
   const stub = {
+    supportsConfigRequiredProvider: () => false,
     getSnapshot,
     refreshSnapshotForCwd,
     refreshSettingsSnapshot,
diff --git a/packages/server/src/server/websocket-server.relay-reconnect.test.ts b/packages/server/src/server/websocket-server.relay-reconnect.test.ts
index 25acb9946b..10694a6ebe 100644
--- a/packages/server/src/server/websocket-server.relay-reconnect.test.ts
+++ b/packages/server/src/server/websocket-server.relay-reconnect.test.ts
@@ -1141,6 +1141,7 @@ describe("relay external socket reconnect behavior", () => {
     expect(serverInfo.features?.stableProjectIdentity).toBe(true);
     expect(serverInfo.features?.canonicalSubmittedPrompts).toBe(true);
     expect(serverInfo.features?.providersSnapshotCwd).toBe(true);
+    expect(serverInfo.features?.hopliteProvider).toBe(false);
     expect(serverInfo.features?.pluginLogs).toBe(true);
     expect(serverInfo.features?.workspaceMarkUnread).toBe(true);
     expect(serverInfo.features?.["terminal-input-mode-replay"]).toBe(true);
diff --git a/packages/server/src/server/websocket-server.ts b/packages/server/src/server/websocket-server.ts
index 5e93681a66..e833a07ce3 100644
--- a/packages/server/src/server/websocket-server.ts
+++ b/packages/server/src/server/websocket-server.ts
@@ -1915,6 +1915,7 @@ export class VoiceAssistantWebSocketServer {
         commitBaseClassification: true,
         // COMPAT(providerRemoval): added in v0.1.105, drop the gate when floor >= v0.1.105.
         providerRemoval: true,
+        hopliteProvider: this.providerSnapshotManager.supportsConfigRequiredProvider("hoplite"),
         // COMPAT(importSessionWorkspaceTarget): added in v0.1.110, remove gate after 2027-01-16.
         importSessionWorkspaceTarget: true,
         // COMPAT(importSessionSearch): added in v0.7.3, remove gate after 2027-03-02.
diff --git a/packages/server/vitest.config.ts b/packages/server/vitest.config.ts
index 4b25764445..c80345c79e 100644
--- a/packages/server/vitest.config.ts
+++ b/packages/server/vitest.config.ts
@@ -19,9 +19,9 @@ export default defineConfig({
     setupFiles: [path.resolve(__dirname, "./src/test-utils/vitest-setup.ts")],
     pool: "forks",
     fileParallelism: false,
-    // Windows runners intermittently starve subprocess-heavy Git tests at the
-    // default worker count, leaving child processes alive past their deadlines.
-    maxWorkers: process.platform === "win32" ? 2 : undefined,
+    // Even two concurrent Git-heavy suites can exhaust Windows test deadlines.
+    // Run files serially so their subprocesses do not compete across suites.
+    maxWorkers: process.platform === "win32" ? 1 : undefined,
     exclude: ["**/node_modules/**", "**/dist/**", "**/.claude/**", "**/.dev/**"],
   },
 });
diff --git a/plugins/hoplite-provider/icon.svg b/plugins/hoplite-provider/icon.svg
new file mode 100644
index 0000000000..ed585a9083
--- /dev/null
+++ b/plugins/hoplite-provider/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="1.394 1.679 8.494 7.828" fill="currentColor"><path d="M8.237 7.813C8.276 7.789 8.327 7.796 8.358 7.83L9.741 9.346C9.797 9.407 9.754 9.506 9.671 9.507H8.977C8.924 9.507 8.881 9.463 8.881 9.41V9.125C8.881 9.089 8.861 9.057 8.83 9.04L7.589 8.379C7.524 8.344 7.521 8.251 7.584 8.212L8.237 7.813ZM3.944 1.679C4.502 1.679 5.052 1.82 5.54 2.09L5.962 2.323C6.024 2.358 6.029 2.446 5.97 2.486L5.091 3.09C5.065 3.108 5.05 3.137 5.05 3.169V3.495C5.05 3.529 5.032 3.561 5.003 3.578L4.68 3.769C4.594 3.82 4.498 3.722 4.549 3.637L4.592 3.566C4.63 3.502 4.584 3.421 4.51 3.421H4.028C3.925 3.421 3.894 3.562 3.989 3.604L4.377 3.775C4.448 3.806 4.455 3.904 4.389 3.944L3.77 4.323C3.755 4.332 3.737 4.337 3.72 4.337H3.361C3.309 4.337 3.268 4.379 3.268 4.431C3.268 4.484 3.309 4.526 3.361 4.526H3.779C3.797 4.526 3.814 4.521 3.829 4.513L7.599 2.272C8.135 1.954 8.815 2.008 9.294 2.407C9.307 2.418 9.314 2.434 9.314 2.451V2.729C9.315 2.812 9.413 2.856 9.475 2.8L9.728 2.57C9.789 2.514 9.888 2.558 9.888 2.641V5.812C9.888 5.865 9.845 5.908 9.792 5.908H9.359C9.331 5.908 9.303 5.895 9.285 5.873L8.374 4.773C8.337 4.728 8.268 4.728 8.229 4.771L7.468 5.625C7.429 5.669 7.438 5.737 7.487 5.769L9.038 6.776C9.098 6.815 9.096 6.903 9.035 6.939L6.618 8.363C6.556 8.4 6.478 8.358 6.474 8.286L6.439 7.633C6.437 7.578 6.48 7.532 6.535 7.532H6.925C6.948 7.532 6.971 7.523 6.988 7.508L7.211 7.31C7.276 7.252 7.236 7.144 7.148 7.142L5.991 7.118H1.49C1.437 7.118 1.394 7.075 1.394 7.022V3.308C1.394 3.255 1.437 3.212 1.49 3.212H2.544C2.597 3.212 2.64 3.169 2.64 3.116V2.969C2.64 2.916 2.597 2.873 2.544 2.873H1.461C1.366 2.873 1.329 2.75 1.408 2.697L2.134 2.221C2.672 1.867 3.301 1.679 3.944 1.679Z"/></svg>
diff --git a/plugins/hoplite-provider/index.server.ts b/plugins/hoplite-provider/index.server.ts
new file mode 100644
index 0000000000..4c101df470
--- /dev/null
+++ b/plugins/hoplite-provider/index.server.ts
@@ -0,0 +1,7 @@
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { createHopliteProvider } from "./server/provider.js";
+
+export default function contribute(server: PluginServerContext) {
+  server.registerProvider(createHopliteProvider());
+  return () => {};
+}
diff --git a/plugins/hoplite-provider/paseo-plugin.json b/plugins/hoplite-provider/paseo-plugin.json
new file mode 100644
index 0000000000..138cf83ad6
--- /dev/null
+++ b/plugins/hoplite-provider/paseo-plugin.json
@@ -0,0 +1 @@
+{ "id": "hoplite-provider", "requirements": { "paseo": ">=0.11.0" } }
diff --git a/plugins/hoplite-provider/server/provider.ts b/plugins/hoplite-provider/server/provider.ts
new file mode 100644
index 0000000000..62a67dbdb1
--- /dev/null
+++ b/plugins/hoplite-provider/server/provider.ts
@@ -0,0 +1,17 @@
+import { runAcpProvider } from "@getpaseo/plugin/server/acp";
+import type { ProviderRegistration } from "@getpaseo/plugin/server/provider";
+import { runPhaseTransformer } from "./run-phase.js";
+
+export function createHopliteProvider(): ProviderRegistration {
+  return {
+    requiresConfiguration: true,
+    ...runAcpProvider({
+      id: "hoplite",
+      label: "Hoplite",
+      description: "Hoplite's coding agent through the local `hoplite acp` bridge",
+      icon: "icon.svg",
+      command: ["hoplite", "acp"],
+      transformers: [runPhaseTransformer],
+    }),
+  };
+}
diff --git a/plugins/hoplite-provider/server/run-phase.test.ts b/plugins/hoplite-provider/server/run-phase.test.ts
new file mode 100644
index 0000000000..5526f386c6
--- /dev/null
+++ b/plugins/hoplite-provider/server/run-phase.test.ts
@@ -0,0 +1,74 @@
+import { describe, expect, it } from "vitest";
+import { runPhaseTransformer } from "./run-phase.js";
+
+const context = { sessionId: "session-1" };
+
+// Frames captured from `hoplite acp` 3.0.0.
+function runPhase(phase: string | null, label: string | null) {
+  return {
+    method: "_hoplite/run_phase",
+    params: {
+      sessionId: "thr_c75d39f7d7624256af918eeee2f4941b",
+      runId: "run_eb213b97bd3147afb2927fbc27f87180",
+      phase,
+      label,
+      startedAt: phase === null ? null : "2026-10-04T17:51:46.311Z",
+    },
+  };
+}
+
+describe("runPhaseTransformer", () => {
+  it("shows a provisioning phase as one running workspace item per run", () => {
+    const update = runPhaseTransformer.notification?.(
+      runPhase("fetching_repository", "Cloning repository"),
+      context,
+    );
+
+    expect(update).toEqual({
+      type: "timeline",
+      item: {
+        type: "tool_call",
+        id: "hoplite-run-phase:run_eb213b97bd3147afb2927fbc27f87180",
+        callId: "hoplite-run-phase:run_eb213b97bd3147afb2927fbc27f87180",
+        name: "Hoplite workspace",
+        detail: { type: "plain_text", label: "Cloning repository", icon: "wrench" },
+        status: "running",
+        error: null,
+      },
+    });
+  });
+
+  it("completes the same item when the run leaves provisioning", () => {
+    const update = runPhaseTransformer.notification?.(runPhase(null, null), context);
+
+    expect(update).toMatchObject({
+      type: "timeline",
+      item: {
+        id: "hoplite-run-phase:run_eb213b97bd3147afb2927fbc27f87180",
+        status: "completed",
+        detail: { label: "Workspace ready" },
+      },
+    });
+  });
+
+  it("falls back to the phase name when Hoplite sends no label", () => {
+    const update = runPhaseTransformer.notification?.(
+      runPhase("configuring_workspace", null),
+      context,
+    );
+
+    expect(update).toMatchObject({ item: { detail: { label: "configuring_workspace" } } });
+  });
+
+  it("ignores other vendor notifications and malformed phases", () => {
+    expect(
+      runPhaseTransformer.notification?.({ method: "_hoplite/other", params: {} }, context),
+    ).toBeNull();
+    expect(
+      runPhaseTransformer.notification?.(
+        { method: "_hoplite/run_phase", params: { phase: "x" } },
+        context,
+      ),
+    ).toBeNull();
+  });
+});
diff --git a/plugins/hoplite-provider/server/run-phase.ts b/plugins/hoplite-provider/server/run-phase.ts
new file mode 100644
index 0000000000..767ee0447d
--- /dev/null
+++ b/plugins/hoplite-provider/server/run-phase.ts
@@ -0,0 +1,39 @@
+import type { AcpTransformer } from "@getpaseo/plugin/server/acp";
+import { z } from "zod";
+
+// Hoplite provisions a cloud workspace before the first agent output of a run and reports each
+// step as `_hoplite/run_phase`. A null phase ends provisioning for that run.
+const runPhaseSchema = z.object({
+  runId: z.string().min(1),
+  phase: z.string().nullable(),
+  label: z.string().nullable(),
+});
+
+const RUN_PHASE_METHOD = "_hoplite/run_phase";
+
+export const runPhaseTransformer: AcpTransformer = {
+  notification(notification) {
+    if (notification.method !== RUN_PHASE_METHOD) return null;
+    const params = runPhaseSchema.safeParse(notification.params);
+    if (!params.success) return null;
+    const { runId, phase, label } = params.data;
+    const id = `hoplite-run-phase:${runId}`;
+    const running = phase !== null;
+    return {
+      type: "timeline",
+      item: {
+        type: "tool_call",
+        id,
+        callId: id,
+        name: "Hoplite workspace",
+        detail: {
+          type: "plain_text",
+          label: running ? (label ?? phase) : "Workspace ready",
+          icon: "wrench",
+        },
+        status: running ? "running" : "completed",
+        error: null,
+      },
+    };
+  },
+};
diff --git a/public-docs/supported-providers.md b/public-docs/supported-providers.md
index f2b1370b68..1aa981ba29 100644
--- a/public-docs/supported-providers.md
+++ b/public-docs/supported-providers.md
@@ -85,6 +85,7 @@ Pick any of these from the in-app provider catalog. Each entry is a one-click in
 - [goose](https://block.github.io/goose/), Block's local open-source AI agent.
 - [Grok](https://docs.x.ai/build/overview), xAI's Grok Build agentic coding CLI.
 - [Hermes Agent](https://hermes-agent.nousresearch.com/docs/user-guide/features/acp), Nous Research's self-improving agent.
+- [Hoplite](#hoplite), cloud coding agent through its local ACP bridge.
 - [Junie](https://junie.jetbrains.com/docs/junie-cli-acp.html), JetBrains' coding agent.
 - [Kilo Code](https://kilo.ai/docs/code-with-ai/platforms/cli), open-source coding agent.
 - [Kimi Code CLI](https://github.com/MoonshotAI/kimi-code), Moonshot AI's coding assistant.
@@ -100,3 +101,18 @@ Pick any of these from the in-app provider catalog. Each entry is a one-click in
 - [VT Code](https://github.com/vinhnx/VTCode/blob/main/docs/guides/zed-acp.md), open-source multi-provider coding agent.
 
 The in-app catalog is the canonical, version-pinned source. Anything not listed here can still be added manually, see [Custom providers](/docs/custom-providers).
+
+### Hoplite
+
+Install the [Hoplite CLI](https://hoplite.sh/docs/cli) on your daemon host and run
+`hoplite login`. In **Settings → Hosts → your host → Providers**, find **Hoplite**
+in the catalog and choose **Add**. Paseo launches `hoplite acp` through the generic ACP adapter.
+
+Hoplite runs the agent in a cloud workspace. Open a repository linked to a Hoplite project,
+or set `agents.providers.hoplite.env.HOPLITE_PROJECT_ID` to use one project everywhere.
+Without a linked repository or pinned project, discovery reports `No Hoplite project`.
+Your local files and Paseo's loopback MCP tools are not available in that cloud workspace.
+
+See [Hoplite's ACP guide](https://hoplite.sh/docs/cli/acp) for authentication and project setup.
+Use a [command override](/docs/custom-providers) if `hoplite` is outside your daemon's PATH;
+keep `acp` in the arguments.

From d6d4084a06ce1cacb014ad512bd346eefdd8943f Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 21:38:38 +0700
Subject: [PATCH 184/270] docs(plugins): make registry publishing requirements
 actionable (#6996)

* docs(plugins): explain registry publishing requirements

* docs(plugins): trim publishing guidance to author tasks
---
 public-docs/cli.md                |  15 +-
 public-docs/community.md          |   9 +-
 public-docs/plugins/publishing.md | 407 ++++++++++++++++--------------
 public-docs/plugins/reference.md  |  11 +-
 4 files changed, 238 insertions(+), 204 deletions(-)

diff --git a/public-docs/cli.md b/public-docs/cli.md
index 1c348960b3..48f37e89de 100644
--- a/public-docs/cli.md
+++ b/public-docs/cli.md
@@ -228,11 +228,12 @@ The output includes each script's lifecycle and supervised terminal ID. Services
 Create and manage trusted plugins on a daemon:
 
 ```bash
-paseo plugin init /absolute/path/to/plugin
-paseo plugin install /absolute/path/to/plugin
-paseo plugin add owner/repository
+paseo plugin init ./plugin
+paseo plugin install ./plugin
+paseo plugin add owner/slug
+paseo plugin add git:owner/repository
 paseo plugin add https://gitlab.com/group/repository.git --ref main
-paseo plugin add owner/monorepo:plugins/review
+paseo plugin add git:owner/monorepo:plugins/review
 paseo plugin ls [id]
 paseo plugin update my-plugin
 paseo plugin update --all
@@ -243,8 +244,10 @@ paseo plugin enable my-plugin
 paseo plugin remove my-plugin
 ```
 
-GitHub shorthand checks an existing host directory first. Append `:<directory>` for a plugin in a
-monorepo. `paseo plugin ls [id]` does not contact the remote. `paseo plugin logs <id>` returns the
+Bare `owner/slug` installs a reviewed registry listing. Use `git:owner/repository` for GitHub
+source, or `./plugin` for a local directory. Append `:<directory>` for a plugin in a monorepo.
+
+`paseo plugin ls [id]` does not contact the remote. `paseo plugin logs <id>` returns the
 plugin's recent daemon-side stdout and stderr. Add `--json` for structured entries, or run
 `paseo --host <target> plugin logs <id>` for another daemon. See the
 [Plugin reference](/docs/plugins/reference) for installation, trust, lifecycle, and log-retention
diff --git a/public-docs/community.md b/public-docs/community.md
index 33ba212056..f18815990d 100644
--- a/public-docs/community.md
+++ b/public-docs/community.md
@@ -10,12 +10,11 @@ category: Getting started
 
 These projects are related to Paseo and built by the community.
 
-## Plugin directory
+## Plugins
 
-[paseo.cafe](https://paseo.cafe) is a community-run directory of Paseo plugins. Listings are generated
-from each plugin's public repository, so it is the fastest way to see what people are building and to
-publish your own. It is independent of the Paseo project and nothing on it is reviewed or endorsed by
-us, so read a plugin's source before installing it.
+Browse the [plugin registry](/plugins) for reviewed community plugins. To share your own, follow
+[Publish a plugin](/docs/plugins/publishing) for package preparation and submission.
+Plugins run unsandboxed; read their listing and source before installing.
 
 ## Tools and integrations
 
diff --git a/public-docs/plugins/publishing.md b/public-docs/plugins/publishing.md
index 16cde2389a..f925d0f1d4 100644
--- a/public-docs/plugins/publishing.md
+++ b/public-docs/plugins/publishing.md
@@ -1,6 +1,6 @@
 ---
 title: Publish a plugin
-description: Share a Paseo plugin on npm, through a private registry, or from a Git repository.
+description: Prepare, publish and submit a Paseo plugin to the reviewed registry.
 nav: Publishing
 order: 45
 category: Plugins
@@ -8,111 +8,241 @@ category: Plugins
 
 # Publish a plugin
 
-Publish your plugin so other people can install and use it in Paseo. Start with a working
-[plugin project](/docs/plugins), then choose where to share it:
+Start with a working [plugin project](/docs/plugins). Prepare its listing, publish it on npm
+or push it to GitHub, then submit it to the registry. After approval, users install the reviewed
+version with `paseo plugin add owner/slug`.
 
-- [Plugin registry](#plugin-registry): share a reviewed artifact users install by `owner/slug`.
-- [npm](#publish-on-npm): publish a package on the public npm registry.
-- [GitHub or Git](#share-through-github-or-git): let users install from a repository.
+1. Prepare your [listing page](#your-listing-page) and, for a visual plugin, an
+   [interface image](#icons-and-screenshots).
+2. [Publish on npm](#publish-on-npm) or [share through Git](#share-through-github-or-git).
+3. [Submit to the plugin registry](#plugin-registry).
+
+For a private plugin, use [direct Git installation](#share-through-github-or-git) or
+[private npm packages](#private-npm-packages).
+
+## Your listing page
+
+You can submit without `OVERVIEW.md`; the reviewer creates a listing page from your README and
+verified behavior. To maintain the page yourself, put `OVERVIEW.md` beside `paseo-plugin.json`
+and include it in the published package. The scaffold already includes it in `files`.
+Your shipped overview replaces the reviewer-written page.
+
+Explain these points in order, using headings only when they help:
+
+1. What the plugin does.
+2. How it works, when that is not obvious.
+3. Setup: settings, accounts, tokens, external tools, supported operating systems and Paseo versions.
+4. Useful capabilities, settings, data access, permissions and limitations.
+
+Describe where data goes, including prompts and tool results sent to agent providers. Local storage
+does not mean data stays on the host. If the plugin downloads or installs software while running,
+explain what it installs and its source, and require explicit user confirmation before the download.
+This applies to activation and connection tests too; declining must leave the software uninstalled.
+
+Use plain factual language and sentence case. Omit marketing, unsupported claims, badges,
+changelogs, contributing and license sections, and implementation details that do not help someone
+choose the plugin. The listing already provides plugin installation instructions.
+
+The publication validator rejects `paseo plugin add`, `npm install` and `npm i` anywhere in an
+overview, including development or setup examples. Link to your README for those commands.
+
+Also supply a one-sentence description: use `package.json`'s `description` for npm or the manifest's
+`description` for Git. The reviewer can fill in a missing description in the registry.
+
+## Icons and screenshots
+
+Themes, panels and other visual plugin interfaces need at least one image showing the current
+interface. Use sample data and hide private details. An icon alone does not meet this requirement;
+plugins without their own visual interface do not need screenshots.
+
+Declare local images in `paseo-plugin.json` before publishing:
+
+```json
+{
+  "id": "review-tools",
+  "name": "Review tools",
+  "description": "Reviews changes before merge",
+  "icon": "assets/icon.png",
+  "media": ["assets/screenshot.png"],
+  "requirements": { "paseo": ">=0.11.0" }
+}
+```
+
+Create the referenced files and include `assets/` in `package.json`'s `files` list for npm.
+Paths are relative to the manifest, use forward slashes and stay inside the plugin directory.
+These metadata fields require Paseo 0.11.0 or later.
+
+| Field   | Listing behavior                                                                                                                                                    |
+| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `name`  | Optional display name; defaults to a humanized plugin ID.                                                                                                           |
+| `icon`  | Optional package-relative PNG. Provider registration icons have a separate [SVG contract](/docs/plugins/reference#providers).                                       |
+| `media` | Package-relative paths or public HTTPS URLs. Images: PNG, JPG, JPEG, WebP or GIF. Videos: MP4 or WebM. The first image is the card thumbnail; videos supplement it. |
+
+Public media URLs need a supported file extension, matched case-insensitively, and must return
+HTTP 200 with the corresponding image or video content type. SVG and extensionless attachment
+URLs are not accepted as registry media.
+
+Instead of declaring `media`, you can supply suitable public image URLs in the submission or
+review PR. The reviewer can add them to the listing without a new plugin release.
+
+## Publish on npm
+
+### 1. Set package identity
+
+Use an npm scope you can publish to and authenticate with `npm login`. From your plugin directory,
+replace `@acme` and the repository below with your own values:
+
+```bash
+npm pkg set name=@acme/paseo-review version=1.0.0
+npm pkg delete private
+npm pkg set repository.type=git repository.url=git+https://github.com/acme/paseo-review.git
+```
+
+The current registry tooling requires a GitHub repository for npm listing ownership, supplied
+through `package.json` or npm provenance. Set `repository` to your public source repository so
+pinning can determine the listing owner. Provenance itself is optional; if present, its repository
+must match the package's repository. A matching source checkout is not required for artifact review.
+
+### 2. Lock installed dependencies
+
+Keep Paseo's host libraries and type-only dependencies in `devDependencies`. Add other runtime
+libraries to `dependencies`. For registry submission, every installed dependency tree needs a lock
+with exact versions, resolved sources and integrity, including transitive dependencies.
+
+For an npm package with installed runtime dependencies, update its lock without running lifecycle
+scripts, then create the publishable lock:
+
+```bash
+npm install --package-lock-only --ignore-scripts
+npm shrinkwrap
+```
+
+`npm shrinkwrap` converts `package-lock.json` into `npm-shrinkwrap.json`. npm publishes the shrinkwrap
+at the package root; it does not publish `package-lock.json`. A repository-only lock or exact direct
+version does not lock the dependency tree installed by your users.
+
+Plugins using only host libraries and development dependencies need no runtime lock unless a
+preparation command installs those dependencies. You can also bundle a library and remove the
+runtime dependency declaration. See [preparation and additional setup](#plugins-with-a-build-step)
+if your plugin installs a separate tree.
+
+### 3. Check the package and publish
+
+Generate any required files before checking the package; the dry run skips packing scripts.
+
+```bash
+npm run typecheck
+npm pack --dry-run --ignore-scripts
+```
+
+Check the file list contains `paseo-plugin.json`, at least one runtime entry, every imported local
+module, any overview and assets you declared, and the shrinkwrap when required. Repository-only import aliases
+and files outside the package do not reach users. The scaffold includes the entries and `client/`,
+`server/` and `shared/`; add other asset directories to `files`.
+
+Confirm any declared preparation command succeeds with the Node/npm versions you support;
+an out-of-sync or incompatible lockfile still blocks installation.
+
+Publish the checked version:
+
+```bash
+npm publish --access public
+```
+
+On a test daemon, install that exact published version and exercise its contributions:
+
+```bash
+paseo plugin install npm:@acme/paseo-review@1.0.0
+paseo plugin ls
+```
+
+Require `running` with no error, then [submit the package](#plugin-registry).
+
+## Share through GitHub or Git
+
+For the public registry, push your plugin to a public GitHub repository. Include its manifest,
+runtime entries, imported files and listing assets. Git tags and commits are optional at submission;
+provide one to select a revision, or the reviewer resolves `main`.
+
+If preparation installs runtime npm dependencies, commit a synchronized `package-lock.json` and
+add this command to `paseo-plugin.json`:
+
+```json
+{
+  "build": [["npm", "ci", "--omit=dev", "--ignore-scripts"]]
+}
+```
+
+`npm ci` consumes the committed lock and fails if it disagrees with `package.json`. `--omit=dev`
+excludes development tools and `--ignore-scripts` suppresses dependency lifecycle scripts.
+The daemon needs npm on its command path. Plugins using only host libraries need no preparation
+command. See [preparation](#plugins-with-a-build-step) for generated files or explicit scripts.
+
+Users can install directly from Git without a registry listing:
+
+```bash
+paseo plugin add git:acme/paseo-review
+paseo plugin add git:acme/monorepo:plugins/review
+```
+
+Use `--ref` to select a branch, tag or commit for the initial installation. Direct installation
+also supports private repositories and other Git hosts when the daemon has access; see
+[plugin sources](/docs/plugins/reference#plugin-sources). Registry submission accepts public
+GitHub sources and public npm packages.
 
 ## Plugin registry
 
-Browse published plugins at [paseo.sh/plugins](https://paseo.sh/plugins).
-Users install the reviewed artifact with:
+Open the [submission form](https://github.com/getpaseo/plugins/issues/new?template=submit-plugin.yml).
+Use the form so the issue receives the submission label that starts intake.
+
+1. Use your plugin's name as the title.
+2. In **Source**, enter the public npm package name or page, or the GitHub repository/folder URL.
+   Include the version or Git reference if you want a specific release reviewed. npm defaults to
+   `latest`. Registry IDs and local directories are not submission sources.
+3. Select the categories that fit. Include any interface-image URLs in the issue description.
+
+The bot opens a review PR. The reviewer inspects the artifact and dependencies without running
+plugin code, completes the listing and records the exact approved version or commit. Publication
+requires the [review policy](https://github.com/getpaseo/plugins/blob/main/REVIEW.md), including
+locked installation inputs and appropriate data access, even when automated validation passes.
+
+If a change is requested, reply on the review PR with the corrected version/revision or requested
+image URL. The reviewer updates the pin and listing. Intake service errors retry automatically;
+missing images or an overview do not prevent opening the review PR.
+
+After approval and publication, users install your listing with:
 
 ```bash
 paseo plugin add owner/slug
 ```
 
-Publish your artifact through npm or Git, then follow the
-[registry submission guide](https://github.com/getpaseo/plugins) to submit it for review.
-Registry installations and updates use the approved revision and plugin path.
-Direct Git installs use explicit `git:owner/repository` shorthand or a full Git URL.
+npm releases receive automatic update PRs. Submit Git updates manually with the desired revision.
+Existing registry installations use approved pins; direct npm/Git installs follow their own update
+rules in the [source reference](/docs/plugins/reference#plugin-sources).
 
-## Publish on npm
+## Plugins with a build step
 
-The scaffold prepares the package files and development dependencies. You choose the package name
-and release version.
+Paseo compiles TypeScript, so an ordinary plugin needs no separate publication build.
+Keep generated modules in their runtime directory and host-provided modules external.
 
-### 1. Set your package name and version
+Paseo suppresses npm lifecycle scripts during package acquisition. Commands explicitly declared in
+manifest `build` still run, including scripts they invoke. Explain the purpose of those commands
+and keep their inputs locked and inspectable. Remove Git-only dependency-install commands from
+npm manifests when npm already installs the production dependencies.
 
-From the plugin directory, set your package details and allow publication. Replace `@acme` with your npm scope:
+Later setup that installs another dependency tree needs its own complete lock, even if your plugin
+has a development lockfile. For npm setup, ship the runtime manifest and lock together and use
+`npm ci`. For Python setup, ship a requirements file containing exact versions and SHA-256 hashes
+for all transitive packages, then install it with:
 
 ```bash
-npm pkg set name=@acme/paseo-review version=1.0.0
-npm pkg delete private
+python -m pip install --require-hashes -r requirements-documents.txt
 ```
 
-### 2. Check and publish
+This command rejects unpinned or unhashed dependencies. Runtime installation also needs the
+[confirmation and disclosure](#your-listing-page) described above.
 
-```bash
-npm run typecheck
-npm pack --dry-run
-npm publish --access public
-```
-
-Check the pack output includes any assets you added to the project.
-
-### 3. Test the published plugin
-
-On a daemon host with npm available:
-
-```bash
-paseo plugin install npm:@acme/paseo-review@1.0.0
-```
-
-Users can also paste `npm:@acme/paseo-review` into **Settings → Plugins → Plugin source**.
-
-:::example[Package configuration]
-
-The scaffold includes this `files` list in `package.json`:
-
-```json
-{
-  "files": [
-    "paseo-plugin.json",
-    "OVERVIEW.md",
-    "index.client.ts",
-    "index.client.tsx",
-    "index.server.ts",
-    "index.server.tsx",
-    "client/",
-    "server/",
-    "shared/"
-  ]
-}
-```
-
-- Add any assets stored outside these directories to `files`.
-- Keep the scaffold's SDK and host libraries in `devDependencies`.
-- Add other runtime libraries with `npm install <package>`. Paseo installs their dependencies too.
-- The npm package name identifies the source. The manifest's `id` identifies the installed plugin.
-
-See the [project reference](/docs/plugins/reference#project-files) for entry points and runtime boundaries.
-
-:::
-
-### Plugins with a build step
-
-Paseo compiles TypeScript. An ordinary plugin needs no separate build before publication.
-If your plugin generates files, include the generated output in the package.
-
-**Installation scripts do not run automatically.** If a dependency needs host-specific setup,
-declare a [preparation command](/docs/plugins/reference#cli-reference).
-
-:::example[Generated files and dependencies]
-
-- Generate code and assets before running `npm publish`.
-- Keep generated JavaScript in its runtime directory and import it from the TypeScript entry.
-- Include generated assets in `files`.
-- Keep host-provided modules external when producing your own bundle.
-- Remove Git-only dependency-install commands from the published manifest; npm installation already
-  installs production dependencies.
-
-Paseo skips npm lifecycle scripts during installation, including dependency scripts. For example,
-a native dependency that needs rebuilding requires an explicit preparation command.
-
-:::
+## Private npm packages
 
 :::example[Publish a private package with GitHub Packages]
 
@@ -151,104 +281,3 @@ Paseo uses the host's npm registry settings and credentials for installation and
 In the app, enter only the source identifier.
 
 :::
-
-## Icons and screenshots
-
-Declare your display name, icon, screenshots, and demo videos in `paseo-plugin.json`:
-
-```json
-{
-  "id": "review-tools",
-  "name": "Review tools",
-  "description": "Reviews changes before merge",
-  "icon": "assets/icon.png",
-  "media": ["assets/screenshot.png", "https://example.com/review-demo.mp4"],
-  "requirements": { "paseo": ">=0.11.0" }
-}
-```
-
-All three fields are optional. `name` gives the registry and website a display name without
-changing the installation ID. When omitted, the registry falls back to a humanized ID.
-Registry and website display requires the registry builder to read these fields from the pinned
-manifest. That update is a separate follow-up; until it lands, these fields are exposed only
-through the daemon's installed-plugin list.
-`icon` must point to a PNG inside the plugin package. `media` accepts paths to images and videos
-inside the package or HTTPS URLs, in display order. Paths are relative to the manifest; use
-forward slashes and keep them inside the package. See the [manifest reference](/docs/plugins/reference#project-files)
-for validation rules.
-
-Commit local assets alongside the manifest at the pinned revision. For npm, add their directory
-(for example, `assets/`) to `package.json`'s `files` list and verify it with `npm pack --dry-run`.
-The scaffold documents these fields in its manifest's `$comment`; add your display name and
-assets before publishing.
-
-Manifests using these fields fail to install on daemons before 0.11.0. Set
-`requirements.paseo` to `>=0.11.0` or a narrower supported range.
-
-## Your listing page
-
-Write `OVERVIEW.md` beside `paseo-plugin.json` for the plugin page inside Paseo.
-It helps someone decide whether to install your plugin; the install command is already at
-the top of that page. A README assumes a GitHub audience and carries installation
-instructions, technical details, and badges. Long, AI-generated READMEs make people read
-past that material to understand what a plugin does.
-
-`OVERVIEW.md` is required to list your plugin in the registry. Commit it beside
-`paseo-plugin.json` in the source repository at the pinned commit. The registry resolves it
-relative to the manifest, under `pluginPath` for monorepos. Include it in the published npm
-package too; the scaffold's `files` list includes it. Replace the scaffold's guidance comment
-with useful facts before publishing.
-
-The repository overview takes precedence over a registry import stopgap. Online validation
-fails when the pinned commit has no `OVERVIEW.md`, except for unchanged imported records
-that already carry `plugins/<owner>/<slug>.md` in the registry repository. Every version bump
-requires a repository overview and removes the stopgap in the same PR. A bump without the
-repository overview fails validation. README files do not supply the overview.
-
-Author overviews and registry stopgaps follow the same content contract, in this order.
-Choose headings only when they help; length follows complexity. A theme needs one paragraph.
-
-1. Explain what the plugin is and does in plain terms first.
-2. Explain how it works only when that is not obvious.
-3. Explain setup when needed: settings, accounts, tokens, providers, external tools, or other
-   plugins. Include applicable daemon version and operating system requirements. Setup
-   guidance is allowed; installation instructions are not.
-4. Explain capabilities and settings worth understanding, what each option does, what the
-   plugin reads or sends and where, permissions, and known limits.
-
-Use sentence case and plain factual language, with no em dashes. Omit installation commands,
-badges, changelog, contributing or license sections, marketing, and unsupported claims.
-Avoid implementation filler such as empty cleanup functions, catalogs of theme-token fields,
-or lists of absent features. Keep only what helps someone choose the plugin.
-
-If your plugin is an unchanged imported record, you can propose an author-written overview
-to replace the registry stopgap. Do not add import credit to your own `OVERVIEW.md`.
-
-## Share through GitHub or Git
-
-Push the plugin project to a repository. Users can install it with:
-
-```bash
-paseo plugin add git:acme/paseo-review
-```
-
-For another Git host:
-
-```bash
-paseo plugin install git:https://git.example.com/acme/paseo-review.git
-```
-
-If your plugin has runtime npm dependencies, commit `package-lock.json` and add a preparation
-command to `paseo-plugin.json`:
-
-```json
-{
-  "build": [["npm", "ci", "--omit=dev"]]
-}
-```
-
-- `npm ci` installs the versions in the committed lockfile.
-- `--omit=dev` excludes development tools.
-- npm must be available on the daemon host.
-
-Plugins that only use Paseo's host libraries need no preparation command.
diff --git a/public-docs/plugins/reference.md b/public-docs/plugins/reference.md
index 04c88bdf1a..409bb3f5a6 100644
--- a/public-docs/plugins/reference.md
+++ b/public-docs/plugins/reference.md
@@ -63,7 +63,9 @@ The required root manifest is `paseo-plugin.json`:
 | `build`        | No       | Preparation commands, described in the CLI reference.                                     |
 
 Paths are relative to `paseo-plugin.json`, use forward slashes, and cannot contain `..`
-segments. See [icons and screenshots](/docs/plugins/publishing#icons-and-screenshots) for an example.
+segments. Registry listings for visual plugins require an interface image even though `media` is
+optional in the runtime manifest. See [icons and screenshots](/docs/plugins/publishing#icons-and-screenshots)
+for accepted formats and listing requirements.
 Paseo validates the references without opening local assets or fetching URLs.
 
 Unknown top-level fields are ignored. Known fields still validate, and unknown keys inside
@@ -2137,7 +2139,7 @@ export default function contribute(server: PluginServerContext) {
 
 Inputs and outputs are validated on both sides. RPC names start with a lowercase letter and contain lowercase letters, numbers, dots, hyphens, or underscores. `useRpc()` returns a typed async function. Use TanStack Query for request state, caching, and mutations.
 
-Backend handlers receive the same `PaseoApi` as `{ paseo }`. Their connection belongs to the subprocess and closes when the plugin stops. It does not subscribe to timelines or catalog events until plugin code subscribes. Follow the [SDK event contract](../../sdk/events.md) for cleanup and timeline replacements. Backend code can use Node APIs and dependencies installed in the plugin directory.
+Backend handlers receive the same `PaseoApi` as `{ paseo }`. Their connection belongs to the subprocess and closes when the plugin stops. It does not subscribe to timelines or catalog events until plugin code subscribes. Follow the [SDK event contract](/docs/sdk/events) for cleanup and timeline replacements. Backend code can use Node APIs and dependencies installed in the plugin directory.
 
 ## Debug backend output
 
@@ -2351,8 +2353,9 @@ keeps the complete dependency tree and `package-lock.json` when activating it. T
 package and lockfile provide its current version and artifact integrity. A version, tag, or range
 chooses content for this installation only.
 
-For package contents, dependencies, preparation, and private registries, see
-[Publish a plugin](/docs/plugins/publishing).
+The installed lockfile records what this installation resolved. Authors submitting npm plugins
+with runtime dependencies must also ship the [publication lock](/docs/plugins/publishing#2-lock-installed-dependencies).
+For package contents, preparation and submission, see [Publish a plugin](/docs/plugins/publishing).
 
 A failed download, dependency installation, manifest check, preparation command, compilation, or
 activation discards the candidate. Other installed plugins keep running. Removing an npm plugin

From 2d86b94b2fe0210e55c1603eaa686f6cfdf289ce Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 22:45:12 +0700
Subject: [PATCH 185/270] Refine provider catalog buttons and show Add errors
 as toasts (#7030)

* fix(app): refine provider catalog actions and error feedback

Use compact row tiles and the shared error toast so failed Add actions remain visible while browsing the catalog. Point Hoplite installation instructions at the CLI install section.

* test(app): supply toast context in provider settings tests

Import the toast API independently of its renderer so the provider section only depends on the context it consumes.
---
 .../e2e/browser/acp-provider-catalog.spec.ts  |   6 +-
 .../src/components/provider-catalog-list.tsx  | 129 +++++++-----------
 packages/app/src/data/acp-provider-catalog.ts |   2 +-
 .../hooks/use-acp-provider-catalog.test.ts    |   2 +-
 .../settings/providers-section.test.tsx       |  13 +-
 .../screens/settings/providers-section.tsx    |  13 +-
 6 files changed, 69 insertions(+), 96 deletions(-)

diff --git a/packages/app/e2e/browser/acp-provider-catalog.spec.ts b/packages/app/e2e/browser/acp-provider-catalog.spec.ts
index d6ebb8f547..ceca7489e3 100644
--- a/packages/app/e2e/browser/acp-provider-catalog.spec.ts
+++ b/packages/app/e2e/browser/acp-provider-catalog.spec.ts
@@ -140,8 +140,10 @@ test("unsupported host asks for an update without writing Hoplite config", async
     await openSettingsHost(page, outdatedDaemon.serverId);
     await openSettingsHostSection(page, outdatedDaemon.serverId, "providers");
     await openAddProviderArea(page);
-    await installAcpCatalogProvider(page, "Hoplite");
-    await expect(page.getByRole("alert")).toHaveText("Update the host to add Hoplite.");
+    await page.getByRole("button", { name: "Add Hoplite", exact: true }).click();
+    const errorToast = page.getByTestId("app-toast-message");
+    await expect(errorToast).toHaveText("Update the host to add Hoplite.");
+    await expect(errorToast).toBeInViewport();
     expect((await client.getDaemonConfig()).config).toEqual(before.config);
     await expect(
       page.getByRole("button", { name: "Hoplite provider details", exact: true }),
diff --git a/packages/app/src/components/provider-catalog-list.tsx b/packages/app/src/components/provider-catalog-list.tsx
index 748554efde..3e75765919 100644
--- a/packages/app/src/components/provider-catalog-list.tsx
+++ b/packages/app/src/components/provider-catalog-list.tsx
@@ -26,8 +26,8 @@ interface ProviderCatalogListProps {
 const PROVIDER_FALLBACK_ICON_SIZE = 20;
 const PROVIDER_REMOTE_ICON_SIZE = 24;
 const TILE_GAP = SPACING[3];
-/** Narrowest tile that keeps the type badge and install link on one line. */
-const MIN_TILE_WIDTH = 216;
+/** Narrowest tile that keeps the icon, type badge, install link, and Add on one row. */
+const MIN_TILE_WIDTH = 300;
 const MAX_COLUMNS = 4;
 
 const ThemedPackagePlus = withUnistyles(PackagePlus);
@@ -42,7 +42,7 @@ function columnCountForWidth(width: number): number {
 
 interface CatalogTileProps {
   entry: AcpProviderCatalogItem;
-  /** `undefined` until the grid is measured; a single column fills the row. */
+  /** `undefined` until the grid is measured, or in a single column; the tile fills the row. */
   width: number | undefined;
   installing: boolean;
   onInstall: (entry: AcpProviderCatalogItem) => void;
@@ -53,76 +53,53 @@ function CatalogTile({ entry, width, installing, onInstall }: CatalogTileProps)
   const handleInstall = useCallback(() => {
     onInstall(entry);
   }, [entry, onInstall]);
-  const isSingleColumn = width === undefined;
   const tileStyle = useMemo(
-    () => [settingsStyles.card, styles.tile, isSingleColumn ? styles.tileFull : { width }],
-    [isSingleColumn, width],
-  );
-
-  const icon = (
-    <View style={styles.iconFrame}>
-      {entry.iconSvg ? (
-        <ThemedSvgXml
-          xml={entry.iconSvg}
-          width={PROVIDER_REMOTE_ICON_SIZE}
-          height={PROVIDER_REMOTE_ICON_SIZE}
-          uniProps={foregroundColorMapping}
-        />
-      ) : (
-        <ThemedPackagePlus size={PROVIDER_FALLBACK_ICON_SIZE} uniProps={foregroundColorMapping} />
-      )}
-    </View>
-  );
-  const addButton = (
-    <Button
-      size="sm"
-      variant="outline"
-      disabled={installing}
-      loading={installing}
-      onPress={handleInstall}
-      accessibilityLabel={t("providerCatalog.actions.addProvider", { provider: entry.title })}
-      style={styles.addButton}
-      testID={`install-provider-${entry.id}`}
-    >
-      {installing ? t("providerCatalog.actions.adding") : t("providerCatalog.actions.add")}
-    </Button>
-  );
-  const details = (
-    <View style={isSingleColumn ? [styles.details, styles.detailsInRow] : styles.details}>
-      <Text style={styles.name} numberOfLines={1}>
-        {entry.title}
-      </Text>
-      <View style={styles.metaRow}>
-        {/* The catalog is the ACP registry, so every entry it offers is an ACP provider. */}
-        <StatusBadge label={t("providerCatalog.types.acp")} size="xs" />
-        <ExternalLink
-          href={entry.installLink}
-          label={t("providerCatalog.actions.installInstructions")}
-          accessibilityLabel={t("providerCatalog.actions.installInstructionsFor", {
-            provider: entry.title,
-          })}
-        />
-      </View>
-    </View>
+    () => [settingsStyles.card, styles.tile, width === undefined ? styles.tileFull : { width }],
+    [width],
   );
 
   return (
     <View style={tileStyle} testID={`provider-catalog-tile-${entry.id}`}>
-      {isSingleColumn ? (
-        <View style={styles.singleColumnRow}>
-          {icon}
-          {details}
-          {addButton}
+      <View style={styles.iconFrame}>
+        {entry.iconSvg ? (
+          <ThemedSvgXml
+            xml={entry.iconSvg}
+            width={PROVIDER_REMOTE_ICON_SIZE}
+            height={PROVIDER_REMOTE_ICON_SIZE}
+            uniProps={foregroundColorMapping}
+          />
+        ) : (
+          <ThemedPackagePlus size={PROVIDER_FALLBACK_ICON_SIZE} uniProps={foregroundColorMapping} />
+        )}
+      </View>
+      <View style={styles.details}>
+        <Text style={styles.name} numberOfLines={1}>
+          {entry.title}
+        </Text>
+        <View style={styles.metaRow}>
+          {/* The catalog is the ACP registry, so every entry it offers is an ACP provider. */}
+          <StatusBadge label={t("providerCatalog.types.acp")} size="xs" />
+          <ExternalLink
+            href={entry.installLink}
+            label={t("providerCatalog.actions.installInstructions")}
+            accessibilityLabel={t("providerCatalog.actions.installInstructionsFor", {
+              provider: entry.title,
+            })}
+          />
         </View>
-      ) : (
-        <>
-          <View style={styles.tileHeader}>
-            {icon}
-            {addButton}
-          </View>
-          {details}
-        </>
-      )}
+      </View>
+      <Button
+        size="xs"
+        variant="outline"
+        disabled={installing}
+        loading={installing}
+        onPress={handleInstall}
+        accessibilityLabel={t("providerCatalog.actions.addProvider", { provider: entry.title })}
+        style={styles.addButton}
+        testID={`install-provider-${entry.id}`}
+      >
+        {installing ? t("providerCatalog.actions.adding") : t("providerCatalog.actions.add")}
+      </Button>
     </View>
   );
 }
@@ -208,29 +185,18 @@ const styles = StyleSheet.create((theme) => ({
     gap: TILE_GAP,
   },
   tile: {
+    flexDirection: "row",
+    alignItems: "center",
     gap: theme.spacing[3],
     padding: theme.spacing[3],
   },
   tileFull: {
     width: "100%",
   },
-  tileHeader: {
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "space-between",
-    gap: theme.spacing[2],
-  },
-  singleColumnRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[3],
-  },
   details: {
-    gap: theme.spacing[1],
-  },
-  detailsInRow: {
     flex: 1,
     minWidth: 0,
+    gap: theme.spacing[1],
   },
   iconFrame: {
     flexShrink: 0,
@@ -243,7 +209,6 @@ const styles = StyleSheet.create((theme) => ({
   },
   addButton: {
     flexShrink: 0,
-    minWidth: 72,
   },
   name: {
     color: theme.colors.foreground,
diff --git a/packages/app/src/data/acp-provider-catalog.ts b/packages/app/src/data/acp-provider-catalog.ts
index 52230d6251..1bd32db53d 100644
--- a/packages/app/src/data/acp-provider-catalog.ts
+++ b/packages/app/src/data/acp-provider-catalog.ts
@@ -246,7 +246,7 @@ const CATALOG_DATA = [
     description: "Cloud coding agent through the local hoplite acp bridge",
     version: "manual",
     iconId: "hoplite",
-    installLink: "https://hoplite.sh/docs/cli/acp",
+    installLink: "https://hoplite.sh/docs/cli#install",
     command: ["hoplite", "acp"],
   },
   {
diff --git a/packages/app/src/hooks/use-acp-provider-catalog.test.ts b/packages/app/src/hooks/use-acp-provider-catalog.test.ts
index 5e642e0091..201c17c022 100644
--- a/packages/app/src/hooks/use-acp-provider-catalog.test.ts
+++ b/packages/app/src/hooks/use-acp-provider-catalog.test.ts
@@ -64,7 +64,7 @@ describe("ACP provider catalog", () => {
     expect(findProvider("hoplite")).toMatchObject({
       title: "Hoplite",
       command: ["hoplite", "acp"],
-      installLink: "https://hoplite.sh/docs/cli/acp",
+      installLink: "https://hoplite.sh/docs/cli#install",
     });
     expect(buildAcpProviderConfigPatch(findProvider("hoplite"), true)).toEqual({
       providers: {
diff --git a/packages/app/src/screens/settings/providers-section.test.tsx b/packages/app/src/screens/settings/providers-section.test.tsx
index 77aaa4d8ec..0a702ae641 100644
--- a/packages/app/src/screens/settings/providers-section.test.tsx
+++ b/packages/app/src/screens/settings/providers-section.test.tsx
@@ -6,6 +6,7 @@ import { createRoot, type Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
 import type { MutableDaemonConfig } from "@getpaseo/protocol/messages";
+import { ToastApiProvider } from "@/contexts/toast-api-context";
 
 const { theme, snapshotState, configState, patchConfigMock, openProviderSettingsMock } = vi.hoisted(
   () => ({
@@ -281,6 +282,12 @@ vi.mock("@/utils/confirm-dialog", () => ({
 
 import { ProvidersSection } from "./providers-section";
 
+function unexpectedToast(): never {
+  throw new Error("Provider row interactions should not display a toast");
+}
+
+const toastApi = { show: unexpectedToast, copied: unexpectedToast, error: unexpectedToast };
+
 const claudeEntry: ProviderSnapshotEntry = {
   provider: "claude",
   status: "ready",
@@ -366,7 +373,11 @@ describe("ProvidersSection", () => {
 
   function render(): void {
     act(() => {
-      root?.render(<ProvidersSection serverId="server-1" />);
+      root?.render(
+        <ToastApiProvider api={toastApi}>
+          <ProvidersSection serverId="server-1" />
+        </ToastApiProvider>,
+      );
     });
   }
 
diff --git a/packages/app/src/screens/settings/providers-section.tsx b/packages/app/src/screens/settings/providers-section.tsx
index 11147b3a3e..72234b7602 100644
--- a/packages/app/src/screens/settings/providers-section.tsx
+++ b/packages/app/src/screens/settings/providers-section.tsx
@@ -11,6 +11,7 @@ import {
 } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
+import { useToast } from "@/contexts/toast-api-context";
 import { settingsStyles } from "@/styles/settings";
 import { useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { useHostFeature } from "@/runtime/host-features";
@@ -326,9 +327,9 @@ export interface ProvidersSectionProps {
 
 export function ProvidersSection({ serverId }: ProvidersSectionProps) {
   const { t } = useTranslation();
+  const toast = useToast();
   const isConnected = useHostRuntimeIsConnected(serverId);
   const supportsHopliteProvider = useHostFeature(serverId, "hopliteProvider");
-  const [installError, setInstallError] = useState<string | null>(null);
   const supportsProviderRemoval = useHostFeature(serverId, "providerRemoval");
   const { entries, isLoading, refresh } = useProvidersSnapshot(serverId);
   const { config, patchConfig } = useDaemonConfig(serverId);
@@ -413,18 +414,17 @@ export function ProvidersSection({ serverId }: ProvidersSectionProps) {
   const handleInstall = useCallback(
     async (entry: AcpProviderCatalogItem) => {
       if (installingProviderId) return;
-      setInstallError(null);
       setInstallingProviderId(entry.id);
       try {
         await patchConfig(buildAcpProviderConfigPatch(entry, supportsHopliteProvider));
         await refresh([entry.id]);
       } catch (error) {
-        setInstallError(error instanceof Error ? error.message : String(error));
+        toast.error(error instanceof Error ? error.message : String(error));
       } finally {
         setInstallingProviderId((current) => (current === entry.id ? null : current));
       }
     },
-    [installingProviderId, patchConfig, refresh, supportsHopliteProvider],
+    [installingProviderId, patchConfig, refresh, supportsHopliteProvider, toast],
   );
 
   return (
@@ -480,11 +480,6 @@ export function ProvidersSection({ serverId }: ProvidersSectionProps) {
           testID="host-page-add-provider-card"
           style={styles.addProviderSection}
         >
-          {installError ? (
-            <Text accessibilityRole="alert" style={styles.errorText}>
-              {installError}
-            </Text>
-          ) : null}
           <ProviderCatalogList
             serverId={serverId}
             installingProviderId={installingProviderId}

From d172d060a5b7a1e49583f05d0ee331599b1d1b27 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 18:28:07 +0200
Subject: [PATCH 186/270] server: keep streamed OpenCode v2 chunks from holding
 their whole message (#6262)

Each streamed text or reasoning chunk was cut from the accumulated
message with slice, which can share the source string's storage. The
timeline store keeps every chunk, so a 128 KB reasoning part retained
about 128 MB: every chunk held the full message as it stood when the
chunk arrived. Long OpenCode v2 reasoning streams exhausted the daemon
worker's heap.

The timeline now emits an independent copy of each suffix, so retained
memory follows the length of the text.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../test-utils/v2-streamed-text-memory.ts     | 48 +++++++++++++++++++
 .../providers/opencode/v2/timeline.test.ts    | 37 ++++++++++++++
 .../agent/providers/opencode/v2/timeline.ts   | 11 ++++-
 3 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 packages/server/src/server/agent/providers/opencode/test-utils/v2-streamed-text-memory.ts

diff --git a/packages/server/src/server/agent/providers/opencode/test-utils/v2-streamed-text-memory.ts b/packages/server/src/server/agent/providers/opencode/test-utils/v2-streamed-text-memory.ts
new file mode 100644
index 0000000000..d9d254d9de
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/test-utils/v2-streamed-text-memory.ts
@@ -0,0 +1,48 @@
+import { TimelineProjection } from "../../../timeline-projection.js";
+import { V2Timeline } from "../v2/timeline.js";
+
+// Streams one reasoning part through the timeline into the daemon's projection and
+// prints the bytes still held once the part is complete.
+const mode = process.argv[2];
+const chunks = Number(process.argv[3]);
+if (mode !== "delta" && mode !== "snapshot") throw new Error("Mode must be delta or snapshot");
+if (!global.gc) throw new Error("Run with --expose-gc");
+
+global.gc();
+const before = process.memoryUsage().heapUsed;
+const timeline = new V2Timeline();
+const projection = new TimelineProjection();
+const part = { assistantMessageID: "answer", type: "reasoning" as const, ordinal: 0 };
+timeline.startPart(part);
+let text = "";
+for (let index = 0; index < chunks; index++) {
+  const delta = `chunk-${index}:`.padEnd(64, String.fromCharCode(65 + (index % 26)));
+  text += delta;
+  const event =
+    mode === "delta"
+      ? timeline.delta({ ...part, delta })
+      : timeline.messages([
+          {
+            id: "answer",
+            type: "assistant",
+            agent: "build",
+            model: { providerID: "test", id: "model" },
+            time: { created: 2 },
+            content: [{ type: "reasoning", text }],
+          },
+        ])[0];
+  if (event?.type !== "timeline") throw new Error("Expected a timeline event");
+  projection.append({
+    seq: index + 1,
+    timestamp: "2026-10-01T00:00:00.000Z",
+    turnId: "turn",
+    item: event.item,
+  });
+}
+global.gc();
+const retainedBytes = process.memoryUsage().heapUsed - before;
+const [row] = projection.getRows();
+if (row?.item.type !== "reasoning" || row.item.text !== text) {
+  throw new Error("Projection lost the streamed text");
+}
+process.stdout.write(String(retainedBytes));
diff --git a/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts b/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts
index 9189f5d3c5..82236de2b8 100644
--- a/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts
@@ -1,4 +1,6 @@
 import type { SessionMessageAssistant } from "@opencode/client";
+import { execFileSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
 import { expect, test } from "vitest";
 import { V2Timeline } from "./timeline.js";
 
@@ -95,3 +97,38 @@ test("a tool's image output is shown as an image, not as base64 in the tool outp
   ]);
   expect(timeline.messages([screenshot])).toEqual([]);
 });
+
+test("a surrogate pair split across deltas streams back intact", () => {
+  const timeline = new V2Timeline();
+  const part = { assistantMessageID: "answer", type: "text" as const, ordinal: 0 };
+  timeline.startPart(part);
+  const chunks = ["a\uD83D", "\uDE00b"].map((delta) => {
+    const event = timeline.delta({ ...part, delta });
+    return event?.type === "timeline" && event.item.type === "assistant_message"
+      ? event.item.text
+      : null;
+  });
+  expect(chunks).toEqual(["a\uD83D", "\uDE00b"]);
+  expect(chunks.join("")).toBe("a😀b");
+});
+
+function retainedBytesAfterStreaming(mode: "delta" | "snapshot", chunks: number): number {
+  const fixture = fileURLToPath(
+    new URL("../test-utils/v2-streamed-text-memory.ts", import.meta.url),
+  );
+  const output = execFileSync(
+    process.execPath,
+    ["--expose-gc", "--import", "tsx", fixture, mode, String(chunks)],
+    { encoding: "utf8" },
+  );
+  return Number(output);
+}
+
+test.each(["delta", "snapshot"] as const)(
+  "a long %s-streamed part holds memory in proportion to its text",
+  (mode) => {
+    const chunks = 2000;
+    const textBytes = chunks * 64;
+    expect(retainedBytesAfterStreaming(mode, chunks)).toBeLessThan(textBytes * 32);
+  },
+);
diff --git a/packages/server/src/server/agent/providers/opencode/v2/timeline.ts b/packages/server/src/server/agent/providers/opencode/v2/timeline.ts
index c58316df9e..0fdd6f9f40 100644
--- a/packages/server/src/server/agent/providers/opencode/v2/timeline.ts
+++ b/packages/server/src/server/agent/providers/opencode/v2/timeline.ts
@@ -12,6 +12,13 @@ function textPartKey(messageID: string, part: "text" | "reasoning", ordinal: num
   return `${messageID}:${part}:${ordinal}`;
 }
 
+// A `slice` can share its source's storage, so every streamed chunk kept by the timeline
+// store would hold the whole text it was cut from. Copying the UTF-16 code units makes
+// the chunk independent; UTF-8 would corrupt a surrogate pair split across chunks.
+function detachedSuffix(text: string, start: number): string {
+  return Buffer.from(text.slice(start), "utf16le").toString("utf16le");
+}
+
 // Text and reasoning each number parts from zero, independent of snapshot position.
 export class V2Timeline {
   private readonly content = new Map<string, string>();
@@ -40,7 +47,7 @@ export class V2Timeline {
     if (!text.startsWith(emitted))
       throw new Error("OpenCode changed previously emitted message content");
     this.content.set(key, text);
-    const suffix = text.slice(emitted.length);
+    const suffix = detachedSuffix(text, emitted.length);
     const item: AgentTimelineItem =
       event.type === "text"
         ? { type: "assistant_message", text: suffix, messageId: event.assistantMessageID }
@@ -143,7 +150,7 @@ export class V2Timeline {
     if (!part.text.startsWith(previous))
       throw new Error("OpenCode changed previously emitted message content");
     this.content.set(key, part.text);
-    const suffix = part.text.slice(previous.length);
+    const suffix = detachedSuffix(part.text, previous.length);
     if (part.type === "text")
       push({ type: "assistant_message", text: suffix, messageId: messageID });
     else push({ type: "reasoning", text: suffix });

From ce0f21e2ff40633c0380cd2ba6862ef3968bc11c Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 18:58:16 +0200
Subject: [PATCH 187/270] docs(changelog): 0.11.3

Cherry-picked from ed53a7193 on release/0.11.3-hoplite (tag v0.11.3).
---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e2b24ac5c..c015dc5ee4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.11.3 - 2026-10-15
+
+### Added
+
+- Added Hoplite as an opt-in provider in the ACP provider catalog ([#6953](https://github.com/getpaseo/paseo/pull/6953) by [@odinglyn0](https://github.com/odinglyn0))
+- Added search to the Add provider catalog ([#6953](https://github.com/getpaseo/paseo/pull/6953), [#7030](https://github.com/getpaseo/paseo/pull/7030))
+
+### Changed
+
+- Changed Add provider failures to show as a toast ([#7030](https://github.com/getpaseo/paseo/pull/7030))
+
+### Fixed
+
+- Fixed Remove being offered for plugin providers such as Antigravity and Muse Code ([#6568](https://github.com/getpaseo/paseo/pull/6568) by [@Ctrl-Creeper](https://github.com/Ctrl-Creeper))
+
 ## 0.11.2 - 2026-10-09
 
 ### Fixed

From fd1e7a34ce908cd153fdc6d1d671f90f0098154e Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 19:06:24 +0200
Subject: [PATCH 188/270] docs(changelog): welcome Hoplite as first sponsor in
 0.11.3

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c015dc5ee4..5569b6e5e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 0.11.3 - 2026-10-15
 
+[Hoplite](https://hoplite.sh) joins Paseo as our first sponsor through the company sponsorship program. Hoplite builds cloud coding agents that turn tasks from GitHub, Linear, Slack and more into pull requests. Thank you to the Hoplite team for supporting Paseo.
+
 ### Added
 
 - Added Hoplite as an opt-in provider in the ACP provider catalog ([#6953](https://github.com/getpaseo/paseo/pull/6953) by [@odinglyn0](https://github.com/odinglyn0))

From 7aa3fac069d4d07e64ed7696b0e161058cda6e09 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 01:18:27 +0700
Subject: [PATCH 189/270] fix(providers): scope project-dependent model
 discovery to workspaces

Global discovery has no linked project. Initialize the bridge to check availability, but only open discovery sessions when a workspace is supplied.
---
 .../hoplite-model-discovery.real.spec.ts      | 110 ++++++++++++++++++
 .../src/server/acp-internal/connection.ts     |   9 +-
 packages/plugin/src/server/acp.test.ts        |  33 ++++++
 packages/plugin/src/server/acp.ts             |   2 +
 .../src/server/daemon-e2e/hoplite-fixture.cjs |   7 ++
 .../src/server/daemon-e2e/models.e2e.test.ts  |  16 ++-
 plugins/hoplite-provider/server/provider.ts   |   1 +
 7 files changed, 172 insertions(+), 6 deletions(-)
 create mode 100644 packages/app/e2e/browser/hoplite-model-discovery.real.spec.ts

diff --git a/packages/app/e2e/browser/hoplite-model-discovery.real.spec.ts b/packages/app/e2e/browser/hoplite-model-discovery.real.spec.ts
new file mode 100644
index 0000000000..60e13b70a6
--- /dev/null
+++ b/packages/app/e2e/browser/hoplite-model-discovery.real.spec.ts
@@ -0,0 +1,110 @@
+import path from "node:path";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import {
+  closeModelPicker,
+  drillIntoProvider,
+  openModelPicker,
+} from "../support/helpers/agent-profiles";
+import { expectComposerVisible, expectComposerFocused } from "../support/helpers/composer";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
+import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
+import { getServerId } from "../support/helpers/server-id";
+import { openSettingsHost, openSettingsHostSection } from "../support/helpers/settings";
+
+// Use an existing repository linked to the signed-in user's Hoplite project.
+const cwd = process.env.E2E_HOPLITE_CWD ?? path.resolve(__dirname, "../../../..");
+
+test.use({
+  viewport: { width: 1440, height: 1000 },
+  e2eDaemonConfig: { version: 1, agents: { providers: { hoplite: { enabled: true } } } },
+});
+
+async function openHopliteSettings(page: Page): Promise<void> {
+  await gotoAppShell(page);
+  await openSettings(page);
+  await openSettingsHost(page, getServerId());
+  await openSettingsHostSection(page, getServerId(), "providers");
+  await page.getByRole("button", { name: "Hoplite provider details", exact: true }).click();
+}
+
+async function expectEmptyGlobalCatalog(page: Page, client: DaemonClient): Promise<void> {
+  const models = await client.listProviderModels("hoplite");
+  expect(models.error).toBeNull();
+  expect(models.models).toEqual([]);
+  const snapshot = await client.getProvidersSnapshot();
+  expect(snapshot.entries.find((entry) => entry.provider === "hoplite")).toMatchObject({
+    status: "ready",
+    models: [],
+  });
+  await expect(page.getByText("No models detected", { exact: true })).toBeVisible();
+  await expect(page.getByRole("button", { name: "Retry", exact: true })).toHaveCount(0);
+}
+
+async function refreshGlobalCatalog(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Refresh", exact: true }).click();
+  await expect(page.getByRole("button", { name: "Refresh", exact: true })).toBeEnabled({
+    timeout: 120_000,
+  });
+}
+
+async function openWorkspaceModels(page: Page, workspaceId: string): Promise<void> {
+  await gotoWorkspace(page, workspaceId);
+  await clickNewChat(page);
+  await expectComposerVisible(page);
+  await expectComposerFocused(page);
+  await openModelPicker(page);
+  await page.getByTestId("sheet-header-back").click();
+  await drillIntoProvider(page, "hoplite");
+}
+
+test("real Hoplite has an empty global catalog and discovers models in its linked workspace", async ({
+  page,
+  e2eWorkerClient,
+}, testInfo) => {
+  test.setTimeout(180_000);
+  const client = await connectDaemonClient<DaemonClient>({ clientIdPrefix: "hoplite-discovery" });
+  const created = await e2eWorkerClient.createWorkspace({
+    source: { kind: "directory", path: cwd },
+    title: "Hoplite discovery QA",
+  });
+  expect(created.error).toBeNull();
+  const workspace = created.workspace!;
+  try {
+    await test.step("global settings succeed with no models, including refresh", async () => {
+      await openHopliteSettings(page);
+      await expectEmptyGlobalCatalog(page, client);
+      await refreshGlobalCatalog(page);
+      await expectEmptyGlobalCatalog(page, client);
+      await page.screenshot({ path: testInfo.outputPath("hoplite-global-empty.png") });
+    });
+
+    await test.step("the linked workspace discovers real models", async () => {
+      const models = await client.listProviderModels("hoplite", { cwd });
+      expect(models.error).toBeNull();
+      expect(models.models!.length).toBeGreaterThan(0);
+      await testInfo.attach("workspace-models", {
+        body: JSON.stringify(models, null, 2),
+        contentType: "application/json",
+      });
+      await openWorkspaceModels(page, workspace.id);
+      await expect(page.getByText(models.models![0]!.label, { exact: true }).last()).toBeVisible();
+      await page.screenshot({ path: testInfo.outputPath("hoplite-workspace-models.png") });
+      await closeModelPicker(page);
+    });
+
+    await test.step("workspace discovery does not populate the global catalog", async () => {
+      await openHopliteSettings(page);
+      await expectEmptyGlobalCatalog(page, client);
+      await refreshGlobalCatalog(page);
+      await expectEmptyGlobalCatalog(page, client);
+      const models = await client.listProviderModels("hoplite", { cwd });
+      expect(models.error).toBeNull();
+      expect(models.models!.length).toBeGreaterThan(0);
+    });
+  } finally {
+    await client.close();
+    await e2eWorkerClient.removeProject(workspace.projectId);
+  }
+});
diff --git a/packages/plugin/src/server/acp-internal/connection.ts b/packages/plugin/src/server/acp-internal/connection.ts
index 09984a3d14..05403594cf 100644
--- a/packages/plugin/src/server/acp-internal/connection.ts
+++ b/packages/plugin/src/server/acp-internal/connection.ts
@@ -547,8 +547,13 @@ class AcpRuntime {
     return sessionCapabilities;
   }
 
-  async discover(cwd = process.cwd()): Promise<ProviderCatalog> {
-    const response = await this.call(this.connection.newSession({ cwd, mcpServers: [] }));
+  async discover(cwd?: string): Promise<ProviderCatalog> {
+    if (cwd === undefined && this.options.options.acpOptions?.workspaceOnlyCatalog) {
+      return { models: [], modes: [] };
+    }
+    const response = await this.call(
+      this.connection.newSession({ cwd: cwd ?? process.cwd(), mcpServers: [] }),
+    );
     this.nativeSessionId = response.sessionId;
     this.modes = response.modes;
     this.configOptions = response.configOptions ?? [];
diff --git a/packages/plugin/src/server/acp.test.ts b/packages/plugin/src/server/acp.test.ts
index 13d69416bb..40c8019439 100644
--- a/packages/plugin/src/server/acp.test.ts
+++ b/packages/plugin/src/server/acp.test.ts
@@ -272,6 +272,39 @@ lines.on("line", (line) => {
     }
   });
 
+  it("still reports initialization failures for workspace-only global discovery", async () => {
+    let unavailable = false;
+    const { connector } = connectorHarness({
+      handleRequest(instance, request) {
+        if (unavailable && request.method === "initialize") {
+          instance.reject(request, "Bridge unavailable");
+          return true;
+        }
+        return false;
+      },
+    });
+    const registration = runAcpProvider({
+      id: "workspace-acp",
+      label: "Workspace ACP",
+      connector,
+      acpOptions: { workspaceOnlyCatalog: true },
+    });
+    const connection = await registration.connect({ versions: [1], capabilities: [] });
+    const events: ProviderEvent[] = [];
+    connection.onEvent((event) => events.push(event));
+    try {
+      unavailable = true;
+      await connection.send({ type: "catalog", requestId: "global" });
+      expect(await waitForEvent(events, (event) => event.type === "request.failed")).toMatchObject({
+        requestId: "global",
+        error: { message: expect.stringContaining("Bridge unavailable") },
+      });
+      expect(events.some((event) => event.type === "catalog")).toBe(false);
+    } finally {
+      await connection.close();
+    }
+  });
+
   it("rejects connection cleanly when the ACP executable does not exist", async () => {
     const registration = runAcpProvider({
       id: "missing-acp",
diff --git a/packages/plugin/src/server/acp.ts b/packages/plugin/src/server/acp.ts
index 533453f15e..826bc23235 100644
--- a/packages/plugin/src/server/acp.ts
+++ b/packages/plugin/src/server/acp.ts
@@ -44,6 +44,8 @@ export type AcpConnector = () => AcpStream | Promise<AcpStream>;
 export interface AcpOptions {
   protocol?: "auto" | "v1";
   startupTimeoutMs?: number;
+  /** Global discovery initializes ACP but returns an empty catalog without opening a session. */
+  workspaceOnlyCatalog?: boolean;
   waitForInitialCommands?: boolean;
   initialCommandsTimeoutMs?: number;
 }
diff --git a/packages/server/src/server/daemon-e2e/hoplite-fixture.cjs b/packages/server/src/server/daemon-e2e/hoplite-fixture.cjs
index 3650238ad7..542c2cf2ba 100644
--- a/packages/server/src/server/daemon-e2e/hoplite-fixture.cjs
+++ b/packages/server/src/server/daemon-e2e/hoplite-fixture.cjs
@@ -20,6 +20,13 @@ readline.createInterface({ input: process.stdin }).on("line", (line) => {
   let result = {};
   if (request.method === "initialize")
     result = { protocolVersion: 1, agentCapabilities: {}, authMethods: [] };
+  if (request.method === "session/new" && request.params.cwd !== process.env.HOPLITE_TEST_CWD) {
+    send({
+      id: request.id,
+      error: { code: -32602, message: "No Hoplite project for this directory" },
+    });
+    return;
+  }
   if (request.method === "session/new")
     result = {
       sessionId: "hoplite-fixture",
diff --git a/packages/server/src/server/daemon-e2e/models.e2e.test.ts b/packages/server/src/server/daemon-e2e/models.e2e.test.ts
index 3447444358..cfa420654b 100644
--- a/packages/server/src/server/daemon-e2e/models.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/models.e2e.test.ts
@@ -199,10 +199,13 @@ test("bundled Hoplite requires a config entry and removal survives restart", asy
         hoplite: {
           enabled: true,
           command: [process.execPath, path.resolve(import.meta.dirname, "hoplite-fixture.cjs")],
-          env: { HOPLITE_TEST_RECORD: record },
+          env: { HOPLITE_TEST_RECORD: record, HOPLITE_TEST_CWD: root },
         },
       },
     });
+    const globalModels = await client.listProviderModels("hoplite");
+    expect(globalModels.error).toBeNull();
+    expect(globalModels.models).toEqual([]);
     await expect
       .poll(
         async () =>
@@ -211,9 +214,14 @@ test("bundled Hoplite requires a config entry and removal survives restart", asy
           )?.status,
       )
       .toBe("ready");
-    expect((await client.listProviderModels("hoplite")).models.map((model) => model.id)).toEqual([
-      "fixture-model",
-    ]);
+    const workspaceModels = await client.listProviderModels("hoplite", { cwd: root });
+    expect(workspaceModels.error).toBeNull();
+    expect(workspaceModels.models.map((model) => model.id)).toEqual(["fixture-model"]);
+    await client.refreshProvidersSnapshot({ providers: ["hoplite"] });
+    expect((await client.listProviderModels("hoplite")).models).toEqual([]);
+    expect(
+      (await client.listProviderModels("hoplite", { cwd: root })).models.map((model) => model.id),
+    ).toEqual(["fixture-model"]);
     const agent = await client.createAgent({
       provider: "hoplite",
       cwd: root,
diff --git a/plugins/hoplite-provider/server/provider.ts b/plugins/hoplite-provider/server/provider.ts
index 62a67dbdb1..cb362052ea 100644
--- a/plugins/hoplite-provider/server/provider.ts
+++ b/plugins/hoplite-provider/server/provider.ts
@@ -11,6 +11,7 @@ export function createHopliteProvider(): ProviderRegistration {
       description: "Hoplite's coding agent through the local `hoplite acp` bridge",
       icon: "icon.svg",
       command: ["hoplite", "acp"],
+      acpOptions: { workspaceOnlyCatalog: true },
       transformers: [runPhaseTransformer],
     }),
   };

From b30302b63031612ed5196c43457d05a182166e06 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 20:26:28 +0200
Subject: [PATCH 190/270] docs(changelog): 0.11.4

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5569b6e5e7..cbd1d0551d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,15 @@
 # Changelog
 
-## 0.11.3 - 2026-10-15
+## 0.11.4 - 2026-10-15
 
 [Hoplite](https://hoplite.sh) joins Paseo as our first sponsor through the company sponsorship program. Hoplite builds cloud coding agents that turn tasks from GitHub, Linear, Slack and more into pull requests. Thank you to the Hoplite team for supporting Paseo.
 
+### Fixed
+
+- Fixed Hoplite showing an error in Settings → Providers instead of discovering models in workspaces linked to a Hoplite project
+
+## 0.11.3 - 2026-10-15
+
 ### Added
 
 - Added Hoplite as an opt-in provider in the ACP provider catalog ([#6953](https://github.com/getpaseo/paseo/pull/6953) by [@odinglyn0](https://github.com/odinglyn0))

From ec7446add4318791e0478498df89f7ea2cc385fe Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 15 Oct 2026 21:11:51 +0200
Subject: [PATCH 191/270] docs(readme): enlarge sponsor logos

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 91310cd7c7..1f6df3c3e4 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ Paseo is an open source agentic development environment for desktop, mobile, web
 <!-- Sponsors: one cell per sponsor in the order of packages/website/src/data/sponsors.ts, then "become a sponsor" cells up to three. -->
 <table>
   <tr>
-    <td align="center" width="33%"><a href="https://hoplite.sh/?utm_source=paseo&utm_medium=readme&utm_campaign=sponsor"><picture><source media="(prefers-color-scheme: dark)" srcset="packages/website/public/sponsors/hoplite-on-dark.svg"><img src="packages/website/public/sponsors/hoplite-on-light.svg" alt="Hoplite" height="40"></picture></a><br><sub>Cloud coding agents</sub></td>
+    <td align="center" width="33%"><a href="https://hoplite.sh/?utm_source=paseo&utm_medium=readme&utm_campaign=sponsor"><picture><source media="(prefers-color-scheme: dark)" srcset="packages/website/public/sponsors/hoplite-on-dark.svg"><img src="packages/website/public/sponsors/hoplite-on-light.svg" alt="Hoplite" height="56"></picture></a><br><sub>Cloud coding agents</sub></td>
     <td align="center" width="33%"><a href="https://paseo.sh/sponsor">Become a sponsor</a></td>
     <td align="center" width="33%"><a href="https://paseo.sh/sponsor">Become a sponsor</a></td>
   </tr>

From 208e323035ab40bbf3b3476fb6175330bc79821c Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 21:16:52 +0200
Subject: [PATCH 192/270] Keep usage providers in place after refresh (#6947)

* fix(app): preserve usage provider order across refreshes

* test(usage): keep refresh and scrolling journeys stable

Usage reports can follow the long fixture card, so a fixed wheel distance
can scroll past its final window. Target the named windows with wheel
input while preserving the visibility checks. Assert refreshed provider
order through visible names and keep viewport setup in journey helpers.

Co-authored-by: Sleroq <hireme@sleroq.link>

---------

Co-authored-by: Sleroq <hireme@sleroq.link>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/e2e/browser/usage-modal.spec.ts  | 49 +++++++++++++++++++
 .../e2e/browser/usage-sidebar-item.spec.ts    | 10 ++--
 .../e2e/support/helpers/usage-sidebar-item.ts |  8 +++
 packages/app/src/usage/model.test.ts          | 16 ++++++
 packages/app/src/usage/model.ts               | 19 ++++---
 5 files changed, 92 insertions(+), 10 deletions(-)

diff --git a/packages/app/e2e/browser/usage-modal.spec.ts b/packages/app/e2e/browser/usage-modal.spec.ts
index 6f546078bf..a923971d09 100644
--- a/packages/app/e2e/browser/usage-modal.spec.ts
+++ b/packages/app/e2e/browser/usage-modal.spec.ts
@@ -100,6 +100,40 @@ function weeklyReport(sourceId: string, usedPct: number): UsageReportEntry {
   };
 }
 
+function installReversedUsageRefresh(page: Page) {
+  const initial = [weeklyReport("opencode", 31), weeklyReport("openai", 12)];
+  const refreshed = [weeklyReport("openai", 22), weeklyReport("opencode", 41)];
+  return installUsageReportsFixture(page, {
+    lists: [(request) => (request.forceRefresh ? refreshed : initial)],
+  });
+}
+
+async function openUsageSummaryAtWidth(page: Page, width: number) {
+  await page.setViewportSize({ width, height: 900 });
+  await gotoAppShell(page);
+  if (width === 390) await openCompactSidebar(page);
+  await expectPinnedUsage(page, ["31% Weekly", "12% Weekly"]);
+  await openUsageFromItem(page);
+}
+
+async function expectUsageProviderOrder(page: Page, summary: string[]) {
+  const group = page.getByTestId(`usage-host-${getServerId()}`);
+  await expect(group.getByText(/^(opencode|openai) plan$/)).toHaveText([
+    "opencode plan",
+    "openai plan",
+  ]);
+  await expectPinnedUsage(page, summary);
+}
+
+async function refreshUsageAndWaitForReports(page: Page, usage: UsageReportsFixture) {
+  const requestCount = usage.listRequests().length;
+  await refreshAllUsage(page);
+  await usage.waitForListRequests(requestCount + 1);
+  const group = page.getByTestId(`usage-host-${getServerId()}`);
+  await expect(group.getByText("41%", { exact: true })).toBeVisible();
+  await expect(page.getByRole("button", { name: "Refresh all", exact: true })).toBeEnabled();
+}
+
 test.describe("usage modal", () => {
   test("opens from the sidebar on the host's reports, with no host filter for one host", async ({
     page,
@@ -152,6 +186,21 @@ test.describe("usage modal", () => {
     await expect(group.getByTestId("usage-freshness")).toHaveCount(0);
   });
 
+  for (const width of [1440, 390]) {
+    test(`keeps sidebar and modal provider order across a reversed refresh at width ${width}`, async ({
+      page,
+    }) => {
+      const usage = await installReversedUsageRefresh(page);
+      await openUsageSummaryAtWidth(page, width);
+      await expectUsageProviderOrder(page, ["31% Weekly", "12% Weekly"]);
+      await qaScreenshot(page, `usage-order-${width}-before-refresh`);
+
+      await refreshUsageAndWaitForReports(page, usage);
+      await expectUsageProviderOrder(page, ["41% Weekly", "22% Weekly"]);
+      await qaScreenshot(page, `usage-order-${width}-after-refresh`);
+    });
+  }
+
   test("refreshes one report from its card", async ({ page }) => {
     test.setTimeout(120_000);
     const serverId = getServerId();
diff --git a/packages/app/e2e/browser/usage-sidebar-item.spec.ts b/packages/app/e2e/browser/usage-sidebar-item.spec.ts
index fb738b3cb5..27fac6691c 100644
--- a/packages/app/e2e/browser/usage-sidebar-item.spec.ts
+++ b/packages/app/e2e/browser/usage-sidebar-item.spec.ts
@@ -30,7 +30,7 @@ import {
   openUsageFromIcon,
   openUsageFromItem,
   pinRow,
-  scrollUsage,
+  scrollUsageToWindow,
   setSummaryInSidebar,
   openUsageOptions,
   showUsageAs,
@@ -146,7 +146,9 @@ test.describe("Usage item", () => {
     compact: { viewport: COMPACT, showSidebar: openCompactSidebar },
   };
   for (const [size, { viewport, showSidebar }] of Object.entries(layouts)) {
-    test(`long usage reports scroll to the final window on ${size}`, async ({ page }) => {
+    test(`long usage reports scroll between their first and last windows on ${size}`, async ({
+      page,
+    }) => {
       test.setTimeout(120_000);
       const source = await installTallUsageSource();
       try {
@@ -161,10 +163,10 @@ test.describe("Usage item", () => {
         await waitForSettledPosition(content);
         await expect(content.getByText("Window 20", { exact: true })).not.toBeInViewport();
         await qaScreenshot(page, `${size}-usage-scroll-top`);
-        await scrollUsage(page, 5_000);
+        await scrollUsageToWindow(page, "Window 20");
         await expect(content.getByText("Window 20", { exact: true })).toBeInViewport();
         await qaScreenshot(page, `${size}-usage-scroll-bottom`);
-        await scrollUsage(page, -5_000);
+        await scrollUsageToWindow(page, "Window 1");
         await expect(content.getByText("Window 20", { exact: true })).not.toBeInViewport();
       } finally {
         await source.cleanup();
diff --git a/packages/app/e2e/support/helpers/usage-sidebar-item.ts b/packages/app/e2e/support/helpers/usage-sidebar-item.ts
index 8cc3c07a00..95c6a4d689 100644
--- a/packages/app/e2e/support/helpers/usage-sidebar-item.ts
+++ b/packages/app/e2e/support/helpers/usage-sidebar-item.ts
@@ -212,6 +212,14 @@ export async function scrollUsage(page: Page, deltaY: number): Promise<void> {
   await page.mouse.wheel(0, deltaY);
 }
 
+/** Reach a window with the wheel even when other reports follow its card. */
+export async function scrollUsageToWindow(page: Page, label: string): Promise<void> {
+  const target = await usageModal(page).getByText(label, { exact: true }).boundingBox();
+  const viewport = page.viewportSize();
+  if (!target || !viewport) throw new Error("Usage window must exist before scrolling to it.");
+  await scrollUsage(page, target.y + target.height / 2 - viewport.height / 2);
+}
+
 /** The modal's own Close button. */
 export async function closeUsage(page: Page): Promise<void> {
   await visible(page, "usage-modal").getByRole("button", { name: "Close", exact: true }).click();
diff --git a/packages/app/src/usage/model.test.ts b/packages/app/src/usage/model.test.ts
index ad293bb23e..a2c493619d 100644
--- a/packages/app/src/usage/model.test.ts
+++ b/packages/app/src/usage/model.test.ts
@@ -257,6 +257,22 @@ describe("settleReports", () => {
     expect(settleReports([refreshed, beta], [alpha, beta])).toEqual([refreshed, beta]);
   });
 
+  it("keeps the displayed order when providers finish a refresh in reverse order", () => {
+    const refreshed = entry({ sourceId: "alpha", planLabel: "New" });
+    const streamed = upsertReport(upsertReport([alpha, beta], beta), refreshed);
+    expect(settleReports(streamed, [beta, refreshed])).toEqual([refreshed, beta]);
+  });
+
+  it("drops missing reports and appends new ones without moving surviving reports", () => {
+    const gamma = entry({ sourceId: "gamma" });
+    const delta = entry({ sourceId: "delta" });
+    expect(settleReports([alpha, beta, gamma], [delta, gamma, alpha])).toEqual([
+      alpha,
+      gamma,
+      delta,
+    ]);
+  });
+
   it("takes the finished list as is when nothing was shown yet", () => {
     expect(settleReports(undefined, [alpha, beta])).toEqual([alpha, beta]);
   });
diff --git a/packages/app/src/usage/model.ts b/packages/app/src/usage/model.ts
index a32da7ea4d..ed8a39163a 100644
--- a/packages/app/src/usage/model.ts
+++ b/packages/app/src/usage/model.ts
@@ -82,17 +82,24 @@ export function upsertReport(
 }
 
 /**
- * The list a finished request leaves: its reports, dropping any the host no longer has, except
- * that a copy on screen fetched after the request's copy stays.
+ * Keep displayed reports in place: the finished list is in fetch-completion order, which can
+ * change on every refresh. Drop missing reports, append new ones, and keep newer fetched copies.
  */
 export function settleReports(
   shown: readonly UsageReportEntry[] | undefined,
   finished: readonly UsageReportEntry[],
 ): UsageReportEntry[] {
-  return finished.map((report) => {
-    const copy = shown?.find((entry) => entry.id === report.id);
-    return copy ? laterFetched(copy, report) : report;
-  });
+  const remaining = new Map(finished.map((report) => [report.id, report]));
+  const settled: UsageReportEntry[] = [];
+  for (const report of shown ?? []) {
+    const arriving = remaining.get(report.id);
+    if (!arriving) {
+      continue;
+    }
+    settled.push(laterFetched(report, arriving));
+    remaining.delete(report.id);
+  }
+  return [...settled, ...remaining.values()];
 }
 
 export interface UsageQueryState {

From f56c0139283028ea8b62e9ce40c1fcccad7b3efb Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Oct 2026 23:11:13 +0200
Subject: [PATCH 193/270] Open configured terminals after worktree setup
 (#6999)

* fix(server): open worktree.terminals when a workspace is created on its own

runWorktreeSetupInBackground only opened the paseo.json worktree.terminals
when its caller passed runAutoTerminals, and only the fork-PR "allow setup"
handler did. workspace.create, the request the New Workspace screen sends,
ran worktree.setup and then skipped the terminals.

Both callers want the terminals, so the flag goes away: terminals follow a
successful setup on a newly created worktree. Reused worktrees stay excluded
by shouldBootstrap, and the agent setup continuation never reaches this
function, so nothing opens twice.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* test(server): run automatic terminal regressions in CI

Include workspace creation in the existing integration command, and append to the terminal marker so repeated command execution fails the regression.

* test(server): make workspace fixtures portable on Windows

Run the setup fixture through a command accepted by PowerShell, await its readiness, and fix the fixture Git line-ending policy. Allow Windows directory locks to settle during cleanup.

* test(server): expose setup failures and await fixture cleanup

Check the public setup status before terminal startup so failures distinguish setup errors from terminal creation. Use asynchronous directory removal so Windows cleanup retries leave the event loop available.

* test(server): start the Windows setup service asynchronously

The Windows regression starts its service but setup stays running, so terminal bootstrap is never reached. Launch the fixture service explicitly with Start-Process and retain the readiness and setup-completion assertions.

---------

Co-authored-by: David Yang <9925+davidyang@users.noreply.github.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/server/package.json                  |   2 +-
 ...rkspace-create-worktree-source.e2e.test.ts | 144 ++++++++++++++++--
 .../server/src/server/worktree-bootstrap.ts   |   7 +-
 .../server/src/server/worktree-session.ts     |  37 +++--
 4 files changed, 155 insertions(+), 35 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index a69a2c3c2a..6e5e2448a2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/checkout-diff-content.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\" && vitest run --maxWorkers=1 src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"oversized attachments\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/checkout-diff-content.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/workspace-create-worktree-source.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\" && vitest run --maxWorkers=1 src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"oversized attachments\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",
diff --git a/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts b/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts
index b377c22374..69c1da2efc 100644
--- a/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts
+++ b/packages/server/src/server/workspace-create-worktree-source.e2e.test.ts
@@ -1,5 +1,6 @@
 import { execFileSync } from "node:child_process";
-import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdtempSync, readFileSync, writeFileSync } from "node:fs";
+import { rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { expect, onTestFinished, test } from "vitest";
@@ -18,6 +19,7 @@ function createGitRepoWithBranch(): { repoDir: string; tempRoot: string } {
   const tempRoot = mkdtempSync(path.join(tmpdir(), "workspace-create-worktree-source-"));
   const repoDir = path.join(tempRoot, "repo");
   execFileSync("git", ["init", "-b", "main", repoDir], { stdio: "pipe" });
+  execFileSync("git", ["config", "core.autocrlf", "false"], { cwd: repoDir, stdio: "pipe" });
   execFileSync("git", ["config", "user.email", "test@getpaseo.local"], {
     cwd: repoDir,
     stdio: "pipe",
@@ -60,10 +62,134 @@ test("workspace.create worktree source forwards action=checkout + refName into t
   } finally {
     await client.close().catch(() => undefined);
     await daemon.close();
-    rmSync(tempRoot, { recursive: true, force: true });
+    await rm(tempRoot, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
   }
 }, 180000);
 
+test.each([false, true])(
+  "workspace.create opens worktree.terminals (setup service: %s)",
+  async (withSetupService) => {
+    const daemon = await createTestPaseoDaemon();
+    const { repoDir, tempRoot } = createGitRepoWithBranch();
+    writeFileSync(
+      path.join(repoDir, "paseo.json"),
+      JSON.stringify({
+        worktree: {
+          ...(withSetupService
+            ? {
+                // Launch the Windows service asynchronously so it outlives
+                // the setup command instead of holding setup open.
+                setup:
+                  process.platform === "win32"
+                    ? "Start-Process -FilePath node -ArgumentList 'setup.cjs','serve' -WorkingDirectory (Get-Location).Path -WindowStyle Hidden; while (!(Test-Path setup-pid.txt)) { Start-Sleep -Milliseconds 25 }"
+                    : "node setup.cjs",
+              }
+            : {}),
+          terminals: [
+            { name: "preview", command: "echo paseo-auto-terminal >> terminal-marker.txt" },
+          ],
+        },
+      }),
+    );
+    writeFileSync(
+      path.join(repoDir, "setup.cjs"),
+      `
+const fs = require("node:fs");
+if (process.argv[2] === "serve") {
+  require("node:net").createServer().listen(Number(process.env.PASEO_WORKTREE_PORT), "127.0.0.1", () => {
+    fs.writeFileSync("setup-pid.txt", String(process.pid));
+    process.send?.("ready");
+  });
+} else {
+  const child = require("node:child_process").spawn(process.execPath, [__filename, "serve"], {
+    detached: true,
+    stdio: ["ignore", "ignore", "ignore", "ipc"],
+  });
+  child.once("message", () => { child.disconnect(); child.unref(); });
+}
+`,
+    );
+    execFileSync("git", ["add", "paseo.json", "setup.cjs"], { cwd: repoDir, stdio: "pipe" });
+    execFileSync("git", ["-c", "commit.gpgsign=false", "commit", "-m", "add paseo.json"], {
+      cwd: repoDir,
+      stdio: "pipe",
+    });
+    const client = new DaemonClient({
+      url: `ws://127.0.0.1:${daemon.port}/ws`,
+      appVersion: "0.1.82",
+    });
+
+    let workspaceCwd: string | undefined;
+    try {
+      await client.connect();
+
+      // This is the request the New Workspace screen sends: the workspace is
+      // created on its own, with no agent in the same request.
+      const result = await client.createWorkspace({
+        source: {
+          kind: "worktree",
+          cwd: repoDir,
+          action: "branch-off",
+          branchName: "feature/auto-terminals",
+          worktreeSlug: "feature-auto-terminals",
+          baseBranch: "main",
+        },
+      });
+
+      expect(result.error).toBeNull();
+      const workspace = result.workspace;
+      if (!workspace) {
+        throw new Error("Expected a created workspace");
+      }
+
+      workspaceCwd = workspace.workspaceDirectory;
+      if (withSetupService) {
+        await expect
+          .poll(() => existsSync(path.join(workspaceCwd!, "setup-pid.txt")), { timeout: 30000 })
+          .toBe(true);
+      }
+      await expect
+        .poll(async () => (await client.fetchWorkspaceSetupStatus(workspace.id)).snapshot, {
+          timeout: 30000,
+        })
+        .toMatchObject({ status: "completed", error: null });
+      await expect
+        .poll(
+          async () =>
+            (
+              await client.listTerminals(workspace.workspaceDirectory, undefined, {
+                workspaceId: workspace.id,
+              })
+            ).terminals.map((terminal) => terminal.name),
+          { timeout: 30000 },
+        )
+        .toContain("preview");
+      await expect
+        .poll(
+          () => {
+            const marker = path.join(workspaceCwd!, "terminal-marker.txt");
+            return existsSync(marker) ? readFileSync(marker, "utf8").trim() : null;
+          },
+          { timeout: 10000 },
+        )
+        .toBe("paseo-auto-terminal");
+      expect(
+        (await client.listTerminals(workspaceCwd, undefined, { workspaceId: workspace.id }))
+          .terminals,
+      ).toHaveLength(1);
+    } finally {
+      const pidFile = workspaceCwd && path.join(workspaceCwd, "setup-pid.txt");
+      if (pidFile && existsSync(pidFile)) {
+        process.kill(Number(readFileSync(pidFile, "utf8")));
+      }
+      await client.close().catch(() => undefined);
+      await daemon.close();
+      await rm(tempRoot, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+    }
+  },
+  180000,
+);
+
 test("existing branch changes remain visible after archive and restore", async () => {
   const daemon = await createTestPaseoDaemon();
   const { repoDir, tempRoot } = createGitRepoWithBranch();
@@ -74,7 +200,7 @@ test("existing branch changes remain visible after archive and restore", async (
   onTestFinished(async () => {
     await client.close().catch(() => undefined);
     await daemon.close();
-    rmSync(tempRoot, { recursive: true, force: true });
+    await rm(tempRoot, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
   });
   runGit(repoDir, "switch", "feature/existing-branch");
   commitFile(repoDir, "feature.txt", "feature change\n");
@@ -134,7 +260,7 @@ test("workspace.create keeps a branch-off name separate from its worktree slug",
   } finally {
     await client.close().catch(() => undefined);
     await daemon.close();
-    rmSync(tempRoot, { recursive: true, force: true });
+    await rm(tempRoot, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
   }
 }, 180000);
 
@@ -168,7 +294,7 @@ test("workspace.create accepts a Git-valid branch-off name outside Paseo slug sy
   } finally {
     await client.close().catch(() => undefined);
     await daemon.close();
-    rmSync(tempRoot, { recursive: true, force: true });
+    await rm(tempRoot, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
   }
 }, 180000);
 
@@ -210,7 +336,7 @@ test("workspace.create always creates a new worktree when the slug is already oc
   } finally {
     await client.close().catch(() => undefined);
     await daemon.close();
-    rmSync(tempRoot, { recursive: true, force: true });
+    await rm(tempRoot, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
   }
 }, 180000);
 
@@ -255,7 +381,7 @@ test("workspace.create suffixes past an occupied detached worktree", async () =>
   } finally {
     await client.close().catch(() => undefined);
     await daemon.close();
-    rmSync(tempRoot, { recursive: true, force: true });
+    await rm(tempRoot, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
   }
 }, 180000);
 
@@ -297,7 +423,7 @@ test("workspace.create suffixes an occupied checkout branch", async () => {
   } finally {
     await client.close().catch(() => undefined);
     await daemon.close();
-    rmSync(tempRoot, { recursive: true, force: true });
+    await rm(tempRoot, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
   }
 }, 180000);
 
@@ -340,7 +466,7 @@ async function createRestorableWorkspace(baseRef: string) {
   onTestFinished(async () => {
     await client.close().catch(() => undefined);
     await daemon.close();
-    rmSync(tempRoot, { recursive: true, force: true });
+    await rm(tempRoot, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
   });
   createDivergentBases(repoDir);
   await client.connect();
diff --git a/packages/server/src/server/worktree-bootstrap.ts b/packages/server/src/server/worktree-bootstrap.ts
index 8e69908f59..4bd49b1c2d 100644
--- a/packages/server/src/server/worktree-bootstrap.ts
+++ b/packages/server/src/server/worktree-bootstrap.ts
@@ -593,13 +593,10 @@ export async function runWorktreeAutoTerminals(options: {
   workspaceId: string;
   worktree: WorktreeConfig;
   workspaceCwd: string;
+  runtimeEnv: WorktreeRuntimeEnv;
   terminalManager: TerminalManager | null;
   logger?: Logger;
 }): Promise<void> {
-  const runtimeEnv = await resolveWorktreeRuntimeEnv({
-    worktreePath: options.worktree.worktreePath,
-    branchName: options.worktree.branchName,
-  });
   await runWorktreeTerminalBootstrap(
     {
       agentId: options.workspaceId,
@@ -610,7 +607,7 @@ export async function runWorktreeAutoTerminals(options: {
       appendTimelineItem: async () => true,
       logger: options.logger,
     },
-    runtimeEnv,
+    options.runtimeEnv,
   );
 }
 
diff --git a/packages/server/src/server/worktree-session.ts b/packages/server/src/server/worktree-session.ts
index cdb0119b64..82f0113bd5 100644
--- a/packages/server/src/server/worktree-session.ts
+++ b/packages/server/src/server/worktree-session.ts
@@ -817,7 +817,6 @@ export async function handleWorkspaceSetupRunRequest(
             slug: basename(worktree.worktreePath),
             worktreePath: worktree.worktreePath,
             workspaceCwd: workspace.cwd,
-            runAutoTerminals: true,
           },
           signal,
         ),
@@ -857,7 +856,6 @@ export async function runWorktreeSetupInBackground(
     slug: string;
     worktreePath: string;
     workspaceCwd?: string;
-    runAutoTerminals?: boolean;
   },
   signal?: AbortSignal,
 ): Promise<void> {
@@ -898,18 +896,18 @@ export async function runWorktreeSetupInBackground(
       } else {
         const workspaceCwd = options.workspaceCwd ?? worktree.worktreePath;
         const setupCommands = getWorktreeSetupCommands(workspaceCwd);
+        const runtimeEnv = await resolveWorktreeRuntimeEnv({
+          worktreePath: worktree.worktreePath,
+          branchName: worktree.branchName,
+          repoRootPath: options.repoRoot,
+        });
+        dependencies.terminalManager?.registerCwdEnv({
+          cwd: workspaceCwd,
+          env: runtimeEnv,
+        });
         if (setupCommands.length === 0) {
           emitSetupProgress("completed", null);
         } else {
-          const runtimeEnv = await resolveWorktreeRuntimeEnv({
-            worktreePath: worktree.worktreePath,
-            branchName: worktree.branchName,
-            repoRootPath: options.repoRoot,
-          });
-          dependencies.terminalManager?.registerCwdEnv({
-            cwd: workspaceCwd,
-            env: runtimeEnv,
-          });
           setupResults = await runWorktreeSetupCommands({
             worktreePath: workspaceCwd,
             branchName: worktree.branchName,
@@ -924,15 +922,14 @@ export async function runWorktreeSetupInBackground(
           });
           emitSetupProgress("completed", null);
         }
-        if (options.runAutoTerminals) {
-          await runWorktreeAutoTerminals({
-            workspaceId,
-            worktree,
-            workspaceCwd,
-            terminalManager: dependencies.terminalManager,
-            logger: dependencies.sessionLogger,
-          });
-        }
+        await runWorktreeAutoTerminals({
+          workspaceId,
+          worktree,
+          workspaceCwd,
+          runtimeEnv,
+          terminalManager: dependencies.terminalManager,
+          logger: dependencies.sessionLogger,
+        });
       }
     } catch (error) {
       if (error instanceof WorktreeSetupError) {

From d9b874f9d0d40195ada83ddce6ab43030a47675d Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 00:14:23 +0200
Subject: [PATCH 194/270] Scroll chat with Page Up and Page Down after clicking
 messages (#7033)

* fix(app): focus chat feed when clicking message content

* test(app): wait for new chat output before checking scroll position

Co-authored-by: Ivan Pantic <panta@talentkit.io>

* test(app): capture the keyboard paging regression

* test(app): verify paged chat text stays in place

---------

Co-authored-by: Ivan Pantic <panta@talentkit.io>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../app/e2e/browser/composer-focus.spec.ts    | 96 ++++++++++++++++++-
 .../support/helpers/timeline-pagination.ts    |  2 +-
 .../app/src/agent-stream/strategy-web.tsx     |  2 +
 .../desktop/e2e/workspace-restart.spec.ts     |  2 +-
 4 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/packages/app/e2e/browser/composer-focus.spec.ts b/packages/app/e2e/browser/composer-focus.spec.ts
index cbc710a94a..9119791806 100644
--- a/packages/app/e2e/browser/composer-focus.spec.ts
+++ b/packages/app/e2e/browser/composer-focus.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test, type Page } from "../support/fixtures";
 import {
-  composerLocator,
   blurComposerInput,
+  composerLocator,
   enterComposerFullscreen,
   exitComposerFullscreen,
   expectComposerDraft,
@@ -25,6 +25,100 @@ import {
   swipeOpenMobileAgentSidebar,
   swipeOpenMobileExplorer,
 } from "../support/helpers/sidebar";
+import { readScrollMetrics } from "../support/helpers/agent-bottom-anchor";
+import {
+  expectTimelinePromptPositionPreserved,
+  rememberTimelinePromptPosition,
+  seedLongMockAgentTimeline,
+  waitForTimelineGeometryToSettle,
+} from "../support/helpers/timeline-pagination";
+
+test("clicking chat text or background focuses the feed for keyboard paging", async ({
+  page,
+}, testInfo) => {
+  const agent = await seedLongMockAgentTimeline({ turns: 8 });
+
+  try {
+    await openAgentRoute(page, agent);
+    const composer = composerLocator(page);
+    const feed = page.getByTestId("agent-chat-scroll").filter({ visible: true });
+    await composer.fill("Keep this draft");
+    await feed.getByText(agent.newestPrompt, { exact: true }).click();
+    await expect(feed).toBeFocused();
+
+    const beforePaging = await readScrollMetrics(page);
+    expect(beforePaging.offsetY).toBeGreaterThan(beforePaging.viewportHeight);
+    await page.keyboard.press("PageUp");
+    await expect
+      .poll(async () => (await readScrollMetrics(page)).offsetY)
+      .toBeLessThan(beforePaging.offsetY - beforePaging.viewportHeight / 2);
+    await page.screenshot({ path: testInfo.outputPath("chat-keyboard-paging.png") });
+    await page.keyboard.press("PageDown");
+    await expect
+      .poll(async () => (await readScrollMetrics(page)).distanceFromBottom)
+      .toBeLessThanOrEqual(2);
+
+    await composer.click();
+    await expectComposerFocused(page);
+    await feed.click({ position: { x: 2, y: 40 } });
+    await expect(feed).toBeFocused();
+    await page.keyboard.press("PageUp");
+    await expect
+      .poll(async () => (await readScrollMetrics(page)).distanceFromBottom)
+      .toBeGreaterThan(beforePaging.viewportHeight / 2);
+    await waitForTimelineGeometryToSettle(page);
+    const readingPrompt = agent.prompts[4];
+    await expect(feed.getByText(readingPrompt, { exact: true })).toBeInViewport();
+    const readingPosition = await rememberTimelinePromptPosition(page, readingPrompt);
+    await agent.client.sendAgentMessage(agent.agentId, "emit 2 coalesced agent stream updates");
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    // The daemon finishing does not mean its response has reached the browser.
+    await expect(feed.getByText(/stress-update-1/)).toHaveCount(1);
+    await waitForTimelineGeometryToSettle(page);
+    await expectTimelinePromptPositionPreserved(page, readingPosition);
+    await expectComposerDraft(page, "Keep this draft");
+  } finally {
+    await agent.cleanup();
+  }
+});
+
+test("focusing the feed preserves assistant text selection and code copy controls", async ({
+  page,
+  context,
+}) => {
+  const sentence = "Select this assistant sentence.";
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-focus-selection-",
+    title: "Chat focus selection",
+    initialPrompt: "Render text and code.",
+    featureValues: {
+      mockAssistantResponse: `${sentence}\n\n\`\`\`bash\necho example\n\`\`\``,
+    },
+  });
+
+  try {
+    await context.grantPermissions(["clipboard-read", "clipboard-write"]);
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    await openAgentRoute(page, agent);
+    await composerLocator(page).fill("Keep this draft");
+
+    const feed = page.getByTestId("agent-chat-scroll").filter({ visible: true });
+    await feed.getByText(sentence, { exact: true }).click({ clickCount: 3 });
+    await expect(feed).toBeFocused();
+    expect(await page.evaluate(() => window.getSelection()?.toString().trim())).toBe(sentence);
+    await page.keyboard.press("ControlOrMeta+c");
+    expect((await page.evaluate(() => navigator.clipboard.readText())).trim()).toBe(sentence);
+
+    const code = feed.locator('[data-paseo-markdown-language="bash"]');
+    await code.hover();
+    await code.locator("[data-paseo-markdown-ignore]").click();
+    await expect(feed).not.toBeFocused();
+    expect(await page.evaluate(() => navigator.clipboard.readText())).toBe("echo example");
+    await expectComposerDraft(page, "Keep this draft");
+  } finally {
+    await agent.cleanup();
+  }
+});
 
 test("submitting a message leaves the composer ready for the next message", async ({ page }) => {
   const agent = await seedMockAgentWorkspace({
diff --git a/packages/app/e2e/support/helpers/timeline-pagination.ts b/packages/app/e2e/support/helpers/timeline-pagination.ts
index 7dd3dca8d7..52027df956 100644
--- a/packages/app/e2e/support/helpers/timeline-pagination.ts
+++ b/packages/app/e2e/support/helpers/timeline-pagination.ts
@@ -544,7 +544,7 @@ async function readTimelineViewport(page: Page): Promise<TimelineViewportSnapsho
   });
 }
 
-async function waitForTimelineGeometryToSettle(page: Page): Promise<void> {
+export async function waitForTimelineGeometryToSettle(page: Page): Promise<void> {
   const scroll = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
   await scroll.evaluate(
     (element) =>
diff --git a/packages/app/src/agent-stream/strategy-web.tsx b/packages/app/src/agent-stream/strategy-web.tsx
index 226b7c1e2a..f1c806fdca 100644
--- a/packages/app/src/agent-stream/strategy-web.tsx
+++ b/packages/app/src/agent-stream/strategy-web.tsx
@@ -1298,6 +1298,8 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     <div style={viewportStyle} data-window-content>
       <div
         ref={handleScrollContainerRef}
+        // Let clicks focus the feed for browser keyboard scrolling without adding a Tab stop.
+        tabIndex={-1}
         data-testid="agent-chat-scroll"
         data-overlay-scrollbar={scrollEnabled && !isMobileBreakpoint ? "true" : undefined}
         id={`agent-chat-scroll-${shouldUseVirtualizer ? "web-dom-virtualized" : "web-dom-scroll"}`}
diff --git a/packages/desktop/e2e/workspace-restart.spec.ts b/packages/desktop/e2e/workspace-restart.spec.ts
index 4ee1655242..67bc8408ea 100644
--- a/packages/desktop/e2e/workspace-restart.spec.ts
+++ b/packages/desktop/e2e/workspace-restart.spec.ts
@@ -127,7 +127,7 @@ function inspectChatDragExclusions(scroll: Element) {
   const headerRect = header.getBoundingClientRect();
   const headerY = headerRect.top + headerRect.height / 2;
   const content = scroll.firstElementChild;
-  const focusScope = scroll.closest("[tabindex]");
+  const focusScope = scroll.closest("[data-window-content]")?.parentElement?.closest("[tabindex]");
   if (!content || !focusScope) throw new Error("Expected chat content and its focus scope");
   const contentRect = content.getBoundingClientRect();
   const chatX = (contentRect.left + contentRect.right) / 2;

From 8d424e039ea3f328500b08861689bbe98d65e567 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 01:15:40 +0200
Subject: [PATCH 195/270] Reduce rendering cost in long chats (#7052)

* perf(app): stop re-walking the timeline on every streamed delta

Every coalesced delta rebuilds the stream render model with the same
tail. The model re-sliced the tail at the history-window start on every
call, so the rendered tail was a fresh array per delta and every WeakMap
keyed on it (ordering, history split, turn timing, the layout history
cache, row revision) missed each time. Cache the slice by tail identity
and window start.

Turn timing then still walked the whole rendered tail per delta and
allocated a new assistant-timing Map, which the layout memo depends on.
Split the walk: the tail is walked once per tail identity and the head is
walked from the carried open turn per delta. The Map keeps its identity
while the head adds no completed turn.

Adds identity-contract tests and a vitest bench for the per-delta
pipeline. 200 deltas over a 2,000-item timeline, mean per run:
default mounted window 5.68ms -> 2.82ms, history fully revealed
16.95ms -> 1.81ms.

Fixes #4816

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* perf(app): keep the stream view's per-delta work bounded by the head

The chat outline concatenated tail and head, reduced over the result in
the render body, and rebuilt jumpToPrompt on every delta even when the
outline was disabled, which is every native viewport. Memoize the tail's
contribution, scan only the head per delta, do nothing while disabled,
make jumpToPrompt a stable event so the rail's memo holds, and republish
the active prompt only when the index or reading position changes.

The view built a Set of every mounted id plus the live head per delta for
the outline's pending-jump check; key it on mounted history only and
treat live head rows as always mounted. Split plugin projection so a head
change does not re-project the tail, memoize the history-window boundary
lookup, and read the turn presentation's submission flag with some()
instead of allocating a filtered array.

Refs #4816

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* test(app): confirm full history before measuring streaming

---------

Co-authored-by: Ivan Malison <IvanMalison@gmail.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 docs/agent-stream-performance.md              |   5 +
 .../browser/agent-stream-smoothness.spec.ts   |  43 ++++-
 .../app/src/agent-stream/chat-find/types.ts   |   5 +-
 .../chat-outline/use-chat-outline.test.tsx    |  22 +--
 .../chat-outline/use-chat-outline.ts          | 120 ++++++++-----
 .../src/agent-stream/model-retention.test.ts  |  51 ++++++
 packages/app/src/agent-stream/model.test.ts   |  43 +++++
 packages/app/src/agent-stream/model.ts        |  52 +++---
 .../app/src/agent-stream/stream-tick.bench.ts | 132 ++++++++++++++
 .../agent-stream/use-stream-history-window.ts |   9 +-
 packages/app/src/agent-stream/view.tsx        |  27 +--
 packages/app/src/composer/submission/model.ts |   8 +
 packages/app/src/stores/session-store.ts      |   4 +-
 packages/app/src/timeline/turn-time.test.ts   |  97 +++++++++-
 packages/app/src/timeline/turn-time.ts        | 168 +++++++++++++-----
 15 files changed, 635 insertions(+), 151 deletions(-)
 create mode 100644 packages/app/src/agent-stream/model-retention.test.ts
 create mode 100644 packages/app/src/agent-stream/stream-tick.bench.ts

diff --git a/docs/agent-stream-performance.md b/docs/agent-stream-performance.md
index b31a3fd9ee..e62f155fd5 100644
--- a/docs/agent-stream-performance.md
+++ b/docs/agent-stream-performance.md
@@ -58,12 +58,17 @@ So arrival sets a _target_ and the reveal rate is derived from the backlog inste
   through that hook; the web viewport once skipped it and history hosts of a live tool group went
   stale. A new field on `StreamLayoutItem` must be added to `areLayoutItemsEquivalent`, or sharing
   silently stops.
+- **Streaming cost must not grow with revealed history.** Reading older messages must not
+  make the next reply progressively more expensive to display. Reuse unchanged history work
+  while text arrives, and release obsolete window caches as the reader reveals more history;
+  window caches must stay bounded while their source timeline remains loaded.
 
 ## Measuring
 
 - **Smoothness (user-perceived):** `packages/app/e2e/browser/agent-stream-smoothness.spec.ts`, gated behind `PASEO_AGENT_STREAM_PERF_E2E=1`. Drives the mock provider's `bursty-stream` model and reports coefficient of variation of characters painted per frame (smoothness) plus p95 gap between visible updates (stalls). Both numbers are needed: a stalled stream is perfectly smooth.
 - **Reproducing bursty arrival:** the `bursty-stream` model in `mock-load-test-agent.ts` emits uneven runs of tokens separated by idle gaps. Burst sizes come from a seeded generator, so a run repeats exactly.
 - **Rate policy in isolation:** `computeRevealStep` in `packages/app/src/agent-stream/text-reveal.ts` is pure; `text-reveal.test.ts` covers convergence and burst flattening without a renderer.
+- **Per-delta cost on a long timeline:** `npx vitest bench --project unit src/agent-stream/stream-tick.bench.ts` from `packages/app` replays 200 deltas over a 2,000-item timeline through the pure model and layout pipeline, with the default mounted window and with history fully revealed. It measures the JS work per delta, not paint.
 
 Healthy numbers (2026-08, Expo web against a local dev daemon, real Claude Haiku agent, ~8.5s samples during active streaming). Setting `TEXT_REVEAL_HORIZON_MS` to 0 makes the reveal paint on arrival, which is how the baseline column was taken:
 
diff --git a/packages/app/e2e/browser/agent-stream-smoothness.spec.ts b/packages/app/e2e/browser/agent-stream-smoothness.spec.ts
index 74069d3561..0146582755 100644
--- a/packages/app/e2e/browser/agent-stream-smoothness.spec.ts
+++ b/packages/app/e2e/browser/agent-stream-smoothness.spec.ts
@@ -1,6 +1,13 @@
 import { test, expect } from "../support/fixtures";
 import { awaitAssistantMessage } from "../support/helpers/agent-stream";
-import { startRunningMockAgent } from "../support/helpers/composer";
+import { startRunningMockAgent, submitMessage } from "../support/helpers/composer";
+import {
+  seedLongMockAgentTimeline,
+  openAgentTimeline,
+  scrollTimelineUntilOlderHistoryIsReachable,
+  scrollTimelineToNewestLoadedEdge,
+  expectTimelinePromptVisible,
+} from "../support/helpers/timeline-pagination";
 import {
   sampleStreamFrames,
   summarizeStreamSmoothness,
@@ -102,6 +109,40 @@ agentStreamPerfDescribe("Agent stream smoothness", () => {
       await agent.cleanup();
     }
   });
+
+  test("keeps streaming work bounded after revealing older history", async ({ page }, testInfo) => {
+    test.setTimeout(120_000);
+    await page.addInitScript(() => {
+      Reflect.set(globalThis, "__PASEO_RENDER_PROFILE_ENABLED__", true);
+    });
+    const agent = await seedLongMockAgentTimeline({ turns: 80, liveTurns: "thirty-minute-stream" });
+    try {
+      await openAgentTimeline(page, agent);
+      await expect(page.getByRole("textbox", { name: "Message agent..." }).first()).toBeVisible();
+      await scrollTimelineUntilOlderHistoryIsReachable(page, agent.oldestPrompt);
+      await expectTimelinePromptVisible(page, agent.oldestPrompt);
+      await scrollTimelineToNewestLoadedEdge(page);
+      await submitMessage(page, "Stream a long answer after reading older messages.");
+      await awaitAssistantMessage(page);
+
+      for (let sample = 0; sample < 3; sample += 1) {
+        await page.evaluate(() => globalThis.__PASEO_RESET_RENDER_PROFILE__?.());
+        const frames = await sampleStreamFrames(page, { sampleWindowMs: SAMPLE_WINDOW_MS });
+        const smoothness = summarizeStreamSmoothness(frames, SAMPLE_WINDOW_MS);
+        const react = summarizeReactCommits(await readStreamReactCommits(page));
+        await testInfo.attach(`revealed-history-stream-${sample}`, {
+          body: JSON.stringify({ smoothness, react }, null, 2),
+          contentType: "application/json",
+        });
+        console.log(`[perf] Revealed history stream: ${JSON.stringify({ smoothness, react })}`);
+        expect(smoothness.growthFrames).toBeGreaterThan(20);
+        expect(react.count).toBeGreaterThan(20);
+        expect(react.actualDurationP95Ms).toBeLessThan(REACT_COMMIT_P95_BUDGET_MS);
+      }
+    } finally {
+      await agent.cleanup();
+    }
+  });
 });
 
 async function readStreamReactCommits(
diff --git a/packages/app/src/agent-stream/chat-find/types.ts b/packages/app/src/agent-stream/chat-find/types.ts
index cce58be96e..4fdf543a5e 100644
--- a/packages/app/src/agent-stream/chat-find/types.ts
+++ b/packages/app/src/agent-stream/chat-find/types.ts
@@ -2,6 +2,9 @@ import type { ReactNode, RefObject } from "react";
 import type { StreamItem } from "@/types/stream";
 import type { StreamViewportHandle } from "../strategy";
 
+export interface MountedMessageIds {
+  has(messageId: string): boolean;
+}
 export interface ChatFindProps {
   agentId: string;
   serverId: string;
@@ -9,7 +12,7 @@ export interface ChatFindProps {
   items: StreamItem[];
   viewportRef: RefObject<StreamViewportHandle | null>;
   revealLoadedMessage(messageId: string): boolean;
-  visibleMessageIds: ReadonlySet<string>;
+  visibleMessageIds: MountedMessageIds;
   children: ReactNode;
 }
 export interface ChatFindExpansionProps {
diff --git a/packages/app/src/agent-stream/chat-outline/use-chat-outline.test.tsx b/packages/app/src/agent-stream/chat-outline/use-chat-outline.test.tsx
index 4b2139fef6..bd5a73ce94 100644
--- a/packages/app/src/agent-stream/chat-outline/use-chat-outline.test.tsx
+++ b/packages/app/src/agent-stream/chat-outline/use-chat-outline.test.tsx
@@ -178,7 +178,7 @@ describe("useChatOutline", () => {
           timelineEpoch,
           enabled,
           viewportRef,
-          visibleMessageIds: new Set(),
+          mountedHistoryMessageIds: new Set(),
           onJumpError: vi.fn(),
         }),
       {
@@ -278,7 +278,7 @@ describe("useChatOutline", () => {
       },
     ];
     const { result, rerender } = renderHook(
-      ({ visibleMessageIds }) =>
+      ({ mountedHistoryMessageIds }) =>
         useChatOutline({
           agentId: "agent-1",
           serverId: "server-1",
@@ -288,10 +288,10 @@ describe("useChatOutline", () => {
           enabled: true,
           viewportRef,
           onJumpError: vi.fn(),
-          visibleMessageIds,
+          mountedHistoryMessageIds,
           revealLoadedMessage,
         }),
-      { initialProps: { visibleMessageIds: new Set<string>() } },
+      { initialProps: { mountedHistoryMessageIds: new Set<string>() } },
     );
 
     await waitFor(() => expect(result.current.prompts).toHaveLength(1));
@@ -299,7 +299,7 @@ describe("useChatOutline", () => {
     expect(revealLoadedMessage).toHaveBeenCalledWith("older-prompt");
     expect(scrollToMessage).not.toHaveBeenCalled();
 
-    rerender({ visibleMessageIds: new Set(["older-prompt"]) });
+    rerender({ mountedHistoryMessageIds: new Set(["older-prompt"]) });
     await waitFor(() => expect(scrollToMessage).toHaveBeenCalledWith("older-prompt"));
   });
 
@@ -327,7 +327,7 @@ describe("useChatOutline", () => {
       timelineCursor: { epoch: "epoch-1", seq: 1 },
     };
     const { result, rerender } = renderHook(
-      ({ tail, visibleMessageIds }) =>
+      ({ tail, mountedHistoryMessageIds }) =>
         useChatOutline({
           agentId: "agent-1",
           serverId: "server-1",
@@ -337,13 +337,13 @@ describe("useChatOutline", () => {
           enabled: true,
           viewportRef,
           onJumpError: vi.fn(),
-          visibleMessageIds,
+          mountedHistoryMessageIds,
           revealLoadedMessage,
         }),
       {
         initialProps: {
           tail: [] as (typeof fetchedPrompt)[],
-          visibleMessageIds: new Set<string>(),
+          mountedHistoryMessageIds: new Set<string>(),
         },
       },
     );
@@ -352,11 +352,11 @@ describe("useChatOutline", () => {
     act(() => result.current.jumpToPrompt(1));
     await waitFor(() => expect(runtime.fetchAgentTimeline).toHaveBeenCalledOnce());
 
-    rerender({ tail: [fetchedPrompt], visibleMessageIds: new Set<string>() });
+    rerender({ tail: [fetchedPrompt], mountedHistoryMessageIds: new Set<string>() });
     await waitFor(() => expect(revealLoadedMessage).toHaveBeenCalledWith(fetchedPrompt.id));
     expect(scrollToMessage).not.toHaveBeenCalled();
 
-    rerender({ tail: [fetchedPrompt], visibleMessageIds: new Set([fetchedPrompt.id]) });
+    rerender({ tail: [fetchedPrompt], mountedHistoryMessageIds: new Set([fetchedPrompt.id]) });
     await waitFor(() => expect(scrollToMessage).toHaveBeenCalledOnce());
     expect(scrollToMessage).toHaveBeenCalledWith(fetchedPrompt.id);
     await act(async () => fetch.resolve());
@@ -392,7 +392,7 @@ describe("useChatOutline", () => {
         enabled: true,
         viewportRef: { current: viewport },
         onJumpError: vi.fn(),
-        visibleMessageIds: new Set([livePrompt.id]),
+        mountedHistoryMessageIds: new Set<string>(),
         revealLoadedMessage,
       }),
     );
diff --git a/packages/app/src/agent-stream/chat-outline/use-chat-outline.ts b/packages/app/src/agent-stream/chat-outline/use-chat-outline.ts
index 015b883d21..cfdb26b2a5 100644
--- a/packages/app/src/agent-stream/chat-outline/use-chat-outline.ts
+++ b/packages/app/src/agent-stream/chat-outline/use-chat-outline.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState, type RefObject } from "react";
+import { useEffect, useMemo, useRef, useState, type RefObject } from "react";
 import type { AgentTimelinePromptIndexPayload } from "@getpaseo/client/internal/daemon-client";
 import { isWeb } from "@/constants/platform";
 import { useStableEvent } from "@/hooks/use-stable-event";
@@ -33,7 +33,8 @@ export interface UseChatOutlineInput {
   enabled: boolean;
   viewportRef: RefObject<StreamViewportHandle | null>;
   onJumpError: () => void;
-  visibleMessageIds?: ReadonlySet<string>;
+  // Message ids of the history the viewport has mounted. Live head messages are always mounted.
+  mountedHistoryMessageIds?: ReadonlySet<string>;
   revealLoadedMessage?: (messageId: string) => boolean;
 }
 
@@ -44,6 +45,24 @@ export interface ChatOutline {
   reportReadingPosition: (seq: number | null) => void;
 }
 
+function latestPromptSeqIn(items: StreamItem[], timelineEpoch: string | null): number {
+  let latest = -1;
+  for (const item of items) {
+    if (item.kind === "user_message" && item.timelineCursor?.epoch === timelineEpoch) {
+      latest = Math.max(latest, item.timelineCursor.seq);
+    }
+  }
+  return latest;
+}
+
+function findLoadedItem(
+  tail: StreamItem[],
+  head: StreamItem[],
+  predicate: (item: StreamItem) => boolean,
+): StreamItem | undefined {
+  return tail.find(predicate) ?? head.find(predicate);
+}
+
 export function useChatOutline({
   agentId,
   serverId,
@@ -53,7 +72,7 @@ export function useChatOutline({
   enabled,
   viewportRef,
   onJumpError,
-  visibleMessageIds,
+  mountedHistoryMessageIds,
   revealLoadedMessage,
 }: UseChatOutlineInput): ChatOutline {
   const [index, setIndex] = useState<AgentTimelinePromptIndexPayload | null>(null);
@@ -62,18 +81,19 @@ export function useChatOutline({
   const readingSeqRef = useRef<number | null>(null);
   const nextJumpRequestIdRef = useRef(0);
   const nextIndexRequestIdRef = useRef(0);
-  const loadedItems = useMemo(() => [...tail, ...(head ?? NO_STREAM_ITEMS)], [head, tail]);
+  // A disabled outline (every native viewport) must not pay for the timeline per delta.
+  const loadedTail = enabled ? tail : NO_STREAM_ITEMS;
+  const loadedHead = enabled ? (head ?? NO_STREAM_ITEMS) : NO_STREAM_ITEMS;
   const prompts = enabled ? (index?.prompts ?? NO_PROMPTS) : NO_PROMPTS;
 
   // The viewed timeline already owns live delivery and reconnect catch-up. Its complete
   // loaded items (including rows outside the mounted window) invalidate the prompt index.
-  const latestPromptSeq = loadedItems.reduce(
-    (latest, item) =>
-      item.kind === "user_message" && item.timelineCursor?.epoch === timelineEpoch
-        ? Math.max(latest, item.timelineCursor.seq)
-        : latest,
-    -1,
+  // Only the head changes per streamed delta, so the tail's contribution is memoized.
+  const tailPromptSeq = useMemo(
+    () => latestPromptSeqIn(loadedTail, timelineEpoch),
+    [loadedTail, timelineEpoch],
   );
+  const latestPromptSeq = Math.max(tailPromptSeq, latestPromptSeqIn(loadedHead, timelineEpoch));
 
   useEffect(() => setIndex(null), [agentId, enabled, serverId, timelineEpoch]);
 
@@ -135,10 +155,18 @@ export function useChatOutline({
 
   useEffect(() => {
     if (pendingJump === null) return;
-    const target = loadedItems.find((item) => item.timelineCursor?.seq === pendingJump.seq);
+    const target = findLoadedItem(
+      loadedTail,
+      loadedHead,
+      (item) => item.timelineCursor?.seq === pendingJump.seq,
+    );
     if (target) {
       if (pendingJump.hasScrolled) return;
-      if (visibleMessageIds?.has(target.id) === false) {
+      const isMounted =
+        mountedHistoryMessageIds === undefined ||
+        mountedHistoryMessageIds.has(target.id) ||
+        loadedHead.includes(target);
+      if (!isMounted) {
         revealLoadedMessage?.(target.id);
         return;
       }
@@ -150,40 +178,48 @@ export function useChatOutline({
       return;
     }
     if (pendingJump.fetchSettled) setPendingJump(null);
-  }, [loadedItems, pendingJump, revealLoadedMessage, viewportRef, visibleMessageIds]);
+  }, [
+    loadedHead,
+    loadedTail,
+    mountedHistoryMessageIds,
+    pendingJump,
+    revealLoadedMessage,
+    viewportRef,
+  ]);
 
-  const jumpToPrompt = useCallback(
-    (seq: number) => {
-      nextJumpRequestIdRef.current += 1;
-      setPendingJump(null);
-      const loaded = loadedItems.find((item) => item.timelineCursor?.seq === seq);
-      if (loaded) {
-        if (revealLoadedMessage?.(loaded.id)) {
-          const requestId = nextJumpRequestIdRef.current;
-          setPendingJump({ requestId, seq, fetchSettled: true, hasScrolled: false });
-          return;
-        }
-        viewportRef.current?.scrollToMessage?.(loaded.id);
+  const jumpToPrompt = useStableEvent((seq: number) => {
+    nextJumpRequestIdRef.current += 1;
+    setPendingJump(null);
+    const loaded = findLoadedItem(
+      loadedTail,
+      loadedHead,
+      (item) => item.timelineCursor?.seq === seq,
+    );
+    if (loaded) {
+      if (revealLoadedMessage?.(loaded.id)) {
+        const requestId = nextJumpRequestIdRef.current;
+        setPendingJump({ requestId, seq, fetchSettled: true, hasScrolled: false });
         return;
       }
-      if (!index) return;
-      const requestId = nextJumpRequestIdRef.current;
-      setPendingJump({ requestId, seq, fetchSettled: false, hasScrolled: false });
-      void getHostRuntimeStore()
-        .fetchAgentTimeline(serverId, agentId, planTimelinePromptJump({ epoch: index.epoch, seq }))
-        .catch((error: unknown) => {
-          console.warn("Failed to load a Chat outline window", error);
-          onJumpError();
-        })
-        .finally(() => {
-          setPendingJump((current) => {
-            if (current?.requestId !== requestId) return current;
-            return { ...current, fetchSettled: true };
-          });
+      viewportRef.current?.scrollToMessage?.(loaded.id);
+      return;
+    }
+    if (!index) return;
+    const requestId = nextJumpRequestIdRef.current;
+    setPendingJump({ requestId, seq, fetchSettled: false, hasScrolled: false });
+    void getHostRuntimeStore()
+      .fetchAgentTimeline(serverId, agentId, planTimelinePromptJump({ epoch: index.epoch, seq }))
+      .catch((error: unknown) => {
+        console.warn("Failed to load a Chat outline window", error);
+        onJumpError();
+      })
+      .finally(() => {
+        setPendingJump((current) => {
+          if (current?.requestId !== requestId) return current;
+          return { ...current, fetchSettled: true };
         });
-    },
-    [agentId, index, loadedItems, onJumpError, revealLoadedMessage, serverId, viewportRef],
-  );
+      });
+  });
 
   return { prompts, activePrompt, jumpToPrompt, reportReadingPosition };
 }
diff --git a/packages/app/src/agent-stream/model-retention.test.ts b/packages/app/src/agent-stream/model-retention.test.ts
new file mode 100644
index 0000000000..c82b29d301
--- /dev/null
+++ b/packages/app/src/agent-stream/model-retention.test.ts
@@ -0,0 +1,51 @@
+import { expect, it } from "vitest";
+import { setFlagsFromString } from "node:v8";
+import { runInNewContext } from "node:vm";
+import { buildAgentStreamRenderModel } from "./model";
+import type { StreamItem } from "@/types/stream";
+
+function revealHistory(tail: StreamItem[]): WeakRef<StreamItem[]>[] {
+  const windows: WeakRef<StreamItem[]>[] = [];
+  for (let start = tail.length - 20; start >= 20; start -= 20) {
+    const model = buildAgentStreamRenderModel({
+      tail,
+      head: [],
+      historyStart: start,
+      platform: "web",
+      isMobileBreakpoint: false,
+      isTurnActive: false,
+      activeTurnStartedAt: null,
+    });
+    windows.push(new WeakRef(model.history));
+  }
+  return windows;
+}
+
+it("releases obsolete history windows and their source timeline", async () => {
+  setFlagsFromString("--expose_gc");
+  const gc = runInNewContext("gc") as () => void;
+  setFlagsFromString("--no-expose_gc");
+  async function collect() {
+    for (let i = 0; i < 3; i++) {
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      gc();
+    }
+  }
+  let tail: StreamItem[] = Array.from({ length: 1000 }, (_, i) => ({
+    kind: i % 2 ? "assistant_message" : "user_message",
+    id: `row-${i}`,
+    text: "text",
+    timestamp: new Date(1700000000000 + i * 1000),
+  }));
+  const windows = revealHistory(tail);
+  await collect();
+  expect(windows.filter((ref) => ref.deref() !== undefined)).toHaveLength(1);
+
+  windows.push(...revealHistory(tail));
+  await collect();
+  expect(windows.filter((ref) => ref.deref() !== undefined)).toHaveLength(1);
+
+  tail = [];
+  await collect();
+  expect(windows.every((ref) => ref.deref() === undefined)).toBe(true);
+});
diff --git a/packages/app/src/agent-stream/model.test.ts b/packages/app/src/agent-stream/model.test.ts
index e29792ab02..dec4c489b9 100644
--- a/packages/app/src/agent-stream/model.test.ts
+++ b/packages/app/src/agent-stream/model.test.ts
@@ -240,4 +240,47 @@ describe("buildAgentStreamRenderModel", () => {
 
     expect(model.turnTiming.byAssistantId.size).toBe(0);
   });
+
+  it.each(["web", "native"] as const)(
+    "reuses rendered history and timing across live-head updates inside a history window on %s",
+    (platform) => {
+      const at = (seed: number) => new Date(Date.UTC(2026, 0, 1, 0, 0, seed));
+      const tail: StreamItem[] = [];
+      for (let index = 0; index < 40; index += 1) {
+        tail.push(
+          { ...userMessage(`u${index}`, 0), timestamp: at(index * 2) },
+          { ...assistantMessage(`a${index}`, 0), timestamp: at(index * 2 + 1) },
+        );
+      }
+      const live = (text: string): StreamItem => ({
+        kind: "assistant_message",
+        id: "live",
+        text,
+        timestamp: at(81),
+      });
+      const build = (head: StreamItem[]) =>
+        buildAgentStreamRenderModel({
+          isTurnActive: true,
+          activeTurnStartedAt: tail.at(-2)?.timestamp ?? null,
+          tail,
+          head,
+          platform,
+          isMobileBreakpoint: false,
+          historyStart: 60,
+        });
+
+      const first = build([live("live")]);
+      const second = build([live("live grows")]);
+
+      expect(second.history).toBe(first.history);
+      expect(second.segments.historyMounted).toBe(first.segments.historyMounted);
+      expect(second.turnTiming.byAssistantId).toBe(first.turnTiming.byAssistantId);
+      expect(first.history).toHaveLength(20);
+      expect(first.turnTiming.byAssistantId.has("a29")).toBe(false);
+      expect(first.turnTiming.byAssistantId.get("a38")).toEqual({
+        completedAt: tail[77]?.timestamp,
+        durationMs: 1000,
+      });
+    },
+  );
 });
diff --git a/packages/app/src/agent-stream/model.ts b/packages/app/src/agent-stream/model.ts
index 89eb73a7be..92f8be7141 100644
--- a/packages/app/src/agent-stream/model.ts
+++ b/packages/app/src/agent-stream/model.ts
@@ -53,11 +53,29 @@ const splitHistoryCache = new WeakMap<
   StreamItem[],
   Map<string, Pick<AgentStreamRenderModel, "history" | "segments">>
 >();
-const turnTimingCache = new WeakMap<
+// A streamed delta rebuilds the model with the same tail. Everything below is keyed on
+// the rendered tail's identity, so the slice has to be reused, not recomputed.
+const renderedTailCache = new WeakMap<
   StreamItem[],
-  WeakMap<StreamItem[], Map<string, StreamTurnTiming>>
+  { historyStart: number; rendered: StreamItem[] }
 >();
 
+function getRenderedTail(tail: StreamItem[], historyStart: number | undefined): StreamItem[] {
+  if (!historyStart) {
+    renderedTailCache.delete(tail);
+    return tail;
+  }
+  const cached = renderedTailCache.get(tail);
+  if (cached?.historyStart === historyStart) {
+    return cached.rendered;
+  }
+  const rendered = tail.slice(historyStart);
+  // Revealing older history replaces the previous window, allowing its arrays and
+  // downstream layouts to be collected while the unchanged source tail stays alive.
+  renderedTailCache.set(tail, { historyStart, rendered });
+  return rendered;
+}
+
 function getOrderedItems(params: {
   cache: WeakMap<StreamItem[], Map<string, StreamItem[]>>;
   source: StreamItem[];
@@ -129,32 +147,6 @@ function splitOrderedTail(params: {
   return split;
 }
 
-function getTurnTiming(params: {
-  isTurnActive: boolean;
-  activeTurnStartedAt: Date | null;
-  tail: StreamItem[];
-  head: StreamItem[];
-}): StreamTurnTiming {
-  let cachedByHead = turnTimingCache.get(params.tail);
-  if (!cachedByHead) {
-    cachedByHead = new WeakMap();
-    turnTimingCache.set(params.tail, cachedByHead);
-  }
-  let cachedByActivity = cachedByHead.get(params.head);
-  if (!cachedByActivity) {
-    cachedByActivity = new Map();
-    cachedByHead.set(params.head, cachedByActivity);
-  }
-  const activityKey = `${params.isTurnActive}:${params.activeTurnStartedAt?.getTime() ?? "none"}`;
-  const cached = cachedByActivity.get(activityKey);
-  if (cached) {
-    return cached;
-  }
-  const timing = deriveStreamTurnTiming(params);
-  cachedByActivity.set(activityKey, timing);
-  return timing;
-}
-
 export function buildAgentStreamRenderModel(
   input: BuildAgentStreamRenderModelInput,
 ): AgentStreamRenderModel {
@@ -163,7 +155,7 @@ export function buildAgentStreamRenderModel(
     isMobileBreakpoint: input.isMobileBreakpoint,
   });
   const orderingCacheKey = `${input.platform}:${input.isMobileBreakpoint}`;
-  const renderedTail = input.historyStart ? input.tail.slice(input.historyStart) : input.tail;
+  const renderedTail = getRenderedTail(input.tail, input.historyStart);
   const orderedTail = getOrderedItems({
     cache: orderedTailCache,
     source: renderedTail,
@@ -189,7 +181,7 @@ export function buildAgentStreamRenderModel(
     platform: input.platform,
     isMobileBreakpoint: input.isMobileBreakpoint,
   });
-  const turnTiming = getTurnTiming({
+  const turnTiming = deriveStreamTurnTiming({
     isTurnActive: input.isTurnActive,
     activeTurnStartedAt: input.activeTurnStartedAt,
     tail: renderedTail,
diff --git a/packages/app/src/agent-stream/stream-tick.bench.ts b/packages/app/src/agent-stream/stream-tick.bench.ts
new file mode 100644
index 0000000000..dc1fecb881
--- /dev/null
+++ b/packages/app/src/agent-stream/stream-tick.bench.ts
@@ -0,0 +1,132 @@
+import { bench, describe } from "vitest";
+import type { StreamItem, ToolCallItem } from "@/types/stream";
+import {
+  prepareToolCallHistory,
+  projectToolCallDetailLevel,
+} from "@/tool-calls/detail-level/projection";
+import { findMountedWindowStart, getMountedRecentStreamItems } from "./history-window";
+import { layoutStream } from "./layout";
+import { buildAgentStreamRenderModel } from "./model";
+import { resolveStreamRenderStrategy } from "./strategy-resolver";
+
+// One coalesced delta replaces the stream head. This is the pure work AgentStreamView
+// does per delta on a long timeline, without React:
+//   npx vitest bench --project unit src/agent-stream/stream-tick.bench.ts
+
+const TIMELINE_ITEMS = 2_000;
+const TICKS = 200;
+
+function timestamp(seed: number): Date {
+  return new Date(1_700_000_000_000 + seed * 1000);
+}
+
+function toolCall(id: string, seed: number): ToolCallItem {
+  return {
+    kind: "tool_call",
+    id,
+    timestamp: timestamp(seed),
+    payload: {
+      source: "agent",
+      data: {
+        provider: "claude",
+        callId: id,
+        name: "shell",
+        status: "completed",
+        error: null,
+        detail: { type: "shell", command: id },
+      },
+    },
+  };
+}
+
+function buildTimeline(count: number): StreamItem[] {
+  const items: StreamItem[] = [];
+  let seed = 0;
+  while (items.length < count) {
+    const turn = items.length;
+    items.push({
+      kind: "user_message",
+      id: `u${turn}`,
+      text: "prompt",
+      timestamp: timestamp(seed++),
+    });
+    items.push(toolCall(`t${turn}a`, seed++));
+    items.push(toolCall(`t${turn}b`, seed++));
+    items.push({
+      kind: "assistant_message",
+      id: `a${turn}`,
+      text: "answer",
+      timestamp: timestamp(seed++),
+    });
+  }
+  return items.slice(0, count);
+}
+
+function buildHeads(base: StreamItem[], ticks: number): StreamItem[][] {
+  let text = "";
+  const heads: StreamItem[][] = [];
+  for (let tick = 0; tick < ticks; tick += 1) {
+    text += "token ";
+    heads.push([
+      {
+        kind: "assistant_message",
+        id: "live",
+        text,
+        timestamp: timestamp(base.length + tick),
+      },
+    ]);
+  }
+  return heads;
+}
+
+function runTicks(input: { tail: StreamItem[]; historyStart: number; heads: StreamItem[][] }) {
+  const { tail, historyStart, heads } = input;
+  const strategy = resolveStreamRenderStrategy({ platform: "web", isMobileBreakpoint: false });
+  const prepared = prepareToolCallHistory("overview", tail);
+  const boundaryId = tail[historyStart]?.id ?? null;
+  const activeTurnStartedAt = tail.at(-1)?.timestamp ?? null;
+  for (const head of heads) {
+    const projected = projectToolCallDetailLevel({
+      level: "overview",
+      tail,
+      head,
+      preparedHistory: prepared,
+      isTurnActive: true,
+    });
+    const boundaryIndex = boundaryId
+      ? projected.tail.findIndex((item) => item.id === boundaryId)
+      : -1;
+    const model = buildAgentStreamRenderModel({
+      isTurnActive: true,
+      activeTurnStartedAt,
+      tail: projected.tail,
+      head: projected.head,
+      platform: "web",
+      isMobileBreakpoint: false,
+      historyStart: boundaryIndex >= 0 ? boundaryIndex : historyStart,
+    });
+    layoutStream({
+      strategy,
+      isTurnActive: true,
+      history: model.history,
+      liveHead: model.segments.liveHead,
+      timingByAssistantId: model.turnTiming.byAssistantId,
+    });
+  }
+}
+
+const tail = buildTimeline(TIMELINE_ITEMS);
+const heads = buildHeads(tail, TICKS);
+const defaultWindowStart = findMountedWindowStart({
+  items: tail,
+  minMountedCount: getMountedRecentStreamItems(),
+});
+
+describe(`${TICKS} streamed deltas over a ${TIMELINE_ITEMS}-item timeline`, () => {
+  bench("default mounted window (recent items only)", () => {
+    runTicks({ tail, historyStart: defaultWindowStart, heads });
+  });
+  bench("history fully revealed (scrolled to top)", () => {
+    runTicks({ tail, historyStart: 0, heads });
+  });
+});
diff --git a/packages/app/src/agent-stream/use-stream-history-window.ts b/packages/app/src/agent-stream/use-stream-history-window.ts
index 42168f052d..9874158dcc 100644
--- a/packages/app/src/agent-stream/use-stream-history-window.ts
+++ b/packages/app/src/agent-stream/use-stream-history-window.ts
@@ -70,10 +70,11 @@ export function useStreamHistoryWindow(input: {
     boundaryItemId: initialBoundaryItemId,
     initialized: items.length > 0,
   }));
-  const boundaryIndex =
-    window.agentId === agentId && window.boundaryItemId !== null
-      ? items.findIndex((item) => item.id === window.boundaryItemId)
-      : -1;
+  const boundaryItemId = window.agentId === agentId ? window.boundaryItemId : null;
+  const boundaryIndex = useMemo(
+    () => (boundaryItemId === null ? -1 : items.findIndex((item) => item.id === boundaryItemId)),
+    [boundaryItemId, items],
+  );
   let start = initialStart;
   if (window.agentId === agentId && window.initialized) {
     if (window.boundaryItemId === null) {
diff --git a/packages/app/src/agent-stream/view.tsx b/packages/app/src/agent-stream/view.tsx
index 1e60240be9..6526e7352b 100644
--- a/packages/app/src/agent-stream/view.tsx
+++ b/packages/app/src/agent-stream/view.tsx
@@ -607,16 +607,21 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       toast?.error(t("agentStream.historyLoadFailed"));
     }, [t, toast]);
     // Chat find and the chat outline address messages, and an assistant message is a
-    // group of block rows, so this is a set of message ids and never of row ids.
-    const visibleMessageIds = useMemo(
-      () =>
-        new Set(
-          [...baseRenderModel.history, ...baseRenderModel.segments.liveHead].map(
-            getStreamItemMessageId,
-          ),
-        ),
-      [baseRenderModel.history, baseRenderModel.segments.liveHead],
+    // group of block rows, so these hold message ids and never row ids. Only the head
+    // changes per streamed delta, so the history set is keyed on mounted history alone.
+    const mountedHistoryMessageIds = useMemo(
+      () => new Set(baseRenderModel.history.map(getStreamItemMessageId)),
+      [baseRenderModel.history],
     );
+    const mountedMessageIds = useMemo(() => {
+      const liveHeadMessageIds = new Set(
+        baseRenderModel.segments.liveHead.map(getStreamItemMessageId),
+      );
+      return {
+        has: (messageId: string) =>
+          mountedHistoryMessageIds.has(messageId) || liveHeadMessageIds.has(messageId),
+      };
+    }, [baseRenderModel.segments.liveHead, mountedHistoryMessageIds]);
     const chatOutline = useChatOutline({
       agentId,
       serverId: resolvedServerId,
@@ -626,7 +631,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       enabled: supportsChatOutline && chatOutlineEnabled,
       viewportRef,
       onJumpError: handleTimelineHistoryLoadError,
-      visibleMessageIds,
+      mountedHistoryMessageIds,
       revealLoadedMessage: revealLoadedHistory,
     });
 
@@ -1105,7 +1110,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
         items={findItems}
         viewportRef={viewportRef}
         revealLoadedMessage={revealLoadedHistory}
-        visibleMessageIds={visibleMessageIds}
+        visibleMessageIds={mountedMessageIds}
       >
         <ToolCallSheetProvider>
           <AssistantSelectionCopySurface style={stylesheet.container}>
diff --git a/packages/app/src/composer/submission/model.ts b/packages/app/src/composer/submission/model.ts
index 26febae04f..67301bd5ff 100644
--- a/packages/app/src/composer/submission/model.ts
+++ b/packages/app/src/composer/submission/model.ts
@@ -17,6 +17,14 @@ export function getActiveMessageSubmissions(
   );
 }
 
+export function hasActiveMessageSubmission(
+  submissions: readonly MessageSubmissionRecord[] | null | undefined,
+): boolean {
+  return (submissions ?? EMPTY_MESSAGE_SUBMISSIONS).some(
+    (submission) => !submission.providerAcknowledged,
+  );
+}
+
 export function getSendingClientMessageIds(
   submissions: readonly MessageSubmissionRecord[] | null | undefined,
 ): string[] {
diff --git a/packages/app/src/stores/session-store.ts b/packages/app/src/stores/session-store.ts
index a741f99ddb..9b70d90486 100644
--- a/packages/app/src/stores/session-store.ts
+++ b/packages/app/src/stores/session-store.ts
@@ -15,7 +15,7 @@ import {
 import {
   acceptMessageSubmission,
   beginMessageSubmission,
-  getActiveMessageSubmissions,
+  hasActiveMessageSubmission,
   observeMessageSubmissionCanonical,
   rejectMessageSubmission,
   type MessageSubmissionRecord,
@@ -348,7 +348,7 @@ export function selectAgentTurnPresentation(
     session?.agents.get(agentId)?.turn ??
       session?.agentDetails.get(agentId)?.turn ??
       TURN_LIVENESS_IDLE,
-    getActiveMessageSubmissions(session?.messageSubmissions.get(agentId)).length > 0,
+    hasActiveMessageSubmission(session?.messageSubmissions.get(agentId)),
   );
 }
 
diff --git a/packages/app/src/timeline/turn-time.test.ts b/packages/app/src/timeline/turn-time.test.ts
index 35dacf397b..3ce6942301 100644
--- a/packages/app/src/timeline/turn-time.test.ts
+++ b/packages/app/src/timeline/turn-time.test.ts
@@ -12,11 +12,11 @@ function user(id: string, timestamp: Date): StreamItem {
   };
 }
 
-function assistant(id: string, timestamp: Date): StreamItem {
+function assistant(id: string, timestamp: Date, text = id): StreamItem {
   return {
     kind: "assistant_message",
     id,
-    text: id,
+    text,
     timestamp,
   };
 }
@@ -125,4 +125,97 @@ describe("deriveStreamTurnTiming", () => {
       durationMs: null,
     });
   });
+
+  it("keeps the timing map identity while a streamed delta grows the live head", () => {
+    const tail = [
+      user("u1", new Date("2026-05-15T00:00:00.000Z")),
+      assistant("a1", new Date("2026-05-15T00:00:07.000Z")),
+      user("u2", new Date("2026-05-15T00:01:00.000Z")),
+    ];
+    const derive = (text: string, at: string) =>
+      deriveStreamTurnTiming({
+        isTurnActive: true,
+        activeTurnStartedAt: tail[2]?.timestamp ?? null,
+        tail,
+        head: [assistant("a2", new Date(at), text)],
+      });
+
+    const first = derive("one", "2026-05-15T00:01:04.000Z");
+    const second = derive("one two", "2026-05-15T00:01:05.000Z");
+
+    assert.equal(second.byAssistantId, first.byAssistantId);
+    assert.deepEqual(first.byAssistantId.get("a1"), {
+      completedAt: tail[1]?.timestamp,
+      durationMs: 7000,
+    });
+    assert.equal(first.byAssistantId.has("a2"), false);
+  });
+
+  it("keeps the timing map identity when the head closed the tail's open turn", () => {
+    const lastTailAt = new Date("2026-05-15T00:00:07.000Z");
+    const tail = [user("u1", new Date("2026-05-15T00:00:00.000Z")), assistant("a1", lastTailAt)];
+    const derive = (text: string, at: string) =>
+      deriveStreamTurnTiming({
+        isTurnActive: true,
+        activeTurnStartedAt: null,
+        tail,
+        head: [
+          user("u2", new Date("2026-05-15T00:01:00.000Z")),
+          assistant("a2", new Date(at), text),
+        ],
+      });
+
+    const first = derive("one", "2026-05-15T00:01:04.000Z");
+    const second = derive("one two", "2026-05-15T00:01:05.000Z");
+
+    assert.equal(second.byAssistantId, first.byAssistantId);
+    assert.deepEqual(first.byAssistantId.get("a1"), {
+      completedAt: lastTailAt,
+      durationMs: 7000,
+    });
+  });
+
+  it("produces a new timing map when the streamed turn completes", () => {
+    const tail = [user("u1", new Date("2026-05-15T00:00:00.000Z"))];
+    const completedAt = new Date("2026-05-15T00:00:09.000Z");
+    const head = [assistant("a1", completedAt)];
+
+    const active = deriveStreamTurnTiming({
+      isTurnActive: true,
+      activeTurnStartedAt: tail[0]?.timestamp ?? null,
+      tail,
+      head,
+    });
+    const completed = deriveStreamTurnTiming({
+      isTurnActive: false,
+      activeTurnStartedAt: null,
+      tail,
+      head,
+    });
+
+    assert.notEqual(completed.byAssistantId, active.byAssistantId);
+    assert.equal(active.byAssistantId.has("a1"), false);
+    assert.deepEqual(completed.byAssistantId.get("a1"), { completedAt, durationMs: 9000 });
+  });
+
+  it("derives fresh timing when the tail itself changes", () => {
+    const firstTail = [
+      user("u1", new Date("2026-05-15T00:00:00.000Z")),
+      assistant("a1", new Date("2026-05-15T00:00:07.000Z")),
+      user("u2", new Date("2026-05-15T00:01:00.000Z")),
+    ];
+    const secondTail = [...firstTail, assistant("a2", new Date("2026-05-15T00:01:03.000Z"))];
+    const derive = (tail: StreamItem[]) =>
+      deriveStreamTurnTiming({ isTurnActive: false, activeTurnStartedAt: null, tail, head: [] });
+
+    const first = derive(firstTail);
+    const second = derive(secondTail);
+
+    assert.notEqual(second.byAssistantId, first.byAssistantId);
+    assert.equal(first.byAssistantId.has("a2"), false);
+    assert.deepEqual(second.byAssistantId.get("a2"), {
+      completedAt: secondTail[3]?.timestamp,
+      durationMs: 3000,
+    });
+  });
 });
diff --git a/packages/app/src/timeline/turn-time.ts b/packages/app/src/timeline/turn-time.ts
index 4542962af4..c47a6983cd 100644
--- a/packages/app/src/timeline/turn-time.ts
+++ b/packages/app/src/timeline/turn-time.ts
@@ -11,61 +11,135 @@ export interface StreamTurnTiming {
   runningStartedAt: Date | null;
 }
 
+interface OpenTurn {
+  userAt: Date | null;
+  lastItemAt: Date | null;
+  assistantIds: readonly string[];
+  previousItem: StreamItem | null;
+}
+
+interface HeadTurnTiming {
+  additions: Map<string, TurnTiming>;
+  byAssistantId: Map<string, TurnTiming>;
+}
+
+interface TailTurnTiming {
+  completed: Map<string, TurnTiming>;
+  openTurn: OpenTurn;
+  lastHead: HeadTurnTiming | null;
+}
+
+const EMPTY_OPEN_TURN: OpenTurn = {
+  userAt: null,
+  lastItemAt: null,
+  assistantIds: [],
+  previousItem: null,
+};
+
+function closeTurn(turn: OpenTurn, into: Map<string, TurnTiming>): void {
+  if (!turn.lastItemAt || turn.assistantIds.length === 0) {
+    return;
+  }
+  const timing: TurnTiming = {
+    completedAt: turn.lastItemAt,
+    durationMs: turn.userAt ? Math.max(0, turn.lastItemAt.getTime() - turn.userAt.getTime()) : null,
+  };
+  for (const id of turn.assistantIds) {
+    into.set(id, timing);
+  }
+}
+
+function walkTurns(
+  items: readonly StreamItem[],
+  from: OpenTurn,
+  into: Map<string, TurnTiming>,
+): OpenTurn {
+  let userAt = from.userAt;
+  let lastItemAt = from.lastItemAt;
+  let assistantIds = [...from.assistantIds];
+  let previousItem = from.previousItem;
+  for (const item of items) {
+    if (startsNewTurn(item, previousItem)) {
+      closeTurn({ userAt, lastItemAt, assistantIds, previousItem }, into);
+      userAt = item.kind === "user_message" ? item.timestamp : null;
+      lastItemAt = null;
+      assistantIds = [];
+    }
+    lastItemAt = item.timestamp;
+    if (item.kind === "assistant_message") {
+      assistantIds.push(item.id);
+    }
+    previousItem = item;
+  }
+  return { userAt, lastItemAt, assistantIds, previousItem };
+}
+
+function areTimingsEqual(a: Map<string, TurnTiming>, b: Map<string, TurnTiming>): boolean {
+  if (a.size !== b.size) {
+    return false;
+  }
+  for (const [id, timing] of a) {
+    const other = b.get(id);
+    if (
+      !other ||
+      other.completedAt.getTime() !== timing.completedAt.getTime() ||
+      other.durationMs !== timing.durationMs
+    ) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// The tail walk is cached by array identity so a streamed delta, which only replaces the
+// head, walks the head from the carried open turn. The returned Map keeps its identity
+// while the head adds no completed turn, so memos keyed on it do not miss per tick.
+const tailTurnTimingCache = new WeakMap<StreamItem[], TailTurnTiming>();
+
+function getTailTurnTiming(tail: StreamItem[]): TailTurnTiming {
+  const cached = tailTurnTimingCache.get(tail);
+  if (cached) {
+    return cached;
+  }
+  const completed = new Map<string, TurnTiming>();
+  const openTurn = walkTurns(tail, EMPTY_OPEN_TURN, completed);
+  const timing: TailTurnTiming = { completed, openTurn, lastHead: null };
+  tailTurnTimingCache.set(tail, timing);
+  return timing;
+}
+
+function resolveByAssistantId(
+  tail: TailTurnTiming,
+  additions: Map<string, TurnTiming>,
+): Map<string, TurnTiming> {
+  if (additions.size === 0) {
+    return tail.completed;
+  }
+  if (tail.lastHead && areTimingsEqual(tail.lastHead.additions, additions)) {
+    return tail.lastHead.byAssistantId;
+  }
+  const byAssistantId = new Map(tail.completed);
+  for (const [id, timing] of additions) {
+    byAssistantId.set(id, timing);
+  }
+  tail.lastHead = { additions, byAssistantId };
+  return byAssistantId;
+}
+
 export function deriveStreamTurnTiming(params: {
   isTurnActive: boolean;
   activeTurnStartedAt: Date | null;
   tail: StreamItem[];
   head: StreamItem[];
 }): StreamTurnTiming {
-  const byAssistantId = new Map<string, TurnTiming>();
-  let currentUserAt: Date | null = null;
-  let currentLastItemAt: Date | null = null;
-  let currentAssistantIds: string[] = [];
-  let previousItem: StreamItem | null = null;
-
-  const flushCompletedTurn = () => {
-    if (!currentLastItemAt || currentAssistantIds.length === 0) {
-      return;
-    }
-    const timing: TurnTiming = {
-      completedAt: currentLastItemAt,
-      durationMs: currentUserAt
-        ? Math.max(0, currentLastItemAt.getTime() - currentUserAt.getTime())
-        : null,
-    };
-    for (const id of currentAssistantIds) {
-      byAssistantId.set(id, timing);
-    }
-  };
-
-  const visitItem = (item: StreamItem) => {
-    if (startsNewTurn(item, previousItem)) {
-      flushCompletedTurn();
-      currentUserAt = item.kind === "user_message" ? item.timestamp : null;
-      currentLastItemAt = null;
-      currentAssistantIds = [];
-    }
-    currentLastItemAt = item.timestamp;
-    if (item.kind === "assistant_message") {
-      currentAssistantIds.push(item.id);
-    }
-    previousItem = item;
-  };
-
-  for (const item of params.tail) {
-    visitItem(item);
-  }
-  for (const item of params.head) {
-    visitItem(item);
-  }
-
-  const runningStartedAt = params.isTurnActive ? params.activeTurnStartedAt : null;
+  const tail = getTailTurnTiming(params.tail);
+  const additions = new Map<string, TurnTiming>();
+  const openTurn = walkTurns(params.head, tail.openTurn, additions);
   if (!params.isTurnActive) {
-    flushCompletedTurn();
+    closeTurn(openTurn, additions);
   }
-
   return {
-    byAssistantId,
-    runningStartedAt,
+    byAssistantId: resolveByAssistantId(tail, additions),
+    runningStartedAt: params.isTurnActive ? params.activeTurnStartedAt : null,
   };
 }

From e0de0fdf6f85d70620aa98312a29372f4682db47 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 03:15:23 +0200
Subject: [PATCH 196/270] Read cached chats while other agents stream (#7074)

* perf(app): overlay pending replica rows on read instead of forcing persists

readRows flushed every pending change to storage, read, and retried
whenever the host revision moved. Every stream reducer flush (48 ms) and
every agent delta advanced that revision, so opening another agent or
workspace on a host with a streaming agent re-serialized the whole
pending batch per iteration and could spin until the stream paused.

Reads now run on the write queue, so no drained batch is mid-apply while
a read runs, and rows still pending in memory are overlaid for the
requested keys. A read never forces a persist and never waits for the
host to go quiet.

Persist retries after a storage failure back off exponentially (1 s to
60 s) and log the failure instead of re-serializing every second.

Before: one readAgent during a 200-commit stream cost 201 store reads and
200 forced persists; a permanently failing store was written 30 times in
30 s. After: 1 read, 0 persists; 5 writes in 30 s.

Fixes #4813
Refs #4814

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* fix(app): log replica persist retry failures

---------

Co-authored-by: Ivan Malison <IvanMalison@gmail.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <paseo-bot[bot]@users.noreply.github.com>
---
 docs/data-model.md                            |   5 +-
 .../src/runtime/replica-cache/index.test.ts   | 148 +++++++++++++++++-
 .../app/src/runtime/replica-cache/index.ts    |  83 +++++++---
 3 files changed, 215 insertions(+), 21 deletions(-)

diff --git a/docs/data-model.md b/docs/data-model.md
index 25a214b11c..1b578bb6d8 100644
--- a/docs/data-model.md
+++ b/docs/data-model.md
@@ -589,7 +589,10 @@ host, kinds, and ids. Opening a cached workspace uses exact workspace and projec
 directory scan. One invalid row is deleted and returned as a miss without affecting other rows.
 An invalid directory row and its affected checkpoint cursor are repaired in one transaction, so a
 later launch cannot accept a checkpoint for a partial baseline. Directory changes and their
-checkpoint are also applied in one transaction.
+checkpoint are also applied in one transaction. Reads wait for accepted changes to reach storage,
+then retry only when a requested row changes during the read. Unrelated agent streams do not
+invalidate the read. Directory baseline replacements and host removal or renaming still invalidate
+the affected reads.
 
 The cache is capped at 32 MiB and evicts whole hosts in least-recently-written order. Budget
 bookkeeping may scan opaque row sizes during a deferred write, never during host registry startup or
diff --git a/packages/app/src/runtime/replica-cache/index.test.ts b/packages/app/src/runtime/replica-cache/index.test.ts
index 76e9e66464..15adc841fb 100644
--- a/packages/app/src/runtime/replica-cache/index.test.ts
+++ b/packages/app/src/runtime/replica-cache/index.test.ts
@@ -464,6 +464,19 @@ describe("ReplicaCache", () => {
     expect((await cache.readDirectory(SERVER_ID)).projects.size).toBe(0);
   });
 
+  it("does not return an accepted agent that storage rejected", async () => {
+    const storage = new MemoryStorage();
+    const cache = createCache(storage);
+    storage.persistentWriteFailure = new Error("disk unavailable");
+    commitDirectory(cache, SERVER_ID, directory());
+    await cache.flush();
+
+    const result = await cache.readAgent(SERVER_ID, "agent-1");
+
+    expect(storage.rows.size).toBe(0);
+    expect(result).toBeUndefined();
+  });
+
   it("fails closed when an accepted deletion cannot be persisted before a read", async () => {
     const storage = new MemoryStorage();
     const cache = createCache(storage);
@@ -504,6 +517,25 @@ describe("ReplicaCache", () => {
     expect((await cache.readWorkspace(SERVER_ID, "workspace-1"))?.workspace.id).toBe("workspace-1");
   });
 
+  it("discards an in-flight read across host removal and reactivation", async () => {
+    const storage = new MemoryStorage();
+    const cache = createCache(storage);
+    commitDirectory(cache, SERVER_ID, directory());
+    await cache.flush();
+    const started = deferred();
+    const release = deferred();
+    storage.onRead = started.resolve;
+    storage.readGate = release.promise;
+
+    const reading = cache.readAgent(SERVER_ID, "agent-1");
+    await started.promise;
+    cache.setHosts([]);
+    cache.setHosts([SERVER_ID]);
+    release.resolve();
+
+    expect(await reading).toBeUndefined();
+  });
+
   it("discards a durable read when the host changes while it is in flight", async () => {
     const storage = new MemoryStorage();
     const cache = createCache(storage);
@@ -522,6 +554,36 @@ describe("ReplicaCache", () => {
     expect(await reading).toBeUndefined();
   });
 
+  it("retries a timeline read when that same timeline changes in flight", async () => {
+    const storage = new MemoryStorage();
+    const cache = createCache(storage);
+    cache.commitTimeline(SERVER_ID, "agent-1", timeline("Old"));
+    await cache.flush();
+    storage.onRead = () => {
+      storage.onRead = null;
+      cache.commitTimeline(SERVER_ID, "agent-1", timeline("New"));
+    };
+
+    expect((await cache.readTimeline(SERVER_ID, "agent-1"))?.items).toEqual([timelineItem("New")]);
+    expect(storage.reads).toHaveLength(2);
+  });
+
+  it("discards a requested row removed by a directory baseline replacement in flight", async () => {
+    const storage = new MemoryStorage();
+    const cache = createCache(storage);
+    commitDirectory(cache, SERVER_ID, directory());
+    await cache.flush();
+    const replacement = directory();
+    replacement.agents.clear();
+    storage.onRead = () => {
+      storage.onRead = null;
+      cache.replaceDirectoryBaseline(SERVER_ID, replacement);
+    };
+
+    expect(await cache.readAgent(SERVER_ID, "agent-1")).toBeUndefined();
+    expect(storage.reads).toHaveLength(2);
+  });
+
   it("never reads a timeline older than an accepted deferred replacement", async () => {
     const storage = new MemoryStorage();
     const cache = createCache(storage);
@@ -796,7 +858,7 @@ describe("ReplicaCache", () => {
     ]);
   });
 
-  it("retries a timeline read invalidated by a concurrent directory commit", async () => {
+  it("reads a persisted timeline across a concurrent directory commit", async () => {
     const storage = new MemoryStorage();
     const cache = createCache(storage);
     cache.commitTimeline(SERVER_ID, "agent-1", timeline("Persisted timeline"));
@@ -858,6 +920,90 @@ describe("ReplicaCache", () => {
 
     expect(storage.cleanups).toBe(1);
   });
+
+  describe.each(["timeline", "directory"] as const)(
+    "while another agent streams %s updates",
+    (kind) => {
+      async function streamingCache() {
+        const storage = new MemoryStorage();
+        const cache = createCache(storage);
+        commitDirectory(cache, SERVER_ID, directory());
+        cache.commitTimeline(SERVER_ID, "agent-1", timeline());
+        await cache.flush();
+        const readsBefore = storage.reads.length;
+        const writesBefore = storage.writes;
+        let chunks = 0;
+        storage.onRead = () => {
+          if (chunks >= 200) return;
+          chunks += 1;
+          if (kind === "timeline") {
+            cache.commitTimeline(SERVER_ID, "agent-2", {
+              ...timeline(`chunk ${chunks}`),
+              agentId: "agent-2",
+            });
+          } else {
+            cache.commitDirectoryMutations(
+              SERVER_ID,
+              [{ type: "upsert", kind: "agent", id: "agent-2", value: agent("agent-2") }],
+              { agents: { generation: "g", afterSeq: 12 + chunks } },
+            );
+          }
+        };
+        return {
+          cache,
+          expectReads: (count: number, writes = 0) => {
+            expect(storage.reads.length - readsBefore).toBe(count);
+            expect(storage.writes - writesBefore).toBe(writes);
+            expect(chunks).toBe(count);
+          },
+        };
+      }
+
+      it("reads another cached agent without waiting for the stream to stop", async () => {
+        const { cache, expectReads } = await streamingCache();
+
+        expect((await cache.readAgent(SERVER_ID, "agent-1"))?.title).toBe("Cached agent");
+        expectReads(1);
+        await cache.flush();
+      });
+
+      it("reads another cached workspace without waiting for the stream to stop", async () => {
+        const { cache, expectReads } = await streamingCache();
+
+        expect((await cache.readWorkspace(SERVER_ID, "workspace-1"))?.workspace.name).toBe("main");
+        expectReads(2, 1);
+        await cache.flush();
+      });
+
+      it("reads another cached timeline without waiting for the stream to stop", async () => {
+        const { cache, expectReads } = await streamingCache();
+
+        expect(await cache.readTimeline(SERVER_ID, "agent-1")).toEqual(timeline());
+        expectReads(1);
+        await cache.flush();
+      });
+    },
+  );
+
+  it("reads the directory after persisting a pending baseline replacement", async () => {
+    const storage = new MemoryStorage();
+    const cache = createCache(storage);
+    commitDirectory(cache, SERVER_ID, directory());
+    cache.commitTimeline(SERVER_ID, "agent-1", timeline());
+    await cache.flush();
+    const replacement = directory({ agents: { generation: "g2", afterSeq: 1 } });
+    replacement.projects.clear();
+    replacement.agents.set("agent-2", agent("agent-2"));
+    cache.replaceDirectoryBaseline(SERVER_ID, replacement);
+
+    const read = await cache.readDirectory(SERVER_ID);
+
+    expect([...read.agents.keys()].sort()).toEqual(["agent-1", "agent-2"]);
+    expect(read.projects.size).toBe(0);
+    expect(read.checkpoint).toEqual({ agents: { generation: "g2", afterSeq: 1 } });
+    expect(await cache.readTimeline(SERVER_ID, "agent-1")).toEqual(timeline());
+    expect(storage.writes).toBe(2);
+  });
 });
 
 it("retains semantic agent messages across disk-cache reconstruction", async () => {
diff --git a/packages/app/src/runtime/replica-cache/index.ts b/packages/app/src/runtime/replica-cache/index.ts
index 3fc8458551..94937d4dc5 100644
--- a/packages/app/src/runtime/replica-cache/index.ts
+++ b/packages/app/src/runtime/replica-cache/index.ts
@@ -880,9 +880,24 @@ function directoryEntityForRow(row: ReplicaRow): keyof DirectoryCheckpoint | und
   return undefined;
 }
 
+interface ReplicaRead {
+  serverId: string;
+  kinds: readonly ReplicaRowKind[];
+  ids?: readonly string[];
+  invalidated: boolean;
+}
+
+function matchesReplicaRead(read: ReplicaRead, row: ReplicaRowKey): boolean {
+  return (
+    read.serverId === row.serverId &&
+    read.kinds.includes(row.kind) &&
+    (!read.ids || read.ids.includes(row.id))
+  );
+}
+
 export class ReplicaCache {
   private readonly activeServerIds = new Set<string>();
-  private readonly hostRevisions = new Map<string, number>();
+  private readonly activeReads = new Set<ReplicaRead>();
   private readonly storedRows = new Map<string, Map<string, ReplicaRow>>();
   private readonly hostBytes = new Map<string, number>();
   private readonly hostWriteOrder = new Map<string, true>();
@@ -1004,10 +1019,22 @@ export class ReplicaCache {
         // accepted commits to land. A store that rejects them will keep rejecting them: fail closed
         // rather than re-attempt the write on every pass. A write rejected for another host leaves
         // this host's stored rows readable.
-        if (!(await this.syncPending()) && this.hasPendingHostChanges(serverId)) return [];
-        const revision = this.hostRevisions.get(serverId) ?? 0;
-        const rows = await this.rowStore.read(serverId, kinds, ids);
-        if (this.canReadHostRevision(serverId, revision)) return rows;
+        const read: ReplicaRead = { serverId, kinds, ids, invalidated: false };
+        this.activeReads.add(read);
+        try {
+          if (!(await this.syncPending()) && this.hasPendingHostChanges(serverId)) return [];
+          if (read.invalidated || this.hasPendingReadChanges(read)) continue;
+          const rows = await this.rowStore.read(serverId, kinds, ids);
+          if (
+            this.activeServerIds.has(serverId) &&
+            !read.invalidated &&
+            !this.hasPendingReadChanges(read)
+          ) {
+            return rows;
+          }
+        } finally {
+          this.activeReads.delete(read);
+        }
       }
       return [];
     } catch {
@@ -1092,7 +1119,6 @@ export class ReplicaCache {
   ): void {
     if (!this.activeServerIds.has(serverId)) return;
     if (this.invalidatedHosts.has(serverId)) return;
-    this.advanceHostRevision(serverId);
     for (const mutation of mutations) {
       if (mutation.type === "delete") {
         this.queueEntityDelete(serverId, mutation.kind, mutation.id);
@@ -1118,7 +1144,7 @@ export class ReplicaCache {
 
   replaceDirectoryBaseline(serverId: string, directory: CachedDirectory): void {
     if (!this.activeServerIds.has(serverId)) return;
-    this.advanceHostRevision(serverId);
+    this.invalidateHostReads(serverId, ["agent", "workspace", "project", "checkpoint"]);
     // Replacing the directory must not discard independently accepted timeline changes.
     for (const [key, row] of this.pendingUpserts) {
       if (row.serverId === serverId && row.kind !== "timeline") this.pendingUpserts.delete(key);
@@ -1150,7 +1176,6 @@ export class ReplicaCache {
   commitTimeline(serverId: string, agentId: string, timeline: CachedTimeline): void {
     if (!this.activeServerIds.has(serverId)) return;
     if (timeline.agentId !== agentId) throw new Error("Timeline cache key does not match payload");
-    this.advanceHostRevision(serverId);
     this.queueUpsert({ serverId, kind: "timeline", id: agentId, value: timeline });
     this.schedulePersist();
   }
@@ -1159,7 +1184,7 @@ export class ReplicaCache {
     const next = new Set(serverIds);
     const removed = [...this.activeServerIds].filter((serverId) => !next.has(serverId));
     const added = [...next].filter((serverId) => !this.activeServerIds.has(serverId));
-    for (const serverId of [...removed, ...added]) this.advanceHostRevision(serverId);
+    for (const serverId of [...removed, ...added]) this.invalidateHostReads(serverId);
     this.activeServerIds.clear();
     for (const serverId of next) this.activeServerIds.add(serverId);
     for (const serverId of removed) {
@@ -1171,8 +1196,8 @@ export class ReplicaCache {
   }
 
   reconcileServerId(oldServerId: string, newServerId: string): void {
-    this.advanceHostRevision(oldServerId);
-    this.advanceHostRevision(newServerId);
+    this.invalidateHostReads(oldServerId);
+    this.invalidateHostReads(newServerId);
     const rows = this.storedRows.get(oldServerId);
     if (rows) {
       const newRows = this.storedRows.get(newServerId) ?? new Map<string, ReplicaRow>();
@@ -1250,12 +1275,14 @@ export class ReplicaCache {
   }
 
   private queueUpsert(row: StructuredReplicaUpsert): void {
+    this.invalidateRowReads(row);
     const key = pendingRowKey(row);
     this.pendingDeletes.delete(key);
     this.pendingUpserts.set(key, row);
   }
 
   private queueDelete(key: ReplicaRowKey): void {
+    this.invalidateRowReads(key);
     const pendingKey = pendingRowKey(key);
     this.pendingUpserts.delete(pendingKey);
     this.pendingDeletes.set(pendingKey, key);
@@ -1267,14 +1294,36 @@ export class ReplicaCache {
     );
   }
 
-  private canReadHostRevision(serverId: string, revision: number): boolean {
+  private hasPendingReadChanges(read: ReplicaRead): boolean {
+    if (
+      this.pendingBaselines.has(read.serverId) &&
+      read.kinds.some((kind) => kind !== "timeline")
+    ) {
+      return true;
+    }
     return (
-      this.activeServerIds.has(serverId) &&
-      (this.hostRevisions.get(serverId) ?? 0) === revision &&
-      !this.hasPendingHostChanges(serverId)
+      [...this.pendingUpserts.values()].some((row) => matchesReplicaRead(read, row)) ||
+      [...this.pendingDeletes.values()].some((row) => matchesReplicaRead(read, row))
     );
   }
 
+  private invalidateRowReads(row: ReplicaRowKey): void {
+    for (const read of this.activeReads) {
+      if (matchesReplicaRead(read, row)) read.invalidated = true;
+    }
+  }
+
+  private invalidateHostReads(serverId: string, kinds?: readonly ReplicaRowKind[]): void {
+    for (const read of this.activeReads) {
+      if (
+        read.serverId === serverId &&
+        (!kinds || kinds.some((kind) => read.kinds.includes(kind)))
+      ) {
+        read.invalidated = true;
+      }
+    }
+  }
+
   private hasPendingHostChanges(serverId: string): boolean {
     if (this.pendingBaselines.has(serverId)) return true;
     for (const row of this.pendingUpserts.values()) {
@@ -1286,10 +1335,6 @@ export class ReplicaCache {
     return false;
   }
 
-  private advanceHostRevision(serverId: string): void {
-    this.hostRevisions.set(serverId, (this.hostRevisions.get(serverId) ?? 0) + 1);
-  }
-
   private drainPendingChanges(): PendingReplicaChanges {
     const changes = {
       upserts: [...this.pendingUpserts.values()],

From 5c2a1552df8e286c2c64cf0495b3c5fbc4c8922d Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 04:14:28 +0200
Subject: [PATCH 197/270] fix(app): preserve number groups when rebinding
 navigation shortcuts (#7065)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Recording a digit for tab or workspace navigation replaced the existing
1–9 wildcard with one literal key. Preserve the group when capturing a
replacement and display its range after saving and reloading.

Adapted the number-group fix from getpaseo/paseo#5237, with independent
failing-first renderer reproduction and tab/workspace matcher coverage.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: dbunk903 <74584941+dbunk903@users.noreply.github.com>
---
 .../src/keyboard/keyboard-shortcuts.test.ts   | 47 +++++++++++++++++-
 .../app/src/keyboard/keyboard-shortcuts.ts    |  7 +++
 packages/app/src/keyboard/shortcut-string.ts  |  1 +
 .../settings/keyboard-shortcuts-section.tsx   |  4 +-
 .../e2e/keyboard-shortcut-unassign.spec.ts    | 48 +++++++++++++++++++
 5 files changed, 104 insertions(+), 3 deletions(-)

diff --git a/packages/app/src/keyboard/keyboard-shortcuts.test.ts b/packages/app/src/keyboard/keyboard-shortcuts.test.ts
index 571474643b..9e56ef66cd 100644
--- a/packages/app/src/keyboard/keyboard-shortcuts.test.ts
+++ b/packages/app/src/keyboard/keyboard-shortcuts.test.ts
@@ -4,6 +4,7 @@ import { keyboardEventToComboString } from "./shortcut-string";
 import {
   buildKeyboardShortcutHelpSections,
   buildEffectiveBindings,
+  normalizeCapturedShortcutCombo,
   getBindingIdForAction,
   getDefaultKeysForAction,
   getWorkspaceIndexJumpModifierKey,
@@ -823,9 +824,9 @@ describe("keyboard-shortcut help sections", () => {
       expect(rowChord({}, "show-shortcuts")).toEqual([["?"]]);
     });
 
-    it("replaces the default-only wildcard when the index jump is rebound", () => {
+    it("keeps the digit range readable when the index jump is rebound", () => {
       expect(rowChord({ [MAC_INDEX_BINDING]: "Ctrl+Digit" }, "workspace-jump-index")).toEqual([
-        ["ctrl", "Digit"],
+        ["ctrl", "1-9"],
       ]);
     });
 
@@ -1347,3 +1348,45 @@ describe("direct new-tab target shortcuts", () => {
     ).toEqual([["ctrl", "shift", "H"]]);
   });
 });
+
+describe("number-group shortcut capture", () => {
+  const tabBindingId = "workspace-tab-navigate-index-cmd-alt-digit-mac-desktop";
+  it.each([
+    { id: tabBindingId, action: "workspace.tab.navigate.index", row: "workspace-tab-jump-index" },
+    {
+      id: "workspace-navigate-index-cmd-digit-mac",
+      action: "workspace.navigate.index",
+      row: "workspace-jump-index",
+    },
+  ])("captures Ctrl+1 as the entire number group for $row", ({ id, action, row }) => {
+    const combo = normalizeCapturedShortcutCombo(id, "Ctrl+1");
+    expect(combo).toBe("Ctrl+Digit");
+    const overrides = { [id]: combo };
+    const bindings = buildEffectiveBindings(overrides);
+    for (let index = 1; index <= 9; index++) {
+      const result = resolveShortcut({
+        event: { key: String(index), code: `Digit${index}`, ctrlKey: true },
+        context: { isMac: true, isDesktop: true, focusScope: "message-input" },
+        bindings,
+      });
+      expect(result.match?.action).toBe(action);
+      expect(result.match?.payload).toEqual({ index });
+    }
+    expect(resolveShortcutKeysForAction(row, overrides, { isMac: true, isDesktop: true })).toEqual([
+      ["ctrl", "1-9"],
+    ]);
+    expect(
+      resolveShortcut({
+        event: { key: "0", code: "Digit0", ctrlKey: true },
+        context: { isMac: true, isDesktop: true },
+        bindings,
+      }).match,
+    ).toBeNull();
+  });
+  it("preserves literal numbers for non-index actions and existing nonnumeric combos", () => {
+    expect(normalizeCapturedShortcutCombo("show-shortcuts", "Ctrl+1")).toBe("Ctrl+1");
+    expect(normalizeCapturedShortcutCombo(tabBindingId, "Ctrl+K")).toBe("Ctrl+K");
+    expect(normalizeCapturedShortcutCombo(tabBindingId, "Ctrl+0")).toBe("Ctrl+0");
+    expect(normalizeCapturedShortcutCombo(tabBindingId, "Ctrl+9")).toBe("Ctrl+Digit");
+  });
+});
diff --git a/packages/app/src/keyboard/keyboard-shortcuts.ts b/packages/app/src/keyboard/keyboard-shortcuts.ts
index 54d2b59cdb..a009008b85 100644
--- a/packages/app/src/keyboard/keyboard-shortcuts.ts
+++ b/packages/app/src/keyboard/keyboard-shortcuts.ts
@@ -1210,6 +1210,13 @@ export const DEFAULT_BINDINGS: readonly ParsedShortcutBinding[] =
 
 export type ShortcutOverrides = Record<string, string | null>;
 
+/** Keep number-group actions bound to all nine indices when recording a new modifier. */
+export function normalizeCapturedShortcutCombo(bindingId: string, combo: string): string {
+  const binding = DEFAULT_BINDINGS.find((candidate) => candidate.id === bindingId);
+  if (binding?.payload?.type !== "index") return combo;
+  return combo.replace(/(^|\+)[1-9]$/, "$1Digit");
+}
+
 export function buildEffectiveBindings(overrides: ShortcutOverrides): ParsedShortcutBinding[] {
   return DEFAULT_BINDINGS.map(function (binding) {
     const override = overrides[binding.id];
diff --git a/packages/app/src/keyboard/shortcut-string.ts b/packages/app/src/keyboard/shortcut-string.ts
index 8b632befbd..6b80009633 100644
--- a/packages/app/src/keyboard/shortcut-string.ts
+++ b/packages/app/src/keyboard/shortcut-string.ts
@@ -192,6 +192,7 @@ const MODIFIER_CODES = new Set([
  * override on a named key renders as a raw code — `ARROWLEFT`, not `←`.
  */
 const DISPLAY_KEY_ALIASES: Record<string, string> = {
+  Digit: "1-9",
   ArrowLeft: "Left",
   ArrowRight: "Right",
   ArrowUp: "Up",
diff --git a/packages/app/src/screens/settings/keyboard-shortcuts-section.tsx b/packages/app/src/screens/settings/keyboard-shortcuts-section.tsx
index 3798a5f9bd..8a8c4b42b9 100644
--- a/packages/app/src/screens/settings/keyboard-shortcuts-section.tsx
+++ b/packages/app/src/screens/settings/keyboard-shortcuts-section.tsx
@@ -19,6 +19,7 @@ import { useKeyboardShortcutOverrides } from "@/hooks/use-keyboard-shortcut-over
 import {
   buildKeyboardShortcutHelpSections,
   getBindingIdForAction,
+  normalizeCapturedShortcutCombo,
   getDefaultKeysForAction,
   resolveShortcutKeysForAction,
   type KeyboardShortcutHelpRow,
@@ -389,7 +390,8 @@ export function KeyboardShortcutsSection() {
       }
 
       setHeldModifiers(null);
-      setCapturedCombos((current) => [...current, comboString]);
+      const capturedCombo = normalizeCapturedShortcutCombo(capturingBindingId!, comboString);
+      setCapturedCombos((current) => [...current, capturedCombo]);
     }
 
     window.addEventListener("keydown", handleKeyDown, true);
diff --git a/packages/desktop/e2e/keyboard-shortcut-unassign.spec.ts b/packages/desktop/e2e/keyboard-shortcut-unassign.spec.ts
index 1d0b829f67..b7063b4565 100644
--- a/packages/desktop/e2e/keyboard-shortcut-unassign.spec.ts
+++ b/packages/desktop/e2e/keyboard-shortcut-unassign.spec.ts
@@ -1,3 +1,5 @@
+import { clickNewChat, gotoWorkspace } from "../../app/e2e/support/helpers/launcher";
+import { clickSettingsBackToWorkspace } from "../../app/e2e/support/helpers/settings";
 import type { Page } from "@playwright/test";
 import { test, expect } from "../../app/e2e/support/fixtures";
 import { gotoAppShell, openSettings } from "../../app/e2e/support/helpers/app";
@@ -213,3 +215,49 @@ for (const { platform, keys, label, firstCombo, secondCombo } of [
     await expectInterruptShortcut(page, label);
   });
 }
+
+async function rebindTabNumbers(page: Page) {
+  await captureShortcut(page, "Jump to tab", "workspace-tab-jump-index", "Control+1");
+  await page.getByRole("button", { name: "Done", exact: true }).click();
+}
+
+async function expectTabNumberRange(page: Page) {
+  const row = page.getByText("Jump to tab", { exact: true }).locator("..");
+  await expect(row.getByText("⌃1-9", { exact: true })).toBeVisible();
+}
+
+async function openTwoDraftTabs(page: Page, workspaceId: string) {
+  await installDesktopBridge(page);
+  await gotoWorkspace(page, workspaceId);
+  await clickNewChat(page);
+  await clickNewChat(page);
+  await expect(
+    page.locator('[data-testid^="workspace-tab-draft_"]').filter({ visible: true }),
+  ).toHaveCount(2);
+  await openSettings(page);
+  await openSettingsSection(page, "shortcuts");
+}
+
+async function expectTabNumberNavigation(page: Page) {
+  const tabs = page.locator('[data-testid^="workspace-tab-draft_"]').filter({ visible: true });
+  await page.keyboard.press("Control+1");
+  await expect(tabs.nth(0)).toHaveAttribute("aria-selected", "true");
+  await page.keyboard.press("Control+2");
+  await expect(tabs.nth(1)).toHaveAttribute("aria-selected", "true");
+}
+
+test("rebinding Jump to tab preserves the number group after reload", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace({ prefix: "tab-number-rebind-" });
+  await openTwoDraftTabs(page, workspace.workspaceId);
+  await rebindTabNumbers(page);
+  await clickSettingsBackToWorkspace(page);
+  await expectTabNumberNavigation(page);
+  await page.reload();
+  await expectTabNumberNavigation(page);
+  await openSettings(page);
+  await openSettingsSection(page, "shortcuts");
+  await expectTabNumberRange(page);
+});

From 8388f161865134f53d55b8e4c4c3cf5296d515de Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 07:04:35 +0200
Subject: [PATCH 198/270] Keep Add Project keyboard selection visible (#7081)

* fix(app): scroll the Add Project results to the keyboard-selected row

The results list had no scroll ref, so ArrowUp/ArrowDown moved the selection off-screen; the autocomplete reveal math is now shared through useRevealActiveItem.

* test(app): verify the directory selected beyond the results viewport

Check scrolling in both directions and across wrapping, then confirm Enter opens the selected directory. The previous regression used an aria-selected attribute that result buttons do not render.

Co-authored-by: superheher <heh@vivaldi.net>

* test(app): verify scroll reveal through browser behavior

Keep pure offset checks and cover keyboard navigation, wrapping, and replacing search results in the real Add Project flow.

* fix(app): measure retained Add Project rows when revealing selection

* fix(app): measure scroll content through a native View reference

---------

Co-authored-by: superheher <heh@vivaldi.net>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../app/e2e/browser/add-project-flow.spec.ts  | 114 ++++++++++++++++-
 .../e2e/support/helpers/add-project-flow.ts   |  23 ++++
 .../app/src/components/add-project-flow.tsx   | 119 +++++++++++-------
 .../components/ui/autocomplete-utils.test.ts  |  30 +----
 .../src/components/ui/autocomplete-utils.ts   |  25 ----
 .../app/src/components/ui/autocomplete.tsx    |   4 +-
 .../src/components/ui/scroll-reveal.test.ts   |  48 +++++++
 .../app/src/components/ui/scroll-reveal.ts    | 110 ++++++++++++++++
 8 files changed, 372 insertions(+), 101 deletions(-)
 create mode 100644 packages/app/src/components/ui/scroll-reveal.test.ts
 create mode 100644 packages/app/src/components/ui/scroll-reveal.ts

diff --git a/packages/app/e2e/browser/add-project-flow.spec.ts b/packages/app/e2e/browser/add-project-flow.spec.ts
index 9fd7f9413d..f66b963d5f 100644
--- a/packages/app/e2e/browser/add-project-flow.spec.ts
+++ b/packages/app/e2e/browser/add-project-flow.spec.ts
@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
-import { mkdtemp, rm, stat } from "node:fs/promises";
-import { tmpdir } from "node:os";
+import { mkdir, mkdtemp, rm, stat } from "node:fs/promises";
+import { homedir, tmpdir } from "node:os";
 import path from "node:path";
 import { test, expect } from "../support/fixtures";
 import {
@@ -12,12 +12,15 @@ import {
   chooseAddProjectMethod,
   expectAddProjectPage,
   expectNewWorkspaceForAddedProject,
+  expectAddProjectResultVisible,
+  navigateAddProjectResults,
   openAddProjectFlow,
   openAddProjectHostSelection,
 } from "../support/helpers/add-project-flow";
 import { gotoAppShell } from "../support/helpers/app";
 import {
   addConnectedHostAndReload,
+  addConnectedHostsAndReload,
   addOfflineHostAndReload,
   waitForConnectedHost,
 } from "../support/helpers/hosts";
@@ -214,6 +217,60 @@ test.describe("Add Project command-center flow", () => {
     });
   });
 
+  test("filtered hosts keep the keyboard-selected row visible", async ({ page }) => {
+    const hosts: IsolatedHostDaemon[] = [];
+    try {
+      for (let index = 1; index <= 3; index += 1) {
+        hosts.push(await startIsolatedHostDaemon(`scroll-host-${index}`));
+      }
+      await page.setViewportSize({ width: 1280, height: 360 });
+      await gotoAppShell(page);
+      await addConnectedHostsAndReload(
+        page,
+        hosts.map((host, index) => ({
+          serverId: host.serverId,
+          port: host.port,
+          label: index < 2 ? `Fleet 0${index + 1}` : "Other host",
+        })),
+        { primaryLabel: "Fleet 00" },
+      );
+      for (const host of hosts) {
+        await waitForConnectedHost(page, {
+          serverId: host.serverId,
+          endpoint: `localhost:${host.port}`,
+        });
+      }
+      await openAddProjectHostSelection(page);
+      await expect(
+        addProjectFlow(page).getByRole("button").filter({ hasText: "Other host" }),
+      ).toBeVisible();
+
+      await addProjectFlowInput(page).fill("Fleet");
+      await expect(addProjectFlowHost(page, hosts[2]!.serverId)).toHaveCount(0);
+      await navigateAddProjectResults(page, "ArrowDown", 2);
+      await expectAddProjectResultVisible(page, "Fleet 02");
+
+      // Filtering out the first host moves retained rows to new positions.
+      await addProjectFlowInput(page).fill("scroll-host");
+      await expect(addProjectFlowHost(page, getServerId())).toHaveCount(0);
+      await expectAddProjectResultVisible(page, "Fleet 01");
+      await navigateAddProjectResults(page, "ArrowDown", 2);
+      await expectAddProjectResultVisible(page, "Other host");
+      await navigateAddProjectResults(page, "ArrowDown", 1);
+      await expectAddProjectResultVisible(page, "Fleet 01");
+
+      await addProjectFlowInput(page).fill("Fleet");
+      await expectAddProjectResultVisible(page, "Fleet 00");
+      await navigateAddProjectResults(page, "ArrowDown", 2);
+      await expectAddProjectResultVisible(page, "Fleet 02");
+      await page.keyboard.press("Enter");
+      await expectAddProjectPage(page, "method");
+      await expect(addProjectFlow(page)).toContainText("Fleet 02");
+    } finally {
+      await Promise.all(hosts.map((host) => host.close()));
+    }
+  });
+
   test("keyboard directory search adds the selected Project", async ({
     page,
     projectPickerFixture,
@@ -241,6 +298,59 @@ test.describe("Add Project command-center flow", () => {
     await expectProjectHasNoWorkspaces(projectId);
   });
 
+  test("keyboard navigation keeps the selected row inside the visible results", async ({
+    page,
+  }) => {
+    const parentDirectory = await mkdtemp(path.join(homedir(), "paseo-e2e-scroll-"));
+    const rowPath = (index: number) =>
+      path.join(parentDirectory, `scroll-probe-${String(index).padStart(2, "0")}`);
+    let projectId: string | null = null;
+    try {
+      await Promise.all(Array.from({ length: 16 }, (_, index) => mkdir(rowPath(index))));
+      await gotoAppShell(page);
+      await openAddProjectFlow(page);
+      await chooseAddProjectMethod(page, "directory-search");
+      await addProjectFlowInput(page).fill(path.basename(parentDirectory));
+      const results = page.getByTestId("add-project-flow-results");
+      await expect(results.getByRole("button", { name: /scroll-probe-/ })).toHaveCount(16, {
+        timeout: 30_000,
+      });
+
+      await navigateAddProjectResults(page, "ArrowDown", 12);
+      await expectAddProjectResultVisible(page, rowPath(11));
+      await navigateAddProjectResults(page, "ArrowUp", 12);
+      await expectAddProjectResultVisible(page, parentDirectory);
+      await navigateAddProjectResults(page, "ArrowUp", 1);
+      await expectAddProjectResultVisible(page, rowPath(15));
+      await navigateAddProjectResults(page, "ArrowDown", 1);
+      await expectAddProjectResultVisible(page, parentDirectory);
+
+      await navigateAddProjectResults(page, "ArrowDown", 12);
+      await expectAddProjectResultVisible(page, rowPath(11));
+      await addProjectFlowInput(page).fill(`${path.basename(parentDirectory)}probe`);
+      await expect(results.getByRole("button")).toHaveCount(16);
+      await expectAddProjectResultVisible(page, rowPath(0));
+      await navigateAddProjectResults(page, "ArrowDown", 12);
+      await expectAddProjectResultVisible(page, rowPath(12));
+      await addProjectFlowInput(page).fill(path.basename(parentDirectory));
+      await expect(results.getByRole("button")).toHaveCount(17);
+      await expectAddProjectResultVisible(page, parentDirectory);
+      await navigateAddProjectResults(page, "ArrowDown", 12);
+      await expectAddProjectResultVisible(page, rowPath(11));
+      await page.keyboard.press("Enter");
+      projectId = await expectOpenedProject(page, "scroll-probe-11");
+      await expectNewWorkspaceForAddedProject(page, {
+        serverId: getServerId(),
+        projectId,
+        projectName: "scroll-probe-11",
+        projectPath: rowPath(11),
+      });
+    } finally {
+      if (projectId) await removeCreatedProject(rowPath(11), projectId);
+      await rm(parentDirectory, { recursive: true, force: true });
+    }
+  });
+
   test("a complete repository URL remains selectable without a GitHub search result", async ({
     page,
   }) => {
diff --git a/packages/app/e2e/support/helpers/add-project-flow.ts b/packages/app/e2e/support/helpers/add-project-flow.ts
index bb88264d37..666469540e 100644
--- a/packages/app/e2e/support/helpers/add-project-flow.ts
+++ b/packages/app/e2e/support/helpers/add-project-flow.ts
@@ -90,3 +90,26 @@ export async function expectNewWorkspaceForAddedProject(
     { timeout: 30_000 },
   );
 }
+
+export async function navigateAddProjectResults(
+  page: Page,
+  key: "ArrowDown" | "ArrowUp",
+  count: number,
+): Promise<void> {
+  for (let index = 0; index < count; index += 1) await page.keyboard.press(key);
+}
+
+export async function expectAddProjectResultVisible(page: Page, text: string): Promise<void> {
+  const results = page.getByTestId("add-project-flow-results");
+  const row = results.getByRole("button").filter({ has: page.getByText(text, { exact: true }) });
+  await expect
+    .poll(async () => {
+      const viewport = await results.boundingBox();
+      const bounds = await row.boundingBox();
+      if (!viewport || !bounds) return false;
+      return (
+        bounds.y >= viewport.y - 1 && bounds.y + bounds.height <= viewport.y + viewport.height + 1
+      );
+    })
+    .toBe(true);
+}
diff --git a/packages/app/src/components/add-project-flow.tsx b/packages/app/src/components/add-project-flow.tsx
index d874a73618..c331f237c5 100644
--- a/packages/app/src/components/add-project-flow.tsx
+++ b/packages/app/src/components/add-project-flow.tsx
@@ -19,6 +19,7 @@ import {
   useRef,
   useState,
   type ComponentType,
+  type RefObject,
 } from "react";
 import {
   Modal,
@@ -71,6 +72,7 @@ import {
   type ProjectPickerOption,
 } from "@/components/project-picker-options";
 import { Shortcut } from "@/components/ui/shortcut";
+import { useRevealActiveItem } from "@/components/ui/scroll-reveal";
 import { useKeyboardShortcutsAvailable } from "@/keyboard/availability";
 import { getIsElectronRuntime } from "@/constants/layout";
 import { isNative, isWeb } from "@/constants/platform";
@@ -252,7 +254,17 @@ function pathTestId(path: string): string {
   return `add-project-flow-path-${encodeURIComponent(path)}`;
 }
 
-function FlowRow({ option, active }: { option: FlowRowOption; active: boolean }) {
+function FlowRow({
+  option,
+  active,
+  activeItemRef,
+  onRowLayout,
+}: {
+  option: FlowRowOption;
+  active: boolean;
+  activeItemRef: RefObject<View | null>;
+  onRowLayout: () => void;
+}) {
   const accessibilityState = useMemo(
     () => ({ disabled: option.disabled === true, selected: active }),
     [active, option.disabled],
@@ -270,6 +282,8 @@ function FlowRow({ option, active }: { option: FlowRowOption; active: boolean })
       accessibilityRole="button"
       accessibilityState={accessibilityState}
       disabled={option.disabled}
+      ref={active ? activeItemRef : undefined}
+      onLayout={active ? onRowLayout : undefined}
       onPress={option.select}
       style={rowStyle}
       testID={option.testID}
@@ -384,6 +398,7 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
   );
   const setHasHydratedWorkspaces = useSessionStore((store) => store.setHasHydratedWorkspaces);
   const inputRef = useRef<EditingTextInputHandle>(null);
+  const resultsRef = useRef<ScrollView>(null);
   const submissionInFlightRef = useRef(false);
   const browseInFlightRef = useRef(false);
   const query = page.kind === "new-directory-name" || page.kind === "method" ? "" : page.query;
@@ -715,6 +730,13 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
   ]);
 
   const activeIndex = rows.length === 0 ? 0 : Math.min(page.activeIndex, rows.length - 1);
+  const rowListKey = useMemo(() => rows.map((row) => row.id).join("\u0000"), [rows]);
+  const { activeItemRef, contentRef, onItemLayout, onViewportLayout, onScroll } =
+    useRevealActiveItem({
+      activeIndex,
+      listKey: rowListKey,
+      scrollRef: resultsRef,
+    });
   const createDirectory = useCallback(async () => {
     if (page.kind !== "new-directory-name" || !client) return;
     const name = page.name.trim();
@@ -905,53 +927,64 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
             ) : null}
           </View>
           <ScrollView
+            ref={resultsRef}
             style={styles.results}
-            contentContainerStyle={styles.resultsContent}
             keyboardShouldPersistTaps="always"
+            onLayout={onViewportLayout}
+            onScroll={onScroll}
+            scrollEventThrottle={16}
             showsVerticalScrollIndicator={false}
             testID="add-project-flow-results"
           >
-            {preview ? (
-              <Text style={styles.preview} testID="add-project-flow-path-preview">
-                {shortenPath(preview)}
-              </Text>
-            ) : null}
-            {isSubmitting ? (
-              <Text style={styles.stateText} testID="add-project-flow-progress">
-                {progressText(page)}
-              </Text>
-            ) : null}
-            {!isSubmitting && page.error ? (
-              <Text style={styles.errorText} testID="add-project-flow-error">
-                {page.error}
-              </Text>
-            ) : null}
-            {!isSubmitting && queryError ? (
-              <Text style={styles.errorText} testID="add-project-flow-query-error">
-                {queryError}
-              </Text>
-            ) : null}
-            {!isSubmitting && loading ? (
-              <Text style={styles.stateText} testID="add-project-flow-loading">
-                Loading...
-              </Text>
-            ) : null}
-            {!isSubmitting &&
-            (!loading || page.kind === "github-search") &&
-            (!queryError || page.kind === "github-search")
-              ? rows.map((option, index) => (
-                  <FlowRow key={option.id} option={option} active={index === activeIndex} />
-                ))
-              : null}
-            {!isSubmitting &&
-            !loading &&
-            !queryError &&
-            rows.length === 0 &&
-            page.kind !== "new-directory-name" ? (
-              <Text style={styles.stateText} testID="add-project-flow-empty">
-                {emptyText(page, host ?? null)}
-              </Text>
-            ) : null}
+            <View ref={contentRef} collapsable={false} style={styles.resultsContent}>
+              {preview ? (
+                <Text style={styles.preview} testID="add-project-flow-path-preview">
+                  {shortenPath(preview)}
+                </Text>
+              ) : null}
+              {isSubmitting ? (
+                <Text style={styles.stateText} testID="add-project-flow-progress">
+                  {progressText(page)}
+                </Text>
+              ) : null}
+              {!isSubmitting && page.error ? (
+                <Text style={styles.errorText} testID="add-project-flow-error">
+                  {page.error}
+                </Text>
+              ) : null}
+              {!isSubmitting && queryError ? (
+                <Text style={styles.errorText} testID="add-project-flow-query-error">
+                  {queryError}
+                </Text>
+              ) : null}
+              {!isSubmitting && loading ? (
+                <Text style={styles.stateText} testID="add-project-flow-loading">
+                  Loading...
+                </Text>
+              ) : null}
+              {!isSubmitting &&
+              (!loading || page.kind === "github-search") &&
+              (!queryError || page.kind === "github-search")
+                ? rows.map((option, index) => (
+                    <FlowRow
+                      key={option.id}
+                      option={option}
+                      activeItemRef={activeItemRef}
+                      active={index === activeIndex}
+                      onRowLayout={onItemLayout}
+                    />
+                  ))
+                : null}
+              {!isSubmitting &&
+              !loading &&
+              !queryError &&
+              rows.length === 0 &&
+              page.kind !== "new-directory-name" ? (
+                <Text style={styles.stateText} testID="add-project-flow-empty">
+                  {emptyText(page, host ?? null)}
+                </Text>
+              ) : null}
+            </View>
           </ScrollView>
           <View style={styles.footer} testID="add-project-flow-footer">
             <FlowHint keys={NAVIGATION_HINT_KEYS} action="Navigate" />
diff --git a/packages/app/src/components/ui/autocomplete-utils.test.ts b/packages/app/src/components/ui/autocomplete-utils.test.ts
index dd67c23b57..ecf046a8aa 100644
--- a/packages/app/src/components/ui/autocomplete-utils.test.ts
+++ b/packages/app/src/components/ui/autocomplete-utils.test.ts
@@ -1,10 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import {
-  getAutocompleteFallbackIndex,
-  getAutocompleteScrollOffset,
-  orderAutocompleteOptions,
-} from "./autocomplete-utils";
+import { getAutocompleteFallbackIndex, orderAutocompleteOptions } from "./autocomplete-utils";
 
 const OPTIONS = ["alpha", "beta", "gamma"];
 
@@ -28,27 +24,3 @@ describe("getAutocompleteFallbackIndex", () => {
     expect(getAutocompleteFallbackIndex(3, "below-input")).toBe(0);
   });
 });
-
-describe("getAutocompleteScrollOffset", () => {
-  it("scrolls up when the active item is above the viewport", () => {
-    expect(
-      getAutocompleteScrollOffset({
-        currentOffset: 120,
-        viewportHeight: 80,
-        itemTop: 90,
-        itemHeight: 20,
-      }),
-    ).toBe(90);
-  });
-
-  it("scrolls down when the active item is below the viewport", () => {
-    expect(
-      getAutocompleteScrollOffset({
-        currentOffset: 0,
-        viewportHeight: 100,
-        itemTop: 150,
-        itemHeight: 24,
-      }),
-    ).toBe(74);
-  });
-});
diff --git a/packages/app/src/components/ui/autocomplete-utils.ts b/packages/app/src/components/ui/autocomplete-utils.ts
index f8250856df..175cf6b62d 100644
--- a/packages/app/src/components/ui/autocomplete-utils.ts
+++ b/packages/app/src/components/ui/autocomplete-utils.ts
@@ -29,28 +29,3 @@ export function getAutocompleteNextIndex(args: {
 }): number {
   return getNextActiveIndex(args);
 }
-
-export function getAutocompleteScrollOffset(args: {
-  currentOffset: number;
-  viewportHeight: number;
-  itemTop: number;
-  itemHeight: number;
-}): number {
-  if (args.viewportHeight <= 0) {
-    return args.currentOffset;
-  }
-
-  const itemBottom = args.itemTop + args.itemHeight;
-  const viewportTop = args.currentOffset;
-  const viewportBottom = args.currentOffset + args.viewportHeight;
-
-  if (args.itemTop < viewportTop) {
-    return Math.max(0, args.itemTop);
-  }
-
-  if (itemBottom > viewportBottom) {
-    return Math.max(0, itemBottom - args.viewportHeight);
-  }
-
-  return args.currentOffset;
-}
diff --git a/packages/app/src/components/ui/autocomplete.tsx b/packages/app/src/components/ui/autocomplete.tsx
index cc684f8b41..7b5b99b316 100644
--- a/packages/app/src/components/ui/autocomplete.tsx
+++ b/packages/app/src/components/ui/autocomplete.tsx
@@ -13,7 +13,7 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 import { File, Folder } from "lucide-react-native";
 import type { Theme } from "@/styles/theme";
-import { getAutocompleteScrollOffset } from "./autocomplete-utils";
+import { getScrollOffsetToRevealItem } from "./scroll-reveal";
 
 export interface AutocompleteOption {
   id: string;
@@ -146,7 +146,7 @@ export function Autocomplete({
       return;
     }
 
-    const nextOffset = getAutocompleteScrollOffset({
+    const nextOffset = getScrollOffsetToRevealItem({
       currentOffset: scrollOffsetRef.current,
       viewportHeight: viewportHeightRef.current,
       itemTop: layout.top,
diff --git a/packages/app/src/components/ui/scroll-reveal.test.ts b/packages/app/src/components/ui/scroll-reveal.test.ts
new file mode 100644
index 0000000000..b793b2f46b
--- /dev/null
+++ b/packages/app/src/components/ui/scroll-reveal.test.ts
@@ -0,0 +1,48 @@
+import { describe, expect, it } from "vitest";
+import { getScrollOffsetToRevealItem } from "./scroll-reveal";
+
+describe("getScrollOffsetToRevealItem", () => {
+  it("keeps the offset when the item is already inside the viewport", () => {
+    expect(
+      getScrollOffsetToRevealItem({
+        currentOffset: 40,
+        viewportHeight: 200,
+        itemTop: 100,
+        itemHeight: 40,
+      }),
+    ).toBe(40);
+  });
+
+  it("scrolls up to the item top when the item is above the viewport", () => {
+    expect(
+      getScrollOffsetToRevealItem({
+        currentOffset: 300,
+        viewportHeight: 200,
+        itemTop: 240,
+        itemHeight: 40,
+      }),
+    ).toBe(240);
+  });
+
+  it("scrolls down just far enough to reveal the item bottom", () => {
+    expect(
+      getScrollOffsetToRevealItem({
+        currentOffset: 0,
+        viewportHeight: 200,
+        itemTop: 380,
+        itemHeight: 40,
+      }),
+    ).toBe(220);
+  });
+
+  it("stays put before the viewport has been measured", () => {
+    expect(
+      getScrollOffsetToRevealItem({
+        currentOffset: 120,
+        viewportHeight: 0,
+        itemTop: 400,
+        itemHeight: 40,
+      }),
+    ).toBe(120);
+  });
+});
diff --git a/packages/app/src/components/ui/scroll-reveal.ts b/packages/app/src/components/ui/scroll-reveal.ts
new file mode 100644
index 0000000000..50194c3ac8
--- /dev/null
+++ b/packages/app/src/components/ui/scroll-reveal.ts
@@ -0,0 +1,110 @@
+import { useCallback, useLayoutEffect, useRef, type RefObject } from "react";
+import type {
+  LayoutChangeEvent,
+  NativeScrollEvent,
+  NativeSyntheticEvent,
+  ScrollView,
+  View,
+} from "react-native";
+
+export function getScrollOffsetToRevealItem(args: {
+  currentOffset: number;
+  viewportHeight: number;
+  itemTop: number;
+  itemHeight: number;
+}): number {
+  if (args.viewportHeight <= 0) {
+    return args.currentOffset;
+  }
+
+  const itemBottom = args.itemTop + args.itemHeight;
+  const viewportTop = args.currentOffset;
+  const viewportBottom = args.currentOffset + args.viewportHeight;
+
+  if (args.itemTop < viewportTop) {
+    return Math.max(0, args.itemTop);
+  }
+
+  if (itemBottom > viewportBottom) {
+    return Math.max(0, itemBottom - args.viewportHeight);
+  }
+
+  return args.currentOffset;
+}
+
+export interface RevealActiveItemHandlers {
+  activeItemRef: RefObject<View | null>;
+  contentRef: RefObject<View | null>;
+  onItemLayout: () => void;
+  onViewportLayout: (event: LayoutChangeEvent) => void;
+  onScroll: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
+}
+
+/**
+ * Reveals the keyboard-selected row using its current position in the scroll
+ * content. Measuring on selection/list changes also covers retained rows that
+ * move or keep their size without emitting another onLayout event on web.
+ * A list replacement resets to the top only when selection restarts there.
+ * Bottom-anchored lists share only getScrollOffsetToRevealItem.
+ */
+export function useRevealActiveItem(options: {
+  activeIndex: number;
+  listKey: string;
+  scrollRef: RefObject<ScrollView | null>;
+}): RevealActiveItemHandlers {
+  const { activeIndex, listKey, scrollRef } = options;
+  const activeItemRef = useRef<View | null>(null);
+  const contentRef = useRef<View | null>(null);
+  const viewportHeightRef = useRef(0);
+  const offsetRef = useRef(0);
+  const measurementRef = useRef(0);
+
+  const reveal = useCallback(() => {
+    const request = ++measurementRef.current;
+    const item = activeItemRef.current;
+    const scroll = scrollRef.current;
+    const content = contentRef.current;
+    if (!item || !scroll || !content) return;
+
+    item.measureLayout(content, (_left, top, _width, height) => {
+      if (request !== measurementRef.current || activeItemRef.current !== item) return;
+      const nextOffset = getScrollOffsetToRevealItem({
+        currentOffset: offsetRef.current,
+        viewportHeight: viewportHeightRef.current,
+        itemTop: top,
+        itemHeight: height,
+      });
+      if (Math.abs(nextOffset - offsetRef.current) < 1) return;
+      offsetRef.current = nextOffset;
+      scroll.scrollTo({ y: nextOffset, animated: false });
+    });
+  }, [scrollRef]);
+
+  const prevListKeyRef = useRef(listKey);
+  useLayoutEffect(() => {
+    if (prevListKeyRef.current !== listKey && activeIndex === 0) {
+      offsetRef.current = 0;
+      scrollRef.current?.scrollTo({ y: 0, animated: false });
+    }
+    prevListKeyRef.current = listKey;
+    reveal();
+    return () => {
+      // Measurements are asynchronous; a previous selection must not scroll us.
+      measurementRef.current += 1;
+    };
+  }, [activeIndex, listKey, reveal, scrollRef]);
+
+  const onViewportLayout = useCallback(
+    (event: LayoutChangeEvent) => {
+      viewportHeightRef.current = event.nativeEvent.layout.height;
+      reveal();
+    },
+    [reveal],
+  );
+
+  const onScroll = useCallback((event: NativeSyntheticEvent<NativeScrollEvent>) => {
+    offsetRef.current = event.nativeEvent.contentOffset.y;
+  }, []);
+
+  return { activeItemRef, contentRef, onItemLayout: reveal, onViewportLayout, onScroll };
+}

From 4117dce2d312e4e8efc1911c05b76731391bb406 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 08:19:21 +0200
Subject: [PATCH 199/270] Fix local WAV transcription startup (#7103)

* fix(speech): complete local transcription providers

* test(speech): document lazy worker assumption

Co-authored-by: LauraGPT <18321252+LauraGPT@users.noreply.github.com>

---------

Co-authored-by: LauraGPT <lauragpt@users.noreply.github.com>
Co-authored-by: LauraGPT <18321252+LauraGPT@users.noreply.github.com>
---
 .../scripts/transcribe-local-wav.test.ts      | 40 +++++++++++++++++++
 .../server/scripts/transcribe-local-wav.ts    |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 packages/server/scripts/transcribe-local-wav.test.ts

diff --git a/packages/server/scripts/transcribe-local-wav.test.ts b/packages/server/scripts/transcribe-local-wav.test.ts
new file mode 100644
index 0000000000..703025e2c5
--- /dev/null
+++ b/packages/server/scripts/transcribe-local-wav.test.ts
@@ -0,0 +1,40 @@
+import { spawnSync } from "node:child_process";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { afterEach, describe, expect, test } from "vitest";
+
+const tempDirs: string[] = [];
+
+afterEach(() => {
+  for (const dir of tempDirs.splice(0)) {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+describe("transcribe-local-wav CLI", () => {
+  test("initializes the complete speech provider configuration", () => {
+    const modelsDir = mkdtempSync(path.join(tmpdir(), "paseo-transcribe-local-"));
+    tempDirs.push(modelsDir);
+    const missingWav = path.join(modelsDir, "missing.wav");
+    const scriptPath = fileURLToPath(new URL("./transcribe-local-wav.ts", import.meta.url));
+
+    const result = spawnSync(
+      process.execPath,
+      ["--import", "tsx", scriptPath, missingWav, "--models-dir", modelsDir],
+      {
+        encoding: "utf8",
+        timeout: 15_000,
+      },
+    );
+
+    expect(result.error).toBeUndefined();
+    expect(result.status).not.toBe(0);
+    // The worker client is lazy, so reaching the missing WAV proves provider initialization completed first.
+    expect(result.stderr).toContain("ENOENT");
+    expect(result.stderr).toContain(missingWav);
+    expect(result.stderr).not.toContain("Cannot read properties of undefined");
+  });
+});
diff --git a/packages/server/scripts/transcribe-local-wav.ts b/packages/server/scripts/transcribe-local-wav.ts
index 0b323df029..a9cb10b7a2 100644
--- a/packages/server/scripts/transcribe-local-wav.ts
+++ b/packages/server/scripts/transcribe-local-wav.ts
@@ -120,6 +120,7 @@ async function main(): Promise<void> {
 
   const providers: RequestedSpeechProviders = {
     dictationStt: { provider: "local", explicit: true },
+    voiceTurnDetection: { provider: "local", explicit: false, enabled: false },
     voiceStt: { provider: "local", explicit: true },
     // Not used here, but required by the shared runtime config shape.
     voiceTts: { provider: "openai", explicit: false },

From 5acfbb3777d7fbac634f4ed83aefed56fb49cb8f Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 09:14:10 +0200
Subject: [PATCH 200/270] Let Escape close plugin previews before stopping
 agents (#7110)

* fix(app): let Escape close an open popover before it interrupts the agent

The agent.interrupt shortcut listens on the window in the capture phase, so
it sees Escape before anything else. Registered overlays get first refusal
through dispatchTopWebOverlayKeyDown, but plugins cannot register, and draw
their floating panels with the Popover API instead. With such a panel open
and the composer focused while an agent runs, Escape closed the panel and
interrupted the agent in the same press.

While a popover is open, Escape is left to it and no app shortcut runs. A
second Escape, with nothing open, interrupts as before.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: RoundRedDot <roundreddot@gmail.com>

* test(app): cover Escape with a popover open through the shortcut path

The first test only checked hasOpenDomPopover and would still pass with the
guard removed from useKeyboardShortcuts. The check is now keyBelongsToDomPopover,
called by the hook, and a browser test drives it the way the app does: a
window capture listener for shortcuts, a popover closed by its own document
Escape listener, focus in a textarea. The first Escape closes the popover
with no interrupt; the second interrupts. Both new tests fail with the guard
removed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: RoundRedDot <roundreddot@gmail.com>

* test(app): exercise plugin Escape through the real composer

Keep the contributor fix and replace the substitute shortcut-listener test with an installed-plugin browser regression. The first Escape must close the preview without cancelling the turn; the second must cancel it.

Co-authored-by: luke <luopeihuan@gmail.com>
Co-authored-by: RoundRedDot <roundreddot@gmail.com>

* test(app): check dismissed model pickers leave the viewport

---------

Co-authored-by: luke <luopeihuan@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: RoundRedDot <roundreddot@gmail.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../e2e/browser/bottom-sheet-reopen.spec.ts   |  8 ++--
 .../app/e2e/browser/plugin-popover.spec.ts    | 47 +++++++++++++++++++
 .../e2e/support/helpers/plugin-timeline.ts    | 43 +++++++++++++++++
 .../app/src/hooks/use-keyboard-shortcuts.ts   |  6 ++-
 .../app/src/lib/overlay-root.browser.test.tsx | 38 ++++++++++++++-
 packages/app/src/lib/overlay-root.ts          | 25 ++++++++++
 6 files changed, 162 insertions(+), 5 deletions(-)
 create mode 100644 packages/app/e2e/browser/plugin-popover.spec.ts

diff --git a/packages/app/e2e/browser/bottom-sheet-reopen.spec.ts b/packages/app/e2e/browser/bottom-sheet-reopen.spec.ts
index 89ee10af22..bc65ae65de 100644
--- a/packages/app/e2e/browser/bottom-sheet-reopen.spec.ts
+++ b/packages/app/e2e/browser/bottom-sheet-reopen.spec.ts
@@ -89,9 +89,11 @@ async function dismissStackedModelPickerWithBackdrop(page: Page) {
     .getByTestId("agent-controls-settings-list")
     .getByRole("button", { name: /Select model/ })
     .click();
-  await expect(page.getByTestId("agent-controls-model-browser-sheet")).toBeVisible();
+  await expect(page.getByTestId("agent-controls-model-browser-sheet")).toBeInViewport();
   await page.mouse.click(MOBILE_VIEWPORT.width / 2, 24);
-  await expect(page.getByTestId("agent-controls-model-browser-sheet")).not.toBeVisible();
+  // In CI, Gorhom retains the dismissed sheet below the viewport.
+  // Dismissal is complete when it leaves the displayed surface.
+  await expect(page.getByTestId("agent-controls-model-browser-sheet")).not.toBeInViewport();
   await expect(page.getByTestId("agent-controls-model-sheet")).toBeVisible();
   await expect(page.getByTestId("agent-controls-settings-list")).toBeVisible();
 }
@@ -139,7 +141,7 @@ test.describe("mobile bottom sheet reopen", () => {
         await expect(sheet).toBeVisible();
         await expect(page.getByTestId("agent-controls-settings-list")).toBeVisible();
         await expect(page.getByTestId("agent-controls-model")).toContainText("Ten second stream");
-        await expect(page.getByTestId("agent-controls-model-browser-sheet")).not.toBeVisible();
+        await expect(page.getByTestId("agent-controls-model-browser-sheet")).not.toBeInViewport();
       });
     } finally {
       await session.cleanup();
diff --git a/packages/app/e2e/browser/plugin-popover.spec.ts b/packages/app/e2e/browser/plugin-popover.spec.ts
new file mode 100644
index 0000000000..8ce3b35513
--- /dev/null
+++ b/packages/app/e2e/browser/plugin-popover.spec.ts
@@ -0,0 +1,47 @@
+import { expect, test, type Page } from "../support/fixtures";
+import { composerLocator, submitMessageWithButton } from "../support/helpers/composer";
+import { seedMockAgentWorkspace, openAgentRoute } from "../support/helpers/mock-agent";
+import { withPopoverTimelinePlugin } from "../support/helpers/plugin-timeline";
+
+async function openPreviewWhileTyping(page: Page): Promise<void> {
+  await composerLocator(page).focus();
+  await page.getByRole("button", { name: "Hover plugin preview", exact: true }).hover();
+  await expect(page.getByRole("dialog", { name: "Plugin preview" })).toBeVisible();
+  await expect(composerLocator(page)).toBeFocused();
+}
+
+async function dismissPreview(page: Page): Promise<void> {
+  await page.keyboard.press("Escape");
+  await expect(page.getByRole("dialog", { name: "Plugin preview" })).not.toBeVisible();
+}
+
+test("Escape dismisses a plugin preview before interrupting the agent", async ({ page }) => {
+  test.setTimeout(120_000);
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "plugin-popover-",
+    title: "Plugin preview keyboard regression",
+    model: "e2e-fast-stream",
+  });
+  try {
+    await withPopoverTimelinePlugin(async () => {
+      await openAgentRoute(page, agent);
+      await submitMessageWithButton(page, "Show the plugin preview.");
+      await agent.client.waitForFinish(agent.agentId, 30_000);
+      await expect(page.getByRole("button", { name: "Hover plugin preview" })).toBeVisible();
+      await submitMessageWithButton(page, "withhold synthetic user message until interrupted");
+      const stop = page.getByRole("button", { name: "Stop agent", exact: true });
+      await expect(stop).toBeVisible();
+
+      await openPreviewWhileTyping(page);
+      await dismissPreview(page);
+      await expect(stop).toBeVisible();
+      await expect(composerLocator(page)).toBeFocused();
+
+      await page.keyboard.press("Escape");
+      await expect(stop).not.toBeVisible();
+      await agent.client.waitForFinish(agent.agentId, 15_000);
+    });
+  } finally {
+    await agent.cleanup();
+  }
+});
diff --git a/packages/app/e2e/support/helpers/plugin-timeline.ts b/packages/app/e2e/support/helpers/plugin-timeline.ts
index 8ad7e0a632..8b0f680e2d 100644
--- a/packages/app/e2e/support/helpers/plugin-timeline.ts
+++ b/packages/app/e2e/support/helpers/plugin-timeline.ts
@@ -231,3 +231,46 @@ export async function attachPromptTimelineEvidence(page: Page, info: TestInfo):
     contentType: "image/png",
   });
 }
+
+const POPOVER_CLIENT_SOURCE = `import React, { useEffect, useRef } from "react";
+import { z } from "zod";
+
+function Preview() {
+  const panel = useRef(null);
+  useEffect(() => {
+    const close = (event) => {
+      if (event.key === "Escape" && panel.current.matches(":popover-open")) {
+        panel.current.hidePopover();
+      }
+    };
+    document.addEventListener("keydown", close, true);
+    return () => document.removeEventListener("keydown", close, true);
+  }, []);
+  return <div>
+    <button onMouseEnter={() => panel.current.showPopover()}>Hover plugin preview</button>
+    <div ref={panel} popover="manual" role="dialog" aria-label="Plugin preview">Plugin hover preview</div>
+  </div>;
+}
+
+export default function contribute(client) {
+  client.addTimelineTransformer({
+    id: "preview", query: { itemType: "user_message" },
+    transform({ item }) {
+      if (item.text !== "Show the plugin preview.") return;
+      return { items: [{ type: "plugin", kind: "preview", version: 1, data: {} }] };
+    },
+  });
+  client.addTimelineRenderer({
+    kind: "preview", version: 1, schema: z.object({}), Component: Preview,
+  });
+  return () => {};
+}`;
+
+/** Installs a timeline preview that owns Escape through the DOM Popover API. */
+export async function withPopoverTimelinePlugin(run: () => Promise<void>): Promise<void> {
+  await withDirectoryPlugin({
+    pluginId: "timeline-popover-e2e",
+    source: POPOVER_CLIENT_SOURCE,
+    run,
+  });
+}
diff --git a/packages/app/src/hooks/use-keyboard-shortcuts.ts b/packages/app/src/hooks/use-keyboard-shortcuts.ts
index d723b5be04..6f332b0a98 100644
--- a/packages/app/src/hooks/use-keyboard-shortcuts.ts
+++ b/packages/app/src/hooks/use-keyboard-shortcuts.ts
@@ -40,7 +40,7 @@ import {
   navigateToLastWorkspace,
   useActiveWorkspaceSelection,
 } from "@/stores/navigation-active-workspace-store";
-import { dispatchTopWebOverlayKeyDown } from "@/lib/overlay-root";
+import { dispatchTopWebOverlayKeyDown, keyBelongsToDomPopover } from "@/lib/overlay-root";
 
 export function useKeyboardShortcuts({
   enabled,
@@ -321,6 +321,10 @@ export function useKeyboardShortcuts({
       return;
     }
 
+    if (keyBelongsToDomPopover(event)) {
+      return;
+    }
+
     // During IME composition, Enter confirms the candidate selection and must
     // not route through global shortcuts like message send.
     if (isImeComposingKeyboardEvent(event)) {
diff --git a/packages/app/src/lib/overlay-root.browser.test.tsx b/packages/app/src/lib/overlay-root.browser.test.tsx
index a21403dd8d..bd20d2aeeb 100644
--- a/packages/app/src/lib/overlay-root.browser.test.tsx
+++ b/packages/app/src/lib/overlay-root.browser.test.tsx
@@ -2,7 +2,11 @@ import React, { type RefCallback } from "react";
 import { flushSync } from "react-dom";
 import { createRoot, type Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
-import { useWebOverlayRegistration } from "./overlay-root";
+import {
+  hasOpenDomPopover,
+  keyBelongsToDomPopover,
+  useWebOverlayRegistration,
+} from "./overlay-root";
 
 function nextFrame(): Promise<void> {
   return new Promise((resolve) => requestAnimationFrame(() => resolve()));
@@ -68,3 +72,35 @@ describe("useWebOverlayRegistration in the browser", () => {
     expect(openerFocusCalls).toBe(1);
   });
 });
+
+describe("hasOpenDomPopover", () => {
+  afterEach(() => {
+    document.body.replaceChildren();
+  });
+
+  it("is true only while a popover is shown", () => {
+    const panel = document.createElement("div");
+    panel.setAttribute("popover", "manual");
+    document.body.append(panel);
+    expect(hasOpenDomPopover()).toBe(false);
+    panel.showPopover();
+    expect(hasOpenDomPopover()).toBe(true);
+    panel.hidePopover();
+    expect(hasOpenDomPopover()).toBe(false);
+  });
+});
+
+describe("Escape with a plugin popover open", () => {
+  afterEach(() => {
+    document.body.replaceChildren();
+  });
+
+  it("leaves other keys to the shortcuts while a popover is open", () => {
+    const panel = document.createElement("div");
+    panel.setAttribute("popover", "manual");
+    document.body.append(panel);
+    panel.showPopover();
+    expect(keyBelongsToDomPopover({ key: "Enter" })).toBe(false);
+    expect(keyBelongsToDomPopover({ key: "Escape" })).toBe(true);
+  });
+});
diff --git a/packages/app/src/lib/overlay-root.ts b/packages/app/src/lib/overlay-root.ts
index 9ffd81725f..d1ab0b9787 100644
--- a/packages/app/src/lib/overlay-root.ts
+++ b/packages/app/src/lib/overlay-root.ts
@@ -112,6 +112,31 @@ export function hasActiveWebOverlay(): boolean {
   return getTopWebOverlay() !== undefined;
 }
 
+/**
+ * True while an element shown with the Popover API is open. Such a layer
+ * floats above the app like a registered overlay but lives outside the
+ * registry: plugins draw their panels this way, since they cannot register.
+ */
+export function hasOpenDomPopover(): boolean {
+  if (typeof document === "undefined") return false;
+  try {
+    return document.querySelector(":popover-open") !== null;
+  } catch {
+    // An engine without the Popover API rejects the selector, and has none open.
+    return false;
+  }
+}
+
+/**
+ * Whether a key belongs to an open popover rather than to the app's shortcuts.
+ * An open popover (a plugin's panel) is the top layer and closes on its own
+ * Escape listener, which runs after the shortcut engine's capture listener:
+ * Escape must not also interrupt the running agent.
+ */
+export function keyBelongsToDomPopover(event: Pick<KeyboardEvent, "key">): boolean {
+  return event.key === "Escape" && hasOpenDomPopover();
+}
+
 function getFocusableElements(scope: HTMLElement): HTMLElement[] {
   const selector = [
     "a[href]",

From 48b310c8a281889ca542be52d034b5f91060bb6f Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 12:21:58 +0200
Subject: [PATCH 201/270] Keep Android chat still when selecting text (#7131)

Android's scroll guard now reads the view's transform matrix, so React Native's inverted chat list (scale: -1, decomposed into a 180-degree rotation with positive scaleY) no longer scrolls on text focus or selection.

Closes #7125

Co-authored-by: luke <luopeihuan@gmail.com>
Co-authored-by: RoundRedDot <roundreddot@gmail.com>
---
 docs/android.md                               |  4 ++-
 .../sh/paseo/scroll/ScrollSelectionTest.kt    | 28 +++++++++++++++++--
 .../sh/paseo/scroll/PaseoScrollPackage.kt     | 11 ++++++--
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/docs/android.md b/docs/android.md
index f04ce945bb..75908a8ae2 100644
--- a/docs/android.md
+++ b/docs/android.md
@@ -124,7 +124,9 @@ This is the Android counterpart of the iOS local-simulator flow in [development.
 
 Android focus and selection visibility requests must not reposition inverted timelines. The
 `modules/paseo-scroll` package keeps React Native's scroll manager interface and returns zero for
-child-reveal scroll calculations when the vertical scale is inverted. Dragging and explicit scroll
+child-reveal scroll calculations when the view's transform matrix inverts the vertical axis. React
+Native's Android list uses `scale: -1`, which decomposes into a 180-degree rotation with positive
+`scaleY`; checking the scale property alone misses it. Dragging and explicit scroll
 commands still work; non-inverted scroll views keep Android's default behavior.
 
 Register this package before React Native's core package through its Expo config plugin. Normal
diff --git a/packages/app/modules/paseo-scroll/android/src/androidTest/java/sh/paseo/scroll/ScrollSelectionTest.kt b/packages/app/modules/paseo-scroll/android/src/androidTest/java/sh/paseo/scroll/ScrollSelectionTest.kt
index 7d6fcee8ed..c7007776ba 100644
--- a/packages/app/modules/paseo-scroll/android/src/androidTest/java/sh/paseo/scroll/ScrollSelectionTest.kt
+++ b/packages/app/modules/paseo-scroll/android/src/androidTest/java/sh/paseo/scroll/ScrollSelectionTest.kt
@@ -9,7 +9,11 @@ import android.widget.TextView
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.facebook.react.bridge.BridgeReactContext
+import com.facebook.react.bridge.JavaOnlyArray
+import com.facebook.react.bridge.JavaOnlyMap
 import com.facebook.react.soloader.OpenSourceMergedSoMapping
+import com.facebook.react.uimanager.DisplayMetricsHolder
+import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.scroll.ReactScrollView
 import com.facebook.react.views.scroll.ReactScrollViewManager
@@ -47,16 +51,29 @@ class ScrollSelectionTest {
     assertNotEquals(before, scroll.scrollY)
   }
 
-  private fun withScroll(inverted: Boolean, check: (ReactScrollView, TextView) -> Unit) {
+  @Test fun verticalScaleStillKeepsFocusAndSelectionInPlace() = withScroll(inverted = true, transform = "scaleY") { scroll, text ->
+    val before = scroll.scrollY
+    assertTrue(text.requestFocus())
+    text.requestRectangleOnScreen(Rect(0, 0, 80, 40), true)
+    assertEquals(before, scroll.scrollY)
+  }
+
+  @Test fun horizontalScaleStillRevealsSelectedText() = withScroll(inverted = true, transform = "scaleX") { scroll, text ->
+    val before = scroll.scrollY
+    text.requestRectangleOnScreen(Rect(0, 0, 80, 40), true)
+    assertNotEquals(before, scroll.scrollY)
+  }
+
+  private fun withScroll(inverted: Boolean, transform: String = "scale", check: (ReactScrollView, TextView) -> Unit) {
     val instrumentation = InstrumentationRegistry.getInstrumentation()
     instrumentation.runOnMainSync {
       val appContext = instrumentation.targetContext
+      DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(appContext)
       SoLoader.init(appContext, OpenSourceMergedSoMapping)
       val reactContext = BridgeReactContext(appContext)
       val context = ThemedReactContext(reactContext, appContext)
       val manager = PaseoScrollPackage().createViewManager(reactContext, ReactScrollViewManager.REACT_CLASS) as ReactScrollViewManager
       val scroll = manager.createViewInstance(context)
-      scroll.scaleY = if (inverted) -1f else 1f
       val content = FrameLayout(context)
       val text = TextView(context).apply {
         setText("Selectable timeline text", TextView.BufferType.SPANNABLE)
@@ -68,6 +85,13 @@ class ScrollSelectionTest {
       content.layout(0, 0, 300, 2000)
       scroll.measure(exact(300), exact(300))
       scroll.layout(0, 0, 300, 300)
+      // Apply RN's actual Android inversion through the manager's transform decomposition.
+      val transforms = JavaOnlyArray.of(JavaOnlyMap.of(transform, if (inverted) -1.0 else 1.0))
+      manager.updateProperties(scroll, ReactStylesDiffMap(JavaOnlyMap.of("transform", transforms)))
+      if (inverted && transform == "scale") {
+        assertEquals(1f, scroll.scaleY, 0f)
+        assertEquals(180f, kotlin.math.abs(scroll.rotation), 0f)
+      }
       scroll.scrollTo(0, 400)
       check(scroll, text)
     }
diff --git a/packages/app/modules/paseo-scroll/android/src/main/java/sh/paseo/scroll/PaseoScrollPackage.kt b/packages/app/modules/paseo-scroll/android/src/main/java/sh/paseo/scroll/PaseoScrollPackage.kt
index c3a2a4373d..71ff179cb1 100644
--- a/packages/app/modules/paseo-scroll/android/src/main/java/sh/paseo/scroll/PaseoScrollPackage.kt
+++ b/packages/app/modules/paseo-scroll/android/src/main/java/sh/paseo/scroll/PaseoScrollPackage.kt
@@ -1,5 +1,6 @@
 package sh.paseo.scroll
 
+import android.graphics.Matrix
 import android.graphics.Rect
 import com.facebook.react.ReactPackage
 import com.facebook.react.ViewManagerOnDemandReactPackage
@@ -27,9 +28,15 @@ private class PaseoScrollViewManager : ReactScrollViewManager() {
 }
 
 private class PaseoScrollView(context: ThemedReactContext) : ReactScrollView(context) {
+  private val transformValues = FloatArray(9)
+
   // Both RN focus handling and Android selection visibility requests use this calculation.
   // Its coordinates ignore inversion. Keep focus/selection bookkeeping, but leave timeline
   // movement to user gestures and explicit scroll commands.
-  override fun computeScrollDeltaToGetChildRectOnScreen(rect: Rect): Int =
-    if (scaleY < 0) 0 else super.computeScrollDeltaToGetChildRectOnScreen(rect)
+  override fun computeScrollDeltaToGetChildRectOnScreen(rect: Rect): Int {
+    // RN's Android scale: -1 becomes a 180-degree rotation with positive scaleY.
+    matrix.getValues(transformValues)
+    if (transformValues[Matrix.MSCALE_Y] < 0) return 0
+    return super.computeScrollDeltaToGetChildRectOnScreen(rect)
+  }
 }

From 62ab2deb27bf258262edbb7d260724b1a738eec2 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 17:26:44 +0700
Subject: [PATCH 202/270] Run and watch workspace scripts from the phone header
 menu (#7122)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(app): run and watch workspace scripts from the compact header menu

The compact header redesign dropped the mobile scripts button, so phones had
no way to run, stop, or restart workspace scripts. Scripts are now a page of
the ⋯ sheet: the root row shows what is running, tinted by health, and the ⋯
carries a dot while a running service is unhealthy. Desktop keeps its popover;
both surfaces share one set of script actions and one status model.

Script status also froze on native whenever the sidebar was closed and no
agent tab was viewed. DirectorySynchronizer releases its subscriptions,
including script_status_update, when nothing demands the directory, and the
workspace screen never demanded the workspace it shows. Web hid this because
the favicon sync holds demand for the whole session. The focused workspace now
holds directory demand, which also lets Restart's second half (start once the
daemon reports the script stopped) complete.

* perf(app): keep workspace script status live without syncing the directory

The focused workspace held full directory demand so the scripts menu saw
script_status_update on phones with the sidebar closed and no agent tab.
That fetched the host's agent and workspace lists on every focus and
streamed every agent and workspace update for the whole host.

Script status now has its own event subscription, which a workspace
screen can hold alone. It fetches the workspace's scripts once when the
subscription lands, because the subscription only carries changes.
Directory demand also holds it, so the sidebar and agent tabs see the
same updates as before.
---
 .../browser/compact-workspace-header.spec.ts  |  96 ++++
 ...compact-workspace-scripts-preconditions.md |  15 +
 ...ative-compact-workspace-scripts.android.ad |  45 ++
 .../helpers/compact-workspace-scripts.ts      |  61 +++
 packages/app/src/i18n/resources/ar.ts         |   3 +
 packages/app/src/i18n/resources/en.ts         |   3 +
 packages/app/src/i18n/resources/es.ts         |   3 +
 packages/app/src/i18n/resources/fr.ts         |   4 +
 packages/app/src/i18n/resources/ja.ts         |   3 +
 packages/app/src/i18n/resources/ko.ts         |   3 +
 packages/app/src/i18n/resources/pt-BR.ts      |   3 +
 packages/app/src/i18n/resources/ru.ts         |   3 +
 packages/app/src/i18n/resources/zh-CN.ts      |   3 +
 .../src/runtime/directory-sync/index.test.ts  |  55 +++
 .../app/src/runtime/directory-sync/index.ts   |  68 ++-
 packages/app/src/runtime/host-runtime.ts      |   8 +
 .../src/screens/workspace/scripts/index.ts    |  10 +
 .../workspace/scripts/script-marks.tsx        |  78 ++++
 .../workspace/scripts/script-status.test.ts   |  89 ++++
 .../workspace/scripts/script-status.ts        |  63 +++
 .../scripts/use-workspace-script-actions.ts   | 191 ++++++++
 .../workspace-scripts-button.test.tsx         |  15 +-
 .../workspace-scripts-button.tsx              | 333 ++------------
 .../scripts/workspace-scripts-menu-pages.tsx  | 416 ++++++++++++++++++
 .../workspace/workspace-header-menu.tsx       |  50 ++-
 .../screens/workspace/workspace-screen.tsx    |  33 +-
 26 files changed, 1345 insertions(+), 309 deletions(-)
 create mode 100644 packages/app/e2e/mobile/agent-device/native-compact-workspace-scripts-preconditions.md
 create mode 100644 packages/app/e2e/mobile/agent-device/native-compact-workspace-scripts.android.ad
 create mode 100644 packages/app/e2e/support/helpers/compact-workspace-scripts.ts
 create mode 100644 packages/app/src/screens/workspace/scripts/index.ts
 create mode 100644 packages/app/src/screens/workspace/scripts/script-marks.tsx
 create mode 100644 packages/app/src/screens/workspace/scripts/script-status.test.ts
 create mode 100644 packages/app/src/screens/workspace/scripts/script-status.ts
 create mode 100644 packages/app/src/screens/workspace/scripts/use-workspace-script-actions.ts
 rename packages/app/src/screens/workspace/{ => scripts}/workspace-scripts-button.test.tsx (96%)
 rename packages/app/src/screens/workspace/{ => scripts}/workspace-scripts-button.tsx (63%)
 create mode 100644 packages/app/src/screens/workspace/scripts/workspace-scripts-menu-pages.tsx

diff --git a/packages/app/e2e/browser/compact-workspace-header.spec.ts b/packages/app/e2e/browser/compact-workspace-header.spec.ts
index c245d2ae10..6033f147e8 100644
--- a/packages/app/e2e/browser/compact-workspace-header.spec.ts
+++ b/packages/app/e2e/browser/compact-workspace-header.spec.ts
@@ -3,6 +3,18 @@ import { test, expect } from "../support/fixtures";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import { openAgentRoute } from "../support/helpers/mock-agent";
 import { getServerId } from "../support/helpers/server-id";
+import { expectOpenTabCount } from "../support/helpers/sheet";
+import {
+  closeCompactWorkspaceMenu,
+  goBackInMenu,
+  menuRow,
+  openCompactWorkspaceMenu,
+  openRunningScriptPage,
+  openScriptsPage,
+  runScriptFromScriptsPage,
+  scriptRow,
+  scriptsMenuRow,
+} from "../support/helpers/compact-workspace-scripts";
 
 const labels = {
   long: {
@@ -94,3 +106,87 @@ for (const width of [320, 390]) {
     });
   }
 }
+
+const KEEP_ALIVE = 'node -e "setInterval(() => {}, 1000)"';
+const WEB_SERVER =
+  "node -e \"require('http').createServer((q, r) => r.end('ok')).listen(process.env.PASEO_PORT)\"";
+
+async function openWorkspaceWithScripts(page: Page) {
+  const workspace = await seedWorkspace({
+    repoPrefix: "compact-scripts-",
+    repo: {
+      paseoConfig: {
+        scripts: {
+          lint: { type: "script", command: KEEP_ALIVE },
+          web: { type: "service", command: WEB_SERVER },
+        },
+      },
+    },
+  });
+  try {
+    const agent = await workspace.client.createAgent({
+      provider: "mock",
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Scripts menu check",
+      modeId: "load-test",
+      model: "e2e-fast-stream",
+    });
+    await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: agent.id });
+    return workspace;
+  } catch (error) {
+    await workspace.cleanup();
+    throw error;
+  }
+}
+
+test("compact header menu runs, shows, and stops workspace scripts", async ({ page }) => {
+  await page.setViewportSize({ width: 390, height: 844 });
+  const workspace = await openWorkspaceWithScripts(page);
+  try {
+    await expectOpenTabCount(page, 1);
+
+    await test.step("nothing running: the Scripts row has no value", async () => {
+      await openCompactWorkspaceMenu(page);
+      await expect(scriptsMenuRow(page)).toHaveAccessibleName("Scripts");
+      await closeCompactWorkspaceMenu(page);
+    });
+
+    await test.step("a stopped script runs from the Scripts page into a terminal tab", async () => {
+      await runScriptFromScriptsPage(page, "lint");
+      await expectOpenTabCount(page, 2);
+      await openCompactWorkspaceMenu(page);
+      await expect(scriptsMenuRow(page)).toHaveAccessibleName(/^Scripts\s*lint$/);
+      await closeCompactWorkspaceMenu(page);
+    });
+
+    await test.step("two running scripts are counted on the root row", async () => {
+      await runScriptFromScriptsPage(page, "web");
+      await expectOpenTabCount(page, 3);
+      await openCompactWorkspaceMenu(page);
+      await expect(scriptsMenuRow(page)).toHaveAccessibleName(/^Scripts\s*2 running$/);
+      await closeCompactWorkspaceMenu(page);
+    });
+
+    await test.step("stopping a script keeps its page open in the stopped state", async () => {
+      await openRunningScriptPage(page, "web");
+      await expect(menuRow(page, "View service")).toBeVisible();
+      await menuRow(page, "Stop").click();
+      await expect(menuRow(page, "Run")).toBeVisible({ timeout: 15_000 });
+      await expect(menuRow(page, "Stop")).toHaveCount(0);
+
+      await goBackInMenu(page);
+      await expect(scriptRow(page, "web")).toHaveAccessibleName(/^web\s*exit \d+$/);
+      await expect(scriptRow(page, "lint")).toHaveAccessibleName(/^lint\s*Running$/);
+      await closeCompactWorkspaceMenu(page);
+    });
+
+    await test.step("the root row names the one script still running", async () => {
+      await openScriptsPage(page);
+      await goBackInMenu(page);
+      await expect(scriptsMenuRow(page)).toHaveAccessibleName(/^Scripts\s*lint$/);
+    });
+  } finally {
+    await workspace.cleanup();
+  }
+});
diff --git a/packages/app/e2e/mobile/agent-device/native-compact-workspace-scripts-preconditions.md b/packages/app/e2e/mobile/agent-device/native-compact-workspace-scripts-preconditions.md
new file mode 100644
index 0000000000..56dbd6355e
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-compact-workspace-scripts-preconditions.md
@@ -0,0 +1,15 @@
+# Native compact workspace scripts flow
+
+`native-compact-workspace-scripts.android.ad` covers live script status in the compact ⋯ → Scripts sheet when nothing else keeps the host directory live. Start on a phone with a workspace open, the sidebar closed, and no agent tab selected. A viewed agent tab or the open sidebar hides the failure, because either one keeps the directory subscribed.
+
+The workspace's `paseo.json` needs a long-running plain script, stopped before the run. `SCRIPT` defaults to `worker`:
+
+```json
+{ "scripts": { "worker": { "command": "node -e \"setInterval(() => {}, 1000)\"" } } }
+```
+
+The flow starts the script, checks that Stop flips its page to Run, runs it again, and checks that Restart brings it back to running with no other interaction. It ends with the script stopped and the sheet dismissed, so it can be replayed.
+
+```sh
+agent-device replay packages/app/e2e/mobile/agent-device/native-compact-workspace-scripts.android.ad --platform android --serial emulator-5590 --metro-port 8137
+```
diff --git a/packages/app/e2e/mobile/agent-device/native-compact-workspace-scripts.android.ad b/packages/app/e2e/mobile/agent-device/native-compact-workspace-scripts.android.ad
new file mode 100644
index 0000000000..7a24b7ee8b
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-compact-workspace-scripts.android.ad
@@ -0,0 +1,45 @@
+context platform=android timeout=120000 retries=0
+env APP_ID=sh.paseo.debug
+env SCRIPT=worker
+
+open "${APP_ID}"
+wait "id=\"workspace-header-menu-trigger\"" 45000
+wait stable 1000 15000
+press "id=\"workspace-header-menu-trigger\""
+wait "id=\"workspace-header-scripts\"" 10000
+press "id=\"workspace-header-scripts\""
+wait "id=\"workspace-scripts-row-${SCRIPT}\"" 10000
+press "id=\"workspace-scripts-row-${SCRIPT}\""
+wait stable 1000 15000
+wait "id=\"workspace-header-menu-trigger\"" 10000
+press "id=\"workspace-header-menu-trigger\""
+wait "id=\"workspace-header-scripts\"" 10000
+press "id=\"workspace-header-scripts\""
+wait "text" "Running" 10000
+press "id=\"workspace-scripts-row-${SCRIPT}\""
+wait "id=\"workspace-script-${SCRIPT}-stop\"" 10000
+press "id=\"workspace-script-${SCRIPT}-stop\""
+wait "id=\"workspace-script-${SCRIPT}-run\"" 10000
+press "id=\"workspace-script-${SCRIPT}-run\""
+wait stable 1000 15000
+wait "id=\"workspace-header-menu-trigger\"" 10000
+press "id=\"workspace-header-menu-trigger\""
+wait "id=\"workspace-header-scripts\"" 10000
+press "id=\"workspace-header-scripts\""
+wait "text" "Running" 10000
+press "id=\"workspace-scripts-row-${SCRIPT}\""
+wait "id=\"workspace-script-${SCRIPT}-restart\"" 10000
+press "id=\"workspace-script-${SCRIPT}-restart\""
+wait stable 1000 15000
+wait "id=\"workspace-header-menu-trigger\"" 10000
+press "id=\"workspace-header-menu-trigger\""
+wait "id=\"workspace-header-scripts\"" 10000
+press "id=\"workspace-header-scripts\""
+wait "text" "Running" 15000
+press "id=\"workspace-scripts-row-${SCRIPT}\""
+wait "id=\"workspace-script-${SCRIPT}-stop\"" 10000
+press "id=\"workspace-script-${SCRIPT}-stop\""
+wait "id=\"workspace-script-${SCRIPT}-run\"" 10000
+back
+wait stable 1000 15000
+close
diff --git a/packages/app/e2e/support/helpers/compact-workspace-scripts.ts b/packages/app/e2e/support/helpers/compact-workspace-scripts.ts
new file mode 100644
index 0000000000..b01a527bc6
--- /dev/null
+++ b/packages/app/e2e/support/helpers/compact-workspace-scripts.ts
@@ -0,0 +1,61 @@
+import { expect, type Locator, type Page } from "@playwright/test";
+
+/** The compact ⋯ sheet. Its trigger shares "Workspace actions" with the sidebar row kebabs. */
+export function compactWorkspaceMenu(page: Page): Locator {
+  return page.getByTestId("workspace-header-menu-content");
+}
+
+export async function openCompactWorkspaceMenu(page: Page): Promise<void> {
+  await page.getByTestId("workspace-header-menu-trigger").click();
+  await expect(compactWorkspaceMenu(page)).toBeVisible({ timeout: 10_000 });
+}
+
+export function menuRow(page: Page, name: string | RegExp): Locator {
+  return compactWorkspaceMenu(page).getByRole("menuitem", { name });
+}
+
+/** The root row that leads to the Scripts page; its accessible name carries its value. */
+export function scriptsMenuRow(page: Page): Locator {
+  return menuRow(page, /^Scripts/);
+}
+
+/** A row on the Scripts page. A running script's name is followed by "Running". */
+export function scriptRow(page: Page, scriptName: string): Locator {
+  return menuRow(page, new RegExp(`^${scriptName}`));
+}
+
+export async function openScriptsPage(page: Page): Promise<void> {
+  await openCompactWorkspaceMenu(page);
+  await scriptsMenuRow(page).click();
+  await expect(scriptsMenuRow(page)).toHaveCount(0);
+  await expect(backButton(page)).toBeVisible();
+}
+
+export async function openRunningScriptPage(page: Page, scriptName: string): Promise<void> {
+  await openScriptsPage(page);
+  await scriptRow(page, scriptName).click();
+  await expect(menuRow(page, "Stop")).toBeVisible();
+}
+
+/** Taps a stopped script on the Scripts page, which runs it and closes the sheet. */
+export async function runScriptFromScriptsPage(page: Page, scriptName: string): Promise<void> {
+  await openScriptsPage(page);
+  await scriptRow(page, scriptName).click();
+  await expect(compactWorkspaceMenu(page)).toBeHidden({ timeout: 10_000 });
+}
+
+export async function goBackInMenu(page: Page): Promise<void> {
+  await backButton(page).click();
+}
+
+export async function closeCompactWorkspaceMenu(page: Page): Promise<void> {
+  await page
+    .getByRole("button", { name: "Bottom sheet backdrop" })
+    .first()
+    .click({ position: { x: 12, y: 12 } });
+  await expect(compactWorkspaceMenu(page)).toBeHidden({ timeout: 10_000 });
+}
+
+function backButton(page: Page): Locator {
+  return compactWorkspaceMenu(page).getByRole("button", { name: "Back" });
+}
diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index 7434471ec6..5e09ac5957 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -729,6 +729,7 @@ export const ar: TranslationResources = {
     header: {
       actions: {
         workspaceActions: "إجراءات Workspace",
+        workspaceActionsUnhealthy: "إجراءات Workspace، توجد خدمة غير سليمة",
         newAgent: "وكيل جديد",
         newTerminal: "محطة جديدة",
         newBrowser: "علامة تبويب متصفح جديدة",
@@ -776,6 +777,8 @@ export const ar: TranslationResources = {
         exitCode: "الخروج من{{code}}",
         startFailed: "فشل بدء تشغيل{{scriptName}}",
         stopFailed: "فشل إيقاف{{scriptName}}",
+        running: "قيد التشغيل",
+        runningCount: "{{count}} قيد التشغيل",
       },
     },
     tree: {
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 97ced3f535..8c6a870580 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -724,6 +724,7 @@ export const en = {
     header: {
       actions: {
         workspaceActions: "Workspace actions",
+        workspaceActionsUnhealthy: "Workspace actions, a service is unhealthy",
         newAgent: "New agent",
         newTerminal: "New terminal",
         newBrowser: "New browser tab",
@@ -771,6 +772,8 @@ export const en = {
         exitCode: "exit {{code}}",
         startFailed: "Failed to start {{scriptName}}",
         stopFailed: "Failed to stop {{scriptName}}",
+        running: "Running",
+        runningCount: "{{count}} running",
       },
     },
     tree: {
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index 124e931497..62667ba9f9 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -736,6 +736,7 @@ export const es: TranslationResources = {
     header: {
       actions: {
         workspaceActions: "AccionesWorkspace",
+        workspaceActionsUnhealthy: "Acciones del workspace, hay un servicio con problemas",
         newAgent: "Nuevo agente",
         newTerminal: "Nueva terminal",
         newBrowser: "Nueva pestaña del navegador",
@@ -784,6 +785,8 @@ export const es: TranslationResources = {
         exitCode: "salir de{{code}}",
         startFailed: "No se pudo iniciar{{scriptName}}",
         stopFailed: "No se pudo detener{{scriptName}}",
+        running: "En ejecución",
+        runningCount: "{{count}} en ejecución",
       },
     },
     tree: {
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index 8a8e01786d..8e70ece6da 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -735,6 +735,8 @@ export const fr: TranslationResources = {
     header: {
       actions: {
         workspaceActions: "Actions de l’espace de travail",
+        workspaceActionsUnhealthy:
+          "Actions de l’espace de travail, un service est en mauvaise santé",
         newAgent: "Nouvel agent",
         newTerminal: "Nouveau terminal",
         newBrowser: "Nouvel onglet de navigateur",
@@ -783,6 +785,8 @@ export const fr: TranslationResources = {
         exitCode: "sortie {{code}}",
         startFailed: "Impossible de démarrer {{scriptName}}",
         stopFailed: "Impossible d’arrêter {{scriptName}}",
+        running: "En cours",
+        runningCount: "{{count}} en cours",
       },
     },
     tree: {
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index 9f6d4eced3..d7b08a9c84 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -733,6 +733,7 @@ export const ja: TranslationResources = {
     header: {
       actions: {
         workspaceActions: "ワークスペースアクション",
+        workspaceActionsUnhealthy: "ワークスペースアクション、異常なサービスがあります",
         newAgent: "新しいエージェント",
         newTerminal: "新しいターミナル",
         newBrowser: "新しいブラウザタブ",
@@ -780,6 +781,8 @@ export const ja: TranslationResources = {
         exitCode: "終了コード: {{code}}",
         startFailed: "{{scriptName}}の起動に失敗しました",
         stopFailed: "{{scriptName}}の停止に失敗しました",
+        running: "実行中",
+        runningCount: "{{count}} 件実行中",
       },
     },
     tree: {
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index a78d44f74b..c82240f0c4 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -729,6 +729,7 @@ export const ko: TranslationResources = {
     header: {
       actions: {
         workspaceActions: "워크스페이스 작업",
+        workspaceActionsUnhealthy: "워크스페이스 작업, 비정상 서비스가 있습니다",
         newAgent: "새 에이전트",
         newTerminal: "새 터미널",
         newBrowser: "새 브라우저 탭",
@@ -776,6 +777,8 @@ export const ko: TranslationResources = {
         exitCode: "종료 {{code}}",
         startFailed: "{{scriptName}}을(를) 시작하지 못했습니다",
         stopFailed: "{{scriptName}}를 중지하지 못했습니다.",
+        running: "실행 중",
+        runningCount: "{{count}}개 실행 중",
       },
     },
     tree: {
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index e5a2e3bfe4..622c13e798 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -733,6 +733,7 @@ export const ptBR: TranslationResources = {
     header: {
       actions: {
         workspaceActions: "Ações do workspace",
+        workspaceActionsUnhealthy: "Ações do workspace, há um serviço com problema",
         newAgent: "Novo agente",
         newTerminal: "Novo terminal",
         newBrowser: "Nova aba de navegador",
@@ -780,6 +781,8 @@ export const ptBR: TranslationResources = {
         exitCode: "saída {{code}}",
         startFailed: "Falha ao iniciar {{scriptName}}",
         stopFailed: "Falha ao parar {{scriptName}}",
+        running: "Em execução",
+        runningCount: "{{count}} em execução",
       },
     },
     tree: {
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index ad0bac05c6..733596de39 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -736,6 +736,7 @@ export const ru: TranslationResources = {
     header: {
       actions: {
         workspaceActions: "Действия с рабочим пространством",
+        workspaceActionsUnhealthy: "Действия с рабочим пространством, есть неисправный сервис",
         newAgent: "Новый агент",
         newTerminal: "Новый терминал",
         newBrowser: "Новая вкладка браузера",
@@ -784,6 +785,8 @@ export const ru: TranslationResources = {
         exitCode: "Код выхода: {{code}}",
         startFailed: "Не удалось запустить скрипт {{scriptName}}",
         stopFailed: "Не удалось остановить скрипт {{scriptName}}",
+        running: "Запущен",
+        runningCount: "Запущено: {{count}}",
       },
     },
     tree: {
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index 7b78bfbea6..c8627ca769 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -725,6 +725,7 @@ export const zhCN: TranslationResources = {
     header: {
       actions: {
         workspaceActions: "Workspace 操作",
+        workspaceActionsUnhealthy: "Workspace 操作，有服务异常",
         newAgent: "新建 Agent",
         newTerminal: "新建 Terminal",
         newBrowser: "新建浏览器标签",
@@ -772,6 +773,8 @@ export const zhCN: TranslationResources = {
         exitCode: "exit {{code}}",
         startFailed: "启动 {{scriptName}} 失败",
         stopFailed: "停止 {{scriptName}} 失败",
+        running: "运行中",
+        runningCount: "{{count}} 个运行中",
       },
     },
     tree: {
diff --git a/packages/app/src/runtime/directory-sync/index.test.ts b/packages/app/src/runtime/directory-sync/index.test.ts
index 5a247590d5..2dea552239 100644
--- a/packages/app/src/runtime/directory-sync/index.test.ts
+++ b/packages/app/src/runtime/directory-sync/index.test.ts
@@ -31,6 +31,7 @@ import { subscriptionFixture } from "../subscription-fixture";
 type WorkspaceFetchResult = Awaited<ReturnType<DaemonClient["fetchWorkspaces"]>>;
 type ProjectListResult = Awaited<ReturnType<DaemonClient["listProjects"]>>;
 type AgentFetchResult = Awaited<ReturnType<DaemonClient["fetchAgents"]>>;
+type WorkspaceScriptsResult = Awaited<ReturnType<DaemonClient["listWorkspaceScripts"]>>;
 
 class FakeDirectoryClient {
   supportsBackgroundWorkspaces(): boolean {
@@ -181,6 +182,14 @@ class FakeDirectoryClient {
     };
   }
 
+  listWorkspaceScriptsCalls = 0;
+  workspaceScripts: WorkspaceScriptsResult["scripts"] = [];
+
+  async listWorkspaceScripts(workspaceId: string): Promise<WorkspaceScriptsResult> {
+    this.listWorkspaceScriptsCalls += 1;
+    return { requestId: "scripts", workspaceId, scripts: this.workspaceScripts, error: null };
+  }
+
   getLastServerInfoMessage() {
     return this.supportsWorkspaceLabels ? { features: { workspaceLabels: true } } : null;
   }
@@ -482,6 +491,52 @@ describe("DirectorySync session readiness", () => {
     directory.dispose();
   });
 
+  it("keeps a workspace's script status live without demanding the directory", async () => {
+    const serverId = "script-status-demand";
+    const { client, directory } = createDirectory(serverId);
+    useSessionStore.getState().initializeSession(serverId, client as unknown as DaemonClient, 1);
+    const workspace = normalizeWorkspaceDescriptor({
+      ...createWorkspaceEntry("workspace-1"),
+      scripts: [],
+    });
+    directory.acceptWorkspaces([workspace]);
+    const script = {
+      scriptName: "worker",
+      type: "script" as const,
+      hostname: "worker.paseo.localhost",
+      port: null,
+      proxyUrl: null,
+      lifecycle: "running" as const,
+      health: null,
+      exitCode: null,
+      terminalId: "terminal-1",
+    };
+    const lifecycle = () =>
+      useSessionStore.getState().sessions[serverId]?.workspaces.get(workspace.id)?.scripts[0]
+        ?.lifecycle;
+    client.workspaceScripts = [script];
+    const source = {};
+
+    directory.setScriptStatusDemand(source, workspace.id);
+
+    await expect.poll(lifecycle).toBe("running");
+    client.emit({
+      type: "script_status_update",
+      payload: { workspaceId: workspace.id, scripts: [{ ...script, lifecycle: "stopped" }] },
+    });
+    expect(lifecycle()).toBe("stopped");
+    expect(client.fetchAgentsCalls).toBe(0);
+    expect(client.fetchWorkspacesCalls).toBe(0);
+
+    directory.setScriptStatusDemand(source, null);
+    client.emit({
+      type: "script_status_update",
+      payload: { workspaceId: workspace.id, scripts: [script] },
+    });
+    expect(lifecycle()).toBe("stopped");
+    directory.dispose();
+  });
+
   it("subscribes to live agent updates when the directory is demanded", async () => {
     const serverId = "demanded-directory-subscription";
     const { client, directory } = createDirectory(serverId);
diff --git a/packages/app/src/runtime/directory-sync/index.ts b/packages/app/src/runtime/directory-sync/index.ts
index 6589914825..28b217fea6 100644
--- a/packages/app/src/runtime/directory-sync/index.ts
+++ b/packages/app/src/runtime/directory-sync/index.ts
@@ -150,6 +150,7 @@ export class DirectorySync {
   private agentSubscription: OwnedSubscription<FetchAgentsPayload> | null = null;
   private workspaceSubscription: OwnedSubscription<FetchWorkspacesPayload> | null = null;
   private eventSubscription: ReturnType<DaemonClient["observeEvents"]> | null = null;
+  private scriptStatusSubscription: ReturnType<DaemonClient["observeEvents"]> | null = null;
   private readonly abortSessionWaits = new Set<() => void>();
   private cacheLoad: Promise<void> | null = null;
   private cacheAccepted = false;
@@ -157,6 +158,7 @@ export class DirectorySync {
   private workspaceRevision = 0;
   private readonly routeDemandIds = new Set<string>();
   private readonly fullDemandSources = new Set<object>();
+  private readonly scriptStatusDemand = new Map<object, string>();
   private demandRefresh: Promise<void> | null = null;
   private satisfiedDemandSource: DirectorySourceToken | null = null;
   private cursors: DirectoryCheckpoint = {};
@@ -189,10 +191,12 @@ export class DirectorySync {
     }
     this.flushAbortedTransactions();
     this.releaseSubscriptions();
+    this.releaseScriptStatusEvents();
     workspaceLabels.disconnect(this.serverId);
     this.connection = connection;
     this.abortPendingSessionWaits();
     if (!connection.client || connection.status !== "online") return true;
+    if (this.scriptStatusDemand.size > 0) this.observeScriptStatusEvents();
     // Reattach labels here because route-only demand can satisfy the epoch before full demand requests them.
     void this.connectWorkspaceLabels().catch(() => undefined);
     if (this.hasDemand()) void this.requestDemandRefresh().catch(() => undefined);
@@ -226,10 +230,32 @@ export class DirectorySync {
     }
   }
 
+  /**
+   * Keeps one workspace's script status live without demanding the directory: a
+   * script_status_update subscription, plus one scripts fetch to cover what changed before it.
+   */
+  setScriptStatusDemand(source: object, workspaceId: string | null): void {
+    if (!workspaceId) {
+      this.scriptStatusDemand.delete(source);
+      if (!this.wantsScriptStatus()) this.releaseScriptStatusEvents();
+      return;
+    }
+    this.scriptStatusDemand.set(source, workspaceId);
+    if (!this.getOnlineConnection()) return;
+    // A new subscription fetches every demanded workspace once its snapshot lands.
+    if (!this.scriptStatusSubscription) this.observeScriptStatusEvents();
+    else
+      void this.scriptStatusSubscription.ready
+        .then(() => this.fetchScriptStatus(workspaceId))
+        .catch(() => undefined);
+  }
+
   dispose(): void {
     this.flushAbortedTransactions();
     this.abortPendingSessionWaits();
+    this.scriptStatusDemand.clear();
     this.releaseSubscriptions();
+    this.releaseScriptStatusEvents();
     this.fullDemandSources.clear();
     this.routeDemandIds.clear();
     workspaceLabels.disconnect(this.serverId);
@@ -247,6 +273,12 @@ export class DirectorySync {
     this.workspaceSubscription = null;
     this.eventSubscription = null;
     this.satisfiedDemandSource = null;
+    if (!this.wantsScriptStatus()) this.releaseScriptStatusEvents();
+  }
+
+  private releaseScriptStatusEvents(): void {
+    void this.scriptStatusSubscription?.release().catch(() => undefined);
+    this.scriptStatusSubscription = null;
   }
 
   private receiveAgentDelta(source: DirectorySourceToken, delta: AgentDirectoryDelta): void {
@@ -276,22 +308,51 @@ export class DirectorySync {
   private observeDirectoryEvents(): void {
     if (this.eventSubscription) return;
     const { client, source } = this.requireOnline();
-    this.eventSubscription = client.observeEvents(["project.update", "script_status_update"]);
+    this.eventSubscription = client.observeEvents(["project.update"]);
     this.eventSubscription.subscribe({
       snapshot: () => {},
       update: (message) => {
         if (!this.isCurrent(client, source)) return;
         if (message.type === "project.update") this.receiveWorkspaceDelta(source, message.payload);
-        if (message.type === "script_status_update")
-          this.receiveWorkspaceDelta(source, { kind: "script_status", update: message.payload });
       },
     });
   }
 
+  // Script status has its own subscription so a workspace screen can hold it without the directory.
+  private observeScriptStatusEvents(): void {
+    if (this.scriptStatusSubscription) return;
+    const { client, source } = this.requireOnline();
+    this.scriptStatusSubscription = client.observeEvents(["script_status_update"]);
+    this.scriptStatusSubscription.subscribe({
+      snapshot: () => {
+        for (const workspaceId of new Set(this.scriptStatusDemand.values()))
+          void this.fetchScriptStatus(workspaceId).catch(() => undefined);
+      },
+      update: (message) => {
+        if (!this.isCurrent(client, source) || message.type !== "script_status_update") return;
+        this.receiveWorkspaceDelta(source, { kind: "script_status", update: message.payload });
+      },
+    });
+  }
+
+  private async fetchScriptStatus(workspaceId: string): Promise<void> {
+    const { client, source } = this.requireOnline();
+    const result = await client.listWorkspaceScripts(workspaceId);
+    if (!this.isCurrent(client, source) || result.error || !result.scripts) return;
+    this.receiveWorkspaceDelta(source, {
+      kind: "script_status",
+      update: { workspaceId, scripts: result.scripts },
+    });
+  }
+
   private hasDemand(): boolean {
     return this.fullDemandSources.size > 0 || this.routeDemandIds.size > 0;
   }
 
+  private wantsScriptStatus(): boolean {
+    return this.hasDemand() || this.scriptStatusDemand.size > 0;
+  }
+
   private requestDemandRefresh(force = false): Promise<void> {
     if (this.demandRefresh) return this.demandRefresh;
     if (!this.hasDemand()) return Promise.resolve();
@@ -299,6 +360,7 @@ export class DirectorySync {
       return this.fullDemandSources.size > 0 ? this.loadCachedDirectory() : Promise.resolve();
     }
     this.observeDirectoryEvents();
+    this.observeScriptStatusEvents();
     const source = this.connection.source;
     if (
       !force &&
diff --git a/packages/app/src/runtime/host-runtime.ts b/packages/app/src/runtime/host-runtime.ts
index 2ecbe60448..55298ce5a1 100644
--- a/packages/app/src/runtime/host-runtime.ts
+++ b/packages/app/src/runtime/host-runtime.ts
@@ -2606,6 +2606,14 @@ export class HostRuntimeStore {
     return () => directory.setDemand(source, false);
   }
 
+  acquireScriptStatusDemand(serverId: string, workspaceId: string): () => void {
+    const directory = this.directorySyncByServer.get(serverId);
+    if (!directory) return () => undefined;
+    const source = {};
+    directory.setScriptStatusDemand(source, workspaceId);
+    return () => directory.setScriptStatusDemand(source, null);
+  }
+
   async prepareAgentRoute(serverId: string, agentId: string): Promise<void> {
     const directory = this.directorySyncByServer.get(serverId);
     if (!directory) throw new Error(`Unknown host runtime for serverId ${serverId}`);
diff --git a/packages/app/src/screens/workspace/scripts/index.ts b/packages/app/src/screens/workspace/scripts/index.ts
new file mode 100644
index 0000000000..efff482e80
--- /dev/null
+++ b/packages/app/src/screens/workspace/scripts/index.ts
@@ -0,0 +1,10 @@
+/**
+ * Workspace scripts: the desktop header popover, and the pages the compact header menu carries.
+ * Both share one set of actions and one reading of script status.
+ */
+export { WorkspaceScriptsButton } from "./workspace-scripts-button";
+export {
+  useWorkspaceScriptsMenuPages,
+  type UseWorkspaceScriptsMenuPagesInput,
+  type WorkspaceScriptsMenuPages,
+} from "./workspace-scripts-menu-pages";
diff --git a/packages/app/src/screens/workspace/scripts/script-marks.tsx b/packages/app/src/screens/workspace/scripts/script-marks.tsx
new file mode 100644
index 0000000000..ae4f9a9edb
--- /dev/null
+++ b/packages/app/src/screens/workspace/scripts/script-marks.tsx
@@ -0,0 +1,78 @@
+import type { ReactElement } from "react";
+import { Text, View } from "react-native";
+import { Globe, SquareTerminal } from "lucide-react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
+import type { WorkspaceDescriptor } from "@/stores/session-store";
+import type { WorkspaceScriptLinkKind } from "@/utils/workspace-script-links";
+import { scriptStatus, scriptToneColorMapping } from "./script-status";
+
+const ThemedGlobe = withUnistyles(Globe);
+const ThemedSquareTerminal = withUnistyles(SquareTerminal);
+
+/** A globe for a service, a terminal for a plain script, in the colour of what it is doing. */
+export function ScriptIcon({
+  script,
+  size,
+}: {
+  script: WorkspaceDescriptor["scripts"][number];
+  size: number;
+}): ReactElement {
+  const Icon = script.type === "service" ? ThemedGlobe : ThemedSquareTerminal;
+  return (
+    <Icon
+      size={size}
+      uniProps={scriptToneColorMapping(scriptStatus(script))}
+      style={styles.scriptIcon}
+    />
+  );
+}
+
+export function ExitCodeBadge({ code }: { code: number }): ReactElement {
+  const { t } = useTranslation();
+  const exitTextStyle =
+    code === 0 ? styles.exitBadgeText : [styles.exitBadgeText, styles.exitBadgeTextError];
+  return (
+    <View style={styles.exitBadge}>
+      <Text style={exitTextStyle}>{t("workspace.scripts.states.exitCode", { code })}</Text>
+    </View>
+  );
+}
+
+/** The label of a URL route, as the user picks between them. */
+export function routeLabelKey(
+  kind: WorkspaceScriptLinkKind,
+):
+  | "workspace.scripts.routes.public"
+  | "workspace.scripts.routes.paseo"
+  | "workspace.scripts.routes.direct" {
+  switch (kind) {
+    case "public":
+      return "workspace.scripts.routes.public";
+    case "paseo":
+      return "workspace.scripts.routes.paseo";
+    case "direct":
+      return "workspace.scripts.routes.direct";
+  }
+}
+
+const styles = StyleSheet.create((theme) => ({
+  scriptIcon: {
+    flexShrink: 0,
+  },
+  exitBadge: {
+    paddingHorizontal: theme.spacing[1.5],
+    paddingVertical: 1,
+    borderRadius: 2,
+    backgroundColor: theme.colors.surface2,
+  },
+  exitBadgeText: {
+    fontSize: 10,
+    lineHeight: 12,
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foregroundMuted,
+  },
+  exitBadgeTextError: {
+    color: theme.colors.statusDanger,
+  },
+}));
diff --git a/packages/app/src/screens/workspace/scripts/script-status.test.ts b/packages/app/src/screens/workspace/scripts/script-status.test.ts
new file mode 100644
index 0000000000..7ca5dc81b3
--- /dev/null
+++ b/packages/app/src/screens/workspace/scripts/script-status.test.ts
@@ -0,0 +1,89 @@
+import { describe, expect, it } from "vitest";
+import type { WorkspaceScriptPayload } from "@getpaseo/protocol/messages";
+import { scriptStatus, summarizeScripts } from "./script-status";
+
+function service(
+  scriptName: string,
+  state: Pick<WorkspaceScriptPayload, "lifecycle" | "health">,
+): WorkspaceScriptPayload {
+  return { ...script(scriptName, state.lifecycle), type: "service", health: state.health };
+}
+
+function script(
+  scriptName: string,
+  lifecycle: WorkspaceScriptPayload["lifecycle"],
+): WorkspaceScriptPayload {
+  return {
+    scriptName,
+    type: "script",
+    hostname: scriptName,
+    port: null,
+    proxyUrl: null,
+    lifecycle,
+    health: null,
+    exitCode: null,
+    terminalId: null,
+  };
+}
+
+describe("scriptStatus", () => {
+  it("colours services by their health and plain scripts by whether they run", () => {
+    expect(scriptStatus(script("lint", "stopped"))).toBe("idle");
+    expect(scriptStatus(script("lint", "running"))).toBe("running");
+    expect(scriptStatus(service("web", { lifecycle: "stopped", health: "unhealthy" }))).toBe(
+      "idle",
+    );
+    expect(scriptStatus(service("web", { lifecycle: "running", health: null }))).toBe("running");
+    expect(scriptStatus(service("web", { lifecycle: "running", health: "healthy" }))).toBe(
+      "healthy",
+    );
+    expect(scriptStatus(service("web", { lifecycle: "running", health: "unhealthy" }))).toBe(
+      "unhealthy",
+    );
+  });
+});
+
+describe("summarizeScripts", () => {
+  it("is idle with nothing running when nothing runs", () => {
+    expect(summarizeScripts([])).toEqual({ tone: "idle", running: [] });
+    expect(summarizeScripts([script("lint", "stopped")])).toEqual({ tone: "idle", running: [] });
+  });
+
+  it("lists the running scripts by name", () => {
+    expect(
+      summarizeScripts([
+        script("lint", "stopped"),
+        service("web", { lifecycle: "running", health: null }),
+      ]),
+    ).toEqual({ tone: "running", running: ["web"] });
+  });
+
+  it("is unhealthy when any running service is", () => {
+    expect(
+      summarizeScripts([
+        service("web", { lifecycle: "running", health: "healthy" }),
+        service("api", { lifecycle: "running", health: "unhealthy" }),
+      ]),
+    ).toEqual({ tone: "unhealthy", running: ["web", "api"] });
+  });
+
+  it("is healthy only when every running service reports healthy", () => {
+    expect(
+      summarizeScripts([
+        script("lint", "running"),
+        service("web", { lifecycle: "running", health: "healthy" }),
+        service("api", { lifecycle: "stopped", health: "unhealthy" }),
+      ]),
+    ).toEqual({ tone: "healthy", running: ["lint", "web"] });
+    expect(
+      summarizeScripts([
+        service("web", { lifecycle: "running", health: "healthy" }),
+        service("api", { lifecycle: "running", health: null }),
+      ]),
+    ).toEqual({ tone: "running", running: ["web", "api"] });
+    expect(summarizeScripts([script("lint", "running")])).toEqual({
+      tone: "running",
+      running: ["lint"],
+    });
+  });
+});
diff --git a/packages/app/src/screens/workspace/scripts/script-status.ts b/packages/app/src/screens/workspace/scripts/script-status.ts
new file mode 100644
index 0000000000..ff7398dda4
--- /dev/null
+++ b/packages/app/src/screens/workspace/scripts/script-status.ts
@@ -0,0 +1,63 @@
+import type { WorkspaceScriptPayload } from "@getpaseo/protocol/messages";
+import type { Theme } from "@/styles/theme";
+
+/**
+ * What a script, or a set of them, is doing, as the one colour its ▶ or row icon is drawn in.
+ *
+ * Health is a service's own report, so it only colours running services. A plain script that is
+ * running is just running.
+ */
+export type ScriptTone = "idle" | "running" | "healthy" | "unhealthy";
+
+export interface ScriptsSummary {
+  tone: ScriptTone;
+  /** Names of the running scripts, in the order the workspace lists them. */
+  running: string[];
+}
+
+export function scriptStatus(script: WorkspaceScriptPayload): ScriptTone {
+  if (script.lifecycle !== "running") return "idle";
+  if (script.type !== "service") return "running";
+  if (script.health === "healthy") return "healthy";
+  if (script.health === "unhealthy") return "unhealthy";
+  return "running";
+}
+
+/**
+ * One unhealthy service makes the whole set unhealthy. The set reads healthy only when every
+ * running service says so; a service that has not reported yet keeps it at plain running.
+ */
+export function summarizeScripts(scripts: readonly WorkspaceScriptPayload[]): ScriptsSummary {
+  const running = scripts.filter((script) => script.lifecycle === "running");
+  if (running.length === 0) return { tone: "idle", running: [] };
+  return { tone: aggregateTone(running), running: running.map((script) => script.scriptName) };
+}
+
+function aggregateTone(running: readonly WorkspaceScriptPayload[]): ScriptTone {
+  const serviceTones = running
+    .filter((script) => script.type === "service")
+    .map((script) => scriptStatus(script));
+  if (serviceTones.includes("unhealthy")) return "unhealthy";
+  if (serviceTones.length > 0 && serviceTones.every((tone) => tone === "healthy")) {
+    return "healthy";
+  }
+  return "running";
+}
+
+const idleColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+const runningColorMapping = (theme: Theme) => ({ color: theme.colors.palette.blue[500] });
+const healthyColorMapping = (theme: Theme) => ({ color: theme.colors.palette.green[500] });
+const unhealthyColorMapping = (theme: Theme) => ({ color: theme.colors.palette.red[500] });
+
+export function scriptToneColorMapping(tone: ScriptTone): (theme: Theme) => { color: string } {
+  switch (tone) {
+    case "idle":
+      return idleColorMapping;
+    case "running":
+      return runningColorMapping;
+    case "healthy":
+      return healthyColorMapping;
+    case "unhealthy":
+      return unhealthyColorMapping;
+  }
+}
diff --git a/packages/app/src/screens/workspace/scripts/use-workspace-script-actions.ts b/packages/app/src/screens/workspace/scripts/use-workspace-script-actions.ts
new file mode 100644
index 0000000000..fb7809990f
--- /dev/null
+++ b/packages/app/src/screens/workspace/scripts/use-workspace-script-actions.ts
@@ -0,0 +1,191 @@
+import { useCallback, useEffect, useMemo, useRef } from "react";
+import * as Clipboard from "expo-clipboard";
+import { useMutation } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
+import type { WorkspaceDescriptor } from "@/stores/session-store";
+import { useSessionStore } from "@/stores/session-store";
+import { useHostRuntimeSnapshot } from "@/runtime/host-runtime";
+import { useToast } from "@/contexts/toast-context";
+import {
+  resolveWorkspaceScriptLink,
+  type WorkspaceScriptLinkKind,
+  type WorkspaceScriptLinkTarget,
+} from "@/utils/workspace-script-links";
+import { useWorkspaceServiceRoutePreferencesStore } from "@/workspace-service-routes/store";
+
+type WorkspaceScript = WorkspaceDescriptor["scripts"][number];
+
+export interface WorkspaceScriptLinks {
+  /** The URL this host's route preference picks, or null when the script serves none. */
+  selected: WorkspaceScriptLinkTarget | null;
+  targets: WorkspaceScriptLinkTarget[];
+}
+
+export interface WorkspaceScriptActions {
+  start: (scriptName: string) => void;
+  stop: (scriptName: string) => void;
+  /** Stops the script, then starts it again once the daemon reports it stopped. */
+  restart: (scriptName: string) => void;
+  copyUrl: (target: WorkspaceScriptLinkTarget) => void;
+  selectRoute: (kind: WorkspaceScriptLinkKind) => void;
+  resolveLinks: (script: WorkspaceScript) => WorkspaceScriptLinks;
+  isStartPending: boolean;
+  isStopPending: boolean;
+}
+
+export interface UseWorkspaceScriptActionsInput {
+  serverId: string;
+  workspaceId: string;
+  scripts: WorkspaceDescriptor["scripts"];
+  onScriptTerminalStarted?: (terminalId: string) => void;
+}
+
+/**
+ * Run, stop, restart and URL handling for a workspace's scripts, shared by every surface that
+ * lists them.
+ *
+ * A restart outlives the press that asked for it — the second half waits for the daemon to
+ * report the script stopped — so mount this with whatever owns the menu, not inside a menu page
+ * that unmounts when the menu closes.
+ */
+export function useWorkspaceScriptActions({
+  serverId,
+  workspaceId,
+  scripts,
+  onScriptTerminalStarted,
+}: UseWorkspaceScriptActionsInput): WorkspaceScriptActions {
+  const { t } = useTranslation();
+  const toast = useToast();
+  const client = useSessionStore((state) => state.sessions[serverId]?.client ?? null);
+  const activeConnection = useHostRuntimeSnapshot(serverId)?.activeConnection ?? null;
+  const preferredRouteKind = useWorkspaceServiceRoutePreferencesStore(
+    (state) => state.byServerId[serverId] ?? null,
+  );
+  const setPreferredRoute = useWorkspaceServiceRoutePreferencesStore(
+    (state) => state.setPreferredRoute,
+  );
+  const pendingRestartRef = useRef<Set<string>>(new Set());
+
+  const startScriptMutation = useMutation({
+    mutationFn: async (scriptName: string) => {
+      if (!client) {
+        throw new Error(t("common.errors.daemonClientUnavailable"));
+      }
+      const result = await client.startWorkspaceScript(workspaceId, scriptName);
+      if (result.error) {
+        throw new Error(result.error);
+      }
+      return result;
+    },
+    onError: (error, scriptName) => {
+      toast.show(
+        error instanceof Error
+          ? error.message
+          : t("workspace.scripts.states.startFailed", { scriptName }),
+        {
+          variant: "error",
+        },
+      );
+    },
+    onSuccess: (result) => {
+      if (result.terminalId) {
+        onScriptTerminalStarted?.(result.terminalId);
+      }
+    },
+  });
+  const startScript = startScriptMutation.mutate;
+
+  const stopScriptMutation = useMutation({
+    mutationFn: async (scriptName: string) => {
+      if (!client) {
+        throw new Error(t("common.errors.daemonClientUnavailable"));
+      }
+      const terminalId = scripts.find((s) => s.scriptName === scriptName)?.terminalId;
+      if (!terminalId) {
+        throw new Error(t("workspace.scripts.states.stopFailed", { scriptName }));
+      }
+      const result = await client.killTerminal(terminalId);
+      if (!result.success) {
+        throw new Error(t("workspace.scripts.states.stopFailed", { scriptName }));
+      }
+    },
+    onError: (error, scriptName) => {
+      pendingRestartRef.current.delete(scriptName);
+      toast.show(
+        error instanceof Error
+          ? error.message
+          : t("workspace.scripts.states.stopFailed", { scriptName }),
+        {
+          variant: "error",
+        },
+      );
+    },
+  });
+  const stopScript = stopScriptMutation.mutate;
+
+  // Restart = kill the script terminal, then start again once the daemon
+  // reports the script as stopped (it tears the runtime entry down on exit).
+  useEffect(() => {
+    const pending = pendingRestartRef.current;
+    if (pending.size === 0) return;
+    for (const script of scripts) {
+      if (!pending.has(script.scriptName) || script.lifecycle === "running") continue;
+      pending.delete(script.scriptName);
+      startScript(script.scriptName);
+    }
+  }, [scripts, startScript]);
+
+  const restart = useCallback(
+    (scriptName: string) => {
+      pendingRestartRef.current.add(scriptName);
+      stopScript(scriptName);
+    },
+    [stopScript],
+  );
+
+  const copyUrl = useCallback(
+    (target: WorkspaceScriptLinkTarget) => {
+      void Clipboard.setStringAsync(target.url);
+      toast.copied(target.label);
+    },
+    [toast],
+  );
+
+  const selectRoute = useCallback(
+    (kind: WorkspaceScriptLinkKind) => setPreferredRoute(serverId, kind),
+    [serverId, setPreferredRoute],
+  );
+
+  const resolveLinks = useCallback(
+    (script: WorkspaceScript): WorkspaceScriptLinks => {
+      const link = resolveWorkspaceScriptLink({ script, activeConnection });
+      const selected =
+        link.targets.find((target) => target.kind === preferredRouteKind) ?? link.primary;
+      return { selected, targets: link.targets };
+    },
+    [activeConnection, preferredRouteKind],
+  );
+
+  return useMemo(
+    () => ({
+      start: startScript,
+      stop: stopScript,
+      restart,
+      copyUrl,
+      selectRoute,
+      resolveLinks,
+      isStartPending: startScriptMutation.isPending,
+      isStopPending: stopScriptMutation.isPending,
+    }),
+    [
+      startScript,
+      stopScript,
+      restart,
+      copyUrl,
+      selectRoute,
+      resolveLinks,
+      startScriptMutation.isPending,
+      stopScriptMutation.isPending,
+    ],
+  );
+}
diff --git a/packages/app/src/screens/workspace/workspace-scripts-button.test.tsx b/packages/app/src/screens/workspace/scripts/workspace-scripts-button.test.tsx
similarity index 96%
rename from packages/app/src/screens/workspace/workspace-scripts-button.test.tsx
rename to packages/app/src/screens/workspace/scripts/workspace-scripts-button.test.tsx
index 82e0132cd3..290f424e97 100644
--- a/packages/app/src/screens/workspace/workspace-scripts-button.test.tsx
+++ b/packages/app/src/screens/workspace/scripts/workspace-scripts-button.test.tsx
@@ -8,7 +8,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import type { WorkspaceScriptPayload } from "@getpaseo/protocol/messages";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { createRoot } from "react-dom/client";
-import { WorkspaceScriptsButton } from "@/screens/workspace/workspace-scripts-button";
+import { WorkspaceScriptsButton } from "./workspace-scripts-button";
 
 void testI18n;
 
@@ -235,7 +235,6 @@ const LIVE_TERMINAL_IDS: string[] = ["terminal-script-1"];
 
 interface RenderScriptsOptions {
   hideLabels?: boolean;
-  presentation?: "split" | "ghost";
 }
 
 function renderScripts(
@@ -264,7 +263,6 @@ function renderScripts(
           scripts={nextScripts}
           liveTerminalIds={LIVE_TERMINAL_IDS}
           hideLabels={options.hideLabels}
-          presentation={options.presentation}
         />
       </QueryClientProvider>
     );
@@ -431,17 +429,6 @@ describe("WorkspaceScriptsButton", () => {
     );
   });
 
-  it("removes the trigger caret in ghost presentation", () => {
-    current = renderScripts([script({ scriptName: "dev" })], {
-      hideLabels: true,
-      presentation: "ghost",
-    });
-
-    const trigger = document.querySelector('[data-testid="workspace-scripts-button"]');
-    expect(trigger?.querySelector('[data-icon="Play"]')?.getAttribute("data-size")).toBe("16");
-    expect(trigger?.querySelector('[data-icon="ChevronDown"]')).toBeNull();
-  });
-
   it("keeps the trigger caret in split presentation", () => {
     current = renderScripts([script({ scriptName: "dev" })]);
 
diff --git a/packages/app/src/screens/workspace/workspace-scripts-button.tsx b/packages/app/src/screens/workspace/scripts/workspace-scripts-button.tsx
similarity index 63%
rename from packages/app/src/screens/workspace/workspace-scripts-button.tsx
rename to packages/app/src/screens/workspace/scripts/workspace-scripts-button.tsx
index 59ddd9a0fb..3a1c472518 100644
--- a/packages/app/src/screens/workspace/workspace-scripts-button.tsx
+++ b/packages/app/src/screens/workspace/scripts/workspace-scripts-button.tsx
@@ -1,13 +1,10 @@
-import { useCallback, useEffect, useMemo, useRef, type ReactElement } from "react";
+import { useCallback, useMemo, type ReactElement } from "react";
 import type { GestureResponderEvent } from "react-native";
 import { Pressable, Text, View } from "react-native";
-import * as Clipboard from "expo-clipboard";
-import { useMutation } from "@tanstack/react-query";
 import {
   ChevronDown,
   Copy,
   Eye,
-  Globe,
   Play,
   RotateCw,
   Square,
@@ -16,8 +13,6 @@ import {
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 import type { WorkspaceDescriptor } from "@/stores/session-store";
-import { useSessionStore } from "@/stores/session-store";
-import { useHostRuntimeSnapshot } from "@/runtime/host-runtime";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -27,17 +22,20 @@ import {
 } from "@/components/ui/dropdown-menu";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { MENU_ITEM_HEIGHT } from "@/components/ui/menu/menu-geometry";
-import { useToast } from "@/contexts/toast-context";
 import { openServiceUrl } from "@/utils/open-service-url";
-import {
-  resolveWorkspaceScriptLink,
-  type WorkspaceScriptLinkKind,
-  type WorkspaceScriptLinkTarget,
+import type {
+  WorkspaceScriptLinkKind,
+  WorkspaceScriptLinkTarget,
 } from "@/utils/workspace-script-links";
 import type { Theme } from "@/styles/theme";
-import { useWorkspaceServiceRoutePreferencesStore } from "@/workspace-service-routes/store";
 import { buttonControlHeight, HEADER_CONTROL_HEIGHT } from "@/components/ui/control-geometry";
 import { extraMutedIconColorMapping } from "@/components/ui/icon-color";
+import { ExitCodeBadge, routeLabelKey, ScriptIcon } from "./script-marks";
+import { scriptToneColorMapping } from "./script-status";
+import {
+  useWorkspaceScriptActions,
+  type WorkspaceScriptActions,
+} from "./use-workspace-script-actions";
 
 type RowActionIcon = "copy" | "open" | "restart" | "start" | "stop" | "terminal";
 
@@ -50,37 +48,23 @@ interface WorkspaceScriptsButtonProps {
   onViewTerminal?: (terminalId: string) => void;
   onOpenUrlInBrowserTab?: (url: string) => void;
   hideLabels?: boolean;
-  presentation?: "split" | "ghost";
 }
 
 const ThemedPlay = withUnistyles(Play);
 const ThemedSquareTerminal = withUnistyles(SquareTerminal);
-const ThemedGlobe = withUnistyles(Globe);
 const ThemedChevronDown = withUnistyles(ChevronDown);
 const ThemedEye = withUnistyles(Eye);
 const ThemedCopy = withUnistyles(Copy);
 const ThemedRotateCw = withUnistyles(RotateCw);
 const ThemedSquare = withUnistyles(Square);
 
-const GHOST_TRIGGER_ICON_SIZE = 16;
-
 const foregroundColorMapping = (theme: Theme) => ({
   color: theme.colors.foreground,
 });
 const mutedColorMapping = (theme: Theme) => ({
   color: theme.colors.foregroundMuted,
 });
-const blueColorMapping = (theme: Theme) => ({
-  color: theme.colors.palette.blue[500],
-});
-const greenColorMapping = (theme: Theme) => ({
-  color: theme.colors.palette.green[500],
-});
-const redColorMapping = (theme: Theme) => ({
-  color: theme.colors.palette.red[500],
-});
 const playFillTransparent = { fill: "transparent" };
-const ghostPlayStroke = { strokeWidth: 1.5 };
 
 interface ScriptRowActionButtonProps {
   accessibilityLabel: string;
@@ -163,23 +147,7 @@ interface ServiceLinkRowProps {
   targets: WorkspaceScriptLinkTarget[];
   scriptName: string;
   onSelectKind: (kind: WorkspaceScriptLinkKind) => void;
-  onCopy: (url: string, label: string) => void;
-}
-
-function routeLabelKey(
-  kind: WorkspaceScriptLinkKind,
-):
-  | "workspace.scripts.routes.public"
-  | "workspace.scripts.routes.paseo"
-  | "workspace.scripts.routes.direct" {
-  switch (kind) {
-    case "public":
-      return "workspace.scripts.routes.public";
-    case "paseo":
-      return "workspace.scripts.routes.paseo";
-    case "direct":
-      return "workspace.scripts.routes.direct";
-  }
+  onCopy: (target: WorkspaceScriptLinkTarget) => void;
 }
 
 function ServiceRouteOption({
@@ -298,12 +266,12 @@ function ServiceLinkRow({
 }: ServiceLinkRowProps): ReactElement {
   const { t } = useTranslation();
   const closeMenu = useDropdownMenuClose();
-  const { label, url } = selectedTarget;
+  const { label } = selectedTarget;
 
   const handleCopy = useCallback(() => {
     closeMenu();
-    onCopy(url, label);
-  }, [url, label, onCopy, closeMenu]);
+    onCopy(selectedTarget);
+  }, [selectedTarget, onCopy, closeMenu]);
 
   return (
     <View style={styles.hostRow}>
@@ -333,84 +301,29 @@ function ServiceLinkRow({
   );
 }
 
-function ExitCodeBadge({ code }: { code: number }): ReactElement {
-  const { t } = useTranslation();
-  const exitTextStyle =
-    code === 0 ? styles.exitBadgeText : [styles.exitBadgeText, styles.exitBadgeTextError];
-  return (
-    <View style={styles.exitBadge}>
-      <Text style={exitTextStyle}>{t("workspace.scripts.states.exitCode", { code })}</Text>
-    </View>
-  );
-}
-
 interface ScriptRowProps {
   script: WorkspaceDescriptor["scripts"][number];
   liveTerminalIdSet: Set<string>;
-  activeConnection: ReturnType<typeof useHostRuntimeSnapshot> extends infer R
-    ? R extends { activeConnection: infer A }
-      ? A
-      : null
-    : null;
-  isStartPending: boolean;
-  isStopPending: boolean;
-  onStartScript: (scriptName: string) => void;
-  onStopScript: (scriptName: string) => void;
-  onRestartScript: (scriptName: string) => void;
-  onCopyUrl: (url: string, label: string) => void;
-  preferredRouteKind: WorkspaceScriptLinkKind | null;
-  onSelectRouteKind: (kind: WorkspaceScriptLinkKind) => void;
+  actions: WorkspaceScriptActions;
   onViewTerminal?: (terminalId: string) => void;
   onOpenUrlInBrowserTab?: (url: string) => void;
 }
 
-function resolveScriptIconColorMapping(args: {
-  script: WorkspaceDescriptor["scripts"][number];
-  isService: boolean;
-  isRunning: boolean;
-}): (theme: Theme) => { color: string } {
-  const { script, isService, isRunning } = args;
-  if (isService) {
-    if (isRunning && script.health === "healthy") return greenColorMapping;
-    if (isRunning && script.health === "unhealthy") return redColorMapping;
-    if (isRunning) return blueColorMapping;
-    return mutedColorMapping;
-  }
-  if (isRunning) return blueColorMapping;
-  return mutedColorMapping;
-}
-
 function ScriptRow({
   script,
   liveTerminalIdSet,
-  activeConnection,
-  isStartPending,
-  isStopPending,
-  onStartScript,
-  onStopScript,
-  onRestartScript,
-  onCopyUrl,
-  preferredRouteKind,
-  onSelectRouteKind,
+  actions,
   onViewTerminal,
   onOpenUrlInBrowserTab,
 }: ScriptRowProps): ReactElement {
   const { t } = useTranslation();
   const isRunning = script.lifecycle === "running";
-  const isService = (script.type ?? "service") === "service";
   const exitCode = script.exitCode ?? null;
-  const serviceLink = resolveWorkspaceScriptLink({ script, activeConnection });
-  const selectedLink =
-    isService && isRunning
-      ? (serviceLink.targets.find((target) => target.kind === preferredRouteKind) ??
-        serviceLink.primary)
-      : null;
+  const { selected: selectedLink, targets: linkTargets } = actions.resolveLinks(script);
   const liveTerminalId =
     script.terminalId && liveTerminalIdSet.has(script.terminalId) ? script.terminalId : null;
-
-  const iconColorMapping = resolveScriptIconColorMapping({ script, isService, isRunning });
-  const ScriptIcon = isService ? ThemedGlobe : ThemedSquareTerminal;
   const showExitBadge = !isRunning && exitCode !== null;
+  const { start, stop, restart } = actions;
   const closeMenu = useDropdownMenuClose();
 
   const handleOpenService = useCallback(() => {
@@ -424,16 +337,16 @@ function ScriptRow({
   }, [liveTerminalId, onViewTerminal]);
 
   const handleRun = useCallback(() => {
-    onStartScript(script.scriptName);
-  }, [onStartScript, script.scriptName]);
+    start(script.scriptName);
+  }, [start, script.scriptName]);
 
   const handleStop = useCallback(() => {
-    onStopScript(script.scriptName);
-  }, [onStopScript, script.scriptName]);
+    stop(script.scriptName);
+  }, [stop, script.scriptName]);
 
   const handleRestart = useCallback(() => {
-    onRestartScript(script.scriptName);
-  }, [onRestartScript, script.scriptName]);
+    restart(script.scriptName);
+  }, [restart, script.scriptName]);
 
   const scriptNameStyle = useMemo(
     () => (isRunning ? [styles.scriptName, styles.scriptNameActive] : styles.scriptName),
@@ -471,7 +384,7 @@ function ScriptRow({
         scriptName: script.scriptName,
       })}
       testID={`workspace-scripts-stop-${script.scriptName}`}
-      disabled={isStopPending}
+      disabled={actions.isStopPending}
       icon="stop"
       onPress={handleStop}
       tooltipLabel={t("workspace.scripts.actions.stop")}
@@ -482,7 +395,7 @@ function ScriptRow({
         scriptName: script.scriptName,
       })}
       testID={`workspace-scripts-start-${script.scriptName}`}
-      disabled={isStartPending}
+      disabled={actions.isStartPending}
       icon="start"
       onPress={handleRun}
       tooltipLabel={t("workspace.scripts.actions.run")}
@@ -497,7 +410,7 @@ function ScriptRow({
       })}
     >
       <View style={styles.scriptHeader}>
-        <ScriptIcon size={14} uniProps={iconColorMapping} style={styles.scriptIcon} />
+        <ScriptIcon script={script} size={14} />
         <Text style={scriptNameStyle} numberOfLines={1}>
           {script.scriptName}
         </Text>
@@ -511,7 +424,7 @@ function ScriptRow({
               scriptName: script.scriptName,
             })}
             testID={`workspace-scripts-restart-${script.scriptName}`}
-            disabled={isStopPending}
+            disabled={actions.isStopPending}
             icon="restart"
             onPress={handleRestart}
             tooltipLabel={t("workspace.scripts.actions.restart")}
@@ -523,10 +436,10 @@ function ScriptRow({
         <View style={styles.hostList}>
           <ServiceLinkRow
             selectedTarget={selectedLink}
-            targets={serviceLink.targets}
+            targets={linkTargets}
             scriptName={script.scriptName}
-            onSelectKind={onSelectRouteKind}
-            onCopy={onCopyUrl}
+            onSelectKind={actions.selectRoute}
+            onCopy={actions.copyUrl}
           />
         </View>
       ) : null}
@@ -543,142 +456,35 @@ export function WorkspaceScriptsButton({
   onViewTerminal,
   onOpenUrlInBrowserTab,
   hideLabels,
-  presentation = "split",
 }: WorkspaceScriptsButtonProps): ReactElement | null {
   const { t } = useTranslation();
-  const toast = useToast();
-  const client = useSessionStore((state) => state.sessions[serverId]?.client ?? null);
-  const activeConnection = useHostRuntimeSnapshot(serverId)?.activeConnection ?? null;
-  const preferredRouteKind = useWorkspaceServiceRoutePreferencesStore(
-    (state) => state.byServerId[serverId] ?? null,
-  );
-  const setPreferredRoute = useWorkspaceServiceRoutePreferencesStore(
-    (state) => state.setPreferredRoute,
-  );
+  const actions = useWorkspaceScriptActions({
+    serverId,
+    workspaceId,
+    scripts,
+    onScriptTerminalStarted,
+  });
   const liveTerminalIdSet = useMemo(() => new Set(liveTerminalIds), [liveTerminalIds]);
-  const pendingRestartRef = useRef<Set<string>>(new Set());
-
-  const startScriptMutation = useMutation({
-    mutationFn: async (scriptName: string) => {
-      if (!client) {
-        throw new Error(t("common.errors.daemonClientUnavailable"));
-      }
-      const result = await client.startWorkspaceScript(workspaceId, scriptName);
-      if (result.error) {
-        throw new Error(result.error);
-      }
-      return result;
-    },
-    onError: (error, scriptName) => {
-      toast.show(
-        error instanceof Error
-          ? error.message
-          : t("workspace.scripts.states.startFailed", { scriptName }),
-        {
-          variant: "error",
-        },
-      );
-    },
-    onSuccess: (result) => {
-      if (result.terminalId) {
-        onScriptTerminalStarted?.(result.terminalId);
-      }
-    },
-  });
-  const startScript = startScriptMutation.mutate;
-
-  const stopScriptMutation = useMutation({
-    mutationFn: async (scriptName: string) => {
-      if (!client) {
-        throw new Error(t("common.errors.daemonClientUnavailable"));
-      }
-      const terminalId = scripts.find((s) => s.scriptName === scriptName)?.terminalId;
-      if (!terminalId) {
-        throw new Error(t("workspace.scripts.states.stopFailed", { scriptName }));
-      }
-      const result = await client.killTerminal(terminalId);
-      if (!result.success) {
-        throw new Error(t("workspace.scripts.states.stopFailed", { scriptName }));
-      }
-    },
-    onError: (error, scriptName) => {
-      pendingRestartRef.current.delete(scriptName);
-      toast.show(
-        error instanceof Error
-          ? error.message
-          : t("workspace.scripts.states.stopFailed", { scriptName }),
-        {
-          variant: "error",
-        },
-      );
-    },
-  });
-
-  // Restart = kill the script terminal, then start again once the daemon
-  // reports the script as stopped (it tears the runtime entry down on exit).
-  useEffect(() => {
-    const pending = pendingRestartRef.current;
-    if (pending.size === 0) return;
-    for (const script of scripts) {
-      if (!pending.has(script.scriptName) || script.lifecycle === "running") continue;
-      pending.delete(script.scriptName);
-      startScript(script.scriptName);
-    }
-  }, [scripts, startScript]);
 
   const triggerStyle = useCallback(
     ({ hovered, pressed, open }: { hovered: boolean; pressed: boolean; open: boolean }) => [
-      presentation === "ghost" ? styles.ghostButton : styles.splitButtonPrimary,
-      (hovered || pressed || open) &&
-        (presentation === "ghost" ? styles.ghostButtonHovered : styles.splitButtonPrimaryHovered),
+      styles.splitButtonPrimary,
+      (hovered || pressed || open) && styles.splitButtonPrimaryHovered,
     ],
-    [presentation],
-  );
-
-  const handleStartScript = useCallback(
-    (scriptName: string) => startScriptMutation.mutate(scriptName),
-    [startScriptMutation],
-  );
-
-  const handleStopScript = useCallback(
-    (scriptName: string) => stopScriptMutation.mutate(scriptName),
-    [stopScriptMutation],
-  );
-
-  const handleRestartScript = useCallback(
-    (scriptName: string) => {
-      pendingRestartRef.current.add(scriptName);
-      stopScriptMutation.mutate(scriptName);
-    },
-    [stopScriptMutation],
-  );
-
-  const handleCopyUrl = useCallback(
-    (url: string, label: string) => {
-      void Clipboard.setStringAsync(url);
-      toast.copied(label);
-    },
-    [toast],
-  );
-
-  const handleSelectRouteKind = useCallback(
-    (kind: WorkspaceScriptLinkKind) => setPreferredRoute(serverId, kind),
-    [serverId, setPreferredRoute],
+    [],
   );
 
   if (scripts.length === 0) {
     return null;
   }
 
+  // The trigger only says whether anything runs; health is for the rows inside.
   const hasAnyRunning = scripts.some((s) => s.lifecycle === "running");
-  const triggerPlayMapping = hasAnyRunning ? blueColorMapping : mutedColorMapping;
-  const triggerIconSize = presentation === "ghost" ? GHOST_TRIGGER_ICON_SIZE : 14;
-  const triggerPlayProps =
-    presentation === "ghost" ? { ...playFillTransparent, ...ghostPlayStroke } : playFillTransparent;
+  const triggerPlayMapping = scriptToneColorMapping(hasAnyRunning ? "running" : "idle");
 
   return (
     <View style={styles.row}>
-      <View style={presentation === "ghost" ? styles.ghostButtonFrame : styles.splitButton}>
+      <View style={styles.splitButton}>
         <DropdownMenu>
           <DropdownMenuTrigger
             testID="workspace-scripts-button"
@@ -687,17 +493,11 @@ export function WorkspaceScriptsButton({
             accessibilityLabel={t("workspace.scripts.accessibility.trigger")}
           >
             <View style={styles.splitButtonContent}>
-              <ThemedPlay
-                size={triggerIconSize}
-                uniProps={triggerPlayMapping}
-                {...triggerPlayProps}
-              />
+              <ThemedPlay size={14} uniProps={triggerPlayMapping} {...playFillTransparent} />
               {!hideLabels && (
                 <Text style={styles.splitButtonText}>{t("workspace.scripts.title")}</Text>
               )}
-              {presentation === "split" ? (
-                <ThemedChevronDown size={16} uniProps={extraMutedIconColorMapping} />
-              ) : null}
+              <ThemedChevronDown size={16} uniProps={extraMutedIconColorMapping} />
             </View>
           </DropdownMenuTrigger>
           <DropdownMenuContent
@@ -711,15 +511,7 @@ export function WorkspaceScriptsButton({
                 key={script.scriptName}
                 script={script}
                 liveTerminalIdSet={liveTerminalIdSet}
-                activeConnection={activeConnection}
-                isStartPending={startScriptMutation.isPending}
-                isStopPending={stopScriptMutation.isPending}
-                onStartScript={handleStartScript}
-                onStopScript={handleStopScript}
-                onRestartScript={handleRestartScript}
-                onCopyUrl={handleCopyUrl}
-                preferredRouteKind={preferredRouteKind}
-                onSelectRouteKind={handleSelectRouteKind}
+                actions={actions}
                 onViewTerminal={onViewTerminal}
                 onOpenUrlInBrowserTab={onOpenUrlInBrowserTab}
               />
@@ -750,21 +542,6 @@ const styles = StyleSheet.create((theme) => ({
     borderColor: theme.colors.borderAccent,
     overflow: "hidden",
   },
-  ghostButtonFrame: {
-    flexDirection: "row",
-    alignItems: "stretch",
-  },
-  ghostButton: {
-    width: theme.spacing[8],
-    height: theme.spacing[8],
-    padding: 0,
-    borderRadius: theme.borderRadius.lg,
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  ghostButtonHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
   splitButtonPrimary: {
     paddingHorizontal: {
       xs: theme.spacing[3],
@@ -798,9 +575,6 @@ const styles = StyleSheet.create((theme) => ({
     paddingHorizontal: theme.spacing[3],
     minHeight: MENU_ITEM_HEIGHT,
   },
-  scriptIcon: {
-    flexShrink: 0,
-  },
   scriptName: {
     fontSize: theme.fontSize.base,
     fontWeight: theme.fontWeight.normal,
@@ -844,21 +618,6 @@ const styles = StyleSheet.create((theme) => ({
   hostLabelActive: {
     color: theme.colors.foreground,
   },
-  exitBadge: {
-    paddingHorizontal: theme.spacing[1.5],
-    paddingVertical: 1,
-    borderRadius: 2,
-    backgroundColor: theme.colors.surface2,
-  },
-  exitBadgeText: {
-    fontSize: 10,
-    lineHeight: 12,
-    fontWeight: theme.fontWeight.medium,
-    color: theme.colors.foregroundMuted,
-  },
-  exitBadgeTextError: {
-    color: theme.colors.palette.red[300],
-  },
   iconActionButton: {
     padding: 2,
   },
diff --git a/packages/app/src/screens/workspace/scripts/workspace-scripts-menu-pages.tsx b/packages/app/src/screens/workspace/scripts/workspace-scripts-menu-pages.tsx
new file mode 100644
index 0000000000..3d14d9faff
--- /dev/null
+++ b/packages/app/src/screens/workspace/scripts/workspace-scripts-menu-pages.tsx
@@ -0,0 +1,416 @@
+import { useCallback, useMemo, type ReactElement } from "react";
+import { View } from "react-native";
+import { Copy, Eye, Play, RotateCw, Square, SquareTerminal } from "lucide-react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
+import {
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuSubTrigger,
+  type MenuPageDefinition,
+} from "@/components/ui/dropdown-menu";
+import type { WorkspaceDescriptor } from "@/stores/session-store";
+import type { Theme } from "@/styles/theme";
+import { openServiceUrl } from "@/utils/open-service-url";
+import type {
+  WorkspaceScriptLinkKind,
+  WorkspaceScriptLinkTarget,
+} from "@/utils/workspace-script-links";
+import { ExitCodeBadge, routeLabelKey, ScriptIcon } from "./script-marks";
+import { scriptToneColorMapping, summarizeScripts, type ScriptsSummary } from "./script-status";
+import {
+  useWorkspaceScriptActions,
+  type WorkspaceScriptActions,
+} from "./use-workspace-script-actions";
+
+type WorkspaceScript = WorkspaceDescriptor["scripts"][number];
+
+const ThemedPlay = withUnistyles(Play);
+const ThemedEye = withUnistyles(Eye);
+const ThemedSquareTerminal = withUnistyles(SquareTerminal);
+const ThemedCopy = withUnistyles(Copy);
+const ThemedRotateCw = withUnistyles(RotateCw);
+const ThemedSquare = withUnistyles(Square);
+
+const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+const playFillTransparent = { fill: "transparent" };
+
+const ROW_ICON_SIZE = 16;
+const TRAILING_ICON_SIZE = 14;
+
+const OPEN_SERVICE_ICON = <ThemedEye size={ROW_ICON_SIZE} uniProps={mutedColorMapping} />;
+const VIEW_TERMINAL_ICON = (
+  <ThemedSquareTerminal size={ROW_ICON_SIZE} uniProps={mutedColorMapping} />
+);
+const COPY_URL_ICON = <ThemedCopy size={ROW_ICON_SIZE} uniProps={mutedColorMapping} />;
+const RESTART_ICON = <ThemedRotateCw size={ROW_ICON_SIZE} uniProps={mutedColorMapping} />;
+const STOP_ICON = <ThemedSquare size={ROW_ICON_SIZE} uniProps={mutedColorMapping} />;
+const RUN_ICON = (
+  <ThemedPlay size={ROW_ICON_SIZE} uniProps={mutedColorMapping} {...playFillTransparent} />
+);
+
+const SCRIPTS_PAGE_ID = "workspace-scripts";
+
+function scriptPageId(scriptName: string): string {
+  return `${SCRIPTS_PAGE_ID}/${scriptName}`;
+}
+
+export interface UseWorkspaceScriptsMenuPagesInput {
+  serverId: string;
+  workspaceId: string;
+  scripts: WorkspaceDescriptor["scripts"];
+  liveTerminalIds: readonly string[];
+  onScriptTerminalStarted: (terminalId: string) => void;
+  onViewTerminal: (terminalId: string) => void;
+  onOpenUrlInBrowserTab: (url: string) => void;
+}
+
+export interface WorkspaceScriptsMenuPages {
+  /** The root row that leads to the scripts page. Null when the workspace has no scripts. */
+  trigger: ReactElement | null;
+  pages: MenuPageDefinition[];
+  /** A running service reports unhealthy, so the menu's own trigger should say so. */
+  needsAttention: boolean;
+}
+
+/**
+ * Workspace scripts as pages of a sheet menu: a Scripts row on the root, a page listing every
+ * script, and one page per script.
+ *
+ * Every script gets a page whether or not it runs, so stopping one from its own page flips that
+ * page to its stopped state instead of pulling it out from under the user.
+ *
+ * The actions live here rather than in a page, so call this from whatever owns the menu: a restart
+ * finishes after the sheet has closed.
+ */
+export function useWorkspaceScriptsMenuPages({
+  serverId,
+  workspaceId,
+  scripts,
+  liveTerminalIds,
+  onScriptTerminalStarted,
+  onViewTerminal,
+  onOpenUrlInBrowserTab,
+}: UseWorkspaceScriptsMenuPagesInput): WorkspaceScriptsMenuPages {
+  const { t } = useTranslation();
+  const actions = useWorkspaceScriptActions({
+    serverId,
+    workspaceId,
+    scripts,
+    onScriptTerminalStarted,
+  });
+  const summary = useMemo(() => summarizeScripts(scripts), [scripts]);
+
+  const trigger = useMemo(
+    () => (scripts.length === 0 ? null : <ScriptsMenuTrigger summary={summary} />),
+    [scripts.length, summary],
+  );
+
+  const pages = useMemo<MenuPageDefinition[]>(() => {
+    if (scripts.length === 0) return [];
+    const liveTerminalIdSet = new Set(liveTerminalIds);
+    return [
+      {
+        id: SCRIPTS_PAGE_ID,
+        title: t("workspace.scripts.title"),
+        content: <ScriptsPage scripts={scripts} actions={actions} />,
+      },
+      ...scripts.map((script) => ({
+        id: scriptPageId(script.scriptName),
+        title: script.scriptName,
+        content: (
+          <ScriptPage
+            script={script}
+            actions={actions}
+            liveTerminalId={
+              script.terminalId && liveTerminalIdSet.has(script.terminalId)
+                ? script.terminalId
+                : null
+            }
+            onViewTerminal={onViewTerminal}
+            onOpenUrlInBrowserTab={onOpenUrlInBrowserTab}
+          />
+        ),
+      })),
+    ];
+  }, [actions, liveTerminalIds, onOpenUrlInBrowserTab, onViewTerminal, scripts, t]);
+
+  return { trigger, pages, needsAttention: summary.tone === "unhealthy" };
+}
+
+/** The root row: ▶ in the colour of the whole set, and what is running as its value. */
+function ScriptsMenuTrigger({ summary }: { summary: ScriptsSummary }): ReactElement {
+  const { t } = useTranslation();
+  const leading = useMemo(
+    () => (
+      <ThemedPlay
+        size={ROW_ICON_SIZE}
+        uniProps={scriptToneColorMapping(summary.tone)}
+        {...playFillTransparent}
+      />
+    ),
+    [summary.tone],
+  );
+  const [onlyRunning] = summary.running;
+  const value =
+    summary.running.length > 1
+      ? t("workspace.scripts.states.runningCount", { count: summary.running.length })
+      : onlyRunning;
+  return (
+    <DropdownMenuSubTrigger
+      id={SCRIPTS_PAGE_ID}
+      value={value}
+      leading={leading}
+      testID="workspace-header-scripts"
+    >
+      {t("workspace.scripts.title")}
+    </DropdownMenuSubTrigger>
+  );
+}
+
+function ScriptsPage({
+  scripts,
+  actions,
+}: {
+  scripts: WorkspaceDescriptor["scripts"];
+  actions: WorkspaceScriptActions;
+}): ReactElement {
+  return (
+    <>
+      {scripts.map((script) =>
+        script.lifecycle === "running" ? (
+          <RunningScriptRow key={script.scriptName} script={script} />
+        ) : (
+          <StoppedScriptRow key={script.scriptName} script={script} actions={actions} />
+        ),
+      )}
+    </>
+  );
+}
+
+function RunningScriptRow({ script }: { script: WorkspaceScript }): ReactElement {
+  const { t } = useTranslation();
+  const leading = useMemo(() => <ScriptIcon script={script} size={ROW_ICON_SIZE} />, [script]);
+  return (
+    <DropdownMenuSubTrigger
+      id={scriptPageId(script.scriptName)}
+      value={t("workspace.scripts.states.running")}
+      leading={leading}
+      testID={`workspace-scripts-row-${script.scriptName}`}
+    >
+      {script.scriptName}
+    </DropdownMenuSubTrigger>
+  );
+}
+
+/** Pressing a stopped script runs it. Starting opens its terminal tab, so the sheet closes. */
+function StoppedScriptRow({
+  script,
+  actions,
+}: {
+  script: WorkspaceScript;
+  actions: WorkspaceScriptActions;
+}): ReactElement {
+  const { start } = actions;
+  const handleSelect = useCallback(() => start(script.scriptName), [start, script.scriptName]);
+  const exitCode = script.exitCode ?? null;
+  const leading = useMemo(() => <ScriptIcon script={script} size={ROW_ICON_SIZE} />, [script]);
+  const trailing = useMemo(
+    () => (
+      <View style={styles.trailing}>
+        {exitCode === null ? null : <ExitCodeBadge code={exitCode} />}
+        <ThemedPlay
+          size={TRAILING_ICON_SIZE}
+          uniProps={mutedColorMapping}
+          {...playFillTransparent}
+        />
+      </View>
+    ),
+    [exitCode],
+  );
+  return (
+    <DropdownMenuItem
+      leading={leading}
+      trailing={trailing}
+      disabled={actions.isStartPending}
+      onSelect={handleSelect}
+      testID={`workspace-scripts-row-${script.scriptName}`}
+    >
+      {script.scriptName}
+    </DropdownMenuItem>
+  );
+}
+
+interface ScriptPageProps {
+  script: WorkspaceScript;
+  actions: WorkspaceScriptActions;
+  liveTerminalId: string | null;
+  onViewTerminal: (terminalId: string) => void;
+  onOpenUrlInBrowserTab: (url: string) => void;
+}
+
+function ScriptPage(props: ScriptPageProps): ReactElement {
+  return props.script.lifecycle === "running" ? (
+    <RunningScriptPage {...props} />
+  ) : (
+    <StoppedScriptPage script={props.script} actions={props.actions} />
+  );
+}
+
+/**
+ * Rows that open something — the service, the terminal, the clipboard toast — close the sheet.
+ * Stop and the URL choice stay: the page is where their result shows.
+ */
+function RunningScriptPage({
+  script,
+  actions,
+  liveTerminalId,
+  onViewTerminal,
+  onOpenUrlInBrowserTab,
+}: ScriptPageProps): ReactElement {
+  const { t } = useTranslation();
+  const { scriptName } = script;
+  const { selected, targets } = actions.resolveLinks(script);
+  const { stop, restart, copyUrl, selectRoute } = actions;
+
+  const handleOpenService = useCallback(() => {
+    if (!selected) return;
+    void openServiceUrl(selected.url, { openInApp: onOpenUrlInBrowserTab });
+  }, [selected, onOpenUrlInBrowserTab]);
+  const handleViewTerminal = useCallback(() => {
+    if (liveTerminalId) onViewTerminal(liveTerminalId);
+  }, [liveTerminalId, onViewTerminal]);
+  const handleCopyUrl = useCallback(() => {
+    if (selected) copyUrl(selected);
+  }, [selected, copyUrl]);
+  const handleRestart = useCallback(() => restart(scriptName), [restart, scriptName]);
+  const handleStop = useCallback(() => stop(scriptName), [stop, scriptName]);
+
+  return (
+    <>
+      {selected ? (
+        <DropdownMenuItem
+          leading={OPEN_SERVICE_ICON}
+          onSelect={handleOpenService}
+          testID={`workspace-script-${scriptName}-open`}
+        >
+          {t("workspace.scripts.actions.openService")}
+        </DropdownMenuItem>
+      ) : null}
+      {liveTerminalId ? (
+        <DropdownMenuItem
+          leading={VIEW_TERMINAL_ICON}
+          onSelect={handleViewTerminal}
+          testID={`workspace-script-${scriptName}-view`}
+        >
+          {t("workspace.scripts.actions.view")}
+        </DropdownMenuItem>
+      ) : null}
+      {selected ? (
+        <DropdownMenuItem
+          leading={COPY_URL_ICON}
+          description={selected.label}
+          onSelect={handleCopyUrl}
+          testID={`workspace-script-${scriptName}-copy`}
+        >
+          {t("workspace.scripts.actions.copyUrl")}
+        </DropdownMenuItem>
+      ) : null}
+      <DropdownMenuItem
+        leading={RESTART_ICON}
+        disabled={actions.isStopPending}
+        onSelect={handleRestart}
+        testID={`workspace-script-${scriptName}-restart`}
+      >
+        {t("workspace.scripts.actions.restart")}
+      </DropdownMenuItem>
+      <DropdownMenuItem
+        leading={STOP_ICON}
+        disabled={actions.isStopPending}
+        closeOnSelect={false}
+        onSelect={handleStop}
+        testID={`workspace-script-${scriptName}-stop`}
+      >
+        {t("workspace.scripts.actions.stop")}
+      </DropdownMenuItem>
+      {selected && targets.length > 1 ? (
+        <>
+          <DropdownMenuSeparator />
+          {targets.map((target) => (
+            <ServiceRouteOption
+              key={target.kind}
+              scriptName={scriptName}
+              target={target}
+              selected={target.kind === selected.kind}
+              onSelect={selectRoute}
+            />
+          ))}
+        </>
+      ) : null}
+    </>
+  );
+}
+
+/** A pick-one URL route. Choosing one keeps the page open so the check moves under the thumb. */
+function ServiceRouteOption({
+  scriptName,
+  target,
+  selected,
+  onSelect,
+}: {
+  scriptName: string;
+  target: WorkspaceScriptLinkTarget;
+  selected: boolean;
+  onSelect: (kind: WorkspaceScriptLinkKind) => void;
+}): ReactElement {
+  const { t } = useTranslation();
+  const handleSelect = useCallback(() => onSelect(target.kind), [onSelect, target.kind]);
+  return (
+    <DropdownMenuItem
+      selected={selected}
+      showSelectedCheck
+      description={target.label}
+      closeOnSelect={false}
+      onSelect={handleSelect}
+      testID={`workspace-script-${scriptName}-route-${target.kind}`}
+    >
+      {t(routeLabelKey(target.kind))}
+    </DropdownMenuItem>
+  );
+}
+
+function StoppedScriptPage({
+  script,
+  actions,
+}: {
+  script: WorkspaceScript;
+  actions: WorkspaceScriptActions;
+}): ReactElement {
+  const { t } = useTranslation();
+  const { start } = actions;
+  const handleRun = useCallback(() => start(script.scriptName), [start, script.scriptName]);
+  const exitCode = script.exitCode ?? null;
+  const trailing = useMemo(
+    () => (exitCode === null ? null : <ExitCodeBadge code={exitCode} />),
+    [exitCode],
+  );
+  return (
+    <DropdownMenuItem
+      leading={RUN_ICON}
+      trailing={trailing}
+      disabled={actions.isStartPending}
+      onSelect={handleRun}
+      testID={`workspace-script-${script.scriptName}-run`}
+    >
+      {t("workspace.scripts.actions.run")}
+    </DropdownMenuItem>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  trailing: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1.5],
+  },
+}));
diff --git a/packages/app/src/screens/workspace/workspace-header-menu.tsx b/packages/app/src/screens/workspace/workspace-header-menu.tsx
index 2fb7176e10..74a95c7548 100644
--- a/packages/app/src/screens/workspace/workspace-header-menu.tsx
+++ b/packages/app/src/screens/workspace/workspace-header-menu.tsx
@@ -27,6 +27,10 @@ import {
 } from "@getpaseo/protocol/terminal-profiles";
 import { buildSettingsHostSectionRoute } from "@/utils/host-routes";
 import type { Theme } from "@/styles/theme";
+import {
+  useWorkspaceScriptsMenuPages,
+  type UseWorkspaceScriptsMenuPagesInput,
+} from "@/screens/workspace/scripts";
 
 const ThemedEllipsis = withUnistyles(Ellipsis);
 const ThemedCopy = withUnistyles(Copy);
@@ -49,6 +53,16 @@ function WorkspaceHeaderMenuTriggerIcon() {
   );
 }
 
+/** The ⋯ with a dot on it, for when something inside the menu needs looking at. */
+function WorkspaceHeaderMenuAttentionTriggerIcon() {
+  return (
+    <View>
+      <WorkspaceHeaderMenuTriggerIcon />
+      <View style={styles.attentionDot} testID="workspace-header-menu-attention" />
+    </View>
+  );
+}
+
 /**
  * The compact header buttons draw at 32pt, under the 44pt touch minimum, and sit flush against
  * each other — so the slop can only grow vertically. Widening it would put two buttons' slop over
@@ -192,6 +206,7 @@ function HeaderMenuProfileItem({
 
 export interface WorkspaceHeaderMenuMobileProps extends WorkspaceHeaderWorkspaceActions {
   normalizedServerId: string;
+  scripts: UseWorkspaceScriptsMenuPagesInput;
   showCreateBrowserTab: boolean;
   createTerminalDisabled: boolean;
   onCreateTerminalWithProfile: (profile: TerminalProfile) => void;
@@ -201,9 +216,13 @@ export interface WorkspaceHeaderMenuMobileProps extends WorkspaceHeaderWorkspace
 /**
  * Compact layouts have no tab strip. New agent and New terminal sit in the tab switcher's footer;
  * the rarer launches stay here alongside the workspace actions.
+ *
+ * The header has no room for a scripts button either, so scripts are a page of this menu, and the
+ * ⋯ carries a dot while a running service is unhealthy.
  */
 export function WorkspaceHeaderMenuMobile({
   normalizedServerId,
+  scripts,
   showCreateBrowserTab,
   createTerminalDisabled,
   onCreateTerminalWithProfile,
@@ -222,6 +241,7 @@ export function WorkspaceHeaderMenuMobile({
   const handleEditProfiles = useCallback(() => {
     router.push(buildSettingsHostSectionRoute(normalizedServerId, "terminals") as Href);
   }, [normalizedServerId, router]);
+  const scriptsMenu = useWorkspaceScriptsMenuPages(scripts);
 
   return (
     <DropdownMenu compactMode="sheet">
@@ -230,16 +250,26 @@ export function WorkspaceHeaderMenuMobile({
         style={triggerStyle}
         hitSlop={COMPACT_HEADER_BUTTON_HIT_SLOP}
         accessibilityRole="button"
-        accessibilityLabel={t("workspace.header.actions.workspaceActions")}
+        accessibilityLabel={
+          scriptsMenu.needsAttention
+            ? t("workspace.header.actions.workspaceActionsUnhealthy")
+            : t("workspace.header.actions.workspaceActions")
+        }
       >
-        <WorkspaceHeaderMenuTriggerIcon />
+        {scriptsMenu.needsAttention ? (
+          <WorkspaceHeaderMenuAttentionTriggerIcon />
+        ) : (
+          <WorkspaceHeaderMenuTriggerIcon />
+        )}
       </DropdownMenuTrigger>
       <DropdownMenuContent
         align="start"
         width={220}
         testID="workspace-header-menu"
+        pages={scriptsMenu.pages}
         sheetTitle={t("workspace.header.actions.workspaceActions")}
       >
+        {scriptsMenu.trigger}
         {showCreateBrowserTab ? (
           <DropdownMenuItem
             testID="workspace-header-new-browser"
@@ -272,9 +302,21 @@ export function WorkspaceHeaderMenuMobile({
   );
 }
 
-const styles = StyleSheet.create({
+const ATTENTION_DOT_SIZE = 6;
+
+const styles = StyleSheet.create((theme) => ({
   headerMenuProfileIconWrapper: {
     width: 16,
     height: 16,
   },
-});
+  // Same red as the Scripts row's unhealthy ▶, so the dot and the row it leads to agree.
+  attentionDot: {
+    position: "absolute",
+    top: -1,
+    right: -2,
+    width: ATTENTION_DOT_SIZE,
+    height: ATTENTION_DOT_SIZE,
+    borderRadius: theme.borderRadius.full,
+    backgroundColor: theme.colors.palette.red[500],
+  },
+}));
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index bfe131d008..d8a37b7156 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -47,7 +47,7 @@ import { SplitContainer } from "@/components/split-container";
 import { RetainedPanel } from "@/components/retained-panel";
 import { WorkspaceActions } from "@/git/workspace-actions";
 import { WorkspaceOpenInEditorButton } from "@/workspace/open-in-editor/button";
-import { WorkspaceScriptsButton } from "@/screens/workspace/workspace-scripts-button";
+import { WorkspaceScriptsButton } from "@/screens/workspace/scripts";
 import { ImportSessionSheet } from "@/components/import-session-sheet";
 import { useNavigateToImportedAgent } from "@/hooks/use-import-session";
 import { useToast } from "@/contexts/toast-context";
@@ -1026,6 +1026,15 @@ function WorkspaceScreenContent({
       .prepareWorkspaceRoute(normalizedServerId, normalizedWorkspaceId)
       .catch(() => undefined);
   }, [normalizedServerId, normalizedWorkspaceId, workspaceDescriptor]);
+  // The focused workspace keeps its script status live even when no sidebar or viewed agent
+  // timeline demands the directory. Retained, hidden workspaces release it.
+  useEffect(() => {
+    if (!isRouteFocused || !normalizedServerId || !normalizedWorkspaceId) return;
+    return getHostRuntimeStore().acquireScriptStatusDemand(
+      normalizedServerId,
+      normalizedWorkspaceId,
+    );
+  }, [isRouteFocused, normalizedServerId, normalizedWorkspaceId]);
   const workspaceScripts = getWorkspaceScripts(workspaceDescriptor);
   const { handleRetryHost, handleManageHost, handleDismissMissingWorkspace } =
     useWorkspaceRouteActions(normalizedServerId);
@@ -3373,6 +3382,26 @@ function WorkspaceScreenContent({
       isWorkspaceHeaderSubtitleDistinct,
     ],
   );
+  const compactHeaderScripts = useMemo(
+    () => ({
+      serverId: normalizedServerId,
+      workspaceId: normalizedWorkspaceId,
+      scripts: workspaceScripts,
+      liveTerminalIds,
+      onScriptTerminalStarted: handleScriptTerminalStarted,
+      onViewTerminal: handleViewScriptTerminal,
+      onOpenUrlInBrowserTab: handleOpenUrlInBrowserTab,
+    }),
+    [
+      normalizedServerId,
+      normalizedWorkspaceId,
+      workspaceScripts,
+      liveTerminalIds,
+      handleScriptTerminalStarted,
+      handleViewScriptTerminal,
+      handleOpenUrlInBrowserTab,
+    ],
+  );
   const compactWorkspaceHeader = useMemo(
     () =>
       isMobile ? (
@@ -3408,6 +3437,7 @@ function WorkspaceScreenContent({
           />
           <WorkspaceHeaderMenuMobile
             normalizedServerId={normalizedServerId}
+            scripts={compactHeaderScripts}
             currentBranchName={currentBranchName}
             showWorkspaceSetup={showWorkspaceSetup}
             showCreateBrowserTab={showCreateBrowserTab}
@@ -3426,6 +3456,7 @@ function WorkspaceScreenContent({
     [
       activeTabKey,
       canOpenImportSheet,
+      compactHeaderScripts,
       createTerminalDisabled,
       currentBranchName,
       explorerSidebarToggleAccessibilityState,

From 6017706cc147ae64c7b0f0a31fa94e304912b364 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 17:27:06 +0700
Subject: [PATCH 203/270] fix(app): avoid restoring composer focus on touch
 navigation (#7130)

Limit implicit pane and remount focus replay to the existing fine-pointer policy. Fullscreen keeps one editor mounted, so touch navigation does not need the restoration introduced for the former portal handoff.
---
 docs/floating-panels.md                       | 21 ++++---
 .../app/e2e/browser/composer-focus.spec.ts    | 56 +++++++++++++++++++
 packages/app/src/composer/input/input.tsx     | 16 ++++--
 packages/app/src/composer/keyboard-scope.tsx  |  6 +-
 4 files changed, 78 insertions(+), 21 deletions(-)

diff --git a/docs/floating-panels.md b/docs/floating-panels.md
index 1af71ac4c9..c183dc6615 100644
--- a/docs/floating-panels.md
+++ b/docs/floating-panels.md
@@ -204,10 +204,11 @@ still-mounted content, paints its own surface under the safe areas, and turns
 the surface translation off. The composer's single tree keeps the editing
 surface at the same position in both modes, so the mounted editor, its native
 buffer, selection, and focus survive the toggle and Send's clear always reaches
-the live input. The one remount left is a viewport crossing the compact
-breakpoint: the app shell swaps its gesture wrapper and the workspace screen
+the live input. A viewport crossing the compact breakpoint still remounts it:
+the app shell swaps its gesture wrapper and the workspace screen
 mounts tabs in different trees, so every screen below remounts. The draft owner
-restores the text and the editing session restores the caret and focus intent.
+restores the text and the editing session restores the caret. Focus restoration
+is limited to mouse-driven UIs, using the same fine-pointer policy as autofocus.
 New workspace keys its sessions by draft in the app-level store for the same
 reason. The centered form honors fullscreen by style alone: no centering, no
 translation, setup fields hidden, slot filling the stationary viewport. The
@@ -217,14 +218,12 @@ sheet suspends pane focus, and the composer gives up input from the moment the
 user asks for the compact agent list or explorer, before the panel's motion
 settles. Pane focus itself stays put under those panels: the agent panel reads
 it as "the user is in this chat" for attention clearing, and opening the agent
-list must not clear the attention it shows. Focus restoration follows pane
-focus, not the active composer. The editor keeps its focus intent only across
-a blur that lands while its pane is not the user's (a retained tab hidden, a
-sheet over it) and refocuses when the pane comes back. A blur while the pane is
-theirs drops the intent in every layout mode, and the keyboard the compact
-panels dismiss when they settle is such a blur, so closing the agent list or
-explorer never reopens the keyboard. Keying restoration on the active composer
-made that dismiss look like a hidden-tab blur and refocused on close.
+list must not clear the attention it shows. On mouse-driven UIs, focus restoration
+follows pane focus, not the active composer. Keying it on the active composer
+made sidebar dismissal look like a hidden-tab blur and refocused on close.
+Native and touch-web navigation must not replay old editor focus, including
+when blur arrives after pane deactivation or the editor unmounts before blur.
+Fullscreen toggles keep the editor mounted and need no focus restoration.
 The band beside the inline editor where the fullscreen glyph sits is the input's
 own right padding, so a tap anywhere in it focuses the editor whether or not the
 glyph shows. On web the slot is a fixed box over the visible viewport, which is
diff --git a/packages/app/e2e/browser/composer-focus.spec.ts b/packages/app/e2e/browser/composer-focus.spec.ts
index 9119791806..c81624ff7d 100644
--- a/packages/app/e2e/browser/composer-focus.spec.ts
+++ b/packages/app/e2e/browser/composer-focus.spec.ts
@@ -15,6 +15,9 @@ import {
   typeIntoFocusedComposer,
 } from "../support/helpers/composer";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { createMockIdleAgent, openWorkspaceWithAgents } from "../support/helpers/archive-tab";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { switchComposerTabWithKeyboard } from "../support/helpers/composer";
 import {
   closeMobileAgentSidebar,
   closeMobileExplorer,
@@ -167,6 +170,59 @@ test.describe("touch screen wide enough for the desktop layout", () => {
   // composer there raises the on-screen keyboard over the conversation.
   test.use({ viewport: { width: 1024, height: 768 }, isMobile: true, hasTouch: true });
 
+  test("remounting an inline composer does not restore focus on touch", async ({ page }) => {
+    const agent = await seedMockAgentWorkspace({
+      repoPrefix: "composer-touch-remount-",
+      title: "Touch remount",
+    });
+    try {
+      await openAgentRoute(page, agent);
+      await composerLocator(page).fill("Keep this draft through resize");
+      await expectComposerFocused(page);
+      await resizeComposerViewport(page, "portrait");
+      await expectComposerDraft(page, "Keep this draft through resize");
+      await expectComposerNotFocused(page);
+      await composerLocator(page).tap();
+      await expectComposerFocused(page);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+
+  test("returning to an inactive inline composer does not restore focus on touch", async ({
+    page,
+  }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "composer-touch-retained-" });
+    try {
+      const first = await createMockIdleAgent(workspace.client, {
+        cwd: workspace.repoPath,
+        workspaceId: workspace.workspaceId,
+        title: "First touch chat",
+      });
+      const second = await createMockIdleAgent(workspace.client, {
+        cwd: workspace.repoPath,
+        workspaceId: workspace.workspaceId,
+        title: "Second touch chat",
+      });
+      await openWorkspaceWithAgents(page, [first, second]);
+      await composerLocator(page).fill("Keep this touch draft");
+      await expectComposerFocused(page);
+      // An external keyboard changes tabs without a pointer click blurring the
+      // editor first. The device still has a touch-primary focus policy.
+      await switchComposerTabWithKeyboard(page, "previous");
+      await expectComposerDraft(page, "");
+      await switchComposerTabWithKeyboard(page, "next");
+      await expectComposerDraft(page, "Keep this touch draft");
+      await expectComposerNotFocused(page);
+      await composerLocator(page).tap();
+      await expectComposerFocused(page);
+      await typeIntoFocusedComposer(page, " after return");
+      await expectComposerDraft(page, "Keep this touch draft after return");
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
   test("opening an agent leaves the composer unfocused", async ({ page }) => {
     const agent = await seedMockAgentWorkspace({
       repoPrefix: "composer-focus-touch-",
diff --git a/packages/app/src/composer/input/input.tsx b/packages/app/src/composer/input/input.tsx
index 7346095d5b..c64d87aba1 100644
--- a/packages/app/src/composer/input/input.tsx
+++ b/packages/app/src/composer/input/input.tsx
@@ -28,6 +28,7 @@ import { useTranslation } from "react-i18next";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 import { ArrowUp, Mic, MicOff, CornerDownLeft, Plus, Square } from "lucide-react-native";
 import { useDictation } from "@/hooks/use-dictation";
+import { hasFinePointer } from "@/hooks/use-fine-pointer";
 import { DictationOverlay } from "@/components/dictation-controls";
 import { RealtimeVoiceOverlay } from "@/components/realtime-voice-overlay";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
@@ -1289,12 +1290,14 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       webTextareaRef.current = element;
       setWebTextArea(element);
     }, []);
-    // Focus intent outlives a blur only while the pane is not the user's pane (a retained
-    // tab hidden, a sheet over it); the pane coming back restores focus. A blur while the
-    // pane is theirs drops it, whatever the layout mode: the user dismissed the keyboard,
-    // or a compact overlay panel did on their behalf, and nothing later refocuses.
+    // Only mouse-driven UIs restore editing focus on navigation. Touch users return
+    // to the conversation; replaying old focus would reopen their software keyboard.
+    // Read pointer capability when restoring, without making a pointer change itself
+    // a focus trigger.
     useLayoutEffect(() => {
-      if (isPaneFocused && focusIntentRef.current) textInputRef.current?.focus();
+      if (isPaneFocused && focusIntentRef.current && hasFinePointer()) {
+        textInputRef.current?.focus();
+      }
     }, [isPaneFocused]);
     // The compact and desktop screens mount the editor in different trees, so a
     // viewport that crosses the breakpoint remounts it. The draft owner brings the
@@ -1311,7 +1314,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         retainedSelectionRef.current = retained.selection;
         selectionRef.current = selection;
         textInputRef.current?.setSelection(selection);
-        if (retained.focused) {
+        if (retained.focused && hasFinePointer()) {
           focusIntentRef.current = true;
           if (paneFocusedRef.current) textInputRef.current?.focus();
         }
@@ -1818,6 +1821,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     }, [onFocusChange]);
 
     const handleInputBlur = useCallback(() => {
+      // A blur in the active pane is a dismissal; only hiding the pane preserves intent.
       if (paneFocusedRef.current) focusIntentRef.current = false;
       isInputFocusedRef.current = false;
       setIsInputFocused(false);
diff --git a/packages/app/src/composer/keyboard-scope.tsx b/packages/app/src/composer/keyboard-scope.tsx
index 20b57dde28..f8087bf420 100644
--- a/packages/app/src/composer/keyboard-scope.tsx
+++ b/packages/app/src/composer/keyboard-scope.tsx
@@ -8,10 +8,8 @@ import {
 
 interface ComposerKeyboardScopeValue {
   /**
-   * The pane this composer sits in is the user's pane. Focus restoration follows it:
-   * the editor keeps its focus intent across blurs that happen while the pane is not
-   * the user's (a retained tab hidden, a sheet over it) and brings focus back when
-   * the pane is theirs again.
+   * The pane this composer sits in is the user's pane. Mouse-driven focus
+   * restoration follows it; touch navigation does not restore editor focus.
    */
   isPaneFocused: boolean;
   /**

From 8d9a7123ba38353029352a93a85cca7160af6f07 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 18:05:11 +0700
Subject: [PATCH 204/270] feat(app): polish compact header, composer, and
 settings menu (#7129)

Header islands lose their filled background and shadow; the round tap
highlight stays. The floating header's fade now carries the icon contrast
the island fill used to give, so it stays solid through the header and
runs a longer tail into the content. The fade lives inside the overlay
because Android clips children that overhang their parent, and keeps
three gradient stops because Android rendered a four-stop version far
more transparent than specified.

Single-line header titles read one step larger. The compact composer
gets a soft drop shadow. The compact settings root groups App and Host
into islands of tiles, driven by breakpoint style values so desktop
keeps its plain list.
---
 .../browser/compact-workspace-header.spec.ts  | 16 ++--
 .../src/components/floating-header/index.tsx  | 64 +++++----------
 .../src/components/headers/compact-header.tsx | 23 ++++--
 packages/app/src/components/ui/edge-fade.tsx  | 72 +++++++++++++++++
 packages/app/src/composer/input/input.tsx     |  7 +-
 packages/app/src/screens/settings-screen.tsx  | 77 +++++++++++--------
 6 files changed, 167 insertions(+), 92 deletions(-)
 create mode 100644 packages/app/src/components/ui/edge-fade.tsx

diff --git a/packages/app/e2e/browser/compact-workspace-header.spec.ts b/packages/app/e2e/browser/compact-workspace-header.spec.ts
index 6033f147e8..be26dbb8d1 100644
--- a/packages/app/e2e/browser/compact-workspace-header.spec.ts
+++ b/packages/app/e2e/browser/compact-workspace-header.spec.ts
@@ -50,11 +50,13 @@ async function openNamedWorkspace(page: Page, names: typeof labels.long) {
 }
 
 async function expectHeaderContentsFit(page: Page, info: TestInfo, long: boolean) {
+  const menu = page.getByTestId("menu-button").filter({ visible: true });
   const title = page.getByTestId("workspace-header-title");
   const project = page.getByTestId("workspace-header-subtitle");
   const badge = page.getByTestId(`host-badge-${getServerId()}`).filter({ visible: true });
   const trigger = page.getByRole("button", { name: /Switch tabs/ });
   const measure = async () => ({
+    menu: await menu.boundingBox(),
     title: await title.boundingBox(),
     project: await project.boundingBox(),
     badge: await badge.boundingBox(),
@@ -66,23 +68,21 @@ async function expectHeaderContentsFit(page: Page, info: TestInfo, long: boolean
   await page.screenshot({ path: info.outputPath("header.png") });
   await expect(async () => {
     const bounds = await measure();
+    expect(bounds.menu).not.toBeNull();
     expect(bounds.title).not.toBeNull();
     expect(bounds.project).not.toBeNull();
     expect(bounds.badge).not.toBeNull();
     expect(bounds.icon).not.toBeNull();
     expect(bounds.trigger).not.toBeNull();
-    // Approved geometry: 12px outside margin, 46px leading island, 8px title gap.
-    expect(bounds.title!.x).toBe(66);
+    // The labels sit between the menu button and the actions without overlapping either.
+    expect(bounds.title!.x).toBeGreaterThan(bounds.menu!.x + bounds.menu!.width);
     expect(bounds.project!.x).toBe(bounds.title!.x);
-    expect(bounds.trigger!.width).toBe(32);
-    expect(bounds.trigger!.height).toBe(32);
-    // The action frame starts 7px inside its island; preserve the 8px gap before it.
-    const contentRight = bounds.trigger!.x - 15;
     for (const box of [bounds.title!, bounds.project!, bounds.badge!, bounds.icon!]) {
-      expect(box.x + box.width).toBeLessThanOrEqual(contentRight + 1);
+      expect(box.x + box.width).toBeLessThan(bounds.trigger!.x);
     }
     expect(bounds.project!.width).toBeGreaterThan(20);
-    expect(bounds.icon!.width).toBe(12);
+    // Long labels truncate instead of squeezing the host icon.
+    expect(bounds.icon!.width).toBe(bounds.icon!.height);
     expect(bounds.badge!.x).toBeGreaterThan(bounds.project!.x + bounds.project!.width);
     expect(bounds.titleTruncated).toBe(long);
     expect(bounds.projectTruncated).toBe(long);
diff --git a/packages/app/src/components/floating-header/index.tsx b/packages/app/src/components/floating-header/index.tsx
index b18a8731b0..6e4cd525f1 100644
--- a/packages/app/src/components/floating-header/index.tsx
+++ b/packages/app/src/components/floating-header/index.tsx
@@ -1,11 +1,12 @@
-import { useCallback, useId, useState, type ReactNode } from "react";
+import { useCallback, useState, type ReactNode } from "react";
 import { View, type LayoutChangeEvent } from "react-native";
-import Svg, { Defs, LinearGradient as SvgLinearGradient, Rect, Stop } from "react-native-svg";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import type { Theme } from "@/styles/theme";
+import { StyleSheet } from "react-native-unistyles";
+import { EdgeFade } from "@/components/ui/edge-fade";
 
 /** How far the fade runs past the header's bottom edge, so content dissolves instead of clipping. */
-const FADE_OVERHANG = 24;
+const FADE_OVERHANG = 48;
+/** Share of the fade that stays opaque, so the header's title and icons keep contrast. */
+const FADE_SOLID_FRACTION = 0.57;
 
 interface FloatingHeaderLayoutProps {
   header: ReactNode;
@@ -29,51 +30,22 @@ export function FloatingHeaderLayout({ header, floating, children }: FloatingHea
       {floating ? null : header}
       <View style={styles.content}>{children(floating ? headerHeight : 0)}</View>
       {floating ? (
-        <View style={styles.overlay} pointerEvents="box-none" onLayout={handleHeaderLayout}>
-          <FloatingHeaderFade />
-          {header}
+        <View style={styles.overlay} pointerEvents="box-none">
+          <EdgeFade
+            edge="top"
+            solidFraction={FADE_SOLID_FRACTION}
+            backdrop="surfaceWorkspace"
+            style={styles.fade}
+          />
+          <View pointerEvents="box-none" onLayout={handleHeaderLayout}>
+            {header}
+          </View>
         </View>
       ) : null}
     </View>
   );
 }
 
-function FloatingHeaderFadeSvg({ gradientId, color }: { gradientId: string; color: string }) {
-  return (
-    <Svg width="100%" height="100%" preserveAspectRatio="none">
-      <Defs>
-        <SvgLinearGradient id={gradientId} x1="0%" y1="0%" x2="0%" y2="100%">
-          {/* Vary opacity rather than interpolating toward `transparent`, which crosses black in
-              some engines and leaves a grey fringe. */}
-          <Stop offset="0%" stopColor={color} stopOpacity={1} />
-          <Stop offset="50%" stopColor={color} stopOpacity={0.97} />
-          <Stop offset="75%" stopColor={color} stopOpacity={0.8} />
-          <Stop offset="100%" stopColor={color} stopOpacity={0} />
-        </SvgLinearGradient>
-      </Defs>
-      <Rect x="0" y="0" width="100%" height="100%" fill={`url(#${gradientId})`} />
-    </Svg>
-  );
-}
-
-const ThemedFloatingHeaderFadeSvg = withUnistyles(FloatingHeaderFadeSvg);
-const workspaceSurfaceColorMapping = (theme: Theme) => ({
-  color: theme.colors.surfaceWorkspace,
-});
-
-function FloatingHeaderFade() {
-  // React-generated ids contain characters that are invalid inside SVG fragment references.
-  const gradientId = `floating-header-fade-${useId().replace(/[^a-zA-Z0-9_-]/g, "")}`;
-  return (
-    <View style={styles.fade} pointerEvents="none">
-      <ThemedFloatingHeaderFadeSvg
-        gradientId={gradientId}
-        uniProps={workspaceSurfaceColorMapping}
-      />
-    </View>
-  );
-}
-
 const styles = StyleSheet.create({
   root: {
     flex: 1,
@@ -88,12 +60,14 @@ const styles = StyleSheet.create({
     top: 0,
     left: 0,
     right: 0,
+    // The fade's tail lives inside the overlay so Android does not clip it.
+    paddingBottom: FADE_OVERHANG,
   },
   fade: {
     position: "absolute",
     top: 0,
     left: 0,
     right: 0,
-    bottom: -FADE_OVERHANG,
+    bottom: 0,
   },
 });
diff --git a/packages/app/src/components/headers/compact-header.tsx b/packages/app/src/components/headers/compact-header.tsx
index aa66580fce..6ed2bddcbe 100644
--- a/packages/app/src/components/headers/compact-header.tsx
+++ b/packages/app/src/components/headers/compact-header.tsx
@@ -17,7 +17,6 @@ import type { ShortcutKey } from "@/utils/format-shortcut";
 
 const ThemedArrowLeft = withUnistyles(ArrowLeft);
 
-const ISLAND_PADDING = 7;
 const NO_SHORTCUT: ShortcutKey[] = [];
 
 interface CompactHeaderProps {
@@ -37,8 +36,9 @@ interface CompactHeaderProps {
 
 /**
  * The phone header: the navigation button and the screen's actions sit in islands, with the title
- * left-aligned between them. It has no background of its own, so it reads the same in flow and floating
- * over content (see `FloatingHeaderLayout`). Its height matches the old flat header, so anything
+ * left-aligned between them. Neither the header nor its islands draw a background, so it reads the
+ * same in flow and floating over content (see `FloatingHeaderLayout`, whose fade gives the icons
+ * contrast). Its height matches the old flat header, so anything
  * offset by the header height still lines up.
  */
 export function CompactHeader({
@@ -90,7 +90,11 @@ function CompactHeaderTitle({
   return (
     <>
       {title ? (
-        <Text style={styles.title} numberOfLines={1} testID={titleTestID}>
+        <Text
+          style={subtitle ? styles.title : styles.singleLineTitle}
+          numberOfLines={1}
+          testID={titleTestID}
+        >
           {title}
         </Text>
       ) : null}
@@ -146,10 +150,6 @@ const styles = StyleSheet.create((theme) => ({
   island: {
     flexDirection: "row",
     alignItems: "center",
-    padding: ISLAND_PADDING,
-    borderRadius: theme.borderRadius.full,
-    backgroundColor: theme.colors.surface2,
-    ...theme.shadow.sm,
   },
   title: {
     fontSize: theme.fontSize.base,
@@ -157,6 +157,13 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.foreground,
     textAlign: "left",
   },
+  // A title without a subtitle has the header to itself, so it reads one step larger.
+  singleLineTitle: {
+    fontSize: theme.fontSize.lg,
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foreground,
+    textAlign: "left",
+  },
   titleSkeleton: {
     width: 140,
     maxWidth: "100%",
diff --git a/packages/app/src/components/ui/edge-fade.tsx b/packages/app/src/components/ui/edge-fade.tsx
new file mode 100644
index 0000000000..de404aeed8
--- /dev/null
+++ b/packages/app/src/components/ui/edge-fade.tsx
@@ -0,0 +1,72 @@
+import { useId } from "react";
+import { View, type StyleProp, type ViewStyle } from "react-native";
+import Svg, { Defs, LinearGradient as SvgLinearGradient, Rect, Stop } from "react-native-svg";
+import { withUnistyles } from "react-native-unistyles";
+import type { Theme } from "@/styles/theme";
+
+type EdgeFadeBackdrop = "surface0" | "surfaceWorkspace";
+
+const backdropColorMappings: Record<EdgeFadeBackdrop, (theme: Theme) => { color: string }> = {
+  surface0: (theme) => ({ color: theme.colors.surface0 }),
+  surfaceWorkspace: (theme) => ({ color: theme.colors.surfaceWorkspace }),
+};
+
+interface EdgeFadeSvgProps {
+  gradientId: string;
+  color: string;
+  edge: "top" | "bottom";
+  solidFraction: number;
+}
+
+function EdgeFadeSvg({ gradientId, color, edge, solidFraction }: EdgeFadeSvgProps) {
+  const fromTop = edge === "top";
+  return (
+    <Svg width="100%" height="100%" preserveAspectRatio="none">
+      <Defs>
+        <SvgLinearGradient
+          id={gradientId}
+          x1="0%"
+          y1={fromTop ? "0%" : "100%"}
+          x2="0%"
+          y2={fromTop ? "100%" : "0%"}
+        >
+          {/* Vary opacity rather than interpolating toward `transparent`, which crosses black in
+              some engines and leaves a grey fringe. Keep it to three stops: Android rendered a
+              four-stop version far more transparent than its stops specify. */}
+          <Stop offset={0} stopColor={color} stopOpacity={1} />
+          <Stop offset={solidFraction} stopColor={color} stopOpacity={1} />
+          <Stop offset={1} stopColor={color} stopOpacity={0} />
+        </SvgLinearGradient>
+      </Defs>
+      <Rect x="0" y="0" width="100%" height="100%" fill={`url(#${gradientId})`} />
+    </Svg>
+  );
+}
+
+const ThemedEdgeFadeSvg = withUnistyles(EdgeFadeSvg);
+
+interface EdgeFadeProps {
+  /** The solid edge; content dissolves moving away from it. */
+  edge: "top" | "bottom";
+  /** Share of the fade, measured from the solid edge, that stays fully opaque. */
+  solidFraction: number;
+  backdrop: EdgeFadeBackdrop;
+  /** Position and size. Keep the fade inside its parent: Android clips overhanging children. */
+  style: StyleProp<ViewStyle>;
+}
+
+/** Dissolves content into the surface behind chrome that floats over it. */
+export function EdgeFade({ edge, solidFraction, backdrop, style }: EdgeFadeProps) {
+  // React-generated ids contain characters that are invalid inside SVG fragment references.
+  const gradientId = `edge-fade-${useId().replace(/[^a-zA-Z0-9_-]/g, "")}`;
+  return (
+    <View style={style} pointerEvents="none">
+      <ThemedEdgeFadeSvg
+        gradientId={gradientId}
+        edge={edge}
+        solidFraction={solidFraction}
+        uniProps={backdropColorMappings[backdrop]}
+      />
+    </View>
+  );
+}
diff --git a/packages/app/src/composer/input/input.tsx b/packages/app/src/composer/input/input.tsx
index c64d87aba1..c6c267a38f 100644
--- a/packages/app/src/composer/input/input.tsx
+++ b/packages/app/src/composer/input/input.tsx
@@ -1862,11 +1862,12 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     const inputWrapperCombinedStyle = useMemo(
       () => [
         styles.inputWrapper,
+        isCompact && !isFullscreen && styles.inputWrapperCompact,
         readOnly && styles.inputWrapperReadOnly,
         inputWrapperStyle,
         { opacity: surfacePresentation.input.opacity },
       ],
-      [inputWrapperStyle, readOnly, surfacePresentation.input.opacity],
+      [inputWrapperStyle, isCompact, isFullscreen, readOnly, surfacePresentation.input.opacity],
     );
     // `withUnistyles` maps this component's `style` into a `.hash > *` child
     // rule, which ties on specificity with react-native-web's own
@@ -2223,6 +2224,10 @@ const styles = StyleSheet.create((theme: Theme) => ({
         }
       : {}),
   },
+  // Lifts the composer off the chat it sits under on phones.
+  inputWrapperCompact: {
+    boxShadow: "0px 4px 16px rgba(0, 0, 0, 0.2)",
+  },
   // Dotted says "this surface is the same box, but there is nothing to type
   // into it" without swapping the border colour, which reads as an error state.
   inputWrapperReadOnly: {
diff --git a/packages/app/src/screens/settings-screen.tsx b/packages/app/src/screens/settings-screen.tsx
index 925607a858..3950c0778e 100644
--- a/packages/app/src/screens/settings-screen.tsx
+++ b/packages/app/src/screens/settings-screen.tsx
@@ -120,6 +120,7 @@ import { MetadataGenerationPage } from "@/screens/settings/metadata-generation-p
 import ProjectsScreen from "@/screens/projects-screen";
 import ProjectSettingsScreen from "@/screens/project-settings-screen";
 import { SETTINGS_DESKTOP_SIDEBAR_WIDTH, useIsCompactFormFactor } from "@/constants/layout";
+import { densityIconBox, densityIconSize } from "@/styles/density";
 import { useLocalDaemonServerId } from "@/hooks/use-is-local-daemon";
 import {
   type EnableBuiltInDaemonOption,
@@ -758,7 +759,7 @@ function SidebarSectionButton({
   isSelected,
   onSelect,
 }: SidebarSectionButtonProps) {
-  const { theme } = useUnistyles();
+  const { theme, rt } = useUnistyles();
   const handlePress = useCallback(() => {
     onSelect(itemId);
   }, [onSelect, itemId]);
@@ -775,7 +776,7 @@ function SidebarSectionButton({
       style={isSelected ? selectedSidebarItemStyle : sidebarItemStyle}
     >
       <IconComponent
-        size={theme.iconSize.md}
+        size={densityIconSize(rt, "md")}
         color={isSelected ? theme.colors.foreground : theme.colors.foregroundMuted}
         strokeWidth={SIDEBAR_ICON_STROKE_WIDTH}
       />
@@ -801,7 +802,7 @@ function SidebarHostSectionButton({
   isSelected,
   onSelect,
 }: SidebarHostSectionButtonProps) {
-  const { theme } = useUnistyles();
+  const { theme, rt } = useUnistyles();
   const handlePress = useCallback(() => {
     onSelect(itemId);
   }, [onSelect, itemId]);
@@ -819,7 +820,7 @@ function SidebarHostSectionButton({
       style={isSelected ? selectedSidebarItemStyle : sidebarItemStyle}
     >
       <IconComponent
-        size={theme.iconSize.md}
+        size={densityIconSize(rt, "md")}
         color={isSelected ? theme.colors.foreground : theme.colors.foregroundMuted}
         strokeWidth={SIDEBAR_ICON_STROKE_WIDTH}
       />
@@ -912,6 +913,16 @@ function HostPicker({
   );
 }
 
+/** A labelled group of sidebar rows. On compact layouts the rows sit together in one island. */
+function SidebarGroup({ label, children }: { label?: string; children: ReactNode }) {
+  return (
+    <View style={sidebarStyles.group}>
+      {label ? <Text style={sidebarStyles.groupLabel}>{label}</Text> : null}
+      <View style={sidebarStyles.island}>{children}</View>
+    </View>
+  );
+}
+
 interface SettingsSidebarProps {
   view: SettingsView;
   onSelectSection: (section: SettingsSectionSlug) => void;
@@ -933,7 +944,7 @@ function SettingsSidebar({
   activeHostServerId,
   layout,
 }: SettingsSidebarProps) {
-  const { theme } = useUnistyles();
+  const { theme, rt } = useUnistyles();
   const { t } = useTranslation();
   const hosts = useHosts();
   const localServerId = useLocalDaemonServerId();
@@ -960,8 +971,7 @@ function SettingsSidebar({
 
   const sidebarBody = (
     <>
-      <View style={sidebarStyles.list}>
-        <Text style={sidebarStyles.groupLabel}>{t("settings.groups.app")}</Text>
+      <SidebarGroup label={t("settings.groups.app")}>
         {items.map((item) => (
           <SidebarSectionButton
             key={item.id}
@@ -972,10 +982,9 @@ function SettingsSidebar({
             onSelect={onSelectSection}
           />
         ))}
-      </View>
+      </SidebarGroup>
       {hasHosts ? (
-        <View style={sidebarStyles.list}>
-          <Text style={sidebarStyles.groupLabel}>{t("settings.groups.host")}</Text>
+        <SidebarGroup label={t("settings.groups.host")}>
           <HostPicker
             activeServerId={activeHostServerId}
             sortedHosts={sortedHosts}
@@ -993,9 +1002,9 @@ function SettingsSidebar({
               onSelect={onSelectHostSection}
             />
           ))}
-        </View>
+        </SidebarGroup>
       ) : (
-        <View style={sidebarStyles.list}>
+        <SidebarGroup>
           <Pressable
             accessibilityRole="button"
             accessibilityLabel={t("settings.addHost")}
@@ -1004,7 +1013,7 @@ function SettingsSidebar({
             style={sidebarItemStyle}
           >
             <Plus
-              size={theme.iconSize.md}
+              size={densityIconSize(rt, "md")}
               color={theme.colors.foregroundMuted}
               strokeWidth={SIDEBAR_ICON_STROKE_WIDTH}
             />
@@ -1021,7 +1030,7 @@ function SettingsSidebar({
               style={sidebarItemStyle}
             >
               <Server
-                size={theme.iconSize.md}
+                size={densityIconSize(rt, "md")}
                 color={theme.colors.foregroundMuted}
                 strokeWidth={SIDEBAR_ICON_STROKE_WIDTH}
               />
@@ -1030,7 +1039,7 @@ function SettingsSidebar({
               </Text>
             </Pressable>
           ) : null}
-        </View>
+        </SidebarGroup>
       )}
     </>
   );
@@ -1572,26 +1581,33 @@ const sidebarStyles = StyleSheet.create((theme) => ({
     paddingVertical: theme.spacing[2],
     paddingHorizontal: theme.spacing[2],
   },
-  list: {
+  // Compact values draw each group as an island of tiles; desktop keeps a plain list.
+  group: {
     paddingVertical: theme.spacing[2],
     paddingHorizontal: theme.spacing[2],
-    gap: theme.spacing[0.5],
+    gap: { xs: theme.spacing[1], md: theme.spacing[0.5] },
   },
   groupLabel: {
     fontSize: theme.fontSize.base,
     fontWeight: theme.fontWeight.normal,
     color: theme.colors.foregroundExtraMuted,
-    paddingHorizontal: theme.spacing[2],
+    paddingHorizontal: { xs: theme.spacing[4], md: theme.spacing[2] },
     paddingVertical: theme.spacing[1],
   },
+  island: {
+    gap: { xs: 2, md: theme.spacing[0.5] },
+    borderRadius: { xs: theme.borderRadius["2xl"], md: 0 },
+    overflow: "hidden",
+  },
   item: {
     flexDirection: "row",
     alignItems: "center",
-    gap: theme.spacing[2],
-    minHeight: 28,
+    gap: { xs: theme.spacing[3], md: theme.spacing[2] },
+    minHeight: { xs: 52, md: 28 },
     paddingVertical: theme.spacing[1],
-    paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius.lg,
+    paddingHorizontal: { xs: theme.spacing[4], md: theme.spacing[2] },
+    borderRadius: { xs: 0, md: theme.borderRadius.lg },
+    backgroundColor: { xs: theme.colors.surface1, md: "transparent" },
   },
   itemHovered: {
     backgroundColor: theme.colors.surfaceSidebarHover,
@@ -1600,7 +1616,7 @@ const sidebarStyles = StyleSheet.create((theme) => ({
     backgroundColor: theme.colors.surfaceSidebarHover,
   },
   label: {
-    fontSize: theme.fontSize.base,
+    fontSize: { xs: theme.fontSize.lg, md: theme.fontSize.base },
     color: theme.colors.foregroundMuted,
     fontWeight: theme.fontWeight.normal,
     flex: 1,
@@ -1608,11 +1624,12 @@ const sidebarStyles = StyleSheet.create((theme) => ({
   pickerTrigger: {
     flexDirection: "row",
     alignItems: "center",
-    gap: theme.spacing[2],
-    minHeight: 28,
+    gap: { xs: theme.spacing[3], md: theme.spacing[2] },
+    minHeight: { xs: 52, md: 28 },
     paddingVertical: theme.spacing[1],
-    paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius.lg,
+    paddingHorizontal: { xs: theme.spacing[4], md: theme.spacing[2] },
+    borderRadius: { xs: 0, md: theme.borderRadius.lg },
+    backgroundColor: { xs: theme.colors.surface1, md: "transparent" },
   },
   pickerTriggerHovered: {
     backgroundColor: theme.colors.surfaceSidebarHover,
@@ -1620,14 +1637,14 @@ const sidebarStyles = StyleSheet.create((theme) => ({
   pickerTriggerLabel: {
     flex: 1,
     minWidth: 0,
-    fontSize: theme.fontSize.base,
+    fontSize: { xs: theme.fontSize.lg, md: theme.fontSize.base },
     color: theme.colors.foreground,
     fontWeight: theme.fontWeight.normal,
   },
   // Match the setting items' icon footprint so the host label aligns with them.
   pickerTriggerDot: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
+    width: densityIconBox("md"),
+    height: densityIconBox("md"),
     alignItems: "center",
     justifyContent: "center",
   },

From c1558d29eab78c898743adb613afa01ba4f0e780 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 18:48:13 +0700
Subject: [PATCH 205/270] fix(app): keep background workspaces hidden after
 reload (#7141)

* fix(app): preserve background workspace visibility after reload

Persist the background flag and reject workspace rows that predate it so the existing cache repair clears their workspace cursor and refreshes the baseline.

* test(app): make legacy workspace cache read paths explicit
---
 .../src/runtime/replica-cache/index.test.ts   | 86 +++++++++++++++++++
 .../app/src/runtime/replica-cache/index.ts    |  3 +
 2 files changed, 89 insertions(+)

diff --git a/packages/app/src/runtime/replica-cache/index.test.ts b/packages/app/src/runtime/replica-cache/index.test.ts
index 15adc841fb..c48777a3e2 100644
--- a/packages/app/src/runtime/replica-cache/index.test.ts
+++ b/packages/app/src/runtime/replica-cache/index.test.ts
@@ -255,7 +255,93 @@ function deleteDirectory(cache: ReplicaCache, serverId: string): void {
   ]);
 }
 
+async function cacheWithoutBackgroundVisibility() {
+  const storage = new MemoryStorage();
+  const writer = createCache(storage);
+  const checkpoint = {
+    agents: { generation: "g", afterSeq: 12 },
+    projects: { generation: "g", afterSeq: 4 },
+    workspaces: { generation: "g", afterSeq: 8 },
+  };
+  const baseline = directory(checkpoint);
+  commitDirectory(writer, SERVER_ID, baseline);
+  writer.commitTimeline(SERVER_ID, "agent-1", timeline());
+  await writer.flush();
+  const key = `${SERVER_ID}:workspace:workspace-1`;
+  const row = storage.rows.get(key)!;
+  const payload = JSON.parse(row.payload) as Record<string, unknown>;
+  delete payload.background;
+  storage.rows.set(key, { ...row, payload: JSON.stringify(payload) });
+
+  return { storage, baseline, reader: createCache(storage) };
+}
+
+async function expectLegacyWorkspaceRefresh({
+  storage,
+  baseline,
+  reader,
+}: Awaited<ReturnType<typeof cacheWithoutBackgroundVisibility>>): Promise<void> {
+  const restored = await reader.readDirectory(SERVER_ID);
+  expect(restored.workspaces.size).toBe(0);
+  expect(restored.checkpoint).toEqual({
+    agents: baseline.checkpoint.agents,
+    projects: baseline.checkpoint.projects,
+  });
+  expect(restored.agents).toEqual(baseline.agents);
+  expect(restored.projects).toEqual(baseline.projects);
+  expect(await reader.readTimeline(SERVER_ID, "agent-1")).toEqual(timeline());
+  expect((await createCache(storage).readDirectory(SERVER_ID)).checkpoint).toEqual(
+    restored.checkpoint,
+  );
+
+  baseline.workspaces.set(
+    "workspace-1",
+    normalizeWorkspaceDescriptor({ ...workspacePayload(), background: true }),
+  );
+  reader.replaceDirectoryBaseline(SERVER_ID, baseline);
+  await reader.flush();
+  const refreshed = await createCache(storage).readDirectory(SERVER_ID);
+  expect(refreshed.workspaces.get("workspace-1")?.background).toBe(true);
+  expect(refreshed.checkpoint).toEqual(baseline.checkpoint);
+}
+
 describe("ReplicaCache", () => {
+  it.each([true, false, undefined])(
+    "preserves background visibility (%s) when reopening a cached workspace",
+    async (background) => {
+      const storage = new MemoryStorage();
+      const writer = createCache(storage);
+      const baseline = directory();
+      baseline.workspaces.set(
+        "workspace-1",
+        normalizeWorkspaceDescriptor({ ...workspacePayload(), background }),
+      );
+      commitDirectory(writer, SERVER_ID, baseline);
+      await writer.flush();
+
+      const reader = createCache(storage);
+      expect(
+        (await reader.readDirectory(SERVER_ID)).workspaces.get("workspace-1")?.background,
+      ).toBe(background ?? false);
+      expect((await reader.readWorkspace(SERVER_ID, "workspace-1"))?.workspace.background).toBe(
+        background ?? false,
+      );
+    },
+  );
+
+  it("refetches workspaces cached without background visibility after a directory read", async () => {
+    const cached = await cacheWithoutBackgroundVisibility();
+
+    await expectLegacyWorkspaceRefresh(cached);
+  });
+
+  it("refetches workspaces cached without background visibility after a workspace read", async () => {
+    const cached = await cacheWithoutBackgroundVisibility();
+
+    expect(await cached.reader.readWorkspace(SERVER_ID, "workspace-1")).toBeUndefined();
+    await expectLegacyWorkspaceRefresh(cached);
+  });
+
   it("rejects pre-baseline-fix checkpoints without discarding cached rows or timelines", async () => {
     const storage = new MemoryStorage();
     const writer = createCache(storage);
diff --git a/packages/app/src/runtime/replica-cache/index.ts b/packages/app/src/runtime/replica-cache/index.ts
index 94937d4dc5..681d11a2c4 100644
--- a/packages/app/src/runtime/replica-cache/index.ts
+++ b/packages/app/src/runtime/replica-cache/index.ts
@@ -306,6 +306,8 @@ const StoredWorkspaceSchema = z.strictObject({
   worktreeSlug: z.string().optional(),
   projectKind: z.enum(["git", "non_git", "directory"]),
   workspaceKind: z.enum(["directory", "local_checkout", "checkout", "worktree"]),
+  // Require the flag so older rows that lost background visibility invalidate the workspace cursor.
+  background: z.boolean(),
   name: z.string(),
   title: z.string().nullable(),
   pinnedAt: z.string().nullable(),
@@ -698,6 +700,7 @@ function serializeWorkspace(workspace: WorkspaceDescriptor): StoredWorkspace {
     worktreeSlug: workspace.worktreeSlug,
     projectKind: workspace.projectKind,
     workspaceKind: workspace.workspaceKind,
+    background: workspace.background ?? false,
     name: workspace.name,
     title: workspace.title ?? null,
     pinnedAt: workspace.pinnedAt ?? null,

From d7b3ff654d88f2c7dabd1840b4a66e2441ab059a Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 20:46:29 +0700
Subject: [PATCH 206/270] Show press feedback on sidebar rows, footer buttons,
 and settings items (#7150)

* fix(app): show press feedback on sidebar rows, footer icons, and settings tiles

Touch has no hover, so these controls gave no acknowledgement when pressed.
Rows take the workspace row's pressed fill; the sidebar header row paints it
on the row so the trailing slot lights up with the button. Footer icon buttons
take the round header-control highlight.

* style(app): format sidebar header row

* fix(app): keep footer icon corners tappable on web

Web hit-testing follows border-radius, so rounding the footer buttons turned
their 44pt square targets into circles and taps near the corners fell through.
Paint the round highlight as a layer inside the square button instead.
---
 packages/app/src/components/left-sidebar.tsx  | 18 +++++++------
 .../sidebar/sidebar-footer-icon-highlight.tsx | 25 +++++++++++++++++++
 .../components/sidebar/sidebar-header-row.tsx | 21 ++++++++++++++--
 .../components/sidebar/sidebar-help-menu.tsx  | 16 +++++++-----
 packages/app/src/screens/settings-screen.tsx  | 24 +++++++++++++++---
 5 files changed, 85 insertions(+), 19 deletions(-)
 create mode 100644 packages/app/src/components/sidebar/sidebar-footer-icon-highlight.tsx

diff --git a/packages/app/src/components/left-sidebar.tsx b/packages/app/src/components/left-sidebar.tsx
index f054668347..943c1edd27 100644
--- a/packages/app/src/components/left-sidebar.tsx
+++ b/packages/app/src/components/left-sidebar.tsx
@@ -32,6 +32,7 @@ import { HostPicker } from "@/components/hosts/host-picker";
 import { SidebarDisplayPreferencesMenu } from "@/components/sidebar/display-preferences/menu";
 import { SidebarSeparator } from "@/components/sidebar/sidebar-separator";
 import { SidebarNavRows } from "@/components/sidebar/sidebar-nav-rows";
+import { SidebarFooterIconHighlight } from "@/components/sidebar/sidebar-footer-icon-highlight";
 import { SidebarHelpMenu } from "@/components/sidebar/sidebar-help-menu";
 import { SidebarResizeHandle } from "@/components/sidebar-resize-handle";
 import { DensityIcon } from "@/components/ui/density-icon";
@@ -317,13 +318,16 @@ function FooterIconButton({
           accessibilityRole="button"
           onPress={onPress}
         >
-          {({ hovered }) => (
-            <DensityIcon
-              icon={icon}
-              size="md"
-              sizeAdjustment={iconSizeAdjustment}
-              color={hovered ? "foreground" : "foregroundMuted"}
-            />
+          {({ hovered, pressed }) => (
+            <>
+              <SidebarFooterIconHighlight visible={pressed} />
+              <DensityIcon
+                icon={icon}
+                size="md"
+                sizeAdjustment={iconSizeAdjustment}
+                color={hovered ? "foreground" : "foregroundMuted"}
+              />
+            </>
           )}
         </Pressable>
       </TooltipTrigger>
diff --git a/packages/app/src/components/sidebar/sidebar-footer-icon-highlight.tsx b/packages/app/src/components/sidebar/sidebar-footer-icon-highlight.tsx
new file mode 100644
index 0000000000..7b901693fa
--- /dev/null
+++ b/packages/app/src/components/sidebar/sidebar-footer-icon-highlight.tsx
@@ -0,0 +1,25 @@
+import { View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+
+/**
+ * The round highlight behind a sidebar footer icon. It is a layer inside the button rather than a
+ * radius on it: web hit-testing follows `border-radius`, so a round button would stop taking taps
+ * near the corners of its square finger-sized target.
+ */
+export function SidebarFooterIconHighlight({ visible }: { visible: boolean }) {
+  return <View pointerEvents="none" style={[styles.highlight, visible && styles.visible]} />;
+}
+
+const styles = StyleSheet.create((theme) => ({
+  highlight: {
+    position: "absolute",
+    top: 0,
+    right: 0,
+    bottom: 0,
+    left: 0,
+    borderRadius: theme.borderRadius.full,
+  },
+  visible: {
+    backgroundColor: theme.colors.interactionHighlight,
+  },
+}));
diff --git a/packages/app/src/components/sidebar/sidebar-header-row.tsx b/packages/app/src/components/sidebar/sidebar-header-row.tsx
index 2eeded947d..f38d27c65c 100644
--- a/packages/app/src/components/sidebar/sidebar-header-row.tsx
+++ b/packages/app/src/components/sidebar/sidebar-header-row.tsx
@@ -54,6 +54,10 @@ export function SidebarHeaderRow({
   const [isHovered, setIsHovered] = useState(false);
   const handlePointerEnter = useCallback(() => setIsHovered(true), []);
   const handlePointerLeave = useCallback(() => setIsHovered(false), []);
+  // The button and its trailing slot are siblings, so the row owns the pressed fill for both.
+  const [isPressed, setIsPressed] = useState(false);
+  const handlePressIn = useCallback(() => setIsPressed(true), []);
+  const handlePressOut = useCallback(() => setIsPressed(false), []);
   const isHighlighted = isHovered || isActive;
   const iconSize = variant === "header" ? "md" : "sm";
 
@@ -65,12 +69,14 @@ export function SidebarHeaderRow({
   return (
     <View ref={rowRef} collapsable={false} style={getContainerStyle(variant)}>
       <View
-        style={[styles.row, isHighlighted && styles.rowHighlighted]}
+        style={[styles.row, isHighlighted && styles.rowHighlighted, isPressed && styles.rowPressed]}
         onPointerEnter={handlePointerEnter}
         onPointerLeave={handlePointerLeave}
       >
         <Pressable
           onPress={onPress}
+          onPressIn={handlePressIn}
+          onPressOut={handlePressOut}
           testID={testID}
           nativeID={nativeID}
           accessible
@@ -92,7 +98,14 @@ export function SidebarHeaderRow({
           <Text style={[styles.label, isHighlighted && styles.labelHighlighted]}>{label}</Text>
         </Pressable>
         {right === null ? null : (
-          <Pressable onPress={onPress} accessible={false} focusable={false} style={styles.trailing}>
+          <Pressable
+            onPress={onPress}
+            onPressIn={handlePressIn}
+            onPressOut={handlePressOut}
+            accessible={false}
+            focusable={false}
+            style={styles.trailing}
+          >
             {right}
           </Pressable>
         )}
@@ -136,6 +149,10 @@ const styles = StyleSheet.create((theme) => ({
   rowHighlighted: {
     backgroundColor: theme.colors.surfaceSidebarHover,
   },
+  // The workspace rows' pressed fill.
+  rowPressed: {
+    backgroundColor: theme.colors.surface2,
+  },
   button: {
     flex: 1,
     minWidth: 0,
diff --git a/packages/app/src/components/sidebar/sidebar-help-menu.tsx b/packages/app/src/components/sidebar/sidebar-help-menu.tsx
index 97ff3d2772..0eefa77468 100644
--- a/packages/app/src/components/sidebar/sidebar-help-menu.tsx
+++ b/packages/app/src/components/sidebar/sidebar-help-menu.tsx
@@ -15,6 +15,7 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { DensityIcon } from "@/components/ui/density-icon";
+import { SidebarFooterIconHighlight } from "./sidebar-footer-icon-highlight";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useAppDiagnosticStore } from "@/diagnostics/store";
 import { useKeyboardShortcutsAvailable } from "@/keyboard/availability";
@@ -108,12 +109,15 @@ export function SidebarHelpMenu() {
               accessibilityRole="button"
               accessibilityLabel={t("sidebar.help.trigger")}
             >
-              {({ hovered }) => (
-                <DensityIcon
-                  icon={CircleHelp}
-                  size="md"
-                  color={hovered ? "foreground" : "foregroundMuted"}
-                />
+              {({ hovered, pressed, open: menuOpen }) => (
+                <>
+                  <SidebarFooterIconHighlight visible={pressed || menuOpen} />
+                  <DensityIcon
+                    icon={CircleHelp}
+                    size="md"
+                    color={hovered ? "foreground" : "foregroundMuted"}
+                  />
+                </>
               )}
             </DropdownMenuTrigger>
           </View>
diff --git a/packages/app/src/screens/settings-screen.tsx b/packages/app/src/screens/settings-screen.tsx
index 3950c0778e..31f5058940 100644
--- a/packages/app/src/screens/settings-screen.tsx
+++ b/packages/app/src/screens/settings-screen.tsx
@@ -275,15 +275,26 @@ function renderHostSettingsContent(
 // Trigger + sidebar style helpers
 // ---------------------------------------------------------------------------
 
-function sidebarItemStyle({ hovered }: PressableStateCallbackType & { hovered?: boolean }) {
-  return [sidebarStyles.item, Boolean(hovered) && sidebarStyles.itemHovered];
+function sidebarItemStyle({
+  hovered,
+  pressed,
+}: PressableStateCallbackType & { hovered?: boolean }) {
+  return [
+    sidebarStyles.item,
+    Boolean(hovered) && sidebarStyles.itemHovered,
+    pressed && sidebarStyles.itemPressed,
+  ];
 }
 
-function selectedSidebarItemStyle({ hovered }: PressableStateCallbackType & { hovered?: boolean }) {
+function selectedSidebarItemStyle({
+  hovered,
+  pressed,
+}: PressableStateCallbackType & { hovered?: boolean }) {
   return [
     sidebarStyles.item,
     Boolean(hovered) && sidebarStyles.itemHovered,
     sidebarStyles.itemSelected,
+    pressed && sidebarStyles.itemPressed,
   ];
 }
 
@@ -865,9 +876,10 @@ function HostPicker({
     [],
   );
   const triggerStyle = useCallback(
-    ({ hovered = false }: PressableStateCallbackType & { hovered?: boolean }) => [
+    ({ hovered = false, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
       sidebarStyles.pickerTrigger,
       hovered && sidebarStyles.pickerTriggerHovered,
+      pressed && sidebarStyles.itemPressed,
     ],
     [],
   );
@@ -1615,6 +1627,10 @@ const sidebarStyles = StyleSheet.create((theme) => ({
   itemSelected: {
     backgroundColor: theme.colors.surfaceSidebarHover,
   },
+  // The workspace rows' pressed fill.
+  itemPressed: {
+    backgroundColor: theme.colors.surface2,
+  },
   label: {
     fontSize: { xs: theme.fontSize.lg, md: theme.fontSize.base },
     color: theme.colors.foregroundMuted,

From eb1a8a2ec7618b013a890aaf32d999bc69a7df65 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 21:03:37 +0700
Subject: [PATCH 207/270] fix(markdown): one renderer on
 react-native-enriched-markdown for iOS, Android and web (#6973)

* fix(app): group native assistant prose into selectable runs

* fix(app): render selectable native prose with enriched markdown

* docs: explain native prose selection boundaries and tradeoffs

* fix(app): preserve markdown semantics and render limits in prose runs

* docs: record native prose compatibility fixes and heading limits

* fix(app): allow additive task lists and admonitions in native prose

* fix(app): preserve inline image formatting and reference scope

* fix(app): preserve markdown source and file actions in native prose

Prepare original source blocks with source-position edits from the assistant parser. Keep reference scope and live/history projection consistent, and retain link text when dispatching workspace file actions.

* fix(app): preserve native prose entities and links while bounding preparation cost

* fix(app): preserve provisional syntax at cached reveal boundaries

* fix(app): bound prose append work and preserve markdown edge cases

* fix(app): preserve home paths and normalized prose links

* fix(app): preserve parser-owned links and streaming tilde tails

* fix(app): keep growing markdown on the streaming block renderer

* fix(app): preserve bracketed IPv6 links in native prose

* fix(app): skip prose classification for blocks over the render cap

* fix(app): share selectable native prose across Markdown surfaces

* fix(app): preserve Markdown containers before grouping prose

* revert(app): remove shared prose-run renderer changes

Reverts ab4737bb2 and ac47e1063 before replacing the Markdown engine across all platforms.

* feat(markdown): use enriched renderer across all platforms

* test: verify library image controls and isolate website config

* fix(markdown): preserve file links and image revisions

* fix(markdown): restore diagrams and preserve link origin

* fix(markdown): retain diagram identity and reference scope

* fix(markdown): avoid empty web history measurements

* fix(markdown): preserve authored empty link titles

* test(markdown): exercise find across whole-message history

* fix(markdown): preserve encoded image paths after rebase

Keep the shared renderer image normalization and file-read regression coverage that originally lived in the main integration merge.

* fix(markdown): derive table and task list colours from the theme

* fix(markdown): restore selection highlight on web

* fix(markdown): restore file link hover tooltips on web

* fix(markdown): normalize inline HTML before rendering

* fix(markdown): create renderer types when applying package patch

The published nightly omits both MarkdownRenderers type files. Represent them as new files so patch-package succeeds on a fresh npm install, matching the already patched development package.

* fix(markdown): keep the renderer tree stable while images resolve

* fix(markdown): size inline images to the line and collapse failed loads

* fix(markdown): normalize only parsed HTML nodes

* fix(markdown): keep the first image reference definition

* fix(markdown): preserve complete assistant messages on native

* fix(markdown): classify web links explicitly and complete renderer types

* fix(markdown): preserve spacing between HTML elements

* fix(markdown): normalize HTML following code elements

* fix(markdown): preserve literal image fallback labels

* fix(markdown): retry transient image decode failures

* docs(markdown): record native selection and image limitations

* fix(markdown): preserve first definitions across Mermaid segments

* fix(markdown): reserve pending images and harden web rendering

* test(markdown): cover state retention during image arrival

* fix(markdown): preserve reader position while responses grow

Keep the same message component boundary when a live row becomes retained history, preserving Mermaid runtimes and selection nodes. Observe paced child text commits at the web viewport so sticky-bottom follows before the next frame.

* test(markdown): require growth while holding a streaming paragraph

* test(markdown): isolate image arrival from reload positioning

Mounted row totals change as history virtualizes, so observe the new response and tool directly. Hold the real PNG response after reload until the reading position settles, then verify its reserved height and viewport instead of attributing initial bottom-follow positioning to image decoding.

* fix(markdown): preserve adjacency around inline HTML

* fix(markdown): keep summary block boundaries outside bold text

* perf(markdown): scan HTML block boundaries incrementally

* test(markdown): gate delivery while establishing a held reader

* test(markdown): name shared renderer setup and file actions

* test(markdown): assert linear HTML boundary work without timing

* test(markdown): check large HTML table output without observing built-ins

* fix(markdown): restore accentBright link colour

* fix(markdown): require letters and known extensions in bare path recognition

* fix(markdown): match main's blockquote, bullet and h6 colours

* fix(android): keep inverted chat still during text selection

React Native decomposes Android list inversion into a 180-degree rotation with positive scaleY, so the existing visibility-scroll guard never recognized the inverted viewport. Inspect the composed matrix and reproduce the actual list transform through the native view manager in regression tests.

* fix(markdown): linked inline code keeps inline code size

* fix(markdown): reserve a placeholder box with an image glyph while images load

* fix(markdown): bare prose paths need an extension, line suffix or depth

Slash-separated English pairs were recognized as file links in prose. Require stronger path intent there while preserving the existing inline-code recognition rule.

* fix(markdown): horizontal blocks own their drags on compact layouts

* perf(markdown): keep native streaming updates in the unfinished tail

Native markdown reparses each updated view in full. Keep parser-closed blocks in a memoized head during paced reveal, then reunite completed prose for cross-paragraph selection. Preserve trailing spacing and source indentation at the split.

* perf(markdown): reuse Android measurements across view mounts

* test(markdown): bare Fabel/model and daemon/client stay plain text when copied

a502cfd0d stopped linking bare two-segment prose paths; the clipboard
expectation still carried the links from the earlier loose pattern and
failed on CI (playwright shard 1/4 on 60b4e2d05). main expects the plain
text, so restore that.

* perf(app): limit native chat mount batches

Whole-message Markdown rows measure synchronously during Fabric layout. Render fewer history rows per batch and retain a smaller offscreen window so opening a chat does not measure twelve history rows at once.

* fix(app): keep populated markdown in sync with native layout

Fabric can collapse streaming blocks before asynchronous rendering replaces the old text, producing a blank frame. Commit populated-view updates synchronously while retaining worker preparation for first mounts to avoid moving large history parsing onto the UI thread.

* perf(app): preserve unchanged sidebar workspace projections

Reopening a retained sidebar rebuilt its entry collection and invalidated every project row despite unchanged workspace data. Preserve collection identity as well as row identity, while keeping membership and ordering changes observable.

* Revert "perf(app): preserve unchanged sidebar workspace projections"

This reverts commit a3919faed4a125f333fa4db6b23e0cdbd9dfcccd.
---
 CLAUDE.md                                     |    2 +
 docs/agent-stream-performance.md              |   29 +-
 docs/markdown-renderer.md                     |   31 +
 docs/native-text-selection.md                 |   24 +
 package-lock.json                             |  109 +-
 .../browser/agent-message-submission.spec.ts  |   14 +-
 .../browser/agent-tab-image-stability.spec.ts |  375 ++-
 .../agent-timeline-scroll-smoothness.spec.ts  |   21 +
 .../assistant-message-render-limit.spec.ts    |    4 +-
 .../browser/assistant-selection-copy.spec.ts  |   85 +-
 packages/app/e2e/browser/chat-find.spec.ts    |   24 +-
 packages/app/e2e/browser/file-editing.spec.ts |    6 +-
 .../e2e/browser/plan-card-markdown.spec.ts    |  169 +-
 .../support/helpers/acp-streaming-markdown.ts |    6 +-
 .../support/helpers/agent-timeline-gate.ts    |   27 +-
 .../e2e/support/helpers/assistant-images.ts   |   27 +-
 .../e2e/support/helpers/streaming-markdown.ts |   11 +-
 .../helpers/timeline-scroll-smoothness.ts     |  124 +-
 packages/app/package.json                     |   33 +-
 .../generate-markdown-image-placeholder.mjs   |   27 +
 .../chat-find/ranges.browser.test.ts          |   11 +
 .../src/agent-stream/chat-find/ranges.web.ts  |    4 +-
 .../chat-find/viewport.browser.test.ts        |   20 +
 .../agent-stream/chat-find/viewport.web.ts    |    7 +-
 .../src/agent-stream/footer-spacing.test.ts   |   37 -
 packages/app/src/agent-stream/layout.test.ts  |    9 +-
 packages/app/src/agent-stream/layout.ts       |    6 +-
 .../app/src/agent-stream/presentation.test.ts |   97 +-
 packages/app/src/agent-stream/presentation.ts |  130 +-
 packages/app/src/agent-stream/spacing.test.ts |  141 +-
 packages/app/src/agent-stream/spacing.ts      |   35 +-
 .../app/src/agent-stream/strategy-native.tsx  |    7 +-
 .../app/src/agent-stream/strategy-web.tsx     |   18 +-
 packages/app/src/agent-stream/strategy.ts     |    2 -
 packages/app/src/agent-stream/view.tsx        |   28 +-
 .../agent-stream/web-virtualization.test.ts   |   60 +-
 .../src/agent-stream/web-virtualization.ts    |    4 -
 .../src/assistant-file-links/extensions.ts    |   57 +
 .../app/src/assistant-file-links/index.ts     |    9 +-
 .../link-press-context.ts                     |   24 -
 .../app/src/assistant-file-links/link.tsx     |  213 --
 .../app/src/assistant-file-links/parse.ts     |   59 +-
 .../app/src/assistant-file-links/provider.tsx |   15 +-
 .../src/assistant-file-links/use-file-link.ts |    8 +-
 .../app/src/assistant-image/lifecycle.test.ts |  120 -
 packages/app/src/assistant-image/lifecycle.ts |   46 -
 .../assistant-image/load-dimensions.test.ts   |   48 -
 .../src/assistant-image/load-dimensions.ts    |   45 -
 .../app/src/assistant-image/retry.test.ts     |   49 -
 packages/app/src/assistant-image/retry.ts     |   31 -
 .../assistant-image/use-assistant-image.ts    |  544 ---
 .../content.browser.test.ts                   |   55 +
 .../assistant-selection-copy/content.web.ts   |   74 +-
 .../src/assistant-selection-copy/markup.ts    |   59 +-
 .../assistant-message-render-limit.native.ts  |   11 +
 .../assistant-message-render-limit.shared.ts  |   30 +
 .../assistant-message-render-limit.test.ts    |    8 +
 .../assistant-message-render-limit.ts         |   56 +-
 .../assistant-message-render-limit.web.ts     |   30 +
 .../src/components/highlighted-code-block.tsx |   24 +-
 .../markdown-text-selection.test.ts           |   14 -
 .../components/markdown-text-selection.tsx    |   17 -
 .../components/markdown-text-style.test.ts    |   32 -
 .../app/src/components/markdown-text-style.ts |   25 -
 .../src/components/markdown-text.android.tsx  |   56 -
 .../app/src/components/markdown-text.d.ts     |    1 -
 .../app/src/components/markdown-text.ios.tsx  |  113 -
 .../app/src/components/markdown-text.web.tsx  |   73 -
 .../src/components/markdown/fence/index.tsx   |   42 -
 .../markdown/fence/language.test.ts           |   15 -
 .../src/components/markdown/fence/language.ts |    3 -
 .../markdown/fence/mermaid/host.native.tsx    |    2 +-
 .../markdown/fence/mermaid/host.tsx           |    2 +-
 .../markdown/fence/mermaid/host.web.tsx       |    2 +-
 .../markdown/fence/mermaid/index.tsx          |   21 +-
 .../markdown/fence/mermaid/render-model.ts    |    2 +-
 .../markdown/fence/mermaid/segments.ts        |   57 +
 .../markdown/fence/{ => mermaid}/types.ts     |    2 -
 .../fence/mermaid/use-render-model.ts         |    2 +-
 .../app/src/components/markdown/frame.tsx     |   18 +
 .../src/components/markdown/html-ish.test.ts  |  529 ---
 .../app/src/components/markdown/html-ish.ts   |  926 ------
 packages/app/src/components/markdown/html.ts  |  179 +
 .../src/components/markdown/image-decoding.ts |   34 +
 .../markdown}/image-source.test.ts            |   56 +-
 .../markdown}/image-source.ts                 |    0
 .../app/src/components/markdown/images.ts     |  133 +
 .../components/markdown/inline-image-size.ts  |   62 -
 .../src/components/markdown/link-children.ts  |   21 -
 .../app/src/components/markdown/link-text.tsx |   41 -
 .../components/markdown/part-groups.test.ts   |   92 -
 .../src/components/markdown/part-groups.ts    |   89 -
 .../src/components/markdown/renderer.test.ts  |  630 +++-
 .../app/src/components/markdown/renderer.tsx  |  876 +----
 .../app/src/components/markdown/renderers.tsx |    3 +
 .../src/components/markdown/renderers.web.tsx |   81 +
 .../app/src/components/markdown/source.ts     |  201 ++
 .../components/markdown/streaming.fixture.md  |   47 +
 .../src/components/markdown/streaming.test.ts |   71 +
 .../app/src/components/markdown/streaming.ts  |   32 +
 .../app/src/components/markdown/styles.ts     |  100 +
 packages/app/src/components/message.tsx       |  985 +-----
 packages/app/src/components/plan-card.tsx     |  199 +-
 packages/app/src/components/ui/tooltip.tsx    |   33 +-
 .../src/file-pane/markdown-preview/index.tsx  |   47 +-
 .../markdown-preview/preview-image.tsx        |  151 -
 packages/app/src/hooks/use-revealed-text.ts   |    2 +-
 .../screens/workspace/workspace-screen.tsx    |   15 +-
 .../app/src/styles/markdown-styles.test.ts    |  142 -
 packages/app/src/styles/markdown-styles.ts    |  422 ---
 .../types/react-native-markdown-display.d.ts  |   11 -
 packages/app/src/types/stream.ts              |    2 -
 .../__tests__/split-markdown-blocks.test.ts   |  127 -
 .../utils/assistant-image-metadata.test.ts    |  105 -
 .../app/src/utils/assistant-image-metadata.ts |  196 --
 .../utils/assistant-markdown-parser.test.ts   |  135 -
 .../src/utils/assistant-markdown-parser.ts    |   10 +-
 .../assistant-message-height-estimate.test.ts |   55 +-
 .../assistant-message-height-estimate.ts      |   92 +-
 packages/app/src/utils/markdown-ast.test.ts   |   35 -
 packages/app/src/utils/markdown-ast.ts        |   12 -
 packages/app/src/utils/markdown-list.test.ts  |   87 -
 packages/app/src/utils/markdown-list.ts       |  147 -
 .../app/src/utils/split-markdown-blocks.ts    |   92 -
 .../app/src/utils/streaming-markdown/index.ts |  153 -
 packages/website/vite.config.ts               |    2 +-
 ...own+1.2.0-nightly-20261014-766fc0e67.patch | 2930 +++++++++++++++++
 .../react-native-markdown-display+7.0.2.patch |   74 -
 scripts/postinstall-patches.mjs               |    5 +-
 129 files changed, 6051 insertions(+), 8296 deletions(-)
 create mode 100644 docs/markdown-renderer.md
 create mode 100644 docs/native-text-selection.md
 create mode 100644 packages/app/scripts/generate-markdown-image-placeholder.mjs
 create mode 100644 packages/app/src/assistant-file-links/extensions.ts
 delete mode 100644 packages/app/src/assistant-file-links/link-press-context.ts
 delete mode 100644 packages/app/src/assistant-file-links/link.tsx
 delete mode 100644 packages/app/src/assistant-image/lifecycle.test.ts
 delete mode 100644 packages/app/src/assistant-image/lifecycle.ts
 delete mode 100644 packages/app/src/assistant-image/load-dimensions.test.ts
 delete mode 100644 packages/app/src/assistant-image/load-dimensions.ts
 delete mode 100644 packages/app/src/assistant-image/retry.test.ts
 delete mode 100644 packages/app/src/assistant-image/retry.ts
 delete mode 100644 packages/app/src/assistant-image/use-assistant-image.ts
 create mode 100644 packages/app/src/components/assistant-message-render-limit.native.ts
 create mode 100644 packages/app/src/components/assistant-message-render-limit.shared.ts
 create mode 100644 packages/app/src/components/assistant-message-render-limit.web.ts
 delete mode 100644 packages/app/src/components/markdown-text-selection.test.ts
 delete mode 100644 packages/app/src/components/markdown-text-selection.tsx
 delete mode 100644 packages/app/src/components/markdown-text-style.test.ts
 delete mode 100644 packages/app/src/components/markdown-text-style.ts
 delete mode 100644 packages/app/src/components/markdown-text.android.tsx
 delete mode 100644 packages/app/src/components/markdown-text.d.ts
 delete mode 100644 packages/app/src/components/markdown-text.ios.tsx
 delete mode 100644 packages/app/src/components/markdown-text.web.tsx
 delete mode 100644 packages/app/src/components/markdown/fence/index.tsx
 delete mode 100644 packages/app/src/components/markdown/fence/language.test.ts
 delete mode 100644 packages/app/src/components/markdown/fence/language.ts
 create mode 100644 packages/app/src/components/markdown/fence/mermaid/segments.ts
 rename packages/app/src/components/markdown/fence/{ => mermaid}/types.ts (99%)
 create mode 100644 packages/app/src/components/markdown/frame.tsx
 delete mode 100644 packages/app/src/components/markdown/html-ish.test.ts
 delete mode 100644 packages/app/src/components/markdown/html-ish.ts
 create mode 100644 packages/app/src/components/markdown/html.ts
 create mode 100644 packages/app/src/components/markdown/image-decoding.ts
 rename packages/app/src/{file-pane/markdown-preview => components/markdown}/image-source.test.ts (69%)
 rename packages/app/src/{file-pane/markdown-preview => components/markdown}/image-source.ts (100%)
 create mode 100644 packages/app/src/components/markdown/images.ts
 delete mode 100644 packages/app/src/components/markdown/inline-image-size.ts
 delete mode 100644 packages/app/src/components/markdown/link-children.ts
 delete mode 100644 packages/app/src/components/markdown/link-text.tsx
 delete mode 100644 packages/app/src/components/markdown/part-groups.test.ts
 delete mode 100644 packages/app/src/components/markdown/part-groups.ts
 create mode 100644 packages/app/src/components/markdown/renderers.tsx
 create mode 100644 packages/app/src/components/markdown/renderers.web.tsx
 create mode 100644 packages/app/src/components/markdown/source.ts
 create mode 100644 packages/app/src/components/markdown/streaming.fixture.md
 create mode 100644 packages/app/src/components/markdown/streaming.test.ts
 create mode 100644 packages/app/src/components/markdown/streaming.ts
 create mode 100644 packages/app/src/components/markdown/styles.ts
 delete mode 100644 packages/app/src/file-pane/markdown-preview/preview-image.tsx
 delete mode 100644 packages/app/src/styles/markdown-styles.test.ts
 delete mode 100644 packages/app/src/styles/markdown-styles.ts
 delete mode 100644 packages/app/src/types/react-native-markdown-display.d.ts
 delete mode 100644 packages/app/src/utils/__tests__/split-markdown-blocks.test.ts
 delete mode 100644 packages/app/src/utils/assistant-image-metadata.test.ts
 delete mode 100644 packages/app/src/utils/assistant-image-metadata.ts
 delete mode 100644 packages/app/src/utils/markdown-ast.test.ts
 delete mode 100644 packages/app/src/utils/markdown-ast.ts
 delete mode 100644 packages/app/src/utils/markdown-list.test.ts
 delete mode 100644 packages/app/src/utils/markdown-list.ts
 delete mode 100644 packages/app/src/utils/split-markdown-blocks.ts
 delete mode 100644 packages/app/src/utils/streaming-markdown/index.ts
 create mode 100644 patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch
 delete mode 100644 patches/react-native-markdown-display+7.0.2.patch

diff --git a/CLAUDE.md b/CLAUDE.md
index 7076471ff9..fc431da2c5 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -49,6 +49,8 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [docs/permissions.md](docs/permissions.md)                           | Semantic daemon permissions, principals, credentials, pairing invitations, and Hub authority                                   |
 | [docs/terminal-performance.md](docs/terminal-performance.md)         | Terminal latency pipeline, coalescing/backpressure invariants, benchmark + perf spec usage                                     |
 | [docs/agent-stream-performance.md](docs/agent-stream-performance.md) | Assistant text pipeline — coalescing window, paced reveal, why arrival lumps are smoothed at render                            |
+| [docs/markdown-renderer.md](docs/markdown-renderer.md)               | Shared Markdown engine, native selection, links, images and library constraints                                                |
+| [docs/native-text-selection.md](docs/native-text-selection.md)       | Native diagram grouping, selection boundaries and leading inline image limitations                                             |
 | [docs/file-observation.md](docs/file-observation.md)                 | Recursive watcher ownership, Linux constraints, teardown invariants, and Parcel comparison                                     |
 | [docs/testing.md](docs/testing.md)                                   | TDD workflow, determinism, real dependencies over mocks, test organization                                                     |
 | [docs/qa.md](docs/qa.md)                                             | QA evidence bar for pull requests — platform matrix, version drift, performance, UI proof                                      |
diff --git a/docs/agent-stream-performance.md b/docs/agent-stream-performance.md
index e62f155fd5..ec506ee99b 100644
--- a/docs/agent-stream-performance.md
+++ b/docs/agent-stream-performance.md
@@ -12,7 +12,7 @@ provider deltas (every provider streams incrementally)
   → recordTimeline: one canonical row per flushed item
   → agent_stream ws message
   → reducer queue (app, one commit per frame) → session store
-  → source-item plugin transforms → native Markdown blocks / tool grouping
+  → source-item plugin transforms → Markdown presentation / tool grouping
   → paced reveal (app, per displayed item) → paint
 ```
 
@@ -29,23 +29,8 @@ So arrival sets a _target_ and the reveal rate is derived from the backlog inste
 - **The coalescer is leading + trailing.** The first delta after an idle window flushes synchronously; only the rest of the burst waits for the trailing timer. Reverting to trailing-only adds a full window to the first character of every turn. Same shape and the same reason as `TerminalOutputCoalescer`.
 - **The leading flush adds a canonical row, and that is fine.** A burst's first chunk lands as its own timeline row. `mergeAssistantChunks` / `mergeReasoningChunks` in `timeline-projection.ts` join contiguous same-turn rows, and clients read the projected timeline, so history is unaffected. Tests that assert on raw rows have to account for the extra row; tests that assert on what a client sees do not.
 - **The store holds the full text; only the rendered slice is paced.** Copy, selection, the chat outline, and scroll geometry all read the same string the user can see. Pacing the store instead would leave the bottom anchor chasing a content height that is ahead of the reveal.
-- **Markdown blocks belong to presentation, and every assistant message is a block group.**
-  `agent-stream/presentation.ts` splits a message into one display row per Markdown block, the same
-  way whether it arrived streaming or as fetched history. Splitting in the reducer instead would
-  discard paragraph separators and expose fragments to plugin callbacks, which need the whole source
-  text. Live-head work stays cheap by parsing only the growing last block during append, retaining
-  completed blocks by object identity, and caching the split per source item so a tail change does
-  not re-split history. History was once left whole to keep cross-block Markdown context; that gave
-  one message two shapes depending on how it arrived, and message-addressed features only worked on
-  one of them.
-- **A row id is never a message id.** Block rows are `${messageId}:block:${n}` with
-  `blockGroupId = messageId`, including single-block messages, so nothing can come to rely on the two
-  being equal. `getStreamItemMessageId` in `presentation.ts` is the only way to go from a row to its
-  message, and web rows carry it as `data-message-id` alongside `data-history-row-id`. Anything
-  addressing a message — chat find, scroll-to-message, history reveal, the find expansion that lifts
-  the render cap — uses the message id and must expect several rows to answer to it. Row ids stay for
-  React keys, virtualizer measurement, scroll anchors, and per-row caches like assistant image
-  occurrence keys.
+- **One source assistant message is one display row.** Presentation projects plugin output and caches unchanged history. The shared [Markdown renderer](markdown-renderer.md) owns rendering on every platform. Chat paces the visible source and applies a 32,000-character render cap on web; native keeps the complete message. The native renderer keeps closed blocks in a stable head and sends the paced suffix to a separate tail view during streaming; completion reunites them for selection. This stays inside the renderer, without promoting blocks into timeline history.
+- **Message identity survives completion.** Assistant row ids are source message ids. Plugin rows can replace a source, so find, scroll-to-message and history reveal still use `getStreamItemMessageId`. Width-specific measurements describe whole rendered messages.
 - **First sight of a text is revealed whole.** Only growth is paced. This is what makes history hydration, timeline replay, a virtualized row remounting on scroll, and an already-finished message all render complete on first paint without a special case for each.
 - **Leaving `phase: "streaming"` snaps the reveal.** A completed turn must never be left holding characters. `layoutStream` sets the phase, so anything outside the live head with an active turn is already complete.
 - **The reducer queue commits on a frame, with a timer as the ceiling.** A frame callback never fires in a hidden tab, so a timer races it and wins when nothing is painting — the store has to keep advancing either way.
@@ -54,7 +39,7 @@ So arrival sets a _target_ and the reveal rate is derived from the backlog inste
   memo boundary each coalesced tick re-rendered every mounted row (about 50 on a phone, 100–250 ms of
   JS per tick). `layoutStream` keeps a layout item's identity when nothing about it changed,
   `useRevisedHistoryRows` hands a fresh item identity to rows whose tool-call group, expanded state,
-  or breakpoint changed, and `HistoryStreamRow` memoizes on both. Every viewport runs its history
+  or breakpoint changed, and `StreamRow` memoizes on both. Every viewport runs its history
   through that hook; the web viewport once skipped it and history hosts of a live tool group went
   stale. A new field on `StreamLayoutItem` must be added to `areLayoutItemsEquivalent`, or sharing
   silently stops.
@@ -63,6 +48,12 @@ So arrival sets a _target_ and the reveal rate is derived from the backlog inste
   while text arrives, and release obsolete window caches as the reader reveals more history;
   window caches must stay bounded while their source timeline remains loaded.
 
+## Native parsing cost
+
+The native library reparses and measures its entire `markdown` prop on each update. During streaming, the renderer splits source at an mdast block boundary and memoizes the head, so per-frame updates parse only the tail. Boundary discovery runs when a source line completes, rather than on every reveal frame. The unfinished line and final parsed block stay in the tail, preserving list continuation, setext headings, tables and open fences. Reference-dependent source and HTML retain a larger tail because later source can change their meaning. A single long block therefore still carries its full parsing cost.
+
+Completion restores one native text view per Mermaid-delimited segment, so selection crosses prose paragraphs again. The head retains its trailing block margin while split. JS reveal remains the pacing source; native opacity animation stays disabled.
+
 ## Measuring
 
 - **Smoothness (user-perceived):** `packages/app/e2e/browser/agent-stream-smoothness.spec.ts`, gated behind `PASEO_AGENT_STREAM_PERF_E2E=1`. Drives the mock provider's `bursty-stream` model and reports coefficient of variation of characters painted per frame (smoothness) plus p95 gap between visible updates (stalls). Both numbers are needed: a stalled stream is perfectly smooth.
diff --git a/docs/markdown-renderer.md b/docs/markdown-renderer.md
new file mode 100644
index 0000000000..418095730a
--- /dev/null
+++ b/docs/markdown-renderer.md
@@ -0,0 +1,31 @@
+# Markdown rendering
+
+Use `MarkdownRenderer` for chat replies, file previews, plans, pull requests and changelog content. It uses `react-native-enriched-markdown` on iOS, Android and web. Keep source adaptation and renderer configuration in `components/markdown`; consumers supply Markdown and, when needed, its file location.
+
+Native selection belongs to the library's text view. Keep an assistant message in one row so selection can cross paragraphs, headings and lists. Code blocks and tables use the library's native views and their selection behavior. Web uses browser selection over semantic HTML. Once its WASM parser is initialized, the library parses synchronously for the first commit of each mounted row; an empty interim row would corrupt virtualized measurements and move the reader. Chat owns paced reveal, the web render cap, message identity and list measurement. Native renders completed messages together. While streaming, it keeps closed blocks in one head view and updates a separate tail, then reunites the text on completion. See [native parsing cost](agent-stream-performance.md#native-parsing-cost) for the boundary and pacing constraints.
+
+## Links and images
+
+Workspace file links use the shared file-link resolver. The workspace supplies its client, root and open-file action once; chat can supply the agent's more specific context. URLs use the same link press path. Recognized inline-code paths stay tappable. The library callback carries the tapped occurrence’s syntax context. Preserve it when opening files: explicit Markdown links decode URL escapes, while recognized inline-code paths preserve literal percent characters and use suffix lookup. Identical URL strings in different occurrences must stay distinct. Explicit absolute workspace links receive a relative hover title; existing authored titles remain intact.
+
+Resolve workspace image paths over the existing session RPC, then give the library a cached native file URL or web blob URL. HTTP(S) images pass through unchanged. This preserves relay, SSH and local socket connections, which do not expose a daemon HTTP endpoint. Each mounted renderer owns its image acquisition identity, so a later reply reads a rewritten path again while the earlier mounted reply retains its snapshot. Image taps open the attachment lightbox. File previews resolve relative images against the Markdown file's directory.
+
+## Engine constraints
+
+The pinned nightly has the same React Native package and core source trees as upstream commit `73ac5085eb1fdc743973b3473d4dba65abad5261`. Compatibility was checked with React Native 0.81.5. Native dependencies must be rebuilt when changing the highlighting configuration; JavaScript refresh cannot enable compiled grammars.
+
+Math and video are disabled. Task lists and admonitions are enabled; task checkboxes are read-only. Source adaptation spaces adjacent empty GFM table delimiters before escaping prose spoiler delimiters and decodes entity text before the engine can discard it. Code spans and fences keep their literal source. Comment HTML is normalized to Markdown before parsing; details show their summary and body expanded.
+
+Mermaid fences use the existing isolated diagram runtime and fullscreen viewer. Web dispatches them through the library’s code-block override. Native has no block-renderer hook, so the renderer extracts only Mermaid fences and places the existing WebView host between library-rendered segments. This is the only block exception; see [native selection limitations](native-text-selection.md) for diagram grouping and leading inline images. Streaming keeps the last valid diagram visible while the next revision renders.
+
+Native code blocks use the library's copy control and compiled grammars. Web code blocks use `HighlightedCodeBlock` through the library's `renderers.codeBlock` override. The patch also preserves web list numbering and link titles, marks pending parses with `aria-busy` so Find waits for rendered text, and carries link syntax through native and web tap events. Web inline code inside a link inherits only the link colour; its code font, size and background stay intact. Keep link variants colour-only: native pills replace text runs and prevent paths from wrapping; Android pills also use the surrounding block’s font size. The package patch is tracked by [upstream PR #997](https://github.com/software-mansion/enriched-markdown/pull/997); remove the patch when the pinned release includes it.
+
+The package patch also keeps overflowing native horizontal blocks in control of their drags: Android claims parent interception at touch-down and releases it for vertical drags so the chat list can scroll; iOS keeps its scroll recognizer active for outward drags at the leading edge. This prevents compact sidebar pans from taking block scrolling without changing sidebar swipes on prose or non-overflowing blocks. Native changes require a client rebuild.
+
+Android measurements use a size-only, 512-entry LRU across view unmounts, matching the library’s existing iOS cache. Scrolling back through history can reuse layout sizes without parsing those rows again. Content, layout props and width identify each entry; font-scale changes and native layout invalidation discard affected sizes. The cache retains no views or spans.
+
+The library determines how incomplete Markdown appears during streaming. Completed text uses the same component and engine as history. Find and scroll-to-message address source message ids; selection-copy understands semantic HTML and the web code component's copy metadata.
+
+## Verification
+
+Follow [QA](qa.md) and [mobile testing](mobile-testing.md). Exercise chat, file preview, plan and PR content on all three platforms. Include cross-paragraph selection, progressive streaming, a file-link tap, code copy/highlighting, a table and a workspace image. On iPad, repeat preview selection after opening and closing Explorer and after rotation. Check web find, selection-copy and source-message navigation after DOM changes.
diff --git a/docs/native-text-selection.md b/docs/native-text-selection.md
new file mode 100644
index 0000000000..dd7edcd79c
--- /dev/null
+++ b/docs/native-text-selection.md
@@ -0,0 +1,24 @@
+# Native text selection
+
+Keep completed assistant prose in one native text view so selection crosses paragraphs, headings and lists. The shared [Markdown renderer](markdown-renderer.md) owns that view.
+
+## Android inverted chat
+
+Keep selection visibility handling in `modules/paseo-scroll`. Android's visibility
+rectangles ignore list inversion. React Native decomposes Android's `scale: -1`
+into rotation with positive `scaleY`, so test the composed matrix when deciding
+whether those requests should move the viewport. Native tests must apply the
+list's transform through React Native's view manager; assigning `scaleY` directly
+misses that decomposition.
+
+## Diagrams in lists and quotes
+
+Selection stops at a Mermaid diagram. Native extracts Mermaid fences into separate views because the library exposes no native block renderer override. A diagram inside a list or quote therefore appears outside that container, and its following prose starts a separate Markdown fragment.
+
+Reopening a list marker or quote prefix on the following fragment cannot place the diagram inside the original container or continue its quote rule. Preserving the group requires a native block renderer hook or a host that owns the whole group. Keep native diagrams at the top level until that exists; nested grouping remains a known limitation.
+
+## Leading inline images
+
+Native image decoders do not support SVG badges, so the renderer shows their alt text. Pending images share the web placeholder: a reserved image box with a small centred image glyph; confirmed acquisition or decoding failures show alt text.
+
+The native library classifies an image from the text preceding it. A raster image at the start of a paragraph uses block sizing even when text follows; the inline size setting only affects images the library recognizes as inline. Correcting that classification requires a native library change and new app builds. JavaScript-only updates retain that classification until native app builds include a library fix.
diff --git a/package-lock.json b/package-lock.json
index c31951b1b3..0eba9e0fd0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16265,15 +16265,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/camelize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
-      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001777",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001777.tgz",
@@ -17088,15 +17079,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/css-color-keywords": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/css-in-js-utils": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz",
@@ -17122,17 +17104,6 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/css-to-react-native": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
-      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
-      "license": "MIT",
-      "dependencies": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
     "node_modules/css-tree": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
@@ -30248,6 +30219,7 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.4.0",
@@ -30259,6 +30231,7 @@
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/proper-lockfile": {
@@ -30905,15 +30878,6 @@
         "react-native": "*"
       }
     },
-    "node_modules/react-native-fit-image": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/react-native-fit-image/-/react-native-fit-image-1.5.5.tgz",
-      "integrity": "sha512-Wl3Vq2DQzxgsWKuW4USfck9zS7YzhvLNPpkwUUCF90bL32e1a0zOVQ3WsJILJOwzmPdHfzZmWasiiAUNBkhNkg==",
-      "license": "Beerware",
-      "dependencies": {
-        "prop-types": "^15.5.10"
-      }
-    },
     "node_modules/react-native-gesture-handler": {
       "version": "2.28.0",
       "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.28.0.tgz",
@@ -30939,22 +30903,6 @@
         "react-native": "*"
       }
     },
-    "node_modules/react-native-markdown-display": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/react-native-markdown-display/-/react-native-markdown-display-7.0.2.tgz",
-      "integrity": "sha512-Mn4wotMvMfLAwbX/huMLt202W5DsdpMO/kblk+6eUs55S57VVNni1gzZCh5qpznYLjIQELNh50VIozEfY6fvaQ==",
-      "license": "MIT",
-      "dependencies": {
-        "css-to-react-native": "^3.0.0",
-        "markdown-it": "^10.0.0",
-        "prop-types": "^15.7.2",
-        "react-native-fit-image": "^1.5.5"
-      },
-      "peerDependencies": {
-        "react": ">=16.2.0",
-        "react-native": ">=0.50.4"
-      }
-    },
     "node_modules/react-native-nitro-modules": {
       "version": "0.35.5",
       "resolved": "https://registry.npmjs.org/react-native-nitro-modules/-/react-native-nitro-modules-0.35.5.tgz",
@@ -31020,18 +30968,6 @@
         "react-native": "*"
       }
     },
-    "node_modules/react-native-uitextview": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/react-native-uitextview/-/react-native-uitextview-2.2.0.tgz",
-      "integrity": "sha512-Vbv3cTAuyfkYrfsR2YKFsOd9OYgfys+IX5yvvYY7Wd6TrOd6FSGrX93xtQHjeLXV1ds6fDJcFJsuLi3S4Ypr8A==",
-      "workspaces": [
-        "example"
-      ],
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
-      }
-    },
     "node_modules/react-native-unistyles": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/react-native-unistyles/-/react-native-unistyles-3.2.4.tgz",
@@ -36480,7 +36416,11 @@
         "i18next": "^26.3.0",
         "lucide-react-native": "^1.50.0",
         "markdown-it": "^10.0.0",
+        "mdast-util-from-markdown": "2.0.3",
+        "mdast-util-gfm-table": "^2.0.0",
         "mermaid": "^11.16.0",
+        "micromark-extension-gfm-table": "^2.1.2",
+        "micromark-util-decode-string": "2.0.1",
         "mnemonic-id": "^3.2.7",
         "qrcode": "^1.5.4",
         "react": "19.1.0",
@@ -36490,15 +36430,14 @@
         "react-native": "0.81.5",
         "react-native-draggable-flatlist": "^4.0.3",
         "react-native-edge-to-edge": "^1.7.0",
+        "react-native-enriched-markdown": "1.2.0-nightly-20261014-766fc0e67",
         "react-native-gesture-handler": "~2.28.0",
         "react-native-keyboard-controller": "1.21.12",
-        "react-native-markdown-display": "^7.0.2",
         "react-native-nitro-modules": "0.35.5",
         "react-native-reanimated": "~4.3.1",
         "react-native-safe-area-context": "~5.6.0",
         "react-native-screens": "~4.16.0",
         "react-native-svg": "^15.14.0",
-        "react-native-uitextview": "^2.2.0",
         "react-native-unistyles": "^3.2.4",
         "react-native-web": "~0.21.0",
         "react-native-webview": "^13.16.0",
@@ -37350,6 +37289,23 @@
         }
       }
     },
+    "packages/app/node_modules/micromark-extension-gfm-table": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.2.tgz",
+      "integrity": "sha512-pRzm4kDTu0MjlmBkxmS9yYhw60nncfcEwu9NNdPFSQEFXS95ZKyIIyTSHu/o3ReBUrLKYEq+7YaXCRn/bPB4MA==",
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "packages/app/node_modules/miniflare": {
       "version": "4.20260625.0",
       "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-4.20260625.0.tgz",
@@ -37378,6 +37334,23 @@
       "dev": true,
       "license": "MIT"
     },
+    "packages/app/node_modules/react-native-enriched-markdown": {
+      "version": "1.2.0-nightly-20261014-766fc0e67",
+      "resolved": "https://registry.npmjs.org/react-native-enriched-markdown/-/react-native-enriched-markdown-1.2.0-nightly-20261014-766fc0e67.tgz",
+      "integrity": "sha512-PyYAAVJAyjlcqHXgSnzxok13MDmyxs/nt46hHIOBdCc0prfaL2Ef6nYkZu7fFCeaETOJXd/xQr4n2/79I+gvdA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "katex": ">=0.16.0",
+        "react": "*",
+        "react-native": "*"
+      },
+      "peerDependenciesMeta": {
+        "katex": {
+          "optional": true
+        }
+      }
+    },
     "packages/app/node_modules/react-native-keyboard-controller": {
       "version": "1.21.12",
       "resolved": "https://registry.npmjs.org/react-native-keyboard-controller/-/react-native-keyboard-controller-1.21.12.tgz",
diff --git a/packages/app/e2e/browser/agent-message-submission.spec.ts b/packages/app/e2e/browser/agent-message-submission.spec.ts
index 3bfda6b4b0..38598f4e65 100644
--- a/packages/app/e2e/browser/agent-message-submission.spec.ts
+++ b/packages/app/e2e/browser/agent-message-submission.spec.ts
@@ -1154,17 +1154,15 @@ test.describe("Agent message submission", () => {
       page,
       page.getByTestId("assistant-message").last(),
     );
-    const assistantMessageCount = await page.getByTestId("assistant-message").count();
-    const toolCallCount = await page.getByTestId("tool-call-badge").count();
     await composer.press("Enter");
     const userMessage = page.getByTestId("user-message").filter({ hasText: prompt }).last();
     await expect(userMessage).toBeVisible();
-    await expect
-      .poll(async () => page.getByTestId("assistant-message").count())
-      .toBeGreaterThan(assistantMessageCount);
-    await expect
-      .poll(async () => page.getByTestId("tool-call-badge").count())
-      .toBeGreaterThan(toolCallCount);
+    await expect(
+      page.getByTestId("assistant-message").filter({
+        hasText: "I'll take a look at the scroll anchor behavior you described.",
+      }),
+    ).toBeVisible();
+    await awaitToolCall(page, "Read");
     await finishTimelineRowStabilityCheck();
   });
 
diff --git a/packages/app/e2e/browser/agent-tab-image-stability.spec.ts b/packages/app/e2e/browser/agent-tab-image-stability.spec.ts
index 841314343f..97b1c8337c 100644
--- a/packages/app/e2e/browser/agent-tab-image-stability.spec.ts
+++ b/packages/app/e2e/browser/agent-tab-image-stability.spec.ts
@@ -1,3 +1,12 @@
+import type { Page } from "@playwright/test";
+import { createReadStream } from "node:fs";
+import { createServer } from "node:http";
+import { delayFileReadResponse } from "../support/helpers/file-read-gate";
+import {
+  expectCompletedDiagram,
+  openDiagramFullscreen,
+  expectFullscreenDiagram,
+} from "../support/helpers/diagram";
 import { expect, test as base } from "../support/fixtures";
 import {
   appendSettledTimelineTurns,
@@ -17,6 +26,10 @@ import {
 import { expectAgentReadyToInterrupt } from "../support/helpers/agent-stream";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 import path from "node:path";
+import {
+  rememberTimelineViewport,
+  scrollTimelinePromptIntoView,
+} from "../support/helpers/timeline-pagination";
 
 const test = base.extend<{ imageWorkspace: SeededWorkspace }>({
   imageWorkspace: async ({ page: _page }, provide) => {
@@ -97,11 +110,11 @@ test("opens a timeline image in a zoomable lightbox", async ({
   await openAssistantImageTimeline(page, imageAgent);
   await expectAssistantImageRendered(page, image);
 
-  await page.getByRole("button", { name: "Open image attachment" }).click();
+  await page.getByRole("button", { name: image.alt }).click();
   const lightboxImage = page.getByTestId("attachment-lightbox-image");
   const canvas = page.getByTestId("attachment-lightbox-canvas");
   await expect(lightboxImage).toBeVisible();
-  await canvas.hover();
+  await page.getByTestId("zoomable-viewport-toolbar").hover();
   const transformedContent = canvas.locator(":scope > div").first();
   const initialBox = await transformedContent.boundingBox();
   const canvasBox = await canvas.boundingBox();
@@ -133,7 +146,7 @@ test("opens a timeline image in a zoomable lightbox", async ({
   await expectAgentReadyToInterrupt(page);
 });
 
-test("reloading a timeline anchors near-tail assistant image growth", async ({
+test("reloading a timeline reserves image height without a load-time scroll jump", async ({
   imageWorkspace: workspace,
   page,
 }) => {
@@ -143,119 +156,34 @@ test("reloading a timeline anchors near-tail assistant image growth", async ({
     fileName: "reload-geometry-image.png",
   });
   const imageAgent = await createSettledMockAgent(workspace, "Reload image geometry");
-  await emitSettledAssistantImage(workspace.client, imageAgent, image);
-  await appendSettledTimelineTurns(workspace.client, imageAgent, 3);
+  const delivery = await serveDelayedImage(path.join(workspace.repoPath, image.relativePath));
+  try {
+    delivery.release();
+    await emitSettledAssistantImage(workspace.client, imageAgent, image, delivery.url);
+    await appendSettledTimelineTurns(workspace.client, imageAgent, 3);
+    await openAssistantImageTimeline(page, imageAgent);
+    await expectAssistantImageRendered(page, image);
 
-  await page.addInitScript(
-    ({ accessibleName }) => {
-      interface ImageGeometryEvent {
-        atMs: number;
-        complete: boolean;
-        height: number;
-        naturalHeight: number;
-        naturalWidth: number;
-        scrollTop: number;
-        width: number;
-      }
-      const state = {
-        accessibleName,
-        events: [] as ImageGeometryEvent[],
-        mutationObserver: null as MutationObserver | null,
-        resizeObserver: null as ResizeObserver | null,
-        target: null as Element | null,
-      };
-      const record = () => {
-        const target = state.target;
-        if (!target) return;
-        const imageElement =
-          target instanceof HTMLImageElement ? target : target.querySelector("img");
-        const scroll = target.closest('[data-testid="agent-chat-scroll"]');
-        const rect = target.getBoundingClientRect();
-        const event: ImageGeometryEvent = {
-          atMs: performance.now(),
-          complete: imageElement?.complete ?? false,
-          height: rect.height,
-          naturalHeight: imageElement?.naturalHeight ?? 0,
-          naturalWidth: imageElement?.naturalWidth ?? 0,
-          scrollTop: scroll instanceof HTMLElement ? scroll.scrollTop : -1,
-          width: rect.width,
-        };
-        const previous = state.events.at(-1);
-        if (
-          !previous ||
-          previous.complete !== event.complete ||
-          previous.height !== event.height ||
-          previous.naturalHeight !== event.naturalHeight ||
-          previous.naturalWidth !== event.naturalWidth ||
-          previous.scrollTop !== event.scrollTop ||
-          previous.width !== event.width
-        ) {
-          state.events.push(event);
-        }
-      };
-      const inspect = () => {
-        const target = Array.from(document.querySelectorAll('[role="img"]')).find(
-          (element) => element.getAttribute("aria-label") === accessibleName,
-        );
-        if (!target || target === state.target) {
-          record();
-          return;
-        }
-        state.target = target;
-        state.resizeObserver?.disconnect();
-        state.resizeObserver = new ResizeObserver(record);
-        state.resizeObserver.observe(target);
-        record();
-      };
-      const start = () => {
-        state.mutationObserver = new MutationObserver(inspect);
-        state.mutationObserver.observe(document.documentElement, {
-          attributes: true,
-          attributeFilter: ["src", "style"],
-          childList: true,
-          subtree: true,
-        });
-        inspect();
-      };
-      if (document.readyState === "loading") {
-        document.addEventListener("DOMContentLoaded", start, { once: true });
-      } else {
-        start();
-      }
-      (
-        window as unknown as {
-          __paseoReloadImageGeometry?: typeof state;
-        }
-      ).__paseoReloadImageGeometry = state;
-    },
-    { accessibleName: image.alt },
-  );
+    delivery.holdNextRequest();
+    await page.reload();
+    await delivery.waitUntilRequested();
+    const rendered = page.getByRole("button", { name: image.alt }).first();
+    await expect(rendered).toHaveAttribute("src", /^data:image\/png/);
+    await scrollTimelinePromptIntoView(
+      page,
+      "image-history-turn-2: emit 1 coalesced agent stream updates",
+    );
+    const beforeLoad = await rememberTimelineViewport(page);
+    const reservedHeight = (await rendered.boundingBox())?.height;
+    expect(reservedHeight).toBe(320);
 
-  await openAssistantImageTimeline(page, imageAgent);
-  await expectAssistantImageRendered(page, image);
-  await page.reload();
-  await expectAssistantImageRendered(page, image);
-  await page.waitForTimeout(500);
-
-  const events = await page.evaluate(() => {
-    const state = (
-      window as unknown as {
-        __paseoReloadImageGeometry?: { events: Array<unknown> };
-      }
-    ).__paseoReloadImageGeometry;
-    if (!state) throw new Error("Reload image geometry observer was not installed");
-    return state.events;
-  });
-  const geometryEvents = events as Array<{ height: number; scrollTop: number }>;
-  const initialGeometry = geometryEvents.find((event) => event.height > 0);
-  if (!initialGeometry)
-    throw new Error(`Image geometry was never measurable: ${JSON.stringify(events)}`);
-  const expandedGeometry = geometryEvents.find((event) => event.height > initialGeometry.height);
-  if (!expandedGeometry)
-    throw new Error(`Image geometry never expanded: ${JSON.stringify(events)}`);
-  expect(expandedGeometry.scrollTop, JSON.stringify(events)).toBeGreaterThan(
-    initialGeometry.scrollTop,
-  );
+    delivery.release();
+    await expectAssistantImageRendered(page, image);
+    expect((await rendered.boundingBox())?.height).toBe(reservedHeight);
+    await expect.poll(() => rememberTimelineViewport(page)).toEqual(beforeLoad);
+  } finally {
+    await delivery.close();
+  }
 });
 
 test("a real assistant PNG remains reachable through pagination and remount", async ({
@@ -296,3 +224,222 @@ test("a near-10 MiB real assistant PNG renders and the app remains responsive",
     response: "stress-update-0",
   });
 });
+
+test("a later reply reads new bytes at the same workspace image path", async ({
+  imageWorkspace: workspace,
+  page,
+}) => {
+  const agent = await createSettledMockAgent(workspace, "Screenshot revisions");
+  const first = await createSmallAssistantPng(workspace, {
+    alt: "Earlier screenshot",
+    fileName: "screenshot.png",
+  });
+  await emitSettledAssistantImage(workspace.client, agent, first);
+  await openAssistantImageTimeline(page, agent);
+  await expectAssistantImageRendered(page, first);
+  const second = await createSmallAssistantPng(workspace, {
+    alt: "Updated screenshot",
+    fileName: "screenshot.png",
+    width: 2,
+    height: 3,
+  });
+  await emitSettledAssistantImage(workspace.client, agent, second);
+  await expectAssistantImageRendered(page, second);
+  await expectAssistantImageRendered(page, first);
+});
+
+test("pending assistant images reserve their decoded height", async ({
+  imageWorkspace: workspace,
+  page,
+}, testInfo) => {
+  const image = await createSmallAssistantPng(workspace, {
+    alt: "Delayed remote image",
+    fileName: "delayed.png",
+    width: 32,
+    height: 24,
+  });
+  const agent = await createSettledMockAgent(workspace, "Pending image geometry");
+  const delivery = await serveDelayedImage(path.join(workspace.repoPath, image.relativePath));
+  const { url } = delivery;
+  try {
+    await emitSettledAssistantImage(workspace.client, agent, image, url);
+    await openAssistantImageTimeline(page, agent);
+    const rendered = page.getByRole("button", { name: image.alt }).first();
+    await expect(rendered).toHaveAttribute("src", /^data:image\/png/);
+    await delivery.waitUntilRequested();
+    const pendingBox = await rendered.boundingBox();
+    expect(pendingBox?.height).toBe(320);
+    await rendered.click();
+    await expect(page.getByTestId("attachment-lightbox-image")).toHaveCount(0);
+    await page.screenshot({ path: testInfo.outputPath("pending-image.png") });
+    delivery.release();
+    await expect(rendered).toHaveAttribute("src", url);
+    expect((await rendered.boundingBox())?.height).toBe(pendingBox?.height);
+  } finally {
+    await delivery.close();
+  }
+});
+
+/** Serve the fixture's real PNG bytes; release controls when the decoder can finish. */
+async function serveDelayedImage(file: string) {
+  let release!: () => void;
+  let ready: Promise<void>;
+  let requested!: () => void;
+  let requestStarted: Promise<void>;
+  const holdNextRequest = () => {
+    ready = new Promise<void>((resolve) => {
+      release = resolve;
+    });
+    requestStarted = new Promise<void>((resolve) => {
+      requested = resolve;
+    });
+  };
+  holdNextRequest();
+  const server = createServer((_request, response) => {
+    requested();
+    void ready.then(() => {
+      response.writeHead(200, { "Content-Type": "image/png", "Cache-Control": "no-store" });
+      return createReadStream(file).pipe(response);
+    });
+  });
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  const address = server.address();
+  if (!address || typeof address === "string") throw new Error("Image server did not listen");
+  return {
+    url: `http://127.0.0.1:${address.port}/image.png`,
+    release: () => release(),
+    holdNextRequest,
+    waitUntilRequested: () => requestStarted,
+    close: async () => {
+      release();
+      server.closeAllConnections();
+      await new Promise<void>((resolve, reject) => {
+        server.close((error) => {
+          if (error) {
+            reject(error);
+            return;
+          }
+          resolve();
+        });
+      });
+    },
+  };
+}
+
+test("late workspace image completion preserves selected prose", async ({
+  imageWorkspace,
+  page,
+}) => {
+  await withPendingWorkspaceImage(page, imageWorkspace, async (image, release) => {
+    const selected = await selectImageFixtureParagraphs(page);
+    release();
+    await expectAssistantImageRendered(page, image);
+    await expectSelectedParagraphsRetained(page, selected);
+  });
+});
+
+test("late workspace image completion keeps Mermaid fullscreen open", async ({
+  imageWorkspace,
+  page,
+}) => {
+  await withPendingWorkspaceImage(page, imageWorkspace, async (image, release) => {
+    await openDiagramFullscreen(page);
+    await expectFullscreenDiagram(page, ["Start", "Done"]);
+    release();
+    await expectAssistantImageRendered(page, image);
+    await expectFullscreenDiagram(page, ["Start", "Done"]);
+  });
+});
+
+async function withPendingWorkspaceImage(
+  page: Page,
+  workspace: SeededWorkspace,
+  run: (
+    image: Awaited<ReturnType<typeof createSmallAssistantPng>>,
+    release: () => void,
+  ) => Promise<void>,
+) {
+  const image = await createSmallAssistantPng(workspace, {
+    alt: "Late workspace image",
+    fileName: "late.png",
+    width: 32,
+    height: 24,
+  });
+  const source = [
+    "Paragraph one stays selected while the workspace image loads.",
+    "Paragraph two remains in this reply.",
+    "Paragraph three is the selection endpoint.",
+    "```mermaid\nflowchart LR\n Start --> Done\n```",
+    `![${image.alt}](${image.relativePath})`,
+  ].join("\n\n");
+  const agent = await createSettledMockAgent(workspace, "Delayed workspace read", source);
+  await emitSettledAssistantImage(workspace.client, agent, image);
+  const gate = await delayFileReadResponse(page, image.relativePath);
+  let released = false;
+  const release = () => {
+    if (!released) {
+      released = true;
+      gate.release();
+    }
+  };
+  try {
+    await openAssistantImageTimeline(page, agent);
+    await gate.waitUntilHeld();
+    await expectCompletedDiagram(page, ["Start", "Done"]);
+    await run(image, release);
+  } finally {
+    release();
+  }
+}
+
+type SelectionProofWindow = Window & { __lateImageSelection?: { start: Node; end: Node } };
+
+async function selectImageFixtureParagraphs(page: Page): Promise<string> {
+  const message = page.getByTestId("assistant-message");
+  await message
+    .getByText("Paragraph one stays selected while the workspace image loads.", { exact: true })
+    .scrollIntoViewIfNeeded();
+  const bounds = await message.evaluate((root) => {
+    const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT);
+    let start: Text | undefined;
+    let end: Text | undefined;
+    while (walker.nextNode()) {
+      const text = walker.currentNode as Text;
+      if (text.data.startsWith("Paragraph one stays")) start = text;
+      if (text.data.startsWith("Paragraph three is")) end = text;
+    }
+    if (!start || !end) throw new Error("Selection paragraphs are missing");
+    (window as SelectionProofWindow).__lateImageSelection = { start, end };
+    const first = document.createRange();
+    first.selectNodeContents(start);
+    const last = document.createRange();
+    last.selectNodeContents(end);
+    return {
+      first: first.getBoundingClientRect().toJSON(),
+      last: last.getBoundingClientRect().toJSON(),
+    };
+  });
+  await page.mouse.move(bounds.first.x + 1, bounds.first.y + 5);
+  await page.mouse.down();
+  await page.mouse.move(bounds.last.right - 1, bounds.last.bottom - 2, { steps: 20 });
+  await page.mouse.up();
+  const selected = await page.evaluate(() => window.getSelection()?.toString() ?? "");
+  expect(selected).toContain("Paragraph one");
+  expect(selected).toContain("Paragraph three");
+  return selected;
+}
+
+async function expectSelectedParagraphsRetained(page: Page, selected: string) {
+  await expect
+    .poll(() =>
+      page.evaluate(() => {
+        const proof = (window as SelectionProofWindow).__lateImageSelection;
+        return {
+          startConnected: proof?.start.isConnected,
+          endConnected: proof?.end.isConnected,
+          text: window.getSelection()?.toString(),
+        };
+      }),
+    )
+    .toEqual({ startConnected: true, endConnected: true, text: selected });
+}
diff --git a/packages/app/e2e/browser/agent-timeline-scroll-smoothness.spec.ts b/packages/app/e2e/browser/agent-timeline-scroll-smoothness.spec.ts
index 73c662124f..04286b85d3 100644
--- a/packages/app/e2e/browser/agent-timeline-scroll-smoothness.spec.ts
+++ b/packages/app/e2e/browser/agent-timeline-scroll-smoothness.spec.ts
@@ -10,6 +10,8 @@ import {
   reportScrollJumps,
   scrollCadences,
   withVariedTimeline,
+  withStreamingReader,
+  holdParagraphThroughCompletion,
 } from "../support/helpers/timeline-scroll-smoothness";
 
 test("scroll detector distinguishes entered image growth from a simultaneous viewport jump", () => {
@@ -202,3 +204,22 @@ for (const cadence of scrollCadences) {
 test("reserves image space before its response arrives", async ({ page }, testInfo) => {
   await expectImageSpaceReserved(page, testInfo);
 });
+
+test("holds a paragraph still while a mixed response streams and completes", async ({ page }) => {
+  await withStreamingReader(async (agent) => {
+    const reading = await holdParagraphThroughCompletion(page, agent);
+    expect(
+      reading.textGrowth,
+      "the held reader must observe an actively growing response",
+    ).toBeGreaterThan(1000);
+    expect(
+      reading.maxFollowGap,
+      "follow-bottom must catch each streamed commit before the next frame",
+    ).toBeLessThanOrEqual(1);
+    expect(
+      reading.maxDrift,
+      "streaming must preserve the held paragraph's viewport position",
+    ).toBeLessThanOrEqual(1);
+    expect(reading.retained, "completion must retain the paragraph's DOM node").toBe(true);
+  });
+});
diff --git a/packages/app/e2e/browser/assistant-message-render-limit.spec.ts b/packages/app/e2e/browser/assistant-message-render-limit.spec.ts
index 0502d1375b..b6fae53e9a 100644
--- a/packages/app/e2e/browser/assistant-message-render-limit.spec.ts
+++ b/packages/app/e2e/browser/assistant-message-render-limit.spec.ts
@@ -2,7 +2,9 @@ import { expect, test } from "../support/fixtures";
 import { getUtf8ByteLength } from "../../src/components/assistant-message-render-limit";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 
-test("caps a newline-heavy assistant message before rendering markdown", async ({ page }) => {
+test("caps a newline-heavy assistant message on web before rendering markdown", async ({
+  page,
+}) => {
   const hiddenTail = "HIDDEN_OVERSIZED_MESSAGE_TAIL";
   const response = `${"x\n".repeat(16_000)}${hiddenTail}`;
   const agent = await seedMockAgentWorkspace({
diff --git a/packages/app/e2e/browser/assistant-selection-copy.spec.ts b/packages/app/e2e/browser/assistant-selection-copy.spec.ts
index bf8e455c88..7daa11c7d6 100644
--- a/packages/app/e2e/browser/assistant-selection-copy.spec.ts
+++ b/packages/app/e2e/browser/assistant-selection-copy.spec.ts
@@ -73,9 +73,14 @@ const ASSISTANT_MARKDOWN = [
 ].join("\n");
 
 const EXPECTED_WHOLE_SELECTION_MARKDOWN = ASSISTANT_MARKDOWN.replace(
-  `${CROSS_STRUCTURE_MARKDOWN}\n\n`,
-  "",
+  "www.example.com stays",
+  "[www.example.com](http://www.example.com) stays",
 )
+  .replace(
+    "`https://example.com/generated` stays",
+    "[`https://example.com/generated`](https://example.com/generated) stays",
+  )
+  .replace(`${CROSS_STRUCTURE_MARKDOWN}\n\n`, "")
   .replace(
     "<https://autolink.example.com>",
     "[https://autolink.example.com](https://autolink.example.com)",
@@ -98,8 +103,7 @@ async function allowRichClipboard(context: BrowserContext): Promise<void> {
 }
 
 /**
- * The rows of one assistant message. A message renders one row per Markdown block, so
- * every locator and every text walk below covers the group, not a single block.
+ * Locate assistant rows by source-message identity.
  */
 function assistantMessageBlocks(page: Page): Locator {
   return page.locator("[data-message-id]").filter({ has: page.getByTestId("assistant-message") });
@@ -173,7 +177,7 @@ async function dragFromBelowImageTo(page: Page, text: string): Promise<void> {
   const blocks = assistantMessageBlocks(page);
   const target = blocks.getByText(text);
   await target.scrollIntoViewIfNeeded();
-  const frame = await blocks.locator('[data-paseo-markdown-tag="img"]').boundingBox();
+  const frame = await blocks.locator("img").boundingBox();
   const end = await target.evaluate((element, selectedText) => {
     const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
     while (walker.nextNode()) {
@@ -192,7 +196,8 @@ async function dragFromBelowImageTo(page: Page, text: string): Promise<void> {
   if (!frame) {
     throw new Error("Expected a rendered image");
   }
-  await page.mouse.move(end.left + 5, frame.y + frame.height + 4);
+  await page.evaluate(() => window.getSelection()?.removeAllRanges());
+  await page.mouse.move(end.left + 1, end.y - 14);
   await page.mouse.down();
   await page.mouse.move(end.x, end.y, { steps: 10 });
   await page.mouse.up();
@@ -210,18 +215,12 @@ async function selectAssistantListItemFromMarker(
 ): Promise<void> {
   const assistantMessage = assistantMessageBlocks(page);
   const item = assistantMessage
-    .locator(`[data-paseo-markdown-tag="${listTag}"]`)
+    .locator(listTag)
     .filter({ hasText: itemText })
-    .locator(':scope > [data-paseo-markdown-tag="li"]')
+    .locator(":scope > li")
     .filter({ hasText: itemText });
 
   await item.evaluate((element, selectedEndText) => {
-    const marker = element.querySelector(':scope > [data-paseo-markdown-list-marker="true"]');
-    const markerText = marker?.firstChild;
-    if (!(markerText instanceof Text)) {
-      throw new Error("Expected rendered list marker text");
-    }
-
     const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
     let endNode: Text | null = null;
     let endOffset = -1;
@@ -239,7 +238,7 @@ async function selectAssistantListItemFromMarker(
     }
 
     const range = document.createRange();
-    range.setStart(markerText, 0);
+    range.setStart(element, 0);
     range.setEnd(endNode, endOffset);
     const selection = window.getSelection();
     selection?.removeAllRanges();
@@ -254,7 +253,7 @@ async function doubleClickAssistantMarkdownText(
 ): Promise<void> {
   const assistantMessage = assistantMessageBlocks(page);
   await assistantMessage
-    .locator(`[data-paseo-markdown-tag="${tag}"]`)
+    .locator(tag)
     .filter({ hasText: text })
     .dblclick({ position: { x: 5, y: 5 } });
 }
@@ -276,39 +275,23 @@ async function selectAssistantTextRange(
           found = blockWalker.nextNode();
         }
       }
-      let cursor = 0;
-      const walker = { nextNode: () => nodes[cursor++] ?? null };
-      let startNode: Node | null = null;
-      let startOffset = -1;
-      let endNode: Node | null = null;
-      let endOffset = -1;
-      let textNode = walker.nextNode();
-      while (textNode) {
-        if (!startNode) {
-          const offset = textNode.textContent?.indexOf(selectedRange.startText) ?? -1;
-          if (offset >= 0) {
-            startNode = textNode;
-            startOffset = offset;
-          }
-        }
-        if (startNode) {
-          const offset = textNode.textContent?.indexOf(selectedRange.endText) ?? -1;
-          if (offset >= 0) {
-            endNode = textNode;
-            endOffset = offset + selectedRange.endText.length;
-            break;
-          }
-        }
-        textNode = walker.nextNode();
-      }
-      if (!startNode || !endNode) {
+      const text = nodes.map((node) => node.data).join("");
+      const start = text.indexOf(selectedRange.startText);
+      const end = text.indexOf(selectedRange.endText, start);
+      if (start < 0 || end < 0)
         throw new Error(
           `Could not find assistant text range: ${selectedRange.startText} — ${selectedRange.endText}`,
         );
-      }
+      const boundary = (offset: number, isEnd = false): [Text, number] => {
+        for (const node of nodes) {
+          if (offset < node.length || (isEnd && offset === node.length)) return [node, offset];
+          offset -= node.length;
+        }
+        throw new Error("Selection extends beyond message");
+      };
       const range = document.createRange();
-      range.setStart(startNode, startOffset);
-      range.setEnd(endNode, endOffset);
+      range.setStart(...boundary(start));
+      range.setEnd(...boundary(end + selectedRange.endText.length, true));
       const selection = window.getSelection();
       selection?.removeAllRanges();
       selection?.addRange(range);
@@ -428,16 +411,12 @@ test("copying an assistant selection preserves Markdown structure and links", as
       ["em", "emphasized prose"],
       ["s", "struck prose"],
     ]) {
-      const formattedProse = assistantMessage
-        .locator(`[data-paseo-markdown-tag="${tag}"]`)
-        .filter({ hasText: text });
+      const formattedProse = assistantMessage.locator(tag).filter({ hasText: text });
       await expect(formattedProse).toHaveCSS("font-family", "serif");
       await expect(formattedProse).not.toHaveAttribute("data-pmono");
     }
-    const inlineCode = assistantMessage
-      .locator('[data-paseo-markdown-tag="code"]')
-      .filter({ hasText: "apply_patch" });
-    await expect(inlineCode).toHaveAttribute("data-pmono", "");
+    const inlineCode = assistantMessage.locator("code").filter({ hasText: "apply_patch" });
+    await expect(inlineCode).toHaveCSS("font-family", /monospace|Mono/);
 
     await selectStructuredClipboardFixture(page);
     await copySelection(page);
@@ -466,7 +445,7 @@ test("copying an assistant selection preserves Markdown structure and links", as
       '<a href="file:///tmp/paseo%20notes.md#L4">workspace file</a>',
     );
     expect(clipboard.html).toContain("<code>https://example.com/generated</code>");
-    expect(clipboard.html).not.toContain(
+    expect(clipboard.html).toContain(
       '<a href="https://example.com/generated"><code>https://example.com/generated</code></a>',
     );
     expect(clipboard.html).toContain('<code class="language-typescript">');
diff --git a/packages/app/e2e/browser/chat-find.spec.ts b/packages/app/e2e/browser/chat-find.spec.ts
index 0ce6c561ed..b29a5f5b89 100644
--- a/packages/app/e2e/browser/chat-find.spec.ts
+++ b/packages/app/e2e/browser/chat-find.spec.ts
@@ -33,9 +33,10 @@ const STREAMED_RESPONSE = [
 const RESPONSE =
   'İ😀hello **world**; hello *world*.\n\n[hello &amp; world](https://example.com/hidden-destination)\n\n```ts\nconst a = "a.b";\n```\n\n- first cell\n- second cell';
 
-// One message far taller than the viewport, so its first and last paragraph rows are
-// never in the virtualizer's window at the same time.
+// One message taller than the viewport, exercising navigation between distant
+// matches inside the same rendered row.
 const PARAGRAPH_PADDING = Array.from({ length: 40 }, (_, index) => `padding${index}`).join(" ");
+const VIRTUALIZED_TURN_COUNT = 60;
 const TALL_RESPONSE = Array.from({ length: 30 }, (_, index) => {
   if (index === 0) return `Opening paragraph with span-needle. ${PARAGRAPH_PADDING}`;
   if (index === 29) return `Closing paragraph with span-needle. ${PARAGRAPH_PADDING}`;
@@ -322,11 +323,11 @@ test("finds a hit in a message that streamed while the chat was open", async ({
   const chat = await openChatStreamingMultiBlockReply(page);
   try {
     await openChatFind(page);
-    // The only hit is in the first paragraph, which is no longer the row that grows.
+    // The first-paragraph hit must remain searchable while the same message grows.
     await expectFindStatus(page, "alpha-needle", "1 of 1");
     await chat.replyFinished();
     await expectFindStatus(page, "beta-needle", "1 of 1");
-    // One message, two Markdown blocks, one count across both.
+    // One message, two paragraphs, one count across both.
     await expectFindStatus(page, "pair-needle", "1 of 2");
     await expectNextMatch(page, "2 of 2", "pair-needle");
     await closeFind(page);
@@ -346,12 +347,14 @@ async function openChatWithVirtualizedTallMessage(page: Page): Promise<MockAgent
     featureValues: { mockAssistantResponse: TALL_RESPONSE },
   });
   try {
-    for (let index = 0; index < 6; index++) {
+    for (let index = 0; index < VIRTUALIZED_TURN_COUNT; index++) {
       await agent.client.sendAgentMessage(agent.agentId, `Prompt number ${index}`);
       await agent.client.waitForFinish(agent.agentId, 15_000);
     }
     await openAgentRoute(page, agent);
-    await expect(page.getByText("Prompt number 5", { exact: true })).toBeVisible();
+    await expect(
+      page.getByText(`Prompt number ${VIRTUALIZED_TURN_COUNT - 1}`, { exact: true }),
+    ).toBeVisible();
     await expect(page.getByText("Prompt number 0", { exact: true })).toHaveCount(0);
     return agent;
   } catch (error) {
@@ -360,9 +363,8 @@ async function openChatWithVirtualizedTallMessage(page: Page): Promise<MockAgent
   }
 }
 
-// Every block row of the selected message must be mounted for Find to see it, whatever
-// the virtualizer's scroll window holds. Otherwise a hit in a far paragraph is missing
-// from the count and Next walks off to the next message instead.
+// Find must count distant paragraphs in one source message as well as messages
+// outside the mounted history window. Next must not skip a same-message hit.
 test("counts every occurrence of a virtualized message and steps between them", async ({
   page,
 }) => {
@@ -370,9 +372,9 @@ test("counts every occurrence of a virtualized message and steps between them",
   const chat = await openChatWithVirtualizedTallMessage(page);
   try {
     await openChatFind(page);
-    await expectFindStatus(page, "span-needle", "1 of 12");
+    await expectFindStatus(page, "span-needle", `1 of ${VIRTUALIZED_TURN_COUNT * 2}`);
     await expectHighlight(page, "span-needle");
-    await expectNextMatch(page, "2 of 12", "span-needle");
+    await expectNextMatch(page, `2 of ${VIRTUALIZED_TURN_COUNT * 2}`, "span-needle");
     await closeFind(page);
   } finally {
     await chat.cleanup();
diff --git a/packages/app/e2e/browser/file-editing.spec.ts b/packages/app/e2e/browser/file-editing.spec.ts
index 7726c581f3..da729381d2 100644
--- a/packages/app/e2e/browser/file-editing.spec.ts
+++ b/packages/app/e2e/browser/file-editing.spec.ts
@@ -72,10 +72,10 @@ async function selectFileView(page: Page, view: "Preview" | "Source"): Promise<v
 }
 
 async function expectMarkdownImageLoaded(page: Page, name: string): Promise<void> {
-  const image = page.getByRole("img", { name, exact: true });
+  const image = page.getByRole("button", { name, exact: true });
   await expect(image).toBeVisible();
   await expect
-    .poll(() => image.locator("img").evaluate((element: HTMLImageElement) => element.naturalWidth))
+    .poll(() => image.evaluate((element: HTMLImageElement) => element.naturalWidth))
     .toBeGreaterThan(0);
 }
 
@@ -221,7 +221,7 @@ test.describe("CodeMirror workspace file editing", () => {
       const fileLink = page.getByRole("link", { name: "Open target" }).first();
       await expect(fileLink).toBeVisible({ timeout: 15_000 });
       await fileLink.hover();
-      await expect(page.getByText("src/target.ts:42-45", { exact: true })).toBeVisible();
+      await expect(fileLink).toHaveAttribute("title", "src/target.ts:42-45");
     } finally {
       await workspace.cleanup();
     }
diff --git a/packages/app/e2e/browser/plan-card-markdown.spec.ts b/packages/app/e2e/browser/plan-card-markdown.spec.ts
index b5d7cfe1e7..5dcf2a2cec 100644
--- a/packages/app/e2e/browser/plan-card-markdown.spec.ts
+++ b/packages/app/e2e/browser/plan-card-markdown.spec.ts
@@ -1,15 +1,9 @@
+import type { Locator, Page } from "@playwright/test";
 import { expect, test } from "../support/fixtures";
 import { waitForPermissionPrompt } from "../support/helpers/permissions";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 
-// The plan card has to pass its own markdown parser. Drop that prop and
-// react-native-markdown-display silently supplies one with `typographer: true`
-// (node_modules/react-native-markdown-display/src/index.js:139-141), which
-// turns (c) into ©, curls straight quotes, and rewrites --- as an em dash.
-// No unit test can catch that, because the defect lives in the JSX.
-//
-// Nothing here is provider-specific: the mock provider drives it, and the
-// behavior is the same for every agent.
+// Literal shell commands and copyright markers must survive Markdown rendering.
 test.describe("Plan card markdown", () => {
   test("renders plan text verbatim", async ({ page }) => {
     test.setTimeout(180_000);
@@ -25,6 +19,7 @@ test.describe("Plan card markdown", () => {
       await waitForPermissionPrompt(page, 120_000);
 
       const planCard = page.getByTestId("permission-plan-card");
+      await expect(planCard.locator(".enrm-text")).toBeVisible();
       await expect(planCard).toContainText("(c)");
       await expect(planCard).toContainText('--name="my repo"');
       await expect(planCard).toContainText("---buzz");
@@ -35,3 +30,161 @@ test.describe("Plan card markdown", () => {
     }
   });
 });
+
+test("chat and file preview share the library renderer and resolve file links", async ({
+  page,
+}, testInfo) => {
+  await withSharedMarkdownFiles(page, async () => {
+    const message = page.getByTestId("assistant-message");
+    await expect(message).toHaveCount(1);
+    await expect(message.locator(".enrm-text > p").first()).toContainText("First paragraph.");
+    await expect(message.locator(".enrm-text > p").nth(1)).toContainText("Second paragraph.");
+    await expect(message.locator("blockquote")).toContainText("A quote");
+    await expect(message.getByRole("table")).toContainText("42");
+    await expect(message.getByRole("cell").nth(0)).toHaveText("Answer");
+    await expect(message.getByRole("cell").nth(1)).toHaveText("");
+    await expect(message.getByRole("cell").nth(2)).toHaveText("42");
+    await expect(message.locator("p div")).toHaveCount(0);
+    await openSharedMarkdownFile(page, "README.md");
+    const preview = page.getByTestId("markdown-preview-frame");
+    await expect(preview.locator(".enrm-text")).toContainText("Second paragraph.");
+    await expect(preview.getByRole("table")).toContainText("42");
+    await returnToSharedMarkdownChat(page);
+    await expectFileLinkTooltip(
+      page,
+      message.getByRole("link", { name: "src/说明.md:2-3", exact: true }),
+      "packages/app/src/说明.md:2-3",
+    );
+    await openSharedMarkdownFile(page, "src/说明.md:2-3");
+    await expect(page.getByText("Unicode suffix lookup succeeded.", { exact: true })).toBeVisible();
+    await openSharedMarkdownFile(page, "packages/app/src/说明.md:2-3");
+    await expect(page.getByText("Unicode suffix lookup succeeded.", { exact: true })).toBeVisible();
+    await openSharedMarkdownFile(page, "Space file");
+    await expect(
+      page.getByText("Explicit link opened the space filename.", { exact: true }),
+    ).toBeVisible();
+    await openSharedMarkdownFile(page, "my%20file.ts");
+    await expect(
+      page.getByText("Inline code opened the literal percent filename.", { exact: true }),
+    ).toBeVisible();
+    await testInfo.attach("shared-renderer", {
+      body: await page.screenshot(),
+      contentType: "image/png",
+    });
+  });
+});
+async function expectFileLinkTooltip(page: Page, link: Locator, path: string) {
+  await link.hover();
+  await expect(page.getByRole("tooltip")).toHaveText(path);
+}
+
+async function withSharedMarkdownFiles(page: Page, run: () => Promise<void>) {
+  const { writeFile, mkdir } = await import("node:fs/promises");
+  const source =
+    "First paragraph.\n\nSecond paragraph.\n\n```ts\nconst answer = 42;\n```\n\n> A quote\n\n| Key || Value |\n| --- | --- | --- |\n| Answer || 42 |\n\nOpen `README.md` or `src/说明.md:2-3`, or packages/app/src/说明.md:2-3.\n\n[Space file](my%20file.ts) and `my%20file.ts`.";
+  const session = await seedMockAgentWorkspace({
+    repoPrefix: "shared-markdown-",
+    title: "Shared Markdown",
+    featureValues: { mockAssistantResponse: source },
+    initialPrompt: "Show Markdown",
+  });
+  try {
+    await writeFile(`${session.cwd}/README.md`, source);
+    await writeFile(`${session.cwd}/my file.ts`, "Explicit link opened the space filename.");
+    await writeFile(
+      `${session.cwd}/my%20file.ts`,
+      "Inline code opened the literal percent filename.",
+    );
+    await mkdir(`${session.cwd}/packages/app/src`, { recursive: true });
+    await writeFile(
+      `${session.cwd}/packages/app/src/说明.md`,
+      "# Nested file\n\nUnicode suffix lookup succeeded.",
+    );
+    await session.client.waitForFinish(session.agentId, 30_000);
+    // A cold render must work even when a separate parser chunk cannot be fetched.
+    await page.route("**/wasm/md4c.bundle?**", (route) => route.abort("failed"));
+    await openAgentRoute(page, session);
+    await run();
+  } finally {
+    await session.cleanup();
+  }
+}
+
+async function returnToSharedMarkdownChat(page: Page) {
+  await page.getByRole("button", { name: "Shared Markdown", exact: true }).click();
+}
+
+async function openSharedMarkdownFile(page: Page, name: string) {
+  await returnToSharedMarkdownChat(page);
+  await page.getByTestId("assistant-message").getByRole("link", { name, exact: true }).click();
+}
+
+test("linked inline code keeps code typography and wraps long paths", async ({
+  page,
+}, testInfo) => {
+  const longPath =
+    "packages/app/src/components/markdown/renderer/very-long-directory-name/another-long-directory-name/file.ts:12";
+  const session = await seedMockAgentWorkspace({
+    repoPrefix: "inline-code-style-",
+    title: "Inline code style",
+    featureValues: {
+      mockAssistantResponse:
+        "Compare `ordinary_token`, `file.ts:12`, `https://example.com`. At the end of this line open `" +
+        longPath +
+        "`.",
+    },
+    initialPrompt: "Show inline code",
+  });
+  try {
+    await session.client.waitForFinish(session.agentId, 30_000);
+    await openAgentRoute(page, session);
+    const message = page.getByTestId("assistant-message");
+    await expect(message.getByRole("link", { name: longPath, exact: true })).toBeVisible();
+    const measurements = await measureInlineCode(message);
+    await testInfo.attach("inline-code-measurements", {
+      body: JSON.stringify(measurements, null, 2),
+      contentType: "application/json",
+    });
+    expect(measurements.codes).toHaveLength(4);
+    const [plain, file, url, long] = measurements.codes;
+    for (const linked of [file, url, long]) {
+      expect(linked.fontSize).toBe(plain.fontSize);
+      expect(linked.fontFamily).toBe(plain.fontFamily);
+      expect(linked.backgroundColor).toBe(plain.backgroundColor);
+      expect(linked.color).toBe(linked.anchorColor);
+      expect(linked.color).not.toBe(plain.color);
+    }
+    expect(long.lines).toBeGreaterThan(1);
+    expect(long.right).toBeLessThanOrEqual(measurements.right + 1);
+  } finally {
+    await session.cleanup();
+  }
+});
+
+async function measureInlineCode(message: Locator) {
+  return message.evaluate((element) => {
+    // Constrain the paragraph to exercise an inline path at a line boundary.
+    const paragraph = element.querySelector("p")!;
+    paragraph.style.width = "300px";
+    const codes = Array.from(paragraph.querySelectorAll("code"), (code) => {
+      const style = getComputedStyle(code);
+      const range = document.createRange();
+      range.selectNodeContents(code);
+      const rects = Array.from(range.getClientRects());
+      return {
+        text: code.textContent,
+        fontSize: style.fontSize,
+        fontFamily: style.fontFamily,
+        backgroundColor: style.backgroundColor,
+        color: style.color,
+        anchorColor: code.closest("a") ? getComputedStyle(code.closest("a")!).color : null,
+        whiteSpace: style.whiteSpace,
+        overflowWrap: style.overflowWrap,
+        rects: rects.map((rect) => ({ left: rect.left, right: rect.right, top: rect.top })),
+        lines: new Set(rects.map((rect) => rect.top)).size,
+        right: Math.max(...rects.map((rect) => rect.right)),
+      };
+    });
+    return { codes, right: paragraph.getBoundingClientRect().right };
+  });
+}
diff --git a/packages/app/e2e/support/helpers/acp-streaming-markdown.ts b/packages/app/e2e/support/helpers/acp-streaming-markdown.ts
index 0ebe9c2b3d..d7ca2ee183 100644
--- a/packages/app/e2e/support/helpers/acp-streaming-markdown.ts
+++ b/packages/app/e2e/support/helpers/acp-streaming-markdown.ts
@@ -52,13 +52,11 @@ export async function expectAcpMarkdown(page: Page, count: number): Promise<void
   await expect(messages).toHaveCount(count);
   for (let index = 0; index < count; index++) {
     const message = messages.nth(index);
-    await expect(message).toHaveText("•Current temperature: 25°C. Read Paseo docs.");
+    await expect(message).toHaveText("Current temperature: 25°C. Read Paseo docs.");
     await expect(
       message.getByRole("link", { name: "Paseo docs" }).and(message.locator("a")),
     ).toHaveAttribute("href", "https://example.com/docs");
-    await expect(message.locator('[data-paseo-markdown-tag="strong"]')).toHaveText(
-      "Current temperature",
-    );
+    await expect(message.locator("strong")).toHaveText("Current temperature");
   }
 }
 
diff --git a/packages/app/e2e/support/helpers/agent-timeline-gate.ts b/packages/app/e2e/support/helpers/agent-timeline-gate.ts
index dd50ccfa3d..408bd8af24 100644
--- a/packages/app/e2e/support/helpers/agent-timeline-gate.ts
+++ b/packages/app/e2e/support/helpers/agent-timeline-gate.ts
@@ -575,20 +575,25 @@ export async function holdAssistantStream(page: Page, agentId: string) {
     });
   });
 
+  const forwardUntil = async (done: (text: string) => boolean): Promise<void> => {
+    while (!done(forwardedText)) {
+      const frame = pending.shift();
+      if (!frame) {
+        await new Promise<void>((resolve) => {
+          notifyFrame = resolve;
+        });
+        continue;
+      }
+      forwardedText += frame.text;
+      frame.forward();
+    }
+  };
+
   return {
     waitForInitialTimeline: () => initialTimeline,
+    showUntil: (text: string) => forwardUntil((forwarded) => forwarded.includes(text)),
     async showThrough(prefix: string): Promise<void> {
-      while (forwardedText.length < prefix.length) {
-        const frame = pending.shift();
-        if (!frame) {
-          await new Promise<void>((resolve) => {
-            notifyFrame = resolve;
-          });
-          continue;
-        }
-        forwardedText += frame.text;
-        frame.forward();
-      }
+      await forwardUntil((text) => text.length >= prefix.length);
       if (forwardedText !== prefix) {
         throw new Error(
           `Stream did not stop at ${JSON.stringify(prefix)}: ${JSON.stringify(forwardedText)}`,
diff --git a/packages/app/e2e/support/helpers/assistant-images.ts b/packages/app/e2e/support/helpers/assistant-images.ts
index c4200c7c75..3d930b41a6 100644
--- a/packages/app/e2e/support/helpers/assistant-images.ts
+++ b/packages/app/e2e/support/helpers/assistant-images.ts
@@ -26,16 +26,13 @@ export interface AssistantImageFixture {
 
 export async function createSmallAssistantPng(
   workspace: SeededWorkspace,
-  input: { alt: string; fileName: string },
+  input: { alt: string; fileName: string; width?: number; height?: number },
 ): Promise<AssistantImageFixture> {
-  await writeFile(path.join(workspace.repoPath, input.fileName), SMALL_PNG);
-  return {
-    alt: input.alt,
-    height: 1,
-    relativePath: input.fileName,
-    size: SMALL_PNG.byteLength,
-    width: 1,
-  };
+  const width = input.width ?? 1;
+  const height = input.height ?? 1;
+  const bytes = width === 1 && height === 1 ? SMALL_PNG : encodeDeterministicPng(width, height);
+  await writeFile(path.join(workspace.repoPath, input.fileName), bytes);
+  return { alt: input.alt, height, relativePath: input.fileName, size: bytes.byteLength, width };
 }
 
 export async function createNearTenMegabyteAssistantPng(
@@ -61,6 +58,7 @@ export async function createNearTenMegabyteAssistantPng(
 export async function createSettledMockAgent(
   workspace: SeededWorkspace,
   title: string,
+  markdown?: string,
 ): Promise<ArchiveTabAgent> {
   const agent = await workspace.client.createAgent({
     provider: "mock",
@@ -69,6 +67,7 @@ export async function createSettledMockAgent(
     cwd: workspace.repoPath,
     workspaceId: workspace.workspaceId,
     title,
+    featureValues: markdown === undefined ? undefined : { mockAssistantResponse: markdown },
   });
   await workspace.client.waitForAgentUpsert(
     agent.id,
@@ -124,7 +123,7 @@ export async function expectAssistantImageRendered(
   page: Page,
   image: AssistantImageFixture,
 ): Promise<void> {
-  const rendered = page.getByRole("img", { name: image.alt }).first();
+  const rendered = page.getByRole("button", { name: image.alt }).first();
   await expect(rendered).toBeVisible({ timeout: 30_000 });
   await expect
     .poll(async () =>
@@ -172,14 +171,14 @@ export async function expectAssistantImageNotMounted(
   page: Page,
   image: AssistantImageFixture,
 ): Promise<void> {
-  await expect(page.getByRole("img", { name: image.alt })).toHaveCount(0);
+  await expect(page.getByRole("button", { name: image.alt })).toHaveCount(0);
 }
 
 export async function userPagesUntilAssistantImageRenders(
   page: Page,
   image: AssistantImageFixture,
 ): Promise<void> {
-  const rendered = page.getByRole("img", { name: image.alt });
+  const rendered = page.getByRole("button", { name: image.alt });
   for (let attempt = 0; attempt < 10; attempt += 1) {
     if ((await rendered.count()) > 0) {
       await expectAssistantImageRendered(page, image);
@@ -253,8 +252,8 @@ async function beginVisibleImageStabilityObservation(
         );
         const imageTab = document.querySelector(`[data-testid="${tabTestId}"]`);
         if (imageTab?.getAttribute("aria-selected") !== "true") return;
-        const imageVisible = Array.from(document.querySelectorAll('[role="img"]')).some(
-          (element) => element.getAttribute("aria-label") === accessibleName && isVisible(element),
+        const imageVisible = Array.from(document.querySelectorAll("img[alt]")).some(
+          (element) => element.getAttribute("alt") === accessibleName && isVisible(element),
         );
         record.missingSeen ||= !imageVisible;
       };
diff --git a/packages/app/e2e/support/helpers/streaming-markdown.ts b/packages/app/e2e/support/helpers/streaming-markdown.ts
index e628d80471..91bf9be172 100644
--- a/packages/app/e2e/support/helpers/streaming-markdown.ts
+++ b/packages/app/e2e/support/helpers/streaming-markdown.ts
@@ -45,11 +45,8 @@ export async function requestStreamingMarkdown(agent: StreamingMarkdownAgent): P
 
 export async function expectUnfinishedBold(page: Page): Promise<void> {
   const message = page.getByTestId("assistant-message").last();
-  const bold = message.locator('[data-paseo-markdown-tag="strong"]');
-  await expect(bold).toContainText("Bold");
+  await expect(message.locator(".enrm-text")).toContainText("Bold");
   await expect(message).not.toContainText("stays bold");
-  await expect(bold).toHaveCSS("font-weight", "500");
-  await expect(message).not.toContainText("*");
 }
 
 export async function expectUnfinishedLink(
@@ -61,7 +58,6 @@ export async function expectUnfinishedLink(
   await agent.stream.showThrough("**Bold text stays bold** and [Paseo docs");
   await expect(message).toContainText("Paseo docs");
   await expect(message.getByRole("link", { name: "Paseo docs" })).toHaveCount(0);
-  await expect(message).not.toContainText("[");
   await expect(message).not.toContainText("https:");
   await captureMarkdown(page, testInfo, "unfinished-link");
 }
@@ -95,8 +91,5 @@ async function expectCompletedMarkdown(page: Page): Promise<void> {
   await expect(
     message.getByRole("link", { name: "Paseo docs" }).and(message.locator("a")),
   ).toHaveAttribute("href", "https://example.com/documentation");
-  await expect(message.locator('[data-paseo-markdown-tag="strong"]')).toHaveCSS(
-    "font-weight",
-    "500",
-  );
+  await expect(message.locator("strong")).toHaveCSS("font-weight", "700");
 }
diff --git a/packages/app/e2e/support/helpers/timeline-scroll-smoothness.ts b/packages/app/e2e/support/helpers/timeline-scroll-smoothness.ts
index f7b62fd953..41f8cf3279 100644
--- a/packages/app/e2e/support/helpers/timeline-scroll-smoothness.ts
+++ b/packages/app/e2e/support/helpers/timeline-scroll-smoothness.ts
@@ -1,8 +1,9 @@
 import { writeFile } from "node:fs/promises";
 import { createServer } from "node:http";
 import { expect, type Page, type TestInfo } from "@playwright/test";
-import { seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";
+import { seedMockAgentWorkspace, openAgentRoute, type MockAgentWorkspace } from "./mock-agent";
 import { openAgentTimeline, expectTimelinePromptVisible } from "./timeline-pagination";
+import { holdAssistantStream } from "./agent-timeline-gate";
 
 export const scrollCadences = [
   { name: "slow", delta: 160, intervalMs: 50, steps: 1000 },
@@ -44,6 +45,120 @@ interface TimelinePage {
   at: number;
 }
 
+export async function withStreamingReader(run: (agent: MockAgentWorkspace) => Promise<void>) {
+  const section = "Read this paragraph while the response continues below. ".repeat(8);
+  const response = [
+    "```mermaid\nflowchart LR\n Start --> Review --> Done\n```",
+    "```mermaid\nflowchart LR\n Nested --> Finished\n```",
+    ...Array.from({ length: 40 }, (_, index) => `## Long section ${index}\n\n${section}`),
+    "READER-STREAM-SETTLED",
+  ].join("\n\n");
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "held-stream-reader-",
+    title: "Held streaming paragraph",
+    featureValues: {
+      mockStreamingAssistantResponse: response,
+      mockStreamingAssistantIntervalMs: 1,
+    },
+  });
+  try {
+    await run(agent);
+  } finally {
+    await agent.cleanup();
+  }
+}
+
+export async function holdParagraphThroughCompletion(page: Page, agent: MockAgentWorkspace) {
+  const stream = await holdAssistantStream(page, agent.agentId);
+  await openAgentRoute(page, agent);
+  await page.getByRole("textbox", { name: "Message agent...", exact: true }).waitFor();
+  const scroll = page.getByTestId("agent-chat-scroll");
+  const following = await scroll.evaluateHandle((viewport) => {
+    const result = { stopped: false, maxGap: 0 };
+    const frame = () => {
+      if (result.stopped) return;
+      result.maxGap = Math.max(
+        result.maxGap,
+        viewport.scrollHeight - viewport.clientHeight - viewport.scrollTop,
+      );
+      requestAnimationFrame(frame);
+    };
+    requestAnimationFrame(frame);
+    return result;
+  });
+  await agent.client.sendAgentMessage(agent.agentId, "Stream the mixed response.");
+  await stream.showUntil("Long section 12\n");
+  await page
+    .getByRole("heading", { name: "Long section 12", exact: true })
+    .waitFor({ state: "attached" });
+  // Exercise a reader whose producer has already finished; delivery must be gated.
+  await agent.client.waitForFinish(agent.agentId, 30_000);
+  await expect(page.getByTestId("mermaid-viewport")).toHaveCount(2);
+  await expect(page.getByTestId("mermaid-viewport").nth(0)).toHaveCSS("opacity", "1");
+  await expect(page.getByTestId("mermaid-viewport").nth(1)).toHaveCSS("opacity", "1");
+  const maxFollowGap = await following.evaluate((result) => {
+    result.stopped = true;
+    return result.maxGap;
+  });
+  const bounds = await scroll.boundingBox();
+  if (!bounds) throw new Error("Reader viewport is missing");
+  await page.mouse.move(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2);
+  await page.mouse.wheel(0, -1600);
+  await page.waitForTimeout(150);
+  const paragraph = page.getByRole("heading", { name: "Long section 3", exact: true });
+  await paragraph.waitFor({ state: "attached" });
+  const recording = await paragraph.evaluateHandle((heading) => {
+    if (!document.querySelector('[data-testid="turn-working-indicator"]')) {
+      throw new Error("The stream completed before the reader detached");
+    }
+    const viewport = document.querySelector<HTMLElement>('[data-testid="agent-chat-scroll"]')!;
+    const clip = viewport.getBoundingClientRect();
+    viewport.scrollTop += heading.getBoundingClientRect().y - (clip.top + clip.height / 2);
+    const baseline = heading.getBoundingClientRect().y;
+    const initialTextLength = heading.closest('[data-testid="assistant-message"]')!.textContent!
+      .length;
+    const result = { maxDrift: 0, retained: true, textGrowth: 0, done: false };
+    let stableAt = performance.now();
+    let signature = "";
+    const frame = (now: number) => {
+      result.retained &&= heading.isConnected;
+      const current = [...document.querySelectorAll("h2")].find(
+        (n) => n.textContent === "Long section 3",
+      );
+      const textLength =
+        current?.closest('[data-testid="assistant-message"]')?.textContent?.length ?? 0;
+      result.textGrowth = Math.max(result.textGrowth, textLength - initialTextLength);
+      if (current)
+        result.maxDrift = Math.max(
+          result.maxDrift,
+          Math.abs(current.getBoundingClientRect().y - baseline),
+        );
+      const next = `${viewport.scrollHeight}:${viewport.scrollTop}:${current?.getBoundingClientRect().y}`;
+      if (next !== signature) {
+        signature = next;
+        stableAt = now;
+      }
+      const complete =
+        document.body.textContent?.includes("Worked for") &&
+        document.body.textContent.includes("READER-STREAM-SETTLED") &&
+        !document.querySelector('[data-testid="turn-working-indicator"]');
+      if (complete && now - stableAt >= 750) {
+        result.done = true;
+        return;
+      }
+      requestAnimationFrame(frame);
+    };
+    requestAnimationFrame(frame);
+    return result;
+  });
+  await expect(
+    page.getByTestId("scroll-to-bottom-button").filter({ visible: true }).first(),
+  ).toBeVisible();
+  stream.release();
+  await page.waitForFunction((result) => result.done, recording);
+  return { ...(await recording.jsonValue()), maxFollowGap };
+}
+
 /** Real HTTP image responses, with intrinsic dimensions unavailable until the response arrives. */
 export async function withVariedTimeline(
   run: (agent: MockAgentWorkspace, newestPrompt: string) => Promise<void>,
@@ -495,7 +610,7 @@ export async function expectImageSpaceReserved(page: Page, testInfo: TestInfo):
       await agent.client.waitForFinish(agent.agentId, 15_000);
       await openAgentTimeline(page, agent);
       await expectTimelinePromptVisible(page, "Show the delayed image");
-      const image = page.getByRole("img", { name: "Reserved image" }).first();
+      const image = page.getByRole("button", { name: "Reserved image", exact: true }).first();
       await expect(image).toBeVisible();
       const before = await image.boundingBox();
       await attachTimelineScreenshot(page, testInfo, "image-placeholder");
@@ -512,8 +627,9 @@ export async function expectImageSpaceReserved(page: Page, testInfo: TestInfo):
         .toBe(240);
       await expect
         .poll(async () => {
-          const box = await image.boundingBox();
-          return box ? Math.round((box.width / box.height) * 100) : 0;
+          return image.evaluate((element: HTMLImageElement) =>
+            Math.round((element.naturalWidth / element.naturalHeight) * 100),
+          );
         })
         .toBe(150);
       const after = await image.boundingBox();
diff --git a/packages/app/package.json b/packages/app/package.json
index 84af04dee4..359814a3ad 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -104,7 +104,11 @@
     "i18next": "^26.3.0",
     "lucide-react-native": "^1.50.0",
     "markdown-it": "^10.0.0",
+    "mdast-util-from-markdown": "2.0.3",
+    "mdast-util-gfm-table": "^2.0.0",
     "mermaid": "^11.16.0",
+    "micromark-extension-gfm-table": "^2.1.2",
+    "micromark-util-decode-string": "2.0.1",
     "mnemonic-id": "^3.2.7",
     "qrcode": "^1.5.4",
     "react": "19.1.0",
@@ -114,15 +118,14 @@
     "react-native": "0.81.5",
     "react-native-draggable-flatlist": "^4.0.3",
     "react-native-edge-to-edge": "^1.7.0",
+    "react-native-enriched-markdown": "1.2.0-nightly-20261014-766fc0e67",
     "react-native-gesture-handler": "~2.28.0",
     "react-native-keyboard-controller": "1.21.12",
-    "react-native-markdown-display": "^7.0.2",
     "react-native-nitro-modules": "0.35.5",
     "react-native-reanimated": "~4.3.1",
     "react-native-safe-area-context": "~5.6.0",
     "react-native-screens": "~4.16.0",
     "react-native-svg": "^15.14.0",
-    "react-native-uitextview": "^2.2.0",
     "react-native-unistyles": "^3.2.4",
     "react-native-web": "~0.21.0",
     "react-native-webview": "^13.16.0",
@@ -164,6 +167,32 @@
     "wrangler": "^4.105.0",
     "ws": "^8.20.0"
   },
+  "enriched-markdown": {
+    "enableMath": false,
+    "enableCodeHighlight": true,
+    "codeHighlightLanguages": [
+      "json",
+      "html",
+      "css",
+      "markdown",
+      "yaml",
+      "go",
+      "java",
+      "javascript",
+      "python",
+      "c",
+      "rust",
+      "bash",
+      "typescript",
+      "tsx",
+      "cpp",
+      "swift",
+      "php",
+      "ruby",
+      "c-sharp"
+    ],
+    "enableVideo": false
+  },
   "reanimated": {
     "staticFeatureFlags": {
       "FORCE_REACT_RENDER_FOR_SETTLED_ANIMATIONS": false
diff --git a/packages/app/scripts/generate-markdown-image-placeholder.mjs b/packages/app/scripts/generate-markdown-image-placeholder.mjs
new file mode 100644
index 0000000000..4e147161e4
--- /dev/null
+++ b/packages/app/scripts/generate-markdown-image-placeholder.mjs
@@ -0,0 +1,27 @@
+// Regenerate from the repo root: node packages/app/scripts/generate-markdown-image-placeholder.mjs
+// sharp is already provided by the development dependency tree; it is not used at runtime.
+import { readFile, writeFile } from "node:fs/promises";
+import sharp from "sharp";
+
+// Lucide Image (ISC), lucide-react-native/dist/esm/icons/image.mjs.
+const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="640" height="640" viewBox="0 0 640 640">
+  <svg x="293.333333" y="293.333333" width="53.333333" height="53.333333" viewBox="0 0 24 24">
+    <g fill="none" stroke="#808080" opacity="0.6" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+      <rect width="18" height="18" x="3" y="3" rx="2" ry="2"/>
+      <circle cx="9" cy="9" r="2"/>
+      <path d="m21 15-3.086-3.086a2 2 0 0 0-2.828 0L6 21"/>
+    </g>
+  </svg>
+</svg>`;
+const png = await sharp(Buffer.from(svg)).png({ compressionLevel: 9 }).toBuffer();
+const uri = `data:image/png;base64,${png.toString("base64")}`;
+const sourceFile = new URL("../src/components/markdown/source.ts", import.meta.url);
+const source = await readFile(sourceFile, "utf8");
+await writeFile(
+  sourceFile,
+  source.replace(
+    /export const PENDING_MARKDOWN_IMAGE =\s*"[^"]*";/,
+    `export const PENDING_MARKDOWN_IMAGE =\n  "${uri}";`,
+  ),
+);
+console.log(`Generated 640×640 Markdown image placeholder: ${png.length} bytes`);
diff --git a/packages/app/src/agent-stream/chat-find/ranges.browser.test.ts b/packages/app/src/agent-stream/chat-find/ranges.browser.test.ts
index c1d84c1b42..631b8f1d27 100644
--- a/packages/app/src/agent-stream/chat-find/ranges.browser.test.ts
+++ b/packages/app/src/agent-stream/chat-find/ranges.browser.test.ts
@@ -65,3 +65,14 @@ it("matches whitespace across text nodes without inspecting hidden link destinat
     "world\nline",
   ]);
 });
+
+it("keeps semantic Markdown paragraphs separate while finding inline matches", () => {
+  const row = content(
+    "<p>İ😀hello <strong>world</strong>; hello <em>world</em>.</p><p>another paragraph</p>",
+  );
+  expect(findRenderedMatches(row, "hello world").map((range) => range.toString())).toEqual([
+    "hello world",
+    "hello world",
+  ]);
+  expect(findRenderedMatches(row, ".another")).toEqual([]);
+});
diff --git a/packages/app/src/agent-stream/chat-find/ranges.web.ts b/packages/app/src/agent-stream/chat-find/ranges.web.ts
index 91ed7bff6a..ea2e901c2d 100644
--- a/packages/app/src/agent-stream/chat-find/ranges.web.ts
+++ b/packages/app/src/agent-stream/chat-find/ranges.web.ts
@@ -1,10 +1,10 @@
 const BLOCKS = ["p", "pre", "li", "td", "th", "h1", "h2", "h3", "h4", "h5", "h6"]
-  .map((tag) => `[data-paseo-markdown-tag="${tag}"]`)
+  .flatMap((tag) => [tag, `[data-paseo-markdown-tag="${tag}"]`])
   .join(",");
 const IGNORED =
   '[data-paseo-markdown-ignore="true"], [aria-hidden="true"], button, [role="button"], svg, script, style';
 
-/** The rows of one message, in reading order. Each is one Markdown block. */
+/** Rendered rows carrying a source message identity, in reading order. */
 export function findMessageRows(root: HTMLElement | null, messageId: string): HTMLElement[] {
   if (!root) return [];
   return Array.from(
diff --git a/packages/app/src/agent-stream/chat-find/viewport.browser.test.ts b/packages/app/src/agent-stream/chat-find/viewport.browser.test.ts
index 2bd1e291b4..a7cf29994c 100644
--- a/packages/app/src/agent-stream/chat-find/viewport.browser.test.ts
+++ b/packages/app/src/agent-stream/chat-find/viewport.browser.test.ts
@@ -98,3 +98,23 @@ function highlightedRow(): string | undefined {
     );
   return row?.dataset.historyRowId;
 }
+
+it("waits for an asynchronous renderer before counting its matches", async () => {
+  const root = transcript("message-1", ["needle"]);
+  const content = root.querySelector('[data-message-text="true"]')!;
+  content.setAttribute("aria-busy", "true");
+  let settled = false;
+  const reveal = viewport(root, {})
+    .reveal("message-1", "needle", 0, new AbortController().signal)
+    .then((result) => {
+      settled = true;
+      return result;
+    });
+  await new Promise<void>((resolve) =>
+    requestAnimationFrame(() => requestAnimationFrame(() => resolve())),
+  );
+  expect(settled).toBe(false);
+  content.textContent = "needle and another needle";
+  content.removeAttribute("aria-busy");
+  expect(await reveal).toEqual({ occurrence: 0, count: 2 });
+});
diff --git a/packages/app/src/agent-stream/chat-find/viewport.web.ts b/packages/app/src/agent-stream/chat-find/viewport.web.ts
index 6bbb3a704b..4fef1f6abc 100644
--- a/packages/app/src/agent-stream/chat-find/viewport.web.ts
+++ b/packages/app/src/agent-stream/chat-find/viewport.web.ts
@@ -21,8 +21,7 @@ export function createFindViewport({
     clear() {
       CSS.highlights.delete(highlightName);
     },
-    // A message renders as one row per Markdown block, so an occurrence can sit in
-    // any of them and the chosen one decides where the viewport lands.
+    // The source message owns navigation; the rendered occurrence owns its position.
     reveal(messageId, query, occurrence, signal) {
       return new Promise((resolve, reject) => {
         let frame = 0;
@@ -61,6 +60,10 @@ export function createFindViewport({
             frame = requestAnimationFrame(poll);
             return;
           }
+          if (rows.some((row) => row.querySelector('[aria-busy="true"]'))) {
+            frame = requestAnimationFrame(poll);
+            return;
+          }
           const ranges = findMessageMatches(getRoot(), messageId, query);
           const index =
             occurrence < 0 ? ranges.length - 1 : Math.min(occurrence, ranges.length - 1);
diff --git a/packages/app/src/agent-stream/footer-spacing.test.ts b/packages/app/src/agent-stream/footer-spacing.test.ts
index a2414fff5c..5fa3535bce 100644
--- a/packages/app/src/agent-stream/footer-spacing.test.ts
+++ b/packages/app/src/agent-stream/footer-spacing.test.ts
@@ -49,17 +49,6 @@ function assistantMessage(id: string): Extract<StreamItem, { kind: "assistant_me
   };
 }
 
-function assistantBlock(
-  id: string,
-  blockIndex: number,
-): Extract<StreamItem, { kind: "assistant_message" }> {
-  return {
-    ...assistantMessage(id),
-    blockGroupId: "response",
-    blockIndex,
-  };
-}
-
 function timingFor(assistantId: string): Map<string, TurnTiming> {
   return new Map([
     [
@@ -109,30 +98,4 @@ describe("turn footer spacing", () => {
       expect(assistantLayout?.assistantSpacing).toBe("compactBottom");
     },
   );
-
-  it.each([
-    ["web", false],
-    ["web", true],
-    ["native", false],
-    ["native", true],
-  ] as const)(
-    "compacts both edges of the final split paragraph on %s when active=%s",
-    (platform, isTurnActive) => {
-      const strategy = strategyFor(platform);
-      const first = assistantBlock("first", 0);
-      const last = assistantBlock("last", 1);
-      const layout = layoutStream({
-        strategy,
-        isTurnActive,
-        history: strategy.orderTail([userMessage("user"), first]),
-        liveHead: strategy.orderHead([last]),
-        timingByAssistantId: timingFor(last.id),
-      });
-      const firstLayout = layout.history.find((item) => item.item.id === first.id);
-      const lastLayout = layout.liveHead.find((item) => item.item.id === last.id);
-
-      expect(firstLayout?.assistantSpacing).toBe("compactBottom");
-      expect(lastLayout?.assistantSpacing).toBe("compactBoth");
-    },
-  );
 });
diff --git a/packages/app/src/agent-stream/layout.test.ts b/packages/app/src/agent-stream/layout.test.ts
index 3ab2a9f8f0..f10fde2cb1 100644
--- a/packages/app/src/agent-stream/layout.test.ts
+++ b/packages/app/src/agent-stream/layout.test.ts
@@ -25,7 +25,7 @@ function userMessage(id: string, seed: number): Extract<StreamItem, { kind: "use
 function assistantMessage(
   id: string,
   seed: number,
-  block?: { groupId: string; index: number },
+  _block?: { groupId: string; index: number },
   turnId?: string,
 ): Extract<StreamItem, { kind: "assistant_message" }> {
   return {
@@ -33,7 +33,6 @@ function assistantMessage(
     id,
     text: id,
     timestamp: timestamp(seed),
-    ...(block ? { blockGroupId: block.groupId, blockIndex: block.index } : {}),
     ...(turnId ? { turnId } : {}),
   };
 }
@@ -318,7 +317,7 @@ describe("layoutStream", () => {
     expect(assistantRow.frameOrder).toBe("content-then-footer");
   });
 
-  it("compacts assistant block spacing across the history and live-head boundary", () => {
+  it("keeps separate messages spaced across history and the live head", () => {
     const historyBlock = assistantMessage("turn:block:0", 2, { groupId: "turn", index: 0 });
     const headBlock = assistantMessage("turn:head", 3, { groupId: "turn", index: 1 });
     const layout = layoutFor({
@@ -328,8 +327,8 @@ describe("layoutStream", () => {
       timingIds: [historyBlock.id, headBlock.id],
     });
 
-    expect(findLayoutItem(layout, historyBlock.id).assistantSpacing).toBe("compactBottom");
-    expect(findLayoutItem(layout, headBlock.id).assistantSpacing).toBe("compactBoth");
+    expect(findLayoutItem(layout, historyBlock.id).assistantSpacing).toBe("default");
+    expect(findLayoutItem(layout, headBlock.id).assistantSpacing).toBe("compactBottom");
   });
 
   it.each(["web", "android"] as const)(
diff --git a/packages/app/src/agent-stream/layout.ts b/packages/app/src/agent-stream/layout.ts
index d460c1fa2e..82ef98db54 100644
--- a/packages/app/src/agent-stream/layout.ts
+++ b/packages/app/src/agent-stream/layout.ts
@@ -1,6 +1,6 @@
 import type { TurnTiming } from "@/timeline/turn-time";
 import type { StreamItem } from "@/types/stream";
-import { getAssistantBlockSpacing, getGapBetweenStreamItems } from "./spacing";
+import { getAssistantMessageSpacing, getGapBetweenStreamItems } from "./spacing";
 import type { StreamFrameChildOrder, StreamStrategy } from "./strategy";
 import { continuesResponse, continuesTurn, isResponseBoundary } from "./turn-membership";
 
@@ -311,10 +311,8 @@ function layoutSegmentItem(
     boundaryAboveItems: input.boundaryAboveItems,
     boundaryAboveIndex: input.boundaryAboveIndex,
   });
-  const assistantSpacing = getAssistantBlockSpacing({
+  const assistantSpacing = getAssistantMessageSpacing({
     item,
-    aboveItem,
-    belowItem,
     hasFooterBelow: completedFooter !== null || (input.hasAuxiliaryFooter && belowItem === null),
   });
 
diff --git a/packages/app/src/agent-stream/presentation.test.ts b/packages/app/src/agent-stream/presentation.test.ts
index 70ed8862ae..dcb52fd24b 100644
--- a/packages/app/src/agent-stream/presentation.test.ts
+++ b/packages/app/src/agent-stream/presentation.test.ts
@@ -1,7 +1,5 @@
-import { QueryClient } from "@tanstack/react-query";
-import { describe, expect, it } from "vitest";
-import type { AgentStreamEventPayload } from "@getpaseo/protocol/messages";
 import { runPluginClientBundle, type PluginClientRuntime } from "@/plugins/evaluate";
+import { transformTimelineItem, type TimelineItemTransform } from "@/plugins/timeline/model";
 import type { InstalledPlugin } from "@/plugins/types";
 import {
   applyStreamEvent,
@@ -10,9 +8,11 @@ import {
   type ToolCallItem,
   type UserMessageItem,
 } from "@/types/stream";
-import { transformTimelineItem, type TimelineItemTransform } from "@/plugins/timeline/model";
-import { createStreamPresentation, getStreamItemMessageId } from "./presentation";
+import type { AgentStreamEventPayload } from "@getpaseo/protocol/messages";
+import { QueryClient } from "@tanstack/react-query";
+import { describe, expect, it } from "vitest";
 import { buildAgentStreamRenderModel } from "./model";
+import { createStreamPresentation, getStreamItemMessageId } from "./presentation";
 
 const runtime = {
   paseo: {},
@@ -123,6 +123,25 @@ function rows(result: { tail: StreamItem[]; head: StreamItem[] }): StreamItem[]
   return [...result.tail, ...result.head];
 }
 
+describe("whole-message Markdown presentation", () => {
+  it("keeps paragraphs, fences and quotes in one progressively updated row", () => {
+    const present = createStreamPresentation();
+    const text = "First paragraph.\n\nSecond paragraph.\n\n```ts\nconst n = 1;\n```\n\n> Quote";
+    for (const length of [10, 30, text.length]) {
+      const source = hydrateStreamState([
+        { event: assistant(text.slice(0, length)), timestamp: new Date(1000) },
+      ]);
+      const result = present({
+        ...presentationOptions,
+        tail: [],
+        head: source,
+        transform: undefined,
+      });
+      expect(rows(result)).toEqual(source);
+    }
+  });
+});
+
 describe("stream presentation through installed plugins", () => {
   it("offers every source tool call to an installed transformer in Overview mode", () => {
     const calls = [toolCall("call-1", "bash"), toolCall("call-2", "read")];
@@ -198,26 +217,17 @@ describe("stream presentation through installed plugins", () => {
       { text: "Header\n\nBody", phase: "streaming" },
     ]);
     expect(rows(harness.render(transform))).toHaveLength(1);
-    expect(rows(harness.render()).map((item) => item.kind)).toEqual([
-      "assistant_message",
-      "assistant_message",
-    ]);
+    expect(rows(harness.render()).map((item) => item.kind)).toEqual(["assistant_message"]);
   });
 
-  it("keeps completed native blocks stable while the last block grows and finishes", () => {
+  it("retains the complete message when streaming finishes", () => {
     const harness = streamHarness();
-    const first = harness.send(assistant("Intro\n\n![Image](image.png)"));
-    const growing = harness.send(assistant("\n\nAfter\n"));
-    const last = harness.send(assistant("- item"));
+    harness.send(assistant("Intro\n\n![Image](image.png)"));
+    const last = harness.send(assistant("\n\nAfter\n- item"));
     const completed = harness.send({ type: "turn_completed", provider: "claude" });
-    expect(first.tail).toMatchObject([{ text: "Intro", blockIndex: 0 }]);
-    expect(first.head).toMatchObject([{ text: "![Image](image.png)", blockIndex: 1 }]);
-    expect(growing.tail[0]).toBe(first.tail[0]);
-    expect(growing.tail[1]).toBe(first.head[0]);
-    expect(last.tail).toBe(growing.tail);
-    expect(last.head).toMatchObject([{ text: "After\n- item", blockIndex: 2 }]);
-    expect(completed.tail).toEqual(rows(last));
-    expect(completed.tail[2]).toBe(last.head[0]);
+    expect(last.tail).toEqual([]);
+    expect(last.head).toMatchObject([{ text: "Intro\n\n![Image](image.png)\n\nAfter\n- item" }]);
+    expect(completed.tail).toEqual(last.head);
     expect(completed.head).toEqual([]);
   });
 
@@ -225,8 +235,8 @@ describe("stream presentation through installed plugins", () => {
     const harness = streamHarness();
     harness.send(assistant("Intro\n\n```ts\nconst a = 1;"));
     const result = harness.send(assistant("\n\nconst b = 2;"));
-    expect(result.tail).toMatchObject([{ text: "Intro" }]);
-    expect(result.head).toMatchObject([{ text: "```ts\nconst a = 1;\n\nconst b = 2;" }]);
+    expect(result.tail).toEqual([]);
+    expect(result.head).toMatchObject([{ text: "Intro\n\n```ts\nconst a = 1;\n\nconst b = 2;" }]);
   });
 
   // Codex streams a line break and the next line's indent as their own chunks.
@@ -244,14 +254,13 @@ describe("stream presentation through installed plugins", () => {
   // 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
   // never leaves an empty row behind and the reference still resolves.
-  it("splits an assistant message into the same blocks through history and through the live head", () => {
+  it("preserves source identity through history and the live head", () => {
     const source = hydrateStreamState([
       {
         event: assistant("[Link][docs]\n\n[docs]: https://example.com\n\nClosing paragraph."),
         timestamp: new Date(1000),
       },
     ]);
-    const messageId = source[0]!.id;
     const present = (placement: "tail" | "head") =>
       rows(
         createStreamPresentation()({
@@ -261,20 +270,7 @@ describe("stream presentation through installed plugins", () => {
           transform: undefined,
         }),
       );
-    expect(present("tail")).toMatchObject([
-      {
-        id: `${messageId}:block:0`,
-        blockGroupId: messageId,
-        blockIndex: 0,
-        text: "[Link][docs]\n\n[docs]: https://example.com",
-      },
-      {
-        id: `${messageId}:block:1`,
-        blockGroupId: messageId,
-        blockIndex: 1,
-        text: "Closing paragraph.",
-      },
-    ]);
+    expect(present("tail")).toEqual(source);
     const blocks = (items: StreamItem[]) =>
       items.map((item) => [item.id, item.kind === "assistant_message" ? item.text : null]);
     expect(blocks(present("head"))).toEqual(blocks(present("tail")));
@@ -282,7 +278,7 @@ describe("stream presentation through installed plugins", () => {
 
   // Rows are addressed by id from outside presentation, so the same text has to land on
   // the same ids whether the reader watched it arrive or opened the chat afterwards.
-  it("gives a streamed message the block ids its hydrated text would have had", () => {
+  it("gives a streamed message the same id as its hydrated text", () => {
     const text = "Intro paragraph.\n\n# Heading\n\n- first\n- second\n\nClosing paragraph.";
     const harness = streamHarness();
     for (let end = 8; end < text.length; end += 8) {
@@ -304,7 +300,7 @@ describe("stream presentation through installed plugins", () => {
     );
   });
 
-  it("repoints a block at the canonical source that replaced the streamed one", () => {
+  it("uses the canonical source that replaced the streamed message", () => {
     const harness = streamHarness();
     harness.send(assistant("Streamed answer"));
     const streamed = rows(harness.render());
@@ -338,15 +334,8 @@ describe("stream presentation through installed plugins", () => {
       head: [],
       transform: undefined,
     });
-    expect(result.tail).toMatchObject([
-      {
-        id: `${messageId}:block:0`,
-        blockGroupId: messageId,
-        blockIndex: 0,
-        text: "Only one paragraph.",
-      },
-    ]);
-    expect(result.tail[0]!.id).not.toBe(messageId);
+    expect(result.tail).toEqual(source);
+    expect(result.tail[0]!.id).toBe(messageId);
   });
 
   it("continues to stream inline reasoning with a stable plugin row", () => {
@@ -563,13 +552,7 @@ describe("timeline presentation", () => {
         text: "<spoken-input>Example</spoken-input><instruction>Explain this XML.</instruction>",
       },
     ];
-    expect(projectTimelineItems(items)).toEqual(
-      items.map((item) =>
-        item.kind === "assistant_message"
-          ? { ...item, id: `${item.id}:block:0`, blockGroupId: item.id, blockIndex: 0 }
-          : item,
-      ),
-    );
+    expect(projectTimelineItems(items)).toEqual(items);
     expect(projectTimelineItems(items)[0]).toBe(items[0]);
   });
 
diff --git a/packages/app/src/agent-stream/presentation.ts b/packages/app/src/agent-stream/presentation.ts
index b89f91f6c0..4459486a7b 100644
--- a/packages/app/src/agent-stream/presentation.ts
+++ b/packages/app/src/agent-stream/presentation.ts
@@ -1,13 +1,12 @@
-import type { AssistantMessageItem, StreamItem, UserMessageItem } from "@/types/stream";
 import type { TimelineItemTransform } from "@/plugins/timeline/model";
 import { projectPluginTimelineItems } from "@/plugins/timeline/projection";
-import { splitMarkdownBlocks } from "@/utils/split-markdown-blocks";
 import {
   prepareToolCallHistory,
   projectToolCallDetailLevel,
   type PreparedToolCallHistory,
   type ToolCallDetailLevel,
 } from "@/tool-calls/detail-level/projection";
+import type { StreamItem, UserMessageItem } from "@/types/stream";
 
 interface PresentationInput {
   tail: StreamItem[];
@@ -17,42 +16,13 @@ interface PresentationInput {
   isTurnActive: boolean;
 }
 
-function retainItems(previous: StreamItem[], next: StreamItem[]): StreamItem[] {
-  return previous.length === next.length && previous.every((item, index) => item === next[index])
-    ? previous
-    : next;
-}
-
-/**
- * The source message a display row belongs to. Every assistant message is split into
- * Markdown blocks, so an assistant row id never equals its message id; anything that
- * addresses a message — find, scroll-to-message, history reveal — asks for this. A
- * plugin row a timeline transformer projected answers for the item it replaced, whose
- * id is what the chat outline and find hold.
- */
+/** Find and scrolling address a plugin row by the source it replaces. */
 export function getStreamItemMessageId(item: StreamItem): string {
-  if (item.kind === "assistant_message") return item.blockGroupId ?? item.id;
   if (item.kind === "plugin") return item.sourceId ?? item.id;
   return item.id;
 }
 
-/**
- * A block is reusable only when it still stands for the same source state. Text and
- * turn are what the reader sees; cursor and timestamp are what the timeline reads back
- * through the row — a reused block carrying a pre-canonical cursor reports a stale
- * reading position and weakens fork-boundary resolution.
- */
-function isReusableBlock(block: AssistantMessageItem, source: AssistantMessageItem, id: string) {
-  return (
-    block.id === id &&
-    block.turnId === source.turnId &&
-    block.timestamp.getTime() === source.timestamp.getTime() &&
-    block.timelineCursor?.epoch === source.timelineCursor?.epoch &&
-    block.timelineCursor?.seq === source.timelineCursor?.seq
-  );
-}
-
-/** Source messages reach plugins before any Markdown splitting or Overview grouping. */
+/** Source messages reach plugins before display projection. */
 export function createStreamPresentation() {
   const userMessageCache = new WeakMap<UserMessageItem, UserMessageItem>();
 
@@ -71,115 +41,39 @@ export function createStreamPresentation() {
     return projected;
   }
 
-  const blocksBySource = new WeakMap<AssistantMessageItem, AssistantMessageItem[]>();
-  let liveSources = new Map<string, AssistantMessageItem>();
   let historySource: StreamItem[] | undefined;
   let historyTransform: TimelineItemTransform | undefined;
   let historyRows: StreamItem[] = [];
-  let displayTail: StreamItem[] = [];
-  let displayHistory: StreamItem[] | undefined;
-  let promotedRows: StreamItem[] = [];
   let preparedTail: StreamItem[] | undefined;
   let preparedLevel: ToolCallDetailLevel | undefined;
   let preparedHistory: PreparedToolCallHistory | null = null;
 
-  /**
-   * One display row per Markdown block. Each block renders on its own, so a construct
-   * that needs context from another block does not resolve: `splitMarkdownBlocks` keeps
-   * link reference definitions with the block that uses them, but a reference pointing
-   * at a definition several blocks away renders as literal text. Streamed messages
-   * always behaved this way; history now matches them.
-   */
-  function nativeBlocks(item: StreamItem): StreamItem[] {
-    if (item.kind === "user_message") return [presentUserMessage(item)];
-    if (item.kind !== "assistant_message") return [item];
-    const cached = blocksBySource.get(item);
-    if (cached) return cached;
-    const previousSource = liveSources.get(item.id);
-    const previous = previousSource && blocksBySource.get(previousSource);
-    // Parse only the growing last block on append, as the old live reducer did.
-    // Canonical text replacements are parsed afresh instead of joining fragments.
-    const isAppend = previousSource && previous && item.text.startsWith(previousSource.text);
-    let prefix: AssistantMessageItem[] = [];
-    let growingText = item.text;
-    if (isAppend) {
-      prefix = previous.slice(0, -1);
-      growingText =
-        previous[previous.length - 1]!.text + item.text.slice(previousSource.text.length);
-    }
-    const parsed = splitMarkdownBlocks(growingText);
-    // Whitespace-only text has no block, and a message still owns exactly one row.
-    const textBlocks = parsed.length > 0 || prefix.length > 0 ? parsed : [""];
-
-    const blocks = [...prefix];
-    for (const [offset, text] of textBlocks.entries()) {
-      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 existing = previous?.[index];
-      const id = `${item.id}:block:${index}`;
-      if (existing?.text === blockText && isReusableBlock(existing, item, id)) {
-        blocks.push(existing);
-        continue;
-      }
-      blocks.push({
-        ...item,
-        id,
-        blockGroupId: item.id,
-        blockIndex: index,
-        text: blockText,
-      });
-    }
-    blocksBySource.set(item, blocks);
-    return blocks;
+  function presentRows(item: StreamItem): StreamItem[] {
+    return [item.kind === "user_message" ? presentUserMessage(item) : item];
   }
 
   return (input: PresentationInput) => {
     // Retained history is not reprojected or regrouped on each live text update.
     if (historySource !== input.tail || historyTransform !== input.transform) {
-      // One rendering path: history splits the same way the live head does, and
-      // `blocksBySource` keeps both the live block identities and the split cost
-      // from being paid again when only the tail's array identity changed.
       historyRows = projectPluginTimelineItems(input.tail, input.transform).flatMap<StreamItem>(
-        nativeBlocks,
+        (item) => presentRows(item),
       );
       historySource = input.tail;
       historyTransform = input.transform;
     }
     const head: StreamItem[] = [];
-    const promoted: StreamItem[] = [];
-    const nextLiveSources = new Map<string, AssistantMessageItem>();
     for (const item of projectPluginTimelineItems(input.head, input.transform, "streaming")) {
-      const blocks = nativeBlocks(item);
-      if (item.kind === "assistant_message") nextLiveSources.set(item.id, item);
-      if (item.kind === "assistant_message" && blocks.length > 1) {
-        promoted.push(...blocks.slice(0, -1));
-        head.push(blocks[blocks.length - 1]!);
-      } else {
-        head.push(...blocks);
-      }
+      const blocks = presentRows(item);
+      head.push(...blocks);
     }
-    liveSources = nextLiveSources;
-    const nextPromoted = retainItems(promotedRows, promoted);
-    if (displayHistory !== historyRows || nextPromoted !== promotedRows) {
-      displayTail = historyRows;
-      if (nextPromoted.length > 0) displayTail = [...historyRows, ...nextPromoted];
-      displayHistory = historyRows;
-      promotedRows = nextPromoted;
-    }
-    if (preparedTail !== displayTail || preparedLevel !== input.level) {
-      preparedHistory = prepareToolCallHistory(input.level, displayTail);
-      preparedTail = displayTail;
+    if (preparedTail !== historyRows || preparedLevel !== input.level) {
+      preparedHistory = prepareToolCallHistory(input.level, historyRows);
+      preparedTail = historyRows;
       preparedLevel = input.level;
     }
     return projectToolCallDetailLevel({
       level: input.level,
-      tail: displayTail,
+      tail: historyRows,
       head,
       preparedHistory,
       isTurnActive: input.isTurnActive,
diff --git a/packages/app/src/agent-stream/spacing.test.ts b/packages/app/src/agent-stream/spacing.test.ts
index dcf8a36844..07e9f185ff 100644
--- a/packages/app/src/agent-stream/spacing.test.ts
+++ b/packages/app/src/agent-stream/spacing.test.ts
@@ -1,135 +1,20 @@
 import { describe, expect, it } from "vitest";
+import { getAssistantMessageSpacing, getGapBetweenStreamItems } from "./spacing";
 import type { StreamItem } from "@/types/stream";
-import { getAssistantBlockSpacing, isSameAssistantBlockGroup } from "./spacing";
-
-function assistantBlock(params: {
-  id: string;
-  blockGroupId: string;
-  blockIndex: number;
-  text?: string;
-}): Extract<StreamItem, { kind: "assistant_message" }> {
-  return {
-    kind: "assistant_message",
-    id: params.id,
-    blockGroupId: params.blockGroupId,
-    blockIndex: params.blockIndex,
-    text: params.text ?? "",
-    timestamp: new Date("2026-05-01T00:00:00.000Z"),
-  };
-}
-
-function toolCallBlock(id: string): Extract<StreamItem, { kind: "tool_call" }> {
-  return {
-    kind: "tool_call",
-    id,
-    timestamp: new Date("2026-05-01T00:00:00.000Z"),
-    payload: {
-      source: "orchestrator",
-      data: {
-        toolCallId: id,
-        toolName: "bash",
-        arguments: "cmd",
-        result: null,
-        status: "executing",
-      },
-    },
-  };
-}
-
-describe("isSameAssistantBlockGroup", () => {
-  it("returns true for two assistant blocks with the same blockGroupId", () => {
-    const a = assistantBlock({ id: "a", blockGroupId: "group-1", blockIndex: 0 });
-    const b = assistantBlock({ id: "b", blockGroupId: "group-1", blockIndex: 1 });
-    expect(isSameAssistantBlockGroup({ item: a, other: b })).toBe(true);
-  });
-
-  it("returns false for blocks from different groups", () => {
-    const a = assistantBlock({ id: "a", blockGroupId: "group-1", blockIndex: 0 });
-    const b = assistantBlock({ id: "b", blockGroupId: "group-2", blockIndex: 0 });
-    expect(isSameAssistantBlockGroup({ item: a, other: b })).toBe(false);
-  });
-
-  it("returns false when one item is not an assistant_message", () => {
-    const a = assistantBlock({ id: "a", blockGroupId: "group-1", blockIndex: 0 });
-    const tc = toolCallBlock("tc-1");
-    expect(isSameAssistantBlockGroup({ item: a, other: tc })).toBe(false);
-  });
-
-  it("returns false for null neighbors", () => {
-    const a = assistantBlock({ id: "a", blockGroupId: "group-1", blockIndex: 0 });
-    expect(isSameAssistantBlockGroup({ item: a, other: null })).toBe(false);
-  });
-});
-
-describe("getAssistantBlockSpacing", () => {
-  it("returns default for non-assistant items", () => {
-    const tc = toolCallBlock("tc-1");
-    expect(getAssistantBlockSpacing({ item: tc, aboveItem: null, belowItem: null })).toBe(
-      "default",
-    );
-  });
-
-  it("returns default when no same-group neighbors exist", () => {
-    const a = assistantBlock({ id: "a", blockGroupId: "group-1", blockIndex: 0 });
-    expect(getAssistantBlockSpacing({ item: a, aboveItem: null, belowItem: null })).toBe("default");
-  });
-
-  it("compacts the bottom edge when the turn footer follows the assistant block", () => {
-    const a = assistantBlock({ id: "a", blockGroupId: "group-1", blockIndex: 0 });
-    expect(
-      getAssistantBlockSpacing({
-        item: a,
-        aboveItem: null,
-        belowItem: null,
-        hasFooterBelow: true,
-      }),
-    ).toBe("compactBottom");
-  });
-
-  it("returns compactTop when the item above is in the same block group", () => {
-    const above = assistantBlock({ id: "above", blockGroupId: "group-1", blockIndex: 0 });
-    const item = assistantBlock({ id: "item", blockGroupId: "group-1", blockIndex: 1 });
-    expect(getAssistantBlockSpacing({ item, aboveItem: above, belowItem: null })).toBe(
-      "compactTop",
-    );
-  });
-
-  it("returns compactBottom when the item below is in the same block group", () => {
-    const item = assistantBlock({ id: "item", blockGroupId: "group-1", blockIndex: 0 });
-    const below = assistantBlock({ id: "below", blockGroupId: "group-1", blockIndex: 1 });
-    expect(getAssistantBlockSpacing({ item, aboveItem: null, belowItem: below })).toBe(
+const message: StreamItem = {
+  kind: "assistant_message",
+  id: "m",
+  text: "First\n\nSecond",
+  timestamp: new Date(0),
+};
+describe("whole-message spacing", () => {
+  it("compacts only the gap to its turn footer", () => {
+    expect(getAssistantMessageSpacing({ item: message })).toBe("default");
+    expect(getAssistantMessageSpacing({ item: message, hasFooterBelow: true })).toBe(
       "compactBottom",
     );
   });
-
-  it("returns compactBoth when both neighbors are in the same block group", () => {
-    const above = assistantBlock({ id: "above", blockGroupId: "group-1", blockIndex: 0 });
-    const item = assistantBlock({ id: "item", blockGroupId: "group-1", blockIndex: 1 });
-    const below = assistantBlock({ id: "below", blockGroupId: "group-1", blockIndex: 2 });
-    expect(getAssistantBlockSpacing({ item, aboveItem: above, belowItem: below })).toBe(
-      "compactBoth",
-    );
-  });
-
-  it("spans the history/live-head boundary: tail gets compactBottom, head gets compactTop", () => {
-    const tailBlock = assistantBlock({
-      id: "group-1:block:0",
-      blockGroupId: "group-1",
-      blockIndex: 0,
-      text: "First paragraph",
-    });
-    const headBlock = assistantBlock({
-      id: "group-1:head",
-      blockGroupId: "group-1",
-      blockIndex: 1,
-      text: "Second paragraph",
-    });
-
-    expect(
-      getAssistantBlockSpacing({ item: tailBlock, aboveItem: null, belowItem: headBlock }),
-    ).toBe("compactBottom");
-    expect(
-      getAssistantBlockSpacing({ item: headBlock, aboveItem: tailBlock, belowItem: null }),
-    ).toBe("compactTop");
+  it("keeps separate messages separated", () => {
+    expect(getGapBetweenStreamItems(message, { ...message, id: "next" })).toBeGreaterThan(0);
   });
 });
diff --git a/packages/app/src/agent-stream/spacing.ts b/packages/app/src/agent-stream/spacing.ts
index 87bdf75f88..55761f71f3 100644
--- a/packages/app/src/agent-stream/spacing.ts
+++ b/packages/app/src/agent-stream/spacing.ts
@@ -1,35 +1,13 @@
 import type { StreamItem } from "@/types/stream";
 import { SPACING } from "@/styles/theme";
 
-export function isSameAssistantBlockGroup(params: {
-  item: StreamItem | null | undefined;
-  other: StreamItem | null | undefined;
-}): boolean {
-  return (
-    params.item?.kind === "assistant_message" &&
-    params.other?.kind === "assistant_message" &&
-    params.item.blockGroupId !== undefined &&
-    params.item.blockGroupId === params.other.blockGroupId
-  );
-}
-
-export function getAssistantBlockSpacing(params: {
+export function getAssistantMessageSpacing(params: {
   item: StreamItem;
-  aboveItem: StreamItem | null | undefined;
-  belowItem: StreamItem | null | undefined;
   hasFooterBelow?: boolean;
-}): "default" | "compactTop" | "compactBottom" | "compactBoth" {
-  if (params.item.kind !== "assistant_message") {
-    return "default";
-  }
-  const compactTop = isSameAssistantBlockGroup({ item: params.item, other: params.aboveItem });
-  const compactBottom =
-    params.hasFooterBelow ||
-    isSameAssistantBlockGroup({ item: params.item, other: params.belowItem });
-  if (compactTop && compactBottom) return "compactBoth";
-  if (compactTop) return "compactTop";
-  if (compactBottom) return "compactBottom";
-  return "default";
+}): "default" | "compactBottom" {
+  return params.item.kind === "assistant_message" && params.hasFooterBelow
+    ? "compactBottom"
+    : "default";
 }
 
 const isUserMessageItem = (item?: StreamItem | null) => item?.kind === "user_message";
@@ -62,8 +40,5 @@ export function getGapBetweenStreamItems(
   if (isToolSequenceItem(item) && belowItem.kind === "assistant_message") {
     return SPACING[1];
   }
-  if (isSameAssistantBlockGroup({ item, other: belowItem })) {
-    return SPACING[3];
-  }
   return SPACING[4];
 }
diff --git a/packages/app/src/agent-stream/strategy-native.tsx b/packages/app/src/agent-stream/strategy-native.tsx
index 65f535db11..66409f23e1 100644
--- a/packages/app/src/agent-stream/strategy-native.tsx
+++ b/packages/app/src/agent-stream/strategy-native.tsx
@@ -591,8 +591,11 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
       scrollEventThrottle={16}
       onContentSizeChange={handleContentSizeChange}
       maintainVisibleContentPosition={maintainVisibleContentPosition}
-      initialNumToRender={12}
-      windowSize={10}
+      // A history row can contain an entire long reply. Keep synchronous native
+      // Markdown measurement bounded while FlatList fills the surrounding window.
+      initialNumToRender={2}
+      maxToRenderPerBatch={2}
+      windowSize={5}
       removeClippedSubviews={false}
       scrollEnabled={scrollEnabled}
       showsVerticalScrollIndicator
diff --git a/packages/app/src/agent-stream/strategy-web.tsx b/packages/app/src/agent-stream/strategy-web.tsx
index f1c806fdca..97490c2a17 100644
--- a/packages/app/src/agent-stream/strategy-web.tsx
+++ b/packages/app/src/agent-stream/strategy-web.tsx
@@ -307,7 +307,6 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     olderHistoryProgressKey,
     scrollEnabled,
     contentMaxWidth,
-    imageContext,
     isMobileBreakpoint,
   } = props;
   const historyVirtualized = useRevisedHistoryRows(
@@ -455,7 +454,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       const row = segments.historyVirtualized[index];
       const measured = row && measuredRowHeights.current.get(row.id);
       if (measured && measured.width === contentWidth) return measured.height;
-      return row ? estimateStreamItemHeight({ item: row, contentMaxWidth, imageContext }) : 120;
+      return row ? estimateStreamItemHeight({ item: row, contentMaxWidth }) : 120;
     },
     observeElementOffset: observeVirtualOffset,
     rangeExtractor,
@@ -979,14 +978,25 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       if (!followOutputRef.current) {
         return;
       }
-      scheduleStickToBottom();
+      // ResizeObserver runs before paint. Following in the next frame exposes
+      // the newly grown row at the old offset for one painted frame.
+      forceStickToBottom();
     });
     observer.observe(scrollContainer);
     if (contentNode) {
       observer.observe(contentNode);
     }
+    // Paced reveal commits inside a message without rerendering this viewport.
+    // Observe those commits too, so the next frame sees the grown content at the
+    // bottom instead of waiting for the resize notification after animation frames.
+    const contentChanges = new MutationObserver(() => {
+      if (isActiveRef.current && followOutputRef.current) forceStickToBottom();
+    });
+    if (contentNode)
+      contentChanges.observe(contentNode, { childList: true, characterData: true, subtree: true });
     return () => {
       observer.disconnect();
+      contentChanges.disconnect();
     };
   }, [
     reconcileReadingPosition,
@@ -994,7 +1004,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     isActive,
     reportReadingPosition,
     scheduleHistoryStartPrependSettle,
-    scheduleStickToBottom,
+    forceStickToBottom,
     updateScrollMetrics,
     measureVirtualizedRows,
   ]);
diff --git a/packages/app/src/agent-stream/strategy.ts b/packages/app/src/agent-stream/strategy.ts
index 3b77f6b831..5f43f8f6b1 100644
--- a/packages/app/src/agent-stream/strategy.ts
+++ b/packages/app/src/agent-stream/strategy.ts
@@ -1,4 +1,3 @@
-import type { AssistantImageContext } from "@/utils/assistant-image-metadata";
 import type { ComponentType, ReactElement, ReactNode, RefObject } from "react";
 import type { StyleProp, ViewStyle } from "react-native";
 import type { StreamItem } from "@/types/stream";
@@ -95,7 +94,6 @@ export interface StreamRenderInput {
   forwardListContentContainerStyle: StyleProp<ViewStyle>;
   // The chat column's max width. The web viewport estimates unmeasured row heights with it.
   contentMaxWidth: number;
-  imageContext?: AssistantImageContext;
 }
 
 export interface ResolveStreamRenderStrategyInput {
diff --git a/packages/app/src/agent-stream/view.tsx b/packages/app/src/agent-stream/view.tsx
index 6526e7352b..cd7aa42b70 100644
--- a/packages/app/src/agent-stream/view.tsx
+++ b/packages/app/src/agent-stream/view.tsx
@@ -218,12 +218,13 @@ function renderListEmptyComponent(input: {
   );
 }
 
-// History rows sit inside FlatList cells that rerender on every data change (RN recreates each
-// CellRenderer with a fresh ref and, in a newest-first list, a shifted index). This boundary is
+// Live and retained rows use the same boundary so completion preserves the message
+// subtree, including measured diagrams and selections. FlatList recreates history
+// cells with fresh refs and shifted indexes on data changes. This boundary is
 // what stops that churn: a row renders again only when its stream item identity, its layout item
 // identity, or the renderer itself changes. Item identity is the revision signal the strategy
 // already uses (`useRevisedHistoryRows` clones items whose content or display state changed).
-const HistoryStreamRow = memo(function HistoryStreamRow({
+const StreamRow = memo(function StreamRow({
   layoutItem,
   renderStreamItem,
 }: {
@@ -234,7 +235,7 @@ const HistoryStreamRow = memo(function HistoryStreamRow({
   return <>{renderStreamItem(layoutItem)}</>;
 });
 
-function renderHistoryStreamItem(input: {
+function renderStreamRow(input: {
   item: StreamItem;
   layoutItemById: Map<string, StreamLayoutItem>;
   renderStreamItem: (layoutItem: StreamLayoutItem) => ReactNode;
@@ -244,7 +245,7 @@ function renderHistoryStreamItem(input: {
     return null;
   }
   return (
-    <HistoryStreamRow
+    <StreamRow
       item={input.item}
       layoutItem={layoutItem}
       renderStreamItem={input.renderStreamItem}
@@ -252,18 +253,6 @@ function renderHistoryStreamItem(input: {
   );
 }
 
-function renderLiveHeadStreamItem(input: {
-  item: StreamItem;
-  layoutItemById: Map<string, StreamLayoutItem>;
-  renderStreamItem: (layoutItem: StreamLayoutItem) => ReactNode;
-}): ReactNode {
-  const layoutItem = input.layoutItemById.get(input.item.id);
-  if (!layoutItem) {
-    return null;
-  }
-  return input.renderStreamItem(layoutItem);
-}
-
 export interface AgentStreamViewHandle {
   scrollToBottom(reason?: BottomAnchorLocalRequest["reason"]): void;
   prepareForViewportChange(): void;
@@ -1030,7 +1019,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
 
     const renderHistoryRow = useCallback(
       (item: StreamItem) =>
-        renderHistoryStreamItem({
+        renderStreamRow({
           item,
           layoutItemById: layoutHistoryItemById,
           renderStreamItem,
@@ -1051,7 +1040,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     // to be a new object on every text-chunk flush.
     const renderLiveHeadRow: StreamSegmentRenderers["renderLiveHeadRow"] = useStableEvent(
       (item: StreamItem) =>
-        renderLiveHeadStreamItem({
+        renderStreamRow({
           item,
           layoutItemById: layoutLiveHeadItemById,
           renderStreamItem,
@@ -1137,7 +1126,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
                 baseListContentContainerStyle: stylesheet.listContentContainer,
                 forwardListContentContainerStyle: stylesheet.forwardListContentContainer,
                 contentMaxWidth,
-                imageContext: { serverId: resolvedServerId, workspaceRoot },
               })}
             </MessageOuterSpacingProvider>
             <ChatOutlineRail
diff --git a/packages/app/src/agent-stream/web-virtualization.test.ts b/packages/app/src/agent-stream/web-virtualization.test.ts
index 602925faa0..31107789e2 100644
--- a/packages/app/src/agent-stream/web-virtualization.test.ts
+++ b/packages/app/src/agent-stream/web-virtualization.test.ts
@@ -2,9 +2,9 @@ import { describe, expect, it } from "vitest";
 import { DEFAULT_CONTENT_MAX_WIDTH } from "@/styles/theme";
 import type { StreamItem } from "@/types/stream";
 import {
-  clearAssistantImageMetadataCache,
-  setAssistantImageMetadata,
-} from "@/utils/assistant-image-metadata";
+  setAssistantMessageHeight,
+  clearAssistantMessageHeightEstimateCache,
+} from "@/utils/assistant-message-height-estimate";
 import {
   DEFAULT_WEB_MOUNTED_RECENT_STREAM_ITEMS,
   DEFAULT_WEB_PARTIAL_VIRTUALIZATION_THRESHOLD,
@@ -161,56 +161,18 @@ describe("estimateStreamItemHeight", () => {
     );
   });
 
-  it("uses local image dimensions only from the row's server and workspace", () => {
-    clearAssistantImageMetadataCache();
-    const imageContext = { serverId: "server-one", workspaceRoot: "/workspace/one" };
-    setAssistantImageMetadata(
-      { source: "portrait.png", ...imageContext },
-      { width: 800, height: 1600 },
-    );
+  it("uses the renderer's whole-message measurement at the measured width", () => {
+    clearAssistantMessageHeightEstimateCache();
     const item: StreamItem = {
       kind: "assistant_message",
-      id: "local-image",
-      text: "![Portrait](portrait.png)",
+      id: "measured",
+      text: "First paragraph\n\n![Image](image.png)",
       timestamp: createTimestamp(2),
     };
-
-    expect(estimateStreamItemHeight({ item, contentMaxWidth: 608, imageContext })).toBe(1264);
-    expect(
-      estimateStreamItemHeight({
-        item,
-        contentMaxWidth: 608,
-        imageContext: { ...imageContext, workspaceRoot: "/workspace/two" },
-      }),
-    ).toBe(464);
-    expect(
-      estimateStreamItemHeight({
-        item,
-        contentMaxWidth: 608,
-        imageContext: { ...imageContext, serverId: "server-two" },
-      }),
-    ).toBe(464);
-  });
-
-  it("uses cached assistant image metadata when available", () => {
-    clearAssistantImageMetadataCache();
-    setAssistantImageMetadata(
-      {
-        source: "https://example.com/tall.png",
-      },
-      { width: 800, height: 1600 },
-    );
-
-    const item: StreamItem = {
-      kind: "assistant_message",
-      id: "a-image",
-      text: "Look at this\n\n![Screenshot](https://example.com/tall.png)",
-      timestamp: createTimestamp(2),
-    };
-
-    expect(
-      estimateStreamItemHeight({ item, contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH }),
-    ).toBeGreaterThan(220);
+    setAssistantMessageHeight({ markdown: item.text, width: 608, height: 640 });
+    expect(estimateStreamItemHeight({ item, contentMaxWidth: 608 })).toBe(640);
+    expect(estimateStreamItemHeight({ item, contentMaxWidth: 320 })).toBe(220);
+    clearAssistantMessageHeightEstimateCache();
   });
 });
 
diff --git a/packages/app/src/agent-stream/web-virtualization.ts b/packages/app/src/agent-stream/web-virtualization.ts
index 0c7f756959..daf01af558 100644
--- a/packages/app/src/agent-stream/web-virtualization.ts
+++ b/packages/app/src/agent-stream/web-virtualization.ts
@@ -1,4 +1,3 @@
-import type { AssistantImageContext } from "@/utils/assistant-image-metadata";
 import type { StreamItem } from "@/types/stream";
 import { estimateAssistantMessageHeightFromCache } from "@/utils/assistant-message-height-estimate";
 import {
@@ -47,13 +46,11 @@ export interface WebVirtualizedHistoryWindow {
 interface StreamItemHeightEstimateInput {
   item: StreamItem;
   contentMaxWidth: number;
-  imageContext?: AssistantImageContext;
 }
 
 export function estimateStreamItemHeight({
   item,
   contentMaxWidth,
-  imageContext,
 }: StreamItemHeightEstimateInput): number {
   switch (item.kind) {
     case "user_message":
@@ -63,7 +60,6 @@ export function estimateStreamItemHeight({
         estimateAssistantMessageHeightFromCache({
           markdown: item.text,
           contentMaxWidth,
-          imageContext,
         }) ?? 220
       );
     case "tool_call":
diff --git a/packages/app/src/assistant-file-links/extensions.ts b/packages/app/src/assistant-file-links/extensions.ts
new file mode 100644
index 0000000000..b32bf6aad9
--- /dev/null
+++ b/packages/app/src/assistant-file-links/extensions.ts
@@ -0,0 +1,57 @@
+export const ASSISTANT_FILE_EXTENSIONS: ReadonlySet<string> = new Set([
+  "astro",
+  "bash",
+  "c",
+  "cc",
+  "cjs",
+  "cpp",
+  "cs",
+  "css",
+  "cts",
+  "cxx",
+  "env",
+  "fish",
+  "go",
+  "gql",
+  "gradle",
+  "graphql",
+  "h",
+  "hpp",
+  "htm",
+  "html",
+  "ini",
+  "java",
+  "js",
+  "json",
+  "jsonc",
+  "jsx",
+  "kt",
+  "kts",
+  "less",
+  "lock",
+  "lua",
+  "md",
+  "mdx",
+  "mjs",
+  "mts",
+  "php",
+  "proto",
+  "py",
+  "rb",
+  "rs",
+  "sass",
+  "scss",
+  "sh",
+  "sql",
+  "svelte",
+  "swift",
+  "toml",
+  "ts",
+  "tsx",
+  "txt",
+  "vue",
+  "xml",
+  "yaml",
+  "yml",
+  "zsh",
+]);
diff --git a/packages/app/src/assistant-file-links/index.ts b/packages/app/src/assistant-file-links/index.ts
index 723945409f..169afc38b0 100644
--- a/packages/app/src/assistant-file-links/index.ts
+++ b/packages/app/src/assistant-file-links/index.ts
@@ -1,9 +1,3 @@
-export {
-  AssistantInlineCodePathLink,
-  AssistantMarkdownCodeLink,
-  AssistantMarkdownLink,
-} from "./link";
-export { type AssistantLinkPress, useAssistantLinkPress } from "./link-press-context";
 export {
   classifyAssistantFileLink,
   normalizeInlinePathTarget,
@@ -11,7 +5,8 @@ export {
 } from "./parse";
 export {
   AssistantFileLinkResolverProvider,
+  useAssistantFileLinkEnvironment,
   type AssistantFileLinkResolverProviderProps,
 } from "./provider";
 export type { AssistantFileLinkSource } from "./resolver";
-export { useAssistantFileLinkActions } from "./use-file-link";
+export { useAssistantFileLinkActions, useFileLink } from "./use-file-link";
diff --git a/packages/app/src/assistant-file-links/link-press-context.ts b/packages/app/src/assistant-file-links/link-press-context.ts
deleted file mode 100644
index 2d6ae19639..0000000000
--- a/packages/app/src/assistant-file-links/link-press-context.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { createContext, useContext } from "react";
-import type { TextProps } from "react-native";
-
-// Carries a link's press handler down to the leaf text spans that render its
-// label. On iOS an assistant link is a nested UITextView span, and
-// react-native-uitextview only attaches onPress to the *string* children it
-// converts into RNUITextViewChild nodes (src/Text.tsx) — element children (the
-// MarkdownInheritedText spans markdown produces for link text) pass through
-// untouched, so an onPress placed on the wrapping span never reaches a tappable
-// native node. Threading the handler through context lets each leaf span hand
-// onPress to its own string children, where the native tap recognizer can find
-// it. Provided only on iOS (Android/web links tap fine via their own paths).
-export interface AssistantLinkPress {
-  onPress: () => void;
-  accessibilityRole?: TextProps["accessibilityRole"];
-}
-
-const AssistantLinkPressContext = createContext<AssistantLinkPress | null>(null);
-
-export const AssistantLinkPressProvider = AssistantLinkPressContext.Provider;
-
-export function useAssistantLinkPress(): AssistantLinkPress | null {
-  return useContext(AssistantLinkPressContext);
-}
diff --git a/packages/app/src/assistant-file-links/link.tsx b/packages/app/src/assistant-file-links/link.tsx
deleted file mode 100644
index 4b8e944ee3..0000000000
--- a/packages/app/src/assistant-file-links/link.tsx
+++ /dev/null
@@ -1,213 +0,0 @@
-import { useMemo, type CSSProperties, type MouseEvent, type ReactNode } from "react";
-import { Platform, Text, View, type StyleProp, type TextStyle, type ViewStyle } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { isNative, isWeb } from "@/constants/platform";
-import { MarkdownTextSpan } from "@/components/markdown-text";
-import { MarkdownLinkText } from "@/components/markdown/link-text";
-import { AssistantLinkPressProvider, type AssistantLinkPress } from "./link-press-context";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { CODE_SURFACE_DATASET } from "@/styles/code-surface";
-import { markdownCopyDataSet } from "@/assistant-selection-copy/markup";
-import { useAssistantFileLinkResolverContext } from "./provider";
-import type { AssistantFileLinkSource } from "./resolver";
-import { formatFileLinkTooltipPath } from "./tooltip-path";
-import { useFileLink } from "./use-file-link";
-
-interface AssistantMarkdownLinkProps {
-  source: AssistantFileLinkSource;
-  style: StyleProp<TextStyle>;
-  monoSurface?: boolean;
-  children: ReactNode;
-}
-
-const MARKDOWN_CODE_LINK_DATASET = {
-  ...CODE_SURFACE_DATASET,
-  ...markdownCopyDataSet.code,
-} as const;
-
-export function AssistantMarkdownLink({
-  source,
-  style,
-  monoSurface,
-  children,
-}: AssistantMarkdownLinkProps) {
-  const { target, onHoverIn, onPress } = useFileLink(source);
-  const { configRef } = useAssistantFileLinkResolverContext();
-  const workspaceRoot = configRef.current.workspaceRoot;
-  const tooltipPath = useMemo(
-    () => (target ? formatFileLinkTooltipPath({ target, workspaceRoot }) : null),
-    [target, workspaceRoot],
-  );
-  const linkPress = useMemo<AssistantLinkPress>(
-    () => ({ onPress, accessibilityRole: "link" }),
-    [onPress],
-  );
-  const unwrapForMarkdownCopy = source.sourceType === "inline-code" || source.markup === "linkify";
-
-  if (isNative) {
-    // Must be a MarkdownTextSpan, not a plain <Text>: on iOS the link renders
-    // inside the paragraph's native UITextView, and a plain <Text> nested there
-    // is not hoisted into a UITextViewChild, so its text is silently dropped
-    // (the link disappears). The span composes correctly and stays selectable.
-    //
-    // Tap-to-open: react-native-uitextview only wires onPress onto the *string*
-    // children it turns into RNUITextViewChild nodes — the element children that
-    // markdown emits for link text pass through untouched, so an onPress placed
-    // here never reaches a tappable native node. We thread it down through
-    // AssistantLinkPressProvider so each leaf text span re-attaches it to its
-    // own string children, where the native tap recognizer can find it. iOS
-    // only: Android forwards onPress through nested <Text> already, and web uses
-    // the <a> path below.
-    const span = (
-      <MarkdownTextSpan
-        accessibilityRole="link"
-        monoSurface={monoSurface}
-        onPress={onPress}
-        style={style}
-      >
-        {children}
-      </MarkdownTextSpan>
-    );
-    return (
-      <FileLinkHoverTooltip filePath={tooltipPath}>
-        {Platform.OS === "ios" ? (
-          <AssistantLinkPressProvider value={linkPress}>{span}</AssistantLinkPressProvider>
-        ) : (
-          span
-        )}
-      </FileLinkHoverTooltip>
-    );
-  }
-
-  const anchor = (
-    <a
-      {...(unwrapForMarkdownCopy ? { "data-paseo-markdown-unwrap": "true" } : {})}
-      href={source.href}
-      title={source.title}
-      onClickCapture={preventAnchorNavigation}
-      onAuxClickCapture={preventAnchorNavigation}
-      style={LINK_ANCHOR_STYLE}
-    >
-      <MarkdownLinkText
-        dataSet={monoSurface ? MARKDOWN_CODE_LINK_DATASET : undefined}
-        style={style}
-        onPress={onPress}
-        onHoverIn={onHoverIn}
-      >
-        {children}
-      </MarkdownLinkText>
-    </a>
-  );
-
-  return <FileLinkHoverTooltip filePath={tooltipPath}>{anchor}</FileLinkHoverTooltip>;
-}
-
-interface AssistantMarkdownCodeLinkProps {
-  source: AssistantFileLinkSource;
-  inheritedStyles: TextStyle;
-  codeInlineStyle: TextStyle;
-  linkStyle: TextStyle;
-  children: ReactNode;
-}
-
-export function AssistantMarkdownCodeLink({
-  source,
-  inheritedStyles,
-  codeInlineStyle,
-  linkStyle,
-  children,
-}: AssistantMarkdownCodeLinkProps) {
-  const style = useMemo(
-    () => [inheritedStyles, codeInlineStyle, linkStyle],
-    [inheritedStyles, codeInlineStyle, linkStyle],
-  );
-  return (
-    <AssistantMarkdownLink source={source} style={style} monoSurface>
-      {children}
-    </AssistantMarkdownLink>
-  );
-}
-
-interface AssistantInlineCodePathLinkProps {
-  content: string;
-  inheritedStyles: TextStyle;
-  codeInlineStyle: TextStyle;
-  linkStyle: TextStyle;
-}
-
-export function AssistantInlineCodePathLink({
-  content,
-  inheritedStyles,
-  codeInlineStyle,
-  linkStyle,
-}: AssistantInlineCodePathLinkProps) {
-  const source = useMemo<AssistantFileLinkSource>(
-    () => ({
-      href: content,
-      text: content,
-      sourceType: "inline-code",
-    }),
-    [content],
-  );
-
-  return (
-    <AssistantMarkdownCodeLink
-      source={source}
-      inheritedStyles={inheritedStyles}
-      codeInlineStyle={codeInlineStyle}
-      linkStyle={linkStyle}
-    >
-      {content}
-    </AssistantMarkdownCodeLink>
-  );
-}
-
-const FILE_LINK_TOOLTIP_TRIGGER_STYLE: ViewStyle = {
-  // RN doesn't type "inline-flex" but RN-web honors it at runtime, which keeps
-  // the tooltip wrapper from breaking inline link flow.
-  display: "inline-flex" as ViewStyle["display"],
-};
-
-function FileLinkHoverTooltip({
-  filePath,
-  children,
-}: {
-  filePath: string | null;
-  children: ReactNode;
-}) {
-  if (!isWeb) {
-    return children;
-  }
-  return (
-    <Tooltip delayDuration={400}>
-      <TooltipTrigger asChild>
-        <View style={FILE_LINK_TOOLTIP_TRIGGER_STYLE}>{children}</View>
-      </TooltipTrigger>
-      {filePath ? (
-        <TooltipContent side="top" align="start" maxWidth={520}>
-          <Text selectable={false} style={styles.tooltipPath}>
-            {filePath}
-          </Text>
-        </TooltipContent>
-      ) : null}
-    </Tooltip>
-  );
-}
-
-const LINK_ANCHOR_STYLE: CSSProperties = {
-  display: "contents",
-  color: "inherit",
-  textDecoration: "none",
-};
-
-function preventAnchorNavigation(event: MouseEvent<HTMLAnchorElement>): void {
-  event.preventDefault();
-}
-
-const styles = StyleSheet.create((theme) => ({
-  tooltipPath: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.normal,
-  },
-}));
diff --git a/packages/app/src/assistant-file-links/parse.ts b/packages/app/src/assistant-file-links/parse.ts
index 0a8089acca..1904c11907 100644
--- a/packages/app/src/assistant-file-links/parse.ts
+++ b/packages/app/src/assistant-file-links/parse.ts
@@ -1,3 +1,4 @@
+import { ASSISTANT_FILE_EXTENSIONS } from "./extensions";
 import { isAbsolutePath } from "@/utils/path";
 
 function safeDecodeURIComponent(value: string): string {
@@ -20,64 +21,6 @@ const INLINE_LINE_FRAGMENT = /^L([0-9]+)(?:C[0-9]+)?(?:-L?([0-9]+)(?:C[0-9]+)?)?
 const INLINE_COLON_LINE_SUFFIX = /^(.+?):([0-9]+)(?::[0-9]+)?(?:-([0-9]+)(?::[0-9]+)?)?$/;
 const INLINE_PAREN_LINE_SUFFIX = /^(.+?)\(([0-9]+)(?:,[0-9]+)?(?:-([0-9]+)(?:,[0-9]+)?)?\)$/;
 const INLINE_WORD_LINE_SUFFIX = /^(.+?)\s+lines?\s+([0-9]+)(?:-([0-9]+))?$/i;
-const ASSISTANT_FILE_EXTENSIONS = new Set([
-  "astro",
-  "bash",
-  "c",
-  "cc",
-  "cjs",
-  "cpp",
-  "cs",
-  "css",
-  "cts",
-  "cxx",
-  "env",
-  "fish",
-  "go",
-  "gql",
-  "gradle",
-  "graphql",
-  "h",
-  "hpp",
-  "htm",
-  "html",
-  "ini",
-  "java",
-  "js",
-  "json",
-  "jsonc",
-  "jsx",
-  "kt",
-  "kts",
-  "less",
-  "lock",
-  "lua",
-  "md",
-  "mdx",
-  "mjs",
-  "mts",
-  "php",
-  "proto",
-  "py",
-  "rb",
-  "rs",
-  "sass",
-  "scss",
-  "sh",
-  "sql",
-  "svelte",
-  "swift",
-  "toml",
-  "ts",
-  "tsx",
-  "txt",
-  "vue",
-  "xml",
-  "yaml",
-  "yml",
-  "zsh",
-]);
-
 export interface AssistantHrefParseOptions {
   workspaceRoot?: string;
   /**
diff --git a/packages/app/src/assistant-file-links/provider.tsx b/packages/app/src/assistant-file-links/provider.tsx
index 77d0b2e034..967e1c32e3 100644
--- a/packages/app/src/assistant-file-links/provider.tsx
+++ b/packages/app/src/assistant-file-links/provider.tsx
@@ -14,6 +14,7 @@ import type { InlinePathTarget } from "./parse";
 import type { AssistantFileLinkContext, GetDirectorySuggestions } from "./resolver";
 
 export interface AssistantFileLinkDaemonClient {
+  readFile?: import("@getpaseo/client/internal/daemon-client").DaemonClient["readFile"];
   getDirectorySuggestions: GetDirectorySuggestions;
 }
 
@@ -78,10 +79,16 @@ export function AssistantFileLinkResolverProvider({
 
 export function useAssistantFileLinkResolverContext(): AssistantFileLinkResolverContextValue {
   const context = useContext(AssistantFileLinkResolverContext);
-  if (!context) {
-    throw new Error("AssistantFileLinkResolverProvider is required for assistant file links.");
-  }
-  return context;
+  return context ?? EMPTY_CONTEXT;
 }
 
 export type { AssistantFileLinkContext };
+
+const EMPTY_CONTEXT: AssistantFileLinkResolverContextValue = {
+  configRef: { current: {} },
+  getDirectorySuggestions: async () => ({ entries: [], error: null }),
+};
+
+export function useAssistantFileLinkEnvironment() {
+  return useAssistantFileLinkResolverContext().configRef.current;
+}
diff --git a/packages/app/src/assistant-file-links/use-file-link.ts b/packages/app/src/assistant-file-links/use-file-link.ts
index 603645f0fe..4f117e5dc1 100644
--- a/packages/app/src/assistant-file-links/use-file-link.ts
+++ b/packages/app/src/assistant-file-links/use-file-link.ts
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import { useStableEvent } from "@/hooks/use-stable-event";
 import type { OpenFileDisposition } from "@/workspace/file-open";
 import { openExternalUrl } from "@/utils/open-external-url";
+import { formatFileLinkTooltipPath } from "./tooltip-path";
 import type { InlinePathTarget } from "./parse";
 import {
   useAssistantFileLinkResolverContext,
@@ -18,6 +19,7 @@ import {
 
 export interface UseFileLinkResult {
   target: InlinePathTarget | null;
+  tooltipPath: string | null;
   onHoverIn: () => void;
   onPress: () => void;
   open: (source: AssistantFileLinkSource, disposition: OpenFileDisposition) => void;
@@ -134,7 +136,11 @@ export function useFileLink(source: AssistantFileLinkSource): UseFileLinkResult
     return query.data ?? null;
   }, [query.data, resolution]);
 
-  return useMemo(() => ({ target, onHoverIn, onPress, open }), [target, onHoverIn, onPress, open]);
+  const tooltipPath = target ? formatFileLinkTooltipPath({ target, workspaceRoot }) : null;
+  return useMemo(
+    () => ({ target, tooltipPath, onHoverIn, onPress, open }),
+    [target, tooltipPath, onHoverIn, onPress, open],
+  );
 }
 
 export function useAssistantFileLinkActions(): AssistantFileLinkActions {
diff --git a/packages/app/src/assistant-image/lifecycle.test.ts b/packages/app/src/assistant-image/lifecycle.test.ts
deleted file mode 100644
index ed7729dd38..0000000000
--- a/packages/app/src/assistant-image/lifecycle.test.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { createAssistantImageLifecycle, transitionAssistantImageLifecycle } from "./lifecycle";
-
-describe("assistant image lifecycle", () => {
-  it("keeps preview URL recreation in the public loading state", () => {
-    const loading = transitionAssistantImageLifecycle(createAssistantImageLifecycle(), {
-      type: "preview_created",
-      uri: "blob:first",
-      aspectRatio: null,
-    });
-    const loaded = transitionAssistantImageLifecycle(loading, {
-      type: "image_loaded",
-      uri: "blob:first",
-      aspectRatio: 1.5,
-    });
-
-    const recreating = transitionAssistantImageLifecycle(loaded, {
-      type: "preview_released",
-    });
-
-    expect(recreating).toEqual({ status: "loading", uri: null, aspectRatio: null });
-  });
-
-  it("publishes loaded only after the recreated URL loads", () => {
-    const recreating = transitionAssistantImageLifecycle(createAssistantImageLifecycle(), {
-      type: "preview_created",
-      uri: "blob:recreated",
-      aspectRatio: 1.5,
-    });
-
-    expect(recreating).toEqual({
-      status: "loading",
-      uri: "blob:recreated",
-      aspectRatio: 1.5,
-    });
-
-    const recreated = transitionAssistantImageLifecycle(recreating, {
-      type: "image_loaded",
-      uri: "blob:recreated",
-      aspectRatio: 0.75,
-    });
-
-    expect(recreated).toEqual({
-      status: "loaded",
-      uri: "blob:recreated",
-      aspectRatio: 0.75,
-    });
-  });
-
-  it("does not reset a loaded image when the same preview is reported again", () => {
-    const loading = transitionAssistantImageLifecycle(createAssistantImageLifecycle(), {
-      type: "preview_created",
-      uri: "blob:current",
-      aspectRatio: null,
-    });
-    const loaded = transitionAssistantImageLifecycle(loading, {
-      type: "image_loaded",
-      uri: "blob:current",
-      aspectRatio: 1.5,
-    });
-
-    const repeated = transitionAssistantImageLifecycle(loaded, {
-      type: "preview_created",
-      uri: "blob:current",
-      aspectRatio: 1.5,
-    });
-
-    expect(repeated).toBe(loaded);
-  });
-
-  it("publishes failed for a terminal image failure on the current URI", () => {
-    const loading = transitionAssistantImageLifecycle(createAssistantImageLifecycle(), {
-      type: "preview_created",
-      uri: "blob:current",
-      aspectRatio: null,
-    });
-    const failed = transitionAssistantImageLifecycle(loading, {
-      type: "failed",
-      uri: "blob:current",
-      message: "Unable to load image preview.",
-    });
-
-    expect(failed).toEqual({
-      status: "failed",
-      message: "Unable to load image preview.",
-    });
-  });
-
-  it("ignores a stale load callback from a replaced URI", () => {
-    const current = transitionAssistantImageLifecycle(createAssistantImageLifecycle(), {
-      type: "preview_created",
-      uri: "blob:current",
-      aspectRatio: 1.25,
-    });
-
-    const afterStaleLoad = transitionAssistantImageLifecycle(current, {
-      type: "image_loaded",
-      uri: "blob:released",
-      aspectRatio: 2,
-    });
-
-    expect(afterStaleLoad).toEqual(current);
-  });
-
-  it("ignores a stale error callback from a replaced URI", () => {
-    const current = transitionAssistantImageLifecycle(createAssistantImageLifecycle(), {
-      type: "preview_created",
-      uri: "blob:current",
-      aspectRatio: null,
-    });
-
-    const afterStaleError = transitionAssistantImageLifecycle(current, {
-      type: "failed",
-      uri: "blob:released",
-      message: "Image unavailable",
-    });
-
-    expect(afterStaleError).toEqual(current);
-  });
-});
diff --git a/packages/app/src/assistant-image/lifecycle.ts b/packages/app/src/assistant-image/lifecycle.ts
deleted file mode 100644
index bf0db18c97..0000000000
--- a/packages/app/src/assistant-image/lifecycle.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-export type AssistantImageLifecycle =
-  | { status: "loading"; uri: string | null; aspectRatio: number | null }
-  | { status: "loaded"; uri: string; aspectRatio: number }
-  | { status: "failed"; message: string };
-
-export type AssistantImageLifecycleEvent =
-  | { type: "preview_created"; uri: string; aspectRatio: number | null }
-  | { type: "preview_released" }
-  | { type: "image_loaded"; uri: string; aspectRatio: number }
-  | { type: "failed"; uri: string; message: string };
-
-export function createAssistantImageLifecycle(): AssistantImageLifecycle {
-  return { status: "loading", uri: null, aspectRatio: null };
-}
-
-export function transitionAssistantImageLifecycle(
-  state: AssistantImageLifecycle,
-  event: AssistantImageLifecycleEvent,
-): AssistantImageLifecycle {
-  if (event.type === "image_loaded") {
-    if (state.status !== "loading" || state.uri !== event.uri) {
-      return state;
-    }
-    return {
-      status: "loaded",
-      uri: event.uri,
-      aspectRatio: event.aspectRatio,
-    };
-  }
-  if (event.type === "failed") {
-    if (state.status === "failed" || state.uri !== event.uri) {
-      return state;
-    }
-    return { status: "failed", message: event.message };
-  }
-  if (event.type === "preview_created") {
-    if (state.status === "loaded" && state.uri === event.uri) {
-      return state;
-    }
-    return { status: "loading", uri: event.uri, aspectRatio: event.aspectRatio };
-  }
-  if (event.type === "preview_released") {
-    return { status: "loading", uri: null, aspectRatio: null };
-  }
-  return state;
-}
diff --git a/packages/app/src/assistant-image/load-dimensions.test.ts b/packages/app/src/assistant-image/load-dimensions.test.ts
deleted file mode 100644
index a60f9b1b6d..0000000000
--- a/packages/app/src/assistant-image/load-dimensions.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  type AssistantImageRenderedDimensionsReader,
-  resolveAssistantImageLoadDimensions,
-} from "./load-dimensions";
-
-class MemoryRenderedDimensionsReader implements AssistantImageRenderedDimensionsReader {
-  constructor(private readonly dimensions: { width: number; height: number } | null) {}
-
-  read(): { width: number; height: number } | null {
-    return this.dimensions;
-  }
-}
-
-describe("assistant image load dimensions", () => {
-  it("prefers native source dimensions", () => {
-    const dimensions = resolveAssistantImageLoadDimensions({
-      source: { width: 640, height: 320 },
-      target: { naturalWidth: 800, naturalHeight: 400 },
-      renderedImage: null,
-      renderedDimensions: new MemoryRenderedDimensionsReader({ width: 900, height: 600 }),
-    });
-
-    expect(dimensions).toEqual({ width: 640, height: 320 });
-  });
-
-  it("uses browser event dimensions when native dimensions are absent", () => {
-    const dimensions = resolveAssistantImageLoadDimensions({
-      source: { width: 0, height: 0 },
-      target: { naturalWidth: 800, naturalHeight: 400 },
-      renderedImage: null,
-      renderedDimensions: new MemoryRenderedDimensionsReader({ width: 900, height: 600 }),
-    });
-
-    expect(dimensions).toEqual({ width: 800, height: 400 });
-  });
-
-  it("falls back to the rendered image adapter", () => {
-    const renderedImage = { id: "rendered-image" };
-    const dimensions = resolveAssistantImageLoadDimensions({
-      target: null,
-      renderedImage,
-      renderedDimensions: new MemoryRenderedDimensionsReader({ width: 900, height: 600 }),
-    });
-
-    expect(dimensions).toEqual({ width: 900, height: 600 });
-  });
-});
diff --git a/packages/app/src/assistant-image/load-dimensions.ts b/packages/app/src/assistant-image/load-dimensions.ts
deleted file mode 100644
index 069814ced8..0000000000
--- a/packages/app/src/assistant-image/load-dimensions.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-export interface AssistantImageDimensions {
-  width: number;
-  height: number;
-}
-
-interface AssistantImageDimensionCandidate {
-  width?: unknown;
-  height?: unknown;
-}
-
-export interface AssistantImageRenderedDimensionsReader {
-  read(renderedImage: unknown): AssistantImageDimensions | null;
-}
-
-function readPositiveDimensions(
-  candidate: AssistantImageDimensionCandidate | null | undefined,
-): AssistantImageDimensions | null {
-  if (
-    typeof candidate?.width !== "number" ||
-    typeof candidate.height !== "number" ||
-    candidate.width <= 0 ||
-    candidate.height <= 0
-  ) {
-    return null;
-  }
-  return { width: candidate.width, height: candidate.height };
-}
-
-export function resolveAssistantImageLoadDimensions(input: {
-  source?: AssistantImageDimensionCandidate | null;
-  target?: { naturalWidth?: unknown; naturalHeight?: unknown } | null;
-  renderedImage: unknown;
-  renderedDimensions: AssistantImageRenderedDimensionsReader;
-}): AssistantImageDimensions | null {
-  const source = readPositiveDimensions(input.source);
-  if (source) {
-    return source;
-  }
-
-  const target = readPositiveDimensions({
-    width: input.target?.naturalWidth,
-    height: input.target?.naturalHeight,
-  });
-  return target ?? input.renderedDimensions.read(input.renderedImage);
-}
diff --git a/packages/app/src/assistant-image/retry.test.ts b/packages/app/src/assistant-image/retry.test.ts
deleted file mode 100644
index 9777663bed..0000000000
--- a/packages/app/src/assistant-image/retry.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { runAssistantImageOperationWithRetry } from "./retry";
-
-describe("assistant image retry", () => {
-  it("recovers from transient failures while the image remains mounted", async () => {
-    const waits: number[] = [];
-    let attempts = 0;
-
-    const result = await runAssistantImageOperationWithRetry({
-      operation: async () => {
-        attempts += 1;
-        if (attempts < 3) {
-          throw new Error("transient");
-        }
-        return "loaded";
-      },
-      delaysMs: [10, 20, 30],
-      wait: async (delayMs) => {
-        waits.push(delayMs);
-      },
-    });
-
-    expect({ attempts, waits, result }).toEqual({
-      attempts: 3,
-      waits: [10, 20],
-      result: "loaded",
-    });
-  });
-
-  it("stops retrying after the image is released", async () => {
-    let stopped = false;
-    let attempts = 0;
-
-    await expect(
-      runAssistantImageOperationWithRetry({
-        operation: async () => {
-          attempts += 1;
-          throw new Error("transient");
-        },
-        delaysMs: [10, 20],
-        shouldStop: () => stopped,
-        wait: async () => {
-          stopped = true;
-        },
-      }),
-    ).rejects.toThrow("transient");
-    expect(attempts).toBe(1);
-  });
-});
diff --git a/packages/app/src/assistant-image/retry.ts b/packages/app/src/assistant-image/retry.ts
deleted file mode 100644
index 4a2cf5c58a..0000000000
--- a/packages/app/src/assistant-image/retry.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-export const ASSISTANT_IMAGE_RETRY_DELAYS_MS = [100, 400, 1_200] as const;
-
-export async function runAssistantImageOperationWithRetry<T>(input: {
-  operation: () => Promise<T>;
-  delaysMs?: readonly number[];
-  shouldStop?: () => boolean;
-  wait?: (delayMs: number) => Promise<void>;
-}): Promise<T> {
-  const delays = input.delaysMs ?? ASSISTANT_IMAGE_RETRY_DELAYS_MS;
-  const shouldStop = input.shouldStop ?? (() => false);
-  const wait =
-    input.wait ??
-    (async (delayMs: number) => {
-      await new Promise<void>((resolve) => setTimeout(resolve, delayMs));
-    });
-
-  for (let attempt = 0; ; attempt += 1) {
-    try {
-      return await input.operation();
-    } catch (error) {
-      const delay = delays[attempt];
-      if (delay === undefined || shouldStop()) {
-        throw error;
-      }
-      await wait(delay);
-      if (shouldStop()) {
-        throw error;
-      }
-    }
-  }
-}
diff --git a/packages/app/src/assistant-image/use-assistant-image.ts b/packages/app/src/assistant-image/use-assistant-image.ts
deleted file mode 100644
index 3314b7a398..0000000000
--- a/packages/app/src/assistant-image/use-assistant-image.ts
+++ /dev/null
@@ -1,544 +0,0 @@
-import {
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useMemo,
-  useReducer,
-  useRef,
-  useState,
-} from "react";
-import type { ImageLoadEvent } from "react-native";
-import { useTranslation } from "react-i18next";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import type { AttachmentMetadata } from "@/attachments/types";
-import { isWeb } from "@/constants/platform";
-import { useStableEvent } from "@/hooks/use-stable-event";
-import { retainAttachmentForGarbageCollection } from "@/attachments/gc-retention";
-import {
-  persistAttachmentFromBytes,
-  persistAttachmentFromDataUrl,
-  releaseAttachmentPreviewUrl,
-  resolveAttachmentPreviewUrl,
-} from "@/attachments/service";
-import { createPreviewAttachmentId, parseImageDataUrl } from "@/attachments/utils";
-import {
-  getAssistantImageMetadata,
-  setAssistantImageMetadata,
-} from "@/utils/assistant-image-metadata";
-import { resolveAssistantImageSource } from "@/utils/assistant-image-source";
-import { createAssistantImageAcquisitionCache } from "./acquisition-cache";
-import {
-  createAssistantImageFileAcquisition,
-  type AssistantImageAcquisition,
-  type AssistantImageFileAcquisitionPort,
-} from "./file-acquisition";
-import {
-  createAssistantImageLifecycle,
-  transitionAssistantImageLifecycle,
-  type AssistantImageLifecycle,
-  type AssistantImageLifecycleEvent,
-} from "./lifecycle";
-import {
-  type AssistantImageRenderedDimensionsReader,
-  resolveAssistantImageLoadDimensions,
-} from "./load-dimensions";
-import { runAssistantImageOperationWithRetry } from "./retry";
-
-interface AssistantImageRenderBinding {
-  uri: string;
-  onRef: (instance: unknown) => void;
-  onLoad: (event: ImageLoadEvent) => void;
-  onError: () => void;
-}
-
-const renderedDimensions: AssistantImageRenderedDimensionsReader = {
-  read(renderedImage) {
-    if (!isWeb || !(renderedImage instanceof HTMLElement)) {
-      return null;
-    }
-    const image = renderedImage.querySelector("img");
-    return image && image.naturalWidth > 0 && image.naturalHeight > 0
-      ? { width: image.naturalWidth, height: image.naturalHeight }
-      : null;
-  },
-};
-
-export type AssistantImageResult =
-  | {
-      status: "loading";
-      binding: AssistantImageRenderBinding | null;
-      aspectRatio: number | null;
-    }
-  | {
-      status: "loaded";
-      binding: AssistantImageRenderBinding;
-      aspectRatio: number;
-    }
-  | { status: "failed"; message: string };
-
-interface UseAssistantImageInput {
-  source: string;
-  occurrenceKey: string;
-  client?: DaemonClient | null;
-  workspaceRoot?: string;
-  serverId?: string;
-}
-
-type PreviewUrlState =
-  | { status: "waiting" }
-  | { status: "loading" }
-  | { status: "loaded"; uri: string }
-  | { status: "failed"; error: unknown };
-
-type AttachmentAcquisitionState =
-  | { status: "waiting" }
-  | { status: "loading" }
-  | { status: "loaded"; attachment: AttachmentMetadata }
-  | { status: "failed"; error: unknown };
-
-interface DataImage {
-  mimeType: string;
-  base64: string;
-  cacheKey: string;
-}
-
-const attachmentAcquisitionCache = createAssistantImageAcquisitionCache<AttachmentMetadata>({
-  capacity: 500,
-  onRetain: (attachment) => retainAttachmentForGarbageCollection(attachment.id),
-});
-
-interface CachedPreviewUrl {
-  attachment: AttachmentMetadata;
-  uri: string;
-}
-
-const previewUrlCache = createAssistantImageAcquisitionCache<CachedPreviewUrl>({
-  capacity: 500,
-  onRetain:
-    ({ attachment, uri }) =>
-    () => {
-      void releaseAttachmentPreviewUrl({ attachment, url: uri });
-    },
-});
-
-const LOADED_IMAGE_CACHE_CAPACITY = 500;
-const loadedImageCache = new Map<string, number>();
-
-function getLoadedImageAspectRatio(uri: string): number | null {
-  const aspectRatio = loadedImageCache.get(uri);
-  if (aspectRatio === undefined) {
-    return null;
-  }
-  loadedImageCache.delete(uri);
-  loadedImageCache.set(uri, aspectRatio);
-  return aspectRatio;
-}
-
-function rememberLoadedImage(uri: string, aspectRatio: number): void {
-  loadedImageCache.delete(uri);
-  loadedImageCache.set(uri, aspectRatio);
-  if (loadedImageCache.size <= LOADED_IMAGE_CACHE_CAPACITY) {
-    return;
-  }
-  const leastRecentlyUsedUri = loadedImageCache.keys().next().value;
-  if (leastRecentlyUsedUri !== undefined) {
-    loadedImageCache.delete(leastRecentlyUsedUri);
-  }
-}
-
-function useAttachmentAcquisition(
-  acquisition: AssistantImageAcquisition | null,
-): AttachmentAcquisitionState {
-  const acquisitionKey = acquisition?.key ?? null;
-  const [entry, setEntry] = useState<{
-    key: string | null;
-    state: AttachmentAcquisitionState;
-  }>(() => {
-    const cached = acquisitionKey ? attachmentAcquisitionCache.peek(acquisitionKey) : undefined;
-    return {
-      key: acquisitionKey,
-      state: cached ? { status: "loaded", attachment: cached } : { status: "waiting" },
-    };
-  });
-
-  useEffect(() => {
-    let disposed = false;
-    let releaseCurrent: (() => void) | null = null;
-    if (!acquisition || !acquisitionKey) {
-      setEntry({ key: null, state: { status: "waiting" } });
-      return;
-    }
-
-    const acquireCurrent = () => {
-      releaseCurrent?.();
-      const retained = attachmentAcquisitionCache.acquireRetained(
-        acquisitionKey,
-        acquisition.locate,
-      );
-      releaseCurrent = retained.release;
-      return retained;
-    };
-    const initial = acquireCurrent();
-    if (initial.value) {
-      setEntry({ key: acquisitionKey, state: { status: "loaded", attachment: initial.value } });
-      return () => {
-        disposed = true;
-        releaseCurrent?.();
-      };
-    }
-
-    setEntry({ key: acquisitionKey, state: { status: "loading" } });
-    void (async () => {
-      let firstAttempt: ReturnType<typeof acquireCurrent> | null = initial;
-      try {
-        const attachment = await runAssistantImageOperationWithRetry({
-          operation: async () => {
-            const retained = firstAttempt ?? acquireCurrent();
-            firstAttempt = null;
-            return await retained.promise;
-          },
-          shouldStop: () => disposed,
-        });
-        if (!disposed) {
-          setEntry({ key: acquisitionKey, state: { status: "loaded", attachment } });
-        }
-      } catch (error) {
-        if (!disposed) {
-          setEntry({ key: acquisitionKey, state: { status: "failed", error } });
-        }
-      }
-    })();
-    return () => {
-      disposed = true;
-      releaseCurrent?.();
-    };
-  }, [acquisition, acquisitionKey]);
-
-  if (!acquisitionKey) {
-    return { status: "waiting" };
-  }
-  const cached = attachmentAcquisitionCache.peek(acquisitionKey);
-  if (cached) {
-    return { status: "loaded", attachment: cached };
-  }
-  return entry.key === acquisitionKey ? entry.state : { status: "waiting" };
-}
-
-function createDataImageAcquisition(input: {
-  source: string;
-  dataImage: DataImage | null;
-}): AssistantImageAcquisition | null {
-  if (!input.dataImage) {
-    return null;
-  }
-  const { dataImage, source } = input;
-  return {
-    key: dataImage.cacheKey,
-    locate: async () =>
-      await persistAttachmentFromDataUrl({
-        id: createPreviewAttachmentId({
-          mimeType: dataImage.mimeType,
-          contentLength: dataImage.base64.length,
-          contentKey: dataImage.cacheKey,
-        }),
-        dataUrl: source,
-        mimeType: dataImage.mimeType,
-      }),
-  };
-}
-
-function usePreviewUrl(attachment: AttachmentMetadata | null | undefined): PreviewUrlState {
-  const id = attachment?.id;
-  const storageType = attachment?.storageType;
-  const storageKey = attachment?.storageKey;
-  const mimeType = attachment?.mimeType;
-  const previewKey =
-    id && storageType && storageKey && mimeType
-      ? `${id}:${storageType}:${storageKey}:${mimeType}`
-      : null;
-  const [entry, setEntry] = useState<{ key: string | null; state: PreviewUrlState }>(() => {
-    return {
-      key: previewKey,
-      state: { status: "waiting" },
-    };
-  });
-  const getCurrentAttachment = useStableEvent(() => attachment ?? null);
-
-  useLayoutEffect(() => {
-    let disposed = false;
-    let releaseCurrent: (() => void) | null = null;
-    const current = getCurrentAttachment();
-
-    if (!current || !previewKey) {
-      setEntry({ key: null, state: { status: "waiting" } });
-      return;
-    }
-
-    const acquireCurrent = () => {
-      releaseCurrent?.();
-      const retained = previewUrlCache.acquireRetained(previewKey, async () => ({
-        attachment: current,
-        uri: await resolveAttachmentPreviewUrl(current),
-      }));
-      releaseCurrent = retained.release;
-      return retained;
-    };
-    const initial = acquireCurrent();
-    if (initial.value) {
-      setEntry({ key: previewKey, state: { status: "loaded", uri: initial.value.uri } });
-      return () => {
-        disposed = true;
-        releaseCurrent?.();
-      };
-    }
-
-    setEntry({ key: previewKey, state: { status: "loading" } });
-    void (async () => {
-      let firstAttempt: ReturnType<typeof acquireCurrent> | null = initial;
-      try {
-        const preview = await runAssistantImageOperationWithRetry({
-          operation: async () => {
-            const retained = firstAttempt ?? acquireCurrent();
-            firstAttempt = null;
-            return await retained.promise;
-          },
-          shouldStop: () => disposed,
-        });
-        if (!disposed) {
-          setEntry({ key: previewKey, state: { status: "loaded", uri: preview.uri } });
-        }
-      } catch (error) {
-        if (!disposed) {
-          setEntry({ key: previewKey, state: { status: "failed", error } });
-        }
-      }
-    })();
-
-    return () => {
-      disposed = true;
-      releaseCurrent?.();
-    };
-  }, [getCurrentAttachment, previewKey]);
-
-  if (!previewKey) {
-    return { status: "waiting" };
-  }
-  return entry.key === previewKey ? entry.state : { status: "waiting" };
-}
-
-function lifecycleReducer(
-  state: AssistantImageLifecycle,
-  event: AssistantImageLifecycleEvent,
-): AssistantImageLifecycle {
-  return transitionAssistantImageLifecycle(state, event);
-}
-
-function errorMessage(error: unknown, fallback: string): string {
-  return error instanceof Error ? error.message : fallback;
-}
-
-function getAcquisitionFailure(input: {
-  hasResolution: boolean;
-  isFileSource: boolean;
-  isDataImage: boolean;
-  fileAttachment: AttachmentAcquisitionState;
-  dataImageAttachment: AttachmentAcquisitionState;
-  preview: PreviewUrlState;
-  hasDirectUri: boolean;
-  fallbackMessage: string;
-}): AssistantImageResult | null {
-  if (!input.hasResolution) {
-    return { status: "failed", message: input.fallbackMessage };
-  }
-  if (input.isFileSource && input.fileAttachment.status === "failed") {
-    return {
-      status: "failed",
-      message: errorMessage(input.fileAttachment.error, input.fallbackMessage),
-    };
-  }
-  if (input.isDataImage && input.dataImageAttachment.status === "failed") {
-    return {
-      status: "failed",
-      message: errorMessage(input.dataImageAttachment.error, input.fallbackMessage),
-    };
-  }
-  if (!input.hasDirectUri && input.preview.status === "failed") {
-    return {
-      status: "failed",
-      message: errorMessage(input.preview.error, input.fallbackMessage),
-    };
-  }
-  return null;
-}
-
-export function useAssistantImage({
-  source,
-  occurrenceKey,
-  client,
-  workspaceRoot,
-  serverId,
-}: UseAssistantImageInput): AssistantImageResult {
-  const { t } = useTranslation();
-  const resolution = useMemo(
-    () => resolveAssistantImageSource({ source, workspaceRoot }),
-    [source, workspaceRoot],
-  );
-  const dataImage = useMemo(() => parseImageDataUrl(source), [source]);
-  const fileAcquisition = useMemo(() => {
-    const port: AssistantImageFileAcquisitionPort | null = client
-      ? {
-          readFile: async (cwd, path) => await client.readFile(cwd, path),
-          persist: persistAttachmentFromBytes,
-        }
-      : null;
-    return createAssistantImageFileAcquisition({
-      port,
-      resolution,
-      serverId,
-      occurrenceKey,
-      unavailableMessage: t("message.attachments.imagePreviewUnavailable"),
-    });
-  }, [client, occurrenceKey, resolution, serverId, t]);
-  const dataImageAcquisition = useMemo(
-    () => createDataImageAcquisition({ source, dataImage }),
-    [dataImage, source],
-  );
-  const fileAttachment = useAttachmentAcquisition(fileAcquisition);
-  const dataImageAttachment = useAttachmentAcquisition(dataImageAcquisition);
-  const filePreview = usePreviewUrl(
-    fileAttachment.status === "loaded" ? fileAttachment.attachment : null,
-  );
-  const dataImagePreview = usePreviewUrl(
-    dataImageAttachment.status === "loaded" ? dataImageAttachment.attachment : null,
-  );
-  const directUri = resolution?.kind === "direct" && !dataImage ? resolution.uri : null;
-  const preview = dataImage ? dataImagePreview : filePreview;
-  const previewUri = preview.status === "loaded" ? preview.uri : null;
-  const uri = directUri ?? previewUri;
-  const cachedAspectRatio = useMemo(
-    () => getAssistantImageMetadata({ source, workspaceRoot, serverId })?.aspectRatio ?? null,
-    [serverId, source, workspaceRoot],
-  );
-  const [lifecycle, dispatchLifecycle] = useReducer(
-    lifecycleReducer,
-    uri,
-    (initialUri): AssistantImageLifecycle => {
-      if (initialUri) {
-        const aspectRatio = getLoadedImageAspectRatio(initialUri);
-        if (aspectRatio !== null) {
-          return { status: "loaded", uri: initialUri, aspectRatio };
-        }
-      }
-      return createAssistantImageLifecycle();
-    },
-  );
-  const dispatch = useCallback((event: AssistantImageLifecycleEvent) => {
-    if (event.type === "image_loaded") {
-      rememberLoadedImage(event.uri, event.aspectRatio);
-    } else if (event.type === "failed" && event.uri) {
-      loadedImageCache.delete(event.uri);
-    }
-    dispatchLifecycle(event);
-  }, []);
-  const renderedImageRef = useRef<unknown>(null);
-  const handleImageRef = useCallback((instance: unknown) => {
-    renderedImageRef.current = instance;
-  }, []);
-
-  useEffect(() => {
-    if (!uri) {
-      dispatch({ type: "preview_released" });
-      return;
-    }
-
-    dispatch({
-      type: "preview_created",
-      uri,
-      aspectRatio: cachedAspectRatio,
-    });
-  }, [cachedAspectRatio, dispatch, uri]);
-
-  const handleImageError = useCallback(() => {
-    if (uri) {
-      dispatch({
-        type: "failed",
-        uri,
-        message: t("message.attachments.imageUnavailable"),
-      });
-    }
-  }, [dispatch, t, uri]);
-  const handleImageLoad = useCallback(
-    (event: ImageLoadEvent) => {
-      if (!uri) {
-        return;
-      }
-      const nativeEvent = event.nativeEvent as ImageLoadEvent["nativeEvent"] & {
-        target?: { naturalWidth?: unknown; naturalHeight?: unknown };
-      };
-      const dimensions = resolveAssistantImageLoadDimensions({
-        source: nativeEvent.source,
-        target: nativeEvent.target,
-        renderedImage: renderedImageRef.current,
-        renderedDimensions,
-      });
-      const metadata = dimensions
-        ? setAssistantImageMetadata({ source, workspaceRoot, serverId }, dimensions)
-        : null;
-      const aspectRatio = metadata?.aspectRatio ?? cachedAspectRatio;
-      if (!aspectRatio) {
-        dispatch({
-          type: "failed",
-          uri,
-          message: t("message.attachments.imageUnavailable"),
-        });
-        return;
-      }
-      dispatch({ type: "image_loaded", uri, aspectRatio });
-    },
-    [cachedAspectRatio, dispatch, serverId, source, t, uri, workspaceRoot],
-  );
-
-  const acquisitionFailure = getAcquisitionFailure({
-    hasResolution: resolution !== null,
-    isFileSource: resolution?.kind === "file_rpc",
-    isDataImage: dataImage !== null,
-    fileAttachment,
-    dataImageAttachment,
-    preview,
-    hasDirectUri: directUri !== null,
-    fallbackMessage: t("message.attachments.imagePreviewLoadFailed"),
-  });
-  if (acquisitionFailure) {
-    return acquisitionFailure;
-  }
-  const hasCurrentLifecycleUri = lifecycle.status !== "failed" && lifecycle.uri === uri;
-  let binding: AssistantImageRenderBinding | null = null;
-  if (hasCurrentLifecycleUri && lifecycle.uri) {
-    binding = {
-      uri: lifecycle.uri,
-      onRef: handleImageRef,
-      onLoad: handleImageLoad,
-      onError: handleImageError,
-    };
-  }
-  if (lifecycle.status === "loaded" && lifecycle.uri === uri) {
-    return {
-      status: "loaded",
-      binding: {
-        uri: lifecycle.uri,
-        onRef: handleImageRef,
-        onLoad: handleImageLoad,
-        onError: handleImageError,
-      },
-      aspectRatio: lifecycle.aspectRatio,
-    };
-  }
-  if (lifecycle.status === "failed") {
-    return lifecycle;
-  }
-  return {
-    status: "loading",
-    binding,
-    aspectRatio: (hasCurrentLifecycleUri ? lifecycle.aspectRatio : null) ?? cachedAspectRatio,
-  };
-}
diff --git a/packages/app/src/assistant-selection-copy/content.browser.test.ts b/packages/app/src/assistant-selection-copy/content.browser.test.ts
index aecb4ba5b4..5c4fcfb331 100644
--- a/packages/app/src/assistant-selection-copy/content.browser.test.ts
+++ b/packages/app/src/assistant-selection-copy/content.browser.test.ts
@@ -760,3 +760,58 @@ describe("assistant selection copy inside highlighted code", () => {
     );
   });
 });
+
+describe("semantic library output", () => {
+  it("copies a partial strong span as plain text", () => {
+    const host = document.createElement("div");
+    host.innerHTML =
+      '<div data-testid="assistant-message"><p>Before <strong>bold text</strong> after</p></div>';
+    document.body.append(host);
+    const text = host.querySelector("strong")!.firstChild!;
+    const range = document.createRange();
+    range.setStart(text, 1);
+    range.setEnd(text, 4);
+    const selection = window.getSelection()!;
+    selection.removeAllRanges();
+    selection.addRange(range);
+    expect(createAssistantSelectionClipboardContent(selection)?.plainText).toBe("old");
+    expect(createAssistantSelectionClipboardContent(selection)?.html).not.toContain("<strong>");
+    host.remove();
+  });
+});
+
+it("copies native semantic ordered lists with their original numbers", () => {
+  const host = document.createElement("div");
+  host.innerHTML =
+    '<div data-testid="assistant-message"><ol start="3"><li>Third item</li><li>Fourth item</li></ol></div>';
+  document.body.append(host);
+  const selection = selectNodeContents(host.querySelector("ol")!);
+  const content = createAssistantSelectionClipboardContent(selection);
+  expect(content?.plainText).toContain("3. Third item");
+  expect(content?.plainText).toContain("4. Fourth item");
+  host.remove();
+});
+
+it("copies a selection inside semantic inline code without Markdown escaping", () => {
+  const message = mountFixture();
+  message.innerHTML = "<p>Run <code>apply_patch</code> now.</p>";
+  const code = fixtureElement(message, "code");
+  expect(createAssistantSelectionClipboardContent(selectText(code, 0, 11))?.plainText).toBe(
+    "apply_patch",
+  );
+});
+
+it("copies a workspace image path instead of its temporary display URL", () => {
+  const message = mountFixture();
+  const sources = JSON.stringify({ "blob:preview": "assets/chart.png" });
+  message.innerHTML = '<div><img src="blob:preview" alt="chart"></div>';
+  message.firstElementChild!.setAttribute("data-paseo-markdown-image-sources", sources);
+  const selection = window.getSelection()!;
+  const range = document.createRange();
+  range.selectNode(message.querySelector("img")!);
+  selection.removeAllRanges();
+  selection.addRange(range);
+  expect(createAssistantSelectionClipboardContent(selection)?.plainText).toBe(
+    "![chart](assets/chart.png)",
+  );
+});
diff --git a/packages/app/src/assistant-selection-copy/content.web.ts b/packages/app/src/assistant-selection-copy/content.web.ts
index e59a71aeca..250d60d761 100644
--- a/packages/app/src/assistant-selection-copy/content.web.ts
+++ b/packages/app/src/assistant-selection-copy/content.web.ts
@@ -6,6 +6,7 @@ import {
   type MarkdownClipboardContent,
 } from "@/utils/rich-clipboard";
 import {
+  MARKDOWN_COPY_IMAGE_SOURCES_ATTRIBUTE,
   MARKDOWN_COPY_ALIGN_ATTRIBUTE,
   MARKDOWN_COPY_ALT_ATTRIBUTE,
   MARKDOWN_COPY_IGNORE_ATTRIBUTE,
@@ -22,9 +23,38 @@ const ASSISTANT_MESSAGE_SELECTOR = '[data-testid="assistant-message"]';
 const MESSAGE_ROW_SELECTOR = "[data-message-id]";
 const CHAT_SCROLL_SELECTOR = '[data-testid="agent-chat-scroll"]';
 const messageRowSelector = (messageId: string) => `[data-message-id="${CSS.escape(messageId)}"]`;
-const CODE_BLOCK_SELECTOR = `[${MARKDOWN_COPY_TAG_ATTRIBUTE}="pre"]`;
-const CODE_REGION_SELECTOR = `${CODE_BLOCK_SELECTOR}, [${MARKDOWN_COPY_TAG_ATTRIBUTE}="code"]`;
-const IMAGE_FRAME_SELECTOR = `[${MARKDOWN_COPY_TAG_ATTRIBUTE}="img"]`;
+const CODE_BLOCK_SELECTOR = `pre, [${MARKDOWN_COPY_TAG_ATTRIBUTE}="pre"]`;
+const CODE_REGION_SELECTOR = `${CODE_BLOCK_SELECTOR}, code, [${MARKDOWN_COPY_TAG_ATTRIBUTE}="code"]`;
+const IMAGE_FRAME_SELECTOR = `img, [${MARKDOWN_COPY_TAG_ATTRIBUTE}="img"]`;
+
+const SEMANTIC_TAGS =
+  "p,blockquote,br,code,pre,h1,h2,h3,h4,h5,h6,hr,img,li,ol,ul,strong,em,s,del,table,thead,tbody,tr,th,td";
+function semanticTag(element: Element): string | null {
+  return (
+    element.getAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE) ??
+    (element.matches(SEMANTIC_TAGS) ? element.tagName.toLowerCase() : null)
+  );
+}
+function copySemanticAttributes(original: Element, copy: Element): void {
+  const tag = semanticTag(original);
+  if (!tag || original.hasAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE)) return;
+  copy.setAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE, tag);
+  if (tag === "ol")
+    copy.setAttribute(MARKDOWN_COPY_LIST_START_ATTRIBUTE, original.getAttribute("start") ?? "1");
+  if (tag === "img") {
+    const url = original.getAttribute("src") ?? "";
+    const encodedSources = original
+      .closest(`[${MARKDOWN_COPY_IMAGE_SOURCES_ATTRIBUTE}]`)
+      ?.getAttribute(MARKDOWN_COPY_IMAGE_SOURCES_ATTRIBUTE);
+    const sources: Record<string, string> = encodedSources ? JSON.parse(encodedSources) : {};
+    copy.setAttribute(MARKDOWN_COPY_SRC_ATTRIBUTE, sources[url] ?? url);
+    copy.setAttribute(MARKDOWN_COPY_ALT_ATTRIBUTE, original.getAttribute("alt") ?? "");
+  }
+  if (tag === "td" || tag === "th") {
+    const align = (original as HTMLElement).style.textAlign;
+    if (align) copy.setAttribute(MARKDOWN_COPY_ALIGN_ATTRIBUTE, align);
+  }
+}
 
 const turndown = new TurndownService({
   bulletListMarker: "-",
@@ -247,6 +277,7 @@ function cloneMarkdownSelection(range: Range, message: Element): Node {
   while (ancestor && ancestor !== message) {
     if (shouldPreserveSemanticElement(range, ancestor)) {
       const wrapper = ancestor.cloneNode(false) as Element;
+      copySemanticAttributes(ancestor, wrapper);
       normalizeOrderedListStart(wrapper, ancestor, range);
       wrapper.append(selected);
       selected = wrapper;
@@ -294,25 +325,26 @@ function nodeAtPath(root: Node, path: number[]): Node {
 }
 
 function removeUnselectedSemantics(range: Range, source: Element, clone: Element): void {
-  const selector = `[${MARKDOWN_COPY_TAG_ATTRIBUTE}], a`;
+  const selector = `[${MARKDOWN_COPY_TAG_ATTRIBUTE}], a, ${SEMANTIC_TAGS}`;
   const originals = Array.from(source.querySelectorAll(selector));
   const copies = Array.from(clone.querySelectorAll(selector));
 
   originals.forEach((original, index) => {
     const copy = copies[index];
+    if (copy) copySemanticAttributes(original, copy);
     if (!copy || shouldPreserveSemanticElement(range, original)) {
       if (copy) {
         normalizeOrderedListStart(copy, original, range);
       }
       return;
     }
-    const tag = original.getAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE);
+    const tag = semanticTag(original);
     if (tag && isBlockBoundary(tag)) {
       copy.setAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE, "p");
       return;
     }
     copy.removeAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE);
-    if (copy.tagName === "A") {
+    if (copy.matches(SEMANTIC_TAGS) || copy.tagName === "A") {
       copy.setAttribute(MARKDOWN_COPY_UNWRAP_ATTRIBUTE, "true");
     }
   });
@@ -322,7 +354,7 @@ function shouldPreserveSemanticElement(range: Range, element: Element): boolean
   if (!range.intersectsNode(element)) {
     return false;
   }
-  const tag = element.getAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE);
+  const tag = semanticTag(element);
   // An image has no part to select, so touching it selects all of it.
   if (tag === "p" || tag === "img" || isTableStructure(tag)) {
     return true;
@@ -340,8 +372,16 @@ function shouldPreserveSemanticElement(range: Range, element: Element): boolean
       (item) => hasSelectedListMarker(range, item) || hasSelectedAllContents(range, item, true),
     );
   }
-  if (tag === "li" && hasSelectedListMarker(range, element)) {
-    return true;
+  if (tag === "li") {
+    if (hasSelectedListMarker(range, element)) return true;
+    // CSS list markers are outside text nodes. Starting inside a semantic item
+    // excludes its marker even when all of the label's characters are selected.
+    if (
+      element.tagName === "LI" &&
+      range.startContainer !== element &&
+      element.contains(range.startContainer)
+    )
+      return false;
   }
   return hasSelectedAllContents(range, element, tag === "li");
 }
@@ -358,7 +398,7 @@ function selectionStaysInsideElement(range: Range, element: Element): boolean {
 function selectedListItems(list: Element, range: Range): Element[] {
   return Array.from(list.children).filter(
     (child) =>
-      child.getAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE) === "li" &&
+      semanticTag(child) === "li" &&
       (child.contains(range.startContainer) ||
         child.contains(range.endContainer) ||
         hasSelectedAllContents(range, child, true)),
@@ -368,7 +408,7 @@ function selectedListItems(list: Element, range: Range): Element[] {
 function hasSelectedListMarker(range: Range, item: Element): boolean {
   const marker = item.querySelector(`:scope > [${MARKDOWN_COPY_LIST_MARKER_ATTRIBUTE}]`);
   if (!marker) {
-    return false;
+    return item.tagName === "LI" && range.startContainer === item && range.startOffset === 0;
   }
 
   const markerContents = document.createRange();
@@ -391,18 +431,20 @@ function hasSelectedListMarker(range: Range, item: Element): boolean {
 }
 
 function normalizeOrderedListStart(copy: Element, original: Element, range: Range): void {
-  if (original.getAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE) !== "ol") {
+  if (semanticTag(original) !== "ol") {
     return;
   }
   const firstSelectedItem = selectedListItems(original, range)[0];
   if (!firstSelectedItem) {
     return;
   }
-  const items = Array.from(original.children).filter(
-    (child) => child.getAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE) === "li",
-  );
+  const items = Array.from(original.children).filter((child) => semanticTag(child) === "li");
   const omittedItems = items.indexOf(firstSelectedItem);
-  const originalStart = Number(original.getAttribute(MARKDOWN_COPY_LIST_START_ATTRIBUTE) ?? 1);
+  const originalStart = Number(
+    original.getAttribute(MARKDOWN_COPY_LIST_START_ATTRIBUTE) ??
+      original.getAttribute("start") ??
+      1,
+  );
   copy.setAttribute(MARKDOWN_COPY_LIST_START_ATTRIBUTE, String(originalStart + omittedItems));
 }
 
diff --git a/packages/app/src/assistant-selection-copy/markup.ts b/packages/app/src/assistant-selection-copy/markup.ts
index 91c6c1618a..7b4a2a1572 100644
--- a/packages/app/src/assistant-selection-copy/markup.ts
+++ b/packages/app/src/assistant-selection-copy/markup.ts
@@ -19,44 +19,11 @@ export const MARKDOWN_COPY_ALT_ATTRIBUTE = "data-paseo-markdown-alt";
 export const TRAILING_CODE_LINE_BREAKS = /(\r?\n[ \t]*)+$/;
 
 export const markdownCopyDataSet = {
-  blockquote: { paseoMarkdownTag: "blockquote" },
-  br: { paseoMarkdownTag: "br" },
   code: { paseoMarkdownTag: "code" },
-  h1: { paseoMarkdownTag: "h1" },
-  h2: { paseoMarkdownTag: "h2" },
-  h3: { paseoMarkdownTag: "h3" },
-  h4: { paseoMarkdownTag: "h4" },
-  h5: { paseoMarkdownTag: "h5" },
-  h6: { paseoMarkdownTag: "h6" },
-  hr: { paseoMarkdownTag: "hr" },
-  ignore: { paseoMarkdownIgnore: "true" },
-  li: { paseoMarkdownTag: "li" },
-  listMarker: { paseoMarkdownIgnore: "true", paseoMarkdownListMarker: "true" },
-  ol: { paseoMarkdownTag: "ol" },
-  p: { paseoMarkdownTag: "p" },
   pre: { paseoMarkdownTag: "pre" },
-  s: { paseoMarkdownTag: "s" },
-  strong: { paseoMarkdownTag: "strong" },
-  em: { paseoMarkdownTag: "em" },
-  table: { paseoMarkdownTag: "table" },
-  tbody: { paseoMarkdownTag: "tbody" },
-  td: { paseoMarkdownTag: "td" },
-  th: { paseoMarkdownTag: "th" },
-  thead: { paseoMarkdownTag: "thead" },
-  tr: { paseoMarkdownTag: "tr" },
-  ul: { paseoMarkdownTag: "ul" },
-  unwrap: { paseoMarkdownUnwrap: "true" },
+  ignore: { paseoMarkdownIgnore: "true" },
 } as const;
 
-export type MarkdownCopyInlineTag = "br" | "code" | "em" | "s" | "strong";
-
-export function markdownCopyOrderedListDataSet(start: unknown) {
-  return {
-    ...markdownCopyDataSet.ol,
-    paseoMarkdownListStart: String(start ?? 1),
-  } as const;
-}
-
 export function markdownCopyCodeBlockDataSet(language: string | null | undefined) {
   const fenceLanguage = language?.trim().split(/\s+/)[0];
   return {
@@ -65,25 +32,7 @@ export function markdownCopyCodeBlockDataSet(language: string | null | undefined
   } as const;
 }
 
-/**
- * An image copies as the Markdown it came from. The rendered `img` points at a preview
- * URL for data and workspace images, and carries no alt text of its own.
- */
-export function markdownCopyImageDataSet(source: string, alt: string | undefined) {
-  return {
-    paseoMarkdownTag: "img",
-    paseoMarkdownSrc: source,
-    ...(alt ? { paseoMarkdownAlt: alt } : {}),
-  } as const;
-}
-
-export function markdownCopyTableCellDataSet(tag: "td" | "th", style: unknown) {
-  const alignment =
-    typeof style === "string"
-      ? style.match(/(?:^|;)\s*text-align\s*:\s*(left|right|center)/i)?.[1]
-      : null;
-  return {
-    ...markdownCopyDataSet[tag],
-    ...(alignment ? { paseoMarkdownAlign: alignment.toLowerCase() } : {}),
-  } as const;
+export const MARKDOWN_COPY_IMAGE_SOURCES_ATTRIBUTE = "data-paseo-markdown-image-sources";
+export function markdownCopyImageSourcesDataSet(sources: Record<string, string>) {
+  return { paseoMarkdownImageSources: JSON.stringify(sources) };
 }
diff --git a/packages/app/src/components/assistant-message-render-limit.native.ts b/packages/app/src/components/assistant-message-render-limit.native.ts
new file mode 100644
index 0000000000..9c80563cd9
--- /dev/null
+++ b/packages/app/src/components/assistant-message-render-limit.native.ts
@@ -0,0 +1,11 @@
+import type { CappedAssistantMessage } from "./assistant-message-render-limit.shared";
+export {
+  getUtf8ByteLength,
+  type CappedAssistantMessage,
+} from "./assistant-message-render-limit.shared";
+
+// Native passes a single string to the C++ parser, without the web renderer's
+// React-node fan-out. Keep complete messages selectable across all paragraphs.
+export function capAssistantMessageForRender(message: string): CappedAssistantMessage {
+  return { text: message, capped: false };
+}
diff --git a/packages/app/src/components/assistant-message-render-limit.shared.ts b/packages/app/src/components/assistant-message-render-limit.shared.ts
new file mode 100644
index 0000000000..429770ecf5
--- /dev/null
+++ b/packages/app/src/components/assistant-message-render-limit.shared.ts
@@ -0,0 +1,30 @@
+export interface CappedAssistantMessage {
+  text: string;
+  capped: boolean;
+}
+
+export function getUtf8ByteLength(message: string): number {
+  let bytes = 0;
+
+  for (let index = 0; index < message.length; index += 1) {
+    const codeUnit = message.charCodeAt(index);
+    if (codeUnit < 0x80) {
+      bytes += 1;
+    } else if (codeUnit < 0x800) {
+      bytes += 2;
+    } else if (
+      codeUnit >= 0xd800 &&
+      codeUnit <= 0xdbff &&
+      index + 1 < message.length &&
+      message.charCodeAt(index + 1) >= 0xdc00 &&
+      message.charCodeAt(index + 1) <= 0xdfff
+    ) {
+      bytes += 4;
+      index += 1;
+    } else {
+      bytes += 3;
+    }
+  }
+
+  return bytes;
+}
diff --git a/packages/app/src/components/assistant-message-render-limit.test.ts b/packages/app/src/components/assistant-message-render-limit.test.ts
index 52a7799633..be7058e51b 100644
--- a/packages/app/src/components/assistant-message-render-limit.test.ts
+++ b/packages/app/src/components/assistant-message-render-limit.test.ts
@@ -56,3 +56,11 @@ describe("assistant message render limit", () => {
     });
   });
 });
+
+it("preserves complete native multi-paragraph messages and the newline-heavy repro", async () => {
+  const native = await import("./assistant-message-render-limit.native");
+  const message = "Paragraph.\n\n".repeat(3000) + "Section 60";
+  expect(native.capAssistantMessageForRender(message)).toEqual({ text: message, capped: false });
+  const lines = "x\n".repeat(16_000) + "HIDDEN_OVERSIZED_MESSAGE_TAIL";
+  expect(native.capAssistantMessageForRender(lines)).toEqual({ text: lines, capped: false });
+});
diff --git a/packages/app/src/components/assistant-message-render-limit.ts b/packages/app/src/components/assistant-message-render-limit.ts
index 0c37270cb5..6c968ad6f9 100644
--- a/packages/app/src/components/assistant-message-render-limit.ts
+++ b/packages/app/src/components/assistant-message-render-limit.ts
@@ -1,55 +1 @@
-const graphemeSegmenter =
-  typeof Intl.Segmenter === "function"
-    ? new Intl.Segmenter(undefined, { granularity: "grapheme" })
-    : null;
-
-export const ASSISTANT_MESSAGE_RENDER_CHARACTER_LIMIT = 32_000;
-
-export interface CappedAssistantMessage {
-  text: string;
-  capped: boolean;
-}
-
-export function getUtf8ByteLength(message: string): number {
-  let bytes = 0;
-
-  for (let index = 0; index < message.length; index += 1) {
-    const codeUnit = message.charCodeAt(index);
-    if (codeUnit < 0x80) {
-      bytes += 1;
-    } else if (codeUnit < 0x800) {
-      bytes += 2;
-    } else if (
-      codeUnit >= 0xd800 &&
-      codeUnit <= 0xdbff &&
-      index + 1 < message.length &&
-      message.charCodeAt(index + 1) >= 0xdc00 &&
-      message.charCodeAt(index + 1) <= 0xdfff
-    ) {
-      bytes += 4;
-      index += 1;
-    } else {
-      bytes += 3;
-    }
-  }
-
-  return bytes;
-}
-
-export function capAssistantMessageForRender(message: string): CappedAssistantMessage {
-  if (message.length <= ASSISTANT_MESSAGE_RENDER_CHARACTER_LIMIT) {
-    return { text: message, capped: false };
-  }
-
-  let end = ASSISTANT_MESSAGE_RENDER_CHARACTER_LIMIT;
-  if (graphemeSegmenter) {
-    end = graphemeSegmenter.segment(message).containing(end)!.index;
-  } else {
-    const finalCodeUnit = message.charCodeAt(end - 1);
-    if (finalCodeUnit >= 0xd800 && finalCodeUnit <= 0xdbff) {
-      end -= 1;
-    }
-  }
-
-  return { text: message.slice(0, end), capped: true };
-}
+export * from "./assistant-message-render-limit.web";
diff --git a/packages/app/src/components/assistant-message-render-limit.web.ts b/packages/app/src/components/assistant-message-render-limit.web.ts
new file mode 100644
index 0000000000..eee6436595
--- /dev/null
+++ b/packages/app/src/components/assistant-message-render-limit.web.ts
@@ -0,0 +1,30 @@
+import type { CappedAssistantMessage } from "./assistant-message-render-limit.shared";
+export {
+  getUtf8ByteLength,
+  type CappedAssistantMessage,
+} from "./assistant-message-render-limit.shared";
+
+const graphemeSegmenter =
+  typeof Intl.Segmenter === "function"
+    ? new Intl.Segmenter(undefined, { granularity: "grapheme" })
+    : null;
+
+export const ASSISTANT_MESSAGE_RENDER_CHARACTER_LIMIT = 32_000;
+
+export function capAssistantMessageForRender(message: string): CappedAssistantMessage {
+  if (message.length <= ASSISTANT_MESSAGE_RENDER_CHARACTER_LIMIT) {
+    return { text: message, capped: false };
+  }
+
+  let end = ASSISTANT_MESSAGE_RENDER_CHARACTER_LIMIT;
+  if (graphemeSegmenter) {
+    end = graphemeSegmenter.segment(message).containing(end)!.index;
+  } else {
+    const finalCodeUnit = message.charCodeAt(end - 1);
+    if (finalCodeUnit >= 0xd800 && finalCodeUnit <= 0xdbff) {
+      end -= 1;
+    }
+  }
+
+  return { text: message.slice(0, end), capped: true };
+}
diff --git a/packages/app/src/components/highlighted-code-block.tsx b/packages/app/src/components/highlighted-code-block.tsx
index 86fc3801a3..292ec53618 100644
--- a/packages/app/src/components/highlighted-code-block.tsx
+++ b/packages/app/src/components/highlighted-code-block.tsx
@@ -1,7 +1,13 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Pressable, View, type StyleProp, type TextStyle, type ViewStyle } from "react-native";
+import {
+  Pressable,
+  View,
+  Text,
+  type StyleProp,
+  type TextStyle,
+  type ViewStyle,
+} from "react-native";
 import { StyleSheet } from "react-native-unistyles";
-import { MarkdownTextSpan } from "@/components/markdown-text";
 import * as Clipboard from "expo-clipboard";
 import { Check, Copy } from "lucide-react-native";
 import { useTranslation } from "react-i18next";
@@ -96,13 +102,13 @@ export const HighlightedCodeBlock = React.memo(function HighlightedCodeBlock({
       onPointerLeave={handlePointerLeave}
     >
       {keyedLines ? (
-        <MarkdownTextSpan style={innerTextStyle} copyTag="code">
+        <Text style={innerTextStyle} dataSet={markdownCopyDataSet.code}>
           {renderCodeSegments(keyedLines)}
-        </MarkdownTextSpan>
+        </Text>
       ) : (
-        <MarkdownTextSpan style={innerTextStyle} copyTag="code">
+        <Text style={innerTextStyle} dataSet={markdownCopyDataSet.code}>
           {renderedCode}
-        </MarkdownTextSpan>
+        </Text>
       )}
       <CopyButton getCode={getCode} visible={controlsVisible} />
     </View>
@@ -129,9 +135,7 @@ interface TokenSpanProps {
 
 const TokenSpan = React.memo(function TokenSpan({ token }: TokenSpanProps) {
   return (
-    <MarkdownTextSpan style={token.style ? syntaxTokenStyleFor(token.style) : undefined}>
-      {token.text}
-    </MarkdownTextSpan>
+    <Text style={token.style ? syntaxTokenStyleFor(token.style) : undefined}>{token.text}</Text>
   );
 });
 
@@ -140,7 +144,7 @@ interface CodeTextSpanProps {
 }
 
 const CodeTextSpan = React.memo(function CodeTextSpan({ text }: CodeTextSpanProps) {
-  return <MarkdownTextSpan>{text}</MarkdownTextSpan>;
+  return <Text>{text}</Text>;
 });
 
 interface SplitStyles {
diff --git a/packages/app/src/components/markdown-text-selection.test.ts b/packages/app/src/components/markdown-text-selection.test.ts
deleted file mode 100644
index 6aa42afa00..0000000000
--- a/packages/app/src/components/markdown-text-selection.test.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { iosMarkdownTextIsSelectable } from "./markdown-text-selection";
-
-describe("markdown text selection", () => {
-  it("uses plain text only for iOS table cells", () => {
-    expect({
-      tableCell: iosMarkdownTextIsSelectable("table-cell"),
-      prose: iosMarkdownTextIsSelectable("prose"),
-    }).toEqual({
-      tableCell: false,
-      prose: true,
-    });
-  });
-});
diff --git a/packages/app/src/components/markdown-text-selection.tsx b/packages/app/src/components/markdown-text-selection.tsx
deleted file mode 100644
index f83ff6a258..0000000000
--- a/packages/app/src/components/markdown-text-selection.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { createContext, type ReactNode, useContext } from "react";
-
-export type MarkdownTextSurface = "prose" | "table-cell";
-
-const MarkdownTextSurfaceContext = createContext<MarkdownTextSurface>("prose");
-
-export function MarkdownTableCellText({ children }: { children: ReactNode }) {
-  return <MarkdownTextSurfaceContext value="table-cell">{children}</MarkdownTextSurfaceContext>;
-}
-
-export function useMarkdownTextSurface(): MarkdownTextSurface {
-  return useContext(MarkdownTextSurfaceContext);
-}
-
-export function iosMarkdownTextIsSelectable(surface: MarkdownTextSurface): boolean {
-  return surface !== "table-cell";
-}
diff --git a/packages/app/src/components/markdown-text-style.test.ts b/packages/app/src/components/markdown-text-style.test.ts
deleted file mode 100644
index 8094cca386..0000000000
--- a/packages/app/src/components/markdown-text-style.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { StyleSheet, type TextStyle } from "react-native";
-import { resolvePlainMarkdownTextStyle } from "@/components/markdown-text-style";
-
-function unistylesStyle(id: string, style: Record<string, unknown>) {
-  return {
-    ...style,
-    [`unistyles_${id}`]: { id },
-  };
-}
-
-function uiTextViewFlatten(rootStyle: TextStyle, style: TextStyle): Record<string, unknown> {
-  // react-native-uitextview/src/util.ts:8 flattens [rootStyle, style]
-  // before passing the result to its native View-backed components.
-  return { ...(StyleSheet.flatten([rootStyle, style]) as Record<string, unknown>) };
-}
-
-function unistylesMetadataKeys(style: Record<string, unknown>) {
-  return Object.keys(style).filter((key) => key.startsWith("unistyles_"));
-}
-
-describe("resolvePlainMarkdownTextStyle", () => {
-  it("keeps UITextView from collapsing parent and child Unistyles styles into one native View style object", () => {
-    const merged = uiTextViewFlatten(
-      resolvePlainMarkdownTextStyle(unistylesStyle("paragraph", { color: "#111" })),
-      resolvePlainMarkdownTextStyle(unistylesStyle("text", { fontWeight: "600" })),
-    );
-
-    expect(unistylesMetadataKeys(merged)).toHaveLength(0);
-    expect(merged).toMatchObject({ color: "#111", fontWeight: "600" });
-  });
-});
diff --git a/packages/app/src/components/markdown-text-style.ts b/packages/app/src/components/markdown-text-style.ts
deleted file mode 100644
index ab1ac4abf6..0000000000
--- a/packages/app/src/components/markdown-text-style.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { StyleSheet, type StyleProp, type TextStyle } from "react-native";
-
-export function resolvePlainMarkdownTextStyle(style: StyleProp<TextStyle>): TextStyle {
-  return stripUnistylesMetadata(StyleSheet.flatten(style) ?? {});
-}
-
-function stripUnistylesMetadata(style: TextStyle): TextStyle {
-  // iOS markdown text goes through react-native-uitextview. That library
-  // inherits text styles by flattening [parentStyle, childStyle] before handing
-  // the result to native View-backed components. If both entries are Unistyles
-  // styles, flattening preserves both `unistyles_*` metadata keys in one object,
-  // and Unistyles correctly warns that the style should have stayed array-shaped.
-  //
-  // `UITextView` is a third-party boundary, not a Unistyles-tracked component in
-  // our ownership model. Resolve the concrete style values before crossing that
-  // boundary and drop only Unistyles' private tracking metadata. This preserves
-  // iOS paragraph/spanning text selection while avoiding the metadata merge.
-  const plainStyle: Record<string, unknown> = { ...style };
-  for (const key of Object.keys(plainStyle)) {
-    if (key.startsWith("unistyles_")) {
-      delete plainStyle[key];
-    }
-  }
-  return plainStyle as TextStyle;
-}
diff --git a/packages/app/src/components/markdown-text.android.tsx b/packages/app/src/components/markdown-text.android.tsx
deleted file mode 100644
index f444d916bd..0000000000
--- a/packages/app/src/components/markdown-text.android.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { useMemo, type ReactNode } from "react";
-import {
-  Text,
-  View,
-  type StyleProp,
-  type TextProps,
-  type TextStyle,
-  type ViewStyle,
-} from "react-native";
-import type { MarkdownCopyInlineTag } from "@/assistant-selection-copy/markup";
-
-interface MarkdownTextSpanProps {
-  style?: StyleProp<TextStyle>;
-  monoSurface?: boolean;
-  copyTag?: MarkdownCopyInlineTag;
-  children: ReactNode;
-  onPress?: TextProps["onPress"];
-  accessibilityRole?: TextProps["accessibilityRole"];
-}
-
-// Android's <Text selectable> enables per-text-node selection natively. Each
-// sibling Text is its own selection scope — drag can't span across siblings
-// (that requires a single UITextView ancestor and is iOS-only). onPress works
-// natively here, so links routed through this span stay tappable on Android.
-export function MarkdownTextSpan({
-  style,
-  children,
-  onPress,
-  accessibilityRole,
-}: MarkdownTextSpanProps) {
-  return (
-    <Text selectable style={style} onPress={onPress} accessibilityRole={accessibilityRole}>
-      {children}
-    </Text>
-  );
-}
-
-interface MarkdownParagraphViewProps {
-  paragraphStyle: ViewStyle;
-  containsImage?: boolean;
-  children: ReactNode;
-}
-
-const MARKDOWN_PARAGRAPH_RESET: ViewStyle = {};
-
-// Paragraph stays a <View>, not a <Text>, for layout fidelity. RN Android's
-// text engine *does* accept inline View children (TextInlineViewPlaceholderSpan
-// in ReactBaseTextShadowNode), so this isn't a crash-avoidance choice — but
-// inline-placeholder spans collapse block-level children (e.g. paragraph
-// images) into one-character placeholders, which destroys image row layout.
-// <View> preserves the original block layout; the trade-off is no cross-span
-// selection on Android (a UITextView-style trick has no Android equivalent).
-export function MarkdownParagraphView({ paragraphStyle, children }: MarkdownParagraphViewProps) {
-  const style = useMemo(() => [paragraphStyle, MARKDOWN_PARAGRAPH_RESET], [paragraphStyle]);
-  return <View style={style}>{children}</View>;
-}
diff --git a/packages/app/src/components/markdown-text.d.ts b/packages/app/src/components/markdown-text.d.ts
deleted file mode 100644
index 00194ac319..0000000000
--- a/packages/app/src/components/markdown-text.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./markdown-text.ios";
diff --git a/packages/app/src/components/markdown-text.ios.tsx b/packages/app/src/components/markdown-text.ios.tsx
deleted file mode 100644
index 1b2eb405c4..0000000000
--- a/packages/app/src/components/markdown-text.ios.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { useMemo, type ReactNode } from "react";
-import {
-  Text,
-  View,
-  type StyleProp,
-  type TextProps,
-  type TextStyle,
-  type ViewStyle,
-} from "react-native";
-import { UITextView } from "react-native-uitextview";
-import { resolvePlainMarkdownTextStyle } from "@/components/markdown-text-style";
-import {
-  iosMarkdownTextIsSelectable,
-  useMarkdownTextSurface,
-} from "@/components/markdown-text-selection";
-import type { MarkdownCopyInlineTag } from "@/assistant-selection-copy/markup";
-
-interface MarkdownTextSpanProps {
-  style?: StyleProp<TextStyle>;
-  monoSurface?: boolean;
-  copyTag?: MarkdownCopyInlineTag;
-  children: ReactNode;
-  // Links route through this span too (see assistant-file-links/link.tsx). A
-  // plain <Text> nested in the paragraph UITextView is dropped, so the link
-  // must be a UITextView span to be visible. onPress is wired onto the leaf
-  // string children here: react-native-uitextview attaches it to the
-  // RNUITextViewChild nodes it builds from string content, which the native tap
-  // recognizer dispatches to. The link's handler reaches these leaf spans via
-  // AssistantLinkPressProvider (see assistant-file-links/link-press-context).
-  onPress?: TextProps["onPress"];
-  accessibilityRole?: TextProps["accessibilityRole"];
-}
-
-// Inline span backed by UITextView so iOS gets native word-selection handles.
-// Used inside MarkdownParagraphView (which is also a UITextView on iOS); the
-// library's TextAncestorContext hoists these into UITextViewChild nodes so
-// selection drags can cross sibling spans (e.g. plain text → **bold** → code).
-export function MarkdownTextSpan({
-  style,
-  children,
-  onPress,
-  accessibilityRole,
-}: MarkdownTextSpanProps) {
-  const plainStyle = useMemo(() => resolvePlainMarkdownTextStyle(style), [style]);
-  const surface = useMarkdownTextSurface();
-
-  // Each selectable span creates a UIKit UITextView with a window-level tap recognizer.
-  // A large table would create one per cell and make every app touch fan out across them.
-  if (!iosMarkdownTextIsSelectable(surface)) {
-    return (
-      <Text
-        selectable={false}
-        style={plainStyle}
-        onPress={onPress}
-        accessibilityRole={accessibilityRole}
-      >
-        {children}
-      </Text>
-    );
-  }
-
-  return (
-    <UITextView
-      uiTextView
-      selectable
-      style={plainStyle}
-      onPress={onPress}
-      accessibilityRole={accessibilityRole}
-    >
-      {children}
-    </UITextView>
-  );
-}
-
-interface MarkdownParagraphViewProps {
-  paragraphStyle: ViewStyle;
-  containsImage?: boolean;
-  children: ReactNode;
-}
-
-const MARKDOWN_PARAGRAPH_RESET: ViewStyle = {};
-
-// iOS-only: paragraph wraps in UITextView so the entire paragraph is one
-// native text view. That's what unlocks cross-inline drag selection — handles
-// can span every MarkdownTextSpan child inside this paragraph.
-// ViewStyle is structurally compatible with the layout props paragraphs use
-// (margin, padding, alignment); the cast lets the existing paragraphStyle
-// flow through unchanged.
-export function MarkdownParagraphView({
-  paragraphStyle,
-  containsImage = false,
-  children,
-}: MarkdownParagraphViewProps) {
-  const textStyle = useMemo(
-    () =>
-      resolvePlainMarkdownTextStyle([
-        paragraphStyle,
-        MARKDOWN_PARAGRAPH_RESET,
-      ] as StyleProp<TextStyle>),
-    [paragraphStyle],
-  );
-  const viewStyle = useMemo(() => [paragraphStyle, MARKDOWN_PARAGRAPH_RESET], [paragraphStyle]);
-
-  if (containsImage) {
-    return <View style={viewStyle}>{children}</View>;
-  }
-
-  return (
-    <UITextView uiTextView selectable style={textStyle}>
-      {children}
-    </UITextView>
-  );
-}
diff --git a/packages/app/src/components/markdown-text.web.tsx b/packages/app/src/components/markdown-text.web.tsx
deleted file mode 100644
index 0cb89f0cff..0000000000
--- a/packages/app/src/components/markdown-text.web.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { useMemo, type ReactNode } from "react";
-import {
-  Text,
-  View,
-  type StyleProp,
-  type TextProps,
-  type TextStyle,
-  type ViewStyle,
-} from "react-native";
-import { CODE_SURFACE_DATASET } from "@/styles/code-surface";
-import { markdownCopyDataSet, type MarkdownCopyInlineTag } from "@/assistant-selection-copy/markup";
-
-interface MarkdownTextSpanProps {
-  style?: StyleProp<TextStyle>;
-  monoSurface?: boolean;
-  copyTag?: MarkdownCopyInlineTag;
-  children: ReactNode;
-  // Web links use the <a>/Pressable path in link.tsx, not this span, so these
-  // are accepted for prop-shape parity with the native variants and forwarded
-  // harmlessly.
-  onPress?: TextProps["onPress"];
-  accessibilityRole?: TextProps["accessibilityRole"];
-}
-
-// react-native-web renders Text as <span>/<div> with `user-select: text`
-// already applied via markdownStyleMapping. The web bundle must not import
-// react-native-uitextview: its transitive import of codegenNativeComponent
-// pulls in setUpReactDevTools, which doesn't resolve under Metro's web
-// target in dev mode.
-export function MarkdownTextSpan({
-  style,
-  monoSurface,
-  copyTag,
-  children,
-  onPress,
-  accessibilityRole,
-}: MarkdownTextSpanProps) {
-  const dataSet = useMemo(() => {
-    if (copyTag && (monoSurface || copyTag === "code")) {
-      return { ...CODE_SURFACE_DATASET, ...markdownCopyDataSet[copyTag] };
-    }
-    if (copyTag) {
-      return markdownCopyDataSet[copyTag];
-    }
-    return monoSurface ? CODE_SURFACE_DATASET : undefined;
-  }, [copyTag, monoSurface]);
-
-  return (
-    <Text dataSet={dataSet} style={style} onPress={onPress} accessibilityRole={accessibilityRole}>
-      {children}
-    </Text>
-  );
-}
-
-interface MarkdownParagraphViewProps {
-  paragraphStyle: ViewStyle;
-  containsImage?: boolean;
-  children: ReactNode;
-}
-
-const MARKDOWN_PARAGRAPH_RESET: ViewStyle = {};
-
-// Same shape as Android — paragraph is a View so block-level children (images)
-// keep their natural layout. Web text selection already spans nested inline
-// elements via CSS user-select, so no UITextView equivalent is needed.
-export function MarkdownParagraphView({ paragraphStyle, children }: MarkdownParagraphViewProps) {
-  const style = useMemo(() => [paragraphStyle, MARKDOWN_PARAGRAPH_RESET], [paragraphStyle]);
-  return (
-    <View style={style} dataSet={markdownCopyDataSet.p}>
-      {children}
-    </View>
-  );
-}
diff --git a/packages/app/src/components/markdown/fence/index.tsx b/packages/app/src/components/markdown/fence/index.tsx
deleted file mode 100644
index 846aa91355..0000000000
--- a/packages/app/src/components/markdown/fence/index.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import type { ComponentType } from "react";
-import { HighlightedCodeBlock } from "@/components/highlighted-code-block";
-import { getMarkdownFenceLanguage } from "./language";
-import { MermaidFence } from "./mermaid";
-import type { MarkdownFenceRendererProps } from "./types";
-
-export interface MarkdownFenceBlockProps extends MarkdownFenceRendererProps {
-  info: string | null | undefined;
-}
-
-const diagramFences: Partial<Record<string, ComponentType<MarkdownFenceRendererProps>>> = {
-  mermaid: MermaidFence,
-};
-
-export function MarkdownFenceBlock({
-  code,
-  info,
-  phase,
-  inheritedStyles,
-  textStyle,
-}: MarkdownFenceBlockProps) {
-  const language = getMarkdownFenceLanguage(info);
-  const DiagramFence = language ? diagramFences[language] : undefined;
-  if (DiagramFence) {
-    return (
-      <DiagramFence
-        code={code}
-        phase={phase}
-        inheritedStyles={inheritedStyles}
-        textStyle={textStyle}
-      />
-    );
-  }
-  return (
-    <HighlightedCodeBlock
-      code={code}
-      language={language}
-      inheritedStyles={inheritedStyles}
-      textStyle={textStyle}
-    />
-  );
-}
diff --git a/packages/app/src/components/markdown/fence/language.test.ts b/packages/app/src/components/markdown/fence/language.test.ts
deleted file mode 100644
index 172f72c310..0000000000
--- a/packages/app/src/components/markdown/fence/language.test.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { getMarkdownFenceLanguage } from "./language";
-
-describe("getMarkdownFenceLanguage", () => {
-  it("normalizes the first info-string token", () => {
-    expect(getMarkdownFenceLanguage(" Sirena theme=dark ")).toBe("sirena");
-    expect(getMarkdownFenceLanguage("TypeScript title=example")).toBe("typescript");
-  });
-
-  it("returns null when no language is declared", () => {
-    expect(getMarkdownFenceLanguage("")).toBeNull();
-    expect(getMarkdownFenceLanguage(null)).toBeNull();
-    expect(getMarkdownFenceLanguage(undefined)).toBeNull();
-  });
-});
diff --git a/packages/app/src/components/markdown/fence/language.ts b/packages/app/src/components/markdown/fence/language.ts
deleted file mode 100644
index fd414a5ac2..0000000000
--- a/packages/app/src/components/markdown/fence/language.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export function getMarkdownFenceLanguage(info: string | null | undefined): string | null {
-  return info?.trim().split(/\s+/)[0]?.toLowerCase() || null;
-}
diff --git a/packages/app/src/components/markdown/fence/mermaid/host.native.tsx b/packages/app/src/components/markdown/fence/mermaid/host.native.tsx
index 044341f3aa..001ec5cf1c 100644
--- a/packages/app/src/components/markdown/fence/mermaid/host.native.tsx
+++ b/packages/app/src/components/markdown/fence/mermaid/host.native.tsx
@@ -14,7 +14,7 @@ import { useTranslation } from "react-i18next";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { HighlightedCodeBlock } from "@/components/highlighted-code-block";
 import type { Theme } from "@/styles/theme";
-import type { MarkdownFenceRendererProps } from "../types";
+import type { MarkdownFenceRendererProps } from "./types";
 import type { MermaidRenderRequest } from "./render-model";
 import { mermaidRuntimeHtml } from "./runtime/html.gen";
 import {
diff --git a/packages/app/src/components/markdown/fence/mermaid/host.tsx b/packages/app/src/components/markdown/fence/mermaid/host.tsx
index 50e9596740..ff2ca3268c 100644
--- a/packages/app/src/components/markdown/fence/mermaid/host.tsx
+++ b/packages/app/src/components/markdown/fence/mermaid/host.tsx
@@ -1,5 +1,5 @@
 import { HighlightedCodeBlock } from "@/components/highlighted-code-block";
-import type { MarkdownFenceRendererProps } from "../types";
+import type { MarkdownFenceRendererProps } from "./types";
 
 export function MermaidFenceHost({ code, inheritedStyles, textStyle }: MarkdownFenceRendererProps) {
   return (
diff --git a/packages/app/src/components/markdown/fence/mermaid/host.web.tsx b/packages/app/src/components/markdown/fence/mermaid/host.web.tsx
index e79922ec43..fed9afe3a3 100644
--- a/packages/app/src/components/markdown/fence/mermaid/host.web.tsx
+++ b/packages/app/src/components/markdown/fence/mermaid/host.web.tsx
@@ -6,7 +6,7 @@ import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { HighlightedCodeBlock } from "@/components/highlighted-code-block";
 import { ZoomableViewport } from "@/components/zoomable-viewport";
 import type { Theme } from "@/styles/theme";
-import type { MarkdownFenceRendererProps } from "../types";
+import type { MarkdownFenceRendererProps } from "./types";
 import { MermaidFullscreenViewer } from "./fullscreen-viewer.web";
 import { MermaidIframeRuntime, type MermaidRenderedMessage } from "./iframe-runtime.web";
 import { useMermaidRenderModel } from "./use-render-model";
diff --git a/packages/app/src/components/markdown/fence/mermaid/index.tsx b/packages/app/src/components/markdown/fence/mermaid/index.tsx
index 0f56d5f74f..fb135c8b6a 100644
--- a/packages/app/src/components/markdown/fence/mermaid/index.tsx
+++ b/packages/app/src/components/markdown/fence/mermaid/index.tsx
@@ -1,6 +1,19 @@
-import type { MarkdownFenceRendererProps } from "../types";
+import { createContext, useContext } from "react";
+import { withUnistyles } from "react-native-unistyles";
+import type { Theme } from "@/styles/theme";
 import { MermaidFenceHost } from "./host";
-
-export function MermaidFence(props: MarkdownFenceRendererProps) {
-  return <MermaidFenceHost {...props} />;
+export { splitMermaidFences } from "./segments";
+export const MermaidStreamingContext = createContext(false);
+const ThemedHost = withUnistyles(MermaidFenceHost);
+const styles = (theme: Theme) => ({
+  inheritedStyles: {
+    color: theme.colors.foreground,
+    fontFamily: theme.fontFamily.mono,
+    fontSize: theme.fontSize.code,
+  },
+  textStyle: { backgroundColor: theme.colors.surface2, padding: 12, borderRadius: 8 },
+});
+export function MermaidFence({ code }: { code: string }) {
+  const streaming = useContext(MermaidStreamingContext);
+  return <ThemedHost code={code} phase={streaming ? "streaming" : "complete"} uniProps={styles} />;
 }
diff --git a/packages/app/src/components/markdown/fence/mermaid/render-model.ts b/packages/app/src/components/markdown/fence/mermaid/render-model.ts
index da5176dbea..16e46f2210 100644
--- a/packages/app/src/components/markdown/fence/mermaid/render-model.ts
+++ b/packages/app/src/components/markdown/fence/mermaid/render-model.ts
@@ -1,4 +1,4 @@
-import type { MarkdownPhase } from "../types";
+import type { MarkdownPhase } from "./types";
 
 export type DiagramColorScheme = "light" | "dark";
 
diff --git a/packages/app/src/components/markdown/fence/mermaid/segments.ts b/packages/app/src/components/markdown/fence/mermaid/segments.ts
new file mode 100644
index 0000000000..be2f229051
--- /dev/null
+++ b/packages/app/src/components/markdown/fence/mermaid/segments.ts
@@ -0,0 +1,57 @@
+import { fromMarkdown } from "mdast-util-from-markdown";
+import type { Definition, RootContent } from "mdast";
+
+interface Segment {
+  kind: "markdown" | "mermaid";
+  id: string;
+  source: string;
+}
+
+/** Native enriched-markdown has no fenced-block override. Only diagrams leave its engine. */
+export function splitMermaidFences(markdown: string): Segment[] {
+  if (!/mermaid/i.test(markdown)) return [{ kind: "markdown", id: "0", source: markdown }];
+  const segments: Segment[] = [];
+  const definitions = new Map<string, Definition>();
+  let cursor = 0;
+  function visit(node: RootContent): void {
+    if (node.type === "definition" && !definitions.has(node.identifier))
+      definitions.set(node.identifier, node);
+    if (node.type === "code" && node.lang?.toLowerCase() === "mermaid" && node.position) {
+      const start = node.position.start.offset!;
+      const end = node.position.end.offset!;
+      if (start > cursor)
+        segments.push({
+          kind: "markdown",
+          id: String(segments.length),
+          source: markdown.slice(cursor, start),
+        });
+      segments.push({ kind: "mermaid", id: String(segments.length), source: node.value });
+      cursor = end;
+    } else if ("children" in node) node.children.forEach(visit);
+  }
+  const tree = fromMarkdown(markdown);
+  tree.children.forEach(visit);
+  if (cursor < markdown.length || segments.length === 0)
+    segments.push({
+      kind: "markdown",
+      id: String(segments.length),
+      source: markdown.slice(cursor),
+    });
+  // Prepend the document's first definitions after splitting, so fragment-local
+  // duplicates cannot override them. Original source slices and fence offsets stay intact.
+  if (segments.some((segment) => segment.kind === "mermaid")) {
+    const referenceSource = [...definitions.values()]
+      .map((node) => {
+        const label = node.identifier.replace(/[\\[\]]/g, "\\$&");
+        const url = node.url.replace(/[\\<>]/g, "\\$&");
+        const title = node.title ? ` "${node.title.replace(/[\\"]/g, "\\$&")}"` : "";
+        return `[${label}]: <${url}>${title}`;
+      })
+      .join("\n");
+    if (referenceSource)
+      for (const segment of segments) {
+        if (segment.kind === "markdown") segment.source = `${referenceSource}\n\n${segment.source}`;
+      }
+  }
+  return segments;
+}
diff --git a/packages/app/src/components/markdown/fence/types.ts b/packages/app/src/components/markdown/fence/mermaid/types.ts
similarity index 99%
rename from packages/app/src/components/markdown/fence/types.ts
rename to packages/app/src/components/markdown/fence/mermaid/types.ts
index b499bc893b..dbfec694cd 100644
--- a/packages/app/src/components/markdown/fence/types.ts
+++ b/packages/app/src/components/markdown/fence/mermaid/types.ts
@@ -1,7 +1,5 @@
 import type { TextStyle } from "react-native";
-
 export type MarkdownPhase = "streaming" | "complete";
-
 export interface MarkdownFenceRendererProps {
   code: string;
   phase: MarkdownPhase;
diff --git a/packages/app/src/components/markdown/fence/mermaid/use-render-model.ts b/packages/app/src/components/markdown/fence/mermaid/use-render-model.ts
index cb35549b10..67b51f8ad6 100644
--- a/packages/app/src/components/markdown/fence/mermaid/use-render-model.ts
+++ b/packages/app/src/components/markdown/fence/mermaid/use-render-model.ts
@@ -8,7 +8,7 @@ import {
   type RenderedDiagram,
 } from "./render-model";
 import { containsUnsafeMermaidSource } from "./source-policy";
-import type { MarkdownPhase } from "../types";
+import type { MarkdownPhase } from "./types";
 
 const renderCache = new Map<string, RenderedDiagram>();
 const RENDER_CACHE_LIMIT = 50;
diff --git a/packages/app/src/components/markdown/frame.tsx b/packages/app/src/components/markdown/frame.tsx
new file mode 100644
index 0000000000..86e8a4df13
--- /dev/null
+++ b/packages/app/src/components/markdown/frame.tsx
@@ -0,0 +1,18 @@
+import React, { type ReactElement } from "react";
+import { View } from "react-native";
+import { markdownCopyImageSourcesDataSet } from "@/assistant-selection-copy/markup";
+import { isWeb } from "@/constants/platform";
+
+export function MarkdownRendererFrame({
+  imageSources,
+  children,
+}: {
+  imageSources: Record<string, string>;
+  children: ReactElement;
+}) {
+  return (
+    <View dataSet={isWeb ? markdownCopyImageSourcesDataSet(imageSources) : undefined}>
+      {children}
+    </View>
+  );
+}
diff --git a/packages/app/src/components/markdown/html-ish.test.ts b/packages/app/src/components/markdown/html-ish.test.ts
deleted file mode 100644
index f8606d2714..0000000000
--- a/packages/app/src/components/markdown/html-ish.test.ts
+++ /dev/null
@@ -1,529 +0,0 @@
-import { readFileSync } from "node:fs";
-import { describe, expect, it } from "vitest";
-import { normalizeHtmlishMarkdown, splitHtmlishMarkdown } from "./html-ish";
-
-describe("splitHtmlishMarkdown", () => {
-  it("renders heading text beside a linked picture without literal heading tags", () => {
-    const source =
-      '<h2><a href="https://example.com/r"><picture><source srcset="https://example.com/d.svg"><img alt="Retrigger" src="https://example.com/l.svg"></picture></a>Confidence Score: 5/5</h2>';
-
-    expect(splitHtmlishMarkdown(source)).toEqual([
-      {
-        kind: "inlineImage",
-        alt: "Retrigger",
-        src: "https://example.com/l.svg",
-        href: "https://example.com/r",
-        flowsWithText: true,
-      },
-      { kind: "markdown", text: "Confidence Score: 5/5" },
-    ]);
-  });
-
-  it.each(["h1", "h2", "h3", "h4", "h5", "h6"])(
-    "keeps a mixed %s heading together after preceding markdown",
-    (heading) => {
-      const source = `Intro\n\n<${heading}><img alt="Icon" src="https://example.com/icon.svg">Caption</${heading}>\n\nOutro`;
-
-      expect(splitHtmlishMarkdown(source)).toEqual([
-        { kind: "markdown", text: "Intro\n\n" },
-        {
-          kind: "inlineImage",
-          alt: "Icon",
-          src: "https://example.com/icon.svg",
-          flowsWithText: true,
-        },
-        { kind: "markdown", text: "Caption\n\nOutro" },
-      ]);
-    },
-  );
-
-  it("preserves formatted text before and after images in a details heading", () => {
-    const source =
-      '<details><summary>More</summary><h2><strong>Before</strong><img alt="Icon" src="https://example.com/icon.svg"><em>After</em></h2></details>';
-
-    expect(splitHtmlishMarkdown(source)).toEqual([
-      {
-        kind: "details",
-        summary: "More",
-        body: "**Before***After*",
-        bodyParts: [
-          { kind: "markdown", text: "**Before**" },
-          { kind: "inlineImage", alt: "Icon", src: "https://example.com/icon.svg" },
-          { kind: "markdown", text: "*After*" },
-        ],
-      },
-    ]);
-  });
-
-  it("keeps mixed HTML headings literal in code examples", () => {
-    const heading = '<h2><img src="https://example.com/icon.svg">Caption</h2>';
-    const source = `Use \`${heading}\`\n\n\`\`\`html\n${heading}\n\`\`\``;
-
-    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
-  });
-
-  it("preserves unknown wrappers around text-only headings", () => {
-    expect(splitHtmlishMarkdown("<section><h2>Heading</h2></section>")).toEqual([
-      { kind: "markdown", text: "<section>Heading</section>" },
-    ]);
-  });
-
-  const inlineImageBody = [
-    '<a href="#"><img alt="Priority" src="https://example.com/assets/priority.svg?v=9" align="top"></a> Spoofed browser User-Agent allows access control bypass',
-    "",
-    "The middleware now trusts any browser-like User-Agent for unauthenticated requests.",
-    "",
-    "```ts",
-    'const isBrowser = userAgent.includes("Mozilla");',
-    "```",
-  ].join("\n");
-
-  const multiDetailsBody = [
-    "### Bot Review",
-    "",
-    "<details>",
-    "<summary><h3>Important Files Changed</h3></summary>",
-    "",
-    "- `packages/server/src/server/session.ts`",
-    "",
-    "</details>",
-    "",
-    "<details>",
-    "<summary><h3>Security Findings</h3></summary>",
-    "",
-    "No blocking findings.",
-    "",
-    "</details>",
-    "",
-    "<!-- bot_other_comments_section -->",
-    '<sub>Reviews (8): Last reviewed commit: “revert: undo parser” | <a href="https://app.greptile.com">Re-trigger Greptile</a></sub>',
-  ].join("\n");
-
-  it("classifies linked HTML images as generic inline images, not block markdown images", () => {
-    const [image, text] = splitHtmlishMarkdown(inlineImageBody);
-
-    expect(image).toEqual({
-      kind: "inlineImage",
-      alt: "Priority",
-      src: "https://example.com/assets/priority.svg?v=9",
-      flowsWithText: true,
-    });
-    expect(text).toEqual({
-      kind: "markdown",
-      text: [
-        " Spoofed browser User-Agent allows access control bypass",
-        "",
-        "The middleware now trusts any browser-like User-Agent for unauthenticated requests.",
-        "",
-        "```ts",
-        'const isBrowser = userAgent.includes("Mozilla");',
-        "```",
-      ].join("\n"),
-    });
-  });
-
-  it("flags both images as flowsWithText when two inline images precede title text on the same line", () => {
-    const twoImageBody = [
-      '<a href="#"><img alt="Priority" src="https://example.com/priority.svg" align="top"></a> <a href="#"><img alt="Security" src="https://example.com/security.svg" align="top"></a> **Title text here**',
-      "",
-      "Body paragraph.",
-    ].join("\n");
-
-    const parts = splitHtmlishMarkdown(twoImageBody);
-    const [first, second, third] = parts;
-
-    expect(first).toEqual({
-      kind: "inlineImage",
-      alt: "Priority",
-      src: "https://example.com/priority.svg",
-      flowsWithText: true,
-    });
-    expect(second).toEqual({ kind: "markdown", text: " " });
-    expect(third).toEqual({
-      kind: "inlineImage",
-      alt: "Security",
-      src: "https://example.com/security.svg",
-      flowsWithText: true,
-    });
-  });
-
-  it("keeps safe width and height attributes on inline images", () => {
-    expect(
-      splitHtmlishMarkdown(
-        '<img alt="Small" src="https://example.com/small.svg" width="18" height="12">',
-      ),
-    ).toEqual([
-      {
-        kind: "inlineImage",
-        alt: "Small",
-        src: "https://example.com/small.svg",
-        width: 18,
-        height: 12,
-      },
-    ]);
-  });
-
-  it("keeps safe non-empty image links", () => {
-    expect(
-      splitHtmlishMarkdown(
-        '<a href="https://example.com/details"><img alt="Small" src="https://example.com/small.svg"></a>',
-      ),
-    ).toEqual([
-      {
-        kind: "inlineImage",
-        alt: "Small",
-        src: "https://example.com/small.svg",
-        href: "https://example.com/details",
-      },
-    ]);
-  });
-
-  it("renders a linked picture inside a heading without exposing its HTML", () => {
-    const source = [
-      '<h2><a href="https://example.com/retrigger?id=73851569"><picture>',
-      '<source media="(prefers-color-scheme: dark)" srcset="https://example.com/dark.svg">',
-      '<source media="(prefers-color-scheme: light)" srcset="https://example.com/light.svg">',
-      '<img alt="Retrigger" src="https://example.com/default.svg" width="85" height="24">',
-      "</picture></a></h2>",
-      "",
-      "Confidence Score: 5/5",
-      "",
-      "<details><summary>Summary</summary>No outstanding findings.</details>",
-    ].join("\n");
-
-    expect(splitHtmlishMarkdown(source)).toEqual([
-      {
-        kind: "inlineImage",
-        alt: "Retrigger",
-        src: "https://example.com/default.svg",
-        href: "https://example.com/retrigger?id=73851569",
-        width: 85,
-        height: 24,
-      },
-      { kind: "markdown", text: "\n\nConfidence Score: 5/5\n\n" },
-      { kind: "details", summary: "Summary", body: "No outstanding findings." },
-    ]);
-  });
-
-  it.each([
-    ["", ""],
-    ["<h3>", "</h3>"],
-    ['<a href="javascript:alert(1)">', "</a>"],
-  ])("uses the picture fallback without activating unsafe links (%s)", (wrapper, closing) => {
-    const picture =
-      '<picture><source srcset="https://example.com/alternate.svg"/><img src="https://example.com/default.svg" alt="Image"></picture>';
-
-    expect(splitHtmlishMarkdown(`${wrapper}${picture}${closing}`)).toEqual([
-      { kind: "inlineImage", src: "https://example.com/default.svg", alt: "Image" },
-    ]);
-  });
-
-  it("keeps picture examples literal inside inline and fenced code", () => {
-    const picture =
-      '<picture><source srcset="https://example.com/alternate.svg"><img src="https://example.com/default.svg"></picture>';
-    const source = `Use \`${picture}\`\n\n\`\`\`html\n${picture}\n\`\`\``;
-    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
-  });
-
-  it.each(["p", "div"])("renders a linked picture inside %s", (wrapper) => {
-    const source = `<${wrapper}><a href="https://example.com/page"><picture><source srcset="https://example.com/dark.svg"><img src="https://example.com/default.svg" alt="Image"></picture></a></${wrapper}>`;
-    expect(splitHtmlishMarkdown(source)).toEqual([
-      {
-        kind: "inlineImage",
-        src: "https://example.com/default.svg",
-        alt: "Image",
-        href: "https://example.com/page",
-      },
-    ]);
-  });
-
-  it.each(["h2", "p", "div"])("keeps text after an image-only %s on a separate row", (wrapper) => {
-    const source = `<${wrapper}><img src="https://example.com/image.svg" alt="Image"></${wrapper}>Next section`;
-    expect(splitHtmlishMarkdown(source)).toEqual([
-      { kind: "inlineImage", src: "https://example.com/image.svg", alt: "Image" },
-      { kind: "markdown", text: "Next section" },
-    ]);
-  });
-
-  it("handles deeply nested image wrappers without exhausting the stack", () => {
-    const source = `${"<div>".repeat(10000)}<a href="https://example.com/page"><picture><img src="https://example.com/image.svg" alt="Image"></picture></a>${"</div>".repeat(10000)}`;
-    expect(splitHtmlishMarkdown(source)).toEqual([
-      {
-        kind: "inlineImage",
-        src: "https://example.com/image.svg",
-        alt: "Image",
-        href: "https://example.com/page",
-      },
-    ]);
-  });
-
-  it("preserves inline image parts inside details bodies", () => {
-    expect(
-      splitHtmlishMarkdown(
-        '<details><summary>Images</summary><a href="https://example.com/page"><img alt="Icon" src="https://example.com/icon.svg"></a> Inline text</details>',
-      ),
-    ).toEqual([
-      {
-        kind: "details",
-        summary: "Images",
-        body: "Inline text",
-        bodyParts: [
-          {
-            kind: "inlineImage",
-            alt: "Icon",
-            src: "https://example.com/icon.svg",
-            href: "https://example.com/page",
-            flowsWithText: true,
-          },
-          { kind: "markdown", text: " Inline text" },
-        ],
-      },
-    ]);
-  });
-
-  it("does not flag standalone inline images as flowing with text", () => {
-    expect(
-      splitHtmlishMarkdown('<img alt="Shot" src="https://example.com/shot.png">\n\nCaption below'),
-    ).toEqual([
-      { kind: "inlineImage", alt: "Shot", src: "https://example.com/shot.png" },
-      { kind: "markdown", text: "\n\nCaption below" },
-    ]);
-  });
-
-  it("does not flag mid-line inline images as flowing with text", () => {
-    const [, image] = splitHtmlishMarkdown(
-      'Before <img alt="Icon" src="https://example.com/icon.png"> after',
-    );
-
-    expect(image).toEqual({
-      kind: "inlineImage",
-      alt: "Icon",
-      src: "https://example.com/icon.png",
-    });
-  });
-
-  it("leaves ordinary markdown images on the markdown path", () => {
-    const source = "![Ordinary](https://example.com/full-size.png)";
-
-    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
-  });
-
-  it("leaves unsafe HTML image sources inert", () => {
-    const source = '<img alt="Bad" src="javascript:alert(1)">';
-
-    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
-  });
-
-  it("removes raw image anchor and image tags from rendered markdown text", () => {
-    const text = splitHtmlishMarkdown(inlineImageBody)
-      .map((part) => (part.kind === "markdown" ? part.text : ""))
-      .join("");
-
-    expect(text).not.toContain("<a ");
-    expect(text).not.toContain("<img ");
-    expect(text).not.toContain("</a>");
-  });
-
-  it("unwraps sub text and strips HTML comments", () => {
-    const parts = splitHtmlishMarkdown(multiDetailsBody);
-    const tail = parts.at(-1);
-
-    expect(tail).toEqual({
-      kind: "markdown",
-      text: "\n\nReviews (8): Last reviewed commit: “revert: undo parser” | [Re-trigger Greptile](https://app.greptile.com)",
-    });
-  });
-
-  it("does not leak stray closing details tags across multiple details blocks", () => {
-    const renderedText = splitHtmlishMarkdown(multiDetailsBody)
-      .map((part) => {
-        if (part.kind === "markdown") return part.text;
-        if (part.kind === "details") return `${part.summary}\n${part.body}`;
-        return part.alt;
-      })
-      .join("\n");
-
-    expect(renderedText).not.toContain("</details>");
-    expect(renderedText).not.toContain("<!--");
-    expect(splitHtmlishMarkdown(multiDetailsBody).slice(0, 4)).toMatchObject([
-      { kind: "markdown", text: "### Bot Review\n\n" },
-      { kind: "details", summary: "Important Files Changed" },
-      { kind: "markdown", text: "\n\n" },
-      { kind: "details", summary: "Security Findings" },
-    ]);
-  });
-
-  it("preserves paragraph boundaries around title, prose, and code block", () => {
-    const text = splitHtmlishMarkdown(inlineImageBody)
-      .map((part) => (part.kind === "markdown" ? part.text : ""))
-      .join("");
-
-    expect(text).toContain(
-      "Spoofed browser User-Agent allows access control bypass\n\nThe middleware now trusts",
-    );
-    expect(text).toContain("unauthenticated requests.\n\n```ts\nconst isBrowser");
-  });
-
-  it("keeps product-specific image language out of parser and renderer logic", () => {
-    const parserSource = readFileSync(new URL("./html-ish.ts", import.meta.url), "utf8");
-    const rendererSource = readFileSync(new URL("./renderer.tsx", import.meta.url), "utf8");
-    const productionSource = `${parserSource}\n${rendererSource}`;
-
-    expect(productionSource).not.toMatch(/Greptile|badge|P0|P1|P2|greptile-static-assets/i);
-  });
-
-  it("parses Greptile-style details blocks", () => {
-    expect(
-      splitHtmlishMarkdown(
-        "<details><summary><h3>Greptile Summary</h3></summary>Body markdown</details>",
-      ),
-    ).toEqual([{ kind: "details", summary: "Greptile Summary", body: "Body markdown" }]);
-  });
-
-  it("keeps details inside fenced code as literal markdown", () => {
-    const source = "```html\n<details><summary>Example</summary>Body</details>\n```";
-
-    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
-  });
-
-  it("keeps details inside inline code on native runtimes without copied array sorting", () => {
-    const source = "Use `<details><summary>Example</summary>Body</details>` as an example.";
-
-    expect(withoutArrayToSorted(() => splitHtmlishMarkdown(source))).toEqual([
-      { kind: "markdown", text: source },
-    ]);
-  });
-
-  it("keeps details inside inline code as literal markdown", () => {
-    const source = "Use `<details><summary>Example</summary>Body</details>` as an example.";
-
-    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
-  });
-
-  it("terminates when an unmatched backtick follows a closed inline code span", () => {
-    const source = "Use `<details><summary>Example</summary>Body</details>` before `dangling";
-
-    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
-  });
-
-  it("still parses normal details outside code", () => {
-    expect(splitHtmlishMarkdown("`code`\n<details><summary>Real</summary>Body</details>")).toEqual([
-      { kind: "markdown", text: "`code`\n" },
-      { kind: "details", summary: "Real", body: "Body" },
-    ]);
-  });
-
-  it("preserves text before and after details blocks", () => {
-    expect(
-      splitHtmlishMarkdown("Before\n<details><summary>More</summary>Hidden</details>\nAfter"),
-    ).toEqual([
-      { kind: "markdown", text: "Before\n" },
-      { kind: "details", summary: "More", body: "Hidden" },
-      { kind: "markdown", text: "\nAfter" },
-    ]);
-  });
-
-  it("parses multiple details blocks", () => {
-    expect(
-      splitHtmlishMarkdown(
-        "<details><summary>One</summary>A</details><details><summary>Two</summary>B</details>",
-      ),
-    ).toEqual([
-      { kind: "details", summary: "One", body: "A" },
-      { kind: "details", summary: "Two", body: "B" },
-    ]);
-  });
-
-  it("normalizes br and simple code tags into markdown", () => {
-    expect(normalizeHtmlishMarkdown("Line 1<br/>Line 2 <code>safe-value</code>")).toBe(
-      "Line 1\nLine 2 `safe-value`",
-    );
-  });
-
-  it("normalizes HTML table cells and inline formatting into markdown", () => {
-    expect(
-      normalizeHtmlishMarkdown(
-        "<table><tr><td><strong>Score</strong>: 78</td></tr><tr><td><strong>No security concerns identified</strong></td></tr><tr><td><strong>Recommended focus areas for review</strong></td><td>Bearer authentication</td></tr></table>",
-      ),
-    ).toBe(
-      "\n- **Score**: 78\n- **No security concerns identified**\n- **Recommended focus areas for review**: Bearer authentication\n",
-    );
-  });
-
-  it("leaves complex code tags inert instead of parsing HTML", () => {
-    expect(normalizeHtmlishMarkdown('<code onclick="evil()"><script>x</script></code>')).toBe(
-      '<code onclick="evil()"><script>x</script></code>',
-    );
-  });
-
-  it("keeps table rows after a comparison that only looks like a tag", () => {
-    const source = [
-      "| ID | Note | Status |",
-      "|---|---|---|",
-      "| a-1 | accepts 1<size<2 only | open |",
-      "| a-2 | second row | open |",
-      "",
-      "Later x -> y.",
-    ].join("\n");
-
-    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
-  });
-
-  it.each(["See <https://example.com/docs> for more.", "Stop when a<b", "Keep </ b> and a <b"])(
-    "keeps %j literal because it is not HTML",
-    (source) => {
-      expect(normalizeHtmlishMarkdown(source)).toBe(source);
-    },
-  );
-
-  it.each([
-    "Call As<Integer>() before limits<DWORD>::max()",
-    "<Kbd Data-Key='K'>Ctrl</Kbd> then <Foo/>",
-  ])("echoes unknown tags in %j as written", (source) => {
-    expect(normalizeHtmlishMarkdown(source)).toBe(source);
-  });
-
-  it("rebuilds an unknown tag that a code span splits", () => {
-    expect(normalizeHtmlishMarkdown('<Tip title="`x`">hi</Tip>')).toBe("`x`<tip title>hi</Tip>");
-  });
-
-  it("still reads tags and comments next to literal angle brackets", () => {
-    expect(normalizeHtmlishMarkdown("1<n<2 <b>bold</b><!-- hidden --> 3<4")).toBe(
-      "1<n<2 **bold** 3<4",
-    );
-  });
-
-  it("falls back to inert markdown when details are unclosed", () => {
-    const source = "<details><summary>Open</summary>Still open";
-
-    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
-  });
-
-  it("falls back to inert markdown when summary is missing", () => {
-    const source = "<details>Hidden</details>";
-
-    expect(splitHtmlishMarkdown(source)).toEqual([{ kind: "markdown", text: source }]);
-  });
-
-  it("does not execute or render unknown HTML as structured content", () => {
-    const source =
-      '<script>alert(1)</script><details onclick="evil()"><summary>Safe</summary><iframe src="x"></iframe></details>';
-
-    expect(splitHtmlishMarkdown(source)).toEqual([
-      { kind: "markdown", text: "<script>alert(1)</script>" },
-      { kind: "details", summary: "Safe", body: '<iframe src="x"></iframe>' },
-    ]);
-  });
-});
-
-function withoutArrayToSorted<T>(callback: () => T): T {
-  const descriptor = Object.getOwnPropertyDescriptor(Array.prototype, "toSorted");
-  Reflect.deleteProperty(Array.prototype, "toSorted");
-  try {
-    return callback();
-  } finally {
-    if (descriptor) {
-      Reflect.defineProperty(Array.prototype, "toSorted", descriptor);
-    }
-  }
-}
diff --git a/packages/app/src/components/markdown/html-ish.ts b/packages/app/src/components/markdown/html-ish.ts
deleted file mode 100644
index 94eb7cab5b..0000000000
--- a/packages/app/src/components/markdown/html-ish.ts
+++ /dev/null
@@ -1,926 +0,0 @@
-import { Parser } from "htmlparser2";
-
-export interface MarkdownTextPart {
-  kind: "markdown";
-  text: string;
-}
-
-export interface MarkdownDetailsPart {
-  kind: "details";
-  summary: string;
-  body: string;
-  bodyParts?: MarkdownDisplayPart[];
-}
-
-export interface MarkdownInlineImagePart {
-  kind: "inlineImage";
-  alt: string;
-  src: string;
-  href?: string;
-  width?: number;
-  height?: number;
-  /** The image starts a line and text continues on that same line. */
-  flowsWithText?: boolean;
-}
-
-export type MarkdownDisplayPart = MarkdownTextPart | MarkdownDetailsPart | MarkdownInlineImagePart;
-
-const FENCE_LINE_RE = /^ {0,3}([`~]{3,})[^\n\r]*(?:\r?\n|$)/gm;
-const BACKTICK_RUN_RE = /`+/g;
-const SAFE_IMAGE_SRC_RE = /^(https?:\/\/|data:image\/(?:png|gif|jpe?g);base64,)/i;
-const SAFE_LINK_HREF_RE = /^(https?:\/\/|#(?:$|[\w-]))/i;
-// CommonMark open and closing tags (spec "Raw HTML"); comments are matched separately.
-const HTML_ATTRIBUTE = String.raw`\s+[A-Za-z_:][\w.:-]*(?:\s*=\s*(?:[^\s"'=<>\x60]+|'[^']*'|"[^"]*"))?`;
-const HTML_TAG_RE = new RegExp(
-  String.raw`<(?:[A-Za-z][A-Za-z0-9-]*(?:${HTML_ATTRIBUTE})*\s*\/?|\/[A-Za-z][A-Za-z0-9-]*\s*)>`,
-  "y",
-);
-const VOID_HTML_TAGS = new Set(["br", "img", "source"]);
-const MARKDOWN_TAG_WRAPPERS: Readonly<Record<string, readonly [string, string]>> = {
-  b: ["**", "**"],
-  del: ["~~", "~~"],
-  em: ["*", "*"],
-  i: ["*", "*"],
-  s: ["~~", "~~"],
-  strike: ["~~", "~~"],
-  strong: ["**", "**"],
-};
-
-interface ProtectedMarkdownRange {
-  start: number;
-  end: number;
-}
-
-interface MarkdownImageDimensions {
-  width?: number;
-  height?: number;
-}
-
-interface HtmlTextToken {
-  kind: "text";
-  value: string;
-}
-
-interface HtmlCommentToken {
-  kind: "comment";
-}
-
-interface HtmlTagToken {
-  kind: "tag";
-  name: string;
-  closing: boolean;
-  selfClosing: boolean;
-  attributes: Record<string, string>;
-  raw: string;
-}
-
-type HtmlToken = HtmlTextToken | HtmlCommentToken | HtmlTagToken;
-
-interface InlineImageParseResult {
-  part: MarkdownInlineImagePart;
-  end: number;
-}
-
-interface MarkdownDelimiterMatch {
-  index: number;
-  end: number;
-}
-
-interface HtmlishTokenParser {
-  write(chunk: string): void;
-  skip(length: number): void;
-  end(): void;
-}
-
-export function splitHtmlishMarkdown(source: string): MarkdownDisplayPart[] {
-  return splitHtmlishTokens(tokenizeHtmlishMarkdown(source));
-}
-
-function splitHtmlishTokens(tokens: HtmlToken[]): MarkdownDisplayPart[] {
-  const parts: MarkdownDisplayPart[] = [];
-  let cursor = 0;
-
-  while (cursor < tokens.length) {
-    const token = tokens[cursor];
-    if (isOpenTag(token, "details")) {
-      const closeIndex = findMatchingClose(tokens, cursor, "details");
-      if (closeIndex !== null) {
-        const details = parseDetailsTokens(tokens.slice(cursor + 1, closeIndex));
-        if (details) {
-          parts.push(details);
-          cursor = closeIndex + 1;
-          continue;
-        }
-      }
-    }
-
-    const inlineImage = parseInlineImageAt(tokens, cursor);
-    if (inlineImage) {
-      parts.push(
-        flowsWithFollowingText(tokens, cursor, inlineImage.end)
-          ? { ...inlineImage.part, flowsWithText: true }
-          : inlineImage.part,
-      );
-      cursor = inlineImage.end;
-      continue;
-    }
-
-    if (isHeadingTag(token)) {
-      const closeIndex = findMixedHeadingClose(tokens, cursor);
-      if (closeIndex !== null) {
-        // Headings render as their contents. Split those contents together so an
-        // embedded image cannot strand the opening heading tag in a text slice.
-        for (const part of splitHtmlishTokens(tokens.slice(cursor + 1, closeIndex))) {
-          appendDisplayPart(parts, part);
-        }
-        cursor = closeIndex + 1;
-        continue;
-      }
-    }
-
-    const end = findNextDisplayPartIndex(tokens, cursor + 1) ?? tokens.length;
-    appendMarkdownPart(parts, renderInlineTokens(tokens.slice(cursor, end)));
-    cursor = end;
-  }
-
-  return parts;
-}
-
-function parseInlineImageAt(tokens: HtmlToken[], start: number): InlineImageParseResult | null {
-  const token = tokens[start];
-  if (token?.kind !== "tag" || token.closing) {
-    return null;
-  }
-
-  if (token.name === "img") {
-    const image = imageTokenToInlineImage(token, undefined);
-    return image ? { part: image, end: start + 1 } : null;
-  }
-
-  if (token.name !== "a" && token.name !== "picture" && !isImageBlockWrapper(token)) {
-    return null;
-  }
-
-  return parseWrappedImageAt(tokens, start);
-}
-
-function parseWrappedImageAt(tokens: HtmlToken[], start: number): InlineImageParseResult | null {
-  // Walk an image-only wrapper chain once. Recursing over copied child slices
-  // makes deeply nested review HTML quadratic and can exhaust the JS stack.
-  const wrappers: string[] = [];
-  let image: MarkdownInlineImagePart | null = null;
-  let href: string | undefined;
-  let hasLink = false;
-
-  for (let index = start; index < tokens.length; index += 1) {
-    const child = tokens[index];
-    if (child.kind === "comment" || isWhitespaceText(child)) {
-      continue;
-    }
-    if (child.kind !== "tag") {
-      return null;
-    }
-    if (child.closing) {
-      if (!image || wrappers.pop() !== child.name) {
-        return null;
-      }
-      if (wrappers.length === 0) {
-        return { part: image, end: index + 1 };
-      }
-      continue;
-    }
-    // Pictures use their img fallback, not responsive source selection.
-    if (child.name === "source" && wrappers.at(-1) === "picture") {
-      continue;
-    }
-    if (image) {
-      return null;
-    }
-    if (child.name === "img") {
-      image = imageTokenToInlineImage(child, href);
-      if (!image) {
-        return null;
-      }
-      continue;
-    }
-    if (child.name !== "a" && child.name !== "picture" && !isImageBlockWrapper(child)) {
-      return null;
-    }
-    if (child.name === "a" && !hasLink) {
-      href = safeHref(child.attributes.href);
-      hasLink = true;
-    }
-    wrappers.push(child.name);
-  }
-  return null;
-}
-
-function isImageBlockWrapper(token: HtmlToken | undefined): boolean {
-  return isHeadingTag(token) || isOpenTag(token, "p") || isOpenTag(token, "div");
-}
-
-function flowsWithFollowingText(tokens: HtmlToken[], start: number, end: number): boolean {
-  if (isImageBlockWrapper(tokens[start])) {
-    return false;
-  }
-
-  const previous = tokens[start - 1];
-  // At line start if nothing precedes this image, or the preceding token ends with only
-  // whitespace since the last newline (covers a bare space between two images on the same line).
-  const atLineStart =
-    previous === undefined ||
-    (previous.kind === "text" && /(?:^|[\n\r])[ \t]*$/.test(previous.value));
-  if (!atLineStart) {
-    return false;
-  }
-
-  // Scan forward past same-line whitespace-only text tokens and inline images to find
-  // the first substantive text token, without crossing a newline.
-  let cursor = end;
-  while (cursor < tokens.length) {
-    const token = tokens[cursor];
-    if (token === undefined) {
-      break;
-    }
-    if (token.kind === "text") {
-      const sameLine = token.value.split(/\r?\n/, 1)[0] ?? "";
-      if (sameLine.trim().length > 0) {
-        return true;
-      }
-      // Whitespace-only on this line — keep scanning only if no newline was crossed.
-      if (token.value.includes("\n") || token.value.includes("\r")) {
-        return false;
-      }
-      cursor += 1;
-      continue;
-    }
-    // An inline image tag — skip over it (the image itself and its possible wrapping close tag).
-    if (token.kind === "tag") {
-      if (isImageBlockWrapper(token)) {
-        return false;
-      }
-      const imageResult = parseInlineImageAt(tokens, cursor);
-      if (imageResult) {
-        cursor = imageResult.end;
-        continue;
-      }
-    }
-    break;
-  }
-  return false;
-}
-
-function findNextDisplayPartIndex(tokens: HtmlToken[], start: number): number | null {
-  for (let index = start; index < tokens.length; index += 1) {
-    if (
-      isOpenTag(tokens[index], "details") ||
-      findMixedHeadingClose(tokens, index) !== null ||
-      parseInlineImageAt(tokens, index)
-    ) {
-      return index;
-    }
-  }
-  return null;
-}
-
-function findMixedHeadingClose(tokens: HtmlToken[], start: number): number | null {
-  const token = tokens[start];
-  if (!isHeadingTag(token)) {
-    return null;
-  }
-  const closeIndex = findMatchingClose(tokens, start, token.name);
-  if (closeIndex === null) {
-    return null;
-  }
-  for (let index = start + 1; index < closeIndex; index += 1) {
-    if (parseInlineImageAt(tokens, index)) {
-      return closeIndex;
-    }
-  }
-  return null;
-}
-
-function appendDisplayPart(parts: MarkdownDisplayPart[], part: MarkdownDisplayPart): void {
-  if (part.kind === "markdown") {
-    appendMarkdownPart(parts, part.text);
-  } else {
-    parts.push(part);
-  }
-}
-
-function appendMarkdownPart(parts: MarkdownDisplayPart[], text: string): void {
-  if (!text) {
-    return;
-  }
-  const previous = parts.at(-1);
-  if (previous?.kind === "markdown") {
-    previous.text += text;
-    return;
-  }
-  parts.push({ kind: "markdown", text });
-}
-
-function parseDetailsTokens(tokens: HtmlToken[]): MarkdownDetailsPart | null {
-  const summaryOpenIndex = findNextOpenTag(tokens, 0, "summary");
-  if (summaryOpenIndex === null) {
-    return null;
-  }
-
-  const summaryCloseIndex = findMatchingClose(tokens, summaryOpenIndex, "summary");
-  if (summaryCloseIndex === null) {
-    return null;
-  }
-
-  const summaryTokens = tokens.slice(summaryOpenIndex + 1, summaryCloseIndex);
-  const bodyTokens = [...tokens.slice(0, summaryOpenIndex), ...tokens.slice(summaryCloseIndex + 1)];
-  const summary = renderSummaryTokens(summaryTokens).trim();
-  if (!summary) {
-    return null;
-  }
-
-  const bodyParts = splitHtmlishTokens(bodyTokens);
-  const body = renderBodyText(bodyParts);
-
-  return {
-    kind: "details",
-    summary,
-    body: body.trim(),
-    ...(bodyParts.some((part) => part.kind !== "markdown")
-      ? { bodyParts: trimBodyParts(bodyParts) }
-      : {}),
-  };
-}
-
-function renderBodyText(parts: MarkdownDisplayPart[]): string {
-  return parts.map((part) => (part.kind === "markdown" ? part.text : "")).join("");
-}
-
-function trimBodyParts(parts: MarkdownDisplayPart[]): MarkdownDisplayPart[] {
-  const trimmed = [...parts];
-  const first = trimmed[0];
-  if (first?.kind === "markdown") {
-    first.text = first.text.trimStart();
-  }
-  const last = trimmed.at(-1);
-  if (last?.kind === "markdown") {
-    last.text = last.text.trimEnd();
-  }
-  return trimmed.filter((part) => part.kind !== "markdown" || part.text.length > 0);
-}
-
-function renderSummaryTokens(tokens: HtmlToken[]): string {
-  return stripSingleHeadingWrapper(renderInlineTokens(tokens));
-}
-
-function stripSingleHeadingWrapper(text: string): string {
-  const tokens = tokenizeHtmlishMarkdown(text.trim());
-  if (tokens.length < 3) {
-    return text;
-  }
-
-  const first = tokens[0];
-  const last = tokens.at(-1);
-  if (!isHeadingTag(first) || !isClosingTag(last, first.name)) {
-    return text;
-  }
-
-  return renderInlineTokens(tokens.slice(1, -1));
-}
-
-function renderInlineTokens(tokens: HtmlToken[]): string {
-  let output = "";
-  for (let index = 0; index < tokens.length; index += 1) {
-    const token = tokens[index];
-    if (!token) {
-      continue;
-    }
-    if (token.kind === "text") {
-      output += token.value;
-      continue;
-    }
-    if (token.kind === "comment" || token.closing) {
-      continue;
-    }
-
-    if (token.name === "br") {
-      output += "\n";
-      continue;
-    }
-
-    if (token.name === "img") {
-      output += renderImageToken(token);
-      continue;
-    }
-
-    const closeIndex = token.selfClosing ? null : findMatchingClose(tokens, index, token.name);
-    if (closeIndex === null) {
-      output += renderUnknownTag(token);
-      continue;
-    }
-
-    const children = tokens.slice(index + 1, closeIndex);
-    const close = tokens[closeIndex];
-    const closeRaw = isClosingTag(close, token.name) ? close.raw : `</${token.name}>`;
-    output += renderHtmlTag(token, children, closeRaw);
-    index = closeIndex;
-  }
-
-  return output;
-}
-
-function renderHtmlTag(token: HtmlTagToken, children: HtmlToken[], closeRaw: string): string {
-  if (token.name === "a") {
-    return renderLinkToken(token, children);
-  }
-  if (token.name === "sub" || isHeadingTagName(token.name)) {
-    return renderInlineTokens(children);
-  }
-  if (token.name === "code" && children.every((child) => child.kind === "text")) {
-    return `\`${renderInlineTokens(children)}\``;
-  }
-  const wrapper = MARKDOWN_TAG_WRAPPERS[token.name];
-  if (wrapper) {
-    return `${wrapper[0]}${renderInlineTokens(children)}${wrapper[1]}`;
-  }
-  if (token.name === "table") {
-    return renderTableTokens(children);
-  }
-  if (token.name === "p" || token.name === "div") {
-    return `\n\n${renderInlineTokens(children).trim()}\n\n`;
-  }
-  return `${token.raw}${renderInlineTokens(children)}${closeRaw}`;
-}
-
-function renderTableTokens(tokens: HtmlToken[]): string {
-  const rows: string[] = [];
-
-  for (let index = 0; index < tokens.length; index += 1) {
-    if (!isOpenTag(tokens[index], "tr")) {
-      continue;
-    }
-    const closeIndex = findMatchingClose(tokens, index, "tr");
-    if (closeIndex === null) {
-      continue;
-    }
-    const cells = renderTableCells(tokens.slice(index + 1, closeIndex));
-    if (cells.length === 1) {
-      rows.push(`- ${cells[0]}`);
-    } else if (cells.length > 1) {
-      const label =
-        cells[0].startsWith("**") && cells[0].endsWith("**") ? cells[0] : `**${cells[0]}**`;
-      rows.push(`- ${label}: ${cells.slice(1).join(" ")}`);
-    }
-    index = closeIndex;
-  }
-
-  return rows.length > 0 ? `\n${rows.join("\n")}\n` : "";
-}
-
-function renderTableCells(tokens: HtmlToken[]): string[] {
-  const cells: string[] = [];
-
-  for (let index = 0; index < tokens.length; index += 1) {
-    const token = tokens[index];
-    if (!isOpenTag(token, "td") && !isOpenTag(token, "th")) {
-      continue;
-    }
-    const closeIndex = findMatchingClose(tokens, index, token.name);
-    if (closeIndex === null) {
-      continue;
-    }
-    const cell = renderInlineTokens(tokens.slice(index + 1, closeIndex)).trim();
-    if (cell) {
-      cells.push(cell);
-    }
-    index = closeIndex;
-  }
-
-  return cells;
-}
-
-function renderImageToken(token: HtmlTagToken): string {
-  const image = imageTokenToInlineImage(token, undefined);
-  if (!image) {
-    return token.raw;
-  }
-
-  return `![${escapeMarkdownImageAlt(image.alt)}](${image.src})`;
-}
-
-function renderLinkToken(token: HtmlTagToken, children: HtmlToken[]): string {
-  const imageOnly = getSingleImageChild(children);
-  if (imageOnly) {
-    return renderImageToken(imageOnly);
-  }
-
-  const label = renderInlineTokens(children);
-  const href = token.attributes.href ?? "";
-  if (!label || !SAFE_LINK_HREF_RE.test(href) || href === "#") {
-    return label;
-  }
-
-  return `[${label}](${href})`;
-}
-
-function imageTokenToInlineImage(
-  token: HtmlTagToken,
-  href: string | undefined,
-): MarkdownInlineImagePart | null {
-  const src = token.attributes.src ?? "";
-  if (!SAFE_IMAGE_SRC_RE.test(src)) {
-    return null;
-  }
-
-  return {
-    kind: "inlineImage",
-    alt: token.attributes.alt ?? "",
-    src,
-    ...(href ? { href } : {}),
-    ...parseImageDimensions(token.attributes),
-  };
-}
-
-function parseImageDimensions(attributes: Record<string, string>): MarkdownImageDimensions {
-  return {
-    ...parseImageDimension("width", attributes.width),
-    ...parseImageDimension("height", attributes.height),
-  };
-}
-
-function parseImageDimension(key: "width" | "height", value: string | undefined) {
-  if (!value || !/^\d+(?:\.\d+)?$/.test(value)) {
-    return {};
-  }
-
-  const parsed = Number(value);
-  return Number.isFinite(parsed) && parsed > 0 ? { [key]: parsed } : {};
-}
-
-function safeHref(href: string | undefined): string | undefined {
-  if (!href || href === "#" || !SAFE_LINK_HREF_RE.test(href)) {
-    return undefined;
-  }
-  return href;
-}
-
-function getSingleImageChild(tokens: HtmlToken[]): HtmlTagToken | null {
-  const visible = tokens.filter((token) => token.kind !== "comment" && !isWhitespaceText(token));
-  return visible.length === 1 && isOpenTag(visible[0], "img") ? visible[0] : null;
-}
-
-function renderUnknownTag(token: HtmlTagToken): string {
-  if (token.name === "script" || token.name === "style") {
-    return "";
-  }
-  return token.raw;
-}
-
-function escapeMarkdownImageAlt(value: string): string {
-  return value.replace(/]/g, "\\]");
-}
-
-function findNextOpenTag(tokens: HtmlToken[], start: number, name: string): number | null {
-  for (let index = start; index < tokens.length; index += 1) {
-    if (isOpenTag(tokens[index], name)) {
-      return index;
-    }
-  }
-  return null;
-}
-
-function findMatchingClose(tokens: HtmlToken[], openIndex: number, name: string): number | null {
-  let depth = 1;
-  for (let index = openIndex + 1; index < tokens.length; index += 1) {
-    const token = tokens[index];
-    if (isOpenTag(token, name) && !token.selfClosing) {
-      depth += 1;
-      continue;
-    }
-    if (isClosingTag(token, name)) {
-      depth -= 1;
-      if (depth === 0) {
-        return index;
-      }
-    }
-  }
-  return null;
-}
-
-function isOpenTag(token: HtmlToken | undefined, name: string): token is HtmlTagToken {
-  return token?.kind === "tag" && token.name === name && !token.closing;
-}
-
-function isClosingTag(token: HtmlToken | undefined, name: string): token is HtmlTagToken {
-  return token?.kind === "tag" && token.name === name && token.closing;
-}
-
-function isHeadingTag(token: HtmlToken | undefined): token is HtmlTagToken {
-  return token?.kind === "tag" && isHeadingTagName(token.name) && !token.closing;
-}
-
-function isHeadingTagName(name: string): boolean {
-  return (
-    name === "h1" ||
-    name === "h2" ||
-    name === "h3" ||
-    name === "h4" ||
-    name === "h5" ||
-    name === "h6"
-  );
-}
-
-function isWhitespaceText(token: HtmlToken): boolean {
-  return token.kind === "text" && token.value.trim() === "";
-}
-
-function tokenizeHtmlishMarkdown(source: string): HtmlToken[] {
-  const protectedRanges = getProtectedMarkdownRanges(source);
-  const tokens: HtmlToken[] = [];
-  const parser = createHtmlishTokenParser(source, tokens);
-  let cursor = 0;
-
-  for (const range of protectedRanges) {
-    parser.write(source.slice(cursor, range.start));
-    tokens.push({ kind: "text", value: source.slice(range.start, range.end) });
-    parser.skip(range.end - range.start);
-    cursor = range.end;
-  }
-
-  parser.write(source.slice(cursor));
-  parser.end();
-  return tokens;
-}
-
-function createHtmlishTokenParser(source: string, tokens: HtmlToken[]): HtmlishTokenParser {
-  let stripNextLeadingLineBreak = false;
-  let skippedLength = 0;
-  let writtenLength = 0;
-  let chunkStart = 0;
-  let parser!: Parser;
-  // Unknown tags render as text, so keep them as written: the parser lowercases names
-  // and rewrites attributes. A tag split by a protected range has no single slice.
-  const readRawTag = (): string | null =>
-    parser.startIndex < chunkStart
-      ? null
-      : source.slice(parser.startIndex + skippedLength, parser.endIndex + 1 + skippedLength);
-  parser = new Parser(
-    {
-      onopentag(name, attributes, isImplied) {
-        if (isImplied) {
-          return;
-        }
-        const selfClosing = VOID_HTML_TAGS.has(name);
-        tokens.push({
-          kind: "tag",
-          name,
-          closing: false,
-          selfClosing,
-          attributes,
-          raw: readRawTag() ?? renderStartTag(name, attributes),
-        });
-      },
-      onclosetag(name, isImplied) {
-        if (isImplied || VOID_HTML_TAGS.has(name)) {
-          return;
-        }
-        tokens.push({
-          kind: "tag",
-          name,
-          closing: true,
-          selfClosing: false,
-          attributes: {},
-          raw: readRawTag() ?? `</${name}>`,
-        });
-      },
-      ontext(value) {
-        if (stripNextLeadingLineBreak) {
-          stripNextLeadingLineBreak = false;
-          value = stripLeadingLineBreak(value);
-        }
-        if (!value) {
-          return;
-        }
-        tokens.push({ kind: "text", value });
-      },
-      oncomment() {
-        stripNextLeadingLineBreak = isLineStart(source, parser.startIndex + skippedLength);
-        tokens.push({ kind: "comment" });
-      },
-    },
-    {
-      decodeEntities: false,
-      lowerCaseAttributeNames: true,
-      lowerCaseTags: true,
-      recognizeSelfClosing: true,
-    },
-  );
-  return {
-    write(chunk) {
-      chunkStart = writtenLength;
-      writtenLength += chunk.length;
-      parser.write(chunk);
-    },
-    skip(length) {
-      skippedLength += length;
-    },
-    end() {
-      parser.end();
-    },
-  };
-}
-
-function isLineStart(source: string, index: number): boolean {
-  return index === 0 || source[index - 1] === "\n" || source[index - 1] === "\r";
-}
-
-function stripLeadingLineBreak(value: string): string {
-  if (value.startsWith("\r\n")) {
-    return value.slice(2);
-  }
-  if (value.startsWith("\n") || value.startsWith("\r")) {
-    return value.slice(1);
-  }
-  return value;
-}
-
-function renderStartTag(name: string, attributes: Record<string, string>): string {
-  const renderedAttributes = Object.entries(attributes)
-    .map(([key, value]) => (value === "" ? ` ${key}` : ` ${key}="${escapeAttribute(value)}"`))
-    .join("");
-  return `<${name}${renderedAttributes}>`;
-}
-
-function escapeAttribute(value: string): string {
-  return value.replaceAll("&", "&amp;").replaceAll('"', "&quot;");
-}
-
-function getProtectedMarkdownRanges(source: string): ProtectedMarkdownRange[] {
-  const fencedRanges = getFencedCodeRanges(source);
-  const codeRanges = mergeProtectedRanges([
-    ...fencedRanges,
-    ...getInlineCodeRanges(source, fencedRanges),
-  ]);
-  return mergeProtectedRanges([...codeRanges, ...getLiteralAngleBracketRanges(source, codeRanges)]);
-}
-
-/**
- * htmlparser2 reads any `<` followed by a letter as a tag and keeps collecting attributes up
- * to the next `>`, so `1<n<2` in a table cell swallows the rows after it and an autolink loses
- * its slashes. Hand it only what CommonMark would read as raw HTML; every other `<` is text.
- */
-function getLiteralAngleBracketRanges(
-  source: string,
-  codeRanges: ProtectedMarkdownRange[],
-): ProtectedMarkdownRange[] {
-  const ranges: ProtectedMarkdownRange[] = [];
-  let codeIndex = 0;
-  // Reused across comment openers so unclosed comments stay linear.
-  let commentClose = -1;
-  let index = source.indexOf("<");
-
-  while (index !== -1) {
-    while ((codeRanges[codeIndex]?.end ?? Infinity) <= index) {
-      codeIndex += 1;
-    }
-    const code = codeRanges[codeIndex];
-    if (code && code.start <= index) {
-      index = source.indexOf("<", code.end);
-      continue;
-    }
-
-    let htmlEnd: number | null;
-    if (source.startsWith("<!--", index)) {
-      if (commentClose !== source.length && commentClose < index + 2) {
-        const close = source.indexOf("-->", index + 2);
-        commentClose = close === -1 ? source.length : close;
-      }
-      htmlEnd = commentClose === source.length ? null : commentClose + 3;
-    } else {
-      HTML_TAG_RE.lastIndex = index;
-      htmlEnd = HTML_TAG_RE.test(source) ? HTML_TAG_RE.lastIndex : null;
-    }
-
-    if (htmlEnd === null) {
-      ranges.push({ start: index, end: index + 1 });
-      htmlEnd = index + 1;
-    }
-    index = source.indexOf("<", htmlEnd);
-  }
-
-  return ranges;
-}
-
-function getFencedCodeRanges(source: string): ProtectedMarkdownRange[] {
-  const ranges: ProtectedMarkdownRange[] = [];
-  FENCE_LINE_RE.lastIndex = 0;
-
-  while (true) {
-    const open = FENCE_LINE_RE.exec(source);
-    if (!open) {
-      return ranges;
-    }
-
-    const marker = open[1];
-    if (!marker) {
-      continue;
-    }
-
-    const close = findClosingFence(source, FENCE_LINE_RE.lastIndex, marker);
-    if (!close) {
-      ranges.push({ start: open.index, end: source.length });
-      return ranges;
-    }
-
-    ranges.push({ start: open.index, end: close.end });
-    FENCE_LINE_RE.lastIndex = close.end;
-  }
-}
-
-function findClosingFence(
-  source: string,
-  start: number,
-  marker: string,
-): MarkdownDelimiterMatch | null {
-  const closeRe = new RegExp(
-    `^ {0,3}[${marker[0]}]{${marker.length},}[^\\n\\r]*(?:\\r?\\n|$)`,
-    "gm",
-  );
-  closeRe.lastIndex = start;
-  const close = closeRe.exec(source);
-  return close ? { index: close.index, end: closeRe.lastIndex } : null;
-}
-
-function getInlineCodeRanges(
-  source: string,
-  fencedRanges: ProtectedMarkdownRange[],
-): ProtectedMarkdownRange[] {
-  const ranges: ProtectedMarkdownRange[] = [];
-  BACKTICK_RUN_RE.lastIndex = 0;
-
-  while (true) {
-    const open = BACKTICK_RUN_RE.exec(source);
-    if (!open) {
-      return ranges;
-    }
-    if (isProtectedIndex(open.index, fencedRanges)) {
-      continue;
-    }
-
-    const marker = open[0];
-    const afterOpen = BACKTICK_RUN_RE.lastIndex;
-    const close = findClosingBacktickRun(source, afterOpen, marker, fencedRanges);
-    if (!close) {
-      // Unmatched backtick run — skip past it so the loop doesn't restart from 0.
-      // findClosingBacktickRun exhausts the global regex, which resets lastIndex
-      // to 0 when exec() returns null (ECMAScript §22.2.7.2).
-      BACKTICK_RUN_RE.lastIndex = afterOpen;
-      continue;
-    }
-
-    ranges.push({ start: open.index, end: close.end });
-    BACKTICK_RUN_RE.lastIndex = close.end;
-  }
-}
-
-function findClosingBacktickRun(
-  source: string,
-  start: number,
-  marker: string,
-  fencedRanges: ProtectedMarkdownRange[],
-): MarkdownDelimiterMatch | null {
-  BACKTICK_RUN_RE.lastIndex = start;
-
-  while (true) {
-    const close = BACKTICK_RUN_RE.exec(source);
-    if (!close) {
-      return null;
-    }
-    if (close[0] === marker && !isProtectedIndex(close.index, fencedRanges)) {
-      return { index: close.index, end: BACKTICK_RUN_RE.lastIndex };
-    }
-  }
-}
-
-function mergeProtectedRanges(ranges: ProtectedMarkdownRange[]): ProtectedMarkdownRange[] {
-  const sorted = [...ranges].sort((a, b) => a.start - b.start);
-  const merged: ProtectedMarkdownRange[] = [];
-
-  for (const range of sorted) {
-    const previous = merged.at(-1);
-    if (!previous || range.start > previous.end) {
-      merged.push({ ...range });
-      continue;
-    }
-    previous.end = Math.max(previous.end, range.end);
-  }
-
-  return merged;
-}
-
-function isProtectedIndex(index: number, ranges: ProtectedMarkdownRange[]): boolean {
-  return ranges.some((range) => index >= range.start && index < range.end);
-}
-
-export function normalizeHtmlishMarkdown(source: string): string {
-  return renderInlineTokens(tokenizeHtmlishMarkdown(source));
-}
diff --git a/packages/app/src/components/markdown/html.ts b/packages/app/src/components/markdown/html.ts
new file mode 100644
index 0000000000..a370372c26
--- /dev/null
+++ b/packages/app/src/components/markdown/html.ts
@@ -0,0 +1,179 @@
+import { Parser } from "htmlparser2";
+import { fromMarkdown } from "mdast-util-from-markdown";
+import { decodeString } from "micromark-util-decode-string";
+import type { Nodes } from "mdast";
+
+const ATTRIBUTE = String.raw`\s+[A-Za-z_:][\w.:-]*(?:\s*=\s*(?:[^\s"'=<>\x60]+|'[^']*'|"[^"]*"))?`;
+const TAG = String.raw`<(?:[A-Za-z][A-Za-z0-9-]*(?:${ATTRIBUTE})*\s*\/?|\/[A-Za-z][A-Za-z0-9-]*\s*)>`;
+const HTML = new RegExp(
+  String.raw`(?<!\\)(?:<!--[\s\S]*?-->|<code\b[^>]*>[\s\S]*?<\/code\s*>|<summary\b[^>]*>[\s\S]*?<\/summary\s*>|${TAG})`,
+  "gi",
+);
+const BLOCK_TAGS = new Set([
+  "div",
+  "p",
+  "table",
+  "tr",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+  "section",
+  "article",
+  "ul",
+  "ol",
+  "li",
+  "blockquote",
+  "pre",
+]);
+const EMPHASIS: Readonly<Record<string, string>> = { b: "**", strong: "**", i: "*", em: "*" };
+
+/** Convert comment HTML to Markdown while preserving the original spelling of code. */
+export function normalizeMarkdownHtml(source: string): string {
+  if (!source.includes("<")) return source;
+  const htmlRanges: { start: number; end: number }[] = [];
+  function findHtml(node: Nodes) {
+    if (node.type === "html" && node.position) {
+      htmlRanges.push({ start: node.position.start.offset!, end: node.position.end.offset! });
+    } else if ("children" in node) node.children.forEach(findHtml);
+  }
+  findHtml(fromMarkdown(source));
+  const codeRanges: { start: number; end: number }[] = [];
+  // Disable HTML parsing so code inside <details> remains visible to the Markdown parser.
+  const tree = fromMarkdown(source, {
+    extensions: [{ disable: { null: ["htmlFlow", "htmlText"] } }],
+  });
+  function protectCode(node: Nodes) {
+    if (node.type === "code" || node.type === "inlineCode") {
+      const start = node.position?.start.offset;
+      const end = node.position?.end.offset;
+      if (start !== undefined && end !== undefined) codeRanges.push({ start, end });
+    } else if ("children" in node) node.children.forEach(protectCode);
+  }
+  protectCode(tree);
+  const links: (string | undefined)[] = [];
+  let previousTag: { name: string; end: number } | null = null;
+  const convert = (raw: string, offset: number): string => {
+    if (codeRanges.some(({ start, end }) => offset >= start && offset < end)) return raw;
+    if (raw.startsWith("<!--")) return "";
+    const summary = /^<summary\b[^>]*>([\s\S]*?)<\/summary\s*>$/i.exec(raw);
+    if (summary) {
+      const title = normalizeMarkdownHtml(summary[1]).trim();
+      // A summary is one bold paragraph, even when its HTML title uses headings
+      // or several block wrappers. Slice AST blocks so inline code stays literal.
+      const inline = fromMarkdown(title)
+        .children.map(({ position }) => title.slice(position!.start.offset!, position!.end.offset!))
+        .join(" ");
+      return `**${inline}**\n\n`;
+    }
+    const code = /^<code\b[^>]*>([\s\S]*?)<\/code\s*>$/i.exec(raw);
+    if (code)
+      return inlineCode(
+        code[1].replace(/&(?:#(?:[xX][\da-fA-F]+|\d+)|[a-zA-Z][a-zA-Z\d]+);/g, (entity) =>
+          decodeString(entity),
+        ),
+      );
+    const closing = raw.startsWith("</");
+    const name = /^<\/?([\w-]+)/.exec(raw)?.[1].toLowerCase() ?? "";
+    // Each gap is inspected once, rather than searching the complete prefix
+    // for a preceding tag on every table row or nested block.
+    const startsAfterBoundary = previousTag
+      ? BLOCK_TAGS.has(previousTag.name) && /^\s*$/.test(source.slice(previousTag.end, offset))
+      : /^\s*$/.test(source.slice(0, offset));
+    previousTag = { name, end: offset + raw.length };
+    if (EMPHASIS[name]) return EMPHASIS[name];
+    const boundary = layoutBoundary(name, source, raw, offset, closing, startsAfterBoundary);
+    if (boundary !== null) return boundary;
+    if (name === "a") return markdownAnchor(raw, closing, links);
+    if (name === "img" && !closing) {
+      const { src, alt = "" } = attributes(raw);
+      return src ? `![${alt.replace(/[[\]\\]/g, "\\$&")}](<${markdownUrl(src)}>)` : alt;
+    }
+    return "";
+  };
+  let result = "";
+  let cursor = 0;
+  for (const range of htmlRanges) {
+    if (range.start < cursor) continue;
+    result += source.slice(cursor, range.start);
+    // Inline HTML code has separate opening/closing AST nodes. Convert the pair
+    // together so its contents keep backslashes and get a safe backtick delimiter.
+    const paired = /^<(code|summary)\b[^>]*>[\s\S]*?<\/\1\s*>/i.exec(source.slice(range.start));
+    const end = paired ? Math.max(range.end, range.start + paired[0].length) : range.end;
+    result += source
+      .slice(range.start, end)
+      .replace(HTML, (raw, offset) => convert(raw, range.start + offset));
+    cursor = end;
+  }
+  return result + source.slice(cursor);
+}
+
+function attributes(tag: string): Record<string, string> {
+  let result: Record<string, string> = {};
+  const parser = new Parser({
+    onopentag: (_name, value) => {
+      result = value;
+    },
+  });
+  parser.end(tag);
+  return result;
+}
+
+function markdownUrl(url: string): string {
+  return url.replace(/[<>\r\n]/g, (character) => encodeURIComponent(character));
+}
+
+function inlineCode(content: string): string {
+  const runs = content.match(/`+/g) ?? [];
+  const marker = "`".repeat(Math.max(0, ...runs.map((run) => run.length)) + 1);
+  const padding = content.startsWith("`") || content.endsWith("`") ? " " : "";
+  return `${marker}${padding}${content}${padding}${marker}`;
+}
+
+function markdownAnchor(raw: string, closing: boolean, links: (string | undefined)[]): string {
+  if (closing) {
+    const href = links.pop();
+    return href === undefined ? "" : `](<${markdownUrl(href)}>)`;
+  }
+  const { href } = attributes(raw);
+  links.push(href);
+  return href === undefined ? "" : "[";
+}
+
+function blockBoundary(
+  source: string,
+  raw: string,
+  offset: number,
+  closing: boolean,
+  startsAfterBoundary: boolean,
+): string {
+  if (closing) {
+    const following = source.slice(offset + raw.length);
+    if (/^\s*$/.test(following) || following.startsWith("\n\n")) return "";
+    const nextClosingTag = /^\s*<\/([\w-]+)/.exec(following);
+    if (nextClosingTag && BLOCK_TAGS.has(nextClosingTag[1].toLowerCase())) return "";
+  } else if (startsAfterBoundary) {
+    return "";
+  }
+  return "\n\n";
+}
+
+function layoutBoundary(
+  name: string,
+  source: string,
+  raw: string,
+  offset: number,
+  closing: boolean,
+  startsAfterBoundary: boolean,
+): string | null {
+  if (name === "br") return closing ? "" : "  \n";
+  if (name === "summary") return closing ? "**\n\n" : "**";
+  if (name === "details")
+    return (closing ? offset + raw.length === source.length : offset === 0) ? "" : "\n\n";
+  if (BLOCK_TAGS.has(name)) return blockBoundary(source, raw, offset, closing, startsAfterBoundary);
+  if ((name === "td" || name === "th") && closing)
+    return /^<t[dh]\b/i.test(source.slice(offset + raw.length)) ? " " : "";
+  return null;
+}
diff --git a/packages/app/src/components/markdown/image-decoding.ts b/packages/app/src/components/markdown/image-decoding.ts
new file mode 100644
index 0000000000..efd1ad3521
--- /dev/null
+++ b/packages/app/src/components/markdown/image-decoding.ts
@@ -0,0 +1,34 @@
+type ImageDecoder = (
+  uri: string,
+  success: (width: number, height: number) => void,
+  failure: (error: unknown) => void,
+) => void;
+
+export function decodeMarkdownImage(uri: string, decode: ImageDecoder): Promise<true> {
+  return new Promise((resolve, reject) => {
+    decode(
+      uri,
+      (width, height) => {
+        if (width > 0 && height > 0) resolve(true);
+        else reject(new Error("Image has no decodable dimensions"));
+      },
+      reject,
+    );
+  });
+}
+
+interface MarkdownImageLoadState {
+  canAcquire: boolean;
+  url: string | undefined;
+  acquisitionFailed: boolean;
+  decodeFailed: boolean;
+  decoded: boolean;
+}
+
+export function getMarkdownImageStatus(
+  state: MarkdownImageLoadState,
+): "pending" | "ready" | "unavailable" {
+  const cannotResolve = !state.canAcquire && state.url === undefined;
+  if (cannotResolve || state.acquisitionFailed || state.decodeFailed) return "unavailable";
+  return state.decoded ? "ready" : "pending";
+}
diff --git a/packages/app/src/file-pane/markdown-preview/image-source.test.ts b/packages/app/src/components/markdown/image-source.test.ts
similarity index 69%
rename from packages/app/src/file-pane/markdown-preview/image-source.test.ts
rename to packages/app/src/components/markdown/image-source.test.ts
index 8277e57492..3605d7a13a 100644
--- a/packages/app/src/file-pane/markdown-preview/image-source.test.ts
+++ b/packages/app/src/components/markdown/image-source.test.ts
@@ -1,4 +1,9 @@
-import { describe, expect, it } from "vitest";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { prepareMarkdownSource } from "./source";
+import { resolveAssistantImageSource } from "@/utils/assistant-image-source";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
 
 import { resolveMarkdownFileDirectory, resolveMarkdownPreviewImageSource } from "./image-source";
 
@@ -163,3 +168,52 @@ describe("resolveMarkdownPreviewImageSource", () => {
     ).toBe("C:/Users/test/repo/images/hero.png");
   });
 });
+
+describe("local assistant Markdown images", () => {
+  let workspaceRoot: string;
+  const imageBytes = Buffer.from(
+    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==",
+    "base64",
+  );
+
+  beforeEach(async () => {
+    workspaceRoot = await mkdtemp(path.join(os.tmpdir(), "assistant-markdown-image-"));
+    await mkdir(path.join(workspaceRoot, "My Apps", "Мои"), { recursive: true });
+    await writeFile(path.join(workspaceRoot, "My Apps", "Мои", "test.png"), imageBytes);
+    await writeFile(path.join(workspaceRoot, "literal%20name.png"), imageBytes);
+  });
+
+  afterEach(async () => {
+    await rm(workspaceRoot, { recursive: true, force: true });
+  });
+
+  it.each([
+    "absolute angle",
+    "absolute encoded",
+    "relative angle",
+    "relative encoded",
+    "file URI",
+    "literal percent",
+  ])("reads the actual image for the %s destination", async (form) => {
+    const absolute = path.join(workspaceRoot, "My Apps", "Мои", "test.png");
+    const destinations: Record<string, string> = {
+      "absolute angle": `<${absolute}>`,
+      "absolute encoded": encodeURI(absolute),
+      "relative angle": "<My Apps/Мои/test.png>",
+      "relative encoded": encodeURI("My Apps/Мои/test.png"),
+      "file URI": `file://${encodeURI(absolute)}`,
+      "literal percent": `${workspaceRoot}/literal%2520name.png`,
+    };
+    const prepared = prepareMarkdownSource(`![test](${destinations[form]})`);
+    expect(prepared.images).toHaveLength(1);
+    const source = resolveMarkdownPreviewImageSource({
+      source: prepared.images[0]!.source,
+      markdownPath: "",
+      workspaceRoot,
+    })!;
+    const target = resolveAssistantImageSource({ source, workspaceRoot });
+    expect(target?.kind).toBe("file_rpc");
+    if (target?.kind !== "file_rpc") throw new Error("Expected a local image read target");
+    await expect(readFile(path.resolve(target.cwd, target.path))).resolves.toEqual(imageBytes);
+  });
+});
diff --git a/packages/app/src/file-pane/markdown-preview/image-source.ts b/packages/app/src/components/markdown/image-source.ts
similarity index 100%
rename from packages/app/src/file-pane/markdown-preview/image-source.ts
rename to packages/app/src/components/markdown/image-source.ts
diff --git a/packages/app/src/components/markdown/images.ts b/packages/app/src/components/markdown/images.ts
new file mode 100644
index 0000000000..83b24b481b
--- /dev/null
+++ b/packages/app/src/components/markdown/images.ts
@@ -0,0 +1,133 @@
+import { Image } from "react-native";
+import { isWeb } from "@/constants/platform";
+import { useMemo, useEffect, useId } from "react";
+import { useFetchQueries } from "@/data/query";
+import { createAssistantImageFileAcquisition } from "@/assistant-image/file-acquisition";
+import {
+  persistAttachmentFromBytes,
+  resolveAttachmentPreviewUrl,
+  releaseAttachmentPreviewUrl,
+} from "@/attachments/service";
+import { createAssistantImageAcquisitionCache } from "@/assistant-image/acquisition-cache";
+import { retainAttachmentForGarbageCollection } from "@/attachments/gc-retention";
+import { resolveAssistantImageSource } from "@/utils/assistant-image-source";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { AttachmentMetadata } from "@/attachments/types";
+import { resolveMarkdownPreviewImageSource } from "./image-source";
+import { prepareMarkdownSource } from "./source";
+import { decodeMarkdownImage, getMarkdownImageStatus } from "./image-decoding";
+
+const urls = createAssistantImageAcquisitionCache<{ uri: string; attachment: AttachmentMetadata }>({
+  capacity: 500,
+  onRetain: ({ uri, attachment }) => {
+    const release = retainAttachmentForGarbageCollection(attachment.id);
+    return () => {
+      release();
+      void releaseAttachmentPreviewUrl({ attachment, url: uri });
+    };
+  },
+});
+
+export interface MarkdownImageContext {
+  client?: Pick<DaemonClient, "readFile"> | null;
+  workspaceRoot?: string;
+  serverId?: string;
+  filePath?: string;
+}
+
+export function useMarkdownSource(text: string, context: MarkdownImageContext) {
+  const occurrenceKey = useId();
+  const prepared = useMemo(
+    () => prepareMarkdownSource(text, context.workspaceRoot, { supportsSvg: isWeb }),
+    [text, context.workspaceRoot],
+  );
+  const sources = [...new Set(prepared.images.map((image) => image.source))];
+  const acquisitions = sources.map((source) => {
+    const resolved = resolveMarkdownPreviewImageSource({
+      source,
+      markdownPath: context.filePath ?? "",
+      workspaceRoot: context.workspaceRoot,
+    });
+    return createAssistantImageFileAcquisition({
+      port: context.client
+        ? {
+            readFile: (cwd, path) => context.client!.readFile(cwd, path),
+            persist: persistAttachmentFromBytes,
+          }
+        : null,
+      resolution: resolved
+        ? resolveAssistantImageSource({ source: resolved, workspaceRoot: context.workspaceRoot })
+        : null,
+      serverId: context.serverId,
+      occurrenceKey,
+      unavailableMessage: "Image unavailable",
+    });
+  });
+  const results = useFetchQueries(
+    acquisitions.map((acquisition, index) => ({
+      queryKey: ["markdownImage", acquisition?.key ?? sources[index]],
+      enabled: acquisition !== null,
+      immutableWhen: () => true,
+      dataShape: "value",
+      gcTime: 0,
+      queryFn: async () => {
+        if (!acquisition) throw new Error("No image acquisition");
+        return urls.acquire(acquisition.key, async () => {
+          const attachment = await acquisition.locate();
+          const uri = await resolveAttachmentPreviewUrl(attachment);
+          return { attachment, uri };
+        });
+      },
+    })),
+  );
+  useEffect(() => {
+    const releases = results.flatMap((result, index) => {
+      const acquisition = acquisitions[index];
+      if (!result.data || !acquisition) return [];
+      const value = result.data;
+      return [urls.acquireRetained(acquisition.key, async () => value).release];
+    });
+    return () => releases.forEach((release) => release());
+  }, [results, acquisitions]);
+  const resolved = new Map<string, string>();
+  results.forEach((result, index) => {
+    if (result.data) resolved.set(sources[index]!, result.data.uri);
+  });
+  const displayUrls = sources.map(
+    (source) =>
+      resolved.get(source) ?? (/^(https?:|data:|blob:)/i.test(source) ? source : undefined),
+  );
+  const decoded = useFetchQueries(
+    displayUrls.map((uri, index) => ({
+      queryKey: ["markdownImageDecode", occurrenceKey, uri ?? sources[index]],
+      refetchOnReconnect: true,
+      enabled: uri !== undefined,
+      immutableWhen: () => true,
+      dataShape: "value",
+      gcTime: 0,
+      queryFn: () => {
+        if (!uri) throw new Error("No image URL to decode");
+        return decodeMarkdownImage(uri, Image.getSize);
+      },
+    })),
+  );
+  const statuses = sources.map((_source, index) =>
+    getMarkdownImageStatus({
+      canAcquire: acquisitions[index] !== null,
+      url: displayUrls[index],
+      acquisitionFailed: results[index].isError,
+      decodeFailed: decoded[index].isError,
+      decoded: decoded[index].data === true,
+    }),
+  );
+  const unavailableImages = new Set(
+    sources.filter((_source, index) => statuses[index] === "unavailable"),
+  );
+  const pendingImages = new Set(sources.filter((_source, index) => statuses[index] === "pending"));
+  return {
+    markdown: prepared.render(resolved, unavailableImages, pendingImages),
+    linkRecognition: prepared.linkRecognition,
+    linkSource: prepared.linkSource,
+    imageSources: Object.fromEntries([...resolved].map(([source, url]) => [url, source])),
+  };
+}
diff --git a/packages/app/src/components/markdown/inline-image-size.ts b/packages/app/src/components/markdown/inline-image-size.ts
deleted file mode 100644
index 8f83f80fcc..0000000000
--- a/packages/app/src/components/markdown/inline-image-size.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-export interface InlineImageDimensions {
-  width: number;
-  height: number;
-}
-
-export interface InlineImageExplicitDimensions {
-  width?: number;
-  height?: number;
-}
-
-const INLINE_IMAGE_MAX_WIDTH = 240;
-const INLINE_IMAGE_MAX_HEIGHT = 160;
-
-export function resolveInlineImageSize(input: {
-  explicit: InlineImageExplicitDimensions;
-  natural: InlineImageDimensions | null;
-}): InlineImageDimensions {
-  const dimensions = resolveInlineImageDimensions(input);
-  const scale = Math.min(
-    1,
-    INLINE_IMAGE_MAX_WIDTH / dimensions.width,
-    INLINE_IMAGE_MAX_HEIGHT / dimensions.height,
-  );
-
-  return {
-    width: Math.round(dimensions.width * scale),
-    height: Math.round(dimensions.height * scale),
-  };
-}
-
-function resolveInlineImageDimensions(input: {
-  explicit: InlineImageExplicitDimensions;
-  natural: InlineImageDimensions | null;
-}): InlineImageDimensions {
-  if (input.explicit.width && input.explicit.height) {
-    return { width: input.explicit.width, height: input.explicit.height };
-  }
-
-  if (input.explicit.width && input.natural) {
-    return {
-      width: input.explicit.width,
-      height: input.explicit.width * (input.natural.height / input.natural.width),
-    };
-  }
-
-  if (input.explicit.height && input.natural) {
-    return {
-      width: input.explicit.height * (input.natural.width / input.natural.height),
-      height: input.explicit.height,
-    };
-  }
-
-  if (input.explicit.width) {
-    return { width: input.explicit.width, height: input.explicit.width };
-  }
-
-  if (input.explicit.height) {
-    return { width: input.explicit.height, height: input.explicit.height };
-  }
-
-  return input.natural ?? { width: INLINE_IMAGE_MAX_WIDTH, height: INLINE_IMAGE_MAX_HEIGHT };
-}
diff --git a/packages/app/src/components/markdown/link-children.ts b/packages/app/src/components/markdown/link-children.ts
deleted file mode 100644
index 9a81042c86..0000000000
--- a/packages/app/src/components/markdown/link-children.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Children, cloneElement, isValidElement, type ReactNode } from "react";
-import type { StyleProp, TextStyle } from "react-native";
-
-export function colorMarkdownLinkChildren(
-  children: ReactNode,
-  color: TextStyle["color"],
-): ReactNode {
-  return Children.map(children, (child) => {
-    if (!isValidElement<{ style?: StyleProp<TextStyle> }>(child)) return child;
-    return cloneElement(child, { style: [child.props.style, { color }] });
-  });
-}
-
-const MARKDOWN_LINK_HOVER_STYLE: TextStyle = { textDecorationLine: "underline" };
-
-export function markdownLinkTextStyle(
-  style: StyleProp<TextStyle>,
-  hovered: boolean,
-): StyleProp<TextStyle> {
-  return [style, hovered && MARKDOWN_LINK_HOVER_STYLE];
-}
diff --git a/packages/app/src/components/markdown/link-text.tsx b/packages/app/src/components/markdown/link-text.tsx
deleted file mode 100644
index 18b1b6c93b..0000000000
--- a/packages/app/src/components/markdown/link-text.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useMemo, useState, type ReactNode } from "react";
-import { Pressable, Text, type StyleProp, type TextStyle } from "react-native";
-import { useStableEvent } from "@/hooks/use-stable-event";
-import { markdownLinkTextStyle } from "./link-children";
-
-interface MarkdownLinkTextProps {
-  style: StyleProp<TextStyle>;
-  dataSet?: Record<string, string>;
-  onPress(): void;
-  onHoverIn?(): void;
-  children?: ReactNode;
-}
-
-export function MarkdownLinkText({
-  style,
-  dataSet,
-  onPress,
-  onHoverIn,
-  children,
-}: MarkdownLinkTextProps) {
-  const [hovered, setHovered] = useState(false);
-  const handleHoverIn = useStableEvent(() => {
-    setHovered(true);
-    onHoverIn?.();
-  });
-  const handleHoverOut = useStableEvent(() => setHovered(false));
-  const textStyle = useMemo(() => markdownLinkTextStyle(style, hovered), [hovered, style]);
-
-  return (
-    <Pressable
-      accessibilityRole="link"
-      onPress={onPress}
-      onHoverIn={handleHoverIn}
-      onHoverOut={handleHoverOut}
-    >
-      <Text dataSet={dataSet} style={textStyle}>
-        {children}
-      </Text>
-    </Pressable>
-  );
-}
diff --git a/packages/app/src/components/markdown/part-groups.test.ts b/packages/app/src/components/markdown/part-groups.test.ts
deleted file mode 100644
index 3b2b54e044..0000000000
--- a/packages/app/src/components/markdown/part-groups.test.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { describe, expect, it } from "vitest";
-import type { MarkdownDisplayPart } from "./html-ish";
-import { groupMarkdownParts } from "./part-groups";
-
-describe("groupMarkdownParts", () => {
-  const flowImage: MarkdownDisplayPart = {
-    kind: "inlineImage",
-    alt: "Priority",
-    src: "https://example.com/priority.svg",
-    flowsWithText: true,
-  };
-
-  it("flows an image with the lead paragraph and keeps later paragraphs full width", () => {
-    expect(
-      groupMarkdownParts([
-        flowImage,
-        { kind: "markdown", text: " **Title line**\n\nSecond paragraph." },
-      ]),
-    ).toEqual([
-      {
-        kind: "imageText",
-        images: [flowImage],
-        lead: "**Title line**",
-        rest: "Second paragraph.",
-      },
-    ]);
-  });
-
-  it("flows an image with a single-paragraph text", () => {
-    expect(groupMarkdownParts([flowImage, { kind: "markdown", text: " Only line" }])).toEqual([
-      { kind: "imageText", images: [flowImage], lead: "Only line", rest: "" },
-    ]);
-  });
-
-  it("groups two consecutive flowing images with the lead paragraph", () => {
-    const secondImage: MarkdownDisplayPart = {
-      kind: "inlineImage",
-      alt: "Severity",
-      src: "https://example.com/severity.svg",
-      flowsWithText: true,
-    };
-
-    expect(
-      groupMarkdownParts([
-        flowImage,
-        { kind: "markdown", text: " " },
-        secondImage,
-        { kind: "markdown", text: " **Title text here**\n\nBody paragraph." },
-      ]),
-    ).toEqual([
-      {
-        kind: "imageText",
-        images: [flowImage, secondImage],
-        lead: "**Title text here**",
-        rest: "Body paragraph.",
-      },
-    ]);
-  });
-
-  it("keeps standalone images as plain parts", () => {
-    const image: MarkdownDisplayPart = {
-      kind: "inlineImage",
-      alt: "Shot",
-      src: "https://example.com/shot.png",
-    };
-
-    expect(groupMarkdownParts([image, { kind: "markdown", text: "\n\nCaption" }])).toEqual([
-      { kind: "part", part: image },
-      { kind: "part", part: { kind: "markdown", text: "\n\nCaption" } },
-    ]);
-  });
-
-  it("keeps a flowing image alone when no markdown follows", () => {
-    expect(groupMarkdownParts([flowImage])).toEqual([{ kind: "part", part: flowImage }]);
-  });
-
-  it("keeps a flowing image alone when the following markdown starts with a blank line", () => {
-    expect(groupMarkdownParts([flowImage, { kind: "markdown", text: "\n\nBelow" }])).toEqual([
-      { kind: "part", part: flowImage },
-      { kind: "part", part: { kind: "markdown", text: "\n\nBelow" } },
-    ]);
-  });
-
-  it("passes other part kinds through unchanged", () => {
-    const details: MarkdownDisplayPart = { kind: "details", summary: "More", body: "Body" };
-
-    expect(groupMarkdownParts([{ kind: "markdown", text: "Intro" }, details])).toEqual([
-      { kind: "part", part: { kind: "markdown", text: "Intro" } },
-      { kind: "part", part: details },
-    ]);
-  });
-});
diff --git a/packages/app/src/components/markdown/part-groups.ts b/packages/app/src/components/markdown/part-groups.ts
deleted file mode 100644
index 016152fb00..0000000000
--- a/packages/app/src/components/markdown/part-groups.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import type { MarkdownDisplayPart, MarkdownInlineImagePart } from "./html-ish";
-
-export type MarkdownPartGroup =
-  | { kind: "part"; part: MarkdownDisplayPart }
-  | { kind: "imageText"; images: MarkdownInlineImagePart[]; lead: string; rest: string };
-
-/**
- * Pairs a run of inline images that flow with text (small status images at the
- * start of a line, GitHub-style) with the lead paragraph of the following
- * markdown part, so the renderer can lay them out side by side instead of
- * stacking the images as their own blocks.
- *
- * Between consecutive flowing images the parser may emit whitespace-only
- * markdown parts — these are consumed and discarded when building the group.
- */
-export function groupMarkdownParts(parts: readonly MarkdownDisplayPart[]): MarkdownPartGroup[] {
-  const groups: MarkdownPartGroup[] = [];
-  let index = 0;
-
-  while (index < parts.length) {
-    const part = parts[index];
-
-    if (part.kind === "inlineImage" && part.flowsWithText) {
-      // Collect the maximal run of flowing images, skipping whitespace-only markdown between them.
-      const images: MarkdownInlineImagePart[] = [part];
-      let lookahead = index + 1;
-
-      while (lookahead < parts.length) {
-        const candidate = parts[lookahead];
-        if (candidate === undefined) {
-          break;
-        }
-        if (isWhitespaceOnlyMarkdown(candidate)) {
-          lookahead += 1;
-          continue;
-        }
-        if (candidate.kind === "inlineImage" && candidate.flowsWithText) {
-          images.push(candidate);
-          lookahead += 1;
-          continue;
-        }
-        break;
-      }
-
-      const trailing = parts[lookahead];
-      if (trailing?.kind === "markdown") {
-        const { lead, rest } = splitLeadParagraph(trailing.text);
-        if (lead) {
-          groups.push({ kind: "imageText", images, lead, rest });
-          index = lookahead + 1;
-          continue;
-        }
-      }
-
-      // No usable lead — emit the images (and any whitespace parts) as plain parts.
-      for (let i = index; i < lookahead; i += 1) {
-        const p = parts[i];
-        if (p !== undefined) {
-          groups.push({ kind: "part", part: p });
-        }
-      }
-      index = lookahead;
-      continue;
-    }
-
-    groups.push({ kind: "part", part });
-    index += 1;
-  }
-
-  return groups;
-}
-
-function isWhitespaceOnlyMarkdown(part: MarkdownDisplayPart): boolean {
-  return part.kind === "markdown" && part.text.trim() === "";
-}
-
-function splitLeadParagraph(text: string): { lead: string; rest: string } {
-  if (/^[ \t]*\r?\n/.test(text)) {
-    return { lead: "", rest: text };
-  }
-  const boundary = /\r?\n[ \t]*\r?\n/.exec(text);
-  if (!boundary) {
-    return { lead: text.trim(), rest: "" };
-  }
-  return {
-    lead: text.slice(0, boundary.index).trim(),
-    rest: text.slice(boundary.index + boundary[0].length),
-  };
-}
diff --git a/packages/app/src/components/markdown/renderer.test.ts b/packages/app/src/components/markdown/renderer.test.ts
index 2dcab5c327..218cdc8884 100644
--- a/packages/app/src/components/markdown/renderer.test.ts
+++ b/packages/app/src/components/markdown/renderer.test.ts
@@ -1,99 +1,563 @@
-/**
- * @vitest-environment jsdom
- */
-import * as React from "react";
-import { createElement, type ReactNode } from "react";
-import { fireEvent, render } from "@testing-library/react";
-import { Text, type StyleProp, type TextStyle } from "react-native";
-import { describe, expect, it, vi } from "vitest";
-import { resolveInlineImageSize } from "./inline-image-size";
-import { colorMarkdownLinkChildren } from "./link-children";
-import { MarkdownLinkText } from "./link-text";
+import { fromMarkdown } from "mdast-util-from-markdown";
+import { toNativeLinkRecognition } from "react-native-enriched-markdown/src/utils/regexParser";
+import { QueryClient } from "@tanstack/react-query";
+import { decodeMarkdownImage, getMarkdownImageStatus } from "./image-decoding";
+import { describe, expect, it } from "vitest";
+import { darkTheme, lightTheme } from "@/styles/theme";
+import { createMarkdownStyles } from "./styles";
+import { prepareMarkdownSource, PENDING_MARKDOWN_IMAGE } from "./source";
+import { normalizeMarkdownHtml } from "./html";
 
-vi.stubGlobal("React", React);
+describe("shared Markdown source adaptation", () => {
+  it("keeps paragraphs, fences and quotes together for the library", () => {
+    const source = "First paragraph.\n\nSecond paragraph.\n\n```ts\nconst n = 1;\n```\n\n> Quote";
+    expect(prepareMarkdownSource(source).render()).toBe(source);
+  });
+  it("resolves workspace images without rewriting code or remote image URLs", () => {
+    const source =
+      "![Local](assets/a.png)\n\n![Remote](https://example.com/a.png)\n\n```md\n![Code](assets/a.png)\n```";
+    const prepared = prepareMarkdownSource(source);
+    expect(prepared.images.map((image) => image.source)).toEqual([
+      "assets/a.png",
+      "https://example.com/a.png",
+    ]);
+    expect(prepared.render(new Map([["assets/a.png", "blob:cached"]]))).toBe(
+      "![Local](<blob:cached>)\n\n![Remote](https://example.com/a.png)\n\n```md\n![Code](assets/a.png)\n```",
+    );
+  });
+  it("resolves reference images and images nested in lists and quotes", () => {
+    const prepared = prepareMarkdownSource("> - ![Image][picture]\n\n[picture]: ../a.png");
+    expect(prepared.render(new Map([["../a.png", "file:///cache/a.png"]]))).toBe(
+      "> - ![Image](<file:///cache/a.png>)\n\n[picture]: ../a.png",
+    );
+  });
+  it("escapes spoiler delimiters only in prose", () => {
+    expect(prepareMarkdownSource("Show ||words|| and `||code||`.").render()).toBe(
+      "Show \\|\\|words\\|\\| and `||code||`.",
+    );
+  });
+});
 
-vi.mock("react-native", () => ({
-  Pressable: ({
-    accessibilityRole,
-    children,
-    onHoverIn,
-    onHoverOut,
-    onPress,
-  }: {
-    accessibilityRole?: string;
-    children?: ReactNode;
-    onHoverIn?(): void;
-    onHoverOut?(): void;
-    onPress?(): void;
-  }) =>
-    createElement(
-      "div",
-      {
-        role: accessibilityRole,
-        onClick: onPress,
-        onMouseEnter: onHoverIn,
-        onMouseLeave: onHoverOut,
+it("preserves named and numeric entities as literal rendered text", () => {
+  expect(prepareMarkdownSource("AT&amp;T &#x1F600; &#35; heading and `&amp;`").render()).toBe(
+    "AT\\&T 😀 \\# heading and `&amp;`",
+  );
+});
+
+it("preserves empty table cells while escaping spoilers in cell text", () => {
+  const source = "| A || B |\n| --- | --- | --- |\n| x || z |";
+  expect(prepareMarkdownSource(source).render()).toBe(
+    "| A | | B |\n| --- | --- | --- |\n| x | | z |",
+  );
+});
+
+it.each([
+  "src/components/message.tsx",
+  "C:\\repo\\file.ts",
+  "docs/说明.md",
+  "my%20file.ts",
+  "src/file.ts:10-20",
+  "src/file.ts(10,2)",
+])("recognizes inline paths through the file resolver: %s", (path) => {
+  const prepared = prepareMarkdownSource(`Open \`${path}\`.`);
+  expect(prepared.linkRecognition.inlineCode?.test(path)).toBe(true);
+  expect(prepared.linkSource(path, "inline-code")).toEqual({
+    href: path,
+    text: path,
+    sourceType: "inline-code",
+  });
+});
+
+it("recognizes bare Unicode filenames and preserves inline-code URLs", () => {
+  const prepared = prepareMarkdownSource("Read 说明.md, or `https://example.com`.");
+  expect([..."说明.md,".matchAll(prepared.linkRecognition.text)].map(([text]) => text)).toEqual([
+    "说明.md",
+  ]);
+  expect(prepared.linkRecognition.inlineCode?.test("https://example.com")).toBe(true);
+});
+
+it("keeps explicit and inline-code links distinct when their URL strings match", () => {
+  const url = "/tmp/my%20file.ts";
+  const prepared = prepareMarkdownSource(`[open](${url}) and \`${url}\``);
+  expect(prepared.linkSource(url, "markdown")).toEqual({ href: url, text: url });
+  expect(prepared.linkSource(url, "inline-code")).toEqual({
+    href: url,
+    text: url,
+    sourceType: "inline-code",
+  });
+});
+
+it("extracts only Mermaid fences for the native diagram host", async () => {
+  const { splitMermaidFences } = await import("./fence/mermaid/segments");
+  const source =
+    "First.\n\n```ts\nconst n = 1;\n```\n\n```mermaid\ngraph TD\nA-->B\n```\n\n> Last.";
+  expect(splitMermaidFences(source)).toEqual([
+    { kind: "markdown", id: "0", source: "First.\n\n```ts\nconst n = 1;\n```\n\n" },
+    { kind: "mermaid", id: "1", source: "graph TD\nA-->B" },
+    { kind: "markdown", id: "2", source: "\n\n> Last." },
+  ]);
+  expect(splitMermaidFences("```md\n```mermaid\n```")).toEqual([
+    { kind: "markdown", id: "0", source: "```md\n```mermaid\n```" },
+  ]);
+});
+
+it("keeps reference links available across native Mermaid boundaries", async () => {
+  const { splitMermaidFences } = await import("./fence/mermaid/segments");
+  const parts = splitMermaidFences(
+    "[Before][file]\n\n```mermaid\ngraph TD\nA-->B\n```\n\n[After][file]\n\n[file]: src/file.ts",
+  );
+  for (const part of parts.filter((candidate) => candidate.kind === "markdown"))
+    expect(part.source).toContain("[file]: <src/file.ts>");
+});
+
+it("recognizes mixed-case Mermaid fence info and incomplete streaming fences", async () => {
+  const { splitMermaidFences } = await import("./fence/mermaid/segments");
+  expect(splitMermaidFences("```Mermaid title\ngraph TD\nA-->B")).toEqual([
+    { kind: "mermaid", id: "0", source: "graph TD\nA-->B" },
+  ]);
+});
+
+it("carries reference definitions nested in quotes across a diagram", async () => {
+  const { splitMermaidFences } = await import("./fence/mermaid/segments");
+  const parts = splitMermaidFences(
+    "[open][file]\n\n```mermaid\ngraph TD\nA-->B\n```\n\n> [file]: src/file.ts",
+  );
+  expect(parts[0].source).toContain("[file]: <src/file.ts>");
+});
+
+it("keeps diagram identity when an earlier workspace image resolves", async () => {
+  const { splitMermaidFences } = await import("./fence/mermaid/segments");
+  const source = "![image](a.png)\n\n```mermaid\ngraph TD\nA-->B\n```";
+  const before = splitMermaidFences(source).find((part) => part.kind === "mermaid");
+  const after = splitMermaidFences(
+    source.replace("a.png", "file:///long/cache/path/image.png"),
+  ).find((part) => part.kind === "mermaid");
+  expect(before).toHaveProperty("id");
+  expect(after?.id).toBe(before?.id);
+});
+
+it("keeps workspace-relative hover titles on explicit absolute file links", () => {
+  expect(prepareMarkdownSource("[Open](/repo/src/file.ts:42-45)", "/repo").render()).toBe(
+    '[Open](/repo/src/file.ts:42-45 "src/file.ts:42-45")',
+  );
+});
+
+it.each(['""', "''", "()"])("preserves an authored empty link title: %s", (title) => {
+  const source = `[Open](/repo/file.ts ${title})`;
+  expect(prepareMarkdownSource(source, "/repo").render()).toBe(source);
+});
+
+describe("shared Markdown theme colours", () => {
+  it.each([
+    ["dark", darkTheme],
+    ["light", lightTheme],
+  ] as const)("uses %s theme colours for tables and task labels", (_name, theme) => {
+    const { markdownStyle: style } = createMarkdownStyles(theme);
+    expect(style.table).toMatchObject({
+      color: theme.colors.foreground,
+      headerTextColor: theme.colors.foreground,
+      headerBackgroundColor: theme.colors.surface2,
+      rowEvenBackgroundColor: theme.colors.surface0,
+      rowOddBackgroundColor: theme.colors.surface1,
+      borderColor: theme.colors.border,
+    });
+    expect(style.list).toMatchObject({
+      color: theme.colors.foreground,
+      bulletColor: theme.colors.foregroundMuted,
+      markerColor: theme.colors.foregroundMuted,
+    });
+    expect(style.h6?.color).toBe(theme.colors.foregroundMuted);
+    expect(style.taskList).toMatchObject({
+      checkedTextColor: theme.colors.foregroundMuted,
+      checkedColor: theme.colors.accent,
+      checkmarkColor: theme.colors.accentForeground,
+      borderColor: theme.colors.foregroundMuted,
+    });
+  });
+});
+
+it.each([
+  ["dark", darkTheme],
+  ["light", lightTheme],
+] as const)(
+  "uses %s theme colours for quotes, admonitions, code, links and dividers",
+  (_name, theme) => {
+    const { markdownStyle: style } = createMarkdownStyles(theme);
+    expect(style.blockquote).toMatchObject({
+      color: `${theme.colors.foreground}cc`,
+      backgroundColor: theme.colors.surface1,
+      borderColor: theme.colors.surface2,
+      admonitions: {
+        note: { color: theme.colors.accentBright, backgroundColor: theme.colors.surface2 },
+        tip: { color: theme.colors.statusSuccess, backgroundColor: theme.colors.surface2 },
+        important: { color: theme.colors.statusMerged, backgroundColor: theme.colors.surface2 },
+        warning: { color: theme.colors.statusWarning, backgroundColor: theme.colors.surface2 },
+        caution: { color: theme.colors.statusDanger, backgroundColor: theme.colors.surface2 },
       },
-      children,
+    });
+    expect(style.code).toMatchObject({
+      color: theme.colors.foreground,
+      backgroundColor: theme.colors.surface2,
+      borderColor: "transparent",
+    });
+    expect(style.link?.color).toBe(theme.colors.accentBright);
+    expect(style.linkVariants?.["^(?!https?://).+"]).toEqual({
+      color: theme.colors.accentBright,
+    });
+    expect(style.thematicBreak?.color).toBe(theme.colors.border);
+  },
+);
+
+it.each([darkTheme, lightTheme])("supplies the theme selection colour to the renderer", (theme) => {
+  expect(createMarkdownStyles(theme)).toHaveProperty(
+    "selectionColor",
+    theme.colors.terminal.selectionBackground,
+  );
+});
+
+describe("GitHub comment HTML normalization", () => {
+  it.each([
+    [
+      '<img alt="P1" src="https://example.com/p1.svg" align="top">',
+      "![P1](<https://example.com/p1.svg>)",
+    ],
+    ['<a href="https://example.com/review">▶</a>', "[▶](<https://example.com/review>)"],
+    ["Before<br>After<br/>End", "Before  \nAfter  \nEnd"],
+    ["<b>bold</b> and <strong>strong</strong>", "**bold** and **strong**"],
+    ["<i>italic</i> and <em>emphasis</em>", "*italic* and *emphasis*"],
+    ["Use <code>const n = 1</code>.", "Use `const n = 1`."],
+    ["H<sub>2</sub>O and x<sup>2</sup>", "H2O and x2"],
+    [
+      "<details><summary>Review details</summary>Body **stays**.</details>",
+      "**Review details**\n\nBody **stays**.",
+    ],
+    ["Before<!-- private -->After", "BeforeAfter"],
+    [
+      "<details><summary><h3>Important Files Changed</h3></summary>Body</details>",
+      "**Important Files Changed**\n\nBody",
+    ],
+    [
+      "<details><summary><p>First</p><p>Second</p></summary>Body</details>",
+      "**First Second**\n\nBody",
+    ],
+    ["<span>file.</span>ts", "file.ts"],
+    ['<a href="https://example.com">Git</a>Hub', "[Git](<https://example.com>)Hub"],
+    ["<span>Git</span><span>Hub</span>", "GitHub"],
+    ["<span>Git</span> Hub", "Git Hub"],
+    ["<div><span>Keep the content</span></div>", "Keep the content"],
+    [
+      '<a href="https://example.com"><strong>Review</strong></a>',
+      "[**Review**](<https://example.com>)",
+    ],
+    ['`<img src="literal.png">` and <b>bold</b>', '`<img src="literal.png">` and **bold**'],
+    [
+      '```html\n<img src="literal.png">\n```\n\n<b>bold</b>',
+      '```html\n<img src="literal.png">\n```\n\n**bold**',
+    ],
+    ['~~~html\n<a href="literal">link</a>\n~~~', '~~~html\n<a href="literal">link</a>\n~~~'],
+    [
+      '<details><summary>Code</summary>\n\n```html\n<img src="literal.png">\n```\n</details>',
+      '**Code**\n\n\n\n```html\n<img src="literal.png">\n```\n',
+    ],
+    [
+      "<https://example.com> and <user@example.com>",
+      "<https://example.com> and <user@example.com>",
+    ],
+  ])("normalizes %s without changing code", (source, expected) => {
+    expect(prepareMarkdownSource(source).render()).toBe(expected);
+  });
+});
+
+it("preserves backslashes and decodes entities inside HTML code", () => {
+  const source = String.raw`<code>\*literal\* &lt;img&gt;</code>`;
+  expect(prepareMarkdownSource(source).render()).toBe("`" + String.raw`\*literal\* <img>` + "`");
+});
+
+it.each([false, true])(
+  "caps inline images to the paragraph line height (compact: %s)",
+  (compact) => {
+    const { markdownStyle } = createMarkdownStyles(darkTheme, compact);
+    expect(markdownStyle.inlineImage?.size).toBe(markdownStyle.paragraph?.lineHeight);
+  },
+);
+
+it("shows native SVG badges as alt text without reserving an image box", () => {
+  const source = "![P1](https://example.com/p1.svg?v=9) **Finding**";
+  const prepared = prepareMarkdownSource(source, undefined, { supportsSvg: false });
+  expect(prepared.render()).toBe("P1 **Finding**");
+  expect(prepared.images).toEqual([]);
+});
+
+it("collapses images that fail to load or decode to their alt text", () => {
+  const prepared = prepareMarkdownSource(
+    "![Remote](https://example.com/broken.png) and ![Local](broken.png)",
+  );
+  expect(
+    prepared.render(
+      new Map([["broken.png", "file:///broken.png"]]),
+      new Set(["https://example.com/broken.png", "broken.png"]),
     ),
-  Text: ({ children, style }: { children?: ReactNode; style?: StyleProp<TextStyle> }) =>
-    createElement("span", { style: flattenStyle(style) }, children),
-}));
+  ).toBe("Remote and Local");
+});
 
-function flattenStyle(style: StyleProp<TextStyle>): TextStyle {
-  return Object.assign({}, ...(Array.isArray(style) ? style.filter(Boolean) : [style]));
-}
+it("preserves angle-bracket image destinations and authored link titles during HTML normalization", () => {
+  const prepared = prepareMarkdownSource(
+    '![shot](<my file.png>) and [open](<my file.png> "<b>literal title</b>")',
+  );
+  expect(prepared.images.map((image) => image.source)).toEqual(["my file.png"]);
+  expect(prepared.render(new Map([["my file.png", "blob:shot"]]))).toBe(
+    '![shot](<blob:shot>) and [open](<my file.png> "<b>literal title</b>")',
+  );
+});
 
-describe("resolveInlineImageSize", () => {
-  it("respects a one-sided explicit width using natural aspect ratio", () => {
-    expect(
-      resolveInlineImageSize({ explicit: { width: 18 }, natural: { width: 90, height: 45 } }),
-    ).toEqual({
-      width: 18,
-      height: 9,
-    });
+it("uses the first repeated image reference definition", () => {
+  const source = "![chart][image]\n\n[image]: first.png\n[image]: second.png";
+  const prepared = prepareMarkdownSource(source);
+  expect(prepared.images.map((image) => image.source)).toEqual(["first.png"]);
+  expect(prepared.render(new Map([["first.png", "blob:first"]]))).toBe(
+    "![chart](<blob:first>)\n\n[image]: first.png\n[image]: second.png",
+  );
+});
+
+it("preserves authored adjacency in the Greptile header", () => {
+  const source =
+    '<h2><a href="https://app.greptile.com/api/retrigger?id=81261069"><picture><source media="(prefers-color-scheme: dark)" srcset="https://greptile-static-assets.s3.amazonaws.com/badges/RetriggerDark.svg?v=2"><source media="(prefers-color-scheme: light)" srcset="https://greptile-static-assets.s3.amazonaws.com/badges/Retrigger.svg?v=2"><img alt="Retrigger" src="https://greptile-static-assets.s3.amazonaws.com/badges/Retrigger.svg?v=2" align="right"></picture></a><a href="https://app.greptile.com/paseo/github/getpaseo/paseo/-/pull/6973"><picture><source media="(prefers-color-scheme: dark)" srcset="https://greptile-static-assets.s3.amazonaws.com/badges/ViewInGreptileDark.svg?v=2"><source media="(prefers-color-scheme: light)" srcset="https://greptile-static-assets.s3.amazonaws.com/badges/ViewInGreptile.svg?v=2"><img alt="View in Greptile" src="https://greptile-static-assets.s3.amazonaws.com/badges/ViewInGreptile.svg?v=2" align="right"></picture></a>Confidence Score: 2/5</h2>';
+  const rendered = prepareMarkdownSource(source, undefined, { supportsSvg: false }).render();
+  expect(rendered).toContain(
+    "[Retrigger](<https://app.greptile.com/api/retrigger?id=81261069>)[View in Greptile]",
+  );
+  expect(rendered).toContain(")Confidence Score: 2/5");
+});
+
+it("keeps paragraph, heading and table-row boundaries when stripping HTML", () => {
+  const source =
+    "<div>First</div><p>Second<br>line</p><h3>Heading</h3><table><tr><td>A</td><td>B</td></tr><tr><td>C</td><td>D</td></tr></table>";
+  const rendered = prepareMarkdownSource(source).render();
+  expect(rendered).toBe("First\n\nSecond  \nline\n\nHeading\n\nA B\n\nC D");
+});
+
+it("normalizes images following HTML code in the same HTML block", () => {
+  const prepared = prepareMarkdownSource('<code>\nx\n</code>\n<img src="shot.png">');
+  expect(prepared.images.map((image) => image.source)).toEqual(["shot.png"]);
+  expect(prepared.render(new Map([["shot.png", "blob:shot"]]))).toContain("![](<blob:shot>)");
+  expect(prepared.render()).toContain("`\nx\n`");
+});
+
+it("preserves literal Markdown punctuation in unsupported and failed image labels", () => {
+  const label = String.raw`\*literal\* \[label\]`;
+  expect(
+    prepareMarkdownSource(`![${label}](badge.svg)`, undefined, { supportsSvg: false }).render(),
+  ).toBe(label);
+  expect(
+    prepareMarkdownSource(`![${label}](https://example.com/badge.png)`).render(
+      new Map(),
+      new Set(["https://example.com/badge.png"]),
+    ),
+  ).toBe(label);
+});
+
+it("retries transient image decoding failures instead of caching an unavailable image", async () => {
+  const client = new QueryClient();
+  let attempts = 0;
+  const decoded = await client.fetchQuery({
+    queryKey: ["markdownImageDecode", "transient.png"],
+    retry: 1,
+    retryDelay: 0,
+    queryFn: () =>
+      decodeMarkdownImage("transient.png", (_uri, success, failure) => {
+        attempts += 1;
+        if (attempts === 1) failure(new Error("temporarily unavailable"));
+        else success(20, 20);
+      }),
   });
+  expect(decoded).toBe(true);
+  expect(attempts).toBe(2);
+  client.clear();
+});
 
-  it("respects a one-sided explicit height using natural aspect ratio", () => {
-    expect(
-      resolveInlineImageSize({ explicit: { height: 18 }, natural: { width: 90, height: 45 } }),
-    ).toEqual({
-      width: 36,
-      height: 18,
+it("keeps the document's first reference definition across every native Mermaid segment", async () => {
+  const { splitMermaidFences } = await import("./fence/mermaid/segments");
+  const before = '[first]: /repo/first.ts "Original"\n\n';
+  const after = '\n\n[open][first]\n\n[first]: /repo/second.ts "Later"';
+  const source = `${before}\`\`\`mermaid\ngraph TD\nA-->B\n\`\`\`${after}`;
+  const firstDefinition = (markdown: string) =>
+    fromMarkdown(markdown).children.find((node) => node.type === "definition");
+  const canonical = firstDefinition(source);
+  const segments = splitMermaidFences(source);
+  for (const segment of segments.filter((candidate) => candidate.kind === "markdown")) {
+    expect(firstDefinition(segment.source)).toMatchObject({
+      identifier: canonical?.identifier,
+      url: canonical?.url,
+      title: canonical?.title,
     });
+  }
+  expect(segments[0].source.endsWith(before)).toBe(true);
+  expect(segments[2].source.endsWith(after)).toBe(true);
+  expect(segments[1]).toEqual({ kind: "mermaid", id: "1", source: "graph TD\nA-->B" });
+});
+
+it("reserves pending image geometry until decode succeeds and collapses only confirmed failures", () => {
+  const source = "![Local](shot.png)\n\n![Remote](https://example.com/image.png)";
+  const prepared = prepareMarkdownSource(source);
+  const pending = prepared.render(
+    new Map(),
+    new Set(),
+    new Set(prepared.images.map((image) => image.source)),
+  );
+  expect(pending.match(/!\[/g)).toHaveLength(2);
+  expect(pending).toContain("data:image/png;base64,");
+  expect(prepared.render(new Map(), new Set(prepared.images.map((image) => image.source)))).toBe(
+    "Local\n\nRemote",
+  );
+});
+
+it("normalizes a large HTML table into one block per row", () => {
+  const cell = "cell".repeat(8);
+  const rows = 8000;
+  const source = `<table>${`<tr><td>${cell}</td><td>${cell}</td></tr>`.repeat(rows)}</table>`;
+  const rendered = normalizeMarkdownHtml(source);
+  expect(rendered.split("\n\n")).toHaveLength(rows);
+  expect(rendered.startsWith(`${cell} ${cell}`)).toBe(true);
+  expect(rendered.endsWith(`${cell} ${cell}`)).toBe(true);
+});
+
+it.each([
+  "3/4",
+  "1.5",
+  "v1.2",
+  "10/10",
+  "2024/10/16",
+  "10.0.0.1",
+  "word.word",
+  "example.com",
+  "file.tsxextra",
+  "v1.2.3-beta",
+  "123/456.789",
+  "×/÷",
+  "２０２４/１０/１６",
+])("leaves non-path tokens unlinked in prose and inline code: %s", (token) => {
+  const { linkRecognition } = prepareMarkdownSource(`Value ${token}, then continue.`);
+  expect([...`Value ${token}, then continue.`.matchAll(linkRecognition.text)]).toEqual([]);
+  expect(linkRecognition.inlineCode.test(token)).toBe(false);
+});
+
+it.each([
+  "src/index.ts",
+  "README.md",
+  "./scripts/run",
+  "./x/y",
+  "../x/y",
+  "/x/y",
+  "a/b/c",
+  String.raw`C:\Users\x`,
+  "src/index.ts:12:3",
+  "src/run:12",
+  "src/run:12:3",
+  "src/run:12-20",
+  "~/dev/paseo",
+  String.raw`C:\Users\x\file.txt`,
+  "file.ts:12",
+  "file.ts:12-20",
+  "123.ts",
+  "FILE.TS",
+  "https://example.com/path",
+])("recognizes complete paths and URLs in prose and inline code: %s", (token) => {
+  const { linkRecognition } = prepareMarkdownSource(`Open ${token} then continue.`);
+  expect(
+    [...`Open ${token} then continue.`.matchAll(linkRecognition.text)].map(([text]) => text),
+  ).toEqual([token]);
+  expect(linkRecognition.inlineCode.test(token)).toBe(true);
+});
+
+it.each([
+  "before/after",
+  "and/or",
+  "input/output",
+  "read/write",
+  "packages/app",
+  "123/file",
+  "src/123",
+])("requires stronger path intent in prose while preserving inline code: %s", (token) => {
+  const { linkRecognition } = prepareMarkdownSource(`Compare ${token}, then continue.`);
+  expect([...`Compare ${token}, then continue.`.matchAll(linkRecognition.text)]).toEqual([]);
+  expect(linkRecognition.inlineCode.test(token)).toBe(true);
+});
+
+it("keeps prose and inline-code recognition enabled through the native regex adapter", () => {
+  const { linkRecognition } = prepareMarkdownSource("3/4 src/index.ts");
+  const native = toNativeLinkRecognition(linkRecognition);
+  expect(native.text).toMatchObject({
+    pattern: linkRecognition.text.source,
+    isDisabled: false,
+    isDefault: false,
   });
-
-  it("reserves a capped 3:2 placeholder when no dimensions are known", () => {
-    expect(resolveInlineImageSize({ explicit: {}, natural: null })).toEqual({
-      width: 240,
-      height: 160,
-    });
+  expect(native.inlineCode).toMatchObject({
+    pattern: linkRecognition.inlineCode.source,
+    isDisabled: false,
+    isDefault: false,
   });
 });
 
-describe("shared Markdown links", () => {
-  it("renders accent text and underlines it while hovered", () => {
-    const onPress = vi.fn();
-    const children = colorMarkdownLinkChildren(
-      createElement(Text, { style: { color: "white" } }, "Paseo"),
-      "rgb(0, 122, 255)",
-    );
-    const view = render(
-      createElement(MarkdownLinkText, { style: { color: "rgb(0, 122, 255)" }, onPress }, children),
-    );
-    const link = view.getByRole("link");
-    const linkText = link.firstElementChild as HTMLElement;
+it.each([undefined, "file:///cache/shot.png"])(
+  "reserves a native workspace image while acquiring or decoding %s",
+  (url) => {
+    const status = getMarkdownImageStatus({
+      canAcquire: true,
+      url,
+      acquisitionFailed: false,
+      decodeFailed: false,
+      decoded: false,
+    });
+    expect(status).toBe("pending");
+    const prepared = prepareMarkdownSource("Before ![image](shot.png) after", undefined, {
+      supportsSvg: false,
+    });
+    const rendered = prepared.render(new Map(), new Set(), new Set(["shot.png"]));
+    expect(rendered).toBe(`Before ![image](<${PENDING_MARKDOWN_IMAGE}>) after`);
+    expect(fromMarkdown(rendered).children).toMatchObject([
+      {
+        type: "paragraph",
+        children: [
+          { type: "text", value: "Before " },
+          { type: "image", url: PENDING_MARKDOWN_IMAGE },
+          { type: "text", value: " after" },
+        ],
+      },
+    ]);
+  },
+);
 
-    expect((view.getByText("Paseo") as HTMLElement).style.color).toBe("rgb(0, 122, 255)");
-    expect(linkText.style.textDecorationLine).toBe("");
-
-    fireEvent.mouseEnter(link);
-    expect(linkText.style.textDecorationLine).toBe("underline");
-
-    fireEvent.mouseLeave(link);
-    expect(linkText.style.textDecorationLine).toBe("");
-
-    fireEvent.click(link);
-    expect(onPress).toHaveBeenCalledOnce();
+it.each([
+  { acquisitionFailed: true, decodeFailed: false },
+  { acquisitionFailed: false, decodeFailed: true },
+])("collapses confirmed native image failures to alt text: %s", (failure) => {
+  expect(
+    getMarkdownImageStatus({
+      canAcquire: true,
+      url: "file:///cache/shot.png",
+      decoded: false,
+      ...failure,
+    }),
+  ).toBe("unavailable");
+  const prepared = prepareMarkdownSource("Before ![image](shot.png) after", undefined, {
+    supportsSvg: false,
   });
+  expect(prepared.render(new Map(), new Set(["shot.png"]), new Set(["shot.png"]))).toBe(
+    "Before image after",
+  );
+});
+
+it("replaces the native placeholder only after the resolved URL decodes", () => {
+  const url = "file:///cache/shot.png";
+  expect(
+    getMarkdownImageStatus({
+      canAcquire: true,
+      url,
+      acquisitionFailed: false,
+      decodeFailed: false,
+      decoded: true,
+    }),
+  ).toBe("ready");
+  const prepared = prepareMarkdownSource("![image](shot.png)", undefined, { supportsSvg: false });
+  expect(prepared.render(new Map([["shot.png", url]]))).toBe(`![image](<${url}>)`);
 });
diff --git a/packages/app/src/components/markdown/renderer.tsx b/packages/app/src/components/markdown/renderer.tsx
index 83380ea919..c4a832342f 100644
--- a/packages/app/src/components/markdown/renderer.tsx
+++ b/packages/app/src/components/markdown/renderer.tsx
@@ -1,790 +1,120 @@
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-  type ComponentType,
-  type ReactNode,
-} from "react";
+import { memo, useMemo, useState } from "react";
+import { EnrichedMarkdownText, type LinkPressEvent } from "react-native-enriched-markdown";
+import { withUnistyles } from "react-native-unistyles";
 import {
-  Image,
-  Pressable,
-  Text,
-  View,
-  type TextProps,
-  type TextStyle,
-  type ViewStyle,
-} from "react-native";
-import { ChevronDown, ChevronRight } from "lucide-react-native";
-import Markdown, {
-  MarkdownIt,
-  type ASTNode,
-  type RenderRules,
-} from "react-native-markdown-display";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { HighlightedCodeBlock } from "@/components/highlighted-code-block";
-import { MarkdownFenceBlock } from "@/components/markdown/fence";
-import { MarkdownParagraphView, MarkdownTextSpan } from "@/components/markdown-text";
-import { MarkdownTableCellText } from "@/components/markdown-text-selection";
-import { getMarkdownListMarker, getMarkdownListSpacing } from "@/utils/markdown-list";
-import { markdownNodeContainsType } from "@/utils/markdown-ast";
-import { createMarkdownParser } from "@/utils/markdown-parser";
-import { createCompactMarkdownStyles, createMarkdownStyles } from "@/styles/markdown-styles";
+  useAssistantFileLinkActions,
+  useAssistantFileLinkEnvironment,
+} from "@/assistant-file-links";
+import { useStableEvent } from "@/hooks/use-stable-event";
+import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
 import type { Theme } from "@/styles/theme";
-import { openExternalUrl } from "@/utils/open-external-url";
-import { isNative } from "@/constants/platform";
-import {
-  splitHtmlishMarkdown,
-  type MarkdownDisplayPart,
-  type MarkdownInlineImagePart,
-} from "./html-ish";
-import { resolveInlineImageSize, type InlineImageDimensions } from "./inline-image-size";
-import {
-  getAssistantImageMetadata,
-  setAssistantImageMetadata,
-} from "@/utils/assistant-image-metadata";
-import { groupMarkdownParts, type MarkdownPartGroup } from "./part-groups";
-import { colorMarkdownLinkChildren } from "./link-children";
-import { MarkdownLinkText } from "./link-text";
+import { isWeb } from "@/constants/platform";
+import { MarkdownRendererFrame } from "./frame";
+import { WEB_RENDERERS } from "./renderers";
+import { createMarkdownStyles } from "./styles";
+import { PENDING_MARKDOWN_IMAGE } from "./source";
+import { splitStreamingMarkdown } from "./streaming";
+import { useMarkdownSource, type MarkdownImageContext } from "./images";
 
-export type MarkdownStyles = Record<string, TextStyle & ViewStyle & { [key: string]: unknown }>;
+import { MermaidFence, MermaidStreamingContext, splitMermaidFences } from "./fence/mermaid";
 
-interface MarkdownWithStableRendererProps {
-  children: ReactNode;
-  style: ReturnType<typeof createMarkdownStyles> | ReturnType<typeof createCompactMarkdownStyles>;
-  rules?: RenderRules;
-  markdownit?: ReturnType<typeof MarkdownIt>;
-  onLinkPress?: (url: string) => boolean;
-  allowedImageHandlers?: readonly string[];
-  topLevelMaxExceededItem?: ReactNode;
-}
+const ThemedMarkdown = withUnistyles(EnrichedMarkdownText);
+const MD4C_FLAGS = { latexMath: false, hardSoftBreaks: true, admonitions: true };
 
-const MarkdownWithStableRenderer = Markdown as ComponentType<MarkdownWithStableRendererProps>;
-const ThemedMarkdown = withUnistyles(MarkdownWithStableRenderer);
+const regularStyle = (theme: Theme) => createMarkdownStyles(theme);
+const compactStyle = (theme: Theme) => createMarkdownStyles(theme, true);
+const WEB_CONTAINER = { userSelect: "text" as const };
 
-function markdownStyleMapping(theme: Theme): Partial<MarkdownWithStableRendererProps> {
-  return { style: createMarkdownStyles(theme) };
-}
-
-function compactMarkdownStyleMapping(theme: Theme): Partial<MarkdownWithStableRendererProps> {
-  return { style: createCompactMarkdownStyles(theme) };
-}
-
-// Serves PR comment bodies and the markdown file preview; agent chat passes its
-// own parser. The preview has to show the bytes on disk, so no typographer.
-const defaultMarkdownParser = createMarkdownParser({ linkify: true });
-const EMPTY_TEXT_STYLE: TextStyle = {};
-const MARKDOWN_LIST_ITEM_CONTENT_FLEX: ViewStyle = { flex: 1, flexShrink: 1, minWidth: 0 };
-export interface MarkdownRendererProps {
+export interface MarkdownRendererProps extends MarkdownImageContext {
   text: string;
   compact?: boolean;
-  rules?: RenderRules;
-  markdownit?: ReturnType<typeof MarkdownIt>;
-  onLinkPress?: (url: string) => boolean;
-  allowedImageHandlers?: readonly string[];
-  topLevelMaxExceededItem?: ReactNode;
-  enableHtmlish?: boolean;
+  streaming?: boolean;
+  onLinkPress?: (url: string) => unknown;
 }
 
-export function MarkdownRenderer({
-  text,
-  compact = false,
-  rules,
-  markdownit = defaultMarkdownParser,
-  onLinkPress,
-  allowedImageHandlers,
-  topLevelMaxExceededItem,
-  enableHtmlish = true,
-}: MarkdownRendererProps) {
-  const markdownRules = useMemo(() => rules ?? createSharedMarkdownRules(), [rules]);
-  const parts = useMemo(
-    () => (enableHtmlish ? splitHtmlishMarkdown(text) : [{ kind: "markdown" as const, text }]),
-    [enableHtmlish, text],
+/** All Markdown surfaces share the same engine and source adaptation. */
+export const MarkdownRenderer = memo(function MarkdownRenderer(props: MarkdownRendererProps) {
+  const streaming = !isWeb && !!props.streaming;
+  // Only completed lines affect block closure. Do not run mdast on every reveal frame.
+  const completeLines = streaming ? props.text.slice(0, props.text.lastIndexOf("\n") + 1) : "";
+  const boundary = useMemo(
+    () => splitStreamingMarkdown(completeLines, true).head.length,
+    [completeLines],
   );
-  const rendererProps = useMemo(
-    () => ({
-      compact,
-      rules: markdownRules,
-      markdownit,
-      onLinkPress,
-      allowedImageHandlers,
-      topLevelMaxExceededItem,
-    }),
-    [
-      allowedImageHandlers,
-      compact,
-      markdownRules,
-      markdownit,
-      onLinkPress,
-      topLevelMaxExceededItem,
-    ],
-  );
-
-  return <MarkdownPartList parts={parts} rendererProps={rendererProps} />;
-}
-
-type MarkdownPartRendererProps = Omit<MarkdownRendererProps, "text" | "enableHtmlish"> & {
-  rules: RenderRules;
-};
-
-function MarkdownPartList({
-  parts,
-  rendererProps,
-}: {
-  parts: MarkdownDisplayPart[];
-  rendererProps: MarkdownPartRendererProps;
-}) {
-  const keyedGroups = useMemo(() => keyMarkdownGroups(groupMarkdownParts(parts)), [parts]);
+  if (!streaming || boundary === 0) return <MarkdownPart {...props} />;
   return (
     <>
-      {keyedGroups.map(({ key, group }) =>
-        group.kind === "part" ? (
-          <MarkdownPart key={key} part={group.part} rendererProps={rendererProps} />
+      <MarkdownPart {...props} text={props.text.slice(0, boundary)} continues />
+      <MarkdownPart {...props} text={props.text.slice(boundary)} />
+    </>
+  );
+});
+
+const MarkdownPart = memo(function MarkdownPart({
+  text,
+  continues = false,
+  compact = false,
+  streaming = false,
+  onLinkPress,
+  ...imageContext
+}: MarkdownRendererProps & { continues?: boolean }) {
+  const environment = useAssistantFileLinkEnvironment();
+  const actions = useAssistantFileLinkActions();
+  const client =
+    imageContext.client ??
+    (environment.client?.readFile
+      ? { readFile: environment.client.readFile.bind(environment.client) }
+      : undefined);
+  const { markdown, imageSources, linkRecognition, linkSource } = useMarkdownSource(text, {
+    workspaceRoot: environment.workspaceRoot,
+    serverId: environment.serverId,
+    ...imageContext,
+    client,
+  });
+  const [image, setImage] = useState<ImageLightboxSource | null>(null);
+  const pressLink = useStableEvent(({ url, sourceType }: LinkPressEvent) => {
+    const source = linkSource(url, sourceType);
+    if (onLinkPress && !actions.canResolveFile(source)) onLinkPress(url);
+    else actions.open(source, "preferred");
+  });
+  const pressImage = useStableEvent(({ url }: { url: string }) => {
+    if (url !== PENDING_MARKDOWN_IMAGE) setImage({ type: "uri", uri: url });
+  });
+  const closeImage = useStableEvent(() => setImage(null));
+  const segments = useMemo(
+    () =>
+      isWeb ? [{ kind: "markdown", id: "0", source: markdown }] : splitMermaidFences(markdown),
+    [markdown],
+  );
+  const content = (
+    <MermaidStreamingContext.Provider value={streaming}>
+      {segments.map((segment) =>
+        segment.kind === "mermaid" ? (
+          <MermaidFence key={`${segment.kind}:${segment.id}`} code={segment.source} />
         ) : (
-          <MarkdownImageTextGroup key={key} group={group} rendererProps={rendererProps} />
+          <ThemedMarkdown
+            key={`${segment.kind}:${segment.id}`}
+            markdown={segment.source}
+            containerStyle={isWeb ? WEB_CONTAINER : undefined}
+            uniProps={compact ? compactStyle : regularStyle}
+            flavor="github"
+            selectable
+            allowTrailingMargin={continues && segment === segments[segments.length - 1]}
+            md4cFlags={MD4C_FLAGS}
+            linkRecognition={linkRecognition}
+            enableTaskListItemToggle={false}
+            enableLinkPreview={false}
+            enableBlockContextMenu={false}
+            // JS reveal owns pacing; native fade animation is a separate experiment.
+            streamingAnimation={false}
+            onLinkPress={pressLink}
+            onImagePress={pressImage}
+            renderers={isWeb ? WEB_RENDERERS : undefined}
+          />
         ),
       )}
-    </>
+      {image ? <AttachmentLightbox source={image} onClose={closeImage} /> : null}
+    </MermaidStreamingContext.Provider>
   );
-}
-
-function keyMarkdownGroups(
-  groups: MarkdownPartGroup[],
-): { key: string; group: MarkdownPartGroup }[] {
-  return groups.map((group, index) => ({ key: `${group.kind}:${index}`, group }));
-}
-
-function MarkdownPart({
-  part,
-  rendererProps,
-}: {
-  part: MarkdownDisplayPart;
-  rendererProps: MarkdownPartRendererProps;
-}) {
-  if (part.kind === "details") {
-    return <MarkdownDetails part={part} rendererProps={rendererProps} />;
-  }
-
-  if (part.kind === "inlineImage") {
-    return <MarkdownInlineImage part={part} onLinkPress={rendererProps.onLinkPress} />;
-  }
-
-  if (part.text.length === 0) {
-    return null;
-  }
-
-  return <MarkdownFragment text={part.text} {...rendererProps} />;
-}
-
-function MarkdownFragment({
-  text,
-  compact,
-  rules,
-  markdownit,
-  onLinkPress,
-  allowedImageHandlers,
-  topLevelMaxExceededItem,
-}: MarkdownRendererProps & { rules: RenderRules }) {
-  const uniProps = compact ? compactMarkdownStyleMapping : markdownStyleMapping;
-  return (
-    <ThemedMarkdown
-      uniProps={uniProps}
-      rules={rules}
-      markdownit={markdownit}
-      onLinkPress={onLinkPress}
-      allowedImageHandlers={allowedImageHandlers}
-      topLevelMaxExceededItem={topLevelMaxExceededItem}
-    >
-      {text}
-    </ThemedMarkdown>
-  );
-}
-
-function useNaturalImageDimensions(part: MarkdownInlineImagePart): {
-  natural: InlineImageDimensions | null;
-  failed: boolean;
-  setFailed: (failed: boolean) => void;
-} {
-  const cached = useMemo(() => getAssistantImageMetadata({ source: part.src }), [part.src]);
-  const [resolved, setResolved] = useState<{
-    source: string;
-    dimensions: InlineImageDimensions;
-  } | null>(null);
-  const natural = resolved?.source === part.src ? resolved.dimensions : cached;
-  const [failed, setFailed] = useState(false);
-
-  useEffect(() => {
-    if ((part.width && part.height) || cached) {
-      return;
-    }
-
-    let cancelled = false;
-    Image.getSize(
-      part.src,
-      (width, height) => {
-        setAssistantImageMetadata({ source: part.src }, { width, height });
-        if (!cancelled) {
-          setResolved({ source: part.src, dimensions: { width, height } });
-        }
-      },
-      () => {
-        if (!cancelled) {
-          setFailed(true);
-        }
-      },
-    );
-
-    return () => {
-      cancelled = true;
-    };
-  }, [cached, part.height, part.src, part.width]);
-
-  return { natural, failed, setFailed };
-}
-
-function MarkdownInlineImage({
-  part,
-  onLinkPress,
-}: {
-  part: Extract<MarkdownDisplayPart, { kind: "inlineImage" }>;
-  onLinkPress?: (url: string) => boolean;
-}) {
-  const { natural: naturalDimensions } = useNaturalImageDimensions(part);
-  const explicitDimensions = useMemo(
-    () => ({ width: part.width, height: part.height }),
-    [part.height, part.width],
-  );
-  const handlePress = useCallback(() => {
-    if (!part.href) return;
-    if (onLinkPress?.(part.href) === false) return;
-    void openExternalUrl(part.href);
-  }, [onLinkPress, part.href]);
-  const source = useMemo(() => ({ uri: part.src }), [part.src]);
-  const imageSize = useMemo(
-    () => resolveInlineImageSize({ explicit: explicitDimensions, natural: naturalDimensions }),
-    [explicitDimensions, naturalDimensions],
-  );
-  const imageStyle = useMemo(() => [detailsStyles.inlineImage, imageSize], [imageSize]);
-
-  const image = (
-    <Image
-      source={source}
-      style={imageStyle}
-      resizeMode="contain"
-      accessibilityLabel={part.alt || undefined}
-    />
-  );
-
-  if (!part.href) {
-    return <View style={detailsStyles.inlineImageWrap}>{image}</View>;
-  }
-
-  return (
-    <Pressable style={detailsStyles.inlineImageWrap} onPress={handlePress} accessibilityRole="link">
-      {image}
-    </Pressable>
-  );
-}
-
-const FLOW_IMAGE_MAX_HEIGHT = 18;
-
-function MarkdownFlowImage({
-  part,
-  onLinkPress,
-}: {
-  part: MarkdownInlineImagePart;
-  onLinkPress?: (url: string) => boolean;
-}) {
-  const { natural, failed, setFailed } = useNaturalImageDimensions(part);
-  const handlePress = useCallback(() => {
-    if (!part.href) return;
-    if (onLinkPress?.(part.href) === false) return;
-    void openExternalUrl(part.href);
-  }, [onLinkPress, part.href]);
-  const handleError = useCallback(() => setFailed(true), [setFailed]);
-  const source = useMemo(() => ({ uri: part.src }), [part.src]);
-  const imageSize = useMemo(() => {
-    const size = resolveInlineImageSize({
-      explicit: { width: part.width, height: part.height },
-      natural,
-    });
-    const scale = Math.min(1, FLOW_IMAGE_MAX_HEIGHT / size.height);
-    return { width: Math.round(size.width * scale), height: Math.round(size.height * scale) };
-  }, [natural, part.height, part.width]);
-  const imageStyle = useMemo(() => [detailsStyles.flowImage, imageSize], [imageSize]);
-
-  if (failed) {
-    if (!part.alt) {
-      return null;
-    }
-    return (
-      <View style={detailsStyles.flowImageFallback}>
-        <Text style={detailsStyles.flowImageFallbackText}>{part.alt}</Text>
-      </View>
-    );
-  }
-
-  const image = (
-    <Image
-      source={source}
-      style={imageStyle}
-      resizeMode="contain"
-      accessibilityLabel={part.alt || undefined}
-      onError={handleError}
-    />
-  );
-
-  if (!part.href) {
-    return image;
-  }
-
-  return (
-    <Pressable onPress={handlePress} accessibilityRole="link">
-      {image}
-    </Pressable>
-  );
-}
-
-function MarkdownImageTextGroup({
-  group,
-  rendererProps,
-}: {
-  group: Extract<MarkdownPartGroup, { kind: "imageText" }>;
-  rendererProps: MarkdownPartRendererProps;
-}) {
-  return (
-    <>
-      <View style={detailsStyles.imageTextRow}>
-        {group.images.map((image) => (
-          <MarkdownFlowImage key={image.src} part={image} onLinkPress={rendererProps.onLinkPress} />
-        ))}
-        <View style={detailsStyles.imageTextRowContent}>
-          <MarkdownFragment text={group.lead} {...rendererProps} />
-        </View>
-      </View>
-      {group.rest ? <MarkdownFragment text={group.rest} {...rendererProps} /> : null}
-    </>
-  );
-}
-
-function MarkdownDetails({
-  part,
-  rendererProps,
-}: {
-  part: Extract<MarkdownDisplayPart, { kind: "details" }>;
-  rendererProps: MarkdownPartRendererProps;
-}) {
-  const [open, setOpen] = useState(false);
-  const toggle = useCallback(() => setOpen((current) => !current), []);
-  const bodyParts = useMemo(
-    () => part.bodyParts ?? [{ kind: "markdown" as const, text: part.body }],
-    [part.body, part.bodyParts],
-  );
-  return (
-    <View style={detailsStyles.container}>
-      <Pressable style={detailsStyles.summaryRow} onPress={toggle} accessibilityRole="button">
-        {open ? (
-          <ChevronDown size={14} color={detailsStyles.summaryIcon.color} />
-        ) : (
-          <ChevronRight size={14} color={detailsStyles.summaryIcon.color} />
-        )}
-        <Text style={detailsStyles.summaryText}>{part.summary}</Text>
-      </Pressable>
-      {open ? (
-        <View style={detailsStyles.body}>
-          <MarkdownPartList parts={bodyParts} rendererProps={rendererProps} />
-        </View>
-      ) : null}
-    </View>
-  );
-}
-
-interface MarkdownInheritedTextProps {
-  inheritedStyles: TextStyle;
-  textStyle: TextStyle;
-  style?: TextStyle;
-  monoSurface?: boolean;
-  onPress?: TextProps["onPress"];
-  accessibilityRole?: TextProps["accessibilityRole"];
-  children: ReactNode;
-}
-
-export function MarkdownInheritedText({
-  inheritedStyles,
-  textStyle,
-  style: overrideStyle,
-  monoSurface,
-  onPress,
-  accessibilityRole,
-  children,
-}: MarkdownInheritedTextProps) {
-  const style = useMemo(
-    () => [inheritedStyles, textStyle, overrideStyle],
-    [inheritedStyles, textStyle, overrideStyle],
-  );
-  return (
-    <MarkdownTextSpan
-      monoSurface={monoSurface}
-      onPress={onPress}
-      accessibilityRole={accessibilityRole}
-      style={style}
-    >
-      {children}
-    </MarkdownTextSpan>
-  );
-}
-
-interface MarkdownListItemContentProps {
-  contentStyle: ViewStyle;
-  children: ReactNode;
-}
-
-function MarkdownListItemContent({ contentStyle, children }: MarkdownListItemContentProps) {
-  const style = useMemo(() => [contentStyle, MARKDOWN_LIST_ITEM_CONTENT_FLEX], [contentStyle]);
-  return <View style={style}>{children}</View>;
-}
-
-interface MarkdownListViewProps {
-  baseStyle: ViewStyle;
-  spacing: { marginTop: number; marginBottom: number };
-  children: ReactNode;
-}
-
-function MarkdownListView({ baseStyle, spacing, children }: MarkdownListViewProps) {
-  const style = useMemo(() => [baseStyle, spacing], [baseStyle, spacing]);
-  return <View style={style}>{children}</View>;
-}
-
-interface SharedMarkdownLinkProps {
-  href: string;
-  inheritedStyles: TextStyle;
-  linkStyle: TextStyle;
-  onLinkPress?: (url: string) => boolean;
-  children: ReactNode;
-}
-
-function SharedMarkdownLink({
-  href,
-  inheritedStyles,
-  linkStyle,
-  onLinkPress,
-  children,
-}: SharedMarkdownLinkProps) {
-  const handlePress = useCallback(() => {
-    if (!href) return;
-    if (onLinkPress?.(href) === false) return;
-    void openExternalUrl(href);
-  }, [href, onLinkPress]);
-  const style = useMemo(() => [inheritedStyles, linkStyle], [inheritedStyles, linkStyle]);
-
-  if (!isNative) {
-    return (
-      <MarkdownLinkText style={style} onPress={handlePress}>
-        {children}
-      </MarkdownLinkText>
-    );
-  }
-
-  return (
-    <MarkdownInheritedText
-      inheritedStyles={inheritedStyles}
-      textStyle={linkStyle}
-      accessibilityRole="link"
-      onPress={handlePress}
-    >
-      {children}
-    </MarkdownInheritedText>
-  );
-}
-
-function getMarkdownLinkHref(node: ASTNode): string {
-  const href = node.attributes?.href;
-  return typeof href === "string" ? href : "";
-}
-
-export function createSharedMarkdownRules(): RenderRules {
-  return {
-    text: (
-      node: ASTNode,
-      _children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownInheritedText
-        key={node.key}
-        inheritedStyles={inheritedStyles}
-        textStyle={styles.text}
-      >
-        {node.content}
-      </MarkdownInheritedText>
-    ),
-    textgroup: (
-      node: ASTNode,
-      children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownInheritedText
-        key={node.key}
-        inheritedStyles={inheritedStyles}
-        textStyle={styles.textgroup}
-      >
-        {children}
-      </MarkdownInheritedText>
-    ),
-    strong: (
-      node: ASTNode,
-      children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownInheritedText
-        key={node.key}
-        inheritedStyles={inheritedStyles}
-        textStyle={styles.strong}
-      >
-        {children}
-      </MarkdownInheritedText>
-    ),
-    em: (
-      node: ASTNode,
-      children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownInheritedText key={node.key} inheritedStyles={inheritedStyles} textStyle={styles.em}>
-        {children}
-      </MarkdownInheritedText>
-    ),
-    s: (
-      node: ASTNode,
-      children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownInheritedText key={node.key} inheritedStyles={inheritedStyles} textStyle={styles.s}>
-        {children}
-      </MarkdownInheritedText>
-    ),
-    hardbreak: (
-      node: ASTNode,
-      _children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-    ) => (
-      <MarkdownTextSpan key={node.key} style={styles.hardbreak}>
-        {"\n"}
-      </MarkdownTextSpan>
-    ),
-    softbreak: (
-      node: ASTNode,
-      _children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-    ) => (
-      <MarkdownTextSpan key={node.key} style={styles.softbreak}>
-        {"\n"}
-      </MarkdownTextSpan>
-    ),
-    code_block: (
-      node: ASTNode,
-      _children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <HighlightedCodeBlock
-        key={node.key}
-        code={node.content}
-        language={null}
-        inheritedStyles={inheritedStyles}
-        textStyle={styles.code_block}
-      />
-    ),
-    fence: (
-      node: ASTNode,
-      _children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownFenceBlock
-        key={node.key}
-        code={node.content}
-        info={node.sourceInfo}
-        phase="complete"
-        inheritedStyles={inheritedStyles}
-        textStyle={styles.fence}
-      />
-    ),
-    code_inline: (
-      node: ASTNode,
-      _children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownInheritedText
-        key={node.key}
-        inheritedStyles={inheritedStyles}
-        textStyle={styles.code_inline}
-        monoSurface
-      >
-        {node.content ?? ""}
-      </MarkdownInheritedText>
-    ),
-    bullet_list: (
-      node: ASTNode,
-      children: ReactNode[],
-      parent: ASTNode[],
-      styles: MarkdownStyles,
-    ) => (
-      <MarkdownListView
-        key={node.key}
-        baseStyle={styles.bullet_list}
-        spacing={getMarkdownListSpacing(node, parent)}
-      >
-        {children}
-      </MarkdownListView>
-    ),
-    ordered_list: (
-      node: ASTNode,
-      children: ReactNode[],
-      parent: ASTNode[],
-      styles: MarkdownStyles,
-    ) => (
-      <MarkdownListView
-        key={node.key}
-        baseStyle={styles.ordered_list}
-        spacing={getMarkdownListSpacing(node, parent)}
-      >
-        {children}
-      </MarkdownListView>
-    ),
-    list_item: (
-      node: ASTNode,
-      children: ReactNode[],
-      parent: ASTNode[],
-      styles: MarkdownStyles,
-    ) => {
-      const { isOrdered, marker } = getMarkdownListMarker(node, parent);
-      const iconStyle = isOrdered ? styles.ordered_list_icon : styles.bullet_list_icon;
-      const contentStyle = isOrdered ? styles.ordered_list_content : styles.bullet_list_content;
-
-      return (
-        <View key={node.key} style={styles.list_item}>
-          <Text style={iconStyle}>{marker}</Text>
-          <MarkdownListItemContent contentStyle={contentStyle}>{children}</MarkdownListItemContent>
-        </View>
-      );
-    },
-    th: (node: ASTNode, children: ReactNode[], _parent: ASTNode[], styles: MarkdownStyles) => (
-      <MarkdownTableCellText key={node.key}>
-        <View style={styles._VIEW_SAFE_th}>{children}</View>
-      </MarkdownTableCellText>
-    ),
-    td: (node: ASTNode, children: ReactNode[], _parent: ASTNode[], styles: MarkdownStyles) => (
-      <MarkdownTableCellText key={node.key}>
-        <View style={styles._VIEW_SAFE_td}>{children}</View>
-      </MarkdownTableCellText>
-    ),
-    paragraph: (
-      node: ASTNode,
-      children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-    ) => (
-      <MarkdownParagraphView
-        key={node.key}
-        paragraphStyle={styles.paragraph}
-        containsImage={markdownNodeContainsType(node, "image")}
-      >
-        {children}
-      </MarkdownParagraphView>
-    ),
-    link: (
-      node: ASTNode,
-      children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownStyles,
-      onLinkPress?: (url: string) => boolean,
-    ) => (
-      <SharedMarkdownLink
-        key={node.key}
-        href={getMarkdownLinkHref(node)}
-        inheritedStyles={EMPTY_TEXT_STYLE}
-        linkStyle={styles.link}
-        onLinkPress={onLinkPress}
-      >
-        {colorMarkdownLinkChildren(children, styles.link.color)}
-      </SharedMarkdownLink>
-    ),
-  };
-}
-
-const detailsStyles = StyleSheet.create((theme) => ({
-  container: {
-    borderWidth: 1,
-    borderColor: theme.colors.border,
-    borderRadius: theme.borderRadius.md,
-    marginBottom: theme.spacing[2],
-    overflow: "hidden",
-  },
-  summaryRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-    paddingHorizontal: theme.spacing[2],
-    paddingVertical: theme.spacing[2],
-    backgroundColor: theme.colors.surface2,
-  },
-  summaryIcon: {
-    color: theme.colors.foregroundMuted,
-  },
-  summaryText: {
-    flex: 1,
-    minWidth: 0,
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.normal,
-    lineHeight: 18,
-  },
-  body: {
-    paddingHorizontal: theme.spacing[2],
-    paddingTop: theme.spacing[2],
-  },
-  inlineImageWrap: {
-    alignSelf: "flex-start",
-    marginBottom: theme.spacing[1],
-  },
-  inlineImage: {},
-  imageTextRow: {
-    flexDirection: "row",
-    alignItems: "flex-start",
-    gap: theme.spacing[2],
-    marginBottom: theme.spacing[3],
-  },
-  imageTextRowContent: {
-    flex: 1,
-    minWidth: 0,
-  },
-  flowImage: {
-    marginTop: 2,
-  },
-  flowImageFallback: {
-    marginTop: 2,
-    paddingHorizontal: theme.spacing[1],
-    borderRadius: theme.borderRadius.sm,
-    backgroundColor: theme.colors.surface2,
-  },
-  flowImageFallbackText: {
-    fontSize: 10,
-    lineHeight: 14,
-    color: theme.colors.foregroundMuted,
-  },
-}));
+  return <MarkdownRendererFrame imageSources={imageSources}>{content}</MarkdownRendererFrame>;
+});
diff --git a/packages/app/src/components/markdown/renderers.tsx b/packages/app/src/components/markdown/renderers.tsx
new file mode 100644
index 0000000000..37132d27e9
--- /dev/null
+++ b/packages/app/src/components/markdown/renderers.tsx
@@ -0,0 +1,3 @@
+import type { MarkdownRenderers } from "react-native-enriched-markdown";
+
+export const WEB_RENDERERS: MarkdownRenderers | undefined = undefined;
diff --git a/packages/app/src/components/markdown/renderers.web.tsx b/packages/app/src/components/markdown/renderers.web.tsx
new file mode 100644
index 0000000000..6f0afc666b
--- /dev/null
+++ b/packages/app/src/components/markdown/renderers.web.tsx
@@ -0,0 +1,81 @@
+import { Text } from "react-native";
+import { forwardRef, useMemo, type ComponentProps } from "react";
+import type {
+  CodeBlockRendererProps,
+  LinkRendererProps,
+  MarkdownRenderers,
+} from "react-native-enriched-markdown";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { useFileLink } from "@/assistant-file-links";
+import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";
+import { HighlightedCodeBlock } from "@/components/highlighted-code-block";
+import type { Theme } from "@/styles/theme";
+import { MermaidFence } from "./fence/mermaid";
+import { markdownLinkSource } from "./source";
+
+const ThemedCodeBlock = withUnistyles(HighlightedCodeBlock);
+const codeStyle = (theme: Theme) => ({
+  inheritedStyles: {
+    color: theme.colors.foreground,
+    fontFamily: theme.fontFamily.mono,
+    fontSize: theme.fontSize.code,
+  },
+  textStyle: { backgroundColor: theme.colors.surface2, padding: 12, borderRadius: 8 },
+});
+function WebCodeBlock({ code, language }: CodeBlockRendererProps) {
+  if (language?.toLowerCase() === "mermaid") return <MermaidFence code={code} />;
+  return <ThemedCodeBlock code={code} language={language} uniProps={codeStyle} />;
+}
+
+function WebLink({ link, anchorProps, children }: LinkRendererProps) {
+  const { tooltipPath, onHoverIn } = useFileLink(markdownLinkSource(link.url, link.sourceType));
+  const anchorStyle = useMemo(
+    () => ({ ...anchorProps.style, overflowWrap: "anywhere" as const }),
+    [anchorProps.style],
+  );
+  const anchor = (
+    <a {...anchorProps} style={anchorStyle}>
+      {children}
+    </a>
+  );
+  return (
+    <Tooltip delayDuration={400}>
+      <TooltipTrigger asChild onHoverIn={onHoverIn}>
+        <InlineLinkTrigger>{anchor}</InlineLinkTrigger>
+      </TooltipTrigger>
+      {tooltipPath ? (
+        <TooltipContent side="top" align="start" maxWidth={520}>
+          <Text selectable={false} style={styles.tooltipPath}>
+            {tooltipPath}
+          </Text>
+        </TooltipContent>
+      ) : null}
+    </Tooltip>
+  );
+}
+// TooltipTrigger also supplies native Pressable handlers; forward only DOM events.
+// A View renders a div, which is invalid inside the library's prose paragraphs.
+const InlineLinkTrigger = forwardRef<HTMLSpanElement, ComponentProps<"span">>(
+  function InlineLinkTrigger({ children, onMouseEnter, onMouseLeave, onFocus, onBlur }, ref) {
+    return (
+      <span
+        ref={ref}
+        onMouseEnter={onMouseEnter}
+        onMouseLeave={onMouseLeave}
+        onFocus={onFocus}
+        onBlur={onBlur}
+      >
+        {children}
+      </span>
+    );
+  },
+);
+const styles = StyleSheet.create((theme) => ({
+  tooltipPath: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.normal,
+  },
+}));
+
+export const WEB_RENDERERS: MarkdownRenderers = { codeBlock: WebCodeBlock, link: WebLink };
diff --git a/packages/app/src/components/markdown/source.ts b/packages/app/src/components/markdown/source.ts
new file mode 100644
index 0000000000..fc6f7463a5
--- /dev/null
+++ b/packages/app/src/components/markdown/source.ts
@@ -0,0 +1,201 @@
+import { ASSISTANT_FILE_EXTENSIONS } from "@/assistant-file-links/extensions";
+import { normalizeMarkdownHtml } from "./html";
+import { gfmTable } from "micromark-extension-gfm-table";
+import { gfmTableFromMarkdown } from "mdast-util-gfm-table";
+import type { AssistantFileLinkSource } from "@/assistant-file-links";
+import { decodeString } from "micromark-util-decode-string";
+import { fromMarkdown } from "mdast-util-from-markdown";
+import type { Link, Nodes, Root } from "mdast";
+
+// Keep this regex in the syntax shared by JavaScript, ICU and java.util.regex.
+// The Unicode flag makes Metro expand it to escapes rejected by native engines.
+const PATH_CHARACTER = String.raw`[a-zA-Z0-9\u0080-\uFFFF_@.%+-]`;
+const PATH_LETTER = String.raw`[a-zA-Z]`;
+const PATH_SEGMENT = String.raw`${PATH_CHARACTER}*[a-zA-Z0-9\u0080-\uFFFF_@%+-]`;
+const LINE_SUFFIX = String.raw`(?::\d+(?::\d+)?(?:-\d+(?::\d+)?)?)?`;
+const FILE_EXTENSIONS = [...ASSISTANT_FILE_EXTENSIONS]
+  .map((extension) => extension.replace(/[a-z]/g, (letter) => `[${letter}${letter.toUpperCase()}]`))
+  .join("|");
+const PATH_PREFIX = String.raw`(?:[A-Za-z]:[\\/]|\.{0,2}\/|~\/)`;
+const HAS_PATH_LETTER = String.raw`(?=${PATH_CHARACTER}*(?:[\\/]${PATH_CHARACTER}*)*${PATH_LETTER})`;
+const SEPARATED_PATH = String.raw`${PATH_SEGMENT}(?:[\\/]${PATH_SEGMENT})+`;
+const FILE_NAME = String.raw`${PATH_SEGMENT}\.(?:${FILE_EXTENSIONS})`;
+// Bare prose paths need a known extension, a line suffix, or at least two separators.
+const PROSE_PATH = String.raw`(?:${PATH_PREFIX}${HAS_PATH_LETTER}${SEPARATED_PATH}|${HAS_PATH_LETTER}(?:${PATH_SEGMENT}(?:[\\/]${PATH_SEGMENT})*[\\/]${FILE_NAME}|${PATH_SEGMENT}(?:[\\/]${PATH_SEGMENT}){2,}|${SEPARATED_PATH}(?=:)))`;
+const INLINE_CODE_PATH = String.raw`${PATH_PREFIX}?${HAS_PATH_LETTER}${SEPARATED_PATH}`;
+
+function createFilePattern(path: string): RegExp {
+  // The native adapter mistakes a literal + in lookbehind for a quantifier; use its hex escape.
+  return new RegExp(
+    String.raw`(?:https?://[^\s<>]+|(?<![a-zA-Z0-9\u0080-\uFFFF_@.%\x2b~:/\\-])(?:${path}|${FILE_NAME})${LINE_SUFFIX}(?![a-zA-Z0-9\u0080-\uFFFF_@%+:/\\-]|\.${PATH_CHARACTER}))`,
+    "g",
+  );
+}
+
+const FILE_PATTERN = createFilePattern(PROSE_PATH);
+const INLINE_CODE_FILE_PATTERN = createFilePattern(INLINE_CODE_PATH);
+
+function linkMetadata() {
+  return {
+    linkRecognition: {
+      text: FILE_PATTERN,
+      inlineCode: new RegExp(
+        String.raw`^(?:${INLINE_CODE_FILE_PATTERN.source})(?:\(\d+(?:,\d+)?(?:-\d+(?:,\d+)?)?\)| lines? \d+(?:-\d+)?)?$`,
+      ),
+    },
+    linkSource: markdownLinkSource,
+  };
+}
+
+export function markdownLinkSource(
+  url: string,
+  sourceType?: "markdown" | "text" | "inline-code",
+): AssistantFileLinkSource {
+  if (sourceType === "inline-code") return { href: url, text: url, sourceType };
+  if (sourceType === "text") return { href: url, text: url, markup: "linkify" };
+  return { href: url, text: url };
+}
+
+// Generated by scripts/generate-markdown-image-placeholder.mjs; reserves the image box.
+export const PENDING_MARKDOWN_IMAGE =
+  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAoAAAAKACAYAAAAMzckjAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKBklEQVR42u3dXWscVRgH8ElFLK032tiCN1nSEiiowdKAn8DY2rR+AG965Qt4Y24Sm91kd5tN1ogQaGzzFfIl43Nki+s4u+m+ZWfC7weH0M6Z2QPn5s8zc87JMgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgKvm/Px8YXd3d7Hdbi/Ns6UxxHAWzAgAwIxE4LrebDafxd/f9/b2TkvSujGep2lsZggAYIr29/c/iZDVKlHwy7dmryIIAEA2hcpfo9Folzj89YdAlUAAgEml174VCH//tBjrhhkDAMgmXvDxn2/+4t+von0dbXmOC0CW6/X6ehpL/9iiUtnNLAwBAMgmef27mK+ypfCXlac6uZ4fX6fTuWXmAADGD4C1fMCKCtzdsowvjaUgoNbMHADA+AFwuSBgLRsfAIAAmL/vRrSVVqu1mipy0a4JgAAAVzAAbm9v34nrP0a/17l7/oz25PT09H0BEADgigTAnZ2d+3H9eNg2LXHvb9E+FAABACoeAFPl76Lw13f/r9mUtmoRAAEA5hQAe69933nD5uj/UAAEAKhoAOwt+Pgr1+cwFoB8Hn9vx159j+Lvm9xzfhEAAQCqGwBXCvp80d8n/u957vofAiAAQEUDYCz+WC3oczv3nMe5I9tOBEAAgOpWAP93Wkh67fv2+tnZ2Xtp9W+uz74ACABQ3QB4Le3zl+uTvvl73qv8vSh4xvcCIABAhVcB1+v1jRFWAb+OZ3x60RnE0b6Lvj+kFhXFZ3Hu75IACABQkgCYTvgoeM07aAuYx4N+7+jo6GZc/3nI/T9tbm7eFAABAEpwEkg64SOubw6r/EUl79tswCbQW1tbH8XikPZFATL1SX0FQACAEpwFnMJd2uQ57fMX7SjaSVrwkb75G/baNwW6uP5yhI2kX/buEQABAOYcAEd2Qfh7Edd2BoXA2Gx6VQAEAKhQABwU/tLJIrGwZC37d5HJWv60kd7r4K4ACABQkQCYwl88rz3gW8G1fP+o9n1ZFAIFQACACgTAUcPfKCFQAAQAKFkAHDf8vWsIFAABAEoUAId98xftwQjjejAoBHY6nXtmDgCgBAFwWuGvPwSmqmHB874ycwAAcw6A0w5/b8Ur40f5Z8Yr4vtmDgBgjgFwVuHPSSAAACUMgJMu+BAAAQAqFABnHf4EQACAEgXAywh/AiAAQEkC4GWFPwEQAKAEAfAyw58ACAAw5wB42eFPAAQAmE3AquUDVrvdvluG8Ncb372CAFgzcwAA4wesxXzAqtfr62UIf73xfVNwFNwtMwcAML6FCFXdXIXtVQS79fSqNdpn0Q4LqnBv0ikdUS1cmkVLv52e32g0TnK/e5jGbNoAALKJqmxPC6p7pWwx1idmDABg8gB4PcJVswLhb+/4+PgDMwYAMKVvAaO1yhz+0hjNFADAFKXqWnx3txHf3XVLFPwO02tflT8AgNlaSCtt02KMg4ODWlrpGyFsZVYLPoYsBPnYgg8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOBK+hsMQ7RDjzvGwwAAAABJRU5ErkJggg==";
+
+export interface MarkdownImage {
+  source: string;
+  alt: string;
+  title: string | null;
+  start: number;
+  end: number;
+}
+
+function workspaceHoverTitle(link: Link, markup: string, workspaceRoot?: string): string | null {
+  if (link.title !== null || !workspaceRoot || !link.url.startsWith(`${workspaceRoot}/`))
+    return null;
+  // mdast represents both missing titles and authored empty titles as null.
+  if (/\s(?:""|''|\(\))\s*\)$/.test(markup)) return null;
+  return link.url.slice(workspaceRoot.length + 1);
+}
+
+/** Preserve source spelling; adapt workspace images, spoiler delimiters, and entity text. */
+export function prepareMarkdownSource(
+  source: string,
+  workspaceRoot?: string,
+  options: { supportsSvg?: boolean } = {},
+) {
+  source = normalizeMarkdownHtml(source);
+  const images: MarkdownImage[] = [];
+  let tree: Root | undefined;
+  const getTree = () =>
+    (tree ??= fromMarkdown(source, {
+      extensions: [gfmTable()],
+      mdastExtensions: [gfmTableFromMarkdown()],
+    }));
+  const edits: { start: number; end: number; text: string }[] = [];
+  if (
+    !source.includes("![") &&
+    !source.includes("||") &&
+    !source.includes("&") &&
+    !(workspaceRoot && source.includes("]("))
+  ) {
+    return { images, ...linkMetadata(), render: () => source };
+  }
+
+  const definitions = new Map<string, { url: string; title?: string | null }>();
+  function definitionsIn(node: Nodes) {
+    if (node.type === "definition" && !definitions.has(node.identifier))
+      definitions.set(node.identifier, node);
+    if ("children" in node) node.children.forEach(definitionsIn);
+  }
+  definitionsIn(getTree());
+  function collectImage(
+    node: Extract<Nodes, { type: "image" | "imageReference" }>,
+    start: number,
+    end: number,
+  ) {
+    const target = node.type === "image" ? node : definitions.get(node.identifier);
+    if (
+      target &&
+      options.supportsSvg === false &&
+      /(?:\.svg(?:[?#]|$)|^data:image\/svg\+xml)/i.test(target.url)
+    ) {
+      edits.push({ start, end, text: escapeMarkdownText(node.alt ?? "") });
+      return;
+    }
+    if (target)
+      images.push({
+        source: target.url,
+        alt: node.alt ?? "",
+        title: target.title ?? null,
+        start,
+        end,
+      });
+  }
+  function visit(node: Nodes) {
+    const start = node.position?.start.offset;
+    const end = node.position?.end.offset;
+    if (start !== undefined && end !== undefined) {
+      if (node.type === "link") {
+        const title = workspaceHoverTitle(node, source.slice(start, end), workspaceRoot);
+        if (title !== null)
+          edits.push({ start: end - 1, end: end - 1, text: ` ${JSON.stringify(title)}` });
+      }
+      if (node.type === "tableRow") {
+        // MD4C's always-enabled spoiler extension otherwise consumes adjacent cell
+        // delimiters. Spaces keep empty GFM cells empty without producing spoilers.
+        const row = source.slice(start, end);
+        for (const match of row.matchAll(/(?<!\\)\|(?=\|)/g)) {
+          edits.push({ start: start + match.index + 1, end: start + match.index + 1, text: " " });
+        }
+      }
+      if (node.type === "image" || node.type === "imageReference") {
+        collectImage(node, start, end);
+        return;
+      }
+      if (node.type === "text") {
+        const text = source
+          .slice(start, end)
+          .replace(/(?<!\\)&(?:#(?:[xX][\da-fA-F]+|\d+)|[a-zA-Z][a-zA-Z\d]+);/g, (entity) =>
+            decodeString(entity).replace(/[!-/:-@[-`{-~]/g, "\\$&"),
+          )
+          .replace(/(?<!\\)\|\|/g, "\\|\\|");
+        if (text !== source.slice(start, end)) edits.push({ start, end, text });
+      }
+    }
+    if ("children" in node) node.children.forEach(visit);
+  }
+  visit(getTree());
+  return {
+    images,
+    ...linkMetadata(),
+    render(
+      urls: ReadonlyMap<string, string> = new Map(),
+      unavailableImages: ReadonlySet<string> = new Set(),
+      pendingImages: ReadonlySet<string> = new Set(),
+    ) {
+      const replacements = [...edits];
+      for (const image of images) {
+        const unavailable = unavailableImages.has(image.source);
+        const pending = pendingImages.has(image.source);
+        if (!unavailable && !pending && /^(https?:|data:|blob:)/i.test(image.source)) continue;
+        let url = unavailable ? undefined : urls.get(image.source);
+        if (pending && !unavailable) url = PENDING_MARKDOWN_IMAGE;
+        replacements.push({
+          start: image.start,
+          end: image.end,
+          text: url
+            ? `![${image.alt.replace(/[[\]\\]/g, "\\$&")}](<${url}>${image.title ? ` ${JSON.stringify(image.title)}` : ""})`
+            : escapeMarkdownText(image.alt),
+        });
+      }
+      let result = source;
+      for (const edit of replacements.sort((a, b) => b.start - a.start)) {
+        result = result.slice(0, edit.start) + edit.text + result.slice(edit.end);
+      }
+      return result;
+    },
+  };
+}
+
+function escapeMarkdownText(text: string): string {
+  return text.replace(/[!-/:-@[-`{-~]/g, "\\$&");
+}
diff --git a/packages/app/src/components/markdown/streaming.fixture.md b/packages/app/src/components/markdown/streaming.fixture.md
new file mode 100644
index 0000000000..da20f9dac7
--- /dev/null
+++ b/packages/app/src/components/markdown/streaming.fixture.md
@@ -0,0 +1,47 @@
+# Streaming feel experiment
+
+The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content. The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content. The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content.
+
+## Plan
+
+- Read the current state and identify the relevant boundary.
+- Keep the implementation small and verify the visible result.
+- Compare the recordings at their original playback speed.
+
+The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content. The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content.
+
+## Example
+
+```typescript
+const value1 = calculateTotal(items.slice(0, 1)); // update the next result
+const value2 = calculateTotal(items.slice(0, 2)); // update the next result
+const value3 = calculateTotal(items.slice(0, 3)); // update the next result
+const value4 = calculateTotal(items.slice(0, 4)); // update the next result
+const value5 = calculateTotal(items.slice(0, 5)); // update the next result
+const value6 = calculateTotal(items.slice(0, 6)); // update the next result
+const value7 = calculateTotal(items.slice(0, 7)); // update the next result
+const value8 = calculateTotal(items.slice(0, 8)); // update the next result
+const value9 = calculateTotal(items.slice(0, 9)); // update the next result
+const value10 = calculateTotal(items.slice(0, 10)); // update the next result
+const value11 = calculateTotal(items.slice(0, 11)); // update the next result
+const value12 = calculateTotal(items.slice(0, 12)); // update the next result
+```
+
+## Results
+
+| Stage  | Observation                              | Result |
+| ------ | ---------------------------------------- | ------ |
+| Step 1 | The next group of words becomes readable | Ready  |
+| Step 2 | The next group of words becomes readable | Ready  |
+| Step 3 | The next group of words becomes readable | Ready  |
+| Step 4 | The next group of words becomes readable | Ready  |
+| Step 5 | The next group of words becomes readable | Ready  |
+| Step 6 | The next group of words becomes readable | Ready  |
+| Step 7 | The next group of words becomes readable | Ready  |
+| Step 8 | The next group of words becomes readable | Ready  |
+
+## Explanation
+
+The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content. The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content. The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content. The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content. The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content. The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content. The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content. The stream should stay easy to follow while new text arrives. Small groups of words explain the next step without distracting from what is already readable. We keep the same fixture and delivery rate so differences come from rendering rather than the content.
+
+END STREAMING FEEL
diff --git a/packages/app/src/components/markdown/streaming.test.ts b/packages/app/src/components/markdown/streaming.test.ts
new file mode 100644
index 0000000000..ba18f28c89
--- /dev/null
+++ b/packages/app/src/components/markdown/streaming.test.ts
@@ -0,0 +1,71 @@
+import { readFileSync } from "node:fs";
+import { describe, expect, it } from "vitest";
+import { splitStreamingMarkdown } from "./streaming";
+
+describe("native streaming Markdown", () => {
+  it("keeps completed messages together for selection", () => {
+    const text = "First.\n\nSecond.\n\nThird.";
+    expect(splitStreamingMarkdown(text, false)).toEqual({ head: text, tail: "" });
+  });
+  it("commits earlier blocks only after the following source line is complete", () => {
+    expect(splitStreamingMarkdown("First.\n\nSecond", true).head).toBe("");
+    expect(splitStreamingMarkdown("First.\n\nSecond\n", true)).toEqual({
+      head: "First.\n\n",
+      tail: "Second\n",
+    });
+  });
+  it.each([
+    "- one\n\n- two\n",
+    "> first\n> second\n",
+    "Title\n---\n",
+    "```mermaid\ngraph LR\nA --> B\n```\n",
+    "- one\n  - nested\n\n    paragraph\n",
+    "    indented code\n\n    still code\n",
+    "| A | B |\n| --- | --- |\n| x | y |\n",
+    "```ts\nconst value = 1;\n```\n",
+    "<div>\nbody\n\nmore\n</div>\n",
+    "[label]\n\n[label]: /target\n",
+    "[label]: /target\n\n[label]\n",
+  ])("keeps an unfinished construct together: %s", (block) => {
+    const prefix = "Introduction.\n\n";
+    const source = prefix + block;
+    const split = splitStreamingMarkdown(source, true);
+    expect(split.head.length).toBeLessThanOrEqual(prefix.length);
+    expect(split.head + split.tail).toBe(source);
+    let previous = 0;
+    for (let end = 0; end <= source.length; end++) {
+      const prefixSplit = splitStreamingMarkdown(source.slice(0, end), true);
+      expect(prefixSplit.head.length, `prefix ${end} of ${source}`).toBeGreaterThanOrEqual(
+        previous,
+      );
+      previous = prefixSplit.head.length;
+    }
+  });
+  it("preserves the indentation that controls fence content and list continuation", () => {
+    for (const tail of ["   ```ts\n   const n = 1;\n", "   - first\n     continued\n"]) {
+      expect(splitStreamingMarkdown(`Intro.\n\n${tail}`, true)).toEqual({
+        head: "Intro.\n\n",
+        tail,
+      });
+    }
+  });
+  it("keeps unresolved references and HTML in the tail even after later blocks", () => {
+    for (const block of ["[label]", "[label]: /target", "<div>body</div>"]) {
+      expect(splitStreamingMarkdown(`Intro.\n\n${block}\n\nNext.\n\nEnd.\n`, true).head).toBe(
+        "Intro.\n\n",
+      );
+    }
+  });
+  it("never retreats or loses source across every prefix of mixed Markdown", () => {
+    const fixture = readFileSync(new URL("./streaming.fixture.md", import.meta.url), "utf8");
+    let previous = 0;
+    for (let end = 0; end <= fixture.length; end++) {
+      const text = fixture.slice(0, end);
+      const { head, tail } = splitStreamingMarkdown(text, true);
+      expect(head.length, `prefix ${end}`).toBeGreaterThanOrEqual(previous);
+      expect(head + tail).toBe(text);
+      previous = head.length;
+    }
+    expect(previous).toBeGreaterThan(1000);
+  }, 15000);
+});
diff --git a/packages/app/src/components/markdown/streaming.ts b/packages/app/src/components/markdown/streaming.ts
new file mode 100644
index 0000000000..1b6153ca44
--- /dev/null
+++ b/packages/app/src/components/markdown/streaming.ts
@@ -0,0 +1,32 @@
+import { fromMarkdown } from "mdast-util-from-markdown";
+import { gfmTable } from "micromark-extension-gfm-table";
+import { gfmTableFromMarkdown } from "mdast-util-gfm-table";
+import type { Nodes } from "mdast";
+
+// A later definition can resolve even a currently plain-text shortcut reference.
+// Keep its entire containing block, and all definitions, in the shared tail.
+// HTML normalization likewise needs the complete enclosing source.
+function needsDocumentContext(node: Nodes): boolean {
+  if (node.type === "html" || node.type === "definition") return true;
+  if (node.type === "linkReference" || node.type === "imageReference") return true;
+  if (node.type === "text" && node.value.includes("[")) return true;
+  return "children" in node && node.children.some(needsDocumentContext);
+}
+
+/** The last parsed block and unfinished line are mutable; earlier blocks are closed. */
+export function splitStreamingMarkdown(text: string, streaming: boolean) {
+  if (!streaming) return { head: text, tail: "" };
+  const completeLines = text.slice(0, text.lastIndexOf("\n") + 1);
+  const tree = fromMarkdown(completeLines, {
+    extensions: [gfmTable()],
+    mdastExtensions: [gfmTableFromMarkdown()],
+  });
+  let boundary = 0;
+  for (let index = 0; index < tree.children.length - 1; index++) {
+    if (needsDocumentContext(tree.children[index])) break;
+    // mdast starts some nodes after their indentation; the next parser needs it too.
+    const nextStart = tree.children[index + 1].position!.start.offset!;
+    boundary = text.lastIndexOf("\n", nextStart - 1) + 1;
+  }
+  return { head: text.slice(0, boundary), tail: text.slice(boundary) };
+}
diff --git a/packages/app/src/components/markdown/styles.ts b/packages/app/src/components/markdown/styles.ts
new file mode 100644
index 0000000000..03d6c69b23
--- /dev/null
+++ b/packages/app/src/components/markdown/styles.ts
@@ -0,0 +1,100 @@
+import type { MarkdownStyle } from "react-native-enriched-markdown";
+import type { Theme } from "@/styles/theme";
+import { isWeb } from "@/constants/platform";
+
+export function createMarkdownStyles(
+  theme: Theme,
+  compact = false,
+): { markdownStyle: MarkdownStyle; selectionColor: string } {
+  const fontSize = compact ? theme.fontSize.base : theme.fontSize.content;
+  const paragraph = {
+    fontSize,
+    fontFamily: theme.fontFamily.ui,
+    lineHeight: Math.round(fontSize * 1.4),
+    color: theme.colors.foreground,
+    marginTop: 0,
+    marginBottom: theme.spacing[3],
+  };
+  const heading = (scale: number) => ({
+    ...paragraph,
+    fontSize: Math.round(fontSize * scale),
+    lineHeight: Math.round(fontSize * scale * 1.3),
+    fontWeight: "bold",
+    marginTop: theme.spacing[3],
+  });
+  return {
+    selectionColor: theme.colors.terminal.selectionBackground,
+    markdownStyle: {
+      paragraph,
+      h1: heading(1.6),
+      h2: heading(1.4),
+      h3: heading(1.2),
+      h4: heading(1.1),
+      h5: heading(1),
+      h6: { ...heading(1), color: theme.colors.foregroundMuted },
+      list: {
+        ...paragraph,
+        bulletColor: theme.colors.foregroundMuted,
+        markerColor: theme.colors.foregroundMuted,
+        gapWidth: 7,
+        itemSpacing: 4,
+        marginLeft: 20,
+      },
+      blockquote: {
+        ...paragraph,
+        color: `${theme.colors.foreground}cc`,
+        backgroundColor: theme.colors.surface1,
+        borderColor: theme.colors.surface2,
+        borderWidth: 3,
+        padding: 12,
+        gapWidth: 8,
+        admonitions: {
+          note: { color: theme.colors.accentBright, backgroundColor: theme.colors.surface2 },
+          tip: { color: theme.colors.statusSuccess, backgroundColor: theme.colors.surface2 },
+          important: { color: theme.colors.statusMerged, backgroundColor: theme.colors.surface2 },
+          warning: { color: theme.colors.statusWarning, backgroundColor: theme.colors.surface2 },
+          caution: { color: theme.colors.statusDanger, backgroundColor: theme.colors.surface2 },
+        },
+      },
+      link: { color: theme.colors.accentBright, underline: false },
+      linkVariants: {
+        "^(?!https?://).+": {
+          color: theme.colors.accentBright,
+        },
+      },
+      code: {
+        fontFamily: theme.fontFamily.mono === "ui-monospace" && !isWeb ? "" : theme.fontFamily.mono,
+        fontSize: theme.fontSize.code,
+        color: theme.colors.foreground,
+        backgroundColor: theme.colors.surface2,
+        borderColor: "transparent",
+      },
+      codeBlock: {
+        ...paragraph,
+        fontFamily: theme.fontFamily.mono === "ui-monospace" && !isWeb ? "" : theme.fontFamily.mono,
+        fontSize: theme.fontSize.code,
+        backgroundColor: theme.colors.surface2,
+        borderColor: theme.colors.border,
+        borderRadius: 8,
+        padding: 12,
+      },
+      table: {
+        ...paragraph,
+        borderColor: theme.colors.border,
+        headerBackgroundColor: theme.colors.surface2,
+        headerTextColor: theme.colors.foreground,
+        rowEvenBackgroundColor: theme.colors.surface0,
+        rowOddBackgroundColor: theme.colors.surface1,
+      },
+      taskList: {
+        checkedTextColor: theme.colors.foregroundMuted,
+        checkedColor: theme.colors.accent,
+        checkmarkColor: theme.colors.accentForeground,
+        borderColor: theme.colors.foregroundMuted,
+      },
+      inlineImage: { size: paragraph.lineHeight },
+      image: { height: 320, resizeMode: "contain", borderRadius: 8 },
+      thematicBreak: { color: theme.colors.border, height: 1, marginTop: 12, marginBottom: 12 },
+    },
+  };
+}
diff --git a/packages/app/src/components/message.tsx b/packages/app/src/components/message.tsx
index 7915832470..314f414d48 100644
--- a/packages/app/src/components/message.tsx
+++ b/packages/app/src/components/message.tsx
@@ -1,53 +1,73 @@
-import type { AgentMessage } from "@getpaseo/protocol/agent-message";
-import { ASSISTANT_IMAGE_DEFAULT_ASPECT_RATIO } from "@/utils/assistant-image-metadata";
-import { LoadingSpinner } from "@/components/ui/loading-spinner";
+import { useStableEvent } from "@/hooks/use-stable-event";
+import { getAgentAttachmentPillContent } from "@/attachments/attachment-pill-content";
+import { AssistantForkMenu, type AssistantForkTarget } from "@/components/assistant-fork-menu";
+import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
+import {
+  AttachmentFrame,
+  AttachmentLabel,
+  AttachmentThumbnail,
+} from "@/components/attachment-pill";
+import { MarkdownRenderer } from "@/components/markdown/renderer";
+import { useRetainedPanelActive } from "@/components/retained-panel";
+import { RewindMenu, type RewindMode } from "@/components/rewind/rewind-menu";
+import { useRewindAgentMutation } from "@/components/rewind/use-rewind-agent-mutation";
 import { TaskListRow } from "@/components/task-list-row";
-import {
-  View,
-  Text,
-  Image,
-  Pressable,
-  type GestureResponderEvent,
-  type LayoutChangeEvent,
-  StyleProp,
-  ViewStyle,
-  type TextStyle,
-} from "react-native";
-import { useTranslation } from "react-i18next";
-import { MarkdownParagraphView, MarkdownTextSpan } from "@/components/markdown-text";
-import { MarkdownTableCellText } from "@/components/markdown-text-selection";
-import * as React from "react";
-import {
-  useState,
-  useEffect,
-  useRef,
-  memo,
-  useMemo,
-  useCallback,
-  createContext,
-  useContext,
-} from "react";
-import type { ComponentType, ReactNode } from "react";
-import type MarkdownIt from "markdown-it";
-import { type ASTNode, type RenderRules } from "react-native-markdown-display";
+import { LoadingSpinner } from "@/components/ui/loading-spinner";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { isNative, isWeb } from "@/constants/platform";
+import { useRevealedText, type MarkdownPhase } from "@/hooks/use-revealed-text";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
+import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
+import { buildToolCallPresentation } from "@/tool-calls/presentation";
+import type { TaskActivity, TodoEntry, UserMessageImageAttachment } from "@/types/stream";
+import { setAssistantMessageHeight } from "@/utils/assistant-message-height-estimate";
+import { isRenderProfileEnabled } from "@/utils/render-profiler";
+import { writeMarkdownToRichClipboard } from "@/utils/rich-clipboard";
+import { getDefaultMarkdownClipboardEnvironment } from "@/utils/rich-clipboard-default-environment";
+import { formatDuration, formatMessageTimestamp } from "@/utils/time";
+import { resolveToolCallIcon } from "@/utils/tool-call-icon";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
+import type { AgentCapabilityFlags, ToolCallDetail } from "@getpaseo/protocol/agent-types";
+import type { AgentAttachment } from "@getpaseo/protocol/messages";
 import MaskedView from "@react-native-masked-view/masked-view";
 import {
-  Info,
-  XCircle,
-  ChevronRight,
   Check,
   CheckSquare,
+  ChevronRight,
   CircleDot,
   Copy,
-  Plus,
-  TriangleAlertIcon,
-  Scissors,
-  MicVocal,
   FileSymlink,
+  Info,
+  MicVocal,
+  Plus,
+  Scissors,
+  TriangleAlertIcon,
+  XCircle,
 } from "lucide-react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
-import { useIsCompactFormFactor } from "@/constants/layout";
+import type { ComponentType, ReactNode } from "react";
+import * as React from "react";
+import {
+  createContext,
+  memo,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { useTranslation } from "react-i18next";
+import {
+  Pressable,
+  StyleProp,
+  Text,
+  View,
+  ViewStyle,
+  type GestureResponderEvent,
+  type LayoutChangeEvent,
+  type TextStyle,
+} from "react-native";
 import Animated, {
   Easing,
   cancelAnimation,
@@ -56,67 +76,14 @@ import Animated, {
   withRepeat,
   withTiming,
 } from "react-native-reanimated";
-import Svg, { Defs, LinearGradient as SvgLinearGradient, Rect, Stop } from "react-native-svg";
-import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
-import { MarkdownRenderer, type MarkdownStyles } from "@/components/markdown/renderer";
-import type { TaskActivity, TodoEntry, UserMessageImageAttachment } from "@/types/stream";
-import type { AgentAttachment } from "@getpaseo/protocol/messages";
-import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
-import { buildToolCallPresentation } from "@/tool-calls/presentation";
-import { resolveToolCallIcon } from "@/utils/tool-call-icon";
-import { getMarkdownListMarker, getMarkdownListSpacing } from "@/utils/markdown-list";
-import { markdownNodeContainsType } from "@/utils/markdown-ast";
-import { useStableEvent } from "@/hooks/use-stable-event";
-import { HighlightedCodeBlock } from "@/components/highlighted-code-block";
-import { MarkdownFenceBlock } from "@/components/markdown/fence";
-import type { MarkdownPhase } from "@/components/markdown/fence/types";
-import { splitMarkdownBlocks } from "@/utils/split-markdown-blocks";
-import { useRevealedText } from "@/hooks/use-revealed-text";
-import { colorMarkdownLinkChildren } from "@/components/markdown/link-children";
-import { createAssistantMarkdownParser } from "@/utils/assistant-markdown-parser";
-import { formatDuration, formatMessageTimestamp } from "@/utils/time";
-import { getTurnDurationLabel } from "./assistant-turn-footer-label";
-import { writeMarkdownToRichClipboard } from "@/utils/rich-clipboard";
-import { getDefaultMarkdownClipboardEnvironment } from "@/utils/rich-clipboard-default-environment";
-import { setAssistantMarkdownBlockHeight } from "@/utils/assistant-message-height-estimate";
-import { isRenderProfileEnabled } from "@/utils/render-profiler";
-import { getAgentAttachmentPillContent } from "@/attachments/attachment-pill-content";
-import { PlanCard } from "./plan-card";
-import { useToolCallSheet } from "./tool-call-sheet";
-import { ToolCallDetailsContent } from "./tool-call-details";
-import {
-  AssistantInlineCodePathLink,
-  type AssistantFileLinkSource,
-  AssistantMarkdownCodeLink,
-  AssistantMarkdownLink,
-  type InlinePathTarget,
-  useAssistantFileLinkActions,
-  useAssistantLinkPress,
-} from "@/assistant-file-links";
-import { getCompactionMarkerLabel } from "./message-compaction-label";
-import { useAssistantImage } from "@/assistant-image/use-assistant-image";
-import { localFileSourceToPath } from "@/attachments/utils";
-import {
-  AttachmentFrame,
-  AttachmentLabel,
-  AttachmentThumbnail,
-} from "@/components/attachment-pill";
-import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { isWeb, isNative } from "@/constants/platform";
-import type { AgentCapabilityFlags } from "@getpaseo/protocol/agent-types";
-import { RewindMenu, type RewindMode } from "@/components/rewind/rewind-menu";
-import { useRewindAgentMutation } from "@/components/rewind/use-rewind-agent-mutation";
-import { AssistantForkMenu, type AssistantForkTarget } from "@/components/assistant-fork-menu";
-import { useRetainedPanelActive } from "@/components/retained-panel";
-import {
-  markdownCopyDataSet,
-  markdownCopyImageDataSet,
-  markdownCopyOrderedListDataSet,
-  markdownCopyTableCellDataSet,
-  type MarkdownCopyInlineTag,
-} from "@/assistant-selection-copy/markup";
+import Svg, { Defs, Rect, Stop, LinearGradient as SvgLinearGradient } from "react-native-svg";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { capAssistantMessageForRender, getUtf8ByteLength } from "./assistant-message-render-limit";
+import { getTurnDurationLabel } from "./assistant-turn-footer-label";
+import { getCompactionMarkerLabel } from "./message-compaction-label";
+import { PlanCard } from "./plan-card";
+import { ToolCallDetailsContent } from "./tool-call-details";
+import { useToolCallSheet } from "./tool-call-sheet";
 export type { InlinePathTarget } from "@/assistant-file-links";
 export type { AssistantForkTarget };
 
@@ -159,20 +126,10 @@ function useDisableOuterSpacing(disableOuterSpacing: boolean | undefined) {
 
 const WEB_TOOLCALL_SHIMMER_KEYFRAME_ID = "paseo-toolcall-shimmer-keyframes";
 const WEB_TOOLCALL_SHIMMER_ANIMATION_NAME = "paseo-toolcall-shimmer";
-const MARKDOWN_ALLOWED_IMAGE_HANDLERS = [
-  "data:image/png;base64",
-  "data:image/gif;base64",
-  "data:image/jpeg;base64",
-  "https://",
-  "http://",
-] as const;
-const MARKDOWN_TOP_LEVEL_MAX_EXCEEDED_ITEM = <Text key="dotdotdot">...</Text>;
-
 const ThemedMicVocal = withUnistyles(MicVocal);
 const ThemedFileSymlinkIcon = withUnistyles(FileSymlink);
 const ThemedTriangleAlertIcon = withUnistyles(TriangleAlertIcon);
 const ThemedChevronRightIcon = withUnistyles(ChevronRight);
-const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 const ThemedNotificationInfo = withUnistyles(Info);
 const ThemedNotificationWarning = withUnistyles(TriangleAlertIcon);
 const ThemedNotificationError = withUnistyles(XCircle);
@@ -818,200 +775,6 @@ export const assistantMessageStylesheet = StyleSheet.create((theme) => ({
   },
 }));
 
-function AssistantMarkdownImage({
-  source,
-  occurrenceKey,
-  alt,
-  hasLeadingContent,
-  client,
-  workspaceRoot,
-  serverId,
-}: {
-  source: string;
-  occurrenceKey: string;
-  alt?: string;
-  hasLeadingContent: boolean;
-  client?: DaemonClient | null;
-  workspaceRoot?: string;
-  serverId?: string;
-}) {
-  const { t } = useTranslation();
-  const [viewerOpen, setViewerOpen] = useState(false);
-  const openViewer = useCallback(() => setViewerOpen(true), []);
-  const closeViewer = useCallback(() => setViewerOpen(false), []);
-  const containerStyle = useMemo<StyleProp<ViewStyle>>(
-    () => ({
-      marginTop: hasLeadingContent ? 16 : 0,
-      marginBottom: 0,
-    }),
-    [hasLeadingContent],
-  );
-  const image = useAssistantImage({
-    source,
-    occurrenceKey,
-    client,
-    workspaceRoot,
-    serverId,
-  });
-  const binding = image.status === "failed" ? null : image.binding;
-  const aspectRatio = image.status === "failed" ? null : image.aspectRatio;
-  const imageUri = binding?.uri ?? "";
-  const imageSource = useMemo(() => ({ uri: imageUri }), [imageUri]);
-  const frameStyle = useMemo<StyleProp<ViewStyle>>(
-    () => [assistantMessageStylesheet.imageFrame, containerStyle],
-    [containerStyle],
-  );
-  const imageSizeStyle = useMemo<ViewStyle>(() => {
-    if (image.status === "failed") return { height: 160 };
-    return { aspectRatio: aspectRatio ?? ASSISTANT_IMAGE_DEFAULT_ASPECT_RATIO };
-  }, [aspectRatio, image.status]);
-  const surfaceStyle = useMemo<StyleProp<ViewStyle>>(
-    () => [assistantMessageStylesheet.imageSurface, imageSizeStyle],
-    [imageSizeStyle],
-  );
-  const lightboxSource = useMemo<ImageLightboxSource | null>(() => {
-    if (!viewerOpen || !imageUri) return null;
-    return {
-      type: "uri",
-      uri: imageUri,
-      contentSize: aspectRatio ? { width: aspectRatio, height: 1 } : undefined,
-    };
-  }, [aspectRatio, imageUri, viewerOpen]);
-
-  const stateFrameStyle = useMemo<StyleProp<ViewStyle>>(
-    () => [
-      assistantMessageStylesheet.imageFrame,
-      containerStyle,
-      imageSizeStyle,
-      assistantMessageStylesheet.imageState,
-    ],
-    [containerStyle, imageSizeStyle],
-  );
-  const copyDataSet = useMemo(() => markdownCopyImageDataSet(source, alt), [source, alt]);
-
-  if (image.status === "failed") {
-    return (
-      <View style={stateFrameStyle} dataSet={copyDataSet}>
-        <Text style={assistantMessageStylesheet.imageErrorText}>{image.message}</Text>
-      </View>
-    );
-  }
-
-  if (!binding) {
-    return (
-      <View style={stateFrameStyle} dataSet={copyDataSet}>
-        <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
-      </View>
-    );
-  }
-
-  return (
-    <View style={frameStyle} dataSet={copyDataSet}>
-      <Pressable
-        accessibilityLabel={t("composer.attachments.openImage")}
-        accessibilityRole="button"
-        disabled={image.status !== "loaded"}
-        onPress={openViewer}
-        style={surfaceStyle}
-      >
-        <View
-          style={assistantMessageStylesheet.image}
-          accessibilityRole="image"
-          accessibilityLabel={alt}
-        >
-          <Image
-            ref={binding.onRef}
-            source={imageSource}
-            style={assistantMessageStylesheet.image}
-            resizeMode="contain"
-            onLoad={binding.onLoad}
-            onError={binding.onError}
-          />
-          {image.status === "loading" ? (
-            <View pointerEvents="none" style={assistantMessageStylesheet.imageLoadingOverlay}>
-              <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
-            </View>
-          ) : null}
-        </View>
-      </Pressable>
-      <AttachmentLightbox source={lightboxSource} onClose={closeViewer} />
-    </View>
-  );
-}
-
-function getInlineCodeAutoLinkUrl(markdownParser: MarkdownIt, content: string): string | null {
-  const trimmed = content.trim();
-  if (!trimmed) {
-    return null;
-  }
-
-  const matches:
-    | {
-        index: number;
-        lastIndex: number;
-        url: string;
-      }[]
-    | null = markdownParser.linkify.match(trimmed);
-  if (!matches || matches.length !== 1) {
-    return null;
-  }
-
-  const [match] = matches;
-  if (!match || match.index !== 0 || match.lastIndex !== trimmed.length) {
-    return null;
-  }
-
-  return match.url;
-}
-
-function getInlineCodeAutoLinkSource(input: {
-  href: string;
-  content: string;
-}): AssistantFileLinkSource {
-  return {
-    href: input.href,
-    text: input.content,
-    markup: "linkify",
-    sourceInfo: "auto",
-  };
-}
-
-interface AssistantMarkdownAstNode extends ASTNode {
-  sourceInfo?: string;
-}
-
-function getMarkdownLinkSource(node: AssistantMarkdownAstNode): AssistantFileLinkSource {
-  return {
-    href: typeof node.attributes?.href === "string" ? node.attributes.href : "",
-    text: getMarkdownNodeText(node),
-    title: typeof node.attributes?.title === "string" ? node.attributes.title : undefined,
-    markup: node.markup,
-    sourceInfo: node.sourceInfo,
-    sourceType: node.sourceType === "inline-code" ? "inline-code" : undefined,
-  };
-}
-
-function getMarkdownNodeText(node: ASTNode): string {
-  if (!node.children.length) {
-    return node.content ?? "";
-  }
-
-  return node.children.map(getMarkdownNodeText).join("");
-}
-
-function nodeHasParentType(parent: unknown, type: string): boolean {
-  if (Array.isArray(parent)) {
-    return parent.some((entry) => entry?.type === type);
-  }
-
-  return (
-    typeof parent === "object" &&
-    parent !== null &&
-    "type" in parent &&
-    (parent as Record<"type", unknown>)["type"] === type
-  );
-}
-
 const turnCopyButtonStylesheet = StyleSheet.create((theme) => ({
   container: {
     alignSelf: "flex-start",
@@ -1364,135 +1127,6 @@ function NativeShimmerPeakSvg({ gradientId }: { gradientId: string }) {
   );
 }
 
-interface AssistantMessageBlockContainerProps {
-  block: string;
-  marginBottom: number;
-  children: ReactNode;
-}
-
-function AssistantMessageBlockContainer({
-  block,
-  marginBottom,
-  children,
-}: AssistantMessageBlockContainerProps) {
-  const style = useMemo(() => (marginBottom > 0 ? { marginBottom } : undefined), [marginBottom]);
-  const handleLayout = useCallback(
-    (event: LayoutChangeEvent) => {
-      const { width, height } = event.nativeEvent.layout;
-      setAssistantMarkdownBlockHeight({ block, width, height });
-    },
-    [block],
-  );
-  return (
-    <View style={style} onLayout={isWeb ? handleLayout : undefined}>
-      {children}
-    </View>
-  );
-}
-
-interface MemoizedMarkdownBlockProps {
-  text: string;
-  rules: RenderRules;
-  parser: MarkdownIt;
-  onLinkPress: (url: string) => boolean;
-}
-
-const MemoizedMarkdownBlock = React.memo(function MemoizedMarkdownBlock({
-  text,
-  rules,
-  parser,
-  onLinkPress,
-}: MemoizedMarkdownBlockProps) {
-  return (
-    <MarkdownRenderer
-      text={text}
-      enableHtmlish={false}
-      rules={rules}
-      markdownit={parser}
-      onLinkPress={onLinkPress}
-      allowedImageHandlers={MARKDOWN_ALLOWED_IMAGE_HANDLERS}
-      topLevelMaxExceededItem={MARKDOWN_TOP_LEVEL_MAX_EXCEEDED_ITEM}
-    />
-  );
-});
-
-interface MarkdownInheritedTextProps {
-  inheritedStyles: TextStyle;
-  textStyle: TextStyle;
-  style?: StyleProp<TextStyle>;
-  monoSurface?: boolean;
-  copyTag?: MarkdownCopyInlineTag;
-  children: ReactNode;
-}
-
-function MarkdownInheritedText({
-  inheritedStyles,
-  textStyle,
-  style: overrideStyle,
-  monoSurface,
-  copyTag,
-  children,
-}: MarkdownInheritedTextProps) {
-  const style = useMemo(
-    () => [inheritedStyles, textStyle, overrideStyle],
-    [inheritedStyles, textStyle, overrideStyle],
-  );
-  // When this span renders link label text on iOS, pick up the link's press
-  // handler from context and hand it to MarkdownTextSpan, which forwards it to
-  // the leaf string children react-native-uitextview makes tappable. Null
-  // outside a link (and on every other platform, where no provider mounts), so
-  // ordinary text is unaffected. See assistant-file-links/link-press-context.
-  const linkPress = useAssistantLinkPress();
-  return (
-    <MarkdownTextSpan
-      monoSurface={monoSurface}
-      copyTag={copyTag}
-      style={style}
-      onPress={linkPress?.onPress}
-      accessibilityRole={linkPress?.accessibilityRole}
-    >
-      {children}
-    </MarkdownTextSpan>
-  );
-}
-
-interface MarkdownListItemContentProps {
-  contentStyle: ViewStyle;
-  children: ReactNode;
-}
-
-const MARKDOWN_LIST_ITEM_CONTENT_FLEX: ViewStyle = { flex: 1, flexShrink: 1, minWidth: 0 };
-
-function MarkdownListItemContent({ contentStyle, children }: MarkdownListItemContentProps) {
-  const style = useMemo(() => [contentStyle, MARKDOWN_LIST_ITEM_CONTENT_FLEX], [contentStyle]);
-  return <View style={style}>{children}</View>;
-}
-
-interface MarkdownListViewProps {
-  baseStyle: ViewStyle;
-  copyTag: "ol" | "ul";
-  orderedStart?: unknown;
-  spacing: { marginTop: number; marginBottom: number };
-  children: ReactNode;
-}
-
-function MarkdownListView({
-  baseStyle,
-  copyTag,
-  orderedStart,
-  spacing,
-  children,
-}: MarkdownListViewProps) {
-  const style = useMemo(() => [baseStyle, spacing], [baseStyle, spacing]);
-  const copyDataSet =
-    copyTag === "ol" ? markdownCopyOrderedListDataSet(orderedStart) : markdownCopyDataSet.ul;
-  return (
-    <View style={style} dataSet={copyDataSet}>
-      {children}
-    </View>
-  );
-}
-
 export const AssistantMessage = memo(function AssistantMessage({
   renderFullContent = false,
   occurrenceKey,
@@ -1505,11 +1139,6 @@ export const AssistantMessage = memo(function AssistantMessage({
   phase,
 }: AssistantMessageProps) {
   const { t } = useTranslation();
-  const markdownParser = useMemo(createAssistantMarkdownParser, []);
-  const streamingMarkdownParser = useMemo(
-    () => createAssistantMarkdownParser({ streaming: true }),
-    [],
-  );
   const renderedMessage = useMemo(
     () =>
       renderFullContent ? { text: message, capped: false } : capAssistantMessageForRender(message),
@@ -1522,449 +1151,6 @@ export const AssistantMessage = memo(function AssistantMessage({
     [message, phase, renderedMessage.capped],
   );
 
-  const fileLinkActions = useAssistantFileLinkActions();
-  const handleMarkdownLinkPress = useStableEvent((url: string) => {
-    fileLinkActions.open({ href: url }, "preferred");
-    // react-native-markdown-display opens the link itself when this returns true.
-    // We already handled it above, so return false to avoid duplicate opens.
-    return false;
-  });
-
-  const markdownRules = useMemo<RenderRules>(() => {
-    return {
-      heading1: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <View key={node.key} style={styles._VIEW_SAFE_heading1} dataSet={markdownCopyDataSet.h1}>
-          {children}
-        </View>
-      ),
-      heading2: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <View key={node.key} style={styles._VIEW_SAFE_heading2} dataSet={markdownCopyDataSet.h2}>
-          {children}
-        </View>
-      ),
-      heading3: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <View key={node.key} style={styles._VIEW_SAFE_heading3} dataSet={markdownCopyDataSet.h3}>
-          {children}
-        </View>
-      ),
-      heading4: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <View key={node.key} style={styles._VIEW_SAFE_heading4} dataSet={markdownCopyDataSet.h4}>
-          {children}
-        </View>
-      ),
-      heading5: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <View key={node.key} style={styles._VIEW_SAFE_heading5} dataSet={markdownCopyDataSet.h5}>
-          {children}
-        </View>
-      ),
-      heading6: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <View key={node.key} style={styles._VIEW_SAFE_heading6} dataSet={markdownCopyDataSet.h6}>
-          {children}
-        </View>
-      ),
-      blockquote: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <View
-          key={node.key}
-          style={styles._VIEW_SAFE_blockquote}
-          dataSet={markdownCopyDataSet.blockquote}
-        >
-          {children}
-        </View>
-      ),
-      hr: (node: ASTNode, _children: ReactNode[], _parent: ASTNode[], styles: MarkdownStyles) => (
-        <View key={node.key} style={styles._VIEW_SAFE_hr} dataSet={markdownCopyDataSet.hr} />
-      ),
-      table: (node: ASTNode, children: ReactNode[], _parent: ASTNode[], styles: MarkdownStyles) => (
-        <View key={node.key} style={styles._VIEW_SAFE_table} dataSet={markdownCopyDataSet.table}>
-          {children}
-        </View>
-      ),
-      thead: (node: ASTNode, children: ReactNode[], _parent: ASTNode[], styles: MarkdownStyles) => (
-        <View key={node.key} style={styles._VIEW_SAFE_thead} dataSet={markdownCopyDataSet.thead}>
-          {children}
-        </View>
-      ),
-      tbody: (node: ASTNode, children: ReactNode[], _parent: ASTNode[], styles: MarkdownStyles) => (
-        <View key={node.key} style={styles._VIEW_SAFE_tbody} dataSet={markdownCopyDataSet.tbody}>
-          {children}
-        </View>
-      ),
-      tr: (node: ASTNode, children: ReactNode[], _parent: ASTNode[], styles: MarkdownStyles) => (
-        <View key={node.key} style={styles._VIEW_SAFE_tr} dataSet={markdownCopyDataSet.tr}>
-          {children}
-        </View>
-      ),
-      text: (
-        node: ASTNode,
-        _children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-        inheritedStyles: TextStyle = {},
-      ) => (
-        <MarkdownInheritedText
-          key={node.key}
-          inheritedStyles={inheritedStyles}
-          textStyle={styles.text}
-        >
-          {node.content}
-        </MarkdownInheritedText>
-      ),
-      textgroup: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-        inheritedStyles: TextStyle = {},
-      ) => (
-        <MarkdownInheritedText
-          key={node.key}
-          inheritedStyles={inheritedStyles}
-          textStyle={styles.textgroup}
-        >
-          {children}
-        </MarkdownInheritedText>
-      ),
-      // strong/em/s have no custom rule in react-native-markdown-display's
-      // defaults beyond wrapping children in a plain RN <Text>. On iOS the
-      // paragraph/textgroup are native UITextViews (see markdown-text.ios.tsx),
-      // and a plain <Text> nested inside one is not hoisted into a
-      // UITextViewChild, so its content renders invisibly. Route these inline
-      // marks through MarkdownTextSpan (same path as text/textgroup) so the
-      // styled content composes and stays visible + selectable on iOS.
-      strong: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-        inheritedStyles: TextStyle = {},
-      ) => (
-        <MarkdownInheritedText
-          key={node.key}
-          copyTag="strong"
-          inheritedStyles={inheritedStyles}
-          textStyle={styles.strong}
-        >
-          {children}
-        </MarkdownInheritedText>
-      ),
-      em: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-        inheritedStyles: TextStyle = {},
-      ) => (
-        <MarkdownInheritedText
-          key={node.key}
-          copyTag="em"
-          inheritedStyles={inheritedStyles}
-          textStyle={styles.em}
-        >
-          {children}
-        </MarkdownInheritedText>
-      ),
-      s: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-        inheritedStyles: TextStyle = {},
-      ) => (
-        <MarkdownInheritedText
-          key={node.key}
-          copyTag="s"
-          inheritedStyles={inheritedStyles}
-          textStyle={styles.s}
-        >
-          {children}
-        </MarkdownInheritedText>
-      ),
-      // hardbreak/softbreak fall back to react-native-markdown-display's
-      // default, a plain RN <Text>{"\n"}. Inside the paragraph UITextView that
-      // plain <Text> is not hoisted into a UITextViewChild and is dropped (same
-      // root cause as strong/em/s) — so on iOS a hard line break vanished, and
-      // a softbreak between words jammed them together ("one\ntwo" -> "onetwo").
-      // Emit the break through MarkdownTextSpan so it composes on iOS. Keep
-      // the resolved break styles: hardbreak is a full-width flex-row child on
-      // Android, and dropping that width joins the surrounding text spans.
-      hardbreak: (
-        node: ASTNode,
-        _children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <MarkdownTextSpan key={node.key} style={styles.hardbreak} copyTag="br">
-          {"\n"}
-        </MarkdownTextSpan>
-      ),
-      softbreak: (
-        node: ASTNode,
-        _children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <MarkdownTextSpan key={node.key} style={styles.softbreak}>
-          {"\n"}
-        </MarkdownTextSpan>
-      ),
-      code_block: (
-        node: ASTNode,
-        _children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-        inheritedStyles: TextStyle = {},
-      ) => (
-        <HighlightedCodeBlock
-          key={node.key}
-          code={node.content}
-          language={null}
-          inheritedStyles={inheritedStyles}
-          textStyle={styles.code_block}
-        />
-      ),
-      fence: (
-        node: ASTNode,
-        _children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-        inheritedStyles: TextStyle = {},
-      ) => (
-        <MarkdownFenceBlock
-          key={node.key}
-          code={node.content}
-          info={node.sourceInfo}
-          phase={phase}
-          inheritedStyles={inheritedStyles}
-          textStyle={styles.fence}
-        />
-      ),
-      code_inline: (
-        node: ASTNode,
-        _children: ReactNode[],
-        parent: ASTNode[],
-        styles: MarkdownStyles,
-        inheritedStyles: TextStyle = {},
-      ) => {
-        const content = node.content ?? "";
-        const isLinkedInlineCode = nodeHasParentType(parent, "link");
-        const inlineCodeSource: AssistantFileLinkSource = {
-          href: content,
-          text: content,
-          sourceType: "inline-code",
-        };
-        const shouldResolveInlinePath =
-          !isLinkedInlineCode && fileLinkActions.canResolveFile(inlineCodeSource);
-
-        if (shouldResolveInlinePath) {
-          return (
-            <AssistantInlineCodePathLink
-              key={node.key}
-              content={content}
-              inheritedStyles={inheritedStyles}
-              codeInlineStyle={styles.code_inline}
-              linkStyle={styles.link}
-            />
-          );
-        }
-
-        const inlineCodeLinkUrl = getInlineCodeAutoLinkUrl(markdownParser, content);
-        if (inlineCodeLinkUrl) {
-          const source = getInlineCodeAutoLinkSource({
-            href: inlineCodeLinkUrl,
-            content,
-          });
-          return (
-            <AssistantMarkdownCodeLink
-              key={node.key}
-              source={source}
-              inheritedStyles={inheritedStyles}
-              codeInlineStyle={styles.code_inline}
-              linkStyle={styles.link}
-            >
-              {content}
-            </AssistantMarkdownCodeLink>
-          );
-        }
-
-        return (
-          <MarkdownInheritedText
-            key={node.key}
-            copyTag="code"
-            inheritedStyles={inheritedStyles}
-            textStyle={styles.code_inline}
-            monoSurface
-          >
-            {content}
-          </MarkdownInheritedText>
-        );
-      },
-      bullet_list: (
-        node: ASTNode,
-        children: ReactNode[],
-        parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <MarkdownListView
-          key={node.key}
-          baseStyle={styles.bullet_list}
-          copyTag="ul"
-          spacing={getMarkdownListSpacing(node, parent)}
-        >
-          {children}
-        </MarkdownListView>
-      ),
-      ordered_list: (
-        node: ASTNode,
-        children: ReactNode[],
-        parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <MarkdownListView
-          key={node.key}
-          baseStyle={styles.ordered_list}
-          copyTag="ol"
-          orderedStart={node.attributes?.start}
-          spacing={getMarkdownListSpacing(node, parent)}
-        >
-          {children}
-        </MarkdownListView>
-      ),
-      list_item: (
-        node: ASTNode,
-        children: ReactNode[],
-        parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => {
-        const { isOrdered, marker } = getMarkdownListMarker(node, parent);
-        const iconStyle = isOrdered ? styles.ordered_list_icon : styles.bullet_list_icon;
-        const contentStyle = isOrdered ? styles.ordered_list_content : styles.bullet_list_content;
-
-        return (
-          <View key={node.key} style={styles.list_item} dataSet={markdownCopyDataSet.li}>
-            <Text style={iconStyle} dataSet={markdownCopyDataSet.listMarker}>
-              {marker}
-            </Text>
-            <MarkdownListItemContent contentStyle={contentStyle}>
-              {children}
-            </MarkdownListItemContent>
-          </View>
-        );
-      },
-      th: (node: ASTNode, children: ReactNode[], _parent: ASTNode[], styles: MarkdownStyles) => (
-        <MarkdownTableCellText key={node.key}>
-          <View
-            style={styles._VIEW_SAFE_th}
-            dataSet={markdownCopyTableCellDataSet("th", node.attributes?.style)}
-          >
-            {children}
-          </View>
-        </MarkdownTableCellText>
-      ),
-      td: (node: ASTNode, children: ReactNode[], _parent: ASTNode[], styles: MarkdownStyles) => (
-        <MarkdownTableCellText key={node.key}>
-          <View
-            style={styles._VIEW_SAFE_td}
-            dataSet={markdownCopyTableCellDataSet("td", node.attributes?.style)}
-          >
-            {children}
-          </View>
-        </MarkdownTableCellText>
-      ),
-      paragraph: (
-        node: ASTNode,
-        children: ReactNode[],
-        _parent: ASTNode[],
-        styles: MarkdownStyles,
-      ) => (
-        <MarkdownParagraphView
-          key={node.key}
-          paragraphStyle={styles.paragraph}
-          containsImage={markdownNodeContainsType(node, "image")}
-        >
-          {children}
-        </MarkdownParagraphView>
-      ),
-      link: (node: ASTNode, children: ReactNode[], _parent: ASTNode[], styles: MarkdownStyles) => (
-        <AssistantMarkdownLink
-          key={node.key}
-          source={getMarkdownLinkSource(node)}
-          style={styles.link}
-        >
-          {colorMarkdownLinkChildren(children, styles.link.color)}
-        </AssistantMarkdownLink>
-      ),
-      image: (
-        node: ASTNode,
-        _children: ReactNode[],
-        parent: ASTNode[],
-        _styles: MarkdownStyles,
-      ) => {
-        const paragraphNode = Array.isArray(parent)
-          ? parent.find((ancestor) => ancestor?.type === "paragraph")
-          : null;
-        const paragraphChildren = Array.isArray(paragraphNode?.children)
-          ? paragraphNode.children
-          : [];
-        const imageIndex = paragraphChildren.findIndex((child: ASTNode) => child?.key === node.key);
-        const hasLeadingContent = imageIndex > 0;
-
-        return (
-          <AssistantMarkdownImage
-            key={node.key}
-            source={localFileSourceToPath(String(node.attributes?.src ?? ""), { decodeHref: true })}
-            occurrenceKey={`${occurrenceKey}:${node.key}`}
-            alt={typeof node.attributes?.alt === "string" ? node.attributes.alt : undefined}
-            hasLeadingContent={hasLeadingContent}
-            client={client}
-            workspaceRoot={workspaceRoot}
-            serverId={serverId}
-          />
-        );
-      },
-    };
-  }, [client, fileLinkActions, markdownParser, occurrenceKey, phase, serverId, workspaceRoot]);
-
-  const blocks = useMemo(() => splitMarkdownBlocks(revealedMessage), [revealedMessage]);
-  const keyedBlocks = useMemo(
-    () => blocks.map((block, index) => ({ key: `block:${index}`, block })),
-    [blocks],
-  );
-
   const assistantContainerStyle = useMemo(
     () => [
       assistantMessageStylesheet.container,
@@ -1987,26 +1173,23 @@ export const AssistantMessage = memo(function AssistantMessage({
     [occurrenceKey, revealedMessage.length],
   );
 
+  const measureMessage = useStableEvent((event: import("react-native").LayoutChangeEvent) => {
+    setAssistantMessageHeight({ markdown: revealedMessage, ...event.nativeEvent.layout });
+  });
   return (
-    <View testID="assistant-message" dataSet={revealDataSet} style={assistantContainerStyle}>
-      {keyedBlocks.map(({ key, block }, index) => (
-        <AssistantMessageBlockContainer
-          key={key}
-          block={block}
-          marginBottom={index < keyedBlocks.length - 1 ? 12 : 0}
-        >
-          <MemoizedMarkdownBlock
-            text={block}
-            rules={markdownRules}
-            parser={
-              phase === "streaming" && index === keyedBlocks.length - 1
-                ? streamingMarkdownParser
-                : markdownParser
-            }
-            onLinkPress={handleMarkdownLinkPress}
-          />
-        </AssistantMessageBlockContainer>
-      ))}
+    <View
+      testID="assistant-message"
+      dataSet={revealDataSet}
+      style={assistantContainerStyle}
+      onLayout={measureMessage}
+    >
+      <MarkdownRenderer
+        text={revealedMessage}
+        streaming={phase !== "complete" || revealedMessage.length < renderedMessage.text.length}
+        client={client}
+        workspaceRoot={workspaceRoot}
+        serverId={serverId}
+      />
       {fullMessageByteLength !== null ? (
         <Text
           testID="assistant-message-capped-notice"
diff --git a/packages/app/src/components/plan-card.tsx b/packages/app/src/components/plan-card.tsx
index 52c70683fb..c0456f524d 100644
--- a/packages/app/src/components/plan-card.tsx
+++ b/packages/app/src/components/plan-card.tsx
@@ -1,194 +1,11 @@
-import { useCallback, useMemo, useState, type ReactNode } from "react";
-import {
-  Pressable,
-  Text,
-  View,
-  type StyleProp,
-  type TextStyle,
-  type ViewStyle,
-} from "react-native";
-import { type ASTNode } from "react-native-markdown-display";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { useTranslation } from "react-i18next";
 import { MarkdownRenderer } from "@/components/markdown/renderer";
-import { ChevronRight } from "lucide-react-native";
 import { isWeb } from "@/constants/platform";
 import type { Theme } from "@/styles/theme";
-import { getMarkdownListMarker } from "@/utils/markdown-list";
-import { createMarkdownParser } from "@/utils/markdown-parser";
-
-// Without this prop react-native-markdown-display builds its own parser with
-// `typographer: true`, which would render a plan's literal `(c)` as ©. Its
-// default also leaves linkify off, so this one keeps bare URLs as plain text.
-const planMarkdownParser = createMarkdownParser({ linkify: false });
-
-type MarkdownRuleStyles = Record<string, TextStyle & ViewStyle & { [key: string]: unknown }>;
-
-function MarkdownInlineText({
-  inheritedStyle,
-  ruleStyle,
-  children,
-}: {
-  inheritedStyle: StyleProp<TextStyle>;
-  ruleStyle: StyleProp<TextStyle>;
-  children: ReactNode;
-}) {
-  const style = useMemo(() => [inheritedStyle, ruleStyle], [inheritedStyle, ruleStyle]);
-  return <Text style={style}>{children}</Text>;
-}
-
-function MarkdownListItemContent({
-  contentStyle,
-  children,
-}: {
-  contentStyle: StyleProp<ViewStyle>;
-  children: ReactNode;
-}) {
-  const style = useMemo(() => [contentStyle, LIST_ITEM_CONTENT_INNER], [contentStyle]);
-  return <View style={style}>{children}</View>;
-}
-
-function MarkdownParagraph({
-  paragraphStyle,
-  isLastChild,
-  children,
-}: {
-  paragraphStyle: StyleProp<ViewStyle>;
-  isLastChild: boolean;
-  children: ReactNode;
-}) {
-  const style = useMemo<StyleProp<ViewStyle>>(
-    () => [paragraphStyle, isLastChild ? PARAGRAPH_LAST_CHILD : null],
-    [paragraphStyle, isLastChild],
-  );
-  return <View style={style}>{children}</View>;
-}
-
-function createPlanMarkdownRules() {
-  return {
-    text: (
-      node: ASTNode,
-      _children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownRuleStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownInlineText key={node.key} inheritedStyle={inheritedStyles} ruleStyle={styles.text}>
-        {node.content}
-      </MarkdownInlineText>
-    ),
-    textgroup: (
-      node: ASTNode,
-      children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownRuleStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownInlineText
-        key={node.key}
-        inheritedStyle={inheritedStyles}
-        ruleStyle={styles.textgroup}
-      >
-        {children}
-      </MarkdownInlineText>
-    ),
-    code_block: (
-      node: ASTNode,
-      _children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownRuleStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownInlineText
-        key={node.key}
-        inheritedStyle={inheritedStyles}
-        ruleStyle={styles.code_block}
-      >
-        {node.content}
-      </MarkdownInlineText>
-    ),
-    fence: (
-      node: ASTNode,
-      _children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownRuleStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownInlineText key={node.key} inheritedStyle={inheritedStyles} ruleStyle={styles.fence}>
-        {node.content}
-      </MarkdownInlineText>
-    ),
-    code_inline: (
-      node: ASTNode,
-      _children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownRuleStyles,
-      inheritedStyles: TextStyle = {},
-    ) => (
-      <MarkdownInlineText
-        key={node.key}
-        inheritedStyle={inheritedStyles}
-        ruleStyle={styles.code_inline}
-      >
-        {node.content}
-      </MarkdownInlineText>
-    ),
-    bullet_list: (
-      node: ASTNode,
-      children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownRuleStyles,
-    ) => (
-      <View key={node.key} style={styles.bullet_list}>
-        {children}
-      </View>
-    ),
-    ordered_list: (
-      node: ASTNode,
-      children: ReactNode[],
-      _parent: ASTNode[],
-      styles: MarkdownRuleStyles,
-    ) => (
-      <View key={node.key} style={styles.ordered_list}>
-        {children}
-      </View>
-    ),
-    list_item: (
-      node: ASTNode,
-      children: ReactNode[],
-      parent: ASTNode[],
-      styles: MarkdownRuleStyles,
-    ) => {
-      const { isOrdered, marker } = getMarkdownListMarker(node, parent);
-      const iconStyle = isOrdered ? styles.ordered_list_icon : styles.bullet_list_icon;
-      const contentStyle = isOrdered ? styles.ordered_list_content : styles.bullet_list_content;
-
-      return (
-        <View key={node.key} style={styles.list_item}>
-          <Text style={iconStyle}>{marker}</Text>
-          <MarkdownListItemContent contentStyle={contentStyle}>{children}</MarkdownListItemContent>
-        </View>
-      );
-    },
-    paragraph: (
-      node: ASTNode,
-      children: ReactNode[],
-      parent: ASTNode[],
-      styles: MarkdownRuleStyles,
-    ) => {
-      const isLastChild = parent[0]?.children?.at(-1)?.key === node.key;
-      return (
-        <MarkdownParagraph
-          key={node.key}
-          paragraphStyle={styles.paragraph}
-          isLastChild={isLastChild}
-        >
-          {children}
-        </MarkdownParagraph>
-      );
-    },
-  };
-}
+import { ChevronRight } from "lucide-react-native";
+import { useCallback, useMemo, useState, type ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+import { Pressable, Text, View } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
 
 export type PlanOutcome = "pending" | "approved" | "rejected" | "canceled";
 
@@ -204,7 +21,6 @@ interface PlanCardProps {
 
 const ThemedChevron = withUnistyles(ChevronRight);
 const chevronColor = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-const markdownRules = createPlanMarkdownRules();
 
 export function PlanCard(props: PlanCardProps) {
   // A resolution starts its own presentation state; subsequent taps stay local.
@@ -262,7 +78,7 @@ function PlanCardContent({
       {expanded ? (
         <View style={styles.body}>
           {description ? <Text style={styles.description}>{description}</Text> : null}
-          <MarkdownRenderer text={text} rules={markdownRules} markdownit={planMarkdownParser} />
+          <MarkdownRenderer text={text} />
         </View>
       ) : null}
       {footer ? <View style={styles.footer}>{footer}</View> : null}
@@ -307,6 +123,3 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[2],
   },
 }));
-
-const LIST_ITEM_CONTENT_INNER = { flex: 1, flexShrink: 1, minWidth: 0 };
-const PARAGRAPH_LAST_CHILD = { marginBottom: 0 };
diff --git a/packages/app/src/components/ui/tooltip.tsx b/packages/app/src/components/ui/tooltip.tsx
index 22796e7ffe..72803f06d0 100644
--- a/packages/app/src/components/ui/tooltip.tsx
+++ b/packages/app/src/components/ui/tooltip.tsx
@@ -41,10 +41,12 @@ interface Rect {
   height: number;
 }
 
+type TooltipTriggerElement = View | HTMLElement;
+
 interface TooltipContextValue {
   open: boolean;
   setOpen: (open: boolean) => void;
-  triggerRef: React.RefObject<View | null>;
+  triggerRef: React.RefObject<TooltipTriggerElement | null>;
   enabled: boolean;
   openOnPress: boolean;
   delayDuration: number;
@@ -120,12 +122,19 @@ function useControllableOpenState({
   return [value, setValue];
 }
 
-function measureElement(element: View): Promise<Rect> {
-  return new Promise((resolve) => {
-    element.measureInWindow((x, y, width, height) => {
-      resolve({ x, y, width, height });
+function measureElement(element: TooltipTriggerElement): Promise<Rect> {
+  if (isWeb && element instanceof HTMLElement) {
+    const { x, y, width, height } = element.getBoundingClientRect();
+    return Promise.resolve({ x, y, width, height });
+  }
+  if ("measureInWindow" in element) {
+    return new Promise((resolve) => {
+      element.measureInWindow((x, y, width, height) => {
+        resolve({ x, y, width, height });
+      });
     });
-  });
+  }
+  throw new Error("A DOM tooltip trigger requires the web platform");
 }
 
 function resolveActualSide(args: {
@@ -240,7 +249,7 @@ export function Tooltip({
   enabledOnDesktop?: boolean;
   enabledOnMobile?: boolean;
 }>): ReactElement {
-  const triggerRef = useRef<View>(null);
+  const triggerRef = useRef<TooltipTriggerElement>(null);
   const [isOpen, setIsOpen] = useControllableOpenState({
     open,
     defaultOpen,
@@ -282,6 +291,12 @@ export function TooltipTrigger({
   triggerRefProp?: string;
 }): ReactElement {
   const ctx = useTooltipContext("TooltipTrigger");
+  const setTriggerRef = useCallback(
+    (node: View | null) => {
+      ctx.triggerRef.current = node;
+    },
+    [ctx.triggerRef],
+  );
   const openTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   const clearOpenTimer = useCallback(() => {
@@ -411,7 +426,7 @@ export function TooltipTrigger({
     };
 
     const existingRefProp = Reflect.get(rawProps, triggerRefProp);
-    mergedProps[triggerRefProp] = (node: View) => {
+    mergedProps[triggerRefProp] = (node: TooltipTriggerElement) => {
       if (isCallable(existingRefProp)) {
         existingRefProp(node);
       } else if (existingRefProp && typeof existingRefProp === "object") {
@@ -424,7 +439,7 @@ export function TooltipTrigger({
   }
 
   return (
-    <Pressable {...triggerProps} ref={ctx.triggerRef} collapsable={false}>
+    <Pressable {...triggerProps} ref={setTriggerRef} collapsable={false}>
       {children}
     </Pressable>
   );
diff --git a/packages/app/src/file-pane/markdown-preview/index.tsx b/packages/app/src/file-pane/markdown-preview/index.tsx
index a79705323f..8a45b5c296 100644
--- a/packages/app/src/file-pane/markdown-preview/index.tsx
+++ b/packages/app/src/file-pane/markdown-preview/index.tsx
@@ -1,16 +1,9 @@
-import { useMemo } from "react";
+import { MarkdownRenderer } from "@/components/markdown/renderer";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import type { ASTNode, RenderRules } from "react-native-markdown-display";
+import { useMemo } from "react";
 import { Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
-import {
-  createSharedMarkdownRules,
-  MarkdownRenderer,
-  type MarkdownStyles,
-} from "@/components/markdown/renderer";
 import { parseMarkdownPreviewDocument } from "./document";
-import { resolveMarkdownPreviewImageSource } from "./image-source";
-import { FileMarkdownPreviewImage } from "./preview-image";
 
 export function FileMarkdownPreview({
   source,
@@ -26,34 +19,6 @@ export function FileMarkdownPreview({
   serverId?: string;
 }) {
   const document = useMemo(() => parseMarkdownPreviewDocument(source), [source]);
-  const rules = useMemo<RenderRules>(
-    () => ({
-      ...createSharedMarkdownRules(),
-      image: (node: ASTNode, _children, _parent: ASTNode[], _styles: MarkdownStyles) => {
-        const resolved = resolveMarkdownPreviewImageSource({
-          source: String(node.attributes?.src ?? ""),
-          markdownPath: filePath,
-          workspaceRoot,
-        });
-        if (!resolved) {
-          return null;
-        }
-
-        return (
-          <FileMarkdownPreviewImage
-            key={node.key}
-            source={resolved}
-            occurrenceKey={`${filePath}:${node.key}`}
-            alt={typeof node.attributes?.alt === "string" ? node.attributes.alt : undefined}
-            client={client}
-            workspaceRoot={workspaceRoot}
-            serverId={serverId}
-          />
-        );
-      },
-    }),
-    [client, filePath, serverId, workspaceRoot],
-  );
 
   return (
     <View style={styles.outerGutter}>
@@ -79,7 +44,13 @@ export function FileMarkdownPreview({
             ))}
           </View>
         ) : null}
-        <MarkdownRenderer text={document.body} rules={rules} />
+        <MarkdownRenderer
+          text={document.body}
+          filePath={filePath}
+          workspaceRoot={workspaceRoot}
+          client={client}
+          serverId={serverId}
+        />
       </View>
     </View>
   );
diff --git a/packages/app/src/file-pane/markdown-preview/preview-image.tsx b/packages/app/src/file-pane/markdown-preview/preview-image.tsx
deleted file mode 100644
index ef27c14978..0000000000
--- a/packages/app/src/file-pane/markdown-preview/preview-image.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-import { useCallback, useMemo, useState } from "react";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { useTranslation } from "react-i18next";
-import { Image, Pressable, Text, View, type StyleProp, type ViewStyle } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { useAssistantImage } from "@/assistant-image/use-assistant-image";
-import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
-import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import type { Theme } from "@/styles/theme";
-
-const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
-const foregroundMutedColorMapping = (theme: Theme) => ({
-  color: theme.colors.foregroundMuted,
-});
-
-const PREVIEW_IMAGE_MIN_HEIGHT = 160;
-
-export function FileMarkdownPreviewImage({
-  source,
-  occurrenceKey,
-  alt,
-  client,
-  workspaceRoot,
-  serverId,
-}: {
-  source: string;
-  occurrenceKey: string;
-  alt?: string;
-  client?: DaemonClient | null;
-  workspaceRoot?: string;
-  serverId?: string;
-}) {
-  const { t } = useTranslation();
-  const [viewerOpen, setViewerOpen] = useState(false);
-  const openViewer = useCallback(() => setViewerOpen(true), []);
-  const closeViewer = useCallback(() => setViewerOpen(false), []);
-  const image = useAssistantImage({
-    source,
-    occurrenceKey,
-    client,
-    workspaceRoot,
-    serverId,
-  });
-  const binding = image.status === "failed" ? null : image.binding;
-  const aspectRatio = image.status === "failed" ? null : image.aspectRatio;
-  const imageUri = binding?.uri ?? "";
-  const imageSource = useMemo(() => ({ uri: imageUri }), [imageUri]);
-  const imageSizeStyle = useMemo<ViewStyle>(() => {
-    if (aspectRatio) {
-      return { aspectRatio };
-    }
-    return { height: PREVIEW_IMAGE_MIN_HEIGHT };
-  }, [aspectRatio]);
-  const surfaceStyle = useMemo<StyleProp<ViewStyle>>(
-    () => [styles.surface, imageSizeStyle],
-    [imageSizeStyle],
-  );
-  const lightboxSource = useMemo<ImageLightboxSource | null>(() => {
-    if (!viewerOpen || !imageUri) return null;
-    return {
-      type: "uri",
-      uri: imageUri,
-      contentSize: aspectRatio ? { width: aspectRatio, height: 1 } : undefined,
-    };
-  }, [aspectRatio, imageUri, viewerOpen]);
-
-  if (image.status === "failed") {
-    return (
-      <View style={[styles.frame, styles.state]} testID="markdown-preview-image-failed">
-        <Text style={styles.errorText}>{image.message}</Text>
-      </View>
-    );
-  }
-
-  if (!binding) {
-    return (
-      <View style={[styles.frame, styles.state]} testID="markdown-preview-image-loading">
-        <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
-      </View>
-    );
-  }
-
-  return (
-    <View style={styles.frame} testID="markdown-preview-image">
-      <Pressable
-        accessibilityLabel={t("composer.attachments.openImage")}
-        accessibilityRole="button"
-        disabled={image.status !== "loaded"}
-        onPress={openViewer}
-        style={surfaceStyle}
-      >
-        <View style={styles.image} accessibilityRole="image" accessibilityLabel={alt}>
-          <Image
-            ref={binding.onRef}
-            source={imageSource}
-            style={styles.image}
-            resizeMode="contain"
-            onLoad={binding.onLoad}
-            onError={binding.onError}
-          />
-          {image.status === "loading" ? (
-            <View pointerEvents="none" style={styles.loadingOverlay}>
-              <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
-            </View>
-          ) : null}
-        </View>
-      </Pressable>
-      <AttachmentLightbox source={lightboxSource} onClose={closeViewer} />
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  frame: {
-    width: "100%",
-    marginBottom: theme.spacing[4],
-  },
-  surface: {
-    width: "100%",
-    overflow: "hidden",
-    borderRadius: theme.borderRadius.md,
-    backgroundColor: theme.colors.surface2,
-  },
-  image: {
-    width: "100%",
-    height: "100%",
-  },
-  state: {
-    minHeight: PREVIEW_IMAGE_MIN_HEIGHT,
-    alignItems: "center",
-    justifyContent: "center",
-    paddingHorizontal: theme.spacing[4],
-    paddingVertical: theme.spacing[6],
-    backgroundColor: theme.colors.surface2,
-    borderRadius: theme.borderRadius.md,
-  },
-  loadingOverlay: {
-    position: "absolute",
-    top: 0,
-    right: 0,
-    bottom: 0,
-    left: 0,
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  errorText: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
-    textAlign: "center",
-  },
-}));
diff --git a/packages/app/src/hooks/use-revealed-text.ts b/packages/app/src/hooks/use-revealed-text.ts
index d3e1c905ab..6d7130927d 100644
--- a/packages/app/src/hooks/use-revealed-text.ts
+++ b/packages/app/src/hooks/use-revealed-text.ts
@@ -11,7 +11,7 @@ import {
   type TextRevealState,
   visibleRevealedText,
 } from "@/agent-stream/text-reveal";
-import type { MarkdownPhase } from "@/components/markdown/fence/types";
+export type MarkdownPhase = "streaming" | "complete";
 
 /**
  * Binds the paced reveal in @/agent-stream/text-reveal to a frame clock.
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index d8a37b7156..0872c0dc92 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -1,3 +1,4 @@
+import { AssistantFileLinkResolverProvider, type InlinePathTarget } from "@/assistant-file-links";
 import {
   WorkspaceComposerEditingSessionsProvider,
   useComposerTabFullscreen,
@@ -3657,6 +3658,10 @@ function WorkspaceScreenContent({
     </View>
   );
 
+  const openMarkdownFile = useStableEvent((target: InlinePathTarget) => {
+    handleOpenPreferredAssistantFile({ location: target, parentTabId: activeTabId });
+  });
+
   const renderedWorkspaceScreen = (
     <RenderProfile id="WorkspaceScreenContent">
       <View style={containerStyle}>
@@ -3696,7 +3701,15 @@ function WorkspaceScreenContent({
   }
   return (
     <WorkspaceContentProviders key={persistenceKey} workspaceKey={persistenceKey}>
-      {renderedWorkspaceScreen}
+      <AssistantFileLinkResolverProvider
+        client={client}
+        serverId={normalizedServerId}
+        workspaceRoot={workspaceDirectory ?? undefined}
+        onOpenWorkspaceFile={openMarkdownFile}
+        toast={toast}
+      >
+        {renderedWorkspaceScreen}
+      </AssistantFileLinkResolverProvider>
     </WorkspaceContentProviders>
   );
 }
diff --git a/packages/app/src/styles/markdown-styles.test.ts b/packages/app/src/styles/markdown-styles.test.ts
deleted file mode 100644
index 061468d785..0000000000
--- a/packages/app/src/styles/markdown-styles.test.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { createCompactMarkdownStyles, createMarkdownStyles } from "./markdown-styles";
-import { darkTheme } from "./theme";
-
-describe("createMarkdownStyles", () => {
-  it("uses the content size for conversation prose and list markers", () => {
-    const styles = createMarkdownStyles(darkTheme);
-    const proseLineHeight = Math.round(darkTheme.fontSize.content * 1.4);
-
-    expect(styles.body).toMatchObject({
-      fontSize: darkTheme.fontSize.content,
-      lineHeight: proseLineHeight,
-    });
-    expect(styles.bullet_list_icon).toMatchObject({
-      fontSize: darkTheme.fontSize.content,
-      lineHeight: proseLineHeight,
-    });
-    expect(styles.ordered_list_icon).toMatchObject({
-      fontSize: darkTheme.fontSize.content,
-      lineHeight: proseLineHeight,
-    });
-  });
-
-  it("applies shrink-and-wrap constraints to long markdown text and links", () => {
-    const styles = createMarkdownStyles(darkTheme);
-
-    expect(styles.body).toMatchObject({
-      flexShrink: 1,
-      minWidth: 0,
-      width: "100%",
-    });
-
-    expect(styles.paragraph).toMatchObject({
-      flexShrink: 1,
-      minWidth: 0,
-      width: "100%",
-      flexWrap: "wrap",
-    });
-
-    expect(styles.text).toMatchObject({
-      flexShrink: 1,
-      minWidth: 0,
-      overflowWrap: "anywhere",
-    });
-
-    expect(styles.link).toMatchObject({
-      flexShrink: 1,
-      minWidth: 0,
-      overflowWrap: "anywhere",
-    });
-
-    expect(styles.blocklink).toMatchObject({
-      flexShrink: 1,
-      minWidth: 0,
-      overflowWrap: "anywhere",
-    });
-  });
-
-  it("keeps assistant markdown text selectable on web", () => {
-    const styles = createMarkdownStyles(darkTheme);
-
-    expect(styles.body).toMatchObject({
-      userSelect: "text",
-    });
-    expect(styles.text).toMatchObject({
-      userSelect: "text",
-    });
-    expect(styles.heading1).toMatchObject({
-      userSelect: "text",
-    });
-    expect(styles.link).toMatchObject({
-      userSelect: "text",
-    });
-    expect(styles.code_inline).toMatchObject({
-      userSelect: "text",
-    });
-    expect(styles.code_block).toMatchObject({
-      userSelect: "text",
-    });
-    expect(styles.fence).toMatchObject({
-      userSelect: "text",
-    });
-    expect(styles.bullet_list_icon).toMatchObject({
-      userSelect: "text",
-    });
-    expect(styles.ordered_list_icon).toMatchObject({
-      userSelect: "text",
-    });
-  });
-
-  it("uses the mono font-size token directly for inline and block code", () => {
-    const styles = createMarkdownStyles(darkTheme);
-    const compactStyles = createCompactMarkdownStyles(darkTheme);
-
-    expect(styles.code_inline).toMatchObject({
-      fontFamily: darkTheme.fontFamily.mono,
-      fontSize: darkTheme.fontSize.code,
-    });
-    expect(styles.code_inline).not.toHaveProperty("lineHeight");
-    expect(styles.code_block).toMatchObject({
-      fontFamily: darkTheme.fontFamily.mono,
-      fontSize: darkTheme.fontSize.code,
-    });
-    expect(styles.fence).toMatchObject({
-      fontFamily: darkTheme.fontFamily.mono,
-      fontSize: darkTheme.fontSize.code,
-    });
-    expect(compactStyles.code_inline).toMatchObject({
-      fontFamily: darkTheme.fontFamily.mono,
-      fontSize: darkTheme.fontSize.code,
-    });
-    expect(compactStyles.code_inline).not.toHaveProperty("lineHeight");
-  });
-
-  it("scales Markdown headings from content size with safe line heights", () => {
-    const largeContentTheme = {
-      ...darkTheme,
-      fontSize: { ...darkTheme.fontSize, content: 21 },
-    };
-    const styles = createMarkdownStyles(largeContentTheme);
-
-    expect(styles.heading1.lineHeight).toBeGreaterThan(styles.heading1.fontSize);
-    expect(styles.heading2.lineHeight).toBeGreaterThan(styles.heading2.fontSize);
-    expect(styles.heading3.lineHeight).toBeGreaterThan(styles.heading3.fontSize);
-  });
-
-  it("keeps blockquotes quiet with a square left edge", () => {
-    const styles = createMarkdownStyles(darkTheme);
-
-    expect(styles.blockquote).toMatchObject({
-      backgroundColor: darkTheme.colors.surface1,
-      color: `${darkTheme.colors.foreground}cc`,
-      borderLeftColor: darkTheme.colors.surface2,
-      paddingTop: darkTheme.spacing[3],
-      paddingBottom: 0,
-      borderTopLeftRadius: 0,
-      borderBottomLeftRadius: 0,
-    });
-    expect(styles.paragraph.marginBottom).toBe(darkTheme.spacing[3]);
-    expect(styles.text).not.toHaveProperty("color");
-  });
-});
diff --git a/packages/app/src/styles/markdown-styles.ts b/packages/app/src/styles/markdown-styles.ts
deleted file mode 100644
index 5d10624136..0000000000
--- a/packages/app/src/styles/markdown-styles.ts
+++ /dev/null
@@ -1,422 +0,0 @@
-import { FONT_SIZE, type Theme } from "./theme";
-import { isWeb } from "@/constants/platform";
-
-const webSelectableTextStyle = isWeb ? { userSelect: "text" as const } : {};
-
-function contentHeadingSize(contentSize: number, tier: keyof typeof FONT_SIZE): number {
-  return Math.round(contentSize * (FONT_SIZE[tier] / FONT_SIZE.base));
-}
-
-function contentHeadingLineHeight(contentSize: number, tier: keyof typeof FONT_SIZE): number {
-  return Math.round(contentHeadingSize(contentSize, tier) * 1.3);
-}
-
-/**
- * Creates comprehensive markdown styles for react-native-markdown-display.
- *
- * Usage:
- *   const markdownStyles = useMemo(() => createMarkdownStyles(theme), [theme]);
- *   <Markdown style={markdownStyles} markdownit={parser}>{content}</Markdown>
- *
- * Always pass `markdownit` from `@/utils/markdown-parser`. Omit it and
- * react-native-markdown-display builds its own parser with `typographer: true`,
- * which rewrites a literal `(c)` as ©.
- */
-export function createMarkdownStyles(theme: Theme) {
-  return {
-    // =========================================================================
-    // BASE STYLES
-    // =========================================================================
-
-    body: {
-      ...webSelectableTextStyle,
-      color: theme.colors.foreground,
-      fontSize: theme.fontSize.content,
-      // Prose line-height scales with the content size, not the
-      // code-size-coupled lineHeight.diff token used by code/diff surfaces.
-      lineHeight: Math.round(theme.fontSize.content * 1.4),
-      flexShrink: 1,
-      minWidth: 0,
-      width: "100%" as const,
-    },
-
-    text: {
-      ...webSelectableTextStyle,
-      flexShrink: 1,
-      minWidth: 0,
-      overflowWrap: "anywhere" as const,
-    },
-
-    paragraph: {
-      marginTop: 0,
-      marginBottom: theme.spacing[3],
-      flexWrap: "wrap" as const,
-      flexDirection: "row" as const,
-      alignItems: "flex-start" as const,
-      justifyContent: "flex-start" as const,
-      flexShrink: 1,
-      minWidth: 0,
-      width: "100%" as const,
-    },
-
-    // =========================================================================
-    // HEADINGS
-    // =========================================================================
-
-    heading1: {
-      ...webSelectableTextStyle,
-      fontSize: contentHeadingSize(theme.fontSize.content, "4xl"),
-      fontWeight: theme.fontWeight.bold,
-      color: theme.colors.foreground,
-      marginTop: theme.spacing[6],
-      marginBottom: theme.spacing[3],
-      lineHeight: contentHeadingLineHeight(theme.fontSize.content, "4xl"),
-      borderBottomWidth: 1,
-      borderBottomColor: theme.colors.border,
-      paddingBottom: theme.spacing[2],
-    },
-
-    heading2: {
-      ...webSelectableTextStyle,
-      fontSize: contentHeadingSize(theme.fontSize.content, "3xl"),
-      fontWeight: theme.fontWeight.bold,
-      color: theme.colors.foreground,
-      marginTop: theme.spacing[6],
-      marginBottom: theme.spacing[3],
-      lineHeight: contentHeadingLineHeight(theme.fontSize.content, "3xl"),
-      borderBottomWidth: 1,
-      borderBottomColor: theme.colors.border,
-      paddingBottom: theme.spacing[2],
-    },
-
-    heading3: {
-      ...webSelectableTextStyle,
-      fontSize: contentHeadingSize(theme.fontSize.content, "2xl"),
-      fontWeight: theme.fontWeight.semibold,
-      color: theme.colors.foreground,
-      marginTop: theme.spacing[4],
-      marginBottom: theme.spacing[2],
-      lineHeight: contentHeadingLineHeight(theme.fontSize.content, "2xl"),
-    },
-
-    heading4: {
-      ...webSelectableTextStyle,
-      fontSize: contentHeadingSize(theme.fontSize.content, "xl"),
-      fontWeight: theme.fontWeight.semibold,
-      color: theme.colors.foreground,
-      marginTop: theme.spacing[4],
-      marginBottom: theme.spacing[2],
-      lineHeight: contentHeadingLineHeight(theme.fontSize.content, "xl"),
-    },
-
-    heading5: {
-      ...webSelectableTextStyle,
-      fontSize: contentHeadingSize(theme.fontSize.content, "lg"),
-      fontWeight: theme.fontWeight.semibold,
-      color: theme.colors.foreground,
-      marginTop: theme.spacing[3],
-      marginBottom: theme.spacing[1],
-      lineHeight: contentHeadingLineHeight(theme.fontSize.content, "lg"),
-    },
-
-    heading6: {
-      ...webSelectableTextStyle,
-      fontSize: contentHeadingSize(theme.fontSize.content, "lg"),
-      fontWeight: theme.fontWeight.semibold,
-      color: theme.colors.foregroundMuted,
-      marginTop: theme.spacing[3],
-      marginBottom: theme.spacing[1],
-      lineHeight: contentHeadingLineHeight(theme.fontSize.content, "lg"),
-      textTransform: "uppercase" as const,
-      letterSpacing: 0.5,
-    },
-
-    // =========================================================================
-    // TEXT FORMATTING
-    // =========================================================================
-
-    strong: {
-      ...webSelectableTextStyle,
-      fontWeight: theme.fontWeight.medium,
-    },
-
-    em: {
-      ...webSelectableTextStyle,
-      fontStyle: "italic" as const,
-    },
-
-    s: {
-      ...webSelectableTextStyle,
-      textDecorationLine: "line-through" as const,
-      color: theme.colors.foregroundMuted,
-    },
-
-    link: {
-      ...webSelectableTextStyle,
-      color: theme.colors.accentBright,
-      textDecorationLine: "none" as const,
-      flexShrink: 1,
-      minWidth: 0,
-      overflowWrap: "anywhere" as const,
-    },
-
-    blocklink: {
-      ...webSelectableTextStyle,
-      color: theme.colors.accentBright,
-      textDecorationLine: "none" as const,
-      flexShrink: 1,
-      minWidth: 0,
-      overflowWrap: "anywhere" as const,
-    },
-
-    // =========================================================================
-    // CODE
-    // =========================================================================
-
-    code_inline: {
-      ...webSelectableTextStyle,
-      backgroundColor: theme.colors.surface2,
-      color: theme.colors.foreground,
-      paddingHorizontal: theme.spacing[1],
-      paddingVertical: 2,
-      borderRadius: theme.borderRadius.md,
-      borderWidth: 0,
-      fontFamily: theme.fontFamily.mono,
-      fontSize: theme.fontSize.code,
-    },
-
-    code_block: {
-      ...webSelectableTextStyle,
-      backgroundColor: theme.colors.surface2,
-      color: theme.colors.foreground,
-      padding: theme.spacing[3],
-      borderRadius: theme.borderRadius.md,
-      fontFamily: theme.fontFamily.mono,
-      fontSize: theme.fontSize.code,
-      marginVertical: theme.spacing[2],
-    },
-
-    fence: {
-      ...webSelectableTextStyle,
-      backgroundColor: theme.colors.surface2,
-      color: theme.colors.foreground,
-      padding: theme.spacing[3],
-      borderRadius: theme.borderRadius.md,
-      borderWidth: 1,
-      borderColor: theme.colors.border,
-      fontFamily: theme.fontFamily.mono,
-      fontSize: theme.fontSize.code,
-      marginVertical: theme.spacing[3],
-    },
-
-    pre: {
-      marginVertical: theme.spacing[2],
-    },
-
-    // =========================================================================
-    // TABLES
-    // =========================================================================
-
-    table: {
-      borderWidth: 1,
-      borderColor: theme.colors.border,
-      borderRadius: theme.borderRadius.md,
-      marginVertical: theme.spacing[3],
-    },
-
-    thead: {
-      backgroundColor: theme.colors.surface2,
-    },
-
-    tbody: {},
-
-    th: {
-      ...webSelectableTextStyle,
-      padding: theme.spacing[2],
-      borderBottomWidth: 1,
-      borderRightWidth: 1,
-      borderColor: theme.colors.border,
-      backgroundColor: theme.colors.surface2,
-      fontWeight: theme.fontWeight.semibold,
-      color: theme.colors.foreground,
-      fontSize: theme.fontSize.content,
-      textAlign: "left" as const,
-    },
-
-    tr: {
-      borderBottomWidth: 1,
-      borderColor: theme.colors.border,
-      flexDirection: "row" as const,
-    },
-
-    td: {
-      ...webSelectableTextStyle,
-      padding: theme.spacing[2],
-      borderRightWidth: 1,
-      borderColor: theme.colors.border,
-      color: theme.colors.foreground,
-      fontSize: theme.fontSize.content,
-      flex: 1,
-    },
-
-    // =========================================================================
-    // LISTS
-    // =========================================================================
-
-    bullet_list: {
-      paddingLeft: 0,
-      width: "100%" as const,
-    },
-
-    ordered_list: {
-      paddingLeft: 0,
-      width: "100%" as const,
-    },
-
-    list_item: {
-      marginBottom: theme.spacing[1],
-      flexDirection: "row" as const,
-      alignItems: "flex-start" as const,
-      flexShrink: 1,
-    },
-
-    bullet_list_content: {
-      flex: 1,
-      flexShrink: 1,
-    },
-
-    ordered_list_content: {
-      flex: 1,
-      flexShrink: 1,
-    },
-
-    bullet_list_icon: {
-      ...webSelectableTextStyle,
-      color: theme.colors.foregroundMuted,
-      marginRight: 4,
-      fontSize: theme.fontSize.content,
-      lineHeight: Math.round(theme.fontSize.content * 1.4),
-    },
-
-    ordered_list_icon: {
-      ...webSelectableTextStyle,
-      color: theme.colors.foregroundMuted,
-      marginRight: 4,
-      fontSize: theme.fontSize.content,
-      fontWeight: theme.fontWeight.normal,
-      lineHeight: Math.round(theme.fontSize.content * 1.4),
-      minWidth: 12,
-    },
-
-    // =========================================================================
-    // BLOCKQUOTE
-    // =========================================================================
-
-    blockquote: {
-      backgroundColor: theme.colors.surface1,
-      color: `${theme.colors.foreground}cc`,
-      borderLeftWidth: 4,
-      borderLeftColor: theme.colors.surface2,
-      paddingHorizontal: theme.spacing[4],
-      paddingTop: theme.spacing[3],
-      paddingBottom: 0,
-      marginVertical: theme.spacing[3],
-      borderRadius: theme.borderRadius.md,
-      borderTopLeftRadius: 0,
-      borderBottomLeftRadius: 0,
-    },
-
-    // =========================================================================
-    // HORIZONTAL RULE
-    // =========================================================================
-
-    hr: {
-      backgroundColor: theme.colors.border,
-      height: 1,
-      marginVertical: 10,
-    },
-
-    // =========================================================================
-    // IMAGES
-    // =========================================================================
-
-    image: {
-      borderRadius: theme.borderRadius.md,
-      marginVertical: theme.spacing[2],
-    },
-
-    // =========================================================================
-    // BREAKS
-    // =========================================================================
-
-    hardbreak: {
-      height: theme.spacing[2],
-    },
-
-    softbreak: {},
-  };
-}
-
-/**
- * Creates a smaller variant of markdown styles for compact UI elements
- * like thought bubbles, tooltips, or side panels.
- */
-export function createCompactMarkdownStyles(theme: Theme) {
-  const baseStyles = createMarkdownStyles(theme);
-
-  return {
-    ...baseStyles,
-
-    body: {
-      ...baseStyles.body,
-      fontSize: theme.fontSize.content,
-      lineHeight: Math.round(theme.fontSize.content * 1.4),
-    },
-
-    heading1: {
-      ...baseStyles.heading1,
-      fontSize: contentHeadingSize(theme.fontSize.content, "2xl"),
-      marginTop: theme.spacing[4],
-      marginBottom: theme.spacing[2],
-      lineHeight: contentHeadingLineHeight(theme.fontSize.content, "2xl"),
-    },
-
-    heading2: {
-      ...baseStyles.heading2,
-      fontSize: contentHeadingSize(theme.fontSize.content, "xl"),
-      marginTop: theme.spacing[3],
-      marginBottom: theme.spacing[2],
-      lineHeight: contentHeadingLineHeight(theme.fontSize.content, "xl"),
-    },
-
-    heading3: {
-      ...baseStyles.heading3,
-      fontSize: contentHeadingSize(theme.fontSize.content, "lg"),
-      marginTop: theme.spacing[3],
-      marginBottom: theme.spacing[1],
-      lineHeight: contentHeadingLineHeight(theme.fontSize.content, "lg"),
-    },
-
-    paragraph: {
-      ...baseStyles.paragraph,
-      marginBottom: theme.spacing[2],
-    },
-
-    code_inline: {
-      ...baseStyles.code_inline,
-      fontSize: theme.fontSize.code,
-    },
-
-    code_block: {
-      ...baseStyles.code_block,
-      fontSize: theme.fontSize.code,
-      padding: theme.spacing[2],
-    },
-
-    fence: {
-      ...baseStyles.fence,
-      fontSize: theme.fontSize.code,
-      padding: theme.spacing[2],
-    },
-  };
-}
diff --git a/packages/app/src/types/react-native-markdown-display.d.ts b/packages/app/src/types/react-native-markdown-display.d.ts
deleted file mode 100644
index 1b9f8044ac..0000000000
--- a/packages/app/src/types/react-native-markdown-display.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// The runtime sets `sourceInfo` on fence/code nodes (tokensToAST.js sets
-// `sourceInfo: token.info`), but the shipped .d.ts omits the field. The
-// re-export is what marks this file as a module so the `declare module`
-// below augments the package instead of shadowing it.
-export type { ASTNode } from "react-native-markdown-display";
-
-declare module "react-native-markdown-display" {
-  interface ASTNode {
-    sourceInfo?: string;
-  }
-}
diff --git a/packages/app/src/types/stream.ts b/packages/app/src/types/stream.ts
index 56cf14558b..9425cabbed 100644
--- a/packages/app/src/types/stream.ts
+++ b/packages/app/src/types/stream.ts
@@ -712,8 +712,6 @@ export interface AssistantMessageItem {
   text: string;
   timestamp: Date;
   /** Display-only fields, assigned after source-item plugin transforms. */
-  blockGroupId?: string;
-  blockIndex?: number;
 }
 
 export interface TimelinePosition {
diff --git a/packages/app/src/utils/__tests__/split-markdown-blocks.test.ts b/packages/app/src/utils/__tests__/split-markdown-blocks.test.ts
deleted file mode 100644
index 22eddf8152..0000000000
--- a/packages/app/src/utils/__tests__/split-markdown-blocks.test.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { splitMarkdownBlocks } from "../split-markdown-blocks";
-
-describe("splitMarkdownBlocks", () => {
-  it("returns a single block for a single paragraph", () => {
-    expect(splitMarkdownBlocks("Hello world")).toEqual(["Hello world"]);
-  });
-
-  it("splits two paragraphs separated by a double newline", () => {
-    expect(splitMarkdownBlocks("First paragraph\n\nSecond paragraph")).toEqual([
-      "First paragraph",
-      "Second paragraph",
-    ]);
-  });
-
-  it("keeps a fenced code block with internal double newlines as one block", () => {
-    expect(splitMarkdownBlocks("```ts\nconst a = 1;\n\nconst b = 2;\n```")).toEqual([
-      "```ts\nconst a = 1;\n\nconst b = 2;\n```",
-    ]);
-  });
-
-  it("does not treat 4-space-indented backticks as a fence", () => {
-    expect(splitMarkdownBlocks("Before\n\n    ```\n    code\n    ```\n\nAfter")).toEqual([
-      "Before",
-      "    ```\n    code\n    ```",
-      "After",
-    ]);
-  });
-
-  it("handles tilde fences", () => {
-    expect(splitMarkdownBlocks("Before\n\n~~~\ncode\n~~~\n\nAfter")).toEqual([
-      "Before",
-      "~~~\ncode\n~~~",
-      "After",
-    ]);
-  });
-
-  it("splits mixed paragraph, code fence, and paragraph content into three blocks", () => {
-    expect(
-      splitMarkdownBlocks(
-        "Intro paragraph\n\n```ts\nconst a = 1;\n\nconst b = 2;\n```\n\nOutro paragraph",
-      ),
-    ).toEqual(["Intro paragraph", "```ts\nconst a = 1;\n\nconst b = 2;\n```", "Outro paragraph"]);
-  });
-
-  it("keeps everything from an unclosed fence start as one block for streaming content", () => {
-    expect(splitMarkdownBlocks("Before fence\n\n```ts\nconst a = 1;\n\nconst b = 2;")).toEqual([
-      "Before fence",
-      "```ts\nconst a = 1;\n\nconst b = 2;",
-    ]);
-  });
-
-  it("returns an empty array for empty input", () => {
-    expect(splitMarkdownBlocks("")).toEqual([]);
-  });
-
-  it("splits a heading followed by a paragraph into two blocks", () => {
-    expect(splitMarkdownBlocks("# Heading\n\nParagraph text")).toEqual([
-      "# Heading",
-      "Paragraph text",
-    ]);
-  });
-
-  it("keeps consecutive list items together when there is no double newline", () => {
-    expect(splitMarkdownBlocks("- First item\n- Second item\n- Third item")).toEqual([
-      "- First item\n- Second item\n- Third item",
-    ]);
-  });
-
-  it("keeps a loose nested list in its outer list block", () => {
-    expect(
-      splitMarkdownBlocks(
-        "Before\n\n3. Outer three\n\n   7. Inner seven\n   8. Inner eight\n\nAfter",
-      ),
-    ).toEqual(["Before", "3. Outer three\n\n   7. Inner seven\n   8. Inner eight", "After"]);
-  });
-
-  it("keeps a link reference definition with the paragraph that uses it", () => {
-    expect(splitMarkdownBlocks("See the [docs][d].\n\n[d]: https://example.com")).toEqual([
-      "See the [docs][d].\n\n[d]: https://example.com",
-    ]);
-  });
-
-  it("folds a leading definition-only block into the block below it", () => {
-    expect(splitMarkdownBlocks('[d]: https://example.com "Docs"\n\nSee the [docs][d].')).toEqual([
-      '[d]: https://example.com "Docs"\n\nSee the [docs][d].',
-    ]);
-  });
-
-  it("folds several definition lines and several definition blocks into one block", () => {
-    expect(
-      splitMarkdownBlocks(
-        "See [one][a] and [two][b].\n\n[a]: https://example.com/a\n[b]: <https://example.com/b>\n\n[c]: https://example.com/c 'Third'\n\nAfter",
-      ),
-    ).toEqual([
-      "See [one][a] and [two][b].\n\n[a]: https://example.com/a\n[b]: <https://example.com/b>\n\n[c]: https://example.com/c 'Third'",
-      "After",
-    ]);
-  });
-
-  it("recognizes every destination the renderer accepts, including escaped spaces", () => {
-    expect(splitMarkdownBlocks("See [docs].\n\n[docs]: docs\\ folder/readme")).toEqual([
-      "See [docs].\n\n[docs]: docs\\ folder/readme",
-    ]);
-    expect(splitMarkdownBlocks("See [docs].\n\n[docs]: <docs folder/readme> 'Title'")).toEqual([
-      "See [docs].\n\n[docs]: <docs folder/readme> 'Title'",
-    ]);
-  });
-
-  it("leaves a definition-only message as its own block", () => {
-    expect(splitMarkdownBlocks("[d]: https://example.com")).toEqual(["[d]: https://example.com"]);
-  });
-
-  it("does not fold a paragraph that merely starts with a bracketed link", () => {
-    expect(splitMarkdownBlocks("Intro\n\n[Link](https://example.com) and more prose")).toEqual([
-      "Intro",
-      "[Link](https://example.com) and more prose",
-    ]);
-  });
-
-  it("treats triple newlines as a split point and filters empty blocks", () => {
-    expect(splitMarkdownBlocks("First paragraph\n\n\nSecond paragraph")).toEqual([
-      "First paragraph",
-      "Second paragraph",
-    ]);
-  });
-});
diff --git a/packages/app/src/utils/assistant-image-metadata.test.ts b/packages/app/src/utils/assistant-image-metadata.test.ts
deleted file mode 100644
index 3ebee656dd..0000000000
--- a/packages/app/src/utils/assistant-image-metadata.test.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { beforeEach, describe, expect, it } from "vitest";
-import { DEFAULT_CONTENT_MAX_WIDTH } from "@/styles/theme";
-import {
-  clearAssistantImageMetadataCache,
-  estimateAssistantMessageHeightFromCache,
-  extractAssistantImageSources,
-  getAssistantImageMetadata,
-  setAssistantImageMetadata,
-} from "./assistant-image-metadata";
-
-describe("assistant image metadata", () => {
-  beforeEach(() => {
-    clearAssistantImageMetadataCache();
-  });
-
-  it("extracts markdown image sources", () => {
-    expect(
-      extractAssistantImageSources(
-        'Before\n\n![local](/tmp/paseo.png)\n\n![remote](https://example.com/test.png "Remote")',
-      ),
-    ).toEqual(["/tmp/paseo.png", "https://example.com/test.png"]);
-  });
-
-  it("keeps local image metadata scoped to its server and workspace", () => {
-    const image = {
-      source: "screenshot.png",
-      workspaceRoot: "/workspace/one",
-      serverId: "server-1",
-    };
-    setAssistantImageMetadata(image, { width: 1200, height: 800 });
-
-    expect(getAssistantImageMetadata({ ...image, workspaceRoot: "/workspace/two" })).toBeNull();
-    expect(getAssistantImageMetadata({ ...image, serverId: "server-2" })).toBeNull();
-    expect(getAssistantImageMetadata({ source: image.source })).toBeNull();
-    expect(getAssistantImageMetadata(image)).toEqual({
-      width: 1200,
-      height: 800,
-      aspectRatio: 1.5,
-    });
-
-    setAssistantImageMetadata(
-      { ...image, workspaceRoot: "/workspace/two" },
-      { width: 800, height: 1200 },
-    );
-    expect(getAssistantImageMetadata(image)?.aspectRatio).toBe(1.5);
-    expect(
-      getAssistantImageMetadata({ ...image, workspaceRoot: "/workspace/two" })?.aspectRatio,
-    ).toBe(2 / 3);
-  });
-
-  it("reuses direct image metadata without workspace context", () => {
-    const source = "https://example.com/shared.png";
-    setAssistantImageMetadata(
-      { source, workspaceRoot: "/workspace/one", serverId: "server-1" },
-      { width: 1200, height: 800 },
-    );
-    expect(getAssistantImageMetadata({ source })).toEqual({
-      width: 1200,
-      height: 800,
-      aspectRatio: 1.5,
-    });
-  });
-
-  it("reserves the default image aspect ratio before metadata arrives", () => {
-    expect(
-      estimateAssistantMessageHeightFromCache({
-        markdown: "![Pending](https://example.com/pending.png)",
-        contentMaxWidth: 608,
-      }),
-    ).toBe(464);
-  });
-
-  it("estimates assistant message height from cached image metadata", () => {
-    setAssistantImageMetadata(
-      {
-        source: "https://example.com/landscape.png",
-      },
-      { width: 1200, height: 800 },
-    );
-
-    expect(
-      estimateAssistantMessageHeightFromCache({
-        markdown: "Here is the screenshot\n\n![Screenshot](https://example.com/landscape.png)",
-        contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
-      }),
-    ).toBeGreaterThan(220);
-  });
-
-  it("estimates image-only data-image markdown without caching the full payload as text", () => {
-    const source = `data:image/png;base64,${"a".repeat(512)}`;
-    setAssistantImageMetadata({ source }, { width: 1200, height: 800 });
-
-    const imageOnlyHeight = estimateAssistantMessageHeightFromCache({
-      markdown: `![Screenshot](${source})`,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
-    });
-    const mixedHeight = estimateAssistantMessageHeightFromCache({
-      markdown: `Text\n\n![Screenshot](${source})`,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
-    });
-
-    expect(imageOnlyHeight).toBeGreaterThan(220);
-    expect(mixedHeight).toBeGreaterThan(imageOnlyHeight ?? 0);
-  });
-});
diff --git a/packages/app/src/utils/assistant-image-metadata.ts b/packages/app/src/utils/assistant-image-metadata.ts
deleted file mode 100644
index ac7bd217b2..0000000000
--- a/packages/app/src/utils/assistant-image-metadata.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-import { resolveAssistantImageSource } from "@/utils/assistant-image-source";
-import { createImageSourceCacheKey } from "@/attachments/utils";
-
-export interface AssistantImageContext {
-  serverId?: string;
-  workspaceRoot?: string;
-}
-
-export interface AssistantImageMetadata {
-  width: number;
-  height: number;
-  aspectRatio: number;
-}
-
-const assistantImageMetadataCache = new Map<string, AssistantImageMetadata>();
-const assistantImageParseCache = new Map<string, { sources: string[]; hasNonImageText: boolean }>();
-const ASSISTANT_IMAGE_METADATA_CACHE_LIMIT = 500;
-const ASSISTANT_IMAGE_PARSE_CACHE_LIMIT = 500;
-
-const MARKDOWN_IMAGE_PATTERN = /!\[[^\]]*]\((<[^>]+>|[^)\n]+)\)/g;
-export const ASSISTANT_IMAGE_DEFAULT_ASPECT_RATIO = 3 / 2;
-const ASSISTANT_IMAGE_INSET = 8;
-const ASSISTANT_IMAGE_MIN_HEIGHT = 160;
-const ASSISTANT_IMAGE_BLOCK_GAP = 24;
-const ASSISTANT_MESSAGE_BASE_HEIGHT = 96;
-const ASSISTANT_MESSAGE_MIN_HEIGHT = 220;
-const ASSISTANT_MESSAGE_IMAGE_ONLY_BASE_HEIGHT = 40;
-
-function touchCacheEntry<K, V>(cache: Map<K, V>, key: K, value: V, limit: number): void {
-  cache.delete(key);
-  cache.set(key, value);
-  if (cache.size <= limit) {
-    return;
-  }
-  const oldestKey = cache.keys().next().value;
-  if (oldestKey !== undefined) {
-    cache.delete(oldestKey);
-  }
-}
-
-function normalizeAssistantImageSourceToken(value: string): string | null {
-  const trimmed = value.trim();
-  if (!trimmed) {
-    return null;
-  }
-
-  if (trimmed.startsWith("<") && trimmed.endsWith(">")) {
-    const inner = trimmed.slice(1, -1).trim();
-    return inner || null;
-  }
-
-  const titleMatch = /^(.*?)(?:\s+(['"]).*?\2)?$/.exec(trimmed);
-  const source = titleMatch?.[1]?.trim() ?? trimmed;
-  return source || null;
-}
-
-function parseAssistantImageMarkdown(markdown: string): {
-  sources: string[];
-  hasNonImageText: boolean;
-} {
-  const sources: string[] = [];
-  for (const match of markdown.matchAll(MARKDOWN_IMAGE_PATTERN)) {
-    const normalized = normalizeAssistantImageSourceToken(match[1] ?? "");
-    if (normalized) {
-      sources.push(normalized);
-    }
-  }
-  return {
-    sources,
-    hasNonImageText: markdown.replace(MARKDOWN_IMAGE_PATTERN, "").trim().length > 0,
-  };
-}
-
-function getAssistantImageMetadataKey(
-  input: AssistantImageContext & { source: string },
-): string | null {
-  const resolution = resolveAssistantImageSource({
-    source: input.source,
-    workspaceRoot: input.workspaceRoot,
-  });
-  if (!resolution) {
-    return null;
-  }
-  if (resolution.kind === "direct") {
-    return `direct:${createImageSourceCacheKey(resolution.uri)}`;
-  }
-  // A file path identifies an image only within its daemon and workspace.
-  // Callers without that context must use the default aspect ratio.
-  if (!input.serverId) {
-    return null;
-  }
-  return JSON.stringify(["file", input.serverId, resolution.cwd, resolution.path]);
-}
-
-export function getAssistantImageMetadata(
-  input: AssistantImageContext & { source: string },
-): AssistantImageMetadata | null {
-  const key = getAssistantImageMetadataKey(input);
-  const metadata = key ? assistantImageMetadataCache.get(key) : undefined;
-  if (!key || !metadata) {
-    return null;
-  }
-  touchCacheEntry(assistantImageMetadataCache, key, metadata, ASSISTANT_IMAGE_METADATA_CACHE_LIMIT);
-  return metadata;
-}
-
-export function setAssistantImageMetadata(
-  input: AssistantImageContext & { source: string },
-  dimensions: { width: number; height: number },
-): AssistantImageMetadata | null {
-  const { width, height } = dimensions;
-  if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) {
-    return null;
-  }
-
-  const metadata: AssistantImageMetadata = {
-    width,
-    height,
-    aspectRatio: width / height,
-  };
-
-  const key = getAssistantImageMetadataKey(input);
-  if (key) {
-    touchCacheEntry(
-      assistantImageMetadataCache,
-      key,
-      metadata,
-      ASSISTANT_IMAGE_METADATA_CACHE_LIMIT,
-    );
-  }
-
-  return metadata;
-}
-
-export function extractAssistantImageSources(markdown: string): string[] {
-  const shouldCacheParse = !/data:image\//i.test(markdown);
-  const cachedParse = shouldCacheParse ? assistantImageParseCache.get(markdown) : undefined;
-  if (cachedParse) {
-    touchCacheEntry(
-      assistantImageParseCache,
-      markdown,
-      cachedParse,
-      ASSISTANT_IMAGE_PARSE_CACHE_LIMIT,
-    );
-    return cachedParse.sources;
-  }
-
-  const parsed = parseAssistantImageMarkdown(markdown);
-  if (shouldCacheParse) {
-    touchCacheEntry(assistantImageParseCache, markdown, parsed, ASSISTANT_IMAGE_PARSE_CACHE_LIMIT);
-  }
-  return parsed.sources;
-}
-
-export interface AssistantMessageHeightEstimateInput {
-  markdown: string;
-  contentMaxWidth: number;
-  imageContext?: AssistantImageContext;
-}
-
-export function estimateAssistantMessageHeightFromCache({
-  markdown,
-  contentMaxWidth,
-  imageContext,
-}: AssistantMessageHeightEstimateInput): number | null {
-  const parsed = assistantImageParseCache.get(markdown) ?? parseAssistantImageMarkdown(markdown);
-  if (parsed.sources.length === 0) {
-    return null;
-  }
-
-  const imageHeights = parsed.sources.map((source) => {
-    const aspectRatio =
-      getAssistantImageMetadata({ source, ...imageContext })?.aspectRatio ??
-      ASSISTANT_IMAGE_DEFAULT_ASPECT_RATIO;
-    return Math.max(
-      ASSISTANT_IMAGE_MIN_HEIGHT,
-      Math.round((contentMaxWidth - ASSISTANT_IMAGE_INSET) / aspectRatio),
-    );
-  });
-
-  const baseHeight = parsed.hasNonImageText
-    ? ASSISTANT_MESSAGE_BASE_HEIGHT
-    : ASSISTANT_MESSAGE_IMAGE_ONLY_BASE_HEIGHT;
-
-  const estimatedHeight =
-    baseHeight +
-    imageHeights.reduce((sum, height) => sum + height, 0) +
-    ASSISTANT_IMAGE_BLOCK_GAP * imageHeights.length;
-
-  return Math.max(ASSISTANT_MESSAGE_MIN_HEIGHT, estimatedHeight);
-}
-
-export function clearAssistantImageMetadataCache(): void {
-  assistantImageMetadataCache.clear();
-  assistantImageParseCache.clear();
-}
diff --git a/packages/app/src/utils/assistant-markdown-parser.test.ts b/packages/app/src/utils/assistant-markdown-parser.test.ts
index 05b1366e1c..f22307239a 100644
--- a/packages/app/src/utils/assistant-markdown-parser.test.ts
+++ b/packages/app/src/utils/assistant-markdown-parser.test.ts
@@ -2,141 +2,6 @@ import { describe, expect, it } from "vitest";
 import { createAssistantMarkdownParser } from "./assistant-markdown-parser";
 
 describe("createAssistantMarkdownParser", () => {
-  it("keeps bold text bold through every partial closing marker", () => {
-    const parser = createAssistantMarkdownParser({ streaming: true });
-
-    for (const source of ["**bold", "**bold*", "**bold**"]) {
-      expect(parser.renderInline(source)).toBe("<strong>bold</strong>");
-    }
-  });
-
-  it("shows the growing link label and only links a complete destination", () => {
-    const parser = createAssistantMarkdownParser({ streaming: true });
-    const source = "[docs](https://example.com/path)";
-    for (let length = 1; length < source.length; length++) {
-      expect(parser.renderInline(source.slice(0, length))).toBe(
-        "docs".slice(0, Math.max(0, length - 1)),
-      );
-    }
-    expect(parser.renderInline(source)).toBe('<a href="https://example.com/path">docs</a>');
-  });
-
-  it.each([
-    ["**", "strong"],
-    ["__", "strong"],
-    ["*", "em"],
-    ["_", "em"],
-    ["~~", "s"],
-    ["`", "code"],
-    ["``", "code"],
-  ])("keeps %s formatting stable as text and closing markers arrive", (marker, tag) => {
-    const parser = createAssistantMarkdownParser({ streaming: true });
-    for (let length = 1; length <= 4; length++) {
-      expect(parser.renderInline(marker + "text".slice(0, length))).toBe(
-        `<${tag}>${"text".slice(0, length)}</${tag}>`,
-      );
-    }
-    for (let length = 0; length <= marker.length; length++) {
-      expect(parser.renderInline(marker + "text" + marker.slice(0, length))).toBe(
-        `<${tag}>text</${tag}>`,
-      );
-    }
-  });
-
-  it("keeps combined and nested emphasis stable through closing markers", () => {
-    const parser = createAssistantMarkdownParser({ streaming: true });
-    for (const closing of ["", "*", "**", "***"]) {
-      expect(parser.renderInline("***both" + closing)).toBe("<em><strong>both</strong></em>");
-    }
-    expect(parser.renderInline("**bold and *italic")).toBe(
-      "<strong>bold and <em>italic</em></strong>",
-    );
-    expect(parser.renderInline("*italic and **bold")).toBe(
-      "<em>italic and <strong>bold</strong></em>",
-    );
-  });
-
-  it.each(["*", "**", "***", "_", "__", "~~", "`", "``"])(
-    "hides an opening %s while waiting for its text",
-    (marker) => {
-      expect(
-        createAssistantMarkdownParser({ streaming: true }).renderInline("hello " + marker),
-      ).toBe("hello ");
-    },
-  );
-
-  it.each([
-    "[docs](https://example.com/a(b)c)",
-    '[docs](https://example.com "a title)")',
-    "[docs](<https://example.com/a(b)>)",
-    "[docs](file:///tmp/example.ts)",
-  ])("waits for the entire destination of %s", (source) => {
-    const parser = createAssistantMarkdownParser({ streaming: true });
-    for (let length = 6; length < source.length; length++) {
-      expect(parser.renderInline(source.slice(0, length))).toBe("docs");
-    }
-    expect(parser.renderInline(source)).toBe(createAssistantMarkdownParser().renderInline(source));
-  });
-
-  it("preserves formatting in incomplete labels and around incomplete links", () => {
-    const parser = createAssistantMarkdownParser({ streaming: true });
-    expect(parser.renderInline("[**bold")).toBe("<strong>bold</strong>");
-    expect(parser.renderInline("[**bold**](https://exam")).toBe("<strong>bold</strong>");
-    expect(parser.renderInline("**see [docs](https://exam")).toBe("<strong>see docs</strong>");
-  });
-
-  it("does not auto-link a URL label before the destination is complete", () => {
-    const parser = createAssistantMarkdownParser({ streaming: true });
-    expect(parser.renderInline("Read [example.com](https://exam")).toBe("Read example.com");
-    expect(parser.renderInline("Read [example.com](https://example.org)")).toBe(
-      'Read <a href="https://example.org">example.com</a>',
-    );
-  });
-
-  it.each([
-    "\\*literal",
-    "\\[literal",
-    "some_identifier",
-    "some__identifier",
-    "`**literal [link](url`",
-    "``a ` b``",
-    "**already closed** after",
-    "[bad](javascript:alert(1))",
-    "<component",
-    "$$price",
-    "20~25",
-  ])("preserves literal and complete inline text: %s", (source) => {
-    expect(createAssistantMarkdownParser({ streaming: true }).renderInline(source)).toBe(
-      createAssistantMarkdownParser().renderInline(source),
-    );
-  });
-
-  it.each([
-    "```md\n**literal [link](url",
-    "~~~md\n**literal [link](url",
-    "    **literal [link](url",
-    "**earlier\n\nplain tail",
-    "- **earlier\n- plain tail",
-  ])("leaves literal code and earlier blocks alone: %s", (source) => {
-    expect(createAssistantMarkdownParser({ streaming: true }).render(source)).toBe(
-      createAssistantMarkdownParser().render(source),
-    );
-  });
-
-  it("completes inline formatting inside the final list item", () => {
-    expect(createAssistantMarkdownParser({ streaming: true }).render("- first\n- **bold")).toBe(
-      "<ul>\n<li>first</li>\n<li><strong>bold</strong></li>\n</ul>\n",
-    );
-  });
-
-  it("hides incomplete images until their source is complete", () => {
-    const parser = createAssistantMarkdownParser({ streaming: true });
-    expect(parser.renderInline("before ![alt](https://exam")).toBe("before ");
-    expect(parser.renderInline("before ![alt](https://example.com/image.png)")).toBe(
-      'before <img src="https://example.com/image.png" alt="alt">',
-    );
-  });
-
   it("keeps ordinary parsing for completed messages", () => {
     const parser = createAssistantMarkdownParser();
     expect(parser.renderInline("**unfinished")).toBe("**unfinished");
diff --git a/packages/app/src/utils/assistant-markdown-parser.ts b/packages/app/src/utils/assistant-markdown-parser.ts
index e1e8f6f38a..1007fc5c93 100644
--- a/packages/app/src/utils/assistant-markdown-parser.ts
+++ b/packages/app/src/utils/assistant-markdown-parser.ts
@@ -1,19 +1,13 @@
 import type MarkdownIt from "markdown-it";
 import { createMarkdownParser } from "@/utils/markdown-parser";
-import { enableStreamingMarkdown } from "@/utils/streaming-markdown";
 
-export function createAssistantMarkdownParser({ streaming = false } = {}): MarkdownIt {
+export function createAssistantMarkdownParser(): MarkdownIt {
   const parser = createMarkdownParser({ linkify: true });
   const defaultValidateLink = parser.validateLink.bind(parser);
 
-  // Assistant messages are the only surface allowed to link into the
-  // filesystem. Every other parser keeps markdown-it's stricter default.
+  // Rich clipboard HTML preserves workspace file links.
   parser.validateLink = (url: string) =>
     url.trim().toLowerCase().startsWith("file://") || defaultValidateLink(url);
 
-  if (streaming) {
-    enableStreamingMarkdown(parser);
-  }
-
   return parser;
 }
diff --git a/packages/app/src/utils/assistant-message-height-estimate.test.ts b/packages/app/src/utils/assistant-message-height-estimate.test.ts
index d4e3a2ff94..545704a57d 100644
--- a/packages/app/src/utils/assistant-message-height-estimate.test.ts
+++ b/packages/app/src/utils/assistant-message-height-estimate.test.ts
@@ -3,69 +3,30 @@ import { DEFAULT_CONTENT_MAX_WIDTH } from "@/styles/theme";
 import {
   clearAssistantMessageHeightEstimateCache,
   estimateAssistantMessageHeightFromCache,
-  setAssistantMarkdownBlockHeight,
+  setAssistantMessageHeight,
 } from "./assistant-message-height-estimate";
-import {
-  clearAssistantImageMetadataCache,
-  setAssistantImageMetadata,
-} from "./assistant-image-metadata";
-
 describe("assistant message height estimate", () => {
   beforeEach(() => {
     clearAssistantMessageHeightEstimateCache();
-    clearAssistantImageMetadataCache();
   });
 
-  it("estimates assistant message height from measured markdown block heights", () => {
-    setAssistantMarkdownBlockHeight({
-      block: "First paragraph",
-      width: 804,
-      height: 18.2,
+  it("uses a whole-message measurement only at the measured width", () => {
+    setAssistantMessageHeight({
+      markdown: "First\n\nSecond",
+      width: DEFAULT_CONTENT_MAX_WIDTH,
+      height: 97,
     });
-    setAssistantMarkdownBlockHeight({
-      block: "Second paragraph",
-      width: 804,
-      height: 41.1,
-    });
-
     expect(
       estimateAssistantMessageHeightFromCache({
-        markdown: "First paragraph\n\nSecond paragraph",
+        markdown: "First\n\nSecond",
         contentMaxWidth: 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({
-        markdown: "Wide paragraph",
+        markdown: "First\n\nSecond",
         contentMaxWidth: 1600,
       }),
-    ).toBe(44);
-    expect(
-      estimateAssistantMessageHeightFromCache({
-        markdown: "Wide paragraph",
-        contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
-      }),
     ).toBeNull();
   });
-
-  it("falls back to image metadata when markdown blocks are not measured", () => {
-    setAssistantImageMetadata(
-      {
-        source: "https://example.com/landscape.png",
-      },
-      { width: 1200, height: 800 },
-    );
-
-    expect(
-      estimateAssistantMessageHeightFromCache({
-        markdown: "Here is the screenshot\n\n![Screenshot](https://example.com/landscape.png)",
-        contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
-      }),
-    ).toBeGreaterThan(220);
-  });
 });
diff --git a/packages/app/src/utils/assistant-message-height-estimate.ts b/packages/app/src/utils/assistant-message-height-estimate.ts
index 02e153e0bb..a7d34b115b 100644
--- a/packages/app/src/utils/assistant-message-height-estimate.ts
+++ b/packages/app/src/utils/assistant-message-height-estimate.ts
@@ -1,20 +1,11 @@
-import {
-  type AssistantMessageHeightEstimateInput,
-  estimateAssistantMessageHeightFromCache as estimateAssistantImageMessageHeightFromCache,
-} from "@/utils/assistant-image-metadata";
-import { splitMarkdownBlocks } from "@/utils/split-markdown-blocks";
+const ASSISTANT_MESSAGE_HEIGHT_CACHE_LIMIT = 1000;
 
-const ASSISTANT_MARKDOWN_BLOCK_HEIGHT_CACHE_LIMIT = 1000;
-const ASSISTANT_MARKDOWN_BLOCK_INSET = 16;
-const ASSISTANT_MESSAGE_VERTICAL_PADDING = 24;
-const ASSISTANT_MARKDOWN_BLOCK_GAP = 12;
-
-interface MarkdownBlockHeightInput {
-  block: string;
+interface MessageHeightInput {
+  markdown: string;
   width: number;
 }
 
-const assistantMarkdownBlockHeightCache = new Map<string, number>();
+const assistantMessageHeightCache = new Map<string, number>();
 
 function touchCacheEntry<K, V>(cache: Map<K, V>, key: K, value: V, limit: number): void {
   cache.delete(key);
@@ -28,98 +19,67 @@ function touchCacheEntry<K, V>(cache: Map<K, V>, key: K, value: V, limit: number
   }
 }
 
-function hashMarkdownBlock(block: string): string {
+function hashMessage(markdown: string): string {
   let hash = 2166136261;
-  for (let index = 0; index < block.length; index += 1) {
-    hash ^= block.charCodeAt(index);
+  for (let index = 0; index < markdown.length; index += 1) {
+    hash ^= markdown.charCodeAt(index);
     hash = Math.imul(hash, 16777619);
   }
-  return `${block.length}:${(hash >>> 0).toString(36)}`;
+  return `${markdown.length}:${(hash >>> 0).toString(36)}`;
 }
 
-function normalizeMarkdownBlockWidth(width: number): number | null {
+function normalizeMessageWidth(width: number): number | null {
   if (!Number.isFinite(width) || width <= 0) {
     return null;
   }
   return Math.round(width);
 }
 
-function createMarkdownBlockHeightKey(input: MarkdownBlockHeightInput): string | null {
-  const normalizedWidth = normalizeMarkdownBlockWidth(input.width);
+function createMessageHeightKey(input: MessageHeightInput): string | null {
+  const normalizedWidth = normalizeMessageWidth(input.width);
   if (normalizedWidth === null) {
     return null;
   }
-  if (input.block.length === 0) {
+  if (input.markdown.length === 0) {
     return null;
   }
-  return `${normalizedWidth}:${hashMarkdownBlock(input.block)}`;
+  return `${normalizedWidth}:${hashMessage(input.markdown)}`;
 }
 
-export function setAssistantMarkdownBlockHeight(input: {
-  block: string;
+export function setAssistantMessageHeight(input: {
+  markdown: string;
   width: number;
   height: number;
 }): number | null {
   if (!Number.isFinite(input.height) || input.height <= 0) {
     return null;
   }
-  const key = createMarkdownBlockHeightKey({
-    block: input.block,
+  const key = createMessageHeightKey({
+    markdown: input.markdown,
     width: input.width,
   });
   if (!key) {
     return null;
   }
   const height = Math.ceil(input.height);
-  touchCacheEntry(
-    assistantMarkdownBlockHeightCache,
-    key,
-    height,
-    ASSISTANT_MARKDOWN_BLOCK_HEIGHT_CACHE_LIMIT,
-  );
+  touchCacheEntry(assistantMessageHeightCache, key, height, ASSISTANT_MESSAGE_HEIGHT_CACHE_LIMIT);
   return height;
 }
 
-function estimateAssistantMarkdownBlockHeightFromCache(
-  markdown: string,
-  contentMaxWidth: number,
-): number | null {
-  const blocks = splitMarkdownBlocks(markdown);
-  if (blocks.length === 0) {
-    return null;
-  }
-
-  let blockHeight = 0;
-  for (const block of blocks) {
-    const key = createMarkdownBlockHeightKey({
-      block,
-      width: contentMaxWidth - ASSISTANT_MARKDOWN_BLOCK_INSET,
-    });
-    const cachedHeight = key ? assistantMarkdownBlockHeightCache.get(key) : undefined;
-    if (cachedHeight === undefined) {
-      return null;
-    }
-    blockHeight += cachedHeight;
-  }
-
-  return (
-    ASSISTANT_MESSAGE_VERTICAL_PADDING +
-    blockHeight +
-    ASSISTANT_MARKDOWN_BLOCK_GAP * Math.max(0, blocks.length - 1)
-  );
-}
-
 export function estimateAssistantMessageHeightFromCache({
   markdown,
   contentMaxWidth,
-  imageContext,
-}: AssistantMessageHeightEstimateInput): number | null {
+}: {
+  markdown: string;
+  contentMaxWidth: number;
+}): number | null {
   return (
-    estimateAssistantMarkdownBlockHeightFromCache(markdown, contentMaxWidth) ??
-    estimateAssistantImageMessageHeightFromCache({ markdown, contentMaxWidth, imageContext })
+    assistantMessageHeightCache.get(
+      createMessageHeightKey({ markdown: markdown, width: contentMaxWidth }) ?? "",
+    ) ?? null
   );
 }
 
 export function clearAssistantMessageHeightEstimateCache(): void {
-  assistantMarkdownBlockHeightCache.clear();
+  assistantMessageHeightCache.clear();
 }
diff --git a/packages/app/src/utils/markdown-ast.test.ts b/packages/app/src/utils/markdown-ast.test.ts
deleted file mode 100644
index e7b439d79f..0000000000
--- a/packages/app/src/utils/markdown-ast.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { markdownNodeContainsType } from "./markdown-ast";
-
-describe("markdownNodeContainsType", () => {
-  it("matches the node itself", () => {
-    expect(markdownNodeContainsType({ type: "image", children: [] }, "image")).toBe(true);
-  });
-
-  it("matches descendants", () => {
-    const paragraph = {
-      type: "paragraph",
-      children: [
-        { type: "text", children: [] },
-        {
-          type: "link",
-          children: [{ type: "image", children: [] }],
-        },
-      ],
-    };
-
-    expect(markdownNodeContainsType(paragraph, "image")).toBe(true);
-  });
-
-  it("returns false when the type is absent", () => {
-    const paragraph = {
-      type: "paragraph",
-      children: [
-        { type: "text", children: [] },
-        { type: "strong", children: [{ type: "text", children: [] }] },
-      ],
-    };
-
-    expect(markdownNodeContainsType(paragraph, "image")).toBe(false);
-  });
-});
diff --git a/packages/app/src/utils/markdown-ast.ts b/packages/app/src/utils/markdown-ast.ts
deleted file mode 100644
index bcd2526e41..0000000000
--- a/packages/app/src/utils/markdown-ast.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export interface MarkdownAstNodeWithChildren {
-  type: string;
-  children: MarkdownAstNodeWithChildren[];
-}
-
-export function markdownNodeContainsType(node: MarkdownAstNodeWithChildren, type: string): boolean {
-  if (node.type === type) {
-    return true;
-  }
-
-  return node.children.some((child) => markdownNodeContainsType(child, type));
-}
diff --git a/packages/app/src/utils/markdown-list.test.ts b/packages/app/src/utils/markdown-list.test.ts
deleted file mode 100644
index a30a69a9eb..0000000000
--- a/packages/app/src/utils/markdown-list.test.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { getMarkdownListMarker, getMarkdownListSpacing } from "./markdown-list";
-
-describe("getMarkdownListMarker", () => {
-  it("returns a bullet marker for unordered list items", () => {
-    expect(getMarkdownListMarker({ index: 0 }, [{ type: "bullet_list" }])).toEqual({
-      isOrdered: false,
-      marker: "•",
-    });
-  });
-
-  it("returns numbered markers for ordered list items", () => {
-    expect(getMarkdownListMarker({ index: 1, markup: "." }, [{ type: "ordered_list" }])).toEqual({
-      isOrdered: true,
-      marker: "2.",
-    });
-  });
-
-  it("respects ordered list start attribute", () => {
-    expect(
-      getMarkdownListMarker({ index: 2, markup: ")" }, [
-        { type: "ordered_list", attributes: { start: "5" } },
-      ]),
-    ).toEqual({
-      isOrdered: true,
-      marker: "7)",
-    });
-  });
-
-  it("prefers the nearest list ancestor in nested lists", () => {
-    expect(
-      getMarkdownListMarker({ index: 0, markup: "." }, [
-        { type: "ordered_list" },
-        { type: "bullet_list" },
-      ]),
-    ).toEqual({
-      isOrdered: true,
-      marker: "1.",
-    });
-  });
-});
-
-describe("getMarkdownListSpacing", () => {
-  it("keeps top-level list spacing as a section boundary", () => {
-    const paragraph = { type: "paragraph" };
-    const list = { type: "bullet_list" };
-    const body = { type: "body", children: [list, paragraph] };
-
-    expect(getMarkdownListSpacing(list, [body])).toEqual({
-      marginTop: 4,
-      marginBottom: 16,
-    });
-  });
-
-  it("does not add bottom spacing after a list at the end of a markdown block", () => {
-    const list = { type: "bullet_list" };
-    const body = { type: "body", children: [list] };
-
-    expect(getMarkdownListSpacing(list, [body])).toEqual({
-      marginTop: 4,
-      marginBottom: 0,
-    });
-  });
-
-  it("uses a smaller gap between adjacent top-level lists", () => {
-    const list = { type: "bullet_list" };
-    const body = { type: "body", children: [list, { type: "ordered_list" }] };
-
-    expect(getMarkdownListSpacing(list, [body])).toEqual({
-      marginTop: 4,
-      marginBottom: 8,
-    });
-  });
-
-  it("does not add section spacing after a nested list", () => {
-    expect(
-      getMarkdownListSpacing({ type: "bullet_list" }, [
-        { type: "list_item" },
-        { type: "bullet_list" },
-        { type: "body" },
-      ]),
-    ).toEqual({
-      marginTop: 4,
-      marginBottom: 0,
-    });
-  });
-});
diff --git a/packages/app/src/utils/markdown-list.ts b/packages/app/src/utils/markdown-list.ts
deleted file mode 100644
index 3dd5150242..0000000000
--- a/packages/app/src/utils/markdown-list.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { SPACING } from "@/styles/theme";
-
-interface MarkdownNode {
-  type?: string;
-  index?: number;
-  markup?: string;
-  attributes?: {
-    start?: number | string;
-  };
-  children?: MarkdownNode[];
-}
-
-const LIST_BULLET = "•";
-const DEFAULT_ORDERED_LIST_MARKUP = ".";
-const MARKDOWN_LIST_MARGIN_TOP = SPACING[1];
-const MARKDOWN_LIST_MARGIN_BOTTOM_TO_PROSE = SPACING[4];
-const MARKDOWN_LIST_MARGIN_BOTTOM_TO_LIST = SPACING[2];
-const MARKDOWN_NESTED_LIST_MARGIN_BOTTOM = 0;
-const MARKDOWN_TERMINAL_LIST_MARGIN_BOTTOM = 0;
-
-function toParentNodes(parent: unknown): MarkdownNode[] {
-  if (Array.isArray(parent)) {
-    return parent;
-  }
-
-  if (parent && typeof parent === "object") {
-    return [parent as MarkdownNode];
-  }
-
-  return [];
-}
-
-function getNearestListParent(parent: unknown): MarkdownNode | undefined {
-  return toParentNodes(parent).find(
-    (ancestor) => ancestor?.type === "ordered_list" || ancestor?.type === "bullet_list",
-  );
-}
-
-function getOrderedListItemIndex(node: MarkdownNode, listParent: MarkdownNode): number {
-  if (typeof node.index === "number" && Number.isFinite(node.index) && node.index >= 0) {
-    return node.index;
-  }
-
-  if (Array.isArray(listParent.children)) {
-    const fallbackIndex = listParent.children.indexOf(node);
-    if (fallbackIndex >= 0) {
-      return fallbackIndex;
-    }
-  }
-
-  return 0;
-}
-
-function parseOrderedListStart(node: MarkdownNode): number {
-  const rawStart = node.attributes?.start;
-  if (typeof rawStart === "number" && Number.isFinite(rawStart)) {
-    return rawStart;
-  }
-
-  if (typeof rawStart === "string") {
-    const parsed = Number.parseInt(rawStart, 10);
-    if (Number.isFinite(parsed)) {
-      return parsed;
-    }
-  }
-
-  return 1;
-}
-
-export function getMarkdownNextSiblingType(
-  node: MarkdownNode,
-  parent: unknown,
-): string | undefined {
-  const ancestors = toParentNodes(parent);
-  for (let i = ancestors.length - 1; i >= 0; i--) {
-    const ancestor = ancestors[i];
-    if (!Array.isArray(ancestor?.children)) continue;
-    const idx = ancestor.children.indexOf(node);
-    if (idx >= 0) {
-      return ancestor.children[idx + 1]?.type;
-    }
-  }
-  return undefined;
-}
-
-function isListType(type: string | undefined): boolean {
-  return type === "bullet_list" || type === "ordered_list";
-}
-
-function hasListItemAncestor(parent: unknown): boolean {
-  return toParentNodes(parent).some((ancestor) => ancestor?.type === "list_item");
-}
-
-export function getMarkdownListSpacing(
-  node: MarkdownNode,
-  parent: unknown,
-): { marginTop: number; marginBottom: number } {
-  if (hasListItemAncestor(parent)) {
-    return {
-      marginTop: MARKDOWN_LIST_MARGIN_TOP,
-      marginBottom: MARKDOWN_NESTED_LIST_MARGIN_BOTTOM,
-    };
-  }
-
-  const nextType = getMarkdownNextSiblingType(node, parent);
-  if (!nextType) {
-    return {
-      marginTop: MARKDOWN_LIST_MARGIN_TOP,
-      marginBottom: MARKDOWN_TERMINAL_LIST_MARGIN_BOTTOM,
-    };
-  }
-
-  return {
-    marginTop: MARKDOWN_LIST_MARGIN_TOP,
-    marginBottom: isListType(nextType)
-      ? MARKDOWN_LIST_MARGIN_BOTTOM_TO_LIST
-      : MARKDOWN_LIST_MARGIN_BOTTOM_TO_PROSE,
-  };
-}
-
-export function getMarkdownListMarker(
-  node: MarkdownNode,
-  parent: unknown,
-): {
-  isOrdered: boolean;
-  marker: string;
-} {
-  const listParent = getNearestListParent(parent);
-  if (!listParent || listParent.type !== "ordered_list") {
-    return {
-      isOrdered: false,
-      marker: LIST_BULLET,
-    };
-  }
-
-  const orderedIndex = getOrderedListItemIndex(node, listParent);
-  const orderedStart = parseOrderedListStart(listParent);
-  const orderedMarkup =
-    typeof node.markup === "string" && node.markup.length > 0
-      ? node.markup
-      : DEFAULT_ORDERED_LIST_MARKUP;
-
-  return {
-    isOrdered: true,
-    marker: `${orderedStart + orderedIndex}${orderedMarkup}`,
-  };
-}
diff --git a/packages/app/src/utils/split-markdown-blocks.ts b/packages/app/src/utils/split-markdown-blocks.ts
deleted file mode 100644
index 8282fc3ca9..0000000000
--- a/packages/app/src/utils/split-markdown-blocks.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import MarkdownIt from "markdown-it";
-
-// Only block maps are needed here; inline parsing belongs to each rendered block.
-const markdownBlockParser = new MarkdownIt();
-markdownBlockParser.core.ruler.disable("inline");
-
-// The renderer decides what counts as a definition, so ask the same parser: a block
-// that produces no tokens but registers references is nothing but definitions.
-function isLinkReferenceDefinitionBlock(block: string): boolean {
-  const env: { references?: Record<string, unknown> } = {};
-  const tokens = markdownBlockParser.parse(block, env);
-  return tokens.length === 0 && Object.keys(env.references ?? {}).length > 0;
-}
-
-/**
- * Definitions render nothing and resolve nothing on their own, so a block made only of
- * them would paint an empty row and break every reference that pointed at it. Fold it
- * into the block it belongs to: the one above, or the one below when it leads.
- */
-function foldLinkReferenceDefinitions(blocks: string[]): string[] {
-  const folded: string[] = [];
-  let leading: string[] = [];
-  for (const block of blocks) {
-    if (isLinkReferenceDefinitionBlock(block)) {
-      if (folded.length > 0) folded[folded.length - 1] += `\n\n${block}`;
-      else leading.push(block);
-      continue;
-    }
-    folded.push([...leading, block].join("\n\n"));
-    leading = [];
-  }
-  if (leading.length > 0) folded.push(leading.join("\n\n"));
-  return folded;
-}
-
-export function splitMarkdownBlocks(text: string): string[] {
-  if (text.length === 0) {
-    return [];
-  }
-
-  const blocks: string[] = [];
-  let currentLines: string[] = [];
-  let sawBlockSeparator = false;
-  const lines = text.split("\n");
-  const structuralBlankLines = getStructuralBlankLines(text, lines);
-
-  for (const [index, line] of lines.entries()) {
-    const isBlankLine = line.trim().length === 0;
-
-    if (isBlankLine && structuralBlankLines.has(index)) {
-      currentLines.push(line);
-      continue;
-    }
-
-    if (isBlankLine) {
-      if (currentLines.length > 0) {
-        sawBlockSeparator = true;
-      }
-      continue;
-    }
-
-    if (sawBlockSeparator) {
-      blocks.push(currentLines.join("\n"));
-      currentLines = [];
-      sawBlockSeparator = false;
-    }
-
-    currentLines.push(line);
-  }
-
-  if (currentLines.length > 0) {
-    blocks.push(currentLines.join("\n"));
-  }
-
-  return foldLinkReferenceDefinitions(blocks.filter((block) => block.length > 0));
-}
-
-function getStructuralBlankLines(text: string, lines: string[]): Set<number> {
-  const blankLines = new Set<number>();
-  for (const token of markdownBlockParser.parse(text, {})) {
-    if (token.level !== 0 || !token.map) {
-      continue;
-    }
-    const [start, end] = token.map;
-    for (let index = start; index < end - 1; index += 1) {
-      if (lines[index]?.trim().length === 0) {
-        blankLines.add(index);
-      }
-    }
-  }
-  return blankLines;
-}
diff --git a/packages/app/src/utils/streaming-markdown/index.ts b/packages/app/src/utils/streaming-markdown/index.ts
deleted file mode 100644
index b70b464d76..0000000000
--- a/packages/app/src/utils/streaming-markdown/index.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import type MarkdownIt from "markdown-it";
-import type StateInline from "markdown-it/lib/rules_inline/state_inline.mjs";
-
-const STREAMING_TAIL = Symbol("streaming markdown tail");
-
-/** Adds provisional inline formatting without changing the source or literal code blocks. */
-export function enableStreamingMarkdown(parser: MarkdownIt): void {
-  parser.core.ruler.at("inline", (state) => {
-    const tail = state.tokens.findLast((token) => token.nesting !== -1);
-    for (const token of state.tokens) {
-      if (token.type === "inline") {
-        const env = { ...state.env, [STREAMING_TAIL]: token === tail };
-        token.children = [];
-        state.md.inline.parse(token.content, state.md, env, token.children);
-      }
-    }
-  });
-  parser.inline.ruler.before("backticks", "streaming_code", completeCode);
-  parser.inline.ruler.before("strikethrough", "streaming_marker", hideOpeningMarker);
-  parser.inline.ruler.after("image", "streaming_link", completeLink);
-  parser.inline.ruler2.after("balance_pairs", "streaming_emphasis", completeEmphasis);
-  parser.core.ruler.after("linkify", "streaming_link_text", (state) => {
-    for (const block of state.tokens) {
-      for (const token of block.children ?? []) {
-        if (token.type === "streaming_link_text") token.type = "text";
-      }
-    }
-  });
-}
-
-function isStreamingTail(state: StateInline): boolean {
-  return state.env[STREAMING_TAIL] === true && state.posMax === state.src.length;
-}
-
-function hideOpeningMarker(state: StateInline, silent: boolean): boolean {
-  if (silent || !isStreamingTail(state)) return false;
-  if (!/^(?:\*{1,3}|_{1,3}|~{1,2})$/.test(state.src.slice(state.pos))) return false;
-  if (state.scanDelims(state.pos, state.src[state.pos] !== "_").can_close) return false;
-  state.pos = state.posMax;
-  return true;
-}
-
-function completeCode(state: StateInline, silent: boolean): boolean {
-  if (silent || !isStreamingTail(state) || state.src[state.pos] !== "`") return false;
-  const runs = /`+/g;
-  runs.lastIndex = state.pos;
-  const opening = runs.exec(state.src)!;
-  let closing: RegExpExecArray | null;
-  while ((closing = runs.exec(state.src))) {
-    if (closing[0].length === opening[0].length) return false;
-  }
-  let content = state.src.slice(state.pos + opening[0].length);
-  // A shorter trailing run may be the first characters of the closing marker.
-  const partialClosing = content.match(/`+$/);
-  if (partialClosing && partialClosing[0].length < opening[0].length) {
-    content = content.slice(0, -partialClosing[0].length);
-  }
-  if (content) {
-    const token = state.push("code_inline", "code", 0);
-    token.markup = opening[0];
-    token.content = content.replace(/\n/g, " ").replace(/^ (.+) $/, "$1");
-  }
-  state.pos = state.posMax;
-  return true;
-}
-
-function completeLink(state: StateInline, silent: boolean): boolean {
-  if (silent || !isStreamingTail(state)) return false;
-  const image = state.src[state.pos] === "!";
-  const start = state.pos + (image ? 1 : 0);
-  if (state.src[start] !== "[") return false;
-  const labelEnd = state.md.helpers.parseLinkLabel(state, start, false);
-  if (labelEnd !== -1 && labelEnd + 1 < state.posMax) {
-    if (state.src[labelEnd + 1] !== "(" || hasClosedDestination(state.src, labelEnd + 1)) {
-      return false;
-    }
-  }
-  const end = state.posMax;
-  if (!image) {
-    if (state.pending) state.pushPending();
-    const firstLabelToken = state.tokens.length;
-    state.pos = start + 1;
-    state.posMax = labelEnd === -1 ? end : labelEnd;
-    state.level++;
-    state.md.inline.tokenize(state);
-    state.level--;
-    // Keep URL-shaped labels out of the automatic linkifier until the real
-    // destination arrives. Restore ordinary text before tokens reach the view.
-    for (let index = firstLabelToken; index < state.tokens.length; index++) {
-      if (state.tokens[index].type === "text") state.tokens[index].type = "streaming_link_text";
-    }
-  }
-  state.pos = state.posMax = end;
-  return true;
-}
-
-function hasClosedDestination(source: string, start: number): boolean {
-  let depth = 0;
-  let quote = "";
-  for (let index = start; index < source.length; index++) {
-    const char = source[index];
-    if (char === "\\") {
-      index++;
-    } else if (quote) {
-      if (char === quote) quote = "";
-    } else if (char === "<") {
-      quote = ">";
-    } else if ((char === '"' || char === "'") && /\s/.test(source[index - 1])) {
-      quote = char;
-    } else if (char === "(") {
-      depth++;
-    } else if (char === ")" && --depth === 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
-function completeEmphasis(state: StateInline): boolean {
-  if (!isStreamingTail(state)) return false;
-  const open = [];
-  let closedThrough = -1;
-  // Reuse markdown-it's escape, word-boundary, nesting and delimiter matching
-  // decisions. Only unmatched openers outside already-closed spans reach EOF.
-  for (const [index, delimiter] of state.delimiters.entries()) {
-    if (delimiter.end !== -1) {
-      closedThrough = Math.max(closedThrough, delimiter.end);
-    } else if (index > closedThrough && delimiter.open) {
-      open.push(delimiter);
-    }
-  }
-  for (const delimiter of open.toReversed()) {
-    if (delimiter.marker === 126 && /(?<![\\~])~$/.test(state.src)) {
-      const last = state.tokens.at(-1);
-      if (last?.type === "text" && last.content.endsWith("~")) {
-        last.content = last.content.slice(0, -1);
-      }
-    }
-    const closing = state.push("text", "", 0);
-    closing.content = String.fromCharCode(delimiter.marker).repeat(
-      delimiter.marker === 126 ? 2 : 1,
-    );
-    delimiter.end = state.delimiters.length;
-    state.delimiters.push({
-      ...delimiter,
-      token: state.tokens.length - 1,
-      end: -1,
-      open: false,
-      close: true,
-    });
-  }
-  return true;
-}
diff --git a/packages/website/vite.config.ts b/packages/website/vite.config.ts
index 46dbc554de..d609be14bb 100644
--- a/packages/website/vite.config.ts
+++ b/packages/website/vite.config.ts
@@ -117,7 +117,7 @@ export default defineConfig((): UserConfig => {
     },
     plugins: [
       cloudflare({ viteEnvironment: { name: "ssr" } }),
-      tsConfigPaths(),
+      tsConfigPaths({ projects: [path.join(__dirname, "tsconfig.json")] }),
       tanstackStart({
         router: {
           quoteStyle: "double",
diff --git a/patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch b/patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch
new file mode 100644
index 0000000000..b41700d65b
--- /dev/null
+++ b/patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch
@@ -0,0 +1,2930 @@
+// UPSTREAM: https://github.com/software-mansion/enriched-markdown/pull/997
+diff --git a/node_modules/react-native-enriched-markdown/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/EventEmitters.cpp b/node_modules/react-native-enriched-markdown/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/EventEmitters.cpp
+index 77465ad..94997f7 100644
+--- a/node_modules/react-native-enriched-markdown/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/EventEmitters.cpp
++++ b/node_modules/react-native-enriched-markdown/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/EventEmitters.cpp
+@@ -17,6 +17,7 @@ void EnrichedMarkdownEventEmitter::onLinkPress(OnLinkPress event) const {
+   dispatchEvent("linkPress", [event=std::move(event)](jsi::Runtime &runtime) {
+     auto payload = jsi::Object(runtime);
+     payload.setProperty(runtime, "url", event.url);
++    payload.setProperty(runtime, "sourceType", event.sourceType);
+     return payload;
+   });
+ }
+@@ -362,6 +363,7 @@ void EnrichedMarkdownTextEventEmitter::onLinkPress(OnLinkPress event) const {
+   dispatchEvent("linkPress", [event=std::move(event)](jsi::Runtime &runtime) {
+     auto payload = jsi::Object(runtime);
+     payload.setProperty(runtime, "url", event.url);
++    payload.setProperty(runtime, "sourceType", event.sourceType);
+     return payload;
+   });
+ }
+diff --git a/node_modules/react-native-enriched-markdown/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/EventEmitters.h b/node_modules/react-native-enriched-markdown/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/EventEmitters.h
+index 0a1c6c2..5935112 100644
+--- a/node_modules/react-native-enriched-markdown/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/EventEmitters.h
++++ b/node_modules/react-native-enriched-markdown/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/EventEmitters.h
+@@ -19,6 +19,7 @@ class EnrichedMarkdownEventEmitter : public ViewEventEmitter {
+ 
+   struct OnLinkPress {
+       std::string url;
++      std::string sourceType;
+     };
+ 
+   struct OnLinkLongPress {
+@@ -298,6 +299,7 @@ class EnrichedMarkdownTextEventEmitter : public ViewEventEmitter {
+ 
+   struct OnLinkPress {
+       std::string url;
++      std::string sourceType;
+     };
+ 
+   struct OnLinkLongPress {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdown.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdown.kt
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdown.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdown.kt
+@@ -95,7 +95,7 @@
+   private var accessibilityLabels = AccessibilityLabels()
+   private var textBreakStrategy: String = BreakStrategyUtils.DEFAULT_STRATEGY
+ 
+-  private var onLinkPressCallback: ((String) -> Unit)? = null
++  private var onLinkPressCallback: ((String, String) -> Unit)? = null
+   private var onLinkLongPressCallback: ((String) -> Unit)? = null
+   private var onTaskListItemPressCallback: ((Int, Boolean, String) -> Unit)? = null
+   private var onLatexErrorCallback: LatexErrorReporter? = null
+@@ -296,7 +296,7 @@
+     }
+   }
+ 
+-  fun setOnLinkPressCallback(callback: (String) -> Unit) {
++  fun setOnLinkPressCallback(callback: (String, String) -> Unit) {
+     onLinkPressCallback = callback
+   }
+ 
+@@ -405,7 +405,7 @@
+     val codeLinkRegex = inlineCodeLinkRegex
+     val renderId = ++currentRenderId
+ 
+-    executor.execute {
++    dispatchMarkdownRender(segmentViews.isNotEmpty(), executor) {
+       try {
+         val filtered =
+           if (isStreaming) {
+@@ -418,13 +418,13 @@
+ 
+         if (renderableMarkdown.isEmpty()) {
+           postToMain(renderId) { applyRenderedSegments(emptyList(), false) }
+-          return@execute
++          return@dispatchMarkdownRender
+         }
+ 
+         val ast =
+           parser.parseMarkdown(renderableMarkdown, md4cFlags, isGFM, textLinkRegex, codeLinkRegex) ?: run {
+             postToMain(renderId) { applyRenderedSegments(emptyList(), false) }
+-            return@execute
++            return@dispatchMarkdownRender
+           }
+ 
+         val segments = splitASTIntoSegments(ast)
+@@ -646,8 +646,12 @@
+     renderId: Long,
+     action: () -> Unit,
+   ) {
+-    mainHandler.post {
++    if (Looper.myLooper() == Looper.getMainLooper()) {
+       if (renderId == currentRenderId) action()
++    } else {
++      mainHandler.post {
++        if (renderId == currentRenderId) action()
++      }
+     }
+   }
+ 
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownManager.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownManager.kt
+index 5dd5828..757d2bd 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownManager.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownManager.kt
+@@ -50,8 +50,8 @@ class EnrichedMarkdownManager :
+       emitContextMenuItemPress(view, itemText, selectedText, selectionStart, selectionEnd)
+     }
+ 
+-    view.setOnLinkPressCallback { url ->
+-      emitLinkPress(view, url)
++    view.setOnLinkPressCallback { url, sourceType ->
++      emitLinkPress(view, url, sourceType)
+     }
+ 
+     view.setOnLinkLongPressCallback { url ->
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownText.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownText.kt
+index 8745349..f3275b9 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownText.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownText.kt
+@@ -69,7 +69,7 @@ class EnrichedMarkdownText
+     CodeBlockPressHost {
+     private val parser = Parser.shared
+     private val renderer = Renderer()
+-    private var onLinkPressCallback: ((String) -> Unit)? = null
++    private var onLinkPressCallback: ((String, String) -> Unit)? = null
+     private var onLinkLongPressCallback: ((String) -> Unit)? = null
+     private var onLatexErrorCallback: LatexErrorReporter? = null
+ 
+@@ -455,8 +455,8 @@ class EnrichedMarkdownText
+       }
+     }
+ 
+-    fun emitOnLinkPress(url: String) {
+-      emitLinkPressEvent(url)
++    fun emitOnLinkPress(url: String, sourceType: String) {
++      emitLinkPressEvent(url, sourceType)
+     }
+ 
+     fun emitOnLinkLongPress(url: String) {
+@@ -491,7 +491,7 @@ class EnrichedMarkdownText
+       codeBlockPressEnabled = enabled
+     }
+ 
+-    fun setOnLinkPressCallback(callback: (String) -> Unit) {
++    fun setOnLinkPressCallback(callback: (String, String) -> Unit) {
+       onLinkPressCallback = callback
+     }
+ 
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownTextManager.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownTextManager.kt
+index f1e3345..2549508 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownTextManager.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownTextManager.kt
+@@ -47,8 +47,8 @@ class EnrichedMarkdownTextManager :
+       emitContextMenuItemPress(view, itemText, selectedText, selectionStart, selectionEnd)
+     }
+ 
+-    view.setOnLinkPressCallback { url ->
+-      emitLinkPress(view, url)
++    view.setOnLinkPressCallback { url, sourceType ->
++      emitLinkPress(view, url, sourceType)
+     }
+ 
+     view.setOnLinkLongPressCallback { url ->
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/events/LinkPressEvent.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/events/LinkPressEvent.kt
+index 93c763e..fbe1c68 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/events/LinkPressEvent.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/events/LinkPressEvent.kt
+@@ -8,12 +8,14 @@ class LinkPressEvent(
+   surfaceId: Int,
+   viewId: Int,
+   private val url: String,
++  private val sourceType: String,
+ ) : Event<LinkPressEvent>(surfaceId, viewId) {
+   override fun getEventName(): String = EVENT_NAME
+ 
+   override fun getEventData(): WritableMap {
+     val eventData: WritableMap = Arguments.createMap()
+     eventData.putString("url", url)
++    eventData.putString("sourceType", sourceType)
+     return eventData
+   }
+ 
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BaselineShiftRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BaselineShiftRenderer.kt
+index cb4605a..510af94 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BaselineShiftRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BaselineShiftRenderer.kt
+@@ -14,7 +14,7 @@ abstract class BaselineShiftRenderer : NodeRenderer {
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlankLineRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlankLineRenderer.kt
+index 0a57557..25eb0dc 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlankLineRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlankLineRenderer.kt
+@@ -15,7 +15,7 @@ class BlankLineRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlockquoteRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlockquoteRenderer.kt
+index f5804a5..6292452 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlockquoteRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlockquoteRenderer.kt
+@@ -19,7 +19,7 @@ class BlockquoteRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlockquoteTextRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlockquoteTextRenderer.kt
+index 91f4a7c..4eacec8 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlockquoteTextRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlockquoteTextRenderer.kt
+@@ -24,7 +24,7 @@ class BlockquoteTextRenderer(
+   fun render(
+     renderer: Renderer,
+     nodes: List<MarkdownASTNode>,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+   ): SpannableStringBuilder = renderer.renderContent(nodes, onLinkPress, onLinkLongPress, block = this)
+ 
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/CodeBlockRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/CodeBlockRenderer.kt
+index 4fcf57d..606c1a5 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/CodeBlockRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/CodeBlockRenderer.kt
+@@ -18,7 +18,7 @@ class CodeBlockRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/CodeRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/CodeRenderer.kt
+index 0008d9b..6b54eff 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/CodeRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/CodeRenderer.kt
+@@ -12,7 +12,7 @@ class CodeRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/EmphasisRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/EmphasisRenderer.kt
+index 8029d2d..6811dc4 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/EmphasisRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/EmphasisRenderer.kt
+@@ -11,7 +11,7 @@ class EmphasisRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/HeadingRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/HeadingRenderer.kt
+index 1a8c71b..432cfae 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/HeadingRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/HeadingRenderer.kt
+@@ -17,7 +17,7 @@ class HeadingRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/HighlightRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/HighlightRenderer.kt
+index a99a31f..acfcce5 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/HighlightRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/HighlightRenderer.kt
+@@ -9,7 +9,7 @@ class HighlightRenderer : NodeRenderer {
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ImageRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ImageRenderer.kt
+index 0047361..58e07f3 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ImageRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ImageRenderer.kt
+@@ -9,7 +9,7 @@ class ImageRenderer : NodeRenderer {
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/LineBreakRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/LineBreakRenderer.kt
+index 0cfad74..df88c5d 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/LineBreakRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/LineBreakRenderer.kt
+@@ -7,7 +7,7 @@ class LineBreakRenderer : NodeRenderer {
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/LinkRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/LinkRenderer.kt
+index 360a436..2bca5be 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/LinkRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/LinkRenderer.kt
+@@ -19,7 +19,7 @@ class LinkRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ListItemRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ListItemRenderer.kt
+index b849f78..24c06f3 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ListItemRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ListItemRenderer.kt
+@@ -19,7 +19,7 @@ class ListItemRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ListRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ListRenderer.kt
+index 2bac5b1..ff2d2c2 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ListRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ListRenderer.kt
+@@ -16,7 +16,7 @@ class ListRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/NodeRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/NodeRenderer.kt
+index 354b31a..77b1e14 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/NodeRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/NodeRenderer.kt
+@@ -15,7 +15,7 @@ interface NodeRenderer {
+   fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   )
+@@ -175,7 +175,7 @@ class RendererFactory(
+   fun renderChildren(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+   ) {
+     renderNodes(node.children, builder, onLinkPress, onLinkLongPress)
+@@ -190,7 +190,7 @@ class RendererFactory(
+   fun renderNodes(
+     nodes: List<MarkdownASTNode>,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+   ) {
+     nodes.forEach { node ->
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ParagraphRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ParagraphRenderer.kt
+index 305acc9..cda43ac 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ParagraphRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ParagraphRenderer.kt
+@@ -16,7 +16,7 @@ class ParagraphRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/Renderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/Renderer.kt
+index ae4be04..01dac8a 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/Renderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/Renderer.kt
+@@ -36,7 +36,7 @@ class Renderer {
+ 
+   fun renderDocument(
+     document: MarkdownASTNode,
+-    onLinkPress: ((String) -> Unit)? = null,
++    onLinkPress: ((String, String) -> Unit)? = null,
+     onLinkLongPress: ((String) -> Unit)? = null,
+   ): SpannableStringBuilder = renderContent(document.children, onLinkPress, onLinkLongPress)
+ 
+@@ -59,7 +59,7 @@ class Renderer {
+    */
+   fun renderContent(
+     nodes: List<MarkdownASTNode>,
+-    onLinkPress: ((String) -> Unit)? = null,
++    onLinkPress: ((String, String) -> Unit)? = null,
+     onLinkLongPress: ((String) -> Unit)? = null,
+     block: BlockquoteTextRenderer? = null,
+   ): SpannableStringBuilder {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/SoftBreakRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/SoftBreakRenderer.kt
+index 334b545..3ae58ff 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/SoftBreakRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/SoftBreakRenderer.kt
+@@ -7,7 +7,7 @@ class SoftBreakRenderer : NodeRenderer {
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/SpoilerRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/SpoilerRenderer.kt
+index 430f98e..8dbdca7 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/SpoilerRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/SpoilerRenderer.kt
+@@ -9,7 +9,7 @@ class SpoilerRenderer : NodeRenderer {
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/StrikethroughRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/StrikethroughRenderer.kt
+index 8ffa61e..c6b562c 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/StrikethroughRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/StrikethroughRenderer.kt
+@@ -11,7 +11,7 @@ class StrikethroughRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/StrongRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/StrongRenderer.kt
+index 584d79b..702b41e 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/StrongRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/StrongRenderer.kt
+@@ -11,7 +11,7 @@ class StrongRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/TextRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/TextRenderer.kt
+index 54e324e..f2856d2 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/TextRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/TextRenderer.kt
+@@ -9,7 +9,7 @@ class TextRenderer : NodeRenderer {
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ThematicBreakRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ThematicBreakRenderer.kt
+index fa63d17..7c43b57 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ThematicBreakRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/ThematicBreakRenderer.kt
+@@ -11,7 +11,7 @@ class ThematicBreakRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/UnderlineRenderer.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/UnderlineRenderer.kt
+index d658913..4437eb0 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/UnderlineRenderer.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/renderer/UnderlineRenderer.kt
+@@ -11,7 +11,7 @@ class UnderlineRenderer(
+   override fun render(
+     node: MarkdownASTNode,
+     builder: SpannableStringBuilder,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     factory: RendererFactory,
+   ) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/RenderedSegment.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/RenderedSegment.kt
+index 0afa2c0..4454e2c 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/RenderedSegment.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/RenderedSegment.kt
+@@ -64,7 +64,7 @@ object MarkdownSegmentRenderer {
+     segments: List<MarkdownSegment>,
+     style: StyleConfig,
+     context: Context,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     blockquoteStyle: BlockquoteStyle? = null,
+     onLatexError: LatexErrorReporter? = null,
+@@ -107,7 +107,7 @@ object MarkdownSegmentRenderer {
+     nodes: List<MarkdownASTNode>,
+     style: StyleConfig,
+     context: Context,
+-    onLinkPress: ((String) -> Unit)?,
++    onLinkPress: ((String, String) -> Unit)?,
+     onLinkLongPress: ((String) -> Unit)?,
+     blockquoteStyle: BlockquoteStyle?,
+     onLatexError: LatexErrorReporter?,
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/SegmentViewCreators.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/SegmentViewCreators.kt
+index c9644d1..58b2f4e 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/SegmentViewCreators.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/SegmentViewCreators.kt
+@@ -67,7 +67,7 @@ data class SegmentViewConfig(
+   val selectionHandleColor: Int?,
+   val contextMenuItemTexts: List<String>,
+   val dynamicProps: DynamicBlockProps,
+-  val onLinkPress: ((String) -> Unit)?,
++  val onLinkPress: ((String, String) -> Unit)?,
+   val onLinkLongPress: ((String) -> Unit)?,
+   val onTaskListItemPress: ((taskIndex: Int, checked: Boolean, itemText: String) -> Unit)?,
+   val onContextMenuItemPress: ((itemText: String, selectedText: String, selectionStart: Int, selectionEnd: Int) -> Unit)?,
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/TableContainerView.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/TableContainerView.kt
+index e190548..b2e6cf2 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/TableContainerView.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/TableContainerView.kt
+@@ -19,7 +19,6 @@ import android.view.Gravity
+ import android.view.MotionEvent
+ import android.view.View
+ import android.widget.FrameLayout
+-import android.widget.HorizontalScrollView
+ import androidx.core.view.ViewCompat
+ import com.swmansion.enriched.markdown.accessibility.AccessibilityLabels
+ import com.swmansion.enriched.markdown.parser.MarkdownASTNode
+@@ -38,6 +37,7 @@ import com.swmansion.enriched.markdown.utils.text.span.prepareWidthAwareSpans
+ import com.swmansion.enriched.markdown.utils.text.view.LinkLongPressMovementMethod
+ import com.swmansion.enriched.markdown.utils.text.view.cancelJSTouchForLinkTap
+ import com.swmansion.enriched.markdown.utils.text.view.reallowParentInterceptIfLinkReleased
++import com.swmansion.enriched.markdown.views.ClaimingHorizontalScrollView
+ import com.swmansion.enriched.markdown.views.ContextMenuPopup
+ import kotlin.math.ceil
+ import kotlin.math.max
+@@ -57,7 +57,7 @@ class TableContainerView(
+ 
+   var allowFontScaling = true
+   var maxFontSizeMultiplier = 0f
+-  var onLinkPress: ((String) -> Unit)? = null
++  var onLinkPress: ((String, String) -> Unit)? = null
+   var onLinkLongPress: ((String) -> Unit)? = null
+   var accessibilityLabels: AccessibilityLabels = AccessibilityLabels()
+     set(value) {
+@@ -70,7 +70,7 @@ class TableContainerView(
+   var dynamicProps: DynamicBlockProps = DynamicBlockProps()
+ 
+   private val scrollView =
+-    HorizontalScrollView(context).apply {
++    ClaimingHorizontalScrollView(context).apply {
+       isHorizontalScrollBarEnabled = true
+       overScrollMode = View.OVER_SCROLL_NEVER
+       importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/spans/LinkSpan.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/spans/LinkSpan.kt
+index ff00069..f3e13aa 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/spans/LinkSpan.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/spans/LinkSpan.kt
+@@ -12,7 +12,7 @@ import com.swmansion.enriched.markdown.utils.text.extensions.applyBlockStyleFont
+ 
+ class LinkSpan(
+   val url: String,
+-  private val onLinkPress: ((String) -> Unit)?,
++  private val onLinkPress: ((String, String) -> Unit)?,
+   private val onLinkLongPress: ((String) -> Unit)?,
+   private val styleCache: SpanStyleCache,
+   private val blockStyle: BlockStyle,
+@@ -30,7 +30,8 @@ class LinkSpan(
+       return
+     }
+ 
+-    onLinkPress?.invoke(url) ?: (widget as? EnrichedMarkdownText)?.emitOnLinkPress(url)
++    val sourceType = if (keepsCodeFont) "inline-code" else if (recognizedLink) "text" else "markdown"
++    onLinkPress?.invoke(url, sourceType) ?: (widget as? EnrichedMarkdownText)?.emitOnLinkPress(url, sourceType)
+   }
+ 
+   fun onLongClick(widget: View): Boolean {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/utils/common/MarkdownViewManagerUtils.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/utils/common/MarkdownViewManagerUtils.kt
+index b4d3cdc..4652b10 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/utils/common/MarkdownViewManagerUtils.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/utils/common/MarkdownViewManagerUtils.kt
+@@ -37,11 +37,12 @@ fun markdownEventTypeConstants(): MutableMap<String, Any> {
+ fun emitLinkPress(
+   view: View,
+   url: String,
++  sourceType: String,
+ ) {
+   val context = view.context as com.facebook.react.bridge.ReactContext
+   val surfaceId = UIManagerHelper.getSurfaceId(context)
+   val eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
+-  eventDispatcher?.dispatchEvent(LinkPressEvent(surfaceId, view.id, url))
++  eventDispatcher?.dispatchEvent(LinkPressEvent(surfaceId, view.id, url, sourceType))
+ }
+ 
+ fun emitLinkLongPress(
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/utils/text/view/LinkEvents.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/utils/text/view/LinkEvents.kt
+index fde4b04..b524ea7 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/utils/text/view/LinkEvents.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/utils/text/view/LinkEvents.kt
+@@ -10,11 +10,11 @@ import com.swmansion.enriched.markdown.events.ImagePressEvent
+ import com.swmansion.enriched.markdown.events.LinkLongPressEvent
+ import com.swmansion.enriched.markdown.events.LinkPressEvent
+ 
+-fun View.emitLinkPressEvent(url: String) {
++fun View.emitLinkPressEvent(url: String, sourceType: String) {
+   val reactContext = context as? ReactContext ?: return
+   val surfaceId = UIManagerHelper.getSurfaceId(reactContext)
+   val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, id)
+-  dispatcher?.dispatchEvent(LinkPressEvent(surfaceId, id, url))
++  dispatcher?.dispatchEvent(LinkPressEvent(surfaceId, id, url, sourceType))
+ }
+ 
+ fun View.emitImagePressEvent(
+diff --git a/node_modules/react-native-enriched-markdown/cpp/parser/MD4CParser.cpp b/node_modules/react-native-enriched-markdown/cpp/parser/MD4CParser.cpp
+index c99a52d..c93aaf7 100644
+--- a/node_modules/react-native-enriched-markdown/cpp/parser/MD4CParser.cpp
++++ b/node_modules/react-native-enriched-markdown/cpp/parser/MD4CParser.cpp
+@@ -307,6 +307,10 @@ public:
+           if (!url.empty()) {
+             node->setAttribute(ATTR_URL, url);
+           }
++          const auto title = impl->getAttributeText(&linkDetail->title);
++          if (!title.empty()) {
++            node->setAttribute(ATTR_TITLE, title);
++          }
+         }
+         impl->pushNode(node);
+         break;
+diff --git a/node_modules/react-native-enriched-markdown/ios/EnrichedMarkdown.mm b/node_modules/react-native-enriched-markdown/ios/EnrichedMarkdown.mm
+index 5a0b7e3..be7b30a 100644
+--- a/node_modules/react-native-enriched-markdown/ios/EnrichedMarkdown.mm
++++ b/node_modules/react-native-enriched-markdown/ios/EnrichedMarkdown.mm
+@@ -82,7 +82,7 @@ static char kENRMSegmentFadeAnimatorKey;
+ 
+ @interface EnrichedMarkdown () <RCTEnrichedMarkdownViewProtocol, UITextViewDelegate, ENRMImageLayoutObserver>
+ + (ENRMMd4cFlags *)flagsFromProps:(const EnrichedMarkdownMd4cFlagsStruct &)props;
+-- (void)emitLinkPress:(NSString *)url;
++- (void)emitLinkPress:(NSString *)url sourceType:(NSString *)sourceType;
+ - (void)emitLinkLongPress:(NSString *)url;
+ - (void)emitLinkContextMenuItemPress:(NSString *)itemText pattern:(NSString *)pattern url:(NSString *)url;
+ - (void)emitImagePress:(NSString *)url altText:(NSString *)altText;
+@@ -411,10 +411,10 @@ static char kENRMSegmentFadeAnimatorKey;
+     if (strongSelf)
+       [strongSelf emitCodeBlockPress:code language:language];
+   };
+-  view.onLinkPress = ^(NSString *url) {
++  view.onLinkPress = ^(NSString *url, NSString *sourceType) {
+     EnrichedMarkdown *strongSelf = weakSelf;
+     if (strongSelf && url)
+-      [strongSelf emitLinkPress:url];
++      [strongSelf emitLinkPress:url sourceType:sourceType];
+   };
+   view.onLinkLongPress = ^(NSString *url) {
+     EnrichedMarkdown *strongSelf = weakSelf;
+@@ -986,10 +986,10 @@ static char kENRMSegmentFadeAnimatorKey;
+ 
+   __weak EnrichedMarkdown *weakSelf = self;
+ 
+-  tableView.onLinkPress = ^(NSString *url) {
++  tableView.onLinkPress = ^(NSString *url, NSString *sourceType) {
+     EnrichedMarkdown *strongSelf = weakSelf;
+     if (strongSelf && url)
+-      [strongSelf emitLinkPress:url];
++      [strongSelf emitLinkPress:url sourceType:sourceType];
+   };
+ 
+   tableView.onLinkLongPress = ^(NSString *url) {
+@@ -1475,11 +1475,11 @@ Class<RCTComponentViewProtocol> EnrichedMarkdownCls(void)
+ }
+ #endif
+ 
+-- (void)emitLinkPress:(NSString *)url
++- (void)emitLinkPress:(NSString *)url sourceType:(NSString *)sourceType
+ {
+   auto emitter = std::static_pointer_cast<EnrichedMarkdownEventEmitter const>(_eventEmitter);
+   if (emitter)
+-    emitter->onLinkPress({.url = std::string(url.UTF8String)});
++    emitter->onLinkPress({.url = std::string(url.UTF8String), .sourceType = std::string(sourceType.UTF8String)});
+ }
+ 
+ - (void)emitImagePress:(NSString *)url altText:(NSString *)altText
+@@ -1575,7 +1575,9 @@ Class<RCTComponentViewProtocol> EnrichedMarkdownCls(void)
+     }
+   }
+ 
+-  if (ENRMHandleTapOnTextView(textView, recognizer, ^(NSString *url) { [self emitLinkPress:url]; })) {
++  if (ENRMHandleTapOnTextView(textView, recognizer, ^(NSString *url, NSString *sourceType) {
++        [self emitLinkPress:url sourceType:sourceType];
++      })) {
+     return;
+   }
+ 
+diff --git a/node_modules/react-native-enriched-markdown/ios/EnrichedMarkdownText.mm b/node_modules/react-native-enriched-markdown/ios/EnrichedMarkdownText.mm
+index b7b588b..2fa091f 100644
+--- a/node_modules/react-native-enriched-markdown/ios/EnrichedMarkdownText.mm
++++ b/node_modules/react-native-enriched-markdown/ios/EnrichedMarkdownText.mm
+@@ -62,7 +62,7 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
+ - (void)applyRenderedText:(NSMutableAttributedString *)attributedText;
+ - (void)textTapped:(ENRMTapRecognizer *)recognizer;
+ - (void)setupLayoutManager;
+-- (void)emitLinkPress:(NSString *)url;
++- (void)emitLinkPress:(NSString *)url sourceType:(NSString *)sourceType;
+ - (void)emitLinkLongPress:(NSString *)url;
+ - (void)emitLinkContextMenuItemPress:(NSString *)itemText pattern:(NSString *)pattern url:(NSString *)url;
+ - (void)emitImagePress:(NSString *)url altText:(NSString *)altText;
+@@ -909,11 +909,11 @@ Class<RCTComponentViewProtocol> EnrichedMarkdownTextCls(void)
+   return [super touchEventEmitterAtPoint:point];
+ }
+ 
+-- (void)emitLinkPress:(NSString *)url
++- (void)emitLinkPress:(NSString *)url sourceType:(NSString *)sourceType
+ {
+   auto emitter = std::static_pointer_cast<EnrichedMarkdownTextEventEmitter const>(_eventEmitter);
+   if (emitter)
+-    emitter->onLinkPress({.url = std::string(url.UTF8String)});
++    emitter->onLinkPress({.url = std::string(url.UTF8String), .sourceType = std::string(sourceType.UTF8String)});
+ }
+ 
+ - (void)emitLinkLongPress:(NSString *)url
+@@ -994,7 +994,9 @@ Class<RCTComponentViewProtocol> EnrichedMarkdownTextCls(void)
+     return;
+   }
+ 
+-  if (ENRMHandleTapOnTextView(textView, recognizer, ^(NSString *url) { [self emitLinkPress:url]; })) {
++  if (ENRMHandleTapOnTextView(textView, recognizer, ^(NSString *url, NSString *sourceType) {
++        [self emitLinkPress:url sourceType:sourceType];
++      })) {
+     return;
+   }
+ 
+diff --git a/node_modules/react-native-enriched-markdown/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/EventEmitters.cpp b/node_modules/react-native-enriched-markdown/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/EventEmitters.cpp
+index 77465ad..94997f7 100644
+--- a/node_modules/react-native-enriched-markdown/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/EventEmitters.cpp
++++ b/node_modules/react-native-enriched-markdown/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/EventEmitters.cpp
+@@ -17,6 +17,7 @@ void EnrichedMarkdownEventEmitter::onLinkPress(OnLinkPress event) const {
+   dispatchEvent("linkPress", [event=std::move(event)](jsi::Runtime &runtime) {
+     auto payload = jsi::Object(runtime);
+     payload.setProperty(runtime, "url", event.url);
++    payload.setProperty(runtime, "sourceType", event.sourceType);
+     return payload;
+   });
+ }
+@@ -362,6 +363,7 @@ void EnrichedMarkdownTextEventEmitter::onLinkPress(OnLinkPress event) const {
+   dispatchEvent("linkPress", [event=std::move(event)](jsi::Runtime &runtime) {
+     auto payload = jsi::Object(runtime);
+     payload.setProperty(runtime, "url", event.url);
++    payload.setProperty(runtime, "sourceType", event.sourceType);
+     return payload;
+   });
+ }
+diff --git a/node_modules/react-native-enriched-markdown/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/EventEmitters.h b/node_modules/react-native-enriched-markdown/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/EventEmitters.h
+index 0a1c6c2..5935112 100644
+--- a/node_modules/react-native-enriched-markdown/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/EventEmitters.h
++++ b/node_modules/react-native-enriched-markdown/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/EventEmitters.h
+@@ -19,6 +19,7 @@ class EnrichedMarkdownEventEmitter : public ViewEventEmitter {
+ 
+   struct OnLinkPress {
+       std::string url;
++      std::string sourceType;
+     };
+ 
+   struct OnLinkLongPress {
+@@ -298,6 +299,7 @@ class EnrichedMarkdownTextEventEmitter : public ViewEventEmitter {
+ 
+   struct OnLinkPress {
+       std::string url;
++      std::string sourceType;
+     };
+ 
+   struct OnLinkLongPress {
+diff --git a/node_modules/react-native-enriched-markdown/ios/renderer/LinkRenderer.m b/node_modules/react-native-enriched-markdown/ios/renderer/LinkRenderer.m
+index c9fd57d..66daf6b 100644
+--- a/node_modules/react-native-enriched-markdown/ios/renderer/LinkRenderer.m
++++ b/node_modules/react-native-enriched-markdown/ios/renderer/LinkRenderer.m
+@@ -96,6 +96,8 @@ static NSRange ENRMCollapseLinkIntoPill(NSMutableAttributedString *output, NSRan
+                              options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                           usingBlock:^(NSDictionary<NSAttributedStringKey, id> *attrs, NSRange subrange, BOOL *stop) {
+                             NSMutableDictionary *newAttributes = [NSMutableDictionary dictionary];
++                            newAttributes[@"linkSourceType"] =
++                                recognizedLink ? (attrs[CodeAttributeName] ? @"inline-code" : @"text") : @"markdown";
+                             if (recognizedLink) {
+                               newAttributes[ENRMRecognizedLinkAttributeName] = @YES;
+                               newAttributes[ENRMRecognizedLinkOriginalUnderlineAttributeName] =
+diff --git a/node_modules/react-native-enriched-markdown/ios/segments/ENRMBlockquoteContainerView.h b/node_modules/react-native-enriched-markdown/ios/segments/ENRMBlockquoteContainerView.h
+index 1657128..85b0c54 100644
+--- a/node_modules/react-native-enriched-markdown/ios/segments/ENRMBlockquoteContainerView.h
++++ b/node_modules/react-native-enriched-markdown/ios/segments/ENRMBlockquoteContainerView.h
+@@ -68,7 +68,7 @@ typedef void (^ENRMBlockquoteLinkBlock)(NSString *url);
+ 
+ // Bridged up to the JS onLinkPress/onLinkLongPress events; propagated to nested
+ // quotes so links at any depth fire.
+-@property (nonatomic, copy, nullable) ENRMBlockquoteLinkBlock onLinkPress;
++@property (nonatomic, copy, nullable) void (^onLinkPress)(NSString *url, NSString *sourceType);
+ @property (nonatomic, copy, nullable) ENRMBlockquoteLinkBlock onLinkLongPress;
+ @property (nonatomic, copy, nullable) void (^onImagePress)(NSString *url, NSString *altText);
+ 
+diff --git a/node_modules/react-native-enriched-markdown/ios/segments/ENRMBlockquoteContainerView.mm b/node_modules/react-native-enriched-markdown/ios/segments/ENRMBlockquoteContainerView.mm
+index 79c79cf..96c7a70 100644
+--- a/node_modules/react-native-enriched-markdown/ios/segments/ENRMBlockquoteContainerView.mm
++++ b/node_modules/react-native-enriched-markdown/ios/segments/ENRMBlockquoteContainerView.mm
+@@ -229,10 +229,10 @@ static UIEdgeInsets ENRMBlockquoteContentInsets(StyleConfig *config)
+                             if (strongSelf) {
+                               view.dynamicProps = strongSelf.dynamicProps;
+                               view.accessibilityLabels = strongSelf.accessibilityLabels;
+-                              view.onLinkPress = ^(NSString *url) {
++                              view.onLinkPress = ^(NSString *url, NSString *sourceType) {
+                                 ENRMBlockquoteContainerView *s = weakSelf;
+                                 if (s.onLinkPress && url)
+-                                  s.onLinkPress(url);
++                                  s.onLinkPress(url, sourceType);
+                               };
+                               view.onLinkLongPress = ^(NSString *url) {
+                                 ENRMBlockquoteContainerView *s = weakSelf;
+@@ -299,10 +299,10 @@ static UIEdgeInsets ENRMBlockquoteContentInsets(StyleConfig *config)
+                                 if (s.onImagePress && url)
+                                   s.onImagePress(url, altText);
+                               };
+-                              view.onLinkPress = ^(NSString *url) {
++                              view.onLinkPress = ^(NSString *url, NSString *sourceType) {
+                                 ENRMBlockquoteContainerView *s = weakSelf;
+                                 if (s.onLinkPress && url)
+-                                  s.onLinkPress(url);
++                                  s.onLinkPress(url, sourceType);
+                               };
+                               view.onLinkLongPress = ^(NSString *url) {
+                                 ENRMBlockquoteContainerView *s = weakSelf;
+@@ -374,10 +374,10 @@ static UIEdgeInsets ENRMBlockquoteContentInsets(StyleConfig *config)
+ {
+   ENRMPlatformTextView *textView = (ENRMPlatformTextView *)recognizer.view;
+   __weak ENRMBlockquoteContainerView *weakSelf = self;
+-  if (ENRMHandleTapOnTextView(textView, recognizer, ^(NSString *url) {
++  if (ENRMHandleTapOnTextView(textView, recognizer, ^(NSString *url, NSString *sourceType) {
+         ENRMBlockquoteContainerView *strongSelf = weakSelf;
+         if (strongSelf.onLinkPress && url)
+-          strongSelf.onLinkPress(url);
++          strongSelf.onLinkPress(url, sourceType);
+       })) {
+     return;
+   }
+diff --git a/node_modules/react-native-enriched-markdown/ios/segments/ENRMTableIOSGridView.h b/node_modules/react-native-enriched-markdown/ios/segments/ENRMTableIOSGridView.h
+index bda3a64..0960bad 100644
+--- a/node_modules/react-native-enriched-markdown/ios/segments/ENRMTableIOSGridView.h
++++ b/node_modules/react-native-enriched-markdown/ios/segments/ENRMTableIOSGridView.h
+@@ -18,6 +18,7 @@ typedef NS_ENUM(NSInteger, ENRMTableIOSItemKind) {
+ @interface ENRMTableIOSItemHit : NSObject
+ @property (nonatomic, assign) ENRMTableIOSItemKind kind;
+ @property (nonatomic, copy) NSString *url;
++@property (nonatomic, copy) NSString *sourceType;
+ /// The link's visible label, or an image's alt text.
+ @property (nonatomic, copy, nullable) NSString *title;
+ /// The item's frame in grid coordinates.
+@@ -34,7 +35,7 @@ typedef NS_ENUM(NSInteger, ENRMTableIOSItemKind) {
+ /// cause multi-second main-thread hangs on large tables.
+ @interface ENRMTableIOSGridView : UIView
+ 
+-@property (nonatomic, copy, nullable) ENRMTableIOSLinkBlock onLinkTap;
++@property (nonatomic, copy, nullable) void (^onLinkTap)(NSString *url, NSString *sourceType);
+ @property (nonatomic, copy, nullable) ENRMTableIOSLinkBlock onLinkLongTap;
+ @property (nonatomic, copy, nullable) void (^onImageTap)(NSString *url, NSString *altText);
+ /// Asked when a touch lands on a link: a link with a menu is left to the context-menu
+diff --git a/node_modules/react-native-enriched-markdown/ios/segments/ENRMTableIOSGridView.m b/node_modules/react-native-enriched-markdown/ios/segments/ENRMTableIOSGridView.m
+index 3d7bee5..8b31c8b 100644
+--- a/node_modules/react-native-enriched-markdown/ios/segments/ENRMTableIOSGridView.m
++++ b/node_modules/react-native-enriched-markdown/ios/segments/ENRMTableIOSGridView.m
+@@ -193,6 +193,7 @@ static ENRMTableIOSItemHit *itemInAttributedString(NSAttributedString *text, CGR
+   ENRMTableIOSItemHit *hit = [[ENRMTableIOSItemHit alloc] init];
+   hit.kind = linkURL ? ENRMTableIOSItemKindLink : ENRMTableIOSItemKindImage;
+   hit.url = linkURL ?: imageURL;
++  hit.sourceType = [text attribute:@"linkSourceType" atIndex:charIndex effectiveRange:NULL] ?: @"markdown";
+   hit.title = linkURL ? linkTitleAtIndex(text, charIndex)
+                       : [text attribute:@"imageAltText" atIndex:charIndex effectiveRange:NULL];
+   hit.frame = CGRectOffset(frame, textRect.origin.x, textRect.origin.y);
+@@ -240,7 +241,7 @@ static ENRMTableIOSItemHit *itemInAttributedString(NSAttributedString *text, CGR
+     return;
+   if (hit.kind == ENRMTableIOSItemKindLink) {
+     if (self.onLinkTap)
+-      self.onLinkTap(hit.url);
++      self.onLinkTap(hit.url, hit.sourceType);
+   } else if (self.onImageTap) {
+     self.onImageTap(hit.url, hit.title ?: @"");
+   }
+diff --git a/node_modules/react-native-enriched-markdown/ios/segments/TableContainerView.h b/node_modules/react-native-enriched-markdown/ios/segments/TableContainerView.h
+index 0da3e9b..b8f9856 100644
+--- a/node_modules/react-native-enriched-markdown/ios/segments/TableContainerView.h
++++ b/node_modules/react-native-enriched-markdown/ios/segments/TableContainerView.h
+@@ -38,7 +38,7 @@ typedef void (^TableLinkPressBlock)(NSString *url);
+ @property (nonatomic, assign) BOOL allowFontScaling;
+ @property (nonatomic, assign) CGFloat maxFontSizeMultiplier;
+ 
+-@property (nonatomic, copy, nullable) TableLinkPressBlock onLinkPress;
++@property (nonatomic, copy, nullable) void (^onLinkPress)(NSString *url, NSString *sourceType);
+ @property (nonatomic, copy, nullable) TableLinkPressBlock onLinkLongPress;
+ @property (nonatomic, copy, nullable) void (^onImagePress)(NSString *url, NSString *altText);
+ 
+diff --git a/node_modules/react-native-enriched-markdown/ios/segments/TableContainerView.m b/node_modules/react-native-enriched-markdown/ios/segments/TableContainerView.m
+index 987eb21..ec93a4e 100644
+--- a/node_modules/react-native-enriched-markdown/ios/segments/TableContainerView.m
++++ b/node_modules/react-native-enriched-markdown/ios/segments/TableContainerView.m
+@@ -315,10 +315,10 @@ static void ENRMTableComputeLayout(NSArray<NSArray<TableCellData *> *> *rows, NS
+ #else
+   ENRMTableIOSGridView *iosGridView = [[ENRMTableIOSGridView alloc] initWithFrame:CGRectZero];
+   __weak TableContainerView *weakSelf = self;
+-  iosGridView.onLinkTap = ^(NSString *url) {
++  iosGridView.onLinkTap = ^(NSString *url, NSString *sourceType) {
+     TableContainerView *strongSelf = weakSelf;
+     if (strongSelf && strongSelf.onLinkPress)
+-      strongSelf.onLinkPress(url);
++      strongSelf.onLinkPress(url, sourceType);
+   };
+   iosGridView.onImageTap = ^(NSString *url, NSString *altText) {
+     TableContainerView *strongSelf = weakSelf;
+diff --git a/node_modules/react-native-enriched-markdown/ios/utils/ENRMTextInteractionUtils.h b/node_modules/react-native-enriched-markdown/ios/utils/ENRMTextInteractionUtils.h
+index 65dc272..c5af8c1 100644
+--- a/node_modules/react-native-enriched-markdown/ios/utils/ENRMTextInteractionUtils.h
++++ b/node_modules/react-native-enriched-markdown/ios/utils/ENRMTextInteractionUtils.h
+@@ -11,7 +11,7 @@ extern "C" {
+ /// If a link is found, calls onLinkPress and returns YES.
+ /// If no link is found, calls ENRMClearSelection and returns NO.
+ BOOL ENRMHandleTapOnTextView(ENRMPlatformTextView *textView, ENRMTapRecognizer *recognizer,
+-                             void (^onLinkPress)(NSString *url));
++                             void (^onLinkPress)(NSString *url, NSString *sourceType));
+ 
+ #ifdef __cplusplus
+ }
+diff --git a/node_modules/react-native-enriched-markdown/ios/utils/ENRMTextInteractionUtils.m b/node_modules/react-native-enriched-markdown/ios/utils/ENRMTextInteractionUtils.m
+index 88d69da..7bb3234 100644
+--- a/node_modules/react-native-enriched-markdown/ios/utils/ENRMTextInteractionUtils.m
++++ b/node_modules/react-native-enriched-markdown/ios/utils/ENRMTextInteractionUtils.m
+@@ -2,7 +2,7 @@
+ #import "LinkTapUtils.h"
+ 
+ BOOL ENRMHandleTapOnTextView(ENRMPlatformTextView *textView, ENRMTapRecognizer *recognizer,
+-                             void (^onLinkPress)(NSString *url))
++                             void (^onLinkPress)(NSString *url, NSString *sourceType))
+ {
+   NSString *url = linkURLAtTapLocation(textView, recognizer);
+   if (!url) {
+@@ -10,6 +10,6 @@ BOOL ENRMHandleTapOnTextView(ENRMPlatformTextView *textView, ENRMTapRecognizer *
+     return NO;
+   }
+   if (onLinkPress)
+-    onLinkPress(url);
++    onLinkPress(url, linkSourceTypeAtTapLocation(textView, recognizer));
+   return YES;
+ }
+diff --git a/node_modules/react-native-enriched-markdown/ios/utils/LinkTapUtils.h b/node_modules/react-native-enriched-markdown/ios/utils/LinkTapUtils.h
+index 3bab20f..136d07e 100644
+--- a/node_modules/react-native-enriched-markdown/ios/utils/LinkTapUtils.h
++++ b/node_modules/react-native-enriched-markdown/ios/utils/LinkTapUtils.h
+@@ -11,6 +11,9 @@ extern "C" {
+ /// Returns the link URL at the tap location, or nil if no link was tapped.
+ NSString *_Nullable linkURLAtTapLocation(ENRMPlatformTextView *textView, ENRMTapRecognizer *recognizer);
+ 
++/// Returns the syntax of the link at the tap location.
++NSString *linkSourceTypeAtTapLocation(ENRMPlatformTextView *textView, ENRMTapRecognizer *recognizer);
++
+ /// Returns the original link URL at a point in text-view coordinates.
+ NSString *_Nullable linkURLAtPoint(ENRMPlatformTextView *textView, CGPoint point);
+ 
+diff --git a/node_modules/react-native-enriched-markdown/ios/utils/LinkTapUtils.m b/node_modules/react-native-enriched-markdown/ios/utils/LinkTapUtils.m
+index 20d8739..6a6ffaa 100644
+--- a/node_modules/react-native-enriched-markdown/ios/utils/LinkTapUtils.m
++++ b/node_modules/react-native-enriched-markdown/ios/utils/LinkTapUtils.m
+@@ -13,6 +13,14 @@ NSString *_Nullable linkURLAtTapLocation(ENRMPlatformTextView *textView, ENRMTap
+   return [attrText attribute:@"linkURL" atIndex:characterIndex effectiveRange:NULL];
+ }
+ 
++NSString *linkSourceTypeAtTapLocation(ENRMPlatformTextView *textView, ENRMTapRecognizer *recognizer)
++{
++  NSUInteger index = ENRMCharacterIndexForTap(textView, recognizer);
++  if (index == NSNotFound)
++    return @"markdown";
++  return [ENRMGetAttributedText(textView) attribute:@"linkSourceType" atIndex:index effectiveRange:NULL] ?: @"markdown";
++}
++
+ NSString *_Nullable linkURLAtPoint(ENRMPlatformTextView *textView, CGPoint point)
+ {
+   NSUInteger index = ENRMCharacterIndexAtPoint(textView, point);
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/EnrichedMarkdownNativeComponent.ts b/node_modules/react-native-enriched-markdown/lib/module/EnrichedMarkdownNativeComponent.ts
+index 32ff768..8e89249 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/EnrichedMarkdownNativeComponent.ts
++++ b/node_modules/react-native-enriched-markdown/lib/module/EnrichedMarkdownNativeComponent.ts
+@@ -275,6 +275,7 @@ export interface MarkdownStyleInternal {
+ 
+ export interface LinkPressEvent {
+   url: string;
++  sourceType: string;
+ }
+ 
+ export interface LinkLongPressEvent {
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/EnrichedMarkdownTextNativeComponent.ts b/node_modules/react-native-enriched-markdown/lib/module/EnrichedMarkdownTextNativeComponent.ts
+index 6f31ccc..7b08b62 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/EnrichedMarkdownTextNativeComponent.ts
++++ b/node_modules/react-native-enriched-markdown/lib/module/EnrichedMarkdownTextNativeComponent.ts
+@@ -276,6 +276,7 @@ export interface MarkdownStyleInternal {
+ 
+ export interface LinkPressEvent {
+   url: string;
++  sourceType: string;
+ }
+ 
+ export interface LinkLongPressEvent {
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/index.js.map b/node_modules/react-native-enriched-markdown/lib/module/index.js.map
+index bef09da..c23b50f 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/index.js.map
++++ b/node_modules/react-native-enriched-markdown/lib/module/index.js.map
+@@ -1 +1 @@
+-{"version":3,"names":["default","EnrichedMarkdownText","DEFAULT_ACCESSIBILITY_LABELS","resolveAccessibilityLabels","EnrichedMarkdownTextInput"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAMA,SAASA,OAAO,IAAIC,oBAAoB,QAAQ,kCAA+B;AAuB/E,SACEC,4BAA4B,EAC5BC,0BAA0B,QACrB,iCAA8B;AAErC,SAASC,yBAAyB,QAAQ,gCAA6B","ignoreList":[]}
++{"version":3,"names":["default","EnrichedMarkdownText","DEFAULT_ACCESSIBILITY_LABELS","resolveAccessibilityLabels","EnrichedMarkdownTextInput"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAUA,SAASA,OAAO,IAAIC,oBAAoB,QAAQ,kCAA+B;AAuB/E,SACEC,4BAA4B,EAC5BC,0BAA0B,QACrB,iCAA8B;AAErC,SAASC,yBAAyB,QAAQ,gCAA6B","ignoreList":[]}
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/index.web.js.map b/node_modules/react-native-enriched-markdown/lib/module/index.web.js.map
+index 2691825..acac81c 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/index.web.js.map
++++ b/node_modules/react-native-enriched-markdown/lib/module/index.web.js.map
+@@ -1 +1 @@
+-{"version":3,"names":["EnrichedMarkdownText","default"],"sourceRoot":"../../src","sources":["index.web.tsx"],"mappings":";;AAAA,SAASA,oBAAoB,EAAEC,OAAO,QAAQ,+BAA4B","ignoreList":[]}
++{"version":3,"names":["EnrichedMarkdownText","default"],"sourceRoot":"../../src","sources":["index.web.tsx"],"mappings":";;AAIA,SAASA,oBAAoB,EAAEC,OAAO,QAAQ,+BAA4B","ignoreList":[]}
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/native/EnrichedMarkdownText.js b/node_modules/react-native-enriched-markdown/lib/module/native/EnrichedMarkdownText.js
+index 9fb1ad2..2532d7c 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/native/EnrichedMarkdownText.js
++++ b/node_modules/react-native-enriched-markdown/lib/module/native/EnrichedMarkdownText.js
+@@ -106,6 +106,7 @@ export const EnrichedMarkdownText = ({
+   writingDirection = 'first-strong',
+   numberOfLines,
+   ellipsizeMode,
++  renderers: _renderers,
+   ...rest
+ }) => {
+   // An equal config keeps the previous object, so an inline literal does not
+@@ -205,10 +206,12 @@ export const EnrichedMarkdownText = ({
+   }, []);
+   const handleLinkPress = useCallback(e => {
+     const {
+-      url
++      url,
++      sourceType
+     } = e.nativeEvent;
+     onLinkPress?.({
+-      url
++      url,
++      sourceType: sourceType
+     });
+   }, [onLinkPress]);
+   const handleLinkLongPress = useCallback(e => {
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/native/EnrichedMarkdownText.js.map b/node_modules/react-native-enriched-markdown/lib/module/native/EnrichedMarkdownText.js.map
+index 2f27901..fc55b09 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/native/EnrichedMarkdownText.js.map
++++ b/node_modules/react-native-enriched-markdown/lib/module/native/EnrichedMarkdownText.js.map
+@@ -1 +1 @@
+-{"version":3,"names":["useMemo","useCallback","useRef","useEffect","EnrichedMarkdownTextNativeComponent","EnrichedMarkdownNativeComponent","isLinkRecognitionEqual","toNativeLinkRecognition","normalizeMarkdownStyle","isLinkPillContentEqual","normalizeLinkPillContent","dispatchLinkContextMenuItem","isLinkContextMenuItemsEqual","normalizeLinkContextMenuItems","resolveAccessibilityLabels","normalizeMenuItem","normalizeLegacyBooleanMenuItem","jsx","_jsx","DEFAULT_COPY_LABEL","DEFAULT_COPY_AS_MARKDOWN_LABEL","DEFAULT_COPY_IMAGE_URL_LABEL","DEFAULT_COPY_IMAGE_URLS_LABEL","buildPluralTemplates","pluralLabels","singularLabel","IntlRef","Intl","PluralRules","pluralRules","other","byCategory","zero","one","two","few","many","templates","n","push","select","defaultMd4cFlags","underline","superscript","subscript","latexMath","highlight","hardSoftBreaks","preserveBlankLines","admonitions","EnrichedMarkdownText","markdown","markdownStyle","containerStyle","onLinkPress","onLinkLongPress","onImagePress","onTaskListItemPress","enableTaskListItemToggle","onCopyPress","onLatexError","onCodeBlockPress","enableBlockContextMenu","enableLinkPreview","selectable","md4cFlags","allowFontScaling","maxFontSizeMultiplier","allowTrailingMargin","flavor","streamingAnimation","streamingConfig","spoilerOverlay","contextMenuItems","linkContextMenuItems","imageRequestHeaders","linkPillContent","linkRecognition","selectionMenuConfig","accessibilityLabels","selectionColor","selectionHandleColor","textBreakStrategy","lineBreakStrategyIOS","writingDirection","numberOfLines","ellipsizeMode","rest","linkRecognitionRef","undefined","nativeLinkRecognition","next","current","normalizedStyleRef","normalized","normalizedStyle","normalizedMd4cFlags","contextMenuCallbacksRef","Map","callbacksMap","item","set","text","onPress","nativeContextMenuItems","filter","visible","map","icon","linkContextMenuItemsRef","nativeLinkContextMenuItemsRef","nativeLinkContextMenuItems","handleLinkContextMenuItemPress","event","url","pattern","itemText","nativeEvent","nativeImageRequestHeaders","Object","entries","name","value","sort","a","b","linkPillContentRef","nativeLinkPillContent","handleContextMenuItemPress","e","selectedText","selectionStart","selectionEnd","callback","get","selection","start","end","handleLinkPress","handleLinkLongPress","handleImagePress","altText","handleTaskListItemPress","index","checked","handleCopyPress","code","language","handleLatexError","source","message","displayMode","handleCodeBlockPress","tableMode","codeBlockMode","normalizedStreamingConfig","normalizedSelectionMenuConfig","config","copy","copyAsMarkdown","copyImageUrl","enabled","copyLabel","label","copyAsMarkdownLabel","copyImageUrlLabel","copyImageUrlsLabel","copyImageUrlPluralTemplates","resolvedAccessibilityLabels","sharedProps","enableImagePress","enableCodeBlockPress","isGFM","style","onLinkContextMenuItemPress","onContextMenuItemPress"],"sourceRoot":"../../../src","sources":["native/EnrichedMarkdownText.tsx"],"mappings":";;AAAA,SAASA,OAAO,EAAEC,WAAW,EAAEC,MAAM,EAAEC,SAAS,QAAQ,OAAO;AAC/D,OAAOC,mCAAmC,MAAM,wCAAwC;AAExF,OAAOC,+BAA+B,MAAM,oCAAoC;AAChF,SACEC,sBAAsB,EACtBC,uBAAuB,QAElB,yBAAsB;AAC7B,SAASC,sBAAsB,QAAQ,2BAA2B;AAClE,SACEC,sBAAsB,EACtBC,wBAAwB,QACnB,wBAAqB;AAC5B,SACEC,2BAA2B,EAC3BC,2BAA2B,EAC3BC,6BAA6B,QACxB,4BAAyB;AAChC,SAASC,0BAA0B,QAAQ,kCAA+B;AAC1E,SACEC,iBAAiB,EACjBC,8BAA8B,QACzB,yBAAsB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAwC9B;AACA;AACA,MAAMC,kBAAkB,GAAG,MAAM;AACjC,MAAMC,8BAA8B,GAAG,kBAAkB;AACzD,MAAMC,4BAA4B,GAAG,gBAAgB;AACrD,MAAMC,6BAA6B,GAAG,yBAAyB;;AAE/D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,oBAAoB,GAAGA,CAC3BC,YAAmD,EACnDC,aAAqB,KACR;EACb,IAAI,CAACD,YAAY,EAAE,OAAO,EAAE;EAE5B,MAAME,OAAO,GAAGC,IAIf;EACD,IAAI,OAAOD,OAAO,CAACE,WAAW,KAAK,UAAU,EAAE,OAAO,EAAE;EAExD,IAAIC,WAA0C;EAC9C,IAAI;IACF;IACA;IACA;IACA;IACAA,WAAW,GAAG,IAAIH,OAAO,CAACE,WAAW,CAAC,CAAC;EACzC,CAAC,CAAC,MAAM;IACN,OAAO,EAAE;EACX;EAEA,MAAM;IAAEE;EAAM,CAAC,GAAGN,YAAY;EAC9B,MAAMO,UAAkC,GAAG;IACzCC,IAAI,EAAER,YAAY,CAACQ,IAAI,IAAIF,KAAK;IAChCG,GAAG,EAAET,YAAY,CAACS,GAAG,IAAIH,KAAK;IAC9BI,GAAG,EAAEV,YAAY,CAACU,GAAG,IAAIJ,KAAK;IAC9BK,GAAG,EAAEX,YAAY,CAACW,GAAG,IAAIL,KAAK;IAC9BM,IAAI,EAAEZ,YAAY,CAACY,IAAI,IAAIN,KAAK;IAChCA;EACF,CAAC;EAED,MAAMO,SAAmB,GAAG,EAAE;EAC9B,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,IAAI,GAAG,EAAEA,CAAC,EAAE,EAAE;IAC7B;IACA;IACAD,SAAS,CAACE,IAAI,CACZD,CAAC,KAAK,CAAC,GAAGb,aAAa,GAAIM,UAAU,CAACF,WAAW,CAACW,MAAM,CAACF,CAAC,CAAC,CAAC,IAAIR,KAClE,CAAC;EACH;EACA,OAAOO,SAAS;AAClB,CAAC;AAED,MAAMI,gBAA2B,GAAG;EAClCC,SAAS,EAAE,KAAK;EAChBC,WAAW,EAAE,KAAK;EAClBC,SAAS,EAAE,KAAK;EAChBC,SAAS,EAAE,IAAI;EACfC,SAAS,EAAE,KAAK;EAChBC,cAAc,EAAE,KAAK;EACrBC,kBAAkB,EAAE,KAAK;EACzBC,WAAW,EAAE;AACf,CAAC;AAED,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACnCC,QAAQ;EACRC,aAAa,GAAG,CAAC,CAAC;EAClBC,cAAc;EACdC,WAAW;EACXC,eAAe;EACfC,YAAY;EACZC,mBAAmB;EACnBC,wBAAwB,GAAG,IAAI;EAC/BC,WAAW;EACXC,YAAY;EACZC,gBAAgB;EAChBC,sBAAsB,GAAG,IAAI;EAC7BC,iBAAiB;EACjBC,UAAU,GAAG,IAAI;EACjBC,SAAS,GAAGxB,gBAAgB;EAC5ByB,gBAAgB,GAAG,IAAI;EACvBC,qBAAqB;EACrBC,mBAAmB,GAAG,KAAK;EAC3BC,MAAM,GAAG,YAAY;EACrBC,kBAAkB,GAAG,KAAK;EAC1BC,eAAe;EACfC,cAAc,GAAG,WAAW;EAC5BC,gBAAgB;EAChBC,oBAAoB;EACpBC,mBAAmB;EACnBC,eAAe;EACfC,eAAe;EACfC,mBAAmB;EACnBC,mBAAmB;EACnBC,cAAc;EACdC,oBAAoB;EACpBC,iBAAiB;EACjBC,oBAAoB;EACpBC,gBAAgB,GAAG,cAAc;EACjCC,aAAa;EACbC,aAAa;EACb,GAAGC;AACsB,CAAC,KAAK;EAC/B;EACA;EACA,MAAMC,kBAAkB,GAAGtF,MAAM,CAC/BuF,SACF,CAAC;EACD,MAAMC,qBAAqB,GAAG1F,OAAO,CAAC,MAAM;IAC1C,MAAM2F,IAAI,GAAGpF,uBAAuB,CAACsE,eAAe,CAAC;IACrD,IAAI,CAACvE,sBAAsB,CAACkF,kBAAkB,CAACI,OAAO,EAAED,IAAI,CAAC,EAAE;MAC7DH,kBAAkB,CAACI,OAAO,GAAGD,IAAI;IACnC;IACA,OAAOH,kBAAkB,CAACI,OAAO;EACnC,CAAC,EAAE,CAACf,eAAe,CAAC,CAAC;EACrB,MAAMgB,kBAAkB,GAAG3F,MAAM,CAA+B,IAAI,CAAC;EACrE,MAAM4F,UAAU,GAAGtF,sBAAsB,CAAC4C,aAAa,CAAC;EACxD;EACA;EACA,IAAIyC,kBAAkB,CAACD,OAAO,KAAKE,UAAU,EAAE;IAC7CD,kBAAkB,CAACD,OAAO,GAAGE,UAAU;EACzC;EACA,MAAMC,eAAe,GAAGF,kBAAkB,CAACD,OAAQ;EAEnD,MAAMI,mBAAmB,GAAGhG,OAAO,CACjC,OAAO;IACL0C,SAAS,EAAEuB,SAAS,CAACvB,SAAS,IAAI,KAAK;IACvCC,WAAW,EAAEsB,SAAS,CAACtB,WAAW,IAAI,KAAK;IAC3CC,SAAS,EAAEqB,SAAS,CAACrB,SAAS,IAAI,KAAK;IACvCC,SAAS,EAAEoB,SAAS,CAACpB,SAAS,IAAI,IAAI;IACtCC,SAAS,EAAEmB,SAAS,CAACnB,SAAS,IAAI,KAAK;IACvCC,cAAc,EAAEkB,SAAS,CAAClB,cAAc,IAAI,KAAK;IACjDC,kBAAkB,EAAEiB,SAAS,CAACjB,kBAAkB,IAAI,KAAK;IACzD;IACA;IACAC,WAAW,EACToB,MAAM,KAAK,QAAQ,GAAIJ,SAAS,CAAChB,WAAW,IAAI,IAAI,GAAI;EAC5D,CAAC,CAAC,EACF,CAACgB,SAAS,EAAEI,MAAM,CACpB,CAAC;EAED,MAAM4B,uBAAuB,GAAG/F,MAAM,CAEpC,IAAIgG,GAAG,CAAC,CAAC,CAAC;EAEZ/F,SAAS,CAAC,MAAM;IACd,MAAMgG,YAAY,GAAG,IAAID,GAAG,CAAqC,CAAC;IAClE,IAAIzB,gBAAgB,EAAE;MACpB,KAAK,MAAM2B,IAAI,IAAI3B,gBAAgB,EAAE;QACnC0B,YAAY,CAACE,GAAG,CAACD,IAAI,CAACE,IAAI,EAAEF,IAAI,CAACG,OAAO,CAAC;MAC3C;IACF;IACAN,uBAAuB,CAACL,OAAO,GAAGO,YAAY;EAChD,CAAC,EAAE,CAAC1B,gBAAgB,CAAC,CAAC;EAEtB,MAAM+B,sBAAsB,GAAGxG,OAAO,CACpC,MACEyE,gBAAgB,EACZgC,MAAM,CAAEL,IAAI,IAAKA,IAAI,CAACM,OAAO,KAAK,KAAK,CAAC,CACzCC,GAAG,CAAEP,IAAI,KAAM;IAAEE,IAAI,EAAEF,IAAI,CAACE,IAAI;IAAEM,IAAI,EAAER,IAAI,CAACQ;EAAK,CAAC,CAAC,CAAC,EAC1D,CAACnC,gBAAgB,CACnB,CAAC;EAED,MAAMoC,uBAAuB,GAAG3G,MAAM,CAACwE,oBAAoB,CAAC;EAC5DmC,uBAAuB,CAACjB,OAAO,GAAGlB,oBAAoB;EACtD;EACA;EACA,MAAMoC,6BAA6B,GAAG5G,MAAM,CAE1C,EAAE,CAAC;EACL,MAAM6G,0BAA0B,GAAG/G,OAAO,CAAC,MAAM;IAC/C,MAAM2F,IAAI,GAAG9E,6BAA6B,CAAC6D,oBAAoB,CAAC;IAChE,IACE,CAAC9D,2BAA2B,CAACkG,6BAA6B,CAAClB,OAAO,EAAED,IAAI,CAAC,EACzE;MACAmB,6BAA6B,CAAClB,OAAO,GAAGD,IAAI;IAC9C;IACA,OAAOmB,6BAA6B,CAAClB,OAAO;EAC9C,CAAC,EAAE,CAAClB,oBAAoB,CAAC,CAAC;EAC1B,MAAMsC,8BAA8B,GAAG/G,WAAW,CAC/CgH,KAA4D,IAAK;IAChE,MAAM;MAAEC,GAAG;MAAEC,OAAO;MAAEC;IAAS,CAAC,GAAGH,KAAK,CAACI,WAAW;IACpD1G,2BAA2B,CACzBkG,uBAAuB,CAACjB,OAAO,EAC/BuB,OAAO,EACPC,QAAQ,EACRF,GACF,CAAC;EACH,CAAC,EACD,EACF,CAAC;EAED,MAAMI,yBAAyB,GAAGtH,OAAO,CACvC,MACE2E,mBAAmB,GACf4C,MAAM,CAACC,OAAO,CAAC7C,mBAAmB,CAAC,CAChCgC,GAAG,CAAC,CAAC,CAACc,IAAI,EAAEC,KAAK,CAAC,MAAM;IAAED,IAAI;IAAEC;EAAM,CAAC,CAAC,CAAC,CACzCC,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAMD,CAAC,CAACH,IAAI,GAAGI,CAAC,CAACJ,IAAI,GAAG,CAAC,CAAC,GAAGG,CAAC,CAACH,IAAI,GAAGI,CAAC,CAACJ,IAAI,GAAG,CAAC,GAAG,CAAE,CAAC,GACnEhC,SAAS,EACf,CAACd,mBAAmB,CACtB,CAAC;;EAED;EACA;EACA,MAAMmD,kBAAkB,GACtB5H,MAAM,CAA8CuF,SAAS,CAAC;EAChE,MAAMsC,qBAAqB,GAAG/H,OAAO,CAAC,MAAM;IAC1C,MAAM2F,IAAI,GAAGjF,wBAAwB,CAACkE,eAAe,CAAC;IACtD,IAAI,CAACnE,sBAAsB,CAACqH,kBAAkB,CAAClC,OAAO,EAAED,IAAI,CAAC,EAAE;MAC7DmC,kBAAkB,CAAClC,OAAO,GAAGD,IAAI;IACnC;IACA,OAAOmC,kBAAkB,CAAClC,OAAO;EACnC,CAAC,EAAE,CAAChB,eAAe,CAAC,CAAC;EAErB,MAAMoD,0BAA0B,GAAG/H,WAAW,CAC3CgI,CAAoD,IAAK;IACxD,MAAM;MAAEb,QAAQ;MAAEc,YAAY;MAAEC,cAAc;MAAEC;IAAa,CAAC,GAC5DH,CAAC,CAACZ,WAAW;IACf,MAAMgB,QAAQ,GAAGpC,uBAAuB,CAACL,OAAO,CAAC0C,GAAG,CAAClB,QAAQ,CAAC;IAC9DiB,QAAQ,GAAG;MACT/B,IAAI,EAAE4B,YAAY;MAClBK,SAAS,EAAE;QAAEC,KAAK,EAAEL,cAAc;QAAEM,GAAG,EAAEL;MAAa;IACxD,CAAC,CAAC;EACJ,CAAC,EACD,EACF,CAAC;EAED,MAAMM,eAAe,GAAGzI,WAAW,CAChCgI,CAAuC,IAAK;IAC3C,MAAM;MAAEf;IAAI,CAAC,GAAGe,CAAC,CAACZ,WAAW;IAC7B/D,WAAW,GAAG;MAAE4D;IAAI,CAAC,CAAC;EACxB,CAAC,EACD,CAAC5D,WAAW,CACd,CAAC;EAED,MAAMqF,mBAAmB,GAAG1I,WAAW,CACpCgI,CAA2C,IAAK;IAC/C,MAAM;MAAEf;IAAI,CAAC,GAAGe,CAAC,CAACZ,WAAW;IAC7B9D,eAAe,GAAG;MAAE2D;IAAI,CAAC,CAAC;EAC5B,CAAC,EACD,CAAC3D,eAAe,CAClB,CAAC;EAED,MAAMqF,gBAAgB,GAAG3I,WAAW,CACjCgI,CAAwC,IAAK;IAC5C,MAAM;MAAEf,GAAG;MAAE2B;IAAQ,CAAC,GAAGZ,CAAC,CAACZ,WAAW;IACtC7D,YAAY,GAAG;MAAE0D,GAAG;MAAE2B;IAAQ,CAAC,CAAC;EAClC,CAAC,EACD,CAACrF,YAAY,CACf,CAAC;EAED,MAAMsF,uBAAuB,GAAG7I,WAAW,CACxCgI,CAA+C,IAAK;IACnD,MAAM;MAAEc,KAAK;MAAEC,OAAO;MAAE1C;IAAK,CAAC,GAAG2B,CAAC,CAACZ,WAAW;IAC9C5D,mBAAmB,GAAG;MAAEsF,KAAK;MAAEC,OAAO;MAAE1C;IAAK,CAAC,CAAC;EACjD,CAAC,EACD,CAAC7C,mBAAmB,CACtB,CAAC;EAED,MAAMwF,eAAe,GAAGhJ,WAAW,CAChCgI,CAAuC,IAAK;IAC3C,MAAM;MAAEiB,IAAI;MAAEC;IAAS,CAAC,GAAGlB,CAAC,CAACZ,WAAW;IACxC1D,WAAW,GAAG;MAAEuF,IAAI;MAAEC;IAAS,CAAC,CAAC;EACnC,CAAC,EACD,CAACxF,WAAW,CACd,CAAC;EAED,MAAMyF,gBAAgB,GAAGnJ,WAAW,CACjCgI,CAAwC,IAAK;IAC5C,MAAM;MAAEoB,MAAM;MAAEC,OAAO;MAAEC;IAAY,CAAC,GAAGtB,CAAC,CAACZ,WAAW;IACtDzD,YAAY,GAAG;MAAEyF,MAAM;MAAEC,OAAO,EAAEA,OAAO,IAAI7D,SAAS;MAAE8D;IAAY,CAAC,CAAC;EACxE,CAAC,EACD,CAAC3F,YAAY,CACf,CAAC;EAED,MAAM4F,oBAAoB,GAAGvJ,WAAW,CACrCgI,CAA4C,IAAK;IAChD,MAAM;MAAEiB,IAAI;MAAEC;IAAS,CAAC,GAAGlB,CAAC,CAACZ,WAAW;IACxCxD,gBAAgB,GAAG;MAAEqF,IAAI;MAAEC;IAAS,CAAC,CAAC;EACxC,CAAC,EACD,CAACtF,gBAAgB,CACnB,CAAC;EAED,MAAM4F,SAAS,GAAGlF,eAAe,EAAEkF,SAAS,IAAI,aAAa;EAC7D,MAAMC,aAAa,GAAGnF,eAAe,EAAEmF,aAAa,IAAI,aAAa;EACrE,MAAMC,yBAAyB,GAAG3J,OAAO,CACvC,OAAO;IAAEyJ,SAAS;IAAEC;EAAc,CAAC,CAAC,EACpC,CAACD,SAAS,EAAEC,aAAa,CAC3B,CAAC;EACD,MAAME,6BAA6B,GAAG5J,OAAO,CAAC,MAAM;IAClD;IACA;IACA,MAAM6J,MAAM,GAAG/E,mBAMF;IAEb,MAAMgF,IAAI,GAAG/I,iBAAiB,CAAC8I,MAAM,EAAEC,IAAI,EAAE,IAAI,EAAE3I,kBAAkB,CAAC;IACtE,MAAM4I,cAAc,GAAG/I,8BAA8B,CACnD6I,MAAM,EAAEE,cAAc,EACtB,qBAAqB,EACrB,gBAAgB,EAChB,IAAI,EACJ3I,8BACF,CAAC;IACD,MAAM4I,YAAY,GAAGhJ,8BAA8B,CACjD6I,MAAM,EAAEG,YAAY,EACpB,qBAAqB,EACrB,cAAc,EACd,IAAI,EACJ3I,4BACF,CAAC;IAED,MAAMG,YAAY,GAChBqI,MAAM,EAAEG,YAAY,EAGnBxI,YAAY;IAEf,OAAO;MACLuI,cAAc,EAAEA,cAAc,CAACE,OAAO;MACtCD,YAAY,EAAEA,YAAY,CAACC,OAAO;MAClCC,SAAS,EAAEJ,IAAI,CAACK,KAAK;MACrBC,mBAAmB,EAAEL,cAAc,CAACI,KAAK;MACzCE,iBAAiB,EAAEL,YAAY,CAACG,KAAK;MACrCG,kBAAkB,EAAE9I,YAAY,EAAEM,KAAK,IAAIR,6BAA6B;MACxEiJ,2BAA2B,EAAEhJ,oBAAoB,CAC/CC,YAAY,EACZwI,YAAY,CAACG,KACf;IACF,CAAC;EACH,CAAC,EAAE,CAACrF,mBAAmB,CAAC,CAAC;EAEzB,MAAM0F,2BAA2B,GAAGxK,OAAO,CACzC,MAAMc,0BAA0B,CAACiE,mBAAmB,CAAC,EACrD,CAACA,mBAAmB,CACtB,CAAC;EAED,MAAM0F,WAAW,GAAG;IAClBtH,QAAQ;IACR0B,eAAe,EAAEa,qBAAqB;IACtCtC,aAAa,EAAE2C,eAAe;IAC9BzC,WAAW,EAAEoF,eAAe;IAC5BnF,eAAe,EAAEoF,mBAAmB;IACpCnF,YAAY,EAAEoF,gBAAgB;IAC9B8B,gBAAgB,EAAElH,YAAY,IAAI,IAAI;IACtCC,mBAAmB,EAAEqF,uBAAuB;IAC5CpF,wBAAwB;IACxBC,WAAW,EAAEsF,eAAe;IAC5BrF,YAAY,EAAEwF,gBAAgB;IAC9BvF,gBAAgB,EAAE2F,oBAAoB;IACtCmB,oBAAoB,EAAE9G,gBAAgB,IAAI,IAAI;IAC9CC,sBAAsB;IACtBC,iBAAiB,EAAER,eAAe,IAAI,IAAI,KAAKQ,iBAAiB,IAAI,IAAI,CAAC;IACzEC,UAAU;IACVC,SAAS,EAAE+B,mBAAmB;IAC9B4E,KAAK,EAAEvG,MAAM,KAAK,QAAQ;IAC1BH,gBAAgB;IAChBC,qBAAqB;IACrBC,mBAAmB;IACnBE,kBAAkB;IAClBC,eAAe,EAAEoF,yBAAyB;IAC1CnF,cAAc;IACdqG,KAAK,EAAExH,cAAc;IACrBoB,gBAAgB,EAAE+B,sBAAsB;IACxC9B,oBAAoB,EAAEqC,0BAA0B;IAChD+D,0BAA0B,EAAE9D,8BAA8B;IAC1DrC,mBAAmB,EAAE2C,yBAAyB;IAC9C1C,eAAe,EAAEmD,qBAAqB;IACtCjD,mBAAmB,EAAE8E,6BAA6B;IAClD7E,mBAAmB,EAAEyF,2BAA2B;IAChDO,sBAAsB,EAAE/C,0BAA0B;IAClDhD,cAAc;IACdC,oBAAoB;IACpBC,iBAAiB;IACjBC,oBAAoB;IACpBC,gBAAgB;IAChBC,aAAa;IACbC,aAAa;IACb,GAAGC;EACL,CAAC;EAED,IAAIlB,MAAM,KAAK,QAAQ,EAAE;IACvB,oBAAOnD,IAAA,CAACb,+BAA+B;MAAA,GAAKoK;IAAW,CAAG,CAAC;EAC7D;EAEA,oBAAOvJ,IAAA,CAACd,mCAAmC;IAAA,GAAKqK;EAAW,CAAG,CAAC;AACjE,CAAC;AAED,eAAevH,oBAAoB","ignoreList":[]}
++{"version":3,"names":["useMemo","useCallback","useRef","useEffect","EnrichedMarkdownTextNativeComponent","EnrichedMarkdownNativeComponent","isLinkRecognitionEqual","toNativeLinkRecognition","normalizeMarkdownStyle","isLinkPillContentEqual","normalizeLinkPillContent","dispatchLinkContextMenuItem","isLinkContextMenuItemsEqual","normalizeLinkContextMenuItems","resolveAccessibilityLabels","normalizeMenuItem","normalizeLegacyBooleanMenuItem","jsx","_jsx","DEFAULT_COPY_LABEL","DEFAULT_COPY_AS_MARKDOWN_LABEL","DEFAULT_COPY_IMAGE_URL_LABEL","DEFAULT_COPY_IMAGE_URLS_LABEL","buildPluralTemplates","pluralLabels","singularLabel","IntlRef","Intl","PluralRules","pluralRules","other","byCategory","zero","one","two","few","many","templates","n","push","select","defaultMd4cFlags","underline","superscript","subscript","latexMath","highlight","hardSoftBreaks","preserveBlankLines","admonitions","EnrichedMarkdownText","markdown","markdownStyle","containerStyle","onLinkPress","onLinkLongPress","onImagePress","onTaskListItemPress","enableTaskListItemToggle","onCopyPress","onLatexError","onCodeBlockPress","enableBlockContextMenu","enableLinkPreview","selectable","md4cFlags","allowFontScaling","maxFontSizeMultiplier","allowTrailingMargin","flavor","streamingAnimation","streamingConfig","spoilerOverlay","contextMenuItems","linkContextMenuItems","imageRequestHeaders","linkPillContent","linkRecognition","selectionMenuConfig","accessibilityLabels","selectionColor","selectionHandleColor","textBreakStrategy","lineBreakStrategyIOS","writingDirection","numberOfLines","ellipsizeMode","renderers","_renderers","rest","linkRecognitionRef","undefined","nativeLinkRecognition","next","current","normalizedStyleRef","normalized","normalizedStyle","normalizedMd4cFlags","contextMenuCallbacksRef","Map","callbacksMap","item","set","text","onPress","nativeContextMenuItems","filter","visible","map","icon","linkContextMenuItemsRef","nativeLinkContextMenuItemsRef","nativeLinkContextMenuItems","handleLinkContextMenuItemPress","event","url","pattern","itemText","nativeEvent","nativeImageRequestHeaders","Object","entries","name","value","sort","a","b","linkPillContentRef","nativeLinkPillContent","handleContextMenuItemPress","e","selectedText","selectionStart","selectionEnd","callback","get","selection","start","end","handleLinkPress","sourceType","handleLinkLongPress","handleImagePress","altText","handleTaskListItemPress","index","checked","handleCopyPress","code","language","handleLatexError","source","message","displayMode","handleCodeBlockPress","tableMode","codeBlockMode","normalizedStreamingConfig","normalizedSelectionMenuConfig","config","copy","copyAsMarkdown","copyImageUrl","enabled","copyLabel","label","copyAsMarkdownLabel","copyImageUrlLabel","copyImageUrlsLabel","copyImageUrlPluralTemplates","resolvedAccessibilityLabels","sharedProps","enableImagePress","enableCodeBlockPress","isGFM","style","onLinkContextMenuItemPress","onContextMenuItemPress"],"sourceRoot":"../../../src","sources":["native/EnrichedMarkdownText.tsx"],"mappings":";;AAAA,SAASA,OAAO,EAAEC,WAAW,EAAEC,MAAM,EAAEC,SAAS,QAAQ,OAAO;AAC/D,OAAOC,mCAAmC,MAAM,wCAAwC;AAExF,OAAOC,+BAA+B,MAAM,oCAAoC;AAChF,SACEC,sBAAsB,EACtBC,uBAAuB,QAElB,yBAAsB;AAC7B,SAASC,sBAAsB,QAAQ,2BAA2B;AAClE,SACEC,sBAAsB,EACtBC,wBAAwB,QACnB,wBAAqB;AAC5B,SACEC,2BAA2B,EAC3BC,2BAA2B,EAC3BC,6BAA6B,QACxB,4BAAyB;AAChC,SAASC,0BAA0B,QAAQ,kCAA+B;AAC1E,SACEC,iBAAiB,EACjBC,8BAA8B,QACzB,yBAAsB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAwC9B;AACA;AACA,MAAMC,kBAAkB,GAAG,MAAM;AACjC,MAAMC,8BAA8B,GAAG,kBAAkB;AACzD,MAAMC,4BAA4B,GAAG,gBAAgB;AACrD,MAAMC,6BAA6B,GAAG,yBAAyB;;AAE/D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,oBAAoB,GAAGA,CAC3BC,YAAmD,EACnDC,aAAqB,KACR;EACb,IAAI,CAACD,YAAY,EAAE,OAAO,EAAE;EAE5B,MAAME,OAAO,GAAGC,IAIf;EACD,IAAI,OAAOD,OAAO,CAACE,WAAW,KAAK,UAAU,EAAE,OAAO,EAAE;EAExD,IAAIC,WAA0C;EAC9C,IAAI;IACF;IACA;IACA;IACA;IACAA,WAAW,GAAG,IAAIH,OAAO,CAACE,WAAW,CAAC,CAAC;EACzC,CAAC,CAAC,MAAM;IACN,OAAO,EAAE;EACX;EAEA,MAAM;IAAEE;EAAM,CAAC,GAAGN,YAAY;EAC9B,MAAMO,UAAkC,GAAG;IACzCC,IAAI,EAAER,YAAY,CAACQ,IAAI,IAAIF,KAAK;IAChCG,GAAG,EAAET,YAAY,CAACS,GAAG,IAAIH,KAAK;IAC9BI,GAAG,EAAEV,YAAY,CAACU,GAAG,IAAIJ,KAAK;IAC9BK,GAAG,EAAEX,YAAY,CAACW,GAAG,IAAIL,KAAK;IAC9BM,IAAI,EAAEZ,YAAY,CAACY,IAAI,IAAIN,KAAK;IAChCA;EACF,CAAC;EAED,MAAMO,SAAmB,GAAG,EAAE;EAC9B,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,IAAI,GAAG,EAAEA,CAAC,EAAE,EAAE;IAC7B;IACA;IACAD,SAAS,CAACE,IAAI,CACZD,CAAC,KAAK,CAAC,GAAGb,aAAa,GAAIM,UAAU,CAACF,WAAW,CAACW,MAAM,CAACF,CAAC,CAAC,CAAC,IAAIR,KAClE,CAAC;EACH;EACA,OAAOO,SAAS;AAClB,CAAC;AAED,MAAMI,gBAA2B,GAAG;EAClCC,SAAS,EAAE,KAAK;EAChBC,WAAW,EAAE,KAAK;EAClBC,SAAS,EAAE,KAAK;EAChBC,SAAS,EAAE,IAAI;EACfC,SAAS,EAAE,KAAK;EAChBC,cAAc,EAAE,KAAK;EACrBC,kBAAkB,EAAE,KAAK;EACzBC,WAAW,EAAE;AACf,CAAC;AAED,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACnCC,QAAQ;EACRC,aAAa,GAAG,CAAC,CAAC;EAClBC,cAAc;EACdC,WAAW;EACXC,eAAe;EACfC,YAAY;EACZC,mBAAmB;EACnBC,wBAAwB,GAAG,IAAI;EAC/BC,WAAW;EACXC,YAAY;EACZC,gBAAgB;EAChBC,sBAAsB,GAAG,IAAI;EAC7BC,iBAAiB;EACjBC,UAAU,GAAG,IAAI;EACjBC,SAAS,GAAGxB,gBAAgB;EAC5ByB,gBAAgB,GAAG,IAAI;EACvBC,qBAAqB;EACrBC,mBAAmB,GAAG,KAAK;EAC3BC,MAAM,GAAG,YAAY;EACrBC,kBAAkB,GAAG,KAAK;EAC1BC,eAAe;EACfC,cAAc,GAAG,WAAW;EAC5BC,gBAAgB;EAChBC,oBAAoB;EACpBC,mBAAmB;EACnBC,eAAe;EACfC,eAAe;EACfC,mBAAmB;EACnBC,mBAAmB;EACnBC,cAAc;EACdC,oBAAoB;EACpBC,iBAAiB;EACjBC,oBAAoB;EACpBC,gBAAgB,GAAG,cAAc;EACjCC,aAAa;EACbC,aAAa;EACbC,SAAS,EAAEC,UAAU;EACrB,GAAGC;AACsB,CAAC,KAAK;EAC/B;EACA;EACA,MAAMC,kBAAkB,GAAGxF,MAAM,CAC/ByF,SACF,CAAC;EACD,MAAMC,qBAAqB,GAAG5F,OAAO,CAAC,MAAM;IAC1C,MAAM6F,IAAI,GAAGtF,uBAAuB,CAACsE,eAAe,CAAC;IACrD,IAAI,CAACvE,sBAAsB,CAACoF,kBAAkB,CAACI,OAAO,EAAED,IAAI,CAAC,EAAE;MAC7DH,kBAAkB,CAACI,OAAO,GAAGD,IAAI;IACnC;IACA,OAAOH,kBAAkB,CAACI,OAAO;EACnC,CAAC,EAAE,CAACjB,eAAe,CAAC,CAAC;EACrB,MAAMkB,kBAAkB,GAAG7F,MAAM,CAA+B,IAAI,CAAC;EACrE,MAAM8F,UAAU,GAAGxF,sBAAsB,CAAC4C,aAAa,CAAC;EACxD;EACA;EACA,IAAI2C,kBAAkB,CAACD,OAAO,KAAKE,UAAU,EAAE;IAC7CD,kBAAkB,CAACD,OAAO,GAAGE,UAAU;EACzC;EACA,MAAMC,eAAe,GAAGF,kBAAkB,CAACD,OAAQ;EAEnD,MAAMI,mBAAmB,GAAGlG,OAAO,CACjC,OAAO;IACL0C,SAAS,EAAEuB,SAAS,CAACvB,SAAS,IAAI,KAAK;IACvCC,WAAW,EAAEsB,SAAS,CAACtB,WAAW,IAAI,KAAK;IAC3CC,SAAS,EAAEqB,SAAS,CAACrB,SAAS,IAAI,KAAK;IACvCC,SAAS,EAAEoB,SAAS,CAACpB,SAAS,IAAI,IAAI;IACtCC,SAAS,EAAEmB,SAAS,CAACnB,SAAS,IAAI,KAAK;IACvCC,cAAc,EAAEkB,SAAS,CAAClB,cAAc,IAAI,KAAK;IACjDC,kBAAkB,EAAEiB,SAAS,CAACjB,kBAAkB,IAAI,KAAK;IACzD;IACA;IACAC,WAAW,EACToB,MAAM,KAAK,QAAQ,GAAIJ,SAAS,CAAChB,WAAW,IAAI,IAAI,GAAI;EAC5D,CAAC,CAAC,EACF,CAACgB,SAAS,EAAEI,MAAM,CACpB,CAAC;EAED,MAAM8B,uBAAuB,GAAGjG,MAAM,CAEpC,IAAIkG,GAAG,CAAC,CAAC,CAAC;EAEZjG,SAAS,CAAC,MAAM;IACd,MAAMkG,YAAY,GAAG,IAAID,GAAG,CAAqC,CAAC;IAClE,IAAI3B,gBAAgB,EAAE;MACpB,KAAK,MAAM6B,IAAI,IAAI7B,gBAAgB,EAAE;QACnC4B,YAAY,CAACE,GAAG,CAACD,IAAI,CAACE,IAAI,EAAEF,IAAI,CAACG,OAAO,CAAC;MAC3C;IACF;IACAN,uBAAuB,CAACL,OAAO,GAAGO,YAAY;EAChD,CAAC,EAAE,CAAC5B,gBAAgB,CAAC,CAAC;EAEtB,MAAMiC,sBAAsB,GAAG1G,OAAO,CACpC,MACEyE,gBAAgB,EACZkC,MAAM,CAAEL,IAAI,IAAKA,IAAI,CAACM,OAAO,KAAK,KAAK,CAAC,CACzCC,GAAG,CAAEP,IAAI,KAAM;IAAEE,IAAI,EAAEF,IAAI,CAACE,IAAI;IAAEM,IAAI,EAAER,IAAI,CAACQ;EAAK,CAAC,CAAC,CAAC,EAC1D,CAACrC,gBAAgB,CACnB,CAAC;EAED,MAAMsC,uBAAuB,GAAG7G,MAAM,CAACwE,oBAAoB,CAAC;EAC5DqC,uBAAuB,CAACjB,OAAO,GAAGpB,oBAAoB;EACtD;EACA;EACA,MAAMsC,6BAA6B,GAAG9G,MAAM,CAE1C,EAAE,CAAC;EACL,MAAM+G,0BAA0B,GAAGjH,OAAO,CAAC,MAAM;IAC/C,MAAM6F,IAAI,GAAGhF,6BAA6B,CAAC6D,oBAAoB,CAAC;IAChE,IACE,CAAC9D,2BAA2B,CAACoG,6BAA6B,CAAClB,OAAO,EAAED,IAAI,CAAC,EACzE;MACAmB,6BAA6B,CAAClB,OAAO,GAAGD,IAAI;IAC9C;IACA,OAAOmB,6BAA6B,CAAClB,OAAO;EAC9C,CAAC,EAAE,CAACpB,oBAAoB,CAAC,CAAC;EAC1B,MAAMwC,8BAA8B,GAAGjH,WAAW,CAC/CkH,KAA4D,IAAK;IAChE,MAAM;MAAEC,GAAG;MAAEC,OAAO;MAAEC;IAAS,CAAC,GAAGH,KAAK,CAACI,WAAW;IACpD5G,2BAA2B,CACzBoG,uBAAuB,CAACjB,OAAO,EAC/BuB,OAAO,EACPC,QAAQ,EACRF,GACF,CAAC;EACH,CAAC,EACD,EACF,CAAC;EAED,MAAMI,yBAAyB,GAAGxH,OAAO,CACvC,MACE2E,mBAAmB,GACf8C,MAAM,CAACC,OAAO,CAAC/C,mBAAmB,CAAC,CAChCkC,GAAG,CAAC,CAAC,CAACc,IAAI,EAAEC,KAAK,CAAC,MAAM;IAAED,IAAI;IAAEC;EAAM,CAAC,CAAC,CAAC,CACzCC,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAMD,CAAC,CAACH,IAAI,GAAGI,CAAC,CAACJ,IAAI,GAAG,CAAC,CAAC,GAAGG,CAAC,CAACH,IAAI,GAAGI,CAAC,CAACJ,IAAI,GAAG,CAAC,GAAG,CAAE,CAAC,GACnEhC,SAAS,EACf,CAAChB,mBAAmB,CACtB,CAAC;;EAED;EACA;EACA,MAAMqD,kBAAkB,GACtB9H,MAAM,CAA8CyF,SAAS,CAAC;EAChE,MAAMsC,qBAAqB,GAAGjI,OAAO,CAAC,MAAM;IAC1C,MAAM6F,IAAI,GAAGnF,wBAAwB,CAACkE,eAAe,CAAC;IACtD,IAAI,CAACnE,sBAAsB,CAACuH,kBAAkB,CAAClC,OAAO,EAAED,IAAI,CAAC,EAAE;MAC7DmC,kBAAkB,CAAClC,OAAO,GAAGD,IAAI;IACnC;IACA,OAAOmC,kBAAkB,CAAClC,OAAO;EACnC,CAAC,EAAE,CAAClB,eAAe,CAAC,CAAC;EAErB,MAAMsD,0BAA0B,GAAGjI,WAAW,CAC3CkI,CAAoD,IAAK;IACxD,MAAM;MAAEb,QAAQ;MAAEc,YAAY;MAAEC,cAAc;MAAEC;IAAa,CAAC,GAC5DH,CAAC,CAACZ,WAAW;IACf,MAAMgB,QAAQ,GAAGpC,uBAAuB,CAACL,OAAO,CAAC0C,GAAG,CAAClB,QAAQ,CAAC;IAC9DiB,QAAQ,GAAG;MACT/B,IAAI,EAAE4B,YAAY;MAClBK,SAAS,EAAE;QAAEC,KAAK,EAAEL,cAAc;QAAEM,GAAG,EAAEL;MAAa;IACxD,CAAC,CAAC;EACJ,CAAC,EACD,EACF,CAAC;EAED,MAAMM,eAAe,GAAG3I,WAAW,CAChCkI,CAA4D,IAAK;IAChE,MAAM;MAAEf,GAAG;MAAEyB;IAAW,CAAC,GAAGV,CAAC,CAACZ,WAAW;IACzCjE,WAAW,GAAG;MACZ8D,GAAG;MACHyB,UAAU,EAAEA;IACd,CAAC,CAAC;EACJ,CAAC,EACD,CAACvF,WAAW,CACd,CAAC;EAED,MAAMwF,mBAAmB,GAAG7I,WAAW,CACpCkI,CAA2C,IAAK;IAC/C,MAAM;MAAEf;IAAI,CAAC,GAAGe,CAAC,CAACZ,WAAW;IAC7BhE,eAAe,GAAG;MAAE6D;IAAI,CAAC,CAAC;EAC5B,CAAC,EACD,CAAC7D,eAAe,CAClB,CAAC;EAED,MAAMwF,gBAAgB,GAAG9I,WAAW,CACjCkI,CAAwC,IAAK;IAC5C,MAAM;MAAEf,GAAG;MAAE4B;IAAQ,CAAC,GAAGb,CAAC,CAACZ,WAAW;IACtC/D,YAAY,GAAG;MAAE4D,GAAG;MAAE4B;IAAQ,CAAC,CAAC;EAClC,CAAC,EACD,CAACxF,YAAY,CACf,CAAC;EAED,MAAMyF,uBAAuB,GAAGhJ,WAAW,CACxCkI,CAA+C,IAAK;IACnD,MAAM;MAAEe,KAAK;MAAEC,OAAO;MAAE3C;IAAK,CAAC,GAAG2B,CAAC,CAACZ,WAAW;IAC9C9D,mBAAmB,GAAG;MAAEyF,KAAK;MAAEC,OAAO;MAAE3C;IAAK,CAAC,CAAC;EACjD,CAAC,EACD,CAAC/C,mBAAmB,CACtB,CAAC;EAED,MAAM2F,eAAe,GAAGnJ,WAAW,CAChCkI,CAAuC,IAAK;IAC3C,MAAM;MAAEkB,IAAI;MAAEC;IAAS,CAAC,GAAGnB,CAAC,CAACZ,WAAW;IACxC5D,WAAW,GAAG;MAAE0F,IAAI;MAAEC;IAAS,CAAC,CAAC;EACnC,CAAC,EACD,CAAC3F,WAAW,CACd,CAAC;EAED,MAAM4F,gBAAgB,GAAGtJ,WAAW,CACjCkI,CAAwC,IAAK;IAC5C,MAAM;MAAEqB,MAAM;MAAEC,OAAO;MAAEC;IAAY,CAAC,GAAGvB,CAAC,CAACZ,WAAW;IACtD3D,YAAY,GAAG;MAAE4F,MAAM;MAAEC,OAAO,EAAEA,OAAO,IAAI9D,SAAS;MAAE+D;IAAY,CAAC,CAAC;EACxE,CAAC,EACD,CAAC9F,YAAY,CACf,CAAC;EAED,MAAM+F,oBAAoB,GAAG1J,WAAW,CACrCkI,CAA4C,IAAK;IAChD,MAAM;MAAEkB,IAAI;MAAEC;IAAS,CAAC,GAAGnB,CAAC,CAACZ,WAAW;IACxC1D,gBAAgB,GAAG;MAAEwF,IAAI;MAAEC;IAAS,CAAC,CAAC;EACxC,CAAC,EACD,CAACzF,gBAAgB,CACnB,CAAC;EAED,MAAM+F,SAAS,GAAGrF,eAAe,EAAEqF,SAAS,IAAI,aAAa;EAC7D,MAAMC,aAAa,GAAGtF,eAAe,EAAEsF,aAAa,IAAI,aAAa;EACrE,MAAMC,yBAAyB,GAAG9J,OAAO,CACvC,OAAO;IAAE4J,SAAS;IAAEC;EAAc,CAAC,CAAC,EACpC,CAACD,SAAS,EAAEC,aAAa,CAC3B,CAAC;EACD,MAAME,6BAA6B,GAAG/J,OAAO,CAAC,MAAM;IAClD;IACA;IACA,MAAMgK,MAAM,GAAGlF,mBAMF;IAEb,MAAMmF,IAAI,GAAGlJ,iBAAiB,CAACiJ,MAAM,EAAEC,IAAI,EAAE,IAAI,EAAE9I,kBAAkB,CAAC;IACtE,MAAM+I,cAAc,GAAGlJ,8BAA8B,CACnDgJ,MAAM,EAAEE,cAAc,EACtB,qBAAqB,EACrB,gBAAgB,EAChB,IAAI,EACJ9I,8BACF,CAAC;IACD,MAAM+I,YAAY,GAAGnJ,8BAA8B,CACjDgJ,MAAM,EAAEG,YAAY,EACpB,qBAAqB,EACrB,cAAc,EACd,IAAI,EACJ9I,4BACF,CAAC;IAED,MAAMG,YAAY,GAChBwI,MAAM,EAAEG,YAAY,EAGnB3I,YAAY;IAEf,OAAO;MACL0I,cAAc,EAAEA,cAAc,CAACE,OAAO;MACtCD,YAAY,EAAEA,YAAY,CAACC,OAAO;MAClCC,SAAS,EAAEJ,IAAI,CAACK,KAAK;MACrBC,mBAAmB,EAAEL,cAAc,CAACI,KAAK;MACzCE,iBAAiB,EAAEL,YAAY,CAACG,KAAK;MACrCG,kBAAkB,EAAEjJ,YAAY,EAAEM,KAAK,IAAIR,6BAA6B;MACxEoJ,2BAA2B,EAAEnJ,oBAAoB,CAC/CC,YAAY,EACZ2I,YAAY,CAACG,KACf;IACF,CAAC;EACH,CAAC,EAAE,CAACxF,mBAAmB,CAAC,CAAC;EAEzB,MAAM6F,2BAA2B,GAAG3K,OAAO,CACzC,MAAMc,0BAA0B,CAACiE,mBAAmB,CAAC,EACrD,CAACA,mBAAmB,CACtB,CAAC;EAED,MAAM6F,WAAW,GAAG;IAClBzH,QAAQ;IACR0B,eAAe,EAAEe,qBAAqB;IACtCxC,aAAa,EAAE6C,eAAe;IAC9B3C,WAAW,EAAEsF,eAAe;IAC5BrF,eAAe,EAAEuF,mBAAmB;IACpCtF,YAAY,EAAEuF,gBAAgB;IAC9B8B,gBAAgB,EAAErH,YAAY,IAAI,IAAI;IACtCC,mBAAmB,EAAEwF,uBAAuB;IAC5CvF,wBAAwB;IACxBC,WAAW,EAAEyF,eAAe;IAC5BxF,YAAY,EAAE2F,gBAAgB;IAC9B1F,gBAAgB,EAAE8F,oBAAoB;IACtCmB,oBAAoB,EAAEjH,gBAAgB,IAAI,IAAI;IAC9CC,sBAAsB;IACtBC,iBAAiB,EAAER,eAAe,IAAI,IAAI,KAAKQ,iBAAiB,IAAI,IAAI,CAAC;IACzEC,UAAU;IACVC,SAAS,EAAEiC,mBAAmB;IAC9B6E,KAAK,EAAE1G,MAAM,KAAK,QAAQ;IAC1BH,gBAAgB;IAChBC,qBAAqB;IACrBC,mBAAmB;IACnBE,kBAAkB;IAClBC,eAAe,EAAEuF,yBAAyB;IAC1CtF,cAAc;IACdwG,KAAK,EAAE3H,cAAc;IACrBoB,gBAAgB,EAAEiC,sBAAsB;IACxChC,oBAAoB,EAAEuC,0BAA0B;IAChDgE,0BAA0B,EAAE/D,8BAA8B;IAC1DvC,mBAAmB,EAAE6C,yBAAyB;IAC9C5C,eAAe,EAAEqD,qBAAqB;IACtCnD,mBAAmB,EAAEiF,6BAA6B;IAClDhF,mBAAmB,EAAE4F,2BAA2B;IAChDO,sBAAsB,EAAEhD,0BAA0B;IAClDlD,cAAc;IACdC,oBAAoB;IACpBC,iBAAiB;IACjBC,oBAAoB;IACpBC,gBAAgB;IAChBC,aAAa;IACbC,aAAa;IACb,GAAGG;EACL,CAAC;EAED,IAAIpB,MAAM,KAAK,QAAQ,EAAE;IACvB,oBAAOnD,IAAA,CAACb,+BAA+B;MAAA,GAAKuK;IAAW,CAAG,CAAC;EAC7D;EAEA,oBAAO1J,IAAA,CAACd,mCAAmC;IAAA,GAAKwK;EAAW,CAAG,CAAC;AACjE,CAAC;AAED,eAAe1H,oBAAoB","ignoreList":[]}
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/types/MarkdownRenderers.js b/node_modules/react-native-enriched-markdown/lib/module/types/MarkdownRenderers.js
+new file mode 100644
+index 0000000..c04179d
+--- /dev/null
++++ b/node_modules/react-native-enriched-markdown/lib/module/types/MarkdownRenderers.js
+@@ -0,0 +1,4 @@
++"use strict";
++
++export {};
++//# sourceMappingURL=MarkdownRenderers.js.map
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/EnrichedMarkdownText.js b/node_modules/react-native-enriched-markdown/lib/module/web/EnrichedMarkdownText.js
+index 2cf2708..8581623 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/EnrichedMarkdownText.js
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/EnrichedMarkdownText.js
+@@ -3,7 +3,7 @@
+ import { useState, useEffect, useMemo, useRef } from 'react';
+ import { normalizeMarkdownStyle } from "../normalizeMarkdownStyle.web.js";
+ import { zeroTrailingMargins, parseErrorFallbackStyle, buildStyles } from "./styles.js";
+-import { parseMarkdown } from "./parseMarkdown.js";
++import { parseMarkdown, parseMarkdownSync } from "./parseMarkdown.js";
+ import { recognizeTextLinks } from "./recognizeTextLinks.js";
+ import { RenderNode } from "./renderers/index.js";
+ import { indexTaskItems, markInlineImages } from "./utils.js";
+@@ -16,6 +16,7 @@ export const EnrichedMarkdownText = ({
+   markdownStyle = {},
+   md4cFlags = {},
+   linkRecognition,
++  renderers,
+   onLinkPress,
+   onLinkLongPress,
+   onImagePress,
+@@ -31,7 +32,7 @@ export const EnrichedMarkdownText = ({
+   ...rest
+ }) => {
+   const normalizedStyle = useMemo(() => normalizeMarkdownStyle(markdownStyle), [markdownStyle]);
+-  const [ast, setAst] = useState(null);
++  const [parsed, setParsed] = useState(null);
+   const [katex, setKatex] = useState(null);
+   const [parseError, setParseError] = useState(false);
+   const {
+@@ -50,7 +51,39 @@ export const EnrichedMarkdownText = ({
+   linkRecognitionRef.current = linkRecognition;
+   const textLinkKey = linkRecognition?.text?.toString() ?? null;
+   const inlineCodeLinkKey = linkRecognition?.inlineCode?.toString() ?? null;
++
++  // Once WASM is ready, new/virtualized rows must have their text on the first
++  // commit. An effect-only parse briefly measures an empty row and moves readers.
++  const immediate = useMemo(() => {
++    try {
++      const result = parseMarkdownSync(markdown, {
++        underline,
++        latexMath,
++        superscript,
++        subscript,
++        highlight,
++        hardSoftBreaks,
++        preserveBlankLines,
++        admonitions
++      });
++      if (!result) return null;
++      indexTaskItems(result);
++      markInlineImages(result);
++      return {
++        markdown,
++        ast: recognizeTextLinks(result, linkRecognitionRef.current?.text, linkRecognitionRef.current?.inlineCode)
++      };
++    } catch {
++      return {
++        markdown,
++        ast: null
++      };
++    }
++    // Regex keys track ref changes; parsed wakes this memo after WASM initialization.
++    // eslint-disable-next-line react-hooks/exhaustive-deps
++  }, [markdown, underline, latexMath, superscript, subscript, highlight, hardSoftBreaks, preserveBlankLines, admonitions, textLinkKey, inlineCodeLinkKey, parsed]);
+   useEffect(() => {
++    if (immediate && (!latexMath || katex)) return;
+     let cancelled = false;
+     const katexPromise = latexMath ? loadKaTeX() : Promise.resolve(null);
+     Promise.all([parseMarkdown(markdown, {
+@@ -68,7 +101,10 @@ export const EnrichedMarkdownText = ({
+         markInlineImages(result);
+         setParseError(false);
+         setKatex(katexInstance);
+-        setAst(recognizeTextLinks(result, linkRecognitionRef.current?.text, linkRecognitionRef.current?.inlineCode));
++        setParsed({
++          markdown,
++          ast: recognizeTextLinks(result, linkRecognitionRef.current?.text, linkRecognitionRef.current?.inlineCode)
++        });
+       }
+     }).catch(error => {
+       if (!cancelled) {
+@@ -76,14 +112,14 @@ export const EnrichedMarkdownText = ({
+           console.error('[EnrichedMarkdownText] Parse failed:', error);
+         }
+         setParseError(true);
+-        setAst(null);
++        setParsed(null);
+         setKatex(null);
+       }
+     });
+     return () => {
+       cancelled = true;
+     };
+-  }, [markdown, underline, latexMath, superscript, subscript, highlight, hardSoftBreaks, preserveBlankLines, admonitions, textLinkKey, inlineCodeLinkKey]);
++  }, [markdown, underline, latexMath, superscript, subscript, highlight, hardSoftBreaks, preserveBlankLines, admonitions, textLinkKey, inlineCodeLinkKey, immediate, katex]);
+   const callbacks = useMemo(() => ({
+     onLinkPress,
+     onLinkLongPress,
+@@ -93,8 +129,9 @@ export const EnrichedMarkdownText = ({
+   }), [onLinkPress, onLinkLongPress, onImagePress, onTaskListItemPress, onCodeBlockPress]);
+   const capabilities = useMemo(() => ({
+     katex,
+-    enableTaskListItemToggle
+-  }), [katex, enableTaskListItemToggle]);
++    enableTaskListItemToggle,
++    renderers
++  }), [katex, enableTaskListItemToggle, renderers]);
+   const lastChildStyle = useMemo(() => allowTrailingMargin ? normalizedStyle : zeroTrailingMargins(normalizedStyle), [normalizedStyle, allowTrailingMargin]);
+   const styles = useMemo(() => buildStyles(normalizedStyle), [normalizedStyle]);
+   const lastChildStyles = useMemo(() => buildStyles(lastChildStyle), [lastChildStyle]);
+@@ -110,7 +147,8 @@ export const EnrichedMarkdownText = ({
+     } : null)
+   }), [containerStyle, selectable, selectionColor]);
+   const domProps = filterNativeOnlyProps(rest);
+-  if (parseError) {
++  const visibleParsed = immediate ?? parsed;
++  if (immediate ? immediate.ast === null : parseError) {
+     return /*#__PURE__*/_jsx("div", {
+       className: ENRM_TEXT_CLASS,
+       style: wrapperStyle,
+@@ -123,10 +161,10 @@ export const EnrichedMarkdownText = ({
+       })
+     });
+   }
+-  if (!ast) return null;
+-  const children = ast.children ?? [];
++  const children = visibleParsed?.ast?.children ?? [];
+   const lastIdx = children.length - 1;
+   return /*#__PURE__*/_jsx("div", {
++    "aria-busy": visibleParsed?.markdown !== markdown,
+     className: ENRM_TEXT_CLASS,
+     style: wrapperStyle,
+     dir: dir,
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/EnrichedMarkdownText.js.map b/node_modules/react-native-enriched-markdown/lib/module/web/EnrichedMarkdownText.js.map
+index 1c49b41..921a946 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/EnrichedMarkdownText.js.map
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/EnrichedMarkdownText.js.map
+@@ -1 +1 @@
+-{"version":3,"names":["useState","useEffect","useMemo","useRef","normalizeMarkdownStyle","zeroTrailingMargins","parseErrorFallbackStyle","buildStyles","parseMarkdown","recognizeTextLinks","RenderNode","indexTaskItems","markInlineImages","loadKaTeX","ENRM_TEXT_CLASS","ENRM_SELECTION_BG_VAR","filterNativeOnlyProps","jsx","_jsx","EnrichedMarkdownText","markdown","markdownStyle","md4cFlags","linkRecognition","onLinkPress","onLinkLongPress","onImagePress","onTaskListItemPress","onCodeBlockPress","enableTaskListItemToggle","allowTrailingMargin","containerStyle","selectable","dir","selectionColor","testID","rest","normalizedStyle","ast","setAst","katex","setKatex","parseError","setParseError","underline","latexMath","superscript","subscript","highlight","hardSoftBreaks","preserveBlankLines","admonitions","linkRecognitionRef","current","textLinkKey","text","toString","inlineCodeLinkKey","inlineCode","cancelled","katexPromise","Promise","resolve","all","then","result","katexInstance","catch","error","__DEV__","console","callbacks","capabilities","lastChildStyle","styles","lastChildStyles","wrapperStyle","display","flexDirection","undefined","userSelect","domProps","className","style","children","lastIdx","length","map","child","index","node","type"],"sourceRoot":"../../../src","sources":["web/EnrichedMarkdownText.tsx"],"mappings":";;AAAA,SACEA,QAAQ,EACRC,SAAS,EACTC,OAAO,EACPC,MAAM,QAED,OAAO;AAEd,SAASC,sBAAsB,QAAQ,kCAA+B;AACtE,SACEC,mBAAmB,EACnBC,uBAAuB,EACvBC,WAAW,QACN,aAAU;AACjB,SAASC,aAAa,QAAQ,oBAAiB;AAC/C,SAASC,kBAAkB,QAAQ,yBAAsB;AACzD,SAASC,UAAU,QAAQ,sBAAa;AAExC,SAASC,cAAc,EAAEC,gBAAgB,QAAQ,YAAS;AAC1D,SAASC,SAAS,QAAQ,YAAS;AAEnC,SAASC,eAAe,EAAEC,qBAAqB,QAAQ,mBAAgB;AACvE,SAASC,qBAAqB,QAAQ,kBAAe;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEtD,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACnCC,QAAQ;EACRC,aAAa,GAAG,CAAC,CAAC;EAClBC,SAAS,GAAG,CAAC,CAAC;EACdC,eAAe;EACfC,WAAW;EACXC,eAAe;EACfC,YAAY;EACZC,mBAAmB;EACnBC,gBAAgB;EAChBC,wBAAwB,GAAG,IAAI;EAC/BC,mBAAmB,GAAG,KAAK;EAC3BC,cAAc;EACdC,UAAU,GAAG,IAAI;EACjBC,GAAG;EACHC,cAAc;EACdC,MAAM;EACN,GAAGC;AACsB,CAAC,KAAK;EAC/B,MAAMC,eAAe,GAAGnC,OAAO,CAC7B,MAAME,sBAAsB,CAACiB,aAAa,CAAC,EAC3C,CAACA,aAAa,CAChB,CAAC;EAED,MAAM,CAACiB,GAAG,EAAEC,MAAM,CAAC,GAAGvC,QAAQ,CAAiB,IAAI,CAAC;EACpD,MAAM,CAACwC,KAAK,EAAEC,QAAQ,CAAC,GAAGzC,QAAQ,CAAuB,IAAI,CAAC;EAC9D,MAAM,CAAC0C,UAAU,EAAEC,aAAa,CAAC,GAAG3C,QAAQ,CAAU,KAAK,CAAC;EAE5D,MAAM;IACJ4C,SAAS,GAAG,KAAK;IACjBC,SAAS,GAAG,IAAI;IAChBC,WAAW,GAAG,KAAK;IACnBC,SAAS,GAAG,KAAK;IACjBC,SAAS,GAAG,KAAK;IACjBC,cAAc,GAAG,KAAK;IACtBC,kBAAkB,GAAG,KAAK;IAC1BC,WAAW,GAAG;EAChB,CAAC,GAAG7B,SAAS;;EAEb;EACA,MAAM8B,kBAAkB,GAAGjD,MAAM,CAACoB,eAAe,CAAC;EAClD6B,kBAAkB,CAACC,OAAO,GAAG9B,eAAe;EAC5C,MAAM+B,WAAW,GAAG/B,eAAe,EAAEgC,IAAI,EAAEC,QAAQ,CAAC,CAAC,IAAI,IAAI;EAC7D,MAAMC,iBAAiB,GAAGlC,eAAe,EAAEmC,UAAU,EAAEF,QAAQ,CAAC,CAAC,IAAI,IAAI;EAEzEvD,SAAS,CAAC,MAAM;IACd,IAAI0D,SAAS,GAAG,KAAK;IAErB,MAAMC,YAAY,GAAGf,SAAS,GAAGhC,SAAS,CAAC,CAAC,GAAGgD,OAAO,CAACC,OAAO,CAAC,IAAI,CAAC;IAEpED,OAAO,CAACE,GAAG,CAAC,CACVvD,aAAa,CAACY,QAAQ,EAAE;MACtBwB,SAAS;MACTC,SAAS;MACTC,WAAW;MACXC,SAAS;MACTC,SAAS;MACTC,cAAc;MACdC,kBAAkB;MAClBC;IACF,CAAC,CAAC,EACFS,YAAY,CACb,CAAC,CACCI,IAAI,CAAC,CAAC,CAACC,MAAM,EAAEC,aAAa,CAAC,KAAK;MACjC,IAAI,CAACP,SAAS,EAAE;QACdhD,cAAc,CAACsD,MAAM,CAAC;QACtBrD,gBAAgB,CAACqD,MAAM,CAAC;QAExBtB,aAAa,CAAC,KAAK,CAAC;QACpBF,QAAQ,CAACyB,aAAa,CAAC;QACvB3B,MAAM,CACJ9B,kBAAkB,CAChBwD,MAAM,EACNb,kBAAkB,CAACC,OAAO,EAAEE,IAAI,EAChCH,kBAAkB,CAACC,OAAO,EAAEK,UAC9B,CACF,CAAC;MACH;IACF,CAAC,CAAC,CACDS,KAAK,CAAEC,KAAK,IAAK;MAChB,IAAI,CAACT,SAAS,EAAE;QACd,IAAIU,OAAO,EAAE;UACXC,OAAO,CAACF,KAAK,CAAC,sCAAsC,EAAEA,KAAK,CAAC;QAC9D;QAEAzB,aAAa,CAAC,IAAI,CAAC;QACnBJ,MAAM,CAAC,IAAI,CAAC;QACZE,QAAQ,CAAC,IAAI,CAAC;MAChB;IACF,CAAC,CAAC;IAEJ,OAAO,MAAM;MACXkB,SAAS,GAAG,IAAI;IAClB,CAAC;EACH,CAAC,EAAE,CACDvC,QAAQ,EACRwB,SAAS,EACTC,SAAS,EACTC,WAAW,EACXC,SAAS,EACTC,SAAS,EACTC,cAAc,EACdC,kBAAkB,EAClBC,WAAW,EACXG,WAAW,EACXG,iBAAiB,CAClB,CAAC;EAEF,MAAMc,SAAS,GAAGrE,OAAO,CACvB,OAAO;IACLsB,WAAW;IACXC,eAAe;IACfC,YAAY;IACZC,mBAAmB;IACnBC;EACF,CAAC,CAAC,EACF,CACEJ,WAAW,EACXC,eAAe,EACfC,YAAY,EACZC,mBAAmB,EACnBC,gBAAgB,CAEpB,CAAC;EAED,MAAM4C,YAAY,GAAGtE,OAAO,CAC1B,OAAO;IAAEsC,KAAK;IAAEX;EAAyB,CAAC,CAAC,EAC3C,CAACW,KAAK,EAAEX,wBAAwB,CAClC,CAAC;EAED,MAAM4C,cAAc,GAAGvE,OAAO,CAC5B,MACE4B,mBAAmB,GACfO,eAAe,GACfhC,mBAAmB,CAACgC,eAAe,CAAC,EAC1C,CAACA,eAAe,EAAEP,mBAAmB,CACvC,CAAC;EAED,MAAM4C,MAAM,GAAGxE,OAAO,CAAC,MAAMK,WAAW,CAAC8B,eAAe,CAAC,EAAE,CAACA,eAAe,CAAC,CAAC;EAE7E,MAAMsC,eAAe,GAAGzE,OAAO,CAC7B,MAAMK,WAAW,CAACkE,cAAc,CAAC,EACjC,CAACA,cAAc,CACjB,CAAC;EAED,MAAMG,YAAY,GAAG1E,OAAO,CAC1B,OAAO;IACL2E,OAAO,EAAE,MAAM;IACfC,aAAa,EAAE,QAAQ;IACvB,GAAI/C,cAAgC;IACpC,IAAIC,UAAU,GAAG+C,SAAS,GAAG;MAAEC,UAAU,EAAE;IAAO,CAAC,CAAC;IACpD,IAAI9C,cAAc,GACb;MAAE,CAACnB,qBAAqB,GAAGmB;IAAe,CAAC,GAC5C,IAAI;EACV,CAAC,CAAC,EACF,CAACH,cAAc,EAAEC,UAAU,EAAEE,cAAc,CAC7C,CAAC;EAED,MAAM+C,QAAQ,GAAGjE,qBAAqB,CAACoB,IAAI,CAAC;EAE5C,IAAIM,UAAU,EAAE;IACd,oBACExB,IAAA;MACEgE,SAAS,EAAEpE,eAAgB;MAC3BqE,KAAK,EAAEP,YAAa;MACpB3C,GAAG,EAAEA,GAAI;MACT,eAAaE,MAAO;MAAA,GAChB8C,QAAQ;MAAAG,QAAA,eAEZlE,IAAA;QAAKiE,KAAK,EAAE7E,uBAAwB;QAAA8E,QAAA,EAAEhE;MAAQ,CAAM;IAAC,CAClD,CAAC;EAEV;EAEA,IAAI,CAACkB,GAAG,EAAE,OAAO,IAAI;EAErB,MAAM8C,QAAQ,GAAG9C,GAAG,CAAC8C,QAAQ,IAAI,EAAE;EACnC,MAAMC,OAAO,GAAGD,QAAQ,CAACE,MAAM,GAAG,CAAC;EAEnC,oBACEpE,IAAA;IACEgE,SAAS,EAAEpE,eAAgB;IAC3BqE,KAAK,EAAEP,YAAa;IACpB3C,GAAG,EAAEA,GAAI;IACT,eAAaE,MAAO;IAAA,GAChB8C,QAAQ;IAAAG,QAAA,EAEXA,QAAQ,CAACG,GAAG,CAAC,CAACC,KAAK,EAAEC,KAAK,kBACzBvE,IAAA,CAACR,UAAU;MAETgF,IAAI,EAAEF,KAAM;MACZL,KAAK,EAAEM,KAAK,KAAKJ,OAAO,GAAGZ,cAAc,GAAGpC,eAAgB;MAC5DqC,MAAM,EAAEe,KAAK,KAAKJ,OAAO,GAAGV,eAAe,GAAGD,MAAO;MACrDH,SAAS,EAAEA,SAAU;MACrBC,YAAY,EAAEA;IAAa,GALtB,GAAGgB,KAAK,CAACG,IAAI,IAAIF,KAAK,EAM5B,CACF;EAAC,CACC,CAAC;AAEV,CAAC;AAED,eAAetE,oBAAoB","ignoreList":[]}
++{"version":3,"names":["useState","useEffect","useMemo","useRef","normalizeMarkdownStyle","zeroTrailingMargins","parseErrorFallbackStyle","buildStyles","parseMarkdown","parseMarkdownSync","recognizeTextLinks","RenderNode","indexTaskItems","markInlineImages","loadKaTeX","ENRM_TEXT_CLASS","ENRM_SELECTION_BG_VAR","filterNativeOnlyProps","jsx","_jsx","EnrichedMarkdownText","markdown","markdownStyle","md4cFlags","linkRecognition","renderers","onLinkPress","onLinkLongPress","onImagePress","onTaskListItemPress","onCodeBlockPress","enableTaskListItemToggle","allowTrailingMargin","containerStyle","selectable","dir","selectionColor","testID","rest","normalizedStyle","parsed","setParsed","katex","setKatex","parseError","setParseError","underline","latexMath","superscript","subscript","highlight","hardSoftBreaks","preserveBlankLines","admonitions","linkRecognitionRef","current","textLinkKey","text","toString","inlineCodeLinkKey","inlineCode","immediate","result","ast","cancelled","katexPromise","Promise","resolve","all","then","katexInstance","catch","error","__DEV__","console","callbacks","capabilities","lastChildStyle","styles","lastChildStyles","wrapperStyle","display","flexDirection","undefined","userSelect","domProps","visibleParsed","className","style","children","lastIdx","length","map","child","index","node","type"],"sourceRoot":"../../../src","sources":["web/EnrichedMarkdownText.tsx"],"mappings":";;AAAA,SACEA,QAAQ,EACRC,SAAS,EACTC,OAAO,EACPC,MAAM,QAED,OAAO;AAEd,SAASC,sBAAsB,QAAQ,kCAA+B;AACtE,SACEC,mBAAmB,EACnBC,uBAAuB,EACvBC,WAAW,QACN,aAAU;AACjB,SAASC,aAAa,EAAEC,iBAAiB,QAAQ,oBAAiB;AAClE,SAASC,kBAAkB,QAAQ,yBAAsB;AACzD,SAASC,UAAU,QAAQ,sBAAa;AAExC,SAASC,cAAc,EAAEC,gBAAgB,QAAQ,YAAS;AAC1D,SAASC,SAAS,QAAQ,YAAS;AAEnC,SAASC,eAAe,EAAEC,qBAAqB,QAAQ,mBAAgB;AACvE,SAASC,qBAAqB,QAAQ,kBAAe;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEtD,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACnCC,QAAQ;EACRC,aAAa,GAAG,CAAC,CAAC;EAClBC,SAAS,GAAG,CAAC,CAAC;EACdC,eAAe;EACfC,SAAS;EACTC,WAAW;EACXC,eAAe;EACfC,YAAY;EACZC,mBAAmB;EACnBC,gBAAgB;EAChBC,wBAAwB,GAAG,IAAI;EAC/BC,mBAAmB,GAAG,KAAK;EAC3BC,cAAc;EACdC,UAAU,GAAG,IAAI;EACjBC,GAAG;EACHC,cAAc;EACdC,MAAM;EACN,GAAGC;AACsB,CAAC,KAAK;EAC/B,MAAMC,eAAe,GAAGrC,OAAO,CAC7B,MAAME,sBAAsB,CAACkB,aAAa,CAAC,EAC3C,CAACA,aAAa,CAChB,CAAC;EAED,MAAM,CAACkB,MAAM,EAAEC,SAAS,CAAC,GAAGzC,QAAQ,CAG1B,IAAI,CAAC;EACf,MAAM,CAAC0C,KAAK,EAAEC,QAAQ,CAAC,GAAG3C,QAAQ,CAAuB,IAAI,CAAC;EAC9D,MAAM,CAAC4C,UAAU,EAAEC,aAAa,CAAC,GAAG7C,QAAQ,CAAU,KAAK,CAAC;EAE5D,MAAM;IACJ8C,SAAS,GAAG,KAAK;IACjBC,SAAS,GAAG,IAAI;IAChBC,WAAW,GAAG,KAAK;IACnBC,SAAS,GAAG,KAAK;IACjBC,SAAS,GAAG,KAAK;IACjBC,cAAc,GAAG,KAAK;IACtBC,kBAAkB,GAAG,KAAK;IAC1BC,WAAW,GAAG;EAChB,CAAC,GAAG9B,SAAS;;EAEb;EACA,MAAM+B,kBAAkB,GAAGnD,MAAM,CAACqB,eAAe,CAAC;EAClD8B,kBAAkB,CAACC,OAAO,GAAG/B,eAAe;EAC5C,MAAMgC,WAAW,GAAGhC,eAAe,EAAEiC,IAAI,EAAEC,QAAQ,CAAC,CAAC,IAAI,IAAI;EAC7D,MAAMC,iBAAiB,GAAGnC,eAAe,EAAEoC,UAAU,EAAEF,QAAQ,CAAC,CAAC,IAAI,IAAI;;EAEzE;EACA;EACA,MAAMG,SAAS,GAAG3D,OAAO,CAAC,MAAM;IAC9B,IAAI;MACF,MAAM4D,MAAM,GAAGrD,iBAAiB,CAACY,QAAQ,EAAE;QACzCyB,SAAS;QACTC,SAAS;QACTC,WAAW;QACXC,SAAS;QACTC,SAAS;QACTC,cAAc;QACdC,kBAAkB;QAClBC;MACF,CAAC,CAAC;MACF,IAAI,CAACS,MAAM,EAAE,OAAO,IAAI;MACxBlD,cAAc,CAACkD,MAAM,CAAC;MACtBjD,gBAAgB,CAACiD,MAAM,CAAC;MACxB,OAAO;QACLzC,QAAQ;QACR0C,GAAG,EAAErD,kBAAkB,CACrBoD,MAAM,EACNR,kBAAkB,CAACC,OAAO,EAAEE,IAAI,EAChCH,kBAAkB,CAACC,OAAO,EAAEK,UAC9B;MACF,CAAC;IACH,CAAC,CAAC,MAAM;MACN,OAAO;QAAEvC,QAAQ;QAAE0C,GAAG,EAAE;MAAK,CAAC;IAChC;IACA;IACA;EACF,CAAC,EAAE,CACD1C,QAAQ,EACRyB,SAAS,EACTC,SAAS,EACTC,WAAW,EACXC,SAAS,EACTC,SAAS,EACTC,cAAc,EACdC,kBAAkB,EAClBC,WAAW,EACXG,WAAW,EACXG,iBAAiB,EACjBnB,MAAM,CACP,CAAC;EAEFvC,SAAS,CAAC,MAAM;IACd,IAAI4D,SAAS,KAAK,CAACd,SAAS,IAAIL,KAAK,CAAC,EAAE;IACxC,IAAIsB,SAAS,GAAG,KAAK;IAErB,MAAMC,YAAY,GAAGlB,SAAS,GAAGjC,SAAS,CAAC,CAAC,GAAGoD,OAAO,CAACC,OAAO,CAAC,IAAI,CAAC;IAEpED,OAAO,CAACE,GAAG,CAAC,CACV5D,aAAa,CAACa,QAAQ,EAAE;MACtByB,SAAS;MACTC,SAAS;MACTC,WAAW;MACXC,SAAS;MACTC,SAAS;MACTC,cAAc;MACdC,kBAAkB;MAClBC;IACF,CAAC,CAAC,EACFY,YAAY,CACb,CAAC,CACCI,IAAI,CAAC,CAAC,CAACP,MAAM,EAAEQ,aAAa,CAAC,KAAK;MACjC,IAAI,CAACN,SAAS,EAAE;QACdpD,cAAc,CAACkD,MAAM,CAAC;QACtBjD,gBAAgB,CAACiD,MAAM,CAAC;QAExBjB,aAAa,CAAC,KAAK,CAAC;QACpBF,QAAQ,CAAC2B,aAAa,CAAC;QACvB7B,SAAS,CAAC;UACRpB,QAAQ;UACR0C,GAAG,EAAErD,kBAAkB,CACrBoD,MAAM,EACNR,kBAAkB,CAACC,OAAO,EAAEE,IAAI,EAChCH,kBAAkB,CAACC,OAAO,EAAEK,UAC9B;QACF,CAAC,CAAC;MACJ;IACF,CAAC,CAAC,CACDW,KAAK,CAAEC,KAAK,IAAK;MAChB,IAAI,CAACR,SAAS,EAAE;QACd,IAAIS,OAAO,EAAE;UACXC,OAAO,CAACF,KAAK,CAAC,sCAAsC,EAAEA,KAAK,CAAC;QAC9D;QAEA3B,aAAa,CAAC,IAAI,CAAC;QACnBJ,SAAS,CAAC,IAAI,CAAC;QACfE,QAAQ,CAAC,IAAI,CAAC;MAChB;IACF,CAAC,CAAC;IAEJ,OAAO,MAAM;MACXqB,SAAS,GAAG,IAAI;IAClB,CAAC;EACH,CAAC,EAAE,CACD3C,QAAQ,EACRyB,SAAS,EACTC,SAAS,EACTC,WAAW,EACXC,SAAS,EACTC,SAAS,EACTC,cAAc,EACdC,kBAAkB,EAClBC,WAAW,EACXG,WAAW,EACXG,iBAAiB,EACjBE,SAAS,EACTnB,KAAK,CACN,CAAC;EAEF,MAAMiC,SAAS,GAAGzE,OAAO,CACvB,OAAO;IACLwB,WAAW;IACXC,eAAe;IACfC,YAAY;IACZC,mBAAmB;IACnBC;EACF,CAAC,CAAC,EACF,CACEJ,WAAW,EACXC,eAAe,EACfC,YAAY,EACZC,mBAAmB,EACnBC,gBAAgB,CAEpB,CAAC;EAED,MAAM8C,YAAY,GAAG1E,OAAO,CAC1B,OAAO;IAAEwC,KAAK;IAAEX,wBAAwB;IAAEN;EAAU,CAAC,CAAC,EACtD,CAACiB,KAAK,EAAEX,wBAAwB,EAAEN,SAAS,CAC7C,CAAC;EAED,MAAMoD,cAAc,GAAG3E,OAAO,CAC5B,MACE8B,mBAAmB,GACfO,eAAe,GACflC,mBAAmB,CAACkC,eAAe,CAAC,EAC1C,CAACA,eAAe,EAAEP,mBAAmB,CACvC,CAAC;EAED,MAAM8C,MAAM,GAAG5E,OAAO,CAAC,MAAMK,WAAW,CAACgC,eAAe,CAAC,EAAE,CAACA,eAAe,CAAC,CAAC;EAE7E,MAAMwC,eAAe,GAAG7E,OAAO,CAC7B,MAAMK,WAAW,CAACsE,cAAc,CAAC,EACjC,CAACA,cAAc,CACjB,CAAC;EAED,MAAMG,YAAY,GAAG9E,OAAO,CAC1B,OAAO;IACL+E,OAAO,EAAE,MAAM;IACfC,aAAa,EAAE,QAAQ;IACvB,GAAIjD,cAAgC;IACpC,IAAIC,UAAU,GAAGiD,SAAS,GAAG;MAAEC,UAAU,EAAE;IAAO,CAAC,CAAC;IACpD,IAAIhD,cAAc,GACb;MAAE,CAACpB,qBAAqB,GAAGoB;IAAe,CAAC,GAC5C,IAAI;EACV,CAAC,CAAC,EACF,CAACH,cAAc,EAAEC,UAAU,EAAEE,cAAc,CAC7C,CAAC;EAED,MAAMiD,QAAQ,GAAGpE,qBAAqB,CAACqB,IAAI,CAAC;EAE5C,MAAMgD,aAAa,GAAGzB,SAAS,IAAIrB,MAAM;EACzC,IAAIqB,SAAS,GAAGA,SAAS,CAACE,GAAG,KAAK,IAAI,GAAGnB,UAAU,EAAE;IACnD,oBACEzB,IAAA;MACEoE,SAAS,EAAExE,eAAgB;MAC3ByE,KAAK,EAAER,YAAa;MACpB7C,GAAG,EAAEA,GAAI;MACT,eAAaE,MAAO;MAAA,GAChBgD,QAAQ;MAAAI,QAAA,eAEZtE,IAAA;QAAKqE,KAAK,EAAElF,uBAAwB;QAAAmF,QAAA,EAAEpE;MAAQ,CAAM;IAAC,CAClD,CAAC;EAEV;EAEA,MAAMoE,QAAQ,GAAGH,aAAa,EAAEvB,GAAG,EAAE0B,QAAQ,IAAI,EAAE;EACnD,MAAMC,OAAO,GAAGD,QAAQ,CAACE,MAAM,GAAG,CAAC;EAEnC,oBACExE,IAAA;IACE,aAAWmE,aAAa,EAAEjE,QAAQ,KAAKA,QAAS;IAChDkE,SAAS,EAAExE,eAAgB;IAC3ByE,KAAK,EAAER,YAAa;IACpB7C,GAAG,EAAEA,GAAI;IACT,eAAaE,MAAO;IAAA,GAChBgD,QAAQ;IAAAI,QAAA,EAEXA,QAAQ,CAACG,GAAG,CAAC,CAACC,KAAK,EAAEC,KAAK,kBACzB3E,IAAA,CAACR,UAAU;MAEToF,IAAI,EAAEF,KAAM;MACZL,KAAK,EAAEM,KAAK,KAAKJ,OAAO,GAAGb,cAAc,GAAGtC,eAAgB;MAC5DuC,MAAM,EAAEgB,KAAK,KAAKJ,OAAO,GAAGX,eAAe,GAAGD,MAAO;MACrDH,SAAS,EAAEA,SAAU;MACrBC,YAAY,EAAEA;IAAa,GALtB,GAAGiB,KAAK,CAACG,IAAI,IAAIF,KAAK,EAM5B,CACF;EAAC,CACC,CAAC;AAEV,CAAC;AAED,eAAe1E,oBAAoB","ignoreList":[]}
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/parseMarkdown.js b/node_modules/react-native-enriched-markdown/lib/module/web/parseMarkdown.js
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/parseMarkdown.js
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/parseMarkdown.js
+@@ -1,14 +1,19 @@
++import createMd4c from './wasm/md4c';
+ "use strict";
+ 
+ // Caching the Promise (not the resolved value) means concurrent callers share
+ // a single WASM initialization — no duplicate loading.
++let readyParser = null;
+ let parserPromise = null;
+ 
+ // SINGLE_FILE=1 inlines the WASM binary as base64 inside md4c.js, so no
+ // network fetch is needed — only a one-time decode + compile on first call.
+ function initializeParser() {
+   if (!parserPromise) {
+-    parserPromise = import('./wasm/md4c').then(module => module.default()).then(wasmModule => wasmModule.cwrap('parseMarkdown', 'string', ['string', 'number', 'number', 'number', 'number', 'number', 'number', 'number', 'number'])).catch(error => {
++    parserPromise = Promise.resolve().then(() => createMd4c()).then(wasmModule => wasmModule.cwrap('parseMarkdown', 'string', ['string', 'number', 'number', 'number', 'number', 'number', 'number', 'number', 'number'])).then(parse => {
++      readyParser = parse;
++      return parse;
++    }).catch(error => {
+       parserPromise = null;
+       throw error;
+     });
+@@ -18,7 +23,7 @@
+ function isASTNode(value) {
+   return typeof value === 'object' && value !== null && 'type' in value && typeof value.type === 'string';
+ }
+-export async function parseMarkdown(markdown, {
++export function parseMarkdownSync(markdown, {
+   underline = false,
+   latexMath = true,
+   superscript = false,
+@@ -28,11 +33,16 @@
+   preserveBlankLines = false,
+   admonitions = true
+ } = {}) {
+-  const parse = await initializeParser();
++  const parse = readyParser;
++  if (!parse) return null;
+   const result = JSON.parse(parse(markdown, underline ? 1 : 0, latexMath ? 1 : 0, superscript ? 1 : 0, subscript ? 1 : 0, highlight ? 1 : 0, hardSoftBreaks ? 1 : 0, preserveBlankLines ? 1 : 0, admonitions ? 1 : 0));
+   if (!isASTNode(result)) {
+     throw new Error('WASM parser returned invalid AST');
+   }
+   return result;
+ }
++export async function parseMarkdown(markdown, flags = {}) {
++  await initializeParser();
++  return parseMarkdownSync(markdown, flags);
++}
+ //# sourceMappingURL=parseMarkdown.js.map
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/parseMarkdown.js.map b/node_modules/react-native-enriched-markdown/lib/module/web/parseMarkdown.js.map
+index 250fa18..ea79a10 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/parseMarkdown.js.map
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/parseMarkdown.js.map
+@@ -1 +1 @@
+-{"version":3,"names":["parserPromise","initializeParser","then","module","default","wasmModule","cwrap","catch","error","isASTNode","value","type","parseMarkdown","markdown","underline","latexMath","superscript","subscript","highlight","hardSoftBreaks","preserveBlankLines","admonitions","parse","result","JSON","Error"],"sourceRoot":"../../../src","sources":["web/parseMarkdown.ts"],"mappings":";;AAeA;AACA;AACA,IAAIA,aAAsC,GAAG,IAAI;;AAEjD;AACA;AACA,SAASC,gBAAgBA,CAAA,EAAqB;EAC5C,IAAI,CAACD,aAAa,EAAE;IAClBA,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC,CAClCE,IAAI,CAAEC,MAAM,IAAKA,MAAM,CAACC,OAAO,CAAC,CAAC,CAAC,CAClCF,IAAI,CAAEG,UAAU,IACfA,UAAU,CAACC,KAAK,CAAC,eAAe,EAAE,QAAQ,EAAE,CAC1C,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,CACT,CACH,CAAC,CACAC,KAAK,CAAEC,KAAK,IAAK;MAChBR,aAAa,GAAG,IAAI;MACpB,MAAMQ,KAAK;IACb,CAAC,CAAqB;EAC1B;EACA,OAAOR,aAAa;AACtB;AAEA,SAASS,SAASA,CAACC,KAAc,EAAoB;EACnD,OACE,OAAOA,KAAK,KAAK,QAAQ,IACzBA,KAAK,KAAK,IAAI,IACd,MAAM,IAAIA,KAAK,IACf,OAAQA,KAAK,CAAaC,IAAI,KAAK,QAAQ;AAE/C;AAEA,OAAO,eAAeC,aAAaA,CACjCC,QAAgB,EAChB;EACEC,SAAS,GAAG,KAAK;EACjBC,SAAS,GAAG,IAAI;EAChBC,WAAW,GAAG,KAAK;EACnBC,SAAS,GAAG,KAAK;EACjBC,SAAS,GAAG,KAAK;EACjBC,cAAc,GAAG,KAAK;EACtBC,kBAAkB,GAAG,KAAK;EAC1BC,WAAW,GAAG;AACL,CAAC,GAAG,CAAC,CAAC,EACC;EAClB,MAAMC,KAAK,GAAG,MAAMrB,gBAAgB,CAAC,CAAC;EAEtC,MAAMsB,MAAe,GAAGC,IAAI,CAACF,KAAK,CAChCA,KAAK,CACHT,QAAQ,EACRC,SAAS,GAAG,CAAC,GAAG,CAAC,EACjBC,SAAS,GAAG,CAAC,GAAG,CAAC,EACjBC,WAAW,GAAG,CAAC,GAAG,CAAC,EACnBC,SAAS,GAAG,CAAC,GAAG,CAAC,EACjBC,SAAS,GAAG,CAAC,GAAG,CAAC,EACjBC,cAAc,GAAG,CAAC,GAAG,CAAC,EACtBC,kBAAkB,GAAG,CAAC,GAAG,CAAC,EAC1BC,WAAW,GAAG,CAAC,GAAG,CACpB,CACF,CAAC;EAED,IAAI,CAACZ,SAAS,CAACc,MAAM,CAAC,EAAE;IACtB,MAAM,IAAIE,KAAK,CAAC,kCAAkC,CAAC;EACrD;EAEA,OAAOF,MAAM;AACf","ignoreList":[]}
++{"version":3,"names":["readyParser","parserPromise","initializeParser","then","module","default","wasmModule","cwrap","parse","catch","error","isASTNode","value","type","parseMarkdownSync","markdown","underline","latexMath","superscript","subscript","highlight","hardSoftBreaks","preserveBlankLines","admonitions","result","JSON","Error","parseMarkdown","flags"],"sourceRoot":"../../../src","sources":["web/parseMarkdown.ts"],"mappings":";;AAeA;AACA;AACA,IAAIA,WAA2B,GAAG,IAAI;AACtC,IAAIC,aAAsC,GAAG,IAAI;;AAEjD;AACA;AACA,SAASC,gBAAgBA,CAAA,EAAqB;EAC5C,IAAI,CAACD,aAAa,EAAE;IAClBA,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC,CAClCE,IAAI,CAAEC,MAAM,IAAKA,MAAM,CAACC,OAAO,CAAC,CAAC,CAAC,CAClCF,IAAI,CAAEG,UAAU,IACfA,UAAU,CAACC,KAAK,CAAC,eAAe,EAAE,QAAQ,EAAE,CAC1C,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,CACT,CACH,CAAC,CACAJ,IAAI,CAAEK,KAAK,IAAK;MACfR,WAAW,GAAGQ,KAAgB;MAC9B,OAAOA,KAAK;IACd,CAAC,CAAC,CACDC,KAAK,CAAEC,KAAK,IAAK;MAChBT,aAAa,GAAG,IAAI;MACpB,MAAMS,KAAK;IACb,CAAC,CAAqB;EAC1B;EACA,OAAOT,aAAa;AACtB;AAEA,SAASU,SAASA,CAACC,KAAc,EAAoB;EACnD,OACE,OAAOA,KAAK,KAAK,QAAQ,IACzBA,KAAK,KAAK,IAAI,IACd,MAAM,IAAIA,KAAK,IACf,OAAQA,KAAK,CAAaC,IAAI,KAAK,QAAQ;AAE/C;AAEA,OAAO,SAASC,iBAAiBA,CAC/BC,QAAgB,EAChB;EACEC,SAAS,GAAG,KAAK;EACjBC,SAAS,GAAG,IAAI;EAChBC,WAAW,GAAG,KAAK;EACnBC,SAAS,GAAG,KAAK;EACjBC,SAAS,GAAG,KAAK;EACjBC,cAAc,GAAG,KAAK;EACtBC,kBAAkB,GAAG,KAAK;EAC1BC,WAAW,GAAG;AACL,CAAC,GAAG,CAAC,CAAC,EACD;EAChB,MAAMf,KAAK,GAAGR,WAAW;EACzB,IAAI,CAACQ,KAAK,EAAE,OAAO,IAAI;EAEvB,MAAMgB,MAAe,GAAGC,IAAI,CAACjB,KAAK,CAChCA,KAAK,CACHO,QAAQ,EACRC,SAAS,GAAG,CAAC,GAAG,CAAC,EACjBC,SAAS,GAAG,CAAC,GAAG,CAAC,EACjBC,WAAW,GAAG,CAAC,GAAG,CAAC,EACnBC,SAAS,GAAG,CAAC,GAAG,CAAC,EACjBC,SAAS,GAAG,CAAC,GAAG,CAAC,EACjBC,cAAc,GAAG,CAAC,GAAG,CAAC,EACtBC,kBAAkB,GAAG,CAAC,GAAG,CAAC,EAC1BC,WAAW,GAAG,CAAC,GAAG,CACpB,CACF,CAAC;EAED,IAAI,CAACZ,SAAS,CAACa,MAAM,CAAC,EAAE;IACtB,MAAM,IAAIE,KAAK,CAAC,kCAAkC,CAAC;EACrD;EAEA,OAAOF,MAAM;AACf;AAEA,OAAO,eAAeG,aAAaA,CACjCZ,QAAgB,EAChBa,KAAgB,GAAG,CAAC,CAAC,EACH;EAClB,MAAM1B,gBAAgB,CAAC,CAAC;EACxB,OAAOY,iBAAiB,CAACC,QAAQ,EAAEa,KAAK,CAAC;AAC3C","ignoreList":[]}
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js
+index dd70713..ca0385a 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js
+@@ -101,12 +101,20 @@ function AdmonitionRenderer({
+   });
+ }
+ function CodeBlockRenderer({
++  capabilities,
+   node,
+   styles,
+   renderChildren,
+   callbacks
+ }) {
+   const language = node.attributes?.language;
++  const CustomCodeBlock = capabilities.renderers?.codeBlock;
++  if (CustomCodeBlock) {
++    return /*#__PURE__*/_jsx(CustomCodeBlock, {
++      code: extractNodeText(node),
++      language: language ?? ''
++    });
++  }
+   const label = language ? `Code block: ${language}` : 'Code block';
+   if (callbacks.onCodeBlockPress == null) {
+     return /*#__PURE__*/_jsx("pre", {
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js.map b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js.map
+index dc917c4..cf59150 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js.map
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js.map
+@@ -1 +1 @@
+-{"version":3,"names":["extractNodeText","filenameFromUrl","toHeadingLevel","KaTeXRenderer","ADMONITION_ICON_PATHS","ADMONITION_ICON_VIEWBOX","ADMONITION_TITLES","ENRM_ADMONITION_CLASS","Fragment","_Fragment","jsx","_jsx","jsxs","_jsxs","ParagraphRenderer","node","styles","parentType","renderChildren","isImageOnly","children","length","type","style","paragraphInBlockquote","paragraph","HeadingRenderer","Tag","attributes","level","BlockquoteRenderer","blockquote","AdmonitionRenderer","admonitionType","colors","admonitions","note","tint","color","iconSize","Math","ceil","fontSize","boxStyle","borderInlineStart","borderWidth","backgroundColor","headerStyle","display","alignItems","gap","round","marginBottom","fontWeight","lineHeight","className","width","height","viewBox","fill","d","CodeBlockRenderer","callbacks","language","label","onCodeBlockPress","codeBlock","codeBlockFont","press","code","replace","handleClick","selection","window","getSelection","isCollapsed","handleKeyDown","event","repeat","key","preventDefault","cursor","role","tabIndex","onClick","onKeyDown","ThematicBreakRenderer","thematicBreak","BlankLineRenderer","count","Number","parseInt","lines","isFinite","max","ImageRenderer","url","title","markdownAlt","trim","alt","imgStyle","isInline","inlineImage","image","interactive","onImagePress","src","altText","LatexMathDisplayRenderer","capabilities","content","katex","displayMode","mathDisplay","VideoRenderer","controls","playsInline","preload","video","blockRenderers","Paragraph","Heading","Blockquote","Admonition","CodeBlock","ThematicBreak","BlankLine","Image","LatexMathDisplay","Video"],"sourceRoot":"../../../../src","sources":["web/renderers/BlockRenderers.tsx"],"mappings":";;AACA,SAASA,eAAe,EAAEC,eAAe,QAAQ,aAAU;AAE3D,SAASC,cAAc,QAAQ,cAAW;AAC1C,SAASC,aAAa,QAAQ,oBAAiB;AAC/C,SACEC,qBAAqB,EACrBC,uBAAuB,EACvBC,iBAAiB,QACZ,sBAAmB;AAE1B,SAASC,qBAAqB,QAAQ,oBAAiB;AAAC,SAAAC,QAAA,IAAAC,SAAA,EAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAExD,SAASC,iBAAiBA,CAAC;EACzBC,IAAI;EACJC,MAAM;EACNC,UAAU;EACVC;AACa,CAAC,EAAE;EAChB,MAAMC,WAAW,GACfJ,IAAI,CAACK,QAAQ,EAAEC,MAAM,KAAK,CAAC,IAAIN,IAAI,CAACK,QAAQ,CAAC,CAAC,CAAC,EAAEE,IAAI,KAAK,OAAO;EACnE,IAAIH,WAAW,EAAE,oBAAOR,IAAA,CAAAF,SAAA;IAAAW,QAAA,EAAGF,cAAc,CAACH,IAAI;EAAC,CAAG,CAAC;EAEnD,IAAIE,UAAU,KAAK,YAAY,IAAIA,UAAU,KAAK,YAAY,EAAE;IAC9D,oBAAON,IAAA;MAAGY,KAAK,EAAEP,MAAM,CAACQ,qBAAsB;MAAAJ,QAAA,EAAEF,cAAc,CAACH,IAAI;IAAC,CAAI,CAAC;EAC3E;EAEA,IAAIE,UAAU,KAAK,UAAU,EAAE;IAC7B,oBAAON,IAAA;MAAAS,QAAA,EAAOF,cAAc,CAACH,IAAI;IAAC,CAAO,CAAC;EAC5C;EAEA,oBAAOJ,IAAA;IAAGY,KAAK,EAAEP,MAAM,CAACS,SAAU;IAAAL,QAAA,EAAEF,cAAc,CAACH,IAAI;EAAC,CAAI,CAAC;AAC/D;AAEA,SAASW,eAAeA,CAAC;EAAEX,IAAI;EAAEC,MAAM;EAAEE;AAA8B,CAAC,EAAE;EACxE,MAAMS,GAAG,GAAGzB,cAAc,CAACa,IAAI,CAACa,UAAU,EAAEC,KAAK,IAAI,GAAG,CAAC;EACzD,oBAAOlB,IAAA,CAACgB,GAAG;IAACJ,KAAK,EAAEP,MAAM,CAACW,GAAG,CAAE;IAAAP,QAAA,EAAEF,cAAc,CAACH,IAAI;EAAC,CAAM,CAAC;AAC9D;AAEA,SAASe,kBAAkBA,CAAC;EAAEf,IAAI;EAAEC,MAAM;EAAEE;AAA8B,CAAC,EAAE;EAC3E,oBACEP,IAAA;IAAYY,KAAK,EAAEP,MAAM,CAACe,UAAW;IAAAX,QAAA,EAAEF,cAAc,CAACH,IAAI;EAAC,CAAa,CAAC;AAE7E;AAEA,SAASiB,kBAAkBA,CAAC;EAC1BjB,IAAI;EACJQ,KAAK;EACLP,MAAM;EACNE;AACa,CAAC,EAAE;EAChB,MAAMI,IAAI,GAAIP,IAAI,CAACa,UAAU,EAAEK,cAAc,IAAI,MAAyB;EAC1E,MAAMF,UAAU,GAAGR,KAAK,CAACQ,UAAU;EACnC,MAAMG,MAAM,GAAGH,UAAU,CAACI,WAAW,CAACb,IAAI,CAAC,IAAIS,UAAU,CAACI,WAAW,CAACC,IAAI;EAC1E,MAAMC,IAAI,GAAGH,MAAM,CAACI,KAAK;EACzB,MAAMC,QAAQ,GAAGC,IAAI,CAACC,IAAI,CAACV,UAAU,CAACW,QAAQ,CAAC;EAC/C;EACA,MAAMC,QAAuB,GAAG;IAC9B,GAAG3B,MAAM,CAACe,UAAU;IACpBa,iBAAiB,EAAE,GAAGb,UAAU,CAACc,WAAW,YAAYR,IAAI,EAAE;IAC9DS,eAAe,EAAEZ,MAAM,CAACY;EAC1B,CAAC;EACD,MAAMC,WAA0B,GAAG;IACjCC,OAAO,EAAE,MAAM;IACfC,UAAU,EAAE,QAAQ;IACpBC,GAAG,EAAEV,IAAI,CAACW,KAAK,CAACZ,QAAQ,GAAG,GAAG,CAAC;IAC/Ba,YAAY,EAAEZ,IAAI,CAACW,KAAK,CAACpB,UAAU,CAACW,QAAQ,GAAG,GAAG,CAAC;IACnDJ,KAAK,EAAED,IAAI;IACXgB,UAAU,EAAE,MAAM;IAClBX,QAAQ,EAAEX,UAAU,CAACW,QAAQ;IAC7BY,UAAU,EAAE;EACd,CAAC;EACD,oBACEzC,KAAA;IAAK0C,SAAS,EAAEhD,qBAAsB;IAACgB,KAAK,EAAEoB,QAAS;IAAAvB,QAAA,gBACrDP,KAAA;MAAKU,KAAK,EAAEwB,WAAY;MAAA3B,QAAA,gBACtBT,IAAA;QACE6C,KAAK,EAAEjB,QAAS;QAChBkB,MAAM,EAAElB,QAAS;QACjBmB,OAAO,EAAE,OAAOrD,uBAAuB,IAAIA,uBAAuB,EAAG;QACrEsD,IAAI,EAAEtB,IAAK;QACX,eAAY,MAAM;QAAAjB,QAAA,eAElBT,IAAA;UAAMiD,CAAC,EAAExD,qBAAqB,CAACkB,IAAI;QAAE,CAAE;MAAC,CACrC,CAAC,eACNX,IAAA;QAAAS,QAAA,EAAOd,iBAAiB,CAACgB,IAAI;MAAC,CAAO,CAAC;IAAA,CACnC,CAAC,EACLJ,cAAc,CAACH,IAAI,CAAC;EAAA,CAClB,CAAC;AAEV;AAEA,SAAS8C,iBAAiBA,CAAC;EACzB9C,IAAI;EACJC,MAAM;EACNE,cAAc;EACd4C;AACa,CAAC,EAAE;EAChB,MAAMC,QAAQ,GAAGhD,IAAI,CAACa,UAAU,EAAEmC,QAAQ;EAC1C,MAAMC,KAAK,GAAGD,QAAQ,GAAG,eAAeA,QAAQ,EAAE,GAAG,YAAY;EAEjE,IAAID,SAAS,CAACG,gBAAgB,IAAI,IAAI,EAAE;IACtC,oBACEtD,IAAA;MAAKY,KAAK,EAAEP,MAAM,CAACkD,SAAU;MAAC,cAAYF,KAAM;MAAA5C,QAAA,eAC9CT,IAAA;QAAMY,KAAK,EAAEP,MAAM,CAACmD,aAAc;QAAA/C,QAAA,EAAEF,cAAc,CAACH,IAAI;MAAC,CAAO;IAAC,CAC7D,CAAC;EAEV;EAEA,MAAMqD,KAAK,GAAGA,CAAA,KACZN,SAAS,CAACG,gBAAgB,GAAG;IAC3BI,IAAI,EAAErE,eAAe,CAACe,IAAI,CAAC,CAACuD,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAC/CP,QAAQ,EAAEA,QAAQ,IAAI;EACxB,CAAC,CAAC;;EAEJ;EACA,MAAMQ,WAAW,GAAGA,CAAA,KAAM;IACxB,MAAMC,SAAS,GACb,OAAOC,MAAM,KAAK,WAAW,GAAGA,MAAM,CAACC,YAAY,CAAC,CAAC,GAAG,IAAI;IAC9D,IAAIF,SAAS,IAAI,CAACA,SAAS,CAACG,WAAW,EAAE;IACzCP,KAAK,CAAC,CAAC;EACT,CAAC;EAED,MAAMQ,aAAa,GAAIC,KAAoC,IAAK;IAC9D,IAAIA,KAAK,CAACC,MAAM,EAAE;IAClB,IAAID,KAAK,CAACE,GAAG,KAAK,OAAO,IAAIF,KAAK,CAACE,GAAG,KAAK,GAAG,EAAE;MAC9CF,KAAK,CAACG,cAAc,CAAC,CAAC;MACtBZ,KAAK,CAAC,CAAC;IACT;EACF,CAAC;EAED,oBACEzD,IAAA;IACEY,KAAK,EAAE;MAAE,GAAGP,MAAM,CAACkD,SAAS;MAAEe,MAAM,EAAE;IAAU,CAAE;IAClD,cAAYjB,KAAM;IAClBkB,IAAI,EAAC,QAAQ;IACbC,QAAQ,EAAE,CAAE;IACZC,OAAO,EAAEb,WAAY;IACrBc,SAAS,EAAET,aAAc;IAAAxD,QAAA,eAEzBT,IAAA;MAAMY,KAAK,EAAEP,MAAM,CAACmD,aAAc;MAAA/C,QAAA,EAAEF,cAAc,CAACH,IAAI;IAAC,CAAO;EAAC,CAC7D,CAAC;AAEV;AAEA,SAASuE,qBAAqBA,CAAC;EAAEtE;AAAsB,CAAC,EAAE;EACxD,oBAAOL,IAAA;IAAIY,KAAK,EAAEP,MAAM,CAACuE;EAAc,CAAE,CAAC;AAC5C;;AAEA;AACA;AACA;AACA;AACA,SAASC,iBAAiBA,CAAC;EAAEzE,IAAI;EAAEQ;AAAqB,CAAC,EAAE;EACzD,MAAMkE,KAAK,GAAGC,MAAM,CAACC,QAAQ,CAAC5E,IAAI,CAACa,UAAU,EAAE6D,KAAK,IAAI,GAAG,EAAE,EAAE,CAAC;EAChE,MAAMG,KAAK,GAAGF,MAAM,CAACG,QAAQ,CAACJ,KAAK,CAAC,GAAGjD,IAAI,CAACsD,GAAG,CAAC,CAAC,EAAEL,KAAK,CAAC,GAAG,CAAC;EAC7D,IAAIG,KAAK,KAAK,CAAC,EAAE,OAAO,IAAI;EAC5B,oBACEjF,IAAA;IACE,eAAY,MAAM;IAClBY,KAAK,EAAE;MAAEkC,MAAM,EAAEmC,KAAK,GAAGrE,KAAK,CAACE,SAAS,CAAC6B;IAAW;EAAE,CACvD,CAAC;AAEN;AAEA,SAASyC,aAAaA,CAAC;EAAEhF,IAAI;EAAEC,MAAM;EAAEC,UAAU;EAAE6C;AAAyB,CAAC,EAAE;EAC7E,MAAMkC,GAAG,GAAGjF,IAAI,CAACa,UAAU,EAAEoE,GAAG;EAChC,IAAI,CAACA,GAAG,EAAE,OAAO,IAAI;EAErB,MAAMC,KAAK,GAAGlF,IAAI,CAACa,UAAU,EAAEqE,KAAK;EACpC,MAAMC,WAAW,GAAGlG,eAAe,CAACe,IAAI,CAAC,CAACoF,IAAI,CAAC,CAAC;EAChD,MAAMC,GAAG,GAAGF,WAAW,IAAID,KAAK,IAAIhG,eAAe,CAAC+F,GAAG,CAAC,IAAI,OAAO;EACnE,MAAMK,QAAQ,GAAGtF,IAAI,CAACa,UAAU,EAAE0E,QAAQ,GACtCtF,MAAM,CAACuF,WAAW,GAClBvF,MAAM,CAACwF,KAAK;EAEhB,MAAMC,WAAW,GACf3C,SAAS,CAAC4C,YAAY,IAAI,IAAI,IAC9BzF,UAAU,KAAK,MAAM,IACrBA,UAAU,KAAK,WAAW,IAC1BA,UAAU,KAAK,iBAAiB;EAClC,IAAI,CAACwF,WAAW,EAAE;IAChB,oBAAO9F,IAAA;MAAKgG,GAAG,EAAEX,GAAI;MAACI,GAAG,EAAEA,GAAI;MAACH,KAAK,EAAEA,KAAM;MAAC1E,KAAK,EAAE8E;IAAS,CAAE,CAAC;EACnE;EAEA,MAAMjC,KAAK,GAAGA,CAAA,KAAMN,SAAS,CAAC4C,YAAY,GAAG;IAAEV,GAAG;IAAEY,OAAO,EAAEV;EAAY,CAAC,CAAC;EAC3E,MAAMtB,aAAa,GAAIC,KAAsC,IAAK;IAChE,IAAIA,KAAK,CAACC,MAAM,EAAE;IAClB,IAAID,KAAK,CAACE,GAAG,KAAK,OAAO,IAAIF,KAAK,CAACE,GAAG,KAAK,GAAG,EAAE;MAC9CF,KAAK,CAACG,cAAc,CAAC,CAAC;MACtBZ,KAAK,CAAC,CAAC;IACT;EACF,CAAC;EAED,oBACEzD,IAAA;IACEgG,GAAG,EAAEX,GAAI;IACTI,GAAG,EAAEA,GAAI;IACTH,KAAK,EAAEA,KAAM;IACb1E,KAAK,EAAE8E,QAAS;IAChBnB,IAAI,EAAC,QAAQ;IACbC,QAAQ,EAAE,CAAE;IACZ,cAAYiB,GAAI;IAChBhB,OAAO,EAAEhB,KAAM;IACfiB,SAAS,EAAET;EAAc,CAC1B,CAAC;AAEN;AAEA,SAASiC,wBAAwBA,CAAC;EAChC9F,IAAI;EACJC,MAAM;EACN8F;AACa,CAAC,EAAE;EAChB,MAAMC,OAAO,GAAG/G,eAAe,CAACe,IAAI,CAAC;EAErC,oBACEJ,IAAA,CAACR,aAAa;IACZ4G,OAAO,EAAEA,OAAQ;IACjBC,KAAK,EAAEF,YAAY,CAACE,KAAM;IAC1BC,WAAW;IACX1F,KAAK,EAAEP,MAAM,CAACkG;EAAY,CAC3B,CAAC;AAEN;AAEA,SAASC,aAAaA,CAAC;EAAEpG,IAAI;EAAEC;AAAsB,CAAC,EAAE;EACtD,MAAMgF,GAAG,GAAGjF,IAAI,CAACa,UAAU,EAAEoE,GAAG;EAChC,IAAI,CAACA,GAAG,EAAE,OAAO,IAAI;EAErB,MAAMC,KAAK,GAAGlF,IAAI,CAACa,UAAU,EAAEqE,KAAK;EACpC,MAAMG,GAAG,GAAGpG,eAAe,CAACe,IAAI,CAAC,CAACoF,IAAI,CAAC,CAAC;EACxC,MAAMnC,KAAK,GAAGoC,GAAG,IAAIH,KAAK,IAAI,OAAO;EAErC,oBACEtF,IAAA;IACEyG,QAAQ;IACRC,WAAW;IACXC,OAAO,EAAC,UAAU;IAClB/F,KAAK,EAAEP,MAAM,CAACuG,KAAM;IACpBtB,KAAK,EAAEA,KAAM;IACb,cAAYjC,KAAM;IAAA5C,QAAA,eAElBT,IAAA;MAAQgG,GAAG,EAAEX;IAAI,CAAE;EAAC,CACf,CAAC;AAEZ;AAEA,OAAO,MAAMwB,cAA2B,GAAG;EACzCC,SAAS,EAAE3G,iBAAiB;EAC5B4G,OAAO,EAAEhG,eAAe;EACxBiG,UAAU,EAAE7F,kBAAkB;EAC9B8F,UAAU,EAAE5F,kBAAkB;EAC9B6F,SAAS,EAAEhE,iBAAiB;EAC5BiE,aAAa,EAAExC,qBAAqB;EACpCyC,SAAS,EAAEvC,iBAAiB;EAC5BwC,KAAK,EAAEjC,aAAa;EACpBkC,gBAAgB,EAAEpB,wBAAwB;EAC1CqB,KAAK,EAAEf;AACT,CAAC","ignoreList":[]}
++{"version":3,"names":["extractNodeText","filenameFromUrl","toHeadingLevel","KaTeXRenderer","ADMONITION_ICON_PATHS","ADMONITION_ICON_VIEWBOX","ADMONITION_TITLES","ENRM_ADMONITION_CLASS","Fragment","_Fragment","jsx","_jsx","jsxs","_jsxs","ParagraphRenderer","node","styles","parentType","renderChildren","isImageOnly","children","length","type","style","paragraphInBlockquote","paragraph","HeadingRenderer","Tag","attributes","level","BlockquoteRenderer","blockquote","AdmonitionRenderer","admonitionType","colors","admonitions","note","tint","color","iconSize","Math","ceil","fontSize","boxStyle","borderInlineStart","borderWidth","backgroundColor","headerStyle","display","alignItems","gap","round","marginBottom","fontWeight","lineHeight","className","width","height","viewBox","fill","d","CodeBlockRenderer","capabilities","callbacks","language","CustomCodeBlock","renderers","codeBlock","code","label","onCodeBlockPress","codeBlockFont","press","replace","handleClick","selection","window","getSelection","isCollapsed","handleKeyDown","event","repeat","key","preventDefault","cursor","role","tabIndex","onClick","onKeyDown","ThematicBreakRenderer","thematicBreak","BlankLineRenderer","count","Number","parseInt","lines","isFinite","max","ImageRenderer","url","title","markdownAlt","trim","alt","imgStyle","isInline","inlineImage","image","interactive","onImagePress","src","altText","LatexMathDisplayRenderer","content","katex","displayMode","mathDisplay","VideoRenderer","controls","playsInline","preload","video","blockRenderers","Paragraph","Heading","Blockquote","Admonition","CodeBlock","ThematicBreak","BlankLine","Image","LatexMathDisplay","Video"],"sourceRoot":"../../../../src","sources":["web/renderers/BlockRenderers.tsx"],"mappings":";;AACA,SAASA,eAAe,EAAEC,eAAe,QAAQ,aAAU;AAE3D,SAASC,cAAc,QAAQ,cAAW;AAC1C,SAASC,aAAa,QAAQ,oBAAiB;AAC/C,SACEC,qBAAqB,EACrBC,uBAAuB,EACvBC,iBAAiB,QACZ,sBAAmB;AAE1B,SAASC,qBAAqB,QAAQ,oBAAiB;AAAC,SAAAC,QAAA,IAAAC,SAAA,EAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAExD,SAASC,iBAAiBA,CAAC;EACzBC,IAAI;EACJC,MAAM;EACNC,UAAU;EACVC;AACa,CAAC,EAAE;EAChB,MAAMC,WAAW,GACfJ,IAAI,CAACK,QAAQ,EAAEC,MAAM,KAAK,CAAC,IAAIN,IAAI,CAACK,QAAQ,CAAC,CAAC,CAAC,EAAEE,IAAI,KAAK,OAAO;EACnE,IAAIH,WAAW,EAAE,oBAAOR,IAAA,CAAAF,SAAA;IAAAW,QAAA,EAAGF,cAAc,CAACH,IAAI;EAAC,CAAG,CAAC;EAEnD,IAAIE,UAAU,KAAK,YAAY,IAAIA,UAAU,KAAK,YAAY,EAAE;IAC9D,oBAAON,IAAA;MAAGY,KAAK,EAAEP,MAAM,CAACQ,qBAAsB;MAAAJ,QAAA,EAAEF,cAAc,CAACH,IAAI;IAAC,CAAI,CAAC;EAC3E;EAEA,IAAIE,UAAU,KAAK,UAAU,EAAE;IAC7B,oBAAON,IAAA;MAAAS,QAAA,EAAOF,cAAc,CAACH,IAAI;IAAC,CAAO,CAAC;EAC5C;EAEA,oBAAOJ,IAAA;IAAGY,KAAK,EAAEP,MAAM,CAACS,SAAU;IAAAL,QAAA,EAAEF,cAAc,CAACH,IAAI;EAAC,CAAI,CAAC;AAC/D;AAEA,SAASW,eAAeA,CAAC;EAAEX,IAAI;EAAEC,MAAM;EAAEE;AAA8B,CAAC,EAAE;EACxE,MAAMS,GAAG,GAAGzB,cAAc,CAACa,IAAI,CAACa,UAAU,EAAEC,KAAK,IAAI,GAAG,CAAC;EACzD,oBAAOlB,IAAA,CAACgB,GAAG;IAACJ,KAAK,EAAEP,MAAM,CAACW,GAAG,CAAE;IAAAP,QAAA,EAAEF,cAAc,CAACH,IAAI;EAAC,CAAM,CAAC;AAC9D;AAEA,SAASe,kBAAkBA,CAAC;EAAEf,IAAI;EAAEC,MAAM;EAAEE;AAA8B,CAAC,EAAE;EAC3E,oBACEP,IAAA;IAAYY,KAAK,EAAEP,MAAM,CAACe,UAAW;IAAAX,QAAA,EAAEF,cAAc,CAACH,IAAI;EAAC,CAAa,CAAC;AAE7E;AAEA,SAASiB,kBAAkBA,CAAC;EAC1BjB,IAAI;EACJQ,KAAK;EACLP,MAAM;EACNE;AACa,CAAC,EAAE;EAChB,MAAMI,IAAI,GAAIP,IAAI,CAACa,UAAU,EAAEK,cAAc,IAAI,MAAyB;EAC1E,MAAMF,UAAU,GAAGR,KAAK,CAACQ,UAAU;EACnC,MAAMG,MAAM,GAAGH,UAAU,CAACI,WAAW,CAACb,IAAI,CAAC,IAAIS,UAAU,CAACI,WAAW,CAACC,IAAI;EAC1E,MAAMC,IAAI,GAAGH,MAAM,CAACI,KAAK;EACzB,MAAMC,QAAQ,GAAGC,IAAI,CAACC,IAAI,CAACV,UAAU,CAACW,QAAQ,CAAC;EAC/C;EACA,MAAMC,QAAuB,GAAG;IAC9B,GAAG3B,MAAM,CAACe,UAAU;IACpBa,iBAAiB,EAAE,GAAGb,UAAU,CAACc,WAAW,YAAYR,IAAI,EAAE;IAC9DS,eAAe,EAAEZ,MAAM,CAACY;EAC1B,CAAC;EACD,MAAMC,WAA0B,GAAG;IACjCC,OAAO,EAAE,MAAM;IACfC,UAAU,EAAE,QAAQ;IACpBC,GAAG,EAAEV,IAAI,CAACW,KAAK,CAACZ,QAAQ,GAAG,GAAG,CAAC;IAC/Ba,YAAY,EAAEZ,IAAI,CAACW,KAAK,CAACpB,UAAU,CAACW,QAAQ,GAAG,GAAG,CAAC;IACnDJ,KAAK,EAAED,IAAI;IACXgB,UAAU,EAAE,MAAM;IAClBX,QAAQ,EAAEX,UAAU,CAACW,QAAQ;IAC7BY,UAAU,EAAE;EACd,CAAC;EACD,oBACEzC,KAAA;IAAK0C,SAAS,EAAEhD,qBAAsB;IAACgB,KAAK,EAAEoB,QAAS;IAAAvB,QAAA,gBACrDP,KAAA;MAAKU,KAAK,EAAEwB,WAAY;MAAA3B,QAAA,gBACtBT,IAAA;QACE6C,KAAK,EAAEjB,QAAS;QAChBkB,MAAM,EAAElB,QAAS;QACjBmB,OAAO,EAAE,OAAOrD,uBAAuB,IAAIA,uBAAuB,EAAG;QACrEsD,IAAI,EAAEtB,IAAK;QACX,eAAY,MAAM;QAAAjB,QAAA,eAElBT,IAAA;UAAMiD,CAAC,EAAExD,qBAAqB,CAACkB,IAAI;QAAE,CAAE;MAAC,CACrC,CAAC,eACNX,IAAA;QAAAS,QAAA,EAAOd,iBAAiB,CAACgB,IAAI;MAAC,CAAO,CAAC;IAAA,CACnC,CAAC,EACLJ,cAAc,CAACH,IAAI,CAAC;EAAA,CAClB,CAAC;AAEV;AAEA,SAAS8C,iBAAiBA,CAAC;EACzBC,YAAY;EACZ/C,IAAI;EACJC,MAAM;EACNE,cAAc;EACd6C;AACa,CAAC,EAAE;EAChB,MAAMC,QAAQ,GAAGjD,IAAI,CAACa,UAAU,EAAEoC,QAAQ;EAC1C,MAAMC,eAAe,GAAGH,YAAY,CAACI,SAAS,EAAEC,SAAS;EACzD,IAAIF,eAAe,EAAE;IACnB,oBACEtD,IAAA,CAACsD,eAAe;MAACG,IAAI,EAAEpE,eAAe,CAACe,IAAI,CAAE;MAACiD,QAAQ,EAAEA,QAAQ,IAAI;IAAG,CAAE,CAAC;EAE9E;EACA,MAAMK,KAAK,GAAGL,QAAQ,GAAG,eAAeA,QAAQ,EAAE,GAAG,YAAY;EAEjE,IAAID,SAAS,CAACO,gBAAgB,IAAI,IAAI,EAAE;IACtC,oBACE3D,IAAA;MAAKY,KAAK,EAAEP,MAAM,CAACmD,SAAU;MAAC,cAAYE,KAAM;MAAAjD,QAAA,eAC9CT,IAAA;QAAMY,KAAK,EAAEP,MAAM,CAACuD,aAAc;QAAAnD,QAAA,EAAEF,cAAc,CAACH,IAAI;MAAC,CAAO;IAAC,CAC7D,CAAC;EAEV;EAEA,MAAMyD,KAAK,GAAGA,CAAA,KACZT,SAAS,CAACO,gBAAgB,GAAG;IAC3BF,IAAI,EAAEpE,eAAe,CAACe,IAAI,CAAC,CAAC0D,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAC/CT,QAAQ,EAAEA,QAAQ,IAAI;EACxB,CAAC,CAAC;;EAEJ;EACA,MAAMU,WAAW,GAAGA,CAAA,KAAM;IACxB,MAAMC,SAAS,GACb,OAAOC,MAAM,KAAK,WAAW,GAAGA,MAAM,CAACC,YAAY,CAAC,CAAC,GAAG,IAAI;IAC9D,IAAIF,SAAS,IAAI,CAACA,SAAS,CAACG,WAAW,EAAE;IACzCN,KAAK,CAAC,CAAC;EACT,CAAC;EAED,MAAMO,aAAa,GAAIC,KAAoC,IAAK;IAC9D,IAAIA,KAAK,CAACC,MAAM,EAAE;IAClB,IAAID,KAAK,CAACE,GAAG,KAAK,OAAO,IAAIF,KAAK,CAACE,GAAG,KAAK,GAAG,EAAE;MAC9CF,KAAK,CAACG,cAAc,CAAC,CAAC;MACtBX,KAAK,CAAC,CAAC;IACT;EACF,CAAC;EAED,oBACE7D,IAAA;IACEY,KAAK,EAAE;MAAE,GAAGP,MAAM,CAACmD,SAAS;MAAEiB,MAAM,EAAE;IAAU,CAAE;IAClD,cAAYf,KAAM;IAClBgB,IAAI,EAAC,QAAQ;IACbC,QAAQ,EAAE,CAAE;IACZC,OAAO,EAAEb,WAAY;IACrBc,SAAS,EAAET,aAAc;IAAA3D,QAAA,eAEzBT,IAAA;MAAMY,KAAK,EAAEP,MAAM,CAACuD,aAAc;MAAAnD,QAAA,EAAEF,cAAc,CAACH,IAAI;IAAC,CAAO;EAAC,CAC7D,CAAC;AAEV;AAEA,SAAS0E,qBAAqBA,CAAC;EAAEzE;AAAsB,CAAC,EAAE;EACxD,oBAAOL,IAAA;IAAIY,KAAK,EAAEP,MAAM,CAAC0E;EAAc,CAAE,CAAC;AAC5C;;AAEA;AACA;AACA;AACA;AACA,SAASC,iBAAiBA,CAAC;EAAE5E,IAAI;EAAEQ;AAAqB,CAAC,EAAE;EACzD,MAAMqE,KAAK,GAAGC,MAAM,CAACC,QAAQ,CAAC/E,IAAI,CAACa,UAAU,EAAEgE,KAAK,IAAI,GAAG,EAAE,EAAE,CAAC;EAChE,MAAMG,KAAK,GAAGF,MAAM,CAACG,QAAQ,CAACJ,KAAK,CAAC,GAAGpD,IAAI,CAACyD,GAAG,CAAC,CAAC,EAAEL,KAAK,CAAC,GAAG,CAAC;EAC7D,IAAIG,KAAK,KAAK,CAAC,EAAE,OAAO,IAAI;EAC5B,oBACEpF,IAAA;IACE,eAAY,MAAM;IAClBY,KAAK,EAAE;MAAEkC,MAAM,EAAEsC,KAAK,GAAGxE,KAAK,CAACE,SAAS,CAAC6B;IAAW;EAAE,CACvD,CAAC;AAEN;AAEA,SAAS4C,aAAaA,CAAC;EAAEnF,IAAI;EAAEC,MAAM;EAAEC,UAAU;EAAE8C;AAAyB,CAAC,EAAE;EAC7E,MAAMoC,GAAG,GAAGpF,IAAI,CAACa,UAAU,EAAEuE,GAAG;EAChC,IAAI,CAACA,GAAG,EAAE,OAAO,IAAI;EAErB,MAAMC,KAAK,GAAGrF,IAAI,CAACa,UAAU,EAAEwE,KAAK;EACpC,MAAMC,WAAW,GAAGrG,eAAe,CAACe,IAAI,CAAC,CAACuF,IAAI,CAAC,CAAC;EAChD,MAAMC,GAAG,GAAGF,WAAW,IAAID,KAAK,IAAInG,eAAe,CAACkG,GAAG,CAAC,IAAI,OAAO;EACnE,MAAMK,QAAQ,GAAGzF,IAAI,CAACa,UAAU,EAAE6E,QAAQ,GACtCzF,MAAM,CAAC0F,WAAW,GAClB1F,MAAM,CAAC2F,KAAK;EAEhB,MAAMC,WAAW,GACf7C,SAAS,CAAC8C,YAAY,IAAI,IAAI,IAC9B5F,UAAU,KAAK,MAAM,IACrBA,UAAU,KAAK,WAAW,IAC1BA,UAAU,KAAK,iBAAiB;EAClC,IAAI,CAAC2F,WAAW,EAAE;IAChB,oBAAOjG,IAAA;MAAKmG,GAAG,EAAEX,GAAI;MAACI,GAAG,EAAEA,GAAI;MAACH,KAAK,EAAEA,KAAM;MAAC7E,KAAK,EAAEiF;IAAS,CAAE,CAAC;EACnE;EAEA,MAAMhC,KAAK,GAAGA,CAAA,KAAMT,SAAS,CAAC8C,YAAY,GAAG;IAAEV,GAAG;IAAEY,OAAO,EAAEV;EAAY,CAAC,CAAC;EAC3E,MAAMtB,aAAa,GAAIC,KAAsC,IAAK;IAChE,IAAIA,KAAK,CAACC,MAAM,EAAE;IAClB,IAAID,KAAK,CAACE,GAAG,KAAK,OAAO,IAAIF,KAAK,CAACE,GAAG,KAAK,GAAG,EAAE;MAC9CF,KAAK,CAACG,cAAc,CAAC,CAAC;MACtBX,KAAK,CAAC,CAAC;IACT;EACF,CAAC;EAED,oBACE7D,IAAA;IACEmG,GAAG,EAAEX,GAAI;IACTI,GAAG,EAAEA,GAAI;IACTH,KAAK,EAAEA,KAAM;IACb7E,KAAK,EAAEiF,QAAS;IAChBnB,IAAI,EAAC,QAAQ;IACbC,QAAQ,EAAE,CAAE;IACZ,cAAYiB,GAAI;IAChBhB,OAAO,EAAEf,KAAM;IACfgB,SAAS,EAAET;EAAc,CAC1B,CAAC;AAEN;AAEA,SAASiC,wBAAwBA,CAAC;EAChCjG,IAAI;EACJC,MAAM;EACN8C;AACa,CAAC,EAAE;EAChB,MAAMmD,OAAO,GAAGjH,eAAe,CAACe,IAAI,CAAC;EAErC,oBACEJ,IAAA,CAACR,aAAa;IACZ8G,OAAO,EAAEA,OAAQ;IACjBC,KAAK,EAAEpD,YAAY,CAACoD,KAAM;IAC1BC,WAAW;IACX5F,KAAK,EAAEP,MAAM,CAACoG;EAAY,CAC3B,CAAC;AAEN;AAEA,SAASC,aAAaA,CAAC;EAAEtG,IAAI;EAAEC;AAAsB,CAAC,EAAE;EACtD,MAAMmF,GAAG,GAAGpF,IAAI,CAACa,UAAU,EAAEuE,GAAG;EAChC,IAAI,CAACA,GAAG,EAAE,OAAO,IAAI;EAErB,MAAMC,KAAK,GAAGrF,IAAI,CAACa,UAAU,EAAEwE,KAAK;EACpC,MAAMG,GAAG,GAAGvG,eAAe,CAACe,IAAI,CAAC,CAACuF,IAAI,CAAC,CAAC;EACxC,MAAMjC,KAAK,GAAGkC,GAAG,IAAIH,KAAK,IAAI,OAAO;EAErC,oBACEzF,IAAA;IACE2G,QAAQ;IACRC,WAAW;IACXC,OAAO,EAAC,UAAU;IAClBjG,KAAK,EAAEP,MAAM,CAACyG,KAAM;IACpBrB,KAAK,EAAEA,KAAM;IACb,cAAY/B,KAAM;IAAAjD,QAAA,eAElBT,IAAA;MAAQmG,GAAG,EAAEX;IAAI,CAAE;EAAC,CACf,CAAC;AAEZ;AAEA,OAAO,MAAMuB,cAA2B,GAAG;EACzCC,SAAS,EAAE7G,iBAAiB;EAC5B8G,OAAO,EAAElG,eAAe;EACxBmG,UAAU,EAAE/F,kBAAkB;EAC9BgG,UAAU,EAAE9F,kBAAkB;EAC9B+F,SAAS,EAAElE,iBAAiB;EAC5BmE,aAAa,EAAEvC,qBAAqB;EACpCwC,SAAS,EAAEtC,iBAAiB;EAC5BuC,KAAK,EAAEhC,aAAa;EACpBiC,gBAAgB,EAAEnB,wBAAwB;EAC1CoB,KAAK,EAAEf;AACT,CAAC","ignoreList":[]}
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/InlineRenderers.js.map b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/InlineRenderers.js.map
+index 72a29d9..aa61748 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/InlineRenderers.js.map
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/InlineRenderers.js.map
+@@ -1 +1 @@
+-{"version":3,"names":["extractNodeText","KaTeXRenderer","linkStyleForUrl","Fragment","_Fragment","jsx","_jsx","TextRenderer","node","children","content","LineBreakRenderer","_props","SoftBreakRenderer","StrongRenderer","styles","renderChildren","style","strong","EmphasisRenderer","emphasis","StrikethroughRenderer","strikethrough","UnderlineRenderer","underline","SuperscriptRenderer","superscript","SubscriptRenderer","subscript","HighlightRenderer","highlight","CodeRenderer","code","LinkRenderer","callbacks","url","attributes","handleClick","event","onLinkPress","preventDefault","handleContextMenu","onLinkLongPress","href","target","rel","onClick","onContextMenu","LatexMathInlineRenderer","capabilities","katex","displayMode","mathInline","inlineRenderers","Text","LineBreak","SoftBreak","Strong","Emphasis","Strikethrough","Underline","Superscript","Subscript","Highlight","Code","Link","LatexMathInline"],"sourceRoot":"../../../../src","sources":["web/renderers/InlineRenderers.tsx"],"mappings":";;AAEA,SAASA,eAAe,QAAQ,aAAU;AAC1C,SAASC,aAAa,QAAQ,oBAAiB;AAC/C,SAASC,eAAe,QAAQ,cAAW;AAAC,SAAAC,QAAA,IAAAC,SAAA,EAAAC,GAAA,IAAAC,IAAA;AAE5C,SAASC,YAAYA,CAAC;EAAEC;AAAoB,CAAC,EAAE;EAC7C,oBAAOF,IAAA,CAAAF,SAAA;IAAAK,QAAA,EAAGD,IAAI,CAACE,OAAO,IAAI;EAAE,CAAG,CAAC;AAClC;AAEA,SAASC,iBAAiBA,CAACC,MAAqB,EAAE;EAChD,oBAAON,IAAA,SAAK,CAAC;AACf;AAEA,SAASO,iBAAiBA,CAACD,MAAqB,EAAE;EAChD,oBAAON,IAAA,CAAAF,SAAA;IAAAK,QAAA,EAAE;EAAC,CAAE,CAAC;AACf;AAEA,SAASK,cAAcA,CAAC;EAAEN,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EACvE,oBAAOV,IAAA;IAAQW,KAAK,EAAEF,MAAM,CAACG,MAAO;IAAAT,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAS,CAAC;AACtE;AAEA,SAASW,gBAAgBA,CAAC;EAAEX,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EACzE,oBAAOV,IAAA;IAAIW,KAAK,EAAEF,MAAM,CAACK,QAAS;IAAAX,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAK,CAAC;AAChE;AAEA,SAASa,qBAAqBA,CAAC;EAC7Bb,IAAI;EACJO,MAAM;EACNC;AACa,CAAC,EAAE;EAChB,oBAAOV,IAAA;IAAGW,KAAK,EAAEF,MAAM,CAACO,aAAc;IAAAb,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAI,CAAC;AACnE;AAEA,SAASe,iBAAiBA,CAAC;EAAEf,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EAC1E,oBAAOV,IAAA;IAAGW,KAAK,EAAEF,MAAM,CAACS,SAAU;IAAAf,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAI,CAAC;AAC/D;AAEA,SAASiB,mBAAmBA,CAAC;EAAEjB,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EAC5E,oBAAOV,IAAA;IAAKW,KAAK,EAAEF,MAAM,CAACW,WAAY;IAAAjB,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAM,CAAC;AACrE;AAEA,SAASmB,iBAAiBA,CAAC;EAAEnB,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EAC1E,oBAAOV,IAAA;IAAKW,KAAK,EAAEF,MAAM,CAACa,SAAU;IAAAnB,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAM,CAAC;AACnE;AAEA,SAASqB,iBAAiBA,CAAC;EAAErB,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EAC1E,oBAAOV,IAAA;IAAMW,KAAK,EAAEF,MAAM,CAACe,SAAU;IAAArB,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAO,CAAC;AACrE;AAEA,SAASuB,YAAYA,CAAC;EAAEvB,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EACrE,oBACEV,IAAA;IAAMW,KAAK,EAAEF,MAAM,CAACiB,IAAK;IAAAvB,QAAA,EAAED,IAAI,CAACE,OAAO,IAAIM,cAAc,CAACR,IAAI;EAAC,CAAO,CAAC;AAE3E;AAEA,SAASyB,YAAYA,CAAC;EACpBzB,IAAI;EACJS,KAAK;EACLiB,SAAS;EACTlB;AACa,CAAC,EAAE;EAChB,MAAMmB,GAAG,GAAG3B,IAAI,CAAC4B,UAAU,EAAED,GAAG;EAEhC,IAAI,CAACA,GAAG,EAAE,oBAAO7B,IAAA,CAAAF,SAAA;IAAAK,QAAA,EAAGO,cAAc,CAACR,IAAI;EAAC,CAAG,CAAC;EAE5C,MAAM6B,WAAW,GAAIC,KAAiB,IAAK;IACzC,IAAIJ,SAAS,CAACK,WAAW,EAAE;MACzBD,KAAK,CAACE,cAAc,CAAC,CAAC;MACtBN,SAAS,CAACK,WAAW,CAAC;QAAEJ;MAAI,CAAC,CAAC;IAChC;EACF,CAAC;EAED,MAAMM,iBAAiB,GAAIH,KAAiB,IAAK;IAC/C,IAAIJ,SAAS,CAACQ,eAAe,EAAE;MAC7BJ,KAAK,CAACE,cAAc,CAAC,CAAC;MACtBN,SAAS,CAACQ,eAAe,CAAC;QAAEP;MAAI,CAAC,CAAC;IACpC;EACF,CAAC;EAED,oBACE7B,IAAA;IACEqC,IAAI,EAAER,GAAI;IACVlB,KAAK,EAAEf,eAAe,CAACe,KAAK,EAAEkB,GAAG,CAAE;IACnCS,MAAM,EAAC,QAAQ;IACfC,GAAG,EAAC,qBAAqB;IACzBC,OAAO,EAAET,WAAY;IACrBU,aAAa,EAAEN,iBAAkB;IAAAhC,QAAA,EAEhCO,cAAc,CAACR,IAAI;EAAC,CACpB,CAAC;AAER;AAEA,SAASwC,uBAAuBA,CAAC;EAC/BxC,IAAI;EACJO,MAAM;EACNkC;AACa,CAAC,EAAE;EAChB,MAAMvC,OAAO,GAAGV,eAAe,CAACQ,IAAI,CAAC;EAErC,oBACEF,IAAA,CAACL,aAAa;IACZS,OAAO,EAAEA,OAAQ;IACjBwC,KAAK,EAAED,YAAY,CAACC,KAAM;IAC1BC,WAAW,EAAE,KAAM;IACnBlC,KAAK,EAAEF,MAAM,CAACqC;EAAW,CAC1B,CAAC;AAEN;AAEA,OAAO,MAAMC,eAA4B,GAAG;EAC1CC,IAAI,EAAE/C,YAAY;EAClBgD,SAAS,EAAE5C,iBAAiB;EAC5B6C,SAAS,EAAE3C,iBAAiB;EAC5B4C,MAAM,EAAE3C,cAAc;EACtB4C,QAAQ,EAAEvC,gBAAgB;EAC1BwC,aAAa,EAAEtC,qBAAqB;EACpCuC,SAAS,EAAErC,iBAAiB;EAC5BsC,WAAW,EAAEpC,mBAAmB;EAChCqC,SAAS,EAAEnC,iBAAiB;EAC5BoC,SAAS,EAAElC,iBAAiB;EAC5BmC,IAAI,EAAEjC,YAAY;EAClBkC,IAAI,EAAEhC,YAAY;EAClBiC,eAAe,EAAElB;AACnB,CAAC","ignoreList":[]}
++{"version":3,"names":["extractNodeText","KaTeXRenderer","linkStyleForUrl","Fragment","_Fragment","jsx","_jsx","TextRenderer","node","children","content","LineBreakRenderer","_props","SoftBreakRenderer","StrongRenderer","styles","renderChildren","style","strong","EmphasisRenderer","emphasis","StrikethroughRenderer","strikethrough","UnderlineRenderer","underline","SuperscriptRenderer","superscript","SubscriptRenderer","subscript","HighlightRenderer","highlight","CodeRenderer","code","LinkRenderer","callbacks","url","attributes","handleClick","event","onLinkPress","preventDefault","sourceType","recognizedLink","some","child","type","handleContextMenu","onLinkLongPress","href","title","target","rel","onClick","onContextMenu","LatexMathInlineRenderer","capabilities","katex","displayMode","mathInline","inlineRenderers","Text","LineBreak","SoftBreak","Strong","Emphasis","Strikethrough","Underline","Superscript","Subscript","Highlight","Code","Link","LatexMathInline"],"sourceRoot":"../../../../src","sources":["web/renderers/InlineRenderers.tsx"],"mappings":";;AAEA,SAASA,eAAe,QAAQ,aAAU;AAC1C,SAASC,aAAa,QAAQ,oBAAiB;AAC/C,SAASC,eAAe,QAAQ,cAAW;AAAC,SAAAC,QAAA,IAAAC,SAAA,EAAAC,GAAA,IAAAC,IAAA;AAE5C,SAASC,YAAYA,CAAC;EAAEC;AAAoB,CAAC,EAAE;EAC7C,oBAAOF,IAAA,CAAAF,SAAA;IAAAK,QAAA,EAAGD,IAAI,CAACE,OAAO,IAAI;EAAE,CAAG,CAAC;AAClC;AAEA,SAASC,iBAAiBA,CAACC,MAAqB,EAAE;EAChD,oBAAON,IAAA,SAAK,CAAC;AACf;AAEA,SAASO,iBAAiBA,CAACD,MAAqB,EAAE;EAChD,oBAAON,IAAA,CAAAF,SAAA;IAAAK,QAAA,EAAE;EAAC,CAAE,CAAC;AACf;AAEA,SAASK,cAAcA,CAAC;EAAEN,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EACvE,oBAAOV,IAAA;IAAQW,KAAK,EAAEF,MAAM,CAACG,MAAO;IAAAT,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAS,CAAC;AACtE;AAEA,SAASW,gBAAgBA,CAAC;EAAEX,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EACzE,oBAAOV,IAAA;IAAIW,KAAK,EAAEF,MAAM,CAACK,QAAS;IAAAX,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAK,CAAC;AAChE;AAEA,SAASa,qBAAqBA,CAAC;EAC7Bb,IAAI;EACJO,MAAM;EACNC;AACa,CAAC,EAAE;EAChB,oBAAOV,IAAA;IAAGW,KAAK,EAAEF,MAAM,CAACO,aAAc;IAAAb,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAI,CAAC;AACnE;AAEA,SAASe,iBAAiBA,CAAC;EAAEf,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EAC1E,oBAAOV,IAAA;IAAGW,KAAK,EAAEF,MAAM,CAACS,SAAU;IAAAf,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAI,CAAC;AAC/D;AAEA,SAASiB,mBAAmBA,CAAC;EAAEjB,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EAC5E,oBAAOV,IAAA;IAAKW,KAAK,EAAEF,MAAM,CAACW,WAAY;IAAAjB,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAM,CAAC;AACrE;AAEA,SAASmB,iBAAiBA,CAAC;EAAEnB,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EAC1E,oBAAOV,IAAA;IAAKW,KAAK,EAAEF,MAAM,CAACa,SAAU;IAAAnB,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAM,CAAC;AACnE;AAEA,SAASqB,iBAAiBA,CAAC;EAAErB,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EAC1E,oBAAOV,IAAA;IAAMW,KAAK,EAAEF,MAAM,CAACe,SAAU;IAAArB,QAAA,EAAEO,cAAc,CAACR,IAAI;EAAC,CAAO,CAAC;AACrE;AAEA,SAASuB,YAAYA,CAAC;EAAEvB,IAAI;EAAEO,MAAM;EAAEC;AAA8B,CAAC,EAAE;EACrE,oBACEV,IAAA;IAAMW,KAAK,EAAEF,MAAM,CAACiB,IAAK;IAAAvB,QAAA,EAAED,IAAI,CAACE,OAAO,IAAIM,cAAc,CAACR,IAAI;EAAC,CAAO,CAAC;AAE3E;AAEA,SAASyB,YAAYA,CAAC;EACpBzB,IAAI;EACJS,KAAK;EACLiB,SAAS;EACTlB;AACa,CAAC,EAAE;EAChB,MAAMmB,GAAG,GAAG3B,IAAI,CAAC4B,UAAU,EAAED,GAAG;EAEhC,IAAI,CAACA,GAAG,EAAE,oBAAO7B,IAAA,CAAAF,SAAA;IAAAK,QAAA,EAAGO,cAAc,CAACR,IAAI;EAAC,CAAG,CAAC;EAE5C,MAAM6B,WAAW,GAAIC,KAAiB,IAAK;IACzC,IAAIJ,SAAS,CAACK,WAAW,EAAE;MACzBD,KAAK,CAACE,cAAc,CAAC,CAAC;MACtBN,SAAS,CAACK,WAAW,CAAC;QACpBJ,GAAG;QACHM,UAAU,EACRjC,IAAI,CAAC4B,UAAU,EAAEM,cAAc,KAAK,MAAM,GACtClC,IAAI,CAACC,QAAQ,EAAEkC,IAAI,CAAEC,KAAK,IAAKA,KAAK,CAACC,IAAI,KAAK,MAAM,CAAC,GACnD,aAAa,GACb,MAAM,GACR;MACR,CAAC,CAAC;IACJ;EACF,CAAC;EAED,MAAMC,iBAAiB,GAAIR,KAAiB,IAAK;IAC/C,IAAIJ,SAAS,CAACa,eAAe,EAAE;MAC7BT,KAAK,CAACE,cAAc,CAAC,CAAC;MACtBN,SAAS,CAACa,eAAe,CAAC;QAAEZ;MAAI,CAAC,CAAC;IACpC;EACF,CAAC;EAED,oBACE7B,IAAA;IACE0C,IAAI,EAAEb,GAAI;IACVc,KAAK,EAAEzC,IAAI,CAAC4B,UAAU,EAAEa,KAAM;IAC9BhC,KAAK,EAAEf,eAAe,CAACe,KAAK,EAAEkB,GAAG,CAAE;IACnCe,MAAM,EAAC,QAAQ;IACfC,GAAG,EAAC,qBAAqB;IACzBC,OAAO,EAAEf,WAAY;IACrBgB,aAAa,EAAEP,iBAAkB;IAAArC,QAAA,EAEhCO,cAAc,CAACR,IAAI;EAAC,CACpB,CAAC;AAER;AAEA,SAAS8C,uBAAuBA,CAAC;EAC/B9C,IAAI;EACJO,MAAM;EACNwC;AACa,CAAC,EAAE;EAChB,MAAM7C,OAAO,GAAGV,eAAe,CAACQ,IAAI,CAAC;EAErC,oBACEF,IAAA,CAACL,aAAa;IACZS,OAAO,EAAEA,OAAQ;IACjB8C,KAAK,EAAED,YAAY,CAACC,KAAM;IAC1BC,WAAW,EAAE,KAAM;IACnBxC,KAAK,EAAEF,MAAM,CAAC2C;EAAW,CAC1B,CAAC;AAEN;AAEA,OAAO,MAAMC,eAA4B,GAAG;EAC1CC,IAAI,EAAErD,YAAY;EAClBsD,SAAS,EAAElD,iBAAiB;EAC5BmD,SAAS,EAAEjD,iBAAiB;EAC5BkD,MAAM,EAAEjD,cAAc;EACtBkD,QAAQ,EAAE7C,gBAAgB;EAC1B8C,aAAa,EAAE5C,qBAAqB;EACpC6C,SAAS,EAAE3C,iBAAiB;EAC5B4C,WAAW,EAAE1C,mBAAmB;EAChC2C,SAAS,EAAEzC,iBAAiB;EAC5B0C,SAAS,EAAExC,iBAAiB;EAC5ByC,IAAI,EAAEvC,YAAY;EAClBwC,IAAI,EAAEtC,YAAY;EAClBuC,eAAe,EAAElB;AACnB,CAAC","ignoreList":[]}
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/ListRenderers.js b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/ListRenderers.js
+index 7718d0a..ed95c24 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/ListRenderers.js
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/ListRenderers.js
+@@ -16,6 +16,7 @@ function ListRenderer({
+   const hasTaskChild = !isNested && node.children?.some(child => child.attributes?.isTask === 'true');
+   const resolvedStyle = isNested ? styles.listNested : hasTaskChild ? styles.listTask : styles.list;
+   return /*#__PURE__*/_jsx(ListTag, {
++    start: ListTag === 'ol' ? Number(node.attributes?.start ?? 1) : undefined,
+     style: resolvedStyle,
+     children: renderChildren(node)
+   });
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/ListRenderers.js.map b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/ListRenderers.js.map
+index 049421a..c05b993 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/ListRenderers.js.map
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/ListRenderers.js.map
+@@ -1 +1 @@
+-{"version":3,"names":["useState","useEffect","extractNodeText","listItemStyle","checkedTaskTextStyle","jsx","_jsx","jsxs","_jsxs","NESTED_LIST_TYPES","Set","ListRenderer","node","styles","parentType","renderChildren","listTag","ListTag","isNested","hasTaskChild","children","some","child","attributes","isTask","resolvedStyle","listNested","listTask","list","style","UnorderedListRenderer","props","OrderedListRenderer","isNestedList","has","type","ListItemRenderer","index","callbacks","capabilities","initialChecked","taskChecked","taskText","isChecked","setIsChecked","handleChange","enableTaskListItemToggle","taskIndex","undefined","newChecked","onTaskListItemPress","checked","text","hasNestedList","checkedStyle","inlineNode","filter","nestedNode","onChange","readOnly","taskCheckbox","taskCheckboxDisabled","listRenderers","UnorderedList","OrderedList","ListItem"],"sourceRoot":"../../../../src","sources":["web/renderers/ListRenderers.tsx"],"mappings":";;AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAC3C,SAASC,eAAe,QAAQ,aAAU;AAE1C,SAASC,aAAa,EAAEC,oBAAoB,QAAQ,cAAW;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAEhE,MAAMC,iBAAgC,GAAG,IAAIC,GAAG,CAAC,CAC/C,eAAe,EACf,aAAa,CACd,CAAC;AAEF,SAASC,YAAYA,CAAC;EACpBC,IAAI;EACJC,MAAM;EACNC,UAAU;EACVC,cAAc;EACdC,OAAO,EAAEC;AAC+B,CAAC,EAAE;EAC3C,MAAMC,QAAQ,GAAGJ,UAAU,KAAK,UAAU;EAC1C,MAAMK,YAAY,GAChB,CAACD,QAAQ,IACTN,IAAI,CAACQ,QAAQ,EAAEC,IAAI,CAAEC,KAAK,IAAKA,KAAK,CAACC,UAAU,EAAEC,MAAM,KAAK,MAAM,CAAC;EAErE,MAAMC,aAAa,GAAGP,QAAQ,GAC1BL,MAAM,CAACa,UAAU,GACjBP,YAAY,GACVN,MAAM,CAACc,QAAQ,GACfd,MAAM,CAACe,IAAI;EACjB,oBAAOtB,IAAA,CAACW,OAAO;IAACY,KAAK,EAAEJ,aAAc;IAAAL,QAAA,EAAEL,cAAc,CAACH,IAAI;EAAC,CAAU,CAAC;AACxE;AAEA,SAASkB,qBAAqBA,CAACC,KAAoB,EAAE;EACnD,oBAAOzB,IAAA,CAACK,YAAY;IAAA,GAAKoB,KAAK;IAAEf,OAAO,EAAC;EAAI,CAAE,CAAC;AACjD;AAEA,SAASgB,mBAAmBA,CAACD,KAAoB,EAAE;EACjD,oBAAOzB,IAAA,CAACK,YAAY;IAAA,GAAKoB,KAAK;IAAEf,OAAO,EAAC;EAAI,CAAE,CAAC;AACjD;AAEA,SAASiB,YAAYA,CAACX,KAAc,EAAW;EAC7C,OAAOb,iBAAiB,CAACyB,GAAG,CAACZ,KAAK,CAACa,IAAI,CAAC;AAC1C;AAEA,SAASC,gBAAgBA,CAAC;EACxBxB,IAAI;EACJiB,KAAK;EACLhB,MAAM;EACNwB,KAAK;EACLC,SAAS;EACTC,YAAY;EACZxB;AACa,CAAC,EAAE;EAChB,MAAMS,MAAM,GAAGZ,IAAI,CAACW,UAAU,EAAEC,MAAM,KAAK,MAAM;EACjD,MAAMgB,cAAc,GAAG5B,IAAI,CAACW,UAAU,EAAEkB,WAAW,KAAK,MAAM;EAC9D,MAAMC,QAAQ,GAAGlB,MAAM,GAAGtB,eAAe,CAACU,IAAI,CAAC,GAAG,EAAE;EACpD,MAAM,CAAC+B,SAAS,EAAEC,YAAY,CAAC,GAAG5C,QAAQ,CAACwC,cAAc,CAAC;EAE1DvC,SAAS,CAAC,MAAM;IACd2C,YAAY,CAACJ,cAAc,CAAC;EAC9B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,MAAMK,YAAY,GAAGA,CAAA,KAAM;IACzB,IAAI,CAACN,YAAY,CAACO,wBAAwB,EAAE;IAE5C,MAAMC,SAAS,GAAGnC,IAAI,CAACW,UAAU,EAAEwB,SAAS;IAC5C,IAAIA,SAAS,KAAKC,SAAS,EAAE;IAE7B,MAAMC,UAAU,GAAG,CAACN,SAAS;IAC7BC,YAAY,CAACK,UAAU,CAAC;IAExBX,SAAS,CAACY,mBAAmB,GAAG;MAC9Bb,KAAK,EAAEU,SAAS;MAChBI,OAAO,EAAEF,UAAU;MACnBG,IAAI,EAAEV;IACR,CAAC,CAAC;EACJ,CAAC;EAED,MAAMW,aAAa,GAAGzC,IAAI,CAACQ,QAAQ,EAAEC,IAAI,CAACY,YAAY,CAAC;EACvD,MAAMqB,YAAY,GAChB9B,MAAM,IAAImB,SAAS,GAAGvC,oBAAoB,CAACyB,KAAK,CAAC,GAAGmB,SAAS;EAE/D,MAAMO,UAAmB,GAAGF,aAAa,GACrC;IACE,GAAGzC,IAAI;IACPQ,QAAQ,EAAER,IAAI,CAACQ,QAAQ,EAAEoC,MAAM,CAAElC,KAAK,IAAK,CAACW,YAAY,CAACX,KAAK,CAAC;EACjE,CAAC,GACDV,IAAI;EACR,MAAM6C,UAA0B,GAAGJ,aAAa,GAC5C;IAAE,GAAGzC,IAAI;IAAEQ,QAAQ,EAAER,IAAI,CAACQ,QAAQ,EAAEoC,MAAM,CAACvB,YAAY;EAAE,CAAC,GAC1D,IAAI;EAER,oBACEzB,KAAA;IAAIqB,KAAK,EAAE1B,aAAa,CAAC0B,KAAK,EAAEL,MAAM,EAAE,CAACa,KAAK,IAAI,CAAC,MAAM,CAAC,CAAE;IAAAjB,QAAA,gBAC1DZ,KAAA;MAAMqB,KAAK,EAAEyB,YAAa;MAAAlC,QAAA,GACvBI,MAAM,iBACLlB,IAAA;QACE6B,IAAI,EAAC,UAAU;QACfgB,OAAO,EAAER,SAAU;QACnBe,QAAQ,EAAEb,YAAa;QACvBc,QAAQ,EAAE,CAACpB,YAAY,CAACO,wBAAyB;QACjD,iBACEP,YAAY,CAACO,wBAAwB,GAAGE,SAAS,GAAG,IACrD;QACDnB,KAAK,EACHU,YAAY,CAACO,wBAAwB,GACjCjC,MAAM,CAAC+C,YAAY,GACnB/C,MAAM,CAACgD,oBACZ;QACD,cAAY,SAASnB,QAAQ;MAAG,CACjC,CACF,EACA3B,cAAc,CAACwC,UAAU,CAAC;IAAA,CACvB,CAAC,EACNE,UAAU,IAAI1C,cAAc,CAAC0C,UAAU,CAAC;EAAA,CACvC,CAAC;AAET;AAEA,OAAO,MAAMK,aAA0B,GAAG;EACxCC,aAAa,EAAEjC,qBAAqB;EACpCkC,WAAW,EAAEhC,mBAAmB;EAChCiC,QAAQ,EAAE7B;AACZ,CAAC","ignoreList":[]}
++{"version":3,"names":["useState","useEffect","extractNodeText","listItemStyle","checkedTaskTextStyle","jsx","_jsx","jsxs","_jsxs","NESTED_LIST_TYPES","Set","ListRenderer","node","styles","parentType","renderChildren","listTag","ListTag","isNested","hasTaskChild","children","some","child","attributes","isTask","resolvedStyle","listNested","listTask","list","start","Number","undefined","style","UnorderedListRenderer","props","OrderedListRenderer","isNestedList","has","type","ListItemRenderer","index","callbacks","capabilities","initialChecked","taskChecked","taskText","isChecked","setIsChecked","handleChange","enableTaskListItemToggle","taskIndex","newChecked","onTaskListItemPress","checked","text","hasNestedList","checkedStyle","inlineNode","filter","nestedNode","onChange","readOnly","taskCheckbox","taskCheckboxDisabled","listRenderers","UnorderedList","OrderedList","ListItem"],"sourceRoot":"../../../../src","sources":["web/renderers/ListRenderers.tsx"],"mappings":";;AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAC3C,SAASC,eAAe,QAAQ,aAAU;AAE1C,SAASC,aAAa,EAAEC,oBAAoB,QAAQ,cAAW;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAEhE,MAAMC,iBAAgC,GAAG,IAAIC,GAAG,CAAC,CAC/C,eAAe,EACf,aAAa,CACd,CAAC;AAEF,SAASC,YAAYA,CAAC;EACpBC,IAAI;EACJC,MAAM;EACNC,UAAU;EACVC,cAAc;EACdC,OAAO,EAAEC;AAC+B,CAAC,EAAE;EAC3C,MAAMC,QAAQ,GAAGJ,UAAU,KAAK,UAAU;EAC1C,MAAMK,YAAY,GAChB,CAACD,QAAQ,IACTN,IAAI,CAACQ,QAAQ,EAAEC,IAAI,CAAEC,KAAK,IAAKA,KAAK,CAACC,UAAU,EAAEC,MAAM,KAAK,MAAM,CAAC;EAErE,MAAMC,aAAa,GAAGP,QAAQ,GAC1BL,MAAM,CAACa,UAAU,GACjBP,YAAY,GACVN,MAAM,CAACc,QAAQ,GACfd,MAAM,CAACe,IAAI;EACjB,oBACEtB,IAAA,CAACW,OAAO;IACNY,KAAK,EAAEZ,OAAO,KAAK,IAAI,GAAGa,MAAM,CAAClB,IAAI,CAACW,UAAU,EAAEM,KAAK,IAAI,CAAC,CAAC,GAAGE,SAAU;IAC1EC,KAAK,EAAEP,aAAc;IAAAL,QAAA,EAEpBL,cAAc,CAACH,IAAI;EAAC,CACd,CAAC;AAEd;AAEA,SAASqB,qBAAqBA,CAACC,KAAoB,EAAE;EACnD,oBAAO5B,IAAA,CAACK,YAAY;IAAA,GAAKuB,KAAK;IAAElB,OAAO,EAAC;EAAI,CAAE,CAAC;AACjD;AAEA,SAASmB,mBAAmBA,CAACD,KAAoB,EAAE;EACjD,oBAAO5B,IAAA,CAACK,YAAY;IAAA,GAAKuB,KAAK;IAAElB,OAAO,EAAC;EAAI,CAAE,CAAC;AACjD;AAEA,SAASoB,YAAYA,CAACd,KAAc,EAAW;EAC7C,OAAOb,iBAAiB,CAAC4B,GAAG,CAACf,KAAK,CAACgB,IAAI,CAAC;AAC1C;AAEA,SAASC,gBAAgBA,CAAC;EACxB3B,IAAI;EACJoB,KAAK;EACLnB,MAAM;EACN2B,KAAK;EACLC,SAAS;EACTC,YAAY;EACZ3B;AACa,CAAC,EAAE;EAChB,MAAMS,MAAM,GAAGZ,IAAI,CAACW,UAAU,EAAEC,MAAM,KAAK,MAAM;EACjD,MAAMmB,cAAc,GAAG/B,IAAI,CAACW,UAAU,EAAEqB,WAAW,KAAK,MAAM;EAC9D,MAAMC,QAAQ,GAAGrB,MAAM,GAAGtB,eAAe,CAACU,IAAI,CAAC,GAAG,EAAE;EACpD,MAAM,CAACkC,SAAS,EAAEC,YAAY,CAAC,GAAG/C,QAAQ,CAAC2C,cAAc,CAAC;EAE1D1C,SAAS,CAAC,MAAM;IACd8C,YAAY,CAACJ,cAAc,CAAC;EAC9B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,MAAMK,YAAY,GAAGA,CAAA,KAAM;IACzB,IAAI,CAACN,YAAY,CAACO,wBAAwB,EAAE;IAE5C,MAAMC,SAAS,GAAGtC,IAAI,CAACW,UAAU,EAAE2B,SAAS;IAC5C,IAAIA,SAAS,KAAKnB,SAAS,EAAE;IAE7B,MAAMoB,UAAU,GAAG,CAACL,SAAS;IAC7BC,YAAY,CAACI,UAAU,CAAC;IAExBV,SAAS,CAACW,mBAAmB,GAAG;MAC9BZ,KAAK,EAAEU,SAAS;MAChBG,OAAO,EAAEF,UAAU;MACnBG,IAAI,EAAET;IACR,CAAC,CAAC;EACJ,CAAC;EAED,MAAMU,aAAa,GAAG3C,IAAI,CAACQ,QAAQ,EAAEC,IAAI,CAACe,YAAY,CAAC;EACvD,MAAMoB,YAAY,GAChBhC,MAAM,IAAIsB,SAAS,GAAG1C,oBAAoB,CAAC4B,KAAK,CAAC,GAAGD,SAAS;EAE/D,MAAM0B,UAAmB,GAAGF,aAAa,GACrC;IACE,GAAG3C,IAAI;IACPQ,QAAQ,EAAER,IAAI,CAACQ,QAAQ,EAAEsC,MAAM,CAAEpC,KAAK,IAAK,CAACc,YAAY,CAACd,KAAK,CAAC;EACjE,CAAC,GACDV,IAAI;EACR,MAAM+C,UAA0B,GAAGJ,aAAa,GAC5C;IAAE,GAAG3C,IAAI;IAAEQ,QAAQ,EAAER,IAAI,CAACQ,QAAQ,EAAEsC,MAAM,CAACtB,YAAY;EAAE,CAAC,GAC1D,IAAI;EAER,oBACE5B,KAAA;IAAIwB,KAAK,EAAE7B,aAAa,CAAC6B,KAAK,EAAER,MAAM,EAAE,CAACgB,KAAK,IAAI,CAAC,MAAM,CAAC,CAAE;IAAApB,QAAA,gBAC1DZ,KAAA;MAAMwB,KAAK,EAAEwB,YAAa;MAAApC,QAAA,GACvBI,MAAM,iBACLlB,IAAA;QACEgC,IAAI,EAAC,UAAU;QACfe,OAAO,EAAEP,SAAU;QACnBc,QAAQ,EAAEZ,YAAa;QACvBa,QAAQ,EAAE,CAACnB,YAAY,CAACO,wBAAyB;QACjD,iBACEP,YAAY,CAACO,wBAAwB,GAAGlB,SAAS,GAAG,IACrD;QACDC,KAAK,EACHU,YAAY,CAACO,wBAAwB,GACjCpC,MAAM,CAACiD,YAAY,GACnBjD,MAAM,CAACkD,oBACZ;QACD,cAAY,SAASlB,QAAQ;MAAG,CACjC,CACF,EACA9B,cAAc,CAAC0C,UAAU,CAAC;IAAA,CACvB,CAAC,EACNE,UAAU,IAAI5C,cAAc,CAAC4C,UAAU,CAAC;EAAA,CACvC,CAAC;AAET;AAEA,OAAO,MAAMK,aAA0B,GAAG;EACxCC,aAAa,EAAEhC,qBAAqB;EACpCiC,WAAW,EAAE/B,mBAAmB;EAChCgC,QAAQ,EAAE5B;AACZ,CAAC","ignoreList":[]}
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/wasm/md4c.js b/node_modules/react-native-enriched-markdown/lib/module/web/wasm/md4c.js
+index 978a8c7..950cccd 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/wasm/md4c.js
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/wasm/md4c.js
+@@ -3,10 +3,11 @@
+ var createMd4cModule = (() => {
+   var _scriptName = globalThis.document?.currentScript?.src;
+   return async function (moduleArg = {}) {
++    var moduleRtn;
+     var Module = moduleArg;
+     var ENVIRONMENT_IS_WEB = true;
+     var ENVIRONMENT_IS_WORKER = false;
+-    var programArgs = [];
++    var arguments_ = [];
+     var thisProgram = "./this.program";
+     var scriptDirectory = "";
+     var readAsync;
+@@ -30,8 +31,6 @@ var createMd4cModule = (() => {
+     var err = console.error.bind(console);
+     var wasmBinary;
+     var ABORT = false;
+-    class EmscriptenEH {}
+-    class EmscriptenSjLj extends EmscriptenEH {}
+     function binaryDecode(bin) {
+       for (var i = 0, l = bin.length, o = new Uint8Array(l), c; i < l; ++i) {
+         c = bin.charCodeAt(i);
+@@ -39,13 +38,12 @@ var createMd4cModule = (() => {
+       }
+       return o;
+     }
++    var readyPromiseResolve, readyPromiseReject;
++    var HEAP8, HEAPU8, HEAP16, HEAPU16, HEAP32, HEAPU32, HEAPF32, HEAPF64;
++    var HEAP64, HEAPU64;
+     var runtimeInitialized = false;
+-    function getMemoryBuffer() {
+-      return wasmMemory.buffer;
+-    }
+     function updateMemoryViews() {
+-      if (HEAP8?.buffer?.resizable) return;
+-      var b = getMemoryBuffer();
++      var b = wasmMemory.buffer;
+       HEAP8 = new Int8Array(b);
+       HEAP16 = new Int16Array(b);
+       HEAPU8 = new Uint8Array(b);
+@@ -58,10 +56,11 @@ var createMd4cModule = (() => {
+       HEAPU64 = new BigUint64Array(b);
+     }
+     function preRun() {
+-      var preRun = Module["preRun"];
+-      if (preRun) {
+-        if (typeof preRun == "function") preRun = [preRun];
+-        onPreRuns.push(...preRun);
++      if (Module["preRun"]) {
++        if (typeof Module["preRun"] == "function") Module["preRun"] = [Module["preRun"]];
++        while (Module["preRun"].length) {
++          addOnPreRun(Module["preRun"].shift());
++        }
+       }
+       callRuntimeCallbacks(onPreRuns);
+     }
+@@ -70,25 +69,27 @@ var createMd4cModule = (() => {
+       wasmExports["__wasm_call_ctors"]();
+     }
+     function postRun() {
+-      var postRun = Module["postRun"];
+-      if (postRun) {
+-        if (typeof postRun == "function") postRun = [postRun];
+-        onPostRuns.push(...postRun);
++      if (Module["postRun"]) {
++        if (typeof Module["postRun"] == "function") Module["postRun"] = [Module["postRun"]];
++        while (Module["postRun"].length) {
++          addOnPostRun(Module["postRun"].shift());
++        }
+       }
+       callRuntimeCallbacks(onPostRuns);
+     }
+     function abort(what) {
+       Module["onAbort"]?.(what);
+-      what = `Aborted(${what})`;
++      what = "Aborted(" + what + ")";
+       err(what);
+       ABORT = true;
+       what += ". Build with -sASSERTIONS for more info.";
+       var e = new WebAssembly.RuntimeError(what);
++      readyPromiseReject?.(e);
+       throw e;
+     }
+     var wasmBinaryFile;
+     function findWasmBinary() {
+-      return binaryDecode('asm

¬
``
`
`
`

`
``````
`
`	
`
`
``|
|`~
`|
``
Tenv__cxa_throwenv\r__assert_failenv	_abort_js\nenvemscripten_resize_heap˜
–
\n
\r\n


\n\n














\r\r	\n	

\n
				


p
44

€€@	

Aʈۢ
memory__wasm_call_ctors\rparseMarkdown__indirect_function_table
_emscripten_stack_restore—
_emscripten_stack_alloc˜
emscripten_stack_get_current™
	J
A
3”
\rq !"#$%&\'()s*B=DZfghq*‚
‚
„
’

†
*‘
Ž
‡
*
‹
‰
*“
•
–
•

(\nªº–
æ

AàÚB7AèÚA6A÷ÚA:AìÚAØ\r(6AðÚAÜ\r-:AñÚA:AƒÛA:AøÚA±\r/;
AúÚA³\r-:AûÚA:AÛA:A„ÛAŠ(6AˆÛAŽ-:A‰ÛA:A›ÛA	:AÛA™)7A˜ÛA¡-:A™ÛA:A ÛB칻֮سå7A«ÛA:A¨ÛA:A·ÛA:A¬ÛAá\r(6A°ÛAå\r/;
A²ÛA:A¸ÛAt"6A¼ÛB‹€€€€‚€€€7 AÆ(6 A¿)7 A:AÏÛA:AÄÛA¦	(6AÈÛAª	-:AÉÛA:AÛÛA:AÐÛAÈ	(6AÔÛAÌ	-:AÕÛA:AÜÛAt"6AàÛBŽ€€€€‚€€€7 AÖ)7 AÐ)7 A: AëÚ,AH@AèÚ(AàÚ(kõ”
!
~#A0k"$@ E@@A€\\"AèÚ("
AÿÿÿÿqA
kA\nAëÚ,"AH""M@AàÚ(AàÚ !@  @ A€ ü\nAëÚ- 
AvÀAH@AäÚ 6
AëÚ Aÿq:  jA:
AàÚ   kAäÚ(  "A  A€xAàÚAàÚ(AëÚ,AN
 A
:,  AG:/  AG:.  AG:-  AG:+  AG:*  AG:)  AG:(  
AG:\'A$t"
A6  
B7 
B7 
B7 
B7 A j" 
6 ! \\"A÷ÿÿÿO\r
@@ AO@ Ar"A
jt!  Aÿÿÿÿk6  6  6
  : Aj! E\r
 E\r   ü\n  jA: Aj! A\'j!#AÐk"$@ Aj"
( 
," AH"E@A<t"
B7 
Aì6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6
 (! AéOA4 Aèn" A4OAjA!A<t"B7 Aì6 B7 B7 B7 B7$ B74 B€€€ü7,  Aj6 (!  6@ E\r  ("A
k6 \r  ((
 r Aj! ("\n! (" \nG@@@ Ak("E\r  ("A
k6 \r  ((
 r \n Ak"G\r (!  \n6@A€
  A€
O" ( kAuM\r At"t! \n k"\n@   \nü\n   j6  \n j6  6 E\r k !@@@@ (" ("\nI@  (6  ("6 @  (A
j6 Aj!
  ("k"Au"A
j"A€€€€O\r
Aÿÿÿÿ
 \n k"\nAu"   K \nAøÿÿÿO"A€€€€O\r At"\nt" j" (6  ("6  \nj!\n    (A
j6 ( ( ("k"Au Atk! @   ü\n  \n6  Aj"6  6 E\r k  6 Aj!@ ,AH@ (A: A6
 A: A: A€z (" 
( 
 
,AH6  -! -! -! -! -! -! -!\r -
! -! B7( A6$ A6  A6 A6 A6 A6  AtAìžAà– r \rAtr Atr Atr Atr Atr Atr Atr6 
( 
 
,"AH"! 
(  ! !\n#A€k"	$@ Aj"(@A! ("E\r
A›  
 	A4jAAüü 	 6 	 6 	 )7 	 )7 	 )7 	 )7$ 	 ( 6, 	 \n60 	AA 	("Aq6œ 	A„
j"
AA€ü 	A;ã
 	A
:®
 	A;
à
 	A
:ß
 	A
:Â
 	A;¿
 	A
:ª
 	A
:¥
 	A
:„
 A€„q@ 	A
:‚ A€€q@ 	A
:â
 A€ q@ 	A
:¨
 A€€€
q@ 	A
:Á
 A€€€q@ 	A
:¯
 Aq@ 	A
:Ä
 Aq@ 	A
:¾
 A€q@ 	A
:²
 A€Âq@ 	A
:€ A
q@A!@ A G AGqE@  
jA
: A
r"Aý
qA	F@ 
 jA
: Aj"A€G\rA E\rA
  jA
k-"A\rF\r A\nF! 	A6` 	A 6D 	 64 	A€€  A€€OAt6X 	A„jAÿ
AÔü 	B7ä 	B7Ü@AA \n 	("E@ 	AÌj!" 	A°jAr!# 	Aüj!$ 	AèjA
r!% 	A°j!\rAè!A!@@ \r!@@@@ 	(" K@ 	B7ø 	B7ð 	B7èA! 	A°jAA \r 	A°jF"j \r  \rF"!\r 	(¨!& 	(!@@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r ! 	A°jA,A j Aj " 6 	A°jA$A j Aj " 6A! 	A°jA A j Aj " A6@ 	(”"AL\r 	(œ! 	(! !\n@@  Alj"
-A>F@ \n O\r  O\r  j-A>G\r A
j"!
@ A
j" O\r@  j-"\nA G \nA	Gq\r
 
A|qAj 
A
j \nA	F!
 A
j" G\r !  
 kAkA 
 G"\n6  6 
!
 \n 
("
I\r  \n 
k"\n6 !
 A
j" G\r ! 
! 	 6ä@@  O\r  j-A\nk


  L\r 	(!
@ 
 Alj-A>F\r
 A
j" G\r ! " #  Aj !A!\nA!A! !@A
 k!A k! 	(„"\' 	(üjAk!( 	(¬E! 	(!! 	( !) 	(œ! 	(¤!@@ ("AG@ !

  6@  ("M@ !

 !
@  O\r  (j-!@ 
 j- Aÿ
qG\r
 
A
j"
 G\r !
@ 
 k )I\r@ 
 O\r@@ 
 j-A	k 
A
j"
 G\r !
 	 
6ä \rA6 	 
6ä  F@   (k"A  M6 \rA6 (!@@@@ AG\r AL\r  L\r
A! 	A6¤ 
 O\r
 
 j"-A\nk

@ 	Aj 
 	Aäj+AL\r 	A6¤ AþÿÿÿqAG\r \rA6 A6 !	 \rA6@ AG\r  	(”G\r \rA6  (" 	(œk"A  O6 \rA6@@ AL"\r  G\r 	 	( AljAk-"A>G6¨
 	A6¨ @ !	 	( AljAk-! Aÿ
qA>F@ !  G@ ! 	(€\r 	(„"A	H\r 	(ü jAk-AG\r 	A
6¬@ A
q@ !
  AL\r  	(” G\r  ! Alj"Ak-A>F\r   G\r  	(€\r  \'A	H\r  (-AG\r  6A A
F\r   A$k(k"A  M6 A
k! 	A6¬ 	A6¨@ (" O\r@ AG\r@ -"A-k















  G\r@@ 
A
j" O\r@   j-F@  A
j"K\r
@@  j-A	k A
j" G\r ! 	 6ä \rA6 A
A A=F6 
 \nI\r -"E\rA­ ÀAPE\rA
! 
A
j"\n O\r@@@  \nj-" Aÿ
qF"\r A F\r A	G\r  j! \nA
j"\n G\r !\n AI\r
 AI\r A\nk@@@  L\r  G\r@ 	Aj  
 	Aàj 	Aèj,E\r 	-è"A>F\r  ! Alj"-G\r 	(ð" (K\r 	(ô" k j"!@ 	(à" O\r@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r 	 6ä   k6  6 ! 	 6ä   k"6  6  O\r@  j-A\nk  M@ 	  j"
6ô A6 	 A
j"
6ô  A
k6 !@  O@ (AF@ ! \rA6   k6 A6 !\n 	Aj  
 	Aäj 	Aèj,! (!
@@@@@ @ 	(ä!@ 
AG\r  G\r@@  O\r  j-"A\rF\r 	-è!
 A\nG\r
 
Aÿ
qA>F\r
A>!
 	-èA>G\r 
Aÿ
q"
A.G 
A)Gq\r 	(ìA
G\r 	(ô" 	(ðk j"!@  O\r@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r ! 	 6ä   k"
6  6  	,è6@@@  O\r  j-A\nk


 	 A
j6ô
 
 M@ 	 
 j6ô A6
 	 A
j6ô  
A
k6 E@ 	Aj  j-\r 	(”!@ 	(˜"
 J@ 	(!

 	A 
A
v 
j 
AL"
6˜ 	( 
All"
E@ 	(("E\rAõ 	(0  	 
6 	(”!Aè   F! A
j! 	 A
j6” 
 Alj"
 	)ø7 
 	)ð7 
 	)è7 	(”! 	(! 	(! !\n 
A	F  Fq\r
 	(ä! !  O@ !
@  j"\n-"
A#G@ ! 
AþF\r
 
AàF\r
 !
  A
k"\nF\rA
!
  A
j"j-A#F\r@@  j- 
G\r
 A
j" G\r !  k"
AI@ !
 	 
6 @@@  O\r@  j-A G\r
 A
j" G\r
  O\r
@@  j-"
A\nk@ 
AàG\r \n-AàG\r !
 A
j" G\r ! 	 6ä \rA6 A
6  A
6\r \rA	6  \nF\rA!
  Aj"j-A#G\r
  \nF\rA!
  Aj"j-A#G\r
  \nF\rA!
  Aj"j-A#G\r
  \nF\rA!
  Aj"j-A#G\r
  \nF\rA!
  Aj"j-A#G\r
  \nF\rA!
 Aj!
  k!
 ! 
AJ@ !

@  O"\n\r 	(Aq\r  j-A	k"AK@ !
A
 tA“€€q\r !

@ \n\r@  j-"A G A	Gq\r
 A
j" G\r !  6 	 6ä \rA6  
6	@@@@@ 
 O\r 
 j-A<G\r 	-A q\rA!#Ak"$ 
"A
j!@@ 
Aj"\n 	Aj"("K\r ( j"-"A k  AákAÿ
qAIAÿ
qAÐG\r -
"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\rA
!
@ Aj K\r ( j"-"A k  AákAÿ
qAIAÿ
qAÓG\r -
"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÔG\rA
!
@ Aj K\r ( j"-"A k  AákAÿ
qAIAÿ
qAÓG\r -
"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÙG\r -"A k  AákAÿ
qAIAÿ
qAÌG\r -"A k  AákAÿ
qAIAÿ
qAÅG\rA
!
@ A	j" K\r ( j"-"A k  AákAÿ
qAIAÿ
qAÔG\r -
"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAØG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAÁG\rA
!
@  \nM\r ("\n j-A!G\rA!  \nj"\n-A-G\r \n-A-F\r
@  O\r (" j"-"\nA?F@A! \nA!G\r@ Aj"\n O\r  \nj,AH\rA!  M\r )B¡¶¢”ˆÕ ÛR\rA!
@ Aj"\n O\r (" j-"Aß
qAÁkAÿ
qAO@ A/G\r
 \n j-Aß
qAÁkAÿ
qAK\r
  \n  A/F"j","\nAÁkAÿ
q" \nAák AIAtA j("("E\r@@@   Atj-"j" K\rA!\n E\r
@ \n j-"A k  AákAÿ
qAIAÿ
q \n j-"A k  AákAÿ
qAIAÿ
qG\r
  \nA
j"\nG\r
  A
j"Atj("\r
A!  M\r
  j-"A	k"\nAMAA
 \ntA“€€q\r
 A>F\r
 A
j"\n O\r A/G\r \n j-A>F\r
  A
jM@A!
A! AA   Aj>E\rA! ("\n O\r (!@@  \nj-"A	k"AK\rA
 tA€€qE\r \nA
j"\n G\r
AAA A\nF A\rF! Aj$ 	 6¤@ 
 (AG\r
 	A6¤ 	("A€qE\r (AG\r 
 	(O\r 	( 
j-"A-k
 	Aj 
 	Aäj+ F@ 	A6¤  A
6 \rA6 AüG\r
  	(”G\r 	(€"E\r (A
G\r 	Aäj! 	Aàj!A!A!@ 	Aj"(" 
M\r (" 
j-AüG\rA
! 
A
j"
 O\r@ 
 j-A	k"\nAK\r
A
 \ntA€€qE\r
 
A
j"
 G\r !
@@@@ 
 I@ 
 ( 
j-A:Fj!
 
 O\r ("\n 
j-A-G\r@@@ 
 \nj-"A-G\r
 
A
j"
 G\r A
j!
A
! A
j!@ 
 A:Fj"
 O\r@@ 
 \nj-"A	k"AK\rA
 tA€€qE\r  
A
j"
G\r
 AüG\rA
!A! 
A
j"
 O\r@ 
 \nj-A	k"AK\r
A
 tA€€qE\r
 
A
j"
 I\r !
 
 O\r@ 
 \nj-A\nk E\r
 !
 E\r
  
6  6A

AE\r  	(à6 \rA\n6	 \rA6 	(”"   F  (AF! A€qE\r  jAL\r 	( Alj"Ak-"E\r A?K\rB
 ­†B€€€€ÀƒP\r@ 	(ä" 	("\n Aj"  \nK"
O\r 	(!@  j-"A G A	Gq\r
 A
j" 
G\r 
! Aj" \nO\r 	("
 j-AÛG\r 
 A
j"j,"E\rAÓ APE\r 
 j-AÝG\r \n Aj"G@  
j-A	k"AK\r	A
 tA“€€qE\r	 Ak % " -Ar: Ak $  6@  	("
O\r 	(!@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" 
G\r 
! 	 6ä  6 	 A
j"
6ô  
6  6Aè!A
! ! ! 	Aj.A! 	Aj 	A@k/\r 	-Aq@ 	Aj 	AÜj/\r 	AjA-\r 	Aj0\rA!#A
k"$ A6$ 	Aj"\rA6@ \r(€AJ@ Aøj!@@@@@@ \r(ø j"("Aÿ
qAk
  AsA\nvA
q6  /
:  (6  (AsA\nvA
q6  /
:  AÿÿK6  /
:  (6
 A6  /
At(€\\"6  /
!  6  At(€6  Aj6  A$j6@@ ("A€q@@ A€qE\r Aÿ
q Aj \r(, \r("@ \r($"E\rA¿ \r(,  ("Aÿ
q"AK\rA
 tAŽ€qE\r \r \r(A
k6 (! A€qE\r Aÿ
q Aj \r(, \r("@ \r($"E\rAš \r(, @ ("Aÿ
qA
k \r(Œ \r(Alj" -
A
r:
 \r \r(A
j6 B7` B7X B7P B7H B7@ B78 B70 B7(@ ("Aÿ
qA\nG\r A€€„
I\r ("A€  Av"
nM\r Aq! Aj!A!\nA!@ "AO@ A|q!A!@  Atj"( j (j (j (j ( ( ( (jjjk! Aj! Aj" G\r E\r
@  Atj"( j (k! A
j! \nA
j"\n G\r  
n AvO\r  \r($"A¸ \r(,  ( A€~qA	r"6A! A6ˆ
 B7€
 B7x B7p B7h \r("@ \r(Œ AljAk-A
s!A
!@@@@@@@ Aÿ
qAk
  Av6h A€€I\r \r("\n ("j-! (!@@@  \r("O\r@  \nj- Aÿ
qG\r
 A
j" G\r
  M\r
@  \nj-A G\r A
j" G\r !@  M\r@  \njA
k-A G\r
 A
k" K\r !A! \r  \nj  kA Aèj AÈj9\r \r(! !\n@  M\r@  \nj-A	k"AMAA
 tA€€q\r
 \nA
j"\n G\r !\n \r  j \n kA  A(j9\r  :ˆ
 (!A! A
6l  Av6h  (Ak6p
  Av6h@@@@@@@  Aÿ
q"A	FqE@  Aèj \r(, \r("\r
 (! Aÿ
qAk
 \r($"E\rAš \r(,  (!@ AÿÿM@ E\r Aj!@ ( (F@ Aj! A
k"\r
@  Alj"Ak( Ak(G\r A
k"\r A
k"E\r Aj! \rA  :"E\r \rA Aj (:"E\r (!@@ Av"Atj"
E@A! \r($"E\r
Aä \r(,  
k @ (! ("! ! 
!@ !@  M\r \r(!@  j-A-F\r
 A
j" G\r !A!  K@ \r( jA
k-A:F!@  M\r \r(!@@  j-"\nA-G\r
 A
j" G\r !
 Ar  \nA:F!  At( 96 A
k! Aj! A
J\rAA \r(, \r("@ \r($"E\r
Aš \r(,  
k \rA ( ( 
 ;"\rAA \r(, \r("@ \r($"E\r
A¿ \r(,  
k AI\r
@AA \r(, \r("E@ Aj!A!
 \r($"E\r
Aš \r(,  
k@ \rA  Atj"( ( 
 ;"\r
 A
j" G\rAA \r(, \r("E\r
 \r($"E\rA¿ \r(,  
k 
k
 \r Aj (<"\r
A!  -"A	Fq\r  Aèj \r(, \r("E\r \r($"@A¿ \r(,  ! \r
 (X@ (Hk (Lk (Pk (8E\r ((k (,k (0k \r (! -AkA
M@ Al j! At j!
 \r(Œ \r(Alj" -
Aþ
q A\nvA
qr:
 \r \r(A
j6 Aj" \r(€H\r \rA6€A! A
j$ "\r 	-Aq@A!A!#A@j"\n$@ 	Aj"(`"E\r (pE\r (X AAR@@AA (, ("E@ (`E\r \nA0j!

 ($"E\rAš (, @ (X Alj"(E\r
 \nB7  \nB7 \nB7 \nB7 
B7 
B7 \n (6( \n (6,@  ( (A 
 \nAj9@A!
A \nA(j (, ("@ ($"E\r
Aš (, 
  ( (<"\rA \nA(j (, ("E@A!
 ($"E\rA¿ (,  \n(@ \n(k \n(k \n(k \r A
j" (`I\rA!AA (, ("E\r ($"@A¿ (,  ! \nA@k$ "\rA!AA 	(0 	("E\r 	(("@A¿ 	(0  ! 	 \n6ä \rA
6 ! ! !
 	A6¨ !@ 	(ä"Aj" 	("O\r 	(!@@  j"
-A\nk@ 
-
A\nk@ 
-A\nk@  j-A\nk Aj! Aj!  I\r@  I@ 	(!@A
!@  j-A\nk A
j" G\r !A! 	A°jA(A j Aj "\n 6 " \r("AG\r@@  ("
M\r 	(!@  jA
k-"A G A	Gq\r
 A
k" 
K\r
@ 
 O\r 	(!@  jA
k-A#G\r
 A
k" 
K\r
 
 F\r 	( jA
k-"
A	F@ !

 
A F@ !

 !
  	-AqE\r
 \n 
6 
!@ AkAI\r  ("M\r 	(!@  jA
k-"
A G 
A	Gq\r
 \n A
k"6  K\r @  	( j-A\rFj!  I@  	( j-A\nFj!@ &E\r E\r  j"AL\r 	( Alj"Ak-A>F\r 	(ü Ak(j" (A€r6@ \r  j" 	(”N\r 	Aj -\r
 AJ@ 	AjA Al"
 	(j"(" -
Aq 	( j,AA1\r
 	AjA 	(ü" 	-éAq" 	( j,AA
1\r
 	( 
j" -
Aý
q r:
 	( 
j 6 @ 	(”!@ 	-AqE\r 	( Alj"
Ak-A>G\r \r(AG\r \n(" ("k"AkAK\r 	(" j"-AÛG\r -
A!G\r  jA
k-AÝG\r Ak! Aj!A!@@@@ Ak
@  j-"A k  AákAÿ
qAIAÿ
q -¹"A k  AákAÿ
qAIAÿ
qG\r A
j" G\rA@  j-"A k  AákAÿ
qAIAÿ
q -Î"A k  AákAÿ
qAIAÿ
qG@ A\nk A
j" G\rAA!@  j-"A k  AákAÿ
qAIAÿ
q -ú	"A k  AákAÿ
qAIAÿ
qG@ A\nG\r A
j" G\rA
A!@  j-"A k  AákAÿ
qAIAÿ
q -‡"A k  AákAÿ
qAIAÿ
qG@ A\nG\r -"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÕG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÏG\r -"A k  AákAÿ
qAIAÿ
qAÎG\rA  A
j" G\rA! 
Ak"
 
-Ar: 	( 	(”AljAk"
 
-AÇ
q r: \rA6 	(”!  k!
@A!@@A
 	( 
Alj"-A)kt"AqE@ A!qE\r
A! 	Aj.  	(„6 	Aj  ( ,A
1\r 	AjA (" -
Aq 	( j,AA
1\r
 	AjAA
 -
"AqA AvAqA
1\r 
A
j"
 	(”H\r@ \r(E@ 	Aj.@A!A!Aè! 	-AÀqE\r
 ( \n(I\r
 	 	(ŒA
j6Œ
 	(Œ@@ 	(„"
Aj" 	(ˆ"J@ 	A€ A
v j AL"6ˆ 	(ü l"E@A! 	(("E\rAõ 	(0  	(€"
@ 	  
 	(ükj6€ 	 6ü 	 	(„"
Aj6„
 	 6„ 	(ü"\rA! 
 j"A;
 	(Œ!
 A6  
AtAr6 	A6Œ@  (E\r 	Aj.E\rA!@@@@ \r("A
k\n
A! 	Aj.\r 	(„"Aj"
 	(ˆ"J@ 	A€ A
v j AL"6ˆ 	(ü l"E@ 	(("E\r\nAõ 	(0 \n 	(€"
@ 	  
 	(ükj6€ 	 	(„"
Aj6„ 	 6ü 
 j
 	 
6„ 	(ü"E\r  j" \r(AÃÌj-"
;
 (! A6  
 Atr6 	 6€ 	Aj \r2\r 	Aj.\rA!Aè! 	(€A: 	(€ /
;
 	(€" (A€r6A! 	Aj \r2\r 	Aj.\rA! 	(€E@Aè! \rA6 \r! 	(€A\n: 	(€ /
;
 A	6AA 	Aj \r2!
@  (F\r 	Aj.E\rA!@ 	(€\r \r!@ 	Aj"(€"
Aj"\n („"J@ A€ A
v j AL"6„ (ø l"E@A ($"E\rAõ (, A (ü"\n@   \n (økj6ü  6ø  (€"\nAj6€  \nj
  \n6€ (ø"E\r 
 j" \r(AÃÌj-"\n;
 \r(!
 A6  \n 
Atr6  6üA
AE\rA! 	Aj \r2!A! E\r
A!
 	(("E\rAš \n  	(P"@ 	(T"
A!@@ 	(P Atj("E\r 	(@" M@   	(D 	(HljI\r
 k 	(T!
 A
j" 
I\r 	(P k 	(H@A!@ 	(@ Atj"-"
A
q (k - 
Aq@ (k A
j" 	(HI\r 	(@k 	(l"@ 	(p"
A!@@ 	(l Atj("E\r 	(\\" M@   	(` 	(dljI\r
 k 	(p!
 A
j" 
I\r 	(l k 	(d@A!@ 	(\\ Alj(k A
j" 	(dI\r 	(\\k 	(8k 	(xk 	(ük 	(k 	A€j$ @A<t"
B7 
Aì6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6
 (@ (("E\r ((" ($"
G A$j!A!\r@@@ 
 \rAt"\nj("(A
F@ ($" (("G\r
 \rA
j!\r
  k"
Au!@@ ((AF\rA
! 
AG@@ A
j!
  Atj"((AF@ 
 O\r Ak(!  
Atj(! \r \r  
"G\rA! A68 B70A!

A!
 A68 B70 A6L B7D  A0j6@  AÄj6<@@@@@@  
At"j"("(AG\r 
 Ak(A
!  
A
j"K@  Atj( rA
G\r
 A<j ($ j! (4"
 (8"I@ 
 (6 
 ("6 @  (A
j6  
Aj64 
 (0"k"
Au"A
j"A€€€€O\rAÿÿÿÿ
  k"Au"   I AøÿÿÿO"A€€€€O\r At"t" 
j" (6  ("6  j!    (A
j6 (8 (4 k"
Au Atk! 
@   
ü\n  68  Aj"
64  60 @ k  
64
@ (H" (L"I@  6  ("6 @  (A
j6 Aj!
  (D"k"Au"A
j"A€€€€O\rAÿÿÿÿ
  k"Au"   I AøÿÿÿO"A€€€€O\r At"t" j" (6  ("6  j!    (A
j6 (L (H k"Au Atk! @   ü\n  6L  Aj"6H  6D E\r k  6H 
A
j! "
 (( ($"kAu"I\r
 A<j (D"@ " (H"
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 r  
Ak"
G\r (D!  6H (L k (0" (4"
F\r ($ \nj"!
 Aj" (("G@@ )!* B7 
(! 
 *7@ E\r  ("A
k6 \r  ((
 r 
Aj!
 Aj" G\r ((!  
G@@@ Ak("E\r  ("A
k6 \r  ((
 r 
 Ak"G\r  
6( (0"
! (4"!@  
kAu"AL\r (" ("kAu N@  k"\nAu" H@@  \n j"F@ !
 !@  (6  ("
6 
@ 
 
(A
j6 Aj! Aj" G\r  6 AL\r  At"j! !   k"K@ !
@  
(6  
(6 
B7 Aj! 
Aj"
 I\r  6  G@@ Ak")!* B7 Ak(! Ak" *7@ E\r  ("
A
k6 
\r  ((
 r  G\r  \nj!
 !@ (! ("@  (A
j6  6 (!  6@ E\r  ("A
k6 \r  ((
 r Aj! Aj" 
G\r  At"j! !
   k"K@ !@ 
 (6 
 (6 B7 
Aj!
 Aj" I\r  
6  G@@ Ak")!* B7 Ak(! Ak" *7@ E\r  ("
A
k6 
\r  ((
 r  G\r  Atj!
 !@ (! ("@  (A
j6  6 (!  6@ E\r  ("A
k6 \r  ((
 r Aj! Aj" 
G\r
@  ("kAu j"A€€€€I@Aÿÿÿÿ
  k"Au"
  
 K AøÿÿÿO" A€€€€O\r AttA"\n  kj!
 At"Ak"Aq 
 
 (6 
 ("6 @  (A
j6 Aj! 
Aj! 
 j! @@  (6  ("6 @  (A
j6  (6  ("6 @  (A
j6 Aj! Aj" G\r ( k"@   ü\n  6 
  ("k"k! @   ü\n   j6  6 (  \n Atj6 @ k (4"
 (0"kAu \rj
 \rA
j!\r @ " 
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 r  
Ak"
G\r (0!  64 (8 k ($!
 ((! \r  
kAuI\r ((  ("
("E\r  6  
("
6 
E\r
 
 
(A
j6
A<t"
B7 
Aì6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6 AÐj$ ,AH@ ( (k (!
 Aj"A6 B7 A€z 
 \nAëÚ,AH@AèÚ(AàÚ(kAèÚ (6AàÚ )"*7AëÚ,AH! *§!@ ("E\r  ("A
k6 \r  ((
 r (!
 A6 
@ 
"@ ,AH@ ( (k ("
@ 
" ("G@@@ Ak("E\r  ("A
k6 \r  ((
 r 
 Ak"G\r (!  
6 ( k@ ("E\r  ("A
k6 \r  ((
 r k AàÚ ! A0j$ Aéq
A
"AàÙ6 Aj! \\"A\rjt"
A6 
 6 
 6 
Aj!
 A
j"@ 
  ü\n  
6 "AÚ6 AœÚA
Ÿ
#Ak"$ 
A"y ( ," AH""@ (  " j!@@@@@@@@@@@ -"Ak
 
AÂv 
AŽ\rv 
A£v 
A¼\nv 
AÞv 
A›v AÜF\r
 AM@  6#Ak"$  6#A 
k"$  A	j"6”
 A6˜
 AA
ü A6L A6$ A6P  AŸ
j6,  A”
j6T A:A!#AÐ
k"$  6Ì
 A 
jAA(ü  (Ì
6È
AAÍ AÈ
j AÐj A 
j`AHA  ("	A_q6@@ (0E@ AÐ60 A6 B7 (,!  6,
 (\r
A ^\r
 AÍ AÈ
j AÐj A 
j`! 	A q!	  AA ($ A60  6, A6 ( B7A   ( 	r6A AÐ
j$ A 
j$ Aj$ 
 A	jv 
 Ày
 
Aðv A
j" G\r 
A"y Aj$Ô

 
AÅv ("A!I@ 
 At(Üv 
A"y ( ," AH@ 
AÂv Aj 
	 (@ 
A”v@ ("E\r Aj 
	 
A:y Aj 
	 ("E\r@ 
A,y Aj 
	 
A:y Aj 
	 ("\r 
Aýy ($ ((G@ 
A÷v@ ($" ((F\r ( 
\n (( ($kAM\rA
!@ 
A,y ($ Atj( 
\n A
j" (( ($kAuI\r 
AÝy 
AýyAA¸AÌAö
¢

#A k"$@ E\r 
E\r E\r@@@ 
A<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6  Aj6  )7  A<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6  Aj6  )7  Aj
 Aj 
 w A j$As

 E@A
@ ( (F\r  ("
 (kA	I\r@ 
Ak("E\r  ("A
k6 \r  ((
 r  
Ak6Aø
#Að
k"$@@ E@A
!
@@@@@@@@@@@@@ 
\r\r	\n\r\rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
("E\r 
("E\r A÷ÿÿÿO\r@ AO@ Ar"A
jt!
  Aÿÿÿÿk6è
  
6à
  6ä

  :ë
 Aà
j!
 @ 
  ü\n 
 jA: (ä
 -ë
"
 
ÀAH@ AøÚ Aà
j ,ë
AN\r (è
 (à
k  6Ü
  6Ø
  (A
j6  )Ø
7    ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6Ô
  Aj6Ð
  )Ð
7  AjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6Ì
  Aj6È
  )È
7  Aj\nA<t"B7 A	6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6Ä
  Aj6À
  )À
7  Aj	A<t"B7 A\n6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6¼
  Aj6¸
  )¸
7   A jA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6´
  Aj6°
  )°
7(  A(jA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r@@ 
("@ 
("\r
 A6è
 B7à

 A÷ÿÿÿO\r	@ AO@ Ar"	A
jt!  	Aÿÿÿÿk6è
  6à
  6ä

  :ë
 Aà
j! @   ü\n  jA: (ä
 -ë
" ÀAHE\r AøÚ Aà
j@ 
("E\r 
("E\r A÷ÿÿÿO\r	@ AO@ Ar"A
jt!
  Aÿÿÿÿk6¬
  
6¤
  6¨

  :¯
 A¤
j!
 @ 
  ü\n 
 jA: (¨
 -¯
"
 
ÀAH@ A„Û A¤
j ,¯
AN\r (¬
 (¤
k ,ë
AN\r (è
 (à
k  6 
  6œ
  (A
j6  )œ
70  A0j  ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6˜
  Aj6”
  )”
78  A8jA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6
  Aj6Œ
  )Œ
7@  A@kA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6ˆ
  Aj6„
  )„
7H  AÈjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6€
  Aj6|  )|7P  AÐjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6x  Aj6t  )t7X  AØj
A<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6p  Aj6l  )l7`  Aàj Að
j$ x

 E@A
@ E\r ( (F\r  (" (kA	I\r@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak6A—%
#A k"$@@ E@A
!	
@@@@@@@@@@@@@@@ A
k
\n\r	A<t"B7 A
6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6Œ  Aj6ˆ  )ˆ7  AjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,@ 
E\r 
(!
 A:• AA
 
 
A
L"
 
ANA0r:” A”j\\"
A÷ÿÿÿO\r@@ 
AO@ 
Ar"A
jt!  Aÿÿÿÿk6€  6ø
  
6ü

  
:ƒ Aø
j! 
E\r
 
E\r  A”j 
ü\n 
 jA: AìÚ6˜ A¤
j AjAìÚ A˜j@ (¤
"Aj"
 Aø
jF\r ,ƒ! ,AH@ 
 (ø
 Aø
j AH" (ü
  {
 AH@ 
 (ø
 (ü
|
 
 (€6 
 )ø
7 ,ƒAN\r (€ (ø
k  6ô
  Aj6ð
  (A
j6  )ð
7  Aj  ("A
k6 \r\r  ((
 r\rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6ì
  Aj6è
  )è
7  AjA<t"B7 A 6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
("E\r 
("E\r A÷ÿÿÿO\r\r@ AO@ Ar"A
jt!
  Aÿÿÿÿk6€  
6ø
  6ü

  :ƒ Aø
j!
 @ 
  ü\n 
 jA: (ü
 -ƒ"
 
ÀAH@ AÜÛ Aø
j ,ƒAN\r (€ (ø
k  6ä
  6à
  (A
j6  )à
7   A j  ("A
k6 \r  ((
 rA<t"B7 A\r6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6Ü
  Aj6Ø
  )Ø
7(  A(j\nA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
("
A
F\r Aø
j 
} AÄÛ Aø
j ,ƒAN\r (€ (ø
k  6Ô
  6Ð
  (A
j6  )Ð
70  A0j  ("A
k6 \r	  ((
 r	A<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
(E\r A¬Û Aø
jAž" ,AH@ ( (k A¸Û Aø
jAžA¾ 
-Aß
qAØF"
 
,AN\r 
( 
(k  6Ì
  6È
  (A
j6  )È
78  A8j  ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r@ 
- "E\r A:¥
  :¤
 AÛ Aø
j A¤
j" ,AN\r ( (k 
("E\r 
("E\r A÷ÿÿÿO\r	@ AO@ Ar"A
jt!
  Aÿÿÿÿk6€  
6ø
  6ü

  :ƒ Aø
j!
 @ 
  ü\n 
 jA: (ü
 -ƒ"
 
ÀAH@ A Û Aø
j ,ƒAN\r (€ (ø
k  6Ä
  6À
  (A
j6  )À
7@  A@k  ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6¼
  Aj6¸
  )¸
7H  AÈjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r Aø
j 
(} AÐÛ6˜ A¤
j AjAÐÛ A˜j@ (¤
"Aj"
 Aø
jF\r ,ƒ! ,AH@ 
 (ø
 Aø
j AH" (ü
  {
 AH@ 
 (ø
 (ü
|
 
 (€6 
 )ø
7 ,ƒAN\r (€ (ø
k  6´
  6°
  (A
j6  )°
7P  AÐj  ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r A:€ BãÞ±›ô­·ô7ø
 A:ƒ A¤
j 
(}  Aø
j6” A˜j Aj" Aø
j A”j@ (˜"Aj" A¤
jF\r ,¯
! ,AH@  (¤
 A¤
j AH" (¨
  {
 AH@  (¤
 (¨
|
  (¬
6  )¤
7 ,¯
AH@ (¬
 (¤
k ,ƒAH@ (€ (ø
k At"6ø
 BŒ€€€€‚€€€7ü
 Aã	(6 AÛ	)7 A: A¤
j 
(}  Aø
j6” A˜j  Aø
j A”j@ (˜"Aj" A¤
jF\r ,¯
! ,AH@  (¤
 A¤
j AH" (¨
  {
 AH@  (¤
 (¨
|
  (¬
6  )¤
7 ,¯
AH@ (¬
 (¤
k ,ƒAH@ (€ (ø
k At"6ø
 BŒ€€€€‚€€€7ü
 AÖ	(6 AÎ	)7 A: A¤
j 
(}  Aø
j6” A˜j  Aø
j A”j@ (˜"Aj"
 A¤
jF\r ,¯
! ,AH@ 
 (¤
 A¤
j AH" (¨
  {
 AH@ 
 (¤
 (¨
|
 
 (¬
6 
 )¤
7 ,¯
AH@ (¬
 (¤
k ,ƒAN\r (€ (ø
k  6 
  6œ
  (A
j6  )œ
7X  AØj  ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6˜
  Aj6”
  )”
7`  AàjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6
  Aj6Œ
  )Œ
7h  AèjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6ˆ
  Aj6„
  )„
7p  Aðj
A<t"B7 Aì6 B7 B7 B7  A6( B74 B€€€ü7, AA AF6@ 
E\rA„\n! 
(A
k"AM@ At(Ü! A:ƒ A:ý
 A„\r(6ø
 Aˆ\r-:ü
 \\"A÷ÿÿÿO\r@@ AO@ Ar"A
jt!
  Aÿÿÿÿk6¬
  
6¤
  6¨

  :¯
 A¤
j!
 E\r
 E\r 
  ü\n  
jA:  Aø
j6” A˜j Aj Aø
j A”j@ (˜"
Aj" A¤
jF\r ,¯
! 
,AH@  (¤
 A¤
j AH"
 (¨
  
{
 AH@  (¤
 (¨
|
  (¬
6  )¤
7 ,¯
AH@ (¬
 (¤
k ,ƒAN\r (€ (ø
k  6€
  Aj6|  (A
j6  )|7    ("A
k6 \r  ((
 r A j$ 	 
#Ak"$@ ( ,"
 
AHE\r (" (F\rA<t"
B74 
B€€€ü7, 
A6 
Aì6 
B7 
B7 
B7$ 
 Aj")7 
 (6 A: A: Ak(!  
6  
Aj6 A$j Aj@ ("
E\r 
 
("A
k6 \r 
 
((
 
r ,AH@ (A: A6
 A: A: Aj$ª

~A
!@@@ (Ak


























 ( ,"
 
AH"
"E\r
  ( Aj 
"j!
 !@@ 1"B?V\rB
 †B€Ì€€ƒP\r A
j" 
G\r
  kAFA! Ã	
	#Ak"$ ("(" ("kAu!@  F\r@  
Atj(E\r
 
A
j"
 G\r !
@ 
 O\r@  A
k"Atj(@ " 
K\r
A<t"B7 A
6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6  Aj6 A0j!  
At"j!  At"
j!@ 
 kAu"	 (" ("kAuM@ ("
 k"Au 	I@  j! 
 G@@ (!
 ("@  (A
j6  
6 (!
  6@ 
E\r 
 
("A
k6 \r 
 
((
 
r Aj! Aj" G\r (!
 
!  G@@  (6  ("6 @  (A
j6 Aj! Aj" G\r  
  
kj6  G@@ (! ("
@ 
 
(A
j6  6 (!  
6@ E\r  ("
A
k6 
\r  ((
 r Aj! Aj" G\r (!
 
 G@@@ 
Ak("E\r  ("A
k6 \r  ((
 r  
Ak"
G\r  6
 @ ! (" G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak"G\r ( (!  6 k A6 B7A!@ 	A€€€€O\rAÿÿÿÿ
 Au" 	  	K AøÿÿÿO"A€€€€O\r  At"t"6  6   j6  G@@  (6  ("6 @  (A
j6 Aj! Aj" G\r  6
 ( Aj@ ("E\r  ("
A
k6 
\r  ((
 r ("(! (!  G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak"G\r  6 Aj$Aî\n

A
"AðØ6 A°ÙAç
#A k"$ ($" (("
G@@ ( Aj" 
G\r@ (AG\r ($" (("F\r !@@@@ (("
AkAI\r@ 
!





  k"AH\r
  t"
6  
6  
 j6 A6 B7  Aj6  Aj6@ Aj!@@ ((!















  Aj!    Aj"G\r Aj" G\r
  ($"@ "
 (("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak"G\r ($!
  6( (, 
k  (6$  (6(  (6, A6 B7 ("E\r "
 ("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak"G\r (!
  6 ( 
k ("E\r "
 ("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak"G\r (!
  6 ( 
k A j$Þ

#Ak"$ @ 
("E\r (" (F\r Ak(! 
("@  (A
j6 Aj!  6  6 A$j Aj@ ("E\r  ("A
k6 \r  ((
 r  
@ 
("
E\r 
 
("A
k6 \r 
 
((
 
r Aj$ª} (  ,"AH""\n!	 (  "!#Ak"$ !@ AO@ 	(A•ÓÇÞl"Av sA•ÓÇÞl A•ÓÇÞls! Ak! 	Aj!	
@@@@ A
k
 	-At s! 	-
At s!  	-sA•ÓÇÞl! Aj$ A\rv sA•ÓÇÞl"Av s"!	 @ 
("E\r 
( A
k q i"A
M\r   I\r  p"Atj("E\r ("E\r A
k! A
K!@@ 	 ("G@@ E@  q!
  I\r  p!  F\r
 ( ," AH G\rA ( Aj AH! \n!@@ "AO@  rAq\r
@ ( (G\r Aj! Aj! Ak"AK\r E\r
@ -"\r -"F@ A
j! A
j! A
k"\r
 \r k
AE\r ("\rA t" 	6 A6 Aj!@ (",AN@  (6  )7
 (!\n@@@ ("A\nM@  :
 A÷ÿÿÿO\r
 Ar"A
jt!  Aÿÿÿÿk6  6  6 ! A
j"@  \n ü\n
u A6 B7 
*! 
(A
j³!@ @  ³” ]E\r
@A  A
kqAG AIr A
tr"  •ü
"  K"A
F\r   A
kqE\r o" 
("M@  O\r
 
(³ 
*•ü
! @ AI\r iA
K\r A
A  A
kgkt AI
 o"  K" O\r
 
!@@ "@ A€€€€O\r
 At"t!\n (!  \n6 @ ( k (!\n  6 @ \nA ü ("E\r Aj! (!@ i"A
M@  A
kq!
  I\r  p! \n Atj 6 ("E\r A
k! A
K!\r@ (!@ \rE@  q!
  I\r  p!@  F@ !
 \n Atj"(E@  6 ! !
  (6  ((6 ( 6 ("\r (! A6 @ ( k A6
 
(" A
k"qE@  	q!
  	K@ 	!
 	 p!@ 
(" Atj"	("E@  
(6 
 6 	 
Aj6 ("E\r
 (!@  A
k"	qE@  	q!
  I\r  p!  Atj 6
  (6  6 
 
(A
j6A
:  6Ÿ

#Ak"$  
6 Aj Aj 
 Aj@ ("Aj"
 F\r ,! ,AH@ 
 (  AH" (  {
 AH@ 
 ( (|
 
 (6 
 )7 Aj$}
 
\\"A÷ÿÿÿI@@@ AO@ Ar"A
jt!  Aÿÿÿÿk6  6  6
  : ! E\r
 E\r  
 ü\n  jA: Î

#Ak"$ @ 
("E\r ( ("F\r Ak(! 
("@  (A
j6  6  6 A$j Aj ("E\r  ("A
k6 \r  ((
 r@ 
("
E\r 
 
("A
k6 \r 
 
((
 
r Aj$
 (" ("I@  
(6  
(6 
B7  Aj6@  ("k"Au"A
j"A€€€€I@Aÿÿÿÿ
  k"Au"   I AøÿÿÿO" A€€€€O\r AttA" j" 
(6  
(6 
B7  Atk!
 @ 
  ü\n   Atj6  Aj"6  
6 @ k  6Ú
#A0k"
$ ("(" ("G@ !@@@ (E\r
 Aj" G\r@ (  Aj" G\r
A<t"B7 A
6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, 
 6 
 Aj6 
A: 
AŒ\n(6 
A\n-: 
A: 
A: 
AôäÕ«6 
A: 
 
Aj6$ 
A(j Aj 
Aj 
A$j@ 
(("Aj" 
F\r ,AN@  
(6  
)7
  
A{ 
,AN\r 
( 
(k 
,AH@ 
( 
(k (! (0"@ " (4"G@@@ Ak("E\r  ("A
k6 \r  ((
 r  Ak"G\r (0!  64 (8 k A68 B70  (60  (64  (68 A6 B7 ( 
Aj 
("E\r  ("A
k6 \r  ((
 r ("(" ("G@@@ Ak("E\r  ("A
k6 \r  ((
 r  Ak"G\r  6 
A0j$ A÷Ú,AH@AôÚ(AìÚ(k AƒÛ,AH@A€Û(AøÚ(k AÛ,AH@AŒÛ(A„Û(k A›Û,AH@A˜Û(AÛ(k A«Û,AH@A¨Û(A Û(k A·Û,AH@A´Û(A¬Û(k AÃÛ,AH@AÀÛ(A¸Û(k AÏÛ,AH@AÌÛ(AÄÛ(k AÛÛ,AH@AØÛ(AÐÛ(k AçÛ,AH@AäÛ(AÜÛ(k Aì6  Aì6 k•
#Ak"$ Aj"
($"@ " 
(("G@@@ Ak("E\r  ("A
k6 \r  ((
 r  Ak"G\r 
($! 
 6( 
(, k 
Aj"("@@ (! ,AH@ ( (k ,AH@ ( (k k "\r (! A6 @ ( k 
,AH@ 
( 
(k Aj$ kµ
 (!@@@@@@@@@@@@ ( Ak
  
A
j"M@  
6A A
k! (!@@ 
! !
@  j"-"A<G@ A\nk


 
 j-A/G\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r  j-A>F\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÓG\r -"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r  j-A>F\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÓG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÙG\r -"A k  AákAÿ
qAIAÿ
qAÌG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r  j-A>F\r A\nj" O\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAØG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -	"A k  AákAÿ
qAIAÿ
qAÁG\r  j-A>F\r\r 
A
j" G\r !  6A 
Aj" O\r Ak! (!@@ 
 j"-A\nk\n\n /A­Ús -A>srE\r 
Aj! 
A
j!
  I\r !
 
Aj" O\r Ak! (!@@ 
 j"-A\nk		 /A¿üF\r 
Aj! 
A
j!
  I\r !
 
A
j" O\r A
k! (!@@@ 
 j-"A\nk	

	 A>F\r 
Aj! 
A
j!
  I\r !
 
Aj" O\r Ak! (!@@ 
 j"-A\nk /Aݺ
s -A>srE\r 
Aj! 
A
j!
  I\r !
@@ 
 O\rA! ( 
j-A\nk


  
6 ( !   6A  6A  6A  6A  
6A  A
j6A
Å
@  ("O\r 
 (˜O\r @ (" j-"E\r A>F@ A>:  
6  -
Aü
q:
 A
j! 
A
j A?K\rB
 ­†B€€€€€ƒP\r  A
j"K@  j-A	k"AK\r
A
 tA“€€qE\r
  :  
6  -
Aü
q:
 
A
j
A! A6  A	j"   I"\nO\r
A! !@@  j-"	A0kAÿ
qA	K\r
  	 A\nljA0k"6 A
j" \nG\r \n!  M\r
  O\r
@  j-"	A)k  A
j"K@  j-A	k"AK\rA
 tA“€€qE\r  	:  
6  -
Aü
q:
 
 k jA
j6  6A
! ç

 
 ("H@@A!@@@A
 (ΠAlj"Ak"-A)kt"AqE@ A!qE\r
A! Ak(!A! Ak-Aq@ ( j,!A! A  A1\r
  A ,A1\r
 AA
 Ak-"AqA AvAqA1E\r
A!   (A
k"6 
 H\rAÚ
#A0k"$@ (ü"
E\r@@@ 
("Aÿ
qAk
 A€qE\r
 
(" (O\r ( j-AÛG\r@ 
("E\r 
Aj! A<j!@@  Atj"(!
@@ -AqE@ (!\n
 (!\n 
A
j" (O\r 
 \nj-AÛG\r  \nj-AÞG\r 
Aj"\r ("O\r  k! \r!@@  \nj-"A	k"AMAA
 tA€€q\r@ AÛk

  A
j"G\r
  \rF\r AÝG\r A
j" O\r  \nj-A:G\r@ Aj" O\r@  \nj-A	k"
AK\r
A
 
tA€€qE\r
 A
j" I\r !A
!
@ AI\r@@  
Atj"("Aj ("O\r  \nj"	-AÛG\r 	-
AÞG\r Aj"!  M\r@@  \nj-"	A	k"AMAA
 tA€€q\r
@ 	AÛk A
j" G\r !  M\r A
j"	 O\r  \nj-AÝG\r 	 \nj-A:F\r 
A
j"
 G\r !
@@@ 
A
k" 
 
A
K 
  O"At"j"E@ ($"
E\r
Aä (, 

@ 
 K@ E\r
  Aj ü\n
  6  (6 
AI\r At"E\r Aj Aj ü\n (X! (`" (d"I\r  A
v jA " (\\ll"\r
 ($"
E\rAõ (, 
 kA!  6d  6X (`!  \rk! \n \rj!\r  (\\"	 lj! 	@ A 	ü  6  \r6  \r 36  (`A
j6`  6  6 
AH@A! 
 j!
 
 \nj-AÛG\r
 
A
j!A!	  k" AGk!A!A!A!A!@Aç  AçL!  Atj(!@@@@@  I@@@@  \nj"
-AÛk
 A
j" ("O\r
@  \nj-"A!kAÿ
qAI\r Aÿ
qA\nku   	!   	! Aj"	 (! 
  k A,j4"AÿM\rA!A!
@@@ 
 jAm"AtA j("\rAu j"AtA j(Aÿÿÿq K@ A
k!

  \rAvA
q j"AtA j(AÿÿÿqM\r
 A
j! 
 N\r
 AN\r  F\r A
j!  A
j"Atj(! 	 M\r A
j"
 O\r 
 \nj-A:G\r@  Aj"
K@@ 
 \nj-A	k"AK@ !A
 tA€€qE@ ! 
A
j"
 G\r A
j" O\r  Atj"
(! 
(!
  
6  
  Aj A(j A$j5E\r   Atj"  k ( Aj Aj Aj A j Aj6! (!
@ E\r 
  ("Atj(I\r (" j!   j"Atj(!  F
  
6  
6 A!A
! 
 I\r@@@@  G@   	  AtjA  A,j Aj7"
\r   (,"\r (8"E@ \rk  -A
r:
   \n j 	 k8"E\r@ E@  (  (  AtjA\n Aj" Aj7! -!
 \r  
Ar:
  ( "
 (j6  ( 
k6  ((6  ($6 A
j!
 
AN\r
A!\r 
A
q (k - 
Aq@ (kA! 
 j! 
E\r A	F\r
 A F\r
 AkAI\r
   	!   	! (, j!	 (, j!  F!
 A
j! 
E\r
  I\r
 @  F@ A6ü  (€ AtkAk6€ At!  kAt"
@   j 
ü\n (ü"
 
( k6  (€ k6€
 (ü"
\r 
(!@ AÿqA†F@ 
("AI\r
 
 A
k6  (€Ak6€ A6ü
 
 A€~qA	r6 A0j$ ¡
@ 
("E\r 
 Al"Av6 
 A|qj"6@@@ E@ ($"E\r
Aä (, A 
("At"@ A ü 
("E\rA!@@ 
( 
(" 
(" lj"( 
(pAtj"("E@  6
@  I\r    ljO\r ( ( ( (AE\r
Aj"E@ ($"E\rAä (,   6  6 B‚€€€ 7  6
 (" ("O@  A
v j"AtAjl"E@ ($"E\rAõ (, A  6 
( ( 
(pAtj 6 (!  Atj 6  A
j6 A
j" 
("I\r
A 
(! E\rA!@@ 
( Atj("E\r 
(" M@   
( 
(ljI\r
 Aj" (AARA
! (AI\r@@  Atj"Ak"("( ("(G\r ( ( ( (A\r  (6 A
j" (I\r A
j" 
(I\rAõ

 (ˆE@A@ (€"Aj" („"
J@ A€ 
A
v 
j 
AL"
6„ (ø 
l"
E@A ($"E\rAõ (, A (ü"@  
  (økj6ü  
6ø  (€"Aj6€  6€ (ø"
\r
A 
 j"
A;
 (ˆ! 
A6 
 AtAr6 A6ˆAæ

A!@ 0\r .\r@ (€"Aj" („"J@ A€ A
v j AL"6„ (ø l"E@ ($"E\rAõ (, A (ü"@    (økj6ü  6ø  (€"Aj6€
  6€ (ø"E\r
  j" 6  At 
r Atr6A! Å
 („! (€!@@@@ (ü"-AkA
M@  Aj"H@A! A€ A
v j AL"6„ (ø l"E@A ($"E\rAõ (, A (ü"@    (økj"6ü  6ø  (€"Aj6€  6€ (ø"\r
  Aj"H@A! A€ A
v j AL"6„ (ø l"E@A ($"E\rAõ (, A (ü"@    (økj"6ü  6ø  (€"Aj6€  6€ (ø"\rA  j" 
(6
  j" 
(6  
(6  
(6  (A
j6A•
\n#A k"$AÅ»òˆx! 
 A 
?"K@@@@@  j"\n 
 k Aj4"AÿK@A!A!@@@  jAm"AtA j("Au j"	AtA j(Aÿÿÿq K@ 	A
k!
  AvA
q j"AtA j(AÿÿÿqM\r
 A
j!  L\r
 	AH\r
 A	F\r
 A F\r
 AkAI\r
 \n-A\nk


 A sA‘þ°l!   
?
  Aj@A! (At"@@  Aj j"-sA“ƒ€l -
sA“ƒ€l -sA“ƒ€l -sA“ƒ€l! Aj" G\r ( j" 
I\r A j$ Ý
@ -"À"AN\r Aà
qAÀ
F@ 
AI\r
 ,
"A¿J\r
  A6 -! -
 A?q AqAtr Að
qAà
F@ 
AI\r
 ,
"A¿J\r
 ,"
A¿J\r
  A6 -
! -! - 
A?q A?qAt AqAtrr 
AI\r Aø
qAð
G\r ,
"A¿J\r ,"
A¿J\r ,"A¿J\r @ A6 -! -
! -! -!
 A?q A?qAt AqAtr 
A?qAtrr  A
6 - ÀÒ
@@ ("	 
j-A<F@ 
 O\r 
A
j" O\r !@@@ 	 "
j-"AÜG@@@ A\nk

 A<k 
A
j!
 
A
j" O\r@  	j-"A!kAÿ
qAI\r A:kE




















































 
Aj!  I\r
  6  
6 
A
j!
 
 O\r
 
!@@@@@  	j-"AÜG@ A	k"AK\r
A
 tA€€q\r
 A
j" O\r@  	j-"A!kAÿ
qAI\r Aÿ
qA:kE




















































 Aj" I\r
 A I\r AÿF\r@@@ A(k
 AJ\r A
j!
 E\r A
k! A
j" I\r
 \r  
G\r
  
F\r  
6  6  6A
!\n \nà
@ 
(" K@ (! !	@ 	 j-A	k"\rAK\rA
 \rtA€€qE\r 	A
j"	 G\r AI@A 
(!	A
!\n  	F@A  \n6@@@@ (" 	j-"A"k
A\'!
A)!A
!  	A
j"	6  \nM\r@ 
 \nAtj(" 	K@@@@ 	 j-"\rAÜG\r 	A
j" (O\r  j-"A!kAÿ
qAI\r
 Aÿ
qA\nku


















 \rÀ F@  	6  	A
j6  \n6A
 	!  \rA(Fq\r A
j"	 I\r \nA
j"\n G\rA¸
@  
kj"\n@ \n!@   Atj("  I"	 
KA! 	 
"kAq"\r@@  ( j-: A
j! A
j! A
j" \rG\r 
 	kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" 	G\r 	 
 O\r  : A
j!  A
j"Atj(!
A ($"E\r
Aä (, A   \nk6  \n6A¶

 
(!@ 
(" 
("O  A
v jA " 
(ll"E@A! ($"
E\rAõ (, 
A 
 6 
 6 
(  
("l j! @ A ü  6  6   36 
 
(A
j6 â
#Ak"\n$ B7 B7 B7 B7@@@@@ @@ 
 j-"E\r A&F\r AÜF\r A
j" G\r 
!  6 B7 B
7  6  Aj"
6  Aj"6
  j"6 E\r
A!A!@@ 
 j"	-"A&G@ \r
  A
 G\r ( j 	-: A
j! A
j 
   \nAjHE\r  A G\r \n(" k"@ ( j 	 ü\n  j! 
@ ("@ ( AtjAk(E\r
  A G\r@ \r 	-AÜG\r A
j" O\r@ 
 j-"	A!kAÿ
qAI\r 	Aÿ
qA\nku


































































































 ! ( j 
 j-: A
j! A
j" I\r ("
 (Atj 6 (! (! !  
6  6  6  6A! ($"E\rAä (, A! (E\r (k (k (k \nAj$ â
 E@A@@  	Alj"("AO@@ 
A€9A (, ( "\r A J! Ak! \r @ 
A€9  (, ( "\r@ (" ("F\r  k! ( j!A!@A
!@@  O\r@@  j-E\r
 A
j" G\r !
 ! E\r
 
   (, ( "\r  k"E\r  j!A
!A
AØA
 (, ( "E\r 
A×A
 (, ( "\r
 	A
j"	 G\rA ($"@A´ (,  ã
#Ak"\n$ \n 6 \n 6@  \nAjA
A
E"\r (ÔAtAjj"	E@A! ($"E\r
Aä (, 
 	 6A
! (Ø"AN@ (t!@ 	 Atj  Alj"(6 A
j! ("AN\r 	 Atj A
j6@@@A\rA (, ("E@A!@ E\rA!@ 	 A
j"Atj("A
k" K@  
  Atj(  I"\r A
j!  O\r
 !  J\r  L\r    H!
 ($"E\rAš (, @  
  Atj(AAI"\r A
j" G\rA\rA (, ("E@A!
 ($"E\rA¿ (,  	! k B7Ø \nAj$ ™ 
~#A@j"	$@  
 AE"\r 
 AtjAk(!\r (t! 
(!@ "Aj! -AqE\r 	Aj!@@@@@  
(" ("  K"O@ !
  ( j  k (, ( "\r
 (!  M\r
 ! ($"E\rA´ (, A!@@ ,"AH\r !\n !@@@@@@@@@@@@@@@@@@@ Aÿ
qA
k
\n	\r\rA
!@ ( jA
j"-A\nk !  A
 (, ( "E\r ($"E\rA´ (,  AÕA
 (, ( "E\r ($"E\rA´ (,  (,! -Aq@AA  ("E@A! ($"E\rAÒ (, A!AA  ("E\r ($"E\rAö (,  -\rAÀqE\r (!@@ -Aq@  K\r
  K\r
@A\nA (, ("E@ A
j" (I\r
 ($"E\rAÒ (, @A\nA (, ("E@ A
j" (I\r
 ($"E\rAö (,  -Aq\r\r (" A
jK@@A
A (, ("@ ($"E\rAö (,  Aj! Aj!  ("I\r  kA
qE\r !AA (, ("E\r ($"E\rAö (, @ ( kA
G\r -AqE\r (,! -Aq@A\rA  ("E\r ($"E\rAÒ (, A\rA  ("E\r ($"E\rAö (,  (,! -Aq@AA  ("E\r ($"E\rAÒ (, AA  ("E\r ($"E\rAö (,  (,! -Aq@AA  ("E\r ($"E\rAÒ (, AA  ("E\r\r ($"E\rAö (,  ( kAG\r (,! -Aq@AA  ("E\r\r ($"E\rAÒ (, AA  ("E\r ($"E\rAö (,  ( kAG\r\n (,! -Aq@AA  ("E\r ($"E\rAÒ (, AA  ("E\r ($"E\rAö (,  ( kAG\r	 (,! -Aq@AA  ("E\r ($"E\rAÒ (, AA  ("E\r\n ($"E\r\rAö (, \rA ( kA
qk! (,! -Aq@ A  ("E@A!\n ($"E\r\rAÒ (, \rA! A  ("E\r	 ($"E\rAö (,  (t (Alj!\n (t \n(Alj! \n,AH@ (! (! \n(! \n)! 	B78 	B70 	B7( 	B7  B7 B7 	 7@   j  kA  	A j9@A!
A 	Aj (, ("@ ($"E\r
AÒ (, 
A 	Aj (, ("E@A!
 ($"E\rAö (,  	(0@ 	( k 	($k 	((k \r  (6@ \n-"AÛG\r -AÝG\r \n(" \n("k"AI\r ( ("kAI\r (! 	B78 	B70 	B7( 	B7  	B7 	B7@   j  jAj AF"  k Ak A 	Aj 	A j9@A!
 (,! AÝG@A	 	Aj  ("E@A! ($"E\r
AÒ (, 
A	 	Aj  ("E@A!
 ($"E\rAö (,  	(0E\r 	( k 	($k 	((k  AÝGAA A!F \n(" (j \n( kA \n(( \n(0F"\r\n -AÝG\r (!@ 
"Aj!
  (K\r ! !
 -"A q\r AtAuAq! (t! ! -Aq"E@  (Alj! (! (!\n  (Alj"(! @  -A r:  \nj!  k!@@@ -"A.k

 -AÀqE\r
 (4! Aj"\n (8K@  \nA
v \njA€qA€
j"l"E@A! ($"E\rAõ (,   68  64 -! AàAº Aÿ
qA.F"(6  (6 @ (4Aj  ü\n (4! \n! -A qE\r  -AqA  A
AAF! (" F\rA ( j  k (, ( "E\r ($"E\rA´ (, A
AØA
 (, ( "E\r ($"E\rA´ (,  ! E\r (" kA
qAA (, ("@ ($"E\rAÒ (,  A
j! (  A
jM\r@A
A (, ("E@ Aj! Aj! ( K\r
 ($"E\rAÒ (,  ! (!@ "Aj! -%AqE\r (" I\r !  
("I\r  \rO@A!@ A}qAF@@@ (" K@ (! !@@  j-"A G A	Gq\r
 A
j" G\r !  I@   j  k (, ( "\r (! !  M\r ( j-A\nk

 ($"E\rA´ (,  AÕA
 (, ( "E\r
 ($"E\rA´ (, A!@@@ 
 (! !@@  j-"A G A	Gq\r
 A
j" \rG\r \r!@  M\rA  j  k (, ( "E\r ($"E\rA´ (, AA×A
 (, ( "E\r ($"E\rA´ (, @ \r -\rA€
q\r@  ("O\r (!@  j-"A G A	Gq\r
 A
j" G\r !  AjI\r
 ( j"Ak-A G\r
 A
k-A G\r
 -A\nk


A! A×A
 (, ( "E\r ($"E\rA´ (,   
("  I! 
Aj!
A! (Ð"AN@ (t!@  Al"j(k (t" j("AN\r A6Ð 	A@k$ 0

 
(!
 ("E@ 
AGA!  
K   
A
kKÎ
 A
j" 
  ("O@A@ Aj  ("\n j-A/F"" O\r  \nj-Aß
qAÁkAÿ
qAK\r@ A
j" O\r@@  \nj-"Aß
qAÁkAÿ
qAI\r A-F\r A0kAÿ
qA	K\r A
j" G\r !AA !  AGk!\r@@@  O\r@@  \nj,"Aÿ
q"A\nk@@ A)N@@@@ A)k
A)!@@@ \n







 A F\r
Aá APE\r A
k!A!A*A A\'G!A+A A"G!
@ A	k"	AK\rA
 	tA€€qE\rA
  A
M!
@ AJ"	\r A>G\r !@ 	\r@ A/G\r A
j" O\r \n j-A>F\r AL\r@ Aß
qAÁkAÿ
qAI\r AßF\r A:G\r
  A
j"M@A!@@@  \nj,"A0kAÿ
qA\nI\r A_qAÁkAÿ
qAI\r E@A!A  APE\r
A!  A
j"G\r
A!A!	@@ Ak
 A=G\r A
j!A!A+!@@@@ A"k



 E\r
Aá AP\r A\rF\rA)!
A*! A
j!  I\rA!	 E\r  \rF\rA
  A)FA
 ! 
 A
j"Atj"(! (" I\r
  M@AA
!	  A
j6 	„
#Ak"$@ 
 O\r@@@  
j"	  
k Aj4"AÿK@A!A!@@@  jAm"AtA j("\nAu j"AtA j(Aÿÿÿq K@ A
k!
  \nAvA
q j"AtA j(AÿÿÿqM\r
 A
j!  L\r
 AH\r
 A	F\r
 A F\r
 AkAI\r
 	-A\nk ( 
j"
 I\r Aj$ 
à
@@@ AÿK@A­!@@@  jAm"AtAÀj("Au j"AtAÀj("Aÿÿÿq K@ A
k!
  AvA
q j"AtAÀj(AÿÿÿqM\r
 A
j!  N\r
 AH\r
AÐ8! 
A
6 
 A r  AÁkAI6A!A4!@@@  jAm"AtAÀ1j("Au j"AtAÀ1j("Aÿÿÿq M@ AvA
q j"AtAÀ1j(Aÿÿÿq O@ AH\rAà8! A
j!
 A
k!  N\r
A!A!@@@  jAm"AtAÐ6j("Au j"AtAÐ6j("Aÿÿÿq M@ AvA
q j"AtAÐ6j(Aÿÿÿq O@ AH\rAð8! A
j!
 A
k!  N\r
 
A
6 
 6
 ( (" lAtj! At"@ 
  ü\n 
 6  F\r ( Aÿÿÿq"A
jF@ 
  sAsA
q j6 
 
(  kj6õ

	#A k"$ B7 B7 B7 B7 A 
?! A ?!	@@@ 
 K@
  	M\r
@ \nE@   
 AjC!A! A
qE@  	  C!	A!  Atj( Aj Atj(k"\r A
j" ("I! A
j" ("I!\n 
 K\r  I\r  	K\r  I\rA! A j$ i
A!@ ("(" 
("("I\rA
!  K\r ( ( ( (A"\rA! (" 
("
I\r  
K! ‰
#Ak"$@@@ 
 O\r  
j  
k Aj4! ( 
j!
 AÿK@A!@@@  jAm"AtA j("\nAu j"	AtA j(Aÿÿÿq K@ 	A
k!
  \nAvA
q j"AtA j(AÿÿÿqM\r
 A
j!  L\r
 	AN\r
 A	F\r A F\r AkAO\r
 A
6 A 6  
 ?!

  @ Aj$ 
D
 ("(" 
("
("I@A  K@A
 ( ( 
( 
(A›”

#A0k"$ A6x#A
k"$ AjAA€
ü@@ E\r A
k! A€
j! 
 AtjAk!@ 
 Atj"(!@ !@ !@ Aj" ("O@ !
 (!	@   	j"-j-@ !  -
j-@ !  -j-@ !   	j-j-@ ! Aj! Aj"!  K\r@  K@ (!@   j"-"	j-\r A
j" G\r A
j" I\r@A
A@@@@@@ 	AÜF@A! A
j" (O\r
@  j-"A!kAÿ
qAI\r@ Aÿ
qA\nku
















 A
j I\r Aj!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÜ ;
 B7  Aj"6  6A!@@@@@@@@@@@@ 	A!k\\\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\n\r	\r
\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r A
j"\r!\n@  \rM\r@  \nj- 	G\r
 \nA
j"\n I\r !\nA!A!A!  (F\r  N"AÿM\rA!A!@@@@  jAm"AtA j("Au j"AtA j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA j(AÿÿÿqM\r
 A
j!  N\r
A! AN\rA!Aä!@@@  jAm"AtA°9j("Au j"AtA°9j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°9j(AÿÿÿqM\r A
j!  N\rA! AN  k! !@@  j-"	AàG\r
 A
j" G\r !A
 	A F! !  k"A K\r At j("\r  AtjAk(O\rA!A
!@ E@ !	 !\n
 !\n \r "	I\r@@@@ 	 \nO\r@  	j-"\rA G@ \rAàF\rA! 	A
j"	 \nG\rA! \n
 	!\r 	 \nO@A! 	!@  \rj-AàG"@ 	! \r!	 \rA
j"\r \nG\r 	! \n!	@  	 k"\rF@A!\n  Atj"("\r I@  jA
k-A F!\n A
s  Gq\r \r  \rF \nrE\r E\r
 A
j@ 	 F\rA! \rAK\r \rAt jAj"\r  \r("\r  \rK6 \r
  A
j"M@A
!  Atj"\n(!	 \n(!\n
 (! \n@ A
k!
 Ak(" ("O\r@  j-"A G A	Gq\r
 A
j" G\r !@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"Aà;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"Aà;
 B7  	6  6 (t (x"Alj"Ak" Ak6 A(k" A
k6  -Ar:  -Ar:A! ! 	! ! 	 (M\r@@@ 
  jA
v"Atj"( 	K@ E\r
 
 AtjAk( 	I\r
 A
k! 	 (K\r
 ! 	! A
j!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"A¦;
 B7  A
j"6  6 (x"AL\r (t" AljAk-A&G\r (|" L@ AÀ A
v j AL"6|  All"E@A! ($"E\rAõ (,   6t (x!  A
j6x  Alj"A»;
 B7  A
j6  6 ("\n -AÀq\r\n    k"  \n Aj>\r ("	 AjM\r	 -
A!G\r	  Aj"j-A-G\r	 -A-G\r	A! (è" K  \nAkOq\r	@ Aj" 	 \n 	 \nI"\rM@  j"	/A­Ús 	-A>srE\r\r@@ A
j!	 Aj" \rK\r 	" j"	/A­Ús 	-A>sr\r
 	!  \nI  A
j"Kq@  Atj"(!	 (!
  6è (!	A
! -A
qE\r A
j" O\r  j-AüG\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"Aü;
 B7  Aj"6  6 ("Aj K\r  Ak"\rj"/A֔
s -A÷sr\r@  \rF\r  \rN"AÿK@A!A!@@@@  jAm"	AtA j("\nAu 	j"AtA j(Aÿÿÿq K@ A
k!
  \nAvA
q 	j"AtA j(AÿÿÿqM\r
 A
j!  N\r
 AN\rA!Aä!@@@  jAm"	AtA°9j("\nAu 	j"AtA°9j(Aÿÿÿq K@ A
k!
  \nAvA
q 	j"AtA°9j(AÿÿÿqM\r
 A
j!  N\r
 AH\r\r
 A	F\r A F\r A\rkA}K\r A!kAI\r A:kAI\r AÛkAI\r AÿG AúKqE\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"A®;
 B7  A
j"6  \r6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 Aj!@@ ("	Aj K\r  Ak"\nj(AèèуG\r  M\r /
A¯ÞF\r
@ 	Aj K\r  Ak"\nj"\r(Aèèуs \r-Aósr\r  M\r /
A¯ÞF\r
 	Aj K\r  Ak"\nj"/Aæè
s -Aðsr\r  M\r /
A¯ÞG\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"Aº;
 B7  6  \n6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 A
j! (A
j K\r	@ A
k-"Aß
qAÁkAÿ
qAO@ Aj O\r A0kAÿ
qA\nO\r
 Aj O\r\n  A
j"j-"A0kAÿ
qA\nO@ A_qAÁkAÿ
qAK\r\n@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÀ;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 A
j!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÝ;
 B7  A
j"6  6\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" 6A
!A

 A
j" O\r
  j-AÛG\r
@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" 6A!!A!  :  	: B7   j"6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÄ;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÄ;
 B7  6  6\n@@ E@  -\rA qAvq\r
 E\r
@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"A:  	: B7  A
j"6  6\n@@@@@@@@@@@AA@@AA@@@@@@@@@@@@@@ 	>\r"""""""""""""""""""""""""""""""
""""""""""""""""""""""" 	AÞF\r
 	AþG\r!A!	 A
j"\n!@  \nM"\r@  j-AþG"	\r
 A
j" I\r !  k"A
G\r ("A€€qE\r \rA!	A!  \nj ( \nkA4"AÿK\r A	F\r A F\r AkA
M\rAA! A
j" I\r	 -AqE\r A
j"!@  M\r@@  j-AÞG\r
 A
j" I\r ! !  kA
G\r%A!	A!  j ( kA4"AÿM@ A	F\r
 A F\r
 AkA
M\r
A@@@  	jAm"AtA j("\rAu j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q j"AtA j(AÿÿÿqM\r A
j!	  	N\rA \nAN\rA
A!  (F\r  N"AÿM\rA!A!@@@  jAm"	AtA j("\rAu 	j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\r ! \nAN\r ! -A qE\r A
j" O\r@  j"	-A=F@  A
j"K\r
 !  kAG\r"A!A!AA 	 ( kA4"AÿM@A! A	F\r A F\r AkAI
@@@  jAm"	AtA j("\rAu 	j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! -A€
qE\r A
j" O\r@  j"	-A+F@  A
j"K\r
 !  kAG\r!A!A!AA 	 ( kA4"AÿM@A! A	F\r A F\r AkAI
@@@  jAm"	AtA j("\rAu 	j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\rA!\n \nAN!@@@  	jAm"AtA j("Au j"\rAtA j(Aÿÿÿq K@ \rA
k!
  AvA
q j"AtA j(AÿÿÿqM\r A
j!	  	N\rA \rAN\rA
A!  (F\r\r  N"AÿM\rA!A!@@@  jAm"	AtA j("Au 	j"\rAtA j(Aÿÿÿq K@ \rA
k!
  AvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\r ! \rAN\r\r ! ! AK\r (! ! A€qE\rA!  (M\r	  N"AÿM\rA!\nA!@@@@  \njAm"\rAtA j("Au \rj"AtA j(Aÿÿÿq K@ A
k!
  AvA
q \rj"\nAtA j(AÿÿÿqM\r
 \nA
j!\n  \nN\r
 AN\r\nA!\nAä!@@@  \njAm"\rAtA°9j("Au \rj"AtA°9j(Aÿÿÿq K@ A
k!
  AvA
q \rj"\nAtA°9j(AÿÿÿqM\r \nA
j!\n  \nN\rA! AN@  j-A$F@  A
j"K\r
A
! !  kAK\rA!  (M\r  N"AÿM\rA!A!	@@@@  	jAm"\nAtA j("Au \nj"\rAtA j(Aÿÿÿq K@ \rA
k!	
  AvA
q \nj"AtA j(AÿÿÿqM\r
 A
j!  	L\r
 \rAN\rA!Aä!	@@@  	jAm"\nAtA°9j("Au \nj"\rAtA°9j(Aÿÿÿq K@ \rA
k!	
  AvA
q \nj"AtA°9j(AÿÿÿqM\r A
j!  	L\rA!\r \rAN@ A
j" O\r@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" I\r ! 	A F@ !  kAI\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\r Aõ (,    A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"A:  	: B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"A€ ;
 B7  A
j"6  6 A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr!@ E\rA!	A!@  j" ( k"A4"AÿM@ A	F\r A F\r AkAO\r
@@@  	jAm"AtA j("\rAu j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q j"AtA j(AÿÿÿqM\r
 A
j!	  	N\r
 \nAN\r
A!Aä!  A4"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"	AtA°9j("\rAu 	j"\nAtA°9j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA°9j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! !  A
q "E\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" : A$: B7  6  6 A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr!@ 	E\rA!	A!@  j" ( k"A4"AÿM@ A	F\r A F\r AkAO\r
@@@  	jAm"AtA j("\rAu j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q j"AtA j(AÿÿÿqM\r
 A
j!	  	N\r
 \nAN\r
A!Aä!  A4"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"	AtA°9j("\rAu 	j"\nAtA°9j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA°9j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! !  A
q "E\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" : Aþ: B7  6  6 A	F\r A F\r AkA
M\r !
A
! ! A
qE\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t All"	\r
A! ($"E\rAõ (,   A
j6x (t"	\r
A!  	6t  (x"A
j6x 	 Alj" : Aþ: B7  \n6  6A! !  kAG\r@@  (F\r  N"AÿK@A!A!@@@  jAm"	AtA j("\rAu 	j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\r ! \nAN\r
 ! A	F\r A F\r AkA
M\r !
A
! ! A
qE\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t All"	\r
A! ($"E\rAõ (,   A
j6x (t"	\r
A!  	6t  (x"A
j6x 	 Alj" : A+: B7  6  6A! !  kAG\r@@  (F\r  N"AÿK@A!A!@@@  jAm"	AtA j("\rAu 	j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\r ! \nAN\r
 ! A	F\r A F\r AkA
M\r !
A
! ! A
qE\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t All"	\r
A! ($"E\rAõ (,   A
j6x (t"	\r
A!  	6t  (x"A
j6x 	 Alj" : A=: B7  6  6 A	F\r A F\r AkA
M\r !
A
! ! A
qE\r	@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t All"	\r
A! ($"E\rAõ (,   A
j6x (t"	\r
A!  	6t  (x"A
j6x 	 Alj" : AÞ: B7  6  6	@ Aj" 	O\r -
A?G\rA!@ (ì" M@ !
 !  \nAkO\r
 Aj" 	 \n 	 \nI"\rM@  j/A¿üF\r@@ A
j!	 Aj" \rK\r 	" j/A¿üG\r
 	!  \nI  A
j"Kq  Atj"(!	 (!
  6ì (!	@ 	 M\r -
A!G\r  j-Aß
qAÁkAÿ
qAK\r@ Aj" 	O\r@  j-Aß
qAÁkAÿ
qAK\r
 A
j" 	G\r 	!A! (ð" K  \nA
kOq\r A
j" 	 \n 	 \nI"\rM@  j-A>F\r@@ A
j!	 Aj" \rK\r 	" j-A>G\r
 	!  \nI  A
j"Kq  Atj"(!	 (!
  6ð (!	@ A	j" 	O\r )B¼ÂìšÄ¨ªÁ… 1Bۅ„BR\rA!\r (ô" K  \nAkOq\r@ Aj" 	 \n 	 \nI"	M@  j"/Aݺ
s -A>srE\r@@ A
j! Aj" 	K\r  "j"/Aݺ
s -A>sr\r
 !  \nI  \rA
j"\rKq@  \rAtj"(!	 (!
  6ô (!\n ! A
j" \nO\r@ Aj" \nO\r  j-"	A0kAÿ
qA\nIA
 	Aß
qAÁkAÿ
qAIE\r@  j-"A0kAÿ
qA\nI\r Aß
qAÁkAÿ
qAI\r A+k"AK\r
 A
F\r
 Aj" \nF\r@  kA K\r
  j-"	A:F@  \nO\r@  j-"	A	k"AMAA
 tA€€q\r 	A>G@ 	A I\r 	A<F\r 	AÿF\r A
j" \nG\r
A0!	 A
j@ 	A0kAÿ
qA\nI\r 	Aß
qAÁkAÿ
qAI\r 	A+k"	AK\r 	A
F\r A
j" \nG\r !@@@  j,"	A0kAÿ
qA\nI\r 	A_qAÁkAÿ
qAI\r 	E\rA‹ 	APE\r
 \n A
j"G\r
\n !  M\r 	AÀG\rA!	 A
j"\r \nO\r@@@@  \r"j-"\rA0kAÿ
qA\nO@ \rA_qAÁkAÿ
qAK\r
 	A
j!	
@ 	AL"\r \rAÿ
qA-G\r 	A
j!	
 \r
 \rAÿ
qA.G\r
A!	  j-A-F\r 	A?J\r\n \n "A
j"\rK\r
\n ! \r \rAÿ
qA>G\r  j-A-F\rAð!	 Aj!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\r\rAõ (, \r  A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" 	Ar: A<: B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\r\rAõ (, \r  A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" 	Ar: A>: B7  6  A
k6 (t (x"Alj"Ak Ak6 Ak A
k6 ! !  6@@@ (x" (|"N@ AÀ A
v j AL"6| (t All"E\r  6t  (x"A
j6x
  A
j6x (t"E\r  Alj"A¼(;
 B7  6  6@ (x" (|"N@ AÀ A
v j AL"6| (t All"E\r  6t  (x"A
j6x
  A
j6x (t"E\r (!  Alj"A¾0;
 B7  6  6 (t (x"Alj"Ak Ak6 Ak A
k6A! !  (M\r@@ 
  jA
v"Atj"( K@ E@ !  
 AtjAk(K@ ! A
k!
 ( O@ !\n A
j!  M\rA! ($"E\rAõ (, A! A
j! A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr"! A
s 	AßFq!@  \nF\rA!A!@  \nj" ( \nk"A4"AÿM@ A	F\r A F\r AkAO\r
@@@  jAm"AtA j("Au j"AtA j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA j(AÿÿÿqM\r
 A
j!  N\r
 AN\r
A!Aä!AA
A  A4"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"AtA°9j("Au j"AtA°9j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°9j(AÿÿÿqM\r A
j!  N\rA! AN"A
q As qA
q"!A  ! ! \n!  rE\r  kAp!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" AtA# AG  LqAA  NA AJr" AFrA@k:  	: B7  \n6  6 \n \r"M\r@@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÄ;
 B7  \r6  \r6 \rA
j"\r \nI\r ! \n!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x (!  Alj"Aÿ ;
 B7  6  6A! A
j$@ "	\r  
A (xAÏAJ@ (à"AN@ A
k!\r A€j! AØj! Aj!@ (t" Al"j"	(!@ 	-"AÄF\r 	(!A!A! AN@   Alj"(Alj! Al! 	(! 	-A q@ 	A!: 	 A
k"6A!!  j!  I@ ( I\r
  I@ ( I\r
@  I@ A!G\r
 AÛG\r (A€€ÀqE\r 	(" (O\r ( j-AÞG\r 	 A
j"6 (t j"(" M\r  ( j  kK"E\r ("E@  (pA
j"6p  6  (A
j6 	 6 	 (6 	 	-A”
r:  -A˜
r: (! 	(! 	(@@@@ -\rA qE\r 	-AÛG\r E\r 	(" 	("kA
G\r -AÛG\r
 E\r
 ( ("kA
G\r
 -AÝG\r
  A
kG\r
 ( ("kA
G\r
  (A
jG\r
@@ A
j" N"@ !
 (t! !@@  Alj"\n-"AÄF\r AüF\r \n( kAäK\r \n-AqE\r \n(! A
j" H\rA!\n \n  \n(" F\r  kAäK\r  I@ (!@@  j-A\nk A
j" G\rA!@   Atj"("L@ (t!@  Alj(" N\r  6  ("L@ (t!@  Alj(" N\r  6 Aj"AG\r \n@@ \n( (I@@  L\r  kAk! (t!A!  AsjAq"@@  AljAÄ;
 A
j! A
j" G\r AI\r@  Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" G\r \n \n-Ar: 	 \n(6
@ \r  kAk! (t!A!  AsjAq"@@  AljAÄ;
 A
j! A
j" G\r AI\r@  Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" G\r  \n(6 	 (6  (6 (t" j" 6  j" 6  -Ar:  -Ar: (! 	(!  
 A
j L ( 	 (6  (6 (t" j" 6  j" 6  -Ar:  -Ar: (! 	(! ( \r (!
 (" ("G\r ( A
jK@ -AÀq\r  
   ( AjM
 	-AÀq\r  
  	(  AjM"AH\r E\r  (6 (t Alj(!
@  ("O\r (" j-A(G\r A
j!\nA! \r!@@@ 
  jA
v"Atj"( K@ E\r 
 AtjAk( I\r A
k!
  (M\r A
j!  O\rA!@@ A
j" 
 Atj("I@@  j-A	k"AK\rA
 tA€€qE\r A
j" G\r !  6@  O\r  j-A\nk A
j" O\r 
 Atj(!  6@  O\r  j-A)G\rA! A6 B7  6  6 A
j!A

   
 Atj"(" Aj Aj 5E\r
@    k ( Aj A j A,j A(j A$j6@ ( " j! (," F! 
  j"Atj(! (!
  ("6(  6$A
!A!@  I@@  j-"A	k"AK\rA
 tA€€qE\r A
j" G\r A
j" O\r  
 Atj("j-! Aÿ
qA)G\r
  A
j"6 ($" (("M@A! A6 B7A

  k! @ A6  6   j"6A

@ j"@ 
 Atj!A! !@   Atj("  K" KA!  "kAq"@@  ( j-: A
j! A
j! A
j" G\r  kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" G\r   O\r A\n: A
j!  A
j"Atj(! ($"	E\rAä (, 	 A
6  6   k6 (!A! (x" \nL@  6 (t! \n!@   Alj"(K@@ -AqAG\r  ("Alj( I\r \r k A
j" H\r
  6  \nL\r
  kAk! (t!A!  AsjAq"@@  \nAljAÄ;
 \nA
j!\n A
j" G\r AI\r
@  \nAlj"AÄ;
 AÄ;
L AÄ;
8 AÄ;
$ \nAj"\n G\r
 	-AÀq\r
  
  	( ( AjM"AH\r E\r
 	 	-Ar:  -Ar: Aj" (tj (6 (t j (6  (tj (6( Aj! (t! (@  Alj (Ð6  6Ð  Alj (6 	(! (! 	-!  
 A
j L   AÛF"!   !   !   ! 	! /
AŒqE\r@@ "Aj! -$"AÄG"\r  I\r
 À! !@@ "Ak! \r  	K\r
 -%"AqE\r E\r ( 	(G\rA‡ APE\r (   (tkAmG\r Ak( (G\r AÄ:$  Aï
q:% AkAÄ: Ak"	 	-Aï
q: "AN\r B7à A6¸ @A!	 A6Ô (x"AL\r (t!A!@@  	Alj"-"Aq\r -AüG\r ( (kA
G\r A6  Ar:@ (ØAH@  	6Ø
  (ÜAlj 	6  	6Ü  A
j"6Ô 	A
j"	 G\rA!	A!	  
A (xL
A!	 A0j$ 	Þ
#Aðk"$ B7h B7` B7X B7P B7H B7@ B78 B70 A6( B7  B7 B7 B7A!	@     Aj AÐj9\r   A Aj A0j9\r  6( (,!	 
@  Aj 	 ("	E@A!	 ($"E\r
AÒ (, 
  Aj 	 ("	E@A!	
 ($"E\rAö (,  (`@ (Pk (Tk (Xk (@@ (0k (4k (8k Aðj$ 	Ý

@ 
(" 
("I@ 
(!
 
( A
v jA "At"l"E@A ($"E\rAõ (, A 
 6 
( Ajl"E@A ($"E\rAõ (, A 
 6 
 6 
(! 
( Atj 6  
(Atj 6 
 
(A
j6AÜ
 
A
j!@@@ 
Aj" O\r  j-A#G\r  
j-A rAøG\r !@@@@  j-"A0kAÿ
qA\nI\r AÁkAÿ
qAI\r  kAK\r AákAÿ
qAI\r
  kAK\r A
j" G\r !  F\r  kAI\r
@ 
Aj" O"\r  j-A#G\r !@@  kAK\r
  j-A0kAÿ
qA	K\r
 A
j" G\r !  F\r  kAI\r
  M\r
  j-Aß
qAÁkAÿ
qAK\r
  \r@@  j-"Aß
qAÁkAÿ
qAO@   kA0K\r A0kAÿ
qA\nI\r
   kA0M\r  A
j" G\r " 
kAkA.K\r
  M\r  j-A;G\rA
!  A
j6 ³
#Ak"$@@  O\r (!@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" G\r !
  O\r (!@  jA
k-A	k"AK\r
A
 tA€€qE\r
 A
k" K\r !  6  6  6@ 
 Aj (, ("@ ($"E\r
Aš (, 
  AjA
<"\r 
 Aj (, ("E@A!
 ($"E\rA¿ (,  Aj$ à!
#A0k"\r$  H@ A¸j! A€j! \rAr! \rAr! 
(!@@ (t"
 Al"j"	-"Aq@ AqE\r
@ E\r 	,"
E\r  
[\r 	(!
 	,"\nAÿ
q"E\r  \n[E\r 	(" I\r@@@@@@@@@@@@@@@@@ A!k^
	 (! A
q@ AN@ 
 Alj"
 
-AÀr: 	 6  6 AH\r  
 Alj"(6¸  6 	 6@ (ä"AN@ 
 Alj 6
  6à  6ä A6 A
j" (xN\r 
 Alj"
-A;G\r (  
(" \rHE\r 	 6 
 6 	 Ar: 
 
-Ar: 	 6 AqE\r \r A€A˜ \nA*Fj"Aj6 AÀ
q"AÀ
F@A! 
 \r Aj6 A€
F\rA!  Aj6A
! A°A´ 	( kA
Fj!\n@ AqE\rA! \n("AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6 	 6 
 
-Ar: 	 	-Ar:\r A
qE\r 	 \n(6 \n 6@ AqE\rA! (Ä"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6 	 6 
 
-Ar: 	 	-Ar: A
qE\r 	 (Ä6  6Ä@ AqE\r (¼"AH\rA! 
 Alj"( (k 	( kG\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r@ A
j" N\r  kAk!A!  AsjAq"\n@@ 
 AljAÄ;
 A
j! A
j" \nG\r AI\r@ 
 Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" G\r  6 	 6  -Ar: 	 	-Ar: A6¼ A
qE\r\n 	 (¼6  6¼\n 
 A
j"Al"j"(! (! \r 6 \r 	("6, \r 	6( \r 	6$ \nAÀF@    \rA
AAA¨ \rA(jOAL\r\n \r(!  O\r  N"AÿM\rA!A!@@@  jAm"AtA j("Au j"AtA j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA j(AÿÿÿqM\r
 A
j!  N\r
 AN\r 	( kAG\r@ AqE\rA! (À"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6 	 6 
 
-Ar: 	 	-Ar:	 A
qE\r 	 (À6  6À 	( kAG\r@ AqE\rA! (È"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6 	 6 
 
-Ar: 	 	-Ar: A
qE\r 	 (È6  6È 	( kAG\r@ AqE\rA! (Ì"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6 	 6 
 
-Ar: 	 	-Ar: A
qE\r 	 (Ì6  6ÌA!A! A	F\r
 A F\r
 AkAI\r
 ( jA
k,"@Aó AP\r
 \r((" 
I\r A
k!@@@ -AÄF\r ( K\r  (O\r -"Aq\r
 Ak" 
O\r
 AqE\r    \rA,jAA.AAè \rA$jOAH\r \r(,!@ \nAÀF\r@  O\r (" j-A/G\r  A
j  \rA,jAA/A‰A \rA$jOAH\r \r(," O\r  j-A/G\r \r A
j"6,@  O\r ( j-A?G\r  A
j  \rA,jAA&AƒA¥ \rA$jOAH\r \r(,!  O\r ( j-A#G\r  A
j  \rA,jAAAAë \rA$jOAH\r \r(,!@  O\rA!A!@ ( j" ( kA4"AÿM@ A	F\r A F\r AkAO\r
@@@  jAm"AtA j("Au j"AtA j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA j(AÿÿÿqM\r
 A
j!  N\r
 AN\r
 ,"@A± A	P\r
 \r($" 
 (xAlj"
O\r@@@ -AÄF\r ( M\r ( K\r -"Aq\r
 Aj" 
I\r
 AqE\r 	 6 	 6  \n:  6  6 (t" j"
 6  j" 6 
 
-Ar:  -Ar: \r Atr 6 A q! A
j! Aà
qAà
G@ \r Atj Aj6 Aj! A
s AGqE@ \r Atj Aj6 A
j! Aq! A
q!A!A!A!A!@@ \r Atj"(("AH\r 
 Alj! @ ( (M\r
 ! !@ (("AH\r 
 Alj! @ ( (M\r
 ! ! Aj! Aj" G\r@ E\r \r Atj(("AH\r 
 Alj! @ ( (M\r
 ! ! E\r 	(! (! (! !\n@@@@@@ 
 Alj"-"A!k\n
 AÛk
 A€A˜ A*Fj -"AtAuAqj!\n@ AvAk \nAj!\n A°A´ ( (kA
Fj!\n \nAj!\n@  k"  k"K@ 
 (" (k k j"Al"j"
 (6 
 )7 
 )7   k"6 
 6 (t j \n(6 \n 6
  O\r 
 Alj j"
 	(6 
 	)7 
 	)7 	  k j"6 
 6A!\n@   \nAtj"("
L@@ 
AN@  (t 
Alj("
6 
 N\r \nA
j"\nAG\r (t" Alj"
 6  j" 6 
 
-Ar:  -Ar:
 A
qE\r A€A˜ \nA*Fj AtAuAqj!
@@@ AvAk
 
Aj!

 
Aj!
 	 
(6 
 6 	-"
AqE\r 
Aq@ (t 	(Alj(!
 	(! A
j" H\r \rA0j$–
#Ak"$@ (E\r 
 3! (  (pAtj("E@A!
@  ("I\r   ( (ljO\r  (F@ ( ( 
 AE\rA!
  6  6  
6  Aj6 Aj!@ ("@@   A
v"
Atj"D"AH@ 

 E\r Aj!  
Asj"\rA! E@A!
 (! Aj$ ý
#A k"$ Aß: A¦Ô;
A! ("A€ q@ A$:A! A€€€
q@ Aj rA=: A
j! A€€€q@ Aj rA+: A
j! A€€q@ Aj jAü: A
j! A€€q@ Aj jAÞ: A
j! A€„q@ Aj jAþ: A
j!A! Aj jA:  
   AjAJ ("AŒq@ Aq@ AÀ:A
! Aq@  rA:: A
j! A€q  rA.: A
j  rA:  
    AjJ A€jAÿ
AÐü A j$‰
 (TE@A A
k! A
k!AA
 ("\n j-A!F j!A!@@ 
  jA
v"Atj"	( K@ E\r
 
 AtjAk( I\r
 A
k!  	(M\r A
j!
@  	(M"E@@  kj"@ !@  	 Atj("  K" KA!
  "kAq"\n@@  ( j-: A
j! A
j! 
A
j"
 \nG\r  kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" G\r   O\r A : A
j! 	 A
j"Atj(!A! ($"E\rAä (, A  k
  \nj!  k! A<j  K"@  (6  (6  (6 (! A6  6 E@ k E@A (T" ( ( (jj (k"K@  k!A

A! ($"@Aè (, A!  6T ò

 ( 
j"A
k,!@ 
AI\r AN\r Ak,!@ A¿K\r A`qA@G\r A?q AqAtr 
AI\r Ak,!@ A¿J\r ApqA`G\r A¿K\r A?q A?qAt AqAtrr 
AF\r Ak-"
Aø
qAð
G\r A¿J\r A¿J\r A¿K\r A?q A?qAt 
AqAtr A?qAtrr! Ô
@ 
 F@ 
!A
!A
!	
 AØ ! AØ !AA ! E! (!A
!A
!	 
!@@@@@@@@@@   j"j"-"A0kAÿ
qA\nI\r A_qAÁkAÿ
qAI\r@ A	kAÿ
q"AO\rA€€ vA
qE\r -ÌL!
 (t!\n (!@ E@@  \n (xAlj"\nO\r@@ -AÄF\r ( M\r ( K\r -Aq\r Aj" \nI\r  6 -!@  \nI\r@@ -AÄF\r ( K\r  (O\r -Aq\r Ak" \nO\r  6 -!
  6 A
j  !\n \r
@@ Aÿ
qA(k
 A
j!A(! AL\r A
k!A)!
 A0kAÿ
qA\nI\r
 A_qAÁkAÿ
qAI\r
 Aÿ
qE\r  À"\n[E\rA!AA! 	E\r
A
!	 	@A
!	  \n[E\rA

@@ E\r Aÿ
q Aÿ
qG\r E\r
A
!A!	 A
j  !A!	A
! \rA
j!\r !
A!	  j" G\r !A \r
  A
A A 	 rj"6 \r 
 Gjç

 AG!@@@ AqE\r E\r 
Aÿ
q!@ - F\r A
k"AG! A
j"AqE\r
 \r E\r
@ - 
Aÿ
qF\r AI\r 
Aÿ
qA‚„l!@A€‚„ ( s"k rA€‚„xqA€‚„xG\r Aj! Ak"AK\r E\r
 
Aÿ
q!@  -F@  A
j! A
k"\rA‡
 A€O@ @  
 ü\n  j!@  
sAqE@@ AqE@ !
 E@ !
 !@  
-: 
A
j!
 A
j"AqE\r
  I\r A|q!@ AÀI\r  A@j"K\r@  
(6  
(6  
(6  
(6  
(6  
(6  
(6  
(6  
( 6   
($6$  
((6(  
(,6,  
(060  
(464  
(868  
(<6< 
A@k!
 A@k" M\r  O\r
@  
(6 
Aj!
 Aj" I\r
 AI@ !
 AI@ !
 Ak! !@  
-:  
-
:
  
-:  
-: 
Aj!
 Aj" M\r  I@@  
-: 
A
j!
 A
j" G\rá
#AÐ
k"$ B
7@ 
 l"E\r  6  6A!
@ Aj 
Atj" Ak( Ak( jj"6 
A
j!
  I\r  k"
AL@A
!
A
  
j!A
!A
!
@ AqAF@    
 AjS AjAT 
Aj
@ Aj 
A
k"Atj(  kO@    Aj 
A AjU
    
 AjS 
A
F@ AjA
VA
 Aj VA
!
  ("A
r"6  j" I\r (AG! A
K!A k!    Aj 
A AjU@ 
A
G\r \r E\r
@@ 
A
L@ Aj AjW"T 
 j!
 (!
 AjAV  (As6 AjA
T  j" Aj 
Ak"Atj(k   Aj 
A
kA
 AjU AjA
V  (A
r"6    Aj A
 AjU !
  j! (! 
A
G\r A
G\r \r AÐ
j$«

#Að
k"$  6A
!@ AH\rA 
k!	 !@   	j"  Ak"\nAtj(k" ZAN@   ZAN\r  Atj     ZAN""6 A
j! A
k \n "A
J\r 
  X Að
j$K
 (!  
AM@ (! 
 
A k!
 !A" 
v6  A  
kt  
vr6Î
#Að
k"$  ("6è
 (!  6  6ì
A 
k! E!\n@@@@ A
G@ !A
!
 !A
! \r !
@   Atj"(k"  ZAL@ ! \nAs!	A
!\n@ 	 AHrA
qE@ Ak(!	  j"  ZAN\r
  	k  ZAN\r
  Atj 6 Aè
j Aè
jW"T A
j!  j! (ì
!	 ! (è
A
G\r
 	\r
 !
 \nE\r
 
  X  
   S Að
j$H
 
AM@ (! Aj
 
A k!
 (!   
t6   
t A  
kvr6\'

 (A
kY"
 
 (Y"A rA –

#A€k"$@ AH\r 
 Atj" 6 E\r@ ( 
(A€  A€O"QA!@ 
 Atj"( 
 A
j"Atj( Q  ( j6  G\r  k"\r A€j$\n hA   
 †
@@@ 
Aÿ
q"@ Aq@ 
Aÿ
q!@ -"E\r  F\r A
j"Aq\rA€‚„ ("k rA€‚„xqA€‚„xG\r
 A‚„l!@A€‚„  s"k rA€‚„xqA€‚„xG\r (! Aj"! A€‚„ krA€‚„xqA€‚„xF\r \\ j !@ "-"E\r
 A
j!  
Aÿ
qG\r "A - 
Aÿ
qF}
@@ "
AqE\r 
-E@A@ 
A
j"
AqE\r
 
-\r
@ 
"Aj!
A€‚„ ("k rA€‚„xqA€‚„xF\r@ "
A
j! 
-\r 
 kY

  (H"
A
k 
r6H ("
Aq@  
A r6A B7  (,"
6  
6  
 (0j6A~

~ ½"B4ˆ§Aÿq"AÿG| E@ 
 DaA DðC¢ 
_! 
(A@j6  
 Aþk6 Bÿÿÿÿÿÿÿ‡€ƒB€€€€€€€ð?„¿ ý~AÍ!
#A@j"$ AÍ6< A)j! A\'j! A(j!@@@@@A!@ 
!  AÿÿÿÿsJ\r  j!@@@@ 
"-"\n@@@@ \nAÿ
q"\nE@ !

 \nA%G\r
 !\n@ \n-
A%G@ \n!
 A
j! \n-! \nAj"
!\n A%F\r  k" Aÿÿÿÿs"\nJ\r	 @   a \r  
6< 
A
j!A!@ 
,
A0k"A	K\r 
-A$G\r 
Aj!A
! !  6<A!	@ ,"A k"
AK@ !
 !A
 
t"
A‰ÑqE\r@  A
j"6< 
 	r!	 ,
"A k"
A O\r
 !A
 
t"
A‰Ñq\r@ A*F@@ ,
A0k"A	K\r -A$G\r E@  AtjA\n6A
  Atj(!\r Aj!
A

 \r A
j!
 E@  
6<A!A!\r  ("Aj6 (!\rA!  
6< \rAN\r
A \rk!\r 	A€Àr!	
 A<jb"\rAH\r\n (<!
A!A!A 
-A.G\r 
-
A*F@@ 
,A0k"A	K\r 
-A$G\r 
Aj!
 E@  AtjA\n6A
  Atj(
 \r 
Aj!
A E\r  ("Aj6 (!  
6< AN
  
A
j6< A<jb! (<!
A
!@ !A! 
","AûkAFI\r 
A
j!
 A:l jA¯Ìj-"A
kAÿ
qAI\r  
6<@ AG@ E\r AN@ E@  Atj 6   Atj)70 E\r A0j  c
 AN\rA! E\r -A q\r 	Aÿÿ{q" 	 	A€Àq!	A!AÔ! !@@@@@@@@@@@@@@@ -"À"ASq  AqAF  "AØk!	\n
@ AÁk AÓF\r )0!AÔA!@@@@@@@ 
 (0 6 (0 6 (0 ¬7 (0 ;
 (0 : (0 6 (0 ¬7A  AM! 	Ar!	Aø! !
 A q! )0""BR@@ 
A
k"
 §Aq-ÀP r: Bˆ"BR\r 
! P\r 	AqE\r AvAÔj!A! !
 )0""BR@@ 
A
k"
 §AqA0r: Bˆ"BR\r 
! 	AqE\r   
k"  H! )0"BS@ B }"70A
!AÔ
 	A€q@A
!AÕ
AÖAÔ 	A
q"!  d!  AHq\r 	Aÿÿ{q 	 !	@ BR\r \r !A!  P  kj"  H!\r -0! (0"A± ""
AAÿÿÿÿ  AÿÿÿÿO"P" 
k  " j! AN@ !	 ! !	 ! -\r )0"BR\r
A!	 @ (0A! A  \rA 	e A6  >  Aj60A! Aj!\nA!@@ \n("E\r Aj i"AH\r   kK\r \nAj!\n  j" I\r
A=! AH\r A  \r  	e E@A!
A! (0!\n@ \n("E\r
 Aj i" j" K\r
  Aj a \nAj!\n  K\r A  \r  	A€Àse \r   \rH!  AHq\r	A=!  +0 \r  	  f"AN\r\n -
!\n A
j! \r	 E\rA
!@  Atj("\n@  Atj \n cA
! A
j"A\nG\r
 A\nO@A
!\n@  Atj(\r
A
! A
j"A\nG\r	A!  :\'A
! ! !	   k"
 
 H" AÿÿÿÿsJ\rA=! \r  j"  \rH" \nK\r A    	e   a A0   	A€€se A0  
Ae   
a A    	A€Àse (<!

A!A=!AèÛ 6A! A@k$ À

 -A qE@@ ("  ^\r
 ( ("k I@  
  ($
@@ (PAH\r E\r !@ 
 j"A
k-A\nG@ A
k"\r
  
  ($ I\r  k! (!
 
!   Q  ( j6s
 (",A0k"A	K@A@A! 
A̙³æM@A  
A\nl"
j  
AÿÿÿÿsK!  A
j"6 ,
! !
 ! A0k"A\nI\r 
³@@@@@@@@@@@@@@@@@@@ 
A	k
	\n\r  ("
Aj6  
(6  ("
Aj6  
47  ("
Aj6  
57  ("
Aj6  
47  ("
Aj6  
57  (AjAxq"
Aj6  
)7  ("
Aj6  
2
7  ("
Aj6  
3
7  ("
Aj6  
07  ("
Aj6  
17  (AjAxq"
Aj6  
)7  ("
Aj6  
57  (AjAxq"
Aj6  
)7  (AjAxq"
Aj6  
)7  ("
Aj6  
47  ("
Aj6  
57  (AjAxq"
Aj6  
+9  gˆ

~ B€€€€Z@@ 
A
k"
 " B\n€"B\n~}§A0r: BÿÿÿÿŸ
V\r §! B\nZ@@ 
A
k"
 " A\nn"A\nlkA0r: AãK\r @ 
A
k"
 A0r: 
Ð
~#A€k"$@  L\r A€Àq\r@  k"A€ A€I""E\r  
:  j"A
k 
: AI\r  
:  
:
 Ak 
: Ak 
: AI\r  
: Ak 
: A	I\r A kAq"j" 
Aÿ
qA‚„l"
6   kA|q"j"Ak 
6 A	I\r  
6  
6 Ak 
6 Ak 
6 AI\r  
6  
6  
6  
6 Ak 
6 Ak 
6 Ak 
6 Ak 
6  AqAr"k"A I\r 
­B€€€~!  j!
@ 
 7 
 7 
 7 
 7 
A j!
 A k"AK\r E@@  A€a A€k"Aÿ
K\r   a A€j$ã
|~#A°k"$ A6¬@ 
½"BS@A
!AÞ! 
š"
½!
 A€q@A
!Aá!
AäAß A
q"! E!@ B€€€€€€€øÿƒB€€€€€€€øÿQ@ A   Aj" Aÿÿ{qe   a AŠ\rA… A q"A—A‰  
 
bAa A    A€Àse    J!\n
 Aj!@@ 
 A¬j_"
 
 "
Db@  (¬"A
k6¬ A r"AáG\r
 A r"AáF\r (¬!A  AH
  Ak"6¬ 
D°A¢!
A  AH! AèA ANj"!@  
ü"6 Aj! 
 ¸¡DeÍÍA¢"
Db\r@ AL@ ! ! !	
 !	 !@A  AO!@ Ak" 	I\r ­!B!@  5 † |" B€”ëÜ€"B€”ëÜ~}> Ak" 	O\r B€”ëÜT\r 	Ak"	 >@ 	 "I@ Ak"(E\r
  (¬ k"6¬ ! AJ\r AH@ AjA	nA
j! AæF!@A	A k" A	O!\n@  	M@AA 	(!
A€”ëÜ \nv!\rA \ntAs!A! 	!@  (" \nv j6  q \rl! Aj" I\rAA 	(! E\r  6 Aj!  (¬ \nj"6¬   	j"	 " Atj   kAu J! AH\rA!@  	M\r  	kAuA	l!A\n! 	("A\nI\r@ A
j!  A\nl"O\r  A AæGk AçF AGqk"  kAuA	lA	kH@ A„`Aìc AHj A€Èj"A	m"\rAtj!\nA\n!  \rA	lk"AL@@ A\nl! A
j"AG\r@ \n("  n" lk"\rE \nAj" Fq\r@ A
qE@D@C!
 A€”ëÜG\r
 	 \nO\r
 \nAk-A
qE\r
D
@C!
Dà?Dð?Dø?  FDø? \r A
v"F \r I!@ \r -A-G\r š! 
š!
 \n  \rk"6 
   
a\r \n  j"6 A€”ëÜO@@ \nA6 	 \nAk"\nK@ 	Ak"	A6 \n \n(A
j"6 Aÿ“ëÜK\r  	kAuA	l!A\n! 	("A\nI\r@ A
j!  A\nl"O\r \nAj"   K!@ " 	M"E@ Ak"(E\r
@ AçG@ Aq!\r
 AsA A
 " J A{Jq"\n j!AA~ \n j! Aq"\r\rAw!@ \r Ak("\nE\rA\n!A! \nA\np\r@ "\rA
j! \n A\nl"pE\r \rAs!  kAuA	l! A_qAÆF@A!\r   jA	k"A AJ"  J!
A!\r   j jA	k"A AJ"  J!A!\n AýÿÿÿAþÿÿÿ  \rr"J\r
  AGjA
j!@ A_q"AÆF@  AÿÿÿÿsJ\r A AJ!
   Au"s k­ d"kA
L@@ A
k"A0:  kAH\r Ak" : A
kA-A+ AH:  k" AÿÿÿÿsJ\r  j" AÿÿÿÿsJ\r
 A    j" e   a A0   A€€se@@@ AÆF@ AjA	r!  	 	 K"!	@ 	5 d!@  	G@  AjM\r
@ A
k"A0:  AjK\r
  G\r A
k"A0:    ka 	Aj"	 M\r @ A‰A
a  	M\r
 AL\r
@ 	5 d" AjK@@ A
k"A0:  AjK\r  A	  A	Na A	k! 	Aj"	 O\r A	J! ! \r@ AH\r  	Aj  	K!\n AjA	r! 	!@  5 d"F@ A
k"A0:@  	G@  AjM\r
@ A
k"A0:  AjK\r
  A
a A
j!  \rrE\r A‰A
a    k"   Ha  k! Aj" \nO\r
 AN\r A0 AjAAe    ka ! A0 A	jA	Ae A    A€Àse    J!\n
  AtAuA	qj!@ AK\r -!Dð?!@A4 Atk"A€N@Dà! AÿI@ Aÿk!Dð!Aý  AýOAþk!
 AxJ\rD`! A¸pK@ AÉj!
D!Aðh  AðhMA’j!  Aÿj­B4†¿¢! A-F@  
š ¡ š!

 
   ¡!
  (¬" Au"s k­ d"F@ A
k"A0: (¬! Ar! A q!	 Ak"\r Aj: A
kA-A+ AH: AqE ALq! Aj!@ " 
ü"AÀÐj- 	r: 
 ·¡D0@¢!
@ A
j" AjkA
G\r 
Da q\r A.:
 Aj! 
Db\rA!\n Aûÿÿÿ   \rk"	jkJ\r A   Aj  Ajk" Ak H  " 	 jj" e   a A0   A€€se  Aj a A0  kAAe  \r 	a A    A€Àse    J!\n A°j$ \n¹~ 
 
(AjAxq"
Aj6  
)! 
)!#A k"
$ Bÿÿÿÿÿÿ?ƒ!~ B0ˆBÿÿ
ƒ"§"AøkAýM@ B† B<ˆ„! A€øk­!@ Bÿÿÿÿÿÿÿÿƒ"B€€€€€€€Z@ B
|!
 B€€€€€€€€R\r B
ƒ |!B  BÿÿÿÿÿÿÿV"! ­ |
@  „P\r Bÿÿ
R\r B† B<ˆ„B€€€€€€€„!Bÿ
 Aþ‡
K@B!Bÿ
A€øAø P"\n" k"	AðJ@B!B
  B€€€€€€À„ \n!A!\n  G@ 
Aj! ! !@A€
 	k"AÀq@  A@j­†!B!
 E\r  ­"† AÀ k­ˆ„!  †!  7  7 
) 
)„BR!\n@ 	AÀq@  	A@j­ˆ!B!
 	E\r AÀ 	k­†  	­"ˆ„!  ˆ! 
 7 
 7 
)B† 
)"B<ˆ„!@ \n­ Bÿÿÿÿÿÿÿÿƒ„"B€€€€€€€Z@ B
|!
 B€€€€€€€€R\r B
ƒ |! B€€€€€€€…  BÿÿÿÿÿÿÿV"! ­! 
A j$ B€€€€€€€€€ƒ B4†„ „¿9¦

 (T"(! (" ( ("k"  I"@   Q  ( j"6  ( k"6    K"@  
 Q  ( j"6  ( k6 A:  (,"6  6 ¢ E@A@  
AÿM\r
@AÔÚ((E@ 
A€qA€¿F\rAèÛA6
 
AÿM@  
A?qA€
r:
  
AvAÀ
r:A 
A€@qA€ÀG 
A€°OqE@  
A?qA€
r:  
AvAà
r:  
AvA?qA€
r:
A 
A€€kAÿÿ?M@  
A?qA€
r:  
AvAð
r:  
AvA?qA€
r:  
AvA?qA€
r:
AAèÛA6AA

  
:A
Ñ(
#Ak"\n$@@@@@@@@@@ Aô
M@A¤Ü("A AjAøq AI"Av"
v"Aq@@ AsA
q 
j"At"
AÌÜj" 
(Ô\\"("F@A¤Ü A~ wq6
  6  6 Aj!  
Ar6 
 j"
 
(A
r6 A†("M\r
 @@  
tA 
t"A krqh"At"
AÌÜj" 
(Ô\\"("F@A¤Ü A~ wq"6
  6  6  Ar6  j" 
 k"A
r6  
j 6 @ AxqAÌÜj!A¸Ü(!
 A
 Avt"qE@A¤Ü  r6 
 (!  
6  
6 
 6 
 6 Aj!A¸Ü 6A¬Ü 6A¨Ü("E\r
 hAt(Ô^"(Axq k!
 !@@ ("E@ ("E\r
 (Axq k" 
 
 K"!
   ! !
 (!	  ("G@ (" 6  6\n (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6	A! A¿K\r Aj"
Axq!A¨Ü("	E\rA! AôÿÿM@ A& 
Avg"kvA
q A
tkA>j!A k!
@@@ At(Ô^"E@A!
A! A A
vkA AGt!@@ (Axq k" 
O\r ! "
\rA!
 !  ("   AvAqj("F  ! A
t! "\r  rE@A!A t"A kr 	q"E\r hAt(Ô^! E\r
@ (Axq k" 
I!  
 !
   ! ("  ("\r E\r 
A¬Ü( kO\r (!  ("G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6 A¬Ü("M@A¸Ü(!
@  k"AO@ 
 j" A
r6  
j 6 
 Ar6
 
 Ar6  
j" (A
r6A!A!A¬Ü 6A¸Ü 6 
Aj!	 A°Ü("I@A°Ü  k"
6A¼ÜA¼Ü(" j"6  
A
r6  Ar6 Aj!	A! A/j"Aüß(@A„à(
AˆàB7A€àB€ €€€€7Aüß \nAjApqAتժs6AàA6AàßA6A€ "
j"A 
k"q" M\rAÜß("
@AÔß(" j"	 M\r	 
 	I\r	@Aàß-AqE@@@@@A¼Ü("
@Aäß!@ (" 
M@ 
  (jI\r ("\rAn"AF\r !Aۈ("A
k"
 q@  k 
 jA kqj!  O\rAÜß("@AÔß("
 j" 
M\r  I\r n" G\r
  k q"n" ( (jF\r
 ! AF\r
 A0j M@ !A„à("
  kjA 
kq"
nAF\r
 
 j! ! AG\rAàßAàß(Ar6 n!An! AF\r AF\r  M\r  k" A(jM\rAÔßAÔß( j"6AØß( I@AØß 6@A¼Ü("
@Aäß!@  (" ("jF\r ("\rA´Ü("A  ME@A´Ü 6A!Aèß 6Aäß 6AÄÜA6AÈÜAüß(6AðßA6@ At"
 
AÌÜj"6Ô\\ 
 6Ø\\ A
j"A G\rA°Ü A(k"Ax kAq"
k"6A¼Ü 
 j"
6 
 A
r6  jA(6AˆAΈ(6 
 O\r 
 I\r (Aq\r   j6A¼Ü 
Ax 
kAq"j"6A°ÜA°Ü( j" k"6  A
r6 
 jA(6AÀÜAŒà(6A!A!A´Ü( K@A´Ü 6  j!Aäß!@@  ("G@ ("\r
 -AqE\rAäß!@@ (" 
M@ 
  (j"I\r
 (!
A°Ü A(k"Ax kAq"k"6A¼Ü  j"6  A
r6  jA(6AˆAΈ(6 
 A\' kAqjA/k"  
AjI"A6 Aìß)7 Aäß)7Aìß Aj6Aèß 6Aäß 6AðßA6 Aj!@ A6 Aj! Aj!  I\r 
 F\r  (A~q6 
  
k"A
r6  6 Aÿ
M@ Aø
qAÌÜj!A¤Ü("A
 Avt"qE@A¤Ü  r6 
 (!  
6  
6A!A
A! AÿÿÿM@ A& Avg"kvA
q A
trA>s! 
 6 
B7 AtAÔÞj!@@A¨Ü("A
 t"qE@A¨Ü  r6  
6 
 6
 A A
vkA AGt! (!@ "(Axq F\r Av! A
t!  Aqj"("\r  
6 
 6A! 
! 
!A
 (" 
6  
6 
 6A!A!A 
j 6 
 j 6A°Ü(" M\rA°Ü  k"
6A¼ÜA¼Ü(" j"6  
A
r6  Ar6 Aj!AèÛA06A!  6  ( j6 Ax kAqj"	 Ar6 Ax kAqj"  	j"
k!@A¼Ü( F@A¼Ü 
6A°ÜA°Ü( j"6 
 A
r6
A¸Ü( F@A¸Ü 
6A†A†( j"6 
 A
r6 
 j 6
 ("AqA
F@ Axq! (!@ Aÿ
M@ (" F@A¤ÜA¤Ü(A~ Avwq6  6  6
 (!@  G@ (" 6  6
@ (" Aj ("E\r
 Aj!@ ! "Aj! ("\r Aj! ("\r A6
A! E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨ÜA¨Ü(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6  j"(!  j!  A~q6 
 A
r6 
 j 6 Aÿ
M@ Aø
qAÌÜj!A¤Ü("A
 Avt"qE@A¤Ü  r6 
 (!  
6  
6 
 6 
 6
A! AÿÿÿM@ A& Avg"kvA
q A
trA>s! 
 6 
B7 AtAÔÞj!@@A¨Ü("A
 t"qE@A¨Ü  r6  
6 
 6
 A A
vkA AGt! (!@ "(Axq F\r Av! A
t!  Aqj"("\r  
6 
 6 
 
6 
 
6
 (" 
6  
6 
A6 
 6 
 6 	Aj!@ E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨Ü 	A~ wq"	6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6@ 
AM@  
 j"Ar6  j" (A
r6
  Ar6  j" 
A
r6 
 j 
6 
Aÿ
M@ 
Aø
qAÌÜj!A¤Ü("A
 
Avt"
qE@A¤Ü 
 r6 
 (!
  6 
 6  6  
6
A! 
AÿÿÿM@ 
A& 
Avg"kvA
q A
trA>s!  6 B7 AtAÔÞj!@@ 	A
 t"qE@A¨Ü  	r6  6  6
 
A A
vkA AGt! (!@ "(Axq 
F\r Av! A
t!  Aqj"("\r  6  6  6  6
 (" 6  6 A6  6  6 Aj!
@ 	E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨Ü A~ wq6@  	(F@ 	 6
 	 6 E\r
  	6 ("@  6  6 ("E\r  6  6@ 
AM@  
 j"Ar6  j" (A
r6
  Ar6  j" 
A
r6 
 j 
6 @ AxqAÌÜj!A¸Ü(!A
 Avt" qE@A¤Ü  r6 
 (!  6  6  6  6A¸Ü 6A¬Ü 
6 Aj! \nAj$ ‚
@ E\r Ak" Ak("
Axq"j!@ 
A
q\r 
AqE\r
  ("k"A´Ü(I\r
  j!@@@A¸Ü( G@ (!
 Aÿ
M@ 
 ("G\rA¤ÜA¤Ü(A~ Avwq6 (! 
 G@ (" 
6 
 6 (" Aj ("E\r Aj!@ ! "
Aj! 
("\r 
Aj! 
("\r A6 ("
AqAG\rA† 6  
A~q6  A
r6  6  
6 
 6A!
 E\r@ ("At"(Ô^ F@ AÔÞj 
6 
\r
A¨ÜA¨Ü(A~ wq6@  (F@  
6
  
6 
E\r
 
 6 ("@ 
 6  
6 ("E\r 
 6  
6  O\r ("A
qE\r@@@@ AqE@A¼Ü( F@A¼Ü 6A°ÜA°Ü( j"6  A
r6 A¸Ü(G\rA¬ÜA6A¸ÜA6A¸Ü(" F@A¸Ü 6A¬ÜA¬Ü( j"6  A
r6  j 6 Axq j! (!
 Aÿ
M@ (" 
F@A¤ÜA¤Ü(A~ Avwq6  
6 
 6 (! 
 G@ (" 
6 
 6 (" Aj ("E\r Aj!@ ! "
Aj! 
("\r 
Aj! 
("\r A6  A~q6  A
r6  j 6A!
 E\r@ ("At"(Ô^ F@ AÔÞj 
6 
\r
A¨ÜA¨Ü(A~ wq6@  (F@  
6
  
6 
E\r
 
 6 ("@ 
 6  
6 ("E\r 
 6  
6  A
r6  j 6  G\rA¬Ü 6 Aÿ
M@ Aø
qAÌÜj!
A¤Ü("A
 Avt"qE@A¤Ü  r6 

 
(! 
 6  6  
6  6A!
 AÿÿÿM@ A& Avg"
kvA
q 
A
trA>s!
  
6 B7 
AtAÔÞj!@A¨Ü("A
 
t"qE@A¨Ü  r6  6A!
A
 A 
A
vkA 
AGt!
 (!@ "(Axq F\r 
Av! 
A
t!
  Aqj"("\r  6A!
 !A! ! 
 (" 6  6A!A!
A! 
 j 6  6  j 6AÄÜAÄÜ(A
k"A 6‰
 E@ 
j 
A@O@AèÛA06AA 
AjAxq 
AI! Ak"("Axq!@ AqE@ A€I\r
 Aj M@ !  kA„à(A
tM\rA  j!@  O@  k"AI\r
   A
qrAr6  j" Ar6  (A
r6  m
A¼Ü( F@A°Ü( j" M\r   A
qrAr6  j"  k"A
r6A°Ü 6A¼Ü 6
A¸Ü( F@A¬Ü( j" I\r@  k"AO@   A
qrAr6  j" A
r6  j" 6  (A~q6
  A
q rAr6  j" (A
r6A!A!A¸Ü 6A¬Ü 6
 ("Aq\r
 Axq j"\n I\r
 \n k! (!@ Aÿ
M@ (" F@A¤ÜA¤Ü(A~ Avwq6  6  6
 (!	@  G@ (" 6  6
@ (" Aj ("E\r
 Aj!@ ! "Aj! ("\r Aj! ("\r A6
A! 	E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨ÜA¨Ü(A~ wq6@  	(F@ 	 6
 	 6 E\r
  	6 ("@  6  6 ("E\r  6  6 AM@  A
q \nrAr6  \nj" (A
r6
   A
qrAr6  j" Ar6  \nj" (A
r6  m ! "@ Aj 
j"E@A  A|Ax Ak("Aq Axqj" 
 
 KQ k «
  
j!@@ ("A
q\r AqE\r
 (" 
j!
@@@  k"A¸Ü(G@ (! Aÿ
M@  ("G\rA¤ÜA¤Ü(A~ Avwq6 (!  G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6 ("AqAG\rA¬Ü 
6  A~q6  
A
r6  
6  6  6A! E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨ÜA¨Ü(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6@@@@ ("AqE@A¼Ü( F@A¼Ü 6A°ÜA°Ü( 
j"
6  
A
r6 A¸Ü(G\rA¬ÜA6A¸ÜA6A¸Ü(" F@A¸Ü 6A¬ÜA¬Ü( 
j"
6  
A
r6  
j 
6 Axq 
j!
 (! Aÿ
M@ (" F@A¤ÜA¤Ü(A~ Avwq6  6  6 (!  G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6  A~q6  
A
r6  
j 
6A! E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨ÜA¨Ü(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6  
A
r6  
j 
6  G\rA† 
6 
Aÿ
M@ 
Aø
qAÌÜj!A¤Ü("A
 
Avt"
qE@A¤Ü 
 r6 
 (!
  6 
 6  6  
6A! 
AÿÿÿM@ 
A& 
Avg"kvA
q A
trA>s!  6 B7 AtAÔÞj!@@A¨Ü("A
 t"qE@A¨Ü  r6  6  6
 
A A
vkA AGt! (!@ "(Axq 
F\r Av! A
t!  Aqj"("\r  6  6  6  6 ("
 6  6 A6  6  
6W

~@ ­B|BøÿÿÿƒAØÚ("­|"BÿÿÿÿX@ §"
?AtM\r
 
\r
AèÛA06AAØÚ 
6 ß
	#Ak"$  6@ AÓ
M@AÐÐAÒ Ajp(!
 A|O@]   AÒ
n"AÒ
l"k6AÒAÐÓ Ajp"
( j! 
AÒkAu!@A! !
@@@ 
! A/F@AÓ
!@  n"
 I\r  
 lF\r  A\nj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  A$j"
n" 
I\r  
 lF\r  A(j"
n" 
I\r  
 lF\r  A*j"
n" 
I\r  
 lF\r  A.j"
n" 
I\r  
 lF\r  A4j"
n" 
I\r  
 lF\r  A:j"
n" 
I\r  
 lF\r  A<j"
n" 
I\r  
 lF\r  AÂj"
n" 
I\r  
 lF\r  AÆj"
n" 
I\r  
 lF\r  AÈj"
n" 
I\r  
 lF\r  AÎj"
n" 
I\r  
 lF\r  AÒj"
n" 
I\r  
 lF\r  AØj"
n" 
I\r  
 lF\r  Aàj"
n" 
I\r  
 lF\r  Aäj"
n" 
I\r  
 lF\r  Aæj"
n" 
I\r  
 lF\r  Aêj"
n" 
I\r  
 lF\r  Aìj"
n" 
I\r  
 lF\r  Aðj"
n" 
I\r  
 lF\r  Aøj"
n" 
I\r  
 lF\r  Aþj"
n" 
I\r  
 lF\r  A‚
j"
n" 
I\r  
 lF\r  Aˆ
j"
n" 
I\r  
 lF\r  AŠ
j"
n" 
I\r  
 lF\r  AŽ
j"
n" 
I\r  
 lF\r  A”
j"
n" 
I\r  
 lF\r  A–
j"
n" 
I\r  
 lF\r  Aœ
j"
n" 
I\r  
 lF\r  A¢
j"
n" 
I\r  
 lF\r  A¦
j"
n" 
I\r  
 lF\r  A¨
j"
n" 
I\r  
 lF\r  A¬
j"
n" 
I\r  
 lF\r  A²
j"
n" 
I\r  
 lF\r  A´
j"
n" 
I\r  
 lF\r  Aº
j"
n" 
I\r  
 lF\r  A¾
j"
n" 
I\r  
 lF\r  AÀ
j"
n" 
I\r  
 lF\r  AÄ
j"
n" 
I\r  
 lF\r  AÆ
j"
n" 
I\r  
 lF\r  AÐ
j"
n" 
I\r AÒ
j!  
 lG\r  At(ÐP"
n" 
O! 
 l!	 
 K"E@   !
 A
j!  	G\r
  	G\r
 \r
A A
j" A0F""At(R  j"AÒ
lj!
   ! Aj$ h
#Ak"$ A: 
 kAu!
 (!@ 
@ 
 
A
v"Asj   Atj"( I"!
 Aj  !
 Aj$  /

@ (@  ("
A
k6 
\r
  ((
A>
A
  A
M!
@@ 
j"\rAӈ("E\r \n
 "E@u ]  
 
\\w¬

@  (AÿÿÿÿqA
kA\n ,"AH"" (  "kM@ E\r
 (  AH! @  j 
 ü\n  j!@ ,AH@  6
  Aÿq:  jA:    j k  A  
x…
Aöÿÿÿ 
k O@A÷ÿÿÿ! (  ,AH!	 
AòÿÿÿM@A 
 j" 
A
t"  K"ArA
j AI! t!@ E\r E\r  	 ü\n@ E\r E\r  j  ü\n   j"k!\n@  F\r \nE\r  j j  	j j \nü\n 
A\nG@ 	k  6  A€€€€xr6   j \nj"6  jA:uÅ
@@@ ,"AN@A\n! A\nF\r
  A
jAÿq: (" (AÿÿÿÿqA
k"G\r
 !@ AöÿÿÿG@A÷ÿÿÿ! (  ,AH! AòÿÿÿM@A A
j" A
t"  K"ArA
j AI! t!@ E\r E\r   ü\n@  F\r  k"E\r  j  j ü\n A\nG@ k  6  A€€€€xr6
u  6 !  A
j6 (!  j"A:
  
:«

 
A÷ÿÿÿI@ (AÿÿÿÿqA
kA\n ,"AH" 
I@A 
ArA
j 
AI"t!
 (!@ (  "A
j"E\r E\r 
   AH ü\n AH@ k  6  
6  A€€€€xr6uh

 (Aÿÿÿÿq" K@  6 (!@ E\r E\r  
 ü\n  jA:  A
k  kA
j ("A   
xQ A\nM@  :@ E\r E\r  
 ü\n  jA: A\n A\nk -Aÿq"A   
x
#A k"$#Ak"$ Aj" A j" Aj"k"A	L@A= A  
A
rgkAÑ	lAv" 
 At(°TIkA
jH\r
 
A¿„=M@ 
AÎM@ 
AãM@ 
A	M@  
A0r: A
j  
A
t/
àT; Aj 
AçM@  
AÿÿqAän"A0r:  
 AälkAÿÿqA
t/
àT;
 Aj  
~ 
AŸM@  
AÎn"A0j: A
j 
 AÎlk~  

 
AÿÁ×/M@ 
Aÿ¬âM@  
AÀ„=n"A0j: A
j 
 AÀ„=lk  
€

 
Aÿ“ëÜM@  
A€Â×/n"A0j: A
j 
 A€Â×/lk€

  
A€Â×/n"A
t/
àT; Aj 
 A€Â×/lk€
!A6  6 Aj"
 (6 
 (6 Aj$@ (" Aj"k"A÷ÿÿÿI@@ A\nM@  :
 Ar"A
jt!
  Aÿÿÿÿk6  
6  6 
!  k!@  F\r E\r   ü\n  jA:
u A j$2

  
Aän"A
t/
àT;  
 AälkA
t/
àT; Aj*

  
AÎn"A
t/
àT; Aj 
 AÎlk~*

  
AÀ„=n"A
t/
àT; Aj 
 AÀ„=lk AÐjjAÐjt

 E@ ( 
(F  
F@A
 
("-!
@ ("-"E\r  
G\r@ -
!
 -
"E\r
 A
j! A
j!  
F\r  
FÚ
#AÐk"$@A
 ( 
(F\r#A@j"$ 
 
("Ak("j!@ Ak("(AÜÖ(F@A  !
  
"L@ B7 A6 AØÖ6  
6  6 B7 B7$ B7, A6< B€€€€€€€
74  Aj  A
A (( (\r
 B7 A6 A¨Ö6  
6 AØÖ6 B7 B7$ B7, B73 A6< A
:;  Aj A
A ((	A!@@ ((
 (A ($A
FA ( A
FA (,A
F!
 (A
G@ (,\r
 ( A
G\r
 ($A
G\r
 (! A@k$A "
E\r ("E\r
 AjAA8ü A
:K A6   6  
6 A
6D 
 Aj A
 
(( (,"
A
F@  ($6 
A
F! AÐj$  A6 Aç6 AŽ6]v

 ($"E@  6  
6 A
6$  (86@@ ( (8G\r ( 
G\r (AG\r
  6 A
:6 A6  A
j6$ ( 
((F@ 
  …
5 ( 
((F@ 
  …
 (" 
   (({
 ("A
q! 
-7A
F@ Au" E\r
 ( j(
 Au E\r 
 ((68A!A! (" 
  j A Aq ((r
 ( 
((F@ 
  …
 (! Aj" 
  ˆ
@ AI\r  Atj! Aj!@  
  ˆ
 
-6\r
 Aj" I\rš
 A
:5@  (G\r A
:4@ ("E@ A
6$  6  
6 A
G\r (0A
F\r
 
 F@ ("AF@  6 ! (0A
G\r A
F\r
  ($A
j6$ A
:6Â
@  
( ƒ
@  
(G\r
 
(A
F\r
 
 6@  
( ƒ
@@ 
( G@  
(G\r
 A
G\r 
A
6  
 6  
(,AF\r
 Aj" (Atj!@@@ 
@  M\r 
A;
4  
  A
 Œ
 
-6\r 
-5A
G\r 
-4A
F@ 
(A
F\rA
!A
! -AqE\rA
! -A
q\rA
AA A
q6, \r 
A6, Aj! (! Aj" 
   
 AI\r
  Atj! Aj!@ ("AqE@ 
($A
G\r
@ 
-6\r  
   
 Aj" I\r A
qE@@ 
-6\r 
($A
F\r  
   
 Aj" I\r@ 
-6\r 
($A
F@ 
(A
F\r  
   
 Aj" I\r
 
 6 
 
((A
j6( 
($A
G\r 
(AG\r 
A
:6K
 ("Au! (" 
  A
q ( j(  j A Aq  ((I
 ("Au! (" 
 A
q ( j(  j A Aq  ((	Š@  
( ƒ
@  
(G\r
 
(A
F\r
 
 6  
( ƒ
@@ 
( G@  
(G\r
 A
G\r 
A
6  
 6 @ 
(,AF\r 
A;
4 (" 
  A
  (( 
-5A
F@ 
A6, 
-4E\r
 
A6, 
 6 
 
((A
j6( 
($A
G\r
 
(AG\r
 
A
:6 (" 
    ((	¦
@  
( ƒ
@  
(G\r
 
(A
F\r
 
 6  
( ƒ
E\r@ 
( G@  
(G\r
 A
G\r
 
A
6  
 6 
 6  
 
((A
j6(@ 
($A
G\r 
(AG\r 
A
:6 
A6,›
  
( ƒ
@ 
   Š
 
-5! (! 
A:5 
-4! 
A:4 Aj"	 
    Œ
  
-4"\nr!  
-5"r!@ AI\r 	 Atj!	 Aj!@ 
-6\r
@ \nA
q@ 
(A
F\r -Aq\r
 A
qE\r -A
qE\r 
A;
4  
    Œ
 
-5" rA
q! 
-4"\n rA
q! Aj" 	I\r 
 A
q:5 
 A
q:49  
( ƒ
@ 
   Š
 (" 
     ((  
( ƒ
@ 
   Š
A§7
 AàÙ6 ("Ak"
 
(A
k"
6 
AH@ Akk  ”
 k ( $# kApq"$ #‘P(A€Þ{"type":"Document"},"attributes":{summarytbodyTableBodyLatexMathDisplay\\u%04x-+   0X0x-0X+0X 0X-0x+0x 0xTableRowdivnavmenuTextUnorderedListOrderedListstartSuperscriptSubscripttfootcountbodyRowCountheadRowCountbasefontDocumentimportantdefaulttightrightHighlightleftframesetfieldsetdt\\taddressdetailsEmphasisnoframes%s:%d: %strvectordirhrfootercenterSpoilerheaderfenceChar\\roptgroupcolgroup/Users/ernest/react-native-enriched-markdown/packages/core/cpp/wasm/ASTSerializer.cpp/emsdk/emscripten/system/lib/libcxxabi/src/private_typeinfo.cpptipcautionoptionfigcaptionAdmonitionsectionmainalignnan\\nformmenuitemListItemparamulurlcolhtmlTableHeaderCellTableCellleveldlisTasklinkLinkCodeBlocktrackSoftBreakLineBreakThematicBreaklibad_array_new_lengthParagraphStrikethroughsearchdialogStrongbasic_stringnodeTypeToStringwarningHeadinginf\\ftrueblockquoteBlockquotenotefalsebasefigureadmonitionTypeUnderlineLatexMathInlineBlankLineiframetitlearticletableTableImageCodeasidetdlegendtaskCheckedddtheadTableHead\\b"\'=<>`-_.-+_\\\\({[,"children":[NANINFcatching a class without an object?)}].!?,;mailto:,"content":h6h5h4h3h2h1http://Too many link reference definition instantiations.Unsupported abi_version.Aborted from text() callback.Aborted from enter_span() callback.Aborted from leave_span() callback.Aborted from enter_block() callback.Aborted from leave_block() callback.malloc() failed.realloc() failed.@:..!#$%&\'*+/=?^_`{|}~-_.:-+-.-_+-_*(null)Suppressing too sparse table (see https://github.com/mity/md4c/issues/345)._=().+-_~%false && "unhandled NodeType in nodeTypeToString"\\"{"type":"[]!xX \nñ<‡íbOFß*$®ŒšŸòT2q¾Îé<Š¬¸ùlAè~€¸+Œô)NSt3__220__shared_ptr_emplaceIN8Markdown15MarkdownASTNodeENS_9allocatorIS2_EEEE"ƒA€¹Nú‡RA f°à\rˆP\rˆ\rð\rˆˆ @`€ˆˆ ÀˆˆˆˆˆA?/A°Äè£\n-Aàdƒµ¯A5KG[uzÞ9AÐ50a\nÉ|‘\'AMÝÚ×ÔÑÎO’y¹AðA€8$èA ‚–AÀ\r~XAඦZA€\rP
¨A Tw$AÀE,5Â9N\nküA®A —  € @\n €/ _ 0A@Z€µÀ@րØ@ހ
@.
€2
@6
€9
@G
€J
@v
€x
y
@}
€

‚
„
†
‡
‰
Š
‹
Ž


‘
“
”
–
—
˜
œ

Ÿ
 
@¤
€¦
§
©
¬
®
¯
±
²
³
µ
·
¸
¼
Ä
Å
Ç
È
Ê
Ë
@Û
€Þ
@î
ۖ
ò
ô
ö
÷
ø
@€ "@2€:;=>ACDEF@N€Eprv†ˆ@Š€ŒŽ‘@¡€£@«€ÂÏÐÑÕÖØ@î€ðñôõ÷ùúý@ÿ€@€@/€`@€€Š@¾€ÀÁ@Í€Ð@.€1@V€ @Å€ÇÍø@ý€€‚ƒ„…†‡ˆ‰@º€½@¿€@”€› @þ€@€@€(@/€8@?€H@M€Y[]_h@o€¸¹º»¾È@Ë€ØÙÚÛèéêëìøùúû&!*!+!2!`!@o!€ƒ!¶$@Ï$€,@/,€`,b,c,d,g,@k,€m,n,o,p,r,u,~,,€,@â,€ë,í,ò,@¦@l¦€€¦@š¦€"§@.§€2§@n§€y§{§}§~§@†§€‹§§§’§–§@¨§€ª§«§¬§­§®§°§±§²§³§´§@§€Ä§Å§Æ§Ç§É§Ë§Ì§@Ú§€Ü§Ý§â§õ§l«m«p«@¿«€!ÿ@:ÿ€
@\'
€°
@Ó
€p
@z
€|
@Š
€Œ
@’
€”
•
€
@²
€P\r
@e\r
€ 
@¿
€@n
@_n
€ n
@¸n
€@ß
Hß
Jß
Mß
Qß
hß
@nß
€rß
@~ß
ێ
@!é
€az¼àöøþ

/
3
7
:
H
K
w
ÿz
~
sSƒ
…
Tˆ
VWŒ
Ý
Y[’
`cih™
oru¡
¥
۬
ƒ­
ˆ°
Š‹´
¶
’¹
½
Æ
Æ
É
É
Ì
Ì
Ü
ß
ï
ó
ó
õ
•
¿
ù
ž
#3e,<š
f,B€
‰ŒGO¹qswó¬­¯ÌÍαÁÃËÃײ¸ÆÀÙïºÁ¸µøòû{}P_0Oa‹¿ÏÂÎÑ/a†-%-\'---ðõ24>ABBJcK¦ŠÐúýÿ
•a¡ÿ \'07@EQSUW`g°±pq¹ruÐÑvwàáz{åxy|}ÉkåN!p!!„!Ð$é$0,_,a,k}}h,l,QqPRs,v,?@,ã,ì,î,ó,A¦m¦¦›¦#§/§3§o§z§|§y§‡§Œ§e‘§“§—§©§f\\aljž‡S«µ§Ã§”§‚Žȧʧdͧۧ›
w|ö§K«L« ïAÿZÿ(
O
Ø
û
—
¡
£
±
³
¹
»
¼
À
ò
p\r
…\r
À
ß
`n
n
»n
Ón
Aß
Iß
Kß
Nß
Rß
iß
oß
sß
ß
"é
Cé
AÀ1Ó
ß0
I
ð
‡–—˜™šžP€@‡€ˆ@€@—€˜@Ÿ€ @§€¨@¯€²³´¶¼ÂÃÄÆÌÖäæòóôöüû
ûûûûûûûûû•ß
A 3¥ssi¼nje‚h1tw\ny\na¾ssŹ¹¹¹ ¹\'¹ ¹\'¹`¹g¹`¹g¹p¹±¹¬¹±B±¹t¹·¹®¹·B·¹¹BÁÅB|¹É¹Î¹ÉBɹfffiflststtvtetk~vtmssAÐ6À°RTV·ÇÒÓ×âãç÷ûû¹
Å
ÅÅ
ÅB±B¹·B¹¹¹
¹BÅÅ
ÅBÉB¹ffiffl@.

À 5P                A¤9¬
!@/€:@@€[@`€{@~€¡@©€«@¬€®@±€´¶@¸€»¿×÷Â@Å€Ò@߀å@ë€íï@ÿ€u~„@…€‡ö‚Z@_€‰@Š€@€¾ÀÃÆó@ô€@€@€j@m€ÔÞéý@þ€@\r€ö@ù€þ@ÿ€0@>€^ˆd	@e	€p	ò	@ó	€ú	@û	€ý	v\nð\n@ñ\n€pó@ú€w„O\ry\rô\r?OZ@[€
@€@€468:@=€…¾@Å€Ç@Ì€Î@Ú€J@O€ž@Ÿ€û`@h€@™€m@n€›@œ€ë@í€5@6€Ô@Ö€Ø@Û€@\n€@D@E€Þ@ÿ€@€ @¦€¨@­€N@O€Z@j€t@€ü@ÿ€;@?€~@€À@Ç€Ó½¿@Á€Í@Ï€Ý@߀í@ï€ý@þ€ @\' €0 @^ €z @~ €Š @Ž €  @Ä €!@
!€!@!€!@	!€!!@!€!@#!€%!\'!)!.!:!@;!€@!@D!€J!@M!€O!Š!@‹!€!@)$€@$@J$€œ$@é$€%@u\'€”\'@s+€v+@ÿ+€å,@ê,€ù,@ü,€þ,@ÿ,€p-.@..€0.@].€`.@c.€€.@™.€›.@ó.€/@Õ/€ð/@ÿ/€
0@0€0@ 0€0060@70€=0@?0€›0@œ0€ 0û01@‘1€–1@Ÿ1€À1@å1€ï12@2€*2@G2€P2`2@2€Š2@°2€À2@ÿ3€ÀM@ÿM€¤@Ƥ€þ¤@ÿ¤€\r¦@¦€s¦~¦ò¦@÷¦€§@§€ §@!§€‰§@Š§€(¨@+¨€6¨@9¨€t¨@w¨€Î¨@Ϩ€ø¨@ú¨€ü¨.©@/©€_©Á©@Í©€Þ©@ß©€\\ª@_ª€wª@yª€Þª@ߪ€ðª@ñª€[«j«@k«€ë«)û²û@Òû€>ý@Oý€ý@‘ý€Èý@Ïý€üý@ÿý€þ@þ€0þ@Rþ€Tþ@fþ€hþ@kþ€
ÿ@ÿ€ÿ@ ÿ€;ÿ@@ÿ€[ÿ@eÿ€àÿ@æÿ€èÿ@îÿ€üÿ@ýÿ€

@

€7

@?

€y

@‰

€Œ

@Ž

€

@œ

€ 

Ð

@ü

€Ÿ
Ð
o
W
w
@x
€	
?	
P\n
@X\n
€\n
È\n
ð\n
@ö\n
€9
@?
€™
@œ
€n\r
Ž\r
@\r
€­
É
@Ê
€Ð
@Ø
€U
@Y
۠
@‰
€G
@M
€»
@¼
€¾
@Á
€@
@C
€t
@u
ہ
@È
€Í
Û
Ý
@ß
€8
@=
۩
Ô
@Õ
€×
@Ø
€K
@O
€Z
@[
€]
Æ
Á
@×
€A
@C
€`
@l
€¹
<
@?
€;
D
@F
ۉ
?
@F
€š
@œ
€ž
@¢
€
@	
ۇ
A
@E
€p
@q
€÷
@ø
€C
@O
€Õ
@ñ
€ÿ
p$
@t$
ۖ/
@ò/
€nj
@oj
€õj
7k
@?k
€Dk
@Ek
€mm
@om
€—n
@šn
ۉo
œ¼
Ÿ¼
Ì
@ïÌ
€úÌ
@üÌ
€Í
@³Î
€ºÎ
@ÐÎ
€ÒÎ
@ÔÎ
€ÝÎ
@ýÎ
€PÏ
@ÃÏ
€Ð
@õÐ
ۄ
@&Ñ
€)Ñ
@dÑ
€jÑ
@lÑ
€ƒÑ
@„Ñ
€ŒÑ
@©Ñ
€®Ñ
@AÒ
€EÒ
SÒ
@ZÒ
€]Ò
@^Ò
€`Ò
@Ò
€Ó
@VÓ
€ÁÖ
ÛÖ
ûÖ
×
5×
O×
o×
‰×
©×
Ã×
Ø
@ÿÙ
€7Ú
@:Ú
€mÚ
@tÚ
€vÚ
@ƒÚ
€…Ú
@‹Ú
€Û
@Û
€Oá
ÿâ
ÿå
^é
@_é
€¬ì
°ì
.í
ðî
@ñî
€ð
@+ð
€0ð
@“ð
€ ð
@®ð
€±ð
@¿ð
€Áð
@Ïð
€Ñð
@õð
€\rñ
@®ñ
€æñ
@ò
€ò
@;ò
€@ò
@Hò
€Pò
@Qò
€`ò
@eò
€ó
@Ùö
€Üö
@ìö
€ðö
@üö
€÷
@Û÷
€à÷
@ë÷
€ð÷
@ø
€ø
@Gø
€Pø
@Yø
€`ø
@‡ø
€ø
@­ø
€°ø
@»ø
€Àø
@Áø
€Ðø
@Øø
€ù
@Wú
€`ú
@mú
€pú
@|ú
€€ú
@Æú
€Èú
Ìú
@Ýú
€ßú
@ëú
€ïú
@úú
€û
@’û
€”û
@ïû
€úû
		AãÌ
 AðÌA	\n\n\n
		AÁÍ!\r\r		AûÍ
A‡Î	AµÎ
AÁÎ	AïÎ
AûÎ	A²Ï	AãÏ
AïÏ	AÐ
A©Ð€	0123456789ABCDEF\r%)+/5;=CGIOSYaegkmqƒ‰‹•—£§­³µ¿ÁÅÇÓ
\r%)+/5;=CGIOSYaegkmqyƒ‰‹•—£§©­³µ»¿ÁÅÇѐ+Ø)NSt3__214__shared_countE,*
Ð)NSt3__219__shared_weak_countEA´Ôœ\ndè\' †
@B€–˜áõʚ;00010203040506070809101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899¸+4+<-N10__cxxabiv116__shim_type_infoE¸+d+(+N10__cxxabiv117__class_type_infoEX+ !"#$%&Ø+\'!"#()*¸+ä+X+N10__cxxabiv120__si_class_type_infoE4,+!"#,-.¸+@,X+N10__cxxabiv121__vmi_class_type_infoE°,/0+„,St9exception¸+ ,|,St9bad_alloc¸+¼,”,St20bad_array_new_lengthì,
12¸+ø,|,St11logic_error-
32¸+(-ì,St12length_error+D-St9type_infoAÔÚ. 0€');
++      return binaryDecode('asm

«
``
`
`

`
`
``````
`	
`
`
`
``|
|`~
`|
``
Tenv__cxa_throwenv\r__assert_failenvemscripten_resize_heapenv	_abort_js	¾
¼
	
	


		
















\r\r\r\n

		
	
\n\n\n\n


p
99

€€@	

Aã€¢
memory__wasm_call_ctors\rparseMarkdown__indirect_function_table
_emscripten_stack_restore½
_emscripten_stack_alloc¾
emscripten_stack_get_current¿
	P
A
8º
\r{ !"#$%&\'()*+,~-E@G_mno{-cc¦
¶
³
¨
-µ
²
©
-´
¯
¬
-¸
-¹
-·
»
¼
»
»

(\n¼è¼
 

AÈÜB7AÐÜA6AßÜA:AÔÜAµ(6AØÜA¹-:AÙÜA:AëÜA:AàÜAŽ/;
AâÜA-:AãÜA:A÷ÜA:AìÜAç(6AðÜAë-:AñÜA:AƒÝA	:AøÜA¯)7A€ÝA·-:AÝA:AˆÝB칻֮سå7A“ÝA:AÝA:AŸÝA:A”ÝA¾(6A˜ÝAÂ/;
AšÝA:A ÝA"6A¤ÝB‹€€€€‚€€€7 A£(6 Aœ)7 A:A·ÝA:A¬ÝA¼	(6A°ÝAÀ	-:A±ÝA:AÃÝA:A¸ÝAÞ	(6A¼ÝAâ	-:A½ÝA:AÄÝA"6AÈÝBŽ€€€€‚€€€7 A³)7 A­)7 A:AìÞAôÝ6AÄÞA€€€6AÀÞAã€6A¤ÞA*6AÈÞAÀÜ(6 AÓÜ,AH@AÐÜ(AÈÜ(ró‹
!
~#A0k"$@ E@AÈÜ„
!AÈ܃
!
@ AO@AÈÜ…
"A€A‰
#Ak"
$AÈ܃
AÈÜAŠ
 
A: Aj 
Aj‹
 
Aj$
AÈÜ A k 
A 
AA۠
AÈÜAÈÜ(AÓÜ,AN
 A
:,  AG:/  AG:.  AG:-  AG:+  AG:*  AG:)  AG:(  
AG:\'A4"
A60 
B7( 
B7  
B7 
B7 
B7 
B7 A j" 
6 ! a"AøÿÿÿO\r
@@ AO@ Ar"A
j!  Aÿÿÿÿk6  6  6
  : Aj! E\r
 E\r   ü\n  jA: Aj! A\'j!#AÐk"$@ Aj"
( 
," AH"E@A<"
B7 
Aà6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6
 (! AéOA4 Aèn" A4OAjA!A<"\nB7 \nAà6 \nB7 \nB7 \nB7 \nB7$ \nB74 \nB€€€ü7,  \nAj6 (!  \n6@ E\r  ("\nA
k6 \n\r  ((
 | Aj! ("! ("\n G@@@ \nAk("E\r  ("A
k6 \r  ((
 |  \nAk"\nG\r (!  6@A€
  A€
O"\n ( kAuM\r \nAt"!\n  k"@ \n  ü\n   \nj6  \n j6  \n6 E\r r !@@@@ ("\n ("I@ \n (6 \n ("6 @  (A
j6 \nAj!\n
 \n ("k"\nAu"A
j"A€€€€O\r
Aÿÿÿÿ
  k"Au"   K AøÿÿÿO"A€€€€O\r At"" \nj" (6  ("6  j!    (A
j6 ( ( ("k"\nAu Atk! \n@   \nü\n  6  Aj"\n6  6 E\r r  \n6 Aj!\n@ ,AH@ (A: A6
 A: A: \nA€”
 A:$@ ,3AH@ ((A: A6,
 A:3 A:( (" 
( 
 
,AH6  -! -! -! -! -! -! -!\n -
! -! B7( A6$ A6  A6 A6 A6 A6  AtA̞AÀ– r \nAtr Atr Atr Atr Atr Atr Atr6 
( 
 
,"AH"! 
(  ! !\n#A€k"	$@ Aj"(@A! ("E\r
A‹  
 	A4jAAüü 	 6 	 6 	 )7 	 )7 	 )7 	 )7$ 	 ( 6, 	 \n60 	AA 	("Aq6œ 	A„
j"
AA€ü 	A;ã
 	A
:®
 	A;
à
 	A
:ß
 	A
:Â
 	A;¿
 	A
:ª
 	A
:¥
 	A
:„
 A€„q@ 	A
:‚ A€€q@ 	A
:â
 A€ q@ 	A
:¨
 A€€€
q@ 	A
:Á
 A€€€q@ 	A
:¯
 Aq@ 	A
:Ä
 Aq@ 	A
:¾
 A€q@ 	A
:²
 A€Âq@ 	A
:€ A
q@A!@ A G AGqE@  
jA
: A
r"Aý
qA	F@ 
 jA
: Aj"A€G\rA E\rA
  jA
k-"A\rF\r A\nF! 	A6` 	A 6D 	 64 	A€€  A€€OAt6X 	A„jAÿ
AÔü 	B7ä 	B7Ü@AA \n 	("E@ 	AÌj!% 	A°jAr!& 	Aüj!\' 	AèjA
r!( 	A°j!AÜ!A!@@ !@@ 	(" K@ 	B7ø 	B7ð 	B7èA! 	A°jAA  	A°jF""j   F"#! 	(¨!) 	(!@@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r ! 	A°jA,A "j Aj #" 6 	A°jA$A "j Aj #" 6A! 	A°jA A "j Aj #"$A6@ 	(”"AL\r 	(œ! 	(! !\n@@  Alj"
-A>F@ \n O\r  O\r  j-A>G\r A
j"!
@ A
j" O\r@  j-"\nA G \nA	Gq\r
 
A|qAj 
A
j \nA	F!
 A
j" G\r !  
 kAkA 
 G"\n6  6 
!
 \n 
("
I\r  \n 
k"\n6 !
 A
j" G\r ! 
! 	 6ä@@  O\r  j-A\nk


  N\r 	(!
@ 
 Alj-A>F\r
 A
j" G\r ! % & " Aj #!A!\nA!A! !@A
 k!A k! 	(„" 	(üjAk! 	(¬E!  	(! 	( !\r 	(œ!! 	(¤!@@ ("AG@ !

  6@ ! ("M@ !

@ "
 O\r  (j-!@ 
 j- Aÿ
qG\r
 
A
j"
 G\r !
@ 
 k \rI\r@ 
 O\r@@ 
 j-A	k 
A
j"
 G\r !
 	 
6ä A6 	A6¨ 	 
6ä  F@   (k"A  M6 A6 ! (!@@@@ AG\r AL\r  N\r
A! 	A6¤ 
 O\r
 
 j"-A\nk

@ 	Aj 
 	Aäj.AL\r 	A6¤ AþÿÿÿqAG\r A6 A6 A6 !@ AG\r  	(”G\r A6  (" 	(œk"A  O6 	A6¨ A6@@ AL"\r  G\r 	 	( AljAk-"A>G6¨
 	A6¨ \r 	( AljAk-! Aÿ
qA>F\r  G\r 	(€@ ! 	(„"A	H@ ! 	(ü jAk-AG@ ! 	A
6¬ !@  A
q@ !
  AL\r  	(” G\r   Alj"Ak-A>F\r   G\r  	(€\r  A	H\r  -AG\r  6A A
F\r   A$k(k"A  M6 A
k! 	A6¬ 	A6¨@ ("  !O\r@ AG\r@ -"A-k















 
!  G\r@@@ A
j" O\r
  j- F\r@@  j-A	k A
j" G\r ! 	 6ä A6 A
A A=F6 ! 
 \nI\r -""E\rA ÀATE\rA
! 
A
j"\n O\r@@@  \nj-" F"\r A F\r A	G\r  j! \nA
j"\n G\r !\n AI\r
 AI\r A\nk@@@  N\r  G\r@ 	Aj   
 	Aàj 	Aèj/E\r 	-è"A>F\r   Alj"-G\r 	(ð" (K\r 	(ô" k j"!@ 	(à" O\r@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r 	 6ä   k6  6 ! 	 6ä   k"6  6  O\r@  j-A\nk  !M@ 	  j"
6ô A6 	 A
j"
6ô  A
k6 !@   !O@ (AF@ ! A6    !k6 A6 ! 	Aj   
 	Aäj 	Aèj/! (!
@@ @ 	(ä!@ 
AG\r  G\r@@  O\r  j-"A\rF\r 	-è!
 A\nG\r
 
Aÿ
qA>F\r
 A>!
 	-èA>F\r  
Aÿ
q"
A.G 
A)Gq\r 	(ìA
F\r  	(ô" 	(ðk j"!@  O\r@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r ! 	 6ä   k"
6  6  	,è6@@@  O\r  j-A\nk


 	 A
j6ô
 
 !M@ 	 
 j6ô A6
 	 A
j6ô  
A
k6 E@ 	Aj  j0\r 	(”!@ 	(˜"
 J@ 	(!

 	A 
A
v 
j 
AL"
6˜ 	( 
Als"
E@ 	(("E\rAå 	(0  	 
6 	(”!AÜ   F! A
j! 	 A
j6” 
 Alj"
 	)ø7 
 	)ð7 
 	)è7 	(”! 	(! 	(! !	 
A	F  Fq\r
 	(ä! !  O@ !
@  j"\n-"
A#G@ ! 
AþF\r
 
AàF\r
 !
  A
k"\nF\rA
  A
j"j-A#G\r  \nF\rA  Aj"j-A#G\r  \nF\rA  Aj"j-A#G\r  \nF\rA  Aj"j-A#G\r  \nF\rA  Aj"j-A#G\r  \nF\rA  Aj"j-A#G\r  \nF\r Aj!A@@  j- 
G\r
 A
j" G\r !  k"
AI@ !
 	 
6 @@@  M\r@  j-A G\r
 A
j" G\r
  M\r
@@  j-"
A\nk@ 
AàG\r \n-AàG\r !
 A
j" G\r ! 	 6ä A6 A
6 $A
6\n A	6 !	 " k"
AJ@ !

@  M"\n\r 	(Aq\r  j-A	k"AK@ !
A
 tA“€€q\r !

@ \n\r@  j-"A G A	Gq\r
 A
j" G\r !  6 	 6ä A6  
6@@@@@ 
 O\r 
 j-A<G\r 	-A q\rA!#Ak"$ 
"A
j!@@ 
Aj" 	Aj"\r("K\r \r( j"-"A k  AákAÿ
qAIAÿ
qAÐG\r -
"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\rA
!
@ Aj K\r \r( j"-"A k  AákAÿ
qAIAÿ
qAÓG\r -
"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÔG\rA
!
@ Aj K\r \r( j"-"A k  AákAÿ
qAIAÿ
qAÓG\r -
"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÙG\r -"A k  AákAÿ
qAIAÿ
qAÌG\r -"A k  AákAÿ
qAIAÿ
qAÅG\rA
!
@ A	j" K\r \r( j"-"A k  AákAÿ
qAIAÿ
qAÔG\r -
"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAØG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAÁG\rA
!
@  M\r \r(" j-A!G\rA!  j"-A-G\r -A-F\r
@  M\r \r(" j"-"A?F@A! A!G\r@ Aj" O\r  j,AH\rA!  M\r )B¡¶¢”ˆÕ ÛR\rA!
@ Aj" O\r \r(" j-"Aß
qAÁkAÿ
qAO@ A/G\r
  j-Aß
qAÁkAÿ
qAK\r
    A/F"j","AÁkAÿ
q" Aák AIAtA j("\n("E\r@@@  \n Atj-"j" K\rA! E\r
@  j-"A k  AákAÿ
qAIAÿ
q  j-"A k  AákAÿ
qAIAÿ
qG\r
  A
j"G\r
 \n A
j"Atj("\r
A!  O\r
  j-"A	k"AMAA
 tA“€€q\r
 A>F\r
 A
j" O\r A/G\r  j-A>F\r
  A
jM@A!
A! \rAA   AjAE\rA! (" O\r \r(!@@  j-"A	k"AK\rA
 tA€€qE\r A
j" G\r
AAA A\nF A\rF! Aj$ 	 "6¤@ 
 (AG\r
 	A6¤ 	("A€qE\r (AG\r 
 	(O\r 	( 
j-"A-k
 	Aj 
 	Aäj. F@ 	A6¤ $A
6 A6	 AüG\r
  	(”G\r 	(€"E\r (A
G\r 	Aäj!\n 	Aàj!A!A!\r@ 	Aj"(" 
M\r (" 
j-AüG\rA
! 
A
j"
 O\r@ 
 j-A	k"AK\r
A
 tA€€qE\r
 
A
j"
 G\r !
@@@@ 
 I@ 
 ( 
j-A:Fj!
 
 O\r (" 
j-A-G\r@@@ 
 j-"A-G\r
 
A
j"
 G\r \rA
j!\r
A
! \rA
j!\r@ 
 A:Fj"
 O\r@@ 
 j-"A	k"AK\rA
 tA€€qE\r  
A
j"
G\r
 AüG\rA
!A! 
A
j"
 O\r@ 
 j-A	k"AK\r
A
 tA€€qE\r
 
A
j"
 I\r !
 
 O\r@ 
 j-A\nk E\r
 !
 E\r
 \n 
6  \r6A

AE\r  	(à6 A\n6 A6 	(”"   F  (AF! A€qE\r  jAL\r 	( Alj"Ak-"E\r A?K\rB
 ­†B€€€€ÀƒP\r@ 	(ä" 	("\n Aj"  \nK"
O\r 	(!@  j-"A G A	Gq\r
 A
j" 
G\r 
! Aj" \nO\r 	("
 j-AÛG\r 
 A
j"j,"E\rAÃ ATE\r 
 j-AÝG\r \n Aj"G@  
j-A	k"AK\rA
 tA“€€qE\r Ak ( " -Ar: Ak \'  6@  	("
O\r 	(!@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" 
G\r 
! 	 6ä  6 	 A
j"
6ô  
6  6AÜ!A
!  ! ! 	Aj1A! 	Aj 	A@k2\r 	-Aq@ 	Aj 	AÜj2\r 	AjA0\r 	Aj3\rA!#A
k"\r$ \rA6$ 	Aj"A6@ (€AJ@ \rAøj!@@@@@@ (ø j"("Aÿ
qAk
 \r AsA\nvA
q6 \r /
: \r (6 \r (AsA\nvA
q6 \r /
: \r AÿÿK6 \r /
: \r (6
 \rA6 \r /
At(€a"6  /
! \r 6 \r At(€6 \r \rAj6 \r \rA$j6@@ ("A€q@@ A€qE\r Aÿ
q \rAj (, ("@ ($"E\rA¯ (,  ("Aÿ
q"AK\rA
 tAŽ€qE\r  (A
k6 (! A€qE\r Aÿ
q \rAj (, ("@ ($"E\rAŠ (, @ ("Aÿ
qA
k (Œ (Alj" -
A
r:
  (A
j6 \rB7` \rB7X \rB7P \rB7H \rB7@ \rB78 \rB70 \rB7(@ ("Aÿ
qA\nG\r A€€„
I\r ("A€  Av"nM\r Aq! Aj!A!\nA!@ "AO@ A|q!A!@  Atj"( j (j (j (j ( ( ( (jjjk! Aj! Aj" G\r E\r
@  Atj"( j (k! A
j! \nA
j"\n G\r  n AvO\r  ($"A¨ (,  ( A€~qA	r"6A! \rA6ˆ
 \rB7€
 \rB7x \rB7p \rB7h ("@ (Œ AljAk-A
qE!A
!@@@@@@@ Aÿ
qAk
 \r Av6h A€€I\r ("\n ("j-! (!@@@  ("O\r@  \nj- Aÿ
qG\r
 A
j" G\r
  M\r
@  \nj-A G\r A
j" G\r !@  M\r@  \njA
k-A G\r
 A
k" K\r !A!   \nj  kA \rAèj \rAÈj<\r (! !\n@  M\r@  \nj-A	k"AMAA
 tA€€q\r
 \nA
j"\n G\r !\n   j \n kA  \rA(j<\r \r :ˆ
 (!A! \rA
6l \r Av6h \r (Ak6p
 \r Av6h@@@@@@@  Aÿ
q"A	FqE@  \rAèj (, ("\r
 (! Aÿ
qAk
 ($"E\rAŠ (,  (!@ AÿÿM@ E\r Aj!@ ( (F@ Aj! A
k"\r
@  Alj"Ak( Ak(G\r A
k"\r A
k"E\r Aj! A  ="E\r A Aj (="E\r (!@@ Av"
Atq"E@A! ($"E\r
AÔ (,  r 
@ (! ("! 
! !@ !@  M\r (!@  j-A-F\r
 A
j" G\r !A!  I@ ( jA
k-A:F!@  M\r (!@@  j-"\nA-G\r
 A
j" G\r !
 Ar  \nA:F!  At(°:6 A
k! Aj! A
J\rAA (, ("@ ($"E\r
AŠ (,  r A ( (  
>"\rAA (, ("@ ($"E\r
A¯ (,  r AI\r
@AA (, ("E@ Aj!A!
 ($"E\r
AŠ (,  r@ A  Atj"( (  
>"\r
 A
j" G\rAA (, ("E\r
 ($"E\rA¯ (,  r r
  Aj (?"\r
A!  (Aÿ
q"A	Fq\r  \rAèj (, ("E\r ($"@A¯ (,  ! \r
 \r(X@ \r(Hr \r(Lr \r(Pr \r(8E\r \r((r \r(,r \r(0r \r (! -AkA
M@ Al j! At j!
 (Œ (Alj" -
Aþ
q A\nvA
qr:
  (A
j6 Aj" (€H\r A6€A! \rA
j$ "\r 	-Aq@A!A!#A@j"
$@ 	Aj"(`"E\r (pE\r (X AAW@@AA (, ("E@ (`E\r 
A0j!\n
 ($"E\rAŠ (, @ (X Alj"(E\r
 
B7  
B7 
B7 
B7 \nB7 \nB7 
 (6( 
 (6,@  ( (A \n 
Aj<@A!
A 
A(j (, ("@ ($"E\r
AŠ (, 
  ( (?"\rA 
A(j (, ("E@A!
 ($"E\rA¯ (,  
(@ 
(r 
(r 
(r \r A
j" (`I\rA!AA (, ("E\r ($"@A¯ (,  ! 
A@k$ \rA!AA 	(0 	("E\r 	(("@A¯ 	(0  ! 	 \n6ä A
6 !@ 	(ä"Aj" 	("O\r 	(!@@  j"
-A\nk@ 
-
A\nk@ 
-A\nk@  j-A\nk Aj! Aj!  I\r@  I@ 	(!@A
!@  j-A\nk A
j" G\r !A! 	A°jA(A "j Aj #"\n 6 " ("AG\r@@  ("
M\r 	(!@  jA
k-"A G A	Gq\r
 A
k" 
K\r
@ 
 O\r 	(!@  jA
k-A#G\r
 A
k" 
K\r
 
 F\r 	( jA
k-"
A	F@ !

 
A F@ !

 !
  	-AqE\r
 \n 
6 
!@ AkAI\r  ("M\r 	(!@  jA
k-"
A G 
A	Gq\r
 \n A
k"6  I\r @  	( j-A\rFj!  I@  	( j-A\nFj!@ )E\r E\r  j"AL\r 	( Alj"Ak-A>F\r 	(ü Ak(j" (A€r6@ \r  j" 	(”N\r 	Aj 0\r
 AJ@ 	AjA Al"
 	(j"(" -
Aq 	( j,AA4\r
 	AjA 	(ü" 	-éAq" 	( j,AA
4\r
 	( 
j" -
Aý
q r:
 	( 
j 6 @ 	(”!@ 	-AqE\r 	( Alj"
Ak-A>G\r (AG\r \n(" ("k"AkAK\r 	(" j"-AÛG\r -
A!G\r  jA
k-AÝG\r Ak! Aj!A!@@@@ Ak
@  j-"A k  AákAÿ
qAIAÿ
q -–"A k  AákAÿ
qAIAÿ
qG\r A
j" G\rA@  j-"A k  AákAÿ
qAIAÿ
q -\r"A k  AákAÿ
qAIAÿ
qG@ A\nk A
j" G\rAA!@  j-"A k  AákAÿ
qAIAÿ
q -\n"A k  AákAÿ
qAIAÿ
qG@ A\nG\r A
j" G\rA
A!@  j-"A k  AákAÿ
qAIAÿ
q -ä"A k  AákAÿ
qAIAÿ
qG@ A\nG\r -"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÕG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÏG\r -"A k  AákAÿ
qAIAÿ
qAÎG\rA  A
j" G\rA! 
Ak"
 
-Ar: 	( 	(”AljAk"
 
-AÇ
q r: A6 	(”!  k!
@A!@@A
 	( 
Alj"-A)kt"AqE@ A!qE\r
A! 	Aj1  	(„6 	Aj  ( ,A
4\r 	AjA (" -
Aq 	( j,AA
4\r
 	AjAA
 -
"AqA AvAqA
4\r 
A
j"
 	(”H\r@ (E@ 	Aj1@A!A!AÜ! 	-AÀqE\r
 ( \n(I\r
 	 	(ŒA
j6Œ
 	(Œ@@ 	(„"
Aj" 	(ˆ"J@ 	A€ A
v j AL"6ˆ 	(ü s"E@A! 	(("E\rAå 	(0  	(€"
@ 	  
 	(ükj6€ 	 6ü 	 	(„"
Aj6„
 	 6„ 	(ü"\rA! 
 j"A;
 	(Œ!
 A6  
AtAr6 	A6Œ@ $(E\r 	Aj1E\rA!@@@@ ("A
k\n
A! 	Aj1\r 	(„"Aj"
 	(ˆ"J@ 	A€ A
v j AL"6ˆ 	(ü s"E@ 	(("E\r\nAå 	(0 \n 	(€"
@ 	  
 	(ükj6€ 	 	(„"
Aj6„ 	 6ü 
 j
 	 
6„ 	(ü"E\r  j" (AtAÐÍj("
 /
Atr6 (! A6  
 Atr6 	 6€ 	Aj 5\r 	Aj1\rA!AÜ! 	(€A: 	(€ /
;
 	(€" (A€r6A! 	Aj 5\r 	Aj1\rA! 	(€E@AÜ! A6 ! 	(€A\n: 	(€ /
;
 A	6AA 	Aj 5!
@  (F\r 	Aj1E\rA!@ 	(€\r !@ 	Aj"\n(€"Aj" \n(„"
J@ \nA€ 
A
v 
j 
AL"
6„ \n(ø 
s"
E@A \n($"
E\rAå \n(, 
A \n(ü"@ \n 
  \n(økj6ü \n 
6ø \n \n(€"Aj6€ 
 j
 \n 6€ \n(ø"
E\r 
 j"
 (AtAÐÍj(" 
/
Atr6 (! 
A6 
  Atr6 \n 
6üA
AE\rA! 	Aj 5!A! E\r
A!
 	(("E\rAŠ \n  	(P"@ 	(T"
A!@@ 	(P Atj("E\r 	(@" M@   	(D 	(HljI\r
 r 	(T!
 A
j" 
I\r 	(P r 	(H@A!@ 	(@ Atj"-"
A
q (r - 
Aq@ (r A
j" 	(HI\r 	(@r 	(l"@ 	(p"
A!@@ 	(l Atj("E\r 	(\\" M@   	(` 	(dljI\r
 r 	(p!
 A
j" 
I\r 	(l r 	(d@A!@ 	(\\ Alj(r A
j" 	(dI\r 	(\\r 	(8r 	(xr 	(ür 	(r 	A€j$ @A<"
B7 
Aà6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6
 (@ (("E\r ((" ($"
G A$j!A!@@@ 
 At"j("(A
F@ ($" (("G\r
 A
j!
  k"
Au!@@ ((AF\rA
! 
AG@@ A
j!
  Atj"((AF@ 
 O\r Ak(!  
Atj(! \r \r 
! 
 G\rA! A68 B70A!

A!
 A68 B70 A6L B7D  A0j6@  AÄj6<@@@@@@  
At"j"("(AG\r 
 Ak(A
!  
A
j"K@  Atj( rA
G\r
 A<j ($ j! (4"
 (8"I@ 
 (6 
 ("6 @  (A
j6  
Aj64 
 (0"k"
Au"A
j"A€€€€O\rAÿÿÿÿ
  k"Au"\n   \nI AøÿÿÿO"A€€€€O\r At""\n 
j" (6  ("6 \n j!    (A
j6 (8 (4 k"
Au Atk! 
@   
ü\n  68  Aj"
64  60 @ r  
64
@ (H" (L"I@  6  ("6 @  (A
j6 Aj!
  (D"k"Au"A
j"A€€€€O\rAÿÿÿÿ
  k"Au"\n   \nI AøÿÿÿO"A€€€€O\r At""\n j" (6  ("6 \n j!    (A
j6 (L (H k"Au Atk! @   ü\n  6L  Aj"6H  6D E\r r  6H 
A
j! "
 (( ($"kAu"I\r
 A<j (D"@ " (H"
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r (D!  6H (L r (0" (4"
F\r ($ j"!
 Aj" (("G@@ )!* B7 
(! 
 *7@ E\r  ("A
k6 \r  ((
 | 
Aj!
 Aj" G\r ((!  
G@@@ Ak("E\r  ("A
k6 \r  ((
 | 
 Ak"G\r  
6(   (0"
 (4"  
kAu (4"
 (0"kAu j
 A
j! @ " 
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r (0!  64 (8 r ($!
 ((!   
kAuI\r ((  (( ("
("E\r  6  
("
6 
E\r
 
 
(A
j6
A<"
B7 
Aà6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6 AÐj$ ,AH@ ( (r (!
 Aj"A6 B7 A€”
 
 \nAÓÜ,AH@AÐÜ(AÈÜ(rAÐÜ (6AÈÜ )"*7AÓÜ,AH! *§!@ ("E\r  ("A
k6 \r  ((
 | (!
 A6 
@ 
",3AH@ 
(0 
((r ,AH@ ( (r ("
@ 
" ("G@@@ Ak("E\r  ("A
k6 \r  ((
 | 
 Ak"G\r (!  
6 ( r@ ("E\r  ("A
k6 \r  ((
 | r AÈÜ ! A0j$ AÆ A¤
 
"AÈÛ6 AÔÛA
®
	#Ak"$ 
A"š
 ( ," AH""@ (  " j!@@@@@@@@@@@ -"Ak
 
A²›
 
Aë\r›
 
A¹›
 
AÒ\n›
 
AΛ
 
Aø›
 AÜF\r
 AM@  6#Ak"$  6#A 
k"$  A	j"6”
 A6˜
 AA
ü A6L A6$ A6P  AŸ
j6,  A”
j6T A:A!#AÐ
k"$  6Ì
 A 
jAA(ü  (Ì
6È
@A AÈ
j AÐj A 
jgAH\r (LAH!\n  ("	A_q6@@ (0E@ AÐ60 A6 B7 (,!  6,
 (\r
A d\r
  AÈ
j AÐj A 
jg! 	A q!	  AA ($ A60  6, A6 ( B7A   ( 	r6 \n\r AÐ
j$ A 
j$ Aj$ 
 A	j›
 
 Àš

 
Aà›
 A
j" G\r 
A"š
 Aj$á

 
Aµ›
 ("A"I@ 
 At(Ì›
 
A"š
 ( ," AH@ 
A²›
 Aj 
	 (@ 
A”›
@ ("E\r Aj 
	 
A:š
 Aj 
	 ("E\r@ 
A,š
 Aj 
	 
A:š
 Aj 
	 ("\r 
Aýš
 ($ ((G@ 
Aç›
@ ($" ((F\r ( 
\n (( ($kAM\rA
!@ 
A,š
 ($ Atj( 
\n A
j" (( ($kAuI\r 
AÝš
 
Aýš
A€AÎAÎAÓ
¾

#A k"$@ E\r 
E\r E\r@@@@ 
A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6  Aj6  )7  A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6  Aj6  )7  Aj -$A
G\r
 A(j 
 •

 Aj 
 •
 A j$As

 E@A
@ ( (F\r  ("
 (kA	I\r@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak6AÔ
#Að
k"$@@ E@A
!	
@@@@@@@@@@@@@ 
\r\r	\n\r\rA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r@@ 
("@ 
("\r
 A6è
 B7à

 AøÿÿÿO\r@ AO@ Ar"A
j!  Aÿÿÿÿk6è
  6à
  6ä

  :ë
 Aà
j! @   ü\n  jA: (ä
 -ë
" ÀAHE\r AàÜ Aà
j@ 
("E\r 
("E\r AøÿÿÿO\r@ AO@ Ar"A
j!
  Aÿÿÿÿk6Ü
  
6Ô
  6Ø

  :ß
 AÔ
j!
 @ 
  ü\n 
 jA: (Ø
 -ß
"
 
ÀAH@ AìÜ AÔ
j ,ß
AN\r (Ü
 (Ô
r ,ë
AN\r (è
 (à
r  6Ð
  6Ì
  (A
j6  )Ì
7    ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6È
  Aj6Ä
  )Ä
7  AjA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6À
  Aj6¼
  )¼
7  Aj\nA<"B7 A	6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6¸
  Aj6´
  )´
7  Aj	A<"B7 A\n6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6°
  Aj6¬
  )¬
7   A jA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6¨
  Aj6¤
  )¤
7(  A(jA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r@@ 
("@ 
("\r
 A6è
 B7à

 AøÿÿÿO\r	@ AO@ Ar"A
j!  Aÿÿÿÿk6è
  6à
  6ä

  :ë
 Aà
j! @   ü\n  jA: (ä
 -ë
" ÀAHE\r AàÜ Aà
j@ 
("E\r 
("E\r AøÿÿÿO\r	@ AO@ Ar"A
j!
  Aÿÿÿÿk6Ü
  
6Ô
  6Ø

  :ß
 AÔ
j!
 @ 
  ü\n 
 jA: (Ø
 -ß
"
 
ÀAH@ AìÜ AÔ
j ,ß
AN\r (Ü
 (Ô
r ,ë
AN\r (è
 (à
r  6 
  6œ
  (A
j6  )œ
70  A0j  ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6˜
  Aj6”
  )”
78  A8jA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6
  Aj6Œ
  )Œ
7@  A@kA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6ˆ
  Aj6„
  )„
7H  AÈjA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6€
  Aj6|  )|7P  AÐjA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6x  Aj6t  )t7X  AØj
A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6p  Aj6l  )l7`  Aàj Að
j$ 	Ð
\n#Aàk"$@ E@A
!
@@ 	







A! A:$ B7 B7 B7 B€€€€€€€À?7 @ (, ,3" AH"
"E\r A(j"("  
!
@  
j-S@ A
j" G\r
   AH j-A<G\r@ A
j" O\r   AH"
 j-A/F\r
@  
j-SE\r
 A
j" G\r
  O\r   AH! !
@@ 
 j"-S\r
 -A>F\r
 -A/F\r
 
A
j"
 G\r !
  
F\r Aj 
 k”
  
I@@ Aj ((  ,3AH j-bÀš
 A
j" 
G\r 
 (," ,3"	 	AH"O\r 	Av! Aj!\n@ (  A
q!@ 
 j"-S@ 
A
j"
 I\r
 -A>F\r
 -A/F\r
@@  
K@ 
!@@  j"-A=F\r
 -S\r
 -A>F\r
 -A/F\r
 A
j" I\r ! 
 G\r
 
A
j!

 A6P B7H AÈj  
k”
 
 I@@ AÈj ((  ,3AH 
j-bÀš
 
A
j"
 I\r@@  (, ,3" AH""O\r (  !@@  j"
-SE\r
 A
j" G\r  
-A=G\r@@@@@@  "A
j"M\r
  j"
-S\r B78 A6@@ 
-A"F\r 
-A\'F\r !
@ 
 j"	-S\r 	-A>F\r 	-A/F\r 
A
j"
 G\r !
 Aj"!@  M\r 
-!
@  j- 
F\r
 A
j" I\r !  k"  k"
  
I"AøÿÿÿO\r@@ AO@ Ar"	A
j!
  	Aÿÿÿÿk64  
6,  60
  :7 A,j!
 E\r
 E\r 
  j ü\n  
jA: ,CAH@ (@ (8r  (46@  ),78   (, ,3" AHIj!
 A6@ B78 !
  M\r  k" 
 k"  I"AøÿÿÿO\r
@@ AO@ Ar"	A
j!  	Aÿÿÿÿk64  6,  60
  :7 A,j! E\r
 E\r   j ü\n  jA: ,CAH@ (@ (8r  (46@  ),78  AÈj6\\ A,j \n AÈj AÜj@ (,"Aj" A8jF\r ,C! ,AN@ AN@  (@6  )87  (8 (<™

  (8 A8j AH" (<  ˜
 ,CAN\r (@ (8rA¤
AƁ
"AüÛ6 AˆÜA
 !
  AÈj6, A8j \n AÈj A,j (8",AH@ A6 (
 A: AjA: ,SAH@ (P (Hr (,! -3!	 
  	Aÿ
q 	ÀAH""I\rA!A!@ ( ,"
 
AHAG\r ( Aj 
AH"
(Aöґ«s 
-Aïsr\r A:S A:K A»/;
H A½-:J Aj!\nA!	 AÈj"( ," AH""! (  "!@ "AI\r Ak"Aq@ !
 
 (A•ÓÇÞl"Av sA•ÓÇÞl A•ÓÇÞls! !
 Aj! AI\r 
!@ (A•ÓÇÞl"
Av 
sA•ÓÇÞl (A•ÓÇÞl"
Av 
sA•ÓÇÞl A•ÓÇÞlsA•ÓÇÞls! Aj! Ak"AK\r@@@@ A
k
 -At s! -
At s!  -sA•ÓÇÞl!@ \n("
E\r \n( A\rv sA•ÓÇÞl"Av s" 
A
kq 
i"A
M\r  
 K\r  
p"Atj("E\r ("E\r 
A
k!	 A
K!\n@@@  ("G@@ \nE@  	q!
 
 K\r  
p!  G\r
 ( ," AH" G\r ( Aj   U\r !	 ("\r
A
 	!
 ,SAH@ (P (Hr 
E\r 
( 
," AHE\rA<"B7 A!6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, A:S AŽ/;
H A-:J A:K  AÈj6, A8j Aj AÈj A,j@ (8" 
F\r 
Aj! Aj! 
,! ,AN@ AN@  (6  )7  
( 
(™

  
(  AH" 
(  ˜
 ,SAH@ (P (Hr Aj! Aj ,AH@ ( (r@ ,3AH@ ((A: A6,
 A:3 A:(@ E\r ( ("F\r Ak(!  6  6 A$j Aj@ ("E\r  ("A
k6 \r  ((
 |A!A! E\r
  ("A
k6 \r
  ((
 |
A! ( (F\r  (" (kA	I\r@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
|  Ak6 Aàj$ à%
#A k"$@@ E@A
!	
@@@@@@@@@@@@@@@@ A
k
\n\r	A<"B7 A
6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6Œ  Aj6ˆ  )ˆ7  A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,@ 
E\r 
(!
 A:• AA
 
 
A
L"
 
ANA0r:” A”ja"
AøÿÿÿO\r@@ 
AO@ 
Ar"A
j!  Aÿÿÿÿk6€  6ø
  
6ü

  
:ƒ Aø
j! 
E\r
 
E\r  A”j 
ü\n 
 jA: AÔÜ6˜ A¤
j AjAÔÜ A˜j@ (¤
"Aj"
 Aø
jF\r ,ƒ! ,AN@ AN@ 
 (€6 
 )ø
7 
 (ø
 (ü
™

 
 (ø
 Aø
j AH" (ü
  ˜
 ,ƒAN\r (€ (ø
r  6ô
  Aj6ð
  (A
j6  )ð
7  Aj  ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6ì
  Aj6è
  )è
7  Aj\rA<"B7 A 6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
("E\r 
("E\r AøÿÿÿO\r@ AO@ Ar"A
j!
  Aÿÿÿÿk6€  
6ø
  6ü

  :ƒ Aø
j!
 @ 
  ü\n 
 jA: (ü
 -ƒ"
 
ÀAH@ AÄÝ Aø
j ,ƒAN\r (€ (ø
r  6ä
  6à
  (A
j6  )à
7  Aj  ("A
k6 \r  ((
 |A<"B7 A\r6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6Ü
  Aj6Ø
  )Ø
7   A jA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
("
A
F\r Aø
j 
œ
 A¬Ý Aø
j ,ƒAN\r (€ (ø
r  6Ô
  6Ð
  (A
j6  )Ð
7(  A(j  ("A
k6 \r\n  ((
 |\nA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
(E\r A”Ý Aø
jAû" ,AH@ ( (r A Ý Aø
jAûA› 
-Aß
qAØF"
 
,AN\r 
( 
(r  6Ì
  6È
  (A
j6  )È
70  A0j  ("A
k6 \r	  ((
 |	A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r@ 
- "E\r A:¥
  :¤
 AøÜ Aø
j A¤
j" ,AN\r ( (r 
("E\r 
("E\r AøÿÿÿO\r\n@ AO@ Ar"A
j!
  Aÿÿÿÿk6€  
6ø
  6ü

  :ƒ Aø
j!
 @ 
  ü\n 
 jA: (ü
 -ƒ"
 
ÀAH@ AˆÝ Aø
j ,ƒAN\r (€ (ø
r  6Ä
  6À
  (A
j6  )À
78  A8j  ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6¼
  Aj6¸
  )¸
7@  A@kA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r Aø
j 
(œ
 A¸Ý6˜ A¤
j AjA¸Ý A˜j@ (¤
"Aj"
 Aø
jF\r ,ƒ! ,AN@ AN@ 
 (€6 
 )ø
7 
 (ø
 (ü
™

 
 (ø
 Aø
j AH" (ü
  ˜
 ,ƒAN\r (€ (ø
r  6´
  6°
  (A
j6  )°
7H  AÈj  ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r A:€ BãÞ±›ô­·ô7ø
 A:ƒ A¤
j 
(œ
  Aø
j6” A˜j Aj" Aø
j A”j@ (˜"Aj" A¤
jF\r ,¯
! ,AN@ AN@  (¬
6  )¤
7  (¤
 (¨
™

  (¤
 A¤
j AH" (¨
  ˜
 ,¯
AH@ (¬
 (¤
r ,ƒAH@ (€ (ø
r A"6ø
 BŒ€€€€‚€€€7ü
 Aù	(6 Añ	)7 A: A¤
j 
(œ
  Aø
j6” A˜j  Aø
j A”j@ (˜"Aj" A¤
jF\r ,¯
! ,AN@ AN@  (¬
6  )¤
7  (¤
 (¨
™

  (¤
 A¤
j AH" (¨
  ˜
 ,¯
AH@ (¬
 (¤
r ,ƒAH@ (€ (ø
r A"6ø
 BŒ€€€€‚€€€7ü
 Aì	(6 Aä	)7 A: A¤
j 
(œ
  Aø
j6” A˜j  Aø
j A”j@ (˜"Aj"
 A¤
jF\r ,¯
! ,AN@ AN@ 
 (¬
6 
 )¤
7 
 (¤
 (¨
™

 
 (¤
 A¤
j AH" (¨
  ˜
 ,¯
AH@ (¬
 (¤
r ,ƒAN\r (€ (ø
r  6 
  6œ
  (A
j6  )œ
7P  AÐj  ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6˜
  Aj6”
  )”
7X  AØjA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6
  Aj6Œ
  )Œ
7`  AàjA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6ˆ
  Aj6„
  )„
7h  AèjA<"B7 Aà6 B7 B7 B7  A6( B74 B€€€ü7, AA AF6@ 
E\rAš\n! 
(A
k"AM@ At(Ð! A:ƒ A:ý
 Aá\r(6ø
 Aå\r-:ü
 a"AøÿÿÿO\r@@ AO@ Ar"A
j!
  Aÿÿÿÿk6¬
  
6¤
  6¨

  :¯
 A¤
j!
 E\r
 E\r 
  ü\n  
jA:  Aø
j6” A˜j Aj Aø
j A”j@ (˜"
Aj" A¤
jF\r ,¯
! 
,AN@ AN@  (¬
6  )¤
7  (¤
 (¨
™

  (¤
 A¤
j AH"
 (¨
  
˜
 ,¯
AH@ (¬
 (¤
r ,ƒAN\r (€ (ø
r  6€
  Aj6|  (A
j6  )|7p  Aðj  ("A
k6 \r
  ((
 |
 A
:$ ,3AH@ ((A: A6,
 A:3 A:( A j$ 	 
#Ak"$@ ( ,"
 
AHE\r (" (F\rA<"
B74 
B€€€ü7, 
A6 
Aà6 
B7 
B7 
B7$ 
 Aj")7 
 (6 A: A: Ak(!  
6  
Aj6 A$j Aj@ ("
E\r 
 
("A
k6 \r 
 
((
 
| ,AH@ (A: A6
 A: A: Aj$ª

~A
!@@@ (Ak


























 ( ,"
 
AH"
"E\r
  ( Aj 
"j!
 !@@ 1"B?V\rB
 †B€Ì€€ƒP\r A
j" 
G\r
  kAFA! ¹	
	#Ak"$ ("("
 ("kAu!@ 
 F\r@  Atj(E\r
 A
j" G\r !@@ " M\r
  A
k"Atj(\rA<"
B7 
A
6 
Aà6 
B7 
B7 
B7  
A6( 
B74 
B€€€ü7,  
6  
Aj6 
A0j!  At"
j!  At"j!@  
kAu"	 ("
 ("kAuM@ (" k"
Au 	I@ 
 j!
  G@@ (! ("@  (A
j6  6 (!  6@ E\r  ("A
k6 \r  ((
 | Aj! Aj" 
G\r (! ! 
 G@@  
(6  
("6 @  (A
j6 Aj! 
Aj"
 G\r    kj6  G@@ (!
 ("@  (A
j6  
6 (!
  6@ 
E\r 
 
("A
k6 \r 
 
((
 
| Aj! Aj" G\r (!  G@@@ Ak("E\r  ("
A
k6 
\r  ((
 |  Ak"G\r  6
 @ ! ("
 G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r ( (!  6 r A6 B7A!
@ 	A€€€€O\rAÿÿÿÿ
 
Au" 	  	K 
AøÿÿÿO"A€€€€O\r  At"
"6  6  
 j6  G@@  (6  ("
6 
@ 
 
(A
j6 Aj! Aj" G\r  6
 ( Aj@ ("
E\r 
 
("A
k6 \r 
 
((
 
| ("(! (!
 
 G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r  6 Aj$A„)

A¤
€
"A€Ú6 A”Ú6 AèÚAÂ	
~ AL@ (" ("kAu N@  
k"Au"\n H@@   j"	F@ !
 	! !@  (6  ("6 @  (A
j6 Aj! Aj" G\r  6 \nAL@ 
 At"j! !   k"K@ !@  (6  (6 B7 Aj! Aj" I\r  6  G@@ Ak")! B7 Ak(! Ak" 7@ E\r  ("A
k6 \r  ((
 | 
 G\r 
 F@ 
!@ (! ("@  (A
j6  6 (!  6@ E\r  ("A
k6 \r  ((
 | Aj! Aj" 	G\r 
 At"j! !   k"K@ !@  (6  (6 B7 Aj! Aj" I\r  6  G@@ Ak")! B7 Ak(! Ak" 7@ E\r  ("A
k6 \r  ((
 | 
 G\r  Atj! 
!@ (! ("@  (A
j6  6 (!  6@ E\r  ("A
k6 \r  ((
 | Aj! Aj" G\r@  ("kAu j"A€€€€I@Aÿÿÿÿ
  k"Au"   I AøÿÿÿO" A€€€€O\r AtA"	 
 kj! At"Ak"Aq   (6  ("6 @  (A
j6 Aj! Aj!  j! @@  (6  ("6 @  (A
j6  (6  ("6 @  (A
j6 Aj! Aj" G\r ( 
k"@  
 ü\n  
6  
 ("k"k!
 @ 
  ü\n   j6  
6 (  	 Atj6 @ rÝ
#A k"$ ($" (("
G@@ ( Aj" 
G\r@ (AG\r ($" (("
F\r !@@@@@ (("


















 
 k"AH\r
  "6  6   j6 A6 B7  Aj6  Aj6@ Aj!@@ (("















  Aj!   
 Aj"G\r Aj" 
G\r
  ($"@ "
 (("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
|  Ak"G\r ($!
  6( (, 
r  (6$  (6(  (6, A6 B7 ("E\r "
 ("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
|  Ak"G\r (!
  6 ( 
r ("E\r "
 ("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
|  Ak"G\r (!
  6 ( 
r A j$¶
~#A k"$@@@ ($"
 (("F\r@ 
("("A G AGqE@  
Aj"
 G\r ((" ($"F\r A$j!@  \nAt"\rj("
("	A\rkAO \nA
jA
!@ 
($" 
(("F\r !
@@@ 
("(AG\r (( ($"kAG\r ((A!F\r
 
Aj"
 G\r
 A6 B7 A6 B7@@@ ("
(AG\r 
(( 
($"
kAG\r 
((A!G\r (" ("G@A<"
B7 
 	6 
Aà6 
B7 
B7 
B7  
B€€€€€€€À?7(  
6  
Aj6 
 (68 
 64 
 60 A6 B7 Aj @ ("
E\r 
 
("A
k6 \r 
 
((
 
| (($!
 (" ("I@  
(6  
("
6 
@ 
 
(A
j6  Aj6  ("k"Au"A
j"A€€€€O\rAÿÿÿÿ
  k"Au"   I AøÿÿÿO"A€€€€O\r At"" j" 
(6  
("
6  j!  
 
 
(A
j6 ( ( k"Au Atk!
 @ 
  ü\n  6  Aj"6  
6 @ r  6
 Aj  Aj" G\r@ (" ("F\rA<"
B7 
 	6 
Aà6 
B7 
B7 
B7  
B€€€€€€€À?7(  
6  
Aj6 
 (68 
 64 
 60 A6 B7 Aj  ("
E\r 
 
("A
k6 \r 
 
((
 
| ($ \rj"	!
 	Aj" (("G@@ )! B7 
(! 
 7@ E\r  ("A
k6 \r  ((
 | 
Aj!
 Aj" G\r ((! 
 G@@@ Ak("E\r  ("A
k6 \r  ((
 | 
 Ak"G\r  
6(  	 ("
 ("  
kAu ("	! ( 	k! ("@ " ("
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r (!  6 ( r (! @ " ("
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r (!  6 ( r Au! ($! ((!  \nj!\n \n  kAuI\r A j$Þ

#Ak"$ @ 
("E\r (" (F\r Ak(! 
("@  (A
j6 Aj!  6  6 A$j Aj@ ("E\r  ("A
k6 \r  ((
 |  
@ 
("
E\r 
 
("A
k6 \r 
 
((
 
| Aj$¢	} ( ," AH""! (  "	!@ "AI\r Ak"Aq@ ! 	
 	(A•ÓÇÞl"Av sA•ÓÇÞl A•ÓÇÞls! ! 	Aj! AI\r !@ (A•ÓÇÞl"Av sA•ÓÇÞl (A•ÓÇÞl"Av sA•ÓÇÞl A•ÓÇÞlsA•ÓÇÞls! Aj! Ak"AK\r@@@@ A
k
 -At s! -
At s!  -sA•ÓÇÞl! A\rv sA•ÓÇÞl"Av s! @ 
("E\r 
(  A
kq i"A
M\r   K\r  p"Atj("E\r ("E\r A
k!\n A
K!@@  ("G@@ E@  \nq!
  K\r  p!  F\r
 ( ," AH G\rA ( Aj AH 	 UE\r ("\rA " 6 A6 Aj!@ (",AN@  (6  )7
 (! (!\n#Ak"$@@@ \n‘
@ " \n’

 \nA÷ÿÿÿK\r
 Aj \nŒ
A
j“
 (  ("6  (
  \n6   \nA
j‰
 Aj$

 A6 B7 
*!\r 
(A
j³!@ @ \r ³” ]E\r
@A  A
kqAG AIr A
tr"  \r•ü
"  K"A
F\r   A
kqE\r w" 
("M@  M\r
 
(³ 
*•ü
! @ AI\r iA
K\r A
A  A
kgkt AI
 w"  K" O\r
 
!@@ "@ A€€€€O\r
 At"! (!  6 @ ( r (!  6 @ A ü ("E\r Aj! (!@ i"	A
M@  A
kq!
  I\r  p!  Atj 6 ("E\r A
k!\n 	A
K!@ (!@ E@  \nq!
  I\r  p!@  F@ !
  Atj"	(E@ 	 6 ! !
  (6  	((6 	( 6 ("\r (! A6 @ ( r A6
 
(" A
k"qE@  q!
  K@ !
  p!@ 
(" Atj"("E@  
(6 
 6  
Aj6 ("E\r
 (!@  A
k"qE@  q!
  K\r  p!  Atj 6
  (6  6 
 
(A
j6A
:  6¡

#Ak"$  
6 Aj Aj 
 Aj@ ("Aj"
 F\r ,! ,AN@ AN@ 
 (6 
 )7 
 ( (™

 
 (  AH" (  ˜
 Aj$}
 
a"AøÿÿÿI@@@ AO@ Ar"A
j!  Aÿÿÿÿk6  6  6
  : ! E\r
 E\r  
 ü\n  jA: o
 ("
@@ 
(! 
,AH@ 
( 
(r 
,AH@ 
( 
(r 
r "
\r (!
 A6 
@ ( 
r
 (" ("I@  
(6  
(6 
B7  Aj6@  ("k"Au"A
j"A€€€€I@Aÿÿÿÿ
  k"Au"   I AøÿÿÿO" A€€€€O\r AtA" j" 
(6  
(6 
B7  Atk!
 @ 
  ü\n   Atj6  Aj"6  
6 @ r  6Î

#Ak"$ @ 
("E\r ( ("F\r Ak(! 
("@  (A
j6  6  6 A$j Aj ("E\r  ("A
k6 \r  ((
 |@ 
("
E\r 
 
("A
k6 \r 
 
((
 
| Aj$Ý
#A0k"
$ ("(" ("G@ !@@@ (@  Aj"G\r
A<"B7 A
6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, 
 6 
 Aj6 
A: 
A¢\n(6 
A¦\n-: 
A: 
A: 
AôäÕ«6 
A: 
 
Aj6$ 
A(j Aj 
Aj 
A$j@ 
(("Aj" 
F\r ,AN@  
(6  
)7
  
A˜
 
,AN\r 
( 
(r 
,AH@ 
( 
(r (! (0"@ " (4"G@@@ Ak("E\r  ("A
k6 \r  ((
 |  Ak"G\r (0!  64 (8 r A68 B70  (60  (64  (68 A6 B7 ( 
Aj 
("E\r
  ("A
k6 \r
  ((
 |
@ (  Aj" G\r ("(" ("G@@@ Ak("E\r  ("A
k6 \r  ((
 |  Ak"G\r  6 
A0j$ AßÜ,AH@AÜÜ(AÔÜ(r AëÜ,AH@AèÜ(AàÜ(r A÷Ü,AH@AôÜ(AìÜ(r AƒÝ,AH@A€Ý(AøÜ(r A“Ý,AH@AÝ(AˆÝ(r AŸÝ,AH@AœÝ(A”Ý(r A«Ý,AH@A¨Ý(A Ý(r A·Ý,AH@A´Ý(A¬Ý(r AÃÝ,AH@AÀÝ(A¸Ý(r AÏÝ,AH@AÌÝ(AÄÝ(r Aà6  Aà6 r¬

#Ak"$ Aj"
($"@ " 
(("G@@@ Ak("E\r  ("A
k6 \r  ((
 |  Ak"G\r 
($! 
 6( 
(, r 
Aj 
,AH@ 
( 
(r Aj$ rµ
 (!@@@@@@@@@@@@ ( Ak
  
A
j"M@  
6A A
k! (!@@ 
! !
@  j"-"A<G@ A\nk


 
 j-A/G\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r  j-A>F\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÓG\r -"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r  j-A>F\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÓG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÙG\r -"A k  AákAÿ
qAIAÿ
qAÌG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r  j-A>F\r A\nj" O\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAØG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -	"A k  AákAÿ
qAIAÿ
qAÁG\r  j-A>F\r\r 
A
j" G\r !  6A 
Aj" O\r Ak! (!@@ 
 j"-A\nk\n\n /A­Ús -A>srE\r 
Aj! 
A
j!
  I\r !
 
Aj" O\r Ak! (!@@ 
 j"-A\nk		 /A¿üF\r 
Aj! 
A
j!
  I\r !
 
A
j" O\r A
k! (!@@@ 
 j-"A\nk	

	 A>F\r 
Aj! 
A
j!
  I\r !
 
Aj" O\r Ak! (!@@ 
 j"-A\nk /Aݺ
s -A>srE\r 
Aj! 
A
j!
  I\r !
@@ 
 O\rA! ( 
j-A\nk


  
6 ( !   6A  6A  6A  6A  
6A  A
j6A
Å
@  ("O\r 
 (˜O\r @ (" j-"E\r A>F@ A>:  
6  -
Aü
q:
 A
j! 
A
j A?K\rB
 ­†B€€€€€ƒP\r  A
j"K@  j-A	k"AK\r
A
 tA“€€qE\r
  :  
6  -
Aü
q:
 
A
j
A! A6  A	j"   I"\nO\r
A! !@@  j-"	A0kAÿ
qA	K\r
  	 A\nljA0k"6 A
j" \nG\r \n!  M\r
  O\r
@  j-"	A)k  A
j"K@  j-A	k"AK\rA
 tA“€€qE\r  	:  
6  -
Aü
q:
 
 k jA
j6  6A
! ç

 
 ("H@@A!@@@A
 (ΠAlj"Ak"-A)kt"AqE@ A!qE\r
A! Ak(!A! Ak-Aq@ ( j,!A! A  A4\r
  A ,A4\r
 AA
 Ak-"AqA AvAqA4E\r
A!   (A
k"6 
 H\rAÞ
#A0k"$@ (ü"
E\r@@@ 
("Aÿ
qAk
 A€qE\r
 
(" (O\r ( j-AÛG\r@ 
("E\r 
Aj! A<j!@@  Atj"(!
@@ -AqE@ (!\n
 (!\n 
A
j" (O\r 
 \nj-AÛG\r  \nj-AÞG\r 
Aj"\r ("O\r  k! \r!@@  \nj-"A	k"AMAA
 tA€€q\r@ AÛk

  A
j"G\r
  \rF\r AÝG\r A
j" O\r  \nj-A:G\r@ Aj" O\r@  \nj-A	k"
AK\r
A
 
tA€€qE\r
 A
j" I\r !A
!
@ AI\r@@  
Atj"("Aj ("O\r  \nj"	-AÛG\r 	-
AÞG\r Aj"!  M\r@@  \nj-"	A	k"AMAA
 tA€€q\r
@ 	AÛk A
j" G\r !  M\r A
j"	 O\r  \nj-AÝG\r 	 \nj-A:F\r 
A
j"
 G\r !
@@@ 
A
k"	 
 
A
K 
  O"At"q"E@ ($"
E\r
AÔ (, 

@ 
 K@ E\r
  Aj ü\n
  6  6 
AI\r 	At"E\r Aj Aj ü\n (X! (`" (d"I\r  A
v jA " (\\ls"\r
 ($"
E\rAå (, 
 rA!  6d  6X (`!  \rk! \n \rj!\r  (\\"	 lj! 	@ A 	ü  6  \r6  \r 66  (`A
j6`  6  6 
AH@A! 
 j!
 
 \nj-AÛG\r
A!	  k"A
k"A  M! 
A
j!A!A!A!A!@Aç  AçL!  Atj(!@@@@@  I@@@@  \nj"
-AÛk
 A
j" ("O\r
@  \nj-"A!kAÿ
qAI\r Aÿ
qA\nku   	!   	! Aj"	 (! 
  k A,j7"AÿM\rA!A!
@@@ 
 jAm"AtA°j("\rAu j"AtA°j(Aÿÿÿq K@ A
k!

  \rAvA
q j"AtA°j(AÿÿÿqM\r
 A
j! 
 N\r
 AN\r  F\r A
j!  A
j"Atj(! 	 M\r A
j"
 O\r 
 \nj-A:G\r@  Aj"
K@@ 
 \nj-A	k"AK@ !A
 tA€€qE@ ! 
A
j"
 G\r A
j" O\r  Atj"
(! 
(!
  
6  
  Aj A(j A$j8E\r   Atj"  k ( Aj Aj Aj A j Aj9! (!
@ E\r 
  ("Atj(I\r (" j!   j"Atj(!  F
  
6  
6 A!A
! 
 I\r@@@@  G@   	  AtjA  A,j Aj:"
\r   (,"\r (;"E@ \rr  -A
r:
   \n j 	 k;"E\r@ E@  (  (  AtjA\n Aj" Aj:! -!
 \r  
Ar:
  ( "
 (j6  ( 
k6  ((6  ($6 A
j!
 
AN\r
A!\r 
A
q (r - 
Aq@ (rA! 
 j! 
E\r A	F\r
 A F\r
 AkAI\r
   	!   	! (, j!	 (, j!  F!
 A
j! 
E\r
  I\r
 @  F@ A6ü  (€ AtkAk6€ At!  kAt"
@   j 
ü\n (ü"
 
( k6  (€ k6€
 (ü"
\r 
(!@ AÿqA†F@ 
("AI\r
 
 A
k6  (€Ak6€ A6ü
 
 A€~qA	r6 A0j$ ¥
@ 
("E\r 
 Al"Av6@ A|q""  A
rA€€I"q"E\r Ak-AqE\r A f 
 6@@ E@ ($"E\r
AÔ (, A@@ 
( 
(" 
(" lj"( 
(pAtj"("E@  6
@  I\r    ljO\r ( ( ( (DE\r
Aq"E@ ($"E\rAÔ (,   6  6 B‚€€€ 7  6
 (" ("O@  A
v j"AtAjs"E@ ($"E\rAå (, A  6 
( ( 
(pAtj 6 (!  Atj 6  A
j6 A
j" 
("I\r
A 
(E\rA!@@ 
( Atj("E\r 
(" M@   
( 
(ljI\r
 Aj" (AAWA
! (AI\r@@  Atj"Ak"("( ("(G\r ( ( ( (D\r  (6 A
j" (I\r A
j" 
(I\rAõ

 (ˆE@A@ (€"Aj" („"
J@ A€ 
A
v 
j 
AL"
6„ (ø 
s"
E@A ($"E\rAå (, A (ü"@  
  (økj6ü  
6ø  (€"Aj6€  6€ (ø"
\r
A 
 j"
A;
 (ˆ! 
A6 
 AtAr6 A6ˆAæ

A!@ 3\r 1\r@ (€"Aj" („"J@ A€ A
v j AL"6„ (ø s"E@ ($"E\rAå (, A (ü"@    (økj6ü  6ø  (€"Aj6€
  6€ (ø"E\r
  j" 6  At 
r Atr6A! Å
 („! (€!@@@@ (ü"-AkA
M@  Aj"H@A! A€ A
v j AL"6„ (ø s"E@A ($"E\rAå (, A (ü"@    (økj"6ü  6ø  (€"Aj6€  6€ (ø"\r
  Aj"H@A! A€ A
v j AL"6„ (ø s"E@A ($"E\rAå (, A (ü"@    (økj"6ü  6ø  (€"Aj6€  6€ (ø"\rA  j" 
(6
  j" 
(6  
(6  
(6  (A
j6A•
\n#A k"$AÅ»òˆx! 
 A 
B"K@@@@@  j"\n 
 k Aj7"AÿK@A!A!@@@  jAm"AtA°j("Au j"	AtA°j(Aÿÿÿq K@ 	A
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  L\r
 	AH\r
 A	F\r
 A F\r
 AkAI\r
 \n-A\nk


 A sA‘þ°l!   
B
  AjCA! (At"@@  Aj j"-sA“ƒ€l -
sA“ƒ€l -sA“ƒ€l -sA“ƒ€l! Aj" G\r ( j" 
I\r A j$ Ý
@ -"À"AN\r Aà
qAÀ
F@ 
AI\r
 ,
"A¿J\r
  A6 -! -
 A?q AqAtr Að
qAà
F@ 
AI\r
 ,
"A¿J\r
 ,"
A¿J\r
  A6 -
! -! - 
A?q A?qAt AqAtrr 
AI\r Aø
qAð
G\r ,
"A¿J\r ,"
A¿J\r ,"A¿J\r @ A6 -! -
! -! -!
 A?q A?qAt AqAtr 
A?qAtrr  A
6 - ÀÒ
@@ ("	 
j-A<F@ 
 O\r 
A
j" O\r !@@@ 	 "
j-"AÜG@@@ A\nk

 A<k 
A
j!
 
A
j" O\r@  	j-"A!kAÿ
qAI\r A:kE




















































 
Aj!  I\r
  6  
6 
A
j!
 
 O\r
 
!@@@@@  	j-"AÜG@ A	k"AK\r
A
 tA€€q\r
 A
j" O\r@  	j-"A!kAÿ
qAI\r Aÿ
qA:kE




















































 Aj" I\r
 A I\r AÿF\r@@@ A(k
 AJ\r A
j!
 E\r A
k! A
j" I\r
 \r  
G\r
  
F\r  
6  6  6A
!\n \nà
@ 
(" K@ (! !	@ 	 j-A	k"\rAK\rA
 \rtA€€qE\r 	A
j"	 G\r AI@A 
(!	A
!\n  	F@A  \n6@@@@ (" 	j-"A"k
A\'!
A)!A
!  	A
j"	6  \nM\r@ 
 \nAtj(" 	K@@@@ 	 j-"\rAÜG\r 	A
j" (O\r  j-"A!kAÿ
qAI\r
 Aÿ
qA\nku


















 \rÀ F@  	6  	A
j6  \n6A
 	!  \rA(Fq\r A
j"	 I\r \nA
j"\n G\rA¸
@  
kq"\n@ \n!@   Atj("  I"	 
KA! 	 
"kAq"\r@@  ( j-: A
j! A
j! A
j" \rG\r 
 	kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" 	G\r 	 
 O\r  : A
j!  A
j"Atj(!
A ($"E\r
AÔ (, A   \nk6  \n6A¶

 
(!@ 
(" 
("O  A
v jA " 
(ls"E@A! ($"
E\rAå (, 
A 
 6 
 6 
(  
("l j! @ A ü  6  6   66 
 
(A
j6 â
#Ak"\n$ B7 B7 B7 B7@@@@@ @@ 
 j-"E\r A&F\r AÜF\r A
j" G\r 
!  6 B7 B
7  6  Aj"
6  Aj"6
  q"6 E\r
A!A!@@ 
 j"	-"A&G@ \r
  A
 J\r ( j 	-: A
j! A
j 
   \nAjKE\r  A J\r \n(" k"@ ( j 	 ü\n  j! 
@ ("@ ( AtjAk(E\r
  A J\r@ \r 	-AÜG\r A
j" O\r@ 
 j-"	A!kAÿ
qAI\r 	Aÿ
qA\nku


































































































 ! ( j 
 j-: A
j! A
j" I\r ("
 (Atj 6 (! (! !  
6  6  6  6A! ($"E\rAÔ (, A! (E\r (r (r (r \nAj$ â
 E@A@@  	Alj"("AO@@ 
A:A (, ( "\r A J! Ak! \r @ 
A:  (, ( "\r@ (" ("F\r  k! ( j!A!@A
!@@  O\r@@  j-E\r
 A
j" G\r !
 ! E\r
 
   (, ( "\r  k"E\r  j!A
!A
AÈA
 (, ( "E\r 
AÇA
 (, ( "\r
 	A
j"	 G\rA ($"@A¤ (,  à
#Ak"\n$ \n 6 \n 6@  \nAjA
A
H"\r (ÔAtAjq"	E@A! ($"E\r
AÔ (, 
 	 6A
! (Ø"AN@ (t!@ 	 Atj  Alj"(6 A
j! ("AN\r 	 Atj A
j6@@A\rA (, ("E@A!@ E\rA!@ 	 A
j"Atj("A
k" K@  
  Atj(  L"\r A
j!  O\r
 !  J\r    H!@  F\r At! A
j!  
  j(AAL"E\r ($"E\r
AŠ (, 
A\rA (, ("E@A!
 ($"E\rA¯ (,  	! r B7Ø \nAj$ ™ 
~#A@j"	$@  
 AH"\r 
 AtjAk(!\r (t! 
(!@ "Aj! -AqE\r 	Aj!@@@@@  
(" ("  K"O@ !
  ( j  k (, ( "\r
 (!  M\r
 ! ($"E\rA¤ (, A!@@ ,"AH\r !\n !@@@@@@@@@@@@@@@@@@@ Aÿ
qA
k
\n	\r\rA
!@ ( jA
j"-A\nk !  A
 (, ( "E\r ($"E\rA¤ (,  AÅA
 (, ( "E\r ($"E\rA¤ (,  (,! -Aq@AA  ("E@A! ($"E\rAÂ (, A!AA  ("E\r ($"E\rAæ (,  -\rAÀqE\r (!@@ -Aq@  K\r
  K\r
@A\nA (, ("E@ A
j" (I\r
 ($"E\rAÂ (, @A\nA (, ("E@ A
j" (I\r
 ($"E\rAæ (,  -Aq\r\r (" A
jK@@A
A (, ("@ ($"E\rAæ (,  Aj! Aj!  ("I\r  kA
qE\r !AA (, ("E\r ($"E\rAæ (, @ ( kA
G\r -AqE\r (,! -Aq@A\rA  ("E\r ($"E\rAÂ (, A\rA  ("E\r ($"E\rAæ (,  (,! -Aq@AA  ("E\r ($"E\rAÂ (, AA  ("E\r ($"E\rAæ (,  (,! -Aq@AA  ("E\r ($"E\rAÂ (, AA  ("E\r\r ($"E\rAæ (,  ( kAG\r (,! -Aq@AA  ("E\r\r ($"E\rAÂ (, AA  ("E\r ($"E\rAæ (,  ( kAG\r\n (,! -Aq@AA  ("E\r ($"E\rAÂ (, AA  ("E\r ($"E\rAæ (,  ( kAG\r	 (,! -Aq@AA  ("E\r ($"E\rAÂ (, AA  ("E\r\n ($"E\r\rAæ (, \rA ( kA
qk! (,! -Aq@ A  ("E@A!\n ($"E\r\rAÂ (, \rA! A  ("E\r	 ($"E\rAæ (,  (t (Alj!\n (t \n(Alj! \n,AH@ (! (! \n(! \n)! 	B78 	B70 	B7( 	B7  B7 B7 	 7@   j  kA  	A j<@A!
A 	Aj (, ("@ ($"E\r
AÂ (, 
A 	Aj (, ("E@A!
 ($"E\rAæ (,  	(0@ 	( r 	($r 	((r \r  (6@ \n-"AÛG\r -AÝG\r \n(" \n("k"AI\r ( ("kAI\r (! 	B78 	B70 	B7( 	B7  	B7 	B7@   j  jAj AF"  k Ak A 	Aj 	A j<@A!
 (,! AÝG@A	 	Aj  ("E@A! ($"E\r
AÂ (, 
A	 	Aj  ("E@A!
 ($"E\rAæ (,  	(0E\r 	( r 	($r 	((r  AÝGAA A!F \n(" (j \n( kA \n(( \n(0I"\r\n -AÝG\r (!@ 
"Aj!
  (K\r ! !
 -"A q\r AtAuAq! (t! ! -Aq"E@  (Alj! (! (!\n  (Alj"(! @  -A r:  \nj!  k!@@@ -"A.k

 -AÀqE\r
 (4! Aj"\n (8K@  \nA
v \njA€qA€
j"s"E@A! ($"E\rAå (,   68  64 -! AÐAª Aÿ
qA.F"(6  (6 @ (4Aj  ü\n (4! \n! -A qE\r  -AqA  A
AAI! (" F\rA ( j  k (, ( "E\r ($"E\rA¤ (, A
AÈA
 (, ( "E\r ($"E\rA¤ (,  ! E\r (" kA
qAA (, ("@ ($"E\rAÂ (,  A
j! (  A
jM\r@A
A (, ("E@ Aj! Aj! ( K\r
 ($"E\rAÂ (,  ! (!@ "Aj! -%AqE\r (" I\r !  
("I\r  \rO@A!@ A}qAF@@@ (" K@ (! !@@  j-"A G A	Gq\r
 A
j" G\r !  I@   j  k (, ( "\r (! !  M\r ( j-A\nk

 ($"E\rA¤ (,  AÅA
 (, ( "E\r
 ($"E\rA¤ (, A!@@@ 
 (! !@@  j-"A G A	Gq\r
 A
j" \rG\r \r!@  M\rA  j  k (, ( "E\r ($"E\rA¤ (, AAÇA
 (, ( "E\r ($"E\rA¤ (, @ \r -\rA€
q\r@  ("O\r (!@  j-"A G A	Gq\r
 A
j" G\r !  AjI\r
 ( j"Ak-A G\r
 A
k-A G\r
 -A\nk


A! AÇA
 (, ( "E\r ($"E\rA¤ (,   
("  I! 
Aj!
A! (Ð"AN@ (t!@  Al"j(r (t" j("AN\r A6Ð 	A@k$ 0

 
(!
 ("E@ 
AGA!  
K   
A
kKÕ
 A
j" 
  ("O@A@ Aj  ("\n j-A/F"" O\r  \nj-Aß
qAÁkAÿ
qAK\r@ A
j" O\r@@  \nj-"Aß
qAÁkAÿ
qAI\r A-F\r A0kAÿ
qA	K\r A
j" G\r !AA ! A
k"A  O!\r@@@  O\r@@  \nj,"Aÿ
q"A\nk@@ A)N@@@@ A)k
A)!@@@ \n







 A F\r
AÑ ATE\r A
k!A!A*A A\'G!A+A A"G!
@ A	k"	AK\rA
 	tA€€qE\rA
  A
M!
@ AJ"	\r A>G\r !@ 	\r@ A/G\r A
j" O\r \n j-A>F\r AL\r@ Aß
qAÁkAÿ
qAI\r AßF\r A:G\r
  A
j"M@A!@@@  \nj,"A0kAÿ
qA\nI\r A_qAÁkAÿ
qAI\r E@A!A ATE\r
A!  A
j"G\r
A!A!	@@ Ak
 A=G\r A
j!A!A+!@@@@ A"k



 E\r
AÑ AT\r A\rF\rA)!
A*! A
j!  I\rA!	 E\r  \rF\rA
  A)FA
 ! 
 A
j"Atj"(! (" I\r
  M@AA
!	  A
j6 	„
#Ak"$@ 
 O\r@@@  
j"	  
k Aj7"AÿK@A!A!@@@  jAm"AtA°j("\nAu j"AtA°j(Aÿÿÿq K@ A
k!
  \nAvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  L\r
 AH\r
 A	F\r
 A F\r
 AkAI\r
 	-A\nk ( 
j"
 I\r Aj$ 
à
@@@ AÿK@A­!@@@  jAm"AtAÐj("Au j"AtAÐj("Aÿÿÿq K@ A
k!
  AvA
q j"AtAÐj(AÿÿÿqM\r
 A
j!  N\r
 AH\r
Aà9! 
A
6 
 A r  AÁkAI6A!A4!@@@  jAm"AtAÐ2j("Au j"AtAÐ2j("Aÿÿÿq M@ AvA
q j"AtAÐ2j(Aÿÿÿq O@ AH\rAð9! A
j!
 A
k!  N\r
A!A!@@@  jAm"AtAà7j("Au j"AtAà7j("Aÿÿÿq M@ AvA
q j"AtAà7j(Aÿÿÿq O@ AH\rA€:! A
j!
 A
k!  N\r
 
A
6 
 6
 ( (" lAtj! At"@ 
  ü\n 
 6  F\r ( Aÿÿÿq"A
jF@ 
  sAsA
q j6 
 
(  kj6õ

	#A k"$ B7 B7 B7 B7 A 
B! A B!	@@@ 
 K@
  	M\r
@ \nE@   
 AjF!A! A
qE@  	  F!	A!  Atj( Aj Atj(k"\r A
j" ("I! A
j" ("I!\n 
 K\r  I\r  	K\r  I\rA! A j$ i
A!@ ("(" 
("("I\rA
!  K\r ( ( ( (D"\rA! (" 
("
I\r  
K! ‰
#Ak"$@@@ 
 O\r  
j  
k Aj7! ( 
j!
 AÿK@A!@@@  jAm"AtA°j("\nAu j"	AtA°j(Aÿÿÿq K@ 	A
k!
  \nAvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  L\r
 	AN\r
 A	F\r A F\r AkAO\r
 A
6 A 6  
 B!

  C Aj$ 
D
 ("(" 
("
("I@A  K@A
 ( ( 
( 
(Dž“

#A0k"$ A6x#A
k"$ AjAA€
ü@@@ E\r A
k! A€
j!\r 
 AtjAk!@ 
 Atj"(!@ !@ !@ Aj" ("O@ !
 (!	@ \r  	j"-j-@ ! \r -
j-@ ! \r -j-@ ! \r  	j-j-@ ! Aj! Aj"!  K\r@  K@ (!@ \r  j"-"	j-\r A
j" G\r A
j" I\r@A
A@@@@@@ 	AÜF@A! A
j" (O\r
@  j-"A!kAÿ
qAI\r@ Aÿ
qA\nku
















 A
j I\r Aj!@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"\r
  6t  (x"A
j6x  Alj"AÜ ;
 B7  Aj"6  6A!@@@@@@@@@@@@ 	A!k\\\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\n\r	\r
\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r A
j"!\n@  M\r@  \nj- 	G\r
 \nA
j"\n I\r !\nA!A!A!  (F\r  Q"AÿM\rA!A!@@@@  jAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  N\r
A! AN\rA!Aä!@@@  jAm"AtAÀ:j("Au j"AtAÀ:j(Aÿÿÿq K@ A
k!
  AvA
q j"AtAÀ:j(AÿÿÿqM\r A
j!  N\rA! AN  k! !@@  j-"	AàG\r
 A
j" G\r !A
 	A F! !  k"A K\r At j("  AtjAk(O\rA!A
!@ E@ !	 !\n
 !\n  "	I\r@@@@ 	 \nO\r@  	j-"A G@ AàF\rA! 	A
j"	 \nG\rA! \n
 	! 	 \nO@A! 	!@  j-AàG"@ 	! !	 A
j" \nG\r 	! \n!	@  	 k"F@A!\n  Atj"(" I@  jA
k-A F!\n A
s  Gq\r \r  F \nrE\r E\r
 A
j@ 	 F\rA! AK\r At jAj"  ("  K6 \r
  A
j"M@A
!  Atj"\n(!	 \n(!\n
 (! \n@ A
k!
 Ak(" ("O\r@  j-"A G A	Gq\r
 A
j" G\r !@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"\r
  6t  (x"A
j6x  Alj"Aà;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"\r
  6t  (x"A
j6x  Alj"Aà;
 B7  	6  6 (t (x"Alj"Ak" Ak6 A(k" A
k6  -Ar:  -Ar:A! ! 	! ! 	 (M\r@@@@ 
  jA
v"Atj"( 	K@ E\r
 
 AtjAk( 	I\r
 A
k! 	 (K\r
 ! ! 	! A
j!A!  M\r ! 	!@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"\r
  6t  (x"A
j6x  Alj"A¦;
 B7  A
j"6  6 (x"AL\r (t" AljAk-A&G\r (|" L@ AÀ A
v j AL"6|  Als"E@A! ($"\rE\rAå (, \r  6t (x!  A
j6x  Alj"A»;
 B7  A
j6  6 ("\n -AÀq\r\n    k"  \n AjA\r ("	 AjM\r	 -
A!G\r	  Aj"j-A-G\r	 -A-G\r	A! (è" K  \nAkOq\r	@ Aj" 	 \n 	 \nI"M@  j"	/A­Ús 	-A>srE\r\r@@ A
j!	 Aj" K\r 	" j"	/A­Ús 	-A>sr\r
 	!  \nI  A
j"Kq@  Atj"(!	 (!
  6è (!	A
! -A
qE\r A
j" O\r  j-AüG\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"Aü;
 B7  Aj"6  6 ("Aj K\r  Ak"j"/A֔
s -A÷sr\r@  F\r  Q"AÿK@A!A!@@@@  jAm"	AtA°j("\nAu 	j"AtA°j(Aÿÿÿq K@ A
k!
  \nAvA
q 	j"AtA°j(AÿÿÿqM\r
 A
j!  N\r
 AN\rA!Aä!@@@  jAm"	AtAÀ:j("\nAu 	j"AtAÀ:j(Aÿÿÿq K@ A
k!
  \nAvA
q 	j"AtAÀ:j(AÿÿÿqM\r
 A
j!  N\r
 AH\r\r
 A	F\r A F\r A\rkA}K\r A!kAI\r A:kAI\r AÛkAI\r AÿG AúKqE\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"A®;
 B7  A
j"6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 Aj!@@ ("	Aj K\r  Ak"\nj(AèèуG\r  M\r /
A¯ÞF\r
@ 	Aj K\r  Ak"\nj"(Aèèуs -Aósr\r  M\r /
A¯ÞF\r
 	Aj K\r  Ak"\nj"/Aæè
s -Aðsr\r  M\r /
A¯ÞG\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"Aº;
 B7  6  \n6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 A
j! (A
j K\r	@ A
k-"Aß
qAÁkAÿ
qAO@ Aj O\r A0kAÿ
qA\nO\r
 Aj O\r\n  A
j"j-"A0kAÿ
qA\nO@ A_qAÁkAÿ
qAK\r\n@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"AÀ;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 A
j!@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"AÝ;
 B7  A
j"6  6\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" 6A
!A

 A
j" O\r
  j-AÛG\r
@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" 6A!!A!  :  	: B7   j"6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"AÄ;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"AÄ;
 B7  6  6\n@@ E@  -\rA qAvq\r
 E\r
@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"A:  	: B7  A
j"6  6\n !@@@@@@@@@AA@@AA@@@@@@@@@@ 	>
 	AþF\r 	AÞG\r -AqE\r A
j"!@  M\r@@  j-AÞG\r
 A
j" I\r ! !  kA
G\r A!	A!  j ( kA7"AÿM@ A	F\r
 A F\r
 AkA
M\r
A@@@  	jAm"AtA°j("Au j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q j"AtA°j(AÿÿÿqM\r A
j!	  	N\rA \nAN\rA
A!  (F\r  Q"AÿM\rA!A!@@@  jAm"	AtA°j("Au 	j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\r ! \nAN\r ! -A qE\r@ A
j" O\r  j"	-A=F\r !  kAG\rA!A!AA 	 ( kA7"AÿM@A! A	F\r A F\r AkAI
@@@  jAm"	AtA°j("Au 	j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! -A€
qE\r@ A
j" O\r  j"	-A+F\r !  kAG\rA!A!AA 	 ( kA7"AÿM@A! A	F\r A F\r AkAI
@@@  jAm"	AtA°j("Au 	j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\rA!\n \nAN!A!	 A
j"\n!@  \nM"\r@  j-AþG"	\r
 A
j" I\r !@  k"A
F@ ("A€€qE\r
@ \rA!	A!  \nj ( \nkA7"AÿM@ A	F\r
 A F\r
 AkA
M\r
A@@@  	jAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°j(AÿÿÿqM\r A
j!	  	N\rA AN\rA
A!  (F\r  Q"AÿM\r\rA!A!@@@  jAm"	AtA°j("Au 	j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\r ! AN\r ! ! AK\r (! ! A€qE\rA!  (M\r\n  Q"AÿM\rA!\nA!@@@@  \njAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"\nAtA°j(AÿÿÿqM\r
 \nA
j!\n  \nN\r
 AN\rA!\nAä!@@@  \njAm"AtAÀ:j("Au j"AtAÀ:j(Aÿÿÿq K@ A
k!
  AvA
q j"\nAtAÀ:j(AÿÿÿqM\r \nA
j!\n  \nN\rA! AN	@ A
j" O"	E@  j-A$F\r
 !  kAK\rA!  (M\r  Q"AÿM\rA!\nA!@@@@  \njAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"\nAtA°j(AÿÿÿqM\r
 \nA
j!\n  \nN\r
 AN\rA!\nAä!@@@  \njAm"AtAÀ:j("Au j"AtAÀ:j(Aÿÿÿq K@ A
k!
  AvA
q j"\nAtAÀ:j(AÿÿÿqM\r \nA
j!\n  \nN\rA! AN@ A
j" O\r@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" I\r ! 	A F@ !  kAI\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\r!Aå (, \r!  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"A:  	: B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\r Aå (, \r   A
j6x (t"E\r
  6t  (x"A
j6x  Alj"A€ ;
 B7  A
j"6  6A! !  kAG\rA! !  kAG\r	 A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr!@ 	\rA!	A!@  j" ( k"A7"AÿM@ A	F\r A F\r AkAO\r
@@@  	jAm"AtA°j("Au j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!	  	N\r
 \nAN\r
A!Aä!  A7"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"	AtAÀ:j("Au 	j"\nAtAÀ:j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtAÀ:j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! !  A
q "E\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" : A$: B7  6  6 A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr!@ 	E\rA!	A!@  j" ( k"A7"AÿM@ A	F\r A F\r AkAO\r
@@@  	jAm"AtA°j("Au j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!	  	N\r
 \nAN\r
A!Aä!  A7"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"	AtAÀ:j("Au 	j"\nAtAÀ:j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtAÀ:j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! !  A
q "E\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" : Aþ: B7  6  6 A	F\r A F\r AkA
M\r !
A
! ! A
qE\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t Als"	\r
A! ($"\rE\rAå (, \r  A
j6x (t"	E\r
  	6t  (x"A
j6x 	 Alj" : Aþ: B7  \n6  6@@  (F\r  Q"AÿK@A!A!@@@  jAm"	AtA°j("Au 	j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\r ! \nAN\r
 ! A	F\r A F\r AkA
M\r !
A
! ! A
qE\r\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t Als"	\r
A! ($"\rE\rAå (, \r  A
j6x (t"	E\r
  	6t  (x"A
j6x 	 Alj" : A+: B7  6  6\r@@  (F\r  Q"AÿK@A!A!@@@  jAm"	AtA°j("Au 	j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\r ! \nAN\r
 ! A	F\r A F\r AkA
M\r !
A
! ! A
qE\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t Als"	\r
A! ($"\rE\rAå (, \r  A
j6x (t"	E\r
  	6t  (x"A
j6x 	 Alj" : A=: B7  6  6 A	F\r A F\r AkA
M\r !
A
! ! A
qE\r	@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t Als"	\r
A! ($"\rE\rAå (, \r  A
j6x (t"	E\r
  	6t  (x"A
j6x 	 Alj" : AÞ: B7  6  6	@ Aj" 	O\r -
A?G\rA!@ (ì" M@ !
 !  \nAkO\r
 Aj" 	 \n 	 \nI"M@  j/A¿üF\r@@ A
j!	 Aj" K\r 	" j/A¿üG\r
 	!  \nI  A
j"Kq  Atj"(!	 (!
  6ì (!	@ 	 M\r -
A!G\r  j-Aß
qAÁkAÿ
qAK\r@ Aj" 	O\r@  j-Aß
qAÁkAÿ
qAK\r
 A
j" 	G\r 	!A! (ð" K  \nA
kOq\r A
j" 	 \n 	 \nI"M@  j-A>F\r@@ A
j!	 Aj" K\r 	" j-A>G\r
 	!  \nI  A
j"Kq  Atj"(!	 (!
  6ð (!	@ A	j" 	O\r )B¼ÂìšÄ¨ªÁ… 1Bۅ„BR\rA! (ô" K  \nAkOq\r@ Aj" 	 \n 	 \nI"	M@  j"/Aݺ
s -A>srE\r@@ A
j! Aj" 	K\r  "j"/Aݺ
s -A>sr\r
 !  \nI  A
j"Kq@  Atj"(!	 (!
  6ô (!\n ! A
j" \nO\r@ Aj" \nO\r  j-"	A0kAÿ
qA\nIA
 	Aß
qAÁkAÿ
qAIE\r@  j-"A0kAÿ
qA\nI\r Aß
qAÁkAÿ
qAI\r A+k"AK\r
 A
F\r
 Aj" \nF\r@  kA K\r
  j-"	A:F@  \nO\r@  j-"	A	k"AMAA
 tA€€q\r 	A>G@ 	A I\r 	A<F\r 	AÿF\r A
j" \nG\r
A0!	 A
j@ 	A0kAÿ
qA\nI\r 	Aß
qAÁkAÿ
qAI\r 	A+k"	AK\r 	A
F\r A
j" \nG\r !@@@  j,"	A0kAÿ
qA\nI\r 	A_qAÁkAÿ
qAI\r 	E\rAû 	ATE\r
 \n A
j"G\r
\n !  M\rA! 	AÀG\r@ "A
j" \nO\r	@@@  j-"	A0kAÿ
qA\nO@ 	A_qAÁkAÿ
qAK\r
 A
j!
@ AL"\r 	Aÿ
qA-G\r A
j!
 \r
 	Aÿ
qA.G\r
A!  j-A-F\r A?J\r\n
 ! \r 	Aÿ
qA>G\r  j-A-F\rAð!	 Aj!@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" 	Ar: A<: B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" 	Ar: A>: B7  6  A
k6 (t (x"Alj"Ak Ak6 Ak A
k6 ! !  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"E\r  6t  (x"A
j6x
  A
j6x (t"E\r\n  Alj"A¼(;
 B7  6  6@ (x" (|"N@ AÀ A
v j AL"6| (t Als"E\r  6t  (x"A
j6x
  A
j6x (t"E\r\n (!  Alj"A¾0;
 B7  6  6 (t (x"Alj"Ak Ak6 Ak A
k6A! !  (M\r@@ 
  jA
v"Atj"( K@ E@ !\n  
 AtjAk(K@ !\n A
k!
 ( O@ !	 A
j!  M\rA! ($"E\rAå (,  A
j! A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr"! A
s!A!@  \nF\rA!A!@@  \nj" ( \nk"A7"AÿM@ A	G\r
@@@  jAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  N\r
A! AH\r
 A F\r
 AkAI\r
A!Aä!A
A  A7"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"AtAÀ:j("Au j"AtAÀ:j(Aÿÿÿq K@ A
k!
  AvA
q j"AtAÀ:j(AÿÿÿqM\r A
j!  N\rA! AN"! A
s! ! \n!A   q 	AßFq""A  "rE\r  kAp!@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"\r
  6t  (x"A
j6x  Alj" AtA# AG  MqAA  OA r" AFrA@k:  	: B7  \n6  6 ! \n "M\r@@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\r	Aå (, \r	  A
j6x (t"\r
  6t  (x"A
j6x  Alj"AÄ;
 B7  6  6 A
j" \nI\r ! \n!@@ (x"\r (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  \rA
j6x (t"E\r
  6t  (x"\rA
j6x (!  \rAlj"Aÿ ;
 B7  6  6A!
A! A
j$@ "	\r  
A (xA¿AM@ (à"AN@ A
k! A€j! AØj! Aj!@ (t" Al"j"	(!\r@ 	-"AÄF\r 	(!\nA!A! \rAN@   \rAlj"(Alj! \nAl! 	(! 	-A q@ 	A!: 	 A
k"6A!!  j!  I@ ( I\r
  I@ ( I\r
@  I@ A!G\r
 AÛG\r (A€€ÀqE\r 	(" (O\r ( j-AÞG\r 	 A
j"6 (t j"(" M\r  ( j  kN"E\r ("E@  (pA
j"6p  6  (A
j6 	 6 	 (6 	 	-A”
r:  -A˜
r: (! 	(! 	(@@@@ -\rA qE\r 	-AÛG\r E\r 	(" 	("kA
G\r -AÛG\r
 E\r
 ( ("kA
G\r
 -AÝG\r
  A
kG\r
 ( ("kA
G\r
  (A
jG\r
@@ A
j" \nN"@ !
 (t! !@@  Alj"-"AÄF\r AüF\r ( kAäK\r -AqE\r (! A
j" \nH\rA!   (" F\r  kAäK\r  I@ (!@@  j-A\nk A
j" G\rA!@   Atj"("L@ (t!\r@ \r Alj(" N\r  6  ("L@ (t!\r@ \r Alj(" N\r  6 Aj"AG\r @@ ( (I@@  L\r  kAk! (t!\rA!  AsjAq"@@ \r AljAÄ;
 A
j! A
j" G\r AI\r@ \r Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" G\r  -Ar: 	 (6
@ \r \n kAk! (t!\rA! \n AsjAq"@@ \r AljAÄ;
 A
j! A
j" G\r AI\r@ \r Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" \nG\r  (6 	 (6  (6 (t"\r j" \n6 \r j"\r 6  -Ar: \r \r-Ar: (! 	(!  
 A
j \nO ( 	 (6  (6 (t"\r j" \n6 \r j"\r 6  -Ar: \r \r-Ar: (! 	(! ( \r (!
 (" ("G\r ( A
jK@ -AÀq\r  
   ( AjP
 	-AÀq\r  
  	(  AjP"AH\r E\r  (6 (t \rAlj(!\r
@  ("O\r (" j-A(G\r \nA
j!A! !@@@ 
  jA
v"Atj"( K@ E\r 
 AtjAk( I\r A
k!
  (M\r A
j!  O\rA!@@ A
j" 
 Atj("I@@  j-A	k"AK\rA
 tA€€qE\r A
j" G\r !  6@  O\r  j-A\nk A
j" O\r 
 Atj(!  6@  O\r  j-A)G\rA! A6 B7  6  6 A
j!A

   
 Atj"(" Aj Aj 8E\r
@    k ( Aj A j A,j A(j A$j9@ ( " j! (," F! 
  j"Atj(! (!
  ("6(  6$A
!A!@  I@@  j-"A	k"AK\rA
 tA€€qE\r A
j" G\r A
j" O\r  
 Atj("j-! Aÿ
qA)G\r
  A
j"6 ($" (("M@A! A6 B7A

  k! @ A6  6   j"6A

@ q"@ 
 Atj!A! !@   Atj("  K" KA!  "kAq"@@  ( j-: A
j! A
j! A
j" G\r  kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" G\r   O\r A\n: A
j!  A
j"Atj(! ($"	E\rAÔ (, 	 A
6  6   k6 (!A! (x" L@  6 (t! !@   Alj"(K@@ -AqAG\r  ("Alj( I\r \r r A
j" H\r
  6  L\r
  \nkAk! (t!A!  \nAsjAq"@@  AljAÄ;
 A
j! A
j" G\r AI\r
@  Alj"AÄ;
 AÄ;
L AÄ;
8 AÄ;
$ Aj" G\r
 	-AÀq\r
  
  	( ( AjP"AH\r E\r
 	 	-Ar:  -Ar: Aj" (tj (6 (t j (6  (tj (6( Aj! (t! (@  Alj (Ð6  6Ð  Alj (6 	(! (! 	-!  
 A
j \nO   AÛF"!   !   !   ! 	! /
AŒqE\r@@ "Aj! -$"AÄG"\r  I\r
 À! !@@ "\nAk! \r  	K\r
 -%"AqE\r E\r ( 	(G\rA÷ ATE\r (   (tkAmG\r \nAk( (G\r AÄ:$  Aï
q:% \nAkAÄ: \nAk"	 	-Aï
q: \r"AN\r B7à A6¸ @A!	 A6Ô (x"AL\r (t!\rA!@@ \r 	Alj"-"Aq\r -AüG\r ( (kA
G\r A6  Ar:@ (ØAH@  	6Ø
 \r (ÜAlj 	6  	6Ü  A
j"6Ô 	A
j"	 G\rA!	A!	  
A (xO
A!	 A0j$ 	Þ
#Aðk"$ B7h B7` B7X B7P B7H B7@ B78 B70 A6( B7  B7 B7 B7A!	@     Aj AÐj<\r   A Aj A0j<\r  6( (,!	 
@  Aj 	 ("	E@A!	 ($"E\r
AÂ (, 
  Aj 	 ("	E@A!	
 ($"E\rAæ (,  (`@ (Pr (Tr (Xr (@@ (0r (4r (8r Aðj$ 	Ý

@ 
(" 
("I@ 
(!
 
( A
v jA "At"s"E@A ($"E\rAå (, A 
 6 
( Ajs"E@A ($"E\rAå (, A 
 6 
 6 
(! 
( Atj 6  
(Atj 6 
 
(A
j6AÜ
 
A
j!@@@ 
Aj" O\r  j-A#G\r  
j-A rAøG\r !@@@@  j-"A0kAÿ
qA\nI\r AÁkAÿ
qAI\r  kAK\r AákAÿ
qAI\r
  kAK\r A
j" G\r !  F\r  kAI\r
@ 
Aj" O"\r  j-A#G\r !@@  kAK\r
  j-A0kAÿ
qA	K\r
 A
j" G\r !  F\r  kAI\r
  M\r
  j-Aß
qAÁkAÿ
qAK\r
  \r@@  j-"Aß
qAÁkAÿ
qAO@   kA0K\r A0kAÿ
qA\nI\r
   kA0M\r  A
j" G\r " 
kAkA.K\r
  M\r  j-A;G\rA
!  A
j6 ³
#Ak"$@@  O\r (!@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" G\r !
  O\r (!@  jA
k-A	k"AK\r
A
 tA€€qE\r
 A
k" K\r !  6  6  6@ 
 Aj (, ("@ ($"E\r
AŠ (, 
  AjA
?"\r 
 Aj (, ("E@A!
 ($"E\rA¯ (,  Aj$ Ê"
#A0k"\r$  H@ A¸j! A€j! \rAr! \rAr! 
(!@@ (t"
 Al"j"-"Aq@ AqE\r
@ E\r ,"
E\r  
`\r (!
 ,"\nAÿ
q"E\r  \n`E\r (" I\r@@@@@@@@@@@@@@@@@ A!k^
	 (! A
q@ AN@ 
 Alj"
 
-AÀr:  6  6 AH\r  
 Alj"(6¸  6  6@ (ä"AN@ 
 Alj 6
  6à  6ä A6 A
j" (xN\r 
 Alj"
-A;G\r (  
(" \rKE\r  6 
 6  Ar: 
 
-Ar:  6 AqE\r \r A€A˜ \nA*Fj"Aj6 AÀ
q"AÀ
F@ !	A
 \r Aj6 A€
F\r !	A! 	 Aj6A
! A°A´ ( kA
Fj!\n@ AqE\rA! \n("AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6  6 
 
-Ar:  -Ar:\r A
qE\r  \n(6 \n 6@ AqE\rA! (Ä"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6  6 
 
-Ar:  -Ar: A
qE\r  (Ä6  6Ä@ AqE\r (¼"AH\rA! 
 Alj"( (k ( kG\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r@ A
j" N\r  kAk!A!  AsjAq"\n@@ 
 AljAÄ;
 A
j! A
j" \nG\r AI\r@ 
 Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" G\r  6  6  -Ar:  -Ar: A6¼ A
qE\r\n  (¼6  6¼\n 
 A
j"Al"j"(! (! \r 6 \r ("6, \r 6( \r 6$ \nAÀF@    \rA
AAA˜ \rA(jRAL\r\n \r(!  O\r  Q"	AÿM\rA!A!@@@  jAm"AtA°j("Au j"AtA°j(Aÿÿÿq 	K@ A
k!
 	 AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  N\r
 AN\r ( kAG\r@ AqE\rA! (À"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6  6 
 
-Ar:  -Ar:	 A
qE\r  (À6  6À ( kAG\r@ AqE\rA! (È"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6  6 
 
-Ar:  -Ar: A
qE\r  (È6  6È ( kAG\r@ AqE\rA! (Ì"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6  6 
 
-Ar:  -Ar: A
qE\r  (Ì6  6ÌA!A! 	A	F\r
 	A F\r
 	AkAI\r
 ( jA
k,"@Aã AT\r
 \r((" 
I\r A
k!@@@ -AÄF\r ( K\r  (O\r -"Aq\r
 Ak" 
O\r
 AqE\r    \rA,jAA.AAØ \rA$jRAH\r \r(,!	@ \nAÀF\r@ 	 O\r (" 	j-A/G\r  	A
j  \rA,jAA/AùA \rA$jRAH\r \r(,"	 O\r  	j-A/G\r \r 	A
j"	6,@ 	 O\r ( 	j-A?G\r  	A
j  \rA,jAA&AóA• \rA$jRAH\r \r(,!	 	 O\r ( 	j-A#G\r  	A
j  \rA,jAAAAÛ \rA$jRAH\r \r(,!	@ 	 O\rA!A!@ ( 	j" ( 	kA7"AÿM@ A	F\r A F\r AkAO\r
@@@  jAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  N\r
 AN\r
 ,"@A¡ A	T\r
 \r($" 
 (xAlj"
O\r@@@ -AÄF\r ( 	M\r ( 	K\r -"Aq\r
 Aj" 
I\r
 AqE\r  6  6  \n:  	6  	6 (t" j"
 6  j" 6 
 
-Ar:  -Ar: \r Atr 6 A q! A
j!	 Aà
qAà
G@ \r 	Atj Aj6 Aj!	 A
s AGqE@ \r 	Atj Aj6 	A
j!	 
 \r(("AljA AN"! A !@ \r(("AH\r 
 Alj! @ ( (M\r
 ! !@ 	AF\r@ \r(("AH\r 
 Alj! @ ( (M\r
 ! ! 	AF\r@ \r(("AH\r 
 Alj! @ ( (M\r
 ! ! 	AF\r@ \r(("AH\r 
 Alj! @ ( (M\r
 ! ! 	AF\r \r(("	AH\r 
 	Alj! @ ( (M\r
 	! ! E\r (!	 (! (! !\n@@@@@@ 
 Alj"-"A!k\n
 AÛk
 A€A˜ A*Fj -"AtAuAqj!\n@ AvAk \nAj!\n A°A´ ( (kA
Fj!\n \nAj!\n@  k" 	 k"K@ 
 (" (k k j"Al"	j"
 (6 
 )7 
 )7   k"6 
 6 (t 	j \n(6 \n 6
  O\r 
 Alj j"
 (6 
 )7 
 )7   k 	j"6 
 6A!\n@   \nAtj"("
L@@ 
AN@  (t 
Alj("
6 
 N\r \nA
j"\nAG\r (t" Alj"
 6  j" 6 
 
-Ar:  -Ar:
 A
qE\r A€A˜ \nA*Fj AtAuAqj!
@@@ AvAk
 
Aj!

 
Aj!
  
(6 
 6 -"
AqE\r 
Aq@ (t (Alj(!
 (! A
j" H\r \rA0j$–
#Ak"$@ (E\r 
 6! (  (pAtj("E@A!
@  ("I\r   ( (ljO\r  (F@ ( ( 
 DE\rA!
  6  6  
6  Aj6 Aj!@ ("@@   A
v"
Atj"G"AH@ 

 E\r Aj!  
Asj"\rA! E@A!
 (! Aj$ ý
#A k"$ Aß: A¦Ô;
A! ("A€ q@ A$:A! A€€€
q@ Aj rA=: A
j! A€€€q@ Aj rA+: A
j! A€€q@ Aj jAü: A
j! A€€q@ Aj jAÞ: A
j! A€„q@ Aj jAþ: A
j!A! Aj jA:  
   AjAM ("AŒq@ Aq@ AÀ:A
! Aq@  rA:: A
j! A€q  rA.: A
j  rA:  
    AjM A€jAÿ
AÐü A j$•
 (TE@A A
k! A
k!AA
 ("\n j-A!F j!A!@@@ 
  jA
v"Atj"	( K@ E\r 
 AtjAk( I\r A
k!
  	(M\r A
j!  O\rA!	@  	("M"E@@  kq"@ !@    K"
 KA! 
 "kAq"\n@@  ( j-: A
j! A
j! A
j" \nG\r  
kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" 
G\r 
  O\r A : A
j! 	 A
j"Atj"(! (!A! ($"E\rAÔ (, A  k
  \nj!  k! A<j  N"@  (6  (6  (6 (! A6  6 E@ r E@A (T" ( ( (jj (k"K@  k!A

A! ($"@AØ (, A!  6T ò

 ( 
j"A
k,!@ 
AI\r AN\r Ak,!@ A¿K\r A`qA@G\r A?q AqAtr 
AI\r Ak,!@ A¿J\r ApqA`G\r A¿K\r A?q A?qAt AqAtrr 
AF\r Ak-"
Aø
qAð
G\r A¿J\r A¿J\r A¿K\r A?q A?qAt 
AqAtr A?qAtrr! Â
@ 
 F@ 
!A
!A
!	
 AÈ ! AÈ !AA ! E! (!A
!A
!	 
!@@@@@@@@@@@   j"j"-"A0kAÿ
qA\nI\r Aß
qAÁkAÿ
qAI\r A	k"\nAMAA
 \ntA€€q\r (t!\n (! E@@  \n (xAlj"\nO\r@@ -AÄF\r ( M\r ( K\r -Aq\r Aj" \nI\r  6 -!@  \nI\r@@ -AÄF\r ( K\r  (O\r -Aq\r\r Ak" \nO\r  6 -! \r
@@ Aÿ
qA(k
 A
j!A(! AL\r	 A
k!A)!
 A0kAÿ
qA\nI\r
 A_qAÁkAÿ
qAI\r
 Aÿ
qE\r  À"`E\rA!AA! 	E\r
A
!	 	@A
!	  `E\rA

@@ E\r Aÿ
q Aÿ
qG\r E\r
A
!A!	 A
j  !A!	A
! \rA
j!\r !
A!	  j" G\r !
  6 A
j  !A \r
  A
A A 	 rj"6 \r 
 Gj A F A	kAIrç

 AG!@@@ AqE\r E\r 
Aÿ
q!@ - F\r A
k"AG! A
j"AqE\r
 \r E\r
@ - 
Aÿ
qF\r AI\r 
Aÿ
qA‚„l!@A€‚„ ( s"k rA€‚„xqA€‚„xG\r Aj! Ak"AK\r E\r
 
Aÿ
q!@  -F@  A
j! A
k"\rA

@@ AO@  
rAq\r
@ ( 
(G\r 
Aj!
 Aj! Ak"AK\r E\r
@ -" 
-"F@ 
A
j!
 A
j! A
k"\r
  kA‡
 A€O@ @  
 ü\n  j!@  
sAqE@@ AqE@ !
 E@ !
 !@  
-: 
A
j!
 A
j"AqE\r
  I\r A|q!@ AÀI\r  A@j"K\r@  
(6  
(6  
(6  
(6  
(6  
(6  
(6  
(6  
( 6   
($6$  
((6(  
(,6,  
(060  
(464  
(868  
(<6< 
A@k!
 A@k" M\r  O\r
@  
(6 
Aj!
 Aj" I\r
 AI@ !
 AI@ !
 Ak! !@  
-:  
-
:
  
-:  
-: 
Aj!
 Aj" M\r  I@@  
-: 
A
j!
 A
j" G\rÚ
#AÐ
k"$ B
7@ 
 l"E\r  6  6A!
@ Aj 
Atj" Ak( Ak( jj"6 
A
j!
  I\r  k"
AL@A
!
A
  
j!A
!A
!
@ AqAF@    
 AjX AjAY 
Aj
@ Aj 
A
k"Atj(  kO@    Aj 
A AjZ
    
 AjX 
A
F@ AjA
[A
 Aj [A
!
  (A
r"6  j" I\r (AG!A k!    Aj 
A AjZ@ 
A
G\r (A
G\r E\r
@ 
A
L@ Aj Aj\\"Y 
 j
 AjA[  (As6 AjA
Y  j" Aj 
Ak"Atj(k   Aj 
A
kA
 AjZ AjA
[  (A
r6    Aj A
 AjZ !
  j! (! (! 
A
G\r A
G\r \r AÐ
j$«

#Að
k"$  6A
!@ AH\rA 
k!	 !@   	j"  Ak"\nAtj(k" _AN@   _AN\r  Atj     _AN""6 A
j! A
k \n "A
J\r 
  ] Að
j$K
 (!  
AM@ (! 
 
A k!
 !A" 
v6  A  
kt  
vr6Î
#Að
k"$  ("6è
 (!  6  6ì
A 
k! E!\n@@@@ A
G@ !A
!
 !A
! \r !
@   Atj"(k"  _AL@ ! \nAs!	A
!\n@ 	 AHrA
qE@ Ak(!	  j"  _AN\r
  	k  _AN\r
  Atj 6 Aè
j Aè
j\\"Y A
j!  j! (ì
!	 ! (è
A
G\r
 	\r
 !
 \nE\r
 
  ]  
   X Að
j$H
 
AM@ (! Aj
 
A k!
 (!   
t6   
t A  
kvr6\'

 (A
k^"
 
 (^"A rA –

#A€k"$@ AH\r 
 Atj" 6 E\r@ ( 
(A€  A€O"VA!@ 
 Atj"( 
 A
j"Atj( V  ( j6  G\r  k"\r A€j$\n hA   
 †
@@@ 
Aÿ
q"@ Aq@ 
Aÿ
q!@ -"E\r  F\r A
j"Aq\rA€‚„ ("k rA€‚„xqA€‚„xG\r
 A‚„l!@A€‚„  s"k rA€‚„xqA€‚„xG\r (! Aj"! A€‚„ krA€‚„xqA€‚„xF\r a j !@ "-"E\r
 A
j!  
Aÿ
qG\r "A - 
Aÿ
qF}
@@ "
AqE\r 
-E@A@ 
A
j"
AqE\r
 
-\r
@ 
"Aj!
A€‚„ ("k rA€‚„xqA€‚„xF\r@ "
A
j! 
-\r 
 k A r  AÁkAIY

  (H"
A
k 
r6H ("
Aq@  
A r6A B7  (,"
6  
6  
 (0j6A~

~ ½"B4ˆ§Aÿq"AÿG| E@ 
 DaA DðC¢ 
e! 
(A@j6  
 Aþk6 Bÿÿÿÿÿÿÿ‡€ƒB€€€€€€€ð?„¿ ð
~@ E\r  
:  j"A
k 
: AI\r  
:  
:
 Ak 
: Ak 
: AI\r  
: Ak 
: A	I\r A kAq"j" 
Aÿ
qA‚„l"
6   kA|q"j"Ak 
6 A	I\r  
6  
6 Ak 
6 Ak 
6 AI\r  
6  
6  
6  
6 Ak 
6 Ak 
6 Ak 
6 Ak 
6  AqAr"k"A I\r 
­B€€€~!  j!
@ 
 7 
 7 
 7 
 7 
A j!
 A k"AK\rû~AÍ!#A@j"$ AÍ6< A)j! A\'j! A(j!@@@@@A!@ !  AÿÿÿÿsJ\r  j!@@@@ "-"\n@@@@ \nAÿ
q"\nE@ !
 \nA%G\r
 !\n@ \n-
A%G@ \n! A
j! \n-! \nAj"!\n A%F\r  k" Aÿÿÿÿs"\nJ\r	 @   h \r  6< A
j!A!@ ,
A0k"A	K\r -A$G\r Aj!A
! !  6<A!	@ ,"A k"AK@ !
 !A
 t"A‰ÑqE\r@  A
j"6<  	r!	 ,
"A k"A O\r
 !A
 t"A‰Ñq\r@ A*F@@ ,
A0k"A	K\r -A$G\r E@  AtjA\n6A
  Atj(!\r Aj!A

 \r A
j! E@  6<A!A!\r 
 
("Aj6 (!\rA!  6< \rAN\r
A \rk!\r 	A€Àr!	
 A<ji"\rAH\r\n (<!A!A!A -A.G\r -
A*F@@ ,A0k"A	K\r -A$G\r Aj! E@  AtjA\n6A
  Atj(
 \r Aj!A E\r 
 
("Aj6 (!  6< AN
  A
j6< A<ji! (<!A
!@ !A! ","AûkAFI\r A
j! A:l jA¿Íj-"A
kAÿ
qAI\r  6<@ AG@ E\r AN@ E@  Atj 6   Atj)70 E\r A0j  
j
 AN\rA! E\r -A q\r 	Aÿÿ{q" 	 	A€Àq!	A!AÔ! !@@@@@@@@@@@@@@@ -"À"ASq  AqAF  "AØk!	\n
@ AÁk AÓF\r )0!AÔA!@@@@@@@ 
 (0 6 (0 6 (0 ¬7 (0 ;
 (0 : (0 6 (0 ¬7A  AM! 	Ar!	Aø! ! A q! )0""BR@@ A
k" §Aq-ÐQ r: Bˆ"BR\r ! P\r 	AqE\r AvAÔj!A! ! )0""BR@@ A
k" §AqA0r: Bˆ"BR\r ! 	AqE\r   k"  H! )0"BS@ B }"70A
!AÔ
 	A€q@A
!AÕ
AÖAÔ 	A
q"!  k!  AHq\r 	Aÿÿ{q 	 !	@ BR\r \r !A!  P  kj"  H!\r -0! (0"A¡ ""AAÿÿÿÿ  AÿÿÿÿO"T" k  " j! AN@ !	 ! !	 ! -\r )0"BR\r
A!	 @ (0A! A  \rA 	l A6  >  Aj60A! Aj!\nA!@@ \n("E\r Aj p"AH\r   kK\r \nAj!\n  j" I\r
A=! AH\r A  \r  	l E@A!
A! (0!\n@ \n("E\r
 Aj p" j" K\r
  Aj h \nAj!\n  K\r A  \r  	A€Àsl \r   \rH!  AHq\r	A=!  +0 \r  	 m"AN\r\n -
!\n A
j! \r	 E\rA
!@  Atj("\n@  Atj \n 
jA
! A
j"A\nG\r
 A\nO@A
!\n@  Atj(\r
A
! A
j"A\nG\r	A!  :\'A
! ! !	   k"  H" AÿÿÿÿsJ\rA=! \r  j"  \rH" \nK\r A    	l   h A0   	A€€sl A0  Al   h A    	A€Àsl (<!
A!A=!AÐÝ 6A! A@k$ À

 -A qE@@ ("  d\r
 ( ("k I@  
  ($
@@ (PAH\r E\r !@ 
 j"A
k-A\nG@ A
k"\r
  
  ($ I\r  k! (!
 
!   V  ( j6s
 (",A0k"A	K@A@A! 
A̙³æM@A  
A\nl"
j  
AÿÿÿÿsK!  A
j"6 ,
! !
 ! A0k"A\nI\r 
³@@@@@@@@@@@@@@@@@@@ 
A	k
	\n\r  ("
Aj6  
(6  ("
Aj6  
47  ("
Aj6  
57  ("
Aj6  
47  ("
Aj6  
57  (AjAxq"
Aj6  
)7  ("
Aj6  
2
7  ("
Aj6  
3
7  ("
Aj6  
07  ("
Aj6  
17  (AjAxq"
Aj6  
)7  ("
Aj6  
57  (AjAxq"
Aj6  
)7  (AjAxq"
Aj6  
)7  ("
Aj6  
47  ("
Aj6  
57  (AjAxq"
Aj6  
+9  ny
~ B€€€€Z@@ 
A
k"
 " B\n€"B\n~}§A0r: BÿÿÿÿŸ
V\r BR@ §!@ 
A
k"
  A\nn"A\nlkA0r: A	K! ! \r 
j

#A€k"$@  L\r A€Àq\r  
  k"A€ A€I"f E@@  A€h A€k"Aÿ
K\r   h A€j$È
|~#A°k"$ A6,@ 
½"BS@A
!AÞ! 
š"
½!
 A€q@A
!Aá!
AäAß A
q"! E!@ B€€€€€€€øÿƒB€€€€€€€øÿQ@ A   Aj" Aÿÿ{ql   h Aç\rAõ A q"AôAù  
 
bAh A    A€Àsl    J!\n
 Aj!@@ 
 A,je"
 
 "
Db@  (,"A
k6, A r"AáG\r
 A r"AáF\r (,!A  AH
  Ak"6, 
D°A¢!
A  AH! A0jA A ANj"!@  
ü"6 Aj! 
 ¸¡DeÍÍA¢"
Db\r@ AL@ ! ! !	
 !	 !@A  AO!@ Ak" 	I\r ­!B!@  5 † |" B€”ëÜ€"B€”ëÜ~}> Ak" 	O\r B€”ëÜT\r 	Ak"	 >@ 	 "I@ Ak"(E\r
  (, k"6, ! AJ\r AH@ AjA	nA
j! AæF!@A	A k" A	O!\n@  	M@AA 	(!
A€”ëÜ \nv!\rA \ntAs!A! 	!@  (" \nv j6  q \rl! Aj" I\rAA 	(! E\r  6 Aj!  (, \nj"6,   	j"	 " Atj   kAu J! AH\rA!@  	M\r  	kAuA	l!A\n! 	("A\nI\r@ A
j!  A\nl"O\r  A AæGk AçF AGqk"  kAuA	lA	kH@ A0jA„`A¤b AHj A€Èj"A	m"\rAtj!\nA\n!  \rA	lk"AL@@ A\nl! A
j"AG\r@ \n("  n" lk"\rE \nAj" Fq\r@ A
qE@D@C!
 A€”ëÜG\r
 	 \nO\r
 \nAk-A
qE\r
D
@C!
Dà?Dð?Dø?  FDø? \r A
v"F \r I!@ \r -A-G\r š! 
š!
 \n  \rk"6 
   
a\r \n  j"6 A€”ëÜO@@ \nA6 	 \nAk"\nK@ 	Ak"	A6 \n \n(A
j"6 Aÿ“ëÜK\r  	kAuA	l!A\n! 	("A\nI\r@ A
j!  A\nl"O\r \nAj"   K!@ " 	M"E@ Ak"(E\r
@ AçG@ Aq!\r
 AsA A
 " J A{Jq"\n j!AA~ \n j! Aq"\r\rAw!@ \r Ak("\nE\rA\n!A! \nA\np\r@ "\rA
j! \n A\nl"pE\r \rAs!  kAuA	l! A_qAÆF@A!\r   jA	k"A AJ"  J!
A!\r   j jA	k"A AJ"  J!A!\n AýÿÿÿAþÿÿÿ  \rr"J\r
  AGjA
j!@ A_q"AÆF@  AÿÿÿÿsJ\r A AJ!
   Au"s k­ k"kA
L@@ A
k"A0:  kAH\r Ak" : A
kA-A+ AH:  k" AÿÿÿÿsJ\r  j" AÿÿÿÿsJ\r
 A    j" l   h A0   A€€sl@@@ AÆF@ AjA	r!  	 	 K"!	@ 	5 k!@  	G@  AjM\r
@ A
k"A0:  AjK\r
  G\r A
k"A0:    kh 	Aj"	 M\r @ AùA
h  	M\r
 AL\r
@ 	5 k" AjK@@ A
k"A0:  AjK\r  A	  A	Nh A	k! 	Aj"	 O\r A	J! ! \r@ AH\r  	Aj  	K!\n AjA	r! 	!@  5 k"F@ A
k"A0:@  	G@  AjM\r
@ A
k"A0:  AjK\r
  A
h A
j!  \rrE\r AùA
h    k"   Hh  k! Aj" \nO\r
 AN\r A0 AjAAl    kh ! A0 A	jA	Al A    A€Àsl    J!\n
  AtAuA	qj!@ AK\rA k!D0@!@ D0@¢! A
k"\r -A-F@  
š ¡ š!

 
   ¡!
  (," Au"s k­ k"F@ A
k"A0: (,! Ar!\r A q!	 Ak" Aj: A
kA-A+ AH: AqE ALq! Aj!@ " 
ü"AÐÑj- 	r: 
 ·¡D0@¢!
@ A
j" AjkA
G\r 
Da q\r A.:
 Aj! 
Db\rA!\n Aýÿÿÿ \r  k"	j"kJ\r A    Aj  Ajk" Ak H  "j" l   \rh A0   A€€sl  Aj h A0  kAAl   	h A    A€Àsl    J!\n A°j$ \n¹~ 
 
(AjAxq"
Aj6  
)! 
)!#A k"
$ Bÿÿÿÿÿÿ?ƒ!~ B0ˆBÿÿ
ƒ"§"AøkAýM@ B† B<ˆ„! A€øk­!@ Bÿÿÿÿÿÿÿÿƒ"B€€€€€€€Z@ B
|!
 B€€€€€€€€R\r B
ƒ |!B  BÿÿÿÿÿÿÿV"! ­ |
@  „P\r Bÿÿ
R\r B† B<ˆ„B€€€€€€€„!Bÿ
 Aþ‡
K@B!Bÿ
A€øAø P"\n" k"	AðJ@B!B
  B€€€€€€À„ \n!A!\n  G@ 
Aj! ! !@A€
 	k"AÀq@  A@j­†!B!
 E\r  ­"† AÀ k­ˆ„!  †!  7  7 
) 
)„BR!\n@ 	AÀq@  	A@j­ˆ!B!
 	E\r AÀ 	k­†  	­"ˆ„!  ˆ! 
 7 
 7 
)B† 
)"B<ˆ„!@ \n­ Bÿÿÿÿÿÿÿÿƒ„"B€€€€€€€Z@ B
|!
 B€€€€€€€€R\r B
ƒ |! B€€€€€€€…  BÿÿÿÿÿÿÿV"! ­! 
A j$ B€€€€€€€€€ƒ B4†„ „¿9¦

 (T"(! (" ( ("k"  I"@   V  ( j"6  ( k"6    K"@  
 V  ( j"6  ( k6 A:  (,"6  6 ¢ E@A@  
AÿM\r
@AìÞ((E@ 
A€qA€¿F\rAÐÝA6
 
AÿM@  
A?qA€
r:
  
AvAÀ
r:A 
A€@qA€ÀG 
A€°OqE@  
A?qA€
r:  
AvAà
r:  
AvA?qA€
r:
A 
A€€kAÿÿ?M@  
A?qA€
r:  
AvAð
r:  
AvA?qA€
r:  
AvA?qA€
r:
AAÐÝA6AA

  
:A
Ñ(
#Ak"\n$@@@@@@@@@@ Aô
M@Aß("A AjAøq AI"Av"
v"Aq@@ AsA
q 
j"At"
A¸ßj" 
(À_"("F@Aß A~ wq6
  6  6 Aj!  
Ar6 
 j"
 
(A
r6 A˜ß("M\r
 @@  
tA 
t"A krqh"At"
A¸ßj" 
(À_"("F@Aß A~ wq"6
  6  6  Ar6  j" 
 k"A
r6  
j 6 @ AxqA¸ßj!A¤ß(!
 A
 Avt"qE@Aß  r6 
 (!  
6  
6 
 6 
 6 Aj!A¤ß 6A˜ß 6A”ß("E\r
 hAt(Àa"(Axq k!
 !@@ ("E@ ("E\r
 (Axq k" 
 
 K"!
   ! !
 (!	  ("G@ (" 6  6\n (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6	A! A¿K\r Aj"
Axq!A”ß("	E\rA! AôÿÿM@ A& 
Avg"kvA
q A
tkA>j!A k!
@@@ At(Àa"E@A!
A! A A
vkA AGt!@@ (Axq k" 
O\r ! "
\rA!
 !  ("   AvAqj("F  ! A
t! "\r  rE@A!A t"A kr 	q"E\r hAt(Àa! E\r
@ (Axq k" 
I!  
 !
   ! ("  ("\r E\r 
A˜ß( kO\r (!  ("G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6 A˜ß("M@A¤ß(!
@  k"AO@ 
 j" A
r6  
j 6 
 Ar6
 
 Ar6  
j" (A
r6A!A!A˜ß 6A¤ß 6 
Aj!	 Aϧ("I@Aϧ  k"
6A¨ßA¨ß(" j"6  
A
r6  Ar6 Aj!	A! A/j"Aèâ(@Aðâ(
AôâB7AìâB€ €€€€7Aèâ \nAjApqAتժs6AüâA6AÌâA6A€ "
j"A 
k"q" M\rAÈâ("
@AÀâ(" j"	 M\r	 
 	I\r	@AÌâ-AqE@@@@@A¨ß("
@AÐâ!@ (" 
M@ 
  (jI\r ("\rAu"AF\r !Aìâ("A
k"
 q@  k 
 jA kqj!  O\rAÈâ("@AÀâ("
 j" 
M\r  I\r u" G\r
  k q"u" ( (jF\r
 ! AF\r
 A0j M@ !Aðâ("
  kjA 
kq"
uAF\r
 
 j! ! AG\rAÌâAÌâ(Ar6 u!Au! AF\r AF\r  M\r  k" A(jM\rAÀâAÀâ( j"6AÄâ( I@AÄâ 6@A¨ß("
@AÐâ!@  (" ("jF\r ("\rA ß("A  ME@A ß 6A!AÔâ 6AÐâ 6A°ßA6A´ßAèâ(6AÜâA6@ At"
 
A¸ßj"6À_ 
 6Ä_ A
j"A G\rAϧ A(k"Ax kAq"
k"6A¨ß 
 j"
6 
 A
r6  jA(6A¬ßAøâ(6 
 O\r 
 I\r (Aq\r   j6A¨ß 
Ax 
kAq"j"6AϧAϧ( j" k"6  A
r6 
 jA(6A¬ßAøâ(6A!A!A ß( K@A ß 6  j!AÐâ!@@  ("G@ ("\r
 -AqE\rAÐâ!@@ (" 
M@ 
  (j"I\r
 (!
Aœß A(k"Ax kAq"k"6A¨ß  j"6  A
r6  jA(6A¬ßAøâ(6 
 A\' kAqjA/k"  
AjI"A6 AØâ)7 AÐâ)7AØâ Aj6AÔâ 6AÐâ 6AÜâA6 Aj!@ A6 Aj! Aj!  I\r 
 F\r  (A~q6 
  
k"A
r6  6 Aÿ
M@ Aø
qA¸ßj!Aß("A
 Avt"qE@Aß  r6 
 (!  
6  
6A!A
A! AÿÿÿM@ A& Avg"kvA
q A
trA>s! 
 6 
B7 AtAˇj!@@Aӧ("A
 t"qE@Aӧ  r6  
6 
 6
 A A
vkA AGt! (!@ "(Axq F\r Av! A
t!  Aqj"("\r  
6 
 6A! 
! 
!A
 (" 
6  
6 
 6A!A!A 
j 6 
 j 6Aϧ(" M\rAϧ  k"
6A¨ßA¨ß(" j"6  
A
r6  Ar6 Aj!AÐÝA06A!  6  ( j6 Ax kAqj"	 Ar6 Ax kAqj"  	j"
k!@A¨ß( F@A¨ß 
6AϧAϧ( j"6 
 A
r6
A¤ß( F@A¤ß 
6A˜ßA˜ß( j"6 
 A
r6 
 j 6
 ("AqA
F@ Axq! (!@ Aÿ
M@ (" F@AßAß(A~ Avwq6  6  6
 (!@  G@ (" 6  6
@ (" Aj ("E\r
 Aj!@ ! "Aj! ("\r Aj! ("\r A6
A! E\r@ ("At"(Àa F@ AÀáj 6 \r
AӧAӧ(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6  j"(!  j!  A~q6 
 A
r6 
 j 6 Aÿ
M@ Aø
qA¸ßj!Aß("A
 Avt"qE@Aß  r6 
 (!  
6  
6 
 6 
 6
A! AÿÿÿM@ A& Avg"kvA
q A
trA>s! 
 6 
B7 AtAˇj!@@Aӧ("A
 t"qE@Aӧ  r6  
6 
 6
 A A
vkA AGt! (!@ "(Axq F\r Av! A
t!  Aqj"("\r  
6 
 6 
 
6 
 
6
 (" 
6  
6 
A6 
 6 
 6 	Aj!@ E\r@ ("At"(Àa F@ AÀáj 6 \r
Aӧ 	A~ wq"	6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6@ 
AM@  
 j"Ar6  j" (A
r6
  Ar6  j" 
A
r6 
 j 
6 
Aÿ
M@ 
Aø
qA¸ßj!Aß("A
 
Avt"
qE@Aß 
 r6 
 (!
  6 
 6  6  
6
A! 
AÿÿÿM@ 
A& 
Avg"kvA
q A
trA>s!  6 B7 AtAÀáj!@@ 	A
 t"qE@Aӧ  	r6  6  6
 
A A
vkA AGt! (!@ "(Axq 
F\r Av! A
t!  Aqj"("\r  6  6  6  6
 (" 6  6 A6  6  6 Aj!
@ 	E\r@ ("At"(Àa F@ AÀáj 6 \r
Aӧ A~ wq6@  	(F@ 	 6
 	 6 E\r
  	6 ("@  6  6 ("E\r  6  6@ 
AM@  
 j"Ar6  j" (A
r6
  Ar6  j" 
A
r6 
 j 
6 @ AxqA¸ßj!A¤ß(!A
 Avt" qE@Aß  r6 
 (!  6  6  6  6A¤ß 6A˜ß 
6 Aj! \nAj$ ‚
@ E\r Ak" Ak("
Axq"j!@ 
A
q\r 
AqE\r
  ("k"A ß(I\r
  j!@@@A¤ß( G@ (!
 Aÿ
M@ 
 ("G\rAßAß(A~ Avwq6 (! 
 G@ (" 
6 
 6 (" Aj ("E\r Aj!@ ! "
Aj! 
("\r 
Aj! 
("\r A6 ("
AqAG\rA˜ß 6  
A~q6  A
r6  6  
6 
 6A!
 E\r@ ("At"(Àa F@ AÀáj 
6 
\r
AӧAӧ(A~ wq6@  (F@  
6
  
6 
E\r
 
 6 ("@ 
 6  
6 ("E\r 
 6  
6  O\r ("A
qE\r@@@@ AqE@A¨ß( F@A¨ß 6AœßAœß( j"6  A
r6 A¤ß(G\rA˜ßA6A¤ßA6A¤ß(" F@A¤ß 6A˜ßA˜ß( j"6  A
r6  j 6 Axq j! (!
 Aÿ
M@ (" 
F@AßAß(A~ Avwq6  
6 
 6 (! 
 G@ (" 
6 
 6 (" Aj ("E\r Aj!@ ! "
Aj! 
("\r 
Aj! 
("\r A6  A~q6  A
r6  j 6A!
 E\r@ ("At"(Àa F@ AÀáj 
6 
\r
AӧAӧ(A~ wq6@  (F@  
6
  
6 
E\r
 
 6 ("@ 
 6  
6 ("E\r 
 6  
6  A
r6  j 6  G\rA˜ß 6 Aÿ
M@ Aø
qA¸ßj!
Aß("A
 Avt"qE@Aß  r6 

 
(! 
 6  6  
6  6A!
 AÿÿÿM@ A& Avg"
kvA
q 
A
trA>s!
  
6 B7 
AtAˇj!@Aӧ("A
 
t"qE@Aӧ  r6  6A!
A
 A 
A
vkA 
AGt!
 (!@ "(Axq F\r 
Av! 
A
t!
  Aqj"("\r  6A!
 !A! ! 
 (" 6  6A!A!
A! 
 j 6  6  j 6A°ßA°ß(A
k"A 6‰
 E@ 
q 
A@O@AÐÝA06AA 
AjAxq 
AI! Ak"("Axq!@ AqE@ A€I\r
 Aj M@ !  kAðâ(A
tM\rA  j!@  O@  k"AI\r
   A
qrAr6  j" Ar6  (A
r6  t
A¨ß( F@Aœß( j" M\r   A
qrAr6  j"  k"A
r6Aœß 6A¨ß 6
A¤ß( F@A˜ß( j" I\r@  k"AO@   A
qrAr6  j" A
r6  j" 6  (A~q6
  A
q rAr6  j" (A
r6A!A!A¤ß 6A˜ß 6
 ("Aq\r
 Axq j"\n I\r
 \n k! (!@ Aÿ
M@ (" F@AßAß(A~ Avwq6  6  6
 (!	@  G@ (" 6  6
@ (" Aj ("E\r
 Aj!@ ! "Aj! ("\r Aj! ("\r A6
A! 	E\r@ ("At"(Àa F@ AÀáj 6 \r
AӧAӧ(A~ wq6@  	(F@ 	 6
 	 6 E\r
  	6 ("@  6  6 ("E\r  6  6 AM@  A
q \nrAr6  \nj" (A
r6
   A
qrAr6  j" Ar6  \nj" (A
r6  t ! "@ Aj 
q"E@A  A|Ax Ak("Aq Axqj" 
 
 KV r «
  
j!@@ ("A
q\r AqE\r
 (" 
j!
@@@  k"A¤ß(G@ (! Aÿ
M@  ("G\rAßAß(A~ Avwq6 (!  G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6 ("AqAG\rA˜ß 
6  A~q6  
A
r6  
6  6  6A! E\r@ ("At"(Àa F@ AÀáj 6 \r
AӧAӧ(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6@@@@ ("AqE@A¨ß( F@A¨ß 6AœßAœß( 
j"
6  
A
r6 A¤ß(G\rA˜ßA6A¤ßA6A¤ß(" F@A¤ß 6A˜ßA˜ß( 
j"
6  
A
r6  
j 
6 Axq 
j!
 (! Aÿ
M@ (" F@AßAß(A~ Avwq6  6  6 (!  G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6  A~q6  
A
r6  
j 
6A! E\r@ ("At"(Àa F@ AÀáj 6 \r
AӧAӧ(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6  
A
r6  
j 
6  G\rA˜ß 
6 
Aÿ
M@ 
Aø
qA¸ßj!Aß("A
 
Avt"
qE@Aß 
 r6 
 (!
  6 
 6  6  
6A! 
AÿÿÿM@ 
A& 
Avg"kvA
q A
trA>s!  6 B7 AtAˇj!@@Aӧ("A
 t"qE@Aӧ  r6  6  6
 
A A
vkA AGt! (!@ "(Axq 
F\r Av! A
t!  Aqj"("\r  6  6  6  6 ("
 6  6 A6  6  
6W

~@ ­B|BøÿÿÿƒAÄÜ("­|"BÿÿÿÿX@ §"
?AtM\r
 
\r
AÐÝA06AAÄÜ 
6 ²
#Ak"$  6@ AÓ
M@AàÑA Ó Ajx(!
 A|O@y   AÒ
n"AÒ
l"k6A ÓAàÔ Ajx"
( j! 
A ÓkAu!@A!@@@ "A/F\r
  At(àQ"
n" 
I\r A
j!  
 lG\r A/I\r
AÓ
!@  n"
 I\r  
 lF\r
  A\nj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  A$j"
n" 
I\r  
 lF\r
  A(j"
n" 
I\r  
 lF\r
  A*j"
n" 
I\r  
 lF\r
  A.j"
n" 
I\r  
 lF\r
  A4j"
n" 
I\r  
 lF\r
  A:j"
n" 
I\r  
 lF\r
  A<j"
n" 
I\r  
 lF\r
  AÂj"
n" 
I\r  
 lF\r
  AÆj"
n" 
I\r  
 lF\r
  AÈj"
n" 
I\r  
 lF\r
  AÎj"
n" 
I\r  
 lF\r
  AÒj"
n" 
I\r  
 lF\r
  AØj"
n" 
I\r  
 lF\r
  Aàj"
n" 
I\r  
 lF\r
  Aäj"
n" 
I\r  
 lF\r
  Aæj"
n" 
I\r  
 lF\r
  Aêj"
n" 
I\r  
 lF\r
  Aìj"
n" 
I\r  
 lF\r
  Aðj"
n" 
I\r  
 lF\r
  Aøj"
n" 
I\r  
 lF\r
  Aþj"
n" 
I\r  
 lF\r
  A‚
j"
n" 
I\r  
 lF\r
  Aˆ
j"
n" 
I\r  
 lF\r
  AŠ
j"
n" 
I\r  
 lF\r
  AŽ
j"
n" 
I\r  
 lF\r
  A”
j"
n" 
I\r  
 lF\r
  A–
j"
n" 
I\r  
 lF\r
  Aœ
j"
n" 
I\r  
 lF\r
  A¢
j"
n" 
I\r  
 lF\r
  A¦
j"
n" 
I\r  
 lF\r
  A¨
j"
n" 
I\r  
 lF\r
  A¬
j"
n" 
I\r  
 lF\r
  A²
j"
n" 
I\r  
 lF\r
  A´
j"
n" 
I\r  
 lF\r
  Aº
j"
n" 
I\r  
 lF\r
  A¾
j"
n" 
I\r  
 lF\r
  AÀ
j"
n" 
I\r  
 lF\r
  AÄ
j"
n" 
I\r  
 lF\r
  AÆ
j"
n" 
I\r  
 lF\r
  AÐ
j"
n" 
I\r AÒ
j!  
 lG\rA A
j" A0F""At( S  j"AÒ
lj! Aj$ ‰

#Ak"$ A: 
 kAu!#Ak"$@ @  6 Aj"
 
( A
v"
Atj6  
Asj 
 ( z"
! (Aj  
!
 Aj$ Aj$ v\r ( 
(I *

@ Aj"
(@ 
}AG\r
  ((
  (A
k"6 A=
A
  A
M!
@@ 
q"\rAۋ("E\r 	
 "E@y \r A¨Ú6 ]
 €
"A˜Û6 Aj! 
a"A\rj"A6  6  6 Aj! A
j"@  
 ü\n  6 \n -Av ‚
@ ( ‡


A\n!
 ‚
 ˆ
A
k 
 ‚
@ ( ¨
#A k"$A÷ÿÿÿ"	 
Asj O@ …
!\n 
AóÿÿÿI@  
A
t6  
 j6 Aj Aj–
(Œ
A
j!	 Aj Aj 
(Ž
 Aj 	“
 (!	 ( @ 	 \n ‰
 @  	j  ‰
   j"k!  G@  	j j  \nj j ‰
 
A\nG@ \nr  	6  (
   j j"6 A:  	j Aj‹
 Aj—
 A j$
 -Aÿq (Aÿÿÿÿq@ E\r E\r  
 ü\n ‚
@  
6  
’
  
-:$ AO AjAxq" A
k" AFA\n  
6 \n  

  
A€€€€xr6y AI\r  
Aÿq:

 
!  
6  6®
 
A÷ÿÿÿM@ „
 
I@ 
Œ
!#Ak"
$ 
Aj 
Aj 
(Ž
 „
! ƒ
!@ ‘
"@A
! A
j! ! (
 A
j!@  K@ 
 “
 
(! 
(!
 
 “
 
(! „
! 
(! 
(! A
k M\r r ‚
! …
!   ƒ
A
j‰
 @ r E@  
  6  6
  ’
 
Aj—
 
Aj$
}
#Ak"$@  „
" ƒ
"kM@ E\r
 …
" j 
 ‰
   j"Š
 A:  j Aj‹

    k j  A  
†
 Aj$#
#Ak"$  
z! Aj$ 
   (ƒ
v
#Ak"$ ˆ
! (!@  I@ (!  6  
 ‰
 A:  j Aj‹

  A
k  kA
j A   
†
 Aj$b
#Ak"$ ‡
!@ A\nM@  ’
  
 ‰
 A:  j Aj‹

 A\n A\nk A   
†
 Aj$‚
#Ak"$  
:@@ ‚
"E@A\n! ‡

 ˆ
A
k! ("
 F@#Ak"$ Aj Aj 
(Ž
#Ak"$@ A÷ÿÿÿG@ …
! Aj AóÿÿÿI  A
t6  A
j6 Aj Aj–
(Œ
A
jA÷ÿÿÿ“
 (! ( @   ‰
 A\nG@ r  6  (
 Aj$

  6 Aj—
 Aj$ …

 …
 \r " 
A
j’

 (!  
A
j6 
 j" Aj‹
 A: A
j Aj‹
 Aj$\r  
 
a•
¬
#A k"$ Aj" A j" Aj"k"A	L@A= A  
A
rgkAÑ	lAu" 
 AtAÀÕj(OjH\r
 
A¿„=M@ 
AÎM@ 
AãM@ 
A	M@  

  
ž
 
AçM@  
Aän"
 
 Aälkž
  
Ÿ
 
AŸM@  
AÎn"
 
 AÎlkŸ
  
 

 
AÿÁ×/M@ 
Aÿ¬âM@  
AÀ„=n"
 
 AÀ„=lk 
  
¡

 
Aÿ“ëÜM@  
A€Â×/n"
 
 A€Â×/lk¡

  
A€Â×/n"ž
 
 A€Â×/lk¡
!A6  6 (!#Ak"$@  Aj"k"A÷ÿÿÿM@@ ‘
@  ’
 !

 Aj Œ
A
j“
 (  ("
6  (
  6 
   k"‰
 A: 
 j Aj‹
 Aj$

 A j$  
A0j: A
jë

#Ak"$#A k"$#Ak"$  
A
tAðÕj"
"6  
Aj6 Aj Aj Aj¢
 Aj$ (! (!#Ak"
$ 
 6    k"‰
 
  j6 Aj 
Aj 
Aj¢
 
Aj$   (£
6   (£
6 Aj Aj Aj¢
 A j$ (! Aj$   
Aän"ž
 
 Aälkž
  
AÎn"ž
 
 AÎlkŸ
  
AÀ„=n"ž
 
 AÀ„=lk 
  
(6  (6\n  
 kj AÐjqAÐjt

 E@ ( 
(F  
F@A
 
("-!
@ ("-"E\r  
G\r@ -
!
 -
"E\r
 A
j! A
j!  
F\r  
F°
#AÐk"$@A
  
A¥
\rA 
E\r#Ak"$ Aj" 
("Ak("6  
 j6  Ak(6 ("Aè×A¥
! (!@ @ (!
#A@j"$ A@k$A  
!
#A@j"$ 
 N@ B7 A6 Aè×6  6 B7 B7$ B7, A6< B€€€€€€€
74  
6  Aj  A
A ((\n 
A (! A@k$ "\r#A@j"$ A6 A¸×6  
6 Aè×6A!
 AjAA\'ü A6< A
:;  Aj A
A ((@@@ ((
 (A ($A
FA ( A
FA (,A
F!

 (A
G@ (,\r
 ( A
G\r
 ($A
G\r
 (!
 A@k$ 
! Aj$A E\r ("E\r
 AjAA8ü A
:K A6   6  6 A
6D  Aj A
 (( (,"A
F@  ($6 A
F! AÐj$  Aý6 Aç6 AÐ6vv

 ($"E@  6  
6 A
6$  (86@@ ( (8G\r ( 
G\r (AG\r
  6 A
:6 A6  A
j6$  
(A¥
@ 
  §
3  
(A¥
@ 
  §
 (" 
   ((

 ("A
q! 
-7A
F@ Au" E\r
 ( «

 Au E\r 
 ((68 (!A!A! (" 
  j A Aq ((\n  
j(p
  
(A¥
@ 
  §
 (! Aj" 
  ª
@ AI\r  Atj! Aj!@  
  ª
 
-6\r
 Aj" I\rš
 A
:5@  (G\r A
:4@ ("E@ A
6$  6  
6 A
G\r (0A
F\r
 
 F@ ("AF@  6 ! (0A
G\r A
F\r
  ($A
j6$ A
:6 @ 
 (G\r (A
F\r  6°
  
( ¥
@ 
  ®
@@  
( ¥
@@ 
( G@  
(G\r
 A
G\r 
A
6  
 6  
(,AF\r
 Aj" (Atj!@@@ 
@  M\r 
A;
4  
  A
 °
 
-6\r 
-5A
G\r 
-4A
F@ 
(A
F\rA
!A
! -AqE\rA
! -A
q\rA
AA A
q6, \r 
A6, Aj! (! Aj" 
   ±
 AI\r
  Atj! Aj!@ ("AqE@ 
($A
G\r
@ 
-6\r  
   ±
 Aj" I\r A
qE@@ 
-6\r 
($A
F\r  
   ±
 Aj" I\r@ 
-6\r 
($A
F@ 
(A
F\r  
   ±
 Aj" I\r
 
 6 
 
((A
j6( 
($A
G\r 
(AG\r 
A
:6K
 ("Au! A
q@ ( «
! (" 
   j A Aq  ((\nI
 ("Au! A
q@ ( «
! (" 
  j A Aq  ((ø
  
( ¥
@ 
  ®
@  
( ¥
@@ 
( G@  
(G\r
 A
G\r 
A
6  
 6 @ 
(,AF\r 
A;
4 (" 
  A
  ((\n 
-5A
F@ 
A6, 
-4E\r
 
A6, 
 6 
 
((A
j6( 
($A
G\r
 
(AG\r
 
A
:6 (" 
    ((”
  
( ¥
@ 
  ®
@  
( ¥
E\r@ 
( G@  
(G\r
 A
G\r
 
A
6  
 6 
 6  
 
((A
j6(@ 
($A
G\r 
(AG\r 
A
:6 
A6,›
  
( ¥
@ 
   ­
 
-5! (! 
A:5 
-4! 
A:4 Aj"	 
    °
  
-4"\nr!  
-5"r!@ AI\r 	 Atj!	 Aj!@ 
-6\r
@ \nA
q@ 
(A
F\r -Aq\r
 A
qE\r -A
qE\r 
A;
4  
    °
 
-5" rA
q! 
-4"\n rA
q! Aj" 	I\r 
 A
q:5 
 A
q:49  
( ¥
@ 
   ­
 (" 
     ((\n  
( ¥
@ 
   ­
A¯\rA¿A„+

 A˜Û6 Aj(Ak"
Aj}AH@ 
r  º
 r\n Aj( $# kApq"$ #ôQ(A€Ò{"type":"Document"},"attributes":{summarytbodyTableBodyLatexMathDisplay\\u%04x-+   0X0x-0X+0X 0X-0x+0x 0x__next_prime overflowTableRowdivnavmenuTextUnorderedListOrderedListstartSuperscriptSubscripttfootcountbodyRowCountheadRowCountbasefontDocumentimportantdefaulttightrightHighlightleftframesetfieldsetdt\\taddressdetailsEmphasisnoframes%s:%d: %strvectordirhrfootercenterSpoilerheaderfenceChar\\roptgroupcolgroup/home/moboudra/dev/paseo/.dev/paseo-home/worktrees/2eantcls/feat-web-code-block-renderer/packages/core/cpp/wasm/ASTSerializer.cpp/emsdk/emscripten/system/lib/libcxxabi/src/private_typeinfo.cpptipvideoVideocautionoptionstd::exceptionfigcaptionAdmonitionsectionmainalignnan\\nformmenuitemListItemparamulurlcolhtmlTableHeaderCellTableCellleveldlisTasklinkLinkCodeBlocktrackSoftBreakLineBreakThematicBreaklibad_array_new_lengthParagraphStrikethroughsearchdialogStrongbasic_stringnodeTypeToStringwarningHeadinginf\\ftrueblockquoteBlockquotenotefalsebasefigureadmonitionTypeUnderlineLatexMathInlineBlankLineiframetitlearticletableTableImageCodeasidetdlegendtaskCheckedddtheadTableHeadsrcstd::bad_alloc\\b"\'=<>`-_.-+_\\\\({[,"children":[NANINFcatching a class without an object?)}].!?,;mailto:,"content":h6h5h4h3h2h1http://Too many link reference definition instantiations.Unsupported abi_version.Aborted from text() callback.Aborted from enter_span() callback.Aborted from leave_span() callback.Aborted from enter_block() callback.Aborted from leave_block() callback.malloc() failed.realloc() failed.@:..!#$%&\'*+/=?^_`{|}~-_.:-+-.-_+-_*(null)Suppressing too sparse table (see https://github.com/mity/md4c/issues/345)._=().+-_~%false && "unhandled NodeType in nodeTypeToString"\\"{"type":"[]!xX \n™Jìi¿e£<‡¢°üOs{±2‡+F< ÂÎ._VÉšAÜ~ôH,„*NSt3__220__shared_ptr_emplaceIN8Markdown15MarkdownASTNodeENS_9allocatorIS2_EEEE8™(A€ä A f\r0\r`\r\r\rÐ\r\rp\r\r€ Àà\r\r @ \r\r\r\rAUmŒA°!þ\n-AàÁ™ÅA5¨]¸‹;OAÐ5F¾\n&’îa=AMM	J	G	D	A	>	¬¨Að`A€•EA Ü˜óAÀ\r”nA༨A€\r’
A ±Ô$AÀEu,’Ø–«gYAA ”A°—  € @\n €/ _ 0A@Z€µÀ@րØ@ހ
@.
€2
@6
€9
@G
€J
@v
€x
y
@}
€

‚
„
†
‡
‰
Š
‹
Ž


‘
“
”
–
—
˜
œ

Ÿ
 
@¤
€¦
§
©
¬
®
¯
±
²
³
µ
·
¸
¼
Ä
Å
Ç
È
Ê
Ë
@Û
€Þ
@î
ۖ
ò
ô
ö
÷
ø
@€ "@2€:;=>ACDEF@N€Eprv†ˆ@Š€ŒŽ‘@¡€£@«€ÂÏÐÑÕÖØ@î€ðñôõ÷ùúý@ÿ€@€@/€`@€€Š@¾€ÀÁ@Í€Ð@.€1@V€ @Å€ÇÍø@ý€€‚ƒ„…†‡ˆ‰@º€½@¿€@”€› @þ€@€@€(@/€8@?€H@M€Y[]_h@o€¸¹º»¾È@Ë€ØÙÚÛèéêëìøùúû&!*!+!2!`!@o!€ƒ!¶$@Ï$€,@/,€`,b,c,d,g,@k,€m,n,o,p,r,u,~,,€,@â,€ë,í,ò,@¦@l¦€€¦@š¦€"§@.§€2§@n§€y§{§}§~§@†§€‹§§§’§–§@¨§€ª§«§¬§­§®§°§±§²§³§´§@§€Ä§Å§Æ§Ç§É§Ë§Ì§@Ú§€Ü§Ý§â§õ§l«m«p«@¿«€!ÿ@:ÿ€
@\'
€°
@Ó
€p
@z
€|
@Š
€Œ
@’
€”
•
€
@²
€P\r
@e\r
€ 
@¿
€@n
@_n
€ n
@¸n
€@ß
Hß
Jß
Mß
Qß
hß
@nß
€rß
@~ß
ێ
@!é
€az¼àöøþ

/
3
7
:
H
K
w
ÿz
~
sSƒ
…
Tˆ
VWŒ
Ý
Y[’
`cih™
oru¡
¥
۬
ƒ­
ˆ°
Š‹´
¶
’¹
½
Æ
Æ
É
É
Ì
Ì
Ü
ß
ï
ó
ó
õ
•
¿
ù
ž
#3e,<š
f,B€
‰ŒGO¹qswó¬­¯ÌÍαÁÃËÃײ¸ÆÀÙïºÁ¸µøòû{}P_0Oa‹¿ÏÂÎÑ/a†-%-\'---ðõ24>ABBJcK¦ŠÐúýÿ
•a¡ÿ \'07@EQSUW`g°±pq¹ruÐÑvwàáz{åxy|}ÉkåN!p!!„!Ð$é$0,_,a,k}}h,l,QqPRs,v,?@,ã,ì,î,ó,A¦m¦¦›¦#§/§3§o§z§|§y§‡§Œ§e‘§“§—§©§f\\aljž‡S«µ§Ã§”§‚Žȧʧdͧۧ›
w|ö§K«L« ïAÿZÿ(
O
Ø
û
—
¡
£
±
³
¹
»
¼
À
ò
p\r
…\r
À
ß
`n
n
»n
Ón
Aß
Iß
Kß
Nß
Rß
iß
oß
sß
ß
"é
Cé
AÐ2Ó
ß0
I
ð
‡–—˜™šžP€@‡€ˆ@€@—€˜@Ÿ€ @§€¨@¯€²³´¶¼ÂÃÄÆÌÖäæòóôöüû
ûûûûûûûûû•ß
A°4¥ssi¼nje‚h1tw\ny\na¾ssŹ¹¹¹ ¹\'¹ ¹\'¹`¹g¹`¹g¹p¹±¹¬¹±B±¹t¹·¹®¹·B·¹¹BÁÅB|¹É¹Î¹ÉBɹfffiflststtvtetk~vtmssAà7À°RTV·ÇÒÓ×âãç÷ûû¹
Å
ÅÅ
ÅB±B¹·B¹¹¹
¹BÅÅ
ÅBÉB¹ffifflА.

P05à                 A´:½
!@/€:@@€[@`€{@~€¡@©€«@¬€®@±€´¶@¸€»¿×÷Â@Å€Ò@߀å@ë€íï@ÿ€u~„@…€‡ö‚Z@_€‰@Š€@€¾ÀÃÆó@ô€@€@€j@m€ÔÞéý@þ€@\r€ö@ù€þ@ÿ€0@>€^ˆd	@e	€p	ò	@ó	€ú	@û	€ý	v\nð\n@ñ\n€pó@ú€w„O\ry\rô\r?OZ@[€
@€@€468:@=€…¾@Å€Ç@Ì€Î@Ú€J@O€ž@Ÿ€û`@h€@™€m@n€›@œ€ë@í€5@6€Ô@Ö€Ø@Û€@\n€@D@E€Þ@ÿ€@€ @¦€¨@­€N@O€Z@j€t@€ü@ÿ€;@?€~@€À@Ç€Ó½¿@Á€Í@Ï€Ý@߀í@ï€ý@þ€ @\' €0 @^ €z @~ €Š @Ž €  @Ä €!@
!€!@!€!@	!€!!@!€!@#!€%!\'!)!.!:!@;!€@!@D!€J!@M!€O!Š!@‹!€!@)$€@$@J$€œ$@é$€%@u\'€”\'@s+€v+@ÿ+€å,@ê,€ù,@ü,€þ,@ÿ,€p-.@..€0.@].€`.@c.€€.@™.€›.@ó.€/@Õ/€ð/@ÿ/€
0@0€0@ 0€0060@70€=0@?0€›0@œ0€ 0û01@‘1€–1@Ÿ1€À1@å1€ï12@2€*2@G2€P2`2@2€Š2@°2€À2@ÿ3€ÀM@ÿM€¤@Ƥ€þ¤@ÿ¤€\r¦@¦€s¦~¦ò¦@÷¦€§@§€ §@!§€‰§@Š§€(¨@+¨€6¨@9¨€t¨@w¨€Î¨@Ϩ€ø¨@ú¨€ü¨.©@/©€_©Á©@Í©€Þ©@ß©€\\ª@_ª€wª@yª€Þª@ߪ€ðª@ñª€[«j«@k«€ë«)û²û@Òû€>ý@Oý€ý@‘ý€Èý@Ïý€üý@ÿý€þ@þ€0þ@Rþ€Tþ@fþ€hþ@kþ€
ÿ@ÿ€ÿ@ ÿ€;ÿ@@ÿ€[ÿ@eÿ€àÿ@æÿ€èÿ@îÿ€üÿ@ýÿ€

@

€7

@?

€y

@‰

€Œ

@Ž

€

@œ

€ 

Ð

@ü

€Ÿ
Ð
o
W
w
@x
€	
?	
P\n
@X\n
€\n
È\n
ð\n
@ö\n
€9
@?
€™
@œ
€n\r
Ž\r
@\r
€­
É
@Ê
€Ð
@Ø
€U
@Y
۠
@‰
€G
@M
€»
@¼
€¾
@Á
€@
@C
€t
@u
ہ
@È
€Í
Û
Ý
@ß
€8
@=
۩
Ô
@Õ
€×
@Ø
€K
@O
€Z
@[
€]
Æ
Á
@×
€A
@C
€`
@l
€¹
<
@?
€;
D
@F
ۉ
?
@F
€š
@œ
€ž
@¢
€
@	
ۇ
A
@E
€p
@q
€÷
@ø
€C
@O
€Õ
@ñ
€ÿ
p$
@t$
ۖ/
@ò/
€nj
@oj
€õj
7k
@?k
€Dk
@Ek
€mm
@om
€—n
@šn
ۉo
œ¼
Ÿ¼
Ì
@ïÌ
€úÌ
@üÌ
€Í
@³Î
€ºÎ
@ÐÎ
€ÒÎ
@ÔÎ
€ÝÎ
@ýÎ
€PÏ
@ÃÏ
€Ð
@õÐ
ۄ
@&Ñ
€)Ñ
@dÑ
€jÑ
@lÑ
€ƒÑ
@„Ñ
€ŒÑ
@©Ñ
€®Ñ
@AÒ
€EÒ
SÒ
@ZÒ
€]Ò
@^Ò
€`Ò
@Ò
€Ó
@VÓ
€ÁÖ
ÛÖ
ûÖ
×
5×
O×
o×
‰×
©×
Ã×
Ø
@ÿÙ
€7Ú
@:Ú
€mÚ
@tÚ
€vÚ
@ƒÚ
€…Ú
@‹Ú
€Û
@Û
€Oá
ÿâ
ÿå
^é
@_é
€¬ì
°ì
.í
ðî
@ñî
€ð
@+ð
€0ð
@“ð
€ ð
@®ð
€±ð
@¿ð
€Áð
@Ïð
€Ñð
@õð
€\rñ
@®ñ
€æñ
@ò
€ò
@;ò
€@ò
@Hò
€Pò
@Qò
€`ò
@eò
€ó
@Ùö
€Üö
@ìö
€ðö
@üö
€÷
@Û÷
€à÷
@ë÷
€ð÷
@ø
€ø
@Gø
€Pø
@Yø
€`ø
@‡ø
€ø
@­ø
€°ø
@»ø
€Àø
@Áø
€Ðø
@Øø
€ù
@Wú
€`ú
@mú
€pú
@|ú
€€ú
@Æú
€Èú
Ìú
@Ýú
€ßú
@ëú
€ïú
@úú
€û
@’û
€”û
@ïû
€úû
	A€ÎA	\n\n\n
		AÑÎ!\r\r		A‹Ï
A—Ï	AÅÏ
AÑÏ	AÿÏ
A‹Ð	AÂÐ	AóÐ
AÿÐ	A­Ñ
A¹Ñ€	0123456789ABCDEF\r%)+/5;=CGIOSYaegkmqƒ‰‹•—£§­³µ¿ÁÅÇÓ
\r%)+/5;=CGIOSYaegkmqyƒ‰‹•—£§©­³µ»¿ÁÅÇÑ ,h*NSt3__214__shared_countE¤,œ*
`*NSt3__219__shared_weak_countEAÄÕø\ndè\' †
@B€–˜áõʚ;00010203040506070809101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899H,Ä+(.N10__cxxabiv116__shim_type_infoEH,ô+¸+N10__cxxabiv117__class_type_infoEè+ !"#$%&h,\'!"#()*H,t,è+N10__cxxabiv120__si_class_type_infoEÄ,+!"#,-.H,Ð,è+N10__cxxabiv121__vmi_class_type_infoEL-/0h-124-34 ,<-St9exceptionH,X-4-St9bad_allocH,t-L-St20bad_array_new_length¤-
56H,°-4-St11logic_errorÔ-
76H,à-¤-St12length_error.
86H,.¤-St12out_of_range ,0.St9type_infoAÁÜ 1€');
+     }
+     function getBinarySync(file) {
+       return file;
+@@ -117,7 +118,7 @@ var createMd4cModule = (() => {
+       return imports;
+     }
+     async function createWasm() {
+-      function receiveInstance(instance) {
++      function receiveInstance(instance, module) {
+         wasmExports = instance.exports;
+         assignWasmExports(wasmExports);
+         updateMemoryViews();
+@@ -127,10 +128,11 @@ var createMd4cModule = (() => {
+         return receiveInstance(result["instance"]);
+       }
+       var info = getWasmImports();
+-      var instantiateWasm = Module["instantiateWasm"];
+-      if (instantiateWasm) {
+-        return new Promise(resolve => {
+-          instantiateWasm(info, inst => resolve(receiveInstance(inst)));
++      if (Module["instantiateWasm"]) {
++        return new Promise((resolve, reject) => {
++          Module["instantiateWasm"](info, (inst, mod) => {
++            resolve(receiveInstance(inst, mod));
++          });
+         });
+       }
+       wasmBinaryFile ??= findWasmBinary();
+@@ -145,23 +147,15 @@ var createMd4cModule = (() => {
+         this.status = status;
+       }
+     }
+-    var HEAP16;
+-    var HEAP32;
+-    var HEAP64;
+-    var HEAP8;
+-    var HEAPF32;
+-    var HEAPF64;
+-    var HEAPU16;
+-    var HEAPU32;
+-    var HEAPU64;
+-    var HEAPU8;
+     var callRuntimeCallbacks = callbacks => {
+       while (callbacks.length > 0) {
+         callbacks.shift()(Module);
+       }
+     };
+     var onPostRuns = [];
++    var addOnPostRun = cb => onPostRuns.push(cb);
+     var onPreRuns = [];
++    var addOnPreRun = cb => onPreRuns.push(cb);
+     var noExitRuntime = true;
+     var stackRestore = val => __emscripten_stack_restore(val);
+     var stackSave = () => _emscripten_stack_get_current();
+@@ -249,12 +243,14 @@ var createMd4cModule = (() => {
+         return HEAPU32[this.ptr + 16 >> 2];
+       }
+     }
++    var exceptionLast = 0;
+     var uncaughtExceptionCount = 0;
+     var ___cxa_throw = (ptr, type, destructor) => {
+       var info = new ExceptionInfo(ptr);
+       info.init(type, destructor);
++      exceptionLast = ptr;
+       uncaughtExceptionCount++;
+-      abort();
++      throw exceptionLast;
+     };
+     var __abort_js = () => abort("");
+     var getHeapMax = () => 536870912;
+@@ -400,17 +396,24 @@ var createMd4cModule = (() => {
+       }
+       return (...args) => ccall(ident, returnType, argTypes, args, opts);
+     };
++    for (var base64ReverseLookup = new Uint8Array(123), i = 25; i >= 0; --i) {
++      base64ReverseLookup[48 + i] = 52 + i;
++      base64ReverseLookup[65 + i] = i;
++      base64ReverseLookup[97 + i] = 26 + i;
++    }
++    base64ReverseLookup[43] = 62;
++    base64ReverseLookup[47] = 63;
+     {
+       if (Module["noExitRuntime"]) noExitRuntime = Module["noExitRuntime"];
+       if (Module["print"]) out = Module["print"];
+       if (Module["printErr"]) err = Module["printErr"];
+-      if (Module["arguments"]) programArgs = Module["arguments"];
++      if (Module["wasmBinary"]) wasmBinary = Module["wasmBinary"];
++      if (Module["arguments"]) arguments_ = Module["arguments"];
+       if (Module["thisProgram"]) thisProgram = Module["thisProgram"];
+-      var preInit = Module["preInit"];
+-      if (preInit) {
+-        if (typeof preInit == "function") Module["preInit"] = preInit = [preInit];
+-        while (preInit.length > 0) {
+-          preInit.shift()();
++      if (Module["preInit"]) {
++        if (typeof Module["preInit"] == "function") Module["preInit"] = [Module["preInit"]];
++        while (Module["preInit"].length > 0) {
++          Module["preInit"].shift()();
+         }
+       }
+     }
+@@ -432,24 +435,39 @@ var createMd4cModule = (() => {
+       _abort_js: __abort_js,
+       emscripten_resize_heap: _emscripten_resize_heap
+     };
+-    async function run() {
++    function run() {
+       preRun();
+-      var setStatus = Module["setStatus"];
+-      if (setStatus) {
+-        setStatus("Running...");
+-        await new Promise(resolve => setTimeout(resolve, 1));
+-        setTimeout(setStatus, 1, "");
+-      }
+-      if (ABORT) return;
+-      initRuntime();
+-      Module["onRuntimeInitialized"]?.();
+-      postRun();
++      function doRun() {
++        Module["calledRun"] = true;
++        if (ABORT) return;
++        initRuntime();
++        readyPromiseResolve?.(Module);
++        Module["onRuntimeInitialized"]?.();
++        postRun();
++      }
++      if (Module["setStatus"]) {
++        Module["setStatus"]("Running...");
++        setTimeout(() => {
++          setTimeout(() => Module["setStatus"](""), 1);
++          doRun();
++        }, 1);
++      } else {
++        doRun();
++      }
+     }
+     var wasmExports;
+     wasmExports = await createWasm();
+-    await run();
++    run();
++    if (runtimeInitialized) {
++      moduleRtn = Module;
++    } else {
++      moduleRtn = new Promise((resolve, reject) => {
++        readyPromiseResolve = resolve;
++        readyPromiseReject = reject;
++      });
++    }
+     ;
+-    return Module;
++    return moduleRtn;
+   };
+ })();
+ if (typeof exports === "object" && typeof module === "object") {
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/wasm/md4c.js.map b/node_modules/react-native-enriched-markdown/lib/module/web/wasm/md4c.js.map
+index 75b509c..ecbb5e7 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/wasm/md4c.js.map
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/wasm/md4c.js.map
+@@ -1 +1 @@
+-{"version":3,"names":["createMd4cModule","_scriptName","globalThis","document","currentScript","src","moduleArg","Module","ENVIRONMENT_IS_WEB","ENVIRONMENT_IS_WORKER","programArgs","thisProgram","scriptDirectory","readAsync","URL","href","url","response","fetch","credentials","ok","arrayBuffer","Error","status","out","console","log","bind","err","error","wasmBinary","ABORT","EmscriptenEH","EmscriptenSjLj","binaryDecode","bin","i","l","length","o","Uint8Array","c","charCodeAt","runtimeInitialized","getMemoryBuffer","wasmMemory","buffer","updateMemoryViews","HEAP8","resizable","b","Int8Array","HEAP16","Int16Array","HEAPU8","HEAPU16","Uint16Array","HEAP32","Int32Array","HEAPU32","Uint32Array","HEAPF32","Float32Array","HEAPF64","Float64Array","HEAP64","BigInt64Array","HEAPU64","BigUint64Array","preRun","onPreRuns","push","callRuntimeCallbacks","initRuntime","wasmExports","postRun","onPostRuns","abort","what","e","WebAssembly","RuntimeError","wasmBinaryFile","findWasmBinary","getBinarySync","file","getWasmBinary","binaryFile","instantiateArrayBuffer","imports","binary","instance","instantiate","reason","instantiateAsync","getWasmImports","env","wasmImports","wasi_snapshot_preview1","createWasm","receiveInstance","exports","assignWasmExports","receiveInstantiationResult","result","info","instantiateWasm","Promise","resolve","inst","ExitStatus","name","constructor","message","callbacks","shift","noExitRuntime","stackRestore","val","__emscripten_stack_restore","stackSave","_emscripten_stack_get_current","UTF8Decoder","TextDecoder","findStringEnd","heapOrArray","idx","maxBytesToRead","ignoreNul","maxIdx","UTF8ArrayToString","endPtr","decode","subarray","str","u0","String","fromCharCode","u1","u2","ch","UTF8ToString","ptr","___assert_fail","condition","filename","line","func","ExceptionInfo","excPtr","set_type","type","get_type","set_destructor","destructor","get_destructor","set_caught","caught","get_caught","set_rethrown","rethrown","get_rethrown","init","set_adjusted_ptr","adjustedPtr","get_adjusted_ptr","uncaughtExceptionCount","___cxa_throw","__abort_js","getHeapMax","alignMemory","size","alignment","Math","ceil","growMemory","oldHeapSize","byteLength","pages","grow","_emscripten_resize_heap","requestedSize","oldSize","maxHeapSize","cutDown","overGrownHeapSize","min","newSize","max","replacement","getCFunc","ident","writeArrayToMemory","array","set","lengthBytesUTF8","len","stringToUTF8Array","heap","outIdx","maxBytesToWrite","startIdx","endIdx","u","codePointAt","stringToUTF8","outPtr","stackAlloc","sz","__emscripten_stack_alloc","stringToUTF8OnStack","ret","ccall","returnType","argTypes","args","opts","toC","string","undefined","arr","convertReturnValue","Boolean","cArgs","stack","converter","onDone","cwrap","numericArgs","every","numericRet","preInit","_parseMarkdown","memory","__indirect_function_table","__assert_fail","__cxa_throw","_abort_js","emscripten_resize_heap","run","setStatus","setTimeout","module","default","define"],"sourceRoot":"../../../../src","sources":["web/wasm/md4c.js"],"mappings":";;AAAA,IAAIA,gBAAgB,GAAC,CAAC,MAAI;EAAC,IAAIC,WAAW,GAACC,UAAU,CAACC,QAAQ,EAAEC,aAAa,EAAEC,GAAG;EAAC,OAAO,gBAAeC,SAAS,GAAC,CAAC,CAAC,EAAC;IAAC,IAAIC,MAAM,GAACD,SAAS;IAAC,IAAIE,kBAAkB,GAAC,IAAI;IAAC,IAAIC,qBAAqB,GAAC,KAAK;IAAC,IAAIC,WAAW,GAAC,EAAE;IAAC,IAAIC,WAAW,GAAC,gBAAgB;IAAC,IAAIC,eAAe,GAAC,EAAE;IAAC,IAAIC,SAAS;IAAC,IAAGL,kBAAkB,IAAEC,qBAAqB,EAAC;MAAC,IAAG;QAACG,eAAe,GAAC,IAAIE,GAAG,CAAC,GAAG,EAACb,WAAW,CAAC,CAACc,IAAI;MAAA,CAAC,OAAK,CAAC;MAAC;QAACF,SAAS,GAAC,MAAMG,GAAG,IAAE;UAAC,IAAIC,QAAQ,GAAC,MAAMC,KAAK,CAACF,GAAG,EAAC;YAACG,WAAW,EAAC;UAAa,CAAC,CAAC;UAAC,IAAGF,QAAQ,CAACG,EAAE,EAAC;YAAC,OAAOH,QAAQ,CAACI,WAAW,CAAC,CAAC;UAAA;UAAC,MAAM,IAAIC,KAAK,CAACL,QAAQ,CAACM,MAAM,GAAC,KAAK,GAACN,QAAQ,CAACD,GAAG,CAAC;QAAA,CAAC;MAAA;IAAC,CAAC,MAAI,CAAC;IAAC,IAAIQ,GAAG,GAACC,OAAO,CAACC,GAAG,CAACC,IAAI,CAACF,OAAO,CAAC;IAAC,IAAIG,GAAG,GAACH,OAAO,CAACI,KAAK,CAACF,IAAI,CAACF,OAAO,CAAC;IAAC,IAAIK,UAAU;IAAC,IAAIC,KAAK,GAAC,KAAK;IAAC,MAAMC,YAAY;IAAE,MAAMC,cAAc,SAASD,YAAY;IAAE,SAASE,YAAYA,CAACC,GAAG,EAAC;MAAC,KAAI,IAAIC,CAAC,GAAC,CAAC,EAACC,CAAC,GAACF,GAAG,CAACG,MAAM,EAACC,CAAC,GAAC,IAAIC,UAAU,CAACH,CAAC,CAAC,EAACI,CAAC,EAACL,CAAC,GAACC,CAAC,EAAC,EAAED,CAAC,EAAC;QAACK,CAAC,GAACN,GAAG,CAACO,UAAU,CAACN,CAAC,CAAC;QAACG,CAAC,CAACH,CAAC,CAAC,GAAC,CAACK,CAAC,IAAE,CAAC,GAACA,CAAC;MAAA;MAAC,OAAOF,CAAC;IAAA;IAAC,IAAII,kBAAkB,GAAC,KAAK;IAAC,SAASC,eAAeA,CAAA,EAAE;MAAC,OAAOC,UAAU,CAACC,MAAM;IAAA;IAAC,SAASC,iBAAiBA,CAAA,EAAE;MAAC,IAAGC,KAAK,EAAEF,MAAM,EAAEG,SAAS,EAAC;MAAO,IAAIC,CAAC,GAACN,eAAe,CAAC,CAAC;MAACI,KAAK,GAAC,IAAIG,SAAS,CAACD,CAAC,CAAC;MAACE,MAAM,GAAC,IAAIC,UAAU,CAACH,CAAC,CAAC;MAACI,MAAM,GAAC,IAAId,UAAU,CAACU,CAAC,CAAC;MAACK,OAAO,GAAC,IAAIC,WAAW,CAACN,CAAC,CAAC;MAACO,MAAM,GAAC,IAAIC,UAAU,CAACR,CAAC,CAAC;MAACS,OAAO,GAAC,IAAIC,WAAW,CAACV,CAAC,CAAC;MAACW,OAAO,GAAC,IAAIC,YAAY,CAACZ,CAAC,CAAC;MAACa,OAAO,GAAC,IAAIC,YAAY,CAACd,CAAC,CAAC;MAACe,MAAM,GAAC,IAAIC,aAAa,CAAChB,CAAC,CAAC;MAACiB,OAAO,GAAC,IAAIC,cAAc,CAAClB,CAAC,CAAC;IAAA;IAAC,SAASmB,MAAMA,CAAA,EAAE;MAAC,IAAIA,MAAM,GAAC9D,MAAM,CAAC,QAAQ,CAAC;MAAC,IAAG8D,MAAM,EAAC;QAAC,IAAG,OAAOA,MAAM,IAAE,UAAU,EAACA,MAAM,GAAC,CAACA,MAAM,CAAC;QAACC,SAAS,CAACC,IAAI,CAAC,GAAGF,MAAM,CAAC;MAAA;MAACG,oBAAoB,CAACF,SAAS,CAAC;IAAA;IAAC,SAASG,WAAWA,CAAA,EAAE;MAAC9B,kBAAkB,GAAC,IAAI;MAAC+B,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAAA;IAAC,SAASC,OAAOA,CAAA,EAAE;MAAC,IAAIA,OAAO,GAACpE,MAAM,CAAC,SAAS,CAAC;MAAC,IAAGoE,OAAO,EAAC;QAAC,IAAG,OAAOA,OAAO,IAAE,UAAU,EAACA,OAAO,GAAC,CAACA,OAAO,CAAC;QAACC,UAAU,CAACL,IAAI,CAAC,GAAGI,OAAO,CAAC;MAAA;MAACH,oBAAoB,CAACI,UAAU,CAAC;IAAA;IAAC,SAASC,KAAKA,CAACC,IAAI,EAAC;MAACvE,MAAM,CAAC,SAAS,CAAC,GAAGuE,IAAI,CAAC;MAACA,IAAI,GAAC,WAAWA,IAAI,GAAG;MAAClD,GAAG,CAACkD,IAAI,CAAC;MAAC/C,KAAK,GAAC,IAAI;MAAC+C,IAAI,IAAE,0CAA0C;MAAC,IAAIC,CAAC,GAAC,IAAIC,WAAW,CAACC,YAAY,CAACH,IAAI,CAAC;MAAC,MAAMC,CAAC;IAAA;IAAC,IAAIG,cAAc;IAAC,SAASC,cAAcA,CAAA,EAAE;MAAC,OAAOjD,YAAY,CAAC,o/qHAAo/qH,CAAC;IAAA;IAAC,SAASkD,aAAaA,CAACC,IAAI,EAAC;MAAC,OAAOA,IAAI;IAAA;IAAC,eAAeC,aAAaA,CAACC,UAAU,EAAC;MAAC,OAAOH,aAAa,CAACG,UAAU,CAAC;IAAA;IAAC,eAAeC,sBAAsBA,CAACD,UAAU,EAACE,OAAO,EAAC;MAAC,IAAG;QAAC,IAAIC,MAAM,GAAC,MAAMJ,aAAa,CAACC,UAAU,CAAC;QAAC,IAAII,QAAQ,GAAC,MAAMX,WAAW,CAACY,WAAW,CAACF,MAAM,EAACD,OAAO,CAAC;QAAC,OAAOE,QAAQ;MAAA,CAAC,QAAME,MAAM,EAAC;QAACjE,GAAG,CAAC,0CAA0CiE,MAAM,EAAE,CAAC;QAAChB,KAAK,CAACgB,MAAM,CAAC;MAAA;IAAC;IAAC,eAAeC,gBAAgBA,CAACJ,MAAM,EAACH,UAAU,EAACE,OAAO,EAAC;MAAC,OAAOD,sBAAsB,CAACD,UAAU,EAACE,OAAO,CAAC;IAAA;IAAC,SAASM,cAAcA,CAAA,EAAE;MAAC,IAAIN,OAAO,GAAC;QAACO,GAAG,EAACC,WAAW;QAACC,sBAAsB,EAACD;MAAW,CAAC;MAAC,OAAOR,OAAO;IAAA;IAAC,eAAeU,UAAUA,CAAA,EAAE;MAAC,SAASC,eAAeA,CAACT,QAAQ,EAAC;QAACjB,WAAW,GAACiB,QAAQ,CAACU,OAAO;QAACC,iBAAiB,CAAC5B,WAAW,CAAC;QAAC3B,iBAAiB,CAAC,CAAC;QAAC,OAAO2B,WAAW;MAAA;MAAC,SAAS6B,0BAA0BA,CAACC,MAAM,EAAC;QAAC,OAAOJ,eAAe,CAACI,MAAM,CAAC,UAAU,CAAC,CAAC;MAAA;MAAC,IAAIC,IAAI,GAACV,cAAc,CAAC,CAAC;MAAC,IAAIW,eAAe,GAACnG,MAAM,CAAC,iBAAiB,CAAC;MAAC,IAAGmG,eAAe,EAAC;QAAC,OAAO,IAAIC,OAAO,CAACC,OAAO,IAAE;UAACF,eAAe,CAACD,IAAI,EAACI,IAAI,IAAED,OAAO,CAACR,eAAe,CAACS,IAAI,CAAC,CAAC,CAAC;QAAA,CAAC,CAAC;MAAA;MAAC3B,cAAc,KAAGC,cAAc,CAAC,CAAC;MAAC,IAAIqB,MAAM,GAAC,MAAMV,gBAAgB,CAAChE,UAAU,EAACoD,cAAc,EAACuB,IAAI,CAAC;MAAC,IAAIJ,OAAO,GAACE,0BAA0B,CAACC,MAAM,CAAC;MAAC,OAAOH,OAAO;IAAA;IAAC,MAAMS,UAAU;MAACC,IAAI,GAAC,YAAY;MAACC,WAAWA,CAACzF,MAAM,EAAC;QAAC,IAAI,CAAC0F,OAAO,GAAC,gCAAgC1F,MAAM,GAAG;QAAC,IAAI,CAACA,MAAM,GAACA,MAAM;MAAA;IAAC;IAAC,IAAI6B,MAAM;IAAC,IAAIK,MAAM;IAAC,IAAIQ,MAAM;IAAC,IAAIjB,KAAK;IAAC,IAAIa,OAAO;IAAC,IAAIE,OAAO;IAAC,IAAIR,OAAO;IAAC,IAAII,OAAO;IAAC,IAAIQ,OAAO;IAAC,IAAIb,MAAM;IAAC,IAAIkB,oBAAoB,GAAC0C,SAAS,IAAE;MAAC,OAAMA,SAAS,CAAC5E,MAAM,GAAC,CAAC,EAAC;QAAC4E,SAAS,CAACC,KAAK,CAAC,CAAC,CAAC5G,MAAM,CAAC;MAAA;IAAC,CAAC;IAAC,IAAIqE,UAAU,GAAC,EAAE;IAAC,IAAIN,SAAS,GAAC,EAAE;IAAC,IAAI8C,aAAa,GAAC,IAAI;IAAC,IAAIC,YAAY,GAACC,GAAG,IAAEC,0BAA0B,CAACD,GAAG,CAAC;IAAC,IAAIE,SAAS,GAACA,CAAA,KAAIC,6BAA6B,CAAC,CAAC;IAAC,IAAIC,WAAW,GAACxH,UAAU,CAACyH,WAAW,IAAE,IAAIA,WAAW,CAAD,CAAC;IAAC,IAAIC,aAAa,GAACA,CAACC,WAAW,EAACC,GAAG,EAACC,cAAc,EAACC,SAAS,KAAG;MAAC,IAAIC,MAAM,GAACH,GAAG,GAACC,cAAc;MAAC,IAAGC,SAAS,EAAC,OAAOC,MAAM;MAAC,OAAMJ,WAAW,CAACC,GAAG,CAAC,IAAE,EAAEA,GAAG,IAAEG,MAAM,CAAC,EAAC,EAAEH,GAAG;MAAC,OAAOA,GAAG;IAAA,CAAC;IAAC,IAAII,iBAAiB,GAACA,CAACL,WAAW,EAACC,GAAG,GAAC,CAAC,EAACC,cAAc,EAACC,SAAS,KAAG;MAAC,IAAIG,MAAM,GAACP,aAAa,CAACC,WAAW,EAACC,GAAG,EAACC,cAAc,EAACC,SAAS,CAAC;MAAC,IAAGG,MAAM,GAACL,GAAG,GAAC,EAAE,IAAED,WAAW,CAAC/E,MAAM,IAAE4E,WAAW,EAAC;QAAC,OAAOA,WAAW,CAACU,MAAM,CAACP,WAAW,CAACQ,QAAQ,CAACP,GAAG,EAACK,MAAM,CAAC,CAAC;MAAA;MAAC,IAAIG,GAAG,GAAC,EAAE;MAAC,OAAMR,GAAG,GAACK,MAAM,EAAC;QAAC,IAAII,EAAE,GAACV,WAAW,CAACC,GAAG,EAAE,CAAC;QAAC,IAAG,EAAES,EAAE,GAAC,GAAG,CAAC,EAAC;UAACD,GAAG,IAAEE,MAAM,CAACC,YAAY,CAACF,EAAE,CAAC;UAAC;QAAQ;QAAC,IAAIG,EAAE,GAACb,WAAW,CAACC,GAAG,EAAE,CAAC,GAAC,EAAE;QAAC,IAAG,CAACS,EAAE,GAAC,GAAG,KAAG,GAAG,EAAC;UAACD,GAAG,IAAEE,MAAM,CAACC,YAAY,CAAC,CAACF,EAAE,GAAC,EAAE,KAAG,CAAC,GAACG,EAAE,CAAC;UAAC;QAAQ;QAAC,IAAIC,EAAE,GAACd,WAAW,CAACC,GAAG,EAAE,CAAC,GAAC,EAAE;QAAC,IAAG,CAACS,EAAE,GAAC,GAAG,KAAG,GAAG,EAAC;UAACA,EAAE,GAAC,CAACA,EAAE,GAAC,EAAE,KAAG,EAAE,GAACG,EAAE,IAAE,CAAC,GAACC,EAAE;QAAA,CAAC,MAAI;UAACJ,EAAE,GAAC,CAACA,EAAE,GAAC,CAAC,KAAG,EAAE,GAACG,EAAE,IAAE,EAAE,GAACC,EAAE,IAAE,CAAC,GAACd,WAAW,CAACC,GAAG,EAAE,CAAC,GAAC,EAAE;QAAA;QAAC,IAAGS,EAAE,GAAC,KAAK,EAAC;UAACD,GAAG,IAAEE,MAAM,CAACC,YAAY,CAACF,EAAE,CAAC;QAAA,CAAC,MAAI;UAAC,IAAIK,EAAE,GAACL,EAAE,GAAC,KAAK;UAACD,GAAG,IAAEE,MAAM,CAACC,YAAY,CAAC,KAAK,GAACG,EAAE,IAAE,EAAE,EAAC,KAAK,GAACA,EAAE,GAAC,IAAI,CAAC;QAAA;MAAC;MAAC,OAAON,GAAG;IAAA,CAAC;IAAC,IAAIO,YAAY,GAACA,CAACC,GAAG,EAACf,cAAc,EAACC,SAAS,KAAGc,GAAG,GAACZ,iBAAiB,CAAC5E,MAAM,EAACwF,GAAG,EAACf,cAAc,EAACC,SAAS,CAAC,GAAC,EAAE;IAAC,IAAIe,cAAc,GAACA,CAACC,SAAS,EAACC,QAAQ,EAACC,IAAI,EAACC,IAAI,KAAGtE,KAAK,CAAC,qBAAqBgE,YAAY,CAACG,SAAS,CAAC,QAAQ,GAAC,CAACC,QAAQ,GAACJ,YAAY,CAACI,QAAQ,CAAC,GAAC,kBAAkB,EAACC,IAAI,EAACC,IAAI,GAACN,YAAY,CAACM,IAAI,CAAC,GAAC,kBAAkB,CAAC,CAAC;IAAC,MAAMC,aAAa;MAACpC,WAAWA,CAACqC,MAAM,EAAC;QAAC,IAAI,CAACA,MAAM,GAACA,MAAM;QAAC,IAAI,CAACP,GAAG,GAACO,MAAM,GAAC,EAAE;MAAA;MAACC,QAAQA,CAACC,IAAI,EAAC;QAAC5F,OAAO,CAAC,IAAI,CAACmF,GAAG,GAAC,CAAC,IAAE,CAAC,CAAC,GAACS,IAAI;MAAA;MAACC,QAAQA,CAAA,EAAE;QAAC,OAAO7F,OAAO,CAAC,IAAI,CAACmF,GAAG,GAAC,CAAC,IAAE,CAAC,CAAC;MAAA;MAACW,cAAcA,CAACC,UAAU,EAAC;QAAC/F,OAAO,CAAC,IAAI,CAACmF,GAAG,GAAC,CAAC,IAAE,CAAC,CAAC,GAACY,UAAU;MAAA;MAACC,cAAcA,CAAA,EAAE;QAAC,OAAOhG,OAAO,CAAC,IAAI,CAACmF,GAAG,GAAC,CAAC,IAAE,CAAC,CAAC;MAAA;MAACc,UAAUA,CAACC,MAAM,EAAC;QAACA,MAAM,GAACA,MAAM,GAAC,CAAC,GAAC,CAAC;QAAC7G,KAAK,CAAC,IAAI,CAAC8F,GAAG,GAAC,EAAE,CAAC,GAACe,MAAM;MAAA;MAACC,UAAUA,CAAA,EAAE;QAAC,OAAO9G,KAAK,CAAC,IAAI,CAAC8F,GAAG,GAAC,EAAE,CAAC,IAAE,CAAC;MAAA;MAACiB,YAAYA,CAACC,QAAQ,EAAC;QAACA,QAAQ,GAACA,QAAQ,GAAC,CAAC,GAAC,CAAC;QAAChH,KAAK,CAAC,IAAI,CAAC8F,GAAG,GAAC,EAAE,CAAC,GAACkB,QAAQ;MAAA;MAACC,YAAYA,CAAA,EAAE;QAAC,OAAOjH,KAAK,CAAC,IAAI,CAAC8F,GAAG,GAAC,EAAE,CAAC,IAAE,CAAC;MAAA;MAACoB,IAAIA,CAACX,IAAI,EAACG,UAAU,EAAC;QAAC,IAAI,CAACS,gBAAgB,CAAC,CAAC,CAAC;QAAC,IAAI,CAACb,QAAQ,CAACC,IAAI,CAAC;QAAC,IAAI,CAACE,cAAc,CAACC,UAAU,CAAC;MAAA;MAACS,gBAAgBA,CAACC,WAAW,EAAC;QAACzG,OAAO,CAAC,IAAI,CAACmF,GAAG,GAAC,EAAE,IAAE,CAAC,CAAC,GAACsB,WAAW;MAAA;MAACC,gBAAgBA,CAAA,EAAE;QAAC,OAAO1G,OAAO,CAAC,IAAI,CAACmF,GAAG,GAAC,EAAE,IAAE,CAAC,CAAC;MAAA;IAAC;IAAC,IAAIwB,sBAAsB,GAAC,CAAC;IAAC,IAAIC,YAAY,GAACA,CAACzB,GAAG,EAACS,IAAI,EAACG,UAAU,KAAG;MAAC,IAAIjD,IAAI,GAAC,IAAI2C,aAAa,CAACN,GAAG,CAAC;MAACrC,IAAI,CAACyD,IAAI,CAACX,IAAI,EAACG,UAAU,CAAC;MAACY,sBAAsB,EAAE;MAACzF,KAAK,CAAC,CAAC;IAAA,CAAC;IAAC,IAAI2F,UAAU,GAACA,CAAA,KAAI3F,KAAK,CAAC,EAAE,CAAC;IAAC,IAAI4F,UAAU,GAACA,CAAA,KAAI,SAAS;IAAC,IAAIC,WAAW,GAACA,CAACC,IAAI,EAACC,SAAS,KAAGC,IAAI,CAACC,IAAI,CAACH,IAAI,GAACC,SAAS,CAAC,GAACA,SAAS;IAAC,IAAIG,UAAU,GAACJ,IAAI,IAAE;MAAC,IAAIK,WAAW,GAACnI,UAAU,CAACC,MAAM,CAACmI,UAAU;MAAC,IAAIC,KAAK,GAAC,CAACP,IAAI,GAACK,WAAW,GAAC,KAAK,IAAE,KAAK,GAAC,CAAC;MAAC,IAAG;QAACnI,UAAU,CAACsI,IAAI,CAACD,KAAK,CAAC;QAACnI,iBAAiB,CAAC,CAAC;QAAC,OAAO,CAAC;MAAA,CAAC,QAAMgC,CAAC,EAAC,CAAC;IAAC,CAAC;IAAC,IAAIqG,uBAAuB,GAACC,aAAa,IAAE;MAAC,IAAIC,OAAO,GAAChI,MAAM,CAAChB,MAAM;MAAC+I,aAAa,MAAI,CAAC;MAAC,IAAIE,WAAW,GAACd,UAAU,CAAC,CAAC;MAAC,IAAGY,aAAa,GAACE,WAAW,EAAC;QAAC,OAAO,KAAK;MAAA;MAAC,KAAI,IAAIC,OAAO,GAAC,CAAC,EAACA,OAAO,IAAE,CAAC,EAACA,OAAO,IAAE,CAAC,EAAC;QAAC,IAAIC,iBAAiB,GAACH,OAAO,IAAE,CAAC,GAAC,EAAE,GAACE,OAAO,CAAC;QAACC,iBAAiB,GAACZ,IAAI,CAACa,GAAG,CAACD,iBAAiB,EAACJ,aAAa,GAAC,SAAS,CAAC;QAAC,IAAIM,OAAO,GAACd,IAAI,CAACa,GAAG,CAACH,WAAW,EAACb,WAAW,CAACG,IAAI,CAACe,GAAG,CAACP,aAAa,EAACI,iBAAiB,CAAC,EAAC,KAAK,CAAC,CAAC;QAAC,IAAII,WAAW,GAACd,UAAU,CAACY,OAAO,CAAC;QAAC,IAAGE,WAAW,EAAC;UAAC,OAAO,IAAI;QAAA;MAAC;MAAC,OAAO,KAAK;IAAA,CAAC;IAAC,IAAIC,QAAQ,GAACC,KAAK,IAAE;MAAC,IAAI5C,IAAI,GAAC5I,MAAM,CAAC,GAAG,GAACwL,KAAK,CAAC;MAAC,OAAO5C,IAAI;IAAA,CAAC;IAAC,IAAI6C,kBAAkB,GAACA,CAACC,KAAK,EAACnJ,MAAM,KAAG;MAACE,KAAK,CAACkJ,GAAG,CAACD,KAAK,EAACnJ,MAAM,CAAC;IAAA,CAAC;IAAC,IAAIqJ,eAAe,GAAC7D,GAAG,IAAE;MAAC,IAAI8D,GAAG,GAAC,CAAC;MAAC,KAAI,IAAIhK,CAAC,GAAC,CAAC,EAACA,CAAC,GAACkG,GAAG,CAAChG,MAAM,EAAC,EAAEF,CAAC,EAAC;QAAC,IAAIK,CAAC,GAAC6F,GAAG,CAAC5F,UAAU,CAACN,CAAC,CAAC;QAAC,IAAGK,CAAC,IAAE,GAAG,EAAC;UAAC2J,GAAG,EAAE;QAAA,CAAC,MAAK,IAAG3J,CAAC,IAAE,IAAI,EAAC;UAAC2J,GAAG,IAAE,CAAC;QAAA,CAAC,MAAK,IAAG3J,CAAC,IAAE,KAAK,IAAEA,CAAC,IAAE,KAAK,EAAC;UAAC2J,GAAG,IAAE,CAAC;UAAC,EAAEhK,CAAC;QAAA,CAAC,MAAI;UAACgK,GAAG,IAAE,CAAC;QAAA;MAAC;MAAC,OAAOA,GAAG;IAAA,CAAC;IAAC,IAAIC,iBAAiB,GAACA,CAAC/D,GAAG,EAACgE,IAAI,EAACC,MAAM,EAACC,eAAe,KAAG;MAAC,IAAG,EAAEA,eAAe,GAAC,CAAC,CAAC,EAAC,OAAO,CAAC;MAAC,IAAIC,QAAQ,GAACF,MAAM;MAAC,IAAIG,MAAM,GAACH,MAAM,GAACC,eAAe,GAAC,CAAC;MAAC,KAAI,IAAIpK,CAAC,GAAC,CAAC,EAACA,CAAC,GAACkG,GAAG,CAAChG,MAAM,EAAC,EAAEF,CAAC,EAAC;QAAC,IAAIuK,CAAC,GAACrE,GAAG,CAACsE,WAAW,CAACxK,CAAC,CAAC;QAAC,IAAGuK,CAAC,IAAE,GAAG,EAAC;UAAC,IAAGJ,MAAM,IAAEG,MAAM,EAAC;UAAMJ,IAAI,CAACC,MAAM,EAAE,CAAC,GAACI,CAAC;QAAA,CAAC,MAAK,IAAGA,CAAC,IAAE,IAAI,EAAC;UAAC,IAAGJ,MAAM,GAAC,CAAC,IAAEG,MAAM,EAAC;UAAMJ,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,CAAC;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,GAAC,EAAE;QAAA,CAAC,MAAK,IAAGA,CAAC,IAAE,KAAK,EAAC;UAAC,IAAGJ,MAAM,GAAC,CAAC,IAAEG,MAAM,EAAC;UAAMJ,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,EAAE;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,CAAC,GAAC,EAAE;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,GAAC,EAAE;QAAA,CAAC,MAAI;UAAC,IAAGJ,MAAM,GAAC,CAAC,IAAEG,MAAM,EAAC;UAAMJ,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,EAAE;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,EAAE,GAAC,EAAE;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,CAAC,GAAC,EAAE;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,GAAC,EAAE;UAACvK,CAAC,EAAE;QAAA;MAAC;MAACkK,IAAI,CAACC,MAAM,CAAC,GAAC,CAAC;MAAC,OAAOA,MAAM,GAACE,QAAQ;IAAA,CAAC;IAAC,IAAII,YAAY,GAACA,CAACvE,GAAG,EAACwE,MAAM,EAACN,eAAe,KAAGH,iBAAiB,CAAC/D,GAAG,EAAChF,MAAM,EAACwJ,MAAM,EAACN,eAAe,CAAC;IAAC,IAAIO,UAAU,GAACC,EAAE,IAAEC,wBAAwB,CAACD,EAAE,CAAC;IAAC,IAAIE,mBAAmB,GAAC5E,GAAG,IAAE;MAAC,IAAIqC,IAAI,GAACwB,eAAe,CAAC7D,GAAG,CAAC,GAAC,CAAC;MAAC,IAAI6E,GAAG,GAACJ,UAAU,CAACpC,IAAI,CAAC;MAACkC,YAAY,CAACvE,GAAG,EAAC6E,GAAG,EAACxC,IAAI,CAAC;MAAC,OAAOwC,GAAG;IAAA,CAAC;IAAC,IAAIC,KAAK,GAACA,CAACrB,KAAK,EAACsB,UAAU,EAACC,QAAQ,EAACC,IAAI,EAACC,IAAI,KAAG;MAAC,IAAIC,GAAG,GAAC;QAACC,MAAM,EAACpF,GAAG,IAAE;UAAC,IAAI6E,GAAG,GAAC,CAAC;UAAC,IAAG7E,GAAG,KAAG,IAAI,IAAEA,GAAG,KAAGqF,SAAS,IAAErF,GAAG,KAAG,CAAC,EAAC;YAAC6E,GAAG,GAACD,mBAAmB,CAAC5E,GAAG,CAAC;UAAA;UAAC,OAAO6E,GAAG;QAAA,CAAC;QAAClB,KAAK,EAAC2B,GAAG,IAAE;UAAC,IAAIT,GAAG,GAACJ,UAAU,CAACa,GAAG,CAACtL,MAAM,CAAC;UAAC0J,kBAAkB,CAAC4B,GAAG,EAACT,GAAG,CAAC;UAAC,OAAOA,GAAG;QAAA;MAAC,CAAC;MAAC,SAASU,kBAAkBA,CAACV,GAAG,EAAC;QAAC,IAAGE,UAAU,KAAG,QAAQ,EAAC;UAAC,OAAOxE,YAAY,CAACsE,GAAG,CAAC;QAAA;QAAC,IAAGE,UAAU,KAAG,SAAS,EAAC,OAAOS,OAAO,CAACX,GAAG,CAAC;QAAC,OAAOA,GAAG;MAAA;MAAC,IAAIhE,IAAI,GAAC2C,QAAQ,CAACC,KAAK,CAAC;MAAC,IAAIgC,KAAK,GAAC,EAAE;MAAC,IAAIC,KAAK,GAAC,CAAC;MAAC,IAAGT,IAAI,EAAC;QAAC,KAAI,IAAInL,CAAC,GAAC,CAAC,EAACA,CAAC,GAACmL,IAAI,CAACjL,MAAM,EAACF,CAAC,EAAE,EAAC;UAAC,IAAI6L,SAAS,GAACR,GAAG,CAACH,QAAQ,CAAClL,CAAC,CAAC,CAAC;UAAC,IAAG6L,SAAS,EAAC;YAAC,IAAGD,KAAK,KAAG,CAAC,EAACA,KAAK,GAACxG,SAAS,CAAC,CAAC;YAACuG,KAAK,CAAC3L,CAAC,CAAC,GAAC6L,SAAS,CAACV,IAAI,CAACnL,CAAC,CAAC,CAAC;UAAA,CAAC,MAAI;YAAC2L,KAAK,CAAC3L,CAAC,CAAC,GAACmL,IAAI,CAACnL,CAAC,CAAC;UAAA;QAAC;MAAC;MAAC,IAAI+K,GAAG,GAAChE,IAAI,CAAC,GAAG4E,KAAK,CAAC;MAAC,SAASG,MAAMA,CAACf,GAAG,EAAC;QAAC,IAAGa,KAAK,KAAG,CAAC,EAAC3G,YAAY,CAAC2G,KAAK,CAAC;QAAC,OAAOH,kBAAkB,CAACV,GAAG,CAAC;MAAA;MAACA,GAAG,GAACe,MAAM,CAACf,GAAG,CAAC;MAAC,OAAOA,GAAG;IAAA,CAAC;IAAC,IAAIgB,KAAK,GAACA,CAACpC,KAAK,EAACsB,UAAU,EAACC,QAAQ,EAACE,IAAI,KAAG;MAAC,IAAIY,WAAW,GAAC,CAACd,QAAQ,IAAEA,QAAQ,CAACe,KAAK,CAAC9E,IAAI,IAAEA,IAAI,KAAG,QAAQ,IAAEA,IAAI,KAAG,SAAS,CAAC;MAAC,IAAI+E,UAAU,GAACjB,UAAU,KAAG,QAAQ;MAAC,IAAGiB,UAAU,IAAEF,WAAW,IAAE,CAACZ,IAAI,EAAC;QAAC,OAAO1B,QAAQ,CAACC,KAAK,CAAC;MAAA;MAAC,OAAM,CAAC,GAAGwB,IAAI,KAAGH,KAAK,CAACrB,KAAK,EAACsB,UAAU,EAACC,QAAQ,EAACC,IAAI,EAACC,IAAI,CAAC;IAAA,CAAC;IAAC;MAAC,IAAGjN,MAAM,CAAC,eAAe,CAAC,EAAC6G,aAAa,GAAC7G,MAAM,CAAC,eAAe,CAAC;MAAC,IAAGA,MAAM,CAAC,OAAO,CAAC,EAACiB,GAAG,GAACjB,MAAM,CAAC,OAAO,CAAC;MAAC,IAAGA,MAAM,CAAC,UAAU,CAAC,EAACqB,GAAG,GAACrB,MAAM,CAAC,UAAU,CAAC;MAAC,IAAGA,MAAM,CAAC,WAAW,CAAC,EAACG,WAAW,GAACH,MAAM,CAAC,WAAW,CAAC;MAAC,IAAGA,MAAM,CAAC,aAAa,CAAC,EAACI,WAAW,GAACJ,MAAM,CAAC,aAAa,CAAC;MAAC,IAAIgO,OAAO,GAAChO,MAAM,CAAC,SAAS,CAAC;MAAC,IAAGgO,OAAO,EAAC;QAAC,IAAG,OAAOA,OAAO,IAAE,UAAU,EAAChO,MAAM,CAAC,SAAS,CAAC,GAACgO,OAAO,GAAC,CAACA,OAAO,CAAC;QAAC,OAAMA,OAAO,CAACjM,MAAM,GAAC,CAAC,EAAC;UAACiM,OAAO,CAACpH,KAAK,CAAC,CAAC,CAAC,CAAC;QAAA;MAAC;IAAC;IAAC5G,MAAM,CAAC,OAAO,CAAC,GAAC6M,KAAK;IAAC7M,MAAM,CAAC,OAAO,CAAC,GAAC4N,KAAK;IAAC5N,MAAM,CAAC,cAAc,CAAC,GAACsI,YAAY;IAAC,IAAI2F,cAAc,EAACjH,0BAA0B,EAAC0F,wBAAwB,EAACxF,6BAA6B,EAACgH,MAAM,EAACC,yBAAyB,EAAC7L,UAAU;IAAC,SAASyD,iBAAiBA,CAAC5B,WAAW,EAAC;MAAC8J,cAAc,GAACjO,MAAM,CAAC,gBAAgB,CAAC,GAACmE,WAAW,CAAC,eAAe,CAAC;MAAC6C,0BAA0B,GAAC7C,WAAW,CAAC,2BAA2B,CAAC;MAACuI,wBAAwB,GAACvI,WAAW,CAAC,yBAAyB,CAAC;MAAC+C,6BAA6B,GAAC/C,WAAW,CAAC,8BAA8B,CAAC;MAAC+J,MAAM,GAAC5L,UAAU,GAAC6B,WAAW,CAAC,QAAQ,CAAC;MAACgK,yBAAyB,GAAChK,WAAW,CAAC,2BAA2B,CAAC;IAAA;IAAC,IAAIuB,WAAW,GAAC;MAAC0I,aAAa,EAAC5F,cAAc;MAAC6F,WAAW,EAACrE,YAAY;MAACsE,SAAS,EAACrE,UAAU;MAACsE,sBAAsB,EAAC1D;IAAuB,CAAC;IAAC,eAAe2D,GAAGA,CAAA,EAAE;MAAC1K,MAAM,CAAC,CAAC;MAAC,IAAI2K,SAAS,GAACzO,MAAM,CAAC,WAAW,CAAC;MAAC,IAAGyO,SAAS,EAAC;QAACA,SAAS,CAAC,YAAY,CAAC;QAAC,MAAM,IAAIrI,OAAO,CAACC,OAAO,IAAEqI,UAAU,CAACrI,OAAO,EAAC,CAAC,CAAC,CAAC;QAACqI,UAAU,CAACD,SAAS,EAAC,CAAC,EAAC,EAAE,CAAC;MAAA;MAAC,IAAGjN,KAAK,EAAC;MAAO0C,WAAW,CAAC,CAAC;MAAClE,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC;MAACoE,OAAO,CAAC,CAAC;IAAA;IAAC,IAAID,WAAW;IAACA,WAAW,GAAC,MAAMyB,UAAU,CAAC,CAAC;IAAC,MAAM4I,GAAG,CAAC,CAAC;IACln/H;IAAC,OAAOxO,MAAM;EAAA,CAAC;AAAA,CAAC,EAAE,CAAC;AAAC,IAAG,OAAO8F,OAAO,KAAG,QAAQ,IAAE,OAAO6I,MAAM,KAAG,QAAQ,EAAC;EAACA,MAAM,CAAC7I,OAAO,GAACrG,gBAAgB;EAACkP,MAAM,CAAC7I,OAAO,CAAC8I,OAAO,GAACnP,gBAAgB;AAAA,CAAC,MAAK,IAAG,OAAOoP,MAAM,KAAG,UAAU,IAAEA,MAAM,CAAC,KAAK,CAAC,EAACA,MAAM,CAAC,EAAE,EAAC,MAAIpP,gBAAgB,CAAC","ignoreList":[]}
++{"version":3,"names":["createMd4cModule","_scriptName","globalThis","document","currentScript","src","moduleArg","moduleRtn","Module","ENVIRONMENT_IS_WEB","ENVIRONMENT_IS_WORKER","arguments_","thisProgram","scriptDirectory","readAsync","URL","href","url","response","fetch","credentials","ok","arrayBuffer","Error","status","out","console","log","bind","err","error","wasmBinary","ABORT","binaryDecode","bin","i","l","length","o","Uint8Array","c","charCodeAt","readyPromiseResolve","readyPromiseReject","HEAP8","HEAPU8","HEAP16","HEAPU16","HEAP32","HEAPU32","HEAPF32","HEAPF64","HEAP64","HEAPU64","runtimeInitialized","updateMemoryViews","b","wasmMemory","buffer","Int8Array","Int16Array","Uint16Array","Int32Array","Uint32Array","Float32Array","Float64Array","BigInt64Array","BigUint64Array","preRun","addOnPreRun","shift","callRuntimeCallbacks","onPreRuns","initRuntime","wasmExports","postRun","addOnPostRun","onPostRuns","abort","what","e","WebAssembly","RuntimeError","wasmBinaryFile","findWasmBinary","getBinarySync","file","getWasmBinary","binaryFile","instantiateArrayBuffer","imports","binary","instance","instantiate","reason","instantiateAsync","getWasmImports","env","wasmImports","wasi_snapshot_preview1","createWasm","receiveInstance","module","exports","assignWasmExports","receiveInstantiationResult","result","info","Promise","resolve","reject","inst","mod","ExitStatus","name","constructor","message","callbacks","cb","push","noExitRuntime","stackRestore","val","__emscripten_stack_restore","stackSave","_emscripten_stack_get_current","UTF8Decoder","TextDecoder","findStringEnd","heapOrArray","idx","maxBytesToRead","ignoreNul","maxIdx","UTF8ArrayToString","endPtr","decode","subarray","str","u0","String","fromCharCode","u1","u2","ch","UTF8ToString","ptr","___assert_fail","condition","filename","line","func","ExceptionInfo","excPtr","set_type","type","get_type","set_destructor","destructor","get_destructor","set_caught","caught","get_caught","set_rethrown","rethrown","get_rethrown","init","set_adjusted_ptr","adjustedPtr","get_adjusted_ptr","exceptionLast","uncaughtExceptionCount","___cxa_throw","__abort_js","getHeapMax","alignMemory","size","alignment","Math","ceil","growMemory","oldHeapSize","byteLength","pages","grow","_emscripten_resize_heap","requestedSize","oldSize","maxHeapSize","cutDown","overGrownHeapSize","min","newSize","max","replacement","getCFunc","ident","writeArrayToMemory","array","set","lengthBytesUTF8","len","stringToUTF8Array","heap","outIdx","maxBytesToWrite","startIdx","endIdx","u","codePointAt","stringToUTF8","outPtr","stackAlloc","sz","__emscripten_stack_alloc","stringToUTF8OnStack","ret","ccall","returnType","argTypes","args","opts","toC","string","undefined","arr","convertReturnValue","Boolean","cArgs","stack","converter","onDone","cwrap","numericArgs","every","numericRet","base64ReverseLookup","_parseMarkdown","memory","__indirect_function_table","__assert_fail","__cxa_throw","_abort_js","emscripten_resize_heap","run","doRun","setTimeout","default","define"],"sourceRoot":"../../../../src","sources":["web/wasm/md4c.js"],"mappings":";;AAAA,IAAIA,gBAAgB,GAAC,CAAC,MAAI;EAAC,IAAIC,WAAW,GAACC,UAAU,CAACC,QAAQ,EAAEC,aAAa,EAAEC,GAAG;EAAC,OAAO,gBAAeC,SAAS,GAAC,CAAC,CAAC,EAAC;IAAC,IAAIC,SAAS;IAAC,IAAIC,MAAM,GAACF,SAAS;IAAC,IAAIG,kBAAkB,GAAC,IAAI;IAAC,IAAIC,qBAAqB,GAAC,KAAK;IAAC,IAAIC,UAAU,GAAC,EAAE;IAAC,IAAIC,WAAW,GAAC,gBAAgB;IAAC,IAAIC,eAAe,GAAC,EAAE;IAAC,IAAIC,SAAS;IAAC,IAAGL,kBAAkB,IAAEC,qBAAqB,EAAC;MAAC,IAAG;QAACG,eAAe,GAAC,IAAIE,GAAG,CAAC,GAAG,EAACd,WAAW,CAAC,CAACe,IAAI;MAAA,CAAC,OAAK,CAAC;MAAC;QAACF,SAAS,GAAC,MAAMG,GAAG,IAAE;UAAC,IAAIC,QAAQ,GAAC,MAAMC,KAAK,CAACF,GAAG,EAAC;YAACG,WAAW,EAAC;UAAa,CAAC,CAAC;UAAC,IAAGF,QAAQ,CAACG,EAAE,EAAC;YAAC,OAAOH,QAAQ,CAACI,WAAW,CAAC,CAAC;UAAA;UAAC,MAAM,IAAIC,KAAK,CAACL,QAAQ,CAACM,MAAM,GAAC,KAAK,GAACN,QAAQ,CAACD,GAAG,CAAC;QAAA,CAAC;MAAA;IAAC,CAAC,MAAI,CAAC;IAAC,IAAIQ,GAAG,GAACC,OAAO,CAACC,GAAG,CAACC,IAAI,CAACF,OAAO,CAAC;IAAC,IAAIG,GAAG,GAACH,OAAO,CAACI,KAAK,CAACF,IAAI,CAACF,OAAO,CAAC;IAAC,IAAIK,UAAU;IAAC,IAAIC,KAAK,GAAC,KAAK;IAAC,SAASC,YAAYA,CAACC,GAAG,EAAC;MAAC,KAAI,IAAIC,CAAC,GAAC,CAAC,EAACC,CAAC,GAACF,GAAG,CAACG,MAAM,EAACC,CAAC,GAAC,IAAIC,UAAU,CAACH,CAAC,CAAC,EAACI,CAAC,EAACL,CAAC,GAACC,CAAC,EAAC,EAAED,CAAC,EAAC;QAACK,CAAC,GAACN,GAAG,CAACO,UAAU,CAACN,CAAC,CAAC;QAACG,CAAC,CAACH,CAAC,CAAC,GAAC,CAACK,CAAC,IAAE,CAAC,GAACA,CAAC;MAAA;MAAC,OAAOF,CAAC;IAAA;IAAC,IAAII,mBAAmB,EAACC,kBAAkB;IAAC,IAAIC,KAAK,EAACC,MAAM,EAACC,MAAM,EAACC,OAAO,EAACC,MAAM,EAACC,OAAO,EAACC,OAAO,EAACC,OAAO;IAAC,IAAIC,MAAM,EAACC,OAAO;IAAC,IAAIC,kBAAkB,GAAC,KAAK;IAAC,SAASC,iBAAiBA,CAAA,EAAE;MAAC,IAAIC,CAAC,GAACC,UAAU,CAACC,MAAM;MAACd,KAAK,GAAC,IAAIe,SAAS,CAACH,CAAC,CAAC;MAACV,MAAM,GAAC,IAAIc,UAAU,CAACJ,CAAC,CAAC;MAACX,MAAM,GAAC,IAAIN,UAAU,CAACiB,CAAC,CAAC;MAACT,OAAO,GAAC,IAAIc,WAAW,CAACL,CAAC,CAAC;MAACR,MAAM,GAAC,IAAIc,UAAU,CAACN,CAAC,CAAC;MAACP,OAAO,GAAC,IAAIc,WAAW,CAACP,CAAC,CAAC;MAACN,OAAO,GAAC,IAAIc,YAAY,CAACR,CAAC,CAAC;MAACL,OAAO,GAAC,IAAIc,YAAY,CAACT,CAAC,CAAC;MAACJ,MAAM,GAAC,IAAIc,aAAa,CAACV,CAAC,CAAC;MAACH,OAAO,GAAC,IAAIc,cAAc,CAACX,CAAC,CAAC;IAAA;IAAC,SAASY,MAAMA,CAAA,EAAE;MAAC,IAAG5D,MAAM,CAAC,QAAQ,CAAC,EAAC;QAAC,IAAG,OAAOA,MAAM,CAAC,QAAQ,CAAC,IAAE,UAAU,EAACA,MAAM,CAAC,QAAQ,CAAC,GAAC,CAACA,MAAM,CAAC,QAAQ,CAAC,CAAC;QAAC,OAAMA,MAAM,CAAC,QAAQ,CAAC,CAAC6B,MAAM,EAAC;UAACgC,WAAW,CAAC7D,MAAM,CAAC,QAAQ,CAAC,CAAC8D,KAAK,CAAC,CAAC,CAAC;QAAA;MAAC;MAACC,oBAAoB,CAACC,SAAS,CAAC;IAAA;IAAC,SAASC,WAAWA,CAAA,EAAE;MAACnB,kBAAkB,GAAC,IAAI;MAACoB,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAAA;IAAC,SAASC,OAAOA,CAAA,EAAE;MAAC,IAAGnE,MAAM,CAAC,SAAS,CAAC,EAAC;QAAC,IAAG,OAAOA,MAAM,CAAC,SAAS,CAAC,IAAE,UAAU,EAACA,MAAM,CAAC,SAAS,CAAC,GAAC,CAACA,MAAM,CAAC,SAAS,CAAC,CAAC;QAAC,OAAMA,MAAM,CAAC,SAAS,CAAC,CAAC6B,MAAM,EAAC;UAACuC,YAAY,CAACpE,MAAM,CAAC,SAAS,CAAC,CAAC8D,KAAK,CAAC,CAAC,CAAC;QAAA;MAAC;MAACC,oBAAoB,CAACM,UAAU,CAAC;IAAA;IAAC,SAASC,KAAKA,CAACC,IAAI,EAAC;MAACvE,MAAM,CAAC,SAAS,CAAC,GAAGuE,IAAI,CAAC;MAACA,IAAI,GAAC,UAAU,GAACA,IAAI,GAAC,GAAG;MAAClD,GAAG,CAACkD,IAAI,CAAC;MAAC/C,KAAK,GAAC,IAAI;MAAC+C,IAAI,IAAE,0CAA0C;MAAC,IAAIC,CAAC,GAAC,IAAIC,WAAW,CAACC,YAAY,CAACH,IAAI,CAAC;MAACpC,kBAAkB,GAAGqC,CAAC,CAAC;MAAC,MAAMA,CAAC;IAAA;IAAC,IAAIG,cAAc;IAAC,SAASC,cAAcA,CAAA,EAAE;MAAC,OAAOnD,YAAY,CAAC,8l3HAA8l3H,CAAC;IAAA;IAAC,SAASoD,aAAaA,CAACC,IAAI,EAAC;MAAC,OAAOA,IAAI;IAAA;IAAC,eAAeC,aAAaA,CAACC,UAAU,EAAC;MAAC,OAAOH,aAAa,CAACG,UAAU,CAAC;IAAA;IAAC,eAAeC,sBAAsBA,CAACD,UAAU,EAACE,OAAO,EAAC;MAAC,IAAG;QAAC,IAAIC,MAAM,GAAC,MAAMJ,aAAa,CAACC,UAAU,CAAC;QAAC,IAAII,QAAQ,GAAC,MAAMX,WAAW,CAACY,WAAW,CAACF,MAAM,EAACD,OAAO,CAAC;QAAC,OAAOE,QAAQ;MAAA,CAAC,QAAME,MAAM,EAAC;QAACjE,GAAG,CAAC,0CAA0CiE,MAAM,EAAE,CAAC;QAAChB,KAAK,CAACgB,MAAM,CAAC;MAAA;IAAC;IAAC,eAAeC,gBAAgBA,CAACJ,MAAM,EAACH,UAAU,EAACE,OAAO,EAAC;MAAC,OAAOD,sBAAsB,CAACD,UAAU,EAACE,OAAO,CAAC;IAAA;IAAC,SAASM,cAAcA,CAAA,EAAE;MAAC,IAAIN,OAAO,GAAC;QAACO,GAAG,EAACC,WAAW;QAACC,sBAAsB,EAACD;MAAW,CAAC;MAAC,OAAOR,OAAO;IAAA;IAAC,eAAeU,UAAUA,CAAA,EAAE;MAAC,SAASC,eAAeA,CAACT,QAAQ,EAACU,MAAM,EAAC;QAAC5B,WAAW,GAACkB,QAAQ,CAACW,OAAO;QAACC,iBAAiB,CAAC9B,WAAW,CAAC;QAACnB,iBAAiB,CAAC,CAAC;QAAC,OAAOmB,WAAW;MAAA;MAAC,SAAS+B,0BAA0BA,CAACC,MAAM,EAAC;QAAC,OAAOL,eAAe,CAACK,MAAM,CAAC,UAAU,CAAC,CAAC;MAAA;MAAC,IAAIC,IAAI,GAACX,cAAc,CAAC,CAAC;MAAC,IAAGxF,MAAM,CAAC,iBAAiB,CAAC,EAAC;QAAC,OAAO,IAAIoG,OAAO,CAAC,CAACC,OAAO,EAACC,MAAM,KAAG;UAACtG,MAAM,CAAC,iBAAiB,CAAC,CAACmG,IAAI,EAAC,CAACI,IAAI,EAACC,GAAG,KAAG;YAACH,OAAO,CAACR,eAAe,CAACU,IAAI,EAACC,GAAG,CAAC,CAAC;UAAA,CAAC,CAAC;QAAA,CAAC,CAAC;MAAA;MAAC7B,cAAc,KAAGC,cAAc,CAAC,CAAC;MAAC,IAAIsB,MAAM,GAAC,MAAMX,gBAAgB,CAAChE,UAAU,EAACoD,cAAc,EAACwB,IAAI,CAAC;MAAC,IAAIJ,OAAO,GAACE,0BAA0B,CAACC,MAAM,CAAC;MAAC,OAAOH,OAAO;IAAA;IAAC,MAAMU,UAAU;MAACC,IAAI,GAAC,YAAY;MAACC,WAAWA,CAAC3F,MAAM,EAAC;QAAC,IAAI,CAAC4F,OAAO,GAAC,gCAAgC5F,MAAM,GAAG;QAAC,IAAI,CAACA,MAAM,GAACA,MAAM;MAAA;IAAC;IAAC,IAAI+C,oBAAoB,GAAC8C,SAAS,IAAE;MAAC,OAAMA,SAAS,CAAChF,MAAM,GAAC,CAAC,EAAC;QAACgF,SAAS,CAAC/C,KAAK,CAAC,CAAC,CAAC9D,MAAM,CAAC;MAAA;IAAC,CAAC;IAAC,IAAIqE,UAAU,GAAC,EAAE;IAAC,IAAID,YAAY,GAAC0C,EAAE,IAAEzC,UAAU,CAAC0C,IAAI,CAACD,EAAE,CAAC;IAAC,IAAI9C,SAAS,GAAC,EAAE;IAAC,IAAIH,WAAW,GAACiD,EAAE,IAAE9C,SAAS,CAAC+C,IAAI,CAACD,EAAE,CAAC;IAAC,IAAIE,aAAa,GAAC,IAAI;IAAC,IAAIC,YAAY,GAACC,GAAG,IAAEC,0BAA0B,CAACD,GAAG,CAAC;IAAC,IAAIE,SAAS,GAACA,CAAA,KAAIC,6BAA6B,CAAC,CAAC;IAAC,IAAIC,WAAW,GAAC5H,UAAU,CAAC6H,WAAW,IAAE,IAAIA,WAAW,CAAD,CAAC;IAAC,IAAIC,aAAa,GAACA,CAACC,WAAW,EAACC,GAAG,EAACC,cAAc,EAACC,SAAS,KAAG;MAAC,IAAIC,MAAM,GAACH,GAAG,GAACC,cAAc;MAAC,IAAGC,SAAS,EAAC,OAAOC,MAAM;MAAC,OAAMJ,WAAW,CAACC,GAAG,CAAC,IAAE,EAAEA,GAAG,IAAEG,MAAM,CAAC,EAAC,EAAEH,GAAG;MAAC,OAAOA,GAAG;IAAA,CAAC;IAAC,IAAII,iBAAiB,GAACA,CAACL,WAAW,EAACC,GAAG,GAAC,CAAC,EAACC,cAAc,EAACC,SAAS,KAAG;MAAC,IAAIG,MAAM,GAACP,aAAa,CAACC,WAAW,EAACC,GAAG,EAACC,cAAc,EAACC,SAAS,CAAC;MAAC,IAAGG,MAAM,GAACL,GAAG,GAAC,EAAE,IAAED,WAAW,CAACvE,MAAM,IAAEoE,WAAW,EAAC;QAAC,OAAOA,WAAW,CAACU,MAAM,CAACP,WAAW,CAACQ,QAAQ,CAACP,GAAG,EAACK,MAAM,CAAC,CAAC;MAAA;MAAC,IAAIG,GAAG,GAAC,EAAE;MAAC,OAAMR,GAAG,GAACK,MAAM,EAAC;QAAC,IAAII,EAAE,GAACV,WAAW,CAACC,GAAG,EAAE,CAAC;QAAC,IAAG,EAAES,EAAE,GAAC,GAAG,CAAC,EAAC;UAACD,GAAG,IAAEE,MAAM,CAACC,YAAY,CAACF,EAAE,CAAC;UAAC;QAAQ;QAAC,IAAIG,EAAE,GAACb,WAAW,CAACC,GAAG,EAAE,CAAC,GAAC,EAAE;QAAC,IAAG,CAACS,EAAE,GAAC,GAAG,KAAG,GAAG,EAAC;UAACD,GAAG,IAAEE,MAAM,CAACC,YAAY,CAAC,CAACF,EAAE,GAAC,EAAE,KAAG,CAAC,GAACG,EAAE,CAAC;UAAC;QAAQ;QAAC,IAAIC,EAAE,GAACd,WAAW,CAACC,GAAG,EAAE,CAAC,GAAC,EAAE;QAAC,IAAG,CAACS,EAAE,GAAC,GAAG,KAAG,GAAG,EAAC;UAACA,EAAE,GAAC,CAACA,EAAE,GAAC,EAAE,KAAG,EAAE,GAACG,EAAE,IAAE,CAAC,GAACC,EAAE;QAAA,CAAC,MAAI;UAACJ,EAAE,GAAC,CAACA,EAAE,GAAC,CAAC,KAAG,EAAE,GAACG,EAAE,IAAE,EAAE,GAACC,EAAE,IAAE,CAAC,GAACd,WAAW,CAACC,GAAG,EAAE,CAAC,GAAC,EAAE;QAAA;QAAC,IAAGS,EAAE,GAAC,KAAK,EAAC;UAACD,GAAG,IAAEE,MAAM,CAACC,YAAY,CAACF,EAAE,CAAC;QAAA,CAAC,MAAI;UAAC,IAAIK,EAAE,GAACL,EAAE,GAAC,KAAK;UAACD,GAAG,IAAEE,MAAM,CAACC,YAAY,CAAC,KAAK,GAACG,EAAE,IAAE,EAAE,EAAC,KAAK,GAACA,EAAE,GAAC,IAAI,CAAC;QAAA;MAAC;MAAC,OAAON,GAAG;IAAA,CAAC;IAAC,IAAIO,YAAY,GAACA,CAACC,GAAG,EAACf,cAAc,EAACC,SAAS,KAAGc,GAAG,GAACZ,iBAAiB,CAACzF,MAAM,EAACqG,GAAG,EAACf,cAAc,EAACC,SAAS,CAAC,GAAC,EAAE;IAAC,IAAIe,cAAc,GAACA,CAACC,SAAS,EAACC,QAAQ,EAACC,IAAI,EAACC,IAAI,KAAGzE,KAAK,CAAC,qBAAqBmE,YAAY,CAACG,SAAS,CAAC,QAAQ,GAAC,CAACC,QAAQ,GAACJ,YAAY,CAACI,QAAQ,CAAC,GAAC,kBAAkB,EAACC,IAAI,EAACC,IAAI,GAACN,YAAY,CAACM,IAAI,CAAC,GAAC,kBAAkB,CAAC,CAAC;IAAC,MAAMC,aAAa;MAACrC,WAAWA,CAACsC,MAAM,EAAC;QAAC,IAAI,CAACA,MAAM,GAACA,MAAM;QAAC,IAAI,CAACP,GAAG,GAACO,MAAM,GAAC,EAAE;MAAA;MAACC,QAAQA,CAACC,IAAI,EAAC;QAAC1G,OAAO,CAAC,IAAI,CAACiG,GAAG,GAAC,CAAC,IAAE,CAAC,CAAC,GAACS,IAAI;MAAA;MAACC,QAAQA,CAAA,EAAE;QAAC,OAAO3G,OAAO,CAAC,IAAI,CAACiG,GAAG,GAAC,CAAC,IAAE,CAAC,CAAC;MAAA;MAACW,cAAcA,CAACC,UAAU,EAAC;QAAC7G,OAAO,CAAC,IAAI,CAACiG,GAAG,GAAC,CAAC,IAAE,CAAC,CAAC,GAACY,UAAU;MAAA;MAACC,cAAcA,CAAA,EAAE;QAAC,OAAO9G,OAAO,CAAC,IAAI,CAACiG,GAAG,GAAC,CAAC,IAAE,CAAC,CAAC;MAAA;MAACc,UAAUA,CAACC,MAAM,EAAC;QAACA,MAAM,GAACA,MAAM,GAAC,CAAC,GAAC,CAAC;QAACrH,KAAK,CAAC,IAAI,CAACsG,GAAG,GAAC,EAAE,CAAC,GAACe,MAAM;MAAA;MAACC,UAAUA,CAAA,EAAE;QAAC,OAAOtH,KAAK,CAAC,IAAI,CAACsG,GAAG,GAAC,EAAE,CAAC,IAAE,CAAC;MAAA;MAACiB,YAAYA,CAACC,QAAQ,EAAC;QAACA,QAAQ,GAACA,QAAQ,GAAC,CAAC,GAAC,CAAC;QAACxH,KAAK,CAAC,IAAI,CAACsG,GAAG,GAAC,EAAE,CAAC,GAACkB,QAAQ;MAAA;MAACC,YAAYA,CAAA,EAAE;QAAC,OAAOzH,KAAK,CAAC,IAAI,CAACsG,GAAG,GAAC,EAAE,CAAC,IAAE,CAAC;MAAA;MAACoB,IAAIA,CAACX,IAAI,EAACG,UAAU,EAAC;QAAC,IAAI,CAACS,gBAAgB,CAAC,CAAC,CAAC;QAAC,IAAI,CAACb,QAAQ,CAACC,IAAI,CAAC;QAAC,IAAI,CAACE,cAAc,CAACC,UAAU,CAAC;MAAA;MAACS,gBAAgBA,CAACC,WAAW,EAAC;QAACvH,OAAO,CAAC,IAAI,CAACiG,GAAG,GAAC,EAAE,IAAE,CAAC,CAAC,GAACsB,WAAW;MAAA;MAACC,gBAAgBA,CAAA,EAAE;QAAC,OAAOxH,OAAO,CAAC,IAAI,CAACiG,GAAG,GAAC,EAAE,IAAE,CAAC,CAAC;MAAA;IAAC;IAAC,IAAIwB,aAAa,GAAC,CAAC;IAAC,IAAIC,sBAAsB,GAAC,CAAC;IAAC,IAAIC,YAAY,GAACA,CAAC1B,GAAG,EAACS,IAAI,EAACG,UAAU,KAAG;MAAC,IAAInD,IAAI,GAAC,IAAI6C,aAAa,CAACN,GAAG,CAAC;MAACvC,IAAI,CAAC2D,IAAI,CAACX,IAAI,EAACG,UAAU,CAAC;MAACY,aAAa,GAACxB,GAAG;MAACyB,sBAAsB,EAAE;MAAC,MAAMD,aAAa;IAAA,CAAC;IAAC,IAAIG,UAAU,GAACA,CAAA,KAAI/F,KAAK,CAAC,EAAE,CAAC;IAAC,IAAIgG,UAAU,GAACA,CAAA,KAAI,SAAS;IAAC,IAAIC,WAAW,GAACA,CAACC,IAAI,EAACC,SAAS,KAAGC,IAAI,CAACC,IAAI,CAACH,IAAI,GAACC,SAAS,CAAC,GAACA,SAAS;IAAC,IAAIG,UAAU,GAACJ,IAAI,IAAE;MAAC,IAAIK,WAAW,GAAC5H,UAAU,CAACC,MAAM,CAAC4H,UAAU;MAAC,IAAIC,KAAK,GAAC,CAACP,IAAI,GAACK,WAAW,GAAC,KAAK,IAAE,KAAK,GAAC,CAAC;MAAC,IAAG;QAAC5H,UAAU,CAAC+H,IAAI,CAACD,KAAK,CAAC;QAAChI,iBAAiB,CAAC,CAAC;QAAC,OAAO,CAAC;MAAA,CAAC,QAAMyB,CAAC,EAAC,CAAC;IAAC,CAAC;IAAC,IAAIyG,uBAAuB,GAACC,aAAa,IAAE;MAAC,IAAIC,OAAO,GAAC9I,MAAM,CAACR,MAAM;MAACqJ,aAAa,MAAI,CAAC;MAAC,IAAIE,WAAW,GAACd,UAAU,CAAC,CAAC;MAAC,IAAGY,aAAa,GAACE,WAAW,EAAC;QAAC,OAAO,KAAK;MAAA;MAAC,KAAI,IAAIC,OAAO,GAAC,CAAC,EAACA,OAAO,IAAE,CAAC,EAACA,OAAO,IAAE,CAAC,EAAC;QAAC,IAAIC,iBAAiB,GAACH,OAAO,IAAE,CAAC,GAAC,EAAE,GAACE,OAAO,CAAC;QAACC,iBAAiB,GAACZ,IAAI,CAACa,GAAG,CAACD,iBAAiB,EAACJ,aAAa,GAAC,SAAS,CAAC;QAAC,IAAIM,OAAO,GAACd,IAAI,CAACa,GAAG,CAACH,WAAW,EAACb,WAAW,CAACG,IAAI,CAACe,GAAG,CAACP,aAAa,EAACI,iBAAiB,CAAC,EAAC,KAAK,CAAC,CAAC;QAAC,IAAII,WAAW,GAACd,UAAU,CAACY,OAAO,CAAC;QAAC,IAAGE,WAAW,EAAC;UAAC,OAAO,IAAI;QAAA;MAAC;MAAC,OAAO,KAAK;IAAA,CAAC;IAAC,IAAIC,QAAQ,GAACC,KAAK,IAAE;MAAC,IAAI7C,IAAI,GAAC/I,MAAM,CAAC,GAAG,GAAC4L,KAAK,CAAC;MAAC,OAAO7C,IAAI;IAAA,CAAC;IAAC,IAAI8C,kBAAkB,GAACA,CAACC,KAAK,EAAC5I,MAAM,KAAG;MAACd,KAAK,CAAC2J,GAAG,CAACD,KAAK,EAAC5I,MAAM,CAAC;IAAA,CAAC;IAAC,IAAI8I,eAAe,GAAC9D,GAAG,IAAE;MAAC,IAAI+D,GAAG,GAAC,CAAC;MAAC,KAAI,IAAItK,CAAC,GAAC,CAAC,EAACA,CAAC,GAACuG,GAAG,CAACrG,MAAM,EAAC,EAAEF,CAAC,EAAC;QAAC,IAAIK,CAAC,GAACkG,GAAG,CAACjG,UAAU,CAACN,CAAC,CAAC;QAAC,IAAGK,CAAC,IAAE,GAAG,EAAC;UAACiK,GAAG,EAAE;QAAA,CAAC,MAAK,IAAGjK,CAAC,IAAE,IAAI,EAAC;UAACiK,GAAG,IAAE,CAAC;QAAA,CAAC,MAAK,IAAGjK,CAAC,IAAE,KAAK,IAAEA,CAAC,IAAE,KAAK,EAAC;UAACiK,GAAG,IAAE,CAAC;UAAC,EAAEtK,CAAC;QAAA,CAAC,MAAI;UAACsK,GAAG,IAAE,CAAC;QAAA;MAAC;MAAC,OAAOA,GAAG;IAAA,CAAC;IAAC,IAAIC,iBAAiB,GAACA,CAAChE,GAAG,EAACiE,IAAI,EAACC,MAAM,EAACC,eAAe,KAAG;MAAC,IAAG,EAAEA,eAAe,GAAC,CAAC,CAAC,EAAC,OAAO,CAAC;MAAC,IAAIC,QAAQ,GAACF,MAAM;MAAC,IAAIG,MAAM,GAACH,MAAM,GAACC,eAAe,GAAC,CAAC;MAAC,KAAI,IAAI1K,CAAC,GAAC,CAAC,EAACA,CAAC,GAACuG,GAAG,CAACrG,MAAM,EAAC,EAAEF,CAAC,EAAC;QAAC,IAAI6K,CAAC,GAACtE,GAAG,CAACuE,WAAW,CAAC9K,CAAC,CAAC;QAAC,IAAG6K,CAAC,IAAE,GAAG,EAAC;UAAC,IAAGJ,MAAM,IAAEG,MAAM,EAAC;UAAMJ,IAAI,CAACC,MAAM,EAAE,CAAC,GAACI,CAAC;QAAA,CAAC,MAAK,IAAGA,CAAC,IAAE,IAAI,EAAC;UAAC,IAAGJ,MAAM,GAAC,CAAC,IAAEG,MAAM,EAAC;UAAMJ,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,CAAC;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,GAAC,EAAE;QAAA,CAAC,MAAK,IAAGA,CAAC,IAAE,KAAK,EAAC;UAAC,IAAGJ,MAAM,GAAC,CAAC,IAAEG,MAAM,EAAC;UAAMJ,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,EAAE;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,CAAC,GAAC,EAAE;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,GAAC,EAAE;QAAA,CAAC,MAAI;UAAC,IAAGJ,MAAM,GAAC,CAAC,IAAEG,MAAM,EAAC;UAAMJ,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,EAAE;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,EAAE,GAAC,EAAE;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,IAAE,CAAC,GAAC,EAAE;UAACL,IAAI,CAACC,MAAM,EAAE,CAAC,GAAC,GAAG,GAACI,CAAC,GAAC,EAAE;UAAC7K,CAAC,EAAE;QAAA;MAAC;MAACwK,IAAI,CAACC,MAAM,CAAC,GAAC,CAAC;MAAC,OAAOA,MAAM,GAACE,QAAQ;IAAA,CAAC;IAAC,IAAII,YAAY,GAACA,CAACxE,GAAG,EAACyE,MAAM,EAACN,eAAe,KAAGH,iBAAiB,CAAChE,GAAG,EAAC7F,MAAM,EAACsK,MAAM,EAACN,eAAe,CAAC;IAAC,IAAIO,UAAU,GAACC,EAAE,IAAEC,wBAAwB,CAACD,EAAE,CAAC;IAAC,IAAIE,mBAAmB,GAAC7E,GAAG,IAAE;MAAC,IAAIsC,IAAI,GAACwB,eAAe,CAAC9D,GAAG,CAAC,GAAC,CAAC;MAAC,IAAI8E,GAAG,GAACJ,UAAU,CAACpC,IAAI,CAAC;MAACkC,YAAY,CAACxE,GAAG,EAAC8E,GAAG,EAACxC,IAAI,CAAC;MAAC,OAAOwC,GAAG;IAAA,CAAC;IAAC,IAAIC,KAAK,GAACA,CAACrB,KAAK,EAACsB,UAAU,EAACC,QAAQ,EAACC,IAAI,EAACC,IAAI,KAAG;MAAC,IAAIC,GAAG,GAAC;QAACC,MAAM,EAACrF,GAAG,IAAE;UAAC,IAAI8E,GAAG,GAAC,CAAC;UAAC,IAAG9E,GAAG,KAAG,IAAI,IAAEA,GAAG,KAAGsF,SAAS,IAAEtF,GAAG,KAAG,CAAC,EAAC;YAAC8E,GAAG,GAACD,mBAAmB,CAAC7E,GAAG,CAAC;UAAA;UAAC,OAAO8E,GAAG;QAAA,CAAC;QAAClB,KAAK,EAAC2B,GAAG,IAAE;UAAC,IAAIT,GAAG,GAACJ,UAAU,CAACa,GAAG,CAAC5L,MAAM,CAAC;UAACgK,kBAAkB,CAAC4B,GAAG,EAACT,GAAG,CAAC;UAAC,OAAOA,GAAG;QAAA;MAAC,CAAC;MAAC,SAASU,kBAAkBA,CAACV,GAAG,EAAC;QAAC,IAAGE,UAAU,KAAG,QAAQ,EAAC;UAAC,OAAOzE,YAAY,CAACuE,GAAG,CAAC;QAAA;QAAC,IAAGE,UAAU,KAAG,SAAS,EAAC,OAAOS,OAAO,CAACX,GAAG,CAAC;QAAC,OAAOA,GAAG;MAAA;MAAC,IAAIjE,IAAI,GAAC4C,QAAQ,CAACC,KAAK,CAAC;MAAC,IAAIgC,KAAK,GAAC,EAAE;MAAC,IAAIC,KAAK,GAAC,CAAC;MAAC,IAAGT,IAAI,EAAC;QAAC,KAAI,IAAIzL,CAAC,GAAC,CAAC,EAACA,CAAC,GAACyL,IAAI,CAACvL,MAAM,EAACF,CAAC,EAAE,EAAC;UAAC,IAAImM,SAAS,GAACR,GAAG,CAACH,QAAQ,CAACxL,CAAC,CAAC,CAAC;UAAC,IAAGmM,SAAS,EAAC;YAAC,IAAGD,KAAK,KAAG,CAAC,EAACA,KAAK,GAACzG,SAAS,CAAC,CAAC;YAACwG,KAAK,CAACjM,CAAC,CAAC,GAACmM,SAAS,CAACV,IAAI,CAACzL,CAAC,CAAC,CAAC;UAAA,CAAC,MAAI;YAACiM,KAAK,CAACjM,CAAC,CAAC,GAACyL,IAAI,CAACzL,CAAC,CAAC;UAAA;QAAC;MAAC;MAAC,IAAIqL,GAAG,GAACjE,IAAI,CAAC,GAAG6E,KAAK,CAAC;MAAC,SAASG,MAAMA,CAACf,GAAG,EAAC;QAAC,IAAGa,KAAK,KAAG,CAAC,EAAC5G,YAAY,CAAC4G,KAAK,CAAC;QAAC,OAAOH,kBAAkB,CAACV,GAAG,CAAC;MAAA;MAACA,GAAG,GAACe,MAAM,CAACf,GAAG,CAAC;MAAC,OAAOA,GAAG;IAAA,CAAC;IAAC,IAAIgB,KAAK,GAACA,CAACpC,KAAK,EAACsB,UAAU,EAACC,QAAQ,EAACE,IAAI,KAAG;MAAC,IAAIY,WAAW,GAAC,CAACd,QAAQ,IAAEA,QAAQ,CAACe,KAAK,CAAC/E,IAAI,IAAEA,IAAI,KAAG,QAAQ,IAAEA,IAAI,KAAG,SAAS,CAAC;MAAC,IAAIgF,UAAU,GAACjB,UAAU,KAAG,QAAQ;MAAC,IAAGiB,UAAU,IAAEF,WAAW,IAAE,CAACZ,IAAI,EAAC;QAAC,OAAO1B,QAAQ,CAACC,KAAK,CAAC;MAAA;MAAC,OAAM,CAAC,GAAGwB,IAAI,KAAGH,KAAK,CAACrB,KAAK,EAACsB,UAAU,EAACC,QAAQ,EAACC,IAAI,EAACC,IAAI,CAAC;IAAA,CAAC;IAAC,KAAI,IAAIe,mBAAmB,GAAC,IAAIrM,UAAU,CAAC,GAAG,CAAC,EAACJ,CAAC,GAAC,EAAE,EAACA,CAAC,IAAE,CAAC,EAAC,EAAEA,CAAC,EAAC;MAACyM,mBAAmB,CAAC,EAAE,GAACzM,CAAC,CAAC,GAAC,EAAE,GAACA,CAAC;MAACyM,mBAAmB,CAAC,EAAE,GAACzM,CAAC,CAAC,GAACA,CAAC;MAACyM,mBAAmB,CAAC,EAAE,GAACzM,CAAC,CAAC,GAAC,EAAE,GAACA,CAAC;IAAA;IAACyM,mBAAmB,CAAC,EAAE,CAAC,GAAC,EAAE;IAACA,mBAAmB,CAAC,EAAE,CAAC,GAAC,EAAE;IAAC;MAAC,IAAGpO,MAAM,CAAC,eAAe,CAAC,EAACgH,aAAa,GAAChH,MAAM,CAAC,eAAe,CAAC;MAAC,IAAGA,MAAM,CAAC,OAAO,CAAC,EAACiB,GAAG,GAACjB,MAAM,CAAC,OAAO,CAAC;MAAC,IAAGA,MAAM,CAAC,UAAU,CAAC,EAACqB,GAAG,GAACrB,MAAM,CAAC,UAAU,CAAC;MAAC,IAAGA,MAAM,CAAC,YAAY,CAAC,EAACuB,UAAU,GAACvB,MAAM,CAAC,YAAY,CAAC;MAAC,IAAGA,MAAM,CAAC,WAAW,CAAC,EAACG,UAAU,GAACH,MAAM,CAAC,WAAW,CAAC;MAAC,IAAGA,MAAM,CAAC,aAAa,CAAC,EAACI,WAAW,GAACJ,MAAM,CAAC,aAAa,CAAC;MAAC,IAAGA,MAAM,CAAC,SAAS,CAAC,EAAC;QAAC,IAAG,OAAOA,MAAM,CAAC,SAAS,CAAC,IAAE,UAAU,EAACA,MAAM,CAAC,SAAS,CAAC,GAAC,CAACA,MAAM,CAAC,SAAS,CAAC,CAAC;QAAC,OAAMA,MAAM,CAAC,SAAS,CAAC,CAAC6B,MAAM,GAAC,CAAC,EAAC;UAAC7B,MAAM,CAAC,SAAS,CAAC,CAAC8D,KAAK,CAAC,CAAC,CAAC,CAAC;QAAA;MAAC;IAAC;IAAC9D,MAAM,CAAC,OAAO,CAAC,GAACiN,KAAK;IAACjN,MAAM,CAAC,OAAO,CAAC,GAACgO,KAAK;IAAChO,MAAM,CAAC,cAAc,CAAC,GAACyI,YAAY;IAAC,IAAI4F,cAAc,EAAClH,0BAA0B,EAAC2F,wBAAwB,EAACzF,6BAA6B,EAACiH,MAAM,EAACC,yBAAyB,EAACtL,UAAU;IAAC,SAAS+C,iBAAiBA,CAAC9B,WAAW,EAAC;MAACmK,cAAc,GAACrO,MAAM,CAAC,gBAAgB,CAAC,GAACkE,WAAW,CAAC,eAAe,CAAC;MAACiD,0BAA0B,GAACjD,WAAW,CAAC,2BAA2B,CAAC;MAAC4I,wBAAwB,GAAC5I,WAAW,CAAC,yBAAyB,CAAC;MAACmD,6BAA6B,GAACnD,WAAW,CAAC,8BAA8B,CAAC;MAACoK,MAAM,GAACrL,UAAU,GAACiB,WAAW,CAAC,QAAQ,CAAC;MAACqK,yBAAyB,GAACrK,WAAW,CAAC,2BAA2B,CAAC;IAAA;IAAC,IAAIwB,WAAW,GAAC;MAAC8I,aAAa,EAAC7F,cAAc;MAAC8F,WAAW,EAACrE,YAAY;MAACsE,SAAS,EAACrE,UAAU;MAACsE,sBAAsB,EAAC1D;IAAuB,CAAC;IAAC,SAAS2D,GAAGA,CAAA,EAAE;MAAChL,MAAM,CAAC,CAAC;MAAC,SAASiL,KAAKA,CAAA,EAAE;QAAC7O,MAAM,CAAC,WAAW,CAAC,GAAC,IAAI;QAAC,IAAGwB,KAAK,EAAC;QAAOyC,WAAW,CAAC,CAAC;QAAC/B,mBAAmB,GAAGlC,MAAM,CAAC;QAACA,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC;QAACmE,OAAO,CAAC,CAAC;MAAA;MAAC,IAAGnE,MAAM,CAAC,WAAW,CAAC,EAAC;QAACA,MAAM,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC;QAAC8O,UAAU,CAAC,MAAI;UAACA,UAAU,CAAC,MAAI9O,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;UAAC6O,KAAK,CAAC,CAAC;QAAA,CAAC,EAAC,CAAC,CAAC;MAAA,CAAC,MAAI;QAACA,KAAK,CAAC,CAAC;MAAA;IAAC;IAAC,IAAI3K,WAAW;IAACA,WAAW,GAAC,MAAO0B,UAAU,CAAC,CAAE;IAACgJ,GAAG,CAAC,CAAC;IAAC,IAAG9L,kBAAkB,EAAC;MAAC/C,SAAS,GAACC,MAAM;IAAA,CAAC,MAAI;MAACD,SAAS,GAAC,IAAIqG,OAAO,CAAC,CAACC,OAAO,EAACC,MAAM,KAAG;QAACpE,mBAAmB,GAACmE,OAAO;QAAClE,kBAAkB,GAACmE,MAAM;MAAA,CAAC,CAAC;IAAA;IACj0sI;IAAC,OAAOvG,SAAS;EAAA,CAAC;AAAA,CAAC,EAAE,CAAC;AAAC,IAAG,OAAOgG,OAAO,KAAG,QAAQ,IAAE,OAAOD,MAAM,KAAG,QAAQ,EAAC;EAACA,MAAM,CAACC,OAAO,GAACvG,gBAAgB;EAACsG,MAAM,CAACC,OAAO,CAACgJ,OAAO,GAACvP,gBAAgB;AAAA,CAAC,MAAK,IAAG,OAAOwP,MAAM,KAAG,UAAU,IAAEA,MAAM,CAAC,KAAK,CAAC,EAACA,MAAM,CAAC,EAAE,EAAC,MAAIxP,gBAAgB,CAAC","ignoreList":[]}
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownNativeComponent.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownNativeComponent.d.ts
+index 1ee4eda..b415d18 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownNativeComponent.d.ts
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownNativeComponent.d.ts
+@@ -235,6 +235,7 @@ export interface MarkdownStyleInternal {
+ }
+ export interface LinkPressEvent {
+     url: string;
++    sourceType: string;
+ }
+ export interface LinkLongPressEvent {
+     url: string;
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownNativeComponent.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownNativeComponent.d.ts.map
+index 8e380e9..5f342bd 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownNativeComponent.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownNativeComponent.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"EnrichedMarkdownNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/EnrichedMarkdownNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,UAAU,EAChB,MAAM,cAAc,CAAC;AAGtB,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;CAChC;AAED,UAAU,sBAAuB,SAAQ,sBAAsB;IAC7D,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,oBAAqB,SAAQ,sBAAsB;IAC3D,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,wBAAwB;IAChC,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,wBAAwB;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,GAAG,EAAE,wBAAwB,CAAC;IAC9B,SAAS,EAAE,wBAAwB,CAAC;IACpC,OAAO,EAAE,wBAAwB,CAAC;IAClC,OAAO,EAAE,wBAAwB,CAAC;CACnC;AAED,UAAU,uBAAwB,SAAQ,sBAAsB;IAC9D,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,eAAe,EAAE,UAAU,CAAC;IAC5B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,WAAW,EAAE,wBAAwB,CAAC;CACvC;AAED,UAAU,iBAAkB,SAAQ,sBAAsB;IACxD,WAAW,EAAE,UAAU,CAAC;IACxB,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,cAAc,EAAE,YAAY,CAAC,KAAK,CAAC;IACnC,WAAW,EAAE,UAAU,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;CACjC;AAED,UAAU,6BAA6B;IACrC,OAAO,EAAE,UAAU,CAAC;IACpB,aAAa,EAAE,UAAU,CAAC;IAC1B,WAAW,EAAE,UAAU,CAAC;IACxB,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,UAAU,CAAC;IACrB,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,UAAU,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,UAAU,CAAC;IACrB,QAAQ,EAAE,UAAU,CAAC;IACrB,GAAG,EAAE,UAAU,CAAC;IAChB,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,EAAE,UAAU,CAAC;CACtB;AAED,UAAU,sBAAuB,SAAQ,sBAAsB;IAC7D,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,YAAY,EAAE,6BAA6B,CAAC;CAC7C;AAED,UAAU,iBAAiB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,iBAAiB,EAAE,YAAY,CAAC,KAAK,CAAC;IACtC,eAAe,EAAE,YAAY,CAAC,KAAK,CAAC;IACpC,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,WAAW,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;CAC9B;AAGD,UAAU,wBAAwB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,UAAU,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,gBAAgB,CAAC;CACxB;AAED,UAAU,mBAAmB;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,UAAU,qBAAqB;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,UAAU,0BAA0B;IAClC,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,iBAAiB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,UAAU,CAAC;CACzB;AAED,UAAU,kBAAkB;IAC1B,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,kBAAkB;IAC1B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,wBAAwB;IAChC,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC;CAC1B;AAED,UAAU,0BAA0B;IAClC,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,kBAAmB,SAAQ,sBAAsB;IACzD,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,UAAU,CAAC;IAClC,eAAe,EAAE,UAAU,CAAC;IAC5B,sBAAsB,EAAE,UAAU,CAAC;IACnC,qBAAqB,EAAE,UAAU,CAAC;IAClC,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,qBAAqB,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1C,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;IACxC,kBAAkB,EAAE,YAAY,CAAC,KAAK,CAAC;IACvC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,qBAAqB;IAC7B,YAAY,EAAE,UAAU,CAAC;IACzB,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,oBAAoB,EAAE,YAAY,CAAC,KAAK,CAAC;IACzC,cAAc,EAAE,UAAU,CAAC;IAC3B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,UAAU,iBAAiB;IACzB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;IAC5B,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,uBAAuB;IAC/B,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,6BAA6B;IACrC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;CAC3B;AAED,UAAU,yBAAyB;IACjC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,oBAAoB;IAC5B,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,6BAA6B,CAAC;IACzC,KAAK,EAAE,yBAAyB,CAAC;CAClC;AAED,UAAU,wBAAwB;IAChC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;CACzC;AAED,UAAU,sBAAsB;IAC9B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;CACzC;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,sBAAsB,CAAC;IAClC,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,UAAU,EAAE,uBAAuB,CAAC;IACpC,IAAI,EAAE,iBAAiB,CAAC;IACxB,SAAS,EAAE,sBAAsB,CAAC;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAChE,MAAM,EAAE,mBAAmB,CAAC;IAC5B,EAAE,EAAE,qBAAqB,CAAC;IAC1B,aAAa,EAAE,0BAA0B,CAAC;IAC1C,SAAS,EAAE,sBAAsB,CAAC;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,kBAAkB,CAAC;IAC1B,KAAK,EAAE,kBAAkB,CAAC;IAC1B,WAAW,EAAE,wBAAwB,CAAC;IACtC,aAAa,EAAE,0BAA0B,CAAC;IAC1C,KAAK,EAAE,kBAAkB,CAAC;IAC1B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,IAAI,EAAE,iBAAiB,CAAC;IACxB,UAAU,EAAE,uBAAuB,CAAC;IACpC,OAAO,EAAE,oBAAoB,CAAC;IAC9B,WAAW,EAAE,wBAAwB,CAAC;IACtC,SAAS,EAAE,sBAAsB,CAAC;IAClC,SAAS,EAAE,sBAAsB,CAAC;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,UAAU,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAG3B,2BAA2B,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,YAAY,CAAC,KAAK,CAAC;IACnC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,MAAM,WAAW,4BAA4B;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AACD,MAAM,WAAW,kCAAkC;IACjD,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,WAAW,6BAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;CACb;AACD,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AACD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;IAC7C,UAAU,EAAE,QAAQ,CAAC,kCAAkC,CAAC,CAAC;IACzD,KAAK,EAAE,QAAQ,CAAC,6BAA6B,CAAC,CAAC;IAC/C,IAAI,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;IAC7C,KAAK,EAAE,QAAQ,CAAC,6BAA6B,CAAC,CAAC;CAChD;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,uBAAuB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,0BAA0B;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAC;CAC3D;AAED,UAAU,+BAA+B;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,mBAAmB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,aAAa,EAAE,qBAAqB,CAAC;IACrC;;;OAGG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAChE;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IACxE;;;;;OAKG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAClE;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC5D;;;OAGG;IACH,mBAAmB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC;IAChF;;;;;;;OAOG;IACH,wBAAwB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACnE;;;;OAIG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAChE,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;IAC1E;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAChE;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAClE;;;OAGG;IACH,sBAAsB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjE;;;;;;;;;;;OAWG;IACH,iBAAiB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5D;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,UAAU,CAAC;IAClC;;;OAGG;IACH,SAAS,EAAE,iBAAiB,CAAC;IAC7B,sEAAsE;IACtE,KAAK,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAChD;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3D;;;;;;;OAOG;IACH,qBAAqB,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3C;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC/D;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9D;;OAEG;IACH,eAAe,CAAC,EAAE,uBAAuB,CAAC;IAC1C;;;;;OAKG;IACH,cAAc,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAE/D;;OAEG;IACH,gBAAgB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAClE;;OAEG;IACH,mBAAmB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC1E,yEAAyE;IACzE,eAAe,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACnE,qFAAqF;IACrF,eAAe,CAAC,EAAE,QAAQ,CAAC;QACzB,IAAI,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QACpC,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;KAC3C,CAAC,CAAC;IACH,qFAAqF;IACrF,oBAAoB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC3E,0BAA0B,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,+BAA+B,CAAC,CAAC;IAChG;;OAEG;IACH,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IACnD,mBAAmB,EAAE,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IACxD;;;OAGG;IACH,sBAAsB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;IACxF;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpE;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChE;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACpE;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAChE;;;OAGG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1D;;AAED,wBAEG"}
+\ No newline at end of file
++{"version":3,"file":"EnrichedMarkdownNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/EnrichedMarkdownNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,UAAU,EAChB,MAAM,cAAc,CAAC;AAGtB,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;CAChC;AAED,UAAU,sBAAuB,SAAQ,sBAAsB;IAC7D,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,oBAAqB,SAAQ,sBAAsB;IAC3D,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,wBAAwB;IAChC,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,wBAAwB;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,GAAG,EAAE,wBAAwB,CAAC;IAC9B,SAAS,EAAE,wBAAwB,CAAC;IACpC,OAAO,EAAE,wBAAwB,CAAC;IAClC,OAAO,EAAE,wBAAwB,CAAC;CACnC;AAED,UAAU,uBAAwB,SAAQ,sBAAsB;IAC9D,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,eAAe,EAAE,UAAU,CAAC;IAC5B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,WAAW,EAAE,wBAAwB,CAAC;CACvC;AAED,UAAU,iBAAkB,SAAQ,sBAAsB;IACxD,WAAW,EAAE,UAAU,CAAC;IACxB,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,cAAc,EAAE,YAAY,CAAC,KAAK,CAAC;IACnC,WAAW,EAAE,UAAU,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;CACjC;AAED,UAAU,6BAA6B;IACrC,OAAO,EAAE,UAAU,CAAC;IACpB,aAAa,EAAE,UAAU,CAAC;IAC1B,WAAW,EAAE,UAAU,CAAC;IACxB,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,UAAU,CAAC;IACrB,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,UAAU,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,UAAU,CAAC;IACrB,QAAQ,EAAE,UAAU,CAAC;IACrB,GAAG,EAAE,UAAU,CAAC;IAChB,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,EAAE,UAAU,CAAC;CACtB;AAED,UAAU,sBAAuB,SAAQ,sBAAsB;IAC7D,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,YAAY,EAAE,6BAA6B,CAAC;CAC7C;AAED,UAAU,iBAAiB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,iBAAiB,EAAE,YAAY,CAAC,KAAK,CAAC;IACtC,eAAe,EAAE,YAAY,CAAC,KAAK,CAAC;IACpC,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,WAAW,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;CAC9B;AAGD,UAAU,wBAAwB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,UAAU,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,gBAAgB,CAAC;CACxB;AAED,UAAU,mBAAmB;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,UAAU,qBAAqB;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,UAAU,0BAA0B;IAClC,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,iBAAiB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,UAAU,CAAC;CACzB;AAED,UAAU,kBAAkB;IAC1B,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,kBAAkB;IAC1B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,wBAAwB;IAChC,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC;CAC1B;AAED,UAAU,0BAA0B;IAClC,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,kBAAmB,SAAQ,sBAAsB;IACzD,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,UAAU,CAAC;IAClC,eAAe,EAAE,UAAU,CAAC;IAC5B,sBAAsB,EAAE,UAAU,CAAC;IACnC,qBAAqB,EAAE,UAAU,CAAC;IAClC,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,qBAAqB,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1C,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;IACxC,kBAAkB,EAAE,YAAY,CAAC,KAAK,CAAC;IACvC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,qBAAqB;IAC7B,YAAY,EAAE,UAAU,CAAC;IACzB,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,oBAAoB,EAAE,YAAY,CAAC,KAAK,CAAC;IACzC,cAAc,EAAE,UAAU,CAAC;IAC3B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,UAAU,iBAAiB;IACzB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;IAC5B,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,uBAAuB;IAC/B,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,6BAA6B;IACrC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;CAC3B;AAED,UAAU,yBAAyB;IACjC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,oBAAoB;IAC5B,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,6BAA6B,CAAC;IACzC,KAAK,EAAE,yBAAyB,CAAC;CAClC;AAED,UAAU,wBAAwB;IAChC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;CACzC;AAED,UAAU,sBAAsB;IAC9B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;CACzC;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,sBAAsB,CAAC;IAClC,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,UAAU,EAAE,uBAAuB,CAAC;IACpC,IAAI,EAAE,iBAAiB,CAAC;IACxB,SAAS,EAAE,sBAAsB,CAAC;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAChE,MAAM,EAAE,mBAAmB,CAAC;IAC5B,EAAE,EAAE,qBAAqB,CAAC;IAC1B,aAAa,EAAE,0BAA0B,CAAC;IAC1C,SAAS,EAAE,sBAAsB,CAAC;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,kBAAkB,CAAC;IAC1B,KAAK,EAAE,kBAAkB,CAAC;IAC1B,WAAW,EAAE,wBAAwB,CAAC;IACtC,aAAa,EAAE,0BAA0B,CAAC;IAC1C,KAAK,EAAE,kBAAkB,CAAC;IAC1B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,IAAI,EAAE,iBAAiB,CAAC;IACxB,UAAU,EAAE,uBAAuB,CAAC;IACpC,OAAO,EAAE,oBAAoB,CAAC;IAC9B,WAAW,EAAE,wBAAwB,CAAC;IACtC,SAAS,EAAE,sBAAsB,CAAC;IAClC,SAAS,EAAE,sBAAsB,CAAC;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,UAAU,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAG3B,2BAA2B,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,YAAY,CAAC,KAAK,CAAC;IACnC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,MAAM,WAAW,4BAA4B;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AACD,MAAM,WAAW,kCAAkC;IACjD,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,WAAW,6BAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;CACb;AACD,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AACD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;IAC7C,UAAU,EAAE,QAAQ,CAAC,kCAAkC,CAAC,CAAC;IACzD,KAAK,EAAE,QAAQ,CAAC,6BAA6B,CAAC,CAAC;IAC/C,IAAI,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;IAC7C,KAAK,EAAE,QAAQ,CAAC,6BAA6B,CAAC,CAAC;CAChD;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,uBAAuB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,0BAA0B;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAC;CAC3D;AAED,UAAU,+BAA+B;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,mBAAmB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,aAAa,EAAE,qBAAqB,CAAC;IACrC;;;OAGG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAChE;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IACxE;;;;;OAKG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAClE;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC5D;;;OAGG;IACH,mBAAmB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC;IAChF;;;;;;;OAOG;IACH,wBAAwB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACnE;;;;OAIG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAChE,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;IAC1E;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAChE;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAClE;;;OAGG;IACH,sBAAsB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjE;;;;;;;;;;;OAWG;IACH,iBAAiB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5D;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,UAAU,CAAC;IAClC;;;OAGG;IACH,SAAS,EAAE,iBAAiB,CAAC;IAC7B,sEAAsE;IACtE,KAAK,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAChD;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3D;;;;;;;OAOG;IACH,qBAAqB,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3C;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC/D;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9D;;OAEG;IACH,eAAe,CAAC,EAAE,uBAAuB,CAAC;IAC1C;;;;;OAKG;IACH,cAAc,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAE/D;;OAEG;IACH,gBAAgB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAClE;;OAEG;IACH,mBAAmB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC1E,yEAAyE;IACzE,eAAe,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACnE,qFAAqF;IACrF,eAAe,CAAC,EAAE,QAAQ,CAAC;QACzB,IAAI,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QACpC,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;KAC3C,CAAC,CAAC;IACH,qFAAqF;IACrF,oBAAoB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC3E,0BAA0B,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,+BAA+B,CAAC,CAAC;IAChG;;OAEG;IACH,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IACnD,mBAAmB,EAAE,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IACxD;;;OAGG;IACH,sBAAsB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;IACxF;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpE;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChE;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACpE;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAChE;;;OAGG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1D;;AAED,wBAEG"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownTextNativeComponent.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownTextNativeComponent.d.ts
+index bcde9a7..247d757 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownTextNativeComponent.d.ts
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownTextNativeComponent.d.ts
+@@ -235,6 +235,7 @@ export interface MarkdownStyleInternal {
+ }
+ export interface LinkPressEvent {
+     url: string;
++    sourceType: string;
+ }
+ export interface LinkLongPressEvent {
+     url: string;
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownTextNativeComponent.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownTextNativeComponent.d.ts.map
+index b4a4797..29bab7c 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownTextNativeComponent.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/EnrichedMarkdownTextNativeComponent.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"EnrichedMarkdownTextNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/EnrichedMarkdownTextNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,UAAU,EAChB,MAAM,cAAc,CAAC;AAGtB,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;CAChC;AAED,UAAU,sBAAuB,SAAQ,sBAAsB;IAC7D,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,oBAAqB,SAAQ,sBAAsB;IAC3D,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,wBAAwB;IAChC,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,wBAAwB;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,GAAG,EAAE,wBAAwB,CAAC;IAC9B,SAAS,EAAE,wBAAwB,CAAC;IACpC,OAAO,EAAE,wBAAwB,CAAC;IAClC,OAAO,EAAE,wBAAwB,CAAC;CACnC;AAED,UAAU,uBAAwB,SAAQ,sBAAsB;IAC9D,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,eAAe,EAAE,UAAU,CAAC;IAC5B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,WAAW,EAAE,wBAAwB,CAAC;CACvC;AAED,UAAU,iBAAkB,SAAQ,sBAAsB;IACxD,WAAW,EAAE,UAAU,CAAC;IACxB,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,cAAc,EAAE,YAAY,CAAC,KAAK,CAAC;IACnC,WAAW,EAAE,UAAU,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;CACjC;AAED,UAAU,6BAA6B;IACrC,OAAO,EAAE,UAAU,CAAC;IACpB,aAAa,EAAE,UAAU,CAAC;IAC1B,WAAW,EAAE,UAAU,CAAC;IACxB,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,UAAU,CAAC;IACrB,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,UAAU,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,UAAU,CAAC;IACrB,QAAQ,EAAE,UAAU,CAAC;IACrB,GAAG,EAAE,UAAU,CAAC;IAChB,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,EAAE,UAAU,CAAC;CACtB;AAED,UAAU,sBAAuB,SAAQ,sBAAsB;IAC7D,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,YAAY,EAAE,6BAA6B,CAAC;CAC7C;AAED,UAAU,iBAAiB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,iBAAiB,EAAE,YAAY,CAAC,KAAK,CAAC;IACtC,eAAe,EAAE,YAAY,CAAC,KAAK,CAAC;IACpC,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,WAAW,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;CAC9B;AAGD,UAAU,wBAAwB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,UAAU,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,gBAAgB,CAAC;CACxB;AAED,UAAU,mBAAmB;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,UAAU,qBAAqB;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,UAAU,0BAA0B;IAClC,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,iBAAiB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,UAAU,CAAC;CACzB;AAED,UAAU,kBAAkB;IAC1B,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAEhC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,kBAAkB;IAC1B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,wBAAwB;IAChC,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC;CAC1B;AAED,UAAU,0BAA0B;IAClC,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,kBAAmB,SAAQ,sBAAsB;IACzD,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,UAAU,CAAC;IAClC,eAAe,EAAE,UAAU,CAAC;IAC5B,sBAAsB,EAAE,UAAU,CAAC;IACnC,qBAAqB,EAAE,UAAU,CAAC;IAClC,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,qBAAqB,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1C,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;IACxC,kBAAkB,EAAE,YAAY,CAAC,KAAK,CAAC;IACvC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,qBAAqB;IAC7B,YAAY,EAAE,UAAU,CAAC;IACzB,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,oBAAoB,EAAE,YAAY,CAAC,KAAK,CAAC;IACzC,cAAc,EAAE,UAAU,CAAC;IAC3B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,UAAU,iBAAiB;IACzB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;IAC5B,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,uBAAuB;IAC/B,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,6BAA6B;IACrC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;CAC3B;AAED,UAAU,yBAAyB;IACjC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,oBAAoB;IAC5B,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,6BAA6B,CAAC;IACzC,KAAK,EAAE,yBAAyB,CAAC;CAClC;AAED,UAAU,wBAAwB;IAChC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;CACzC;AAED,UAAU,sBAAsB;IAC9B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;CACzC;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,sBAAsB,CAAC;IAClC,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,UAAU,EAAE,uBAAuB,CAAC;IACpC,IAAI,EAAE,iBAAiB,CAAC;IACxB,SAAS,EAAE,sBAAsB,CAAC;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAChE,MAAM,EAAE,mBAAmB,CAAC;IAC5B,EAAE,EAAE,qBAAqB,CAAC;IAC1B,aAAa,EAAE,0BAA0B,CAAC;IAC1C,SAAS,EAAE,sBAAsB,CAAC;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,kBAAkB,CAAC;IAC1B,KAAK,EAAE,kBAAkB,CAAC;IAC1B,WAAW,EAAE,wBAAwB,CAAC;IACtC,aAAa,EAAE,0BAA0B,CAAC;IAC1C,KAAK,EAAE,kBAAkB,CAAC;IAC1B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,IAAI,EAAE,iBAAiB,CAAC;IACxB,UAAU,EAAE,uBAAuB,CAAC;IACpC,OAAO,EAAE,oBAAoB,CAAC;IAC9B,WAAW,EAAE,wBAAwB,CAAC;IACtC,SAAS,EAAE,sBAAsB,CAAC;IAClC,SAAS,EAAE,sBAAsB,CAAC;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,UAAU,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAG3B,2BAA2B,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,YAAY,CAAC,KAAK,CAAC;IACnC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,MAAM,WAAW,4BAA4B;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AACD,MAAM,WAAW,kCAAkC;IACjD,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,WAAW,6BAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;CACb;AACD,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AACD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;IAC7C,UAAU,EAAE,QAAQ,CAAC,kCAAkC,CAAC,CAAC;IACzD,KAAK,EAAE,QAAQ,CAAC,6BAA6B,CAAC,CAAC;IAC/C,IAAI,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;IAC7C,KAAK,EAAE,QAAQ,CAAC,6BAA6B,CAAC,CAAC;CAChD;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,uBAAuB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,0BAA0B;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAC;CAC3D;AAED,UAAU,+BAA+B;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,mBAAmB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,aAAa,EAAE,qBAAqB,CAAC;IACrC;;;OAGG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAChE;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IACxE;;;;;OAKG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAClE;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC5D;;;OAGG;IACH,mBAAmB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC;IAChF;;;;;;;OAOG;IACH,wBAAwB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACnE;;;;OAIG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAChE,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;IAC1E;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAChE;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAClE;;;OAGG;IACH,sBAAsB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjE;;;;;;;;;;;OAWG;IACH,iBAAiB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5D;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,UAAU,CAAC;IAClC;;;OAGG;IACH,SAAS,EAAE,iBAAiB,CAAC;IAC7B,sEAAsE;IACtE,KAAK,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3D;;;;;;;OAOG;IACH,qBAAqB,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3C;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC/D;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9D;;OAEG;IACH,eAAe,CAAC,EAAE,uBAAuB,CAAC;IAC1C;;;;;OAKG;IACH,cAAc,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC/D;;OAEG;IACH,gBAAgB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAClE;;OAEG;IACH,mBAAmB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC1E,yEAAyE;IACzE,eAAe,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACnE,qFAAqF;IACrF,eAAe,CAAC,EAAE,QAAQ,CAAC;QACzB,IAAI,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QACpC,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;KAC3C,CAAC,CAAC;IACH,qFAAqF;IACrF,oBAAoB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC3E,0BAA0B,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,+BAA+B,CAAC,CAAC;IAChG;;OAEG;IACH,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IACnD,mBAAmB,EAAE,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IACxD;;;OAGG;IACH,sBAAsB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;IACxF;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpE;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChE;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACpE;;;;;;;;OAQG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAChE;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1D;;AAED,wBAEG"}
+\ No newline at end of file
++{"version":3,"file":"EnrichedMarkdownTextNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/EnrichedMarkdownTextNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,UAAU,EAChB,MAAM,cAAc,CAAC;AAGtB,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;CAChC;AAED,UAAU,sBAAuB,SAAQ,sBAAsB;IAC7D,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,oBAAqB,SAAQ,sBAAsB;IAC3D,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,wBAAwB;IAChC,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,wBAAwB;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,GAAG,EAAE,wBAAwB,CAAC;IAC9B,SAAS,EAAE,wBAAwB,CAAC;IACpC,OAAO,EAAE,wBAAwB,CAAC;IAClC,OAAO,EAAE,wBAAwB,CAAC;CACnC;AAED,UAAU,uBAAwB,SAAQ,sBAAsB;IAC9D,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,eAAe,EAAE,UAAU,CAAC;IAC5B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,WAAW,EAAE,wBAAwB,CAAC;CACvC;AAED,UAAU,iBAAkB,SAAQ,sBAAsB;IACxD,WAAW,EAAE,UAAU,CAAC;IACxB,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,cAAc,EAAE,YAAY,CAAC,KAAK,CAAC;IACnC,WAAW,EAAE,UAAU,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;CACjC;AAED,UAAU,6BAA6B;IACrC,OAAO,EAAE,UAAU,CAAC;IACpB,aAAa,EAAE,UAAU,CAAC;IAC1B,WAAW,EAAE,UAAU,CAAC;IACxB,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,UAAU,CAAC;IACrB,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,UAAU,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,UAAU,CAAC;IACrB,QAAQ,EAAE,UAAU,CAAC;IACrB,GAAG,EAAE,UAAU,CAAC;IAChB,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,EAAE,UAAU,CAAC;CACtB;AAED,UAAU,sBAAuB,SAAQ,sBAAsB;IAC7D,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,YAAY,EAAE,6BAA6B,CAAC;CAC7C;AAED,UAAU,iBAAiB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,iBAAiB,EAAE,YAAY,CAAC,KAAK,CAAC;IACtC,eAAe,EAAE,YAAY,CAAC,KAAK,CAAC;IACpC,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;IAC/B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,WAAW,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;CAC9B;AAGD,UAAU,wBAAwB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,UAAU,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,gBAAgB,CAAC;CACxB;AAED,UAAU,mBAAmB;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,UAAU,qBAAqB;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,UAAU,0BAA0B;IAClC,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,iBAAiB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,UAAU,CAAC;CACzB;AAED,UAAU,kBAAkB;IAC1B,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAEhC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,kBAAkB;IAC1B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,UAAU,wBAAwB;IAChC,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC;CAC1B;AAED,UAAU,0BAA0B;IAClC,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,kBAAmB,SAAQ,sBAAsB;IACzD,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,UAAU,CAAC;IAClC,eAAe,EAAE,UAAU,CAAC;IAC5B,sBAAsB,EAAE,UAAU,CAAC;IACnC,qBAAqB,EAAE,UAAU,CAAC;IAClC,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,qBAAqB,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1C,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;IACxC,kBAAkB,EAAE,YAAY,CAAC,KAAK,CAAC;IACvC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,qBAAqB;IAC7B,YAAY,EAAE,UAAU,CAAC;IACzB,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,oBAAoB,EAAE,YAAY,CAAC,KAAK,CAAC;IACzC,cAAc,EAAE,UAAU,CAAC;IAC3B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,UAAU,iBAAiB;IACzB,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;IAC7B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;IAC5B,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,uBAAuB;IAC/B,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,6BAA6B;IACrC,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;IAC5B,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;CAC3B;AAED,UAAU,yBAAyB;IACjC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,UAAU,oBAAoB;IAC5B,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,6BAA6B,CAAC;IACzC,KAAK,EAAE,yBAAyB,CAAC;CAClC;AAED,UAAU,wBAAwB;IAChC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;CACzC;AAED,UAAU,sBAAsB;IAC9B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;IAC9B,mBAAmB,EAAE,YAAY,CAAC,KAAK,CAAC;CACzC;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,sBAAsB,CAAC;IAClC,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,EAAE,EAAE,oBAAoB,CAAC;IACzB,UAAU,EAAE,uBAAuB,CAAC;IACpC,IAAI,EAAE,iBAAiB,CAAC;IACxB,SAAS,EAAE,sBAAsB,CAAC;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAChE,MAAM,EAAE,mBAAmB,CAAC;IAC5B,EAAE,EAAE,qBAAqB,CAAC;IAC1B,aAAa,EAAE,0BAA0B,CAAC;IAC1C,SAAS,EAAE,sBAAsB,CAAC;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,kBAAkB,CAAC;IAC1B,KAAK,EAAE,kBAAkB,CAAC;IAC1B,WAAW,EAAE,wBAAwB,CAAC;IACtC,aAAa,EAAE,0BAA0B,CAAC;IAC1C,KAAK,EAAE,kBAAkB,CAAC;IAC1B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,IAAI,EAAE,iBAAiB,CAAC;IACxB,UAAU,EAAE,uBAAuB,CAAC;IACpC,OAAO,EAAE,oBAAoB,CAAC;IAC9B,WAAW,EAAE,wBAAwB,CAAC;IACtC,SAAS,EAAE,sBAAsB,CAAC;IAClC,SAAS,EAAE,sBAAsB,CAAC;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,UAAU,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAG3B,2BAA2B,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,YAAY,CAAC,KAAK,CAAC;IACnC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC;CAClC;AAED,MAAM,WAAW,4BAA4B;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AACD,MAAM,WAAW,kCAAkC;IACjD,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,WAAW,6BAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;CACb;AACD,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AACD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;IAC7C,UAAU,EAAE,QAAQ,CAAC,kCAAkC,CAAC,CAAC;IACzD,KAAK,EAAE,QAAQ,CAAC,6BAA6B,CAAC,CAAC;IAC/C,IAAI,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;IAC7C,KAAK,EAAE,QAAQ,CAAC,6BAA6B,CAAC,CAAC;CAChD;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,uBAAuB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,0BAA0B;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAC;CAC3D;AAED,UAAU,+BAA+B;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,mBAAmB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,aAAa,EAAE,qBAAqB,CAAC;IACrC;;;OAGG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAChE;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IACxE;;;;;OAKG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAClE;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC5D;;;OAGG;IACH,mBAAmB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC;IAChF;;;;;;;OAOG;IACH,wBAAwB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACnE;;;;OAIG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAChE,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;IAC1E;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAChE;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAClE;;;OAGG;IACH,sBAAsB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjE;;;;;;;;;;;OAWG;IACH,iBAAiB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5D;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,UAAU,CAAC;IAClC;;;OAGG;IACH,SAAS,EAAE,iBAAiB,CAAC;IAC7B,sEAAsE;IACtE,KAAK,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3D;;;;;;;OAOG;IACH,qBAAqB,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3C;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC/D;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9D;;OAEG;IACH,eAAe,CAAC,EAAE,uBAAuB,CAAC;IAC1C;;;;;OAKG;IACH,cAAc,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC/D;;OAEG;IACH,gBAAgB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAClE;;OAEG;IACH,mBAAmB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC1E,yEAAyE;IACzE,eAAe,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACnE,qFAAqF;IACrF,eAAe,CAAC,EAAE,QAAQ,CAAC;QACzB,IAAI,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QACpC,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;KAC3C,CAAC,CAAC;IACH,qFAAqF;IACrF,oBAAoB,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC3E,0BAA0B,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,+BAA+B,CAAC,CAAC;IAChG;;OAEG;IACH,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IACnD,mBAAmB,EAAE,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IACxD;;;OAGG;IACH,sBAAsB,CAAC,EAAE,YAAY,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;IACxF;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpE;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChE;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACpE;;;;;;;;OAQG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAChE;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1D;;AAED,wBAEG"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/index.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/index.d.ts.map
+index aaeab3f..6c2cbe8 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/index.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/index.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC7E,YAAY,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,YAAY,EACV,mBAAmB,EACnB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAChF,YAAY,EACV,yBAAyB,EACzB,eAAe,EACf,aAAa,EACb,SAAS,EACT,eAAe,IAAI,mBAAmB,EACtC,mBAAmB,IAAI,uBAAuB,EAC9C,yBAAyB,IAAI,6BAA6B,GAC3D,MAAM,+BAA+B,CAAC;AACvC,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,mBAAmB,EACnB,2BAA2B,GAC5B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,YAAY,EACV,8BAA8B,EAC9B,iCAAiC,EACjC,sBAAsB,EACtB,UAAU,EACV,eAAe,EACf,wBAAwB,EACxB,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACpB,iBAAiB,EACjB,SAAS,EACT,YAAY,EACZ,YAAY,GACb,MAAM,6BAA6B,CAAC"}
+\ No newline at end of file
++{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,YAAY,EACV,iBAAiB,EACjB,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC7E,YAAY,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,YAAY,EACV,mBAAmB,EACnB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAChF,YAAY,EACV,yBAAyB,EACzB,eAAe,EACf,aAAa,EACb,SAAS,EACT,eAAe,IAAI,mBAAmB,EACtC,mBAAmB,IAAI,uBAAuB,EAC9C,yBAAyB,IAAI,6BAA6B,GAC3D,MAAM,+BAA+B,CAAC;AACvC,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,mBAAmB,EACnB,2BAA2B,GAC5B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,YAAY,EACV,8BAA8B,EAC9B,iCAAiC,EACjC,sBAAsB,EACtB,UAAU,EACV,eAAe,EACf,wBAAwB,EACxB,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACpB,iBAAiB,EACjB,SAAS,EACT,YAAY,EACZ,YAAY,GACb,MAAM,6BAA6B,CAAC"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/index.web.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/index.web.d.ts.map
+index ad425ad..c3403c8 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/index.web.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/index.web.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../../src/index.web.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC3E,YAAY,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC/E,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACtE,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,mBAAmB,GACpB,MAAM,gBAAgB,CAAC"}
+\ No newline at end of file
++{"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../../src/index.web.tsx"],"names":[],"mappings":"AAAA,YAAY,EACV,iBAAiB,EACjB,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC3E,YAAY,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC/E,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACtE,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,mBAAmB,GACpB,MAAM,gBAAgB,CAAC"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/native/EnrichedMarkdownText.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/native/EnrichedMarkdownText.d.ts
+index 3835048..1fcf936 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/native/EnrichedMarkdownText.d.ts
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/native/EnrichedMarkdownText.d.ts
+@@ -4,6 +4,6 @@ import type { LinkPressEvent, LinkLongPressEvent, ImagePressEvent, TaskListItemP
+ export type { MarkdownStyle, Md4cFlags };
+ export type { EnrichedMarkdownTextProps, StreamingConfig, ContextMenuItem, SelectionMenuConfig, SelectionMenuPluralLabels, };
+ export type { LinkPressEvent, LinkLongPressEvent, ImagePressEvent, TaskListItemPressEvent, CopyPressEvent, LatexErrorEvent, CodeBlockPressEvent, };
+-export declare const EnrichedMarkdownText: ({ markdown, markdownStyle, containerStyle, onLinkPress, onLinkLongPress, onImagePress, onTaskListItemPress, enableTaskListItemToggle, onCopyPress, onLatexError, onCodeBlockPress, enableBlockContextMenu, enableLinkPreview, selectable, md4cFlags, allowFontScaling, maxFontSizeMultiplier, allowTrailingMargin, flavor, streamingAnimation, streamingConfig, spoilerOverlay, contextMenuItems, linkContextMenuItems, imageRequestHeaders, linkPillContent, linkRecognition, selectionMenuConfig, accessibilityLabels, selectionColor, selectionHandleColor, textBreakStrategy, lineBreakStrategyIOS, writingDirection, numberOfLines, ellipsizeMode, ...rest }: EnrichedMarkdownTextProps) => import("react/jsx-runtime").JSX.Element;
++export declare const EnrichedMarkdownText: ({ markdown, markdownStyle, containerStyle, onLinkPress, onLinkLongPress, onImagePress, onTaskListItemPress, enableTaskListItemToggle, onCopyPress, onLatexError, onCodeBlockPress, enableBlockContextMenu, enableLinkPreview, selectable, md4cFlags, allowFontScaling, maxFontSizeMultiplier, allowTrailingMargin, flavor, streamingAnimation, streamingConfig, spoilerOverlay, contextMenuItems, linkContextMenuItems, imageRequestHeaders, linkPillContent, linkRecognition, selectionMenuConfig, accessibilityLabels, selectionColor, selectionHandleColor, textBreakStrategy, lineBreakStrategyIOS, writingDirection, numberOfLines, ellipsizeMode, renderers: _renderers, ...rest }: EnrichedMarkdownTextProps) => import("react/jsx-runtime").JSX.Element;
+ export default EnrichedMarkdownText;
+ //# sourceMappingURL=EnrichedMarkdownText.d.ts.map
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/native/EnrichedMarkdownText.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/native/EnrichedMarkdownText.d.ts.map
+index 343249e..5ee0474 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/native/EnrichedMarkdownText.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/native/EnrichedMarkdownText.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"EnrichedMarkdownText.d.ts","sourceRoot":"","sources":["../../../../src/native/EnrichedMarkdownText.tsx"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,KAAK,EACV,yBAAyB,EACzB,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EAC1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,mBAAmB,EAGpB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC;AACzC,YAAY,EACV,yBAAyB,EACzB,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,yBAAyB,GAC1B,CAAC;AACF,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,mBAAmB,GACpB,CAAC;AA0EF,eAAO,MAAM,oBAAoB,GAAI,moBAsClC,yBAAyB,4CAgS3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+\ No newline at end of file
++{"version":3,"file":"EnrichedMarkdownText.d.ts","sourceRoot":"","sources":["../../../../src/native/EnrichedMarkdownText.tsx"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,KAAK,EACV,yBAAyB,EACzB,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EAC1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,mBAAmB,EAGpB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC;AACzC,YAAY,EACV,yBAAyB,EACzB,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,yBAAyB,GAC1B,CAAC;AACF,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,mBAAmB,GACpB,CAAC;AA0EF,eAAO,MAAM,oBAAoB,GAAI,0pBAuClC,yBAAyB,4CAmS3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.d.ts
+index afc9af3..f2bae28 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.d.ts
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.d.ts
+@@ -1,3 +1,4 @@
++import type { MarkdownRenderers } from './MarkdownRenderers';
+ import type { ColorValue, ViewProps, ViewStyle, TextStyle } from 'react-native';
+ import type { MarkdownStyle, Md4cFlags } from './MarkdownStyle';
+ import type { AccessibilityLabels } from './AccessibilityLabels';
+@@ -146,6 +147,8 @@ export interface EnrichedMarkdownTextProps extends Omit<ViewProps, 'style'> {
+      * @platform ios, android, web
+      */
+     markdown: string;
++    /** Custom block components. Ignored on native. @platform web */
++    renderers?: MarkdownRenderers;
+     /**
+      * Style configuration for markdown elements.
+      * @platform ios, android, web
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.d.ts.map
+index fb1e2eb..e80d931 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"MarkdownTextProps.d.ts","sourceRoot":"","sources":["../../../../src/types/MarkdownTextProps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,mBAAmB,EACpB,MAAM,UAAU,CAAC;AAElB,6DAA6D;AAC7D,MAAM,WAAW,eAAe;IAC9B,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,gDAAgD;IAChD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;CAC1C;AAED;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,KAAK,EAAE;QACf,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;KAC3C,KAAK,IAAI,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B;;;OAGG;IACH,cAAc,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD;;;;;OAKG;IACH,YAAY,CAAC,EAAE;QACb,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,yBAAyB,CAAC;KAC1C,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;IACrC;;;;;;;;;;OAUG;IACH,aAAa,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;CAC1C;AAED,MAAM,WAAW,yBAA0B,SAAQ,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;IACzE;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;OAGG;IACH,cAAc,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IACvC;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACtD;;;;;;;;;;;;;;OAcG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAChD;;;;;;;;;OASG;IACH,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC9D;;;;;;;;;;;OAWG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C;;;;;;;;;;;;;;;;OAgBG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAChD;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACxD;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;;;;;;;;;;;;OAaG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,UAAU,CAAC;IAClC;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;;;;OAQG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,YAAY,GAAG,QAAQ,CAAC;IACjC;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;;OAIG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;;;;;;;;OASG;IACH,cAAc,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;IACvC;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IACrC;;;;;;;;;;;;;;;OAeG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAC7D;;;;;;;;;;OAUG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C;;;;;;;;;;OAUG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAClD;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C;;;;;;;OAOG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C;;;;;OAKG;IACH,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC7B;;;;;;;;;;OAUG;IACH,iBAAiB,CAAC,EAAE,QAAQ,GAAG,aAAa,GAAG,UAAU,CAAC;IAC1D;;;;;;;;OAQG;IACH,oBAAoB,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,aAAa,GAAG,UAAU,CAAC;IACxE;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,cAAc,CAAC;IAC3D;;;;;;;;;;;;;;;OAeG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;;;;;;;OAaG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;CACrD"}
+\ No newline at end of file
++{"version":3,"file":"MarkdownTextProps.d.ts","sourceRoot":"","sources":["../../../../src/types/MarkdownTextProps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,mBAAmB,EACpB,MAAM,UAAU,CAAC;AAElB,6DAA6D;AAC7D,MAAM,WAAW,eAAe;IAC9B,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,gDAAgD;IAChD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;CAC1C;AAED;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,KAAK,EAAE;QACf,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;KAC3C,KAAK,IAAI,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B;;;OAGG;IACH,cAAc,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD;;;;;OAKG;IACH,YAAY,CAAC,EAAE;QACb,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,yBAAyB,CAAC;KAC1C,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;IACrC;;;;;;;;;;OAUG;IACH,aAAa,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;CAC1C;AAED,MAAM,WAAW,yBAA0B,SAAQ,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;IACzE;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B;;;OAGG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;OAGG;IACH,cAAc,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IACvC;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACtD;;;;;;;;;;;;;;OAcG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAChD;;;;;;;;;OASG;IACH,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC9D;;;;;;;;;;;OAWG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C;;;;;;;;;;;;;;;;OAgBG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAChD;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACxD;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;;;;;;;;;;;;OAaG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,UAAU,CAAC;IAClC;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;;;;OAQG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,YAAY,GAAG,QAAQ,CAAC;IACjC;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;;OAIG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;;;;;;;;OASG;IACH,cAAc,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;IACvC;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IACrC;;;;;;;;;;;;;;;OAeG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAC7D;;;;;;;;;;OAUG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C;;;;;;;;;;OAUG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAClD;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C;;;;;;;OAOG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C;;;;;OAKG;IACH,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC7B;;;;;;;;;;OAUG;IACH,iBAAiB,CAAC,EAAE,QAAQ,GAAG,aAAa,GAAG,UAAU,CAAC;IAC1D;;;;;;;;OAQG;IACH,oBAAoB,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,aAAa,GAAG,UAAU,CAAC;IACxE;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,cAAc,CAAC;IAC3D;;;;;;;;;;;;;;;OAeG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;;;;;;;OAaG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;CACrD"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.web.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.web.d.ts
+index 19b0d0d..7537e44 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.web.d.ts
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.web.d.ts
+@@ -1,3 +1,4 @@
++import type { MarkdownRenderers } from './MarkdownRenderers';
+ import type { LinkRecognition } from './MarkdownTextProps';
+ import type { CSSProperties, HTMLAttributes } from 'react';
+ import type { MarkdownStyle, Md4cFlags } from './MarkdownStyle';
+@@ -13,6 +14,8 @@ export interface EnrichedMarkdownTextProps extends Omit<HTMLAttributes<HTMLDivEl
+      * @platform ios, android, web
+      */
+     markdown: string;
++    /** Custom block components. Ignored on native. @platform web */
++    renderers?: MarkdownRenderers;
+     /**
+      * Style configuration for markdown elements.
+      * @platform ios, android, web
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.web.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.web.d.ts.map
+index df50221..5b15656 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.web.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownTextProps.web.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"MarkdownTextProps.web.d.ts","sourceRoot":"","sources":["../../../../src/types/MarkdownTextProps.web.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,yBAA0B,SAAQ,IAAI,CACrD,cAAc,CAAC,cAAc,CAAC,EAC9B,OAAO,GAAG,KAAK,CAChB;IACC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;OAGG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;OAIG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACtD;;;;;;;;;;OAUG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAChD;;;;;;;;;OASG;IACH,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC9D;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACxD;;;;;;;;;;;;;;;;;OAiBG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;;OAKG;IACH,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;CAC9B"}
+\ No newline at end of file
++{"version":3,"file":"MarkdownTextProps.web.d.ts","sourceRoot":"","sources":["../../../../src/types/MarkdownTextProps.web.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,yBAA0B,SAAQ,IAAI,CACrD,cAAc,CAAC,cAAc,CAAC,EAC9B,OAAO,GAAG,KAAK,CAChB;IACC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B;;;OAGG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;OAGG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;OAIG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACtD;;;;;;;;;;OAUG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAChD;;;;;;;;;OASG;IACH,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC9D;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACxD;;;;;;;;;;;;;;;;;OAiBG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;;OAKG;IACH,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;CAC9B"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/events.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/events.d.ts
+index 135693c..56b5327 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/events.d.ts
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/events.d.ts
+@@ -1,5 +1,7 @@
+ export interface LinkPressEvent {
+     url: string;
++    /** Syntax of the tapped occurrence, independent of other links with the same URL. */
++    sourceType?: 'markdown' | 'text' | 'inline-code';
+ }
+ export interface LinkLongPressEvent {
+     url: string;
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/events.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/events.d.ts.map
+index b09b7ee..f3268e5 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/events.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/events.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../../src/types/events.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,MAAM,EAAE,MAAM,CAAC;IACf,mDAAmD;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,wEAAwE;AACxE,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,4DAA4D;AAC5D,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAC;CAC3D;AAED,kGAAkG;AAClG,MAAM,WAAW,+BAA+B;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB"}
+\ No newline at end of file
++{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../../src/types/events.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,qFAAqF;IACrF,UAAU,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,aAAa,CAAC;CAClD;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,MAAM,EAAE,MAAM,CAAC;IACf,mDAAmD;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,wEAAwE;AACxE,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,4DAA4D;AAC5D,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAC;CAC3D;AAED,kGAAkG;AAClG,MAAM,WAAW,+BAA+B;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/EnrichedMarkdownText.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/EnrichedMarkdownText.d.ts
+index 08317a3..d48d3c0 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/EnrichedMarkdownText.d.ts
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/EnrichedMarkdownText.d.ts
+@@ -1,4 +1,4 @@
+ import type { EnrichedMarkdownTextProps } from '../types/MarkdownTextProps.web';
+-export declare const EnrichedMarkdownText: ({ markdown, markdownStyle, md4cFlags, linkRecognition, onLinkPress, onLinkLongPress, onImagePress, onTaskListItemPress, onCodeBlockPress, enableTaskListItemToggle, allowTrailingMargin, containerStyle, selectable, dir, selectionColor, testID, ...rest }: EnrichedMarkdownTextProps) => import("react/jsx-runtime").JSX.Element | null;
++export declare const EnrichedMarkdownText: ({ markdown, markdownStyle, md4cFlags, linkRecognition, renderers, onLinkPress, onLinkLongPress, onImagePress, onTaskListItemPress, onCodeBlockPress, enableTaskListItemToggle, allowTrailingMargin, containerStyle, selectable, dir, selectionColor, testID, ...rest }: EnrichedMarkdownTextProps) => import("react/jsx-runtime").JSX.Element;
+ export default EnrichedMarkdownText;
+ //# sourceMappingURL=EnrichedMarkdownText.d.ts.map
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/EnrichedMarkdownText.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/EnrichedMarkdownText.d.ts.map
+index 365eb97..b357421 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/EnrichedMarkdownText.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/EnrichedMarkdownText.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"EnrichedMarkdownText.d.ts","sourceRoot":"","sources":["../../../../src/web/EnrichedMarkdownText.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAiBhF,eAAO,MAAM,oBAAoB,GAAI,6PAkBlC,yBAAyB,mDAqL3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+\ No newline at end of file
++{"version":3,"file":"EnrichedMarkdownText.d.ts","sourceRoot":"","sources":["../../../../src/web/EnrichedMarkdownText.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAiBhF,eAAO,MAAM,oBAAoB,GAAI,wQAmBlC,yBAAyB,4CAyO3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/parseMarkdown.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/parseMarkdown.d.ts
+index 890724b..ff89213 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/parseMarkdown.d.ts
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/parseMarkdown.d.ts
+@@ -1,4 +1,5 @@
+ import type { ASTNode } from './types';
+ import type { Md4cFlags } from '../types/MarkdownStyle';
+-export declare function parseMarkdown(markdown: string, { underline, latexMath, superscript, subscript, highlight, hardSoftBreaks, preserveBlankLines, admonitions, }?: Md4cFlags): Promise<ASTNode>;
++export declare function parseMarkdownSync(markdown: string, { underline, latexMath, superscript, subscript, highlight, hardSoftBreaks, preserveBlankLines, admonitions, }?: Md4cFlags): ASTNode | null;
++export declare function parseMarkdown(markdown: string, flags?: Md4cFlags): Promise<ASTNode>;
+ //# sourceMappingURL=parseMarkdown.d.ts.map
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/parseMarkdown.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/parseMarkdown.d.ts.map
+index 877d681..ff2beec 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/parseMarkdown.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/parseMarkdown.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"parseMarkdown.d.ts","sourceRoot":"","sources":["../../../../src/web/parseMarkdown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAsDxD,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,EACE,SAAiB,EACjB,SAAgB,EAChB,WAAmB,EACnB,SAAiB,EACjB,SAAiB,EACjB,cAAsB,EACtB,kBAA0B,EAC1B,WAAkB,GACnB,GAAE,SAAc,GAChB,OAAO,CAAC,OAAO,CAAC,CAsBlB"}
+\ No newline at end of file
++{"version":3,"file":"parseMarkdown.d.ts","sourceRoot":"","sources":["../../../../src/web/parseMarkdown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AA2DxD,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,EACE,SAAiB,EACjB,SAAgB,EAChB,WAAmB,EACnB,SAAiB,EACjB,SAAiB,EACjB,cAAsB,EACtB,kBAA0B,EAC1B,WAAkB,GACnB,GAAE,SAAc,GAChB,OAAO,GAAG,IAAI,CAuBhB;AAED,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,SAAc,GACpB,OAAO,CAAC,OAAO,CAAC,CAGlB"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/BlockRenderers.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/BlockRenderers.d.ts.map
+index 2a61d73..b304c4e 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/BlockRenderers.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/BlockRenderers.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"BlockRenderers.d.ts","sourceRoot":"","sources":["../../../../../src/web/renderers/BlockRenderers.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,WAAW,EAAE,MAAM,UAAU,CAAC;AAqP3D,eAAO,MAAM,cAAc,EAAE,WAW5B,CAAC"}
+\ No newline at end of file
++{"version":3,"file":"BlockRenderers.d.ts","sourceRoot":"","sources":["../../../../../src/web/renderers/BlockRenderers.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,WAAW,EAAE,MAAM,UAAU,CAAC;AA4P3D,eAAO,MAAM,cAAc,EAAE,WAW5B,CAAC"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/InlineRenderers.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/InlineRenderers.d.ts.map
+index 817ce9d..eb672e3 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/InlineRenderers.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/InlineRenderers.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"InlineRenderers.d.ts","sourceRoot":"","sources":["../../../../../src/web/renderers/InlineRenderers.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAiB,WAAW,EAAE,MAAM,UAAU,CAAC;AA8G3D,eAAO,MAAM,eAAe,EAAE,WAc7B,CAAC"}
+\ No newline at end of file
++{"version":3,"file":"InlineRenderers.d.ts","sourceRoot":"","sources":["../../../../../src/web/renderers/InlineRenderers.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAiB,WAAW,EAAE,MAAM,UAAU,CAAC;AAuH3D,eAAO,MAAM,eAAe,EAAE,WAc7B,CAAC"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/ListRenderers.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/ListRenderers.d.ts.map
+index bdcf7d0..ea540b8 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/ListRenderers.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/renderers/ListRenderers.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"ListRenderers.d.ts","sourceRoot":"","sources":["../../../../../src/web/renderers/ListRenderers.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,WAAW,EAAqB,MAAM,UAAU,CAAC;AAmH9E,eAAO,MAAM,aAAa,EAAE,WAI3B,CAAC"}
+\ No newline at end of file
++{"version":3,"file":"ListRenderers.d.ts","sourceRoot":"","sources":["../../../../../src/web/renderers/ListRenderers.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,WAAW,EAAqB,MAAM,UAAU,CAAC;AA0H9E,eAAO,MAAM,aAAa,EAAE,WAI3B,CAAC"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/types.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/types.d.ts
+index c83a25e..c3e28f5 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/types.d.ts
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/types.d.ts
+@@ -1,3 +1,4 @@
++import type { MarkdownRenderers } from '../types/MarkdownRenderers';
+ import type { ComponentType, ReactNode } from 'react';
+ import type { MarkdownStyleInternal } from '../types/MarkdownStyleInternal';
+ import type { Styles } from './styles';
+@@ -5,6 +6,7 @@ import type { LinkPressEvent, LinkLongPressEvent, ImagePressEvent, TaskListItemP
+ import type { KaTeXInstance } from './katex';
+ export type NodeType = 'Document' | 'Paragraph' | 'Text' | 'Link' | 'Heading' | 'LineBreak' | 'SoftBreak' | 'Strong' | 'Emphasis' | 'Strikethrough' | 'Underline' | 'Superscript' | 'Subscript' | 'Highlight' | 'Code' | 'Image' | 'Blockquote' | 'UnorderedList' | 'OrderedList' | 'ListItem' | 'CodeBlock' | 'ThematicBreak' | 'Table' | 'TableHead' | 'TableBody' | 'TableRow' | 'TableHeaderCell' | 'TableCell' | 'LatexMathInline' | 'LatexMathDisplay' | 'BlankLine' | 'Admonition' | 'Video';
+ export interface NodeAttributes {
++    start?: string;
+     level?: string;
+     url?: string;
+     /** Stamped by recognizeTextLinks() — not present in the raw WASM output. */
+@@ -44,6 +46,7 @@ export interface RendererCallbacks {
+     onCodeBlockPress?: (event: CodeBlockPressEvent) => void;
+ }
+ export interface RenderCapabilities {
++    renderers?: MarkdownRenderers;
+     katex: KaTeXInstance | null;
+     /** When false, task list checkboxes render read-only and ignore clicks. */
+     enableTaskListItemToggle: boolean;
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/types.d.ts.map b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/types.d.ts.map
+index a32ca4e..279b944 100644
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/web/types.d.ts.map
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/web/types.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/web/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,MAAM,MAAM,QAAQ,GAChB,UAAU,GACV,WAAW,GACX,MAAM,GACN,MAAM,GACN,SAAS,GACT,WAAW,GACX,WAAW,GACX,QAAQ,GACR,UAAU,GACV,eAAe,GACf,WAAW,GACX,aAAa,GACb,WAAW,GACX,WAAW,GACX,MAAM,GACN,OAAO,GACP,YAAY,GACZ,eAAe,GACf,aAAa,GACb,UAAU,GACV,WAAW,GACX,eAAe,GACf,OAAO,GACP,WAAW,GACX,WAAW,GACX,UAAU,GACV,iBAAiB,GACjB,WAAW,GACX,iBAAiB,GACjB,kBAAkB,GAClB,WAAW,GACX,YAAY,GACZ,OAAO,CAAC;AAEZ,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4EAA4E;IAC5E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8EAA8E;IAC9E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;IAChD,2EAA2E;IAC3E,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,QAAQ,CAAC;IACf,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6EAA6E;IAC7E,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,qFAAqF;IACrF,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACtD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAChD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC9D,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;CACzD;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,2EAA2E;IAC3E,wBAAwB,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,qBAAqB,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,iDAAiD;IACjD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,iBAAiB,CAAC;IAC7B,YAAY,EAAE,kBAAkB,CAAC;IACjC,cAAc,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,SAAS,CAAC;CAC9C;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,CAC/B,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC,CAC/C,CAAC"}
+\ No newline at end of file
++{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/web/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,MAAM,MAAM,QAAQ,GAChB,UAAU,GACV,WAAW,GACX,MAAM,GACN,MAAM,GACN,SAAS,GACT,WAAW,GACX,WAAW,GACX,QAAQ,GACR,UAAU,GACV,eAAe,GACf,WAAW,GACX,aAAa,GACb,WAAW,GACX,WAAW,GACX,MAAM,GACN,OAAO,GACP,YAAY,GACZ,eAAe,GACf,aAAa,GACb,UAAU,GACV,WAAW,GACX,eAAe,GACf,OAAO,GACP,WAAW,GACX,WAAW,GACX,UAAU,GACV,iBAAiB,GACjB,WAAW,GACX,iBAAiB,GACjB,kBAAkB,GAClB,WAAW,GACX,YAAY,GACZ,OAAO,CAAC;AAEZ,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4EAA4E;IAC5E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8EAA8E;IAC9E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;IAChD,2EAA2E;IAC3E,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,QAAQ,CAAC;IACf,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6EAA6E;IAC7E,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,qFAAqF;IACrF,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACtD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAChD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC9D,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;CACzD;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,2EAA2E;IAC3E,wBAAwB,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,qBAAqB,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,iDAAiD;IACjD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,iBAAiB,CAAC;IAC7B,YAAY,EAAE,kBAAkB,CAAC;IACjC,cAAc,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,SAAS,CAAC;CAC9C;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,CAC/B,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC,CAC/C,CAAC"}
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/src/EnrichedMarkdownNativeComponent.ts b/node_modules/react-native-enriched-markdown/src/EnrichedMarkdownNativeComponent.ts
+index 32ff768..8e89249 100644
+--- a/node_modules/react-native-enriched-markdown/src/EnrichedMarkdownNativeComponent.ts
++++ b/node_modules/react-native-enriched-markdown/src/EnrichedMarkdownNativeComponent.ts
+@@ -275,6 +275,7 @@ export interface MarkdownStyleInternal {
+ 
+ export interface LinkPressEvent {
+   url: string;
++  sourceType: string;
+ }
+ 
+ export interface LinkLongPressEvent {
+diff --git a/node_modules/react-native-enriched-markdown/src/EnrichedMarkdownTextNativeComponent.ts b/node_modules/react-native-enriched-markdown/src/EnrichedMarkdownTextNativeComponent.ts
+index 6f31ccc..7b08b62 100644
+--- a/node_modules/react-native-enriched-markdown/src/EnrichedMarkdownTextNativeComponent.ts
++++ b/node_modules/react-native-enriched-markdown/src/EnrichedMarkdownTextNativeComponent.ts
+@@ -276,6 +276,7 @@ export interface MarkdownStyleInternal {
+ 
+ export interface LinkPressEvent {
+   url: string;
++  sourceType: string;
+ }
+ 
+ export interface LinkLongPressEvent {
+diff --git a/node_modules/react-native-enriched-markdown/src/native/EnrichedMarkdownText.tsx b/node_modules/react-native-enriched-markdown/src/native/EnrichedMarkdownText.tsx
+index ca7157e..40581c1 100644
+--- a/node_modules/react-native-enriched-markdown/src/native/EnrichedMarkdownText.tsx
++++ b/node_modules/react-native-enriched-markdown/src/native/EnrichedMarkdownText.tsx
+@@ -170,6 +170,7 @@ export const EnrichedMarkdownText = ({
+   writingDirection = 'first-strong',
+   numberOfLines,
+   ellipsizeMode,
++  renderers: _renderers,
+   ...rest
+ }: EnrichedMarkdownTextProps) => {
+   // An equal config keeps the previous object, so an inline literal does not
+@@ -297,9 +298,12 @@ export const EnrichedMarkdownText = ({
+   );
+ 
+   const handleLinkPress = useCallback(
+-    (e: NativeSyntheticEvent<LinkPressEvent>) => {
+-      const { url } = e.nativeEvent;
+-      onLinkPress?.({ url });
++    (e: NativeSyntheticEvent<{ url: string; sourceType: string }>) => {
++      const { url, sourceType } = e.nativeEvent;
++      onLinkPress?.({
++        url,
++        sourceType: sourceType as LinkPressEvent['sourceType'],
++      });
+     },
+     [onLinkPress]
+   );
+diff --git a/node_modules/react-native-enriched-markdown/src/types/MarkdownTextProps.web.ts b/node_modules/react-native-enriched-markdown/src/types/MarkdownTextProps.web.ts
+index cac90b4..c308537 100644
+--- a/node_modules/react-native-enriched-markdown/src/types/MarkdownTextProps.web.ts
++++ b/node_modules/react-native-enriched-markdown/src/types/MarkdownTextProps.web.ts
+@@ -1,3 +1,4 @@
++import type { MarkdownRenderers } from './MarkdownRenderers';
+ import type { LinkRecognition } from './MarkdownTextProps';
+ import type { CSSProperties, HTMLAttributes } from 'react';
+ import type { MarkdownStyle, Md4cFlags } from './MarkdownStyle';
+@@ -23,6 +24,8 @@ export interface EnrichedMarkdownTextProps extends Omit<
+    * @platform ios, android, web
+    */
+   markdown: string;
++  /** Custom block components. Ignored on native. @platform web */
++  renderers?: MarkdownRenderers;
+   /**
+    * Style configuration for markdown elements.
+    * @platform ios, android, web
+diff --git a/node_modules/react-native-enriched-markdown/src/types/events.ts b/node_modules/react-native-enriched-markdown/src/types/events.ts
+index 9df94ed..c726533 100644
+--- a/node_modules/react-native-enriched-markdown/src/types/events.ts
++++ b/node_modules/react-native-enriched-markdown/src/types/events.ts
+@@ -1,5 +1,7 @@
+ export interface LinkPressEvent {
+   url: string;
++  /** Syntax of the tapped occurrence, independent of other links with the same URL. */
++  sourceType?: 'markdown' | 'text' | 'inline-code';
+ }
+ 
+ export interface LinkLongPressEvent {
+diff --git a/node_modules/react-native-enriched-markdown/src/web/EnrichedMarkdownText.tsx b/node_modules/react-native-enriched-markdown/src/web/EnrichedMarkdownText.tsx
+index 08dc7df..11fbd16 100644
+--- a/node_modules/react-native-enriched-markdown/src/web/EnrichedMarkdownText.tsx
++++ b/node_modules/react-native-enriched-markdown/src/web/EnrichedMarkdownText.tsx
+@@ -12,7 +12,7 @@ import {
+   parseErrorFallbackStyle,
+   buildStyles,
+ } from './styles';
+-import { parseMarkdown } from './parseMarkdown';
++import { parseMarkdown, parseMarkdownSync } from './parseMarkdown';
+ import { recognizeTextLinks } from './recognizeTextLinks';
+ import { RenderNode } from './renderers';
+ import type { ASTNode, RendererCallbacks, RenderCapabilities } from './types';
+@@ -27,6 +27,7 @@ export const EnrichedMarkdownText = ({
+   markdownStyle = {},
+   md4cFlags = {},
+   linkRecognition,
++  renderers,
+   onLinkPress,
+   onLinkLongPress,
+   onImagePress,
+@@ -46,7 +47,10 @@ export const EnrichedMarkdownText = ({
+     [markdownStyle]
+   );
+ 
+-  const [ast, setAst] = useState<ASTNode | null>(null);
++  const [parsed, setParsed] = useState<{
++    ast: ASTNode;
++    markdown: string;
++  } | null>(null);
+   const [katex, setKatex] = useState<KaTeXInstance | null>(null);
+   const [parseError, setParseError] = useState<boolean>(false);
+ 
+@@ -67,7 +71,53 @@ export const EnrichedMarkdownText = ({
+   const textLinkKey = linkRecognition?.text?.toString() ?? null;
+   const inlineCodeLinkKey = linkRecognition?.inlineCode?.toString() ?? null;
+ 
++  // Once WASM is ready, new/virtualized rows must have their text on the first
++  // commit. An effect-only parse briefly measures an empty row and moves readers.
++  const immediate = useMemo(() => {
++    try {
++      const result = parseMarkdownSync(markdown, {
++        underline,
++        latexMath,
++        superscript,
++        subscript,
++        highlight,
++        hardSoftBreaks,
++        preserveBlankLines,
++        admonitions,
++      });
++      if (!result) return null;
++      indexTaskItems(result);
++      markInlineImages(result);
++      return {
++        markdown,
++        ast: recognizeTextLinks(
++          result,
++          linkRecognitionRef.current?.text,
++          linkRecognitionRef.current?.inlineCode
++        ),
++      };
++    } catch {
++      return { markdown, ast: null };
++    }
++    // Regex keys track ref changes; parsed wakes this memo after WASM initialization.
++    // eslint-disable-next-line react-hooks/exhaustive-deps
++  }, [
++    markdown,
++    underline,
++    latexMath,
++    superscript,
++    subscript,
++    highlight,
++    hardSoftBreaks,
++    preserveBlankLines,
++    admonitions,
++    textLinkKey,
++    inlineCodeLinkKey,
++    parsed,
++  ]);
++
+   useEffect(() => {
++    if (immediate && (!latexMath || katex)) return;
+     let cancelled = false;
+ 
+     const katexPromise = latexMath ? loadKaTeX() : Promise.resolve(null);
+@@ -92,13 +142,14 @@ export const EnrichedMarkdownText = ({
+ 
+           setParseError(false);
+           setKatex(katexInstance);
+-          setAst(
+-            recognizeTextLinks(
++          setParsed({
++            markdown,
++            ast: recognizeTextLinks(
+               result,
+               linkRecognitionRef.current?.text,
+               linkRecognitionRef.current?.inlineCode
+-            )
+-          );
++            ),
++          });
+         }
+       })
+       .catch((error) => {
+@@ -108,7 +159,7 @@ export const EnrichedMarkdownText = ({
+           }
+ 
+           setParseError(true);
+-          setAst(null);
++          setParsed(null);
+           setKatex(null);
+         }
+       });
+@@ -128,6 +179,8 @@ export const EnrichedMarkdownText = ({
+     admonitions,
+     textLinkKey,
+     inlineCodeLinkKey,
++    immediate,
++    katex,
+   ]);
+ 
+   const callbacks = useMemo<RendererCallbacks>(
+@@ -148,8 +201,8 @@ export const EnrichedMarkdownText = ({
+   );
+ 
+   const capabilities = useMemo<RenderCapabilities>(
+-    () => ({ katex, enableTaskListItemToggle }),
+-    [katex, enableTaskListItemToggle]
++    () => ({ katex, enableTaskListItemToggle, renderers }),
++    [katex, enableTaskListItemToggle, renderers]
+   );
+ 
+   const lastChildStyle = useMemo(
+@@ -182,7 +235,8 @@ export const EnrichedMarkdownText = ({
+ 
+   const domProps = filterNativeOnlyProps(rest);
+ 
+-  if (parseError) {
++  const visibleParsed = immediate ?? parsed;
++  if (immediate ? immediate.ast === null : parseError) {
+     return (
+       <div
+         className={ENRM_TEXT_CLASS}
+@@ -196,13 +250,12 @@ export const EnrichedMarkdownText = ({
+     );
+   }
+ 
+-  if (!ast) return null;
+-
+-  const children = ast.children ?? [];
++  const children = visibleParsed?.ast?.children ?? [];
+   const lastIdx = children.length - 1;
+ 
+   return (
+     <div
++      aria-busy={visibleParsed?.markdown !== markdown}
+       className={ENRM_TEXT_CLASS}
+       style={wrapperStyle}
+       dir={dir}
+diff --git a/node_modules/react-native-enriched-markdown/src/web/parseMarkdown.ts b/node_modules/react-native-enriched-markdown/src/web/parseMarkdown.ts
+--- a/node_modules/react-native-enriched-markdown/src/web/parseMarkdown.ts
++++ b/node_modules/react-native-enriched-markdown/src/web/parseMarkdown.ts
+@@ -1,3 +1,4 @@
++import createMd4c from './wasm/md4c';
+ import type { ASTNode } from './types';
+ import type { Md4cFlags } from '../types/MarkdownStyle';
+ 
+@@ -15,14 +16,15 @@
+ 
+ // Caching the Promise (not the resolved value) means concurrent callers share
+ // a single WASM initialization — no duplicate loading.
++let readyParser: ParseFn | null = null;
+ let parserPromise: Promise<ParseFn> | null = null;
+ 
+ // SINGLE_FILE=1 inlines the WASM binary as base64 inside md4c.js, so no
+ // network fetch is needed — only a one-time decode + compile on first call.
+ function initializeParser(): Promise<ParseFn> {
+   if (!parserPromise) {
+-    parserPromise = import('./wasm/md4c')
+-      .then((module) => module.default())
++    parserPromise = Promise.resolve()
++      .then(() => createMd4c())
+       .then((wasmModule) =>
+         wasmModule.cwrap('parseMarkdown', 'string', [
+           'string',
+@@ -36,6 +38,10 @@
+           'number',
+         ])
+       )
++      .then((parse) => {
++        readyParser = parse as ParseFn;
++        return parse;
++      })
+       .catch((error) => {
+         parserPromise = null;
+         throw error;
+@@ -53,7 +59,7 @@
+   );
+ }
+ 
+-export async function parseMarkdown(
++export function parseMarkdownSync(
+   markdown: string,
+   {
+     underline = false,
+@@ -65,8 +71,9 @@
+     preserveBlankLines = false,
+     admonitions = true,
+   }: Md4cFlags = {}
+-): Promise<ASTNode> {
+-  const parse = await initializeParser();
++): ASTNode | null {
++  const parse = readyParser;
++  if (!parse) return null;
+ 
+   const result: unknown = JSON.parse(
+     parse(
+@@ -88,3 +95,11 @@
+ 
+   return result;
+ }
++
++export async function parseMarkdown(
++  markdown: string,
++  flags: Md4cFlags = {}
++): Promise<ASTNode> {
++  await initializeParser();
++  return parseMarkdownSync(markdown, flags)!;
++}
+diff --git a/node_modules/react-native-enriched-markdown/src/web/renderers/ListRenderers.tsx b/node_modules/react-native-enriched-markdown/src/web/renderers/ListRenderers.tsx
+index 251009e..da2e1b4 100644
+--- a/node_modules/react-native-enriched-markdown/src/web/renderers/ListRenderers.tsx
++++ b/node_modules/react-native-enriched-markdown/src/web/renderers/ListRenderers.tsx
+@@ -25,7 +25,14 @@ function ListRenderer({
+     : hasTaskChild
+       ? styles.listTask
+       : styles.list;
+-  return <ListTag style={resolvedStyle}>{renderChildren(node)}</ListTag>;
++  return (
++    <ListTag
++      start={ListTag === 'ol' ? Number(node.attributes?.start ?? 1) : undefined}
++      style={resolvedStyle}
++    >
++      {renderChildren(node)}
++    </ListTag>
++  );
+ }
+ 
+ function UnorderedListRenderer(props: RendererProps) {
+diff --git a/node_modules/react-native-enriched-markdown/src/web/types.ts b/node_modules/react-native-enriched-markdown/src/web/types.ts
+index 781adb1..4d4fa0c 100644
+--- a/node_modules/react-native-enriched-markdown/src/web/types.ts
++++ b/node_modules/react-native-enriched-markdown/src/web/types.ts
+@@ -1,3 +1,4 @@
++import type { MarkdownRenderers } from '../types/MarkdownRenderers';
+ import type { ComponentType, ReactNode } from 'react';
+ import type { MarkdownStyleInternal } from '../types/MarkdownStyleInternal';
+ import type { Styles } from './styles';
+@@ -46,6 +47,7 @@ export type NodeType =
+   | 'Video';
+ 
+ export interface NodeAttributes {
++  start?: string;
+   level?: string;
+   url?: string;
+   /** Stamped by recognizeTextLinks() — not present in the raw WASM output. */
+@@ -88,6 +90,7 @@ export interface RendererCallbacks {
+ }
+ 
+ export interface RenderCapabilities {
++  renderers?: MarkdownRenderers;
+   katex: KaTeXInstance | null;
+   /** When false, task list checkboxes render read-only and ignore clicks. */
+   enableTaskListItemToggle: boolean;
+diff --git a/node_modules/react-native-enriched-markdown/src/web/wasm/md4c.js b/node_modules/react-native-enriched-markdown/src/web/wasm/md4c.js
+index 26a61d7..4f82a68 100644
+--- a/node_modules/react-native-enriched-markdown/src/web/wasm/md4c.js
++++ b/node_modules/react-native-enriched-markdown/src/web/wasm/md4c.js
+@@ -1,2 +1,2 @@
+-var createMd4cModule=(()=>{var _scriptName=globalThis.document?.currentScript?.src;return async function(moduleArg={}){var Module=moduleArg;var ENVIRONMENT_IS_WEB=true;var ENVIRONMENT_IS_WORKER=false;var programArgs=[];var thisProgram="./this.program";var scriptDirectory="";var readAsync;if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){try{scriptDirectory=new URL(".",_scriptName).href}catch{}{readAsync=async url=>{var response=await fetch(url,{credentials:"same-origin"});if(response.ok){return response.arrayBuffer()}throw new Error(response.status+" : "+response.url)}}}else{}var out=console.log.bind(console);var err=console.error.bind(console);var wasmBinary;var ABORT=false;class EmscriptenEH{}class EmscriptenSjLj extends EmscriptenEH{}function binaryDecode(bin){for(var i=0,l=bin.length,o=new Uint8Array(l),c;i<l;++i){c=bin.charCodeAt(i);o[i]=~c>>8&c}return o}var runtimeInitialized=false;function getMemoryBuffer(){return wasmMemory.buffer}function updateMemoryViews(){if(HEAP8?.buffer?.resizable)return;var b=getMemoryBuffer();HEAP8=new Int8Array(b);HEAP16=new Int16Array(b);HEAPU8=new Uint8Array(b);HEAPU16=new Uint16Array(b);HEAP32=new Int32Array(b);HEAPU32=new Uint32Array(b);HEAPF32=new Float32Array(b);HEAPF64=new Float64Array(b);HEAP64=new BigInt64Array(b);HEAPU64=new BigUint64Array(b)}function preRun(){var preRun=Module["preRun"];if(preRun){if(typeof preRun=="function")preRun=[preRun];onPreRuns.push(...preRun)}callRuntimeCallbacks(onPreRuns)}function initRuntime(){runtimeInitialized=true;wasmExports["__wasm_call_ctors"]()}function postRun(){var postRun=Module["postRun"];if(postRun){if(typeof postRun=="function")postRun=[postRun];onPostRuns.push(...postRun)}callRuntimeCallbacks(onPostRuns)}function abort(what){Module["onAbort"]?.(what);what=`Aborted(${what})`;err(what);ABORT=true;what+=". Build with -sASSERTIONS for more info.";var e=new WebAssembly.RuntimeError(what);throw e}var wasmBinaryFile;function findWasmBinary(){return binaryDecode('asm

¬
``
`
`
`

`
``````
`
`	
`
`
``|
|`~
`|
``
Tenv__cxa_throwenv\r__assert_failenv	_abort_js\nenvemscripten_resize_heap˜
–
\n
\r\n


\n\n














\r\r	\n	

\n
				


p
44

€€@	

Aʈۢ
memory__wasm_call_ctors\rparseMarkdown__indirect_function_table
_emscripten_stack_restore—
_emscripten_stack_alloc˜
emscripten_stack_get_current™
	J
A
3”
\rq !"#$%&\'()s*B=DZfghq*‚
‚
„
’

†
*‘
Ž
‡
*
‹
‰
*“
•
–
•

(\nªº–
æ

AàÚB7AèÚA6A÷ÚA:AìÚAØ\r(6AðÚAÜ\r-:AñÚA:AƒÛA:AøÚA±\r/;
AúÚA³\r-:AûÚA:AÛA:A„ÛAŠ(6AˆÛAŽ-:A‰ÛA:A›ÛA	:AÛA™)7A˜ÛA¡-:A™ÛA:A ÛB칻֮سå7A«ÛA:A¨ÛA:A·ÛA:A¬ÛAá\r(6A°ÛAå\r/;
A²ÛA:A¸ÛAt"6A¼ÛB‹€€€€‚€€€7 AÆ(6 A¿)7 A:AÏÛA:AÄÛA¦	(6AÈÛAª	-:AÉÛA:AÛÛA:AÐÛAÈ	(6AÔÛAÌ	-:AÕÛA:AÜÛAt"6AàÛBŽ€€€€‚€€€7 AÖ)7 AÐ)7 A: AëÚ,AH@AèÚ(AàÚ(kõ”
!
~#A0k"$@ E@@A€\\"AèÚ("
AÿÿÿÿqA
kA\nAëÚ,"AH""M@AàÚ(AàÚ !@  @ A€ ü\nAëÚ- 
AvÀAH@AäÚ 6
AëÚ Aÿq:  jA:
AàÚ   kAäÚ(  "A  A€xAàÚAàÚ(AëÚ,AN
 A
:,  AG:/  AG:.  AG:-  AG:+  AG:*  AG:)  AG:(  
AG:\'A$t"
A6  
B7 
B7 
B7 
B7 A j" 
6 ! \\"A÷ÿÿÿO\r
@@ AO@ Ar"A
jt!  Aÿÿÿÿk6  6  6
  : Aj! E\r
 E\r   ü\n  jA: Aj! A\'j!#AÐk"$@ Aj"
( 
," AH"E@A<t"
B7 
Aì6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6
 (! AéOA4 Aèn" A4OAjA!A<t"B7 Aì6 B7 B7 B7 B7$ B74 B€€€ü7,  Aj6 (!  6@ E\r  ("A
k6 \r  ((
 r Aj! ("\n! (" \nG@@@ Ak("E\r  ("A
k6 \r  ((
 r \n Ak"G\r (!  \n6@A€
  A€
O" ( kAuM\r At"t! \n k"\n@   \nü\n   j6  \n j6  6 E\r k !@@@@ (" ("\nI@  (6  ("6 @  (A
j6 Aj!
  ("k"Au"A
j"A€€€€O\r
Aÿÿÿÿ
 \n k"\nAu"   K \nAøÿÿÿO"A€€€€O\r At"\nt" j" (6  ("6  \nj!\n    (A
j6 ( ( ("k"Au Atk! @   ü\n  \n6  Aj"6  6 E\r k  6 Aj!@ ,AH@ (A: A6
 A: A: A€z (" 
( 
 
,AH6  -! -! -! -! -! -! -!\r -
! -! B7( A6$ A6  A6 A6 A6 A6  AtAìžAà– r \rAtr Atr Atr Atr Atr Atr Atr6 
( 
 
,"AH"! 
(  ! !\n#A€k"	$@ Aj"(@A! ("E\r
A›  
 	A4jAAüü 	 6 	 6 	 )7 	 )7 	 )7 	 )7$ 	 ( 6, 	 \n60 	AA 	("Aq6œ 	A„
j"
AA€ü 	A;ã
 	A
:®
 	A;
à
 	A
:ß
 	A
:Â
 	A;¿
 	A
:ª
 	A
:¥
 	A
:„
 A€„q@ 	A
:‚ A€€q@ 	A
:â
 A€ q@ 	A
:¨
 A€€€
q@ 	A
:Á
 A€€€q@ 	A
:¯
 Aq@ 	A
:Ä
 Aq@ 	A
:¾
 A€q@ 	A
:²
 A€Âq@ 	A
:€ A
q@A!@ A G AGqE@  
jA
: A
r"Aý
qA	F@ 
 jA
: Aj"A€G\rA E\rA
  jA
k-"A\rF\r A\nF! 	A6` 	A 6D 	 64 	A€€  A€€OAt6X 	A„jAÿ
AÔü 	B7ä 	B7Ü@AA \n 	("E@ 	AÌj!" 	A°jAr!# 	Aüj!$ 	AèjA
r!% 	A°j!\rAè!A!@@ \r!@@@@ 	(" K@ 	B7ø 	B7ð 	B7èA! 	A°jAA \r 	A°jF"j \r  \rF"!\r 	(¨!& 	(!@@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r ! 	A°jA,A j Aj " 6 	A°jA$A j Aj " 6A! 	A°jA A j Aj " A6@ 	(”"AL\r 	(œ! 	(! !\n@@  Alj"
-A>F@ \n O\r  O\r  j-A>G\r A
j"!
@ A
j" O\r@  j-"\nA G \nA	Gq\r
 
A|qAj 
A
j \nA	F!
 A
j" G\r !  
 kAkA 
 G"\n6  6 
!
 \n 
("
I\r  \n 
k"\n6 !
 A
j" G\r ! 
! 	 6ä@@  O\r  j-A\nk


  L\r 	(!
@ 
 Alj-A>F\r
 A
j" G\r ! " #  Aj !A!\nA!A! !@A
 k!A k! 	(„"\' 	(üjAk!( 	(¬E! 	(!! 	( !) 	(œ! 	(¤!@@ ("AG@ !

  6@  ("M@ !

 !
@  O\r  (j-!@ 
 j- Aÿ
qG\r
 
A
j"
 G\r !
@ 
 k )I\r@ 
 O\r@@ 
 j-A	k 
A
j"
 G\r !
 	 
6ä \rA6 	 
6ä  F@   (k"A  M6 \rA6 (!@@@@ AG\r AL\r  L\r
A! 	A6¤ 
 O\r
 
 j"-A\nk

@ 	Aj 
 	Aäj+AL\r 	A6¤ AþÿÿÿqAG\r \rA6 A6 !	 \rA6@ AG\r  	(”G\r \rA6  (" 	(œk"A  O6 \rA6@@ AL"\r  G\r 	 	( AljAk-"A>G6¨
 	A6¨ @ !	 	( AljAk-! Aÿ
qA>F@ !  G@ ! 	(€\r 	(„"A	H\r 	(ü jAk-AG\r 	A
6¬@ A
q@ !
  AL\r  	(” G\r  ! Alj"Ak-A>F\r   G\r  	(€\r  \'A	H\r  (-AG\r  6A A
F\r   A$k(k"A  M6 A
k! 	A6¬ 	A6¨@ (" O\r@ AG\r@ -"A-k















  G\r@@ 
A
j" O\r@   j-F@  A
j"K\r
@@  j-A	k A
j" G\r ! 	 6ä \rA6 A
A A=F6 
 \nI\r -"E\rA­ ÀAPE\rA
! 
A
j"\n O\r@@@  \nj-" Aÿ
qF"\r A F\r A	G\r  j! \nA
j"\n G\r !\n AI\r
 AI\r A\nk@@@  L\r  G\r@ 	Aj  
 	Aàj 	Aèj,E\r 	-è"A>F\r  ! Alj"-G\r 	(ð" (K\r 	(ô" k j"!@ 	(à" O\r@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r 	 6ä   k6  6 ! 	 6ä   k"6  6  O\r@  j-A\nk  M@ 	  j"
6ô A6 	 A
j"
6ô  A
k6 !@  O@ (AF@ ! \rA6   k6 A6 !\n 	Aj  
 	Aäj 	Aèj,! (!
@@@@@ @ 	(ä!@ 
AG\r  G\r@@  O\r  j-"A\rF\r 	-è!
 A\nG\r
 
Aÿ
qA>F\r
A>!
 	-èA>G\r 
Aÿ
q"
A.G 
A)Gq\r 	(ìA
G\r 	(ô" 	(ðk j"!@  O\r@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r ! 	 6ä   k"
6  6  	,è6@@@  O\r  j-A\nk


 	 A
j6ô
 
 M@ 	 
 j6ô A6
 	 A
j6ô  
A
k6 E@ 	Aj  j-\r 	(”!@ 	(˜"
 J@ 	(!

 	A 
A
v 
j 
AL"
6˜ 	( 
All"
E@ 	(("E\rAõ 	(0  	 
6 	(”!Aè   F! A
j! 	 A
j6” 
 Alj"
 	)ø7 
 	)ð7 
 	)è7 	(”! 	(! 	(! !\n 
A	F  Fq\r
 	(ä! !  O@ !
@  j"\n-"
A#G@ ! 
AþF\r
 
AàF\r
 !
  A
k"\nF\rA
!
  A
j"j-A#F\r@@  j- 
G\r
 A
j" G\r !  k"
AI@ !
 	 
6 @@@  O\r@  j-A G\r
 A
j" G\r
  O\r
@@  j-"
A\nk@ 
AàG\r \n-AàG\r !
 A
j" G\r ! 	 6ä \rA6 A
6  A
6\r \rA	6  \nF\rA!
  Aj"j-A#G\r
  \nF\rA!
  Aj"j-A#G\r
  \nF\rA!
  Aj"j-A#G\r
  \nF\rA!
  Aj"j-A#G\r
  \nF\rA!
  Aj"j-A#G\r
  \nF\rA!
 Aj!
  k!
 ! 
AJ@ !

@  O"\n\r 	(Aq\r  j-A	k"AK@ !
A
 tA“€€q\r !

@ \n\r@  j-"A G A	Gq\r
 A
j" G\r !  6 	 6ä \rA6  
6	@@@@@ 
 O\r 
 j-A<G\r 	-A q\rA!#Ak"$ 
"A
j!@@ 
Aj"\n 	Aj"("K\r ( j"-"A k  AákAÿ
qAIAÿ
qAÐG\r -
"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\rA
!
@ Aj K\r ( j"-"A k  AákAÿ
qAIAÿ
qAÓG\r -
"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÔG\rA
!
@ Aj K\r ( j"-"A k  AákAÿ
qAIAÿ
qAÓG\r -
"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÙG\r -"A k  AákAÿ
qAIAÿ
qAÌG\r -"A k  AákAÿ
qAIAÿ
qAÅG\rA
!
@ A	j" K\r ( j"-"A k  AákAÿ
qAIAÿ
qAÔG\r -
"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAØG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAÁG\rA
!
@  \nM\r ("\n j-A!G\rA!  \nj"\n-A-G\r \n-A-F\r
@  O\r (" j"-"\nA?F@A! \nA!G\r@ Aj"\n O\r  \nj,AH\rA!  M\r )B¡¶¢”ˆÕ ÛR\rA!
@ Aj"\n O\r (" j-"Aß
qAÁkAÿ
qAO@ A/G\r
 \n j-Aß
qAÁkAÿ
qAK\r
  \n  A/F"j","\nAÁkAÿ
q" \nAák AIAtA j("("E\r@@@   Atj-"j" K\rA!\n E\r
@ \n j-"A k  AákAÿ
qAIAÿ
q \n j-"A k  AákAÿ
qAIAÿ
qG\r
  \nA
j"\nG\r
  A
j"Atj("\r
A!  M\r
  j-"A	k"\nAMAA
 \ntA“€€q\r
 A>F\r
 A
j"\n O\r A/G\r \n j-A>F\r
  A
jM@A!
A! AA   Aj>E\rA! ("\n O\r (!@@  \nj-"A	k"AK\rA
 tA€€qE\r \nA
j"\n G\r
AAA A\nF A\rF! Aj$ 	 6¤@ 
 (AG\r
 	A6¤ 	("A€qE\r (AG\r 
 	(O\r 	( 
j-"A-k
 	Aj 
 	Aäj+ F@ 	A6¤  A
6 \rA6 AüG\r
  	(”G\r 	(€"E\r (A
G\r 	Aäj! 	Aàj!A!A!@ 	Aj"(" 
M\r (" 
j-AüG\rA
! 
A
j"
 O\r@ 
 j-A	k"\nAK\r
A
 \ntA€€qE\r
 
A
j"
 G\r !
@@@@ 
 I@ 
 ( 
j-A:Fj!
 
 O\r ("\n 
j-A-G\r@@@ 
 \nj-"A-G\r
 
A
j"
 G\r A
j!
A
! A
j!@ 
 A:Fj"
 O\r@@ 
 \nj-"A	k"AK\rA
 tA€€qE\r  
A
j"
G\r
 AüG\rA
!A! 
A
j"
 O\r@ 
 \nj-A	k"AK\r
A
 tA€€qE\r
 
A
j"
 I\r !
 
 O\r@ 
 \nj-A\nk E\r
 !
 E\r
  
6  6A

AE\r  	(à6 \rA\n6	 \rA6 	(”"   F  (AF! A€qE\r  jAL\r 	( Alj"Ak-"E\r A?K\rB
 ­†B€€€€ÀƒP\r@ 	(ä" 	("\n Aj"  \nK"
O\r 	(!@  j-"A G A	Gq\r
 A
j" 
G\r 
! Aj" \nO\r 	("
 j-AÛG\r 
 A
j"j,"E\rAÓ APE\r 
 j-AÝG\r \n Aj"G@  
j-A	k"AK\r	A
 tA“€€qE\r	 Ak % " -Ar: Ak $  6@  	("
O\r 	(!@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" 
G\r 
! 	 6ä  6 	 A
j"
6ô  
6  6Aè!A
! ! ! 	Aj.A! 	Aj 	A@k/\r 	-Aq@ 	Aj 	AÜj/\r 	AjA-\r 	Aj0\rA!#A
k"$ A6$ 	Aj"\rA6@ \r(€AJ@ Aøj!@@@@@@ \r(ø j"("Aÿ
qAk
  AsA\nvA
q6  /
:  (6  (AsA\nvA
q6  /
:  AÿÿK6  /
:  (6
 A6  /
At(€\\"6  /
!  6  At(€6  Aj6  A$j6@@ ("A€q@@ A€qE\r Aÿ
q Aj \r(, \r("@ \r($"E\rA¿ \r(,  ("Aÿ
q"AK\rA
 tAŽ€qE\r \r \r(A
k6 (! A€qE\r Aÿ
q Aj \r(, \r("@ \r($"E\rAš \r(, @ ("Aÿ
qA
k \r(Œ \r(Alj" -
A
r:
 \r \r(A
j6 B7` B7X B7P B7H B7@ B78 B70 B7(@ ("Aÿ
qA\nG\r A€€„
I\r ("A€  Av"
nM\r Aq! Aj!A!\nA!@ "AO@ A|q!A!@  Atj"( j (j (j (j ( ( ( (jjjk! Aj! Aj" G\r E\r
@  Atj"( j (k! A
j! \nA
j"\n G\r  
n AvO\r  \r($"A¸ \r(,  ( A€~qA	r"6A! A6ˆ
 B7€
 B7x B7p B7h \r("@ \r(Œ AljAk-A
s!A
!@@@@@@@ Aÿ
qAk
  Av6h A€€I\r \r("\n ("j-! (!@@@  \r("O\r@  \nj- Aÿ
qG\r
 A
j" G\r
  M\r
@  \nj-A G\r A
j" G\r !@  M\r@  \njA
k-A G\r
 A
k" K\r !A! \r  \nj  kA Aèj AÈj9\r \r(! !\n@  M\r@  \nj-A	k"AMAA
 tA€€q\r
 \nA
j"\n G\r !\n \r  j \n kA  A(j9\r  :ˆ
 (!A! A
6l  Av6h  (Ak6p
  Av6h@@@@@@@  Aÿ
q"A	FqE@  Aèj \r(, \r("\r
 (! Aÿ
qAk
 \r($"E\rAš \r(,  (!@ AÿÿM@ E\r Aj!@ ( (F@ Aj! A
k"\r
@  Alj"Ak( Ak(G\r A
k"\r A
k"E\r Aj! \rA  :"E\r \rA Aj (:"E\r (!@@ Av"Atj"
E@A! \r($"E\r
Aä \r(,  
k @ (! ("! ! 
!@ !@  M\r \r(!@  j-A-F\r
 A
j" G\r !A!  K@ \r( jA
k-A:F!@  M\r \r(!@@  j-"\nA-G\r
 A
j" G\r !
 Ar  \nA:F!  At( 96 A
k! Aj! A
J\rAA \r(, \r("@ \r($"E\r
Aš \r(,  
k \rA ( ( 
 ;"\rAA \r(, \r("@ \r($"E\r
A¿ \r(,  
k AI\r
@AA \r(, \r("E@ Aj!A!
 \r($"E\r
Aš \r(,  
k@ \rA  Atj"( ( 
 ;"\r
 A
j" G\rAA \r(, \r("E\r
 \r($"E\rA¿ \r(,  
k 
k
 \r Aj (<"\r
A!  -"A	Fq\r  Aèj \r(, \r("E\r \r($"@A¿ \r(,  ! \r
 (X@ (Hk (Lk (Pk (8E\r ((k (,k (0k \r (! -AkA
M@ Al j! At j!
 \r(Œ \r(Alj" -
Aþ
q A\nvA
qr:
 \r \r(A
j6 Aj" \r(€H\r \rA6€A! A
j$ "\r 	-Aq@A!A!#A@j"\n$@ 	Aj"(`"E\r (pE\r (X AAR@@AA (, ("E@ (`E\r \nA0j!

 ($"E\rAš (, @ (X Alj"(E\r
 \nB7  \nB7 \nB7 \nB7 
B7 
B7 \n (6( \n (6,@  ( (A 
 \nAj9@A!
A \nA(j (, ("@ ($"E\r
Aš (, 
  ( (<"\rA \nA(j (, ("E@A!
 ($"E\rA¿ (,  \n(@ \n(k \n(k \n(k \r A
j" (`I\rA!AA (, ("E\r ($"@A¿ (,  ! \nA@k$ "\rA!AA 	(0 	("E\r 	(("@A¿ 	(0  ! 	 \n6ä \rA
6 ! ! !
 	A6¨ !@ 	(ä"Aj" 	("O\r 	(!@@  j"
-A\nk@ 
-
A\nk@ 
-A\nk@  j-A\nk Aj! Aj!  I\r@  I@ 	(!@A
!@  j-A\nk A
j" G\r !A! 	A°jA(A j Aj "\n 6 " \r("AG\r@@  ("
M\r 	(!@  jA
k-"A G A	Gq\r
 A
k" 
K\r
@ 
 O\r 	(!@  jA
k-A#G\r
 A
k" 
K\r
 
 F\r 	( jA
k-"
A	F@ !

 
A F@ !

 !
  	-AqE\r
 \n 
6 
!@ AkAI\r  ("M\r 	(!@  jA
k-"
A G 
A	Gq\r
 \n A
k"6  K\r @  	( j-A\rFj!  I@  	( j-A\nFj!@ &E\r E\r  j"AL\r 	( Alj"Ak-A>F\r 	(ü Ak(j" (A€r6@ \r  j" 	(”N\r 	Aj -\r
 AJ@ 	AjA Al"
 	(j"(" -
Aq 	( j,AA1\r
 	AjA 	(ü" 	-éAq" 	( j,AA
1\r
 	( 
j" -
Aý
q r:
 	( 
j 6 @ 	(”!@ 	-AqE\r 	( Alj"
Ak-A>G\r \r(AG\r \n(" ("k"AkAK\r 	(" j"-AÛG\r -
A!G\r  jA
k-AÝG\r Ak! Aj!A!@@@@ Ak
@  j-"A k  AákAÿ
qAIAÿ
q -¹"A k  AákAÿ
qAIAÿ
qG\r A
j" G\rA@  j-"A k  AákAÿ
qAIAÿ
q -Î"A k  AákAÿ
qAIAÿ
qG@ A\nk A
j" G\rAA!@  j-"A k  AákAÿ
qAIAÿ
q -ú	"A k  AákAÿ
qAIAÿ
qG@ A\nG\r A
j" G\rA
A!@  j-"A k  AákAÿ
qAIAÿ
q -‡"A k  AákAÿ
qAIAÿ
qG@ A\nG\r -"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÕG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÏG\r -"A k  AákAÿ
qAIAÿ
qAÎG\rA  A
j" G\rA! 
Ak"
 
-Ar: 	( 	(”AljAk"
 
-AÇ
q r: \rA6 	(”!  k!
@A!@@A
 	( 
Alj"-A)kt"AqE@ A!qE\r
A! 	Aj.  	(„6 	Aj  ( ,A
1\r 	AjA (" -
Aq 	( j,AA
1\r
 	AjAA
 -
"AqA AvAqA
1\r 
A
j"
 	(”H\r@ \r(E@ 	Aj.@A!A!Aè! 	-AÀqE\r
 ( \n(I\r
 	 	(ŒA
j6Œ
 	(Œ@@ 	(„"
Aj" 	(ˆ"J@ 	A€ A
v j AL"6ˆ 	(ü l"E@A! 	(("E\rAõ 	(0  	(€"
@ 	  
 	(ükj6€ 	 6ü 	 	(„"
Aj6„
 	 6„ 	(ü"\rA! 
 j"A;
 	(Œ!
 A6  
AtAr6 	A6Œ@  (E\r 	Aj.E\rA!@@@@ \r("A
k\n
A! 	Aj.\r 	(„"Aj"
 	(ˆ"J@ 	A€ A
v j AL"6ˆ 	(ü l"E@ 	(("E\r\nAõ 	(0 \n 	(€"
@ 	  
 	(ükj6€ 	 	(„"
Aj6„ 	 6ü 
 j
 	 
6„ 	(ü"E\r  j" \r(AÃÌj-"
;
 (! A6  
 Atr6 	 6€ 	Aj \r2\r 	Aj.\rA!Aè! 	(€A: 	(€ /
;
 	(€" (A€r6A! 	Aj \r2\r 	Aj.\rA! 	(€E@Aè! \rA6 \r! 	(€A\n: 	(€ /
;
 A	6AA 	Aj \r2!
@  (F\r 	Aj.E\rA!@ 	(€\r \r!@ 	Aj"(€"
Aj"\n („"J@ A€ A
v j AL"6„ (ø l"E@A ($"E\rAõ (, A (ü"\n@   \n (økj6ü  6ø  (€"\nAj6€  \nj
  \n6€ (ø"E\r 
 j" \r(AÃÌj-"\n;
 \r(!
 A6  \n 
Atr6  6üA
AE\rA! 	Aj \r2!A! E\r
A!
 	(("E\rAš \n  	(P"@ 	(T"
A!@@ 	(P Atj("E\r 	(@" M@   	(D 	(HljI\r
 k 	(T!
 A
j" 
I\r 	(P k 	(H@A!@ 	(@ Atj"-"
A
q (k - 
Aq@ (k A
j" 	(HI\r 	(@k 	(l"@ 	(p"
A!@@ 	(l Atj("E\r 	(\\" M@   	(` 	(dljI\r
 k 	(p!
 A
j" 
I\r 	(l k 	(d@A!@ 	(\\ Alj(k A
j" 	(dI\r 	(\\k 	(8k 	(xk 	(ük 	(k 	A€j$ @A<t"
B7 
Aì6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6
 (@ (("E\r ((" ($"
G A$j!A!\r@@@ 
 \rAt"\nj("(A
F@ ($" (("G\r
 \rA
j!\r
  k"
Au!@@ ((AF\rA
! 
AG@@ A
j!
  Atj"((AF@ 
 O\r Ak(!  
Atj(! \r \r  
"G\rA! A68 B70A!

A!
 A68 B70 A6L B7D  A0j6@  AÄj6<@@@@@@  
At"j"("(AG\r 
 Ak(A
!  
A
j"K@  Atj( rA
G\r
 A<j ($ j! (4"
 (8"I@ 
 (6 
 ("6 @  (A
j6  
Aj64 
 (0"k"
Au"A
j"A€€€€O\rAÿÿÿÿ
  k"Au"   I AøÿÿÿO"A€€€€O\r At"t" 
j" (6  ("6  j!    (A
j6 (8 (4 k"
Au Atk! 
@   
ü\n  68  Aj"
64  60 @ k  
64
@ (H" (L"I@  6  ("6 @  (A
j6 Aj!
  (D"k"Au"A
j"A€€€€O\rAÿÿÿÿ
  k"Au"   I AøÿÿÿO"A€€€€O\r At"t" j" (6  ("6  j!    (A
j6 (L (H k"Au Atk! @   ü\n  6L  Aj"6H  6D E\r k  6H 
A
j! "
 (( ($"kAu"I\r
 A<j (D"@ " (H"
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 r  
Ak"
G\r (D!  6H (L k (0" (4"
F\r ($ \nj"!
 Aj" (("G@@ )!* B7 
(! 
 *7@ E\r  ("A
k6 \r  ((
 r 
Aj!
 Aj" G\r ((!  
G@@@ Ak("E\r  ("A
k6 \r  ((
 r 
 Ak"G\r  
6( (0"
! (4"!@  
kAu"AL\r (" ("kAu N@  k"\nAu" H@@  \n j"F@ !
 !@  (6  ("
6 
@ 
 
(A
j6 Aj! Aj" G\r  6 AL\r  At"j! !   k"K@ !
@  
(6  
(6 
B7 Aj! 
Aj"
 I\r  6  G@@ Ak")!* B7 Ak(! Ak" *7@ E\r  ("
A
k6 
\r  ((
 r  G\r  \nj!
 !@ (! ("@  (A
j6  6 (!  6@ E\r  ("A
k6 \r  ((
 r Aj! Aj" 
G\r  At"j! !
   k"K@ !@ 
 (6 
 (6 B7 
Aj!
 Aj" I\r  
6  G@@ Ak")!* B7 Ak(! Ak" *7@ E\r  ("
A
k6 
\r  ((
 r  G\r  Atj!
 !@ (! ("@  (A
j6  6 (!  6@ E\r  ("A
k6 \r  ((
 r Aj! Aj" 
G\r
@  ("kAu j"A€€€€I@Aÿÿÿÿ
  k"Au"
  
 K AøÿÿÿO" A€€€€O\r AttA"\n  kj!
 At"Ak"Aq 
 
 (6 
 ("6 @  (A
j6 Aj! 
Aj! 
 j! @@  (6  ("6 @  (A
j6  (6  ("6 @  (A
j6 Aj! Aj" G\r ( k"@   ü\n  6 
  ("k"k! @   ü\n   j6  6 (  \n Atj6 @ k (4"
 (0"kAu \rj
 \rA
j!\r @ " 
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 r  
Ak"
G\r (0!  64 (8 k ($!
 ((! \r  
kAuI\r ((  ("
("E\r  6  
("
6 
E\r
 
 
(A
j6
A<t"
B7 
Aì6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6 AÐj$ ,AH@ ( (k (!
 Aj"A6 B7 A€z 
 \nAëÚ,AH@AèÚ(AàÚ(kAèÚ (6AàÚ )"*7AëÚ,AH! *§!@ ("E\r  ("A
k6 \r  ((
 r (!
 A6 
@ 
"@ ,AH@ ( (k ("
@ 
" ("G@@@ Ak("E\r  ("A
k6 \r  ((
 r 
 Ak"G\r (!  
6 ( k@ ("E\r  ("A
k6 \r  ((
 r k AàÚ ! A0j$ Aéq
A
"AàÙ6 Aj! \\"A\rjt"
A6 
 6 
 6 
Aj!
 A
j"@ 
  ü\n  
6 "AÚ6 AœÚA
Ÿ
#Ak"$ 
A"y ( ," AH""@ (  " j!@@@@@@@@@@@ -"Ak
 
AÂv 
AŽ\rv 
A£v 
A¼\nv 
AÞv 
A›v AÜF\r
 AM@  6#Ak"$  6#A 
k"$  A	j"6”
 A6˜
 AA
ü A6L A6$ A6P  AŸ
j6,  A”
j6T A:A!#AÐ
k"$  6Ì
 A 
jAA(ü  (Ì
6È
AAÍ AÈ
j AÐj A 
j`AHA  ("	A_q6@@ (0E@ AÐ60 A6 B7 (,!  6,
 (\r
A ^\r
 AÍ AÈ
j AÐj A 
j`! 	A q!	  AA ($ A60  6, A6 ( B7A   ( 	r6A AÐ
j$ A 
j$ Aj$ 
 A	jv 
 Ày
 
Aðv A
j" G\r 
A"y Aj$Ô

 
AÅv ("A!I@ 
 At(Üv 
A"y ( ," AH@ 
AÂv Aj 
	 (@ 
A”v@ ("E\r Aj 
	 
A:y Aj 
	 ("E\r@ 
A,y Aj 
	 
A:y Aj 
	 ("\r 
Aýy ($ ((G@ 
A÷v@ ($" ((F\r ( 
\n (( ($kAM\rA
!@ 
A,y ($ Atj( 
\n A
j" (( ($kAuI\r 
AÝy 
AýyAA¸AÌAö
¢

#A k"$@ E\r 
E\r E\r@@@ 
A<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6  Aj6  )7  A<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6  Aj6  )7  Aj
 Aj 
 w A j$As

 E@A
@ ( (F\r  ("
 (kA	I\r@ 
Ak("E\r  ("A
k6 \r  ((
 r  
Ak6Aø
#Að
k"$@@ E@A
!
@@@@@@@@@@@@@ 
\r\r	\n\r\rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
("E\r 
("E\r A÷ÿÿÿO\r@ AO@ Ar"A
jt!
  Aÿÿÿÿk6è
  
6à
  6ä

  :ë
 Aà
j!
 @ 
  ü\n 
 jA: (ä
 -ë
"
 
ÀAH@ AøÚ Aà
j ,ë
AN\r (è
 (à
k  6Ü
  6Ø
  (A
j6  )Ø
7    ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6Ô
  Aj6Ð
  )Ð
7  AjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6Ì
  Aj6È
  )È
7  Aj\nA<t"B7 A	6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6Ä
  Aj6À
  )À
7  Aj	A<t"B7 A\n6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6¼
  Aj6¸
  )¸
7   A jA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6´
  Aj6°
  )°
7(  A(jA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r@@ 
("@ 
("\r
 A6è
 B7à

 A÷ÿÿÿO\r	@ AO@ Ar"	A
jt!  	Aÿÿÿÿk6è
  6à
  6ä

  :ë
 Aà
j! @   ü\n  jA: (ä
 -ë
" ÀAHE\r AøÚ Aà
j@ 
("E\r 
("E\r A÷ÿÿÿO\r	@ AO@ Ar"A
jt!
  Aÿÿÿÿk6¬
  
6¤
  6¨

  :¯
 A¤
j!
 @ 
  ü\n 
 jA: (¨
 -¯
"
 
ÀAH@ A„Û A¤
j ,¯
AN\r (¬
 (¤
k ,ë
AN\r (è
 (à
k  6 
  6œ
  (A
j6  )œ
70  A0j  ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6˜
  Aj6”
  )”
78  A8jA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6
  Aj6Œ
  )Œ
7@  A@kA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6ˆ
  Aj6„
  )„
7H  AÈjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6€
  Aj6|  )|7P  AÐjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6x  Aj6t  )t7X  AØj
A<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6p  Aj6l  )l7`  Aàj Að
j$ x

 E@A
@ E\r ( (F\r  (" (kA	I\r@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak6A—%
#A k"$@@ E@A
!	
@@@@@@@@@@@@@@@ A
k
\n\r	A<t"B7 A
6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6Œ  Aj6ˆ  )ˆ7  AjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,@ 
E\r 
(!
 A:• AA
 
 
A
L"
 
ANA0r:” A”j\\"
A÷ÿÿÿO\r@@ 
AO@ 
Ar"A
jt!  Aÿÿÿÿk6€  6ø
  
6ü

  
:ƒ Aø
j! 
E\r
 
E\r  A”j 
ü\n 
 jA: AìÚ6˜ A¤
j AjAìÚ A˜j@ (¤
"Aj"
 Aø
jF\r ,ƒ! ,AH@ 
 (ø
 Aø
j AH" (ü
  {
 AH@ 
 (ø
 (ü
|
 
 (€6 
 )ø
7 ,ƒAN\r (€ (ø
k  6ô
  Aj6ð
  (A
j6  )ð
7  Aj  ("A
k6 \r\r  ((
 r\rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6ì
  Aj6è
  )è
7  AjA<t"B7 A 6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
("E\r 
("E\r A÷ÿÿÿO\r\r@ AO@ Ar"A
jt!
  Aÿÿÿÿk6€  
6ø
  6ü

  :ƒ Aø
j!
 @ 
  ü\n 
 jA: (ü
 -ƒ"
 
ÀAH@ AÜÛ Aø
j ,ƒAN\r (€ (ø
k  6ä
  6à
  (A
j6  )à
7   A j  ("A
k6 \r  ((
 rA<t"B7 A\r6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6Ü
  Aj6Ø
  )Ø
7(  A(j\nA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
("
A
F\r Aø
j 
} AÄÛ Aø
j ,ƒAN\r (€ (ø
k  6Ô
  6Ð
  (A
j6  )Ð
70  A0j  ("A
k6 \r	  ((
 r	A<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
(E\r A¬Û Aø
jAž" ,AH@ ( (k A¸Û Aø
jAžA¾ 
-Aß
qAØF"
 
,AN\r 
( 
(k  6Ì
  6È
  (A
j6  )È
78  A8j  ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r@ 
- "E\r A:¥
  :¤
 AÛ Aø
j A¤
j" ,AN\r ( (k 
("E\r 
("E\r A÷ÿÿÿO\r	@ AO@ Ar"A
jt!
  Aÿÿÿÿk6€  
6ø
  6ü

  :ƒ Aø
j!
 @ 
  ü\n 
 jA: (ü
 -ƒ"
 
ÀAH@ A Û Aø
j ,ƒAN\r (€ (ø
k  6Ä
  6À
  (A
j6  )À
7@  A@k  ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6¼
  Aj6¸
  )¸
7H  AÈjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r Aø
j 
(} AÐÛ6˜ A¤
j AjAÐÛ A˜j@ (¤
"Aj"
 Aø
jF\r ,ƒ! ,AH@ 
 (ø
 Aø
j AH" (ü
  {
 AH@ 
 (ø
 (ü
|
 
 (€6 
 )ø
7 ,ƒAN\r (€ (ø
k  6´
  6°
  (A
j6  )°
7P  AÐj  ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r A:€ BãÞ±›ô­·ô7ø
 A:ƒ A¤
j 
(}  Aø
j6” A˜j Aj" Aø
j A”j@ (˜"Aj" A¤
jF\r ,¯
! ,AH@  (¤
 A¤
j AH" (¨
  {
 AH@  (¤
 (¨
|
  (¬
6  )¤
7 ,¯
AH@ (¬
 (¤
k ,ƒAH@ (€ (ø
k At"6ø
 BŒ€€€€‚€€€7ü
 Aã	(6 AÛ	)7 A: A¤
j 
(}  Aø
j6” A˜j  Aø
j A”j@ (˜"Aj" A¤
jF\r ,¯
! ,AH@  (¤
 A¤
j AH" (¨
  {
 AH@  (¤
 (¨
|
  (¬
6  )¤
7 ,¯
AH@ (¬
 (¤
k ,ƒAH@ (€ (ø
k At"6ø
 BŒ€€€€‚€€€7ü
 AÖ	(6 AÎ	)7 A: A¤
j 
(}  Aø
j6” A˜j  Aø
j A”j@ (˜"Aj"
 A¤
jF\r ,¯
! ,AH@ 
 (¤
 A¤
j AH" (¨
  {
 AH@ 
 (¤
 (¨
|
 
 (¬
6 
 )¤
7 ,¯
AH@ (¬
 (¤
k ,ƒAN\r (€ (ø
k  6 
  6œ
  (A
j6  )œ
7X  AØj  ("A
k6 \r  ((
 rA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6˜
  Aj6”
  )”
7`  AàjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6
  Aj6Œ
  )Œ
7h  AèjA<t"B7 A6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6ˆ
  Aj6„
  )„
7p  Aðj
A<t"B7 Aì6 B7 B7 B7  A6( B74 B€€€ü7, AA AF6@ 
E\rA„\n! 
(A
k"AM@ At(Ü! A:ƒ A:ý
 A„\r(6ø
 Aˆ\r-:ü
 \\"A÷ÿÿÿO\r@@ AO@ Ar"A
jt!
  Aÿÿÿÿk6¬
  
6¤
  6¨

  :¯
 A¤
j!
 E\r
 E\r 
  ü\n  
jA:  Aø
j6” A˜j Aj Aø
j A”j@ (˜"
Aj" A¤
jF\r ,¯
! 
,AH@  (¤
 A¤
j AH"
 (¨
  
{
 AH@  (¤
 (¨
|
  (¬
6  )¤
7 ,¯
AH@ (¬
 (¤
k ,ƒAN\r (€ (ø
k  6€
  Aj6|  (A
j6  )|7    ("A
k6 \r  ((
 r A j$ 	 
#Ak"$@ ( ,"
 
AHE\r (" (F\rA<t"
B74 
B€€€ü7, 
A6 
Aì6 
B7 
B7 
B7$ 
 Aj")7 
 (6 A: A: Ak(!  
6  
Aj6 A$j Aj@ ("
E\r 
 
("A
k6 \r 
 
((
 
r ,AH@ (A: A6
 A: A: Aj$ª

~A
!@@@ (Ak


























 ( ,"
 
AH"
"E\r
  ( Aj 
"j!
 !@@ 1"B?V\rB
 †B€Ì€€ƒP\r A
j" 
G\r
  kAFA! Ã	
	#Ak"$ ("(" ("kAu!@  F\r@  
Atj(E\r
 
A
j"
 G\r !
@ 
 O\r@  A
k"Atj(@ " 
K\r
A<t"B7 A
6 Aì6 B7 B7 B7  A6( B74 B€€€ü7,  6  Aj6 A0j!  
At"j!  At"
j!@ 
 kAu"	 (" ("kAuM@ ("
 k"Au 	I@  j! 
 G@@ (!
 ("@  (A
j6  
6 (!
  6@ 
E\r 
 
("A
k6 \r 
 
((
 
r Aj! Aj" G\r (!
 
!  G@@  (6  ("6 @  (A
j6 Aj! Aj" G\r  
  
kj6  G@@ (! ("
@ 
 
(A
j6  6 (!  
6@ E\r  ("
A
k6 
\r  ((
 r Aj! Aj" G\r (!
 
 G@@@ 
Ak("E\r  ("A
k6 \r  ((
 r  
Ak"
G\r  6
 @ ! (" G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak"G\r ( (!  6 k A6 B7A!@ 	A€€€€O\rAÿÿÿÿ
 Au" 	  	K AøÿÿÿO"A€€€€O\r  At"t"6  6   j6  G@@  (6  ("6 @  (A
j6 Aj! Aj" G\r  6
 ( Aj@ ("E\r  ("
A
k6 
\r  ((
 r ("(! (!  G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak"G\r  6 Aj$Aî\n

A
"AðØ6 A°ÙAç
#A k"$ ($" (("
G@@ ( Aj" 
G\r@ (AG\r ($" (("F\r !@@@@ (("
AkAI\r@ 
!





  k"AH\r
  t"
6  
6  
 j6 A6 B7  Aj6  Aj6@ Aj!@@ ((!















  Aj!    Aj"G\r Aj" G\r
  ($"@ "
 (("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak"G\r ($!
  6( (, 
k  (6$  (6(  (6, A6 B7 ("E\r "
 ("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak"G\r (!
  6 ( 
k ("E\r "
 ("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
r  Ak"G\r (!
  6 ( 
k A j$Þ

#Ak"$ @ 
("E\r (" (F\r Ak(! 
("@  (A
j6 Aj!  6  6 A$j Aj@ ("E\r  ("A
k6 \r  ((
 r  
@ 
("
E\r 
 
("A
k6 \r 
 
((
 
r Aj$ª} (  ,"AH""\n!	 (  "!#Ak"$ !@ AO@ 	(A•ÓÇÞl"Av sA•ÓÇÞl A•ÓÇÞls! Ak! 	Aj!	
@@@@ A
k
 	-At s! 	-
At s!  	-sA•ÓÇÞl! Aj$ A\rv sA•ÓÇÞl"Av s"!	 @ 
("E\r 
( A
k q i"A
M\r   I\r  p"Atj("E\r ("E\r A
k! A
K!@@ 	 ("G@@ E@  q!
  I\r  p!  F\r
 ( ," AH G\rA ( Aj AH! \n!@@ "AO@  rAq\r
@ ( (G\r Aj! Aj! Ak"AK\r E\r
@ -"\r -"F@ A
j! A
j! A
k"\r
 \r k
AE\r ("\rA t" 	6 A6 Aj!@ (",AN@  (6  )7
 (!\n@@@ ("A\nM@  :
 A÷ÿÿÿO\r
 Ar"A
jt!  Aÿÿÿÿk6  6  6 ! A
j"@  \n ü\n
u A6 B7 
*! 
(A
j³!@ @  ³” ]E\r
@A  A
kqAG AIr A
tr"  •ü
"  K"A
F\r   A
kqE\r o" 
("M@  O\r
 
(³ 
*•ü
! @ AI\r iA
K\r A
A  A
kgkt AI
 o"  K" O\r
 
!@@ "@ A€€€€O\r
 At"t!\n (!  \n6 @ ( k (!\n  6 @ \nA ü ("E\r Aj! (!@ i"A
M@  A
kq!
  I\r  p! \n Atj 6 ("E\r A
k! A
K!\r@ (!@ \rE@  q!
  I\r  p!@  F@ !
 \n Atj"(E@  6 ! !
  (6  ((6 ( 6 ("\r (! A6 @ ( k A6
 
(" A
k"qE@  	q!
  	K@ 	!
 	 p!@ 
(" Atj"	("E@  
(6 
 6 	 
Aj6 ("E\r
 (!@  A
k"	qE@  	q!
  I\r  p!  Atj 6
  (6  6 
 
(A
j6A
:  6Ÿ

#Ak"$  
6 Aj Aj 
 Aj@ ("Aj"
 F\r ,! ,AH@ 
 (  AH" (  {
 AH@ 
 ( (|
 
 (6 
 )7 Aj$}
 
\\"A÷ÿÿÿI@@@ AO@ Ar"A
jt!  Aÿÿÿÿk6  6  6
  : ! E\r
 E\r  
 ü\n  jA: Î

#Ak"$ @ 
("E\r ( ("F\r Ak(! 
("@  (A
j6  6  6 A$j Aj ("E\r  ("A
k6 \r  ((
 r@ 
("
E\r 
 
("A
k6 \r 
 
((
 
r Aj$
 (" ("I@  
(6  
(6 
B7  Aj6@  ("k"Au"A
j"A€€€€I@Aÿÿÿÿ
  k"Au"   I AøÿÿÿO" A€€€€O\r AttA" j" 
(6  
(6 
B7  Atk!
 @ 
  ü\n   Atj6  Aj"6  
6 @ k  6Ú
#A0k"
$ ("(" ("G@ !@@@ (E\r
 Aj" G\r@ (  Aj" G\r
A<t"B7 A
6 Aì6 B7 B7 B7  A6( B74 B€€€ü7, 
 6 
 Aj6 
A: 
AŒ\n(6 
A\n-: 
A: 
A: 
AôäÕ«6 
A: 
 
Aj6$ 
A(j Aj 
Aj 
A$j@ 
(("Aj" 
F\r ,AN@  
(6  
)7
  
A{ 
,AN\r 
( 
(k 
,AH@ 
( 
(k (! (0"@ " (4"G@@@ Ak("E\r  ("A
k6 \r  ((
 r  Ak"G\r (0!  64 (8 k A68 B70  (60  (64  (68 A6 B7 ( 
Aj 
("E\r  ("A
k6 \r  ((
 r ("(" ("G@@@ Ak("E\r  ("A
k6 \r  ((
 r  Ak"G\r  6 
A0j$ A÷Ú,AH@AôÚ(AìÚ(k AƒÛ,AH@A€Û(AøÚ(k AÛ,AH@AŒÛ(A„Û(k A›Û,AH@A˜Û(AÛ(k A«Û,AH@A¨Û(A Û(k A·Û,AH@A´Û(A¬Û(k AÃÛ,AH@AÀÛ(A¸Û(k AÏÛ,AH@AÌÛ(AÄÛ(k AÛÛ,AH@AØÛ(AÐÛ(k AçÛ,AH@AäÛ(AÜÛ(k Aì6  Aì6 k•
#Ak"$ Aj"
($"@ " 
(("G@@@ Ak("E\r  ("A
k6 \r  ((
 r  Ak"G\r 
($! 
 6( 
(, k 
Aj"("@@ (! ,AH@ ( (k ,AH@ ( (k k "\r (! A6 @ ( k 
,AH@ 
( 
(k Aj$ kµ
 (!@@@@@@@@@@@@ ( Ak
  
A
j"M@  
6A A
k! (!@@ 
! !
@  j"-"A<G@ A\nk


 
 j-A/G\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r  j-A>F\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÓG\r -"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r  j-A>F\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÓG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÙG\r -"A k  AákAÿ
qAIAÿ
qAÌG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r  j-A>F\r A\nj" O\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAØG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -	"A k  AákAÿ
qAIAÿ
qAÁG\r  j-A>F\r\r 
A
j" G\r !  6A 
Aj" O\r Ak! (!@@ 
 j"-A\nk\n\n /A­Ús -A>srE\r 
Aj! 
A
j!
  I\r !
 
Aj" O\r Ak! (!@@ 
 j"-A\nk		 /A¿üF\r 
Aj! 
A
j!
  I\r !
 
A
j" O\r A
k! (!@@@ 
 j-"A\nk	

	 A>F\r 
Aj! 
A
j!
  I\r !
 
Aj" O\r Ak! (!@@ 
 j"-A\nk /Aݺ
s -A>srE\r 
Aj! 
A
j!
  I\r !
@@ 
 O\rA! ( 
j-A\nk


  
6 ( !   6A  6A  6A  6A  
6A  A
j6A
Å
@  ("O\r 
 (˜O\r @ (" j-"E\r A>F@ A>:  
6  -
Aü
q:
 A
j! 
A
j A?K\rB
 ­†B€€€€€ƒP\r  A
j"K@  j-A	k"AK\r
A
 tA“€€qE\r
  :  
6  -
Aü
q:
 
A
j
A! A6  A	j"   I"\nO\r
A! !@@  j-"	A0kAÿ
qA	K\r
  	 A\nljA0k"6 A
j" \nG\r \n!  M\r
  O\r
@  j-"	A)k  A
j"K@  j-A	k"AK\rA
 tA“€€qE\r  	:  
6  -
Aü
q:
 
 k jA
j6  6A
! ç

 
 ("H@@A!@@@A
 (ΠAlj"Ak"-A)kt"AqE@ A!qE\r
A! Ak(!A! Ak-Aq@ ( j,!A! A  A1\r
  A ,A1\r
 AA
 Ak-"AqA AvAqA1E\r
A!   (A
k"6 
 H\rAÚ
#A0k"$@ (ü"
E\r@@@ 
("Aÿ
qAk
 A€qE\r
 
(" (O\r ( j-AÛG\r@ 
("E\r 
Aj! A<j!@@  Atj"(!
@@ -AqE@ (!\n
 (!\n 
A
j" (O\r 
 \nj-AÛG\r  \nj-AÞG\r 
Aj"\r ("O\r  k! \r!@@  \nj-"A	k"AMAA
 tA€€q\r@ AÛk

  A
j"G\r
  \rF\r AÝG\r A
j" O\r  \nj-A:G\r@ Aj" O\r@  \nj-A	k"
AK\r
A
 
tA€€qE\r
 A
j" I\r !A
!
@ AI\r@@  
Atj"("Aj ("O\r  \nj"	-AÛG\r 	-
AÞG\r Aj"!  M\r@@  \nj-"	A	k"AMAA
 tA€€q\r
@ 	AÛk A
j" G\r !  M\r A
j"	 O\r  \nj-AÝG\r 	 \nj-A:F\r 
A
j"
 G\r !
@@@ 
A
k" 
 
A
K 
  O"At"j"E@ ($"
E\r
Aä (, 

@ 
 K@ E\r
  Aj ü\n
  6  (6 
AI\r At"E\r Aj Aj ü\n (X! (`" (d"I\r  A
v jA " (\\ll"\r
 ($"
E\rAõ (, 
 kA!  6d  6X (`!  \rk! \n \rj!\r  (\\"	 lj! 	@ A 	ü  6  \r6  \r 36  (`A
j6`  6  6 
AH@A! 
 j!
 
 \nj-AÛG\r
 
A
j!A!	  k" AGk!A!A!A!A!@Aç  AçL!  Atj(!@@@@@  I@@@@  \nj"
-AÛk
 A
j" ("O\r
@  \nj-"A!kAÿ
qAI\r Aÿ
qA\nku   	!   	! Aj"	 (! 
  k A,j4"AÿM\rA!A!
@@@ 
 jAm"AtA j("\rAu j"AtA j(Aÿÿÿq K@ A
k!

  \rAvA
q j"AtA j(AÿÿÿqM\r
 A
j! 
 N\r
 AN\r  F\r A
j!  A
j"Atj(! 	 M\r A
j"
 O\r 
 \nj-A:G\r@  Aj"
K@@ 
 \nj-A	k"AK@ !A
 tA€€qE@ ! 
A
j"
 G\r A
j" O\r  Atj"
(! 
(!
  
6  
  Aj A(j A$j5E\r   Atj"  k ( Aj Aj Aj A j Aj6! (!
@ E\r 
  ("Atj(I\r (" j!   j"Atj(!  F
  
6  
6 A!A
! 
 I\r@@@@  G@   	  AtjA  A,j Aj7"
\r   (,"\r (8"E@ \rk  -A
r:
   \n j 	 k8"E\r@ E@  (  (  AtjA\n Aj" Aj7! -!
 \r  
Ar:
  ( "
 (j6  ( 
k6  ((6  ($6 A
j!
 
AN\r
A!\r 
A
q (k - 
Aq@ (kA! 
 j! 
E\r A	F\r
 A F\r
 AkAI\r
   	!   	! (, j!	 (, j!  F!
 A
j! 
E\r
  I\r
 @  F@ A6ü  (€ AtkAk6€ At!  kAt"
@   j 
ü\n (ü"
 
( k6  (€ k6€
 (ü"
\r 
(!@ AÿqA†F@ 
("AI\r
 
 A
k6  (€Ak6€ A6ü
 
 A€~qA	r6 A0j$ ¡
@ 
("E\r 
 Al"Av6 
 A|qj"6@@@ E@ ($"E\r
Aä (, A 
("At"@ A ü 
("E\rA!@@ 
( 
(" 
(" lj"( 
(pAtj"("E@  6
@  I\r    ljO\r ( ( ( (AE\r
Aj"E@ ($"E\rAä (,   6  6 B‚€€€ 7  6
 (" ("O@  A
v j"AtAjl"E@ ($"E\rAõ (, A  6 
( ( 
(pAtj 6 (!  Atj 6  A
j6 A
j" 
("I\r
A 
(! E\rA!@@ 
( Atj("E\r 
(" M@   
( 
(ljI\r
 Aj" (AARA
! (AI\r@@  Atj"Ak"("( ("(G\r ( ( ( (A\r  (6 A
j" (I\r A
j" 
(I\rAõ

 (ˆE@A@ (€"Aj" („"
J@ A€ 
A
v 
j 
AL"
6„ (ø 
l"
E@A ($"E\rAõ (, A (ü"@  
  (økj6ü  
6ø  (€"Aj6€  6€ (ø"
\r
A 
 j"
A;
 (ˆ! 
A6 
 AtAr6 A6ˆAæ

A!@ 0\r .\r@ (€"Aj" („"J@ A€ A
v j AL"6„ (ø l"E@ ($"E\rAõ (, A (ü"@    (økj6ü  6ø  (€"Aj6€
  6€ (ø"E\r
  j" 6  At 
r Atr6A! Å
 („! (€!@@@@ (ü"-AkA
M@  Aj"H@A! A€ A
v j AL"6„ (ø l"E@A ($"E\rAõ (, A (ü"@    (økj"6ü  6ø  (€"Aj6€  6€ (ø"\r
  Aj"H@A! A€ A
v j AL"6„ (ø l"E@A ($"E\rAõ (, A (ü"@    (økj"6ü  6ø  (€"Aj6€  6€ (ø"\rA  j" 
(6
  j" 
(6  
(6  
(6  (A
j6A•
\n#A k"$AÅ»òˆx! 
 A 
?"K@@@@@  j"\n 
 k Aj4"AÿK@A!A!@@@  jAm"AtA j("Au j"	AtA j(Aÿÿÿq K@ 	A
k!
  AvA
q j"AtA j(AÿÿÿqM\r
 A
j!  L\r
 	AH\r
 A	F\r
 A F\r
 AkAI\r
 \n-A\nk


 A sA‘þ°l!   
?
  Aj@A! (At"@@  Aj j"-sA“ƒ€l -
sA“ƒ€l -sA“ƒ€l -sA“ƒ€l! Aj" G\r ( j" 
I\r A j$ Ý
@ -"À"AN\r Aà
qAÀ
F@ 
AI\r
 ,
"A¿J\r
  A6 -! -
 A?q AqAtr Að
qAà
F@ 
AI\r
 ,
"A¿J\r
 ,"
A¿J\r
  A6 -
! -! - 
A?q A?qAt AqAtrr 
AI\r Aø
qAð
G\r ,
"A¿J\r ,"
A¿J\r ,"A¿J\r @ A6 -! -
! -! -!
 A?q A?qAt AqAtr 
A?qAtrr  A
6 - ÀÒ
@@ ("	 
j-A<F@ 
 O\r 
A
j" O\r !@@@ 	 "
j-"AÜG@@@ A\nk

 A<k 
A
j!
 
A
j" O\r@  	j-"A!kAÿ
qAI\r A:kE




















































 
Aj!  I\r
  6  
6 
A
j!
 
 O\r
 
!@@@@@  	j-"AÜG@ A	k"AK\r
A
 tA€€q\r
 A
j" O\r@  	j-"A!kAÿ
qAI\r Aÿ
qA:kE




















































 Aj" I\r
 A I\r AÿF\r@@@ A(k
 AJ\r A
j!
 E\r A
k! A
j" I\r
 \r  
G\r
  
F\r  
6  6  6A
!\n \nà
@ 
(" K@ (! !	@ 	 j-A	k"\rAK\rA
 \rtA€€qE\r 	A
j"	 G\r AI@A 
(!	A
!\n  	F@A  \n6@@@@ (" 	j-"A"k
A\'!
A)!A
!  	A
j"	6  \nM\r@ 
 \nAtj(" 	K@@@@ 	 j-"\rAÜG\r 	A
j" (O\r  j-"A!kAÿ
qAI\r
 Aÿ
qA\nku


















 \rÀ F@  	6  	A
j6  \n6A
 	!  \rA(Fq\r A
j"	 I\r \nA
j"\n G\rA¸
@  
kj"\n@ \n!@   Atj("  I"	 
KA! 	 
"kAq"\r@@  ( j-: A
j! A
j! A
j" \rG\r 
 	kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" 	G\r 	 
 O\r  : A
j!  A
j"Atj(!
A ($"E\r
Aä (, A   \nk6  \n6A¶

 
(!@ 
(" 
("O  A
v jA " 
(ll"E@A! ($"
E\rAõ (, 
A 
 6 
 6 
(  
("l j! @ A ü  6  6   36 
 
(A
j6 â
#Ak"\n$ B7 B7 B7 B7@@@@@ @@ 
 j-"E\r A&F\r AÜF\r A
j" G\r 
!  6 B7 B
7  6  Aj"
6  Aj"6
  j"6 E\r
A!A!@@ 
 j"	-"A&G@ \r
  A
 G\r ( j 	-: A
j! A
j 
   \nAjHE\r  A G\r \n(" k"@ ( j 	 ü\n  j! 
@ ("@ ( AtjAk(E\r
  A G\r@ \r 	-AÜG\r A
j" O\r@ 
 j-"	A!kAÿ
qAI\r 	Aÿ
qA\nku


































































































 ! ( j 
 j-: A
j! A
j" I\r ("
 (Atj 6 (! (! !  
6  6  6  6A! ($"E\rAä (, A! (E\r (k (k (k \nAj$ â
 E@A@@  	Alj"("AO@@ 
A€9A (, ( "\r A J! Ak! \r @ 
A€9  (, ( "\r@ (" ("F\r  k! ( j!A!@A
!@@  O\r@@  j-E\r
 A
j" G\r !
 ! E\r
 
   (, ( "\r  k"E\r  j!A
!A
AØA
 (, ( "E\r 
A×A
 (, ( "\r
 	A
j"	 G\rA ($"@A´ (,  ã
#Ak"\n$ \n 6 \n 6@  \nAjA
A
E"\r (ÔAtAjj"	E@A! ($"E\r
Aä (, 
 	 6A
! (Ø"AN@ (t!@ 	 Atj  Alj"(6 A
j! ("AN\r 	 Atj A
j6@@@A\rA (, ("E@A!@ E\rA!@ 	 A
j"Atj("A
k" K@  
  Atj(  I"\r A
j!  O\r
 !  J\r  L\r    H!
 ($"E\rAš (, @  
  Atj(AAI"\r A
j" G\rA\rA (, ("E@A!
 ($"E\rA¿ (,  	! k B7Ø \nAj$ ™ 
~#A@j"	$@  
 AE"\r 
 AtjAk(!\r (t! 
(!@ "Aj! -AqE\r 	Aj!@@@@@  
(" ("  K"O@ !
  ( j  k (, ( "\r
 (!  M\r
 ! ($"E\rA´ (, A!@@ ,"AH\r !\n !@@@@@@@@@@@@@@@@@@@ Aÿ
qA
k
\n	\r\rA
!@ ( jA
j"-A\nk !  A
 (, ( "E\r ($"E\rA´ (,  AÕA
 (, ( "E\r ($"E\rA´ (,  (,! -Aq@AA  ("E@A! ($"E\rAÒ (, A!AA  ("E\r ($"E\rAö (,  -\rAÀqE\r (!@@ -Aq@  K\r
  K\r
@A\nA (, ("E@ A
j" (I\r
 ($"E\rAÒ (, @A\nA (, ("E@ A
j" (I\r
 ($"E\rAö (,  -Aq\r\r (" A
jK@@A
A (, ("@ ($"E\rAö (,  Aj! Aj!  ("I\r  kA
qE\r !AA (, ("E\r ($"E\rAö (, @ ( kA
G\r -AqE\r (,! -Aq@A\rA  ("E\r ($"E\rAÒ (, A\rA  ("E\r ($"E\rAö (,  (,! -Aq@AA  ("E\r ($"E\rAÒ (, AA  ("E\r ($"E\rAö (,  (,! -Aq@AA  ("E\r ($"E\rAÒ (, AA  ("E\r\r ($"E\rAö (,  ( kAG\r (,! -Aq@AA  ("E\r\r ($"E\rAÒ (, AA  ("E\r ($"E\rAö (,  ( kAG\r\n (,! -Aq@AA  ("E\r ($"E\rAÒ (, AA  ("E\r ($"E\rAö (,  ( kAG\r	 (,! -Aq@AA  ("E\r ($"E\rAÒ (, AA  ("E\r\n ($"E\r\rAö (, \rA ( kA
qk! (,! -Aq@ A  ("E@A!\n ($"E\r\rAÒ (, \rA! A  ("E\r	 ($"E\rAö (,  (t (Alj!\n (t \n(Alj! \n,AH@ (! (! \n(! \n)! 	B78 	B70 	B7( 	B7  B7 B7 	 7@   j  kA  	A j9@A!
A 	Aj (, ("@ ($"E\r
AÒ (, 
A 	Aj (, ("E@A!
 ($"E\rAö (,  	(0@ 	( k 	($k 	((k \r  (6@ \n-"AÛG\r -AÝG\r \n(" \n("k"AI\r ( ("kAI\r (! 	B78 	B70 	B7( 	B7  	B7 	B7@   j  jAj AF"  k Ak A 	Aj 	A j9@A!
 (,! AÝG@A	 	Aj  ("E@A! ($"E\r
AÒ (, 
A	 	Aj  ("E@A!
 ($"E\rAö (,  	(0E\r 	( k 	($k 	((k  AÝGAA A!F \n(" (j \n( kA \n(( \n(0F"\r\n -AÝG\r (!@ 
"Aj!
  (K\r ! !
 -"A q\r AtAuAq! (t! ! -Aq"E@  (Alj! (! (!\n  (Alj"(! @  -A r:  \nj!  k!@@@ -"A.k

 -AÀqE\r
 (4! Aj"\n (8K@  \nA
v \njA€qA€
j"l"E@A! ($"E\rAõ (,   68  64 -! AàAº Aÿ
qA.F"(6  (6 @ (4Aj  ü\n (4! \n! -A qE\r  -AqA  A
AAF! (" F\rA ( j  k (, ( "E\r ($"E\rA´ (, A
AØA
 (, ( "E\r ($"E\rA´ (,  ! E\r (" kA
qAA (, ("@ ($"E\rAÒ (,  A
j! (  A
jM\r@A
A (, ("E@ Aj! Aj! ( K\r
 ($"E\rAÒ (,  ! (!@ "Aj! -%AqE\r (" I\r !  
("I\r  \rO@A!@ A}qAF@@@ (" K@ (! !@@  j-"A G A	Gq\r
 A
j" G\r !  I@   j  k (, ( "\r (! !  M\r ( j-A\nk

 ($"E\rA´ (,  AÕA
 (, ( "E\r
 ($"E\rA´ (, A!@@@ 
 (! !@@  j-"A G A	Gq\r
 A
j" \rG\r \r!@  M\rA  j  k (, ( "E\r ($"E\rA´ (, AA×A
 (, ( "E\r ($"E\rA´ (, @ \r -\rA€
q\r@  ("O\r (!@  j-"A G A	Gq\r
 A
j" G\r !  AjI\r
 ( j"Ak-A G\r
 A
k-A G\r
 -A\nk


A! A×A
 (, ( "E\r ($"E\rA´ (,   
("  I! 
Aj!
A! (Ð"AN@ (t!@  Al"j(k (t" j("AN\r A6Ð 	A@k$ 0

 
(!
 ("E@ 
AGA!  
K   
A
kKÎ
 A
j" 
  ("O@A@ Aj  ("\n j-A/F"" O\r  \nj-Aß
qAÁkAÿ
qAK\r@ A
j" O\r@@  \nj-"Aß
qAÁkAÿ
qAI\r A-F\r A0kAÿ
qA	K\r A
j" G\r !AA !  AGk!\r@@@  O\r@@  \nj,"Aÿ
q"A\nk@@ A)N@@@@ A)k
A)!@@@ \n







 A F\r
Aá APE\r A
k!A!A*A A\'G!A+A A"G!
@ A	k"	AK\rA
 	tA€€qE\rA
  A
M!
@ AJ"	\r A>G\r !@ 	\r@ A/G\r A
j" O\r \n j-A>F\r AL\r@ Aß
qAÁkAÿ
qAI\r AßF\r A:G\r
  A
j"M@A!@@@  \nj,"A0kAÿ
qA\nI\r A_qAÁkAÿ
qAI\r E@A!A  APE\r
A!  A
j"G\r
A!A!	@@ Ak
 A=G\r A
j!A!A+!@@@@ A"k



 E\r
Aá AP\r A\rF\rA)!
A*! A
j!  I\rA!	 E\r  \rF\rA
  A)FA
 ! 
 A
j"Atj"(! (" I\r
  M@AA
!	  A
j6 	„
#Ak"$@ 
 O\r@@@  
j"	  
k Aj4"AÿK@A!A!@@@  jAm"AtA j("\nAu j"AtA j(Aÿÿÿq K@ A
k!
  \nAvA
q j"AtA j(AÿÿÿqM\r
 A
j!  L\r
 AH\r
 A	F\r
 A F\r
 AkAI\r
 	-A\nk ( 
j"
 I\r Aj$ 
à
@@@ AÿK@A­!@@@  jAm"AtAÀj("Au j"AtAÀj("Aÿÿÿq K@ A
k!
  AvA
q j"AtAÀj(AÿÿÿqM\r
 A
j!  N\r
 AH\r
AÐ8! 
A
6 
 A r  AÁkAI6A!A4!@@@  jAm"AtAÀ1j("Au j"AtAÀ1j("Aÿÿÿq M@ AvA
q j"AtAÀ1j(Aÿÿÿq O@ AH\rAà8! A
j!
 A
k!  N\r
A!A!@@@  jAm"AtAÐ6j("Au j"AtAÐ6j("Aÿÿÿq M@ AvA
q j"AtAÐ6j(Aÿÿÿq O@ AH\rAð8! A
j!
 A
k!  N\r
 
A
6 
 6
 ( (" lAtj! At"@ 
  ü\n 
 6  F\r ( Aÿÿÿq"A
jF@ 
  sAsA
q j6 
 
(  kj6õ

	#A k"$ B7 B7 B7 B7 A 
?! A ?!	@@@ 
 K@
  	M\r
@ \nE@   
 AjC!A! A
qE@  	  C!	A!  Atj( Aj Atj(k"\r A
j" ("I! A
j" ("I!\n 
 K\r  I\r  	K\r  I\rA! A j$ i
A!@ ("(" 
("("I\rA
!  K\r ( ( ( (A"\rA! (" 
("
I\r  
K! ‰
#Ak"$@@@ 
 O\r  
j  
k Aj4! ( 
j!
 AÿK@A!@@@  jAm"AtA j("\nAu j"	AtA j(Aÿÿÿq K@ 	A
k!
  \nAvA
q j"AtA j(AÿÿÿqM\r
 A
j!  L\r
 	AN\r
 A	F\r A F\r AkAO\r
 A
6 A 6  
 ?!

  @ Aj$ 
D
 ("(" 
("
("I@A  K@A
 ( ( 
( 
(A›”

#A0k"$ A6x#A
k"$ AjAA€
ü@@ E\r A
k! A€
j! 
 AtjAk!@ 
 Atj"(!@ !@ !@ Aj" ("O@ !
 (!	@   	j"-j-@ !  -
j-@ !  -j-@ !   	j-j-@ ! Aj! Aj"!  K\r@  K@ (!@   j"-"	j-\r A
j" G\r A
j" I\r@A
A@@@@@@ 	AÜF@A! A
j" (O\r
@  j-"A!kAÿ
qAI\r@ Aÿ
qA\nku
















 A
j I\r Aj!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÜ ;
 B7  Aj"6  6A!@@@@@@@@@@@@ 	A!k\\\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\n\r	\r
\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r A
j"\r!\n@  \rM\r@  \nj- 	G\r
 \nA
j"\n I\r !\nA!A!A!  (F\r  N"AÿM\rA!A!@@@@  jAm"AtA j("Au j"AtA j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA j(AÿÿÿqM\r
 A
j!  N\r
A! AN\rA!Aä!@@@  jAm"AtA°9j("Au j"AtA°9j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°9j(AÿÿÿqM\r A
j!  N\rA! AN  k! !@@  j-"	AàG\r
 A
j" G\r !A
 	A F! !  k"A K\r At j("\r  AtjAk(O\rA!A
!@ E@ !	 !\n
 !\n \r "	I\r@@@@ 	 \nO\r@  	j-"\rA G@ \rAàF\rA! 	A
j"	 \nG\rA! \n
 	!\r 	 \nO@A! 	!@  \rj-AàG"@ 	! \r!	 \rA
j"\r \nG\r 	! \n!	@  	 k"\rF@A!\n  Atj"("\r I@  jA
k-A F!\n A
s  Gq\r \r  \rF \nrE\r E\r
 A
j@ 	 F\rA! \rAK\r \rAt jAj"\r  \r("\r  \rK6 \r
  A
j"M@A
!  Atj"\n(!	 \n(!\n
 (! \n@ A
k!
 Ak(" ("O\r@  j-"A G A	Gq\r
 A
j" G\r !@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"Aà;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"Aà;
 B7  	6  6 (t (x"Alj"Ak" Ak6 A(k" A
k6  -Ar:  -Ar:A! ! 	! ! 	 (M\r@@@ 
  jA
v"Atj"( 	K@ E\r
 
 AtjAk( 	I\r
 A
k! 	 (K\r
 ! 	! A
j!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"A¦;
 B7  A
j"6  6 (x"AL\r (t" AljAk-A&G\r (|" L@ AÀ A
v j AL"6|  All"E@A! ($"E\rAõ (,   6t (x!  A
j6x  Alj"A»;
 B7  A
j6  6 ("\n -AÀq\r\n    k"  \n Aj>\r ("	 AjM\r	 -
A!G\r	  Aj"j-A-G\r	 -A-G\r	A! (è" K  \nAkOq\r	@ Aj" 	 \n 	 \nI"\rM@  j"	/A­Ús 	-A>srE\r\r@@ A
j!	 Aj" \rK\r 	" j"	/A­Ús 	-A>sr\r
 	!  \nI  A
j"Kq@  Atj"(!	 (!
  6è (!	A
! -A
qE\r A
j" O\r  j-AüG\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"Aü;
 B7  Aj"6  6 ("Aj K\r  Ak"\rj"/A֔
s -A÷sr\r@  \rF\r  \rN"AÿK@A!A!@@@@  jAm"	AtA j("\nAu 	j"AtA j(Aÿÿÿq K@ A
k!
  \nAvA
q 	j"AtA j(AÿÿÿqM\r
 A
j!  N\r
 AN\rA!Aä!@@@  jAm"	AtA°9j("\nAu 	j"AtA°9j(Aÿÿÿq K@ A
k!
  \nAvA
q 	j"AtA°9j(AÿÿÿqM\r
 A
j!  N\r
 AH\r\r
 A	F\r A F\r A\rkA}K\r A!kAI\r A:kAI\r AÛkAI\r AÿG AúKqE\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"A®;
 B7  A
j"6  \r6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 Aj!@@ ("	Aj K\r  Ak"\nj(AèèуG\r  M\r /
A¯ÞF\r
@ 	Aj K\r  Ak"\nj"\r(Aèèуs \r-Aósr\r  M\r /
A¯ÞF\r
 	Aj K\r  Ak"\nj"/Aæè
s -Aðsr\r  M\r /
A¯ÞG\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"Aº;
 B7  6  \n6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 A
j! (A
j K\r	@ A
k-"Aß
qAÁkAÿ
qAO@ Aj O\r A0kAÿ
qA\nO\r
 Aj O\r\n  A
j"j-"A0kAÿ
qA\nO@ A_qAÁkAÿ
qAK\r\n@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÀ;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 A
j!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÝ;
 B7  A
j"6  6\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" 6A
!A

 A
j" O\r
  j-AÛG\r
@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" 6A!!A!  :  	: B7   j"6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÄ;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÄ;
 B7  6  6\n@@ E@  -\rA qAvq\r
 E\r
@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"A:  	: B7  A
j"6  6\n@@@@@@@@@@@AA@@AA@@@@@@@@@@@@@@ 	>\r"""""""""""""""""""""""""""""""
""""""""""""""""""""""" 	AÞF\r
 	AþG\r!A!	 A
j"\n!@  \nM"\r@  j-AþG"	\r
 A
j" I\r !  k"A
G\r ("A€€qE\r \rA!	A!  \nj ( \nkA4"AÿK\r A	F\r A F\r AkA
M\rAA! A
j" I\r	 -AqE\r A
j"!@  M\r@@  j-AÞG\r
 A
j" I\r ! !  kA
G\r%A!	A!  j ( kA4"AÿM@ A	F\r
 A F\r
 AkA
M\r
A@@@  	jAm"AtA j("\rAu j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q j"AtA j(AÿÿÿqM\r A
j!	  	N\rA \nAN\rA
A!  (F\r  N"AÿM\rA!A!@@@  jAm"	AtA j("\rAu 	j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\r ! \nAN\r ! -A qE\r A
j" O\r@  j"	-A=F@  A
j"K\r
 !  kAG\r"A!A!AA 	 ( kA4"AÿM@A! A	F\r A F\r AkAI
@@@  jAm"	AtA j("\rAu 	j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! -A€
qE\r A
j" O\r@  j"	-A+F@  A
j"K\r
 !  kAG\r!A!A!AA 	 ( kA4"AÿM@A! A	F\r A F\r AkAI
@@@  jAm"	AtA j("\rAu 	j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\rA!\n \nAN!@@@  	jAm"AtA j("Au j"\rAtA j(Aÿÿÿq K@ \rA
k!
  AvA
q j"AtA j(AÿÿÿqM\r A
j!	  	N\rA \rAN\rA
A!  (F\r\r  N"AÿM\rA!A!@@@  jAm"	AtA j("Au 	j"\rAtA j(Aÿÿÿq K@ \rA
k!
  AvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\r ! \rAN\r\r ! ! AK\r (! ! A€qE\rA!  (M\r	  N"AÿM\rA!\nA!@@@@  \njAm"\rAtA j("Au \rj"AtA j(Aÿÿÿq K@ A
k!
  AvA
q \rj"\nAtA j(AÿÿÿqM\r
 \nA
j!\n  \nN\r
 AN\r\nA!\nAä!@@@  \njAm"\rAtA°9j("Au \rj"AtA°9j(Aÿÿÿq K@ A
k!
  AvA
q \rj"\nAtA°9j(AÿÿÿqM\r \nA
j!\n  \nN\rA! AN@  j-A$F@  A
j"K\r
A
! !  kAK\rA!  (M\r  N"AÿM\rA!A!	@@@@  	jAm"\nAtA j("Au \nj"\rAtA j(Aÿÿÿq K@ \rA
k!	
  AvA
q \nj"AtA j(AÿÿÿqM\r
 A
j!  	L\r
 \rAN\rA!Aä!	@@@  	jAm"\nAtA°9j("Au \nj"\rAtA°9j(Aÿÿÿq K@ \rA
k!	
  AvA
q \nj"AtA°9j(AÿÿÿqM\r A
j!  	L\rA!\r \rAN@ A
j" O\r@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" I\r ! 	A F@ !  kAI\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\r Aõ (,    A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"A:  	: B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"A€ ;
 B7  A
j"6  6 A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr!@ E\rA!	A!@  j" ( k"A4"AÿM@ A	F\r A F\r AkAO\r
@@@  	jAm"AtA j("\rAu j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q j"AtA j(AÿÿÿqM\r
 A
j!	  	N\r
 \nAN\r
A!Aä!  A4"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"	AtA°9j("\rAu 	j"\nAtA°9j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA°9j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! !  A
q "E\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" : A$: B7  6  6 A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr!@ 	E\rA!	A!@  j" ( k"A4"AÿM@ A	F\r A F\r AkAO\r
@@@  	jAm"AtA j("\rAu j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q j"AtA j(AÿÿÿqM\r
 A
j!	  	N\r
 \nAN\r
A!Aä!  A4"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"	AtA°9j("\rAu 	j"\nAtA°9j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA°9j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! !  A
q "E\r@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" : Aþ: B7  6  6 A	F\r A F\r AkA
M\r !
A
! ! A
qE\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t All"	\r
A! ($"E\rAõ (,   A
j6x (t"	\r
A!  	6t  (x"A
j6x 	 Alj" : Aþ: B7  \n6  6A! !  kAG\r@@  (F\r  N"AÿK@A!A!@@@  jAm"	AtA j("\rAu 	j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\r ! \nAN\r
 ! A	F\r A F\r AkA
M\r !
A
! ! A
qE\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t All"	\r
A! ($"E\rAõ (,   A
j6x (t"	\r
A!  	6t  (x"A
j6x 	 Alj" : A+: B7  6  6A! !  kAG\r@@  (F\r  N"AÿK@A!A!@@@  jAm"	AtA j("\rAu 	j"\nAtA j(Aÿÿÿq K@ \nA
k!
  \rAvA
q 	j"AtA j(AÿÿÿqM\r A
j!  N\r ! \nAN\r
 ! A	F\r A F\r AkA
M\r !
A
! ! A
qE\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t All"	\r
A! ($"E\rAõ (,   A
j6x (t"	\r
A!  	6t  (x"A
j6x 	 Alj" : A=: B7  6  6 A	F\r A F\r AkA
M\r !
A
! ! A
qE\r	@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t All"	\r
A! ($"E\rAõ (,   A
j6x (t"	\r
A!  	6t  (x"A
j6x 	 Alj" : AÞ: B7  6  6	@ Aj" 	O\r -
A?G\rA!@ (ì" M@ !
 !  \nAkO\r
 Aj" 	 \n 	 \nI"\rM@  j/A¿üF\r@@ A
j!	 Aj" \rK\r 	" j/A¿üG\r
 	!  \nI  A
j"Kq  Atj"(!	 (!
  6ì (!	@ 	 M\r -
A!G\r  j-Aß
qAÁkAÿ
qAK\r@ Aj" 	O\r@  j-Aß
qAÁkAÿ
qAK\r
 A
j" 	G\r 	!A! (ð" K  \nA
kOq\r A
j" 	 \n 	 \nI"\rM@  j-A>F\r@@ A
j!	 Aj" \rK\r 	" j-A>G\r
 	!  \nI  A
j"Kq  Atj"(!	 (!
  6ð (!	@ A	j" 	O\r )B¼ÂìšÄ¨ªÁ… 1Bۅ„BR\rA!\r (ô" K  \nAkOq\r@ Aj" 	 \n 	 \nI"	M@  j"/Aݺ
s -A>srE\r@@ A
j! Aj" 	K\r  "j"/Aݺ
s -A>sr\r
 !  \nI  \rA
j"\rKq@  \rAtj"(!	 (!
  6ô (!\n ! A
j" \nO\r@ Aj" \nO\r  j-"	A0kAÿ
qA\nIA
 	Aß
qAÁkAÿ
qAIE\r@  j-"A0kAÿ
qA\nI\r Aß
qAÁkAÿ
qAI\r A+k"AK\r
 A
F\r
 Aj" \nF\r@  kA K\r
  j-"	A:F@  \nO\r@  j-"	A	k"AMAA
 tA€€q\r 	A>G@ 	A I\r 	A<F\r 	AÿF\r A
j" \nG\r
A0!	 A
j@ 	A0kAÿ
qA\nI\r 	Aß
qAÁkAÿ
qAI\r 	A+k"	AK\r 	A
F\r A
j" \nG\r !@@@  j,"	A0kAÿ
qA\nI\r 	A_qAÁkAÿ
qAI\r 	E\rA‹ 	APE\r
 \n A
j"G\r
\n !  M\r 	AÀG\rA!	 A
j"\r \nO\r@@@@  \r"j-"\rA0kAÿ
qA\nO@ \rA_qAÁkAÿ
qAK\r
 	A
j!	
@ 	AL"\r \rAÿ
qA-G\r 	A
j!	
 \r
 \rAÿ
qA.G\r
A!	  j-A-F\r 	A?J\r\n \n "A
j"\rK\r
\n ! \r \rAÿ
qA>G\r  j-A-F\rAð!	 Aj!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\r\rAõ (, \r  A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" 	Ar: A<: B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\r\rAõ (, \r  A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" 	Ar: A>: B7  6  A
k6 (t (x"Alj"Ak Ak6 Ak A
k6 ! !  6@@@ (x" (|"N@ AÀ A
v j AL"6| (t All"E\r  6t  (x"A
j6x
  A
j6x (t"E\r  Alj"A¼(;
 B7  6  6@ (x" (|"N@ AÀ A
v j AL"6| (t All"E\r  6t  (x"A
j6x
  A
j6x (t"E\r (!  Alj"A¾0;
 B7  6  6 (t (x"Alj"Ak Ak6 Ak A
k6A! !  (M\r@@ 
  jA
v"Atj"( K@ E@ !  
 AtjAk(K@ ! A
k!
 ( O@ !\n A
j!  M\rA! ($"E\rAõ (, A! A
j! A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr"! A
s 	AßFq!@  \nF\rA!A!@  \nj" ( \nk"A4"AÿM@ A	F\r A F\r AkAO\r
@@@  jAm"AtA j("Au j"AtA j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA j(AÿÿÿqM\r
 A
j!  N\r
 AN\r
A!Aä!AA
A  A4"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"AtA°9j("Au j"AtA°9j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°9j(AÿÿÿqM\r A
j!  N\rA! AN"A
q As qA
q"!A  ! ! \n!  rE\r  kAp!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj" AtA# AG  LqAA  NA AJr" AFrA@k:  	: B7  \n6  6 \n \r"M\r@@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x  Alj"AÄ;
 B7  \r6  \r6 \rA
j"\r \nI\r ! \n!@@ (x" (|"N@ AÀ A
v j AL"6| (t All"\r
A! ($"E\rAõ (,   A
j6x (t"\r
A!  6t  (x"A
j6x (!  Alj"Aÿ ;
 B7  6  6A! A
j$@ "	\r  
A (xAÏAJ@ (à"AN@ A
k!\r A€j! AØj! Aj!@ (t" Al"j"	(!@ 	-"AÄF\r 	(!A!A! AN@   Alj"(Alj! Al! 	(! 	-A q@ 	A!: 	 A
k"6A!!  j!  I@ ( I\r
  I@ ( I\r
@  I@ A!G\r
 AÛG\r (A€€ÀqE\r 	(" (O\r ( j-AÞG\r 	 A
j"6 (t j"(" M\r  ( j  kK"E\r ("E@  (pA
j"6p  6  (A
j6 	 6 	 (6 	 	-A”
r:  -A˜
r: (! 	(! 	(@@@@ -\rA qE\r 	-AÛG\r E\r 	(" 	("kA
G\r -AÛG\r
 E\r
 ( ("kA
G\r
 -AÝG\r
  A
kG\r
 ( ("kA
G\r
  (A
jG\r
@@ A
j" N"@ !
 (t! !@@  Alj"\n-"AÄF\r AüF\r \n( kAäK\r \n-AqE\r \n(! A
j" H\rA!\n \n  \n(" F\r  kAäK\r  I@ (!@@  j-A\nk A
j" G\rA!@   Atj"("L@ (t!@  Alj(" N\r  6  ("L@ (t!@  Alj(" N\r  6 Aj"AG\r \n@@ \n( (I@@  L\r  kAk! (t!A!  AsjAq"@@  AljAÄ;
 A
j! A
j" G\r AI\r@  Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" G\r \n \n-Ar: 	 \n(6
@ \r  kAk! (t!A!  AsjAq"@@  AljAÄ;
 A
j! A
j" G\r AI\r@  Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" G\r  \n(6 	 (6  (6 (t" j" 6  j" 6  -Ar:  -Ar: (! 	(!  
 A
j L ( 	 (6  (6 (t" j" 6  j" 6  -Ar:  -Ar: (! 	(! ( \r (!
 (" ("G\r ( A
jK@ -AÀq\r  
   ( AjM
 	-AÀq\r  
  	(  AjM"AH\r E\r  (6 (t Alj(!
@  ("O\r (" j-A(G\r A
j!\nA! \r!@@@ 
  jA
v"Atj"( K@ E\r 
 AtjAk( I\r A
k!
  (M\r A
j!  O\rA!@@ A
j" 
 Atj("I@@  j-A	k"AK\rA
 tA€€qE\r A
j" G\r !  6@  O\r  j-A\nk A
j" O\r 
 Atj(!  6@  O\r  j-A)G\rA! A6 B7  6  6 A
j!A

   
 Atj"(" Aj Aj 5E\r
@    k ( Aj A j A,j A(j A$j6@ ( " j! (," F! 
  j"Atj(! (!
  ("6(  6$A
!A!@  I@@  j-"A	k"AK\rA
 tA€€qE\r A
j" G\r A
j" O\r  
 Atj("j-! Aÿ
qA)G\r
  A
j"6 ($" (("M@A! A6 B7A

  k! @ A6  6   j"6A

@ j"@ 
 Atj!A! !@   Atj("  K" KA!  "kAq"@@  ( j-: A
j! A
j! A
j" G\r  kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" G\r   O\r A\n: A
j!  A
j"Atj(! ($"	E\rAä (, 	 A
6  6   k6 (!A! (x" \nL@  6 (t! \n!@   Alj"(K@@ -AqAG\r  ("Alj( I\r \r k A
j" H\r
  6  \nL\r
  kAk! (t!A!  AsjAq"@@  \nAljAÄ;
 \nA
j!\n A
j" G\r AI\r
@  \nAlj"AÄ;
 AÄ;
L AÄ;
8 AÄ;
$ \nAj"\n G\r
 	-AÀq\r
  
  	( ( AjM"AH\r E\r
 	 	-Ar:  -Ar: Aj" (tj (6 (t j (6  (tj (6( Aj! (t! (@  Alj (Ð6  6Ð  Alj (6 	(! (! 	-!  
 A
j L   AÛF"!   !   !   ! 	! /
AŒqE\r@@ "Aj! -$"AÄG"\r  I\r
 À! !@@ "Ak! \r  	K\r
 -%"AqE\r E\r ( 	(G\rA‡ APE\r (   (tkAmG\r Ak( (G\r AÄ:$  Aï
q:% AkAÄ: Ak"	 	-Aï
q: "AN\r B7à A6¸ @A!	 A6Ô (x"AL\r (t!A!@@  	Alj"-"Aq\r -AüG\r ( (kA
G\r A6  Ar:@ (ØAH@  	6Ø
  (ÜAlj 	6  	6Ü  A
j"6Ô 	A
j"	 G\rA!	A!	  
A (xL
A!	 A0j$ 	Þ
#Aðk"$ B7h B7` B7X B7P B7H B7@ B78 B70 A6( B7  B7 B7 B7A!	@     Aj AÐj9\r   A Aj A0j9\r  6( (,!	 
@  Aj 	 ("	E@A!	 ($"E\r
AÒ (, 
  Aj 	 ("	E@A!	
 ($"E\rAö (,  (`@ (Pk (Tk (Xk (@@ (0k (4k (8k Aðj$ 	Ý

@ 
(" 
("I@ 
(!
 
( A
v jA "At"l"E@A ($"E\rAõ (, A 
 6 
( Ajl"E@A ($"E\rAõ (, A 
 6 
 6 
(! 
( Atj 6  
(Atj 6 
 
(A
j6AÜ
 
A
j!@@@ 
Aj" O\r  j-A#G\r  
j-A rAøG\r !@@@@  j-"A0kAÿ
qA\nI\r AÁkAÿ
qAI\r  kAK\r AákAÿ
qAI\r
  kAK\r A
j" G\r !  F\r  kAI\r
@ 
Aj" O"\r  j-A#G\r !@@  kAK\r
  j-A0kAÿ
qA	K\r
 A
j" G\r !  F\r  kAI\r
  M\r
  j-Aß
qAÁkAÿ
qAK\r
  \r@@  j-"Aß
qAÁkAÿ
qAO@   kA0K\r A0kAÿ
qA\nI\r
   kA0M\r  A
j" G\r " 
kAkA.K\r
  M\r  j-A;G\rA
!  A
j6 ³
#Ak"$@@  O\r (!@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" G\r !
  O\r (!@  jA
k-A	k"AK\r
A
 tA€€qE\r
 A
k" K\r !  6  6  6@ 
 Aj (, ("@ ($"E\r
Aš (, 
  AjA
<"\r 
 Aj (, ("E@A!
 ($"E\rA¿ (,  Aj$ à!
#A0k"\r$  H@ A¸j! A€j! \rAr! \rAr! 
(!@@ (t"
 Al"j"	-"Aq@ AqE\r
@ E\r 	,"
E\r  
[\r 	(!
 	,"\nAÿ
q"E\r  \n[E\r 	(" I\r@@@@@@@@@@@@@@@@@ A!k^
	 (! A
q@ AN@ 
 Alj"
 
-AÀr: 	 6  6 AH\r  
 Alj"(6¸  6 	 6@ (ä"AN@ 
 Alj 6
  6à  6ä A6 A
j" (xN\r 
 Alj"
-A;G\r (  
(" \rHE\r 	 6 
 6 	 Ar: 
 
-Ar: 	 6 AqE\r \r A€A˜ \nA*Fj"Aj6 AÀ
q"AÀ
F@A! 
 \r Aj6 A€
F\rA!  Aj6A
! A°A´ 	( kA
Fj!\n@ AqE\rA! \n("AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6 	 6 
 
-Ar: 	 	-Ar:\r A
qE\r 	 \n(6 \n 6@ AqE\rA! (Ä"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6 	 6 
 
-Ar: 	 	-Ar: A
qE\r 	 (Ä6  6Ä@ AqE\r (¼"AH\rA! 
 Alj"( (k 	( kG\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r@ A
j" N\r  kAk!A!  AsjAq"\n@@ 
 AljAÄ;
 A
j! A
j" \nG\r AI\r@ 
 Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" G\r  6 	 6  -Ar: 	 	-Ar: A6¼ A
qE\r\n 	 (¼6  6¼\n 
 A
j"Al"j"(! (! \r 6 \r 	("6, \r 	6( \r 	6$ \nAÀF@    \rA
AAA¨ \rA(jOAL\r\n \r(!  O\r  N"AÿM\rA!A!@@@  jAm"AtA j("Au j"AtA j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA j(AÿÿÿqM\r
 A
j!  N\r
 AN\r 	( kAG\r@ AqE\rA! (À"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6 	 6 
 
-Ar: 	 	-Ar:	 A
qE\r 	 (À6  6À 	( kAG\r@ AqE\rA! (È"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6 	 6 
 
-Ar: 	 	-Ar: A
qE\r 	 (È6  6È 	( kAG\r@ AqE\rA! (Ì"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6 	 6 
 
-Ar: 	 	-Ar: A
qE\r 	 (Ì6  6ÌA!A! A	F\r
 A F\r
 AkAI\r
 ( jA
k,"@Aó AP\r
 \r((" 
I\r A
k!@@@ -AÄF\r ( K\r  (O\r -"Aq\r
 Ak" 
O\r
 AqE\r    \rA,jAA.AAè \rA$jOAH\r \r(,!@ \nAÀF\r@  O\r (" j-A/G\r  A
j  \rA,jAA/A‰A \rA$jOAH\r \r(," O\r  j-A/G\r \r A
j"6,@  O\r ( j-A?G\r  A
j  \rA,jAA&AƒA¥ \rA$jOAH\r \r(,!  O\r ( j-A#G\r  A
j  \rA,jAAAAë \rA$jOAH\r \r(,!@  O\rA!A!@ ( j" ( kA4"AÿM@ A	F\r A F\r AkAO\r
@@@  jAm"AtA j("Au j"AtA j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA j(AÿÿÿqM\r
 A
j!  N\r
 AN\r
 ,"@A± A	P\r
 \r($" 
 (xAlj"
O\r@@@ -AÄF\r ( M\r ( K\r -"Aq\r
 Aj" 
I\r
 AqE\r 	 6 	 6  \n:  6  6 (t" j"
 6  j" 6 
 
-Ar:  -Ar: \r Atr 6 A q! A
j! Aà
qAà
G@ \r Atj Aj6 Aj! A
s AGqE@ \r Atj Aj6 A
j! Aq! A
q!A!A!A!A!@@ \r Atj"(("AH\r 
 Alj! @ ( (M\r
 ! !@ (("AH\r 
 Alj! @ ( (M\r
 ! ! Aj! Aj" G\r@ E\r \r Atj(("AH\r 
 Alj! @ ( (M\r
 ! ! E\r 	(! (! (! !\n@@@@@@ 
 Alj"-"A!k\n
 AÛk
 A€A˜ A*Fj -"AtAuAqj!\n@ AvAk \nAj!\n A°A´ ( (kA
Fj!\n \nAj!\n@  k"  k"K@ 
 (" (k k j"Al"j"
 (6 
 )7 
 )7   k"6 
 6 (t j \n(6 \n 6
  O\r 
 Alj j"
 	(6 
 	)7 
 	)7 	  k j"6 
 6A!\n@   \nAtj"("
L@@ 
AN@  (t 
Alj("
6 
 N\r \nA
j"\nAG\r (t" Alj"
 6  j" 6 
 
-Ar:  -Ar:
 A
qE\r A€A˜ \nA*Fj AtAuAqj!
@@@ AvAk
 
Aj!

 
Aj!
 	 
(6 
 6 	-"
AqE\r 
Aq@ (t 	(Alj(!
 	(! A
j" H\r \rA0j$–
#Ak"$@ (E\r 
 3! (  (pAtj("E@A!
@  ("I\r   ( (ljO\r  (F@ ( ( 
 AE\rA!
  6  6  
6  Aj6 Aj!@ ("@@   A
v"
Atj"D"AH@ 

 E\r Aj!  
Asj"\rA! E@A!
 (! Aj$ ý
#A k"$ Aß: A¦Ô;
A! ("A€ q@ A$:A! A€€€
q@ Aj rA=: A
j! A€€€q@ Aj rA+: A
j! A€€q@ Aj jAü: A
j! A€€q@ Aj jAÞ: A
j! A€„q@ Aj jAþ: A
j!A! Aj jA:  
   AjAJ ("AŒq@ Aq@ AÀ:A
! Aq@  rA:: A
j! A€q  rA.: A
j  rA:  
    AjJ A€jAÿ
AÐü A j$‰
 (TE@A A
k! A
k!AA
 ("\n j-A!F j!A!@@ 
  jA
v"Atj"	( K@ E\r
 
 AtjAk( I\r
 A
k!  	(M\r A
j!
@  	(M"E@@  kj"@ !@  	 Atj("  K" KA!
  "kAq"\n@@  ( j-: A
j! A
j! 
A
j"
 \nG\r  kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" G\r   O\r A : A
j! 	 A
j"Atj(!A! ($"E\rAä (, A  k
  \nj!  k! A<j  K"@  (6  (6  (6 (! A6  6 E@ k E@A (T" ( ( (jj (k"K@  k!A

A! ($"@Aè (, A!  6T ò

 ( 
j"A
k,!@ 
AI\r AN\r Ak,!@ A¿K\r A`qA@G\r A?q AqAtr 
AI\r Ak,!@ A¿J\r ApqA`G\r A¿K\r A?q A?qAt AqAtrr 
AF\r Ak-"
Aø
qAð
G\r A¿J\r A¿J\r A¿K\r A?q A?qAt 
AqAtr A?qAtrr! Ô
@ 
 F@ 
!A
!A
!	
 AØ ! AØ !AA ! E! (!A
!A
!	 
!@@@@@@@@@@   j"j"-"A0kAÿ
qA\nI\r A_qAÁkAÿ
qAI\r@ A	kAÿ
q"AO\rA€€ vA
qE\r -ÌL!
 (t!\n (!@ E@@  \n (xAlj"\nO\r@@ -AÄF\r ( M\r ( K\r -Aq\r Aj" \nI\r  6 -!@  \nI\r@@ -AÄF\r ( K\r  (O\r -Aq\r Ak" \nO\r  6 -!
  6 A
j  !\n \r
@@ Aÿ
qA(k
 A
j!A(! AL\r A
k!A)!
 A0kAÿ
qA\nI\r
 A_qAÁkAÿ
qAI\r
 Aÿ
qE\r  À"\n[E\rA!AA! 	E\r
A
!	 	@A
!	  \n[E\rA

@@ E\r Aÿ
q Aÿ
qG\r E\r
A
!A!	 A
j  !A!	A
! \rA
j!\r !
A!	  j" G\r !A \r
  A
A A 	 rj"6 \r 
 Gjç

 AG!@@@ AqE\r E\r 
Aÿ
q!@ - F\r A
k"AG! A
j"AqE\r
 \r E\r
@ - 
Aÿ
qF\r AI\r 
Aÿ
qA‚„l!@A€‚„ ( s"k rA€‚„xqA€‚„xG\r Aj! Ak"AK\r E\r
 
Aÿ
q!@  -F@  A
j! A
k"\rA‡
 A€O@ @  
 ü\n  j!@  
sAqE@@ AqE@ !
 E@ !
 !@  
-: 
A
j!
 A
j"AqE\r
  I\r A|q!@ AÀI\r  A@j"K\r@  
(6  
(6  
(6  
(6  
(6  
(6  
(6  
(6  
( 6   
($6$  
((6(  
(,6,  
(060  
(464  
(868  
(<6< 
A@k!
 A@k" M\r  O\r
@  
(6 
Aj!
 Aj" I\r
 AI@ !
 AI@ !
 Ak! !@  
-:  
-
:
  
-:  
-: 
Aj!
 Aj" M\r  I@@  
-: 
A
j!
 A
j" G\rá
#AÐ
k"$ B
7@ 
 l"E\r  6  6A!
@ Aj 
Atj" Ak( Ak( jj"6 
A
j!
  I\r  k"
AL@A
!
A
  
j!A
!A
!
@ AqAF@    
 AjS AjAT 
Aj
@ Aj 
A
k"Atj(  kO@    Aj 
A AjU
    
 AjS 
A
F@ AjA
VA
 Aj VA
!
  ("A
r"6  j" I\r (AG! A
K!A k!    Aj 
A AjU@ 
A
G\r \r E\r
@@ 
A
L@ Aj AjW"T 
 j!
 (!
 AjAV  (As6 AjA
T  j" Aj 
Ak"Atj(k   Aj 
A
kA
 AjU AjA
V  (A
r"6    Aj A
 AjU !
  j! (! 
A
G\r A
G\r \r AÐ
j$«

#Að
k"$  6A
!@ AH\rA 
k!	 !@   	j"  Ak"\nAtj(k" ZAN@   ZAN\r  Atj     ZAN""6 A
j! A
k \n "A
J\r 
  X Að
j$K
 (!  
AM@ (! 
 
A k!
 !A" 
v6  A  
kt  
vr6Î
#Að
k"$  ("6è
 (!  6  6ì
A 
k! E!\n@@@@ A
G@ !A
!
 !A
! \r !
@   Atj"(k"  ZAL@ ! \nAs!	A
!\n@ 	 AHrA
qE@ Ak(!	  j"  ZAN\r
  	k  ZAN\r
  Atj 6 Aè
j Aè
jW"T A
j!  j! (ì
!	 ! (è
A
G\r
 	\r
 !
 \nE\r
 
  X  
   S Að
j$H
 
AM@ (! Aj
 
A k!
 (!   
t6   
t A  
kvr6\'

 (A
kY"
 
 (Y"A rA –

#A€k"$@ AH\r 
 Atj" 6 E\r@ ( 
(A€  A€O"QA!@ 
 Atj"( 
 A
j"Atj( Q  ( j6  G\r  k"\r A€j$\n hA   
 †
@@@ 
Aÿ
q"@ Aq@ 
Aÿ
q!@ -"E\r  F\r A
j"Aq\rA€‚„ ("k rA€‚„xqA€‚„xG\r
 A‚„l!@A€‚„  s"k rA€‚„xqA€‚„xG\r (! Aj"! A€‚„ krA€‚„xqA€‚„xF\r \\ j !@ "-"E\r
 A
j!  
Aÿ
qG\r "A - 
Aÿ
qF}
@@ "
AqE\r 
-E@A@ 
A
j"
AqE\r
 
-\r
@ 
"Aj!
A€‚„ ("k rA€‚„xqA€‚„xF\r@ "
A
j! 
-\r 
 kY

  (H"
A
k 
r6H ("
Aq@  
A r6A B7  (,"
6  
6  
 (0j6A~

~ ½"B4ˆ§Aÿq"AÿG| E@ 
 DaA DðC¢ 
_! 
(A@j6  
 Aþk6 Bÿÿÿÿÿÿÿ‡€ƒB€€€€€€€ð?„¿ ý~AÍ!
#A@j"$ AÍ6< A)j! A\'j! A(j!@@@@@A!@ 
!  AÿÿÿÿsJ\r  j!@@@@ 
"-"\n@@@@ \nAÿ
q"\nE@ !

 \nA%G\r
 !\n@ \n-
A%G@ \n!
 A
j! \n-! \nAj"
!\n A%F\r  k" Aÿÿÿÿs"\nJ\r	 @   a \r  
6< 
A
j!A!@ 
,
A0k"A	K\r 
-A$G\r 
Aj!A
! !  6<A!	@ ,"A k"
AK@ !
 !A
 
t"
A‰ÑqE\r@  A
j"6< 
 	r!	 ,
"A k"
A O\r
 !A
 
t"
A‰Ñq\r@ A*F@@ ,
A0k"A	K\r -A$G\r E@  AtjA\n6A
  Atj(!\r Aj!
A

 \r A
j!
 E@  
6<A!A!\r  ("Aj6 (!\rA!  
6< \rAN\r
A \rk!\r 	A€Àr!	
 A<jb"\rAH\r\n (<!
A!A!A 
-A.G\r 
-
A*F@@ 
,A0k"A	K\r 
-A$G\r 
Aj!
 E@  AtjA\n6A
  Atj(
 \r 
Aj!
A E\r  ("Aj6 (!  
6< AN
  
A
j6< A<jb! (<!
A
!@ !A! 
","AûkAFI\r 
A
j!
 A:l jA¯Ìj-"A
kAÿ
qAI\r  
6<@ AG@ E\r AN@ E@  Atj 6   Atj)70 E\r A0j  c
 AN\rA! E\r -A q\r 	Aÿÿ{q" 	 	A€Àq!	A!AÔ! !@@@@@@@@@@@@@@@ -"À"ASq  AqAF  "AØk!	\n
@ AÁk AÓF\r )0!AÔA!@@@@@@@ 
 (0 6 (0 6 (0 ¬7 (0 ;
 (0 : (0 6 (0 ¬7A  AM! 	Ar!	Aø! !
 A q! )0""BR@@ 
A
k"
 §Aq-ÀP r: Bˆ"BR\r 
! P\r 	AqE\r AvAÔj!A! !
 )0""BR@@ 
A
k"
 §AqA0r: Bˆ"BR\r 
! 	AqE\r   
k"  H! )0"BS@ B }"70A
!AÔ
 	A€q@A
!AÕ
AÖAÔ 	A
q"!  d!  AHq\r 	Aÿÿ{q 	 !	@ BR\r \r !A!  P  kj"  H!\r -0! (0"A± ""
AAÿÿÿÿ  AÿÿÿÿO"P" 
k  " j! AN@ !	 ! !	 ! -\r )0"BR\r
A!	 @ (0A! A  \rA 	e A6  >  Aj60A! Aj!\nA!@@ \n("E\r Aj i"AH\r   kK\r \nAj!\n  j" I\r
A=! AH\r A  \r  	e E@A!
A! (0!\n@ \n("E\r
 Aj i" j" K\r
  Aj a \nAj!\n  K\r A  \r  	A€Àse \r   \rH!  AHq\r	A=!  +0 \r  	  f"AN\r\n -
!\n A
j! \r	 E\rA
!@  Atj("\n@  Atj \n cA
! A
j"A\nG\r
 A\nO@A
!\n@  Atj(\r
A
! A
j"A\nG\r	A!  :\'A
! ! !	   k"
 
 H" AÿÿÿÿsJ\rA=! \r  j"  \rH" \nK\r A    	e   a A0   	A€€se A0  
Ae   
a A    	A€Àse (<!

A!A=!AèÛ 6A! A@k$ À

 -A qE@@ ("  ^\r
 ( ("k I@  
  ($
@@ (PAH\r E\r !@ 
 j"A
k-A\nG@ A
k"\r
  
  ($ I\r  k! (!
 
!   Q  ( j6s
 (",A0k"A	K@A@A! 
A̙³æM@A  
A\nl"
j  
AÿÿÿÿsK!  A
j"6 ,
! !
 ! A0k"A\nI\r 
³@@@@@@@@@@@@@@@@@@@ 
A	k
	\n\r  ("
Aj6  
(6  ("
Aj6  
47  ("
Aj6  
57  ("
Aj6  
47  ("
Aj6  
57  (AjAxq"
Aj6  
)7  ("
Aj6  
2
7  ("
Aj6  
3
7  ("
Aj6  
07  ("
Aj6  
17  (AjAxq"
Aj6  
)7  ("
Aj6  
57  (AjAxq"
Aj6  
)7  (AjAxq"
Aj6  
)7  ("
Aj6  
47  ("
Aj6  
57  (AjAxq"
Aj6  
+9  gˆ

~ B€€€€Z@@ 
A
k"
 " B\n€"B\n~}§A0r: BÿÿÿÿŸ
V\r §! B\nZ@@ 
A
k"
 " A\nn"A\nlkA0r: AãK\r @ 
A
k"
 A0r: 
Ð
~#A€k"$@  L\r A€Àq\r@  k"A€ A€I""E\r  
:  j"A
k 
: AI\r  
:  
:
 Ak 
: Ak 
: AI\r  
: Ak 
: A	I\r A kAq"j" 
Aÿ
qA‚„l"
6   kA|q"j"Ak 
6 A	I\r  
6  
6 Ak 
6 Ak 
6 AI\r  
6  
6  
6  
6 Ak 
6 Ak 
6 Ak 
6 Ak 
6  AqAr"k"A I\r 
­B€€€~!  j!
@ 
 7 
 7 
 7 
 7 
A j!
 A k"AK\r E@@  A€a A€k"Aÿ
K\r   a A€j$ã
|~#A°k"$ A6¬@ 
½"BS@A
!AÞ! 
š"
½!
 A€q@A
!Aá!
AäAß A
q"! E!@ B€€€€€€€øÿƒB€€€€€€€øÿQ@ A   Aj" Aÿÿ{qe   a AŠ\rA… A q"A—A‰  
 
bAa A    A€Àse    J!\n
 Aj!@@ 
 A¬j_"
 
 "
Db@  (¬"A
k6¬ A r"AáG\r
 A r"AáF\r (¬!A  AH
  Ak"6¬ 
D°A¢!
A  AH! AèA ANj"!@  
ü"6 Aj! 
 ¸¡DeÍÍA¢"
Db\r@ AL@ ! ! !	
 !	 !@A  AO!@ Ak" 	I\r ­!B!@  5 † |" B€”ëÜ€"B€”ëÜ~}> Ak" 	O\r B€”ëÜT\r 	Ak"	 >@ 	 "I@ Ak"(E\r
  (¬ k"6¬ ! AJ\r AH@ AjA	nA
j! AæF!@A	A k" A	O!\n@  	M@AA 	(!
A€”ëÜ \nv!\rA \ntAs!A! 	!@  (" \nv j6  q \rl! Aj" I\rAA 	(! E\r  6 Aj!  (¬ \nj"6¬   	j"	 " Atj   kAu J! AH\rA!@  	M\r  	kAuA	l!A\n! 	("A\nI\r@ A
j!  A\nl"O\r  A AæGk AçF AGqk"  kAuA	lA	kH@ A„`Aìc AHj A€Èj"A	m"\rAtj!\nA\n!  \rA	lk"AL@@ A\nl! A
j"AG\r@ \n("  n" lk"\rE \nAj" Fq\r@ A
qE@D@C!
 A€”ëÜG\r
 	 \nO\r
 \nAk-A
qE\r
D
@C!
Dà?Dð?Dø?  FDø? \r A
v"F \r I!@ \r -A-G\r š! 
š!
 \n  \rk"6 
   
a\r \n  j"6 A€”ëÜO@@ \nA6 	 \nAk"\nK@ 	Ak"	A6 \n \n(A
j"6 Aÿ“ëÜK\r  	kAuA	l!A\n! 	("A\nI\r@ A
j!  A\nl"O\r \nAj"   K!@ " 	M"E@ Ak"(E\r
@ AçG@ Aq!\r
 AsA A
 " J A{Jq"\n j!AA~ \n j! Aq"\r\rAw!@ \r Ak("\nE\rA\n!A! \nA\np\r@ "\rA
j! \n A\nl"pE\r \rAs!  kAuA	l! A_qAÆF@A!\r   jA	k"A AJ"  J!
A!\r   j jA	k"A AJ"  J!A!\n AýÿÿÿAþÿÿÿ  \rr"J\r
  AGjA
j!@ A_q"AÆF@  AÿÿÿÿsJ\r A AJ!
   Au"s k­ d"kA
L@@ A
k"A0:  kAH\r Ak" : A
kA-A+ AH:  k" AÿÿÿÿsJ\r  j" AÿÿÿÿsJ\r
 A    j" e   a A0   A€€se@@@ AÆF@ AjA	r!  	 	 K"!	@ 	5 d!@  	G@  AjM\r
@ A
k"A0:  AjK\r
  G\r A
k"A0:    ka 	Aj"	 M\r @ A‰A
a  	M\r
 AL\r
@ 	5 d" AjK@@ A
k"A0:  AjK\r  A	  A	Na A	k! 	Aj"	 O\r A	J! ! \r@ AH\r  	Aj  	K!\n AjA	r! 	!@  5 d"F@ A
k"A0:@  	G@  AjM\r
@ A
k"A0:  AjK\r
  A
a A
j!  \rrE\r A‰A
a    k"   Ha  k! Aj" \nO\r
 AN\r A0 AjAAe    ka ! A0 A	jA	Ae A    A€Àse    J!\n
  AtAuA	qj!@ AK\r -!Dð?!@A4 Atk"A€N@Dà! AÿI@ Aÿk!Dð!Aý  AýOAþk!
 AxJ\rD`! A¸pK@ AÉj!
D!Aðh  AðhMA’j!  Aÿj­B4†¿¢! A-F@  
š ¡ š!

 
   ¡!
  (¬" Au"s k­ d"F@ A
k"A0: (¬! Ar! A q!	 Ak"\r Aj: A
kA-A+ AH: AqE ALq! Aj!@ " 
ü"AÀÐj- 	r: 
 ·¡D0@¢!
@ A
j" AjkA
G\r 
Da q\r A.:
 Aj! 
Db\rA!\n Aûÿÿÿ   \rk"	jkJ\r A   Aj  Ajk" Ak H  " 	 jj" e   a A0   A€€se  Aj a A0  kAAe  \r 	a A    A€Àse    J!\n A°j$ \n¹~ 
 
(AjAxq"
Aj6  
)! 
)!#A k"
$ Bÿÿÿÿÿÿ?ƒ!~ B0ˆBÿÿ
ƒ"§"AøkAýM@ B† B<ˆ„! A€øk­!@ Bÿÿÿÿÿÿÿÿƒ"B€€€€€€€Z@ B
|!
 B€€€€€€€€R\r B
ƒ |!B  BÿÿÿÿÿÿÿV"! ­ |
@  „P\r Bÿÿ
R\r B† B<ˆ„B€€€€€€€„!Bÿ
 Aþ‡
K@B!Bÿ
A€øAø P"\n" k"	AðJ@B!B
  B€€€€€€À„ \n!A!\n  G@ 
Aj! ! !@A€
 	k"AÀq@  A@j­†!B!
 E\r  ­"† AÀ k­ˆ„!  †!  7  7 
) 
)„BR!\n@ 	AÀq@  	A@j­ˆ!B!
 	E\r AÀ 	k­†  	­"ˆ„!  ˆ! 
 7 
 7 
)B† 
)"B<ˆ„!@ \n­ Bÿÿÿÿÿÿÿÿƒ„"B€€€€€€€Z@ B
|!
 B€€€€€€€€R\r B
ƒ |! B€€€€€€€…  BÿÿÿÿÿÿÿV"! ­! 
A j$ B€€€€€€€€€ƒ B4†„ „¿9¦

 (T"(! (" ( ("k"  I"@   Q  ( j"6  ( k"6    K"@  
 Q  ( j"6  ( k6 A:  (,"6  6 ¢ E@A@  
AÿM\r
@AÔÚ((E@ 
A€qA€¿F\rAèÛA6
 
AÿM@  
A?qA€
r:
  
AvAÀ
r:A 
A€@qA€ÀG 
A€°OqE@  
A?qA€
r:  
AvAà
r:  
AvA?qA€
r:
A 
A€€kAÿÿ?M@  
A?qA€
r:  
AvAð
r:  
AvA?qA€
r:  
AvA?qA€
r:
AAèÛA6AA

  
:A
Ñ(
#Ak"\n$@@@@@@@@@@ Aô
M@A¤Ü("A AjAøq AI"Av"
v"Aq@@ AsA
q 
j"At"
AÌÜj" 
(Ô\\"("F@A¤Ü A~ wq6
  6  6 Aj!  
Ar6 
 j"
 
(A
r6 A†("M\r
 @@  
tA 
t"A krqh"At"
AÌÜj" 
(Ô\\"("F@A¤Ü A~ wq"6
  6  6  Ar6  j" 
 k"A
r6  
j 6 @ AxqAÌÜj!A¸Ü(!
 A
 Avt"qE@A¤Ü  r6 
 (!  
6  
6 
 6 
 6 Aj!A¸Ü 6A¬Ü 6A¨Ü("E\r
 hAt(Ô^"(Axq k!
 !@@ ("E@ ("E\r
 (Axq k" 
 
 K"!
   ! !
 (!	  ("G@ (" 6  6\n (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6	A! A¿K\r Aj"
Axq!A¨Ü("	E\rA! AôÿÿM@ A& 
Avg"kvA
q A
tkA>j!A k!
@@@ At(Ô^"E@A!
A! A A
vkA AGt!@@ (Axq k" 
O\r ! "
\rA!
 !  ("   AvAqj("F  ! A
t! "\r  rE@A!A t"A kr 	q"E\r hAt(Ô^! E\r
@ (Axq k" 
I!  
 !
   ! ("  ("\r E\r 
A¬Ü( kO\r (!  ("G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6 A¬Ü("M@A¸Ü(!
@  k"AO@ 
 j" A
r6  
j 6 
 Ar6
 
 Ar6  
j" (A
r6A!A!A¬Ü 6A¸Ü 6 
Aj!	 A°Ü("I@A°Ü  k"
6A¼ÜA¼Ü(" j"6  
A
r6  Ar6 Aj!	A! A/j"Aüß(@A„à(
AˆàB7A€àB€ €€€€7Aüß \nAjApqAتժs6AàA6AàßA6A€ "
j"A 
k"q" M\rAÜß("
@AÔß(" j"	 M\r	 
 	I\r	@Aàß-AqE@@@@@A¼Ü("
@Aäß!@ (" 
M@ 
  (jI\r ("\rAn"AF\r !Aۈ("A
k"
 q@  k 
 jA kqj!  O\rAÜß("@AÔß("
 j" 
M\r  I\r n" G\r
  k q"n" ( (jF\r
 ! AF\r
 A0j M@ !A„à("
  kjA 
kq"
nAF\r
 
 j! ! AG\rAàßAàß(Ar6 n!An! AF\r AF\r  M\r  k" A(jM\rAÔßAÔß( j"6AØß( I@AØß 6@A¼Ü("
@Aäß!@  (" ("jF\r ("\rA´Ü("A  ME@A´Ü 6A!Aèß 6Aäß 6AÄÜA6AÈÜAüß(6AðßA6@ At"
 
AÌÜj"6Ô\\ 
 6Ø\\ A
j"A G\rA°Ü A(k"Ax kAq"
k"6A¼Ü 
 j"
6 
 A
r6  jA(6AˆAΈ(6 
 O\r 
 I\r (Aq\r   j6A¼Ü 
Ax 
kAq"j"6A°ÜA°Ü( j" k"6  A
r6 
 jA(6AÀÜAŒà(6A!A!A´Ü( K@A´Ü 6  j!Aäß!@@  ("G@ ("\r
 -AqE\rAäß!@@ (" 
M@ 
  (j"I\r
 (!
A°Ü A(k"Ax kAq"k"6A¼Ü  j"6  A
r6  jA(6AˆAΈ(6 
 A\' kAqjA/k"  
AjI"A6 Aìß)7 Aäß)7Aìß Aj6Aèß 6Aäß 6AðßA6 Aj!@ A6 Aj! Aj!  I\r 
 F\r  (A~q6 
  
k"A
r6  6 Aÿ
M@ Aø
qAÌÜj!A¤Ü("A
 Avt"qE@A¤Ü  r6 
 (!  
6  
6A!A
A! AÿÿÿM@ A& Avg"kvA
q A
trA>s! 
 6 
B7 AtAÔÞj!@@A¨Ü("A
 t"qE@A¨Ü  r6  
6 
 6
 A A
vkA AGt! (!@ "(Axq F\r Av! A
t!  Aqj"("\r  
6 
 6A! 
! 
!A
 (" 
6  
6 
 6A!A!A 
j 6 
 j 6A°Ü(" M\rA°Ü  k"
6A¼ÜA¼Ü(" j"6  
A
r6  Ar6 Aj!AèÛA06A!  6  ( j6 Ax kAqj"	 Ar6 Ax kAqj"  	j"
k!@A¼Ü( F@A¼Ü 
6A°ÜA°Ü( j"6 
 A
r6
A¸Ü( F@A¸Ü 
6A†A†( j"6 
 A
r6 
 j 6
 ("AqA
F@ Axq! (!@ Aÿ
M@ (" F@A¤ÜA¤Ü(A~ Avwq6  6  6
 (!@  G@ (" 6  6
@ (" Aj ("E\r
 Aj!@ ! "Aj! ("\r Aj! ("\r A6
A! E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨ÜA¨Ü(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6  j"(!  j!  A~q6 
 A
r6 
 j 6 Aÿ
M@ Aø
qAÌÜj!A¤Ü("A
 Avt"qE@A¤Ü  r6 
 (!  
6  
6 
 6 
 6
A! AÿÿÿM@ A& Avg"kvA
q A
trA>s! 
 6 
B7 AtAÔÞj!@@A¨Ü("A
 t"qE@A¨Ü  r6  
6 
 6
 A A
vkA AGt! (!@ "(Axq F\r Av! A
t!  Aqj"("\r  
6 
 6 
 
6 
 
6
 (" 
6  
6 
A6 
 6 
 6 	Aj!@ E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨Ü 	A~ wq"	6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6@ 
AM@  
 j"Ar6  j" (A
r6
  Ar6  j" 
A
r6 
 j 
6 
Aÿ
M@ 
Aø
qAÌÜj!A¤Ü("A
 
Avt"
qE@A¤Ü 
 r6 
 (!
  6 
 6  6  
6
A! 
AÿÿÿM@ 
A& 
Avg"kvA
q A
trA>s!  6 B7 AtAÔÞj!@@ 	A
 t"qE@A¨Ü  	r6  6  6
 
A A
vkA AGt! (!@ "(Axq 
F\r Av! A
t!  Aqj"("\r  6  6  6  6
 (" 6  6 A6  6  6 Aj!
@ 	E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨Ü A~ wq6@  	(F@ 	 6
 	 6 E\r
  	6 ("@  6  6 ("E\r  6  6@ 
AM@  
 j"Ar6  j" (A
r6
  Ar6  j" 
A
r6 
 j 
6 @ AxqAÌÜj!A¸Ü(!A
 Avt" qE@A¤Ü  r6 
 (!  6  6  6  6A¸Ü 6A¬Ü 
6 Aj! \nAj$ ‚
@ E\r Ak" Ak("
Axq"j!@ 
A
q\r 
AqE\r
  ("k"A´Ü(I\r
  j!@@@A¸Ü( G@ (!
 Aÿ
M@ 
 ("G\rA¤ÜA¤Ü(A~ Avwq6 (! 
 G@ (" 
6 
 6 (" Aj ("E\r Aj!@ ! "
Aj! 
("\r 
Aj! 
("\r A6 ("
AqAG\rA† 6  
A~q6  A
r6  6  
6 
 6A!
 E\r@ ("At"(Ô^ F@ AÔÞj 
6 
\r
A¨ÜA¨Ü(A~ wq6@  (F@  
6
  
6 
E\r
 
 6 ("@ 
 6  
6 ("E\r 
 6  
6  O\r ("A
qE\r@@@@ AqE@A¼Ü( F@A¼Ü 6A°ÜA°Ü( j"6  A
r6 A¸Ü(G\rA¬ÜA6A¸ÜA6A¸Ü(" F@A¸Ü 6A¬ÜA¬Ü( j"6  A
r6  j 6 Axq j! (!
 Aÿ
M@ (" 
F@A¤ÜA¤Ü(A~ Avwq6  
6 
 6 (! 
 G@ (" 
6 
 6 (" Aj ("E\r Aj!@ ! "
Aj! 
("\r 
Aj! 
("\r A6  A~q6  A
r6  j 6A!
 E\r@ ("At"(Ô^ F@ AÔÞj 
6 
\r
A¨ÜA¨Ü(A~ wq6@  (F@  
6
  
6 
E\r
 
 6 ("@ 
 6  
6 ("E\r 
 6  
6  A
r6  j 6  G\rA¬Ü 6 Aÿ
M@ Aø
qAÌÜj!
A¤Ü("A
 Avt"qE@A¤Ü  r6 

 
(! 
 6  6  
6  6A!
 AÿÿÿM@ A& Avg"
kvA
q 
A
trA>s!
  
6 B7 
AtAÔÞj!@A¨Ü("A
 
t"qE@A¨Ü  r6  6A!
A
 A 
A
vkA 
AGt!
 (!@ "(Axq F\r 
Av! 
A
t!
  Aqj"("\r  6A!
 !A! ! 
 (" 6  6A!A!
A! 
 j 6  6  j 6AÄÜAÄÜ(A
k"A 6‰
 E@ 
j 
A@O@AèÛA06AA 
AjAxq 
AI! Ak"("Axq!@ AqE@ A€I\r
 Aj M@ !  kA„à(A
tM\rA  j!@  O@  k"AI\r
   A
qrAr6  j" Ar6  (A
r6  m
A¼Ü( F@A°Ü( j" M\r   A
qrAr6  j"  k"A
r6A°Ü 6A¼Ü 6
A¸Ü( F@A¬Ü( j" I\r@  k"AO@   A
qrAr6  j" A
r6  j" 6  (A~q6
  A
q rAr6  j" (A
r6A!A!A¸Ü 6A¬Ü 6
 ("Aq\r
 Axq j"\n I\r
 \n k! (!@ Aÿ
M@ (" F@A¤ÜA¤Ü(A~ Avwq6  6  6
 (!	@  G@ (" 6  6
@ (" Aj ("E\r
 Aj!@ ! "Aj! ("\r Aj! ("\r A6
A! 	E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨ÜA¨Ü(A~ wq6@  	(F@ 	 6
 	 6 E\r
  	6 ("@  6  6 ("E\r  6  6 AM@  A
q \nrAr6  \nj" (A
r6
   A
qrAr6  j" Ar6  \nj" (A
r6  m ! "@ Aj 
j"E@A  A|Ax Ak("Aq Axqj" 
 
 KQ k «
  
j!@@ ("A
q\r AqE\r
 (" 
j!
@@@  k"A¸Ü(G@ (! Aÿ
M@  ("G\rA¤ÜA¤Ü(A~ Avwq6 (!  G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6 ("AqAG\rA¬Ü 
6  A~q6  
A
r6  
6  6  6A! E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨ÜA¨Ü(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6@@@@ ("AqE@A¼Ü( F@A¼Ü 6A°ÜA°Ü( 
j"
6  
A
r6 A¸Ü(G\rA¬ÜA6A¸ÜA6A¸Ü(" F@A¸Ü 6A¬ÜA¬Ü( 
j"
6  
A
r6  
j 
6 Axq 
j!
 (! Aÿ
M@ (" F@A¤ÜA¤Ü(A~ Avwq6  6  6 (!  G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6  A~q6  
A
r6  
j 
6A! E\r@ ("At"(Ô^ F@ AÔÞj 6 \r
A¨ÜA¨Ü(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6  
A
r6  
j 
6  G\rA† 
6 
Aÿ
M@ 
Aø
qAÌÜj!A¤Ü("A
 
Avt"
qE@A¤Ü 
 r6 
 (!
  6 
 6  6  
6A! 
AÿÿÿM@ 
A& 
Avg"kvA
q A
trA>s!  6 B7 AtAÔÞj!@@A¨Ü("A
 t"qE@A¨Ü  r6  6  6
 
A A
vkA AGt! (!@ "(Axq 
F\r Av! A
t!  Aqj"("\r  6  6  6  6 ("
 6  6 A6  6  
6W

~@ ­B|BøÿÿÿƒAØÚ("­|"BÿÿÿÿX@ §"
?AtM\r
 
\r
AèÛA06AAØÚ 
6 ß
	#Ak"$  6@ AÓ
M@AÐÐAÒ Ajp(!
 A|O@]   AÒ
n"AÒ
l"k6AÒAÐÓ Ajp"
( j! 
AÒkAu!@A! !
@@@ 
! A/F@AÓ
!@  n"
 I\r  
 lF\r  A\nj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  Aj"
n" 
I\r  
 lF\r  A$j"
n" 
I\r  
 lF\r  A(j"
n" 
I\r  
 lF\r  A*j"
n" 
I\r  
 lF\r  A.j"
n" 
I\r  
 lF\r  A4j"
n" 
I\r  
 lF\r  A:j"
n" 
I\r  
 lF\r  A<j"
n" 
I\r  
 lF\r  AÂj"
n" 
I\r  
 lF\r  AÆj"
n" 
I\r  
 lF\r  AÈj"
n" 
I\r  
 lF\r  AÎj"
n" 
I\r  
 lF\r  AÒj"
n" 
I\r  
 lF\r  AØj"
n" 
I\r  
 lF\r  Aàj"
n" 
I\r  
 lF\r  Aäj"
n" 
I\r  
 lF\r  Aæj"
n" 
I\r  
 lF\r  Aêj"
n" 
I\r  
 lF\r  Aìj"
n" 
I\r  
 lF\r  Aðj"
n" 
I\r  
 lF\r  Aøj"
n" 
I\r  
 lF\r  Aþj"
n" 
I\r  
 lF\r  A‚
j"
n" 
I\r  
 lF\r  Aˆ
j"
n" 
I\r  
 lF\r  AŠ
j"
n" 
I\r  
 lF\r  AŽ
j"
n" 
I\r  
 lF\r  A”
j"
n" 
I\r  
 lF\r  A–
j"
n" 
I\r  
 lF\r  Aœ
j"
n" 
I\r  
 lF\r  A¢
j"
n" 
I\r  
 lF\r  A¦
j"
n" 
I\r  
 lF\r  A¨
j"
n" 
I\r  
 lF\r  A¬
j"
n" 
I\r  
 lF\r  A²
j"
n" 
I\r  
 lF\r  A´
j"
n" 
I\r  
 lF\r  Aº
j"
n" 
I\r  
 lF\r  A¾
j"
n" 
I\r  
 lF\r  AÀ
j"
n" 
I\r  
 lF\r  AÄ
j"
n" 
I\r  
 lF\r  AÆ
j"
n" 
I\r  
 lF\r  AÐ
j"
n" 
I\r AÒ
j!  
 lG\r  At(ÐP"
n" 
O! 
 l!	 
 K"E@   !
 A
j!  	G\r
  	G\r
 \r
A A
j" A0F""At(R  j"AÒ
lj!
   ! Aj$ h
#Ak"$ A: 
 kAu!
 (!@ 
@ 
 
A
v"Asj   Atj"( I"!
 Aj  !
 Aj$  /

@ (@  ("
A
k6 
\r
  ((
A>
A
  A
M!
@@ 
j"\rAӈ("E\r \n
 "E@u ]  
 
\\w¬

@  (AÿÿÿÿqA
kA\n ,"AH"" (  "kM@ E\r
 (  AH! @  j 
 ü\n  j!@ ,AH@  6
  Aÿq:  jA:    j k  A  
x…
Aöÿÿÿ 
k O@A÷ÿÿÿ! (  ,AH!	 
AòÿÿÿM@A 
 j" 
A
t"  K"ArA
j AI! t!@ E\r E\r  	 ü\n@ E\r E\r  j  ü\n   j"k!\n@  F\r \nE\r  j j  	j j \nü\n 
A\nG@ 	k  6  A€€€€xr6   j \nj"6  jA:uÅ
@@@ ,"AN@A\n! A\nF\r
  A
jAÿq: (" (AÿÿÿÿqA
k"G\r
 !@ AöÿÿÿG@A÷ÿÿÿ! (  ,AH! AòÿÿÿM@A A
j" A
t"  K"ArA
j AI! t!@ E\r E\r   ü\n@  F\r  k"E\r  j  j ü\n A\nG@ k  6  A€€€€xr6
u  6 !  A
j6 (!  j"A:
  
:«

 
A÷ÿÿÿI@ (AÿÿÿÿqA
kA\n ,"AH" 
I@A 
ArA
j 
AI"t!
 (!@ (  "A
j"E\r E\r 
   AH ü\n AH@ k  6  
6  A€€€€xr6uh

 (Aÿÿÿÿq" K@  6 (!@ E\r E\r  
 ü\n  jA:  A
k  kA
j ("A   
xQ A\nM@  :@ E\r E\r  
 ü\n  jA: A\n A\nk -Aÿq"A   
x
#A k"$#Ak"$ Aj" A j" Aj"k"A	L@A= A  
A
rgkAÑ	lAv" 
 At(°TIkA
jH\r
 
A¿„=M@ 
AÎM@ 
AãM@ 
A	M@  
A0r: A
j  
A
t/
àT; Aj 
AçM@  
AÿÿqAän"A0r:  
 AälkAÿÿqA
t/
àT;
 Aj  
~ 
AŸM@  
AÎn"A0j: A
j 
 AÎlk~  

 
AÿÁ×/M@ 
Aÿ¬âM@  
AÀ„=n"A0j: A
j 
 AÀ„=lk  
€

 
Aÿ“ëÜM@  
A€Â×/n"A0j: A
j 
 A€Â×/lk€

  
A€Â×/n"A
t/
àT; Aj 
 A€Â×/lk€
!A6  6 Aj"
 (6 
 (6 Aj$@ (" Aj"k"A÷ÿÿÿI@@ A\nM@  :
 Ar"A
jt!
  Aÿÿÿÿk6  
6  6 
!  k!@  F\r E\r   ü\n  jA:
u A j$2

  
Aän"A
t/
àT;  
 AälkA
t/
àT; Aj*

  
AÎn"A
t/
àT; Aj 
 AÎlk~*

  
AÀ„=n"A
t/
àT; Aj 
 AÀ„=lk AÐjjAÐjt

 E@ ( 
(F  
F@A
 
("-!
@ ("-"E\r  
G\r@ -
!
 -
"E\r
 A
j! A
j!  
F\r  
FÚ
#AÐk"$@A
 ( 
(F\r#A@j"$ 
 
("Ak("j!@ Ak("(AÜÖ(F@A  !
  
"L@ B7 A6 AØÖ6  
6  6 B7 B7$ B7, A6< B€€€€€€€
74  Aj  A
A (( (\r
 B7 A6 A¨Ö6  
6 AØÖ6 B7 B7$ B7, B73 A6< A
:;  Aj A
A ((	A!@@ ((
 (A ($A
FA ( A
FA (,A
F!
 (A
G@ (,\r
 ( A
G\r
 ($A
G\r
 (! A@k$A "
E\r ("E\r
 AjAA8ü A
:K A6   6  
6 A
6D 
 Aj A
 
(( (,"
A
F@  ($6 
A
F! AÐj$  A6 Aç6 AŽ6]v

 ($"E@  6  
6 A
6$  (86@@ ( (8G\r ( 
G\r (AG\r
  6 A
:6 A6  A
j6$ ( 
((F@ 
  …
5 ( 
((F@ 
  …
 (" 
   (({
 ("A
q! 
-7A
F@ Au" E\r
 ( j(
 Au E\r 
 ((68A!A! (" 
  j A Aq ((r
 ( 
((F@ 
  …
 (! Aj" 
  ˆ
@ AI\r  Atj! Aj!@  
  ˆ
 
-6\r
 Aj" I\rš
 A
:5@  (G\r A
:4@ ("E@ A
6$  6  
6 A
G\r (0A
F\r
 
 F@ ("AF@  6 ! (0A
G\r A
F\r
  ($A
j6$ A
:6Â
@  
( ƒ
@  
(G\r
 
(A
F\r
 
 6@  
( ƒ
@@ 
( G@  
(G\r
 A
G\r 
A
6  
 6  
(,AF\r
 Aj" (Atj!@@@ 
@  M\r 
A;
4  
  A
 Œ
 
-6\r 
-5A
G\r 
-4A
F@ 
(A
F\rA
!A
! -AqE\rA
! -A
q\rA
AA A
q6, \r 
A6, Aj! (! Aj" 
   
 AI\r
  Atj! Aj!@ ("AqE@ 
($A
G\r
@ 
-6\r  
   
 Aj" I\r A
qE@@ 
-6\r 
($A
F\r  
   
 Aj" I\r@ 
-6\r 
($A
F@ 
(A
F\r  
   
 Aj" I\r
 
 6 
 
((A
j6( 
($A
G\r 
(AG\r 
A
:6K
 ("Au! (" 
  A
q ( j(  j A Aq  ((I
 ("Au! (" 
 A
q ( j(  j A Aq  ((	Š@  
( ƒ
@  
(G\r
 
(A
F\r
 
 6  
( ƒ
@@ 
( G@  
(G\r
 A
G\r 
A
6  
 6 @ 
(,AF\r 
A;
4 (" 
  A
  (( 
-5A
F@ 
A6, 
-4E\r
 
A6, 
 6 
 
((A
j6( 
($A
G\r
 
(AG\r
 
A
:6 (" 
    ((	¦
@  
( ƒ
@  
(G\r
 
(A
F\r
 
 6  
( ƒ
E\r@ 
( G@  
(G\r
 A
G\r
 
A
6  
 6 
 6  
 
((A
j6(@ 
($A
G\r 
(AG\r 
A
:6 
A6,›
  
( ƒ
@ 
   Š
 
-5! (! 
A:5 
-4! 
A:4 Aj"	 
    Œ
  
-4"\nr!  
-5"r!@ AI\r 	 Atj!	 Aj!@ 
-6\r
@ \nA
q@ 
(A
F\r -Aq\r
 A
qE\r -A
qE\r 
A;
4  
    Œ
 
-5" rA
q! 
-4"\n rA
q! Aj" 	I\r 
 A
q:5 
 A
q:49  
( ƒ
@ 
   Š
 (" 
     ((  
( ƒ
@ 
   Š
A§7
 AàÙ6 ("Ak"
 
(A
k"
6 
AH@ Akk  ”
 k ( $# kApq"$ #‘P(A€Þ{"type":"Document"},"attributes":{summarytbodyTableBodyLatexMathDisplay\\u%04x-+   0X0x-0X+0X 0X-0x+0x 0xTableRowdivnavmenuTextUnorderedListOrderedListstartSuperscriptSubscripttfootcountbodyRowCountheadRowCountbasefontDocumentimportantdefaulttightrightHighlightleftframesetfieldsetdt\\taddressdetailsEmphasisnoframes%s:%d: %strvectordirhrfootercenterSpoilerheaderfenceChar\\roptgroupcolgroup/Users/ernest/react-native-enriched-markdown/packages/core/cpp/wasm/ASTSerializer.cpp/emsdk/emscripten/system/lib/libcxxabi/src/private_typeinfo.cpptipcautionoptionfigcaptionAdmonitionsectionmainalignnan\\nformmenuitemListItemparamulurlcolhtmlTableHeaderCellTableCellleveldlisTasklinkLinkCodeBlocktrackSoftBreakLineBreakThematicBreaklibad_array_new_lengthParagraphStrikethroughsearchdialogStrongbasic_stringnodeTypeToStringwarningHeadinginf\\ftrueblockquoteBlockquotenotefalsebasefigureadmonitionTypeUnderlineLatexMathInlineBlankLineiframetitlearticletableTableImageCodeasidetdlegendtaskCheckedddtheadTableHead\\b"\'=<>`-_.-+_\\\\({[,"children":[NANINFcatching a class without an object?)}].!?,;mailto:,"content":h6h5h4h3h2h1http://Too many link reference definition instantiations.Unsupported abi_version.Aborted from text() callback.Aborted from enter_span() callback.Aborted from leave_span() callback.Aborted from enter_block() callback.Aborted from leave_block() callback.malloc() failed.realloc() failed.@:..!#$%&\'*+/=?^_`{|}~-_.:-+-.-_+-_*(null)Suppressing too sparse table (see https://github.com/mity/md4c/issues/345)._=().+-_~%false && "unhandled NodeType in nodeTypeToString"\\"{"type":"[]!xX \nñ<‡íbOFß*$®ŒšŸòT2q¾Îé<Š¬¸ùlAè~€¸+Œô)NSt3__220__shared_ptr_emplaceIN8Markdown15MarkdownASTNodeENS_9allocatorIS2_EEEE"ƒA€¹Nú‡RA f°à\rˆP\rˆ\rð\rˆˆ @`€ˆˆ ÀˆˆˆˆˆA?/A°Äè£\n-Aàdƒµ¯A5KG[uzÞ9AÐ50a\nÉ|‘\'AMÝÚ×ÔÑÎO’y¹AðA€8$èA ‚–AÀ\r~XAඦZA€\rP
¨A Tw$AÀE,5Â9N\nküA®A —  € @\n €/ _ 0A@Z€µÀ@րØ@ހ
@.
€2
@6
€9
@G
€J
@v
€x
y
@}
€

‚
„
†
‡
‰
Š
‹
Ž


‘
“
”
–
—
˜
œ

Ÿ
 
@¤
€¦
§
©
¬
®
¯
±
²
³
µ
·
¸
¼
Ä
Å
Ç
È
Ê
Ë
@Û
€Þ
@î
ۖ
ò
ô
ö
÷
ø
@€ "@2€:;=>ACDEF@N€Eprv†ˆ@Š€ŒŽ‘@¡€£@«€ÂÏÐÑÕÖØ@î€ðñôõ÷ùúý@ÿ€@€@/€`@€€Š@¾€ÀÁ@Í€Ð@.€1@V€ @Å€ÇÍø@ý€€‚ƒ„…†‡ˆ‰@º€½@¿€@”€› @þ€@€@€(@/€8@?€H@M€Y[]_h@o€¸¹º»¾È@Ë€ØÙÚÛèéêëìøùúû&!*!+!2!`!@o!€ƒ!¶$@Ï$€,@/,€`,b,c,d,g,@k,€m,n,o,p,r,u,~,,€,@â,€ë,í,ò,@¦@l¦€€¦@š¦€"§@.§€2§@n§€y§{§}§~§@†§€‹§§§’§–§@¨§€ª§«§¬§­§®§°§±§²§³§´§@§€Ä§Å§Æ§Ç§É§Ë§Ì§@Ú§€Ü§Ý§â§õ§l«m«p«@¿«€!ÿ@:ÿ€
@\'
€°
@Ó
€p
@z
€|
@Š
€Œ
@’
€”
•
€
@²
€P\r
@e\r
€ 
@¿
€@n
@_n
€ n
@¸n
€@ß
Hß
Jß
Mß
Qß
hß
@nß
€rß
@~ß
ێ
@!é
€az¼àöøþ

/
3
7
:
H
K
w
ÿz
~
sSƒ
…
Tˆ
VWŒ
Ý
Y[’
`cih™
oru¡
¥
۬
ƒ­
ˆ°
Š‹´
¶
’¹
½
Æ
Æ
É
É
Ì
Ì
Ü
ß
ï
ó
ó
õ
•
¿
ù
ž
#3e,<š
f,B€
‰ŒGO¹qswó¬­¯ÌÍαÁÃËÃײ¸ÆÀÙïºÁ¸µøòû{}P_0Oa‹¿ÏÂÎÑ/a†-%-\'---ðõ24>ABBJcK¦ŠÐúýÿ
•a¡ÿ \'07@EQSUW`g°±pq¹ruÐÑvwàáz{åxy|}ÉkåN!p!!„!Ð$é$0,_,a,k}}h,l,QqPRs,v,?@,ã,ì,î,ó,A¦m¦¦›¦#§/§3§o§z§|§y§‡§Œ§e‘§“§—§©§f\\aljž‡S«µ§Ã§”§‚Žȧʧdͧۧ›
w|ö§K«L« ïAÿZÿ(
O
Ø
û
—
¡
£
±
³
¹
»
¼
À
ò
p\r
…\r
À
ß
`n
n
»n
Ón
Aß
Iß
Kß
Nß
Rß
iß
oß
sß
ß
"é
Cé
AÀ1Ó
ß0
I
ð
‡–—˜™šžP€@‡€ˆ@€@—€˜@Ÿ€ @§€¨@¯€²³´¶¼ÂÃÄÆÌÖäæòóôöüû
ûûûûûûûûû•ß
A 3¥ssi¼nje‚h1tw\ny\na¾ssŹ¹¹¹ ¹\'¹ ¹\'¹`¹g¹`¹g¹p¹±¹¬¹±B±¹t¹·¹®¹·B·¹¹BÁÅB|¹É¹Î¹ÉBɹfffiflststtvtetk~vtmssAÐ6À°RTV·ÇÒÓ×âãç÷ûû¹
Å
ÅÅ
ÅB±B¹·B¹¹¹
¹BÅÅ
ÅBÉB¹ffiffl@.

À 5P                A¤9¬
!@/€:@@€[@`€{@~€¡@©€«@¬€®@±€´¶@¸€»¿×÷Â@Å€Ò@߀å@ë€íï@ÿ€u~„@…€‡ö‚Z@_€‰@Š€@€¾ÀÃÆó@ô€@€@€j@m€ÔÞéý@þ€@\r€ö@ù€þ@ÿ€0@>€^ˆd	@e	€p	ò	@ó	€ú	@û	€ý	v\nð\n@ñ\n€pó@ú€w„O\ry\rô\r?OZ@[€
@€@€468:@=€…¾@Å€Ç@Ì€Î@Ú€J@O€ž@Ÿ€û`@h€@™€m@n€›@œ€ë@í€5@6€Ô@Ö€Ø@Û€@\n€@D@E€Þ@ÿ€@€ @¦€¨@­€N@O€Z@j€t@€ü@ÿ€;@?€~@€À@Ç€Ó½¿@Á€Í@Ï€Ý@߀í@ï€ý@þ€ @\' €0 @^ €z @~ €Š @Ž €  @Ä €!@
!€!@!€!@	!€!!@!€!@#!€%!\'!)!.!:!@;!€@!@D!€J!@M!€O!Š!@‹!€!@)$€@$@J$€œ$@é$€%@u\'€”\'@s+€v+@ÿ+€å,@ê,€ù,@ü,€þ,@ÿ,€p-.@..€0.@].€`.@c.€€.@™.€›.@ó.€/@Õ/€ð/@ÿ/€
0@0€0@ 0€0060@70€=0@?0€›0@œ0€ 0û01@‘1€–1@Ÿ1€À1@å1€ï12@2€*2@G2€P2`2@2€Š2@°2€À2@ÿ3€ÀM@ÿM€¤@Ƥ€þ¤@ÿ¤€\r¦@¦€s¦~¦ò¦@÷¦€§@§€ §@!§€‰§@Š§€(¨@+¨€6¨@9¨€t¨@w¨€Î¨@Ϩ€ø¨@ú¨€ü¨.©@/©€_©Á©@Í©€Þ©@ß©€\\ª@_ª€wª@yª€Þª@ߪ€ðª@ñª€[«j«@k«€ë«)û²û@Òû€>ý@Oý€ý@‘ý€Èý@Ïý€üý@ÿý€þ@þ€0þ@Rþ€Tþ@fþ€hþ@kþ€
ÿ@ÿ€ÿ@ ÿ€;ÿ@@ÿ€[ÿ@eÿ€àÿ@æÿ€èÿ@îÿ€üÿ@ýÿ€

@

€7

@?

€y

@‰

€Œ

@Ž

€

@œ

€ 

Ð

@ü

€Ÿ
Ð
o
W
w
@x
€	
?	
P\n
@X\n
€\n
È\n
ð\n
@ö\n
€9
@?
€™
@œ
€n\r
Ž\r
@\r
€­
É
@Ê
€Ð
@Ø
€U
@Y
۠
@‰
€G
@M
€»
@¼
€¾
@Á
€@
@C
€t
@u
ہ
@È
€Í
Û
Ý
@ß
€8
@=
۩
Ô
@Õ
€×
@Ø
€K
@O
€Z
@[
€]
Æ
Á
@×
€A
@C
€`
@l
€¹
<
@?
€;
D
@F
ۉ
?
@F
€š
@œ
€ž
@¢
€
@	
ۇ
A
@E
€p
@q
€÷
@ø
€C
@O
€Õ
@ñ
€ÿ
p$
@t$
ۖ/
@ò/
€nj
@oj
€õj
7k
@?k
€Dk
@Ek
€mm
@om
€—n
@šn
ۉo
œ¼
Ÿ¼
Ì
@ïÌ
€úÌ
@üÌ
€Í
@³Î
€ºÎ
@ÐÎ
€ÒÎ
@ÔÎ
€ÝÎ
@ýÎ
€PÏ
@ÃÏ
€Ð
@õÐ
ۄ
@&Ñ
€)Ñ
@dÑ
€jÑ
@lÑ
€ƒÑ
@„Ñ
€ŒÑ
@©Ñ
€®Ñ
@AÒ
€EÒ
SÒ
@ZÒ
€]Ò
@^Ò
€`Ò
@Ò
€Ó
@VÓ
€ÁÖ
ÛÖ
ûÖ
×
5×
O×
o×
‰×
©×
Ã×
Ø
@ÿÙ
€7Ú
@:Ú
€mÚ
@tÚ
€vÚ
@ƒÚ
€…Ú
@‹Ú
€Û
@Û
€Oá
ÿâ
ÿå
^é
@_é
€¬ì
°ì
.í
ðî
@ñî
€ð
@+ð
€0ð
@“ð
€ ð
@®ð
€±ð
@¿ð
€Áð
@Ïð
€Ñð
@õð
€\rñ
@®ñ
€æñ
@ò
€ò
@;ò
€@ò
@Hò
€Pò
@Qò
€`ò
@eò
€ó
@Ùö
€Üö
@ìö
€ðö
@üö
€÷
@Û÷
€à÷
@ë÷
€ð÷
@ø
€ø
@Gø
€Pø
@Yø
€`ø
@‡ø
€ø
@­ø
€°ø
@»ø
€Àø
@Áø
€Ðø
@Øø
€ù
@Wú
€`ú
@mú
€pú
@|ú
€€ú
@Æú
€Èú
Ìú
@Ýú
€ßú
@ëú
€ïú
@úú
€û
@’û
€”û
@ïû
€úû
		AãÌ
 AðÌA	\n\n\n
		AÁÍ!\r\r		AûÍ
A‡Î	AµÎ
AÁÎ	AïÎ
AûÎ	A²Ï	AãÏ
AïÏ	AÐ
A©Ð€	0123456789ABCDEF\r%)+/5;=CGIOSYaegkmqƒ‰‹•—£§­³µ¿ÁÅÇÓ
\r%)+/5;=CGIOSYaegkmqyƒ‰‹•—£§©­³µ»¿ÁÅÇѐ+Ø)NSt3__214__shared_countE,*
Ð)NSt3__219__shared_weak_countEA´Ôœ\ndè\' †
@B€–˜áõʚ;00010203040506070809101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899¸+4+<-N10__cxxabiv116__shim_type_infoE¸+d+(+N10__cxxabiv117__class_type_infoEX+ !"#$%&Ø+\'!"#()*¸+ä+X+N10__cxxabiv120__si_class_type_infoE4,+!"#,-.¸+@,X+N10__cxxabiv121__vmi_class_type_infoE°,/0+„,St9exception¸+ ,|,St9bad_alloc¸+¼,”,St20bad_array_new_lengthì,
12¸+ø,|,St11logic_error-
32¸+(-ì,St12length_error+D-St9type_infoAÔÚ. 0€')}function getBinarySync(file){return file}async function getWasmBinary(binaryFile){return getBinarySync(binaryFile)}async function instantiateArrayBuffer(binaryFile,imports){try{var binary=await getWasmBinary(binaryFile);var instance=await WebAssembly.instantiate(binary,imports);return instance}catch(reason){err(`failed to asynchronously prepare wasm: ${reason}`);abort(reason)}}async function instantiateAsync(binary,binaryFile,imports){return instantiateArrayBuffer(binaryFile,imports)}function getWasmImports(){var imports={env:wasmImports,wasi_snapshot_preview1:wasmImports};return imports}async function createWasm(){function receiveInstance(instance){wasmExports=instance.exports;assignWasmExports(wasmExports);updateMemoryViews();return wasmExports}function receiveInstantiationResult(result){return receiveInstance(result["instance"])}var info=getWasmImports();var instantiateWasm=Module["instantiateWasm"];if(instantiateWasm){return new Promise(resolve=>{instantiateWasm(info,inst=>resolve(receiveInstance(inst)))})}wasmBinaryFile??=findWasmBinary();var result=await instantiateAsync(wasmBinary,wasmBinaryFile,info);var exports=receiveInstantiationResult(result);return exports}class ExitStatus{name="ExitStatus";constructor(status){this.message=`Program terminated with exit(${status})`;this.status=status}}var HEAP16;var HEAP32;var HEAP64;var HEAP8;var HEAPF32;var HEAPF64;var HEAPU16;var HEAPU32;var HEAPU64;var HEAPU8;var callRuntimeCallbacks=callbacks=>{while(callbacks.length>0){callbacks.shift()(Module)}};var onPostRuns=[];var onPreRuns=[];var noExitRuntime=true;var stackRestore=val=>__emscripten_stack_restore(val);var stackSave=()=>_emscripten_stack_get_current();var UTF8Decoder=globalThis.TextDecoder&&new TextDecoder;var findStringEnd=(heapOrArray,idx,maxBytesToRead,ignoreNul)=>{var maxIdx=idx+maxBytesToRead;if(ignoreNul)return maxIdx;while(heapOrArray[idx]&&!(idx>=maxIdx))++idx;return idx};var UTF8ArrayToString=(heapOrArray,idx=0,maxBytesToRead,ignoreNul)=>{var endPtr=findStringEnd(heapOrArray,idx,maxBytesToRead,ignoreNul);if(endPtr-idx>16&&heapOrArray.buffer&&UTF8Decoder){return UTF8Decoder.decode(heapOrArray.subarray(idx,endPtr))}var str="";while(idx<endPtr){var u0=heapOrArray[idx++];if(!(u0&128)){str+=String.fromCharCode(u0);continue}var u1=heapOrArray[idx++]&63;if((u0&224)==192){str+=String.fromCharCode((u0&31)<<6|u1);continue}var u2=heapOrArray[idx++]&63;if((u0&240)==224){u0=(u0&15)<<12|u1<<6|u2}else{u0=(u0&7)<<18|u1<<12|u2<<6|heapOrArray[idx++]&63}if(u0<65536){str+=String.fromCharCode(u0)}else{var ch=u0-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}}return str};var UTF8ToString=(ptr,maxBytesToRead,ignoreNul)=>ptr?UTF8ArrayToString(HEAPU8,ptr,maxBytesToRead,ignoreNul):"";var ___assert_fail=(condition,filename,line,func)=>abort(`Assertion failed: ${UTF8ToString(condition)}, at: `+[filename?UTF8ToString(filename):"unknown filename",line,func?UTF8ToString(func):"unknown function"]);class ExceptionInfo{constructor(excPtr){this.excPtr=excPtr;this.ptr=excPtr-24}set_type(type){HEAPU32[this.ptr+4>>2]=type}get_type(){return HEAPU32[this.ptr+4>>2]}set_destructor(destructor){HEAPU32[this.ptr+8>>2]=destructor}get_destructor(){return HEAPU32[this.ptr+8>>2]}set_caught(caught){caught=caught?1:0;HEAP8[this.ptr+12]=caught}get_caught(){return HEAP8[this.ptr+12]!=0}set_rethrown(rethrown){rethrown=rethrown?1:0;HEAP8[this.ptr+13]=rethrown}get_rethrown(){return HEAP8[this.ptr+13]!=0}init(type,destructor){this.set_adjusted_ptr(0);this.set_type(type);this.set_destructor(destructor)}set_adjusted_ptr(adjustedPtr){HEAPU32[this.ptr+16>>2]=adjustedPtr}get_adjusted_ptr(){return HEAPU32[this.ptr+16>>2]}}var uncaughtExceptionCount=0;var ___cxa_throw=(ptr,type,destructor)=>{var info=new ExceptionInfo(ptr);info.init(type,destructor);uncaughtExceptionCount++;abort()};var __abort_js=()=>abort("");var getHeapMax=()=>536870912;var alignMemory=(size,alignment)=>Math.ceil(size/alignment)*alignment;var growMemory=size=>{var oldHeapSize=wasmMemory.buffer.byteLength;var pages=(size-oldHeapSize+65535)/65536|0;try{wasmMemory.grow(pages);updateMemoryViews();return 1}catch(e){}};var _emscripten_resize_heap=requestedSize=>{var oldSize=HEAPU8.length;requestedSize>>>=0;var maxHeapSize=getHeapMax();if(requestedSize>maxHeapSize){return false}for(var cutDown=1;cutDown<=4;cutDown*=2){var overGrownHeapSize=oldSize*(1+.2/cutDown);overGrownHeapSize=Math.min(overGrownHeapSize,requestedSize+100663296);var newSize=Math.min(maxHeapSize,alignMemory(Math.max(requestedSize,overGrownHeapSize),65536));var replacement=growMemory(newSize);if(replacement){return true}}return false};var getCFunc=ident=>{var func=Module["_"+ident];return func};var writeArrayToMemory=(array,buffer)=>{HEAP8.set(array,buffer)};var lengthBytesUTF8=str=>{var len=0;for(var i=0;i<str.length;++i){var c=str.charCodeAt(i);if(c<=127){len++}else if(c<=2047){len+=2}else if(c>=55296&&c<=57343){len+=4;++i}else{len+=3}}return len};var stringToUTF8Array=(str,heap,outIdx,maxBytesToWrite)=>{if(!(maxBytesToWrite>0))return 0;var startIdx=outIdx;var endIdx=outIdx+maxBytesToWrite-1;for(var i=0;i<str.length;++i){var u=str.codePointAt(i);if(u<=127){if(outIdx>=endIdx)break;heap[outIdx++]=u}else if(u<=2047){if(outIdx+1>=endIdx)break;heap[outIdx++]=192|u>>6;heap[outIdx++]=128|u&63}else if(u<=65535){if(outIdx+2>=endIdx)break;heap[outIdx++]=224|u>>12;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63}else{if(outIdx+3>=endIdx)break;heap[outIdx++]=240|u>>18;heap[outIdx++]=128|u>>12&63;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63;i++}}heap[outIdx]=0;return outIdx-startIdx};var stringToUTF8=(str,outPtr,maxBytesToWrite)=>stringToUTF8Array(str,HEAPU8,outPtr,maxBytesToWrite);var stackAlloc=sz=>__emscripten_stack_alloc(sz);var stringToUTF8OnStack=str=>{var size=lengthBytesUTF8(str)+1;var ret=stackAlloc(size);stringToUTF8(str,ret,size);return ret};var ccall=(ident,returnType,argTypes,args,opts)=>{var toC={string:str=>{var ret=0;if(str!==null&&str!==undefined&&str!==0){ret=stringToUTF8OnStack(str)}return ret},array:arr=>{var ret=stackAlloc(arr.length);writeArrayToMemory(arr,ret);return ret}};function convertReturnValue(ret){if(returnType==="string"){return UTF8ToString(ret)}if(returnType==="boolean")return Boolean(ret);return ret}var func=getCFunc(ident);var cArgs=[];var stack=0;if(args){for(var i=0;i<args.length;i++){var converter=toC[argTypes[i]];if(converter){if(stack===0)stack=stackSave();cArgs[i]=converter(args[i])}else{cArgs[i]=args[i]}}}var ret=func(...cArgs);function onDone(ret){if(stack!==0)stackRestore(stack);return convertReturnValue(ret)}ret=onDone(ret);return ret};var cwrap=(ident,returnType,argTypes,opts)=>{var numericArgs=!argTypes||argTypes.every(type=>type==="number"||type==="boolean");var numericRet=returnType!=="string";if(numericRet&&numericArgs&&!opts){return getCFunc(ident)}return(...args)=>ccall(ident,returnType,argTypes,args,opts)};{if(Module["noExitRuntime"])noExitRuntime=Module["noExitRuntime"];if(Module["print"])out=Module["print"];if(Module["printErr"])err=Module["printErr"];if(Module["arguments"])programArgs=Module["arguments"];if(Module["thisProgram"])thisProgram=Module["thisProgram"];var preInit=Module["preInit"];if(preInit){if(typeof preInit=="function")Module["preInit"]=preInit=[preInit];while(preInit.length>0){preInit.shift()()}}}Module["ccall"]=ccall;Module["cwrap"]=cwrap;Module["UTF8ToString"]=UTF8ToString;var _parseMarkdown,__emscripten_stack_restore,__emscripten_stack_alloc,_emscripten_stack_get_current,memory,__indirect_function_table,wasmMemory;function assignWasmExports(wasmExports){_parseMarkdown=Module["_parseMarkdown"]=wasmExports["parseMarkdown"];__emscripten_stack_restore=wasmExports["_emscripten_stack_restore"];__emscripten_stack_alloc=wasmExports["_emscripten_stack_alloc"];_emscripten_stack_get_current=wasmExports["emscripten_stack_get_current"];memory=wasmMemory=wasmExports["memory"];__indirect_function_table=wasmExports["__indirect_function_table"]}var wasmImports={__assert_fail:___assert_fail,__cxa_throw:___cxa_throw,_abort_js:__abort_js,emscripten_resize_heap:_emscripten_resize_heap};async function run(){preRun();var setStatus=Module["setStatus"];if(setStatus){setStatus("Running...");await new Promise(resolve=>setTimeout(resolve,1));setTimeout(setStatus,1,"")}if(ABORT)return;initRuntime();Module["onRuntimeInitialized"]?.();postRun()}var wasmExports;wasmExports=await createWasm();await run();
+-;return Module}})();if(typeof exports==="object"&&typeof module==="object"){module.exports=createMd4cModule;module.exports.default=createMd4cModule}else if(typeof define==="function"&&define["amd"])define([],()=>createMd4cModule);
++var createMd4cModule=(()=>{var _scriptName=globalThis.document?.currentScript?.src;return async function(moduleArg={}){var moduleRtn;var Module=moduleArg;var ENVIRONMENT_IS_WEB=true;var ENVIRONMENT_IS_WORKER=false;var arguments_=[];var thisProgram="./this.program";var scriptDirectory="";var readAsync;if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){try{scriptDirectory=new URL(".",_scriptName).href}catch{}{readAsync=async url=>{var response=await fetch(url,{credentials:"same-origin"});if(response.ok){return response.arrayBuffer()}throw new Error(response.status+" : "+response.url)}}}else{}var out=console.log.bind(console);var err=console.error.bind(console);var wasmBinary;var ABORT=false;function binaryDecode(bin){for(var i=0,l=bin.length,o=new Uint8Array(l),c;i<l;++i){c=bin.charCodeAt(i);o[i]=~c>>8&c}return o}var readyPromiseResolve,readyPromiseReject;var HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;var HEAP64,HEAPU64;var runtimeInitialized=false;function updateMemoryViews(){var b=wasmMemory.buffer;HEAP8=new Int8Array(b);HEAP16=new Int16Array(b);HEAPU8=new Uint8Array(b);HEAPU16=new Uint16Array(b);HEAP32=new Int32Array(b);HEAPU32=new Uint32Array(b);HEAPF32=new Float32Array(b);HEAPF64=new Float64Array(b);HEAP64=new BigInt64Array(b);HEAPU64=new BigUint64Array(b)}function preRun(){if(Module["preRun"]){if(typeof Module["preRun"]=="function")Module["preRun"]=[Module["preRun"]];while(Module["preRun"].length){addOnPreRun(Module["preRun"].shift())}}callRuntimeCallbacks(onPreRuns)}function initRuntime(){runtimeInitialized=true;wasmExports["__wasm_call_ctors"]()}function postRun(){if(Module["postRun"]){if(typeof Module["postRun"]=="function")Module["postRun"]=[Module["postRun"]];while(Module["postRun"].length){addOnPostRun(Module["postRun"].shift())}}callRuntimeCallbacks(onPostRuns)}function abort(what){Module["onAbort"]?.(what);what="Aborted("+what+")";err(what);ABORT=true;what+=". Build with -sASSERTIONS for more info.";var e=new WebAssembly.RuntimeError(what);readyPromiseReject?.(e);throw e}var wasmBinaryFile;function findWasmBinary(){return binaryDecode('asm

«
``
`
`

`
`
``````
`	
`
`
`
``|
|`~
`|
``
Tenv__cxa_throwenv\r__assert_failenvemscripten_resize_heapenv	_abort_js	¾
¼
	
	


		
















\r\r\r\n

		
	
\n\n\n\n


p
99

€€@	

Aã€¢
memory__wasm_call_ctors\rparseMarkdown__indirect_function_table
_emscripten_stack_restore½
_emscripten_stack_alloc¾
emscripten_stack_get_current¿
	P
A
8º
\r{ !"#$%&\'()*+,~-E@G_mno{-cc¦
¶
³
¨
-µ
²
©
-´
¯
¬
-¸
-¹
-·
»
¼
»
»

(\n¼è¼
 

AÈÜB7AÐÜA6AßÜA:AÔÜAµ(6AØÜA¹-:AÙÜA:AëÜA:AàÜAŽ/;
AâÜA-:AãÜA:A÷ÜA:AìÜAç(6AðÜAë-:AñÜA:AƒÝA	:AøÜA¯)7A€ÝA·-:AÝA:AˆÝB칻֮سå7A“ÝA:AÝA:AŸÝA:A”ÝA¾(6A˜ÝAÂ/;
AšÝA:A ÝA"6A¤ÝB‹€€€€‚€€€7 A£(6 Aœ)7 A:A·ÝA:A¬ÝA¼	(6A°ÝAÀ	-:A±ÝA:AÃÝA:A¸ÝAÞ	(6A¼ÝAâ	-:A½ÝA:AÄÝA"6AÈÝBŽ€€€€‚€€€7 A³)7 A­)7 A:AìÞAôÝ6AÄÞA€€€6AÀÞAã€6A¤ÞA*6AÈÞAÀÜ(6 AÓÜ,AH@AÐÜ(AÈÜ(ró‹
!
~#A0k"$@ E@AÈÜ„
!AÈ܃
!
@ AO@AÈÜ…
"A€A‰
#Ak"
$AÈ܃
AÈÜAŠ
 
A: Aj 
Aj‹
 
Aj$
AÈÜ A k 
A 
AA۠
AÈÜAÈÜ(AÓÜ,AN
 A
:,  AG:/  AG:.  AG:-  AG:+  AG:*  AG:)  AG:(  
AG:\'A4"
A60 
B7( 
B7  
B7 
B7 
B7 
B7 A j" 
6 ! a"AøÿÿÿO\r
@@ AO@ Ar"A
j!  Aÿÿÿÿk6  6  6
  : Aj! E\r
 E\r   ü\n  jA: Aj! A\'j!#AÐk"$@ Aj"
( 
," AH"E@A<"
B7 
Aà6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6
 (! AéOA4 Aèn" A4OAjA!A<"\nB7 \nAà6 \nB7 \nB7 \nB7 \nB7$ \nB74 \nB€€€ü7,  \nAj6 (!  \n6@ E\r  ("\nA
k6 \n\r  ((
 | Aj! ("! ("\n G@@@ \nAk("E\r  ("A
k6 \r  ((
 |  \nAk"\nG\r (!  6@A€
  A€
O"\n ( kAuM\r \nAt"!\n  k"@ \n  ü\n   \nj6  \n j6  \n6 E\r r !@@@@ ("\n ("I@ \n (6 \n ("6 @  (A
j6 \nAj!\n
 \n ("k"\nAu"A
j"A€€€€O\r
Aÿÿÿÿ
  k"Au"   K AøÿÿÿO"A€€€€O\r At"" \nj" (6  ("6  j!    (A
j6 ( ( ("k"\nAu Atk! \n@   \nü\n  6  Aj"\n6  6 E\r r  \n6 Aj!\n@ ,AH@ (A: A6
 A: A: \nA€”
 A:$@ ,3AH@ ((A: A6,
 A:3 A:( (" 
( 
 
,AH6  -! -! -! -! -! -! -!\n -
! -! B7( A6$ A6  A6 A6 A6 A6  AtA̞AÀ– r \nAtr Atr Atr Atr Atr Atr Atr6 
( 
 
,"AH"! 
(  ! !\n#A€k"	$@ Aj"(@A! ("E\r
A‹  
 	A4jAAüü 	 6 	 6 	 )7 	 )7 	 )7 	 )7$ 	 ( 6, 	 \n60 	AA 	("Aq6œ 	A„
j"
AA€ü 	A;ã
 	A
:®
 	A;
à
 	A
:ß
 	A
:Â
 	A;¿
 	A
:ª
 	A
:¥
 	A
:„
 A€„q@ 	A
:‚ A€€q@ 	A
:â
 A€ q@ 	A
:¨
 A€€€
q@ 	A
:Á
 A€€€q@ 	A
:¯
 Aq@ 	A
:Ä
 Aq@ 	A
:¾
 A€q@ 	A
:²
 A€Âq@ 	A
:€ A
q@A!@ A G AGqE@  
jA
: A
r"Aý
qA	F@ 
 jA
: Aj"A€G\rA E\rA
  jA
k-"A\rF\r A\nF! 	A6` 	A 6D 	 64 	A€€  A€€OAt6X 	A„jAÿ
AÔü 	B7ä 	B7Ü@AA \n 	("E@ 	AÌj!% 	A°jAr!& 	Aüj!\' 	AèjA
r!( 	A°j!AÜ!A!@@ !@@ 	(" K@ 	B7ø 	B7ð 	B7èA! 	A°jAA  	A°jF""j   F"#! 	(¨!) 	(!@@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r ! 	A°jA,A "j Aj #" 6 	A°jA$A "j Aj #" 6A! 	A°jA A "j Aj #"$A6@ 	(”"AL\r 	(œ! 	(! !\n@@  Alj"
-A>F@ \n O\r  O\r  j-A>G\r A
j"!
@ A
j" O\r@  j-"\nA G \nA	Gq\r
 
A|qAj 
A
j \nA	F!
 A
j" G\r !  
 kAkA 
 G"\n6  6 
!
 \n 
("
I\r  \n 
k"\n6 !
 A
j" G\r ! 
! 	 6ä@@  O\r  j-A\nk


  N\r 	(!
@ 
 Alj-A>F\r
 A
j" G\r ! % & " Aj #!A!\nA!A! !@A
 k!A k! 	(„" 	(üjAk! 	(¬E!  	(! 	( !\r 	(œ!! 	(¤!@@ ("AG@ !

  6@ ! ("M@ !

@ "
 O\r  (j-!@ 
 j- Aÿ
qG\r
 
A
j"
 G\r !
@ 
 k \rI\r@ 
 O\r@@ 
 j-A	k 
A
j"
 G\r !
 	 
6ä A6 	A6¨ 	 
6ä  F@   (k"A  M6 A6 ! (!@@@@ AG\r AL\r  N\r
A! 	A6¤ 
 O\r
 
 j"-A\nk

@ 	Aj 
 	Aäj.AL\r 	A6¤ AþÿÿÿqAG\r A6 A6 A6 !@ AG\r  	(”G\r A6  (" 	(œk"A  O6 	A6¨ A6@@ AL"\r  G\r 	 	( AljAk-"A>G6¨
 	A6¨ \r 	( AljAk-! Aÿ
qA>F\r  G\r 	(€@ ! 	(„"A	H@ ! 	(ü jAk-AG@ ! 	A
6¬ !@  A
q@ !
  AL\r  	(” G\r   Alj"Ak-A>F\r   G\r  	(€\r  A	H\r  -AG\r  6A A
F\r   A$k(k"A  M6 A
k! 	A6¬ 	A6¨@ ("  !O\r@ AG\r@ -"A-k















 
!  G\r@@@ A
j" O\r
  j- F\r@@  j-A	k A
j" G\r ! 	 6ä A6 A
A A=F6 ! 
 \nI\r -""E\rA ÀATE\rA
! 
A
j"\n O\r@@@  \nj-" F"\r A F\r A	G\r  j! \nA
j"\n G\r !\n AI\r
 AI\r A\nk@@@  N\r  G\r@ 	Aj   
 	Aàj 	Aèj/E\r 	-è"A>F\r   Alj"-G\r 	(ð" (K\r 	(ô" k j"!@ 	(à" O\r@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r 	 6ä   k6  6 ! 	 6ä   k"6  6  O\r@  j-A\nk  !M@ 	  j"
6ô A6 	 A
j"
6ô  A
k6 !@   !O@ (AF@ ! A6    !k6 A6 ! 	Aj   
 	Aäj 	Aèj/! (!
@@ @ 	(ä!@ 
AG\r  G\r@@  O\r  j-"A\rF\r 	-è!
 A\nG\r
 
Aÿ
qA>F\r
 A>!
 	-èA>F\r  
Aÿ
q"
A.G 
A)Gq\r 	(ìA
F\r  	(ô" 	(ðk j"!@  O\r@  j-"
A G 
A	Gq\r
 A|qAj A
j 
A	F! A
j" G\r ! 	 6ä   k"
6  6  	,è6@@@  O\r  j-A\nk


 	 A
j6ô
 
 !M@ 	 
 j6ô A6
 	 A
j6ô  
A
k6 E@ 	Aj  j0\r 	(”!@ 	(˜"
 J@ 	(!

 	A 
A
v 
j 
AL"
6˜ 	( 
Als"
E@ 	(("E\rAå 	(0  	 
6 	(”!AÜ   F! A
j! 	 A
j6” 
 Alj"
 	)ø7 
 	)ð7 
 	)è7 	(”! 	(! 	(! !	 
A	F  Fq\r
 	(ä! !  O@ !
@  j"\n-"
A#G@ ! 
AþF\r
 
AàF\r
 !
  A
k"\nF\rA
  A
j"j-A#G\r  \nF\rA  Aj"j-A#G\r  \nF\rA  Aj"j-A#G\r  \nF\rA  Aj"j-A#G\r  \nF\rA  Aj"j-A#G\r  \nF\rA  Aj"j-A#G\r  \nF\r Aj!A@@  j- 
G\r
 A
j" G\r !  k"
AI@ !
 	 
6 @@@  M\r@  j-A G\r
 A
j" G\r
  M\r
@@  j-"
A\nk@ 
AàG\r \n-AàG\r !
 A
j" G\r ! 	 6ä A6 A
6 $A
6\n A	6 !	 " k"
AJ@ !

@  M"\n\r 	(Aq\r  j-A	k"AK@ !
A
 tA“€€q\r !

@ \n\r@  j-"A G A	Gq\r
 A
j" G\r !  6 	 6ä A6  
6@@@@@ 
 O\r 
 j-A<G\r 	-A q\rA!#Ak"$ 
"A
j!@@ 
Aj" 	Aj"\r("K\r \r( j"-"A k  AákAÿ
qAIAÿ
qAÐG\r -
"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\rA
!
@ Aj K\r \r( j"-"A k  AákAÿ
qAIAÿ
qAÓG\r -
"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÔG\rA
!
@ Aj K\r \r( j"-"A k  AákAÿ
qAIAÿ
qAÓG\r -
"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÙG\r -"A k  AákAÿ
qAIAÿ
qAÌG\r -"A k  AákAÿ
qAIAÿ
qAÅG\rA
!
@ A	j" K\r \r( j"-"A k  AákAÿ
qAIAÿ
qAÔG\r -
"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAØG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAÁG\rA
!
@  M\r \r(" j-A!G\rA!  j"-A-G\r -A-F\r
@  M\r \r(" j"-"A?F@A! A!G\r@ Aj" O\r  j,AH\rA!  M\r )B¡¶¢”ˆÕ ÛR\rA!
@ Aj" O\r \r(" j-"Aß
qAÁkAÿ
qAO@ A/G\r
  j-Aß
qAÁkAÿ
qAK\r
    A/F"j","AÁkAÿ
q" Aák AIAtA j("\n("E\r@@@  \n Atj-"j" K\rA! E\r
@  j-"A k  AákAÿ
qAIAÿ
q  j-"A k  AákAÿ
qAIAÿ
qG\r
  A
j"G\r
 \n A
j"Atj("\r
A!  O\r
  j-"A	k"AMAA
 tA“€€q\r
 A>F\r
 A
j" O\r A/G\r  j-A>F\r
  A
jM@A!
A! \rAA   AjAE\rA! (" O\r \r(!@@  j-"A	k"AK\rA
 tA€€qE\r A
j" G\r
AAA A\nF A\rF! Aj$ 	 "6¤@ 
 (AG\r
 	A6¤ 	("A€qE\r (AG\r 
 	(O\r 	( 
j-"A-k
 	Aj 
 	Aäj. F@ 	A6¤ $A
6 A6	 AüG\r
  	(”G\r 	(€"E\r (A
G\r 	Aäj!\n 	Aàj!A!A!\r@ 	Aj"(" 
M\r (" 
j-AüG\rA
! 
A
j"
 O\r@ 
 j-A	k"AK\r
A
 tA€€qE\r
 
A
j"
 G\r !
@@@@ 
 I@ 
 ( 
j-A:Fj!
 
 O\r (" 
j-A-G\r@@@ 
 j-"A-G\r
 
A
j"
 G\r \rA
j!\r
A
! \rA
j!\r@ 
 A:Fj"
 O\r@@ 
 j-"A	k"AK\rA
 tA€€qE\r  
A
j"
G\r
 AüG\rA
!A! 
A
j"
 O\r@ 
 j-A	k"AK\r
A
 tA€€qE\r
 
A
j"
 I\r !
 
 O\r@ 
 j-A\nk E\r
 !
 E\r
 \n 
6  \r6A

AE\r  	(à6 A\n6 A6 	(”"   F  (AF! A€qE\r  jAL\r 	( Alj"Ak-"E\r A?K\rB
 ­†B€€€€ÀƒP\r@ 	(ä" 	("\n Aj"  \nK"
O\r 	(!@  j-"A G A	Gq\r
 A
j" 
G\r 
! Aj" \nO\r 	("
 j-AÛG\r 
 A
j"j,"E\rAÃ ATE\r 
 j-AÝG\r \n Aj"G@  
j-A	k"AK\rA
 tA“€€qE\r Ak ( " -Ar: Ak \'  6@  	("
O\r 	(!@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" 
G\r 
! 	 6ä  6 	 A
j"
6ô  
6  6AÜ!A
!  ! ! 	Aj1A! 	Aj 	A@k2\r 	-Aq@ 	Aj 	AÜj2\r 	AjA0\r 	Aj3\rA!#A
k"\r$ \rA6$ 	Aj"A6@ (€AJ@ \rAøj!@@@@@@ (ø j"("Aÿ
qAk
 \r AsA\nvA
q6 \r /
: \r (6 \r (AsA\nvA
q6 \r /
: \r AÿÿK6 \r /
: \r (6
 \rA6 \r /
At(€a"6  /
! \r 6 \r At(€6 \r \rAj6 \r \rA$j6@@ ("A€q@@ A€qE\r Aÿ
q \rAj (, ("@ ($"E\rA¯ (,  ("Aÿ
q"AK\rA
 tAŽ€qE\r  (A
k6 (! A€qE\r Aÿ
q \rAj (, ("@ ($"E\rAŠ (, @ ("Aÿ
qA
k (Œ (Alj" -
A
r:
  (A
j6 \rB7` \rB7X \rB7P \rB7H \rB7@ \rB78 \rB70 \rB7(@ ("Aÿ
qA\nG\r A€€„
I\r ("A€  Av"nM\r Aq! Aj!A!\nA!@ "AO@ A|q!A!@  Atj"( j (j (j (j ( ( ( (jjjk! Aj! Aj" G\r E\r
@  Atj"( j (k! A
j! \nA
j"\n G\r  n AvO\r  ($"A¨ (,  ( A€~qA	r"6A! \rA6ˆ
 \rB7€
 \rB7x \rB7p \rB7h ("@ (Œ AljAk-A
qE!A
!@@@@@@@ Aÿ
qAk
 \r Av6h A€€I\r ("\n ("j-! (!@@@  ("O\r@  \nj- Aÿ
qG\r
 A
j" G\r
  M\r
@  \nj-A G\r A
j" G\r !@  M\r@  \njA
k-A G\r
 A
k" K\r !A!   \nj  kA \rAèj \rAÈj<\r (! !\n@  M\r@  \nj-A	k"AMAA
 tA€€q\r
 \nA
j"\n G\r !\n   j \n kA  \rA(j<\r \r :ˆ
 (!A! \rA
6l \r Av6h \r (Ak6p
 \r Av6h@@@@@@@  Aÿ
q"A	FqE@  \rAèj (, ("\r
 (! Aÿ
qAk
 ($"E\rAŠ (,  (!@ AÿÿM@ E\r Aj!@ ( (F@ Aj! A
k"\r
@  Alj"Ak( Ak(G\r A
k"\r A
k"E\r Aj! A  ="E\r A Aj (="E\r (!@@ Av"
Atq"E@A! ($"E\r
AÔ (,  r 
@ (! ("! 
! !@ !@  M\r (!@  j-A-F\r
 A
j" G\r !A!  I@ ( jA
k-A:F!@  M\r (!@@  j-"\nA-G\r
 A
j" G\r !
 Ar  \nA:F!  At(°:6 A
k! Aj! A
J\rAA (, ("@ ($"E\r
AŠ (,  r A ( (  
>"\rAA (, ("@ ($"E\r
A¯ (,  r AI\r
@AA (, ("E@ Aj!A!
 ($"E\r
AŠ (,  r@ A  Atj"( (  
>"\r
 A
j" G\rAA (, ("E\r
 ($"E\rA¯ (,  r r
  Aj (?"\r
A!  (Aÿ
q"A	Fq\r  \rAèj (, ("E\r ($"@A¯ (,  ! \r
 \r(X@ \r(Hr \r(Lr \r(Pr \r(8E\r \r((r \r(,r \r(0r \r (! -AkA
M@ Al j! At j!
 (Œ (Alj" -
Aþ
q A\nvA
qr:
  (A
j6 Aj" (€H\r A6€A! \rA
j$ "\r 	-Aq@A!A!#A@j"
$@ 	Aj"(`"E\r (pE\r (X AAW@@AA (, ("E@ (`E\r 
A0j!\n
 ($"E\rAŠ (, @ (X Alj"(E\r
 
B7  
B7 
B7 
B7 \nB7 \nB7 
 (6( 
 (6,@  ( (A \n 
Aj<@A!
A 
A(j (, ("@ ($"E\r
AŠ (, 
  ( (?"\rA 
A(j (, ("E@A!
 ($"E\rA¯ (,  
(@ 
(r 
(r 
(r \r A
j" (`I\rA!AA (, ("E\r ($"@A¯ (,  ! 
A@k$ \rA!AA 	(0 	("E\r 	(("@A¯ 	(0  ! 	 \n6ä A
6 !@ 	(ä"Aj" 	("O\r 	(!@@  j"
-A\nk@ 
-
A\nk@ 
-A\nk@  j-A\nk Aj! Aj!  I\r@  I@ 	(!@A
!@  j-A\nk A
j" G\r !A! 	A°jA(A "j Aj #"\n 6 " ("AG\r@@  ("
M\r 	(!@  jA
k-"A G A	Gq\r
 A
k" 
K\r
@ 
 O\r 	(!@  jA
k-A#G\r
 A
k" 
K\r
 
 F\r 	( jA
k-"
A	F@ !

 
A F@ !

 !
  	-AqE\r
 \n 
6 
!@ AkAI\r  ("M\r 	(!@  jA
k-"
A G 
A	Gq\r
 \n A
k"6  I\r @  	( j-A\rFj!  I@  	( j-A\nFj!@ )E\r E\r  j"AL\r 	( Alj"Ak-A>F\r 	(ü Ak(j" (A€r6@ \r  j" 	(”N\r 	Aj 0\r
 AJ@ 	AjA Al"
 	(j"(" -
Aq 	( j,AA4\r
 	AjA 	(ü" 	-éAq" 	( j,AA
4\r
 	( 
j" -
Aý
q r:
 	( 
j 6 @ 	(”!@ 	-AqE\r 	( Alj"
Ak-A>G\r (AG\r \n(" ("k"AkAK\r 	(" j"-AÛG\r -
A!G\r  jA
k-AÝG\r Ak! Aj!A!@@@@ Ak
@  j-"A k  AákAÿ
qAIAÿ
q -–"A k  AákAÿ
qAIAÿ
qG\r A
j" G\rA@  j-"A k  AákAÿ
qAIAÿ
q -\r"A k  AákAÿ
qAIAÿ
qG@ A\nk A
j" G\rAA!@  j-"A k  AákAÿ
qAIAÿ
q -\n"A k  AákAÿ
qAIAÿ
qG@ A\nG\r A
j" G\rA
A!@  j-"A k  AákAÿ
qAIAÿ
q -ä"A k  AákAÿ
qAIAÿ
qG@ A\nG\r -"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÕG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÏG\r -"A k  AákAÿ
qAIAÿ
qAÎG\rA  A
j" G\rA! 
Ak"
 
-Ar: 	( 	(”AljAk"
 
-AÇ
q r: A6 	(”!  k!
@A!@@A
 	( 
Alj"-A)kt"AqE@ A!qE\r
A! 	Aj1  	(„6 	Aj  ( ,A
4\r 	AjA (" -
Aq 	( j,AA
4\r
 	AjAA
 -
"AqA AvAqA
4\r 
A
j"
 	(”H\r@ (E@ 	Aj1@A!A!AÜ! 	-AÀqE\r
 ( \n(I\r
 	 	(ŒA
j6Œ
 	(Œ@@ 	(„"
Aj" 	(ˆ"J@ 	A€ A
v j AL"6ˆ 	(ü s"E@A! 	(("E\rAå 	(0  	(€"
@ 	  
 	(ükj6€ 	 6ü 	 	(„"
Aj6„
 	 6„ 	(ü"\rA! 
 j"A;
 	(Œ!
 A6  
AtAr6 	A6Œ@ $(E\r 	Aj1E\rA!@@@@ ("A
k\n
A! 	Aj1\r 	(„"Aj"
 	(ˆ"J@ 	A€ A
v j AL"6ˆ 	(ü s"E@ 	(("E\r\nAå 	(0 \n 	(€"
@ 	  
 	(ükj6€ 	 	(„"
Aj6„ 	 6ü 
 j
 	 
6„ 	(ü"E\r  j" (AtAÐÍj("
 /
Atr6 (! A6  
 Atr6 	 6€ 	Aj 5\r 	Aj1\rA!AÜ! 	(€A: 	(€ /
;
 	(€" (A€r6A! 	Aj 5\r 	Aj1\rA! 	(€E@AÜ! A6 ! 	(€A\n: 	(€ /
;
 A	6AA 	Aj 5!
@  (F\r 	Aj1E\rA!@ 	(€\r !@ 	Aj"\n(€"Aj" \n(„"
J@ \nA€ 
A
v 
j 
AL"
6„ \n(ø 
s"
E@A \n($"
E\rAå \n(, 
A \n(ü"@ \n 
  \n(økj6ü \n 
6ø \n \n(€"Aj6€ 
 j
 \n 6€ \n(ø"
E\r 
 j"
 (AtAÐÍj(" 
/
Atr6 (! 
A6 
  Atr6 \n 
6üA
AE\rA! 	Aj 5!A! E\r
A!
 	(("E\rAŠ \n  	(P"@ 	(T"
A!@@ 	(P Atj("E\r 	(@" M@   	(D 	(HljI\r
 r 	(T!
 A
j" 
I\r 	(P r 	(H@A!@ 	(@ Atj"-"
A
q (r - 
Aq@ (r A
j" 	(HI\r 	(@r 	(l"@ 	(p"
A!@@ 	(l Atj("E\r 	(\\" M@   	(` 	(dljI\r
 r 	(p!
 A
j" 
I\r 	(l r 	(d@A!@ 	(\\ Alj(r A
j" 	(dI\r 	(\\r 	(8r 	(xr 	(ür 	(r 	A€j$ @A<"
B7 
Aà6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6
 (@ (("E\r ((" ($"
G A$j!A!@@@ 
 At"j("(A
F@ ($" (("G\r
 A
j!
  k"
Au!@@ ((AF\rA
! 
AG@@ A
j!
  Atj"((AF@ 
 O\r Ak(!  
Atj(! \r \r 
! 
 G\rA! A68 B70A!

A!
 A68 B70 A6L B7D  A0j6@  AÄj6<@@@@@@  
At"j"("(AG\r 
 Ak(A
!  
A
j"K@  Atj( rA
G\r
 A<j ($ j! (4"
 (8"I@ 
 (6 
 ("6 @  (A
j6  
Aj64 
 (0"k"
Au"A
j"A€€€€O\rAÿÿÿÿ
  k"Au"\n   \nI AøÿÿÿO"A€€€€O\r At""\n 
j" (6  ("6 \n j!    (A
j6 (8 (4 k"
Au Atk! 
@   
ü\n  68  Aj"
64  60 @ r  
64
@ (H" (L"I@  6  ("6 @  (A
j6 Aj!
  (D"k"Au"A
j"A€€€€O\rAÿÿÿÿ
  k"Au"\n   \nI AøÿÿÿO"A€€€€O\r At""\n j" (6  ("6 \n j!    (A
j6 (L (H k"Au Atk! @   ü\n  6L  Aj"6H  6D E\r r  6H 
A
j! "
 (( ($"kAu"I\r
 A<j (D"@ " (H"
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r (D!  6H (L r (0" (4"
F\r ($ j"!
 Aj" (("G@@ )!* B7 
(! 
 *7@ E\r  ("A
k6 \r  ((
 | 
Aj!
 Aj" G\r ((!  
G@@@ Ak("E\r  ("A
k6 \r  ((
 | 
 Ak"G\r  
6(   (0"
 (4"  
kAu (4"
 (0"kAu j
 A
j! @ " 
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r (0!  64 (8 r ($!
 ((!   
kAuI\r ((  (( ("
("E\r  6  
("
6 
E\r
 
 
(A
j6
A<"
B7 
Aà6 
B7 
B7 
B7 
B7$ 
B74 
B€€€ü7,  
6  
Aj6 AÐj$ ,AH@ ( (r (!
 Aj"A6 B7 A€”
 
 \nAÓÜ,AH@AÐÜ(AÈÜ(rAÐÜ (6AÈÜ )"*7AÓÜ,AH! *§!@ ("E\r  ("A
k6 \r  ((
 | (!
 A6 
@ 
",3AH@ 
(0 
((r ,AH@ ( (r ("
@ 
" ("G@@@ Ak("E\r  ("A
k6 \r  ((
 | 
 Ak"G\r (!  
6 ( r@ ("E\r  ("A
k6 \r  ((
 | r AÈÜ ! A0j$ AÆ A¤
 
"AÈÛ6 AÔÛA
®
	#Ak"$ 
A"š
 ( ," AH""@ (  " j!@@@@@@@@@@@ -"Ak
 
A²›
 
Aë\r›
 
A¹›
 
AÒ\n›
 
AΛ
 
Aø›
 AÜF\r
 AM@  6#Ak"$  6#A 
k"$  A	j"6”
 A6˜
 AA
ü A6L A6$ A6P  AŸ
j6,  A”
j6T A:A!#AÐ
k"$  6Ì
 A 
jAA(ü  (Ì
6È
@A AÈ
j AÐj A 
jgAH\r (LAH!\n  ("	A_q6@@ (0E@ AÐ60 A6 B7 (,!  6,
 (\r
A d\r
  AÈ
j AÐj A 
jg! 	A q!	  AA ($ A60  6, A6 ( B7A   ( 	r6 \n\r AÐ
j$ A 
j$ Aj$ 
 A	j›
 
 Àš

 
Aà›
 A
j" G\r 
A"š
 Aj$á

 
Aµ›
 ("A"I@ 
 At(Ì›
 
A"š
 ( ," AH@ 
A²›
 Aj 
	 (@ 
A”›
@ ("E\r Aj 
	 
A:š
 Aj 
	 ("E\r@ 
A,š
 Aj 
	 
A:š
 Aj 
	 ("\r 
Aýš
 ($ ((G@ 
Aç›
@ ($" ((F\r ( 
\n (( ($kAM\rA
!@ 
A,š
 ($ Atj( 
\n A
j" (( ($kAuI\r 
AÝš
 
Aýš
A€AÎAÎAÓ
¾

#A k"$@ E\r 
E\r E\r@@@@ 
A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6  Aj6  )7  A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6  Aj6  )7  Aj -$A
G\r
 A(j 
 •

 Aj 
 •
 A j$As

 E@A
@ ( (F\r  ("
 (kA	I\r@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak6AÔ
#Að
k"$@@ E@A
!	
@@@@@@@@@@@@@ 
\r\r	\n\r\rA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r@@ 
("@ 
("\r
 A6è
 B7à

 AøÿÿÿO\r@ AO@ Ar"A
j!  Aÿÿÿÿk6è
  6à
  6ä

  :ë
 Aà
j! @   ü\n  jA: (ä
 -ë
" ÀAHE\r AàÜ Aà
j@ 
("E\r 
("E\r AøÿÿÿO\r@ AO@ Ar"A
j!
  Aÿÿÿÿk6Ü
  
6Ô
  6Ø

  :ß
 AÔ
j!
 @ 
  ü\n 
 jA: (Ø
 -ß
"
 
ÀAH@ AìÜ AÔ
j ,ß
AN\r (Ü
 (Ô
r ,ë
AN\r (è
 (à
r  6Ð
  6Ì
  (A
j6  )Ì
7    ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6È
  Aj6Ä
  )Ä
7  AjA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6À
  Aj6¼
  )¼
7  Aj\nA<"B7 A	6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6¸
  Aj6´
  )´
7  Aj	A<"B7 A\n6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6°
  Aj6¬
  )¬
7   A jA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6¨
  Aj6¤
  )¤
7(  A(jA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r@@ 
("@ 
("\r
 A6è
 B7à

 AøÿÿÿO\r	@ AO@ Ar"A
j!  Aÿÿÿÿk6è
  6à
  6ä

  :ë
 Aà
j! @   ü\n  jA: (ä
 -ë
" ÀAHE\r AàÜ Aà
j@ 
("E\r 
("E\r AøÿÿÿO\r	@ AO@ Ar"A
j!
  Aÿÿÿÿk6Ü
  
6Ô
  6Ø

  :ß
 AÔ
j!
 @ 
  ü\n 
 jA: (Ø
 -ß
"
 
ÀAH@ AìÜ AÔ
j ,ß
AN\r (Ü
 (Ô
r ,ë
AN\r (è
 (à
r  6 
  6œ
  (A
j6  )œ
70  A0j  ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6˜
  Aj6”
  )”
78  A8jA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6
  Aj6Œ
  )Œ
7@  A@kA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6ˆ
  Aj6„
  )„
7H  AÈjA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6€
  Aj6|  )|7P  AÐjA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6x  Aj6t  )t7X  AØj
A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6p  Aj6l  )l7`  Aàj Að
j$ 	Ð
\n#Aàk"$@ E@A
!
@@ 	







A! A:$ B7 B7 B7 B€€€€€€€À?7 @ (, ,3" AH"
"E\r A(j"("  
!
@  
j-S@ A
j" G\r
   AH j-A<G\r@ A
j" O\r   AH"
 j-A/F\r
@  
j-SE\r
 A
j" G\r
  O\r   AH! !
@@ 
 j"-S\r
 -A>F\r
 -A/F\r
 
A
j"
 G\r !
  
F\r Aj 
 k”
  
I@@ Aj ((  ,3AH j-bÀš
 A
j" 
G\r 
 (," ,3"	 	AH"O\r 	Av! Aj!\n@ (  A
q!@ 
 j"-S@ 
A
j"
 I\r
 -A>F\r
 -A/F\r
@@  
K@ 
!@@  j"-A=F\r
 -S\r
 -A>F\r
 -A/F\r
 A
j" I\r ! 
 G\r
 
A
j!

 A6P B7H AÈj  
k”
 
 I@@ AÈj ((  ,3AH 
j-bÀš
 
A
j"
 I\r@@  (, ,3" AH""O\r (  !@@  j"
-SE\r
 A
j" G\r  
-A=G\r@@@@@@  "A
j"M\r
  j"
-S\r B78 A6@@ 
-A"F\r 
-A\'F\r !
@ 
 j"	-S\r 	-A>F\r 	-A/F\r 
A
j"
 G\r !
 Aj"!@  M\r 
-!
@  j- 
F\r
 A
j" I\r !  k"  k"
  
I"AøÿÿÿO\r@@ AO@ Ar"	A
j!
  	Aÿÿÿÿk64  
6,  60
  :7 A,j!
 E\r
 E\r 
  j ü\n  
jA: ,CAH@ (@ (8r  (46@  ),78   (, ,3" AHIj!
 A6@ B78 !
  M\r  k" 
 k"  I"AøÿÿÿO\r
@@ AO@ Ar"	A
j!  	Aÿÿÿÿk64  6,  60
  :7 A,j! E\r
 E\r   j ü\n  jA: ,CAH@ (@ (8r  (46@  ),78  AÈj6\\ A,j \n AÈj AÜj@ (,"Aj" A8jF\r ,C! ,AN@ AN@  (@6  )87  (8 (<™

  (8 A8j AH" (<  ˜
 ,CAN\r (@ (8rA¤
AƁ
"AüÛ6 AˆÜA
 !
  AÈj6, A8j \n AÈj A,j (8",AH@ A6 (
 A: AjA: ,SAH@ (P (Hr (,! -3!	 
  	Aÿ
q 	ÀAH""I\rA!A!@ ( ,"
 
AHAG\r ( Aj 
AH"
(Aöґ«s 
-Aïsr\r A:S A:K A»/;
H A½-:J Aj!\nA!	 AÈj"( ," AH""! (  "!@ "AI\r Ak"Aq@ !
 
 (A•ÓÇÞl"Av sA•ÓÇÞl A•ÓÇÞls! !
 Aj! AI\r 
!@ (A•ÓÇÞl"
Av 
sA•ÓÇÞl (A•ÓÇÞl"
Av 
sA•ÓÇÞl A•ÓÇÞlsA•ÓÇÞls! Aj! Ak"AK\r@@@@ A
k
 -At s! -
At s!  -sA•ÓÇÞl!@ \n("
E\r \n( A\rv sA•ÓÇÞl"Av s" 
A
kq 
i"A
M\r  
 K\r  
p"Atj("E\r ("E\r 
A
k!	 A
K!\n@@@  ("G@@ \nE@  	q!
 
 K\r  
p!  G\r
 ( ," AH" G\r ( Aj   U\r !	 ("\r
A
 	!
 ,SAH@ (P (Hr 
E\r 
( 
," AHE\rA<"B7 A!6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, A:S AŽ/;
H A-:J A:K  AÈj6, A8j Aj AÈj A,j@ (8" 
F\r 
Aj! Aj! 
,! ,AN@ AN@  (6  )7  
( 
(™

  
(  AH" 
(  ˜
 ,SAH@ (P (Hr Aj! Aj ,AH@ ( (r@ ,3AH@ ((A: A6,
 A:3 A:(@ E\r ( ("F\r Ak(!  6  6 A$j Aj@ ("E\r  ("A
k6 \r  ((
 |A!A! E\r
  ("A
k6 \r
  ((
 |
A! ( (F\r  (" (kA	I\r@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
|  Ak6 Aàj$ à%
#A k"$@@ E@A
!	
@@@@@@@@@@@@@@@@ A
k
\n\r	A<"B7 A
6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6Œ  Aj6ˆ  )ˆ7  A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,@ 
E\r 
(!
 A:• AA
 
 
A
L"
 
ANA0r:” A”ja"
AøÿÿÿO\r@@ 
AO@ 
Ar"A
j!  Aÿÿÿÿk6€  6ø
  
6ü

  
:ƒ Aø
j! 
E\r
 
E\r  A”j 
ü\n 
 jA: AÔÜ6˜ A¤
j AjAÔÜ A˜j@ (¤
"Aj"
 Aø
jF\r ,ƒ! ,AN@ AN@ 
 (€6 
 )ø
7 
 (ø
 (ü
™

 
 (ø
 Aø
j AH" (ü
  ˜
 ,ƒAN\r (€ (ø
r  6ô
  Aj6ð
  (A
j6  )ð
7  Aj  ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6ì
  Aj6è
  )è
7  Aj\rA<"B7 A 6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
("E\r 
("E\r AøÿÿÿO\r@ AO@ Ar"A
j!
  Aÿÿÿÿk6€  
6ø
  6ü

  :ƒ Aø
j!
 @ 
  ü\n 
 jA: (ü
 -ƒ"
 
ÀAH@ AÄÝ Aø
j ,ƒAN\r (€ (ø
r  6ä
  6à
  (A
j6  )à
7  Aj  ("A
k6 \r  ((
 |A<"B7 A\r6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6Ü
  Aj6Ø
  )Ø
7   A jA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
("
A
F\r Aø
j 
œ
 A¬Ý Aø
j ,ƒAN\r (€ (ø
r  6Ô
  6Ð
  (A
j6  )Ð
7(  A(j  ("A
k6 \r\n  ((
 |\nA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r 
(E\r A”Ý Aø
jAû" ,AH@ ( (r A Ý Aø
jAûA› 
-Aß
qAØF"
 
,AN\r 
( 
(r  6Ì
  6È
  (A
j6  )È
70  A0j  ("A
k6 \r	  ((
 |	A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r@ 
- "E\r A:¥
  :¤
 AøÜ Aø
j A¤
j" ,AN\r ( (r 
("E\r 
("E\r AøÿÿÿO\r\n@ AO@ Ar"A
j!
  Aÿÿÿÿk6€  
6ø
  6ü

  :ƒ Aø
j!
 @ 
  ü\n 
 jA: (ü
 -ƒ"
 
ÀAH@ AˆÝ Aø
j ,ƒAN\r (€ (ø
r  6Ä
  6À
  (A
j6  )À
78  A8j  ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6¼
  Aj6¸
  )¸
7@  A@kA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r Aø
j 
(œ
 A¸Ý6˜ A¤
j AjA¸Ý A˜j@ (¤
"Aj"
 Aø
jF\r ,ƒ! ,AN@ AN@ 
 (€6 
 )ø
7 
 (ø
 (ü
™

 
 (ø
 Aø
j AH" (ü
  ˜
 ,ƒAN\r (€ (ø
r  6´
  6°
  (A
j6  )°
7H  AÈj  ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, Aj!@ 
E\r A:€ BãÞ±›ô­·ô7ø
 A:ƒ A¤
j 
(œ
  Aø
j6” A˜j Aj" Aø
j A”j@ (˜"Aj" A¤
jF\r ,¯
! ,AN@ AN@  (¬
6  )¤
7  (¤
 (¨
™

  (¤
 A¤
j AH" (¨
  ˜
 ,¯
AH@ (¬
 (¤
r ,ƒAH@ (€ (ø
r A"6ø
 BŒ€€€€‚€€€7ü
 Aù	(6 Añ	)7 A: A¤
j 
(œ
  Aø
j6” A˜j  Aø
j A”j@ (˜"Aj" A¤
jF\r ,¯
! ,AN@ AN@  (¬
6  )¤
7  (¤
 (¨
™

  (¤
 A¤
j AH" (¨
  ˜
 ,¯
AH@ (¬
 (¤
r ,ƒAH@ (€ (ø
r A"6ø
 BŒ€€€€‚€€€7ü
 Aì	(6 Aä	)7 A: A¤
j 
(œ
  Aø
j6” A˜j  Aø
j A”j@ (˜"Aj"
 A¤
jF\r ,¯
! ,AN@ AN@ 
 (¬
6 
 )¤
7 
 (¤
 (¨
™

 
 (¤
 A¤
j AH" (¨
  ˜
 ,¯
AH@ (¬
 (¤
r ,ƒAN\r (€ (ø
r  6 
  6œ
  (A
j6  )œ
7P  AÐj  ("A
k6 \r  ((
 |A<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6˜
  Aj6”
  )”
7X  AØjA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6
  Aj6Œ
  )Œ
7`  AàjA<"B7 A6 Aà6 B7 B7 B7  A6( B74 B€€€ü7,  6ˆ
  Aj6„
  )„
7h  AèjA<"B7 Aà6 B7 B7 B7  A6( B74 B€€€ü7, AA AF6@ 
E\rAš\n! 
(A
k"AM@ At(Ð! A:ƒ A:ý
 Aá\r(6ø
 Aå\r-:ü
 a"AøÿÿÿO\r@@ AO@ Ar"A
j!
  Aÿÿÿÿk6¬
  
6¤
  6¨

  :¯
 A¤
j!
 E\r
 E\r 
  ü\n  
jA:  Aø
j6” A˜j Aj Aø
j A”j@ (˜"
Aj" A¤
jF\r ,¯
! 
,AN@ AN@  (¬
6  )¤
7  (¤
 (¨
™

  (¤
 A¤
j AH"
 (¨
  
˜
 ,¯
AH@ (¬
 (¤
r ,ƒAN\r (€ (ø
r  6€
  Aj6|  (A
j6  )|7p  Aðj  ("A
k6 \r
  ((
 |
 A
:$ ,3AH@ ((A: A6,
 A:3 A:( A j$ 	 
#Ak"$@ ( ,"
 
AHE\r (" (F\rA<"
B74 
B€€€ü7, 
A6 
Aà6 
B7 
B7 
B7$ 
 Aj")7 
 (6 A: A: Ak(!  
6  
Aj6 A$j Aj@ ("
E\r 
 
("A
k6 \r 
 
((
 
| ,AH@ (A: A6
 A: A: Aj$ª

~A
!@@@ (Ak


























 ( ,"
 
AH"
"E\r
  ( Aj 
"j!
 !@@ 1"B?V\rB
 †B€Ì€€ƒP\r A
j" 
G\r
  kAFA! ¹	
	#Ak"$ ("("
 ("kAu!@ 
 F\r@  Atj(E\r
 A
j" G\r !@@ " M\r
  A
k"Atj(\rA<"
B7 
A
6 
Aà6 
B7 
B7 
B7  
A6( 
B74 
B€€€ü7,  
6  
Aj6 
A0j!  At"
j!  At"j!@  
kAu"	 ("
 ("kAuM@ (" k"
Au 	I@ 
 j!
  G@@ (! ("@  (A
j6  6 (!  6@ E\r  ("A
k6 \r  ((
 | Aj! Aj" 
G\r (! ! 
 G@@  
(6  
("6 @  (A
j6 Aj! 
Aj"
 G\r    kj6  G@@ (!
 ("@  (A
j6  
6 (!
  6@ 
E\r 
 
("A
k6 \r 
 
((
 
| Aj! Aj" G\r (!  G@@@ Ak("E\r  ("
A
k6 
\r  ((
 |  Ak"G\r  6
 @ ! ("
 G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r ( (!  6 r A6 B7A!
@ 	A€€€€O\rAÿÿÿÿ
 
Au" 	  	K 
AøÿÿÿO"A€€€€O\r  At"
"6  6  
 j6  G@@  (6  ("
6 
@ 
 
(A
j6 Aj! Aj" G\r  6
 ( Aj@ ("
E\r 
 
("A
k6 \r 
 
((
 
| ("(! (!
 
 G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r  6 Aj$A„)

A¤
€
"A€Ú6 A”Ú6 AèÚAÂ	
~ AL@ (" ("kAu N@  
k"Au"\n H@@   j"	F@ !
 	! !@  (6  ("6 @  (A
j6 Aj! Aj" G\r  6 \nAL@ 
 At"j! !   k"K@ !@  (6  (6 B7 Aj! Aj" I\r  6  G@@ Ak")! B7 Ak(! Ak" 7@ E\r  ("A
k6 \r  ((
 | 
 G\r 
 F@ 
!@ (! ("@  (A
j6  6 (!  6@ E\r  ("A
k6 \r  ((
 | Aj! Aj" 	G\r 
 At"j! !   k"K@ !@  (6  (6 B7 Aj! Aj" I\r  6  G@@ Ak")! B7 Ak(! Ak" 7@ E\r  ("A
k6 \r  ((
 | 
 G\r  Atj! 
!@ (! ("@  (A
j6  6 (!  6@ E\r  ("A
k6 \r  ((
 | Aj! Aj" G\r@  ("kAu j"A€€€€I@Aÿÿÿÿ
  k"Au"   I AøÿÿÿO" A€€€€O\r AtA"	 
 kj! At"Ak"Aq   (6  ("6 @  (A
j6 Aj! Aj!  j! @@  (6  ("6 @  (A
j6  (6  ("6 @  (A
j6 Aj! Aj" G\r ( 
k"@  
 ü\n  
6  
 ("k"k!
 @ 
  ü\n   j6  
6 (  	 Atj6 @ rÝ
#A k"$ ($" (("
G@@ ( Aj" 
G\r@ (AG\r ($" (("
F\r !@@@@@ (("


















 
 k"AH\r
  "6  6   j6 A6 B7  Aj6  Aj6@ Aj!@@ (("















  Aj!   
 Aj"G\r Aj" 
G\r
  ($"@ "
 (("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
|  Ak"G\r ($!
  6( (, 
r  (6$  (6(  (6, A6 B7 ("E\r "
 ("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
|  Ak"G\r (!
  6 ( 
r ("E\r "
 ("G@@@ Ak("
E\r 
 
("A
k6 \r 
 
((
 
|  Ak"G\r (!
  6 ( 
r A j$¶
~#A k"$@@@ ($"
 (("F\r@ 
("("A G AGqE@  
Aj"
 G\r ((" ($"F\r A$j!@  \nAt"\rj("
("	A\rkAO \nA
jA
!@ 
($" 
(("F\r !
@@@ 
("(AG\r (( ($"kAG\r ((A!F\r
 
Aj"
 G\r
 A6 B7 A6 B7@@@ ("
(AG\r 
(( 
($"
kAG\r 
((A!G\r (" ("G@A<"
B7 
 	6 
Aà6 
B7 
B7 
B7  
B€€€€€€€À?7(  
6  
Aj6 
 (68 
 64 
 60 A6 B7 Aj @ ("
E\r 
 
("A
k6 \r 
 
((
 
| (($!
 (" ("I@  
(6  
("
6 
@ 
 
(A
j6  Aj6  ("k"Au"A
j"A€€€€O\rAÿÿÿÿ
  k"Au"   I AøÿÿÿO"A€€€€O\r At"" j" 
(6  
("
6  j!  
 
 
(A
j6 ( ( k"Au Atk!
 @ 
  ü\n  6  Aj"6  
6 @ r  6
 Aj  Aj" G\r@ (" ("F\rA<"
B7 
 	6 
Aà6 
B7 
B7 
B7  
B€€€€€€€À?7(  
6  
Aj6 
 (68 
 64 
 60 A6 B7 Aj  ("
E\r 
 
("A
k6 \r 
 
((
 
| ($ \rj"	!
 	Aj" (("G@@ )! B7 
(! 
 7@ E\r  ("A
k6 \r  ((
 | 
Aj!
 Aj" G\r ((! 
 G@@@ Ak("E\r  ("A
k6 \r  ((
 | 
 Ak"G\r  
6(  	 ("
 ("  
kAu ("	! ( 	k! ("@ " ("
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r (!  6 ( r (! @ " ("
G@@@ 
Ak("E\r  ("A
k6 \r  ((
 |  
Ak"
G\r (!  6 ( r Au! ($! ((!  \nj!\n \n  kAuI\r A j$Þ

#Ak"$ @ 
("E\r (" (F\r Ak(! 
("@  (A
j6 Aj!  6  6 A$j Aj@ ("E\r  ("A
k6 \r  ((
 |  
@ 
("
E\r 
 
("A
k6 \r 
 
((
 
| Aj$¢	} ( ," AH""! (  "	!@ "AI\r Ak"Aq@ ! 	
 	(A•ÓÇÞl"Av sA•ÓÇÞl A•ÓÇÞls! ! 	Aj! AI\r !@ (A•ÓÇÞl"Av sA•ÓÇÞl (A•ÓÇÞl"Av sA•ÓÇÞl A•ÓÇÞlsA•ÓÇÞls! Aj! Ak"AK\r@@@@ A
k
 -At s! -
At s!  -sA•ÓÇÞl! A\rv sA•ÓÇÞl"Av s! @ 
("E\r 
(  A
kq i"A
M\r   K\r  p"Atj("E\r ("E\r A
k!\n A
K!@@  ("G@@ E@  \nq!
  K\r  p!  F\r
 ( ," AH G\rA ( Aj AH 	 UE\r ("\rA " 6 A6 Aj!@ (",AN@  (6  )7
 (! (!\n#Ak"$@@@ \n‘
@ " \n’

 \nA÷ÿÿÿK\r
 Aj \nŒ
A
j“
 (  ("6  (
  \n6   \nA
j‰
 Aj$

 A6 B7 
*!\r 
(A
j³!@ @ \r ³” ]E\r
@A  A
kqAG AIr A
tr"  \r•ü
"  K"A
F\r   A
kqE\r w" 
("M@  M\r
 
(³ 
*•ü
! @ AI\r iA
K\r A
A  A
kgkt AI
 w"  K" O\r
 
!@@ "@ A€€€€O\r
 At"! (!  6 @ ( r (!  6 @ A ü ("E\r Aj! (!@ i"	A
M@  A
kq!
  I\r  p!  Atj 6 ("E\r A
k!\n 	A
K!@ (!@ E@  \nq!
  I\r  p!@  F@ !
  Atj"	(E@ 	 6 ! !
  (6  	((6 	( 6 ("\r (! A6 @ ( r A6
 
(" A
k"qE@  q!
  K@ !
  p!@ 
(" Atj"("E@  
(6 
 6  
Aj6 ("E\r
 (!@  A
k"qE@  q!
  K\r  p!  Atj 6
  (6  6 
 
(A
j6A
:  6¡

#Ak"$  
6 Aj Aj 
 Aj@ ("Aj"
 F\r ,! ,AN@ AN@ 
 (6 
 )7 
 ( (™

 
 (  AH" (  ˜
 Aj$}
 
a"AøÿÿÿI@@@ AO@ Ar"A
j!  Aÿÿÿÿk6  6  6
  : ! E\r
 E\r  
 ü\n  jA: o
 ("
@@ 
(! 
,AH@ 
( 
(r 
,AH@ 
( 
(r 
r "
\r (!
 A6 
@ ( 
r
 (" ("I@  
(6  
(6 
B7  Aj6@  ("k"Au"A
j"A€€€€I@Aÿÿÿÿ
  k"Au"   I AøÿÿÿO" A€€€€O\r AtA" j" 
(6  
(6 
B7  Atk!
 @ 
  ü\n   Atj6  Aj"6  
6 @ r  6Î

#Ak"$ @ 
("E\r ( ("F\r Ak(! 
("@  (A
j6  6  6 A$j Aj ("E\r  ("A
k6 \r  ((
 |@ 
("
E\r 
 
("A
k6 \r 
 
((
 
| Aj$Ý
#A0k"
$ ("(" ("G@ !@@@ (@  Aj"G\r
A<"B7 A
6 Aà6 B7 B7 B7  A6( B74 B€€€ü7, 
 6 
 Aj6 
A: 
A¢\n(6 
A¦\n-: 
A: 
A: 
AôäÕ«6 
A: 
 
Aj6$ 
A(j Aj 
Aj 
A$j@ 
(("Aj" 
F\r ,AN@  
(6  
)7
  
A˜
 
,AN\r 
( 
(r 
,AH@ 
( 
(r (! (0"@ " (4"G@@@ Ak("E\r  ("A
k6 \r  ((
 |  Ak"G\r (0!  64 (8 r A68 B70  (60  (64  (68 A6 B7 ( 
Aj 
("E\r
  ("A
k6 \r
  ((
 |
@ (  Aj" G\r ("(" ("G@@@ Ak("E\r  ("A
k6 \r  ((
 |  Ak"G\r  6 
A0j$ AßÜ,AH@AÜÜ(AÔÜ(r AëÜ,AH@AèÜ(AàÜ(r A÷Ü,AH@AôÜ(AìÜ(r AƒÝ,AH@A€Ý(AøÜ(r A“Ý,AH@AÝ(AˆÝ(r AŸÝ,AH@AœÝ(A”Ý(r A«Ý,AH@A¨Ý(A Ý(r A·Ý,AH@A´Ý(A¬Ý(r AÃÝ,AH@AÀÝ(A¸Ý(r AÏÝ,AH@AÌÝ(AÄÝ(r Aà6  Aà6 r¬

#Ak"$ Aj"
($"@ " 
(("G@@@ Ak("E\r  ("A
k6 \r  ((
 |  Ak"G\r 
($! 
 6( 
(, r 
Aj 
,AH@ 
( 
(r Aj$ rµ
 (!@@@@@@@@@@@@ ( Ak
  
A
j"M@  
6A A
k! (!@@ 
! !
@  j"-"A<G@ A\nk


 
 j-A/G\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r  j-A>F\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÓG\r -"A k  AákAÿ
qAIAÿ
qAÃG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÉG\r -"A k  AákAÿ
qAIAÿ
qAÐG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r  j-A>F\r@ Aj" O\r -"A k  AákAÿ
qAIAÿ
qAÓG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÙG\r -"A k  AákAÿ
qAIAÿ
qAÌG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r  j-A>F\r A\nj" O\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -"A k  AákAÿ
qAIAÿ
qAØG\r -"A k  AákAÿ
qAIAÿ
qAÔG\r -"A k  AákAÿ
qAIAÿ
qAÁG\r -"A k  AákAÿ
qAIAÿ
qAÒG\r -"A k  AákAÿ
qAIAÿ
qAÅG\r -	"A k  AákAÿ
qAIAÿ
qAÁG\r  j-A>F\r\r 
A
j" G\r !  6A 
Aj" O\r Ak! (!@@ 
 j"-A\nk\n\n /A­Ús -A>srE\r 
Aj! 
A
j!
  I\r !
 
Aj" O\r Ak! (!@@ 
 j"-A\nk		 /A¿üF\r 
Aj! 
A
j!
  I\r !
 
A
j" O\r A
k! (!@@@ 
 j-"A\nk	

	 A>F\r 
Aj! 
A
j!
  I\r !
 
Aj" O\r Ak! (!@@ 
 j"-A\nk /Aݺ
s -A>srE\r 
Aj! 
A
j!
  I\r !
@@ 
 O\rA! ( 
j-A\nk


  
6 ( !   6A  6A  6A  6A  
6A  A
j6A
Å
@  ("O\r 
 (˜O\r @ (" j-"E\r A>F@ A>:  
6  -
Aü
q:
 A
j! 
A
j A?K\rB
 ­†B€€€€€ƒP\r  A
j"K@  j-A	k"AK\r
A
 tA“€€qE\r
  :  
6  -
Aü
q:
 
A
j
A! A6  A	j"   I"\nO\r
A! !@@  j-"	A0kAÿ
qA	K\r
  	 A\nljA0k"6 A
j" \nG\r \n!  M\r
  O\r
@  j-"	A)k  A
j"K@  j-A	k"AK\rA
 tA“€€qE\r  	:  
6  -
Aü
q:
 
 k jA
j6  6A
! ç

 
 ("H@@A!@@@A
 (ΠAlj"Ak"-A)kt"AqE@ A!qE\r
A! Ak(!A! Ak-Aq@ ( j,!A! A  A4\r
  A ,A4\r
 AA
 Ak-"AqA AvAqA4E\r
A!   (A
k"6 
 H\rAÞ
#A0k"$@ (ü"
E\r@@@ 
("Aÿ
qAk
 A€qE\r
 
(" (O\r ( j-AÛG\r@ 
("E\r 
Aj! A<j!@@  Atj"(!
@@ -AqE@ (!\n
 (!\n 
A
j" (O\r 
 \nj-AÛG\r  \nj-AÞG\r 
Aj"\r ("O\r  k! \r!@@  \nj-"A	k"AMAA
 tA€€q\r@ AÛk

  A
j"G\r
  \rF\r AÝG\r A
j" O\r  \nj-A:G\r@ Aj" O\r@  \nj-A	k"
AK\r
A
 
tA€€qE\r
 A
j" I\r !A
!
@ AI\r@@  
Atj"("Aj ("O\r  \nj"	-AÛG\r 	-
AÞG\r Aj"!  M\r@@  \nj-"	A	k"AMAA
 tA€€q\r
@ 	AÛk A
j" G\r !  M\r A
j"	 O\r  \nj-AÝG\r 	 \nj-A:F\r 
A
j"
 G\r !
@@@ 
A
k"	 
 
A
K 
  O"At"q"E@ ($"
E\r
AÔ (, 

@ 
 K@ E\r
  Aj ü\n
  6  6 
AI\r 	At"E\r Aj Aj ü\n (X! (`" (d"I\r  A
v jA " (\\ls"\r
 ($"
E\rAå (, 
 rA!  6d  6X (`!  \rk! \n \rj!\r  (\\"	 lj! 	@ A 	ü  6  \r6  \r 66  (`A
j6`  6  6 
AH@A! 
 j!
 
 \nj-AÛG\r
A!	  k"A
k"A  M! 
A
j!A!A!A!A!@Aç  AçL!  Atj(!@@@@@  I@@@@  \nj"
-AÛk
 A
j" ("O\r
@  \nj-"A!kAÿ
qAI\r Aÿ
qA\nku   	!   	! Aj"	 (! 
  k A,j7"AÿM\rA!A!
@@@ 
 jAm"AtA°j("\rAu j"AtA°j(Aÿÿÿq K@ A
k!

  \rAvA
q j"AtA°j(AÿÿÿqM\r
 A
j! 
 N\r
 AN\r  F\r A
j!  A
j"Atj(! 	 M\r A
j"
 O\r 
 \nj-A:G\r@  Aj"
K@@ 
 \nj-A	k"AK@ !A
 tA€€qE@ ! 
A
j"
 G\r A
j" O\r  Atj"
(! 
(!
  
6  
  Aj A(j A$j8E\r   Atj"  k ( Aj Aj Aj A j Aj9! (!
@ E\r 
  ("Atj(I\r (" j!   j"Atj(!  F
  
6  
6 A!A
! 
 I\r@@@@  G@   	  AtjA  A,j Aj:"
\r   (,"\r (;"E@ \rr  -A
r:
   \n j 	 k;"E\r@ E@  (  (  AtjA\n Aj" Aj:! -!
 \r  
Ar:
  ( "
 (j6  ( 
k6  ((6  ($6 A
j!
 
AN\r
A!\r 
A
q (r - 
Aq@ (rA! 
 j! 
E\r A	F\r
 A F\r
 AkAI\r
   	!   	! (, j!	 (, j!  F!
 A
j! 
E\r
  I\r
 @  F@ A6ü  (€ AtkAk6€ At!  kAt"
@   j 
ü\n (ü"
 
( k6  (€ k6€
 (ü"
\r 
(!@ AÿqA†F@ 
("AI\r
 
 A
k6  (€Ak6€ A6ü
 
 A€~qA	r6 A0j$ ¥
@ 
("E\r 
 Al"Av6@ A|q""  A
rA€€I"q"E\r Ak-AqE\r A f 
 6@@ E@ ($"E\r
AÔ (, A@@ 
( 
(" 
(" lj"( 
(pAtj"("E@  6
@  I\r    ljO\r ( ( ( (DE\r
Aq"E@ ($"E\rAÔ (,   6  6 B‚€€€ 7  6
 (" ("O@  A
v j"AtAjs"E@ ($"E\rAå (, A  6 
( ( 
(pAtj 6 (!  Atj 6  A
j6 A
j" 
("I\r
A 
(E\rA!@@ 
( Atj("E\r 
(" M@   
( 
(ljI\r
 Aj" (AAWA
! (AI\r@@  Atj"Ak"("( ("(G\r ( ( ( (D\r  (6 A
j" (I\r A
j" 
(I\rAõ

 (ˆE@A@ (€"Aj" („"
J@ A€ 
A
v 
j 
AL"
6„ (ø 
s"
E@A ($"E\rAå (, A (ü"@  
  (økj6ü  
6ø  (€"Aj6€  6€ (ø"
\r
A 
 j"
A;
 (ˆ! 
A6 
 AtAr6 A6ˆAæ

A!@ 3\r 1\r@ (€"Aj" („"J@ A€ A
v j AL"6„ (ø s"E@ ($"E\rAå (, A (ü"@    (økj6ü  6ø  (€"Aj6€
  6€ (ø"E\r
  j" 6  At 
r Atr6A! Å
 („! (€!@@@@ (ü"-AkA
M@  Aj"H@A! A€ A
v j AL"6„ (ø s"E@A ($"E\rAå (, A (ü"@    (økj"6ü  6ø  (€"Aj6€  6€ (ø"\r
  Aj"H@A! A€ A
v j AL"6„ (ø s"E@A ($"E\rAå (, A (ü"@    (økj"6ü  6ø  (€"Aj6€  6€ (ø"\rA  j" 
(6
  j" 
(6  
(6  
(6  (A
j6A•
\n#A k"$AÅ»òˆx! 
 A 
B"K@@@@@  j"\n 
 k Aj7"AÿK@A!A!@@@  jAm"AtA°j("Au j"	AtA°j(Aÿÿÿq K@ 	A
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  L\r
 	AH\r
 A	F\r
 A F\r
 AkAI\r
 \n-A\nk


 A sA‘þ°l!   
B
  AjCA! (At"@@  Aj j"-sA“ƒ€l -
sA“ƒ€l -sA“ƒ€l -sA“ƒ€l! Aj" G\r ( j" 
I\r A j$ Ý
@ -"À"AN\r Aà
qAÀ
F@ 
AI\r
 ,
"A¿J\r
  A6 -! -
 A?q AqAtr Að
qAà
F@ 
AI\r
 ,
"A¿J\r
 ,"
A¿J\r
  A6 -
! -! - 
A?q A?qAt AqAtrr 
AI\r Aø
qAð
G\r ,
"A¿J\r ,"
A¿J\r ,"A¿J\r @ A6 -! -
! -! -!
 A?q A?qAt AqAtr 
A?qAtrr  A
6 - ÀÒ
@@ ("	 
j-A<F@ 
 O\r 
A
j" O\r !@@@ 	 "
j-"AÜG@@@ A\nk

 A<k 
A
j!
 
A
j" O\r@  	j-"A!kAÿ
qAI\r A:kE




















































 
Aj!  I\r
  6  
6 
A
j!
 
 O\r
 
!@@@@@  	j-"AÜG@ A	k"AK\r
A
 tA€€q\r
 A
j" O\r@  	j-"A!kAÿ
qAI\r Aÿ
qA:kE




















































 Aj" I\r
 A I\r AÿF\r@@@ A(k
 AJ\r A
j!
 E\r A
k! A
j" I\r
 \r  
G\r
  
F\r  
6  6  6A
!\n \nà
@ 
(" K@ (! !	@ 	 j-A	k"\rAK\rA
 \rtA€€qE\r 	A
j"	 G\r AI@A 
(!	A
!\n  	F@A  \n6@@@@ (" 	j-"A"k
A\'!
A)!A
!  	A
j"	6  \nM\r@ 
 \nAtj(" 	K@@@@ 	 j-"\rAÜG\r 	A
j" (O\r  j-"A!kAÿ
qAI\r
 Aÿ
qA\nku


















 \rÀ F@  	6  	A
j6  \n6A
 	!  \rA(Fq\r A
j"	 I\r \nA
j"\n G\rA¸
@  
kq"\n@ \n!@   Atj("  I"	 
KA! 	 
"kAq"\r@@  ( j-: A
j! A
j! A
j" \rG\r 
 	kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" 	G\r 	 
 O\r  : A
j!  A
j"Atj(!
A ($"E\r
AÔ (, A   \nk6  \n6A¶

 
(!@ 
(" 
("O  A
v jA " 
(ls"E@A! ($"
E\rAå (, 
A 
 6 
 6 
(  
("l j! @ A ü  6  6   66 
 
(A
j6 â
#Ak"\n$ B7 B7 B7 B7@@@@@ @@ 
 j-"E\r A&F\r AÜF\r A
j" G\r 
!  6 B7 B
7  6  Aj"
6  Aj"6
  q"6 E\r
A!A!@@ 
 j"	-"A&G@ \r
  A
 J\r ( j 	-: A
j! A
j 
   \nAjKE\r  A J\r \n(" k"@ ( j 	 ü\n  j! 
@ ("@ ( AtjAk(E\r
  A J\r@ \r 	-AÜG\r A
j" O\r@ 
 j-"	A!kAÿ
qAI\r 	Aÿ
qA\nku


































































































 ! ( j 
 j-: A
j! A
j" I\r ("
 (Atj 6 (! (! !  
6  6  6  6A! ($"E\rAÔ (, A! (E\r (r (r (r \nAj$ â
 E@A@@  	Alj"("AO@@ 
A:A (, ( "\r A J! Ak! \r @ 
A:  (, ( "\r@ (" ("F\r  k! ( j!A!@A
!@@  O\r@@  j-E\r
 A
j" G\r !
 ! E\r
 
   (, ( "\r  k"E\r  j!A
!A
AÈA
 (, ( "E\r 
AÇA
 (, ( "\r
 	A
j"	 G\rA ($"@A¤ (,  à
#Ak"\n$ \n 6 \n 6@  \nAjA
A
H"\r (ÔAtAjq"	E@A! ($"E\r
AÔ (, 
 	 6A
! (Ø"AN@ (t!@ 	 Atj  Alj"(6 A
j! ("AN\r 	 Atj A
j6@@A\rA (, ("E@A!@ E\rA!@ 	 A
j"Atj("A
k" K@  
  Atj(  L"\r A
j!  O\r
 !  J\r    H!@  F\r At! A
j!  
  j(AAL"E\r ($"E\r
AŠ (, 
A\rA (, ("E@A!
 ($"E\rA¯ (,  	! r B7Ø \nAj$ ™ 
~#A@j"	$@  
 AH"\r 
 AtjAk(!\r (t! 
(!@ "Aj! -AqE\r 	Aj!@@@@@  
(" ("  K"O@ !
  ( j  k (, ( "\r
 (!  M\r
 ! ($"E\rA¤ (, A!@@ ,"AH\r !\n !@@@@@@@@@@@@@@@@@@@ Aÿ
qA
k
\n	\r\rA
!@ ( jA
j"-A\nk !  A
 (, ( "E\r ($"E\rA¤ (,  AÅA
 (, ( "E\r ($"E\rA¤ (,  (,! -Aq@AA  ("E@A! ($"E\rAÂ (, A!AA  ("E\r ($"E\rAæ (,  -\rAÀqE\r (!@@ -Aq@  K\r
  K\r
@A\nA (, ("E@ A
j" (I\r
 ($"E\rAÂ (, @A\nA (, ("E@ A
j" (I\r
 ($"E\rAæ (,  -Aq\r\r (" A
jK@@A
A (, ("@ ($"E\rAæ (,  Aj! Aj!  ("I\r  kA
qE\r !AA (, ("E\r ($"E\rAæ (, @ ( kA
G\r -AqE\r (,! -Aq@A\rA  ("E\r ($"E\rAÂ (, A\rA  ("E\r ($"E\rAæ (,  (,! -Aq@AA  ("E\r ($"E\rAÂ (, AA  ("E\r ($"E\rAæ (,  (,! -Aq@AA  ("E\r ($"E\rAÂ (, AA  ("E\r\r ($"E\rAæ (,  ( kAG\r (,! -Aq@AA  ("E\r\r ($"E\rAÂ (, AA  ("E\r ($"E\rAæ (,  ( kAG\r\n (,! -Aq@AA  ("E\r ($"E\rAÂ (, AA  ("E\r ($"E\rAæ (,  ( kAG\r	 (,! -Aq@AA  ("E\r ($"E\rAÂ (, AA  ("E\r\n ($"E\r\rAæ (, \rA ( kA
qk! (,! -Aq@ A  ("E@A!\n ($"E\r\rAÂ (, \rA! A  ("E\r	 ($"E\rAæ (,  (t (Alj!\n (t \n(Alj! \n,AH@ (! (! \n(! \n)! 	B78 	B70 	B7( 	B7  B7 B7 	 7@   j  kA  	A j<@A!
A 	Aj (, ("@ ($"E\r
AÂ (, 
A 	Aj (, ("E@A!
 ($"E\rAæ (,  	(0@ 	( r 	($r 	((r \r  (6@ \n-"AÛG\r -AÝG\r \n(" \n("k"AI\r ( ("kAI\r (! 	B78 	B70 	B7( 	B7  	B7 	B7@   j  jAj AF"  k Ak A 	Aj 	A j<@A!
 (,! AÝG@A	 	Aj  ("E@A! ($"E\r
AÂ (, 
A	 	Aj  ("E@A!
 ($"E\rAæ (,  	(0E\r 	( r 	($r 	((r  AÝGAA A!F \n(" (j \n( kA \n(( \n(0I"\r\n -AÝG\r (!@ 
"Aj!
  (K\r ! !
 -"A q\r AtAuAq! (t! ! -Aq"E@  (Alj! (! (!\n  (Alj"(! @  -A r:  \nj!  k!@@@ -"A.k

 -AÀqE\r
 (4! Aj"\n (8K@  \nA
v \njA€qA€
j"s"E@A! ($"E\rAå (,   68  64 -! AÐAª Aÿ
qA.F"(6  (6 @ (4Aj  ü\n (4! \n! -A qE\r  -AqA  A
AAI! (" F\rA ( j  k (, ( "E\r ($"E\rA¤ (, A
AÈA
 (, ( "E\r ($"E\rA¤ (,  ! E\r (" kA
qAA (, ("@ ($"E\rAÂ (,  A
j! (  A
jM\r@A
A (, ("E@ Aj! Aj! ( K\r
 ($"E\rAÂ (,  ! (!@ "Aj! -%AqE\r (" I\r !  
("I\r  \rO@A!@ A}qAF@@@ (" K@ (! !@@  j-"A G A	Gq\r
 A
j" G\r !  I@   j  k (, ( "\r (! !  M\r ( j-A\nk

 ($"E\rA¤ (,  AÅA
 (, ( "E\r
 ($"E\rA¤ (, A!@@@ 
 (! !@@  j-"A G A	Gq\r
 A
j" \rG\r \r!@  M\rA  j  k (, ( "E\r ($"E\rA¤ (, AAÇA
 (, ( "E\r ($"E\rA¤ (, @ \r -\rA€
q\r@  ("O\r (!@  j-"A G A	Gq\r
 A
j" G\r !  AjI\r
 ( j"Ak-A G\r
 A
k-A G\r
 -A\nk


A! AÇA
 (, ( "E\r ($"E\rA¤ (,   
("  I! 
Aj!
A! (Ð"AN@ (t!@  Al"j(r (t" j("AN\r A6Ð 	A@k$ 0

 
(!
 ("E@ 
AGA!  
K   
A
kKÕ
 A
j" 
  ("O@A@ Aj  ("\n j-A/F"" O\r  \nj-Aß
qAÁkAÿ
qAK\r@ A
j" O\r@@  \nj-"Aß
qAÁkAÿ
qAI\r A-F\r A0kAÿ
qA	K\r A
j" G\r !AA ! A
k"A  O!\r@@@  O\r@@  \nj,"Aÿ
q"A\nk@@ A)N@@@@ A)k
A)!@@@ \n







 A F\r
AÑ ATE\r A
k!A!A*A A\'G!A+A A"G!
@ A	k"	AK\rA
 	tA€€qE\rA
  A
M!
@ AJ"	\r A>G\r !@ 	\r@ A/G\r A
j" O\r \n j-A>F\r AL\r@ Aß
qAÁkAÿ
qAI\r AßF\r A:G\r
  A
j"M@A!@@@  \nj,"A0kAÿ
qA\nI\r A_qAÁkAÿ
qAI\r E@A!A ATE\r
A!  A
j"G\r
A!A!	@@ Ak
 A=G\r A
j!A!A+!@@@@ A"k



 E\r
AÑ AT\r A\rF\rA)!
A*! A
j!  I\rA!	 E\r  \rF\rA
  A)FA
 ! 
 A
j"Atj"(! (" I\r
  M@AA
!	  A
j6 	„
#Ak"$@ 
 O\r@@@  
j"	  
k Aj7"AÿK@A!A!@@@  jAm"AtA°j("\nAu j"AtA°j(Aÿÿÿq K@ A
k!
  \nAvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  L\r
 AH\r
 A	F\r
 A F\r
 AkAI\r
 	-A\nk ( 
j"
 I\r Aj$ 
à
@@@ AÿK@A­!@@@  jAm"AtAÐj("Au j"AtAÐj("Aÿÿÿq K@ A
k!
  AvA
q j"AtAÐj(AÿÿÿqM\r
 A
j!  N\r
 AH\r
Aà9! 
A
6 
 A r  AÁkAI6A!A4!@@@  jAm"AtAÐ2j("Au j"AtAÐ2j("Aÿÿÿq M@ AvA
q j"AtAÐ2j(Aÿÿÿq O@ AH\rAð9! A
j!
 A
k!  N\r
A!A!@@@  jAm"AtAà7j("Au j"AtAà7j("Aÿÿÿq M@ AvA
q j"AtAà7j(Aÿÿÿq O@ AH\rA€:! A
j!
 A
k!  N\r
 
A
6 
 6
 ( (" lAtj! At"@ 
  ü\n 
 6  F\r ( Aÿÿÿq"A
jF@ 
  sAsA
q j6 
 
(  kj6õ

	#A k"$ B7 B7 B7 B7 A 
B! A B!	@@@ 
 K@
  	M\r
@ \nE@   
 AjF!A! A
qE@  	  F!	A!  Atj( Aj Atj(k"\r A
j" ("I! A
j" ("I!\n 
 K\r  I\r  	K\r  I\rA! A j$ i
A!@ ("(" 
("("I\rA
!  K\r ( ( ( (D"\rA! (" 
("
I\r  
K! ‰
#Ak"$@@@ 
 O\r  
j  
k Aj7! ( 
j!
 AÿK@A!@@@  jAm"AtA°j("\nAu j"	AtA°j(Aÿÿÿq K@ 	A
k!
  \nAvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  L\r
 	AN\r
 A	F\r A F\r AkAO\r
 A
6 A 6  
 B!

  C Aj$ 
D
 ("(" 
("
("I@A  K@A
 ( ( 
( 
(Dž“

#A0k"$ A6x#A
k"$ AjAA€
ü@@@ E\r A
k! A€
j!\r 
 AtjAk!@ 
 Atj"(!@ !@ !@ Aj" ("O@ !
 (!	@ \r  	j"-j-@ ! \r -
j-@ ! \r -j-@ ! \r  	j-j-@ ! Aj! Aj"!  K\r@  K@ (!@ \r  j"-"	j-\r A
j" G\r A
j" I\r@A
A@@@@@@ 	AÜF@A! A
j" (O\r
@  j-"A!kAÿ
qAI\r@ Aÿ
qA\nku
















 A
j I\r Aj!@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"\r
  6t  (x"A
j6x  Alj"AÜ ;
 B7  Aj"6  6A!@@@@@@@@@@@@ 	A!k\\\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\n\r	\r
\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r A
j"!\n@  M\r@  \nj- 	G\r
 \nA
j"\n I\r !\nA!A!A!  (F\r  Q"AÿM\rA!A!@@@@  jAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  N\r
A! AN\rA!Aä!@@@  jAm"AtAÀ:j("Au j"AtAÀ:j(Aÿÿÿq K@ A
k!
  AvA
q j"AtAÀ:j(AÿÿÿqM\r A
j!  N\rA! AN  k! !@@  j-"	AàG\r
 A
j" G\r !A
 	A F! !  k"A K\r At j("  AtjAk(O\rA!A
!@ E@ !	 !\n
 !\n  "	I\r@@@@ 	 \nO\r@  	j-"A G@ AàF\rA! 	A
j"	 \nG\rA! \n
 	! 	 \nO@A! 	!@  j-AàG"@ 	! !	 A
j" \nG\r 	! \n!	@  	 k"F@A!\n  Atj"(" I@  jA
k-A F!\n A
s  Gq\r \r  F \nrE\r E\r
 A
j@ 	 F\rA! AK\r At jAj"  ("  K6 \r
  A
j"M@A
!  Atj"\n(!	 \n(!\n
 (! \n@ A
k!
 Ak(" ("O\r@  j-"A G A	Gq\r
 A
j" G\r !@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"\r
  6t  (x"A
j6x  Alj"Aà;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"\r
  6t  (x"A
j6x  Alj"Aà;
 B7  	6  6 (t (x"Alj"Ak" Ak6 A(k" A
k6  -Ar:  -Ar:A! ! 	! ! 	 (M\r@@@@ 
  jA
v"Atj"( 	K@ E\r
 
 AtjAk( 	I\r
 A
k! 	 (K\r
 ! ! 	! A
j!A!  M\r ! 	!@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"\r
  6t  (x"A
j6x  Alj"A¦;
 B7  A
j"6  6 (x"AL\r (t" AljAk-A&G\r (|" L@ AÀ A
v j AL"6|  Als"E@A! ($"\rE\rAå (, \r  6t (x!  A
j6x  Alj"A»;
 B7  A
j6  6 ("\n -AÀq\r\n    k"  \n AjA\r ("	 AjM\r	 -
A!G\r	  Aj"j-A-G\r	 -A-G\r	A! (è" K  \nAkOq\r	@ Aj" 	 \n 	 \nI"M@  j"	/A­Ús 	-A>srE\r\r@@ A
j!	 Aj" K\r 	" j"	/A­Ús 	-A>sr\r
 	!  \nI  A
j"Kq@  Atj"(!	 (!
  6è (!	A
! -A
qE\r A
j" O\r  j-AüG\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"Aü;
 B7  Aj"6  6 ("Aj K\r  Ak"j"/A֔
s -A÷sr\r@  F\r  Q"AÿK@A!A!@@@@  jAm"	AtA°j("\nAu 	j"AtA°j(Aÿÿÿq K@ A
k!
  \nAvA
q 	j"AtA°j(AÿÿÿqM\r
 A
j!  N\r
 AN\rA!Aä!@@@  jAm"	AtAÀ:j("\nAu 	j"AtAÀ:j(Aÿÿÿq K@ A
k!
  \nAvA
q 	j"AtAÀ:j(AÿÿÿqM\r
 A
j!  N\r
 AH\r\r
 A	F\r A F\r A\rkA}K\r A!kAI\r A:kAI\r AÛkAI\r AÿG AúKqE\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"A®;
 B7  A
j"6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 Aj!@@ ("	Aj K\r  Ak"\nj(AèèуG\r  M\r /
A¯ÞF\r
@ 	Aj K\r  Ak"\nj"(Aèèуs -Aósr\r  M\r /
A¯ÞF\r
 	Aj K\r  Ak"\nj"/Aæè
s -Aðsr\r  M\r /
A¯ÞG\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"Aº;
 B7  6  \n6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 A
j! (A
j K\r	@ A
k-"Aß
qAÁkAÿ
qAO@ Aj O\r A0kAÿ
qA\nO\r
 Aj O\r\n  A
j"j-"A0kAÿ
qA\nO@ A_qAÁkAÿ
qAK\r\n@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"AÀ;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" (6 (! AÄ;
 B7  6 A
j!@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"AÝ;
 B7  A
j"6  6\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" 6A
!A

 A
j" O\r
  j-AÛG\r
@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" 6A!!A!  :  	: B7   j"6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"AÄ;
 B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"AÄ;
 B7  6  6\n@@ E@  -\rA qAvq\r
 E\r
@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"A:  	: B7  A
j"6  6\n !@@@@@@@@@AA@@AA@@@@@@@@@@ 	>
 	AþF\r 	AÞG\r -AqE\r A
j"!@  M\r@@  j-AÞG\r
 A
j" I\r ! !  kA
G\r A!	A!  j ( kA7"AÿM@ A	F\r
 A F\r
 AkA
M\r
A@@@  	jAm"AtA°j("Au j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q j"AtA°j(AÿÿÿqM\r A
j!	  	N\rA \nAN\rA
A!  (F\r  Q"AÿM\rA!A!@@@  jAm"	AtA°j("Au 	j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\r ! \nAN\r ! -A qE\r@ A
j" O\r  j"	-A=F\r !  kAG\rA!A!AA 	 ( kA7"AÿM@A! A	F\r A F\r AkAI
@@@  jAm"	AtA°j("Au 	j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! -A€
qE\r@ A
j" O\r  j"	-A+F\r !  kAG\rA!A!AA 	 ( kA7"AÿM@A! A	F\r A F\r AkAI
@@@  jAm"	AtA°j("Au 	j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\rA!\n \nAN!A!	 A
j"\n!@  \nM"\r@  j-AþG"	\r
 A
j" I\r !@  k"A
F@ ("A€€qE\r
@ \rA!	A!  \nj ( \nkA7"AÿM@ A	F\r
 A F\r
 AkA
M\r
A@@@  	jAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°j(AÿÿÿqM\r A
j!	  	N\rA AN\rA
A!  (F\r  Q"AÿM\r\rA!A!@@@  jAm"	AtA°j("Au 	j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\r ! AN\r ! ! AK\r (! ! A€qE\rA!  (M\r\n  Q"AÿM\rA!\nA!@@@@  \njAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"\nAtA°j(AÿÿÿqM\r
 \nA
j!\n  \nN\r
 AN\rA!\nAä!@@@  \njAm"AtAÀ:j("Au j"AtAÀ:j(Aÿÿÿq K@ A
k!
  AvA
q j"\nAtAÀ:j(AÿÿÿqM\r \nA
j!\n  \nN\rA! AN	@ A
j" O"	E@  j-A$F\r
 !  kAK\rA!  (M\r  Q"AÿM\rA!\nA!@@@@  \njAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"\nAtA°j(AÿÿÿqM\r
 \nA
j!\n  \nN\r
 AN\rA!\nAä!@@@  \njAm"AtAÀ:j("Au j"AtAÀ:j(Aÿÿÿq K@ A
k!
  AvA
q j"\nAtAÀ:j(AÿÿÿqM\r \nA
j!\n  \nN\rA! AN@ A
j" O\r@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" I\r ! 	A F@ !  kAI\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\r!Aå (, \r!  A
j6x (t"E\r
  6t  (x"A
j6x  Alj"A:  	: B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\r Aå (, \r   A
j6x (t"E\r
  6t  (x"A
j6x  Alj"A€ ;
 B7  A
j"6  6A! !  kAG\rA! !  kAG\r	 A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr!@ 	\rA!	A!@  j" ( k"A7"AÿM@ A	F\r A F\r AkAO\r
@@@  	jAm"AtA°j("Au j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!	  	N\r
 \nAN\r
A!Aä!  A7"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"	AtAÀ:j("Au 	j"\nAtAÀ:j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtAÀ:j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! !  A
q "E\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" : A$: B7  6  6 A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr!@ 	E\rA!	A!@  j" ( k"A7"AÿM@ A	F\r A F\r AkAO\r
@@@  	jAm"AtA°j("Au j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!	  	N\r
 \nAN\r
A!Aä!  A7"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"	AtAÀ:j("Au 	j"\nAtAÀ:j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtAÀ:j(AÿÿÿqM\r A
j!  N\rA!\n \nAN! !  A
q "E\r@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" : Aþ: B7  6  6 A	F\r A F\r AkA
M\r !
A
! ! A
qE\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t Als"	\r
A! ($"\rE\rAå (, \r  A
j6x (t"	E\r
  	6t  (x"A
j6x 	 Alj" : Aþ: B7  \n6  6@@  (F\r  Q"AÿK@A!A!@@@  jAm"	AtA°j("Au 	j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\r ! \nAN\r
 ! A	F\r A F\r AkA
M\r !
A
! ! A
qE\r\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t Als"	\r
A! ($"\rE\rAå (, \r  A
j6x (t"	E\r
  	6t  (x"A
j6x 	 Alj" : A+: B7  6  6\r@@  (F\r  Q"AÿK@A!A!@@@  jAm"	AtA°j("Au 	j"\nAtA°j(Aÿÿÿq K@ \nA
k!
  AvA
q 	j"AtA°j(AÿÿÿqM\r A
j!  N\r ! \nAN\r
 ! A	F\r A F\r AkA
M\r !
A
! ! A
qE\r@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t Als"	\r
A! ($"\rE\rAå (, \r  A
j6x (t"	E\r
  	6t  (x"A
j6x 	 Alj" : A=: B7  6  6 A	F\r A F\r AkA
M\r !
A
! ! A
qE\r	@@ (x" (|"	N@ AÀ 	A
v 	j 	AL"6| (t Als"	\r
A! ($"\rE\rAå (, \r  A
j6x (t"	E\r
  	6t  (x"A
j6x 	 Alj" : AÞ: B7  6  6	@ Aj" 	O\r -
A?G\rA!@ (ì" M@ !
 !  \nAkO\r
 Aj" 	 \n 	 \nI"M@  j/A¿üF\r@@ A
j!	 Aj" K\r 	" j/A¿üG\r
 	!  \nI  A
j"Kq  Atj"(!	 (!
  6ì (!	@ 	 M\r -
A!G\r  j-Aß
qAÁkAÿ
qAK\r@ Aj" 	O\r@  j-Aß
qAÁkAÿ
qAK\r
 A
j" 	G\r 	!A! (ð" K  \nA
kOq\r A
j" 	 \n 	 \nI"M@  j-A>F\r@@ A
j!	 Aj" K\r 	" j-A>G\r
 	!  \nI  A
j"Kq  Atj"(!	 (!
  6ð (!	@ A	j" 	O\r )B¼ÂìšÄ¨ªÁ… 1Bۅ„BR\rA! (ô" K  \nAkOq\r@ Aj" 	 \n 	 \nI"	M@  j"/Aݺ
s -A>srE\r@@ A
j! Aj" 	K\r  "j"/Aݺ
s -A>sr\r
 !  \nI  A
j"Kq@  Atj"(!	 (!
  6ô (!\n ! A
j" \nO\r@ Aj" \nO\r  j-"	A0kAÿ
qA\nIA
 	Aß
qAÁkAÿ
qAIE\r@  j-"A0kAÿ
qA\nI\r Aß
qAÁkAÿ
qAI\r A+k"AK\r
 A
F\r
 Aj" \nF\r@  kA K\r
  j-"	A:F@  \nO\r@  j-"	A	k"AMAA
 tA€€q\r 	A>G@ 	A I\r 	A<F\r 	AÿF\r A
j" \nG\r
A0!	 A
j@ 	A0kAÿ
qA\nI\r 	Aß
qAÁkAÿ
qAI\r 	A+k"	AK\r 	A
F\r A
j" \nG\r !@@@  j,"	A0kAÿ
qA\nI\r 	A_qAÁkAÿ
qAI\r 	E\rAû 	ATE\r
 \n A
j"G\r
\n !  M\rA! 	AÀG\r@ "A
j" \nO\r	@@@  j-"	A0kAÿ
qA\nO@ 	A_qAÁkAÿ
qAK\r
 A
j!
@ AL"\r 	Aÿ
qA-G\r A
j!
 \r
 	Aÿ
qA.G\r
A!  j-A-F\r A?J\r\n
 ! \r 	Aÿ
qA>G\r  j-A-F\rAð!	 Aj!@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" 	Ar: A<: B7  6  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"E\r
  6t  (x"A
j6x  Alj" 	Ar: A>: B7  6  A
k6 (t (x"Alj"Ak Ak6 Ak A
k6 ! !  6@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"E\r  6t  (x"A
j6x
  A
j6x (t"E\r\n  Alj"A¼(;
 B7  6  6@ (x" (|"N@ AÀ A
v j AL"6| (t Als"E\r  6t  (x"A
j6x
  A
j6x (t"E\r\n (!  Alj"A¾0;
 B7  6  6 (t (x"Alj"Ak Ak6 Ak A
k6A! !  (M\r@@ 
  jA
v"Atj"( K@ E@ !\n  
 AtjAk(K@ !\n A
k!
 ( O@ !	 A
j!  M\rA! ($"E\rAå (,  A
j! A	F\r
 A F\r
 A\rkA}K\r
 AÿG AúKq A!kAI A:kAIr AÛkAIrr"! A
s!A!@  \nF\rA!A!@@  \nj" ( \nk"A7"AÿM@ A	G\r
@@@  jAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  N\r
A! AH\r
 A F\r
 AkAI\r
A!Aä!A
A  A7"AÿM@ AÿG AúKq A!kAI A:kAIr AÛkAIrr
@@@  jAm"AtAÀ:j("Au j"AtAÀ:j(Aÿÿÿq K@ A
k!
  AvA
q j"AtAÀ:j(AÿÿÿqM\r A
j!  N\rA! AN"! A
s! ! \n!A   q 	AßFq""A  "rE\r  kAp!@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  A
j6x (t"\r
  6t  (x"A
j6x  Alj" AtA# AG  MqAA  OA r" AFrA@k:  	: B7  \n6  6 ! \n "M\r@@@ (x" (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\r	Aå (, \r	  A
j6x (t"\r
  6t  (x"A
j6x  Alj"AÄ;
 B7  6  6 A
j" \nI\r ! \n!@@ (x"\r (|"N@ AÀ A
v j AL"6| (t Als"\r
A! ($"\rE\rAå (, \r  \rA
j6x (t"E\r
  6t  (x"\rA
j6x (!  \rAlj"Aÿ ;
 B7  6  6A!
A! A
j$@ "	\r  
A (xA¿AM@ (à"AN@ A
k! A€j! AØj! Aj!@ (t" Al"j"	(!\r@ 	-"AÄF\r 	(!\nA!A! \rAN@   \rAlj"(Alj! \nAl! 	(! 	-A q@ 	A!: 	 A
k"6A!!  j!  I@ ( I\r
  I@ ( I\r
@  I@ A!G\r
 AÛG\r (A€€ÀqE\r 	(" (O\r ( j-AÞG\r 	 A
j"6 (t j"(" M\r  ( j  kN"E\r ("E@  (pA
j"6p  6  (A
j6 	 6 	 (6 	 	-A”
r:  -A˜
r: (! 	(! 	(@@@@ -\rA qE\r 	-AÛG\r E\r 	(" 	("kA
G\r -AÛG\r
 E\r
 ( ("kA
G\r
 -AÝG\r
  A
kG\r
 ( ("kA
G\r
  (A
jG\r
@@ A
j" \nN"@ !
 (t! !@@  Alj"-"AÄF\r AüF\r ( kAäK\r -AqE\r (! A
j" \nH\rA!   (" F\r  kAäK\r  I@ (!@@  j-A\nk A
j" G\rA!@   Atj"("L@ (t!\r@ \r Alj(" N\r  6  ("L@ (t!\r@ \r Alj(" N\r  6 Aj"AG\r @@ ( (I@@  L\r  kAk! (t!\rA!  AsjAq"@@ \r AljAÄ;
 A
j! A
j" G\r AI\r@ \r Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" G\r  -Ar: 	 (6
@ \r \n kAk! (t!\rA! \n AsjAq"@@ \r AljAÄ;
 A
j! A
j" G\r AI\r@ \r Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" \nG\r  (6 	 (6  (6 (t"\r j" \n6 \r j"\r 6  -Ar: \r \r-Ar: (! 	(!  
 A
j \nO ( 	 (6  (6 (t"\r j" \n6 \r j"\r 6  -Ar: \r \r-Ar: (! 	(! ( \r (!
 (" ("G\r ( A
jK@ -AÀq\r  
   ( AjP
 	-AÀq\r  
  	(  AjP"AH\r E\r  (6 (t \rAlj(!\r
@  ("O\r (" j-A(G\r \nA
j!A! !@@@ 
  jA
v"Atj"( K@ E\r 
 AtjAk( I\r A
k!
  (M\r A
j!  O\rA!@@ A
j" 
 Atj("I@@  j-A	k"AK\rA
 tA€€qE\r A
j" G\r !  6@  O\r  j-A\nk A
j" O\r 
 Atj(!  6@  O\r  j-A)G\rA! A6 B7  6  6 A
j!A

   
 Atj"(" Aj Aj 8E\r
@    k ( Aj A j A,j A(j A$j9@ ( " j! (," F! 
  j"Atj(! (!
  ("6(  6$A
!A!@  I@@  j-"A	k"AK\rA
 tA€€qE\r A
j" G\r A
j" O\r  
 Atj("j-! Aÿ
qA)G\r
  A
j"6 ($" (("M@A! A6 B7A

  k! @ A6  6   j"6A

@ q"@ 
 Atj!A! !@   Atj("  K" KA!  "kAq"@@  ( j-: A
j! A
j! A
j" G\r  kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" G\r   O\r A\n: A
j!  A
j"Atj(! ($"	E\rAÔ (, 	 A
6  6   k6 (!A! (x" L@  6 (t! !@   Alj"(K@@ -AqAG\r  ("Alj( I\r \r r A
j" H\r
  6  L\r
  \nkAk! (t!A!  \nAsjAq"@@  AljAÄ;
 A
j! A
j" G\r AI\r
@  Alj"AÄ;
 AÄ;
L AÄ;
8 AÄ;
$ Aj" G\r
 	-AÀq\r
  
  	( ( AjP"AH\r E\r
 	 	-Ar:  -Ar: Aj" (tj (6 (t j (6  (tj (6( Aj! (t! (@  Alj (Ð6  6Ð  Alj (6 	(! (! 	-!  
 A
j \nO   AÛF"!   !   !   ! 	! /
AŒqE\r@@ "Aj! -$"AÄG"\r  I\r
 À! !@@ "\nAk! \r  	K\r
 -%"AqE\r E\r ( 	(G\rA÷ ATE\r (   (tkAmG\r \nAk( (G\r AÄ:$  Aï
q:% \nAkAÄ: \nAk"	 	-Aï
q: \r"AN\r B7à A6¸ @A!	 A6Ô (x"AL\r (t!\rA!@@ \r 	Alj"-"Aq\r -AüG\r ( (kA
G\r A6  Ar:@ (ØAH@  	6Ø
 \r (ÜAlj 	6  	6Ü  A
j"6Ô 	A
j"	 G\rA!	A!	  
A (xO
A!	 A0j$ 	Þ
#Aðk"$ B7h B7` B7X B7P B7H B7@ B78 B70 A6( B7  B7 B7 B7A!	@     Aj AÐj<\r   A Aj A0j<\r  6( (,!	 
@  Aj 	 ("	E@A!	 ($"E\r
AÂ (, 
  Aj 	 ("	E@A!	
 ($"E\rAæ (,  (`@ (Pr (Tr (Xr (@@ (0r (4r (8r Aðj$ 	Ý

@ 
(" 
("I@ 
(!
 
( A
v jA "At"s"E@A ($"E\rAå (, A 
 6 
( Ajs"E@A ($"E\rAå (, A 
 6 
 6 
(! 
( Atj 6  
(Atj 6 
 
(A
j6AÜ
 
A
j!@@@ 
Aj" O\r  j-A#G\r  
j-A rAøG\r !@@@@  j-"A0kAÿ
qA\nI\r AÁkAÿ
qAI\r  kAK\r AákAÿ
qAI\r
  kAK\r A
j" G\r !  F\r  kAI\r
@ 
Aj" O"\r  j-A#G\r !@@  kAK\r
  j-A0kAÿ
qA	K\r
 A
j" G\r !  F\r  kAI\r
  M\r
  j-Aß
qAÁkAÿ
qAK\r
  \r@@  j-"Aß
qAÁkAÿ
qAO@   kA0K\r A0kAÿ
qA\nI\r
   kA0M\r  A
j" G\r " 
kAkA.K\r
  M\r  j-A;G\rA
!  A
j6 ³
#Ak"$@@  O\r (!@  j-A	k"AK\r
A
 tA€€qE\r
 A
j" G\r !
  O\r (!@  jA
k-A	k"AK\r
A
 tA€€qE\r
 A
k" K\r !  6  6  6@ 
 Aj (, ("@ ($"E\r
AŠ (, 
  AjA
?"\r 
 Aj (, ("E@A!
 ($"E\rA¯ (,  Aj$ Ê"
#A0k"\r$  H@ A¸j! A€j! \rAr! \rAr! 
(!@@ (t"
 Al"j"-"Aq@ AqE\r
@ E\r ,"
E\r  
`\r (!
 ,"\nAÿ
q"E\r  \n`E\r (" I\r@@@@@@@@@@@@@@@@@ A!k^
	 (! A
q@ AN@ 
 Alj"
 
-AÀr:  6  6 AH\r  
 Alj"(6¸  6  6@ (ä"AN@ 
 Alj 6
  6à  6ä A6 A
j" (xN\r 
 Alj"
-A;G\r (  
(" \rKE\r  6 
 6  Ar: 
 
-Ar:  6 AqE\r \r A€A˜ \nA*Fj"Aj6 AÀ
q"AÀ
F@ !	A
 \r Aj6 A€
F\r !	A! 	 Aj6A
! A°A´ ( kA
Fj!\n@ AqE\rA! \n("AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6  6 
 
-Ar:  -Ar:\r A
qE\r  \n(6 \n 6@ AqE\rA! (Ä"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6  6 
 
-Ar:  -Ar: A
qE\r  (Ä6  6Ä@ AqE\r (¼"AH\rA! 
 Alj"( (k ( kG\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r@ A
j" N\r  kAk!A!  AsjAq"\n@@ 
 AljAÄ;
 A
j! A
j" \nG\r AI\r@ 
 Alj"AÄ;
L AÄ;
8 AÄ;
$ AÄ;
 Aj" G\r  6  6  -Ar:  -Ar: A6¼ A
qE\r\n  (¼6  6¼\n 
 A
j"Al"j"(! (! \r 6 \r ("6, \r 6( \r 6$ \nAÀF@    \rA
AAA˜ \rA(jRAL\r\n \r(!  O\r  Q"	AÿM\rA!A!@@@  jAm"AtA°j("Au j"AtA°j(Aÿÿÿq 	K@ A
k!
 	 AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  N\r
 AN\r ( kAG\r@ AqE\rA! (À"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6  6 
 
-Ar:  -Ar:	 A
qE\r  (À6  6À ( kAG\r@ AqE\rA! (È"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6  6 
 
-Ar:  -Ar: A
qE\r  (È6  6È ( kAG\r@ AqE\rA! (Ì"AH\r@   Atj"\n("L@@ 
 Alj(" N\r \n 6  \n("L@@ 
 Alj(" N\r \n 6 Aj"AG\r 
 Alj"
 6  6 
 
-Ar:  -Ar: A
qE\r  (Ì6  6ÌA!A! 	A	F\r
 	A F\r
 	AkAI\r
 ( jA
k,"@Aã AT\r
 \r((" 
I\r A
k!@@@ -AÄF\r ( K\r  (O\r -"Aq\r
 Ak" 
O\r
 AqE\r    \rA,jAA.AAØ \rA$jRAH\r \r(,!	@ \nAÀF\r@ 	 O\r (" 	j-A/G\r  	A
j  \rA,jAA/AùA \rA$jRAH\r \r(,"	 O\r  	j-A/G\r \r 	A
j"	6,@ 	 O\r ( 	j-A?G\r  	A
j  \rA,jAA&AóA• \rA$jRAH\r \r(,!	 	 O\r ( 	j-A#G\r  	A
j  \rA,jAAAAÛ \rA$jRAH\r \r(,!	@ 	 O\rA!A!@ ( 	j" ( 	kA7"AÿM@ A	F\r A F\r AkAO\r
@@@  jAm"AtA°j("Au j"AtA°j(Aÿÿÿq K@ A
k!
  AvA
q j"AtA°j(AÿÿÿqM\r
 A
j!  N\r
 AN\r
 ,"@A¡ A	T\r
 \r($" 
 (xAlj"
O\r@@@ -AÄF\r ( 	M\r ( 	K\r -"Aq\r
 Aj" 
I\r
 AqE\r  6  6  \n:  	6  	6 (t" j"
 6  j" 6 
 
-Ar:  -Ar: \r Atr 6 A q! A
j!	 Aà
qAà
G@ \r 	Atj Aj6 Aj!	 A
s AGqE@ \r 	Atj Aj6 	A
j!	 
 \r(("AljA AN"! A !@ \r(("AH\r 
 Alj! @ ( (M\r
 ! !@ 	AF\r@ \r(("AH\r 
 Alj! @ ( (M\r
 ! ! 	AF\r@ \r(("AH\r 
 Alj! @ ( (M\r
 ! ! 	AF\r@ \r(("AH\r 
 Alj! @ ( (M\r
 ! ! 	AF\r \r(("	AH\r 
 	Alj! @ ( (M\r
 	! ! E\r (!	 (! (! !\n@@@@@@ 
 Alj"-"A!k\n
 AÛk
 A€A˜ A*Fj -"AtAuAqj!\n@ AvAk \nAj!\n A°A´ ( (kA
Fj!\n \nAj!\n@  k" 	 k"K@ 
 (" (k k j"Al"	j"
 (6 
 )7 
 )7   k"6 
 6 (t 	j \n(6 \n 6
  O\r 
 Alj j"
 (6 
 )7 
 )7   k 	j"6 
 6A!\n@   \nAtj"("
L@@ 
AN@  (t 
Alj("
6 
 N\r \nA
j"\nAG\r (t" Alj"
 6  j" 6 
 
-Ar:  -Ar:
 A
qE\r A€A˜ \nA*Fj AtAuAqj!
@@@ AvAk
 
Aj!

 
Aj!
  
(6 
 6 -"
AqE\r 
Aq@ (t (Alj(!
 (! A
j" H\r \rA0j$–
#Ak"$@ (E\r 
 6! (  (pAtj("E@A!
@  ("I\r   ( (ljO\r  (F@ ( ( 
 DE\rA!
  6  6  
6  Aj6 Aj!@ ("@@   A
v"
Atj"G"AH@ 

 E\r Aj!  
Asj"\rA! E@A!
 (! Aj$ ý
#A k"$ Aß: A¦Ô;
A! ("A€ q@ A$:A! A€€€
q@ Aj rA=: A
j! A€€€q@ Aj rA+: A
j! A€€q@ Aj jAü: A
j! A€€q@ Aj jAÞ: A
j! A€„q@ Aj jAþ: A
j!A! Aj jA:  
   AjAM ("AŒq@ Aq@ AÀ:A
! Aq@  rA:: A
j! A€q  rA.: A
j  rA:  
    AjM A€jAÿ
AÐü A j$•
 (TE@A A
k! A
k!AA
 ("\n j-A!F j!A!@@@ 
  jA
v"Atj"	( K@ E\r 
 AtjAk( I\r A
k!
  	(M\r A
j!  O\rA!	@  	("M"E@@  kq"@ !@    K"
 KA! 
 "kAq"\n@@  ( j-: A
j! A
j! A
j" \nG\r  
kA|M@@  ( j-:  ( j-
:
  ( j-:  ( j-: Aj! Aj" 
G\r 
  O\r A : A
j! 	 A
j"Atj"(! (!A! ($"E\rAÔ (, A  k
  \nj!  k! A<j  N"@  (6  (6  (6 (! A6  6 E@ r E@A (T" ( ( (jj (k"K@  k!A

A! ($"@AØ (, A!  6T ò

 ( 
j"A
k,!@ 
AI\r AN\r Ak,!@ A¿K\r A`qA@G\r A?q AqAtr 
AI\r Ak,!@ A¿J\r ApqA`G\r A¿K\r A?q A?qAt AqAtrr 
AF\r Ak-"
Aø
qAð
G\r A¿J\r A¿J\r A¿K\r A?q A?qAt 
AqAtr A?qAtrr! Â
@ 
 F@ 
!A
!A
!	
 AÈ ! AÈ !AA ! E! (!A
!A
!	 
!@@@@@@@@@@@   j"j"-"A0kAÿ
qA\nI\r Aß
qAÁkAÿ
qAI\r A	k"\nAMAA
 \ntA€€q\r (t!\n (! E@@  \n (xAlj"\nO\r@@ -AÄF\r ( M\r ( K\r -Aq\r Aj" \nI\r  6 -!@  \nI\r@@ -AÄF\r ( K\r  (O\r -Aq\r\r Ak" \nO\r  6 -! \r
@@ Aÿ
qA(k
 A
j!A(! AL\r	 A
k!A)!
 A0kAÿ
qA\nI\r
 A_qAÁkAÿ
qAI\r
 Aÿ
qE\r  À"`E\rA!AA! 	E\r
A
!	 	@A
!	  `E\rA

@@ E\r Aÿ
q Aÿ
qG\r E\r
A
!A!	 A
j  !A!	A
! \rA
j!\r !
A!	  j" G\r !
  6 A
j  !A \r
  A
A A 	 rj"6 \r 
 Gj A F A	kAIrç

 AG!@@@ AqE\r E\r 
Aÿ
q!@ - F\r A
k"AG! A
j"AqE\r
 \r E\r
@ - 
Aÿ
qF\r AI\r 
Aÿ
qA‚„l!@A€‚„ ( s"k rA€‚„xqA€‚„xG\r Aj! Ak"AK\r E\r
 
Aÿ
q!@  -F@  A
j! A
k"\rA

@@ AO@  
rAq\r
@ ( 
(G\r 
Aj!
 Aj! Ak"AK\r E\r
@ -" 
-"F@ 
A
j!
 A
j! A
k"\r
  kA‡
 A€O@ @  
 ü\n  j!@  
sAqE@@ AqE@ !
 E@ !
 !@  
-: 
A
j!
 A
j"AqE\r
  I\r A|q!@ AÀI\r  A@j"K\r@  
(6  
(6  
(6  
(6  
(6  
(6  
(6  
(6  
( 6   
($6$  
((6(  
(,6,  
(060  
(464  
(868  
(<6< 
A@k!
 A@k" M\r  O\r
@  
(6 
Aj!
 Aj" I\r
 AI@ !
 AI@ !
 Ak! !@  
-:  
-
:
  
-:  
-: 
Aj!
 Aj" M\r  I@@  
-: 
A
j!
 A
j" G\rÚ
#AÐ
k"$ B
7@ 
 l"E\r  6  6A!
@ Aj 
Atj" Ak( Ak( jj"6 
A
j!
  I\r  k"
AL@A
!
A
  
j!A
!A
!
@ AqAF@    
 AjX AjAY 
Aj
@ Aj 
A
k"Atj(  kO@    Aj 
A AjZ
    
 AjX 
A
F@ AjA
[A
 Aj [A
!
  (A
r"6  j" I\r (AG!A k!    Aj 
A AjZ@ 
A
G\r (A
G\r E\r
@ 
A
L@ Aj Aj\\"Y 
 j
 AjA[  (As6 AjA
Y  j" Aj 
Ak"Atj(k   Aj 
A
kA
 AjZ AjA
[  (A
r6    Aj A
 AjZ !
  j! (! (! 
A
G\r A
G\r \r AÐ
j$«

#Að
k"$  6A
!@ AH\rA 
k!	 !@   	j"  Ak"\nAtj(k" _AN@   _AN\r  Atj     _AN""6 A
j! A
k \n "A
J\r 
  ] Að
j$K
 (!  
AM@ (! 
 
A k!
 !A" 
v6  A  
kt  
vr6Î
#Að
k"$  ("6è
 (!  6  6ì
A 
k! E!\n@@@@ A
G@ !A
!
 !A
! \r !
@   Atj"(k"  _AL@ ! \nAs!	A
!\n@ 	 AHrA
qE@ Ak(!	  j"  _AN\r
  	k  _AN\r
  Atj 6 Aè
j Aè
j\\"Y A
j!  j! (ì
!	 ! (è
A
G\r
 	\r
 !
 \nE\r
 
  ]  
   X Að
j$H
 
AM@ (! Aj
 
A k!
 (!   
t6   
t A  
kvr6\'

 (A
k^"
 
 (^"A rA –

#A€k"$@ AH\r 
 Atj" 6 E\r@ ( 
(A€  A€O"VA!@ 
 Atj"( 
 A
j"Atj( V  ( j6  G\r  k"\r A€j$\n hA   
 †
@@@ 
Aÿ
q"@ Aq@ 
Aÿ
q!@ -"E\r  F\r A
j"Aq\rA€‚„ ("k rA€‚„xqA€‚„xG\r
 A‚„l!@A€‚„  s"k rA€‚„xqA€‚„xG\r (! Aj"! A€‚„ krA€‚„xqA€‚„xF\r a j !@ "-"E\r
 A
j!  
Aÿ
qG\r "A - 
Aÿ
qF}
@@ "
AqE\r 
-E@A@ 
A
j"
AqE\r
 
-\r
@ 
"Aj!
A€‚„ ("k rA€‚„xqA€‚„xF\r@ "
A
j! 
-\r 
 k A r  AÁkAIY

  (H"
A
k 
r6H ("
Aq@  
A r6A B7  (,"
6  
6  
 (0j6A~

~ ½"B4ˆ§Aÿq"AÿG| E@ 
 DaA DðC¢ 
e! 
(A@j6  
 Aþk6 Bÿÿÿÿÿÿÿ‡€ƒB€€€€€€€ð?„¿ ð
~@ E\r  
:  j"A
k 
: AI\r  
:  
:
 Ak 
: Ak 
: AI\r  
: Ak 
: A	I\r A kAq"j" 
Aÿ
qA‚„l"
6   kA|q"j"Ak 
6 A	I\r  
6  
6 Ak 
6 Ak 
6 AI\r  
6  
6  
6  
6 Ak 
6 Ak 
6 Ak 
6 Ak 
6  AqAr"k"A I\r 
­B€€€~!  j!
@ 
 7 
 7 
 7 
 7 
A j!
 A k"AK\rû~AÍ!#A@j"$ AÍ6< A)j! A\'j! A(j!@@@@@A!@ !  AÿÿÿÿsJ\r  j!@@@@ "-"\n@@@@ \nAÿ
q"\nE@ !
 \nA%G\r
 !\n@ \n-
A%G@ \n! A
j! \n-! \nAj"!\n A%F\r  k" Aÿÿÿÿs"\nJ\r	 @   h \r  6< A
j!A!@ ,
A0k"A	K\r -A$G\r Aj!A
! !  6<A!	@ ,"A k"AK@ !
 !A
 t"A‰ÑqE\r@  A
j"6<  	r!	 ,
"A k"A O\r
 !A
 t"A‰Ñq\r@ A*F@@ ,
A0k"A	K\r -A$G\r E@  AtjA\n6A
  Atj(!\r Aj!A

 \r A
j! E@  6<A!A!\r 
 
("Aj6 (!\rA!  6< \rAN\r
A \rk!\r 	A€Àr!	
 A<ji"\rAH\r\n (<!A!A!A -A.G\r -
A*F@@ ,A0k"A	K\r -A$G\r Aj! E@  AtjA\n6A
  Atj(
 \r Aj!A E\r 
 
("Aj6 (!  6< AN
  A
j6< A<ji! (<!A
!@ !A! ","AûkAFI\r A
j! A:l jA¿Íj-"A
kAÿ
qAI\r  6<@ AG@ E\r AN@ E@  Atj 6   Atj)70 E\r A0j  
j
 AN\rA! E\r -A q\r 	Aÿÿ{q" 	 	A€Àq!	A!AÔ! !@@@@@@@@@@@@@@@ -"À"ASq  AqAF  "AØk!	\n
@ AÁk AÓF\r )0!AÔA!@@@@@@@ 
 (0 6 (0 6 (0 ¬7 (0 ;
 (0 : (0 6 (0 ¬7A  AM! 	Ar!	Aø! ! A q! )0""BR@@ A
k" §Aq-ÐQ r: Bˆ"BR\r ! P\r 	AqE\r AvAÔj!A! ! )0""BR@@ A
k" §AqA0r: Bˆ"BR\r ! 	AqE\r   k"  H! )0"BS@ B }"70A
!AÔ
 	A€q@A
!AÕ
AÖAÔ 	A
q"!  k!  AHq\r 	Aÿÿ{q 	 !	@ BR\r \r !A!  P  kj"  H!\r -0! (0"A¡ ""AAÿÿÿÿ  AÿÿÿÿO"T" k  " j! AN@ !	 ! !	 ! -\r )0"BR\r
A!	 @ (0A! A  \rA 	l A6  >  Aj60A! Aj!\nA!@@ \n("E\r Aj p"AH\r   kK\r \nAj!\n  j" I\r
A=! AH\r A  \r  	l E@A!
A! (0!\n@ \n("E\r
 Aj p" j" K\r
  Aj h \nAj!\n  K\r A  \r  	A€Àsl \r   \rH!  AHq\r	A=!  +0 \r  	 m"AN\r\n -
!\n A
j! \r	 E\rA
!@  Atj("\n@  Atj \n 
jA
! A
j"A\nG\r
 A\nO@A
!\n@  Atj(\r
A
! A
j"A\nG\r	A!  :\'A
! ! !	   k"  H" AÿÿÿÿsJ\rA=! \r  j"  \rH" \nK\r A    	l   h A0   	A€€sl A0  Al   h A    	A€Àsl (<!
A!A=!AÐÝ 6A! A@k$ À

 -A qE@@ ("  d\r
 ( ("k I@  
  ($
@@ (PAH\r E\r !@ 
 j"A
k-A\nG@ A
k"\r
  
  ($ I\r  k! (!
 
!   V  ( j6s
 (",A0k"A	K@A@A! 
A̙³æM@A  
A\nl"
j  
AÿÿÿÿsK!  A
j"6 ,
! !
 ! A0k"A\nI\r 
³@@@@@@@@@@@@@@@@@@@ 
A	k
	\n\r  ("
Aj6  
(6  ("
Aj6  
47  ("
Aj6  
57  ("
Aj6  
47  ("
Aj6  
57  (AjAxq"
Aj6  
)7  ("
Aj6  
2
7  ("
Aj6  
3
7  ("
Aj6  
07  ("
Aj6  
17  (AjAxq"
Aj6  
)7  ("
Aj6  
57  (AjAxq"
Aj6  
)7  (AjAxq"
Aj6  
)7  ("
Aj6  
47  ("
Aj6  
57  (AjAxq"
Aj6  
+9  ny
~ B€€€€Z@@ 
A
k"
 " B\n€"B\n~}§A0r: BÿÿÿÿŸ
V\r BR@ §!@ 
A
k"
  A\nn"A\nlkA0r: A	K! ! \r 
j

#A€k"$@  L\r A€Àq\r  
  k"A€ A€I"f E@@  A€h A€k"Aÿ
K\r   h A€j$È
|~#A°k"$ A6,@ 
½"BS@A
!AÞ! 
š"
½!
 A€q@A
!Aá!
AäAß A
q"! E!@ B€€€€€€€øÿƒB€€€€€€€øÿQ@ A   Aj" Aÿÿ{ql   h Aç\rAõ A q"AôAù  
 
bAh A    A€Àsl    J!\n
 Aj!@@ 
 A,je"
 
 "
Db@  (,"A
k6, A r"AáG\r
 A r"AáF\r (,!A  AH
  Ak"6, 
D°A¢!
A  AH! A0jA A ANj"!@  
ü"6 Aj! 
 ¸¡DeÍÍA¢"
Db\r@ AL@ ! ! !	
 !	 !@A  AO!@ Ak" 	I\r ­!B!@  5 † |" B€”ëÜ€"B€”ëÜ~}> Ak" 	O\r B€”ëÜT\r 	Ak"	 >@ 	 "I@ Ak"(E\r
  (, k"6, ! AJ\r AH@ AjA	nA
j! AæF!@A	A k" A	O!\n@  	M@AA 	(!
A€”ëÜ \nv!\rA \ntAs!A! 	!@  (" \nv j6  q \rl! Aj" I\rAA 	(! E\r  6 Aj!  (, \nj"6,   	j"	 " Atj   kAu J! AH\rA!@  	M\r  	kAuA	l!A\n! 	("A\nI\r@ A
j!  A\nl"O\r  A AæGk AçF AGqk"  kAuA	lA	kH@ A0jA„`A¤b AHj A€Èj"A	m"\rAtj!\nA\n!  \rA	lk"AL@@ A\nl! A
j"AG\r@ \n("  n" lk"\rE \nAj" Fq\r@ A
qE@D@C!
 A€”ëÜG\r
 	 \nO\r
 \nAk-A
qE\r
D
@C!
Dà?Dð?Dø?  FDø? \r A
v"F \r I!@ \r -A-G\r š! 
š!
 \n  \rk"6 
   
a\r \n  j"6 A€”ëÜO@@ \nA6 	 \nAk"\nK@ 	Ak"	A6 \n \n(A
j"6 Aÿ“ëÜK\r  	kAuA	l!A\n! 	("A\nI\r@ A
j!  A\nl"O\r \nAj"   K!@ " 	M"E@ Ak"(E\r
@ AçG@ Aq!\r
 AsA A
 " J A{Jq"\n j!AA~ \n j! Aq"\r\rAw!@ \r Ak("\nE\rA\n!A! \nA\np\r@ "\rA
j! \n A\nl"pE\r \rAs!  kAuA	l! A_qAÆF@A!\r   jA	k"A AJ"  J!
A!\r   j jA	k"A AJ"  J!A!\n AýÿÿÿAþÿÿÿ  \rr"J\r
  AGjA
j!@ A_q"AÆF@  AÿÿÿÿsJ\r A AJ!
   Au"s k­ k"kA
L@@ A
k"A0:  kAH\r Ak" : A
kA-A+ AH:  k" AÿÿÿÿsJ\r  j" AÿÿÿÿsJ\r
 A    j" l   h A0   A€€sl@@@ AÆF@ AjA	r!  	 	 K"!	@ 	5 k!@  	G@  AjM\r
@ A
k"A0:  AjK\r
  G\r A
k"A0:    kh 	Aj"	 M\r @ AùA
h  	M\r
 AL\r
@ 	5 k" AjK@@ A
k"A0:  AjK\r  A	  A	Nh A	k! 	Aj"	 O\r A	J! ! \r@ AH\r  	Aj  	K!\n AjA	r! 	!@  5 k"F@ A
k"A0:@  	G@  AjM\r
@ A
k"A0:  AjK\r
  A
h A
j!  \rrE\r AùA
h    k"   Hh  k! Aj" \nO\r
 AN\r A0 AjAAl    kh ! A0 A	jA	Al A    A€Àsl    J!\n
  AtAuA	qj!@ AK\rA k!D0@!@ D0@¢! A
k"\r -A-F@  
š ¡ š!

 
   ¡!
  (," Au"s k­ k"F@ A
k"A0: (,! Ar!\r A q!	 Ak" Aj: A
kA-A+ AH: AqE ALq! Aj!@ " 
ü"AÐÑj- 	r: 
 ·¡D0@¢!
@ A
j" AjkA
G\r 
Da q\r A.:
 Aj! 
Db\rA!\n Aýÿÿÿ \r  k"	j"kJ\r A    Aj  Ajk" Ak H  "j" l   \rh A0   A€€sl  Aj h A0  kAAl   	h A    A€Àsl    J!\n A°j$ \n¹~ 
 
(AjAxq"
Aj6  
)! 
)!#A k"
$ Bÿÿÿÿÿÿ?ƒ!~ B0ˆBÿÿ
ƒ"§"AøkAýM@ B† B<ˆ„! A€øk­!@ Bÿÿÿÿÿÿÿÿƒ"B€€€€€€€Z@ B
|!
 B€€€€€€€€R\r B
ƒ |!B  BÿÿÿÿÿÿÿV"! ­ |
@  „P\r Bÿÿ
R\r B† B<ˆ„B€€€€€€€„!Bÿ
 Aþ‡
K@B!Bÿ
A€øAø P"\n" k"	AðJ@B!B
  B€€€€€€À„ \n!A!\n  G@ 
Aj! ! !@A€
 	k"AÀq@  A@j­†!B!
 E\r  ­"† AÀ k­ˆ„!  †!  7  7 
) 
)„BR!\n@ 	AÀq@  	A@j­ˆ!B!
 	E\r AÀ 	k­†  	­"ˆ„!  ˆ! 
 7 
 7 
)B† 
)"B<ˆ„!@ \n­ Bÿÿÿÿÿÿÿÿƒ„"B€€€€€€€Z@ B
|!
 B€€€€€€€€R\r B
ƒ |! B€€€€€€€…  BÿÿÿÿÿÿÿV"! ­! 
A j$ B€€€€€€€€€ƒ B4†„ „¿9¦

 (T"(! (" ( ("k"  I"@   V  ( j"6  ( k"6    K"@  
 V  ( j"6  ( k6 A:  (,"6  6 ¢ E@A@  
AÿM\r
@AìÞ((E@ 
A€qA€¿F\rAÐÝA6
 
AÿM@  
A?qA€
r:
  
AvAÀ
r:A 
A€@qA€ÀG 
A€°OqE@  
A?qA€
r:  
AvAà
r:  
AvA?qA€
r:
A 
A€€kAÿÿ?M@  
A?qA€
r:  
AvAð
r:  
AvA?qA€
r:  
AvA?qA€
r:
AAÐÝA6AA

  
:A
Ñ(
#Ak"\n$@@@@@@@@@@ Aô
M@Aß("A AjAøq AI"Av"
v"Aq@@ AsA
q 
j"At"
A¸ßj" 
(À_"("F@Aß A~ wq6
  6  6 Aj!  
Ar6 
 j"
 
(A
r6 A˜ß("M\r
 @@  
tA 
t"A krqh"At"
A¸ßj" 
(À_"("F@Aß A~ wq"6
  6  6  Ar6  j" 
 k"A
r6  
j 6 @ AxqA¸ßj!A¤ß(!
 A
 Avt"qE@Aß  r6 
 (!  
6  
6 
 6 
 6 Aj!A¤ß 6A˜ß 6A”ß("E\r
 hAt(Àa"(Axq k!
 !@@ ("E@ ("E\r
 (Axq k" 
 
 K"!
   ! !
 (!	  ("G@ (" 6  6\n (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6	A! A¿K\r Aj"
Axq!A”ß("	E\rA! AôÿÿM@ A& 
Avg"kvA
q A
tkA>j!A k!
@@@ At(Àa"E@A!
A! A A
vkA AGt!@@ (Axq k" 
O\r ! "
\rA!
 !  ("   AvAqj("F  ! A
t! "\r  rE@A!A t"A kr 	q"E\r hAt(Àa! E\r
@ (Axq k" 
I!  
 !
   ! ("  ("\r E\r 
A˜ß( kO\r (!  ("G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6 A˜ß("M@A¤ß(!
@  k"AO@ 
 j" A
r6  
j 6 
 Ar6
 
 Ar6  
j" (A
r6A!A!A˜ß 6A¤ß 6 
Aj!	 Aϧ("I@Aϧ  k"
6A¨ßA¨ß(" j"6  
A
r6  Ar6 Aj!	A! A/j"Aèâ(@Aðâ(
AôâB7AìâB€ €€€€7Aèâ \nAjApqAتժs6AüâA6AÌâA6A€ "
j"A 
k"q" M\rAÈâ("
@AÀâ(" j"	 M\r	 
 	I\r	@AÌâ-AqE@@@@@A¨ß("
@AÐâ!@ (" 
M@ 
  (jI\r ("\rAu"AF\r !Aìâ("A
k"
 q@  k 
 jA kqj!  O\rAÈâ("@AÀâ("
 j" 
M\r  I\r u" G\r
  k q"u" ( (jF\r
 ! AF\r
 A0j M@ !Aðâ("
  kjA 
kq"
uAF\r
 
 j! ! AG\rAÌâAÌâ(Ar6 u!Au! AF\r AF\r  M\r  k" A(jM\rAÀâAÀâ( j"6AÄâ( I@AÄâ 6@A¨ß("
@AÐâ!@  (" ("jF\r ("\rA ß("A  ME@A ß 6A!AÔâ 6AÐâ 6A°ßA6A´ßAèâ(6AÜâA6@ At"
 
A¸ßj"6À_ 
 6Ä_ A
j"A G\rAϧ A(k"Ax kAq"
k"6A¨ß 
 j"
6 
 A
r6  jA(6A¬ßAøâ(6 
 O\r 
 I\r (Aq\r   j6A¨ß 
Ax 
kAq"j"6AϧAϧ( j" k"6  A
r6 
 jA(6A¬ßAøâ(6A!A!A ß( K@A ß 6  j!AÐâ!@@  ("G@ ("\r
 -AqE\rAÐâ!@@ (" 
M@ 
  (j"I\r
 (!
Aœß A(k"Ax kAq"k"6A¨ß  j"6  A
r6  jA(6A¬ßAøâ(6 
 A\' kAqjA/k"  
AjI"A6 AØâ)7 AÐâ)7AØâ Aj6AÔâ 6AÐâ 6AÜâA6 Aj!@ A6 Aj! Aj!  I\r 
 F\r  (A~q6 
  
k"A
r6  6 Aÿ
M@ Aø
qA¸ßj!Aß("A
 Avt"qE@Aß  r6 
 (!  
6  
6A!A
A! AÿÿÿM@ A& Avg"kvA
q A
trA>s! 
 6 
B7 AtAˇj!@@Aӧ("A
 t"qE@Aӧ  r6  
6 
 6
 A A
vkA AGt! (!@ "(Axq F\r Av! A
t!  Aqj"("\r  
6 
 6A! 
! 
!A
 (" 
6  
6 
 6A!A!A 
j 6 
 j 6Aϧ(" M\rAϧ  k"
6A¨ßA¨ß(" j"6  
A
r6  Ar6 Aj!AÐÝA06A!  6  ( j6 Ax kAqj"	 Ar6 Ax kAqj"  	j"
k!@A¨ß( F@A¨ß 
6AϧAϧ( j"6 
 A
r6
A¤ß( F@A¤ß 
6A˜ßA˜ß( j"6 
 A
r6 
 j 6
 ("AqA
F@ Axq! (!@ Aÿ
M@ (" F@AßAß(A~ Avwq6  6  6
 (!@  G@ (" 6  6
@ (" Aj ("E\r
 Aj!@ ! "Aj! ("\r Aj! ("\r A6
A! E\r@ ("At"(Àa F@ AÀáj 6 \r
AӧAӧ(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6  j"(!  j!  A~q6 
 A
r6 
 j 6 Aÿ
M@ Aø
qA¸ßj!Aß("A
 Avt"qE@Aß  r6 
 (!  
6  
6 
 6 
 6
A! AÿÿÿM@ A& Avg"kvA
q A
trA>s! 
 6 
B7 AtAˇj!@@Aӧ("A
 t"qE@Aӧ  r6  
6 
 6
 A A
vkA AGt! (!@ "(Axq F\r Av! A
t!  Aqj"("\r  
6 
 6 
 
6 
 
6
 (" 
6  
6 
A6 
 6 
 6 	Aj!@ E\r@ ("At"(Àa F@ AÀáj 6 \r
Aӧ 	A~ wq"	6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6@ 
AM@  
 j"Ar6  j" (A
r6
  Ar6  j" 
A
r6 
 j 
6 
Aÿ
M@ 
Aø
qA¸ßj!Aß("A
 
Avt"
qE@Aß 
 r6 
 (!
  6 
 6  6  
6
A! 
AÿÿÿM@ 
A& 
Avg"kvA
q A
trA>s!  6 B7 AtAÀáj!@@ 	A
 t"qE@Aӧ  	r6  6  6
 
A A
vkA AGt! (!@ "(Axq 
F\r Av! A
t!  Aqj"("\r  6  6  6  6
 (" 6  6 A6  6  6 Aj!
@ 	E\r@ ("At"(Àa F@ AÀáj 6 \r
Aӧ A~ wq6@  	(F@ 	 6
 	 6 E\r
  	6 ("@  6  6 ("E\r  6  6@ 
AM@  
 j"Ar6  j" (A
r6
  Ar6  j" 
A
r6 
 j 
6 @ AxqA¸ßj!A¤ß(!A
 Avt" qE@Aß  r6 
 (!  6  6  6  6A¤ß 6A˜ß 
6 Aj! \nAj$ ‚
@ E\r Ak" Ak("
Axq"j!@ 
A
q\r 
AqE\r
  ("k"A ß(I\r
  j!@@@A¤ß( G@ (!
 Aÿ
M@ 
 ("G\rAßAß(A~ Avwq6 (! 
 G@ (" 
6 
 6 (" Aj ("E\r Aj!@ ! "
Aj! 
("\r 
Aj! 
("\r A6 ("
AqAG\rA˜ß 6  
A~q6  A
r6  6  
6 
 6A!
 E\r@ ("At"(Àa F@ AÀáj 
6 
\r
AӧAӧ(A~ wq6@  (F@  
6
  
6 
E\r
 
 6 ("@ 
 6  
6 ("E\r 
 6  
6  O\r ("A
qE\r@@@@ AqE@A¨ß( F@A¨ß 6AœßAœß( j"6  A
r6 A¤ß(G\rA˜ßA6A¤ßA6A¤ß(" F@A¤ß 6A˜ßA˜ß( j"6  A
r6  j 6 Axq j! (!
 Aÿ
M@ (" 
F@AßAß(A~ Avwq6  
6 
 6 (! 
 G@ (" 
6 
 6 (" Aj ("E\r Aj!@ ! "
Aj! 
("\r 
Aj! 
("\r A6  A~q6  A
r6  j 6A!
 E\r@ ("At"(Àa F@ AÀáj 
6 
\r
AӧAӧ(A~ wq6@  (F@  
6
  
6 
E\r
 
 6 ("@ 
 6  
6 ("E\r 
 6  
6  A
r6  j 6  G\rA˜ß 6 Aÿ
M@ Aø
qA¸ßj!
Aß("A
 Avt"qE@Aß  r6 

 
(! 
 6  6  
6  6A!
 AÿÿÿM@ A& Avg"
kvA
q 
A
trA>s!
  
6 B7 
AtAˇj!@Aӧ("A
 
t"qE@Aӧ  r6  6A!
A
 A 
A
vkA 
AGt!
 (!@ "(Axq F\r 
Av! 
A
t!
  Aqj"("\r  6A!
 !A! ! 
 (" 6  6A!A!
A! 
 j 6  6  j 6A°ßA°ß(A
k"A 6‰
 E@ 
q 
A@O@AÐÝA06AA 
AjAxq 
AI! Ak"("Axq!@ AqE@ A€I\r
 Aj M@ !  kAðâ(A
tM\rA  j!@  O@  k"AI\r
   A
qrAr6  j" Ar6  (A
r6  t
A¨ß( F@Aœß( j" M\r   A
qrAr6  j"  k"A
r6Aœß 6A¨ß 6
A¤ß( F@A˜ß( j" I\r@  k"AO@   A
qrAr6  j" A
r6  j" 6  (A~q6
  A
q rAr6  j" (A
r6A!A!A¤ß 6A˜ß 6
 ("Aq\r
 Axq j"\n I\r
 \n k! (!@ Aÿ
M@ (" F@AßAß(A~ Avwq6  6  6
 (!	@  G@ (" 6  6
@ (" Aj ("E\r
 Aj!@ ! "Aj! ("\r Aj! ("\r A6
A! 	E\r@ ("At"(Àa F@ AÀáj 6 \r
AӧAӧ(A~ wq6@  	(F@ 	 6
 	 6 E\r
  	6 ("@  6  6 ("E\r  6  6 AM@  A
q \nrAr6  \nj" (A
r6
   A
qrAr6  j" Ar6  \nj" (A
r6  t ! "@ Aj 
q"E@A  A|Ax Ak("Aq Axqj" 
 
 KV r «
  
j!@@ ("A
q\r AqE\r
 (" 
j!
@@@  k"A¤ß(G@ (! Aÿ
M@  ("G\rAßAß(A~ Avwq6 (!  G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6 ("AqAG\rA˜ß 
6  A~q6  
A
r6  
6  6  6A! E\r@ ("At"(Àa F@ AÀáj 6 \r
AӧAӧ(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6@@@@ ("AqE@A¨ß( F@A¨ß 6AœßAœß( 
j"
6  
A
r6 A¤ß(G\rA˜ßA6A¤ßA6A¤ß(" F@A¤ß 6A˜ßA˜ß( 
j"
6  
A
r6  
j 
6 Axq 
j!
 (! Aÿ
M@ (" F@AßAß(A~ Avwq6  6  6 (!  G@ (" 6  6 (" Aj ("E\r Aj!@ ! "Aj! ("\r Aj! ("\r A6  A~q6  
A
r6  
j 
6A! E\r@ ("At"(Àa F@ AÀáj 6 \r
AӧAӧ(A~ wq6@  (F@  6
  6 E\r
  6 ("@  6  6 ("E\r  6  6  
A
r6  
j 
6  G\rA˜ß 
6 
Aÿ
M@ 
Aø
qA¸ßj!Aß("A
 
Avt"
qE@Aß 
 r6 
 (!
  6 
 6  6  
6A! 
AÿÿÿM@ 
A& 
Avg"kvA
q A
trA>s!  6 B7 AtAˇj!@@Aӧ("A
 t"qE@Aӧ  r6  6  6
 
A A
vkA AGt! (!@ "(Axq 
F\r Av! A
t!  Aqj"("\r  6  6  6  6 ("
 6  6 A6  6  
6W

~@ ­B|BøÿÿÿƒAÄÜ("­|"BÿÿÿÿX@ §"
?AtM\r
 
\r
AÐÝA06AAÄÜ 
6 ²
#Ak"$  6@ AÓ
M@AàÑA Ó Ajx(!
 A|O@y   AÒ
n"AÒ
l"k6A ÓAàÔ Ajx"
( j! 
A ÓkAu!@A!@@@ "A/F\r
  At(àQ"
n" 
I\r A
j!  
 lG\r A/I\r
AÓ
!@  n"
 I\r  
 lF\r
  A\nj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  Aj"
n" 
I\r  
 lF\r
  A$j"
n" 
I\r  
 lF\r
  A(j"
n" 
I\r  
 lF\r
  A*j"
n" 
I\r  
 lF\r
  A.j"
n" 
I\r  
 lF\r
  A4j"
n" 
I\r  
 lF\r
  A:j"
n" 
I\r  
 lF\r
  A<j"
n" 
I\r  
 lF\r
  AÂj"
n" 
I\r  
 lF\r
  AÆj"
n" 
I\r  
 lF\r
  AÈj"
n" 
I\r  
 lF\r
  AÎj"
n" 
I\r  
 lF\r
  AÒj"
n" 
I\r  
 lF\r
  AØj"
n" 
I\r  
 lF\r
  Aàj"
n" 
I\r  
 lF\r
  Aäj"
n" 
I\r  
 lF\r
  Aæj"
n" 
I\r  
 lF\r
  Aêj"
n" 
I\r  
 lF\r
  Aìj"
n" 
I\r  
 lF\r
  Aðj"
n" 
I\r  
 lF\r
  Aøj"
n" 
I\r  
 lF\r
  Aþj"
n" 
I\r  
 lF\r
  A‚
j"
n" 
I\r  
 lF\r
  Aˆ
j"
n" 
I\r  
 lF\r
  AŠ
j"
n" 
I\r  
 lF\r
  AŽ
j"
n" 
I\r  
 lF\r
  A”
j"
n" 
I\r  
 lF\r
  A–
j"
n" 
I\r  
 lF\r
  Aœ
j"
n" 
I\r  
 lF\r
  A¢
j"
n" 
I\r  
 lF\r
  A¦
j"
n" 
I\r  
 lF\r
  A¨
j"
n" 
I\r  
 lF\r
  A¬
j"
n" 
I\r  
 lF\r
  A²
j"
n" 
I\r  
 lF\r
  A´
j"
n" 
I\r  
 lF\r
  Aº
j"
n" 
I\r  
 lF\r
  A¾
j"
n" 
I\r  
 lF\r
  AÀ
j"
n" 
I\r  
 lF\r
  AÄ
j"
n" 
I\r  
 lF\r
  AÆ
j"
n" 
I\r  
 lF\r
  AÐ
j"
n" 
I\r AÒ
j!  
 lG\rA A
j" A0F""At( S  j"AÒ
lj! Aj$ ‰

#Ak"$ A: 
 kAu!#Ak"$@ @  6 Aj"
 
( A
v"
Atj6  
Asj 
 ( z"
! (Aj  
!
 Aj$ Aj$ v\r ( 
(I *

@ Aj"
(@ 
}AG\r
  ((
  (A
k"6 A=
A
  A
M!
@@ 
q"\rAۋ("E\r 	
 "E@y \r A¨Ú6 ]
 €
"A˜Û6 Aj! 
a"A\rj"A6  6  6 Aj! A
j"@  
 ü\n  6 \n -Av ‚
@ ( ‡


A\n!
 ‚
 ˆ
A
k 
 ‚
@ ( ¨
#A k"$A÷ÿÿÿ"	 
Asj O@ …
!\n 
AóÿÿÿI@  
A
t6  
 j6 Aj Aj–
(Œ
A
j!	 Aj Aj 
(Ž
 Aj 	“
 (!	 ( @ 	 \n ‰
 @  	j  ‰
   j"k!  G@  	j j  \nj j ‰
 
A\nG@ \nr  	6  (
   j j"6 A:  	j Aj‹
 Aj—
 A j$
 -Aÿq (Aÿÿÿÿq@ E\r E\r  
 ü\n ‚
@  
6  
’
  
-:$ AO AjAxq" A
k" AFA\n  
6 \n  

  
A€€€€xr6y AI\r  
Aÿq:

 
!  
6  6®
 
A÷ÿÿÿM@ „
 
I@ 
Œ
!#Ak"
$ 
Aj 
Aj 
(Ž
 „
! ƒ
!@ ‘
"@A
! A
j! ! (
 A
j!@  K@ 
 “
 
(! 
(!
 
 “
 
(! „
! 
(! 
(! A
k M\r r ‚
! …
!   ƒ
A
j‰
 @ r E@  
  6  6
  ’
 
Aj—
 
Aj$
}
#Ak"$@  „
" ƒ
"kM@ E\r
 …
" j 
 ‰
   j"Š
 A:  j Aj‹

    k j  A  
†
 Aj$#
#Ak"$  
z! Aj$ 
   (ƒ
v
#Ak"$ ˆ
! (!@  I@ (!  6  
 ‰
 A:  j Aj‹

  A
k  kA
j A   
†
 Aj$b
#Ak"$ ‡
!@ A\nM@  ’
  
 ‰
 A:  j Aj‹

 A\n A\nk A   
†
 Aj$‚
#Ak"$  
:@@ ‚
"E@A\n! ‡

 ˆ
A
k! ("
 F@#Ak"$ Aj Aj 
(Ž
#Ak"$@ A÷ÿÿÿG@ …
! Aj AóÿÿÿI  A
t6  A
j6 Aj Aj–
(Œ
A
jA÷ÿÿÿ“
 (! ( @   ‰
 A\nG@ r  6  (
 Aj$

  6 Aj—
 Aj$ …

 …
 \r " 
A
j’

 (!  
A
j6 
 j" Aj‹
 A: A
j Aj‹
 Aj$\r  
 
a•
¬
#A k"$ Aj" A j" Aj"k"A	L@A= A  
A
rgkAÑ	lAu" 
 AtAÀÕj(OjH\r
 
A¿„=M@ 
AÎM@ 
AãM@ 
A	M@  

  
ž
 
AçM@  
Aän"
 
 Aälkž
  
Ÿ
 
AŸM@  
AÎn"
 
 AÎlkŸ
  
 

 
AÿÁ×/M@ 
Aÿ¬âM@  
AÀ„=n"
 
 AÀ„=lk 
  
¡

 
Aÿ“ëÜM@  
A€Â×/n"
 
 A€Â×/lk¡

  
A€Â×/n"ž
 
 A€Â×/lk¡
!A6  6 (!#Ak"$@  Aj"k"A÷ÿÿÿM@@ ‘
@  ’
 !

 Aj Œ
A
j“
 (  ("
6  (
  6 
   k"‰
 A: 
 j Aj‹
 Aj$

 A j$  
A0j: A
jë

#Ak"$#A k"$#Ak"$  
A
tAðÕj"
"6  
Aj6 Aj Aj Aj¢
 Aj$ (! (!#Ak"
$ 
 6    k"‰
 
  j6 Aj 
Aj 
Aj¢
 
Aj$   (£
6   (£
6 Aj Aj Aj¢
 A j$ (! Aj$   
Aän"ž
 
 Aälkž
  
AÎn"ž
 
 AÎlkŸ
  
AÀ„=n"ž
 
 AÀ„=lk 
  
(6  (6\n  
 kj AÐjqAÐjt

 E@ ( 
(F  
F@A
 
("-!
@ ("-"E\r  
G\r@ -
!
 -
"E\r
 A
j! A
j!  
F\r  
F°
#AÐk"$@A
  
A¥
\rA 
E\r#Ak"$ Aj" 
("Ak("6  
 j6  Ak(6 ("Aè×A¥
! (!@ @ (!
#A@j"$ A@k$A  
!
#A@j"$ 
 N@ B7 A6 Aè×6  6 B7 B7$ B7, A6< B€€€€€€€
74  
6  Aj  A
A ((\n 
A (! A@k$ "\r#A@j"$ A6 A¸×6  
6 Aè×6A!
 AjAA\'ü A6< A
:;  Aj A
A ((@@@ ((
 (A ($A
FA ( A
FA (,A
F!

 (A
G@ (,\r
 ( A
G\r
 ($A
G\r
 (!
 A@k$ 
! Aj$A E\r ("E\r
 AjAA8ü A
:K A6   6  6 A
6D  Aj A
 (( (,"A
F@  ($6 A
F! AÐj$  Aý6 Aç6 AÐ6vv

 ($"E@  6  
6 A
6$  (86@@ ( (8G\r ( 
G\r (AG\r
  6 A
:6 A6  A
j6$  
(A¥
@ 
  §
3  
(A¥
@ 
  §
 (" 
   ((

 ("A
q! 
-7A
F@ Au" E\r
 ( «

 Au E\r 
 ((68 (!A!A! (" 
  j A Aq ((\n  
j(p
  
(A¥
@ 
  §
 (! Aj" 
  ª
@ AI\r  Atj! Aj!@  
  ª
 
-6\r
 Aj" I\rš
 A
:5@  (G\r A
:4@ ("E@ A
6$  6  
6 A
G\r (0A
F\r
 
 F@ ("AF@  6 ! (0A
G\r A
F\r
  ($A
j6$ A
:6 @ 
 (G\r (A
F\r  6°
  
( ¥
@ 
  ®
@@  
( ¥
@@ 
( G@  
(G\r
 A
G\r 
A
6  
 6  
(,AF\r
 Aj" (Atj!@@@ 
@  M\r 
A;
4  
  A
 °
 
-6\r 
-5A
G\r 
-4A
F@ 
(A
F\rA
!A
! -AqE\rA
! -A
q\rA
AA A
q6, \r 
A6, Aj! (! Aj" 
   ±
 AI\r
  Atj! Aj!@ ("AqE@ 
($A
G\r
@ 
-6\r  
   ±
 Aj" I\r A
qE@@ 
-6\r 
($A
F\r  
   ±
 Aj" I\r@ 
-6\r 
($A
F@ 
(A
F\r  
   ±
 Aj" I\r
 
 6 
 
((A
j6( 
($A
G\r 
(AG\r 
A
:6K
 ("Au! A
q@ ( «
! (" 
   j A Aq  ((\nI
 ("Au! A
q@ ( «
! (" 
  j A Aq  ((ø
  
( ¥
@ 
  ®
@  
( ¥
@@ 
( G@  
(G\r
 A
G\r 
A
6  
 6 @ 
(,AF\r 
A;
4 (" 
  A
  ((\n 
-5A
F@ 
A6, 
-4E\r
 
A6, 
 6 
 
((A
j6( 
($A
G\r
 
(AG\r
 
A
:6 (" 
    ((”
  
( ¥
@ 
  ®
@  
( ¥
E\r@ 
( G@  
(G\r
 A
G\r
 
A
6  
 6 
 6  
 
((A
j6(@ 
($A
G\r 
(AG\r 
A
:6 
A6,›
  
( ¥
@ 
   ­
 
-5! (! 
A:5 
-4! 
A:4 Aj"	 
    °
  
-4"\nr!  
-5"r!@ AI\r 	 Atj!	 Aj!@ 
-6\r
@ \nA
q@ 
(A
F\r -Aq\r
 A
qE\r -A
qE\r 
A;
4  
    °
 
-5" rA
q! 
-4"\n rA
q! Aj" 	I\r 
 A
q:5 
 A
q:49  
( ¥
@ 
   ­
 (" 
     ((\n  
( ¥
@ 
   ­
A¯\rA¿A„+

 A˜Û6 Aj(Ak"
Aj}AH@ 
r  º
 r\n Aj( $# kApq"$ #ôQ(A€Ò{"type":"Document"},"attributes":{summarytbodyTableBodyLatexMathDisplay\\u%04x-+   0X0x-0X+0X 0X-0x+0x 0x__next_prime overflowTableRowdivnavmenuTextUnorderedListOrderedListstartSuperscriptSubscripttfootcountbodyRowCountheadRowCountbasefontDocumentimportantdefaulttightrightHighlightleftframesetfieldsetdt\\taddressdetailsEmphasisnoframes%s:%d: %strvectordirhrfootercenterSpoilerheaderfenceChar\\roptgroupcolgroup/home/moboudra/dev/paseo/.dev/paseo-home/worktrees/2eantcls/feat-web-code-block-renderer/packages/core/cpp/wasm/ASTSerializer.cpp/emsdk/emscripten/system/lib/libcxxabi/src/private_typeinfo.cpptipvideoVideocautionoptionstd::exceptionfigcaptionAdmonitionsectionmainalignnan\\nformmenuitemListItemparamulurlcolhtmlTableHeaderCellTableCellleveldlisTasklinkLinkCodeBlocktrackSoftBreakLineBreakThematicBreaklibad_array_new_lengthParagraphStrikethroughsearchdialogStrongbasic_stringnodeTypeToStringwarningHeadinginf\\ftrueblockquoteBlockquotenotefalsebasefigureadmonitionTypeUnderlineLatexMathInlineBlankLineiframetitlearticletableTableImageCodeasidetdlegendtaskCheckedddtheadTableHeadsrcstd::bad_alloc\\b"\'=<>`-_.-+_\\\\({[,"children":[NANINFcatching a class without an object?)}].!?,;mailto:,"content":h6h5h4h3h2h1http://Too many link reference definition instantiations.Unsupported abi_version.Aborted from text() callback.Aborted from enter_span() callback.Aborted from leave_span() callback.Aborted from enter_block() callback.Aborted from leave_block() callback.malloc() failed.realloc() failed.@:..!#$%&\'*+/=?^_`{|}~-_.:-+-.-_+-_*(null)Suppressing too sparse table (see https://github.com/mity/md4c/issues/345)._=().+-_~%false && "unhandled NodeType in nodeTypeToString"\\"{"type":"[]!xX \n™Jìi¿e£<‡¢°üOs{±2‡+F< ÂÎ._VÉšAÜ~ôH,„*NSt3__220__shared_ptr_emplaceIN8Markdown15MarkdownASTNodeENS_9allocatorIS2_EEEE8™(A€ä A f\r0\r`\r\r\rÐ\r\rp\r\r€ Àà\r\r @ \r\r\r\rAUmŒA°!þ\n-AàÁ™ÅA5¨]¸‹;OAÐ5F¾\n&’îa=AMM	J	G	D	A	>	¬¨Að`A€•EA Ü˜óAÀ\r”nA༨A€\r’
A ±Ô$AÀEu,’Ø–«gYAA ”A°—  € @\n €/ _ 0A@Z€µÀ@րØ@ހ
@.
€2
@6
€9
@G
€J
@v
€x
y
@}
€

‚
„
†
‡
‰
Š
‹
Ž


‘
“
”
–
—
˜
œ

Ÿ
 
@¤
€¦
§
©
¬
®
¯
±
²
³
µ
·
¸
¼
Ä
Å
Ç
È
Ê
Ë
@Û
€Þ
@î
ۖ
ò
ô
ö
÷
ø
@€ "@2€:;=>ACDEF@N€Eprv†ˆ@Š€ŒŽ‘@¡€£@«€ÂÏÐÑÕÖØ@î€ðñôõ÷ùúý@ÿ€@€@/€`@€€Š@¾€ÀÁ@Í€Ð@.€1@V€ @Å€ÇÍø@ý€€‚ƒ„…†‡ˆ‰@º€½@¿€@”€› @þ€@€@€(@/€8@?€H@M€Y[]_h@o€¸¹º»¾È@Ë€ØÙÚÛèéêëìøùúû&!*!+!2!`!@o!€ƒ!¶$@Ï$€,@/,€`,b,c,d,g,@k,€m,n,o,p,r,u,~,,€,@â,€ë,í,ò,@¦@l¦€€¦@š¦€"§@.§€2§@n§€y§{§}§~§@†§€‹§§§’§–§@¨§€ª§«§¬§­§®§°§±§²§³§´§@§€Ä§Å§Æ§Ç§É§Ë§Ì§@Ú§€Ü§Ý§â§õ§l«m«p«@¿«€!ÿ@:ÿ€
@\'
€°
@Ó
€p
@z
€|
@Š
€Œ
@’
€”
•
€
@²
€P\r
@e\r
€ 
@¿
€@n
@_n
€ n
@¸n
€@ß
Hß
Jß
Mß
Qß
hß
@nß
€rß
@~ß
ێ
@!é
€az¼àöøþ

/
3
7
:
H
K
w
ÿz
~
sSƒ
…
Tˆ
VWŒ
Ý
Y[’
`cih™
oru¡
¥
۬
ƒ­
ˆ°
Š‹´
¶
’¹
½
Æ
Æ
É
É
Ì
Ì
Ü
ß
ï
ó
ó
õ
•
¿
ù
ž
#3e,<š
f,B€
‰ŒGO¹qswó¬­¯ÌÍαÁÃËÃײ¸ÆÀÙïºÁ¸µøòû{}P_0Oa‹¿ÏÂÎÑ/a†-%-\'---ðõ24>ABBJcK¦ŠÐúýÿ
•a¡ÿ \'07@EQSUW`g°±pq¹ruÐÑvwàáz{åxy|}ÉkåN!p!!„!Ð$é$0,_,a,k}}h,l,QqPRs,v,?@,ã,ì,î,ó,A¦m¦¦›¦#§/§3§o§z§|§y§‡§Œ§e‘§“§—§©§f\\aljž‡S«µ§Ã§”§‚Žȧʧdͧۧ›
w|ö§K«L« ïAÿZÿ(
O
Ø
û
—
¡
£
±
³
¹
»
¼
À
ò
p\r
…\r
À
ß
`n
n
»n
Ón
Aß
Iß
Kß
Nß
Rß
iß
oß
sß
ß
"é
Cé
AÐ2Ó
ß0
I
ð
‡–—˜™šžP€@‡€ˆ@€@—€˜@Ÿ€ @§€¨@¯€²³´¶¼ÂÃÄÆÌÖäæòóôöüû
ûûûûûûûûû•ß
A°4¥ssi¼nje‚h1tw\ny\na¾ssŹ¹¹¹ ¹\'¹ ¹\'¹`¹g¹`¹g¹p¹±¹¬¹±B±¹t¹·¹®¹·B·¹¹BÁÅB|¹É¹Î¹ÉBɹfffiflststtvtetk~vtmssAà7À°RTV·ÇÒÓ×âãç÷ûû¹
Å
ÅÅ
ÅB±B¹·B¹¹¹
¹BÅÅ
ÅBÉB¹ffifflА.

P05à                 A´:½
!@/€:@@€[@`€{@~€¡@©€«@¬€®@±€´¶@¸€»¿×÷Â@Å€Ò@߀å@ë€íï@ÿ€u~„@…€‡ö‚Z@_€‰@Š€@€¾ÀÃÆó@ô€@€@€j@m€ÔÞéý@þ€@\r€ö@ù€þ@ÿ€0@>€^ˆd	@e	€p	ò	@ó	€ú	@û	€ý	v\nð\n@ñ\n€pó@ú€w„O\ry\rô\r?OZ@[€
@€@€468:@=€…¾@Å€Ç@Ì€Î@Ú€J@O€ž@Ÿ€û`@h€@™€m@n€›@œ€ë@í€5@6€Ô@Ö€Ø@Û€@\n€@D@E€Þ@ÿ€@€ @¦€¨@­€N@O€Z@j€t@€ü@ÿ€;@?€~@€À@Ç€Ó½¿@Á€Í@Ï€Ý@߀í@ï€ý@þ€ @\' €0 @^ €z @~ €Š @Ž €  @Ä €!@
!€!@!€!@	!€!!@!€!@#!€%!\'!)!.!:!@;!€@!@D!€J!@M!€O!Š!@‹!€!@)$€@$@J$€œ$@é$€%@u\'€”\'@s+€v+@ÿ+€å,@ê,€ù,@ü,€þ,@ÿ,€p-.@..€0.@].€`.@c.€€.@™.€›.@ó.€/@Õ/€ð/@ÿ/€
0@0€0@ 0€0060@70€=0@?0€›0@œ0€ 0û01@‘1€–1@Ÿ1€À1@å1€ï12@2€*2@G2€P2`2@2€Š2@°2€À2@ÿ3€ÀM@ÿM€¤@Ƥ€þ¤@ÿ¤€\r¦@¦€s¦~¦ò¦@÷¦€§@§€ §@!§€‰§@Š§€(¨@+¨€6¨@9¨€t¨@w¨€Î¨@Ϩ€ø¨@ú¨€ü¨.©@/©€_©Á©@Í©€Þ©@ß©€\\ª@_ª€wª@yª€Þª@ߪ€ðª@ñª€[«j«@k«€ë«)û²û@Òû€>ý@Oý€ý@‘ý€Èý@Ïý€üý@ÿý€þ@þ€0þ@Rþ€Tþ@fþ€hþ@kþ€
ÿ@ÿ€ÿ@ ÿ€;ÿ@@ÿ€[ÿ@eÿ€àÿ@æÿ€èÿ@îÿ€üÿ@ýÿ€

@

€7

@?

€y

@‰

€Œ

@Ž

€

@œ

€ 

Ð

@ü

€Ÿ
Ð
o
W
w
@x
€	
?	
P\n
@X\n
€\n
È\n
ð\n
@ö\n
€9
@?
€™
@œ
€n\r
Ž\r
@\r
€­
É
@Ê
€Ð
@Ø
€U
@Y
۠
@‰
€G
@M
€»
@¼
€¾
@Á
€@
@C
€t
@u
ہ
@È
€Í
Û
Ý
@ß
€8
@=
۩
Ô
@Õ
€×
@Ø
€K
@O
€Z
@[
€]
Æ
Á
@×
€A
@C
€`
@l
€¹
<
@?
€;
D
@F
ۉ
?
@F
€š
@œ
€ž
@¢
€
@	
ۇ
A
@E
€p
@q
€÷
@ø
€C
@O
€Õ
@ñ
€ÿ
p$
@t$
ۖ/
@ò/
€nj
@oj
€õj
7k
@?k
€Dk
@Ek
€mm
@om
€—n
@šn
ۉo
œ¼
Ÿ¼
Ì
@ïÌ
€úÌ
@üÌ
€Í
@³Î
€ºÎ
@ÐÎ
€ÒÎ
@ÔÎ
€ÝÎ
@ýÎ
€PÏ
@ÃÏ
€Ð
@õÐ
ۄ
@&Ñ
€)Ñ
@dÑ
€jÑ
@lÑ
€ƒÑ
@„Ñ
€ŒÑ
@©Ñ
€®Ñ
@AÒ
€EÒ
SÒ
@ZÒ
€]Ò
@^Ò
€`Ò
@Ò
€Ó
@VÓ
€ÁÖ
ÛÖ
ûÖ
×
5×
O×
o×
‰×
©×
Ã×
Ø
@ÿÙ
€7Ú
@:Ú
€mÚ
@tÚ
€vÚ
@ƒÚ
€…Ú
@‹Ú
€Û
@Û
€Oá
ÿâ
ÿå
^é
@_é
€¬ì
°ì
.í
ðî
@ñî
€ð
@+ð
€0ð
@“ð
€ ð
@®ð
€±ð
@¿ð
€Áð
@Ïð
€Ñð
@õð
€\rñ
@®ñ
€æñ
@ò
€ò
@;ò
€@ò
@Hò
€Pò
@Qò
€`ò
@eò
€ó
@Ùö
€Üö
@ìö
€ðö
@üö
€÷
@Û÷
€à÷
@ë÷
€ð÷
@ø
€ø
@Gø
€Pø
@Yø
€`ø
@‡ø
€ø
@­ø
€°ø
@»ø
€Àø
@Áø
€Ðø
@Øø
€ù
@Wú
€`ú
@mú
€pú
@|ú
€€ú
@Æú
€Èú
Ìú
@Ýú
€ßú
@ëú
€ïú
@úú
€û
@’û
€”û
@ïû
€úû
	A€ÎA	\n\n\n
		AÑÎ!\r\r		A‹Ï
A—Ï	AÅÏ
AÑÏ	AÿÏ
A‹Ð	AÂÐ	AóÐ
AÿÐ	A­Ñ
A¹Ñ€	0123456789ABCDEF\r%)+/5;=CGIOSYaegkmqƒ‰‹•—£§­³µ¿ÁÅÇÓ
\r%)+/5;=CGIOSYaegkmqyƒ‰‹•—£§©­³µ»¿ÁÅÇÑ ,h*NSt3__214__shared_countE¤,œ*
`*NSt3__219__shared_weak_countEAÄÕø\ndè\' †
@B€–˜áõʚ;00010203040506070809101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899H,Ä+(.N10__cxxabiv116__shim_type_infoEH,ô+¸+N10__cxxabiv117__class_type_infoEè+ !"#$%&h,\'!"#()*H,t,è+N10__cxxabiv120__si_class_type_infoEÄ,+!"#,-.H,Ð,è+N10__cxxabiv121__vmi_class_type_infoEL-/0h-124-34 ,<-St9exceptionH,X-4-St9bad_allocH,t-L-St20bad_array_new_length¤-
56H,°-4-St11logic_errorÔ-
76H,à-¤-St12length_error.
86H,.¤-St12out_of_range ,0.St9type_infoAÁÜ 1€')}function getBinarySync(file){return file}async function getWasmBinary(binaryFile){return getBinarySync(binaryFile)}async function instantiateArrayBuffer(binaryFile,imports){try{var binary=await getWasmBinary(binaryFile);var instance=await WebAssembly.instantiate(binary,imports);return instance}catch(reason){err(`failed to asynchronously prepare wasm: ${reason}`);abort(reason)}}async function instantiateAsync(binary,binaryFile,imports){return instantiateArrayBuffer(binaryFile,imports)}function getWasmImports(){var imports={env:wasmImports,wasi_snapshot_preview1:wasmImports};return imports}async function createWasm(){function receiveInstance(instance,module){wasmExports=instance.exports;assignWasmExports(wasmExports);updateMemoryViews();return wasmExports}function receiveInstantiationResult(result){return receiveInstance(result["instance"])}var info=getWasmImports();if(Module["instantiateWasm"]){return new Promise((resolve,reject)=>{Module["instantiateWasm"](info,(inst,mod)=>{resolve(receiveInstance(inst,mod))})})}wasmBinaryFile??=findWasmBinary();var result=await instantiateAsync(wasmBinary,wasmBinaryFile,info);var exports=receiveInstantiationResult(result);return exports}class ExitStatus{name="ExitStatus";constructor(status){this.message=`Program terminated with exit(${status})`;this.status=status}}var callRuntimeCallbacks=callbacks=>{while(callbacks.length>0){callbacks.shift()(Module)}};var onPostRuns=[];var addOnPostRun=cb=>onPostRuns.push(cb);var onPreRuns=[];var addOnPreRun=cb=>onPreRuns.push(cb);var noExitRuntime=true;var stackRestore=val=>__emscripten_stack_restore(val);var stackSave=()=>_emscripten_stack_get_current();var UTF8Decoder=globalThis.TextDecoder&&new TextDecoder;var findStringEnd=(heapOrArray,idx,maxBytesToRead,ignoreNul)=>{var maxIdx=idx+maxBytesToRead;if(ignoreNul)return maxIdx;while(heapOrArray[idx]&&!(idx>=maxIdx))++idx;return idx};var UTF8ArrayToString=(heapOrArray,idx=0,maxBytesToRead,ignoreNul)=>{var endPtr=findStringEnd(heapOrArray,idx,maxBytesToRead,ignoreNul);if(endPtr-idx>16&&heapOrArray.buffer&&UTF8Decoder){return UTF8Decoder.decode(heapOrArray.subarray(idx,endPtr))}var str="";while(idx<endPtr){var u0=heapOrArray[idx++];if(!(u0&128)){str+=String.fromCharCode(u0);continue}var u1=heapOrArray[idx++]&63;if((u0&224)==192){str+=String.fromCharCode((u0&31)<<6|u1);continue}var u2=heapOrArray[idx++]&63;if((u0&240)==224){u0=(u0&15)<<12|u1<<6|u2}else{u0=(u0&7)<<18|u1<<12|u2<<6|heapOrArray[idx++]&63}if(u0<65536){str+=String.fromCharCode(u0)}else{var ch=u0-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}}return str};var UTF8ToString=(ptr,maxBytesToRead,ignoreNul)=>ptr?UTF8ArrayToString(HEAPU8,ptr,maxBytesToRead,ignoreNul):"";var ___assert_fail=(condition,filename,line,func)=>abort(`Assertion failed: ${UTF8ToString(condition)}, at: `+[filename?UTF8ToString(filename):"unknown filename",line,func?UTF8ToString(func):"unknown function"]);class ExceptionInfo{constructor(excPtr){this.excPtr=excPtr;this.ptr=excPtr-24}set_type(type){HEAPU32[this.ptr+4>>2]=type}get_type(){return HEAPU32[this.ptr+4>>2]}set_destructor(destructor){HEAPU32[this.ptr+8>>2]=destructor}get_destructor(){return HEAPU32[this.ptr+8>>2]}set_caught(caught){caught=caught?1:0;HEAP8[this.ptr+12]=caught}get_caught(){return HEAP8[this.ptr+12]!=0}set_rethrown(rethrown){rethrown=rethrown?1:0;HEAP8[this.ptr+13]=rethrown}get_rethrown(){return HEAP8[this.ptr+13]!=0}init(type,destructor){this.set_adjusted_ptr(0);this.set_type(type);this.set_destructor(destructor)}set_adjusted_ptr(adjustedPtr){HEAPU32[this.ptr+16>>2]=adjustedPtr}get_adjusted_ptr(){return HEAPU32[this.ptr+16>>2]}}var exceptionLast=0;var uncaughtExceptionCount=0;var ___cxa_throw=(ptr,type,destructor)=>{var info=new ExceptionInfo(ptr);info.init(type,destructor);exceptionLast=ptr;uncaughtExceptionCount++;throw exceptionLast};var __abort_js=()=>abort("");var getHeapMax=()=>536870912;var alignMemory=(size,alignment)=>Math.ceil(size/alignment)*alignment;var growMemory=size=>{var oldHeapSize=wasmMemory.buffer.byteLength;var pages=(size-oldHeapSize+65535)/65536|0;try{wasmMemory.grow(pages);updateMemoryViews();return 1}catch(e){}};var _emscripten_resize_heap=requestedSize=>{var oldSize=HEAPU8.length;requestedSize>>>=0;var maxHeapSize=getHeapMax();if(requestedSize>maxHeapSize){return false}for(var cutDown=1;cutDown<=4;cutDown*=2){var overGrownHeapSize=oldSize*(1+.2/cutDown);overGrownHeapSize=Math.min(overGrownHeapSize,requestedSize+100663296);var newSize=Math.min(maxHeapSize,alignMemory(Math.max(requestedSize,overGrownHeapSize),65536));var replacement=growMemory(newSize);if(replacement){return true}}return false};var getCFunc=ident=>{var func=Module["_"+ident];return func};var writeArrayToMemory=(array,buffer)=>{HEAP8.set(array,buffer)};var lengthBytesUTF8=str=>{var len=0;for(var i=0;i<str.length;++i){var c=str.charCodeAt(i);if(c<=127){len++}else if(c<=2047){len+=2}else if(c>=55296&&c<=57343){len+=4;++i}else{len+=3}}return len};var stringToUTF8Array=(str,heap,outIdx,maxBytesToWrite)=>{if(!(maxBytesToWrite>0))return 0;var startIdx=outIdx;var endIdx=outIdx+maxBytesToWrite-1;for(var i=0;i<str.length;++i){var u=str.codePointAt(i);if(u<=127){if(outIdx>=endIdx)break;heap[outIdx++]=u}else if(u<=2047){if(outIdx+1>=endIdx)break;heap[outIdx++]=192|u>>6;heap[outIdx++]=128|u&63}else if(u<=65535){if(outIdx+2>=endIdx)break;heap[outIdx++]=224|u>>12;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63}else{if(outIdx+3>=endIdx)break;heap[outIdx++]=240|u>>18;heap[outIdx++]=128|u>>12&63;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63;i++}}heap[outIdx]=0;return outIdx-startIdx};var stringToUTF8=(str,outPtr,maxBytesToWrite)=>stringToUTF8Array(str,HEAPU8,outPtr,maxBytesToWrite);var stackAlloc=sz=>__emscripten_stack_alloc(sz);var stringToUTF8OnStack=str=>{var size=lengthBytesUTF8(str)+1;var ret=stackAlloc(size);stringToUTF8(str,ret,size);return ret};var ccall=(ident,returnType,argTypes,args,opts)=>{var toC={string:str=>{var ret=0;if(str!==null&&str!==undefined&&str!==0){ret=stringToUTF8OnStack(str)}return ret},array:arr=>{var ret=stackAlloc(arr.length);writeArrayToMemory(arr,ret);return ret}};function convertReturnValue(ret){if(returnType==="string"){return UTF8ToString(ret)}if(returnType==="boolean")return Boolean(ret);return ret}var func=getCFunc(ident);var cArgs=[];var stack=0;if(args){for(var i=0;i<args.length;i++){var converter=toC[argTypes[i]];if(converter){if(stack===0)stack=stackSave();cArgs[i]=converter(args[i])}else{cArgs[i]=args[i]}}}var ret=func(...cArgs);function onDone(ret){if(stack!==0)stackRestore(stack);return convertReturnValue(ret)}ret=onDone(ret);return ret};var cwrap=(ident,returnType,argTypes,opts)=>{var numericArgs=!argTypes||argTypes.every(type=>type==="number"||type==="boolean");var numericRet=returnType!=="string";if(numericRet&&numericArgs&&!opts){return getCFunc(ident)}return(...args)=>ccall(ident,returnType,argTypes,args,opts)};for(var base64ReverseLookup=new Uint8Array(123),i=25;i>=0;--i){base64ReverseLookup[48+i]=52+i;base64ReverseLookup[65+i]=i;base64ReverseLookup[97+i]=26+i}base64ReverseLookup[43]=62;base64ReverseLookup[47]=63;{if(Module["noExitRuntime"])noExitRuntime=Module["noExitRuntime"];if(Module["print"])out=Module["print"];if(Module["printErr"])err=Module["printErr"];if(Module["wasmBinary"])wasmBinary=Module["wasmBinary"];if(Module["arguments"])arguments_=Module["arguments"];if(Module["thisProgram"])thisProgram=Module["thisProgram"];if(Module["preInit"]){if(typeof Module["preInit"]=="function")Module["preInit"]=[Module["preInit"]];while(Module["preInit"].length>0){Module["preInit"].shift()()}}}Module["ccall"]=ccall;Module["cwrap"]=cwrap;Module["UTF8ToString"]=UTF8ToString;var _parseMarkdown,__emscripten_stack_restore,__emscripten_stack_alloc,_emscripten_stack_get_current,memory,__indirect_function_table,wasmMemory;function assignWasmExports(wasmExports){_parseMarkdown=Module["_parseMarkdown"]=wasmExports["parseMarkdown"];__emscripten_stack_restore=wasmExports["_emscripten_stack_restore"];__emscripten_stack_alloc=wasmExports["_emscripten_stack_alloc"];_emscripten_stack_get_current=wasmExports["emscripten_stack_get_current"];memory=wasmMemory=wasmExports["memory"];__indirect_function_table=wasmExports["__indirect_function_table"]}var wasmImports={__assert_fail:___assert_fail,__cxa_throw:___cxa_throw,_abort_js:__abort_js,emscripten_resize_heap:_emscripten_resize_heap};function run(){preRun();function doRun(){Module["calledRun"]=true;if(ABORT)return;initRuntime();readyPromiseResolve?.(Module);Module["onRuntimeInitialized"]?.();postRun()}if(Module["setStatus"]){Module["setStatus"]("Running...");setTimeout(()=>{setTimeout(()=>Module["setStatus"](""),1);doRun()},1)}else{doRun()}}var wasmExports;wasmExports=await (createWasm());run();if(runtimeInitialized){moduleRtn=Module}else{moduleRtn=new Promise((resolve,reject)=>{readyPromiseResolve=resolve;readyPromiseReject=reject})}
++;return moduleRtn}})();if(typeof exports==="object"&&typeof module==="object"){module.exports=createMd4cModule;module.exports.default=createMd4cModule}else if(typeof define==="function"&&define["amd"])define([],()=>createMd4cModule);
+diff --git a/node_modules/react-native-enriched-markdown/src/types/MarkdownRenderers.ts b/node_modules/react-native-enriched-markdown/src/types/MarkdownRenderers.ts
+new file mode 100644
+--- /dev/null
++++ b/node_modules/react-native-enriched-markdown/src/types/MarkdownRenderers.ts
+@@ -0,0 +1,21 @@
++import type { ComponentType, ComponentProps, ReactNode } from 'react';
++import type { LinkPressEvent } from './events';
++
++export interface CodeBlockRendererProps {
++  /** Code content, including its original trailing whitespace. */
++  code: string;
++  /** Fence language, or an empty string for an unlabelled block. */
++  language: string;
++}
++
++export interface LinkRendererProps {
++  link: LinkPressEvent;
++  anchorProps: ComponentProps<'a'>;
++  children: ReactNode;
++}
++
++/** Custom web components. Overrides own their styling and interactions. */
++export interface MarkdownRenderers {
++  codeBlock?: ComponentType<CodeBlockRendererProps>;
++  link?: ComponentType<LinkRendererProps>;
++}
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownRenderers.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownRenderers.d.ts
+new file mode 100644
+--- /dev/null
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/types/MarkdownRenderers.d.ts
+@@ -0,0 +1,20 @@
++import type { ComponentType, ComponentProps, ReactNode } from 'react';
++import type { LinkPressEvent } from './events';
++export interface CodeBlockRendererProps {
++    /** Code content, including its original trailing whitespace. */
++    code: string;
++    /** Fence language, or an empty string for an unlabelled block. */
++    language: string;
++}
++export interface LinkRendererProps {
++  link: LinkPressEvent;
++  anchorProps: ComponentProps<'a'>;
++  children: ReactNode;
++}
++
++/** Custom web components. Overrides own their styling and interactions. */
++export interface MarkdownRenderers {
++    codeBlock?: ComponentType<CodeBlockRendererProps>;
++  link?: ComponentType<LinkRendererProps>;
++}
++//# sourceMappingURL=MarkdownRenderers.d.ts.map
+\ No newline at end of file
+diff --git a/node_modules/react-native-enriched-markdown/src/index.tsx b/node_modules/react-native-enriched-markdown/src/index.tsx
+--- a/node_modules/react-native-enriched-markdown/src/index.tsx
++++ b/node_modules/react-native-enriched-markdown/src/index.tsx
+@@ -1,3 +1,8 @@
++export type {
++  MarkdownRenderers,
++  CodeBlockRendererProps,
++  LinkRendererProps,
++} from './types/MarkdownRenderers';
+ export type { LinkVariantStyle, LinkPillStyle } from './types/MarkdownStyle';
+ export type { LinkPillContent } from './types/MarkdownTextProps';
+ export type {
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/index.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/index.d.ts
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/index.d.ts
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/index.d.ts
+@@ -1,3 +1,4 @@
++export type { MarkdownRenderers, CodeBlockRendererProps, LinkRendererProps, } from './types/MarkdownRenderers';
+ export type { LinkVariantStyle, LinkPillStyle } from './types/MarkdownStyle';
+ export type { LinkPillContent } from './types/MarkdownTextProps';
+ export type { LinkContextMenuItem, LinkRecognition, } from './types/MarkdownTextProps';
+diff --git a/node_modules/react-native-enriched-markdown/src/types/MarkdownTextProps.ts b/node_modules/react-native-enriched-markdown/src/types/MarkdownTextProps.ts
+--- a/node_modules/react-native-enriched-markdown/src/types/MarkdownTextProps.ts
++++ b/node_modules/react-native-enriched-markdown/src/types/MarkdownTextProps.ts
+@@ -1,3 +1,4 @@
++import type { MarkdownRenderers } from './MarkdownRenderers';
+ import type { ColorValue, ViewProps, ViewStyle, TextStyle } from 'react-native';
+ import type { MarkdownStyle, Md4cFlags } from './MarkdownStyle';
+ import type { AccessibilityLabels } from './AccessibilityLabels';
+@@ -154,6 +155,8 @@
+    * @platform ios, android, web
+    */
+   markdown: string;
++  /** Custom block components. Ignored on native. @platform web */
++  renderers?: MarkdownRenderers;
+   /**
+    * Style configuration for markdown elements.
+    * @platform ios, android, web
+diff --git a/node_modules/react-native-enriched-markdown/src/index.web.tsx b/node_modules/react-native-enriched-markdown/src/index.web.tsx
+--- a/node_modules/react-native-enriched-markdown/src/index.web.tsx
++++ b/node_modules/react-native-enriched-markdown/src/index.web.tsx
+@@ -1,3 +1,8 @@
++export type {
++  MarkdownRenderers,
++  CodeBlockRendererProps,
++  LinkRendererProps,
++} from './types/MarkdownRenderers';
+ export { EnrichedMarkdownText, default } from './web/EnrichedMarkdownText';
+ export type { EnrichedMarkdownTextProps } from './types/MarkdownTextProps.web';
+ export type { MarkdownStyle, Md4cFlags } from './types/MarkdownStyle';
+diff --git a/node_modules/react-native-enriched-markdown/lib/typescript/src/index.web.d.ts b/node_modules/react-native-enriched-markdown/lib/typescript/src/index.web.d.ts
+--- a/node_modules/react-native-enriched-markdown/lib/typescript/src/index.web.d.ts
++++ b/node_modules/react-native-enriched-markdown/lib/typescript/src/index.web.d.ts
+@@ -1,3 +1,4 @@
++export type { MarkdownRenderers, CodeBlockRendererProps, LinkRendererProps, } from './types/MarkdownRenderers';
+ export { EnrichedMarkdownText, default } from './web/EnrichedMarkdownText';
+ export type { EnrichedMarkdownTextProps } from './types/MarkdownTextProps.web';
+ export type { MarkdownStyle, Md4cFlags } from './types/MarkdownStyle';
+diff --git a/node_modules/react-native-enriched-markdown/src/web/renderers/InlineRenderers.tsx b/node_modules/react-native-enriched-markdown/src/web/renderers/InlineRenderers.tsx
+index 091eb19..bbee3ce 100644
+--- a/node_modules/react-native-enriched-markdown/src/web/renderers/InlineRenderers.tsx
++++ b/node_modules/react-native-enriched-markdown/src/web/renderers/InlineRenderers.tsx
+@@ -48,9 +48,9 @@ function HighlightRenderer({ node, styles, renderChildren }: RendererProps) {
+   return <mark style={styles.highlight}>{renderChildren(node)}</mark>;
+ }
+ 
+-function CodeRenderer({ node, styles, renderChildren }: RendererProps) {
++function CodeRenderer({ node, styles, parentType, renderChildren }: RendererProps) {
+   return (
+-    <code style={styles.code}>{node.content ?? renderChildren(node)}</code>
++    <code style={parentType === 'Link' ? { ...styles.code, color: 'inherit' } : styles.code}>{node.content ?? renderChildren(node)}</code>
+   );
+ }
+ 
+@@ -58,16 +58,25 @@ function LinkRenderer({
+   node,
+   style,
+   callbacks,
++  capabilities,
+   renderChildren,
+ }: RendererProps) {
+   const url = node.attributes?.url;
+ 
+   if (!url) return <>{renderChildren(node)}</>;
+ 
++  const isRecognizedLink = node.attributes?.recognizedLink === 'true';
++  const containsInlineCode = node.children?.some((child) => child.type === 'Code');
++  let sourceType: 'markdown' | 'text' | 'inline-code' = 'markdown';
++  if (isRecognizedLink) {
++    sourceType = containsInlineCode ? 'inline-code' : 'text';
++  }
++  const link = { url, sourceType };
++
+   const handleClick = (event: MouseEvent) => {
+     if (callbacks.onLinkPress) {
+       event.preventDefault();
+-      callbacks.onLinkPress({ url });
++      callbacks.onLinkPress(link);
+     }
+   };
+ 
+@@ -78,18 +87,27 @@ function LinkRenderer({
+     }
+   };
+ 
+-  return (
+-    <a
+-      href={url}
+-      style={linkStyleForUrl(style, url)}
+-      target="_blank"
+-      rel="noopener noreferrer"
+-      onClick={handleClick}
+-      onContextMenu={handleContextMenu}
+-    >
+-      {renderChildren(node)}
+-    </a>
+-  );
++  const anchorProps = {
++    href: url,
++    title: node.attributes?.title,
++    style: linkStyleForUrl(style, url),
++    target: '_blank',
++    rel: 'noopener noreferrer',
++    onClick: handleClick,
++    onContextMenu: handleContextMenu,
++  };
++  const CustomLink = capabilities.renderers?.link;
++  if (CustomLink) {
++    return (
++      <CustomLink
++        link={link}
++        anchorProps={anchorProps}
++      >
++        {renderChildren(node)}
++      </CustomLink>
++    );
++  }
++  return <a {...anchorProps}>{renderChildren(node)}</a>;
+ }
+ 
+ function LatexMathInlineRenderer({
+diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/InlineRenderers.js b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/InlineRenderers.js
+index c8311d4..d1e698c 100644
+--- a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/InlineRenderers.js
++++ b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/InlineRenderers.js
+@@ -92,10 +92,11 @@ function HighlightRenderer({
+ function CodeRenderer({
+   node,
+   styles,
++  parentType,
+   renderChildren
+ }) {
+   return /*#__PURE__*/_jsx("code", {
+-    style: styles.code,
++    style: parentType === 'Link' ? { ...styles.code, color: 'inherit' } : styles.code,
+     children: node.content ?? renderChildren(node)
+   });
+ }
+@@ -103,18 +104,24 @@ function LinkRenderer({
+   node,
+   style,
+   callbacks,
++  capabilities,
+   renderChildren
+ }) {
+   const url = node.attributes?.url;
+   if (!url) return /*#__PURE__*/_jsx(_Fragment, {
+     children: renderChildren(node)
+   });
++  const isRecognizedLink = node.attributes?.recognizedLink === 'true';
++  const containsInlineCode = node.children?.some(child => child.type === 'Code');
++  let sourceType = 'markdown';
++  if (isRecognizedLink) {
++    sourceType = containsInlineCode ? 'inline-code' : 'text';
++  }
++  const link = { url, sourceType };
+   const handleClick = event => {
+     if (callbacks.onLinkPress) {
+       event.preventDefault();
+-      callbacks.onLinkPress({
+-        url
+-      });
++      callbacks.onLinkPress(link);
+     }
+   };
+   const handleContextMenu = event => {
+@@ -125,15 +132,24 @@ function LinkRenderer({
+       });
+     }
+   };
+-  return /*#__PURE__*/_jsx("a", {
++  const anchorProps = {
+     href: url,
++    title: node.attributes?.title,
+     style: linkStyleForUrl(style, url),
+-    target: "_blank",
+-    rel: "noopener noreferrer",
++    target: '_blank',
++    rel: 'noopener noreferrer',
+     onClick: handleClick,
+-    onContextMenu: handleContextMenu,
+-    children: renderChildren(node)
+-  });
++    onContextMenu: handleContextMenu
++  };
++  const CustomLink = capabilities.renderers?.link;
++  if (CustomLink) {
++    return /*#__PURE__*/_jsx(CustomLink, {
++      link,
++      anchorProps,
++      children: renderChildren(node)
++    });
++  }
++  return /*#__PURE__*/_jsx("a", { ...anchorProps, children: renderChildren(node) });
+ }
+ function LatexMathInlineRenderer({
+   node,
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/CodeBlockContainerView.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/CodeBlockContainerView.kt
+index cba0825..21387f0 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/CodeBlockContainerView.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/segments/CodeBlockContainerView.kt
+@@ -21,7 +21,6 @@ import android.view.GestureDetector
+ import android.view.MotionEvent
+ import android.view.View
+ import android.widget.FrameLayout
+-import android.widget.HorizontalScrollView
+ import android.widget.ImageView
+ import androidx.appcompat.widget.AppCompatImageButton
+ import androidx.appcompat.widget.AppCompatTextView
+@@ -33,6 +32,7 @@ import com.swmansion.enriched.markdown.utils.common.CodeBlockHighlighter
+ import com.swmansion.enriched.markdown.utils.common.CodeBlockNode
+ import com.swmansion.enriched.markdown.utils.text.extensions.applyCodeBlockTextStyle
+ import com.swmansion.enriched.markdown.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
++import com.swmansion.enriched.markdown.views.ClaimingHorizontalScrollView
+ import com.swmansion.enriched.markdown.views.ContextMenuPopup
+ import com.swmansion.enriched.markdown.views.CopyGlyph
+ import kotlin.math.ceil
+@@ -102,7 +102,7 @@ class CodeBlockContainerView(
+     }
+ 
+   private val scrollView =
+-    HorizontalScrollView(context).apply {
++    ClaimingHorizontalScrollView(context).apply {
+       isHorizontalScrollBarEnabled = true
+       overScrollMode = View.OVER_SCROLL_NEVER
+       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/views/ClaimingHorizontalScrollView.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/views/ClaimingHorizontalScrollView.kt
+new file mode 100644
+index 0000000..d80ecbd
+--- /dev/null
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/views/ClaimingHorizontalScrollView.kt
+@@ -0,0 +1,41 @@
++package com.swmansion.enriched.markdown.views
++
++import android.content.Context
++import android.view.MotionEvent
++import android.view.ViewConfiguration
++import android.widget.HorizontalScrollView
++import kotlin.math.abs
++
++/** Claims overflowing blocks before ancestor gesture handlers can activate. */
++internal class ClaimingHorizontalScrollView(context: Context) : HorizontalScrollView(context) {
++  private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop
++  private var downX = 0f
++  private var downY = 0f
++  private var claimed = false
++
++  override fun dispatchTouchEvent(event: MotionEvent): Boolean {
++    if (event.actionMasked == MotionEvent.ACTION_DOWN) {
++      downX = event.x
++      downY = event.y
++      claimed = canScrollHorizontally(-1) || canScrollHorizontally(1)
++      if (claimed) parent.requestDisallowInterceptTouchEvent(true)
++    }
++
++    val handled = super.dispatchTouchEvent(event)
++    when (event.actionMasked) {
++      MotionEvent.ACTION_MOVE -> {
++        if (claimed) {
++          val dx = abs(event.x - downX)
++          val dy = abs(event.y - downY)
++          if (dy > dx && dy > touchSlop) {
++            // Release after native dispatch, which can itself disallow interception.
++            parent.requestDisallowInterceptTouchEvent(false)
++            claimed = false
++          }
++        }
++      }
++      MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> claimed = false
++    }
++    return handled
++  }
++}
+diff --git a/node_modules/react-native-enriched-markdown/ios/utils/ENRMHorizontalScrollView.h b/node_modules/react-native-enriched-markdown/ios/utils/ENRMHorizontalScrollView.h
+index a0c77f6..644e801 100644
+--- a/node_modules/react-native-enriched-markdown/ios/utils/ENRMHorizontalScrollView.h
++++ b/node_modules/react-native-enriched-markdown/ios/utils/ENRMHorizontalScrollView.h
+@@ -1,30 +1,7 @@
+ #import "ENRMUIKit.h"
+ 
+ /// Horizontal scroll view shared by code blocks, tables and display math.
+-///
+-/// A rightward pan that starts while the view is settled at its leading edge is
+-/// refused, so a full-width back gesture (react-native-screens
+-/// `fullScreenGestureEnabled`, iOS 26 content pop) can begin instead. Inward
+-/// pans, pans from inside the content, and pans during deceleration or bounce
+-/// scroll as usual. Cost: no bounce on a fresh rightward pan at the leading
+-/// edge. Left edge only; RTL is not handled. macOS keeps RCTUIScrollView.
+-///
+-/// TODO: move this decision to react-native-screens. RNSScreenStack already
+-/// inspects competing scroll-view pans (`shouldRequireFailureOfGestureRecognizer:`
+-/// on iOS 26, `shouldRecognizeSimultaneouslyWithGestureRecognizer:` before);
+-/// treating a scroll view settled at its leading edge as not competing would
+-/// cover every horizontal scroll view, keep the bounce when nothing can pop,
+-/// and handle RTL. Then this subclass is only needed without RNS.
++/// Keep the native scroll recognizer at the leading edge so enclosing sidebar
++/// gestures cannot take an outward drag that starts in an overflowing block.
+ @interface ENRMHorizontalScrollView : RCTUIScrollView
+ @end
+-
+-/// Decision behind `-gestureRecognizerShouldBegin:`, kept pure so it can be
+-/// tested without a live scroll view. `leadingBoundary` is the content offset
+-/// at the leading edge, i.e. `-adjustedContentInset.left`.
+-static inline BOOL ENRMShouldYieldOutwardPan(CGFloat contentOffsetX, CGFloat leadingBoundary, BOOL decelerating,
+-                                             CGPoint velocity)
+-{
+-  BOOL outward = velocity.x > fabs(velocity.y);
+-  BOOL settledAtLeadingEdge = !decelerating && fabs(contentOffsetX - leadingBoundary) <= 0.5;
+-  return outward && settledAtLeadingEdge;
+-}
+diff --git a/node_modules/react-native-enriched-markdown/ios/utils/ENRMHorizontalScrollView.m b/node_modules/react-native-enriched-markdown/ios/utils/ENRMHorizontalScrollView.m
+index b98d10c..b645629 100644
+--- a/node_modules/react-native-enriched-markdown/ios/utils/ENRMHorizontalScrollView.m
++++ b/node_modules/react-native-enriched-markdown/ios/utils/ENRMHorizontalScrollView.m
+@@ -1,17 +1,4 @@
+ #import "ENRMHorizontalScrollView.h"
+ 
+ @implementation ENRMHorizontalScrollView
+-
+-#if !TARGET_OS_OSX
+-- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
+-{
+-  if (gestureRecognizer == self.panGestureRecognizer &&
+-      ENRMShouldYieldOutwardPan(self.contentOffset.x, -self.adjustedContentInset.left, self.isDecelerating,
+-                                [self.panGestureRecognizer velocityInView:self])) {
+-    return NO;
+-  }
+-  return [super gestureRecognizerShouldBegin:gestureRecognizer];
+-}
+-#endif
+-
+ @end
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/MeasurementSizeCache.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/MeasurementSizeCache.kt
+new file mode 100644
+index 0000000..11911c8
+--- /dev/null
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/MeasurementSizeCache.kt
+@@ -0,0 +1,31 @@
++package com.swmansion.enriched.markdown
++
++/** Size-only cache: no views, spans, Contexts or callbacks survive unmount. */
++internal class MeasurementSizeCache(private val capacity: Int = 512) {
++  data class Key(val markdown: String, val propsHash: Int, val width: Float, val splitTableSegments: Boolean)
++
++  private val sizes = LinkedHashMap<Key, Long>(16, 0.75f, true)
++
++  @Synchronized
++  fun get(key: Key): Long? = sizes[key]
++
++  @Synchronized
++  fun put(key: Key, size: Long) {
++    sizes[key] = size
++    if (sizes.size > capacity) {
++      val oldest = sizes.entries.iterator()
++      oldest.next()
++      oldest.remove()
++    }
++  }
++
++  @Synchronized
++  fun removeMatchingMarkdown(markdown: String) {
++    sizes.keys.removeAll { it.markdown == markdown }
++  }
++
++  @Synchronized
++  fun clear() {
++    sizes.clear()
++  }
++}
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/MeasurementStore.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/MeasurementStore.kt
+index f4840e4..e36b444 100644
+--- a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/MeasurementStore.kt
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/MeasurementStore.kt
+@@ -66,9 +66,11 @@ object MeasurementStore {
+     val spannable: CharSequence?,
+     val paintParams: PaintParams,
+     val markdownHash: Int,
++    val sizeKey: MeasurementSizeCache.Key? = null,
+   )
+ 
+   private val data = ConcurrentHashMap<Int, MeasurementParams>()
++  private val sizes = MeasurementSizeCache()
+ 
+   // Store font scaling settings per view ID
+   private data class FontScalingSettings(
+@@ -133,7 +135,10 @@ object MeasurementStore {
+           YogaMeasureOutput.getHeight(newSize) + PixelUtil.toDIPFromPixel(trailingMarginBottomPx),
+         )
+     }
+-    data[id] = MeasurementParams(width, newSize, spannable, paintParams, existingHash)
++    if (oldSize != newSize) {
++      cached?.sizeKey?.let { sizes.removeMatchingMarkdown(it.markdown) }
++    }
++    data[id] = MeasurementParams(width, newSize, spannable, paintParams, existingHash, cached?.sizeKey)
+     return oldSize != newSize
+   }
+ 
+@@ -144,7 +149,7 @@ object MeasurementStore {
+   }
+ 
+   fun invalidate(id: Int) {
+-    data.remove(id)
++    data.remove(id)?.sizeKey?.let { sizes.removeMatchingMarkdown(it.markdown) }
+   }
+ 
+   // Content-box width (px) the measure pass last wrapped at; the display view insets to match (#805).
+@@ -212,7 +217,7 @@ object MeasurementStore {
+     val previous = fontScalingSettings[viewId]
+     fontScalingSettings[viewId] = FontScalingSettings(allowFontScaling, maxFontSizeMultiplier)
+     if (previous != null && (previous.allowFontScaling != allowFontScaling || previous.maxFontSizeMultiplier != maxFontSizeMultiplier)) {
+-      data.remove(viewId)
++      invalidate(viewId)
+     }
+   }
+ 
+@@ -285,7 +290,43 @@ object MeasurementStore {
+ 
+     val fontScale = checkAndUpdateFontScale(context, allowFontScaling, maxFontSizeMultiplier)
+ 
+-    // Split measurement always goes through the full measure path (no spannable caching)
++    // Use resolved layout settings, including values supplied by native setters.
++    var layoutHash = computePropsHash(props, allowFontScaling, fontScale, maxFontSizeMultiplier)
++    layoutHash = 31 * layoutHash + resolveBreakStrategy(id)
++    layoutHash = 31 * layoutHash + resolveMaxLines(id)
++    layoutHash = 31 * layoutHash + (resolveEllipsize(id)?.hashCode() ?: 0)
++    layoutHash = 31 * layoutHash + props.getBooleanOrDefault("streamingAnimation", false).hashCode()
++    layoutHash = 31 * layoutHash + (id?.let { streamingTableModes[it] } ?: TableStreamingMode.PROGRESSIVE).hashCode()
++    layoutHash = 31 * layoutHash + (id?.let { streamingCodeBlockModes[it] } ?: CodeBlockStreamingMode.PROGRESSIVE).hashCode()
++    layoutHash = 31 * layoutHash + context.resources.displayMetrics.density.toBits()
++    val key = MeasurementSizeCache.Key(props.getStringOrDefault("markdown", ""), layoutHash, width, splitTableSegments)
++    val cached = id?.let { data[it] }
++    if (cached?.sizeKey == key) return cached.cachedSize
++    sizes.get(key)?.let { size ->
++      if (id != null) {
++        data[id] = MeasurementParams(width, size, null, PaintParams(Typeface.DEFAULT, 0f), 0, key)
++      }
++      return size
++    }
++
++    val size = measureUncached(context, id, width, props, splitTableSegments, allowFontScaling, fontScale, maxFontSizeMultiplier)
++    sizes.put(key, size)
++    if (id != null) {
++      data.computeIfPresent(id) { _, measured -> measured.copy(sizeKey = key) }
++    }
++    return size
++  }
++
++  private fun measureUncached(
++    context: Context,
++    id: Int?,
++    width: Float,
++    props: ReadableMap?,
++    splitTableSegments: Boolean,
++    allowFontScaling: Boolean,
++    fontScale: Float,
++    maxFontSizeMultiplier: Float,
++  ): Long {
+     if (splitTableSegments) {
+       return measureAndCacheSplit(context, id, width, props, allowFontScaling, fontScale, maxFontSizeMultiplier)
+     }
+@@ -295,7 +336,7 @@ object MeasurementStore {
+ 
+     val currentHash = computePropsHash(props, allowFontScaling, fontScale, maxFontSizeMultiplier)
+ 
+-    if (cached.markdownHash != currentHash) {
++    if (cached.markdownHash != currentHash || cached.spannable == null) {
+       return measureAndCache(context, safeId, width, props, allowFontScaling, fontScale, maxFontSizeMultiplier)
+     }
+ 
+@@ -332,8 +373,11 @@ object MeasurementStore {
+     val imageRequestHeaders = parseImageRequestHeaders(props.getArrayOrNull("imageRequestHeaders"))
+     val linkPillContent = parseLinkPillContent(props.getArrayOrNull("linkPillContent"))
+     var result = markdown.hashCode()
+-    result = 31 * result + (styleMap?.hashCode() ?: 0)
+-    result = 31 * result + (md4cFlagsMap?.hashCode() ?: 0)
++    // ReadableNativeArray hashes its backing array identity, not its values.
++    result = 31 * result + (styleMap?.toHashMap()?.hashCode() ?: 0)
++    result = 31 * result + (md4cFlagsMap?.toHashMap()?.hashCode() ?: 0)
++    result = 31 * result + props.getBooleanOrDefault("isGFM", false).hashCode()
++    result = 31 * result + props.getStringOrDefault("textBreakStrategy", BreakStrategyUtils.DEFAULT_STRATEGY).hashCode()
+     result = 31 * result + parseLinkRecognition(props.getMapOrNull("linkRecognition")).hashCode()
+     result = 31 * result + fontScale.toBits()
+     result = 31 * result + allowFontScaling.hashCode()
+@@ -356,6 +400,7 @@ object MeasurementStore {
+       if (lastKnownFontScale != 1.0f) {
+         lastKnownFontScale = 1.0f
+         data.clear()
++        sizes.clear()
+       }
+       return 1.0f
+     }
+@@ -368,6 +413,7 @@ object MeasurementStore {
+     if (currentFontScale != lastKnownFontScale) {
+       lastKnownFontScale = currentFontScale
+       data.clear()
++      sizes.clear()
+     }
+     return currentFontScale
+   }
+diff --git a/node_modules/react-native-enriched-markdown/android/src/test/java/com/swmansion/enriched/markdown/MeasurementSizeCacheTest.kt b/node_modules/react-native-enriched-markdown/android/src/test/java/com/swmansion/enriched/markdown/MeasurementSizeCacheTest.kt
+new file mode 100644
+index 0000000..b3394c4
+--- /dev/null
++++ b/node_modules/react-native-enriched-markdown/android/src/test/java/com/swmansion/enriched/markdown/MeasurementSizeCacheTest.kt
+@@ -0,0 +1,51 @@
++package com.swmansion.enriched.markdown
++
++import org.junit.Assert.*
++import org.junit.Test
++
++class MeasurementSizeCacheTest {
++  private fun key(markdown: String = "hello", propsHash: Int = 1, width: Float = 320f) =
++    MeasurementSizeCache.Key(markdown, propsHash, width, true)
++
++  @Test fun reusesSizeAcrossIndependentEqualKeys() {
++    val cache = MeasurementSizeCache(2)
++    cache.put(key(), 42L)
++    assertEquals(42L, cache.get(key()))
++    assertNull(cache.get(key(propsHash = 2)))
++    assertNull(cache.get(key(width = 321f)))
++    assertNull(cache.get(key().copy(splitTableSegments = false)))
++  }
++
++  @Test fun comparesMarkdownEvenWhenItsHashCollides() {
++    val cache = MeasurementSizeCache(2)
++    assertEquals("Aa".hashCode(), "BB".hashCode())
++    cache.put(key("Aa"), 42L)
++    assertNull(cache.get(key("BB")))
++  }
++
++  @Test fun evictsLeastRecentlyUsedSize() {
++    val cache = MeasurementSizeCache(2)
++    cache.put(key("one"), 1L)
++    cache.put(key("two"), 2L)
++    assertEquals(1L, cache.get(key("one")))
++    cache.put(key("three"), 3L)
++    assertNull(cache.get(key("two")))
++    assertEquals(1L, cache.get(key("one")))
++    assertEquals(3L, cache.get(key("three")))
++  }
++
++  @Test fun invalidatesAllWidthsAndPropsForChangedContent() {
++    val cache = MeasurementSizeCache(4)
++    cache.put(key(), 1L)
++    cache.put(key(width = 640f), 2L)
++    cache.put(key(propsHash = 2), 3L)
++    cache.put(key("other"), 4L)
++    cache.removeMatchingMarkdown("hello")
++    assertNull(cache.get(key()))
++    assertNull(cache.get(key(width = 640f)))
++    assertNull(cache.get(key(propsHash = 2)))
++    assertEquals(4L, cache.get(key("other")))
++    cache.clear()
++    assertNull(cache.get(key("other")))
++  }
++}
+diff --git a/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/MarkdownRenderDispatch.kt b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/MarkdownRenderDispatch.kt
+new file mode 100644
+--- /dev/null
++++ b/node_modules/react-native-enriched-markdown/android/src/main/java/com/swmansion/enriched/markdown/MarkdownRenderDispatch.kt
+@@ -0,0 +1,9 @@
++package com.swmansion.enriched.markdown
++
++import java.util.concurrent.Executor
++
++// Keep populated views in step with Fabric geometry when streaming blocks move or collapse.
++// First mounts retain worker preparation so large history rows do not parse on the UI thread.
++internal fun dispatchMarkdownRender(hasContent: Boolean, executor: Executor, render: () -> Unit) {
++  if (hasContent) render() else executor.execute(render)
++}
+diff --git a/node_modules/react-native-enriched-markdown/android/src/test/java/com/swmansion/enriched/markdown/MarkdownRenderDispatchTest.kt b/node_modules/react-native-enriched-markdown/android/src/test/java/com/swmansion/enriched/markdown/MarkdownRenderDispatchTest.kt
+new file mode 100644
+--- /dev/null
++++ b/node_modules/react-native-enriched-markdown/android/src/test/java/com/swmansion/enriched/markdown/MarkdownRenderDispatchTest.kt
+@@ -0,0 +1,46 @@
++package com.swmansion.enriched.markdown
++
++import java.util.concurrent.CountDownLatch
++import java.util.concurrent.Executors
++import java.util.concurrent.TimeUnit
++import org.junit.Assert.*
++import org.junit.Test
++
++class MarkdownRenderDispatchTest {
++  @Test fun populatedViewUpdatesBeforeReturningEvenWithBusyWorker() {
++    val executor = Executors.newSingleThreadExecutor()
++    val release = CountDownLatch(1)
++    val started = CountDownLatch(1)
++    try {
++      executor.execute { started.countDown(); release.await() }
++      assertTrue(started.await(5, TimeUnit.SECONDS))
++      val caller = Thread.currentThread()
++      var rendered = false
++      dispatchMarkdownRender(true, executor) {
++        assertSame(caller, Thread.currentThread())
++        rendered = true
++      }
++      assertTrue(rendered)
++    } finally {
++      release.countDown()
++      executor.shutdownNow()
++    }
++  }
++
++  @Test fun firstMountPreparesOnWorker() {
++    val executor = Executors.newSingleThreadExecutor()
++    val finished = CountDownLatch(1)
++    val caller = Thread.currentThread()
++    var worker: Thread? = null
++    try {
++      dispatchMarkdownRender(false, executor) {
++        worker = Thread.currentThread()
++        finished.countDown()
++      }
++      assertTrue(finished.await(5, TimeUnit.SECONDS))
++      assertNotSame(caller, worker)
++    } finally {
++      executor.shutdownNow()
++    }
++  }
++}
diff --git a/patches/react-native-markdown-display+7.0.2.patch b/patches/react-native-markdown-display+7.0.2.patch
deleted file mode 100644
index ad8ac0bf66..0000000000
--- a/patches/react-native-markdown-display+7.0.2.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/node_modules/react-native-markdown-display/src/lib/AstRenderer.js b/node_modules/react-native-markdown-display/src/lib/AstRenderer.js
-index 608e945..edafe12 100644
---- a/node_modules/react-native-markdown-display/src/lib/AstRenderer.js
-+++ b/node_modules/react-native-markdown-display/src/lib/AstRenderer.js
-@@ -1,6 +1,5 @@
- import {StyleSheet} from 'react-native';
- 
--import getUniqueID from './util/getUniqueID';
- import convertAdditionalStyles from './util/convertAdditionalStyles';
- 
- import textStyleProps from './data/textStyleProps';
-@@ -180,7 +179,7 @@ export default class AstRenderer {
-    * @return {*}
-    */
-   render = (nodes) => {
--    const root = {type: 'body', key: getUniqueID(), children: nodes};
-+    const root = {type: 'body', key: 'rnmr_root', children: nodes};
-     return this.renderNode(root, [], true);
-   };
- }
-diff --git a/node_modules/react-native-markdown-display/src/lib/util/tokensToAST.js b/node_modules/react-native-markdown-display/src/lib/util/tokensToAST.js
-index b0ed265..68e2150 100644
---- a/node_modules/react-native-markdown-display/src/lib/util/tokensToAST.js
-+++ b/node_modules/react-native-markdown-display/src/lib/util/tokensToAST.js
-@@ -1,4 +1,3 @@
--import getUniqueID from './getUniqueID';
- import getTokenTypeByToken from './getTokenTypeByToken';
- 
- /**
-@@ -7,9 +6,10 @@ import getTokenTypeByToken from './getTokenTypeByToken';
-  * @param {number} tokenIndex
-  * @return {{type: string, content, tokenIndex: *, index: number, attributes: {}, children: *}}
-  */
--function createNode(token, tokenIndex) {
-+function createNode(token, tokenIndex, parentKey) {
-   const type = getTokenTypeByToken(token);
-   const content = token.content;
-+  const keyPath = parentKey ? `${parentKey}.${tokenIndex}` : `${tokenIndex}`;
- 
-   let attributes = {};
- 
-@@ -27,12 +27,12 @@ function createNode(token, tokenIndex) {
-     sourceMeta: token.meta,
-     block: token.block,
-     markup: token.markup,
--    key: getUniqueID() + '_' + type,
-+    key: `rnmr_${keyPath}_${type}`,
-     content,
-     tokenIndex,
-     index: 0,
-     attributes,
--    children: tokensToAST(token.children),
-+    children: tokensToAST(token.children, keyPath),
-   };
- }
- 
-@@ -41,7 +41,7 @@ function createNode(token, tokenIndex) {
-  * @param {Array<{type: string, tag:string, content: string, children: *, attrs: Array}>}tokens
-  * @return {Array}
-  */
--export default function tokensToAST(tokens) {
-+export default function tokensToAST(tokens, parentKey = '') {
-   let stack = [];
-   let children = [];
- 
-@@ -51,7 +51,7 @@ export default function tokensToAST(tokens) {
- 
-   for (let i = 0; i < tokens.length; i++) {
-     const token = tokens[i];
--    const astNode = createNode(token, i);
-+    const astNode = createNode(token, i, parentKey);
- 
-     if (
-       !(
diff --git a/scripts/postinstall-patches.mjs b/scripts/postinstall-patches.mjs
index 3eeafc6371..a571614c5a 100644
--- a/scripts/postinstall-patches.mjs
+++ b/scripts/postinstall-patches.mjs
@@ -9,8 +9,9 @@ import { join, relative } from "node:path";
 // the patch's node_modules/... paths relative to its working directory.
 const patchedPackages = [
   {
-    nodeModulesPath: "node_modules/react-native-markdown-display",
-    patchPrefix: "react-native-markdown-display+",
+    nodeModulesPath: "packages/app/node_modules/react-native-enriched-markdown",
+    patchPrefix: "react-native-enriched-markdown+",
+    cwd: "packages/app",
   },
   // Remove after react-native-unistyles ships
   // https://github.com/jpudysz/react-native-unistyles/pull/1203.

From 0d7a234e6381576d32015dbd54469497708e416f Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 21:10:42 +0700
Subject: [PATCH 208/270] perf(app): preserve unchanged sidebar workspace
 projections (#7157)

Reopening a retained sidebar rebuilt its entry collection and invalidated every project row despite unchanged workspace data. Preserve collection identity as well as row identity, while keeping membership and ordering changes observable.
---
 .../sidebar-workspaces-view-model.test.ts     | 51 +++++++++++++++++++
 .../hooks/sidebar-workspaces-view-model.ts    | 21 +++++---
 2 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/hooks/sidebar-workspaces-view-model.test.ts b/packages/app/src/hooks/sidebar-workspaces-view-model.test.ts
index 637d3a035b..1bc4cf2135 100644
--- a/packages/app/src/hooks/sidebar-workspaces-view-model.test.ts
+++ b/packages/app/src/hooks/sidebar-workspaces-view-model.test.ts
@@ -403,6 +403,57 @@ describe("shared sidebar workspace model", () => {
     expect(model.projectNamesByViewKey).toEqual(new Map([["getpaseo/paseo", "getpaseo/paseo"]]));
   });
 
+  it("preserves the collection when a retained sidebar reconnects to unchanged entries", () => {
+    const model = buildSidebarWorkspacePlacementModel({
+      projects: [project({ projectKey: "project", workspaceKeys: ["srv:one", "srv:two"] })],
+    });
+    const one = workspace({
+      id: "one",
+      name: "one",
+      projectId: "project",
+      projectDisplayName: "project",
+    });
+    const two = workspace({
+      id: "two",
+      name: "two",
+      projectId: "project",
+      projectDisplayName: "project",
+    });
+    const sessions = [
+      {
+        serverId: "srv",
+        workspaceAgentActivity: new Map(),
+        workspaces: new Map([
+          ["one", one],
+          ["two", two],
+        ]),
+      },
+    ];
+    const previousEntries = buildSidebarWorkspaceEntries({
+      placements: model.workspaces,
+      sessions,
+    });
+    expect(
+      buildSidebarWorkspaceEntries({
+        placements: model.workspaces,
+        sessions,
+        previousEntries,
+      }),
+    ).toBe(previousEntries);
+    const reordered = buildSidebarWorkspaceEntries({
+      placements: model.workspaces.toReversed(),
+      sessions,
+      previousEntries,
+    });
+    expect([...reordered.keys()]).toEqual(["srv:two", "srv:one"]);
+    const removed = buildSidebarWorkspaceEntries({
+      placements: model.workspaces.slice(0, 1),
+      sessions,
+      previousEntries,
+    });
+    expect([...removed.keys()]).toEqual(["srv:one"]);
+  });
+
   it("preserves unchanged row identities when another workspace updates", () => {
     const model = buildSidebarWorkspacePlacementModel({
       projects: [project({ projectKey: "project", workspaceKeys: ["srv:one", "srv:two"] })],
diff --git a/packages/app/src/hooks/sidebar-workspaces-view-model.ts b/packages/app/src/hooks/sidebar-workspaces-view-model.ts
index 24ecc34461..e004c3fb89 100644
--- a/packages/app/src/hooks/sidebar-workspaces-view-model.ts
+++ b/packages/app/src/hooks/sidebar-workspaces-view-model.ts
@@ -369,13 +369,15 @@ export function buildSidebarWorkspaceEntries(input: {
   sessions: SidebarWorkspaceSession[];
   pendingCreateAttempts?: Record<string, PendingCreateAttempt>;
   previousEntries?: ReadonlyMap<string, SidebarWorkspaceEntry>;
-}): Map<string, SidebarWorkspaceEntry> {
+}): ReadonlyMap<string, SidebarWorkspaceEntry> {
   if (input.placements.length === 0 || input.sessions.length === 0) {
     return new Map();
   }
 
   const sessionByServerId = new Map(input.sessions.map((session) => [session.serverId, session]));
   const entries = new Map<string, SidebarWorkspaceEntry>();
+  const previousKeys = input.previousEntries?.keys();
+  let unchanged = input.previousEntries !== undefined;
 
   for (const placement of input.placements) {
     const session = sessionByServerId.get(placement.serverId);
@@ -395,15 +397,22 @@ export function buildSidebarWorkspaceEntries(input: {
       workspaceAgentActivity: session.workspaceAgentActivity,
     });
     const previousEntry = input.previousEntries?.get(placement.workspaceKey);
-    entries.set(
-      placement.workspaceKey,
+    const nextEntry =
       previousEntry && areSidebarWorkspaceEntriesEqual(previousEntry, entry)
         ? previousEntry
-        : entry,
-    );
+        : entry;
+    entries.set(placement.workspaceKey, nextEntry);
+    unchanged =
+      previousKeys?.next().value === placement.workspaceKey &&
+      previousEntry === nextEntry &&
+      unchanged;
   }
 
-  return entries;
+  // Resuming a retained sidebar must not invalidate its project/filter projections
+  // when the directory has not changed while it was hidden.
+  return unchanged && input.previousEntries?.size === entries.size
+    ? input.previousEntries
+    : entries;
 }
 
 function areSidebarWorkspaceEntriesEqual(

From 64693f21cf564389a0b74b57777267761e27f71c Mon Sep 17 00:00:00 2001
From: Jiawen Geng <technicalcute@gmail.com>
Date: Fri, 16 Oct 2026 22:56:39 +0800
Subject: [PATCH 209/270] fix(cursor): show plan usage in Cursor agents'
 context details (#6353)

Cursor agents never showed plan usage cards under their context details.
ACP sessions had no usageSession(), and the Cursor usage source only ran
global discovery, so per-agent discovery always came back empty.

Cursor ACP sessions now report a usage session (provider "cursor" plus
their launch env). The Cursor usage source resolves the cursor-agent
auth.json for that env. Sessions on CURSOR_API_KEY or CURSOR_AUTH_TOKEN,
the in-memory store, or the macOS Keychain (the default there) report
no login.
---
 .../src/server/agent/providers/acp-agent.ts   | 27 +++++++
 .../agent/providers/cursor-acp-agent.test.ts  | 71 ++++++++++++++++++
 .../agent/providers/cursor-acp-agent.ts       |  1 +
 .../agent/providers/generic-acp-agent.ts      |  2 +
 plugins/cursor-usage-source/index.server.ts   |  4 +-
 .../cursor-usage-source/server/usage.test.ts  | 74 ++++++++++++++++++-
 plugins/cursor-usage-source/server/usage.ts   | 29 ++++++++
 public-docs/plugins/reference.md              |  5 +-
 8 files changed, 209 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/server/agent/providers/acp-agent.ts b/packages/server/src/server/agent/providers/acp-agent.ts
index 3b61fcb863..823f941de1 100644
--- a/packages/server/src/server/agent/providers/acp-agent.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.ts
@@ -88,6 +88,7 @@ import {
   type AgentStreamEvent,
   type AgentTimelineItem,
   type AgentUsage,
+  type AgentUsageSession,
   type FetchCatalogOptions,
   type ProviderRefreshContext,
   type ImportableProviderSession,
@@ -112,6 +113,7 @@ import {
 import { importSessionFromPersistence } from "../provider-session-import.js";
 import {
   checkProviderLaunchAvailable,
+  createProviderEnv,
   createProviderEnvSpec,
   resolveProviderLaunch,
   type ProviderRuntimeSettings,
@@ -456,6 +458,8 @@ export type ACPCatalogModelResolver = (
 
 interface ACPAgentClientOptions {
   provider: string;
+  // Provider id usage sources match a session against; ACP sessions without one report no usage.
+  usageProvider?: string;
   logger: Logger;
   runtimeSettings?: ProviderRuntimeSettings;
   defaultCommand: [string, ...string[]];
@@ -488,6 +492,7 @@ interface ACPAgentClientOptions {
 
 interface ACPAgentSessionOptions {
   provider: string;
+  usageProvider?: string;
   logger: Logger;
   runtimeSettings?: ProviderRuntimeSettings;
   defaultCommand: [string, ...string[]];
@@ -910,6 +915,7 @@ function isACPCreateConfigUnattended(input: AgentCreateConfigUnattendedInput): b
 
 export class ACPAgentClient implements AgentClient {
   readonly provider: string;
+  private readonly usageProvider?: string;
   readonly capabilities: AgentCapabilityFlags;
   readonly resolveCreateConfig = resolveACPCreateConfig;
   readonly isCreateConfigUnattended = isACPCreateConfigUnattended;
@@ -951,6 +957,7 @@ export class ACPAgentClient implements AgentClient {
 
   constructor(options: ACPAgentClientOptions) {
     this.provider = options.provider;
+    this.usageProvider = options.usageProvider;
     this.terminateProcess = options.terminateProcess ?? terminateWithTreeKill;
     this.capabilities = options.capabilities ?? DEFAULT_ACP_CAPABILITIES;
     this.logger = options.logger.child({
@@ -989,6 +996,7 @@ export class ACPAgentClient implements AgentClient {
       { ...config, provider: this.provider },
       {
         provider: this.provider,
+        usageProvider: this.usageProvider,
         logger: this.logger,
         runtimeSettings: this.runtimeSettings,
         defaultCommand: this.defaultCommand,
@@ -1046,6 +1054,7 @@ export class ACPAgentClient implements AgentClient {
     const providerOptions = ACPProviderOptionsSchema.parse(mergedConfig.providerOptions ?? {});
     const session = new ACPAgentSession(mergedConfig, {
       provider: this.provider,
+      usageProvider: this.usageProvider,
       logger: this.logger,
       runtimeSettings: this.runtimeSettings,
       defaultCommand: this.defaultCommand,
@@ -1715,6 +1724,9 @@ export class ACPAgentSession implements AgentSession, ACPClient {
   ) => Promise<void>;
   private readonly agentId?: string;
   private readonly launchEnv?: Record<string, string>;
+  private readonly usageProvider?: string;
+  private readonly usageSessionKey = randomUUID();
+  private readonly harnessEnvironment: Record<string, string>;
   private readonly subscribers = new Set<(event: AgentStreamEvent) => void>();
   private readonly pendingPermissions = new Map<string, PendingPermission>();
   private pendingUserMessage: PendingUserMessage | null = null;
@@ -1778,6 +1790,11 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     this.availableModes = options.defaultModes;
     this.agentId = options.agentId;
     this.launchEnv = options.launchEnv;
+    this.usageProvider = options.usageProvider;
+    this.harnessEnvironment = createProviderEnv({
+      runtimeSettings: options.runtimeSettings,
+      overlays: [options.launchEnv],
+    });
     this.initialHandle = options.handle;
     this.resumePurpose = options.resumePurpose ?? "interactive";
     this.config = { ...config, provider: options.provider };
@@ -1794,6 +1811,16 @@ export class ACPAgentSession implements AgentSession, ACPClient {
     return this.sessionId;
   }
 
+  usageSession(): AgentUsageSession | null {
+    if (this.closed || !this.usageProvider) return null;
+    return {
+      provider: this.usageProvider,
+      model: this.currentModel ?? undefined,
+      env: this.harnessEnvironment,
+      sessionKey: this.usageSessionKey,
+    };
+  }
+
   async initializeNewSession(): Promise<void> {
     try {
       const spawned = await this.spawnProcess();
diff --git a/packages/server/src/server/agent/providers/cursor-acp-agent.test.ts b/packages/server/src/server/agent/providers/cursor-acp-agent.test.ts
index bd43d913e8..97b4c1cc86 100644
--- a/packages/server/src/server/agent/providers/cursor-acp-agent.test.ts
+++ b/packages/server/src/server/agent/providers/cursor-acp-agent.test.ts
@@ -1,10 +1,14 @@
 import type { SessionConfigOption } from "@agentclientprotocol/sdk";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
 import { describe, expect, test, vi } from "vitest";
 
 import { ACPAgentSession } from "./acp-agent.js";
 import type { SpawnedACPProcess, SessionStateResponse } from "./acp-agent.js";
 import type { AgentSessionConfig } from "../agent-sdk-types.js";
 import { CURSOR_FAST_FEATURE_OPTION, CursorACPAgentClient } from "./cursor-acp-agent.js";
+import { GenericACPAgentClient } from "./generic-acp-agent.js";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
 
 function captureWarnings(): {
@@ -355,3 +359,70 @@ describe("CursorACPAgentClient session start", () => {
     await expect(session.initializeNewSession()).rejects.toThrow("Invalid params");
   });
 });
+
+describe("CursorACPAgentClient usage session", () => {
+  test("matches usage sources as cursor, with the agent's provider and launch env", async () => {
+    await withFakeACPAgent(async (command, cwd) => {
+      const client = new CursorACPAgentClient({
+        logger: createTestLogger(),
+        command,
+        env: { XDG_CONFIG_HOME: "/profile/config" },
+      });
+      const session = await client.createSession(
+        { provider: "acp", cwd },
+        { agentId: "agent-1", env: { HOME: "/agent/home" } },
+      );
+      const usage = session.usageSession?.();
+      expect(usage).toMatchObject({
+        provider: "cursor",
+        env: { XDG_CONFIG_HOME: "/profile/config", HOME: "/agent/home" },
+      });
+      expect(session.usageSession?.()?.sessionKey).toBe(usage?.sessionKey);
+      await session.close();
+      expect(session.usageSession?.()).toBeNull();
+    });
+  });
+
+  test("leaves other ACP agents without a usage session", async () => {
+    await withFakeACPAgent(async (command, cwd) => {
+      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
+      const session = await client.createSession({ provider: "acp", cwd });
+      try {
+        expect(session.usageSession?.()).toBeNull();
+      } finally {
+        await session.close();
+      }
+    });
+  });
+});
+
+async function withFakeACPAgent(
+  run: (command: [string, ...string[]], cwd: string) => Promise<void>,
+): Promise<void> {
+  const testDir = await mkdtemp(path.join(tmpdir(), "paseo-cursor-usage-"));
+  try {
+    const scriptPath = path.join(testDir, "fake-acp-agent.cjs");
+    await writeFile(scriptPath, fakeACPAgentScript, "utf8");
+    await run([process.execPath, scriptPath], testDir);
+  } finally {
+    await rm(testDir, { recursive: true, force: true });
+  }
+}
+
+const fakeACPAgentScript = `
+const readline = require("node:readline");
+const rl = readline.createInterface({ input: process.stdin });
+function write(message) {
+  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", ...message }) + "\\n");
+}
+rl.on("line", (line) => {
+  const message = JSON.parse(line);
+  if (message.method === "initialize") {
+    write({ id: message.id, result: { protocolVersion: message.params?.protocolVersion ?? 1, agentCapabilities: {} } });
+  } else if (message.method === "session/new") {
+    write({ id: message.id, result: { sessionId: "session-1" } });
+  } else if (message.id !== undefined) {
+    write({ id: message.id, result: {} });
+  }
+});
+`;
diff --git a/packages/server/src/server/agent/providers/cursor-acp-agent.ts b/packages/server/src/server/agent/providers/cursor-acp-agent.ts
index 0b5b9ac4ec..4c5cd8a9c3 100644
--- a/packages/server/src/server/agent/providers/cursor-acp-agent.ts
+++ b/packages/server/src/server/agent/providers/cursor-acp-agent.ts
@@ -92,6 +92,7 @@ export class CursorACPAgentClient extends GenericACPAgentClient {
       env: options.env,
       providerId: options.providerId,
       label: options.label,
+      usageProvider: "cursor",
       // cursor-agent publishes slash commands asynchronously via available_commands_update.
       waitForInitialCommands: true,
       initialCommandsWaitTimeoutMs: CURSOR_INITIAL_COMMANDS_WAIT_TIMEOUT_MS,
diff --git a/packages/server/src/server/agent/providers/generic-acp-agent.ts b/packages/server/src/server/agent/providers/generic-acp-agent.ts
index 5a14d99137..37db4d02dd 100644
--- a/packages/server/src/server/agent/providers/generic-acp-agent.ts
+++ b/packages/server/src/server/agent/providers/generic-acp-agent.ts
@@ -22,6 +22,7 @@ interface GenericACPAgentClientOptions {
   env?: Record<string, string>;
   providerId?: string;
   label?: string;
+  usageProvider?: string;
   waitForInitialCommands?: boolean;
   initialCommandsWaitTimeoutMs?: number;
   diagnosticPhaseTimeoutMs?: number;
@@ -41,6 +42,7 @@ export class GenericACPAgentClient extends ACPAgentClient {
   constructor(options: GenericACPAgentClientOptions) {
     super({
       provider: "acp",
+      usageProvider: options.usageProvider,
       logger: options.logger,
       runtimeSettings: {
         env: options.env,
diff --git a/plugins/cursor-usage-source/index.server.ts b/plugins/cursor-usage-source/index.server.ts
index 5b19939833..a357b3d1bb 100644
--- a/plugins/cursor-usage-source/index.server.ts
+++ b/plugins/cursor-usage-source/index.server.ts
@@ -1,6 +1,6 @@
 import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { inputSchema } from "./shared/input.js";
-import { fetchUsage, discover } from "./server/usage.js";
+import { fetchUsage, discover, discoverSession } from "./server/usage.js";
 
 export default function contribute(server: PluginServerContext) {
   server.registerUsageSource({
@@ -8,7 +8,7 @@ export default function contribute(server: PluginServerContext) {
     label: "Cursor",
     icon: "icon.svg",
     input: inputSchema,
-    discover: (scope) => (scope.kind === "global" ? discover() : Promise.resolve([])),
+    discover: (scope) => (scope.kind === "global" ? discover() : discoverSession(scope)),
     fetch: fetchUsage,
   });
   return () => {};
diff --git a/plugins/cursor-usage-source/server/usage.test.ts b/plugins/cursor-usage-source/server/usage.test.ts
index 21cca3b192..91b657c264 100644
--- a/plugins/cursor-usage-source/server/usage.test.ts
+++ b/plugins/cursor-usage-source/server/usage.test.ts
@@ -3,7 +3,7 @@ import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { discover, fetchUsage } from "./usage.js";
+import { discover, discoverSession, fetchUsage } from "./usage.js";
 import type { UsageReport } from "@getpaseo/plugin/server/usage";
 
 // node:sqlite has no @types/node@20 typings; require it with a narrow local type.
@@ -256,6 +256,78 @@ describe("cursor usage source", () => {
     writeFileSync(join(directory, "state.vscdb"), "invalid database");
     expect(await discover()).toEqual([]);
   });
+
+  describe("session discovery", () => {
+    let sessionHome: string;
+    beforeEach(() => {
+      sessionHome = mkdtempSync(join(tmpdir(), "usage-session-home-"));
+    });
+    afterEach(() => {
+      rmSync(sessionHome, { recursive: true, force: true });
+    });
+    function cursorSession(env: Record<string, string>, provider = "cursor") {
+      return { kind: "session" as const, provider, env: { HOME: sessionHome, ...env } };
+    }
+    function writeAuthJson(path: string): void {
+      mkdirSync(join(path, ".."), { recursive: true });
+      writeFileSync(path, JSON.stringify({ accessToken: "session-token" }));
+    }
+
+    it("reads the login cursor-agent uses under the session's XDG_CONFIG_HOME", async () => {
+      const configHome = join(sessionHome, "xdg");
+      const authPath = join(configHome, "cursor", "auth.json");
+      writeAuthJson(authPath);
+      expect(
+        await discoverSession(cursorSession({ XDG_CONFIG_HOME: configHome }), "linux"),
+      ).toEqual([{ key: "default", input: { store: "file", locator: authPath } }]);
+    });
+
+    it("reads the login under the session's HOME, not the daemon's", async () => {
+      writeCursorAuthJson(homeDir, "daemon-token");
+      writeCursorAuthJson(sessionHome, "session-token");
+      expect(await discoverSession(cursorSession({}), "linux")).toEqual([
+        {
+          key: "default",
+          input: { store: "file", locator: join(sessionHome, ".config", "cursor", "auth.json") },
+        },
+      ]);
+    });
+
+    it("reads %APPDATA%/Cursor/auth.json on Windows", async () => {
+      const appData = join(sessionHome, "AppData", "Roaming");
+      const authPath = join(appData, "Cursor", "auth.json");
+      writeAuthJson(authPath);
+      expect(await discoverSession(cursorSession({ APPDATA: appData }), "win32")).toEqual([
+        { key: "default", input: { store: "file", locator: authPath } },
+      ]);
+    });
+
+    it("reads ~/.cursor/auth.json on macOS only when cursor-agent uses the file store", async () => {
+      const authPath = join(sessionHome, ".cursor", "auth.json");
+      writeAuthJson(authPath);
+      expect(await discoverSession(cursorSession({}), "darwin")).toEqual([]);
+      expect(
+        await discoverSession(cursorSession({ AGENT_CLI_CREDENTIAL_STORE: "file" }), "darwin"),
+      ).toEqual([{ key: "default", input: { store: "file", locator: authPath } }]);
+    });
+
+    it.each([
+      ["another provider", cursorSession({}, "claude")],
+      ["a CURSOR_API_KEY session", cursorSession({ CURSOR_API_KEY: "key" })],
+      ["a CURSOR_AUTH_TOKEN session", cursorSession({ CURSOR_AUTH_TOKEN: "token" })],
+      ["an in-memory credential store", cursorSession({ AGENT_CLI_CREDENTIAL_STORE: "memory" })],
+    ])("returns no login for %s", async (_scenario, scope) => {
+      writeCursorAuthJson(sessionHome, "session-token");
+      expect(await discoverSession(scope, "linux")).toEqual([]);
+    });
+
+    it("never falls back to the daemon's default stores", async () => {
+      writeCursorStateDb(homeDir, { "cursorAuth/accessToken": "desktop-token" });
+      writeCursorAuthJson(homeDir, "daemon-token");
+      process.env["CURSOR_ACCESS_TOKEN"] = "daemon-env-token";
+      expect(await discoverSession(cursorSession({}), "linux")).toEqual([]);
+    });
+  });
 });
 
 it("discovery returns a locator when fetch finds cursor credentials", async () => {
diff --git a/plugins/cursor-usage-source/server/usage.ts b/plugins/cursor-usage-source/server/usage.ts
index d313b1d739..c5d2ab1391 100644
--- a/plugins/cursor-usage-source/server/usage.ts
+++ b/plugins/cursor-usage-source/server/usage.ts
@@ -11,6 +11,7 @@ import {
   type UsageAccount,
   type UsageReport,
   type UsageBalance,
+  type UsageScope,
 } from "@getpaseo/plugin/server/usage";
 
 const ApiNumberSchema = z.coerce.number().finite();
@@ -209,6 +210,7 @@ async function readToken(input: UsageInput): Promise<string | undefined> {
       : await readCursorTokenFromAuthJson(input.locator);
   return token ?? undefined;
 }
+
 export async function discover(): Promise<UsageAccount[]> {
   const home = homedir();
   const candidates: UsageInput[] = ["CURSOR_ACCESS_TOKEN", "CURSOR_TOKEN"].map((locator) => ({
@@ -238,3 +240,30 @@ export async function discover(): Promise<UsageAccount[]> {
   for (const input of candidates) if (await readToken(input)) return [{ key: "default", input }];
   return [];
 }
+
+// Resolves the login a cursor-agent session runs on. The key matches global discovery so
+// the session's login joins the host's Cursor card instead of adding a second one.
+export async function discoverSession(
+  scope: Extract<UsageScope, { kind: "session" }>,
+  platform: NodeJS.Platform = process.platform,
+): Promise<UsageAccount[]> {
+  if (scope.provider !== "cursor") return [];
+  const locator = cursorAgentAuthPath(scope.env, platform);
+  if (!locator) return [];
+  const input: UsageInput = { store: "file", locator };
+  return (await readToken(input)) ? [{ key: "default", input }] : [];
+}
+
+// Mirrors cursor-agent's credential store. Env credentials win over the stored login and
+// can't be named by an input. AGENT_CLI_CREDENTIAL_STORE picks "file" or "memory"; by
+// default macOS keeps the login in the Keychain and other platforms in auth.json.
+function cursorAgentAuthPath(env: Record<string, string>, platform: NodeJS.Platform) {
+  if (env.CURSOR_API_KEY || env.CURSOR_AUTH_TOKEN) return null;
+  const store = env.AGENT_CLI_CREDENTIAL_STORE;
+  if (store === "memory" || (platform === "darwin" && store !== "file")) return null;
+  const home = env.HOME || env.USERPROFILE || homedir();
+  if (platform === "win32")
+    return join(env.APPDATA || join(home, "AppData", "Roaming"), "Cursor", "auth.json");
+  if (platform === "darwin") return join(home, ".cursor", "auth.json");
+  return join(env.XDG_CONFIG_HOME || join(home, ".config"), "cursor", "auth.json");
+}
diff --git a/public-docs/plugins/reference.md b/public-docs/plugins/reference.md
index 409bb3f5a6..525ffe1423 100644
--- a/public-docs/plugins/reference.md
+++ b/public-docs/plugins/reference.md
@@ -411,11 +411,14 @@ Built-in session routes:
 | Claude                 | `pi`, `omp` with `anthropic/…` model          | That harness's Anthropic login store                                                           |
 | Codex                  | `codex`                                       | `CODEX_HOME/auth.json`, or the default                                                         |
 | Codex                  | `pi`, `opencode`, `omp` with `openai/…` model | That harness's OpenAI login store                                                              |
+| Cursor                 | `cursor`                                      | cursor-agent's `auth.json` for that session's `XDG_CONFIG_HOME`, `APPDATA`, or home directory  |
 | Muse                   | `muse`                                        | That session's own Muse launch/config                                                          |
 | Other built-in sources | Any                                           | No session discovery                                                                           |
 
 Claude excludes Bedrock, Vertex, and foreign `ANTHROPIC_BASE_URL` sessions. Codex excludes sessions
-with `OPENAI_BASE_URL` set.
+with `OPENAI_BASE_URL` set. Cursor excludes sessions that authenticate with `CURSOR_API_KEY` or
+`CURSOR_AUTH_TOKEN`, and macOS sessions that keep the login in the Keychain, the default unless
+`AGENT_CLI_CREDENTIAL_STORE=file`.
 
 Use a stable account key: 1–128 characters from `[A-Za-z0-9._-]`. It identifies the account or
 organization whose quota is metered and survives token rotation. Never use a credential or raw

From 6b1ec373875569946a314801297357853dff1868 Mon Sep 17 00:00:00 2001
From: "paseo-ai[bot]" <266920839+paseo-ai[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 15:03:55 +0000
Subject: [PATCH 210/270] fix: update lockfile signatures and Nix hash [skip
 ci]

---
 nix/npm-deps.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/npm-deps.hash b/nix/npm-deps.hash
index 8906abc66b..9f7440506e 100644
--- a/nix/npm-deps.hash
+++ b/nix/npm-deps.hash
@@ -1 +1 @@
-sha256-CK96G7MWsmd/VDvkuaFJ23U04EGNmeiXdTYbmR8RDDQ=
+sha256-Sw9WSOnvebpXgty0WACJrRq+pkKuynLMxJg6D/SnyRk=

From d29814186729a811df4bcf229f44c5d27ff9ae8d Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 17:09:44 +0200
Subject: [PATCH 211/270] fix(app): dismiss review feedback confirmation with a
 toast

The sent phase kept its confirmation over the diff indefinitely. Use the shared success toast and return the feedback workflow to idle after sending.
---
 .../e2e/browser/composer-diff-stat.spec.ts    | 11 +++++------
 .../app/src/review/feedback/index.test.ts     |  3 +--
 packages/app/src/review/feedback/index.ts     |  5 ++---
 packages/app/src/review/feedback/surface.tsx  | 19 ++++++-------------
 .../app/src/review/feedback/use-feedback.ts   | 17 +++++++++++++++--
 5 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/packages/app/e2e/browser/composer-diff-stat.spec.ts b/packages/app/e2e/browser/composer-diff-stat.spec.ts
index 00705faccd..b3d1b56c12 100644
--- a/packages/app/e2e/browser/composer-diff-stat.spec.ts
+++ b/packages/app/e2e/browser/composer-diff-stat.spec.ts
@@ -310,7 +310,7 @@ async function sendFeedback(page: Page, count: number) {
 }
 
 async function expectFeedbackSent(page: Page, recipient: string) {
-  await expect(page.getByText(`Feedback sent to ${recipient}`, { exact: true })).toBeVisible();
+  await expect(page.getByTestId("app-toast")).toHaveText(`Feedback sent to ${recipient}`);
   await expect(page.getByTestId("working-diff-panel")).toBeVisible();
 }
 
@@ -340,6 +340,9 @@ test.describe("send review feedback", () => {
         await expectFeedbackSent(page, "Composer diff stat");
         await expectReviewAbsent(page, "Please simplify this.");
         await captureFeedback(page, "single");
+        await expect(
+          page.getByText("Feedback sent to Composer diff stat", { exact: true }),
+        ).toHaveCount(0);
       });
       await test.step("Return to the untouched composer draft", async () => {
         await showWideLayout(page);
@@ -375,11 +378,7 @@ test.describe("send review feedback", () => {
         ).toBeDisabled();
         expect(gate.requestCount()).toBe(1);
         gate.accept();
-        await expect(
-          compactReviewSurface(page).getByText("Feedback sent to Composer diff stat", {
-            exact: true,
-          }),
-        ).toBeVisible();
+        await expectFeedbackSent(page, "Composer diff stat");
       });
     } finally {
       await workspace.cleanup();
diff --git a/packages/app/src/review/feedback/index.test.ts b/packages/app/src/review/feedback/index.test.ts
index b423855b75..6ef6d74287 100644
--- a/packages/app/src/review/feedback/index.test.ts
+++ b/packages/app/src/review/feedback/index.test.ts
@@ -172,8 +172,7 @@ describe("review feedback", () => {
       makeComment("added"),
     ]);
     expect(feedback.model.getState().phase).toEqual({
-      kind: "sent",
-      recipient: makeRecipient("one"),
+      kind: "idle",
     });
   });
   it("clears unchanged sent comments while preserving additions", async () => {
diff --git a/packages/app/src/review/feedback/index.ts b/packages/app/src/review/feedback/index.ts
index 69e0592fe8..3aaba5c97d 100644
--- a/packages/app/src/review/feedback/index.ts
+++ b/packages/app/src/review/feedback/index.ts
@@ -23,8 +23,7 @@ export type FeedbackPhase =
   | { kind: "idle" }
   | { kind: "choosing" }
   | { kind: "sending"; recipient: FeedbackRecipient; commentCount: number }
-  | { kind: "failed"; message: string }
-  | { kind: "sent"; recipient: FeedbackRecipient };
+  | { kind: "failed"; message: string };
 export interface ReviewFeedbackState {
   phase: FeedbackPhase;
   commentCount: number;
@@ -115,7 +114,7 @@ function createFeedbackView(
     try {
       await ports.send(recipient, attachment);
       ports.clearSent(sentComments);
-      workflow.changePhase({ kind: "sent", recipient });
+      workflow.changePhase({ kind: "idle" });
     } catch (error) {
       workflow.changePhase({
         kind: "failed",
diff --git a/packages/app/src/review/feedback/surface.tsx b/packages/app/src/review/feedback/surface.tsx
index 7f87f46d88..fac499152e 100644
--- a/packages/app/src/review/feedback/surface.tsx
+++ b/packages/app/src/review/feedback/surface.tsx
@@ -80,17 +80,6 @@ function OpenReviewFeedbackAction({
   let notice: ReactNode = unavailableNotice;
   if (state.phase.kind === "failed")
     notice = <Text style={styles.error}>{state.phase.message}</Text>;
-  else if (state.phase.kind === "sent")
-    notice = (
-      <>
-        <SentNotice
-          recipient={state.phase.recipient}
-          serverId={serverId}
-          workspaceId={workspaceId}
-        />
-        {unavailableNotice}
-      </>
-    );
   return (
     <>
       {state.commentCount > 0 ? (
@@ -229,7 +218,7 @@ function RecipientRow({
   );
 }
 
-function SentNotice({
+export function FeedbackSentMessage({
   recipient,
   serverId,
   workspaceId,
@@ -241,7 +230,7 @@ function SentNotice({
   const { t } = useTranslation();
   const render = useCallback(
     (presentation: WorkspaceTabPresentation) => (
-      <Text style={styles.text}>
+      <Text style={styles.sentMessage}>
         {t("review.feedback.sent", { recipient: presentation.label })}
       </Text>
     ),
@@ -267,6 +256,10 @@ const styles = StyleSheet.create((theme) => ({
     left: theme.spacing[4],
     alignItems: "flex-end",
   },
+  sentMessage: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+  },
   text: {
     color: theme.colors.foreground,
     fontSize: theme.fontSize.sm,
diff --git a/packages/app/src/review/feedback/use-feedback.ts b/packages/app/src/review/feedback/use-feedback.ts
index e2b151953e..0596f3c55f 100644
--- a/packages/app/src/review/feedback/use-feedback.ts
+++ b/packages/app/src/review/feedback/use-feedback.ts
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useRef, useSyncExternalStore } from "react";
+import { createElement, useEffect, useMemo, useRef, useSyncExternalStore } from "react";
 import {
   useReviewDraftComments,
   getReviewDraftComments,
@@ -22,6 +22,8 @@ import {
   type FeedbackAttachment,
   type FeedbackRecipient,
 } from "./index";
+import { useToast } from "@/contexts/toast-context";
+import { FeedbackSentMessage } from "./surface";
 
 const feedbackScope = createReviewFeedbackScope();
 
@@ -32,6 +34,7 @@ export function useReviewFeedback(input: {
   attachment: FeedbackAttachment | null;
 }) {
   const { serverId, reviewDraftKey, workspaceId } = input;
+  const toast = useToast();
   const isCompact = useIsCompactFormFactor();
   const workspaceKey = workspaceId
     ? buildWorkspaceTabPersistenceKey({ serverId, workspaceId })
@@ -49,12 +52,14 @@ export function useReviewFeedback(input: {
     connected,
     attachment: input.attachment,
     sendBehavior: settings.sendBehavior,
+    toast,
   });
   live.current = {
     client,
     connected,
     attachment: input.attachment,
     sendBehavior: settings.sendBehavior,
+    toast,
   };
   const model = useMemo(
     () =>
@@ -85,12 +90,20 @@ export function useReviewFeedback(input: {
                   ).turnId ?? undefined)
                 : undefined,
           });
+          live.current.toast.show(
+            createElement(FeedbackSentMessage, {
+              recipient,
+              serverId,
+              workspaceId: workspaceId ?? "",
+            }),
+            { variant: "success" },
+          );
         },
         clearSent: (sentComments) =>
           clearSentReviewDraftComments({ key: reviewDraftKey, comments: sentComments }),
         failedMessage: () => i18n.t("review.feedback.failed"),
       }),
-    [reviewDraftKey, serverId, workspaceKey],
+    [reviewDraftKey, serverId, workspaceKey, workspaceId],
   );
   useEffect(() => {
     model.refresh();

From a8deb51086f1baa9daa0da2c8b3689b7e362e10f Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 17:23:43 +0200
Subject: [PATCH 212/270] fix(server): keep provider images separate from
 adjacent prose

Generated image Markdown was concatenated into the preceding paragraph and rendered at inline size. Preserve paragraph boundaries around image output while retaining intentional inline image behavior.
---
 .../claude/agent.image-rendering.test.ts      |  4 +-
 .../providers/codex-app-server-agent.test.ts  |  6 +-
 .../providers/opencode/v2/timeline.test.ts    |  2 +-
 .../providers/provider-image-output.test.ts   | 61 +++++++++++++++++--
 .../agent/providers/provider-image-output.ts  |  7 ++-
 5 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/packages/server/src/server/agent/providers/claude/agent.image-rendering.test.ts b/packages/server/src/server/agent/providers/claude/agent.image-rendering.test.ts
index 66891e01bf..5a06fea7fd 100644
--- a/packages/server/src/server/agent/providers/claude/agent.image-rendering.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.image-rendering.test.ts
@@ -140,11 +140,11 @@ function imageMessages(items: AgentTimelineItem[]): string[] {
   return items
     .filter((item) => item.type === "assistant_message")
     .map((item) => (item as { text: string }).text)
-    .filter((text) => text.startsWith("!["));
+    .filter((text) => text.trimStart().startsWith("!["));
 }
 
 function markdownImageSource(markdown: string): string {
-  const match = markdown.match(/^!\[[^\]]*]\((.*)\)$/);
+  const match = markdown.trim().match(/^!\[[^\]]*]\((.*)\)$/);
   if (!match) {
     throw new Error(`Expected markdown image, got: ${markdown}`);
   }
diff --git a/packages/server/src/server/agent/providers/codex-app-server-agent.test.ts b/packages/server/src/server/agent/providers/codex-app-server-agent.test.ts
index c8269722a7..8238a80131 100644
--- a/packages/server/src/server/agent/providers/codex-app-server-agent.test.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.test.ts
@@ -502,7 +502,7 @@ function asInternals(session: CodexTestSession): CodexSessionTestAccess {
 }
 
 function markdownImageSource(markdown: string): string {
-  const match = markdown.match(/^!\[[^\]]*]\((.*)\)$/);
+  const match = markdown.trim().match(/^!\[[^\]]*]\((.*)\)$/);
   if (!match) {
     throw new Error(`Expected markdown image, got: ${markdown}`);
   }
@@ -6000,7 +6000,7 @@ describe("Codex app-server provider", () => {
         turnId: "test-turn",
         item: {
           type: "assistant_message",
-          text: "![Image](file:///tmp/paseo%20image.png)",
+          text: "\n\n![Image](file:///tmp/paseo%20image.png)\n\n",
         },
       },
     ]);
@@ -6032,7 +6032,7 @@ describe("Codex app-server provider", () => {
           turnId: "test-turn",
           item: {
             type: "assistant_message",
-            text: `![Image](${expectedPath})`,
+            text: `\n\n![Image](${expectedPath})\n\n`,
           },
         },
       ]);
diff --git a/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts b/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts
index 82236de2b8..d86b9a7dcb 100644
--- a/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts
@@ -92,7 +92,7 @@ test("a tool's image output is shown as an image, not as base64 in the tool outp
     },
     {
       type: "assistant_message",
-      text: expect.stringMatching(/^!\[Image\]\(file:\/\/.*paseo-attachments.*\.png\)$/),
+      text: expect.stringMatching(/^\n\n!\[Image\]\(file:\/\/.*paseo-attachments.*\.png\)\n\n$/),
     },
   ]);
   expect(timeline.messages([screenshot])).toEqual([]);
diff --git a/packages/server/src/server/agent/providers/provider-image-output.test.ts b/packages/server/src/server/agent/providers/provider-image-output.test.ts
index 0c32af04fe..b4f4784a66 100644
--- a/packages/server/src/server/agent/providers/provider-image-output.test.ts
+++ b/packages/server/src/server/agent/providers/provider-image-output.test.ts
@@ -1,5 +1,7 @@
 import { existsSync, rmSync } from "node:fs";
 import path from "node:path";
+import MarkdownIt from "markdown-it";
+import { projectTimelineRows } from "../timeline-projection.js";
 import { describe, expect, test } from "vitest";
 
 import {
@@ -44,7 +46,7 @@ describe("isProviderImageMarkdown", () => {
     );
 
     expect(markdown).toBe(
-      `![Image](file:///C:/Users/me/AppData/Local/Temp/paseo-attachments/${HASH}.png)`,
+      `\n\n![Image](file:///C:/Users/me/AppData/Local/Temp/paseo-attachments/${HASH}.png)\n\n`,
     );
     expect(isProviderImageMarkdown(markdown)).toBe(true);
   });
@@ -53,20 +55,20 @@ describe("isProviderImageMarkdown", () => {
     const markdown = renderImageMarkdown("/home/user/Projects/Project With Spaces/screenshot.png");
 
     expect(markdown).toBe(
-      "![Image](file:///home/user/Projects/Project%20With%20Spaces/screenshot.png)",
+      "\n\n![Image](file:///home/user/Projects/Project%20With%20Spaces/screenshot.png)\n\n",
     );
   });
 
   test("encodes URI-significant characters in POSIX file paths", () => {
     const markdown = renderImageMarkdown("/tmp/screenshot#1?draft.png");
 
-    expect(markdown).toBe("![Image](file:///tmp/screenshot%231%3Fdraft.png)");
+    expect(markdown).toBe("\n\n![Image](file:///tmp/screenshot%231%3Fdraft.png)\n\n");
   });
 
   test("preserves double-leading slashes in POSIX file paths", () => {
     const markdown = renderImageMarkdown("//tmp/screenshot#1.png");
 
-    expect(markdown).toBe("![Image](file:////tmp/screenshot%231.png)");
+    expect(markdown).toBe("\n\n![Image](file:////tmp/screenshot%231.png)\n\n");
   });
 
   test.each([
@@ -77,7 +79,7 @@ describe("isProviderImageMarkdown", () => {
       "file://server/share/shot%3Fdraft.png",
     ],
   ])("encodes %s image paths as file URIs", (_label, imagePath, expectedSource) => {
-    expect(renderImageMarkdown(imagePath)).toBe(`![Image](${expectedSource})`);
+    expect(renderImageMarkdown(imagePath)).toBe(`\n\n![Image](${expectedSource})\n\n`);
   });
 
   test("rejects user-authored markdown that is not a materialized attachment", () => {
@@ -113,3 +115,52 @@ describe("materializeProviderImage", () => {
     }
   });
 });
+
+describe("provider image paragraph boundaries", () => {
+  test.each(["", "\n"])("keeps image outputs separate from prose ending in %j", (ending) => {
+    const image = renderProviderImageOutputAsAssistantMarkdown({
+      url: "https://example.com/chart.png",
+    });
+    if (!image) throw new Error("Expected image output");
+    const projected = projectTimelineRows({
+      mode: "projected",
+      rows: [
+        {
+          seq: 1,
+          timestamp: "2026-10-16T15:08:23Z",
+          item: { type: "assistant_message", text: `Before${ending}`, messageId: "commentary" },
+        },
+        { seq: 2, timestamp: "2026-10-16T15:08:24Z", item: image },
+        {
+          seq: 3,
+          timestamp: "2026-10-16T15:08:25Z",
+          item: { type: "assistant_message", text: "After" },
+        },
+      ],
+    });
+    expect(projected).toHaveLength(1);
+    const item = projected[0]!.item;
+    if (item.type !== "assistant_message") throw new Error("Expected assistant message");
+    const paragraphs = new MarkdownIt()
+      .parse(item.text, {})
+      .filter((token) => token.type === "inline");
+    expect(paragraphs.map((token) => token.content)).toEqual([
+      "Before",
+      "![Image](https://example.com/chart.png)",
+      "After",
+    ]);
+  });
+});
+
+test("materialized image output retains paragraph boundaries and attachment recognition", () => {
+  const item = renderProviderImageOutputAsAssistantMarkdown(
+    { data: "YWJjMTIz", mimeType: "image/png" },
+    { materialize: () => ({ path: `/tmp/paseo-attachments/${HASH}.png` }) },
+  );
+  expect(item).toEqual({
+    type: "assistant_message",
+    text: `\n\n![Image](file:///tmp/paseo-attachments/${HASH}.png)\n\n`,
+  });
+  if (!item || item.type !== "assistant_message") throw new Error("Expected image output");
+  expect(isProviderImageMarkdown(item.text)).toBe(true);
+});
diff --git a/packages/server/src/server/agent/providers/provider-image-output.ts b/packages/server/src/server/agent/providers/provider-image-output.ts
index 387158b32f..ba8843918b 100644
--- a/packages/server/src/server/agent/providers/provider-image-output.ts
+++ b/packages/server/src/server/agent/providers/provider-image-output.ts
@@ -108,7 +108,7 @@ const PROVIDER_IMAGE_MARKDOWN = new RegExp(
 );
 
 export function isProviderImageMarkdown(text: string): boolean {
-  return PROVIDER_IMAGE_MARKDOWN.test(text);
+  return PROVIDER_IMAGE_MARKDOWN.test(text.trimStart());
 }
 
 interface RenderProviderImageOutputOptions {
@@ -178,7 +178,8 @@ export function renderProviderImageOutputAsAssistantMarkdown(
     const altText = escapeMarkdownImageAlt(nonEmptyString(image.altText) ?? "Image");
     return {
       type: "assistant_message",
-      text: `![${altText}](${escapeMarkdownImageSource(source)})`,
+      // Image outputs remain standalone paragraphs when adjacent assistant chunks merge.
+      text: `\n\n![${altText}](${escapeMarkdownImageSource(source)})\n\n`,
     };
   }
 
@@ -208,6 +209,6 @@ export function renderProviderImageOutputAsAssistantMarkdown(
   const altText = escapeMarkdownImageAlt(nonEmptyString(image.altText) ?? "Image");
   return {
     type: "assistant_message",
-    text: `![${altText}](${escapeMarkdownImageSource(materialized.path)})`,
+    text: `\n\n![${altText}](${escapeMarkdownImageSource(materialized.path)})\n\n`,
   };
 }

From 98559bf729ad558bc70035725c8400b5761bbf04 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 22:30:27 +0700
Subject: [PATCH 213/270] fix(app): release iOS sidebar rows after an
 interrupted drag (#7159)

An iOS pan waiting for manual activation can deliver finger-up without finalizing, leaving the row active and the outer scroller locked. Fail a pending pan when its touch stream ends so the existing finalization path cancels the drag. Track activation immediately so an active drag keeps its normal completion path.

Based on the touch-release diagnosis in #5586. The native regression fails before the fix and passes on the Namespace iOS simulator.

Co-authored-by: Kassam Khoja <kassam@shopwrk.com>
---
 .../native-sidebar-drag-release.ios.ad        | 13 ++++++
 ...eact-native-draggable-flatlist+4.0.3.patch | 46 +++++++++++++------
 2 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 packages/app/e2e/mobile/agent-device/native-sidebar-drag-release.ios.ad

diff --git a/packages/app/e2e/mobile/agent-device/native-sidebar-drag-release.ios.ad b/packages/app/e2e/mobile/agent-device/native-sidebar-drag-release.ios.ad
new file mode 100644
index 0000000000..c94e24914d
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-sidebar-drag-release.ios.ad
@@ -0,0 +1,13 @@
+context platform=ios timeout=60000 retries=0
+env APP_ID=sh.paseo.debug
+
+# Start with the sidebar closed. WORKSPACE_ROW is the testID of a visible,
+# unselected workspace row. Hold past drag arming (180ms), below menu opening (450ms).
+open "${APP_ID}"
+press "label=\"Open menu\""
+wait "id=\"${WORKSPACE_ROW}\"" 10000
+longpress "id=\"${WORKSPACE_ROW}\"" 250
+press "id=\"${WORKSPACE_ROW}\""
+# A released drag must not swallow the next tap: navigation closes the sidebar.
+wait "label=\"Open menu\"" 5000
+close
diff --git a/patches/react-native-draggable-flatlist+4.0.3.patch b/patches/react-native-draggable-flatlist+4.0.3.patch
index 79838c55e2..ddbdb92224 100644
--- a/patches/react-native-draggable-flatlist+4.0.3.patch
+++ b/patches/react-native-draggable-flatlist+4.0.3.patch
@@ -58,10 +58,14 @@ index 2abb4a2..8ca967f 100644
      onAnimValInit?: (animVals: ReturnType<typeof useAnimatedValues>) => void;
      itemEnteringAnimation?: AnimateProps<Animated.View>["entering"];
 diff --git a/node_modules/react-native-draggable-flatlist/src/components/DraggableFlatList.tsx b/node_modules/react-native-draggable-flatlist/src/components/DraggableFlatList.tsx
-index 7c88afc..6d5719c 100644
+index 7c88afc..a74140f 100644
 --- a/node_modules/react-native-draggable-flatlist/src/components/DraggableFlatList.tsx
 +++ b/node_modules/react-native-draggable-flatlist/src/components/DraggableFlatList.tsx
-@@ -19,6 +19,7 @@ import {
+@@ -16,9 +16,11 @@ import {
+   FlatList,
+   Gesture,
+   GestureDetector,
++  State,
  } from "react-native-gesture-handler";
  import Animated, {
    runOnJS,
@@ -69,7 +73,7 @@ index 7c88afc..6d5719c 100644
    useAnimatedReaction,
    useAnimatedScrollHandler,
    useSharedValue,
-@@ -92,6 +93,17 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
+@@ -92,6 +94,17 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
      activeCellOffset.value = -1;
      setActiveKey(null);
    });
@@ -87,7 +91,7 @@ index 7c88afc..6d5719c 100644
 
    const {
      dragHitSlop = DEFAULT_PROPS.dragHitSlop,
-@@ -144,19 +156,88 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
+@@ -144,19 +157,88 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
      });
    }, [props.data, keyExtractor, keyToIndexRef]);
 
@@ -183,7 +187,7 @@ index 7c88afc..6d5719c 100644
        setActiveKey(activeKey);
        onDragBegin?.(index);
      }
-@@ -218,8 +299,25 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
+@@ -218,8 +300,25 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
      props.onRelease?.(index);
    });
 
@@ -210,7 +214,7 @@ index 7c88afc..6d5719c 100644
        const { onDragEnd, data } = props;
 
        const newData = [...data];
-@@ -238,26 +336,6 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
+@@ -238,26 +337,6 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
      props.onPlaceholderIndexChange?.(index);
    });
 
@@ -237,7 +241,7 @@ index 7c88afc..6d5719c 100644
    useAnimatedReaction(
      () => {
        return spacerIndexAnim.value;
-@@ -271,11 +349,21 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
+@@ -271,11 +350,24 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
    );
 
    const gestureDisabled = useSharedValue(false);
@@ -257,10 +261,13 @@ index 7c88afc..6d5719c 100644
 +      gestureSessionActive.value = true;
 +      terminalHandled.value = false;
 +      runOnJS(onGestureBegin)(sessionId);
++      panGestureState.value = evt.state;
++    })
++    .onStart((evt) => {
        panGestureState.value = evt.state;
      })
      .onUpdate((evt) => {
-@@ -286,8 +374,15 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
+@@ -286,8 +378,15 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
          : evt.translationY;
        touchTranslate.value = translation;
      })
@@ -277,7 +284,7 @@ index 7c88afc..6d5719c 100644
        // Set touch val to current translate val
        isTouchActiveNative.value = false;
        const translation = horizontalAnim.value
-@@ -299,6 +394,7 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
+@@ -299,6 +398,7 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
 
        // Only call onDragEnd if actually dragging a cell
        if (activeIndexAnim.value === -1 || disabled.value) return;
@@ -285,7 +292,7 @@ index 7c88afc..6d5719c 100644
        disabled.value = true;
        runOnJS(onRelease)(activeIndexAnim.value);
        const springTo = placeholderOffset.value - activeCellOffset.value;
-@@ -309,14 +405,64 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
+@@ -309,22 +409,84 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
            runOnJS(onDragEnd)({
              from: activeIndexAnim.value,
              to: spacerIndexAnim.value,
@@ -316,6 +323,7 @@ index 7c88afc..6d5719c 100644
 +      }
        runOnJS(onContainerTouchStart)();
      })
+-    .onTouchesUp(() => {
 +    .onTouchesMove((event, stateManager) => {
 +      if (!coordinatesDragWithExternalGesture) return;
 +
@@ -348,10 +356,20 @@ index 7c88afc..6d5719c 100644
 +        stateManager.activate();
 +      }
 +    })
-     .onTouchesUp(() => {
++    .onTouchesUp((event, stateManager) => {
        // Turning this into a worklet causes timing issues. We want it to run
        // just after the finger lifts.
-@@ -324,7 +470,9 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
+       runOnJS(onContainerTouchEnd)();
++      // A manually activated iOS pan can remain BEGAN after the last finger
++      // lifts. Fail it explicitly so onFinalize cancels the armed row.
++      if (event.numberOfTouches === 0 && panGestureState.value === State.BEGAN) {
++        stateManager.fail();
++      }
++    })
++    .onTouchesCancelled((_event, stateManager) => {
++      if (panGestureState.value === State.BEGAN) {
++        stateManager.fail();
++      }
      });
 
    if (dragHitSlop) panGesture.hitSlop(dragHitSlop);
@@ -362,7 +380,7 @@ index 7c88afc..6d5719c 100644
      const activeOffset = [-activationDistanceProp, activationDistanceProp];
      if (props.horizontal) {
        panGesture.activeOffsetX(activeOffset);
-@@ -332,6 +480,21 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
+@@ -332,6 +494,21 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
        panGesture.activeOffsetY(activeOffset);
      }
    }
@@ -384,7 +402,7 @@ index 7c88afc..6d5719c 100644
 
    const onScroll = useStableCallback((scrollOffset: number) => {
      props.onScrollOffsetChange?.(scrollOffset);
-@@ -373,8 +536,9 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
+@@ -373,8 +550,9 @@ function DraggableFlatListInner<T>(props: DraggableFlatListProps<T>) {
        horizontal={!!props.horizontal}
        layoutAnimationDisabled={layoutAnimationDisabled}
      >

From ae0b2588bf3a8f884b5b7207285e4df52bdcc01d Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 18:36:45 +0200
Subject: [PATCH 214/270] fix(app): move Show background to the end of
 workspace display menu

---
 .../browser/sidebar-mobile-menu-sheets.spec.ts    |  9 +++++++++
 .../e2e/browser/sidebar-project-filter.spec.ts    | 10 ++++++++++
 .../sidebar/display-preferences/menu.tsx          | 15 ++++++++-------
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/packages/app/e2e/browser/sidebar-mobile-menu-sheets.spec.ts b/packages/app/e2e/browser/sidebar-mobile-menu-sheets.spec.ts
index cf2f448913..7b4c36bf97 100644
--- a/packages/app/e2e/browser/sidebar-mobile-menu-sheets.spec.ts
+++ b/packages/app/e2e/browser/sidebar-mobile-menu-sheets.spec.ts
@@ -21,6 +21,15 @@ test("project and workspace kebabs open action sheets on compact layouts", async
     await page.getByRole("button", { name: "Open menu", exact: true }).click();
     await waitForSidebarHydration(page);
 
+    await page.getByTestId("sidebar-display-preferences-menu").click();
+    await expect(page.getByRole("menuitem")).toHaveText([
+      /^Grouping/,
+      /^Title/,
+      "Show",
+      "Show background",
+    ]);
+    await closeMenuSheet(page);
+
     await page
       .getByTestId(`sidebar-project-kebab-${projectEquivalenceViewKey(seeded.projectKey)}`)
       .click();
diff --git a/packages/app/e2e/browser/sidebar-project-filter.spec.ts b/packages/app/e2e/browser/sidebar-project-filter.spec.ts
index df9b9afddf..a2f8d14348 100644
--- a/packages/app/e2e/browser/sidebar-project-filter.spec.ts
+++ b/packages/app/e2e/browser/sidebar-project-filter.spec.ts
@@ -29,6 +29,16 @@ test.describe("Sidebar project filter", () => {
       await expect(alphaRow).toBeVisible({ timeout: 30_000 });
       await expect(betaRow).toBeVisible({ timeout: 30_000 });
 
+      await page.getByTestId("sidebar-display-preferences-menu").click();
+      await expect(page.getByRole("menuitem")).toHaveText([
+        /^Grouping/,
+        /^Title/,
+        "Show",
+        "Project",
+        "Show background",
+      ]);
+      await closeSidebarDisplayPreferences(page);
+
       await openSidebarProjectFilter(page);
       await expect(page.getByTestId("sidebar-project-filter-all")).toBeVisible();
       await toggleProjectFilter(page, alpha.projectKey);
diff --git a/packages/app/src/components/sidebar/display-preferences/menu.tsx b/packages/app/src/components/sidebar/display-preferences/menu.tsx
index d62b3f9ff1..be5a66ff6f 100644
--- a/packages/app/src/components/sidebar/display-preferences/menu.tsx
+++ b/packages/app/src/components/sidebar/display-preferences/menu.tsx
@@ -301,13 +301,6 @@ export function SidebarDisplayPreferencesMenu(): ReactElement {
           sheetTitle={t("sidebar.display.heading")}
           testID="sidebar-display-preferences-content"
         >
-          <MenuItem
-            selected={preferences.showBackground}
-            closeOnSelect={false}
-            onSelect={preferences.toggleBackground}
-          >
-            {t("sidebar.display.showBackground")}
-          </MenuItem>
           <MenuSubTrigger
             id="grouping"
             value={t(GROUPING_LABEL_KEYS[preferences.grouping])}
@@ -366,6 +359,14 @@ export function SidebarDisplayPreferencesMenu(): ReactElement {
               </MenuSubTrigger>
             </>
           ) : null}
+          <MenuSeparator />
+          <MenuItem
+            selected={preferences.showBackground}
+            closeOnSelect={false}
+            onSelect={preferences.toggleBackground}
+          >
+            {t("sidebar.display.showBackground")}
+          </MenuItem>
         </MenuSurface>
       </MenuRoot>
       <WorkspaceLabelManagerModal visible={managerOpen} onClose={closeManager} />

From df82edd2186978de74d63d5ab69f4f17e7d98ad1 Mon Sep 17 00:00:00 2001
From: babo-jeonguk <dnrtoki@gmail.com>
Date: Sat, 17 Oct 2026 02:08:03 +0900
Subject: [PATCH 215/270] Split the inbound WebSocket validator per message
 type (#6847)

* Split the inbound WebSocket validator per message type

zod-aot compiled WSOutboundMessageSchema into one 11 MB function. Every
inbound frame, heartbeats included, ran through it, so V8 hosts (daemon
clients, plugin hosts, the CLI, Electron) eventually Maglev-compiled the
whole function: about 800 MB of compiler memory and multi-second stalls,
again after each deoptimization.

Generate a tag-only envelope validator plus one validator per session
message, and dispatch on the message type. Issue paths, defaults and
passthrough behave as before.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Use forward slashes in generated validator imports

path.relative() returns backslash paths on Windows, which break the
import specifiers written into the generated files.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Declare the session export helper as a function

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
---
 .gitignore                                    |   2 +
 docs/protocol-validation.md                   |  11 +-
 packages/protocol/codegen/README.md           |   4 +-
 .../protocol/codegen/ws-outbound.compile.ts   |   4 -
 .../scripts/generate-validation-aot.mjs       |  89 +++++++++++---
 .../src/generated/validation/README.md        |   2 +-
 .../src/validation/ws-outbound-envelope.ts    |  25 ++++
 .../validation/ws-outbound-schema-metadata.ts |   3 -
 .../protocol/src/validation/ws-outbound.ts    |  57 +++++++--
 .../tests/validation/ws-outbound.test.ts      | 109 +++++++++++++++---
 10 files changed, 252 insertions(+), 54 deletions(-)
 delete mode 100644 packages/protocol/codegen/ws-outbound.compile.ts
 create mode 100644 packages/protocol/src/validation/ws-outbound-envelope.ts
 delete mode 100644 packages/protocol/src/validation/ws-outbound-schema-metadata.ts

diff --git a/.gitignore b/.gitignore
index 6d6bb279b7..a85ff1fd8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,6 +85,8 @@ valknut-report.json/
 packages/server/src/server/fixtures/dictation/dictation-debug-largest.wav
 packages/server/src/server/fixtures/dictation/dictation-debug-largest.transcript.txt
 packages/protocol/src/generated/validation/*.aot.ts
+packages/protocol/src/generated/validation/ws-outbound-schema-metadata.ts
+packages/protocol/codegen/generated/
 
 /artifacts
 packages/desktop/.cache/
diff --git a/docs/protocol-validation.md b/docs/protocol-validation.md
index 5fc31a5fdf..4694f9e208 100644
--- a/docs/protocol-validation.md
+++ b/docs/protocol-validation.md
@@ -6,7 +6,9 @@ The reason is mobile performance. A captured 353 KB provider snapshot cost about
 
 ## Runtime Path
 
-`packages/protocol/src/validation/ws-outbound.ts` is the shipped boundary. It calls the generated `WSOutboundMessageSchema.safeParse` and returns the validated data. It does not normalize, repair, or re-validate the generated result.
+`packages/protocol/src/validation/ws-outbound.ts` is the shipped boundary. It validates the envelope with a generated validator that checks only each session message's `type` tag, then runs the generated validator for that one message type and returns the validated data. Issue paths from the message validator, including nested union branches, are prefixed with `message`, so callers see the same issues as when one validator covered the whole envelope. It does not normalize, repair, or re-validate the generated result.
+
+Keep one generated function per message type. zod-aot inlines every nested schema into the function it compiles, so compiling `WSOutboundMessageSchema` as a whole produced one 11 MB function. On V8 (daemon clients, plugin hosts, the CLI, and Electron), the Maglev tier compiled that function once it was hot, allocating about 800 MB and stalling for seconds, and compiled it again after each deoptimization. Hermes has no JIT, so mobile never showed it. `packages/protocol/tests/validation/ws-outbound.test.ts` fails if a generated function grows past 1 MB.
 
 Generated validators preserve unknown keys where Zod object parsing strips them. The client dispatch path uses known `type` and payload fields, so this passthrough behavior is accepted for inbound messages. The wire format is unchanged.
 
@@ -16,11 +18,10 @@ Provider model normalization is a parser-side compatibility shim in the client c
 
 The protocol package owns generation.
 
-- `packages/protocol/codegen/ws-outbound.compile.ts` is the build-time zod-aot discovery entry.
-- `packages/protocol/scripts/generate-validation-aot.mjs` runs the exact-pinned compiler and applies the small local compiler patches before generation.
+- `packages/protocol/src/validation/ws-outbound-envelope.ts` defines the tag-only envelope schema and exposes the session message schemas that get their own validators.
+- `packages/protocol/scripts/generate-validation-aot.mjs` writes the zod-aot discovery entry and the runtime schema metadata, runs the exact-pinned compiler, and applies the small local compiler patches before generation. It also emits the `type` → validator map the boundary dispatches through.
 - `packages/protocol/scripts/watch-validation-aot.mjs` reruns generation while editing protocol sources.
-- `packages/protocol/src/generated/validation/ws-outbound.aot.ts` is generated runtime code and is gitignored.
-- `packages/protocol/src/validation/ws-outbound-schema-metadata.ts` is runtime schema metadata for zod-aot fallback/default references.
+- `packages/protocol/codegen/generated/ws-outbound.compile.ts`, `packages/protocol/src/generated/validation/ws-outbound.aot.ts`, and `packages/protocol/src/generated/validation/ws-outbound-schema-metadata.ts` are generated and gitignored. The metadata module lets generated code reach schema fallback/default values.
 
 Generation runs from protocol-owned lifecycle hooks: `prebuild`, `pretypecheck`, `pretest`, and `watch`. Installs do not run generation: published packages consume protocol from prebuilt `dist`, and local build/typecheck/test flows generate the source file at the point it is actually needed.
 
diff --git a/packages/protocol/codegen/README.md b/packages/protocol/codegen/README.md
index 7b2b0bcee5..69d7ac79b6 100644
--- a/packages/protocol/codegen/README.md
+++ b/packages/protocol/codegen/README.md
@@ -1,7 +1,7 @@
 # Protocol Validator Codegen
 
-This directory is build-time only. `ws-outbound.compile.ts` is the zod-aot discovery entry for the inbound WebSocket validator.
+This directory is build-time only. The generator writes `generated/ws-outbound.compile.ts`, the zod-aot discovery entry for the inbound WebSocket validators: one for the envelope and one per session message type.
 
-The generated runtime file is written to `../src/generated/validation/ws-outbound.aot.ts` and is not committed. The protocol package owns every generation trigger through its npm lifecycle scripts.
+The discovery entry and the generated runtime files under `../src/generated/validation/` are not committed. The protocol package owns every generation trigger through its npm lifecycle scripts.
 
 `zod-aot` is exact-pinned, and the protocol generator applies the small compiler patches it requires before generation. Treat changes to those patches like compiler changes: regenerate, inspect the output, and run the protocol validation regression tests before shipping.
diff --git a/packages/protocol/codegen/ws-outbound.compile.ts b/packages/protocol/codegen/ws-outbound.compile.ts
deleted file mode 100644
index 589986cf6a..0000000000
--- a/packages/protocol/codegen/ws-outbound.compile.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { compile } from "zod-aot";
-import { WSOutboundMessageSchema as SourceWSOutboundMessageSchema } from "../src/messages.js";
-
-export const WSOutboundMessageSchema = compile(SourceWSOutboundMessageSchema);
diff --git a/packages/protocol/scripts/generate-validation-aot.mjs b/packages/protocol/scripts/generate-validation-aot.mjs
index c3fd0b72ed..34c393c19e 100644
--- a/packages/protocol/scripts/generate-validation-aot.mjs
+++ b/packages/protocol/scripts/generate-validation-aot.mjs
@@ -4,8 +4,12 @@ import { dirname, relative, resolve, sep } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
 const packageRoot = resolve(dirname(fileURLToPath(import.meta.url)), "..");
-const source = resolve(packageRoot, "codegen/ws-outbound.compile.ts");
-const runtimeSchemaMetadata = resolve(packageRoot, "src/validation/ws-outbound-schema-metadata.ts");
+const envelopeSource = resolve(packageRoot, "src/validation/ws-outbound-envelope.ts");
+const source = resolve(packageRoot, "codegen/generated/ws-outbound.compile.ts");
+const runtimeSchemaMetadata = resolve(
+  packageRoot,
+  "src/generated/validation/ws-outbound-schema-metadata.ts",
+);
 const output = resolve(packageRoot, "src/generated/validation/ws-outbound.aot.ts");
 
 const require = createRequire(import.meta.url);
@@ -72,16 +76,69 @@ await Promise.all([
   ensureZodAotDiscriminatedUnionOutputPatch(),
 ]);
 
-const [{ discoverSchemas }, { compileSchemas }, { generateCompiledFileContent }] =
-  await Promise.all([
-    import(pathToFileURL(resolve(zodAotRoot, "dist/discovery.js")).href),
-    import(pathToFileURL(resolve(zodAotRoot, "dist/core/pipeline.js")).href),
-    import(pathToFileURL(resolve(zodAotRoot, "dist/cli/emitter.js")).href),
-  ]);
+const [
+  { loadSourceFile },
+  { discoverSchemas },
+  { compileSchemas },
+  { generateCompiledFileContent },
+] = await Promise.all([
+  import(pathToFileURL(resolve(zodAotRoot, "dist/loader.js")).href),
+  import(pathToFileURL(resolve(zodAotRoot, "dist/discovery.js")).href),
+  import(pathToFileURL(resolve(zodAotRoot, "dist/core/pipeline.js")).href),
+  import(pathToFileURL(resolve(zodAotRoot, "dist/cli/emitter.js")).href),
+]);
+
+// One compiled validator per session message plus a tag-only envelope. zod-aot emits one function
+// per compiled schema, so this keeps every generated function small enough for V8 to optimize cheaply.
+const { sessionOutboundMessageOptions } = await loadSourceFile(envelopeSource, { cacheBust: true });
+const sessionTags = sessionOutboundMessageOptions.map((option) => option.shape.type.value);
+function sessionExport(index) {
+  return `SessionOutboundMessage${index}`;
+}
+const envelopeImport = relative(dirname(source), envelopeSource)
+  .replace(/\.ts$/, ".js")
+  .split(sep)
+  .join("/");
+const metadataImport = relative(dirname(runtimeSchemaMetadata), envelopeSource)
+  .replace(/\.ts$/, ".js")
+  .split(sep)
+  .join("/");
+
+await mkdir(dirname(source), { recursive: true });
+await writeFile(
+  source,
+  [
+    "// AUTO-GENERATED by generate-validation-aot.mjs — DO NOT EDIT",
+    'import { compile } from "zod-aot";',
+    `import { WSOutboundEnvelopeSchema, sessionOutboundMessageOptions } from "${envelopeImport}";`,
+    "export const WSOutboundEnvelope = compile(WSOutboundEnvelopeSchema);",
+    ...sessionTags.map(
+      (_, index) =>
+        `export const ${sessionExport(index)} = compile(sessionOutboundMessageOptions[${index}]);`,
+    ),
+    "",
+  ].join("\n"),
+);
+await mkdir(dirname(runtimeSchemaMetadata), { recursive: true });
+await writeFile(
+  runtimeSchemaMetadata,
+  [
+    "// AUTO-GENERATED by generate-validation-aot.mjs — DO NOT EDIT",
+    `import { WSOutboundEnvelopeSchema, sessionOutboundMessageOptions } from "${metadataImport}";`,
+    "export const WSOutboundEnvelope = { schema: WSOutboundEnvelopeSchema };",
+    ...sessionTags.map(
+      (_, index) =>
+        `export const ${sessionExport(index)} = { schema: sessionOutboundMessageOptions[${index}] };`,
+    ),
+    "",
+  ].join("\n"),
+);
 
 const schemas = await discoverSchemas(source, { cacheBust: true });
-if (schemas.length === 0) {
-  throw new Error(`No zod-aot compile() exports found in ${relative(packageRoot, source)}`);
+if (schemas.length !== sessionTags.length + 1) {
+  throw new Error(
+    `Expected ${sessionTags.length + 1} zod-aot compile() exports in ${relative(packageRoot, source)}, found ${schemas.length}`,
+  );
 }
 
 const compiled = compileSchemas(schemas, { mode: "inline" });
@@ -95,12 +152,16 @@ const content = generateCompiledFileContent(compiled, runtimeImportPath, {
   "// AUTO-GENERATED by zod-aot — DO NOT EDIT",
   "// @ts-nocheck\n// AUTO-GENERATED by zod-aot — DO NOT EDIT",
 );
+const sessionMessageValidators = [
+  "export const SessionOutboundMessageValidators = {",
+  ...sessionTags.map((tag, index) => `  ${JSON.stringify(tag)}: ${sessionExport(index)},`),
+  "};",
+  "",
+].join("\n");
 
 await mkdir(dirname(output), { recursive: true });
-await writeFile(output, content);
+await writeFile(output, `${content}\n${sessionMessageValidators}`);
 
 console.info(
-  `generated ${relative(packageRoot, output)} from ${relative(packageRoot, source)} (${schemas
-    .map((schema) => schema.exportName)
-    .join(", ")})`,
+  `generated ${relative(packageRoot, output)}: envelope + ${sessionTags.length} session message validators`,
 );
diff --git a/packages/protocol/src/generated/validation/README.md b/packages/protocol/src/generated/validation/README.md
index 7d650faf4b..10ebc31e14 100644
--- a/packages/protocol/src/generated/validation/README.md
+++ b/packages/protocol/src/generated/validation/README.md
@@ -1,6 +1,6 @@
 # Generated protocol validators
 
-`ws-outbound.aot.ts` is generated by zod-aot from `packages/protocol/codegen/ws-outbound.compile.ts`.
+`ws-outbound.aot.ts` is generated by zod-aot from `packages/protocol/codegen/generated/ws-outbound.compile.ts`, which the generator writes along with `ws-outbound-schema-metadata.ts`.
 
 Run:
 
diff --git a/packages/protocol/src/validation/ws-outbound-envelope.ts b/packages/protocol/src/validation/ws-outbound-envelope.ts
new file mode 100644
index 0000000000..0ced88e8a9
--- /dev/null
+++ b/packages/protocol/src/validation/ws-outbound-envelope.ts
@@ -0,0 +1,25 @@
+import { z } from "zod";
+import {
+  SessionOutboundMessageSchema,
+  WSHelloRejectedMessageSchema,
+  WSPongMessageSchema,
+} from "../messages.js";
+
+export const sessionOutboundMessageOptions = SessionOutboundMessageSchema.options;
+
+const [firstSessionTag, ...otherSessionTags] = sessionOutboundMessageOptions.map((option) =>
+  z.object({ type: option.shape.type }),
+);
+
+// WSOutboundMessageSchema with every session message reduced to its tag. It reports the same
+// envelope and discriminator issues, while each session message gets its own generated validator:
+// one function for the whole protocol is large enough that V8's Maglev tier spends hundreds of MB
+// and seconds compiling it.
+export const WSOutboundEnvelopeSchema = z.discriminatedUnion("type", [
+  WSPongMessageSchema,
+  z.object({
+    type: z.literal("session"),
+    message: z.discriminatedUnion("type", [firstSessionTag, ...otherSessionTags]),
+  }),
+  WSHelloRejectedMessageSchema,
+]);
diff --git a/packages/protocol/src/validation/ws-outbound-schema-metadata.ts b/packages/protocol/src/validation/ws-outbound-schema-metadata.ts
deleted file mode 100644
index 23c9b5e563..0000000000
--- a/packages/protocol/src/validation/ws-outbound-schema-metadata.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { WSOutboundMessageSchema as SourceWSOutboundMessageSchema } from "../messages.js";
-
-export const WSOutboundMessageSchema = { schema: SourceWSOutboundMessageSchema };
diff --git a/packages/protocol/src/validation/ws-outbound.ts b/packages/protocol/src/validation/ws-outbound.ts
index bcb568cd8e..6cc7ad1268 100644
--- a/packages/protocol/src/validation/ws-outbound.ts
+++ b/packages/protocol/src/validation/ws-outbound.ts
@@ -1,19 +1,54 @@
+import { ZodRealError } from "zod";
 import type { z } from "zod";
-import { WSOutboundMessageSchema } from "../generated/validation/ws-outbound.aot.js";
-import type { WSOutboundMessage } from "../messages.js";
+import {
+  SessionOutboundMessageValidators,
+  WSOutboundEnvelope,
+} from "../generated/validation/ws-outbound.aot.js";
+import type { SessionOutboundMessage, WSOutboundMessage } from "../messages.js";
 
-type WSOutboundValidationResult =
-  | { success: true; data: WSOutboundMessage }
-  | { success: false; error: z.ZodError };
+type ValidationResult<T> = { success: true; data: T } | { success: false; error: z.ZodError };
 
-interface WSOutboundGeneratedValidator {
-  safeParse(input: unknown): WSOutboundValidationResult;
+interface GeneratedValidator<T> {
+  safeParse(input: unknown): ValidationResult<T>;
 }
 
-// zod-aot emits runtime JavaScript from WSOutboundMessageSchema but not its TypeScript surface.
+// zod-aot emits runtime JavaScript from the envelope and message schemas but not its TypeScript surface.
 // Protocol regression tests cover the patched compiler cases behind this boundary.
-const wsOutboundValidator = WSOutboundMessageSchema as WSOutboundGeneratedValidator;
+const envelopeValidator = WSOutboundEnvelope as GeneratedValidator<WSOutboundMessage>;
+const sessionMessageValidators = SessionOutboundMessageValidators as Record<
+  SessionOutboundMessage["type"],
+  GeneratedValidator<SessionOutboundMessage>
+>;
 
-export function validateWSOutboundMessage(input: unknown): WSOutboundValidationResult {
-  return wsOutboundValidator.safeParse(input);
+// The message validator reports paths relative to the message, nested issues included.
+function underMessage(issue: z.core.$ZodIssue): z.core.$ZodIssue {
+  const path = ["message", ...issue.path];
+  switch (issue.code) {
+    case "invalid_union":
+      return issue.inclusive === false
+        ? { ...issue, path }
+        : { ...issue, path, errors: issue.errors.map((branch) => branch.map(underMessage)) };
+    case "invalid_key":
+    case "invalid_element":
+      return { ...issue, path, issues: issue.issues.map(underMessage) };
+    default:
+      return { ...issue, path };
+  }
+}
+
+export function validateWSOutboundMessage(input: unknown): ValidationResult<WSOutboundMessage> {
+  const envelope = envelopeValidator.safeParse(input);
+  if (!envelope.success || envelope.data.type !== "session") {
+    return envelope;
+  }
+  const message = envelope.data.message;
+  const result = sessionMessageValidators[message.type].safeParse(message);
+  if (!result.success) {
+    return { success: false, error: new ZodRealError(result.error.issues.map(underMessage)) };
+  }
+  // Message validators return a new object when they apply defaults.
+  if (result.data === message) {
+    return envelope;
+  }
+  return { success: true, data: { ...envelope.data, message: result.data } };
 }
diff --git a/packages/protocol/tests/validation/ws-outbound.test.ts b/packages/protocol/tests/validation/ws-outbound.test.ts
index e2e3e3170a..ed147d89ad 100644
--- a/packages/protocol/tests/validation/ws-outbound.test.ts
+++ b/packages/protocol/tests/validation/ws-outbound.test.ts
@@ -3,8 +3,10 @@ import { createRequire } from "node:module";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { createJiti } from "jiti";
+import type { z } from "zod";
 import { describe, expect, it } from "vitest";
-import { WSOutboundMessageSchema as GeneratedWSOutboundMessageSchema } from "../../src/generated/validation/ws-outbound.aot.js";
+import { WSOutboundMessageSchema } from "../../src/messages.js";
+import { validateWSOutboundMessage } from "../../src/validation/ws-outbound.js";
 
 interface GeneratedSchema {
   safeParse(input: unknown): { success: boolean; data?: unknown };
@@ -132,10 +134,8 @@ const SourceSchema = z.object({
   });
 
   it("accepts a minimal valid envelope and rejects a corrupted envelope", () => {
-    expect(GeneratedWSOutboundMessageSchema.safeParse({ type: "pong" }).success).toBe(true);
-    expect(GeneratedWSOutboundMessageSchema.safeParse({ type: "not_a_message" }).success).toBe(
-      false,
-    );
+    expect(validateWSOutboundMessage({ type: "pong" }).success).toBe(true);
+    expect(validateWSOutboundMessage({ type: "not_a_message" }).success).toBe(false);
   });
 
   it("accepts project config responses with and without setup commit status", () => {
@@ -158,11 +158,10 @@ const SourceSchema = z.object({
       },
     });
 
-    expect(GeneratedWSOutboundMessageSchema.safeParse(envelope(payload)).success).toBe(true);
+    expect(validateWSOutboundMessage(envelope(payload)).success).toBe(true);
     expect(
-      GeneratedWSOutboundMessageSchema.safeParse(
-        envelope({ ...payload, hasUncommittedWorktreeSetupChanges: true }),
-      ).success,
+      validateWSOutboundMessage(envelope({ ...payload, hasUncommittedWorktreeSetupChanges: true }))
+        .success,
     ).toBe(true);
   });
 
@@ -196,7 +195,7 @@ const SourceSchema = z.object({
       },
     };
 
-    expect(GeneratedWSOutboundMessageSchema.safeParse(envelope)).toEqual({
+    expect(validateWSOutboundMessage(envelope)).toEqual({
       success: true,
       data: envelope,
     });
@@ -255,7 +254,7 @@ const SourceSchema = z.object({
   ])("preserves workspaceId in a $name", ({ message }) => {
     const envelope = { type: "session", message };
 
-    expect(GeneratedWSOutboundMessageSchema.safeParse(envelope)).toEqual({
+    expect(validateWSOutboundMessage(envelope)).toEqual({
       success: true,
       data: envelope,
     });
@@ -263,11 +262,11 @@ const SourceSchema = z.object({
 
   it("emits runtime imports with .js extensions", async () => {
     const generated = await readFile(generatedWSOutboundPath, "utf8");
-    expect(generated).toContain('from "../../validation/ws-outbound-schema-metadata.js"');
+    expect(generated).toContain('from "./ws-outbound-schema-metadata.js"');
   });
 
   it("accepts a forge.search.response envelope", () => {
-    const result = GeneratedWSOutboundMessageSchema.safeParse({
+    const result = validateWSOutboundMessage({
       type: "session",
       message: {
         type: "forge.search.response",
@@ -293,7 +292,7 @@ const SourceSchema = z.object({
   });
 
   it("accepts a legacy github_search_response envelope", () => {
-    const result = GeneratedWSOutboundMessageSchema.safeParse({
+    const result = validateWSOutboundMessage({
       type: "session",
       message: {
         type: "github_search_response",
@@ -319,4 +318,86 @@ const SourceSchema = z.object({
     });
     expect(result.success).toBe(true);
   });
+
+  it("keeps each generated validator function small", async () => {
+    // A single function for the whole protocol made V8's Maglev tier spend ~800 MB and seconds compiling it.
+    const generated = await readFile(generatedWSOutboundPath, "utf8");
+    const starts = [...generated.matchAll(/function safeParse_\w+\(/g)].map((match) => match.index);
+    const sizes = starts.map((start, index) => (starts[index + 1] ?? generated.length) - start);
+
+    expect(Math.max(...sizes)).toBeLessThan(1_000_000);
+    expect(sizes.length).toBeGreaterThan(1);
+  });
+
+  it("keeps nested union issue paths rooted at the envelope", () => {
+    // Generated validators root branch issues at the input; runtime Zod reports them relative to the union.
+    const envelope = {
+      type: "session",
+      message: {
+        type: "read_project_config_response",
+        payload: { repoRoot: "/repo", ok: true, config: {}, revision: { mtimeMs: 1, size: 1 } },
+      },
+    };
+    const paths = (issues: z.core.$ZodIssue[]): PropertyKey[][] =>
+      issues.flatMap((issue) => [
+        issue.path,
+        ...(issue.code === "invalid_union" ? paths(issue.errors.flat()) : []),
+      ]);
+
+    const result = validateWSOutboundMessage(envelope);
+
+    expect(result.success).toBe(false);
+    if (result.success) return;
+    expect(paths(result.error.issues)).toEqual([
+      ["message", "payload"],
+      ["message", "payload", "requestId"],
+      ["message", "payload", "requestId"],
+      ["message", "payload", "ok"],
+      ["message", "payload", "error"],
+    ]);
+  });
+
+  it("applies defaults from the matching session message schema", () => {
+    const envelope = {
+      type: "session",
+      message: {
+        type: "agent_update",
+        payload: {
+          kind: "upsert",
+          agent: {
+            id: "agent-1",
+            provider: "claude",
+            cwd: "/repo",
+            model: "model",
+            createdAt: "2026-01-01T00:00:00.000Z",
+            updatedAt: "2026-01-01T00:00:00.000Z",
+            lastUserMessageAt: "2026-01-01T00:00:00.000Z",
+            status: "initializing",
+            capabilities: {
+              supportsStreaming: false,
+              supportsSessionPersistence: false,
+              supportsDynamicModes: false,
+              supportsMcpServers: false,
+              supportsReasoningStream: false,
+              supportsToolInvocations: false,
+            },
+            currentModeId: "default",
+            availableModes: [],
+            pendingPermissions: [],
+            persistence: { provider: "claude", sessionId: "session-1" },
+            title: "Agent",
+          },
+        },
+      },
+    };
+
+    const result = validateWSOutboundMessage(envelope);
+    const expected = WSOutboundMessageSchema.safeParse(envelope);
+
+    expect(expected.success).toBe(true);
+    expect(result).toEqual(expected);
+    expect(result.success && result.data).toMatchObject({
+      message: { payload: { agent: { capabilities: { supportsRewindConversation: false } } } },
+    });
+  });
 });

From a1c6e8dfafee91ac250af09553f7975a38fb3c25 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 00:38:15 +0700
Subject: [PATCH 216/270] fix(app): keep iOS fullscreen composer above the
 keyboard (#7170)

Keep keyboard translation attached to the native animation graph when fullscreen resizes the dock. Apply the enabled mode on the native animation frame so Fabric does not restore the previous transform during layout.
---
 .../native-composer-fullscreen.ios.ad         | 18 +++++++++++++++
 .../keyboard/shift/internal/translate.ios.tsx | 22 +++++++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 packages/app/e2e/mobile/agent-device/native-composer-fullscreen.ios.ad

diff --git a/packages/app/e2e/mobile/agent-device/native-composer-fullscreen.ios.ad b/packages/app/e2e/mobile/agent-device/native-composer-fullscreen.ios.ad
new file mode 100644
index 0000000000..d991b227b7
--- /dev/null
+++ b/packages/app/e2e/mobile/agent-device/native-composer-fullscreen.ios.ad
@@ -0,0 +1,18 @@
+context platform=ios timeout=60000 retries=0
+# Start with an empty composer in an idle chat or new-agent draft on an iPhone with the software keyboard enabled.
+# Expand a long draft with the keyboard open; Exit fullscreen must remain reachable.
+open sh.paseo.debug
+wait "editable=true" 60000
+fill "editable=true" "iOS fullscreen composer smoke.\n\nLine 1: Check that the composer keeps this draft when expanded and collapsed.\nLine 2: Check that the composer keeps this draft when expanded and collapsed.\nLine 3: Check that the composer keeps this draft when expanded and collapsed.\nLine 4: Check that the composer keeps this draft when expanded and collapsed.\nLine 5: Check that the composer keeps this draft when expanded and collapsed.\nLine 6: Check that the composer keeps this draft when expanded and collapsed.\nLine 7: Check that the composer keeps this draft when expanded and collapsed.\nLine 8: Check that the composer keeps this draft when expanded and collapsed.\nLine 9: Check that the composer keeps this draft when expanded and collapsed.\nLine 10: Check that the composer keeps this draft when expanded and collapsed.\nLine 11: Check that the composer keeps this draft when expanded and collapsed.\nLine 12: Check that the composer keeps this draft when expanded and collapsed.\nLine 13: Check that the composer keeps this draft when expanded and collapsed.\nLine 14: Check that the composer keeps this draft when expanded and collapsed."
+press "label=\"Fullscreen\""
+wait "label=\"Exit fullscreen\" role=button" 5000
+is visible "label=\"Exit fullscreen\" role=button"
+press "label=\"Exit fullscreen\" role=button"
+wait "label=\"Fullscreen\" role=button" 5000
+is visible "label=\"Fullscreen\" role=button"
+press "label=\"Fullscreen\""
+wait "label=\"Exit fullscreen\" role=button" 5000
+is visible "label=\"Exit fullscreen\" role=button"
+press "label=\"Exit fullscreen\" role=button"
+wait "label=\"Fullscreen\" role=button" 5000
+is visible "label=\"Fullscreen\" role=button"
diff --git a/packages/app/src/keyboard/shift/internal/translate.ios.tsx b/packages/app/src/keyboard/shift/internal/translate.ios.tsx
index 348fe828d0..1fea4fab0c 100644
--- a/packages/app/src/keyboard/shift/internal/translate.ios.tsx
+++ b/packages/app/src/keyboard/shift/internal/translate.ios.tsx
@@ -1,5 +1,5 @@
-import { useMemo, type ReactNode } from "react";
-import { Animated, type ViewProps } from "react-native";
+import { useMemo, useEffect, type ReactNode } from "react";
+import { Animated, useAnimatedValue, type ViewProps } from "react-native";
 import { useKeyboardAnimation } from "react-native-keyboard-controller";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
@@ -32,9 +32,23 @@ export function KeyboardTranslateView({
       }),
     [bottomClearance, height, insets.bottom, progress],
   );
+  // Fullscreen resizes this view while disabling translation. iOS Fabric can
+  // reapply its previous transform during that layout commit. Keep the graph
+  // attached and apply the mode on the native animation frame; a static zero or
+  // setValue during the React commit gets overwritten by the resize.
+  const enabledValue = useAnimatedValue(enabled ? 1 : 0);
+  useEffect(() => {
+    const animation = Animated.timing(enabledValue, {
+      toValue: enabled ? 1 : 0,
+      duration: 0,
+      useNativeDriver: true,
+    });
+    animation.start();
+    return () => animation.stop();
+  }, [enabled, enabledValue]);
   const keyboardStyle = useMemo(
-    () => ({ transform: [{ translateY: enabled ? translateY : 0 }] }),
-    [enabled, translateY],
+    () => ({ transform: [{ translateY: Animated.multiply(translateY, enabledValue) }] }),
+    [enabledValue, translateY],
   );
 
   return (

From 90fcf51d7622b0e6c413502c95791e5595206f76 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 19:56:28 +0200
Subject: [PATCH 217/270] Render the Antigravity icon for terminal profiles
 (#6938)

* fix(app): render terminal-profile icons instead of the generic Bot

* test(app): verify terminal profile artwork in the launch menu

Exercise the rendered SVG, dimensions, theme color, catalog artwork and fallback through the real browser app instead of inspecting hook results in JSDOM. The browser regression fails on main before the lookup fix.

---------

Co-authored-by: Noah <noahguerin20@gmail.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../browser/terminal-profile-icons.spec.ts    | 71 +++++++++++++++++++
 packages/app/src/components/provider-icons.ts | 11 ++-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 packages/app/e2e/browser/terminal-profile-icons.spec.ts

diff --git a/packages/app/e2e/browser/terminal-profile-icons.spec.ts b/packages/app/e2e/browser/terminal-profile-icons.spec.ts
new file mode 100644
index 0000000000..29d786cfd3
--- /dev/null
+++ b/packages/app/e2e/browser/terminal-profile-icons.spec.ts
@@ -0,0 +1,71 @@
+import { ACP_PROVIDER_ICON_SVGS } from "../../src/assets/acp-provider-icons";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { openNewWorkspaceComposer } from "../support/helpers/new-workspace";
+import { openLaunchMenu } from "../support/helpers/new-workspace-launch";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
+
+// Harmless commands: this journey opens the profile menu without launching them.
+test.use({
+  e2eDaemonConfig: {
+    version: 1,
+    daemon: {
+      terminalProfiles: [
+        { id: "antigravity", name: "Antigravity artwork", command: "/bin/sh", icon: "agy" },
+        { id: "cursor", name: "Cursor artwork", command: "/bin/sh", icon: "cursor" },
+        { id: "unknown", name: "Unknown artwork", command: "/bin/sh", icon: "unknown-icon" },
+      ],
+    },
+  },
+});
+
+function profileIcon(page: Page, name: string) {
+  return page.getByRole("menuitem", { name: new RegExp(`^${name} artwork`) }).locator("svg");
+}
+
+async function expectBundledArtwork(page: Page, name: string, artwork: string) {
+  const icon = profileIcon(page, name);
+  await expect(icon).toBeVisible();
+  const expectedPaths = await page.evaluate((xml) => {
+    const document = new DOMParser().parseFromString(xml, "image/svg+xml");
+    return Array.from(document.querySelectorAll("path"), (path) => path.getAttribute("d")!);
+  }, artwork);
+  await expect(icon.locator("path")).toHaveCount(expectedPaths.length);
+  for (const [index, path] of expectedPaths.entries()) {
+    await expect(icon.locator("path").nth(index)).toHaveAttribute("d", path);
+  }
+  await expect(icon).toHaveAttribute("width", "14");
+  await expect(icon).toHaveAttribute("height", "14");
+  const terminalColor = await page
+    .getByRole("menuitem", { name: "Terminal", exact: true })
+    .locator("svg")
+    .evaluate((element) => getComputedStyle(element).stroke);
+  await expect(icon.locator("path").first()).toHaveCSS("fill", terminalColor);
+}
+
+async function expectUnknownArtworkFallback(page: Page) {
+  const icon = profileIcon(page, "Unknown");
+  await expect(icon).toBeVisible();
+  await expect(icon.locator('path[d="M12 8V4H8"]')).toHaveCount(1);
+}
+
+test("terminal profiles show bundled artwork while unknown icons keep the Bot fallback", async ({
+  page,
+}) => {
+  const workspace = await seedWorkspace({ repoPrefix: "terminal-icons-" });
+  try {
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    await openNewWorkspaceComposer(page, {
+      projectKey: workspace.projectKey,
+      projectDisplayName: workspace.projectDisplayName,
+    });
+    await openLaunchMenu(page);
+    await expectBundledArtwork(page, "Antigravity", ACP_PROVIDER_ICON_SVGS.agy);
+    await expectBundledArtwork(page, "Cursor", ACP_PROVIDER_ICON_SVGS.cursor);
+    await expectUnknownArtworkFallback(page);
+  } finally {
+    await workspace.cleanup();
+  }
+});
diff --git a/packages/app/src/components/provider-icons.ts b/packages/app/src/components/provider-icons.ts
index fec4003705..883b4820f7 100644
--- a/packages/app/src/components/provider-icons.ts
+++ b/packages/app/src/components/provider-icons.ts
@@ -3,6 +3,7 @@ import { providerSnapshotIcons } from "@/data/provider-icons";
 import { Bot, PackagePlus } from "lucide-react-native";
 import { createElement, useCallback, type ComponentType } from "react";
 import { SvgXml } from "react-native-svg";
+import { TERMINAL_PROFILE_ICON_NAMES } from "@getpaseo/protocol/provider-icon-names";
 import { ClaudeIcon } from "@/components/icons/claude-icon";
 import { CodexIcon } from "@/components/icons/codex-icon";
 import { CopilotIcon } from "@/components/icons/copilot-icon";
@@ -10,6 +11,7 @@ import { MiniMaxIcon } from "@/components/icons/minimax-icon";
 import { OpenCodeIcon } from "@/components/icons/opencode-icon";
 import { OmpIcon } from "@/components/icons/omp-icon";
 import { PiIcon } from "@/components/icons/pi-icon";
+import { ACP_PROVIDER_ICON_SVGS } from "@/assets/acp-provider-icons";
 import { ACP_PROVIDER_CATALOG } from "@/data/acp-provider-catalog";
 import { resolveProviderIconName } from "@/components/provider-icon-name";
 
@@ -31,10 +33,17 @@ const BUILTIN_PROVIDER_ICONS: Record<string, ProviderIconComponent> = {
   pi: PiIcon as unknown as ProviderIconComponent,
 };
 
-const CATALOG_ICON_SVGS = new Map(
+const CATALOG_ICON_SVGS = new Map<string, string>(
   ACP_PROVIDER_CATALOG.flatMap((entry) => (entry.iconSvg ? [[entry.id, entry.iconSvg]] : [])),
 );
 
+for (const name of TERMINAL_PROFILE_ICON_NAMES) {
+  const iconSvg = (ACP_PROVIDER_ICON_SVGS as Record<string, string | undefined>)[name];
+  if (iconSvg) {
+    CATALOG_ICON_SVGS.set(name, iconSvg);
+  }
+}
+
 const catalogIconComponents = new Map<string, ProviderIconComponent>();
 const snapshotIconComponents = new Map<string, ProviderIconComponent>();
 

From b1256a448418735500e44a4854cc7af2f43a5985 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 20:56:36 +0200
Subject: [PATCH 218/270] docs(changelog): 0.12.0-beta.1

---
 CHANGELOG.md | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbd1d0551d..80dc5d17e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,139 @@
 # Changelog
 
+## 0.12.0-beta.1 - 2026-10-16
+
+Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and close to 100 fixes.
+
+**Before upgrading:** `paseo run --background` is deprecated in favor of `--no-wait`, and `paseo permit allow` and `deny` now exit non-zero when the daemon doesn't confirm within 15 seconds
+
+### Added
+
+- Added background workspaces, hidden from the sidebar unless Show background is on ([#5039](https://github.com/getpaseo/paseo/pull/5039), [#7141](https://github.com/getpaseo/paseo/pull/7141) by [@gpambrozio](https://github.com/gpambrozio), [@marvin-ambrozio](https://github.com/marvin-ambrozio))
+- Added a Send feedback button to the diff pane, so review comments reach an agent without opening its chat ([#6455](https://github.com/getpaseo/paseo/pull/6455))
+- Added a fullscreen composer on phones ([#6531](https://github.com/getpaseo/paseo/pull/6531), [#6902](https://github.com/getpaseo/paseo/pull/6902), [#6945](https://github.com/getpaseo/paseo/pull/6945), [#6987](https://github.com/getpaseo/paseo/pull/6987), [#7130](https://github.com/getpaseo/paseo/pull/7130), [#7170](https://github.com/getpaseo/paseo/pull/7170))
+- Added the sender's name to messages one agent sends another ([#6373](https://github.com/getpaseo/paseo/pull/6373))
+- Added Claude Mythos 5.1 when the installed Claude Code advertises it ([#6403](https://github.com/getpaseo/paseo/pull/6403))
+- Added option previews to Claude question cards ([#6171](https://github.com/getpaseo/paseo/pull/6171) by [@gabrielgiordan](https://github.com/gabrielgiordan))
+- Added `paseo usage` to show account quotas, balances, and reset times from the CLI ([#6474](https://github.com/getpaseo/paseo/pull/6474))
+
+### Improved
+
+- Changed text selection in replies on iOS and Android to cross paragraphs, headings, and lists ([#6973](https://github.com/getpaseo/paseo/pull/6973))
+- Added a copy button to code blocks on iOS and Android ([#6973](https://github.com/getpaseo/paseo/pull/6973))
+- Changed wide Markdown tables on iOS and Android to scroll sideways ([#6973](https://github.com/getpaseo/paseo/pull/6973))
+- Changed phone layouts to a floating header ([#6431](https://github.com/getpaseo/paseo/pull/6431))
+- Moved New agent and New terminal on phones into the tab switcher ([#6431](https://github.com/getpaseo/paseo/pull/6431))
+- Moved workspace scripts on phones into ⋯ → Scripts, which shows what is running ([#7122](https://github.com/getpaseo/paseo/pull/7122))
+- Changed phones to open files and subagents in a closable sheet, with Open as tab for subagents ([#6827](https://github.com/getpaseo/paseo/pull/6827), [#6885](https://github.com/getpaseo/paseo/pull/6885), [#6958](https://github.com/getpaseo/paseo/pull/6958))
+- Changed diff comments on phones to open in a sheet instead of an editor inside the code ([#6455](https://github.com/getpaseo/paseo/pull/6455))
+- Changed Settings on phones to large tiles grouped into App and Host ([#7129](https://github.com/getpaseo/paseo/pull/7129))
+- Reduced rendering work in long chats while a reply streams ([#7052](https://github.com/getpaseo/paseo/pull/7052) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Made reopening the sidebar about 45% faster ([#7157](https://github.com/getpaseo/paseo/pull/7157))
+- Changed Gitea and Forgejo fork PR checkouts to include the fork owner in the branch name, such as `bob/patch-1` ([#6829](https://github.com/getpaseo/paseo/pull/6829) by [@alexanderadam](https://github.com/alexanderadam))
+
+### Plugins
+
+- Fixed plugins that import Paseo protocol types failing to install with "Could not resolve type dependency" ([#7023](https://github.com/getpaseo/paseo/pull/7023))
+- Fixed `providers.waitForReady` throwing in plugins on the mobile app ([#6760](https://github.com/getpaseo/paseo/pull/6760) by [@GeorgeR](https://github.com/GeorgeR))
+- Fixed the chat outline not jumping to prompts rendered by a timeline plugin ([#6690](https://github.com/getpaseo/paseo/pull/6690) by [@lukeRRD](https://github.com/lukeRRD))
+- Fixed Escape stopping the running agent instead of first closing an open plugin preview ([#7110](https://github.com/getpaseo/paseo/pull/7110) by [@RRD-dev](https://github.com/RRD-dev), [@luoph](https://github.com/luoph))
+
+### Fixed
+
+- Fixed iOS replies with list items that render blank, and text that keeps a stale width after a resize or rotation ([#6973](https://github.com/getpaseo/paseo/pull/6973))
+- Fixed plugin hosts, the CLI, and the desktop app growing to about 1 GB of memory after running for 30 to 75 minutes ([#6847](https://github.com/getpaseo/paseo/pull/6847) by [@babo-jeonguk](https://github.com/babo-jeonguk))
+- Fixed the daemon running out of memory during long OpenCode v2 reply or reasoning streams ([#6262](https://github.com/getpaseo/paseo/pull/6262))
+- Fixed archived ACP agents starting a provider process that kept running each time their timeline loaded ([#6766](https://github.com/getpaseo/paseo/pull/6766) by [@apple-ouyang](https://github.com/apple-ouyang))
+- Fixed oversized attachments disconnecting the host in a loop instead of failing with a size error ([#6285](https://github.com/getpaseo/paseo/pull/6285))
+- Fixed Download in Files failing on hosts connected over relay, SSH, or a socket ([#6595](https://github.com/getpaseo/paseo/pull/6595) by [@odoo-mvds](https://github.com/odoo-mvds), [@YASICJUNWOO](https://github.com/YASICJUNWOO), [@JrDw0](https://github.com/JrDw0))
+- Fixed Changes showing no diff lines with custom Git diff settings, such as `color.diff=always` or an external diff command ([#6536](https://github.com/getpaseo/paseo/pull/6536), [#6562](https://github.com/getpaseo/paseo/pull/6562) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed an incomplete font name in Appearance breaking the app's styling ([#6695](https://github.com/getpaseo/paseo/pull/6695))
+- Fixed the Linux desktop window never appearing when the hidden window renders no frames ([#6726](https://github.com/getpaseo/paseo/pull/6726) by [@EhEo](https://github.com/EhEo))
+- Fixed opening another agent or workspace stalling while a different agent on the same host is streaming ([#7074](https://github.com/getpaseo/paseo/pull/7074) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Fixed agent creation showing an error and a retry draft when the provider rejected the first prompt ([#6379](https://github.com/getpaseo/paseo/pull/6379))
+- Fixed parent agents missing the finish notification when a child finished its first turn very quickly ([#6008](https://github.com/getpaseo/paseo/pull/6008) by [@ahmet-izgi](https://github.com/ahmet-izgi))
+- Fixed parent agents being told a child finished when its task was stopped or reloaded ([#6660](https://github.com/getpaseo/paseo/pull/6660) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed Codex chats containing U+2028 or U+2029 failing to reopen on Node 24 ([#5999](https://github.com/getpaseo/paseo/pull/5999) by [@grahameger](https://github.com/grahameger), [@jtsang4](https://github.com/jtsang4), [@kotusenka](https://github.com/kotusenka))
+- Fixed Add Project directory search hanging the daemon on macOS when it entered `~/Library` ([#5789](https://github.com/getpaseo/paseo/pull/5789) by [@lardissone](https://github.com/lardissone))
+- Fixed New workspace failing with "Invalid mode" when the saved mode isn't offered by the provider ([#5847](https://github.com/getpaseo/paseo/pull/5847) by [@mcowger](https://github.com/mcowger))
+- Fixed answering multi-select OpenCode v2 questions failing with "Invalid answer" ([#6149](https://github.com/getpaseo/paseo/pull/6149) by [@gammons](https://github.com/gammons))
+- Fixed browser screenshots failing the turn on OpenCode v2 agents ([#6330](https://github.com/getpaseo/paseo/pull/6330))
+- Fixed OpenCode v2 agents receiving "HTTP 500" instead of the Paseo tool error ([#6519](https://github.com/getpaseo/paseo/pull/6519))
+- Fixed rewinding a Claude conversation failing with "Session not found" when the provider sets `CLAUDE_CONFIG_DIR` ([#6325](https://github.com/getpaseo/paseo/pull/6325))
+- Fixed imported Claude Code sessions taking their first prompt as the name instead of their `/rename` title ([#6930](https://github.com/getpaseo/paseo/pull/6930) by [@platanus-kr](https://github.com/platanus-kr))
+- Fixed a wrongly shaped answer to a Claude question reporting success and discarding the question ([#6936](https://github.com/getpaseo/paseo/pull/6936) by [@thomasvan](https://github.com/thomasvan))
+- Fixed Cursor agents showing no plan usage in their context details ([#6353](https://github.com/getpaseo/paseo/pull/6353) by [@gengjiawen](https://github.com/gengjiawen))
+- Fixed the Claude context meter counting only output tokens when a proxy reports input usage at the end of the response ([#6703](https://github.com/getpaseo/paseo/pull/6703) by [@kywoo26](https://github.com/kywoo26))
+- Fixed the Claude context meter showing a 1M maximum after switching back to a 200k model ([#6814](https://github.com/getpaseo/paseo/pull/6814))
+- Fixed the context meter staying empty during the first turn on custom Claude `[1m]` models ([#6767](https://github.com/getpaseo/paseo/pull/6767))
+- Fixed a schedule never running again after one of its runs could not be recorded ([#6334](https://github.com/getpaseo/paseo/pull/6334))
+- Fixed schedules sharing a cron minute running a slot twice and skipping the next occurrence ([#6532](https://github.com/getpaseo/paseo/pull/6532) by [@keithpk](https://github.com/keithpk))
+- Fixed Committed showing no changes for worktrees created from an existing branch ([#6462](https://github.com/getpaseo/paseo/pull/6462) by [@cr-2takumax](https://github.com/cr-2takumax))
+- Fixed Discard and commit diffs in Changes for workspaces opened at a repository subdirectory ([#6777](https://github.com/getpaseo/paseo/pull/6777), [#6801](https://github.com/getpaseo/paseo/pull/6801), [#6882](https://github.com/getpaseo/paseo/pull/6882) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed renamed and edited files showing every line as added in Changes ([#6559](https://github.com/getpaseo/paseo/pull/6559))
+- Fixed renamed files opened from a commit showing as new files ([#6895](https://github.com/getpaseo/paseo/pull/6895))
+- Fixed Changes showing no diff for filenames containing quotes, backslashes, or tabs ([#6583](https://github.com/getpaseo/paseo/pull/6583) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed Changes dropping removed lines that start with `--`, such as SQL comments ([#6569](https://github.com/getpaseo/paseo/pull/6569) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed the Diff tab staying on a spinner after the first edit in a clean workspace ([#6745](https://github.com/getpaseo/paseo/pull/6745))
+- Fixed worktree creation failing after running `git init` in a project added before Git ([#6785](https://github.com/getpaseo/paseo/pull/6785))
+- Fixed new worktrees not opening the terminals configured in `paseo.json` after setup ([#6999](https://github.com/getpaseo/paseo/pull/6999) by [@davidyang](https://github.com/davidyang))
+- Fixed a service newly added to `paseo.json` failing to start until the daemon restarted ([#6542](https://github.com/getpaseo/paseo/pull/6542))
+- Fixed workspace service URLs returning 502 when the service listens only on IPv6 localhost ([#6753](https://github.com/getpaseo/paseo/pull/6753) by [@marcelocastrobarbosa](https://github.com/marcelocastrobarbosa))
+- Fixed terminals that could not be closed when their command was missing or exited immediately ([#6792](https://github.com/getpaseo/paseo/pull/6792) by [@KiraPC](https://github.com/KiraPC))
+- Fixed CJK terminal text gaining spaces between characters after returning to a workspace ([#6452](https://github.com/getpaseo/paseo/pull/6452) by [@jasonhnd](https://github.com/jasonhnd), [@liujin0506](https://github.com/liujin0506), [@seob717](https://github.com/seob717))
+- Fixed the self-hosted web app failing to connect through a reverse proxy on port 80 or 443 ([#6638](https://github.com/getpaseo/paseo/pull/6638) by [@kiawin](https://github.com/kiawin))
+- Fixed assistant file links with spaces or non-ASCII characters failing with ENOENT ([#6520](https://github.com/getpaseo/paseo/pull/6520) by [@apple-ouyang](https://github.com/apple-ouyang), [@sunshinehomeyu-blip](https://github.com/sunshinehomeyu-blip))
+- Fixed local images in agent replies failing to load when their path contains spaces or non-ASCII characters ([#6877](https://github.com/getpaseo/paseo/pull/6877))
+- Fixed Markdown file previews not showing images referenced by relative paths ([#6750](https://github.com/getpaseo/paseo/pull/6750) by [@apple-ouyang](https://github.com/apple-ouyang))
+- Fixed iOS sidebar rows staying highlighted and swallowing the next tap after a brief hold ([#7159](https://github.com/getpaseo/paseo/pull/7159) by [@kassamkhoja](https://github.com/kassamkhoja))
+- Fixed Android chats scrolling when you long-press to select text ([#7131](https://github.com/getpaseo/paseo/pull/7131) by [@RRD-dev](https://github.com/RRD-dev), [@luoph](https://github.com/luoph))
+- Fixed sidebar rows, footer buttons, and Settings items showing no feedback when tapped on touch devices ([#7150](https://github.com/getpaseo/paseo/pull/7150))
+- Fixed Page Up and Page Down not scrolling the chat after clicking a message ([#7033](https://github.com/getpaseo/paseo/pull/7033) by [@panta82](https://github.com/panta82))
+- Fixed Add Project keyboard selection moving to directories scrolled out of view ([#7081](https://github.com/getpaseo/paseo/pull/7081) by [@superheher](https://github.com/superheher))
+- Fixed Enter replacing an email address in the composer with a file mention ([#6471](https://github.com/getpaseo/paseo/pull/6471) by [@jasonhnd](https://github.com/jasonhnd))
+- Fixed letter shortcuts not running with non-Latin keyboard layouts such as Russian ([#6755](https://github.com/getpaseo/paseo/pull/6755))
+- Fixed shortcut recording saving the QWERTY key instead of the typed letter on layouts such as Dvorak ([#6652](https://github.com/getpaseo/paseo/pull/6652))
+- Fixed rebinding Jump to tab or Jump to workspace keeping only the pressed number instead of 1–9; record existing overrides again ([#7065](https://github.com/getpaseo/paseo/pull/7065) by [@dbunk903](https://github.com/dbunk903))
+- Fixed Previous and Next workspace shortcuts stopping at workspace 9 ([#6586](https://github.com/getpaseo/paseo/pull/6586) by [@IEatCodeDaily](https://github.com/IEatCodeDaily))
+- Fixed unreadable Android status bar icons in the Light theme and after the system theme changes ([#6707](https://github.com/getpaseo/paseo/pull/6707) by [@terayang](https://github.com/terayang))
+- Fixed the pairing QR code getting clipped on iOS and Android ([#6758](https://github.com/getpaseo/paseo/pull/6758) by [@fdkevin0](https://github.com/fdkevin0))
+- Fixed a `write EPIPE` error dialog on Linux desktop when the launcher stops reading console output ([#6639](https://github.com/getpaseo/paseo/pull/6639))
+- Fixed `paseo permit allow` and `deny` reporting success over SSH while the request stayed pending ([#6607](https://github.com/getpaseo/paseo/pull/6607) by [@budivoogt](https://github.com/budivoogt))
+- Fixed files and folders whose names start with two dots, like `..notes.txt`, being hidden and rejected ([#6604](https://github.com/getpaseo/paseo/pull/6604), [#6720](https://github.com/getpaseo/paseo/pull/6720) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed Markdown previews dropping table rows after a `<` that isn't HTML, such as `List<Item>` ([#6370](https://github.com/getpaseo/paseo/pull/6370) by [@gengjiawen](https://github.com/gengjiawen))
+- Fixed a literal heading tag appearing when an HTML heading contains a linked image ([#6650](https://github.com/getpaseo/paseo/pull/6650))
+- Fixed Astro diffs with an empty `{}` expression failing to render ([#6763](https://github.com/getpaseo/paseo/pull/6763))
+- Fixed slash command argument hints missing from autocomplete for ACP providers ([#6920](https://github.com/getpaseo/paseo/pull/6920) by [@bwestlund17](https://github.com/bwestlund17))
+- Fixed terminal profiles configured with the `agy` icon showing a generic bot instead of the Antigravity icon ([#6938](https://github.com/getpaseo/paseo/pull/6938) by [@noahg9](https://github.com/noahg9))
+- Fixed the Pi thinking level not updating when a Pi extension changes it ([#6741](https://github.com/getpaseo/paseo/pull/6741))
+- Fixed Pi subagents from `@tintinweb/pi-subagents` staying running after their turn limit ([#6594](https://github.com/getpaseo/paseo/pull/6594) by [@Chen-DaYi](https://github.com/Chen-DaYi))
+- Fixed manual `/compact` on OMP agents showing no progress and leaving the context meter stale ([#6106](https://github.com/getpaseo/paseo/pull/6106))
+- Fixed voice mode TTS rejecting model and voice names from OpenAI-compatible servers ([#6060](https://github.com/getpaseo/paseo/pull/6060) by [@khimaros](https://github.com/khimaros))
+- Fixed the xhigh thinking option showing "Extra high" instead of its configured label ([#6005](https://github.com/getpaseo/paseo/pull/6005) by [@EliorFureraj](https://github.com/EliorFureraj))
+- Fixed the Remove button going off screen for long custom model names in provider settings ([#6507](https://github.com/getpaseo/paseo/pull/6507))
+- Fixed the starting-ref picker not finding GitLab merge requests and issues by number ([#6525](https://github.com/getpaseo/paseo/pull/6525))
+- Fixed the starting-ref picker hiding change requests that match only in their description ([#6558](https://github.com/getpaseo/paseo/pull/6558))
+- Fixed @-mentions not finding plan files under `.cursor/plans` ([#6641](https://github.com/getpaseo/paseo/pull/6641) by [@chyendongnhanh338](https://github.com/chyendongnhanh338))
+- Fixed Paseo replacing a symlinked `config.json` with a regular file when saving settings ([#6023](https://github.com/getpaseo/paseo/pull/6023))
+- Fixed the published config schema rejecting valid settings such as `agentProfiles` and `plugins` ([#6621](https://github.com/getpaseo/paseo/pull/6621) by [@ragokan](https://github.com/ragokan))
+- Fixed duplicating a folder turning its relative symlinks into absolute links to the original ([#6771](https://github.com/getpaseo/paseo/pull/6771) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed renaming an untracked file like `[id].tsx` failing when a tracked file matches it as a pattern ([#6573](https://github.com/getpaseo/paseo/pull/6573) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed saving workspace files with long names failing with `ENAMETOOLONG` ([#6658](https://github.com/getpaseo/paseo/pull/6658) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed worktree creation and Changes failing for projects whose folder name ends in a space ([#6686](https://github.com/getpaseo/paseo/pull/6686))
+- Fixed merging a worktree when the base branch's worktree path contains a newline or ends in a space ([#6668](https://github.com/getpaseo/paseo/pull/6668) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed `paseo agent ls` listing only the first 200 agents ([#6033](https://github.com/getpaseo/paseo/pull/6033) by [@hteo1337](https://github.com/hteo1337))
+- Fixed `paseo worktree ls` and `paseo worktree archive` failing with "cwd or repoRoot is required" ([#6467](https://github.com/getpaseo/paseo/pull/6467) by [@jasonhnd](https://github.com/jasonhnd))
+- Fixed `paseo worktree ls` listing an archived worktree for up to 15 seconds ([#6545](https://github.com/getpaseo/paseo/pull/6545) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed `paseo logs --since` printing activity from before the requested timestamp ([#6514](https://github.com/getpaseo/paseo/pull/6514) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed `paseo logs --follow` splitting words across lines as text streams in ([#6528](https://github.com/getpaseo/paseo/pull/6528) by [@fiorelorenzo](https://github.com/fiorelorenzo))
+- Fixed `paseo logs` printing reasoning after the reply that followed it ([#6546](https://github.com/getpaseo/paseo/pull/6546))
+- Fixed the daemon keeping files open after a canceled HTTP download ([#6567](https://github.com/getpaseo/paseo/pull/6567) by [@Mar-garet](https://github.com/Mar-garet))
+- Fixed Linux desktop windows showing a generic icon instead of the Paseo icon ([#6645](https://github.com/getpaseo/paseo/pull/6645) by [@whme](https://github.com/whme), [@panta82](https://github.com/panta82))
+- Fixed Google Play listing Android devices without a camera as incompatible ([#6339](https://github.com/getpaseo/paseo/pull/6339))
+- Fixed `nix build .#desktop` running out of memory on Macs with less than 15 GB of RAM ([#6537](https://github.com/getpaseo/paseo/pull/6537) by [@truelecter](https://github.com/truelecter))
+- Fixed usage providers changing places after Refresh all ([#6947](https://github.com/getpaseo/paseo/pull/6947) by [@sleroq](https://github.com/sleroq))
+- Fixed the OpenCode Go usage icon being nearly invisible on dark themes ([#6362](https://github.com/getpaseo/paseo/pull/6362) by [@az33zy](https://github.com/az33zy))
+
 ## 0.11.4 - 2026-10-15
 
 [Hoplite](https://hoplite.sh) joins Paseo as our first sponsor through the company sponsorship program. Hoplite builds cloud coding agents that turn tasks from GitHub, Linear, Slack and more into pull requests. Thank you to the Hoplite team for supporting Paseo.

From e2f4948f92ce2fc3c4cfb7878f239a88034883de Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 16 Oct 2026 21:00:46 +0200
Subject: [PATCH 219/270] chore(release): cut 0.12.0-beta.1

---
 package-lock.json                        | 56 ++++++++++++------------
 package.json                             |  2 +-
 packages/app/package.json                |  2 +-
 packages/cli/package.json                |  8 ++--
 packages/client/package.json             |  6 +--
 packages/desktop/package.json            |  2 +-
 packages/expo-two-way-audio/package.json |  2 +-
 packages/highlight/package.json          |  2 +-
 packages/plugin/package.json             | 10 ++---
 packages/protocol/package.json           |  2 +-
 packages/relay/package.json              |  2 +-
 packages/server/package.json             | 12 ++---
 packages/website/package.json            |  2 +-
 plugins/package.json                     |  2 +-
 14 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0eba9e0fd0..e91904fd01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -36349,7 +36349,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -37469,12 +37469,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.11.2",
-        "@getpaseo/protocol": "0.11.2",
-        "@getpaseo/server": "0.11.2",
+        "@getpaseo/client": "0.12.0-beta.1",
+        "@getpaseo/protocol": "0.12.0-beta.1",
+        "@getpaseo/server": "0.12.0-beta.1",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -37721,10 +37721,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "dependencies": {
-        "@getpaseo/protocol": "0.11.2",
-        "@getpaseo/relay": "0.11.2",
+        "@getpaseo/protocol": "0.12.0-beta.1",
+        "@getpaseo/relay": "0.12.0-beta.1",
         "zod": "^4.4.3"
       },
       "devDependencies": {
@@ -37735,7 +37735,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -37979,7 +37979,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -38875,7 +38875,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "dependencies": {
         "@codemirror/language": "6.12.4",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -38904,14 +38904,14 @@
     },
     "packages/plugin": {
       "name": "@getpaseo/plugin",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "dependencies": {
         "@agentclientprotocol/sdk": "^1.4.0",
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.11.2",
-        "@getpaseo/protocol": "0.11.2",
+        "@getpaseo/client": "0.12.0-beta.1",
+        "@getpaseo/protocol": "0.12.0-beta.1",
         "@types/node": "^20.9.0",
         "@types/react": "~19.2.0",
         "react": "19.1.0",
@@ -38921,8 +38921,8 @@
         "zod": "^4.4.3"
       },
       "peerDependencies": {
-        "@getpaseo/client": "0.11.2",
-        "@getpaseo/protocol": "0.11.2",
+        "@getpaseo/client": "0.12.0-beta.1",
+        "@getpaseo/protocol": "0.12.0-beta.1",
         "react": "~19.1.0",
         "react-native": ">=0.81.5",
         "zod": "^4.4.3"
@@ -38944,7 +38944,7 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "dependencies": {
         "semver": "^7.8.5",
         "zod": "^4.4.3"
@@ -38971,7 +38971,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -39189,16 +39189,16 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "0.3.246",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.11.2",
-        "@getpaseo/highlight": "0.11.2",
-        "@getpaseo/plugin": "0.11.2",
-        "@getpaseo/protocol": "0.11.2",
-        "@getpaseo/relay": "0.11.2",
+        "@getpaseo/client": "0.12.0-beta.1",
+        "@getpaseo/highlight": "0.12.0-beta.1",
+        "@getpaseo/plugin": "0.12.0-beta.1",
+        "@getpaseo/protocol": "0.12.0-beta.1",
+        "@getpaseo/relay": "0.12.0-beta.1",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "1.29.0",
         "@opencode-ai/sdk": "1.14.46",
@@ -40119,7 +40119,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",
@@ -41727,7 +41727,7 @@
     },
     "plugins": {
       "name": "@getpaseo/builtin-plugins",
-      "version": "0.11.2",
+      "version": "0.12.0-beta.1",
       "dependencies": {
         "@getpaseo/plugin": "*",
         "zod": "^4.4.3"
diff --git a/package.json b/package.json
index ecbfd83891..edc25df8f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [
diff --git a/packages/app/package.json b/packages/app/package.json
index 359814a3ad..670e0d93ab 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "private": true,
   "main": "index.ts",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4fdcfba018..bebedc5c93 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/cli",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "description": "Paseo CLI - control your AI coding agents from the command line",
   "bin": {
     "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.0.0",
-    "@getpaseo/client": "0.11.2",
-    "@getpaseo/protocol": "0.11.2",
-    "@getpaseo/server": "0.11.2",
+    "@getpaseo/client": "0.12.0-beta.1",
+    "@getpaseo/protocol": "0.12.0-beta.1",
+    "@getpaseo/server": "0.12.0-beta.1",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "mime-types": "^2.1.35",
diff --git a/packages/client/package.json b/packages/client/package.json
index 937190e0d0..b10a452edd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/client",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "description": "Paseo client SDK package",
   "files": [
     "dist",
@@ -39,8 +39,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@getpaseo/protocol": "0.11.2",
-    "@getpaseo/relay": "0.11.2",
+    "@getpaseo/protocol": "0.12.0-beta.1",
+    "@getpaseo/relay": "0.12.0-beta.1",
     "zod": "^4.4.3"
   },
   "devDependencies": {
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index e6e2dbd567..ac128ee180 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/desktop",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "private": true,
   "description": "Paseo desktop app (Electron wrapper)",
   "homepage": "https://paseo.sh",
diff --git a/packages/expo-two-way-audio/package.json b/packages/expo-two-way-audio/package.json
index 1e6bd41230..9e49135e39 100644
--- a/packages/expo-two-way-audio/package.json
+++ b/packages/expo-two-way-audio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "description": "Native module for two way audio streaming",
   "keywords": [
     "ExpoTwoWayAudio",
diff --git a/packages/highlight/package.json b/packages/highlight/package.json
index 02e9e28daa..2e3a55146c 100644
--- a/packages/highlight/package.json
+++ b/packages/highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/highlight",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "files": [
     "dist",
     "!dist/**/*.map",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 2797c32211..a7354bc086 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/plugin",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "description": "Paseo plugin SDK package",
   "files": [
     "dist",
@@ -70,8 +70,8 @@
     "use-sync-external-store": "^1.6.0"
   },
   "devDependencies": {
-    "@getpaseo/client": "0.11.2",
-    "@getpaseo/protocol": "0.11.2",
+    "@getpaseo/client": "0.12.0-beta.1",
+    "@getpaseo/protocol": "0.12.0-beta.1",
     "@types/node": "^20.9.0",
     "@types/react": "~19.2.0",
     "react": "19.1.0",
@@ -81,8 +81,8 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@getpaseo/client": "0.11.2",
-    "@getpaseo/protocol": "0.11.2",
+    "@getpaseo/client": "0.12.0-beta.1",
+    "@getpaseo/protocol": "0.12.0-beta.1",
     "react": "~19.1.0",
     "react-native": ">=0.81.5",
     "zod": "^4.4.3"
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index 8ce97a1025..964ff5a51e 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/protocol",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "description": "Paseo shared protocol schemas and wire types",
   "files": [
     "dist",
diff --git a/packages/relay/package.json b/packages/relay/package.json
index d53a1a870e..c182f2c403 100644
--- a/packages/relay/package.json
+++ b/packages/relay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/relay",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "description": "Paseo relay for bridging daemon and client connections",
   "files": [
     "dist",
diff --git a/packages/server/package.json b/packages/server/package.json
index 6e5e2448a2..1116605bf4 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/server",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "description": "Paseo backend server",
   "files": [
     "dist/server",
@@ -107,11 +107,11 @@
     "@agentclientprotocol/sdk": "^0.17.1",
     "@anthropic-ai/claude-agent-sdk": "0.3.246",
     "@anthropic-ai/sdk": "^0.104.2",
-    "@getpaseo/client": "0.11.2",
-    "@getpaseo/highlight": "0.11.2",
-    "@getpaseo/plugin": "0.11.2",
-    "@getpaseo/protocol": "0.11.2",
-    "@getpaseo/relay": "0.11.2",
+    "@getpaseo/client": "0.12.0-beta.1",
+    "@getpaseo/highlight": "0.12.0-beta.1",
+    "@getpaseo/plugin": "0.12.0-beta.1",
+    "@getpaseo/protocol": "0.12.0-beta.1",
+    "@getpaseo/relay": "0.12.0-beta.1",
     "@isaacs/ttlcache": "^2.1.4",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@opencode-ai/sdk": "1.14.46",
diff --git a/packages/website/package.json b/packages/website/package.json
index 1677b3c0fc..3646d4da47 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/website",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/plugins/package.json b/plugins/package.json
index 4bd6ca429b..8f37f073c8 100644
--- a/plugins/package.json
+++ b/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/builtin-plugins",
-  "version": "0.11.2",
+  "version": "0.12.0-beta.1",
   "private": true,
   "type": "module",
   "scripts": {

From 05b3745dcc7c14570e3921eec97f7374d8649198 Mon Sep 17 00:00:00 2001
From: "paseo-ai[bot]" <266920839+paseo-ai[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 19:10:33 +0000
Subject: [PATCH 220/270] fix: update lockfile signatures and Nix hash [skip
 ci]

---
 nix/npm-deps.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/npm-deps.hash b/nix/npm-deps.hash
index 9f7440506e..25fc44e53a 100644
--- a/nix/npm-deps.hash
+++ b/nix/npm-deps.hash
@@ -1 +1 @@
-sha256-Sw9WSOnvebpXgty0WACJrRq+pkKuynLMxJg6D/SnyRk=
+sha256-1WmrHvE68Lzyil4On7xtsPMQTODXZ3Jb3/juUg3nHi4=

From d152f1529ffc5f771506917e9776f6162f6eb357 Mon Sep 17 00:00:00 2001
From: xzthemeofsss <xzthemeofsss@gmail.com>
Date: Sat, 17 Oct 2026 04:12:05 +0800
Subject: [PATCH 221/270] fix(app): recover failed question responses (#7098)

* test: reproduce failed question response recovery

* fix: show question response failures and allow retry
---
 .../question-response-retry/after.png         | Bin 0 -> 19267 bytes
 .../question-response-retry/before.png        | Bin 0 -> 14392 bytes
 .../question-prompt-pagination.spec.ts        | 214 +++++++++++++++++-
 packages/app/src/agent-stream/view.tsx        |   6 +
 .../question-form-card.browser.test.tsx       |   1 +
 .../app/src/components/question-form-card.tsx |  22 +-
 packages/app/src/i18n/resources/ar.ts         |   1 +
 packages/app/src/i18n/resources/en.ts         |   1 +
 packages/app/src/i18n/resources/es.ts         |   1 +
 packages/app/src/i18n/resources/fr.ts         |   1 +
 packages/app/src/i18n/resources/ja.ts         |   1 +
 packages/app/src/i18n/resources/ko.ts         |   1 +
 packages/app/src/i18n/resources/pt-BR.ts      |   1 +
 packages/app/src/i18n/resources/ru.ts         |   1 +
 packages/app/src/i18n/resources/zh-CN.ts      |   1 +
 .../test-utils/question-response-daemon.ts    |  69 ++++++
 16 files changed, 314 insertions(+), 7 deletions(-)
 create mode 100644 docs/qa-evidence/question-response-retry/after.png
 create mode 100644 docs/qa-evidence/question-response-retry/before.png
 create mode 100644 packages/server/src/server/test-utils/question-response-daemon.ts

diff --git a/docs/qa-evidence/question-response-retry/after.png b/docs/qa-evidence/question-response-retry/after.png
new file mode 100644
index 0000000000000000000000000000000000000000..27dddb4bf6f1fc90cd0f927d47ace455377b591c
GIT binary patch
literal 19267
zcmc$`WmHt*+c#<;2uODeNS8EHqjYztbc1vWsDw1qASK=1t)z5!cQbUuyf^-z=fm@^
zcdc{II%loJ2X)3_&+L2e`?`L0O^|||I0_OW(vv4oP$VTpl%70!{s#Q}`sFk5r{-%@
z$df1NPb5V?sJJEXFCe<fsKXGB*rUDTUt``fV`5_Xp<5ND$IQBl(n*EHA8Jix&=y$c
zR;wLY7JB7gP+<h=z6{zA+V6oS)!S`BpvI<bSc!4#x9*$A^Y0uFU8v=uwXKe3T^uwt
z;&&(^K|w(T1c^I41T!-;-vYtU8D)ImK!1P#z`*{2jq039Z&_?q6d@6josp4=p`oFr
zrKKSSo(TBKBEv3FDDUm<m6DUQcXBGLsEC<`5!L9m$b6VqLN<JSiOLg1M9IlXHKoN~
zCVg^?l|NackI&Mg7e+-Z_DXeD5c@Orlk)ORBT|4L`Zq7t12r^$P`!C$YKClOh5X_1
z82&U=RI=1qCue7`u&@$egV$vUQN{P6S2?uD<>%-B=Lr*2)1O3D6_u6OOlbdpNsc+5
z(!4z9@$HO7UTHr*C)QE+KOP##l*Ru186Ykuma|)`gGa!Y2+n$ZbaZ}nR7t!xgY~6H
z>V7N(H?wX7CdM&89i1k&ZcPnWNeMFw(d6aH2|76B4c%Q?Y(j#clYxneg`FLJJl>z7
zcTy1c#JITB$Vh85v&?e&NCG%7IhVPb1x?L&-rg<D%!4&GqSxYSQBhIow7%bjNcr8S
ztF36jxn?0~y1DsPI!Y=^ptBjX)fX36)50rse#q!0`VhSS+MG}G4HE-HA(xF-;OhGF
zA0q;SorQ)MNMJ=$C@3?LE4RTRgZJ!NCAEZD^JAi;!|H`5x-xiQ63XLNexI3n*U4n@
zVXlU0Y>d4`7a0?L{A;@YGXEZGWMoIhWDO0Cyp0G7{+I6Z7o*t>hlkZ7<$hSLZpXo3
zg?r@<0*XUJW!NiM&yU5FmB;$~WhUbOy_kz)wLT=Ik~U69S2tBK>~U4VVKsh4M=QU9
z22TCy5D9nZ`0v-!(bbzTVU+r&q}Yr+Y*S%i;NW@>;bLH5L}IX7gTF8c6ctm?J&!4F
zW~-AVB_%T?`g(gCoEbPMDKBjcJTFPRx@lg5^YyT~yER~-q1ifKqsb`q4_Hirz_z60
zOQ@(@o^nq%^}f!^$tl*XB!BnrlEZa>+VS$xOYyaQnqWxiXYx=q8qfP16tLbZ{C9l@
z$WseA4Bo{G>B+R#Q>6&*?h_<jMXiNa1jioii?8w5k5<-v?wuv^HC<dTmj4I~2<(9c
z&sbeqYBED6H@ZI27YirOIG#vIm_C@h<o7t69vm!jKcx;My#8h17nicp8*4L~l|F9P
z6E$Ho%TcPBIZNh4Tvk)lMi1UC0-x0!x(I1+r(AcqzQ097K;7Ti-E}ye?;Oh=>g=Y8
zW7<2pnEPtd%Oj2O#qX=C0&am;wL`7#S1zu4eX*Mp6Qmk+Oo#42e+H+f#AnYTke7c$
z)Jqrh^qPCijdGK?&TU3AcA{x8cs?e_R66c-g%P=VdhSkFbPWb7qmlCOPVCv_4=pw$
zFflT|4Pa0&@jO~i*RjPU{!D~et&%TvtN2t^X;iE60xztzM6cO&txLAN+#ZE+JdMkS
za53}8j~|Fw)Q3y0;=5%&u&*S1E{vKd>~U+Wt7bzF59>YAJP+X{e4npY;C6(6{rU4J
z1edAh(+b6dTmTBu$)vX3y;sidWQndTbn!W)m0CGR#>KuTY<Xp6MgKGF!EE(jwsbrp
zuag9HvAK#96WlA)5cL@(G+3Gi+kzzWWXZz*x{Bf5mEyr%?P9qRG*f)VTt-4dN>Wns
z;tvkDfPgTqH~H3jPi0(OoG<)2*v7_FB`NgkCEJI3h5D_oQgKdgF%+X3NnA_;Xk^>V
zA6q@n;Vqm+nYJ9>zYl5g@_haA{-jTA=Qo$lY_P^;D~xa8CudjihY#edOZag8Xohlc
z8Ta)r4^spL1XkCuKCNF|TnK-^5O<hua8{R)NEjB<HcO`NQkY?)qubf&i`Uqmuh;cQ
z+E|#k{MbQEOe|ucki;;aQiVz;*kIgKu`|}XSY|-NwnUTmnI3xy{dRkV(j;wtJstyN
z$ZwUa8WBsdO?t@(g3M|)l<IZ5#e!ZB2}0*|Sf_o{Y0?*WwtaljP3GgWJ8lt4#LDvd
z?l^a$!CANIs=L2G6ipC6Ei&@fjNN75E%|&fWsX_~AL4ZrTBu%XVf6+S-ZGz(3e}d+
z^(K9j5`QR`viy-xE6s-ZTwZ;0aOlWX%0}AUy#CC@m$Sm_YRkgZSf`<-sX03{6UU;j
zR=!uEoD<ru%t&eNb$h^{#lc7n@rGxWzCm@u!`o{AE)TY1iyMX`>>+bVFexx9=x>;7
zklEnf#>xsclJ5uK*XIOpf5is{A;v|JK@PUJhpVl`6J^xO4X^$D;MS!(D8m>s-sJe0
zy(f@#?m&96iG=V9zsYuiWi;p&A%}|A<V&3V0@cE+8?LsK`Fh8UOy>mwTx{&mJEPe~
z-Kg=5iP~Qs?d{)rUJ&ED9L}re$Rw7w{0ykPxF|6*GQuMx`+kALpaw31Oo8G={@Mz3
z>6t%+(@PYT6#nbX6QuLKsqUAryEbgFL0KzZCQA_`e&-N~&3S@CkbqgBUV7NzoYdUJ
zZ#hw**ytil_i6j}z$;5Xf-XFk48>o;AtAza2uwRWJLZ2{69i&zre|j}NU5<egOU;x
zDcmFvMn+hbIJ3*PAuqpBgq?KQe|(t|h%q`Q6-#eut1=f1@61J-#Xx6=Ld+u~K8ji2
z$~A4e(W@%pd0{(M!lY87BPqVMysSM@pc);8dv!J5Eo^Bw{OjvUQKKuAnrXhl8M!^s
zLVPDbD2R@lmWbnMXTE-{&K`@`d3U<0-ltHF33Pc8+emp~N(>CeulHlze<}4oN--?`
zc-rjYyf;-U?&307W7B9hq=%1%l~jwiOC^NHZMUdZ_i5)~&Y-TBmoGkwke$8qlj>m7
z%IN6mC$H+VxACMVeGMEoyM<ffXIZe<d2RjiyZ&TB=uESyGDCy@9$G)ijl6Dlwi=>w
z>+0)Cc*<B_zh2%RF*=xa{*m)yf;Ixe#H6~0rjW5PuOrOWwoZqX$i-DNYV`Zd1E=LW
z?zQRQo$X@NyO|lyG@l2P_wR4JBgm}&>mFW#za|w}9L*()`jMn9%Rf5Cj?1EFf4n;3
za-g-M1RxBJ^KX^RGcSZ|Ue61mwJsDsXG;d`%LVAnDGlzA1_g-l1X887kUf!tgoH*I
zp=xBwk9MtE+Y-hf_`a#WzoZVjuig&qt}2PmeX!gM4b32apI&E%Yy#OBBVO|>C1B6l
z8$+q?xm+ar+FhdCm?L-ZbhfQHIXRh_m^hRsE@je($MV2etI_Ck;E#+)jw`L)tf;6+
zPF{O|pOk*TJ5kt+Vkm^}!=J$I<XEVhi@M2in}2}e^Mpye<~Jo3Rkka%Wv<4C4D#?i
zEDRvEykB}_ES$13GB-DSGovXxiAZvCR3e89?@WY*p@N>cL0Qi0e-X1NylPBMOoEWP
zs8Q_Q7h7Rv<AFcpa&x-}Q#?VT9vdAUdFUoXP(Y#AZz0C)Y4Q3#9N4`%FqciV1#>1P
zwKXuf1eO1*PGD$YkX(Ni;Vi-P!0WN)<+;DA>FKVAi(bEUvYmF6(8vVEFeL7XOb31n
z82^1sCqVP&4KE)brGx?7$o%~0_5c(B)xe8DZ7dwGw_V`nnI&Lv0Uusu^ya8t((_{7
z+pt`>@k<CEi_J_0j!Dy8tsNRM4+jUwrP0$AUgw+ZEvi~u|K%bU-G=?WJ=cTTbFjzC
zK5Z);E(u%GKX8op#xj(aE23jyG=G~q+w$1ow+7{Fy26Bp^snmTqMnkP`DD@YLgVG;
z5Nu|Ayvn36he~SuyuSX+m$<!2n^Z0vTqTuwW)g7W=&CcD&TgT6n*-XRR_sW+pn1eu
zLWBd(g!x8Eqok@WRXr}fwVU7-9QMX?Z@)hO?sIFyCnX3v{zvbz;X%~`m6KB|zmeY#
zVT2RA<N3upopW=iV7Ynr5V6D>>v%$ZCWq67b7c~Pe;FAWt!;1fxY{1xtNv|S`h0rM
zz4W=!u(JROr`Pq6*lqo<Vq{WkaU7F&@Plm94dtiI98Qy7pJBa1wPN?v&A~)=Xb4LV
zc{Zq1xmHum=Fp{97Nzk<Xn0^mL~V6-;#-4n@#=?o1~Na-Msm}<0}!}C-_>n!LKJE1
zo1+C_U+*g;KY!ay{ihZcIySb3GOp~Hm>6p#qhc=2fGFRfp!s3G_~>Z;j1DR<qG)=*
zcQRa>T3UJ4nMMBhmQ4r}v9p>)M(E>NSy{U<jCWxvigf*d|BlyTtV@%mi7N0l(kbW2
zrak1-^1GQS`c&1{s@sUXqo<}8bLVTKS7}3U%<d6U%~PA5o7?az&CJY9NlqSrNFEM!
z%bnCT%KSM5Nn^E|<ak8JB+MzLw`hu)sFAg-c5g?&pZRCIuY4=8_a(IZ<4uBpW&%gZ
zmqc&Ap9akp3`4RLS-gBUBVh!JCNw{+%f*IDK5TBJH4<!^CrGEMOgh+#RG6KTYHBq)
z4-k{6e>fIbvF<Nyu$C(*NRkjH|0OU`Le?OFsq+%qICvHA)ZUUR<KN3BCnl%>;-!tF
zph%5n+M@?+c%qzOfQ<Ft!onhhM^aW+J?VnJ&G*NpF(|pHNDWlM*-6~KL|kXM|B&%|
z8C7&ocBwfFDgf)O#c|x$I6WVR-73y^C(6spc-)TiXiZUxc?`jgv9m+|pQERV#k`@W
z-dbPR&`2=q?de$OyeBPHkBp5CL#!Sj=cw1QHOsv&NugkWd6T>!PT~m)-~57=ftupY
z)7}hvR#wEy@7%U<bF;HfJEI@K4%wgqm-?tZPT}(xGBlm6%E~a9<69UHwi|jnhqtYq
z>IgoZfc(YH`7dNVW&jgjy?CqWL~aDmcC;)#A~&}Y5Q0(P^0r6ZjuFJY>RAImX5gav
z|Cwd|Z=~!0!-sG1U;%&s{$)2CMCx4wErdm{3H=2QHn!8ATA<sDtsxi=#<5IO#qjXk
zF!8A9XveFg$gHe4|8PIH>2!nJu~HJ(!RXjncCMzT=E0n+R?Fw?iuSIsBmhsz&y#u2
zmG5is0E+F4FAdCKW@kUWzwEYIYQgI3>FJ@7OYXoYtnyD}Z%yNKO?7(#y3xi=<yHrS
zcB^;$?u6Az&06T9m+N{ojeMsSqEDi5K-1pV7UbjakLz;aBb@ajv0J;l)j_<8y+P~S
z*_kMuI$Uh7wOjHw`A#Vwt_r$4{^4?hvjyCLYXN_R(|iPFv7K{ra%kj;-7go?HM%5F
z2{|~Zs5*Z!G3wo|eR~0UN&n;ak}MRTwZN$Rf<c`bI-GvL{HNV^2^HrN!Q{MckBf~}
z^@SJQ8cc~#P33nluv=OLEog0R&EN20yUiaNfLzrJaa81&+rwoB(WR{q@TF2=phB9D
z<#?s=o_n0{hUC*$-5s@mdx4DW@9$r2KH||Go?^)-;JoX!HMqdf-_+o8;Jq_yk`D@c
zH~<VWacP2Kzk^4ca4y(<9)y~9*Vg!4_7Td<%azjV>aJjSTWes^Gq(0;907sPzJNST
z-wyIM?@ifp*v`XktZP|X?gD5V&@SdfT(8nIHk}8r-7e|wF$o>Zg>2qtiCOzx9txP}
zYfll$L#~#EL+2tX#lNEvh35iBa(&WQ>P#Fuy9+vtVjSjac-BvV7$}DfM8_!=om6Tl
zSJHoPZfy9HH+$a)RCrw;LOd?^l}l5Hj#elmv$DlP=Kv9j^(td&qO|1mxH;QNV1+Gw
z{B%^@Bwpcli<(?l^%-EYCgk4w@xukrjM=P%GgS-EvFa4lMU>fT4ZHce5?82RwN>Le
zbZKgK_U7VX4)pHr3G5RA?T3efm}r*nh%|G6=T_sL&P8{n<h*C<%1h5IRaCH*+WHgO
zyTZME#&QOdxM9rL*ZWC!E%(d5tgR0Xvz?uyKOOfc_EJ&>JXP`(3`R2ir(1Rp4UN{`
z?y#FHz`Sl<YAq))?*UmKegIs;;=}r&wu#{9D~VotWZb(ti!r;k?g;I&kED|%f_DO<
z-x=XbzoU^2CUKjMW(DyS)H^zc2=hetMCU$IiwYA61NBvxsj=}dufb$@a&mGauDhEt
zc?c<=3s``OSwd9<bZWWe`EsN0oK|X+MVguFrQS;8$Y^M=!$!@#oFa{Km36rU!A>~C
z`<rvfgIlm+WhK~X8EYTM)gr>f<G2d#-%NxOa@Gj>pLkv#{^U6p7U9hz&cDx1!>zTR
zG29vL3=a>_6l-STH1y^9GMMswsz}rS@|p72Km{TD+Z5~^DxQaU7X5<57vg-TuN-XV
zqo^QZ_^iZ{9MH(|65ZS3^!CwYx(Dkc?-YR~qM7m#B5vD;#;Hk{n}Vw59YT5KHTaa2
z6u{0TwG+7Qyj@)4W|xQnGJcAEl8XT#8naH_%PFRHdYL~QmgDHKR33Z!w`F73r&}0J
z3QRvdGO+!!OziAfvRSdS6%_NdYY%&(#iiq!!%#~~N@Ra>2nS{8)H?uhtfi$jS*$H?
z<C>nH?odxmR9jx2_;$tjaG|khgUzNpKpI+M!hp-1Ool#8C~vQMf83phiHZ5v-D#z*
zlif@%hEY?gTt6P@10M}`MmM0%+!=ODf*M^VUS9VKgBH_e9~2bI()6PVIV}U{qxy04
z1GCE&aaN~(eRv*#N)l>f2lYTjMNOa;`T1w;>+@Tn0!UOl24SL(=DcOMva%{%`^ZsJ
zvYl!0hBdSoRf3ClP9}x7{@b?*v_(RO9jZ{8XUw?!`}@zHFA1&EY1ix*s9FWQB4Ben
zdS5kFxaE9mIy_lC*BwSgdE&d)<h(aIQ<<9;9oqv}5wDe|Rc)EU7+kfxvSNR+U;p&^
zP0BmR8tM4=cd8$Yj<_?|&YZ_wel~Dljfh8o!rz;M(UY)aV2l*fu9x|TP?h}56I&h)
z&oVJE7-_19l#Ef-#vMT%10|kFX!(?GFv~t6H-3F{cfCc9ZEa}iz`((xPrWxy!W<3w
zo%K}7n6{m>?N|<{LsIzQG+QupOAAVNZnjkH&2Ax!KLw3ysh+Ns)|W7eIYd-cE>_kL
z3lf&xoSg00_$A$Ttqab(<MQoohgFsn8AjdVO20;?^N>7urb<hz7^8a>OcYz*Y|t-M
zk%ZPvoRUadqxf=poM~VeYSmbWkFc||EAx@Y#2nel$h>O9MSbsnH%hy6T`rz=0B9qF
za!9FNW|P<3*WTV?pn>TWYjF}^G`TNbLeq%IM!vl)y#2Q-yj+2h&J;dZGKhEG=j)Tl
z5)zAZ!a-5;6Tm`)@Xd~(=s->LKQW2u?+gqK%wx3PfHqNJC5eoHdN)(=I0Zg6dA4ey
z8t2kN`ewP+RL${P_hO@KtKHJm=kTxOq@|VjGMk8AO;GRu?eEtqer{=vi@WL09lo0E
z>)SlAq!2IkRBT<&>SDgxQ#@M=2kf(;;J+*F;#HglZC@?sLsG%XbKQilC%>!2W4?PD
zZIUo+HIjjnvy$bqp-rj$BTiXKskn$ScF(Yq&~8yZyaux&za$VTdl>Emv2ziq&E#F_
zaY1LN>pfUi5>FR~$J7O0h2`cO0SGENO&1NI22NZXOi9@XX6kvd-wC($Hxeqv1bUTr
zy#q>#kMpkEw%#KtNWf0wJ%<R{BM;Ut4XU*Gg=BZB{-{NFI(iQSGR~T1Se2QLjjwdI
z%CF$y8))(5M4`HH=<gU@)0`u0$CU1H5^=Nf3GXX|uN1E|Uv|n$<jqu>k2Ja1aLdcf
z>ja!0ViztS_s}RquGdegq~p@{GKv)uRVlD*W9(1o>ra8o({~wMa<_{>f{+;*9;wpy
z%6f0I_~<?9?qc&+9MhcOjrq44l+`D18GC2n?5dh$1RtZJ`DF0VCM1|w<7Ds50$r7^
z-J<COslp$vx+9u?d?RWt+RaQf65f-mV<Q>OUH2QpB`2H5l>s%SOBkRzoT$fz@hb*M
zqsQ2xe?XE+0>AaXre2dBVv;CAB*VB$AKudfAUd=a27`tG0g>KP9c+6QhGei?{+JGE
zWsvkqO7;N#ABTRu3r}YmD5n0?eh05FB~n;@{OYq<TJLsu#^#fT&4yChy>4o0tK2*$
zon4skC)CHVu&~N|5y(E*d0vujFJ((_iH6`(5`WD7`)P3zB|Bny<y)9@BxzY=M+clm
z1R;^CLF(~VTD&3h_Gven=j}OBLTqfY5iNQrup2NCvXv)Y-UftcDS__C_3bHkeYJqd
z0LMZPw79l`QLpI@Ev*FaL#B9y%l5Dyt!=Fk4%V&Es8F7iyn3tMLSG+NcBWm+HL6i~
zWH+tFyth9R&fC&j$1P^Mp_Ni|07%aFJf$&Y)5fN*a;*4dNr*%cU50<9m!3>i0Blr%
z1hKAfXn0MOKZw725|ofVgwRMWbM?dopM@n2EE3rJN;Bb7&!rSdc;O1X`=0!gPvR=(
zb=qDBaOTtU51`)_Xp~dTwqC7PmX+~^5pkbh+6Dc{-G?o>vcDahD$%9ce}-Yu6P2cL
z0jv^G3q{S%HQEEh?(cq55`4bd=@znIb59d&hDRe+tIW9##DL2FJd0E@x!$jo2aI5Q
zN0Ur_8{nm$Xc`ME75~|}qm}kWPrIrl?G%f#mQ;ujbGS&i0??SkiQnB7mbOIN(oFql
zHGvkEE0@A=(%TKL$xm)O|I0i;7J0d*TYZ-P_#&W^@ILE?wWFPG4c?QI;~W68{-L5n
zdu=7slOOahO9r6y86*#-@O}41e6`PO*wHxa@^uwAI7C8M!*+feZ-TCAXH@zoxuuI+
zcg|vW`t<{*T$*5}77-;7>TxQLj$WE=MXfqx5)p+kRPD;@VvegQ-2K%i6_%wE6kP1-
zkt`OVrtbRl=V{^k0;*|D8FIBtj9!_t1)HL(lM@G5Nsa#gNZT`K){xIcr^&j>nMR1|
zWaGM@TndEKk3UvHrB5Xa+Tck@NHBQ)y+4KHt5%C)zfj~EcY(yg5sWV`%E3r1VxT)#
zkDx543kB50T|qqHAqa?yiM56sgaGc6Xa0Vg{*Gup2>e?j=-*R+1M&aSn$W=ipC2M&
z);KsgjE=HZR#cGFh=UD}fn&gy_@i%wnwkw6nVldN|L<~HY-(!a&z}aC^wE7LIXToX
zrh&JDF+v1qLOmX@U@9deQ(eIZIuWBF!6Y9O6D1{O-)K~H1i0;0bbeL&Rm24ay=Ctk
z5PGRcYroUlpaUz(voJ9>{+X2Y=(c1S_RP;?`_sIkxK|(Hwod;NFeAMG{@*7tqUF!d
zGG5>IT54!9Ko(`k9)<&NtXOVlNiQuuR$G^Cmrc*WAkJ(y4UR+6+Z@8cz@R-ec%xPW
zpgzIB6@HTbazx_aQ*T*%?A#yyJj~$UxCedCUZTavEAs#B68!x_mXWjinwR$mAb0?=
zR@0)Oq`tns!a_o2=r}mehx6~!Ym<|cK^dW<q6$(+$Hk>SXnq3pO90J*N^UT$)q6@s
zk&%&p)IQk}1hW{+Njbv@9$jy2;TbGg^~RNa0PyGoP{n}Wj0a35FAu-~3}h@l$G2~x
zTZ3t>Pmtr8bsx^gSo{_%Dk{Jp<roxd`W8myb9+8jo$>zLw{P7Mu;JnL0)Bm<y%Qq&
z5VEqdRoELX9WE@1bs-@)RvNU6=~x3Tjc&Wz^<rNWn0`#!T+;GDKm(Wxcq%nWnTm6n
zV#s)d@qJ5wF|F@!7HQ;3S(LkGepN5dgO5)U7J9Peq^_<`mUe?e#I-$DIs{rPa9Vux
zlWF8r;oz$H>{pFHE^7m>DO3xpioD=;k;T~NLSyUcoE^-kUboppw$X)zkjol)TDOn#
zWf&nJbfFOnNN|aE?ch>t=g9_x8Ib$z7SVbSinOXdcE=<94S9C}Rok5|XAiak#C)({
z1(s;LGyPWdd{TSivsV(MehUS~>dX)F_NHcgr03vT4<jJ^Jh&^=BO$qgR;fNW*clQJ
zD41?(Dq4-NQ8Z!et?gtKRbR`!i)l3V0ALK>C+l?i0-T)Zr$eo0r>EV2h7yi-Jv?rJ
zea7qbGR8FJ2pi$^)sbTUDbUhF3^0P<<&0!@1I&(})bME~qsxAnE1-bOdfLxxqIBue
zw@RSHs(%stj@`81<KgaIfFYn;$aoKR<|9L{hx32NbQ@hPJdsaYiW@F7q--K);Xi>^
z0`xaUZS^_NU~c5jH_2Cg(6a_-=~H7JH#Z)!q3&G8@2Dv;G~bkg7?4?khI$2vTyHLe
zT2TkzM2lB<nvY(A$7%!26u7oGmt^Q<WTiH_pf?V2g9hi(czbcs>bNC0p=(s+akd@g
zO6+s$W(9{qOs}r<-&z1hb4lm}WEcn$S4&Qgj;Eoa{o)a%u(Pq%%O$e&5pgVq%bz^<
zqrk)297^K`;9Q3VKnO;MLOO8_*&KP8M|*&?Lw(Obs|n&;T+Yrme|_qcBIpHw&*!|W
z(CU2;s58B5v(*&Y`L4UsQzDVuEJ>`^n_X#R5}C0)k}M}{tI4~Qjd*>T<f{=h2qQkH
zrBei{U8z<z1rrmB1)|sd!a{63%+Jry>-OUM=BB_FZfe|hi3C7**lcyH)9(0AI~t8)
zlDW?@1&|c<fgc96dX*aM8OdmBBM;<*={{iV0ps=j+ly2AWS(-<fznt8_295D6x0@f
z^-{fNm&?NiEShj>A_&0R05xZ3>W31Zdv^xo#4~B{9_ZTjCzRJ|ZIK{^8RhMs?TmrD
zk&xYVyf?P5FUFqWodX9USm&|EOTOu=yK6|5#n^6&tA`VGu^7N>x7jKSWgEM%vvWV8
zdMfz`igQo8IyydTj89HnrBXPMTXc4HF=<tOoGwfMTOkx(Zq%)wr{KLcXoE!^3hDuT
zfEF!%g`0M)7Z6y0NgG`C`R+>c?E1L-1+@8+H0no8@Y!`zPjBx5rEI3ve14bM#x(_%
z(Xft=&XJ4j&ghF=$Ga=Ujgm-C8o9eqy)ivkeB#$Y+8){KtxFRVvHd;ql8V`nDSu-v
zB6qTI%ikX`S-l3Q>+$@xnwlCRj=<2*<t_&|U%qhV&8rk^bxze{-1MjLAsh?Q9(s*T
zYtlMQ1EB|m9m;eHRPuqv$ZZD?%&)Jb&!p(Us*55T&s1zk$KAa#$%M8fea(2WYXh3*
zmZ0st1{xaL__{aDOM0OpwXP}Me);!P2~6N@zC#y%iJkn38Pt{{wPH)4e5<P0mX%Fc
zn&FKi0)f4_5^zDFN2wQSJe9Yaav@?jt*ZJG_{Gs;JdYe6;k0<7aLd;CbW;{&8rTwF
zA-G?kn6R)6oo)?fGP_+^AKotmtArNzS}G$h!2IO6TX{Ippvn8bYcQoTo2f9oy~c*`
zBs`rSErM4({7$n##Uh<nn9FVvQ<Z?&9h^*25hJUIQf-BaE)x^%R%Pxs`=VyE5l>wm
z&jg`bAY(k&=E;P)r+leyBPk}P1Mrl^#l_RFVik;8s+}X9SW5-mPsBHH-WKpYNsrcH
zPGUFX3V7y2got<yl$b|-XH**OW+y1e66H*_l`Ek600puqzYO4JJ9($%8G<{Itq!^R
z$aoRr54<^YJv0I~4RATFdT0%hPhDGK51t+#VgT#3b*y$m==GK0W3+2+$y0!)S9yjF
z%VqX@R%kQF1^oFo9i>JWo2Q+mBq`|*8@)<x=)rYkCAz<X;PvSkXgh&v`dB(nWc+S{
zyR*QUh*5otO$z*Z{Y){G>h`XjtQYHu>Qii^Z1hSmp9*2vO2yEAeHPW~Qz`sC91b47
zpg26Fyt?`vC`xT@haKISQc*F<$r&z_+sfHeCd807HGpCTZ}&s^Tn|@IW`IRb7sFvO
zdbK|T4uI5AGz5XY>MQ^xLBG*uU~Z0RZ?VCdkB-j$Vjr4aoDTPGR%6kAm?xk>D(2Jg
zGGhL#xoDb|yyxi~8-2#<(c!i4&*Ah<Sa{(T2HL+zaJ1y6ryBsq3cO8FyI(^asHv#|
z0Vd?O70Q((Q53bBD9Co0ugX`>MGcqLx;Q>g6!1i4t36Y>T#{+woA7#*0N;5Vo|Qd+
z-WAqLr>`3B4k85@r7wU%R1(S-Hr?R72VnEv#hl#*bg9x6YD*`U_oovR?=2CL_Rd%2
zE})kvmVa_|<oond|NZ+X)Pq0=eC@?3t-aNhBziCTbFr<pE-I*%<tRLyD$5xop(_IR
z8$_YHj|*)zooT*)B>@H354m_1H#^+Yid+Lg2AhQjl!SiZvn7XxRi9AlSjG1BdZw|;
z*V@eCsucW?y}#F9{yY-+C9rq0FP?=Jvc0JW?hXlE^%5P?m&(b~QA~2HQ2XCJK-Qy&
z9$OI$t0JJ0dfXn6CS;0u3!%tte}L8g`t3Qw`o*%UIX6F_uAq|~8F_%J5Qx-C+;(y<
zF1Xa2&z{XfyzhAI$R?C4tE!YVYkse6+;bt=_^>y)7TiiGDd`!y_U6*&Q?%2$X5D43
zE}Q|`_+6$-je^u4SkB&|FCu4F9B4AxcVw>FY$nM|o_27gz|s84dp<UjDZaB^lw-fv
zrKrfF;Pj_zN*=PIHV*9h0D^W@l3A;w7JN9#!v$CI*Bu{G%Y|N??-VzCUK)g3uXVu|
zIU{;<K68U`22li^GPTcfXVpfZ`p02<)dF)%%YdFg@F;|<#vsxn+$4;Y$jj-vi;e+A
zY|qiAbX)gs^dRx;-J5eFoHX48KNFp0vw<7EIhP;LvtHaUeS5YqngM%a=_wEHnR>Tl
zOh0mqaE&>X6A7CCX|0N@Ro2wFpR5OsKgIf7Ue4P40F?3AK3XcnUbL@xKBjHxgsuhU
ziuFhjTmZwx07XbBvh|$I2hbeZJ1dyHPOYtO408+2TdtxlhE7>L!kg@%(sY27%@|)x
z<j`w7XmD^)0&$ji%OAGT&3V<w(kdkTQe7lHLECzc>*LKCL1d(2T_8YLEt-{^mX-V-
zVCCYPo7>SK{b;ZDV=h%aJ#Ta6DKj!M6fQKHJqAE^bhbmmo2qx*A}265GozuV&WNL|
zzP;wut1w11jQcwf-eNYG>~*vpnQNxYkMhzS^p#_<;zq@}@@X#62h<$oQ(Mh7`~nhs
z(|HAmw3O6OZuvcRUe$c1^M`wcgi2vfQCRKo;pV)HDaR+(&AB`hG9uoW3)aL2A|igf
z;>xjlO@Sxp=h3}s`S}UnGN8a;GME44v`Xf8r|00nCK54he^ciWdvw$dfi+>LuoCh_
zhLg-8Kew3Auc1`51V}59eai*9820qTC!H$uAeEvCgU$Y#g!dp|c*c7@)rK22Twx;3
ztk*PNXRl0_CI*10*ZG9HIT^20-m0KIg#T?OhwI@bFRzu~4c6v@3X3$mnfKoE#|Xq~
zu)z(IPPbscnqB}}?53db3CKIAE#uWzcxY&@KCn0x!mAdy;|yR%H*otKPW<uxK0;td
zh=+GMB2FfGkiZ%m=tk|&#K+eND(yrmlxl#WzOivARlsqjjjXw87i`-<V`Es3?(Vfk
z_ODa{;fK%80r<4mmSi}?zqN+)?A*rB7jSO|OBML$7w`w7J-?ogU!@w>;WBAmP3doy
zkJ&DGydvV_fCeXwr*iCM%0uq^r)nkNzvqKMTA6hn>{^NV-9CcI5NpKFL5gQ?d`KT`
z>F-j$@^@fiTwihQ&z{@Z*+J1D$**5!+2_uNiy+1_HMv6WtKjS|%M98*FTKr{e}Cn@
z_%<G%KL>0qK;}GB{<gJKCZ|Ym&ase_caDzII);zB3g<0|_`^nk$R(UFoHpno<o=qD
zZf2z1&+WxaUVyf=t1bO&Q1ez_<L~(R9UmX#;>H!!Zf;X@aScvRie08G%yuc5P?k&3
zxI<#|;Z-@3BONY!hil&tHPaGse3@MwtE&USGrk3Gc2RM0K3?8}^AAB7nFXvNYaJj1
zfZ~;VHUm(Q>J_E^r%&h}?-y5@bVNj8q2uE+p0{_UYLSs6Fz;y(Wq$V)<GGpx06l}B
zMVv)?0{TE-bB3nf$qONPLq+wXI)h3Ym)!y|(8vdk8SuXpZ1@cSvY(|d0+=2jQyTsw
zqHGlZ^>Fl(!QGfG{r3A2Aew=}h<+6Jz+_u00|C?j=BIE%kq`P5#dZ)Ztatx8m=Hz{
zdf3^1ksSmXd8}XNKZgQ#tgm^Nnb|#bCQ4H?F+11nG1Ho1$S5Fyl`fHUDXR^CXIh+?
zm|tISp{14cNOS4q6x`UjxrJ#*eQ?@aZk`$-vocdrwReb6$8QOqMK}X`E@GDfxaz+3
zU37F}qVLbR50cW@%bqo5&y|&<tEyi0tC^ab9_P3}9&A=YGwM+kpmuS|c|psLvo0-L
zP9!bu2;4>x$z0+7iv`w&0HghX#4Z2dJX9q2FHTNA>+q|ZPN+)Qu1dgXG|tZXCm3*l
z56X`9&y4n0mPDqZVN95tL2mbP;Vl(<sXa1P+OdGdRbJI$pc%)gnNic|ZzQSA!0`An
z&o=+cNJ@r?&d~DitoUvh#<PzprOfju^X~<zQzD~9d~#u?LwX}XF1UJyF((yEvar`H
z`;Jl){HCb5i>ayg@cH^tcgcWu(#%ZIv!KvWW;dbWdUt^p+XSnSNn9#o(EKqJN4^Ou
zNtWK!;L!V%E$U~O+K6BBX1rg|c;5z_PfCf@tG7a<e!N%c+ZdCj)OIG>**7+#g>OZ_
zV!yE_x0q2a*6VHj`tS0=OWkr*6l=V@`}pA`?vDX-<@dPk6q16e$FP`4XMnIQw{&h)
z`5$ioudk4`cMy*eUE4Lr{@oOLpm|&kYZC+o!55ooOb7FLcT|g7JuZO?V?CGM{aFWw
zuNv!XYf=4HL+yMvXdunwt<=|+pCwy=!pdE;(;B?^n14M~`;qCX`|tNc-?_VW`2)Lj
zeS1cK2?#<79}O)!?U;cUkYOliYf8<{JtQ%DImqPIuBK%j3NFsSbGSec9yKxqH?!+>
za8M1S=5PIT^2d{x0w<r-C9*f82`j@f8tnad*Qm?{Pt;aqLj^Q~EjrW-tW9#7WIV2(
zAiJm*Bx-2<=gNa?PIu3seG^bzG>#3ftK#cGO>&0#uEjb_^?a#t^q|YbINRyG3(vI<
z2H@VmWoO4KU0!VdP9@C?a^Qv4G&HTBPu^sh4p^=Z98;6B?;M?3_{mVaIx|rM)1%r?
z!OuL)&dk7g=h%LWI{ftKiDpVU89mY3H#<_F+E&<5;l}1>8~RYHC@|=FK|s^cP$`iu
zJBib3zRUoGfPwRDF;ii2f1_u4P&a5ZU$@c6k{hUgdbY!^tgLLdrPOwXw3iT4Y|`f)
z6c(mzRismI2wk)b@o5LqsH1Lnw@><Dx$Okk0+`0D24#uoK6mm~Utk_O|LoUw^4Na~
zGiiO<Eb#ft?R@tfWI8~=jhkKxsO`KC>mp80*56TWI`+0erWl~c$1LS`^;EghdoeL;
z+=si<KoE<LrVcB!wy~jmpt`@kjOsB4PERo0T0rp}L;PgY$vfN%cD8l;%J<?q0spN9
zc)MBZwUzhsd9_WJl(2rvOVt*xD$t&4)~<cOlOM010!R-~cvDkTZEbBIPE2}J1rQX@
zD$3rLDt9;QHmZ$oSS~ho=E=t}Yz1$CGClsbE5c`J)yIyo(ev_QrJbg&J#8{i5hrP&
z(JDqDjs;e2He~B_S579%Nk+!v;{&nUn|D_YyVb3CSnx$a+i-{m;js3Aa~9QIA6r*G
z_mh2~l0`>H7pmm@jYa0Lm8Ud&!d@ZPuPuMv+S?n;i$o(V)kkaaI1l(PegM>{%<+}I
zx!*&jk*VEHW<zPfA!QW;>dx6U@W}y<7oed*@O4=e`y?fWG>P)c8cZb=8~p;>!Aw;?
z3o8D3WogTehBKZei$Pyt!c@r%Fc>hIuT0d~_4JpvjLiPUfhVbe2MFd*HMwK$jF;Jl
z;L6&&fY`+!IqlkuQpL5_v0n+8oi2w<KHK{`4fbpBi;JlZ--Teu<2ge94x`Tko)xMW
zYtcaw<r3a{bO!5-hZ9rSkZsj{S{c=AUS!s9Dca2$zCPP=JU$M(TKjx^@Ed^S><gei
zq(OY%k&{0~FtV{B!NQs<)~2z!k09X-a(wmDJb$eyC~#ZWVA_t75YD7Hfk^$pY8*4T
z6voR{$BpYyQ4x-^L;0fA!Dd$A-AV2P5r8Io%^s=~aiiJN=Ld7oB^mhmJQo@U%FB-f
zkpYGObH4NYYr9ffLIS=HUbcx-NO-v7ZLc~UT~Ww&%St<fT7k++1O#<`!C6fWSB>9k
z8~>R|uAEJ&PQCrksH%l8;pJStV<QNmHP%mTPeDl#5D+G0$-PMgJSxN^m;sv<#+?Bv
z=fkq~b?ezG9QFB!`=vkgwBh8mv~UOc`4+BF!I#L5bB(U9WN99N@^<fMrFMt95NDkj
zgZI$OS8``uW(25iw8lmnjs>o}+RCSWW(S`ZuC&<`4Y=bVhwg3JsNjjX<-9Y>`3ghm
zIR&;}R70_D<4jL}$JKG>Y^`0hQTL*FL|e8qQ0cU5iWuaczI&eQE07@|C}?oLi}GJ-
z?EbbZAVTfnBl&iXDHPBI@@6L{&J=5>k4l4I6Hkq<$X7Do*4;0ZO~U1&GiFN;90z%v
z0m#EurDSvfPkv0yxN`0w5Q=xU(-H!=uavqqv4F1L5g1#X^&M@WUR6=h=DN?W8~z;A
z!M%?&DGN6-2+<OP(T&<z)9*uyj>n}FARRw>7bGz*^a&BR9vzWo8J(T|qC^|8(KvdB
z26F!x#vOo3X;iZ4)fgk9+N-U&IW9!r=j+r{;8IZPFK6sQmqg~g71Mxe)ZrJSH6u)W
zSSplWXgSfVaX6Oy-D%|C-Fh}-hLs(qEhMy>$nFDzMTnw<doz`VAXgpE#KQxJCW7S^
zPN2v_N%?$&(dqZF0p4St5$T=%>i(Cf0)Q8N75vM)<i(BVm32A_7+e6DRB6y}ivu?(
zr`x9`%L#|2vs8g%(6GZk(mOz_Jj3BO*Vh9PD1KcpaqmtPX%?#%nri&USUmz;V6w)B
z0ZvU^{CkNmpHyyu5;~GP51x&%!L}Qr)cHJs&J<PY)6@>adV#sQ-)D`<77yu^yVktA
z+1kc{Yb&h7pxCyuKZ9JXbuG=15uEc%X7;AgR(VYm8NgRZd{;un>TiBOaiij{mI{;(
zv9Ov8tP--?&*4>{hLwtm@C(OEOYsXSj(>=xrr-5<z!d*(HbjBJ8KW*MLvDer&CCp2
zAS`iFGAVp=+Zi)_yk-XAcz6&Oe-?q5j@LlH3@a1u`G+tB?YOv+r!)_j-nyBYM(6yd
z{k#UZbzEx{Vdj8(;b?0o<>i_8H_&I|V3MQacutYj^v2MoK&5#$tE$eDxP=wQFoOes
z5eEZtGvm|7#>Q7ab&wF>*ip$>(yULRSEbKzphI~Ppy+NHORw4?k`$i))`=e_+v5;4
zjdyNGv<0$PR<BS|LH~%?GP|Q{a>EFFkBf&F9}}bfv&|g2b4hY<av)ofhcmRs3DQ#Y
zP{5JO38ak=p*&&c>h)5qzMi9OQIp56x0yMy+Dl6PG*V$#-4m^`g4$rE$~Ui1X~Rla
z*&;#;EzQQOKw!|1bi75hP30B}=`}uS#WQ}fSXyY6C>h<A(F@WiH}{v2hwCkjPM6V7
zuj>4y(fsOjWWBOA`RjFZ9G<ZGhR^gBhI4oY{Piygt)k${XmXR@%TR1$qoaB)Ad&mU
z9|W)^5oQY2YrXG1jLo*J=W2k9@6XCw?gQ0oH^@sN48UXJ4QLxa{*03#+0nED^5uCi
zR+ll5CV1zY+^tsHvbR4Po<PV%M8C>%imn_vU8-jvKbA}s!;ap#plnqD=<L&LrN)cG
za(icl*O@vPb&k@A1r<u1wePt#TACPkC0kkqdy9@h>m5jP4JG2nR3D=hmjkR>`ZOS6
zvprUoUc_J&NfmCVAt50l#<h}}*+iv}6n+6K)2LO5wKB(^Ne16Q2@$Oye)UT6^tTHe
zdu7?LtqGMOBan}#&(UvhPZM-Issn>1ei?GUy00sxxQSN&Qc`AS)i-@ckm5Gm8pZc(
za9)VbE%g&<sGsO~&gyi$ii5|ZCyI&{e3Lx2wAA#q0#{CIJs@{J@xw+#!Z(q|Lj(8o
z<8iVAr@y5MXri$U(82`fj;c%!_h6ZNvmqZl$qsX%wPE>lrzfC`AImpT>1zWuf?g_A
zW9C`yN@nRmGBb9qS$@r$g_O$pJyWYH6e6-+Ed2e6-xn~gv|Qmw?E9+Rq;F6vwpUwA
zYkAaP38_RikKoOlH;41}c-g4=@4rcNmiz%Tf^Iuk$7Al?dxv@q9B0foA2;_#GLI_F
zV3;0b<@)0*KVI0IsA|7R0s3x86n-2lL-4OJ8FJSr8wy`$YN6<}$J0&jw=AvJ<K_AS
z5t@<S{55v4=Z=AKarOGfUy_6QtE{G4uCCzrUwVpk0UQ0B;PdPx4yzz0BjO(`gUQ!c
zU7_`~QY%ciAnLC4l}Y(ePrhGOF8~&xPx}pmL8^4$M$bb5Rs7#&Wu9OF>UTc5f+0Qn
zwOF?|3W@v~%k;nrro4PaSy>|p!dl(I(dL+>K_Wyjkd5kmU<M|h-QiDPY5;w8uJLj?
zimEV{@>j7>%aLof#TZxrD46&1I3T!8Wx_&6ZoQTcN7++{LegSCIjYxm&({%FZGX=R
zQAZM<o|!=<95=f>yiZ^fGJn5lIiBbJ@grY)UhgY{QL?FV5D@4#)*tve5u-1DJ*iDH
zSv13A)WxqeJzHawcqtU}d%W4xOeaARn+{AW&D9jgq#5_ehu?d6dM?&GqP;U}^BXDX
zB=vz&x58T13QJANDM7yQ@?Z}10|_FwEV9`VGV)9i?r3P0Q-&FdJ%v{+5)H}ejY}11
ze7Kmq0E=Z}Vv_lc!^s>%93=QWwiNt_0qxP@YsFaljqy@_dG;3~C>@6UKMI?gn`2h;
zK}Q5S?}x;J$;lk6DLK`G^+oOg;oY%ZJ~;#g3mcmS0NqTVIPZ`DI__9{WqSDI1F}nH
zlfoSa7+MQ{AB3c{sQ&z!7ErU?XR9=MzA)?Z{`yH(ow@)0hJo5K8ib!8K%hV4S6-%1
z3%bEEJoz>G*kgfj?)j%roWe%hJ+--1U+rs^>F@W*$)jl=JC1K42cyw!zFBPDny<4s
zh%^%Ukp2pthzPo`Ll6CqqWI>mqJovYoOjTx^xO8JZAz~-m8a%&EG1{|M52c&l8Jzq
zD^*M4^uA5FX5*f^j1N2!*aYaLRQGm{CQU|Vj@kh&{OQzH6H&kGFQ<08HO3e+LIt70
z-|6&Q=fHr}1A}+8BNluwV)8$|5rW)A(40&%3^IYqvIf(E-Gu7#NpdLuDp2E>jk9wh
z4|V+m#qbmrH4is#=UC(v8PED;B;Bjb%qCoK*5}yS*tC{<<NPy~wXCc1RoxAE>g(%o
zZ`UyD9iZ{?J^S?Pv8}U1gjyOJ>&>hZh9w)9K4+4OFXXg%FA7;L5Ien=3S1`{He?|U
zJ3OWxKm{L6f%ssU6gTal#Jhyudc=PCu^e+s&Gi0S%E-sYa~xuUDBN|b`V48)AH>Ws
z39c!i>f!mLZem1S)*q%p!a(Fms6pvICGT6<I}o=TX{BY_^v_m)sHP8EH0aAW){?1`
zo%!a+gh&xDJn(FALE-7Ildm((G4f7Jr)PE_OkPG?t%iMDO>S<!Phf4&4pP52AO&jU
z<u_kDBjkiz7gtx$a|LN2>SR<+<2#De2=MLkg(X}ad5^Xulnk8T{Dglb#uSXJ9e~-Z
z9?+`}*3#r)oHxsgu!i9S<_Bm{^LT>!eJ;j1iuR_<g{DRRj1SC(^pVjY$AI`lN~DFU
zRiT+rGvo<X^t%T44tU*vQ_7th*25^>vxh=ZG<t#~3rCtEkDir?F~f|1VnBHe;r*&f
z2Uaex-c70Dv^r?<|Je6`sJJLGM5#v93Q%!I>%^Iv*gQ?X-KeJ!bKys#&LN`957n4!
z9~WC{tbPOUqga>enQ}Ir0C+thZGm~yfhdS_@_{UhbHey}uUmVSn12bcwtr_~)_t6j
z73q9psl}2O5O1|0hhOpq@>RXX1_6tq5P{Eo>;B~N_<q@9t#z$7m5E_Cf1=`sVOt(2
zZJ#r2{H5gOiOcEK7kk=IaeNMcfVbMNj*3ksC30Fb>4-);;3M!zi=+4QDG~pkKs2=~
zWZOHy#7LY1_&ogslZmAX)#G9=5+~BpS+KH<8XCQ|k0-=RNr~Lim|OT|=l+)g3<sdM
z#VOov+KVX}ddR#AXB6PNTmo$VaZ%1T-<DTZIMG{_(2^REU-GS<KWr-5pw}P?hUH07
zM<>qBtQiz`v#^1AO$;0|f2@BI4++Zuv-<YGiE;n;9{RScd3czLiK)4`xX6XmZW^<Z
zgMsw{+5Y}BlCA}H`65Uy_t|xOR@Lg2@Ino)TD1;6nl<KhPvzt6I6bNH$_mEdAl3PP
zN>miH2x^5t|5V`v>O~UjSFCib5v=^a(NX@T2cxN>hEEXM3zKiOi^<meUWJpo!>$#N
z2iOIsJxU%>f_jYEyp%*)zt+*kCnfy+nU!Pu@l#QeQ&@k3Gdmi58rB;T8HctOqTEPj
zpM8kvV^Gi8LEsjoYF727rP)8Yf7AfG?(Ls~;`SQp??dy=)DoTfWrd9;q*!2?MN?V~
z7z70Rz=Ylp+|A9L1o`oc-GI~E=#ULrE#5b|xkY@9^8b!`WA(nb<;fGIzmMM+AV+C9
zD$YE`oroihPy8yfMja~VkKDT^w@wMJoyzzQ5y%q3fvN1LzL{%liHuejD*TWrpr3W3
zw3<Bzq5iK@Pm4`<jxP}rfl+{2`kI{l_~L*sBd?OHc04yJe?Cj~AOJV##a)BeWrga3
z4g;v>6r-!oMb<!NIUmWKXUSn>jclxo0n{cVKK?rhTPu8Cn7TPn0#j`hP4#KCc_DbE
zq!4e**{XatO^iD>WUTtnmdj<eyVaj+Ts>0Jn-5l3-rY`_ZkgYszSWlAQ*F<=_G0Iu
zc<_HaAM-nXCy{_s&4&s54+AIVf!;XQ<L&Chu4ZC&FuOFa1r{45lZ(0wC|FtZwW@ms
zJYDuCnab3PcR{KKq~~_PY?%LQqcH3=?fBtAwu8ZZreY^ca&56Ai?eu+7Vo=K!|mre
zqh#?J%S`VSMOa^p(bQm(e*Hy%D%s0Sg44a)wW*=Fxb7EcJ9BlJkJ=heSAjJO@wDe;
z(F-sk8=sm%!D%)a@mJELL@z@ms6drLvJZTdz)~%AxW>juCY4`~c2|!{i$nBf-`~IB
z8v$U&+O?6tcPE{pV1_IxsONm|13)&P91GpAj_j*i?_GZ7=g)v?9{|sXfzPgfhKSnY
zwbHhcE_`cbWnkc1ehen$Qc|QrpdcMg@S2AP1ue9A4T0Q~qMX%YlVqlt;3{XC?Ruzu
zEwe|Q{(ZhXQ<^)%q@Fwew~Y|AZ{LfqDymW_<5*{E&3})7fr?8m@Q&NeW_}>br+5)7
zRX=#ZUM_cSxplaB<-NpWFyz=ecR$A5ZWM*3Ln7spKeei-!Xu<AT^nHZ++%A!aDv8_
znXd)MYte22Tpq8L^sv@fu!avf5&cE|HKbt(EU-HRC%?yK%UrDV&+>1gdL^&r?(X67
z8ZA2~$KV|o7qfr>35YWj13URT5X1NO66${IG983vHWDcKs5hYbe5?BI<ZoQ#14{?Q
z^I~U=#0!M6-Z=Pdu?lc;ks`C`=YW_}i)6GIh-s9l7IuO0_w1!Py+)VHXyu^eHSub@
zB{0g;Jes`ODlMgT^ClrWJ)Xvucpj7vCnDU<bJA}9_HX|A?wwI3y|$pTm`KN{38st~
z&4Ug6z2uIKfzPUEc_{0)S!yN@e{#S0R#85n=<1oHzm@o)xmx9-r&Wul!`Ws2S7ED|
z{6Ik}8)=>y-j6Fu3k)R!NCFOf&w4F}kT@RoY?U{UcyqlNxMO`A73z{&3OO<s{Wqc_
z{H03S85PGnV`d<^{6|`Yl-*Rs)HLUWsvnY31Wc@%N*{y4a)1KOom^ep=?jv)E*LSB
zM58Lp-rCL8WJg5cq2i376O<TrKLKC=!LP6f{0BVPYuL|oj06?!GkL9}&Wp5GPqX<u
z?`T##&%?v>B^Khlwb`D}V56QLGU1^ate9RcV3C!IxLd=*#@sy4?YDQ88_UYpx8pe5
zTfM<N?y4TOo+mMHe`}KGOo7r<nQt3cF&%i4_S|XM_h@9GXzdJv7>ml?=jswNlyPM#
zDf$fGu&`Lm%-Y(mk<480d*?BIAKkV>7nd3(&z`98Q9IM5q$GoM5k!Rih1ppo_J{&)
zTK&apW64}HZ;jC1DPM#L^y0TYfvRAJw$XNBvsl}8p~=0kt7~?2ROrrEYrJ5ow>bSI
zADAb!QkrD8$z$tDAC$fIUmI7DA;{d{6=PhNIInpBsQM9?7+#fi_hse273v}{A=?!f
zS(TM*PZtzt3fnFNpS(Fe6u%~>@_X-f$1`D3q@H}I9aueglYuZ4P0$U^Vy7dB9mL3*
z!53CQgWvJ`l1iz8(IzlCC90xwR$<c0sQ*x?Lb^9m2y$Tp6_t)PHgjN_yDcF>;~1^&
zvrgeG%4{7sW&jOS_IB14NqhvV-otgjKq35<GZ%M{a@*Zf1VUC;E?vAb`{*e=-3+Yc
z*F_Ad+EuJ-(@Kr<d#WdDYHE{_lr-Q=4iYX;eZjB^9DGd@k3Gl->H+x_GeCGz$ef6$
z>@rKz2)g7Gc!Nt=PPt=yldlY^s;FpkJ1)2~GoVM04w6Rj;X1#30Z&zoIqA|D@R@l5
zgXMZ}QMO*j)Y9;0a-5;5;jT6GO?7;Yqmu4OvySQpTd!975NY5u*2re}rFk*%tt%>G
z^&A<gAXvp!eOvXT_6(%rC8VW8BIMso?(9wwSxs91b{I-s7{9qY8w&>EJ<16KS1=?D
zhJ4!IgD+VCiYds3iOo{h_$GFAbYzvbriR52C*&`$s|ek#<s4|7ETpQglt;oB`&+bB
zP)W%{AH3=2=8d{qv1ZR(&z2|q&c+c~Qgh5qU!5VV%+o<f3k|gY*RF~l-~KjyXGkP>
z@Mgo@s_9#F3$5PFGPtvMh5Egzciybc0W}K$p4BivvDoO!`uo<Ex7m4KsD5dl>1eY-
z_R6||%dc*2oxFGN+^G4$?#!Qmzx#mOa85t{1RN+`D4@#o<XPBb;EDv`*$mq@oS170
ztX>2Xxw&Pn*>Y}f66RO2%+FsB91iNLXMQx%;7-TY`2QF3FU7~N@%HlGxN(C`{r6`#
zw%%W8YiynU>OJ@J((3$_)8&Vf=e^xkWpm(e_|9wn?Pj?WUu6&7d^{ul@wKxx^8|Ex
zw!gh3xc^mL_`X{=>dyTxSCR)+x=wmr;JLDy`TJX1M5?Q`KmG!qrD6&M#@ZEGE{hJi
z<>aindJEVGySU<i`TSQBi)PI)5&o|u&AqzIPY*cm;OqTXRbBe`j3+F;*@<F7mE1Lr
ziJOd+wS&)}TX_E+sQKy|o|5uK`oHs)u&}DXObhrldVuYcgzRkPdl4ryHMc9h%dYW^
zz9iHY>GAOtuv7u+IC@Z89^4p=OUJ%ZbjkbgIVV$;tbb3fFI)cN(1RC0ZY=6O`ud0C
zx%#=f?XAEL0AuapX)$`|&z%!n()uV|VJlzS*Go@Xp9bFDxd_}c`@$QYmZtXd<sXmz
zVUm)O&z`B>ij#fwecIx!a}`AS!pfXy?*lb{yR3lb?A*CBM$g;#tiTlZHdnRDFMlLm
zJ@@s`?2ykwOBPl7zVDmo3rq@uf$0bGm7}6&0r%blH&CPl=UV^iF5KbI?fmgm>Z}v8
zGRAl3KL0*fBw+W%)|E3gzUla$y<KfG^Y(9WbBpK2?_ygo@Zn04UGwY3j?VF!R;?|a
z#{c#I#sz1^`PSKQ{~q{d^OG+kfq!nyhz`|xX>?<Kart~RVE18#L`P4LnFaVvoQd<g
z4&^I@8q|BwVPBN)p*Q*DkE<Vmq3qJ?_p4EI=ggUrZfyId<^g@XVuE7Q%-OSN0)3I5
znhH5*DFi6b5nW_$ef!CiM?Y9+gEYELo%2V?QTzMzDj8W>;CUvXoFFJVsij3leYud+
zuUr>xZSU-C?`NQ?(M3*;5vjSktsSkYk-(L}g)@K$L<tM0XJ;oTDVZA^Pd&~1qc;nr
zE=kWCcnE;9v9>mF9hju4u4X3Z)eWkiK0aRF-tOUb@}R}y6aNLQ0M<f>51%_1w)O9S
p;0aj&|C<@)9|tnnKy6xP2L8_96AP9em<$wQ@O1TaS?83{1OPCrIne+B

literal 0
HcmV?d00001

diff --git a/docs/qa-evidence/question-response-retry/before.png b/docs/qa-evidence/question-response-retry/before.png
new file mode 100644
index 0000000000000000000000000000000000000000..651e5f54da246b9ca4830400285e46473bcb1dd0
GIT binary patch
literal 14392
zcmch8Wmr_*+pmG5fa1_7Azf0UbVzr1NOwv%C`gxdN_TgMbc4juoen7tGsIau&;Py7
z^`7hfaz32H2bjItv-jF7?)w+_3X+o%eSz{C<-vmoFT}-!6dpWyOb$MGKYIjz(<WrV
z9z1yUKwOAl$t7iP5!pr2X!+^i=nvw_G6U2`!DzF7k8<Q{mC`>w;pab>!!jIj;kPA2
z>BD(7JD`AN*ca8pe@>lcq)1)uQ1-zr>QH9HqP5u!L%}q?_Tq40(-D5ku`A9vI()~$
z5eYkUTP0SLl9q;=Rzl6gWb!Zr!A~EvLV*%PJRO#ujg9PyQxJ`%k#QjgW;73X3<Cqh
z`^2GcVcJ&^2qe-#E?=Nqq6nIsX99=Asbj765#F6DA|jL>al)_2NJ&XE^L|7{Z5@<i
zoy28$_+|UyM&p3*$)|oQmXH;tk@Pd7LD5X$IXybUxPLBn#9J*AeLeoDl$78^A!lc{
zZ}(@9WsHsEgh<6e`=ol@SA*_PB`DGI|Bf>M@J#dlzt_ZQF|a7rIB@<{8W{NJ5k!Jr
z0>Aa8L%`L2L3p+IH%bZA`)`MRG<uRb109lC{j7I!yN?7(Bl|Yrv$6RlC$|JdV~6s8
z`D-|u+TsE~olQs(H8X<=v~R*-@`W+pa&j%4j^-#rLPFvFi1OH^B!7ntrAAlxL6nVc
zg6^`!p#cSp4=`<QA{7Ky0{@o{LpIBqOz4iFfX~g%4L1+!aXfEMP7aBjh>%u`CqgDq
zX8#H3D`c_EEQ9Oo;ODMLB%m#BZjGpZ4+`1ElsL%5z7Zg4QiWvaDA8)xS(9K<HaYE2
zn@;}Za()HgYcDt~Y;-VF(l{4odR-u@8fiT{O1rF6E5p@*pAe~tDr8phr;N@_6i)NG
zhGdO~{jJCMPeMYc<gWO&OtTw1g|ARBRaI3(uI0ZXlWg~=@_N>agcS;8e8=Q-+$sLA
zD?cPzHZ*_nY?h~tHZn0uuESd4?{lqWW{$YNx%n<ophR<rjINIaMx3gDP%V9W7j>TP
zuD)K3Il_2J;h+2F=H%e+ajotDJwARnL)=16n%Ug3Z3$)rgagufKV*@Z*c<9?y%Fo9
zX>Boaag<o58YSlgv0`C8U)Z3-$<9&His1gF18mwJGvm8w7YB>D#~OwkVY5}<?4EEB
z^PRSpo+J}|q*z*u?%<CwnE%8=z3pz;o4W6L$1ClfGc&zDC#!~xTJ_Xm?qa`WWVc*x
zY%=U0-5iL89MAcoLL7G{iP+0k3lu2)u7_QHf6%#~6I>z=Cw!t|4vk(nPmz!&aX@#Y
z1mL=k;t2Gtb@R1cXnPm6NsEbHuSb+PA1<97ADb^V+jjb&je##F55&+c*4zG=F<I@{
zEYV~uQ^*-l^FDBJR@IM1#brQ$J?T7O+Xe<bTLD(0=?p)GsT9WC9j)hu6L6%aq-Zo&
z-@UPMpjIE3<$gepR_s$L*By+_>3p!Vs^@}d23A?^m$My5V&bxu75G|d+TGi?jHz7C
z6?U8P7l(Y~+2UV9aHJ2GBibLXXJ21Sd@!GU%f$3+B(B6sB&E?4VO?i!6X;oMHNUyD
z6U?mD=m6cHcg|LbAB-;}$-rSuHPNBfm66h*Q@u4js{<$1n$F|9y0V|X*zr8-#&wA(
z)o$T5pG+X+stqP|+M8*xUGMQj_5Nk2pm1DmwoJ(B@T`{@XX>C6T{MXJQH#gbakDF`
zOe(iuTlBZbh_+k!?p+G(JeE#%vDuZ2Jp1VKX#M);1%#WE6J9mi%I<wD5QNc<jP_@_
z#hpzv3@kO-{VV0#%&a?;q#>_ypIEwSY<e*IeeG8Bt&O(pwN1`hV+m1Fafyj$JHB+K
z8YPg><sbHcelxSN)wOyy#Z$`{E9RYJ)5es^XPJ+t+ThTsU?~QR8I)+&xm+yr^71Z$
zcZ8_2P1%in_pkjkmPPkyN|vt#8+|WcXNoNDZ0F2)A~&pDU#LrYRT%Bj7BVvx9=2nZ
zWPJF;haaP(6~AmOEiFBMdMaS2(dKmmEt2<nQOmjhf!ROT+RV%hA0J=s&rF4MgPl>4
za*+?@<md=;?9;84ag$wRGTQ2giYuLT3QhW0^y7;6)+JNdLtt;Q$ywTSe1b(^p9rOA
zeo`dtb(oIl#iCMIF=+B=Dvv0W2Zg|b`{4@_1+8jRz3EaLkJB-#0CZvq8sua{lvsLi
zp<%-3$+C%wg-9q~!5H4HrT>dJK~+oDW}W%+WK_~g9tR7q|GR4k;^?bP$55EnxS7pX
zJFfq(W|f!!&J^}Ma)agAp>$&s4ThW5hZD{R58mEdOXMWS$D7Pn=7cpd@OWK|T?ZO{
zFR^J&42tphdyE`TY8*8B>EhyIzG^#NBFF8TeRZm&Db3^kQwq%XSBDA_L^n;w!{!3o
zebBdoo^BThTWf1Ro8WtwaJa(`7G<Q^Ks;k|RFscLkc*+Ca7-7$AsRJVVuV`iFD<>p
zr5lwJxHxxYt0!{cph^a*a>d$Ud;5zDZiAlFOBZ+N2w@>DUQhVx?TvddHjB~<2v8A(
zT;YDw$*l43)Q<-l+kUAdKb<=J`&U9nMgS2-A-U}7oUWEts9a=RWlS$uFA&hz*Jryf
z692JKwTwvQ0W*V1)_oX6OWpmj=6-mFo7ICU_%!$X&QwW@IkXX^0+kYt9Je#ou3vfq
z>@23(#(2bh;iBJYX=tA35LD+w&8t`15_qr>E^cm_M3i`knDK)~&$RX3Jv@BWr2FZ@
z(I2IY8F1PX;0aLaf4^LpWQ^@y$S=XRht9hGDD7&7=E-_<iAyqh%<JyvNXECEsa&vH
zY5SsJYgbNO9dFXb(kf#_<4l(6pfgsq@cTZ^tvVRbsjC07Ie?8umP^=8{8`H|A>HzK
zx>s-bKA0fTR!_B)tznHCbDH?UCxVfq5@Zm_n4<d<TOXOWuEcH-$>T=H-GwR>)t@qL
zdYy4*6I+zz<Xd~bZb2(wCF4tnej?UuEadA4;8)nVZ>p+l>S?!!zNo9K*S9t{(srrB
z#&4yQkhto}kU4mtZ84n~d98|)3WbzBwlB9&O^tKxQ^Tb4GUqenuQ7)@9V`&Ne%)xZ
ze9LMz7c}96Bh{N0n^OsY5@V`LU2I4um74hjwz^8w3TBCNPH;vao6$fWi;2uMtUApL
z?rLf}?|yMGYfer|>SoTk^7N|ovyOB2n<%*&^Rks36$_kqYIZx54Xjogs|ra83FJ<{
zl(H_HeW^H|_6)N``1j}Az;HAzH=Z%Rd+V6t<zI+xJd3n$^+~l%M7cl#0z={0gQ_Mc
zqmYlRth`OAx_r+oRRu@HS3CZw<s{2Wcq+%VROMHh1`}<u@0i}`k0yZm&ut(M(K{?a
z2V+u75xh4nZ)$RPayrivt<ax6K3cyUp;sx>_5@2WuzO9(MoVh}S~Q*X(IWWVetRU5
zHSjtA^^xvUxkgQ4jk%soRbDsI5%TX!Bh=>iEG$jVhZTCA#AKr3<#YE*jHko{E;lhb
zSzXqeM7flhYNb?d3Tgl1EYsiD_XeG~htzC;(fw6HUt|eQtaZJv!T78AZ9=Z|z_5I?
zCrFbE)n=Ls3U(@SulK!g8!(~il}3YaBQ2L(--Nl8XkG-ktY4$5RvFji=O=HEd=_F5
z66q46GS;x4$A27nHF2LNRE0&f+d%9!i^ZS_UT&~Q7k;}coWSX*ad-Q;`!ppgYG->p
z;H_W3ke@(>@$l<d3CHb`#k1Y%ke?RQrG8mIxv!EZCzZ%c(D?|O9E(;lL#*b$r*b;N
zFP5jXLY?>LYIr@L3W>bt#rfUpi6Hh;bJ-kFPC0{3nE3b#j-<8yy|g93aXMtZ=E+yO
zoam!f%q@nB066#ue`BI-_vrW-4Hfm~=0e(qMD@wjDM*z72;kNW^&IZ!=<gGYjRq-&
zgV|3T8h-zdD^e*ztc4Va$*->NgBz3AW;LJA+q^Lu(fVq^g7VoD;e>0!cZ0YP;u<H4
zlE{%@bUwWG|AC&qaehAk8BF1m-7@d=jfrwS&mo(w+7l3BurS77WqsSERi=d&Dlb+`
z=<5DD+hwzz$`W~Tba8>1TK4eq(@<i*hy1;rot@Lu&OK<IH_CmjI^H+XX&vt>!~ROU
z%>j^BLAdkuA>pCJrH4aql0TUF{|ZZ*x;(n$cL(=18A)OGgb$7KA|BC{n2gqOIiiTV
zmud6-$Xs$Yk+ZX_%**S|m(SXnWafTmus1UXmYokS>oI(Hb#;~S$6q_vdk8!F34@Su
zeLJ2FUHKkI7D*>&=j6D%)N4w`Wo)dhkq+<w9E8E}scnN~4c-SZ1@u$0v8jeQ#nhDR
z6kR+>tYWt?LG$q&l8Rj?j;xx)j}-``oZk`o!MN{%)4sOX6LF_Mo*g8x)Xo(G&#J4d
zb0r&)fByV=?)>U-28RC(y$ofNV9ogaJl(cCAu+K|wW)jvAJqraC3T0|In&h%St{9|
za6b@z4c{>Qyt)a=mk;QhO<=*}5b)47lc`VFSWJg%mY?`)@r3>|H%W|y-pXE2<|(d*
z^<8PdeWNa|;j_wfRz7E4v|;AR70!kM7L8wXvk5A$uu{<X4xu8bc+Q<7CCxA2A18(o
zKh*0BkNK#iB;zxkN1$tPj^A72r!oGZ$D&M#sG^2o|ATpRB(8e9xG_+25)uMHIKF2t
zspO2EIFw&2D=Wc0a}+eC-2c7w#cL#h@gXSSG6v))Pwu;0HmX-ok~A_n!juthe0-d_
zB#y-ryN|!zt<rIK%FfYovBn}zt`Fqy>CR5Fx9Pe6;_oXnA$fE2M(r|ZM`hiC{%(pi
z-rikx(;7~x`~oF)g@Vb!LHK8`C&sS`IA#IjErce${#dB5B7gm8z=!tZ#}`!rxQyE8
zr>D=*ZK&=8hq$Gs$5H@&`{hHg<}Z;`u#`JTrcpu^?m#&eJ~oq5T{ItGD)&`^uKs8f
zB5s$!M+tIYNDN{b_KC5S_}-@bgGOyUF!7@YaGVt57JGE|{sUaqVCMd>9jX66|De+U
ze|}i-m$a*=hls~bDxKhbfBx?B$Y9k>SV%~#!A{xbDV5AMA?Aski*aP6yh?;n+4SLT
z6&pRh^jlI=S^_Y%KRF#io?|ty(YTf`f&wJ$b+nd~`_f|i_WhTYw-wvppJNg(AA@B-
zn!-Vc<uE%tOYFgP9l^({$HBvMv(hez*QsTtHxP4ZJd{Ag?JLW7b3IeB-oc{T;x-J@
zvR&<Z=#uMp3*v(K*%ij^d&Gq|6?wKgz%M_z0N=|riHp}O0%7suKsb%h8-)FZh7&gH
zg@snnfP&7Y76hG=i}-7Lin{;O0{U7$H#vF3VYmYPRMGt}i53teT#w5`BlqT=KN%Yv
zm)4f+wqMw94PpE#SZH)~|DE2hr)L$<@Oh#1^E_ZL+D$k#_d}oDjHW4(Q_1fO?~O=%
z<<0Hz=Su|9VwrYJTuRD2yzK~p(Pyj8FcrNw%76cM;^z-*gYQ^et5|B)m`m?YSy?~}
z=SwuvrGzt#riwYh<3fUi&BxZDVQ<*f_fG$=k`Zz_m8w?(Qu|pZjhBqI)(q1LHcnxC
z)$WT|Og*Bh$5>@D+HJEtjZVaBDWtETIYUK5bH#Ue1p*c29}cTIho3T3wRczBwQS3K
z+GX0EtDT~Wl+#MIP*Gw}pH2~Pf(EtzsyWk#nw{bxiMb>8wG$38-&EYtYu0AwIPHJB
zX4mfuz^iL<zj#4#$>0TYz}@vp*&ab?_YNw~yAQD#_Tkxn05p({>IqMh$vb?gAzRJ(
zrIIJ(i3YpJ;rp7k*H=@THq#}VcZ<%;f>Ahcn62qlOIgp_TmOcu?fq%@MHURWb@q*C
z)aiF6_r9)xP%$v1@wmS{^f6<ok&LgCv#NB2Z&|j$YGqiqpYm`oOqYI!wz${rK#R_H
zpq-10H*+->j{xMV>R)%S1-aim$%Es|if%G%8Hrbrs!n$4>1n7)m{0d|Pj@#7g;e5u
z*O_v3uPdX)M#r}2Js#(0)61cF%%|IF@dyMW#6Ennu?4jF^I$9;o6VAz<+6u!P>^`S
zDQv!O`g~s#;Jlz)T4kKM!=)BFhG+h+MSEP%2f<fnBPoa8SDVw3WC5dzESS5khyz5=
zOAVwl@ZX^n4$r+AX7)mS7PM}Xl)ie~^(H4zgRxBFP)v``53gU$<;kYGg17l-;g!mF
zhqytYzx&*{ppwOb){(%x-qA5vqE>Mlt6J!=JEa)vHa0f4?8Su*jiHeA!a~E$MQ8e^
z24-9Y?`xZdy-C0a=Q;2~pzG`F-NPD$;;6pJ=%B;*YORucL$6*%zN8Vgyk8-Mar9o-
zw%^Li4p-WV1H)$CzDzgheMzVCuG9Tn!6zZ=b{E7?yj)@S+t5(7la>|JfS1Ch(i-(&
zZqxY>Nu##7qrd=wJ`hb|=}vpGRA$hN7D?Dt?{cIN_8MySvz0^BrV%<(-N?_!*Jcha
z4AxBGu&<TLtGRRsN|qan>$O>z@o>`6PcHOn`VCsC_79eL-|s+ltQQP8r;<te^jDzf
z(_WCmtEf1T<`R13Vg!UUoc8AeUhdP$XCiUN&?*<&uIEzA$IvL|I=~dHt*vV;rYmPY
z8yaRS(RTOnaB~BWH<lx5QlO;2JM#thx!SaUp`l7pP^UYhzS!&T<~k+@ON!_xx9iTI
zF<&4BupCU^^+jf>T^{vzAGY!3i$>H{gnmXw4oFYI#F~6dx@IRPwho^9%s*=AP#-dA
zp2g8s*6Qhwj`tgV@Y^>>PY(|!`M?jp#E4TEv`k0mWJEalGBCMgs5mb#@277?V`D``
zY-ATx66f35bW0Y!j(R(hv)%O)`QWw=7t$5|_QAm-!GP&V7m0X=7R%Y-TM#ODr;+zT
zB5QD<(Z7N7`J)rlaz7708HlCp4JX8rRUw7^Xn6-$DuJU6WQrAiw3y;{+H*Nv;)x*Q
z!690D=#7m>cRf7A;fb*PnS1jh9GnfPa621aW5xuLD}?){X1&^4VURfz!@ihCX=&+j
zGFzvk2Gb<Qt;tKs^9SO)X*K47n4g~E2l9H~)Vz6;{2fWqkCKdRapd4j;yayIk7U+;
z9q$%{-KjFtx>;B#ebyfg0s`_|wPu$i#<puMrmbwy)DUsha)>P#Sl>>zw)~4?mht@?
z36DC@F2mS3r4yK#X?NU;ROmZ8I=Vg?)Ql0Fk5`$X+p3dBrVr@DV-t$@svMbWRlL{4
z^eynJNd)~f)S#6{_Mxd-40Y^8F)@Fazkf&iPEYU^cG)d&_tzjoY#tCe)||MN6@Lzd
z?k53(*B~+FD&$D8?<KOd?Lr4%5s&#iv$#9muX0RsVh!Z$mQJoEU@y<JoUOc%A}oXJ
zW<pvYlRrFfCm3$`4R}@c+lPjQ|F@{HaE81kq~GxUNllmEPp-S2nTiQ8Mv>!SPF!{^
zW^7fsp7?{+4-}Xp(TF7wF$V_*D*qTXzCnXh?ujv|syTcL8-^-J+OJcOTmfo*{n(KP
zOBboLdP`HY*3tu(a~y)pC@g%hlGeT+Uj0>k(9K`_vIj?0#14LH2KY>eA%5<;Mzv{}
z8GFUz>6BP#*Cqgp3NT|0+~gX!lUB28>EFX1!b;RnEM9fV_i{S!e9$K_PZZ<3I9wJD
z!TW9R4&MsUJNvM2$pk<Qm(e&#o6S)d=pU`7ieXbF^Gxj*OYVn(^nlubZghB3>J1oW
zb=$!}Y!NdJt6qmU(mFl+vIk4|DV^54l2V^$zjR+*c%Ahkj;cjAkFztnR$=!eWvvBo
zo0?Ls1`K_q+-fEkKVs(T2JgFv4kDkyQ#g8<HfZr|1O$e2g+sQWMXIRJp8Yan-<GLB
z(I)ohUR{si`&|D8vO`h(T3U`mz;+OeErOU&zSc64N_$K?!mHe#No5va9CPSbE8Lu}
z`A0ybgX`|aGFvDS&%o4E+Xr|!idGnBwAIggjv~TaZ8+z?e|HJN?uO0n?O8H+s<-eH
z$+ahOIrAEaGGo%?ZD#?I(H*Q8DRoX4xXQAFW}caeFG#%|k^s~Ukh$K;DSj^z40tI?
zt}rwlL@$QdcH3BLHt|X^u?t7)-5PCpe`|Gh^<gXGZd+KnSPfEBG+%e9h9z?gw@{tP
zr5_95tgZ$LShX~Tq;=&H;C9Acl$OX1qI;oNWJ465w^#A#M0nN$X{=W8Z1Lsv-x#mt
z=10rA;&o&sq@}xQ$wWNrjRw>H5ECugE;T=ShCD;_UQ1W^$0dYYtGt3?{IOGfQWELG
z7>GneEVq9<BW51KuR*F$<v{=}%O&`YI#-VR6>_&?ts_$dp?GwCJ-a2+V`@Be_rN6e
z^XTQ>vH(W4awbwz0q$E*#5stcDojh(ezcV5z*~^ZQPEtg)6SE5AR!8P6nzf?S%iFL
z;|(BEdfGM<xx@OYojPL?d<=!EjB=r-;VG?9w#6y4x!Jc8<(`O_E^(rRfF2|cBFdEu
zWB4i~uR=)}(gM}PJ<2U6^C8rolLd-xW)nCi8Z{qkvc|t+C^b0|4yC<+@MogYu?PhE
z=`!MlJlQ+(=vEMExaar~d(rv%yJ4^ICo6?OYQbIIvP_SZ4hTUNs6yZUP`9)8GL&fJ
z=`}I%@v*TcsmZfBqT0KHh@bbo8C~{j(roj3tmB%~1CkezuQZA)J&yZ(L25>MmLEXp
z094j`TLY_)NrL<Pi_XZcceg*xq2@rDRR!?sSL6&nimdD?SR5CCi{jW&)&1L_7!(px
z2~5`4ml2O1zxiOZgmNgKC$s9rI#Z+?;dKK?!()2Z%V#mQhtJX~C?<^f_3b9|-O<!!
zu^D?Rh)3$he>OM$Y<az|*<a=g2FUn6Z85OGrMAwf51jPd1b{{UXGb!_?Lg#29XxlQ
zQ=02dmrh3{ndq>E!9C9u_=jhzO7+QNU}D<(v9=XReosOPCgvD4$S)wLqQa%un9SrM
zA!+aJMK0P{cxfC{jtY3DcDbVM`!OvK4{lcL3Z1<%D7GW>G!^R>dlR|NGO3S&oOAnZ
zBDx>cx1xn{m(1+to71y1;XhaezV==D8Xq#L13NNG5EVjw=}Sx6;fH;NRH>~c_u~$j
zBY?r)44`Q*?}=~3Kju)r?x&dn#G8$Km#OdjfA@?25Buo<`(Y}jCF~4dTx?mQg6!4;
zIGB*qS8;M5C0a+@$oj?sic6AsJHpz@9m`k=vS{&ag&?V|W2`11jgi7}`4gX?QN$!F
zC@M?jXfcd__89nlSo|(bB+Jo$eFMmU5NsT3`i$buHPXIK|99V4{4nCzizEpTgOlP!
zqD$oJpMj?d`9%qk2(CU4>N`><c%ez1u6O>5>)wD0L}A8Ceb4gIE#Oeo`GaMKssE#-
zf13BF-!Q89ooI+=xJqHQMvKxwIUr|3hV>zmMNp2J*|C8*nY@2V<D>7SLS)EXTpF_-
z&E#pv_unSRqtguMGml|w2Fd?_n?%h2-81^159JwJ1CvmEFE1~7+|NZsL{LTtF)v(z
zSX!i7rcc7aZ~*KEpUzXa8z3xAjE{ded4-Klad1OpXk=uy+$xwgwqZ^`afJbqZ~t+j
zXEBs;S8cs0;sF$#FR*c=a6bK5?RVLUfB%l~U6=obpS`&}0;IrXG!-+YUq3<xsPv(;
zRol9&r!W>Exlpo86+yuQeU;+(7j3Ha=4?An6-AbUbnUn=l6Z@?A!#HY^q_xpnn-9^
znAIe8y<|MwkBZF9(lYfb9Ngpr#k^-Rhk#W{6)4@_A~=tF!7CN(fY{t~<};zTH&)nS
zZz7p<H-KT;;`S}zB_S}37*#E9+(*G}i|q#PCL{sAX!B}GPk+ke-pXUWkN~KXKJ7Mu
z0vQ=rFNwG(Gdgz<TiEaxqoShtZZD%LrIVat$6IA>w|ARPSI5{^bJeIQ<{u3EkRyn?
zgTqv~Z02ike9`?uBrF6?1Q-ASmbszCDyez(TFa~N&p`--WgoVs0sjZmT?^o@k%^|4
zbe)T3LZ;iz*+_eP7*HcHFi*<8@4kKe#_qSo%*_19*RSn%&Pe0QlV;^26-~?S$$|-+
z7HEt0B7Ej$xU}W<`FsH|&EQ+fG$7v*vj1HKX)a`+Hg;!1mJj{8nZIuu_myUihUf0o
zzSBNuV3o`z1i9H{l(*sp2x`81kWhOmL4P!>nQ{oL<M9Sf(Yme$+Hi^b3F^6WnYJ8|
zWSJBx@la?dsAN;&f5ynrx*6MwlesPst|wmgUN@Xx3(c-oC3SDN=gqwtx89wbT0HQ+
zwjHZ9qI)-0bC$X`EWrGn>UJx6u~e&q7ay09Fl?+yr%ewSwbE2Ria-)5DL{XD34Eno
zV&FmqI~Q8bmlJzkj$L={-wgv118^xW4vyI=nG)8dG#eqI@0U&&f5t2(a;3MLdej{E
z;W#tv^~C?B1uWTK53iR%fMwoh2j@$ln3y;kb?_6&7&8QZna%C>6QESMoc@u|cMrp7
zIbZDz09j#gx(vNE9%#rAG-!-xAZ0YAXN~bNZNcQ`dIS|pPg#5I96tU*S5R970Y~ud
z{(K!+D@#3L$x=;A%~zw1j*lz8zR0|1g*skW9F;F~&ECCK;I74{^MYTWjP``$^H@x!
z0Ql*!5AUfok_1}VkGS7?fYRg+dP_(Q0C~pO*LRrB$6|-;5DmDbvjeewH9+_8MDNv2
zHub({_qsYx^YHM%d6%Ht=m4uQ=+$#W-Jcl*N#5($^(uv<3Z00%UcY-3o3=S7AptCA
z?CbM?B@=d+zhCQ*03c8;flGK?ueba1QR}o`XA1K@eL4l4NW9W1j^6eiyd*BWjXprX
zz#?gOfUQMQ+$_7>JbUea>eA$X!B%lJTV+yXy|^>X)&wMr1^}-wE5xHIYnL8{)SU&n
zGn-V1YCcZ*@#Cvrh1&FvdvKp$c5FfdNTVs=9wWaUM43W+!&<4;P?^kXh4;~XBU?P0
zdD5qXG^7qX2^JeNK7Qib@wdkTzqb*G+s${k2r&VDTDuJ!k)n^Mki4;ygGuu&m`7w3
zv+3>atxFTog>5;JUlM%Sf30pmlz`qFK^)L#A43eJqk*y%gqhIBQ>`$$HGvrnO<uUE
z0MG`?zX1JeB5#y{*W=g3gyO5$T|K<o4R(&ErWQ)pv??AP?DZt@p#)~aBLSu*gnmtx
z?vNe;>5+q*Y7E-Vz?|yIk%RyQEoAmEC#Kd)NAS7fSY|gW?g(zx7{D$fV~@^Q6Nio$
zfQ6(|Wh_0p;f2`0n5%jG#Z}NCjkhI|y!>~C0Wube+?S390#1i~g`8mJLM2w6MJN<d
z!eKEgwbIW`Q}DB0;9e@WdT?B;wYb$}2nGbA20mkt_kZEb#GYVNqBUC{>A34PW;%%x
zgoNz6HI&Hd_(&#&{afQog@He!eSK|B?v_7Bi2lXcMpi^m7NpZ<wd0-=1!}Sq2fTR0
zx<w#p518d#(?!`@x8$>)_l751^zyOokw6O*DRAig6SN2j>*m(^GO<;Q4vx((=7mCG
zOk06(H<A2K)yJ<mmMwYPqdN6&XFEWd@bL6}vR?O{)Lp$eBs;`){~uqlBY*7yQd71<
z|0!&O3F~rROkDi-YFimtwwT^VcQ!q@GHEX4$!s<t^qrcddHP_s|Ly7F6)?9M%WSxu
zhmiT}wW$F~g>udD?)C;0H4Mb3VAL{sU(DOI6+n|NFI~O|Jwa_{yBWZe1H{C~p;EUU
zeJ$cLzVY&T@wB!@iv#Ta5JipI$?NnPgFF_cd^vt8JRjx*Alo%MA8KngU+m4k!5GKG
zT?FVpy|LDQ+gefifnNZq9RaRZ_gZ-cjqO9%Or?UTwfD3N&mQ_PFJRFqAU(+j`o_Uh
zOC5-;I7RFFdj|)tVBi3V?eEWz%Ff9%(Mb6SZ@#vBLcrGn1hdsNkK@_<oOoq9Ut5AF
z@tV!rVQ;45;bWw(VjzYhbr*t}@{`Y-mx<}sE|`e)^z@!{)rVar8Av{JY9qGgoc>$E
zSV!&Udvj;IH;A$P#~Bo4WS`3iM>KW4d`2sAxgMLYj{Iy=S)S<Y%MZq;3lc|t&1(6>
z{xdFaJaD4XiFpe>5ll*BK;bfb&87)N8$Scg_}%F;J|H6+S|5obyjf%y3U0{SKTt0@
zlhaR>PM6+5Pc<hJRLispk2KzrW?m1_Oazv-!gp|WJZ^{CbPi`K9OrB4^+U_QhEOo*
z5)q}Yq2h)Dl#s435AxkluDSq!fBm&$>13z1-bzcykp}h2v@RI^HLmLW)il)RG8>5P
zXQW(!dZ}Y2xO#0`jZS_#{CQRDeqpU;8dgW`r(W!*3n5x^g%*BH7^2mz4Gjorf~nR|
zCB;c!@EW9Acls~O7YMKd&hTUeH|$wpzNL|&p|01xA(+r6xWfr*QUnr?w8pt@G44Vi
z_cVZH$q}&(V%vO;#RVuA=_a5!#x&RUc}(Dqn(D^r^z^q+$%RtRzz4>c4UHO%>e7kF
z`$LHnj-2$ATLOafOHIy<Cd4O-_V$WN^i6Aj?RbaVr<Ox+e$Mel4Gp2~jhvE66!v||
zB}}}{cVXj!$n$Q;4B$x6T$(iA@FvI!nqRH>w&!}+C&#>lUECsk|IRhLo&e!I01e+V
zugVXE|L$%ck+CNe+9%s@Xw3l<=?Dc$(W*p6$L@*v!B6L>Bwe~ME3`NUVI@}cwFcpq
z`*U|oA0zs6sjSOI!ggH3i1`jcK?qQ2o<H5si60m=w3B+tYWnJXwADB{($PyA!w#g*
zNfOc#FcG_51rc`PBp4B}``q=>%SrEDob9(X&ND8}dH$ELaPPZBpOLf|`S+B&M$HZ#
z(1V5WFt!7&7T-oVjQ@9&wa@(EfC$JCxLmqEjLgjKlXp8%i(I1^4Cc*%Um<)fBy7d^
z0ox4w+6rLR1h3HGV4+(lkL#d7>NFR<J4z7hSS4_mJ=u5`O|LJX3;KI}JqJ+k?2zvj
zz0WG|sS+O_UpA8FPx}tO3)>gB*C&kfm>t;iOe6HI=Nf-N?l3S|{{s13W9|r;E4{HR
zfl`gRvW-oedX=&BpWnROHZ3hJ#N2^FAt8dZ1|Sy#1+B8}qn4J*P(qMl`UFftQBi&n
zGA}6bnqI5^6|*FhVed+oXvAWxC)?X}Rxh*{R-P-rzFEyX>6Rd)6FI<+DRWWnt!H=e
zGze&o7v%UPB_)$NCbr0aYI`-Tfr=AmlK}JJbsK)`3;m_#_J`E~^1Nk+T<zCQeEAOG
z+ZM6(N7rk126lF#cix3c30_0AialTAXXwh5IDo@oXh_Z)*yS(&WrB8W?857ERn(!!
zbVUg0#3&7hj(N4=UD+Vgh(-`CgHd>j)DF}GKmCfSa1cQC9(}%FryG8L^yC@BAvnMw
zZUj~V7;cYK>H|P;g%DpKJ`TMI3Rv;O&jHM}YGRglGL7lb*h@X>{pK5DVjHP^Xz6F%
z`4k@aI2caKLPrl7DMNst-{!S42x1^rm`)WN`95t2!VMU;xEtvVH2^w@9C{KdDJa5-
zcr+|~L-nMF1eq;eU0q{AlR)LuT8cbi_PNr@@0|}WK;fACevQ+^hYu452OErv3{0&r
z|7K8seDdU@+ZpsX4t>%rX9tk?*c1N#mC2Xi+@bG-YD?LD{Hn67h&J8qY7f8wlG9v+
z{WJg)8(NU)IfLHtRQ99jm6aX<(FFtqIyzs}Ed%E~55S9rUNp213$V?@yF0eyI-6w>
zv763zksWtVMRavn0*J#g?D}_PtO$di(`vdLZjI^$*150za&B_=u98jTbvpN%3@?~x
zF&P1FWK7zBY7TiSbR;Bllam#<2)a!K)fR;Oy#EwI)u|oX$7lJe(Sak3fa5??ANq_m
z*lz>LLci#7A^S6taAG~+G8YvkUzKo#i%CfxpPrU`o79ysf0!2|9Ty*wHPZNm{ldgB
zsbyeab7ke9cdlKU$j&yjv0+58v2^$LBH(b1Q~n@Gmifn!^)67U(%_j#Fk1i>vA-lc
z0##B3Uz@u%>w(3J9!onvkLXt|nwh!8C9b`tKUi)9)hWbuD%YWpA}%A{0neqaCP3Hp
z<K)|vFgB(%7Y2Mm7f6Prq`eiD_rx>CqWB;3xQU9U2@Zv1y8hv#8$$m%-1tN0N{-Qf
zi@OR4Cj=YgnQ*wbXHu4)Bw!g1|6cP*AaWf&(y2NvBqS#GADgosul7|K!QP%JpQ@_5
z6YIaFjOoxF$o<Jn9!-oKg;EuZ`vT8Q0jZJ^5$Y&*j|mlq)+!Z-cp9uqK<Do(So7rs
zR>d=ZkYRDON*oZ~d@c9Gi%%@DwT%?Z@sD4x2nUz^Sr#js-gUT);N{YcNKz?{iu;Q-
zI@|Hm@O^yoyBEfEpb)3oEcKp^vns`9D-?u;gv7`1(F{n*p2#Wg^$bgs0Q(Oz7XA16
z@&EMl|3_c^Uml)mS#dajIXkk7j5x?PGC~>Ih7}g?=w!&QzubSEbZ>m0lKxkH>xM_C
ziY$*S9Vs)JuuH4QV#^!lLY}-{_WOQFEd#@=rFySogozYQz)syVeng8Q6(|+T)%R`6
z67^&h<?c0lXt_XM9oFh_`_%0rwAb%D*R9nKxAr{?)F<89F;@HqxxlLbuOKAfKLyaj
z#RV)UH*5Bm?LT2B9jK1%I}2O(2%WNd1)!N`Zj0@>sFKqM31uoZ4j3{>X?*4XB}W|_
zsE%QPR%13CL<k$*q@?E>hb9(<TjAah!<F3!OS2ENmu1PxTImE#@7!95FpFzB7Xm|Y
zj=$|zIRD!kAdr~Xs4zG~`kwj;_+JTWwt21^(aUSxvZLM4gzho-+WTtdq!5nYj;Fr9
zB>xmZ-^OQMiI?HJq{R{95m0$@E7C>=-^GfNGYmC>9=v1q$Tz#Ch;DSLr-hVrYb~C+
z{TvdGD;XY<D|-J?eaEtMoeh9V(t!)S+G83WXB(Rw<fynNfdbsyHq)(=(@9fEO{IY%
z#;b-(M~(Z=K4$hW@jzzrr)UX**SqWUmrYwZ&Q%vnDb+Gb!*ZFp*Q5?eJBySeF~sp{
zf?x%lJd#?V8CSTSDz}+mBCqP*8=7d16x97WF{Awp3PVqehrACKqNok+ayn}A10sr~
zw1r@sq>lVS_v&=!b+8_tH-B7*P)4#=WI?}#n5_7K81{VkajXoZVNs2kE^XM{a$dc{
zDrJ2C`>=0P_uuh=EnmQDi&V2fsl;~^P)qK%Kj%nt2cbfato|^!C)yt&Elx)@*|;_l
z)fKF2E2~p+aKF&6epE4xgUVI&vCQdR)e?>EUxgiWHM@B-KYgc9Vao=wodFSfxwncd
zV=z#R<-9fYWEDS!)6sf3Y5DZ(Fu9tUB``=J#Xw794U_m&FttAhF0Hm&w<hd<1<AK=
z6q|MNdNz{L18kyj4SD#eAI5iw59@0zC@=#6CttO!R3=YaN-8+Cxx!|7HI=7HrSP;8
zczhz<JZUtV)t0m5)YNjM{W=jZSUe81JBEdKd@6CaUJ<HOD90YGADAUbDdl9<cXMq5
z74n#b3Y3^-Q*4!JQP9grk_rPNC$6=!G5|IWAot(z5qODGSm%j2c=6_zfDKf66}#7%
zj%Axe2VRF6pKKATmTCz;D*D_cf;ca0sILcD!1iFF+Z?J56siYv%Pv{IQk2W}wiXf+
zD6f~@iZJ0?tseUu{VbrAwPPwX(^_{ug18rP6$>gyF2*G{e*^w|*-NYmeAMmDO=z?0
zy8nw^)RBNku|-<no|MQGjZCpuqR?u>3Z?u47NidbvcY)7@Nrx`btNyMQ8bp!iPEAd
zNqO|h{9xHzEoZ>a-d?ywvP31zc6+1+0Q%P-^3x=8;QMu9si~<Y8Xtwz-mqC`o%)T>
z!6vpNha_UCmkJc|qGo|OWxLh|`|-nHjfa^TUlUYpYSmgg#xtx^XJ?!MosUX}fG&Pe
zrBq9`)dL@?2616f{>1w(YI86iI|Z#O2?ZB_M>BEf-3hYA?6;9VHMh<}H{61l2o4Ic
zegab7)P^qSCm=5yC{`LiM+yP;|BP)~OOuzNj(i|ir>CqOlue`qi)Nw>)MJ0G#0ggJ
z4Zm3|RyP>p%d8LyGgs^Or~(Ce`c-0frKQ1uvZ=Ru5fadc<Kr{Ddk1QqbeiRM6{xX%
zPDq#vYG$qdHT&(Dwbu;urFNq34nE!QoOn#-Pk%Bic!H=)6##|(Bwd|?W=nW@c;#L<
zTcQzbpjcI*NaY11qijWs8nez3R~0r22M%CUkom>MSQ?tUldD#s!eG;>H~=OAuvG`S
zfgj49v>o`UU1R?FC+9~{^rp}Pr%Q0fN<pVGy@U$}33<d7kQJr3CEIQ>Yvz4iP#<l+
zAH6&F-HAY)3$vgLo9D8q*fiu+QqPjuo<4aJj(5a6KHlyt3N$m@O$oyh?EO5Pm}21i
zPBuD*)Yo4Mhj?i;Uz${KPnBqHgLSau0DtkORw|j5jf6zrg<(82V({3(-Z_>-Niw>r
z?=#v*`WA_wIh#E9+4(9;u>*(UuI;+AeT|oXgC3dqMwh<`dH^aKjq*~`h~IslYZDA$
zHRwSDSbqfQDt-%sO9H056M2Z4icagrMtj8h=XQ2BswHVYy^a8hocRL9?eE(ie>sF|
zB=j#Iby0aQU?9Ubw-}rw%^c^Xq*Zu5qMm>Z`CJA?v+p60N)xMEoDZ#i41kmc_8!P7
zfT3Os#<nQGp3?kD4<AZvGwcoLq0YdU;G&H!D=YgU34y5QNhRJ~+WORsTIQL`FaKMb
z>93Q)JfCkmM%rN?nVQq_J$*=cYqjtl?DLS9NzOt|U=uD*W#vcp*ERR5_mu+gO(W3|
z+M3^Q|2b@Pjh~z~7w6}de=v!b4(gU!i8$;8Xk+8(RG<1$lf;8rV0Qx_o~^>IZ)^lr
z;yaMq@>e)GaIp8_uRs(kTCrlCwbg3FZ<wPvzS#jvol}kAYo+|Fn}ZtMtTIi{T;GWC
ziP5Hf0ZLV~$qJh1fu_JuhHOek{rQ8(*QPJK7atV`+b_X7P6Mv36lL^a8t+F^c|9^B
zq63_Lup!3O;d(aD$^TDm1Q+VdT_|<2&cyT}JgylZm&f^HPSf^+n37NBjSc1CfXXzj
zVuQir*0jN)w(A$koRMHzSsCRVuG`-MeK!A;A)Yn^5%g}iEl{Jt0W<XliUCJ74)?nK
zPTE}BHoEdL-E^g!uX&Dk>Vl&hfwAI*;>glRDGRqI*UUc@v0`!)uWQXE40je|h8%cD
zVt_2lhnNm1@uA{iv6{^Y>$TCo{^0Q=SxY{{B~gN65Lvab1Zwu#2&F~an~GN?Hg1p7
z*)s-%@jklW_LRpG3sdzh$p$y!*dsPEj0)jxlY6mlIl(bvBVxk*y8;fAzFqY%@-Dc=
zg73FWQ7;?J4CHm8;And<H&?H($yXHnA*tkw1--EyyYJ5%NhZrpXMA&P(s-CCCBTfC
z-ngP^RTPoWIK2o%t?&o}_-e(#$omEU2WehUCQJ8}E!1)(5S3o772u~{tuuk=pkRx3
z#%Ud7s+gb}`if*JQ(JoJID+>1d8AkBxc&p47{L_+B+(KSw6P-h&;%o>Ys6O>;rAWU
z=>D8BCSu&;Q}maAVV0H$TV`_dDv4}j;?ABW{oyi3=!Kac_51ggNS!Nv`=@(qb*}3Y
zj^A+$ujsz%J(T_r#=0;A^^HJgHZd}K({`&)y+MxASz?*M<FGO4V|;-J!aqSMXLOFd
zWa@g$X<u)top6ykKTBi8{l=L;4fdx^5E|KHuB+*t_4z|eZmH1$td!ACW%bs4@8urC
zCRS5=Fa~4xxNqK!{tM0DJy{LO|7Xh=%l}+e7$rfD;f0P4`dK~|vu#+GHh%Eq>;Iep
zd%zT^H}1D|sT5&@1_V;e8ktx?YO}SqQ(>^t^@quz+lBlj+}xh}#H}_#JUu<ZLcf1g
z;HA^hm;ts4>0-=Op<P^9Tui9Dzr!(-er!_{1_X5w<AzU%`e$N+gqRqhJzs1i2R7dq
zDE((&9DsJfHiPZ}*djlH5gn&XR4W9~fx5c6!{*7``x_Ai2*e7I^bQUVPBh=#fo*?x
lcSWgIjo`!6`=tK(fuD;r9lZO|EjaT)Tv$e^R6y6~e*um+k}&`P

literal 0
HcmV?d00001

diff --git a/packages/app/e2e/browser/question-prompt-pagination.spec.ts b/packages/app/e2e/browser/question-prompt-pagination.spec.ts
index 1d75ae2839..b444a8cddf 100644
--- a/packages/app/e2e/browser/question-prompt-pagination.spec.ts
+++ b/packages/app/e2e/browser/question-prompt-pagination.spec.ts
@@ -1,5 +1,16 @@
+import { fork } from "node:child_process";
+import path from "node:path";
+import { expect } from "@playwright/test";
+import { z } from "zod";
 import { test } from "../support/fixtures";
-import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { expectVisibleAgentSurfacesIdle } from "../support/helpers/agent-stream";
+import { buildSeededHost } from "../support/helpers/daemon-registry";
+import { killProcessTree } from "../support/helpers/spawn-node";
+import {
+  buildAgentRoute,
+  openAgentRoute,
+  seedMockAgentWorkspace,
+} from "../support/helpers/mock-agent";
 import {
   chooseQuestionOption,
   continueToNextQuestion,
@@ -130,3 +141,204 @@ test.describe("Question prompt pagination", () => {
     }
   });
 });
+
+const questionDaemonMessage = z.discriminatedUnion("type", [
+  z.object({ type: z.literal("ready"), port: z.number(), serverId: z.string() }),
+  z.object({
+    type: z.literal("attempt"),
+    requestId: z.string(),
+    response: z.unknown(),
+    sessionId: z.string(),
+  }),
+  z.object({
+    type: z.literal("resolved"),
+    requestId: z.string(),
+    response: z.unknown(),
+    sessionId: z.string(),
+    pendingRequestIds: z.array(z.string()),
+  }),
+  z.object({ type: z.literal("error"), error: z.string() }),
+]);
+
+type QuestionResponseAttempt = Extract<z.infer<typeof questionDaemonMessage>, { type: "attempt" }>;
+
+type QuestionResolution = Extract<z.infer<typeof questionDaemonMessage>, { type: "resolved" }>;
+
+interface QuestionRetryControl {
+  attempts: QuestionResponseAttempt[];
+  resolutions: QuestionResolution[];
+  releaseFirstResponse(): void;
+}
+
+const retryTest = test.extend<{
+  questionClient: QuestionRetryControl;
+}>({
+  questionClient: async ({ page }, provide, testInfo) => {
+    const serverDir = path.resolve(__dirname, "../../../server");
+    const child = fork(path.join(serverDir, "src/server/test-utils/question-response-daemon.ts"), {
+      cwd: serverDir,
+      execArgv: ["--import", "tsx"],
+      stdio: ["ignore", "pipe", "pipe", "ipc"],
+    });
+    const output: string[] = [];
+    child.stdout?.on("data", (data: Buffer) => output.push(data.toString()));
+    child.stderr?.on("data", (data: Buffer) => output.push(data.toString()));
+    const ready = Promise.withResolvers<{ port: number; serverId: string }>();
+    const attempts: QuestionResponseAttempt[] = [];
+    const resolutions: QuestionResolution[] = [];
+    child.on("message", (message: unknown) => {
+      const parsed = questionDaemonMessage.parse(message);
+      switch (parsed.type) {
+        case "ready":
+          ready.resolve(parsed);
+          break;
+        case "attempt":
+          attempts.push(parsed);
+          break;
+        case "resolved":
+          resolutions.push(parsed);
+          break;
+        case "error":
+          ready.reject(new Error(parsed.error));
+          break;
+      }
+    });
+    child.once("exit", (code) => ready.reject(new Error(`Question daemon exited with ${code}`)));
+    const timeout = setTimeout(
+      () => ready.reject(new Error("Question daemon startup timed out")),
+      20_000,
+    );
+    try {
+      const daemon = await ready.promise;
+      clearTimeout(timeout);
+      const session = await seedMockAgentWorkspace({
+        port: daemon.port,
+        repoPrefix: "question-retry-",
+        title: "Question response retry",
+        initialPrompt: "Emit synthetic questions.",
+      });
+      try {
+        await page.goto("/", { waitUntil: "commit" });
+        const serverId = daemon.serverId;
+        const host = buildSeededHost({
+          serverId,
+          endpoint: `127.0.0.1:${daemon.port}`,
+          label: "Question retry host",
+          nowIso: new Date().toISOString(),
+        });
+        await page.evaluate((extraHost) => {
+          localStorage.setItem("@paseo:e2e-extra-hosts", JSON.stringify([extraHost]));
+        }, host);
+        await page.goto(buildAgentRoute(session.workspaceId, session.agentId, serverId), {
+          waitUntil: "commit",
+        });
+        await waitForQuestionPrompt(page, 120_000);
+        await provide({ attempts, resolutions, releaseFirstResponse: () => child.send("release") });
+      } finally {
+        await session.cleanup();
+      }
+    } finally {
+      clearTimeout(timeout);
+      await killProcessTree(child);
+      if (testInfo.status !== testInfo.expectedStatus) {
+        await testInfo.attach("question-daemon", {
+          body: output.join(""),
+          contentType: "text/plain",
+        });
+      }
+    }
+  },
+});
+
+retryTest(
+  "failed question submission preserves answers and allows retry",
+  async ({ page, questionClient }, testInfo) => {
+    retryTest.setTimeout(180_000);
+    const card = page.getByTestId("question-form-card");
+    await chooseQuestionOption(page, "App");
+    await chooseQuestionOption(page, "Behind feature flag");
+    await fillQuestionAnswer(page, {
+      question: SUCCESS_QUESTION,
+      answer: "Preserve my answers after a failed submission.",
+    });
+    await card.getByRole("button", { name: "Submit" }).click();
+    await expect(card.getByRole("progressbar")).toBeVisible();
+    await expectQuestionPrimaryActionDisabled(page, "Submit");
+    await expect(card.getByRole("button", { name: "Dismiss" })).toBeDisabled();
+    await expect(card.getByRole("tab").first()).toBeDisabled();
+    await expect(card.getByRole("textbox")).not.toBeEditable();
+    questionClient.releaseFirstResponse();
+    await expectQuestionPrimaryActionEnabled(page, "Submit");
+    await card.screenshot({ path: testInfo.outputPath("submission-failed.png") });
+    await expect(card.getByRole("alert")).toHaveText("Could not send your response. Try again.");
+    await expect(card.getByRole("progressbar")).toHaveCount(0);
+    await expect(card.getByRole("button", { name: "Submit" })).toHaveText("Submit");
+    await expectQuestionDismissEnabled(page);
+    await openQuestion(page, { index: 1, total: TOTAL_QUESTIONS });
+    await expectQuestionOptionSelected(page, "App");
+    await openQuestion(page, { index: 2, total: TOTAL_QUESTIONS });
+    await expectQuestionOptionSelected(page, "Behind feature flag");
+    await openQuestion(page, { index: 3, total: TOTAL_QUESTIONS });
+    await expect(card.getByRole("textbox")).toHaveValue(
+      "Preserve my answers after a failed submission.",
+    );
+    await submitQuestionAnswers(page);
+    await expectVisibleAgentSurfacesIdle(page);
+    await expect.poll(() => questionClient.attempts.length).toBe(2);
+    expect(questionClient.attempts[1]).toEqual(questionClient.attempts[0]);
+    await expect
+      .poll(() => questionClient.resolutions)
+      .toEqual([{ ...questionClient.attempts[1], type: "resolved", pendingRequestIds: [] }]);
+    expect(questionClient.attempts[1].response).toMatchObject({
+      behavior: "allow",
+      updatedInput: {
+        answers: {
+          surface: "App",
+          rollout: "Behind feature flag",
+          success: "Preserve my answers after a failed submission.",
+        },
+      },
+    });
+    await page.screenshot({ path: testInfo.outputPath("submission-retried.png") });
+  },
+);
+
+retryTest(
+  "failed question dismissal allows an immediate retry",
+  async ({ page, questionClient }, testInfo) => {
+    retryTest.setTimeout(180_000);
+    const card = page.getByTestId("question-form-card");
+    questionClient.releaseFirstResponse();
+    await chooseQuestionOption(page, "App");
+    await chooseQuestionOption(page, "Behind feature flag");
+    await fillQuestionAnswer(page, {
+      question: SUCCESS_QUESTION,
+      answer: "Start with the internal team.",
+    });
+    await card.getByRole("button", { name: "Dismiss" }).click();
+    await expect(card.getByRole("alert")).toHaveText("Could not send your response. Try again.");
+    await expect(card.getByRole("progressbar")).toHaveCount(0);
+    await expect(card.getByRole("button", { name: "Dismiss" })).toHaveText("Dismiss");
+    await expectQuestionDismissEnabled(page);
+    await expectQuestionPrimaryActionEnabled(page, "Submit");
+    await card.screenshot({ path: testInfo.outputPath("dismissal-failed.png") });
+    await openQuestion(page, { index: 1, total: TOTAL_QUESTIONS });
+    await expectQuestionOptionSelected(page, "App");
+    await openQuestion(page, { index: 3, total: TOTAL_QUESTIONS });
+    await expect(card.getByRole("textbox")).toHaveValue("Start with the internal team.");
+    await expect(card.getByRole("alert")).toBeVisible();
+    await card.getByRole("button", { name: "Dismiss" }).click();
+    await expect(card).toHaveCount(0);
+    await expectVisibleAgentSurfacesIdle(page);
+    await expect.poll(() => questionClient.attempts.length).toBe(2);
+    expect(questionClient.attempts[1]).toEqual(questionClient.attempts[0]);
+    await expect
+      .poll(() => questionClient.resolutions)
+      .toEqual([{ ...questionClient.attempts[1], type: "resolved", pendingRequestIds: [] }]);
+    expect(questionClient.attempts[1].response).toEqual({
+      behavior: "deny",
+      message: "Dismissed by user",
+    });
+    await page.screenshot({ path: testInfo.outputPath("dismissal-retried.png") });
+  },
+);
diff --git a/packages/app/src/agent-stream/view.tsx b/packages/app/src/agent-stream/view.tsx
index cd7aa42b70..09b02cda18 100644
--- a/packages/app/src/agent-stream/view.tsx
+++ b/packages/app/src/agent-stream/view.tsx
@@ -1531,11 +1531,17 @@ function PermissionRequestCard({
   );
 
   if (request.kind === "question") {
+    const responseFailed =
+      permissionMutation.isError &&
+      permissionMutation.variables?.agentId === permission.agentId &&
+      permissionMutation.variables?.requestId === permission.request.id;
+    const responseError = responseFailed ? t("message.question.responseFailed") : null;
     return (
       <QuestionFormCard
         permission={permission}
         onRespond={handleResponse}
         isResponding={isResponding}
+        responseError={responseError}
       />
     );
   }
diff --git a/packages/app/src/components/question-form-card.browser.test.tsx b/packages/app/src/components/question-form-card.browser.test.tsx
index 630b001aa6..83120931d1 100644
--- a/packages/app/src/components/question-form-card.browser.test.tsx
+++ b/packages/app/src/components/question-form-card.browser.test.tsx
@@ -58,6 +58,7 @@ function mountCard(question: Record<string, unknown>) {
         permission={buildPermission(question)}
         onRespond={onRespond}
         isResponding={false}
+        responseError={null}
       />,
     ),
   );
diff --git a/packages/app/src/components/question-form-card.tsx b/packages/app/src/components/question-form-card.tsx
index 655e01d210..7014de89d1 100644
--- a/packages/app/src/components/question-form-card.tsx
+++ b/packages/app/src/components/question-form-card.tsx
@@ -1,3 +1,4 @@
+import { Alert } from "@/components/ui/alert";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { useState, useCallback, useMemo, useRef, type RefObject } from "react";
 import { View, Text, Pressable, type PressableStateCallbackType } from "react-native";
@@ -27,6 +28,7 @@ interface QuestionFormCardProps {
   permission: PendingPermission;
   onRespond: (response: AgentPermissionResponse) => void;
   isResponding: boolean;
+  responseError: string | null;
 }
 
 const IS_WEB = isWeb;
@@ -339,7 +341,12 @@ function QuestionOtherInput({
   );
 }
 
-export function QuestionFormCard({ permission, onRespond, isResponding }: QuestionFormCardProps) {
+export function QuestionFormCard({
+  permission,
+  onRespond,
+  isResponding,
+  responseError,
+}: QuestionFormCardProps) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
   const isMobile = useIsCompactFormFactor();
@@ -438,7 +445,7 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
   ]);
 
   const handleDeny = useCallback(() => {
-    if (!questions) return;
+    if (!questions || isResponding) return;
     setRespondingAction("dismiss");
     if (shouldSubmitEmptyOnDismiss(questions)) {
       onRespond({
@@ -454,7 +461,7 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
       behavior: "deny",
       message: "Dismissed by user",
     });
-  }, [questions, onRespond, otherTexts, permission.request.input, selections]);
+  }, [questions, isResponding, onRespond, otherTexts, permission.request.input, selections]);
 
   const handleSelectQuestion = useCallback((index: number) => {
     setActiveQuestionIndex(index);
@@ -487,6 +494,7 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
     [theme.colors.surface2, theme.colors.surface1, theme.colors.borderAccent],
   );
 
+  const pendingAction = isResponding ? respondingAction : null;
   const primaryDisabled = isResponding || (isLastQuestion ? !allAnswered : !activeQuestionAnswered);
   const primaryActionLabel = isLastQuestion
     ? t("message.question.submit")
@@ -550,7 +558,7 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
   const dismissLabel = resolveDismissLabel(questions, t("common.actions.dismiss"));
   const selected = selections[resolvedActiveQuestionIndex] ?? new Set<number>();
   const otherText = otherTexts[resolvedActiveQuestionIndex] ?? "";
-  const showTextInput = activeQuestion ? questionShowsTextInput(activeQuestion) : false;
+  const showTextInput = questionShowsTextInput(questions[resolvedActiveQuestionIndex]);
 
   return (
     <View style={containerStyle} testID="question-form-card">
@@ -604,6 +612,8 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
         </View>
       ) : null}
 
+      {responseError ? <Alert variant="error" description={responseError} size="sm" /> : null}
+
       <View style={actionsContainerStyle}>
         <Pressable
           style={dismissButtonStyle}
@@ -613,7 +623,7 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
           accessibilityLabel={dismissLabel}
           testID="question-form-dismiss"
         >
-          {respondingAction === "dismiss" ? (
+          {pendingAction === "dismiss" ? (
             <LoadingSpinner size="small" color={theme.colors.foregroundMuted} />
           ) : (
             <View style={styles.actionContent}>
@@ -631,7 +641,7 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
           accessibilityLabel={primaryActionLabel}
           testID="question-form-primary-action"
         >
-          {respondingAction === "submit" ? (
+          {pendingAction === "submit" ? (
             <LoadingSpinner size="small" color={theme.colors.accentForeground} />
           ) : (
             <View style={styles.actionContent}>
diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index 5e09ac5957..c5b9cf42d6 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -369,6 +369,7 @@ export const ar: TranslationResources = {
       failedRetry: "فشل الإملاء. اضغط على إعادة المحاولة.",
     },
     question: {
+      responseFailed: "تعذر إرسال ردك. حاول مرة أخرى.",
       submit: "يُقدِّم",
       next: "التالي",
       answerPlaceholder: "اكتب إجابتك...",
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 8c6a870580..76135fb6c9 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -366,6 +366,7 @@ export const en = {
       failedRetry: "Dictation failed. Tap retry.",
     },
     question: {
+      responseFailed: "Could not send your response. Try again.",
       submit: "Submit",
       next: "Next",
       answerPlaceholder: "Type your answer...",
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index 62667ba9f9..d2572a4bab 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -374,6 +374,7 @@ export const es: TranslationResources = {
       failedRetry: "El dictado falló. Toca reintentar.",
     },
     question: {
+      responseFailed: "No se pudo enviar tu respuesta. Inténtalo de nuevo.",
       submit: "Entregar",
       next: "Siguiente",
       answerPlaceholder: "Escribe tu respuesta...",
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index 8e70ece6da..48fd08c9ed 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -374,6 +374,7 @@ export const fr: TranslationResources = {
       failedRetry: "La dictée a échoué. Appuyez sur Réessayer.",
     },
     question: {
+      responseFailed: "Impossible d’envoyer votre réponse. Réessayez.",
       submit: "Envoyer",
       next: "Suivant",
       answerPlaceholder: "Saisissez votre réponse…",
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index d7b08a9c84..b3482f5c15 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -374,6 +374,7 @@ export const ja: TranslationResources = {
       failedRetry: "音声入力に失敗しました。再試行をタップしてください。",
     },
     question: {
+      responseFailed: "回答を送信できませんでした。もう一度お試しください。",
       submit: "送信",
       next: "次へ",
       answerPlaceholder: "回答を入力...",
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index c82240f0c4..e39d625253 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -370,6 +370,7 @@ export const ko: TranslationResources = {
       failedRetry: "받아쓰기에 실패했습니다. 다시 시도하려면 누르세요.",
     },
     question: {
+      responseFailed: "응답을 보내지 못했습니다. 다시 시도해 주세요.",
       submit: "제출",
       next: "다음",
       answerPlaceholder: "답변을 입력하세요...",
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index 622c13e798..8c3d93499a 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -373,6 +373,7 @@ export const ptBR: TranslationResources = {
       failedRetry: "Falha no ditado. Toque para tentar novamente.",
     },
     question: {
+      responseFailed: "Não foi possível enviar sua resposta. Tente novamente.",
       submit: "Enviar",
       next: "Próximo",
       answerPlaceholder: "Digite sua resposta...",
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index 733596de39..df57855cb6 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -373,6 +373,7 @@ export const ru: TranslationResources = {
       failedRetry: "Диктовка не удалась. Нажмите «Повторить».",
     },
     question: {
+      responseFailed: "Не удалось отправить ответ. Попробуйте ещё раз.",
       submit: "Отправить",
       next: "Далее",
       answerPlaceholder: "Введите ответ...",
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index c8627ca769..984cc0d71a 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -369,6 +369,7 @@ export const zhCN: TranslationResources = {
       failedRetry: "听写失败。点按重试。",
     },
     question: {
+      responseFailed: "未能发送你的回复，请重试。",
       submit: "提交",
       next: "下一步",
       answerPlaceholder: "输入你的回答...",
diff --git a/packages/server/src/server/test-utils/question-response-daemon.ts b/packages/server/src/server/test-utils/question-response-daemon.ts
new file mode 100644
index 0000000000..2899dc8ba3
--- /dev/null
+++ b/packages/server/src/server/test-utils/question-response-daemon.ts
@@ -0,0 +1,69 @@
+import { randomUUID } from "node:crypto";
+import {
+  MockLoadTestAgentClient,
+  MockLoadTestAgentSession,
+} from "../agent/providers/mock-load-test-agent.js";
+import { createTestPaseoDaemon } from "./paseo-daemon.js";
+
+const firstResponse = Promise.withResolvers<void>();
+
+class RetryQuestionSession extends MockLoadTestAgentSession {
+  private attempts = 0;
+
+  override async respondToPermission(
+    requestId: string,
+    response: Parameters<MockLoadTestAgentSession["respondToPermission"]>[1],
+  ) {
+    this.attempts += 1;
+    process.send?.({ type: "attempt", requestId, response, sessionId: this.id });
+    if (this.attempts === 1) {
+      await firstResponse.promise;
+      throw new Error("Synthetic question response failure");
+    }
+    return super.respondToPermission(requestId, response);
+  }
+}
+
+class RetryQuestionClient extends MockLoadTestAgentClient {
+  override async createSession(config: Parameters<MockLoadTestAgentClient["createSession"]>[0]) {
+    const session = new RetryQuestionSession({ config, sessionId: randomUUID() });
+    session.subscribe((event) => {
+      if (event.type === "permission_resolved") {
+        process.send?.({
+          type: "resolved",
+          requestId: event.requestId,
+          response: event.resolution,
+          sessionId: session.id,
+          pendingRequestIds: session.getPendingPermissions().map((request) => request.id),
+        });
+      }
+    });
+    return session;
+  }
+}
+
+async function main(): Promise<void> {
+  const daemon = await createTestPaseoDaemon({
+    agentClients: { mock: new RetryQuestionClient() },
+    isDev: true,
+    mcpEnabled: false,
+    corsAllowedOrigins: [`http://localhost:${process.env.E2E_METRO_PORT}`],
+  });
+  process.on("message", (message: unknown) => {
+    if (message === "release") firstResponse.resolve();
+  });
+  const shutdown = async () => {
+    firstResponse.resolve();
+    await daemon.close();
+    process.exit(0);
+  };
+  process.once("SIGINT", () => void shutdown());
+  process.once("SIGTERM", () => void shutdown());
+  process.once("disconnect", () => void shutdown());
+  process.send?.({ type: "ready", port: daemon.port, serverId: daemon.daemon.getServerId() });
+}
+
+void main().catch((error: unknown) => {
+  process.send?.({ type: "error", error: error instanceof Error ? error.message : String(error) });
+  process.exit(1);
+});

From 30122b1ae11369f275cf931b68078716d5a8c4c3 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2026 23:53:46 +0200
Subject: [PATCH 222/270] Show a background Claude subagent's action log on its
 card (#6242)

* fix(claude): show a background subagent's action log on its card

Claude Code answers a background Agent call at launch and streams the
child's frames afterwards. Since #6067 the sidechain tracker stopped
emitting the parent card once the call had its result, so the card's
log stayed empty. The tracker now rebuilds the card from the settled
call, keeping its status, output, and label, and adds the child's
action log.

Closes #6157

* fix(claude): release a settled subagent call when the child finishes

* fix(claude): keep a background subagent's card in the turn that settled it

A background child often keeps streaming after the parent's turn ends. Its
frames then rebuilt the settled card in the next turn with an empty log, and
the projection showed it as a second card for the same call. The settled call
now rebuilds the card only within the turn that answered it.

* test(claude): model the turn boundary in background card coverage

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../claude/agent.background-subagent.test.ts  | 153 +++++++++++++++++-
 .../server/agent/providers/claude/agent.ts    |  79 ++++++---
 .../providers/claude/sidechain-tracker.ts     |  26 ++-
 3 files changed, 232 insertions(+), 26 deletions(-)

diff --git a/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts b/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts
index 630bdbf0a6..d0a5bf644a 100644
--- a/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts
@@ -4,7 +4,7 @@ import path from "node:path";
 import { afterEach, describe, expect, test, vi } from "vitest";
 
 import { createTestLogger } from "../../../../test-utils/test-logger.js";
-import type { AgentStreamEvent } from "../../agent-sdk-types.js";
+import type { AgentSession, AgentStreamEvent } from "../../agent-sdk-types.js";
 import type { AgentTimelineRow } from "../../agent-manager.js";
 import { projectTimelineRows } from "../../timeline-projection.js";
 import { ClaudeAgentClient } from "./agent.js";
@@ -105,6 +105,39 @@ async function collectUntilTerminal(
   return events;
 }
 
+async function collectTimelineAcrossTurns(
+  session: AgentSession,
+  prompt: string,
+  turnCount: number,
+): Promise<AgentTimelineRow[]> {
+  const rows: AgentTimelineRow[] = [];
+  let currentTurnId: string | undefined;
+  let completedTurns = 0;
+  let unsubscribe = () => {};
+  const turnsCompleted = new Promise<void>((resolve) => {
+    unsubscribe = session.subscribe((event) => {
+      if (event.type === "turn_started") currentTurnId = event.turnId;
+      if (event.type === "timeline") {
+        rows.push({
+          seq: rows.length + 1,
+          timestamp: new Date(Date.UTC(2026, 9, 4, 0, 0, rows.length)).toISOString(),
+          item: event.item,
+          ...(currentTurnId ? { turnId: currentTurnId } : {}),
+        });
+      }
+      if (event.type === "turn_completed" && ++completedTurns === turnCount) resolve();
+    });
+  });
+  try {
+    await session.startTurn(prompt);
+    await turnsCompleted;
+    return rows;
+  } finally {
+    unsubscribe();
+    await session.close();
+  }
+}
+
 describe("background Claude subagents", () => {
   afterEach(() => {
     queryFactory.mockReset();
@@ -431,6 +464,124 @@ describe("background Claude subagents", () => {
         type: "sub_agent",
         subAgentType: "general-purpose",
         description: "Count files here",
+        log: "[Bash] ls -1",
+      },
+    });
+  });
+
+  test("keeps one logged Task card when the child streams on after the parent's turn ends", async () => {
+    // A child can stream across the main session's turn boundary. Claude opens the next
+    // main-session turn with system/init; bare child frames do not open a turn.
+    queryFactory.mockImplementation(() =>
+      buildQueryMock([
+        { type: "system", subtype: "init", session_id: "bg-session", permissionMode: "default" },
+        {
+          type: "assistant",
+          message: {
+            model: "claude-haiku-4-5",
+            content: [
+              {
+                type: "tool_use",
+                id: "toolu_background",
+                name: "Agent",
+                input: {
+                  subagent_type: "general-purpose",
+                  description: "Count files here",
+                  prompt: "Run ls and reply with the number of entries.",
+                  run_in_background: true,
+                },
+              },
+            ],
+          },
+        },
+        {
+          type: "system",
+          subtype: "task_started",
+          task_id: "bg-task",
+          tool_use_id: "toolu_background",
+          task_type: "local_agent",
+          subagent_type: "general-purpose",
+          description: "Count files here",
+          prompt: "Run ls and reply with the number of entries.",
+        },
+        {
+          type: "user",
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: "toolu_background",
+                content: "Async agent launched successfully.",
+              },
+            ],
+          },
+        },
+        {
+          type: "assistant",
+          parent_tool_use_id: "toolu_background",
+          message: {
+            model: "claude-haiku-4-5",
+            content: [
+              {
+                type: "tool_use",
+                id: "toolu_ls",
+                name: "Bash",
+                input: { command: "ls -1", description: "List files" },
+              },
+            ],
+          },
+        },
+        { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
+        { type: "system", subtype: "init", session_id: "bg-session", permissionMode: "default" },
+        {
+          type: "user",
+          parent_tool_use_id: "toolu_background",
+          message: {
+            role: "user",
+            content: [{ type: "tool_result", tool_use_id: "toolu_ls", content: "a\nb\nc" }],
+          },
+        },
+        {
+          type: "assistant",
+          parent_tool_use_id: "toolu_background",
+          message: { model: "claude-haiku-4-5", content: [{ type: "text", text: "3" }] },
+        },
+        {
+          type: "system",
+          subtype: "task_updated",
+          task_id: "bg-task",
+          patch: { status: "completed" },
+        },
+        {
+          type: "system",
+          subtype: "task_notification",
+          task_id: "bg-task",
+          tool_use_id: "toolu_background",
+          status: "completed",
+        },
+        { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
+      ]),
+    );
+    const session = await new ClaudeAgentClient({
+      logger: createTestLogger(),
+      queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    }).createSession({ provider: "claude", cwd: process.cwd() });
+    const rows = await collectTimelineAcrossTurns(session, "delegate work", 2);
+
+    const cards = projectTimelineRows({ rows, mode: "projected" })
+      .map((entry) => entry.item)
+      .filter((item) => item.type === "tool_call" && item.callId === "toolu_background");
+
+    expect(cards).toHaveLength(1);
+    expect(cards[0]).toMatchObject({
+      status: "completed",
+      detail: {
+        type: "sub_agent",
+        subAgentType: "general-purpose",
+        description: "Count files here",
+        log: "[Bash] ls -1",
       },
     });
   });
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index 8c5cc1a41c..e88ae34662 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -2228,18 +2228,37 @@ class ClaudeAgentSession implements AgentSession {
     getToolInput: (toolUseId) => this.toolUseCache.get(toolUseId)?.input ?? null,
     readWorkflowResult: readClaudeWorkflowResultFile,
   });
+  /**
+   * Subagent tool calls Claude has already answered while the child still runs, with the input
+   * they were launched with and the turn that answered them. A background child is answered at
+   * launch and streams its frames afterwards.
+   */
+  private readonly settledSubagentToolCalls = new Map<
+    string,
+    {
+      item: Extract<AgentTimelineItem, { type: "tool_call" }>;
+      input: AgentMetadata | null;
+      turnId: string | null;
+    }
+  >();
   private readonly sidechainTracker = new ClaudeSidechainTracker({
-    getToolInput: (toolUseId) => this.toolUseCache.get(toolUseId)?.input ?? null,
+    getToolInput: (toolUseId) =>
+      this.toolUseCache.get(toolUseId)?.input ??
+      this.settledSubagentToolCallInCurrentTurn(toolUseId)?.input ??
+      null,
     // Releases that predate the task protocol announce nothing, so the tracker keeps deriving
     // identity and status from frames for them. Detecting the capability beats comparing version
     // strings: it reacts to what this session actually does.
     isDescriptorOwnedElsewhere: () => this.taskProtocolSource.isActive,
-    // The parent's tool call owns its card once its result arrives. A background child streams
-    // its frames after Claude has already answered the call, and re-emitting the card from them
-    // would replace the settled card with an unlabeled, running one.
+    // A background child streams its frames after Claude has already answered the call, so its
+    // card is rebuilt from the settled call: a running one would replace the settled, labeled card.
+    // A card belongs to the turn that answered the call, so frames from a later turn leave it be.
     needsSyntheticParentToolCard: (toolUseId) =>
-      this.toolUseCache.has(toolUseId) &&
+      (this.toolUseCache.has(toolUseId) ||
+        this.settledSubagentToolCallInCurrentTurn(toolUseId) !== undefined) &&
       this.taskProtocolSource.needsSyntheticParentToolCard(toolUseId),
+    getSettledParentToolCall: (toolUseId) =>
+      this.settledSubagentToolCallInCurrentTurn(toolUseId)?.item,
   });
   private persistedHistory: PersistedTimelineEntry[] = [];
   private persistedProviderSubagentEvents: Extract<
@@ -2876,6 +2895,7 @@ class ClaudeAgentSession implements AgentSession {
     this.cancelCurrentTurn = null;
     this.turnState = "idle";
     this.sidechainTracker.clear();
+    this.settledSubagentToolCalls.clear();
     this.taskProtocolSource.reset();
     this.input?.end();
     this.query?.close?.();
@@ -4361,6 +4381,7 @@ class ClaudeAgentSession implements AgentSession {
     for (const event of foldSubagentObservations(subagentObservations)) {
       events.push({ type: "provider_subagent", provider: "claude", event });
     }
+    this.releaseFinishedSubagentToolCalls(subagentObservations);
     for (const observation of subagentObservations) {
       if (observation.kind !== "declared") continue;
       if (!this.taskProtocolSource.needsSyntheticParentToolCard(observation.id)) continue;
@@ -5548,28 +5569,22 @@ class ClaudeAgentSession implements AgentSession {
     const { images, text } = splitClaudeToolResultImages(block.content);
     const output = this.buildToolOutput(text, block, entry);
 
-    if (block.is_error) {
-      this.pushToolCall(
-        mapClaudeFailedToolCall({
+    const settledToolCall = block.is_error
+      ? mapClaudeFailedToolCall({
           name: toolName,
           callId,
           input: entry?.input ?? null,
           output: output ?? null,
           error: { ...block, content: text },
-        }),
-        items,
-      );
-    } else {
-      this.pushToolCall(
-        mapClaudeCompletedToolCall({
+        })
+      : mapClaudeCompletedToolCall({
           name: toolName,
           callId,
           input: entry?.input ?? null,
           output: output ?? null,
-        }),
-        items,
-      );
-    }
+        });
+    this.pushToolCall(settledToolCall, items);
+    this.rememberSettledSubagentToolCall(settledToolCall, entry);
 
     for (const image of images) {
       const imageItem = renderProviderImageOutputAsAssistantMarkdown(image, {
@@ -5585,6 +5600,34 @@ class ClaudeAgentSession implements AgentSession {
     }
   }
 
+  private rememberSettledSubagentToolCall(
+    item: Extract<AgentTimelineItem, { type: "tool_call" }> | null,
+    entry: ToolUseCacheEntry | undefined,
+  ): void {
+    const subagentId = item ? this.taskProtocolSource.resolveSubagentId(item.callId) : undefined;
+    if (!item || !subagentId) return;
+    this.settledSubagentToolCalls.set(subagentId, {
+      item,
+      input: entry?.input ?? null,
+      turnId: this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? null,
+    });
+  }
+
+  private settledSubagentToolCallInCurrentTurn(subagentId: string) {
+    const settled = this.settledSubagentToolCalls.get(subagentId);
+    const currentTurnId = this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? null;
+    return settled && settled.turnId === currentTurnId ? settled : undefined;
+  }
+
+  /** A finished child streams no more frames, so its settled call has nothing left to update. */
+  private releaseFinishedSubagentToolCalls(observations: SubagentObservation[]): void {
+    for (const observation of observations) {
+      if (observation.kind === "status" && observation.status !== "running") {
+        this.settledSubagentToolCalls.delete(observation.id);
+      }
+    }
+  }
+
   private buildToolOutput(
     content: unknown,
     block: ClaudeContentChunk,
diff --git a/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts b/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
index 195e21f857..f054523126 100644
--- a/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
+++ b/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
@@ -18,6 +18,8 @@ interface ClaudeContentChunk {
   [key: string]: unknown;
 }
 
+type ClaudeToolCallItem = Extract<AgentTimelineItem, { type: "tool_call" }>;
+
 interface SubAgentActionEntry {
   index: number;
   toolName: string;
@@ -64,6 +66,7 @@ export class ClaudeSidechainTracker {
   private readonly getToolInput: (toolUseId: string) => AgentMetadata | null | undefined;
   private readonly isDescriptorOwnedElsewhere: () => boolean;
   private readonly needsSyntheticParentToolCard: (toolUseId: string) => boolean;
+  private readonly getSettledParentToolCall: (toolUseId: string) => ClaudeToolCallItem | undefined;
 
   constructor(input: {
     getToolInput: (toolUseId: string) => AgentMetadata | null | undefined;
@@ -74,10 +77,17 @@ export class ClaudeSidechainTracker {
      */
     isDescriptorOwnedElsewhere?: () => boolean;
     needsSyntheticParentToolCard?: (toolUseId: string) => boolean;
+    /**
+     * The parent's tool call once Claude has answered it. A background child streams its frames
+     * after that answer, so its card keeps the settled status and output and gains the child's
+     * action log.
+     */
+    getSettledParentToolCall?: (toolUseId: string) => ClaudeToolCallItem | undefined;
   }) {
     this.getToolInput = input.getToolInput;
     this.isDescriptorOwnedElsewhere = input.isDescriptorOwnedElsewhere ?? (() => false);
     this.needsSyntheticParentToolCard = input.needsSyntheticParentToolCard ?? (() => true);
+    this.getSettledParentToolCall = input.getSettledParentToolCall ?? (() => undefined);
   }
 
   handleMessage(message: SDKMessage, parentToolUseId: string): AgentStreamEvent[] {
@@ -119,17 +129,19 @@ export class ClaudeSidechainTracker {
       return [];
     }
 
-    const toolCall = mapClaudeRunningToolCall({
-      name: "Task",
-      callId: parentToolUseId,
-      input: null,
-      output: null,
-    });
+    const toolCall =
+      this.getSettledParentToolCall(parentToolUseId) ??
+      mapClaudeRunningToolCall({
+        name: "Task",
+        callId: parentToolUseId,
+        input: null,
+        output: null,
+      });
     if (!toolCall) {
       return [];
     }
 
-    const detail: Extract<AgentTimelineItem, { type: "tool_call" }>["detail"] = {
+    const detail: ClaudeToolCallItem["detail"] = {
       type: "sub_agent",
       ...(state.subAgentType ? { subAgentType: state.subAgentType } : {}),
       ...(state.description ? { description: state.description } : {}),

From cd77ecd837df40d042599d8847403eb416b35b04 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 01:10:35 +0200
Subject: [PATCH 223/270] Start idle OMP agents when they receive follow-ups
 (#7169)

* fix(server): run slash commands sent by another agent out of band again

* fix(omp): send /steer and /follow-up as prompts so an idle agent starts a run

* test(omp): verify idle follow-ups and parent notifications

Cover real daemon and MCP delivery, and keep the fake runtime tests independent of an installed OMP executable.

Co-authored-by: Hung Le <22406703+nhthung@users.noreply.github.com>

* fix(omp): report idle follow-up admission failures

Use the existing prompt lifecycle for an idle command so acknowledgements and late rejections settle the child and notify its caller. Keep busy commands on the streaming prompt path, and accept one runtime prompt input object.

---------

Co-authored-by: Hung Le <22406703+nhthung@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/agent/agent-manager.test.ts    |  35 ++++
 .../server/src/server/agent/agent-manager.ts  |   9 +-
 .../src/server/agent/mcp-server.test.ts       | 179 +++++++++++++++++-
 .../server/agent/providers/omp/agent.test.ts  |  13 ++
 .../src/server/agent/providers/omp/agent.ts   |  44 ++++-
 .../agent/providers/omp/cli-runtime.test.ts   |  24 ++-
 .../server/agent/providers/omp/cli-runtime.ts |  14 +-
 .../server/agent/providers/omp/rpc-types.ts   |   1 +
 .../src/server/agent/providers/omp/runtime.ts |  17 +-
 .../providers/omp/test-utils/fake-omp.ts      |  32 ++--
 .../server/daemon-e2e/omp.real.e2e.test.ts    |  86 ++++++++-
 11 files changed, 403 insertions(+), 51 deletions(-)

diff --git a/packages/server/src/server/agent/agent-manager.test.ts b/packages/server/src/server/agent/agent-manager.test.ts
index 763659e9f4..44e38a344f 100644
--- a/packages/server/src/server/agent/agent-manager.test.ts
+++ b/packages/server/src/server/agent/agent-manager.test.ts
@@ -10929,6 +10929,41 @@ test("authoritative timeline records a daemon-handled submitted prompt before it
   }
 });
 
+test("tryRunOutOfBand gives providers the command another agent sent, not its envelope", async () => {
+  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-agent-out-of-band-"));
+  const seenPrompts: AgentPromptInput[] = [];
+
+  class SlashCommandSession extends TestAgentSession {
+    override tryHandleOutOfBand(prompt: AgentPromptInput) {
+      seenPrompts.push(prompt);
+      return prompt === "/handled" ? { run: async () => {} } : null;
+    }
+  }
+  const client = new (class extends TestAgentClient {
+    override async createSession(config: AgentSessionConfig) {
+      return new SlashCommandSession(config);
+    }
+  })();
+  const manager = new AgentManager({ clients: { codex: client }, logger });
+  const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
+    workspaceId: undefined,
+  });
+
+  try {
+    const fromAgent = prepareAgentMessage("/handled", { kind: "agent-message", agentId: "sender" });
+    expect(manager.tryRunOutOfBand(agent.id, fromAgent.prompt)).toBe(true);
+    expect(seenPrompts).toEqual(["/handled"]);
+
+    // A human who pastes an envelope gets it quoted, and it stays a plain prompt.
+    const pasted = prepareAgentMessage(String(fromAgent.prompt));
+    expect(manager.tryRunOutOfBand(agent.id, pasted.prompt)).toBe(false);
+    expect(seenPrompts.at(-1)).toBe(pasted.prompt);
+  } finally {
+    await manager.closeAgent(agent.id);
+    rmSync(workdir, { recursive: true, force: true });
+  }
+});
+
 test("replaceAgentRun succeeds when foreground turn terminal event is never delivered", async () => {
   const workdir = mkdtempSync(join(tmpdir(), "agent-manager-stale-fg-"));
   const storagePath = join(workdir, "agents");
diff --git a/packages/server/src/server/agent/agent-manager.ts b/packages/server/src/server/agent/agent-manager.ts
index e09d62f6a9..ff91ef85ef 100644
--- a/packages/server/src/server/agent/agent-manager.ts
+++ b/packages/server/src/server/agent/agent-manager.ts
@@ -79,7 +79,7 @@ import {
   type PendingForegroundRun,
 } from "./agent-run-state.js";
 import { invokeRewindCapability, type RewindMode } from "./rewind/rewind.js";
-import { projectAgentMessage } from "./agent-messages/index.js";
+import { parseAgentMessage, projectAgentMessage } from "./agent-messages/index.js";
 import { isStaleProviderSessionError } from "./stale-provider-session-error.js";
 import { stripInternalPaseoMcpServer, withRuntimePaseoMcpServer } from "./runtime-mcp-config.js";
 import { resolveCreateAgentTitles } from "./create-agent-title.js";
@@ -2459,7 +2459,12 @@ export class AgentManager {
    */
   tryRunOutOfBand(agentId: string, prompt: AgentPromptInput, options?: AgentRunOptions): boolean {
     const agent = this.requireSessionAgent(agentId);
-    const handler = agent.session.tryHandleOutOfBand?.(prompt);
+    // Providers parse slash commands from the raw text, so a command another agent sent
+    // must reach them without its sender envelope.
+    const agentMessage = typeof prompt === "string" ? parseAgentMessage(prompt) : null;
+    const handler = agent.session.tryHandleOutOfBand?.(
+      agentMessage?.source ? agentMessage.text : prompt,
+    );
     if (!handler) {
       return false;
     }
diff --git a/packages/server/src/server/agent/mcp-server.test.ts b/packages/server/src/server/agent/mcp-server.test.ts
index de0099cecf..3a90b7f577 100644
--- a/packages/server/src/server/agent/mcp-server.test.ts
+++ b/packages/server/src/server/agent/mcp-server.test.ts
@@ -15,6 +15,8 @@ import { createAgentMcpServer as createAgentMcpServerWithDependencies } from "./
 import { AgentManager, type ManagedAgent } from "./agent-manager.js";
 import { AgentStorage, type StoredAgentRecord } from "./agent-storage.js";
 import { createTestAgentClients } from "../test-utils/fake-agent-client.js";
+import { OmpAgentClient } from "./providers/omp/agent.js";
+import { FakeOmp } from "./providers/omp/test-utils/fake-omp.js";
 import type {
   AgentClient,
   AgentMode,
@@ -3856,8 +3858,7 @@ class HeldTurnAgentSession implements AgentSession {
   }
 
   tryHandleOutOfBand(prompt: AgentPromptInput) {
-    const text = typeof prompt === "string" ? (parseAgentMessage(prompt)?.text ?? prompt) : null;
-    return text === "/side-command" ? { run: async () => {} } : null;
+    return prompt === "/side-command" ? { run: async () => {} } : null;
   }
 
   async startTurn(prompt: AgentPromptInput): Promise<{ turnId: string }> {
@@ -4557,6 +4558,180 @@ describe("send_agent_prompt MCP tool", () => {
   });
 });
 
+describe("send_agent_prompt MCP tool to an OMP child", () => {
+  const logger = createTestLogger();
+  const existingCwd = process.cwd();
+
+  async function setupOmpChild() {
+    const workdir = await mkdtemp(join(tmpdir(), "mcp-omp-child-"));
+    const storage = new AgentStorage(join(workdir, "agents"), logger);
+    const parentClient = new HeldTurnAgentClient("claude", false);
+    const omp = new FakeOmp();
+    const agentManager = new AgentManager({
+      clients: {
+        claude: parentClient,
+        omp: new OmpAgentClient({
+          logger,
+          runtime: omp,
+          noTurnScheduler: { waitForSettle: async () => {} },
+          runtimeSettings: { command: { mode: "replace", argv: [process.execPath] } },
+        }),
+      },
+      registry: storage,
+      logger,
+    });
+    const parent = await agentManager.createAgent(
+      { provider: "claude", cwd: existingCwd },
+      undefined,
+      { workspaceId: "wks_parent" },
+    );
+    const child = await agentManager.createAgent(
+      { provider: "omp", cwd: existingCwd, title: "OMP child" },
+      undefined,
+      { workspaceId: "wks_parent" },
+    );
+    const server = await createAgentMcpServer({
+      agentManager,
+      agentStorage: storage,
+      callerAgentId: parent.id,
+      providerSnapshotManager: createOpenCodeManager().manager,
+      logger,
+    });
+    return {
+      agentManager,
+      storage,
+      workdir,
+      parentClient,
+      ompSession: omp.latestSession(),
+      childId: child.id,
+      tool: registeredTool(server, "send_agent_prompt"),
+    };
+  }
+
+  async function expectOneFinishNotification(
+    agentManager: AgentManager,
+    parentClient: HeldTurnAgentClient,
+    childId: string,
+  ) {
+    await vi.waitFor(() => expect(agentManager.getAgent(childId)?.lifecycle).toBe("idle"));
+    await vi.waitFor(() => {
+      expect(parentClient.sessions[0]!.prompts).toHaveLength(1);
+      expect(parentClient.sessions[0]!.prompts[0]).toContain(
+        `Agent ${childId} (OMP child) finished.`,
+      );
+    });
+  }
+
+  it.each([
+    { command: "follow-up", streamingBehavior: "followUp" },
+    { command: "steer", streamingBehavior: "steer" },
+  ] as const)(
+    "delivers /$command into a turn OMP started on its own, without aborting it",
+    async ({ command, streamingBehavior }) => {
+      const { agentManager, storage, workdir, parentClient, ompSession, childId, tool } =
+        await setupOmpChild();
+      try {
+        ompSession.beginTurn();
+        ompSession.streamAssistantText("background job finished, working on it");
+        await vi.waitFor(() => {
+          expect(agentManager.getAgent(childId)?.activeTurnId).toMatch(/^autonomous-/);
+        });
+
+        const response = await invokeToolWithParsedInput(tool, {
+          agentId: childId,
+          prompt: `/${command} then summarize the logs`,
+        });
+
+        expect(response.structuredContent).toMatchObject({
+          success: true,
+          disposition: "out_of_band",
+          status: "running",
+        });
+        await vi.waitFor(() => {
+          expect(ompSession.prompts).toEqual([
+            { message: "then summarize the logs", imageCount: 0, streamingBehavior },
+          ]);
+        });
+        expect(ompSession.abortRequested).toBe(false);
+        expect(agentManager.getAgent(childId)?.lifecycle).toBe("running");
+
+        ompSession.finishTurn();
+        await expectOneFinishNotification(agentManager, parentClient, childId);
+      } finally {
+        await removeAgentStateDir(agentManager, storage, workdir);
+      }
+    },
+  );
+
+  it.each(["before ack", "after ack"])(
+    "reports an idle follow-up rejected %s and notifies its parent",
+    async (order) => {
+      const { agentManager, storage, workdir, parentClient, ompSession, childId, tool } =
+        await setupOmpChild();
+      try {
+        ompSession.promptAck = { requestId: "follow-up-rejected" };
+        const rejection = {
+          type: "prompt_result",
+          id: "follow-up-rejected",
+          agentInvoked: false,
+          status: "error",
+          sessionSettled: true,
+          error: { message: "Provider rejected the follow-up", retryable: false },
+        } as const;
+        const promptStarted = ompSession.nextPrompt();
+        const response = invokeToolWithParsedInput(tool, {
+          agentId: childId,
+          prompt: "/follow-up check the build",
+        });
+        await promptStarted;
+        if (order === "before ack") ompSession.emit(rejection);
+        await response;
+        if (order === "after ack") ompSession.emit(rejection);
+        await vi.waitFor(() => expect(agentManager.getAgent(childId)?.lifecycle).toBe("error"));
+        expect(agentManager.getAgent(childId)?.lastError).toContain(
+          "Provider rejected the follow-up",
+        );
+        await vi.waitFor(() => expect(parentClient.sessions[0]!.prompts).toHaveLength(1));
+        expect(parentClient.sessions[0]!.prompts[0]).toContain(
+          `Agent ${childId} (OMP child) errored.`,
+        );
+      } finally {
+        await removeAgentStateDir(agentManager, storage, workdir);
+      }
+    },
+  );
+
+  it("lets an idle child start a run with the follow-up", async () => {
+    const { agentManager, storage, workdir, parentClient, ompSession, childId, tool } =
+      await setupOmpChild();
+    try {
+      const response = await invokeToolWithParsedInput(tool, {
+        agentId: childId,
+        prompt: "/follow-up check the build",
+      });
+
+      expect(response.structuredContent).toMatchObject({
+        success: true,
+        disposition: "out_of_band",
+        status: "running",
+      });
+      await vi.waitFor(() => {
+        expect(ompSession.prompts).toEqual([
+          { message: "check the build", imageCount: 0, streamingBehavior: "followUp" },
+        ]);
+      });
+
+      ompSession.beginTurn();
+      ompSession.streamAssistantText("Build is green");
+      await vi.waitFor(() => expect(agentManager.getAgent(childId)?.lifecycle).toBe("running"));
+      ompSession.finishTurn();
+      await expectOneFinishNotification(agentManager, parentClient, childId);
+    } finally {
+      await removeAgentStateDir(agentManager, storage, workdir);
+    }
+  });
+});
+
 describe("update_agent MCP tool", () => {
   const logger = createTestLogger();
 
diff --git a/packages/server/src/server/agent/providers/omp/agent.test.ts b/packages/server/src/server/agent/providers/omp/agent.test.ts
index a1dc9130a8..c9911a64b8 100644
--- a/packages/server/src/server/agent/providers/omp/agent.test.ts
+++ b/packages/server/src/server/agent/providers/omp/agent.test.ts
@@ -39,6 +39,19 @@ const ABORTED_TERMINAL_RESPONSE: OmpAgentMessage = {
   errorMessage: "Interrupted by user",
 };
 
+test("an idle follow-up is submitted as a prompt so OMP can start a turn", async () => {
+  const runtime = new FakeOmp();
+  const client = new OmpAgentClient({ logger: createTestLogger(), runtime });
+  const session = await client.createSession({ provider: "omp", cwd: process.cwd() });
+  onTestFinished(() => session.close());
+  const handler = session.tryHandleOutOfBand?.("/follow-up check the build");
+  expect(handler).not.toBeNull();
+  await handler!.run({ emit: () => {} });
+  expect(runtime.latestSession().prompts).toEqual([
+    { message: "check the build", imageCount: 0, streamingBehavior: "followUp" },
+  ]);
+});
+
 test("OMP ready timeout defaults to 20 seconds and RPC timeout overrides both", () => {
   expect(resolveOmpProviderOptions({}).runtimeOptions).toMatchObject({
     readyTimeoutMs: 20_000,
diff --git a/packages/server/src/server/agent/providers/omp/agent.ts b/packages/server/src/server/agent/providers/omp/agent.ts
index 5413364cdb..ab82df9475 100644
--- a/packages/server/src/server/agent/providers/omp/agent.ts
+++ b/packages/server/src/server/agent/providers/omp/agent.ts
@@ -705,6 +705,7 @@ export class OmpAgentSession implements AgentSession {
   private activeAssistantMessageId: string | null = null;
   private activeTurnTerminalAssistantMessage: OmpAgentMessage | null = null;
   private activeTurnStarted = false;
+  private outOfBandTurnStartAnnounced = false;
   private activeTurnHasUserMessage = false;
   private activeNoTurnPromptText: string | null = null;
   private readonly pendingNoTurnOutputs: Array<{ turnId: string; message: string }> = [];
@@ -849,6 +850,20 @@ export class OmpAgentSession implements AgentSession {
   }
 
   async startTurn(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<StartTurnResult> {
+    return this.startPrompt({ prompt, options });
+  }
+
+  private async startPrompt({
+    prompt,
+    options,
+    streamingBehavior,
+    announceTurn = false,
+  }: {
+    prompt: AgentPromptInput;
+    options?: AgentRunOptions;
+    streamingBehavior?: "steer" | "followUp";
+    announceTurn?: boolean;
+  }): Promise<StartTurnResult> {
     if (this.activeTurnId) {
       throw new Error("An OMP turn is already active");
     }
@@ -861,17 +876,26 @@ export class OmpAgentSession implements AgentSession {
     this.activeAssistantMessageId = null;
     this.activeTurnTerminalAssistantMessage = null;
     this.activeTurnStarted = false;
+    this.outOfBandTurnStartAnnounced = false;
     this.activeTurnHasUserMessage = false;
     this.activePromptRequestId = null;
     this.clearNoTurnBuffers();
     this.activeNoTurnPromptText = payload.text;
     this.usagePoller.startTurn();
+    if (announceTurn) {
+      this.outOfBandTurnStartAnnounced = true;
+      this.emit({ type: "turn_started", provider: this.provider, turnId });
+    }
 
     void (async () => {
       try {
         if (this.runtimeDead) await this.replaceRuntime(this.currentModeId ?? "full");
         if (this.closed) throw new Error("OMP session is closed");
-        const ack = await this.runtimeSession.prompt(payload.text, payload.images);
+        const ack = await this.runtimeSession.prompt({
+          message: payload.text,
+          images: payload.images,
+          streamingBehavior,
+        });
         this.activePromptRequestId = ack.requestId ?? null;
         const correlatedResult = ack.requestId
           ? this.pendingPromptResults.get(ack.requestId)
@@ -1191,6 +1215,7 @@ export class OmpAgentSession implements AgentSession {
     this.activeAssistantMessageId = null;
     this.activeTurnTerminalAssistantMessage = null;
     this.activeTurnStarted = false;
+    this.outOfBandTurnStartAnnounced = false;
     this.activeTurnHasUserMessage = false;
     this.pendingClientMessages.length = 0;
     this.clearNoTurnBuffers();
@@ -1235,12 +1260,13 @@ export class OmpAgentSession implements AgentSession {
       if (!message) {
         return null;
       }
+      const streamingBehavior = commandName === "steer" ? "steer" : "followUp";
       return {
         run: async () => {
-          if (commandName === "steer") {
-            this.runtimeSession.steer(message);
+          if (!this.activeTurnId && !this.activeTurnStarted) {
+            await this.startPrompt({ prompt: message, streamingBehavior, announceTurn: true });
           } else {
-            this.runtimeSession.followUp(message);
+            await this.runtimeSession.prompt({ message, streamingBehavior });
           }
         },
       };
@@ -1804,11 +1830,11 @@ export class OmpAgentSession implements AgentSession {
       case "turn_start":
         this.activeTurnStarted = true;
         this.clearNoTurnBuffers();
-        this.emit({
-          type: "turn_started",
-          provider: this.provider,
-          turnId,
-        });
+        if (this.outOfBandTurnStartAnnounced) {
+          this.outOfBandTurnStartAnnounced = false;
+        } else {
+          this.emit({ type: "turn_started", provider: this.provider, turnId });
+        }
         return;
       case "message_start":
         this.handleMessageStart(event);
diff --git a/packages/server/src/server/agent/providers/omp/cli-runtime.test.ts b/packages/server/src/server/agent/providers/omp/cli-runtime.test.ts
index 2deae45850..4c8a81fe46 100644
--- a/packages/server/src/server/agent/providers/omp/cli-runtime.test.ts
+++ b/packages/server/src/server/agent/providers/omp/cli-runtime.test.ts
@@ -143,6 +143,26 @@ describe("OMP CLI runtime", () => {
     await expect(result).rejects.toThrow("rejected");
     await session.close();
   });
+  test("sends the prompt streamingBehavior only when one is given", async () => {
+    const child = createOmpChild();
+    const session = await createRuntime(child, []).startSession({ cwd: "/workspace/project" });
+
+    for (const streamingBehavior of ["followUp", undefined] as const) {
+      const pending = capturePendingCommand(child, "prompt");
+      const result = session.prompt({ message: "after this, update the docs", streamingBehavior });
+      const command = await pending;
+      expect(withoutRequestId(command)).toEqual({
+        type: "prompt",
+        message: "after this, update the docs",
+        ...(streamingBehavior ? { streamingBehavior } : {}),
+      });
+      child.stdout.write(
+        `${JSON.stringify({ id: command.id, type: "response", command: "prompt", success: true })}\n`,
+      );
+      await result;
+    }
+    await session.close();
+  });
   test("uses the configured RPC timeout and attributes the pending phase", async () => {
     vi.useFakeTimers();
     const child = createOmpChild();
@@ -438,7 +458,7 @@ describe("OMP CLI runtime", () => {
     replyToCommands(child, () => undefined);
     const session = await createRuntime(child).startSession({ cwd: "/workspace/project" });
 
-    await expect(session.prompt("hello")).resolves.toEqual({ requestId: "req_1" });
+    await expect(session.prompt({ message: "hello" })).resolves.toEqual({ requestId: "req_1" });
   });
 
   test("reports OMP 18.3's late prompt rejection as a failed prompt result", async () => {
@@ -455,7 +475,7 @@ describe("OMP CLI runtime", () => {
     const events: unknown[] = [];
     session.onEvent((event) => events.push(event));
 
-    await expect(session.prompt("hello")).resolves.toEqual({ requestId: "req_1" });
+    await expect(session.prompt({ message: "hello" })).resolves.toEqual({ requestId: "req_1" });
 
     expect(events).toContainEqual({
       type: "prompt_result",
diff --git a/packages/server/src/server/agent/providers/omp/cli-runtime.ts b/packages/server/src/server/agent/providers/omp/cli-runtime.ts
index 75bd79f5f0..5ae9d8f9c4 100644
--- a/packages/server/src/server/agent/providers/omp/cli-runtime.ts
+++ b/packages/server/src/server/agent/providers/omp/cli-runtime.ts
@@ -15,6 +15,7 @@ import {
   type OmpRuntime,
   type OmpRuntimeLaunch,
   type OmpRuntimeSession,
+  type OmpPromptInput,
   type OmpStartSessionInput,
 } from "./runtime.js";
 import {
@@ -142,14 +143,12 @@ class OmpCliRuntimeSession implements OmpRuntimeSession {
     };
   }
 
-  async prompt(
-    message: string,
-    images?: Array<{ type: "image"; data: string; mimeType: string }>,
-  ): Promise<OmpPromptAck> {
+  async prompt({ message, images, streamingBehavior }: OmpPromptInput): Promise<OmpPromptAck> {
     const { id: requestId, promise } = this.process.startRequest({
       type: "prompt",
       message,
       ...(images?.length ? { images } : {}),
+      ...(streamingBehavior ? { streamingBehavior: streamingBehavior } : {}),
     });
     const ack = OmpPromptAckSchema.parse(await promise) ?? {};
     return { requestId, ...ack };
@@ -282,13 +281,6 @@ class OmpCliRuntimeSession implements OmpRuntimeSession {
     await this.request({ type: "steer", message, ...(images?.length ? { images } : {}) });
   }
 
-  followUp(
-    message: string,
-    images?: Array<{ type: "image"; data: string; mimeType: string }>,
-  ): void {
-    this.process.send({ type: "follow_up", message, ...(images?.length ? { images } : {}) });
-  }
-
   async handoff(customInstructions?: string): Promise<void> {
     await this.request({
       type: "handoff",
diff --git a/packages/server/src/server/agent/providers/omp/rpc-types.ts b/packages/server/src/server/agent/providers/omp/rpc-types.ts
index b0514c7863..733dedf571 100644
--- a/packages/server/src/server/agent/providers/omp/rpc-types.ts
+++ b/packages/server/src/server/agent/providers/omp/rpc-types.ts
@@ -535,6 +535,7 @@ export const OmpRpcCommandSchema = z.discriminatedUnion("type", [
     type: z.literal("prompt"),
     message: z.string(),
     images: z.array(OmpImageContentSchema).optional(),
+    streamingBehavior: z.enum(["steer", "followUp"]).optional(),
   }),
   z.object({
     ...OmpCommandBase,
diff --git a/packages/server/src/server/agent/providers/omp/runtime.ts b/packages/server/src/server/agent/providers/omp/runtime.ts
index 691e907139..523595ed07 100644
--- a/packages/server/src/server/agent/providers/omp/runtime.ts
+++ b/packages/server/src/server/agent/providers/omp/runtime.ts
@@ -42,13 +42,18 @@ export interface OmpStartSessionInput {
   extraArgs?: string[];
 }
 
+export interface OmpPromptInput {
+  message: string;
+  images?: Array<{ type: "image"; data: string; mimeType: string }>;
+  streamingBehavior?: "steer" | "followUp";
+}
+
 export interface OmpRuntimeSession {
   readonly environment: Record<string, string>;
   onEvent(callback: (event: OmpRuntimeEvent) => void): () => void;
-  prompt(
-    message: string,
-    images?: Array<{ type: "image"; data: string; mimeType: string }>,
-  ): Promise<OmpPromptAck>;
+  // With streamingBehavior, a busy OMP queues the message instead of rejecting it, and an
+  // idle OMP starts a run with it.
+  prompt(input: OmpPromptInput): Promise<OmpPromptAck>;
   compact(customInstructions?: string): Promise<void>;
   setAutoCompaction(enabled: boolean): Promise<void>;
   abort(): Promise<void>;
@@ -71,10 +76,6 @@ export interface OmpRuntimeSession {
     message: string,
     images?: Array<{ type: "image"; data: string; mimeType: string }>,
   ): Promise<void>;
-  followUp(
-    message: string,
-    images?: Array<{ type: "image"; data: string; mimeType: string }>,
-  ): void;
   handoff(customInstructions?: string): Promise<void>;
   respondToExtensionUiRequest(
     id: string,
diff --git a/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts b/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts
index 58688c245d..02033f8dea 100644
--- a/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts
+++ b/packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts
@@ -2,6 +2,7 @@ import type {
   OmpRuntime,
   OmpRuntimeLaunch,
   OmpRuntimeSession,
+  OmpPromptInput,
   OmpStartSessionInput,
 } from "../runtime.js";
 import type {
@@ -133,7 +134,11 @@ export class FakeOmpSession implements OmpRuntimeSession {
   readonly environment: Record<string, string>;
   fastModeResult = { enabled: false, active: false };
   readonly setFastModeRequests: boolean[] = [];
-  readonly prompts: Array<{ message: string; imageCount: number }> = [];
+  readonly prompts: Array<{
+    message: string;
+    imageCount: number;
+    streamingBehavior?: "steer" | "followUp";
+  }> = [];
   readonly compactRequests: Array<{ customInstructions?: string }> = [];
   readonly setAutoCompactionRequests: boolean[] = [];
   readonly subagentSubscriptionRequests: FakeOmpSubagentSubscriptionLevel[] = [];
@@ -143,7 +148,6 @@ export class FakeOmpSession implements OmpRuntimeSession {
   readonly handoffRequests: Array<{ customInstructions?: string }> = [];
   readonly steerRequests: Array<{ message: string; imageCount: number }> = [];
   steerError: Error | null = null;
-  readonly followUpRequests: Array<{ message: string; imageCount: number }> = [];
   readonly hostToolSetRequests: OmpRpcHostToolDefinition[][] = [];
   readonly hostToolResults: OmpRpcHostToolResult[] = [];
   readonly hostToolUpdates: OmpRpcHostToolUpdate[] = [];
@@ -216,14 +220,19 @@ export class FakeOmpSession implements OmpRuntimeSession {
     };
   }
 
-  async prompt(
-    message: string,
-    images?: Array<{ type: "image"; data: string; mimeType: string }>,
-  ): Promise<OmpPromptAck> {
-    if (this.state.isStreaming || this.state.isCompacting) {
+  async prompt({ message, images, streamingBehavior }: OmpPromptInput): Promise<OmpPromptAck> {
+    const busy = this.state.isStreaming || this.state.isCompacting;
+    if (busy && !streamingBehavior) {
       throw new Error("Agent is already processing");
     }
-    this.prompts.push({ message, imageCount: images?.length ?? 0 });
+    this.prompts.push({
+      message,
+      imageCount: images?.length ?? 0,
+      ...(streamingBehavior ? { streamingBehavior: streamingBehavior } : {}),
+    });
+    if (busy) {
+      return {};
+    }
     this.promptWaiters.shift()?.();
     const heldPrompt = this.nextHeldPrompt;
     if (heldPrompt) {
@@ -412,13 +421,6 @@ export class FakeOmpSession implements OmpRuntimeSession {
     if (this.steerError) throw this.steerError;
   }
 
-  followUp(
-    message: string,
-    images?: Array<{ type: "image"; data: string; mimeType: string }>,
-  ): void {
-    this.followUpRequests.push({ message, imageCount: images?.length ?? 0 });
-  }
-
   sendHostToolResult(result: OmpRpcHostToolResult): void {
     this.hostToolResults.push(result);
     this.hostToolResultWaiters.shift()?.(result);
diff --git a/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
index ab407e31bc..247068220a 100644
--- a/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts
@@ -5,6 +5,8 @@ import path from "node:path";
 import { promisify } from "node:util";
 
 import pino from "pino";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { afterEach, beforeAll, describe, expect, test } from "vitest";
 
 import type { AgentTimelineItem } from "../agent/agent-sdk-types.js";
@@ -131,6 +133,14 @@ async function timeline(client: DaemonClient, agentId: string): Promise<AgentTim
   return result.entries.map((entry) => entry.item);
 }
 
+async function readAssistantText(harness: Harness, agentId: string): Promise<string> {
+  const items = await timeline(harness.client, agentId);
+  return items
+    .filter((item) => item.type === "assistant_message")
+    .map((item) => item.text)
+    .join("");
+}
+
 function compactionFiller(records = 1200): string {
   const teas = ["assam", "darjeeling", "sencha", "oolong"];
   return Array.from(
@@ -257,8 +267,80 @@ async function contextWindowUsedTokens(client: DaemonClient, agentId: string) {
 
 describe("daemon E2E (real OMP)", () => {
   test(
-    "a prompt OMP rejects before its agent runs fails the turn with OMP's error",
+    "an idle out-of-band follow-up starts a turn",
     async () => {
+      const harness = await createHarness();
+      try {
+        const agent = await createAgent(harness, "idle-follow-up");
+        await harness.client.sendMessage(agent.id, "/follow-up Reply exactly IDLE_FOLLOWUP_OK");
+        await expect
+          .poll(() => readAssistantText(harness, agent.id), { timeout: 30_000 })
+          .toContain("IDLE_FOLLOWUP_OK");
+        const finish = await harness.client.waitForFinish(agent.id, TIMEOUT_MS);
+        expect(finish.status).toBe("idle");
+      } finally {
+        await closeHarness(harness);
+      }
+    },
+    TIMEOUT_MS,
+  );
+
+  test(
+    "an agent-sent idle follow-up starts a turn and notifies its parent",
+    async () => {
+      const harness = await createHarness();
+      const mcp = new Client({ name: "idle-follow-up-test", version: "1.0.0" });
+      try {
+        const parent = await createAgent(harness, "follow-up-parent");
+        const child = await createAgent(harness, "follow-up-child");
+        await mcp.connect(
+          new StreamableHTTPClientTransport(
+            new URL(
+              `http://127.0.0.1:${harness.daemon.port}/mcp/agents?callerAgentId=${parent.id}`,
+            ),
+          ),
+        );
+        const response = await mcp.callTool({
+          name: "send_agent_prompt",
+          arguments: { agentId: child.id, prompt: "/follow-up Reply exactly MCP_IDLE_FOLLOWUP_OK" },
+        });
+        expect(response.isError).not.toBe(true);
+        expect(response.structuredContent).toMatchObject({
+          success: true,
+          disposition: "out_of_band",
+        });
+        await expect
+          .poll(() => readAssistantText(harness, child.id), { timeout: 30_000 })
+          .toContain("MCP_IDLE_FOLLOWUP_OK");
+        await expect
+          .poll(
+            async () => {
+              const items = await timeline(harness.client, parent.id);
+              let notifications = 0;
+              for (const item of items) {
+                if (
+                  item.type === "tool_call" &&
+                  item.agentMessage?.sender.id === child.id &&
+                  item.agentMessage.event === "finished"
+                )
+                  notifications++;
+              }
+              return notifications;
+            },
+            { timeout: 15_000 },
+          )
+          .toBe(1);
+      } finally {
+        await mcp.close();
+        await closeHarness(harness);
+      }
+    },
+    TIMEOUT_MS,
+  );
+
+  test.each(["Reply with ok.", "/follow-up Reply with ok."])(
+    "a rejected %s fails the turn with OMP's error",
+    async (prompt) => {
       const harness = await createHarness({ ompHome: createOfflineOmpHome() });
       try {
         const agent = await harness.client.createAgent({
@@ -268,7 +350,7 @@ describe("daemon E2E (real OMP)", () => {
           model: "anthropic/claude-haiku-4-5",
           modeId: "full",
         });
-        await harness.client.sendMessage(agent.id, "Reply with ok.");
+        await harness.client.sendMessage(agent.id, prompt);
         const finish = await harness.client.waitForFinish(agent.id, 60_000);
         expect(finish.status).toBe("error");
         expect(finish.error).toContain("No API key found for anthropic");

From 88a7aec1b89ede815387d3d378e01470d170c1ae Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 03:54:00 +0200
Subject: [PATCH 224/270] fix(claude): keep active turns running through
 settings changes (#7179)

A pending thinking change retired the live query when mode, model, or command controls requested it. Reuse the query owned by the current turn and apply pending launch settings after the turn finishes.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../claude/agent.live-settings.test.ts        | 157 ++++++++++++++++++
 .../server/agent/providers/claude/agent.ts    |   8 +-
 .../claude-settings-mid-turn.real.e2e.test.ts |  60 +++++++
 3 files changed, 222 insertions(+), 3 deletions(-)
 create mode 100644 packages/server/src/server/agent/providers/claude/agent.live-settings.test.ts
 create mode 100644 packages/server/src/server/daemon-e2e/claude-settings-mid-turn.real.e2e.test.ts

diff --git a/packages/server/src/server/agent/providers/claude/agent.live-settings.test.ts b/packages/server/src/server/agent/providers/claude/agent.live-settings.test.ts
new file mode 100644
index 0000000000..cb272ebecb
--- /dev/null
+++ b/packages/server/src/server/agent/providers/claude/agent.live-settings.test.ts
@@ -0,0 +1,157 @@
+import { expect, test } from "vitest";
+import type { Query, SDKMessage } from "@anthropic-ai/claude-agent-sdk";
+import { createTestLogger } from "../../../../test-utils/test-logger.js";
+import type { AgentStreamEvent } from "../../agent-sdk-types.js";
+import { ClaudeAgentClient } from "./agent.js";
+import type { ClaudeQueryInput } from "./query.js";
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((done) => {
+    resolve = done;
+  });
+  return { promise, resolve };
+}
+
+// The injected SDK adapter consumes real session input and holds a command open
+// until the test releases it. Closing the query interrupts that command.
+class ForegroundQuery {
+  readonly work = deferred<void>();
+  readonly closed = deferred<void>();
+  private stopped = false;
+  private readonly output: AsyncGenerator<SDKMessage>;
+
+  constructor(input: ClaudeQueryInput) {
+    this.output = this.events(input);
+  }
+
+  private async *events(input: ClaudeQueryInput): AsyncGenerator<SDKMessage> {
+    if (typeof input.prompt === "string") throw new Error("Expected streaming input");
+    for await (const _prompt of input.prompt) {
+      yield {
+        type: "system",
+        subtype: "init",
+        session_id: "settings-session",
+        model: "claude-haiku-5-5",
+        permissionMode: "auto",
+      } as SDKMessage;
+      yield {
+        type: "assistant",
+        message: {
+          content: [
+            { type: "tool_use", id: "tool_sleep", name: "Bash", input: { command: "sleep 20" } },
+          ],
+        },
+      } as SDKMessage;
+      await this.work.promise;
+      if (this.stopped) return;
+      yield { type: "assistant", message: { content: "DONE" } } as SDKMessage;
+      yield {
+        type: "result",
+        subtype: "success",
+        usage: { input_tokens: 1, cache_read_input_tokens: 0, output_tokens: 1 },
+        total_cost_usd: 0,
+      } as SDKMessage;
+    }
+  }
+
+  next() {
+    return this.output.next();
+  }
+  return() {
+    this.close();
+    return this.output.return();
+  }
+  close() {
+    this.stopped = true;
+    this.closed.resolve();
+    this.work.resolve();
+  }
+  async interrupt() {
+    this.close();
+  }
+  async setPermissionMode() {}
+  async setModel() {}
+  async supportedCommands() {
+    return [];
+  }
+  [Symbol.asyncIterator]() {
+    return this;
+  }
+}
+
+test.each(["mode", "model", "commands"] as const)(
+  "a pending thinking change preserves the current turn during a %s request",
+  async (control) => {
+    const queries: ForegroundQuery[] = [];
+    const efforts: ClaudeQueryInput["options"]["effort"][] = [];
+    const client = new ClaudeAgentClient({
+      logger: createTestLogger(),
+      resolveBinary: async () => "/test/claude",
+      queryFactory: (input) => {
+        const query = new ForegroundQuery(input);
+        queries.push(query);
+        efforts.push(input.options.effort);
+        return query as unknown as Query;
+      },
+    });
+    const session = await client.createSession({
+      provider: "claude",
+      cwd: process.cwd(),
+      model: "claude-haiku-5-5",
+      modeId: "auto",
+      thinkingOptionId: "low",
+    });
+    const running = deferred<void>();
+    let terminal = deferred<string>();
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => {
+      events.push(event);
+      if (
+        event.type === "timeline" &&
+        event.item.type === "tool_call" &&
+        event.item.status === "running"
+      )
+        running.resolve();
+      if (
+        event.type === "turn_completed" ||
+        event.type === "turn_failed" ||
+        event.type === "turn_canceled"
+      )
+        terminal.resolve(event.type);
+    });
+    try {
+      await session.startTurn("Run the foreground command");
+      await running.promise;
+      expect(await session.setThinkingOption?.("medium")).toMatchObject({
+        message: "Thinking level applies next turn",
+      });
+      if (control === "mode") await session.setMode("acceptEdits");
+      else if (control === "model") await session.setModel("claude-sonnet-5-6");
+      else await session.listCommands();
+      queries[0].work.resolve();
+      expect(
+        await Promise.race([
+          terminal.promise,
+          queries[0].closed.promise.then(() => "query closed before turn finished"),
+        ]),
+      ).toBe("turn_completed");
+      expect(
+        events.some(
+          (event) =>
+            event.type === "timeline" &&
+            event.item.type === "assistant_message" &&
+            event.item.text === "DONE",
+        ),
+      ).toBe(true);
+
+      terminal = deferred<string>();
+      await session.startTurn("Run another command with the new thinking level");
+      queries[1].work.resolve();
+      expect(await terminal.promise).toBe("turn_completed");
+      expect(efforts).toEqual(["low", "medium"]);
+    } finally {
+      await session.close();
+    }
+  },
+);
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index e88ae34662..7517a87029 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -2610,13 +2610,13 @@ class ClaudeAgentSession implements AgentSession {
     const normalized = isPermissionMode(modeId) ? modeId : "default";
     assertClaudeModeCanRun(normalized, this.harnessEnvironment);
     const previousMode = this.currentMode;
-    const launchesQuery = !this.query || this.queryRestartNeeded;
+    const previousQuery = this.query;
     const activeQuery = await this.ensureQuery(normalized);
     try {
       await activeQuery.setPermissionMode(normalized);
     } catch (error) {
       // The query was launched in the rejected mode; relaunch in the current mode next time.
-      if (launchesQuery) this.queryRestartNeeded = true;
+      if (activeQuery !== previousQuery) this.queryRestartNeeded = true;
       throw error;
     }
     if (normalized === "plan") {
@@ -3314,7 +3314,9 @@ class ClaudeAgentSession implements AgentSession {
   }
 
   private async ensureQuery(launchMode: PermissionMode = this.currentMode): Promise<Query> {
-    if (this.query && !this.queryRestartNeeded) {
+    // Controls use the running turn's query. Pending launch settings take effect
+    // after that turn finishes, when its active query handle has been cleared.
+    if (this.query && (!this.queryRestartNeeded || this.activeForegroundQuery === this.query)) {
       return this.query;
     }
 
diff --git a/packages/server/src/server/daemon-e2e/claude-settings-mid-turn.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/claude-settings-mid-turn.real.e2e.test.ts
new file mode 100644
index 0000000000..5211ff2a5a
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/claude-settings-mid-turn.real.e2e.test.ts
@@ -0,0 +1,60 @@
+import { expect, test } from "vitest";
+import { mkdtemp, rm } from "node:fs/promises";
+import { existsSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import pino from "pino";
+import { ClaudeAgentClient } from "../agent/providers/claude/agent.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+
+test("changing thinking then mode preserves a foreground Claude command", async () => {
+  const logger = pino({ level: "silent" });
+  const cwd = await mkdtemp(path.join(tmpdir(), "claude-settings-mid-turn-"));
+  const daemon = await createTestPaseoDaemon({
+    logger,
+    agentClients: { claude: new ClaudeAgentClient({ logger }) },
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  try {
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    const agent = await client.createAgent({
+      provider: "claude",
+      model: "claude-haiku-5-5",
+      modeId: "auto",
+      thinkingOptionId: "low",
+      cwd,
+    });
+    await client.subscribeAgentTimeline(agent.id, () => {}).ready;
+    await client.sendMessage(
+      agent.id,
+      "Run exactly these three Bash commands in the foreground, one per tool call, in order: python3 -c \"from pathlib import Path; import time; Path('started').write_text('started'); time.sleep(20); print(1)\", then the same with print(2), then print(3). Then reply DONE.",
+    );
+    // A tool-call row is emitted before Claude's permission check finishes.
+    // Wait for the command itself, so changing to acceptEdits cannot gate its start.
+    await expect.poll(() => existsSync(path.join(cwd, "started")), { timeout: 90_000 }).toBe(true);
+    const notice = await client.setAgentThinkingOption(agent.id, "medium");
+    expect(notice).toEqual({ type: "warning", message: "Thinking level applies next turn" });
+    await client.setAgentMode(agent.id, "acceptEdits");
+    await expect
+      .poll(
+        async () => {
+          const timeline = await client.fetchAgentTimeline(agent.id, { limit: 100 });
+          return timeline.entries.some(
+            ({ item }) =>
+              item.type === "tool_call" &&
+              item.detail.type === "shell" &&
+              item.detail.command.includes("print(1)") &&
+              item.status === "completed",
+          );
+        },
+        { timeout: 45_000, interval: 100 },
+      )
+      .toBe(true);
+  } finally {
+    await client.close();
+    await daemon.close();
+    await rm(cwd, { recursive: true, force: true });
+  }
+}, 180_000);

From 8555e8abd900ee11146e45a4858a4454a32bcf71 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 11:02:23 +0700
Subject: [PATCH 225/270] fix(release): distribute stable iOS builds to
 TestFlight testers (#7189)

Replace the upload-only submission with the existing TestFlight distribution job shape so external testers receive stable releases. Keep App Store review targeting the same version and build without a second binary upload.
---
 docs/android.md                               |  6 ++--
 docs/release.md                               | 23 +++++++-------
 .../app/.eas/workflows/release-mobile.yml     | 11 ++++---
 scripts/ci-workflow.test.mjs                  | 30 ++++++++++++++++++-
 4 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/docs/android.md b/docs/android.md
index 75908a8ae2..c90a27efec 100644
--- a/docs/android.md
+++ b/docs/android.md
@@ -205,12 +205,12 @@ adb exec-out screencap -p > screenshot.png
 
 Stable tag pushes like `v0.1.0` trigger:
 
-- The EAS GitHub app on Expo servers (iOS + Android production builds + store submit). There is no workflow file in this repo for it.
+- The EAS GitHub app on Expo servers, using `packages/app/.eas/workflows/release-mobile.yml` (iOS + Android production builds and distribution).
 - `.github/workflows/android-apk-release.yml` on GitHub Actions (APK asset on GitHub Release).
 
-iOS auto-submits to App Store review via a Fastlane lane after EAS uploads to TestFlight. Android auto-submits to the Play Store via EAS-managed credentials.
+iOS distributes the same build to external TestFlight testers and App Store review; see [Mobile builds (EAS)](release.md#mobile-builds-eas) for the review paths. Android auto-submits to the Play Store via EAS-managed credentials.
 
-Beta tags like `v0.1.1-beta.1` only trigger the GitHub APK workflow. They publish a GitHub prerelease APK for testing and do not submit to the stores.
+Beta tags like `v0.1.1-beta.1` trigger the GitHub APK workflow and EAS `Release iOS Beta`. They publish a GitHub prerelease APK and distribute iOS through TestFlight without submitting to production stores.
 
 `android-v*` tags also trigger only the GitHub APK workflow — useful when you want to ship an APK without going through stores. The GitHub APK workflow supports `workflow_dispatch` with an existing `tag` input so you can rebuild without cutting a new tag.
 
diff --git a/docs/release.md b/docs/release.md
index cdac451f23..2be4b008db 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -305,12 +305,14 @@ macOS 13 maps to Darwin 22. The two values use different version domains; do not
 iOS and Android store builds are not in `.github/workflows`. They are triggered by the EAS GitHub app the moment the `v*` tag is pushed:
 
 - **Android (Play Store)** — EAS builds with profile `production` and auto-submits to the Play Store via `eas submit` (EAS-managed credentials, no Fastlane).
-- **iOS (TestFlight + App Store)** — EAS builds with profile `production`, uploads to TestFlight, and a Fastlane lane submits the build for App Store review.
+- **iOS (TestFlight + App Store)** — EAS builds with profile `production`, uploads once through a `testflight` job, distributes the build to the `Paseo Beta` external group with Beta App Review submission, and a Fastlane lane submits that same build for App Store review.
 - **Android APK (GitHub Release asset)** — separate, via `.github/workflows/android-apk-release.yml`. This is the only Android-related workflow that lives in this repo.
 
 EAS uses the local app version source. `packages/app/app.config.js` derives the native version from the package version. Android `versionCode` is `major * 1_000_000 + minor * 1_000 + patch`. iOS reserves 1,000 build slots per app version: beta `N` uses slot `N`, and stable uses slot `999`. For example, `0.2.6-beta.2` appears in App Store Connect as version `0.2.6` build `2006002`; stable uses build `2006999`. Rebuilding the same tag produces the same native build number; if a store has already accepted a binary and you need a different binary, cut the next beta or patch instead of relying on EAS remote auto-increment.
 
-Beta tags run `Release iOS Beta`. The workflow uploads the build to TestFlight, distributes it to the persistent `Paseo Beta` external group, and submits it for Beta App Review. Testers and the group are managed once in App Store Connect; releases require no dashboard action.
+Stable tags run `Release Mobile`; beta tags run `Release iOS Beta`. Both distribute to the persistent `Paseo Beta` external group and submit for Beta App Review, so testers receive stable releases as well as betas. Testers, the group, and required TestFlight test information are managed once in App Store Connect.
+
+Stable iOS releases use one binary for two Apple review paths: Beta App Review for external TestFlight distribution and App Store review. [Apple says](https://developer.apple.com/help/app-store-connect/test-a-beta-version/invite-external-testers) the first submitted build requires a full TestFlight review; later builds for the same version might not. Do not assume a stable patch skips review.
 
 There is no mobile-release workflow under `.github/workflows`. The EAS GitHub app reads the workflows under `packages/app/.eas/workflows` and handles tag triggering directly.
 
@@ -334,7 +336,7 @@ npx eas build:list --platform android --limit 5 --non-interactive --json
 # Inspect a specific build.
 npx eas build:view <build-id>
 
-# Inspect the full release workflow, including submit_ios, submit_android,
+# Inspect the full release workflow, including distribute_ios, submit_android,
 # and submit_ios_for_review.
 npx eas workflow:view <workflow-run-id> --json
 
@@ -347,17 +349,17 @@ npx eas build:view <build-id> --json | jq '.logFiles[]'
 
 A build's `gitCommitHash` must match the release tag commit. `status` walks through `NEW` → `IN_QUEUE` → `IN_PROGRESS` → `FINISHED` (or `ERRORED`/`CANCELED`). The EAS workflow run's `gitCommitHash` and `trigger` must also match the release tag.
 
-Once a build is `FINISHED`, EAS still has release-critical work to do: Android must submit to the Play Store, and iOS must upload to TestFlight **and** submit the build for App Store review. The release is not done until all platforms are on their way through the stores.
+Once a build is `FINISHED`, EAS still has release-critical work to do: Android must submit to the Play Store, and iOS must distribute to the external TestFlight group with Beta App Review submission **and** submit the same build for App Store review. The release is not done until all platforms are on their way through the stores.
 
 For the `Release Mobile` EAS workflow, these jobs must pass:
 
 - `build_ios` — iOS binary built
-- `submit_ios` — iOS binary uploaded to App Store Connect/TestFlight
+- `distribute_ios` — iOS binary uploaded once, added to `Paseo Beta`, and submitted for Beta App Review
 - `submit_ios_for_review` — iOS build submitted for App Store review via Fastlane
 - `build_android` — Android store binary built
 - `submit_android` — Android binary submitted to the Play Store
 
-Do not treat `build_ios: SUCCESS` or `submit_ios: SUCCESS` as a completed iOS release. `submit_ios_for_review: FAILURE` means the iOS release is blocked even if the build is visible in TestFlight.
+Do not treat `build_ios: SUCCESS` or `distribute_ios: SUCCESS` as a completed iOS release. `submit_ios_for_review: FAILURE` means the iOS release is blocked even if the build is visible in TestFlight.
 
 To confirm the submission landed, inspect the EAS workflow with `npx eas workflow:view <workflow-run-id> --json`. App Store Connect (review state for the matching version/build) and the Play Console track are the final ground truth.
 
@@ -380,8 +382,9 @@ Windows, and Android APK assets are present along with the channel manifests
 (`latest-mac.yml`, `latest-linux.yml`, and `latest.yml` for stable;
 `beta-mac.yml`, `beta-linux.yml`, and `beta.yml` for beta).
 
-For stable releases, also confirm every required mobile build, upload, store
-submission, and review-submission job for the release commit. For betas, confirm
+For stable releases, also confirm every required mobile build, external
+TestFlight distribution, Beta App Review submission, and store submission job
+for the release commit. For betas, confirm
 the beta EAS workflow completed its TestFlight distribution and Beta App Review
 path. Delete the heartbeat only after every applicable checklist item passes,
 then report the release as shipped.
@@ -396,7 +399,7 @@ Pattern:
   "timezone": "UTC",
   "maxRuns": 120,
   "expiresIn": "24h",
-  "prompt": "Resume the vX.Y.Z release babysit for commit <sha>. Check npm tags; every GitHub Actions run for the release branch and tag; the published GitHub Release body, expected desktop/APK assets, and channel manifests; the Docker image; and the matching EAS workflow. Completion requires every applicable checklist item. For stable, require build_ios, submit_ios, submit_ios_for_review, build_android, and submit_android to succeed. For beta, require the beta TestFlight distribution and Beta App Review path. If work is pending, wait for the next heartbeat. If a failure can be retried safely for the same version, follow the failed-release procedure; otherwise report the blocker. When every applicable completion-checklist item passes, delete THIS heartbeat, report shipped, and stop.",
+  "prompt": "Resume the vX.Y.Z release babysit for commit <sha>. Check npm tags; every GitHub Actions run for the release branch and tag; the published GitHub Release body, expected desktop/APK assets, and channel manifests; the Docker image; and the matching EAS workflow. Completion requires every applicable checklist item. For stable, require build_ios, distribute_ios (Paseo Beta external distribution and Beta App Review submission), submit_ios_for_review, build_android, and submit_android to succeed. For beta, require the beta TestFlight distribution and Beta App Review path. If work is pending, wait for the next heartbeat. If a failure can be retried safely for the same version, follow the failed-release procedure; otherwise report the blocker. When every applicable completion-checklist item passes, delete THIS heartbeat, report shipped, and stop.",
 }
 ```
 
@@ -680,7 +683,7 @@ Every entry covers `previous stable release → release source`: first beta, lat
 - [ ] GitHub `Release Notes Sync` is green and the release body matches the stable changelog entry
 - [ ] EAS `Release Mobile` workflow for the same tag is green
 - [ ] EAS iOS `build_ios` completes for the same tag
-- [ ] EAS iOS `submit_ios` succeeds, uploading the build to App Store Connect/TestFlight
+- [ ] EAS iOS `distribute_ios` succeeds, uploading the binary once, distributing it to `Paseo Beta`, and submitting it for Beta App Review
 - [ ] EAS iOS `submit_ios_for_review` succeeds, putting the build into App Store review
 - [ ] EAS Android `build_android` completes for the same tag
 - [ ] EAS Android `submit_android` succeeds, putting the build on its Play Store track
diff --git a/packages/app/.eas/workflows/release-mobile.yml b/packages/app/.eas/workflows/release-mobile.yml
index 13968b8b55..26790ef22f 100644
--- a/packages/app/.eas/workflows/release-mobile.yml
+++ b/packages/app/.eas/workflows/release-mobile.yml
@@ -23,13 +23,16 @@ jobs:
       platform: android
       profile: production
 
-  submit_ios:
-    name: Submit iOS
+  distribute_ios:
+    name: Distribute iOS to TestFlight
     needs: [build_ios]
-    type: submit
+    type: testflight
     params:
       build_id: ${{ needs.build_ios.outputs.build_id }}
       profile: production
+      external_groups:
+        - Paseo Beta
+      submit_beta_review: true
 
   submit_android:
     name: Submit Android
@@ -41,7 +44,7 @@ jobs:
 
   submit_ios_for_review:
     name: Submit iOS for App Store review
-    needs: [build_ios, submit_ios]
+    needs: [build_ios, distribute_ios]
     environment: production
     runs_on: macos-medium
     steps:
diff --git a/scripts/ci-workflow.test.mjs b/scripts/ci-workflow.test.mjs
index 8ea5411026..d71fa6e184 100644
--- a/scripts/ci-workflow.test.mjs
+++ b/scripts/ci-workflow.test.mjs
@@ -37,7 +37,7 @@ function jobBlocks(source) {
   let currentJob;
 
   for (const line of source.split("\n")) {
-    const jobMatch = /^  ([a-z0-9-]+):\s*$/.exec(line);
+    const jobMatch = /^  ([a-z0-9_-]+):\s*$/.exec(line);
     if (jobMatch) {
       currentJob = jobMatch[1];
       jobs.set(currentJob, []);
@@ -303,3 +303,31 @@ test("desktop packaging smokes main pushes and only the pull requests that touch
     assert.match(source, new RegExp(`${action}@[0-9a-f]{40} # v\\d+\\.\\d+\\.\\d+`));
   }
 });
+
+test("stable iOS releases upload once and distribute to external testers before App Store review", () => {
+  const source = readFileSync(
+    new URL("packages/app/.eas/workflows/release-mobile.yml", repoRoot),
+    "utf8",
+  );
+  const jobs = jobBlocks(source);
+  const uploads = [...jobs.entries()].filter(
+    ([, lines]) =>
+      lines.some((line) => /^    type: (submit|testflight)$/.test(line)) &&
+      lines.some((line) => line.includes("needs.build_ios.outputs.build_id")),
+  );
+  assert.equal(uploads.length, 1, "the iOS binary must be uploaded exactly once");
+  const [distributionId, distributionLines] = uploads[0];
+  const distribution = distributionLines.join("\n");
+  assert.match(distribution, /^    type: testflight$/m);
+  assert.match(distribution, /external_groups:\s*\n\s+- Paseo Beta/);
+  assert.match(distribution, /^      submit_beta_review: true$/m);
+
+  const review = jobs.get("submit_ios_for_review").join("\n");
+  assert.match(review, new RegExp(`needs: \\[build_ios, ${distributionId}\\]`));
+  assert.match(review, /APP_VERSION="\$\{\{ needs\.build_ios\.outputs\.app_version \}\}"/);
+  assert.match(
+    review,
+    /APP_BUILD_VERSION="\$\{\{ needs\.build_ios\.outputs\.app_build_version \}\}"/,
+  );
+  assert.match(review, /bundle exec fastlane ios submit_review/);
+});

From ec9817ed2728b1d9f58962096509adbab4fd7af9 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 11:29:58 +0700
Subject: [PATCH 226/270] fix(app): make home actions reachable on short
 screens (#7167)

* fix(app): make home actions reachable on short screens

Keep the home cards and community links in one scrollable flow so overflow stays reachable and the footer cannot overlap the cards.

* fix(app): keep home scrolling clear of window drag regions
---
 .../e2e/browser/open-project-scroll.spec.ts   |  42 +++++++
 .../app/src/screens/open-project-screen.tsx   | 113 ++++++++++--------
 2 files changed, 102 insertions(+), 53 deletions(-)
 create mode 100644 packages/app/e2e/browser/open-project-scroll.spec.ts

diff --git a/packages/app/e2e/browser/open-project-scroll.spec.ts b/packages/app/e2e/browser/open-project-scroll.spec.ts
new file mode 100644
index 0000000000..b0b9e9c9c4
--- /dev/null
+++ b/packages/app/e2e/browser/open-project-scroll.spec.ts
@@ -0,0 +1,42 @@
+import { type Page } from "@playwright/test";
+import { test, expect } from "../support/fixtures";
+
+async function openProjectHome(page: Page) {
+  await page.goto("/open-project");
+  await expect(page.getByText("Add a project", { exact: true })).toBeVisible();
+}
+
+async function scrollToHomeFooter(page: Page) {
+  await page.mouse.move(160, 350);
+  await page.mouse.wheel(0, 1500);
+}
+
+async function expectHomeActionsReachable(page: Page) {
+  const providers = page.getByTestId("open-project-setup-providers");
+  const community = page.getByRole("button", { name: "Community", exact: true });
+  await expect(providers).toBeInViewport({ ratio: 1 });
+  await expect(community).toBeInViewport({ ratio: 1 });
+  const providerBounds = await providers.boundingBox();
+  const communityBounds = await community.boundingBox();
+  expect(providerBounds).not.toBeNull();
+  expect(communityBounds).not.toBeNull();
+  expect(communityBounds!.y).toBeGreaterThanOrEqual(providerBounds!.y + providerBounds!.height);
+}
+
+test("home actions remain reachable on a short phone screen", async ({ page }, testInfo) => {
+  await page.setViewportSize({ width: 320, height: 568 });
+  await openProjectHome(page);
+  await scrollToHomeFooter(page);
+  await expectHomeActionsReachable(page);
+  await page.screenshot({ path: testInfo.outputPath("home-scrolled.png") });
+});
+
+test("home actions fit on a desktop screen without overlap", async ({ page }) => {
+  await page.setViewportSize({ width: 1280, height: 900 });
+  await openProjectHome(page);
+  await expectHomeActionsReachable(page);
+  await expect(page.getByTestId("open-project-setup-providers")).toHaveCSS(
+    "-webkit-app-region",
+    "none",
+  );
+});
diff --git a/packages/app/src/screens/open-project-screen.tsx b/packages/app/src/screens/open-project-screen.tsx
index 4c340e0f15..4fcbb4d2fc 100644
--- a/packages/app/src/screens/open-project-screen.tsx
+++ b/packages/app/src/screens/open-project-screen.tsx
@@ -1,7 +1,7 @@
 import { useHosts, useHostRuntimeLastError } from "@/runtime/host-runtime";
 import { useCallback, useEffect, useState, type ComponentType } from "react";
 import { useTranslation } from "react-i18next";
-import { View, Text, Pressable } from "react-native";
+import { View, Text, Pressable, ScrollView } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useRouter } from "expo-router";
 import { FolderOpen, Inbox, Plug, Smartphone } from "lucide-react-native";
@@ -18,11 +18,12 @@ import {
   HEADER_INNER_HEIGHT_MOBILE,
   HEADER_TOP_PADDING_MOBILE,
 } from "@/constants/layout";
-import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
 import { useLocalDaemonServerId } from "@/hooks/use-is-local-daemon";
 import { PairDeviceModal } from "@/desktop/components/pair-device-modal";
 import { buildSettingsHostSectionRoute } from "@/utils/host-routes";
 
+const WINDOW_CONTENT_DATASET = { "window-content": "" };
+
 export function OpenProjectScreen() {
   const { t } = useTranslation();
   const hosts = useHosts();
@@ -61,51 +62,56 @@ export function OpenProjectScreen() {
   return (
     <View style={styles.container}>
       <MenuHeader borderless />
-      <View style={styles.content}>
-        <TitlebarDragRegion />
-        <View style={styles.logo}>
-          <PaseoLogo size={52} />
-        </View>
-        {hosts.map((host) => (
-          <HostError key={host.serverId} serverId={host.serverId} label={host.label} />
-        ))}
-        <View style={styles.tiles}>
-          <HomeTile
-            icon={FolderOpen}
-            title={t("openProject.tiles.addProject.title")}
-            description={t("openProject.tiles.addProject.description")}
-            onPress={handleOpenPicker}
-            testID="open-project-submit"
-            accent
-          />
-          <HomeTile
-            icon={Inbox}
-            title={t("openProject.tiles.importSession.title")}
-            description={t("openProject.tiles.importSession.description")}
-            onPress={importSession.open}
-            testID="open-project-import-session"
-          />
-          <HomeTile
-            icon={Plug}
-            title={t("openProject.tiles.setupProviders.title")}
-            description={t("openProject.tiles.setupProviders.description")}
-            onPress={handleOpenProviders}
-            testID="open-project-setup-providers"
-          />
-          {localServerId ? (
+      <ScrollView
+        style={styles.scroll}
+        contentContainerStyle={styles.scrollContent}
+        dataSet={WINDOW_CONTENT_DATASET}
+      >
+        <View style={styles.content}>
+          <View style={styles.logo}>
+            <PaseoLogo size={52} />
+          </View>
+          {hosts.map((host) => (
+            <HostError key={host.serverId} serverId={host.serverId} label={host.label} />
+          ))}
+          <View style={styles.tiles}>
             <HomeTile
-              icon={Smartphone}
-              title={t("openProject.tiles.pairDevice.title")}
-              description={t("openProject.tiles.pairDevice.description")}
-              onPress={handleOpenPairDevice}
-              testID="open-project-pair-device"
+              icon={FolderOpen}
+              title={t("openProject.tiles.addProject.title")}
+              description={t("openProject.tiles.addProject.description")}
+              onPress={handleOpenPicker}
+              testID="open-project-submit"
+              accent
             />
-          ) : null}
+            <HomeTile
+              icon={Inbox}
+              title={t("openProject.tiles.importSession.title")}
+              description={t("openProject.tiles.importSession.description")}
+              onPress={importSession.open}
+              testID="open-project-import-session"
+            />
+            <HomeTile
+              icon={Plug}
+              title={t("openProject.tiles.setupProviders.title")}
+              description={t("openProject.tiles.setupProviders.description")}
+              onPress={handleOpenProviders}
+              testID="open-project-setup-providers"
+            />
+            {localServerId ? (
+              <HomeTile
+                icon={Smartphone}
+                title={t("openProject.tiles.pairDevice.title")}
+                description={t("openProject.tiles.pairDevice.description")}
+                onPress={handleOpenPairDevice}
+                testID="open-project-pair-device"
+              />
+            ) : null}
+          </View>
         </View>
-      </View>
-      <View style={styles.communityRow}>
-        <CommunityLinks />
-      </View>
+        <View style={styles.communityRow}>
+          <CommunityLinks />
+        </View>
+      </ScrollView>
       <PairDeviceModal
         serverId={localServerId ?? ""}
         visible={isPairDeviceOpen}
@@ -176,18 +182,21 @@ const styles = StyleSheet.create((theme) => ({
     backgroundColor: theme.colors.surface0,
     userSelect: "none",
   },
+  scroll: {
+    flex: 1,
+  },
+  scrollContent: {
+    flexGrow: 1,
+  },
   content: {
     position: "relative",
-    flex: 1,
+    flexGrow: 1,
+    flexShrink: 0,
     justifyContent: { xs: "flex-start", md: "center" },
     alignItems: "center",
     gap: 0,
     padding: theme.spacing[6],
     paddingTop: { xs: theme.spacing[12], md: theme.spacing[6] },
-    paddingBottom: {
-      xs: HEADER_INNER_HEIGHT_MOBILE + HEADER_TOP_PADDING_MOBILE + theme.spacing[6],
-      md: HEADER_INNER_HEIGHT + theme.spacing[6],
-    },
   },
   logo: {
     marginBottom: theme.spacing[8],
@@ -238,10 +247,8 @@ const styles = StyleSheet.create((theme) => ({
     lineHeight: 18,
   },
   communityRow: {
-    position: "absolute",
-    left: 0,
-    right: 0,
-    bottom: {
+    flexShrink: 0,
+    paddingBottom: {
       xs: HEADER_INNER_HEIGHT_MOBILE + HEADER_TOP_PADDING_MOBILE + theme.spacing[2],
       md: HEADER_INNER_HEIGHT + theme.spacing[2],
     },

From f472c9d1f4339c0f36583e84bf62c80c12867110 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 06:47:31 +0200
Subject: [PATCH 227/270] Correct workspace source parameters in the Paseo
 skill (#7188)

* docs(skills): align workspace source parameters

* docs(skills): clarify workspace source inputs

* test(skills): check workspace guidance against MCP inputs

Keep the bundled workspace guidance aligned with the tool schema agents receive, so removed source parameters do not remain in the instructions.

Co-authored-by: boeto <bo@eto.me>

---------

Co-authored-by: boeto <bo@eto.me>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/agent/mcp-server.test.ts       | 45 ++++++++++++++++++-
 skills/paseo/SKILL.md                         |  2 +-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/server/agent/mcp-server.test.ts b/packages/server/src/server/agent/mcp-server.test.ts
index 3a90b7f577..33467b22f6 100644
--- a/packages/server/src/server/agent/mcp-server.test.ts
+++ b/packages/server/src/server/agent/mcp-server.test.ts
@@ -5,7 +5,7 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
 import { describe, expect, it, vi } from "vitest";
 import { realpathSync } from "node:fs";
-import { access, mkdtemp, mkdir, rm, writeFile } from "node:fs/promises";
+import { access, mkdtemp, mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { join, resolve as resolvePath } from "node:path";
 import { tmpdir } from "node:os";
 import { z } from "zod";
@@ -843,6 +843,49 @@ function createAgentMcpServer(options: Parameters<typeof createAgentMcpServerWit
   });
 }
 
+describe("bundled Paseo skill", () => {
+  it("documents only advertised create_workspace input names", async () => {
+    const server = await createAgentMcpServer({
+      agentManager: new BoundaryAgentManagerFake() as AgentManager,
+      agentStorage: new BoundaryAgentStorageFake() as AgentStorage,
+      providerSnapshotManager:
+        new BoundaryProviderSnapshotManagerFake() as unknown as ProviderSnapshotManager,
+      logger: createTestLogger(),
+    });
+    const client = await connectInMemoryMcpClient(server);
+
+    try {
+      const skill = await readFile(
+        new URL("../../../../../skills/paseo/SKILL.md", import.meta.url),
+        "utf8",
+      );
+      const paragraph = skill.split("\n").find((line) => line.startsWith("**`create_workspace`**"));
+      expect(paragraph).toBeTypeOf("string");
+      // The final sentence describes output, rather than tool inputs.
+      const inputGuidance = paragraph!.split("Returns ")[0]!;
+      const documentedInputs = [...inputGuidance.matchAll(/`([a-zA-Z][a-zA-Z0-9]*)`/g)].map(
+        (match) => match[1]!,
+      );
+      expect(documentedInputs.length).toBeGreaterThan(0);
+      const { tools } = await client.listTools();
+      const tool = tools.find((entry) => entry.name === "create_workspace")!;
+      const properties = tool.inputSchema.properties!;
+      const advertisedNamesAndValues = new Set([
+        ...Object.keys(properties),
+        ...Object.values(properties).flatMap((property) =>
+          typeof property === "object" && property !== null && Array.isArray(property.enum)
+            ? property.enum
+            : [],
+        ),
+      ]);
+      expect(documentedInputs.filter((name) => !advertisedNamesAndValues.has(name))).toEqual([]);
+    } finally {
+      await client.close();
+      await server.close();
+    }
+  });
+});
+
 describe("browser MCP tools", () => {
   const logger = createTestLogger();
 
diff --git a/skills/paseo/SKILL.md b/skills/paseo/SKILL.md
index 11b5f2ff97..b7fe95811d 100644
--- a/skills/paseo/SKILL.md
+++ b/skills/paseo/SKILL.md
@@ -21,7 +21,7 @@ For a local daemon, `project create` defaults to the current directory and resol
 
 ## Workspaces
 
-**`create_workspace`** — create a workspace independently of any agent. Required: `isolation` (`local` or `worktree`). Worktree isolation supports `mode: "branch-off" | "checkout-branch" | "checkout-pr"`: use `branchName`/`baseBranch` for a new branch, `branch` for an existing branch, or `prNumber` plus optional `forge`/`projectPath` for a change request. `worktreeSlug` controls the managed path. Returns the workspace descriptor centered on `workspaceId`.
+**`create_workspace`** — create a workspace independently of any agent. Required: `isolation` (`local` or `worktree`). Worktree isolation supports `mode: "branch-off" | "checkout-branch" | "checkout-pr"`: use `branchName`/`baseBranch` for a new branch, `branch` for an existing branch, or `prNumber` plus optional `forge` for a change request. Use `path` for a local directory or source checkout and `projectId` for the owning project; when no path is supplied, a worktree may resolve its source from `projectId`. `worktreeSlug` controls the managed path. Returns the workspace descriptor centered on `workspaceId`.
 
 `background: true` hides a workspace from default lists and the sidebar while its contents remain durable and accessible; omit `background` to inherit your current workspace’s value (false without a caller), and override it only when the user explicitly asks.
 

From 6e1ec21c6a4e784131a1247670c4705ddda9f524 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 12:53:06 +0700
Subject: [PATCH 228/270] Keep Android dictation running through audio
 interruptions (#7200)

* fix(android): preserve dictation across audio interruptions

Playback focus loss does not mean microphone capture is unavailable. Keep dictation alive across media takeovers and wait for Android input silencing to clear, while preserving conversation interruption protection.

* test(android): verify dictation clears its selected audio route
---
 docs/mobile-testing.md                        |  27 ++-
 packages/app/src/audio/audio-engine-types.ts  |   6 +
 packages/app/src/audio/audio-engine.native.ts |  21 +-
 packages/app/src/audio/audio-engine.web.ts    |   9 +-
 .../app/src/components/dictation-controls.tsx |   9 +-
 .../use-dictation-audio-source.native.ts      |  32 ++-
 .../hooks/use-dictation-audio-source.types.ts |   1 +
 .../hooks/use-dictation-audio-source.web.ts   |   1 +
 .../app/src/hooks/use-dictation.shared.ts     |   2 +-
 packages/app/src/hooks/use-dictation.ts       |   2 +-
 packages/app/src/i18n/resources/ar.ts         |   1 +
 packages/app/src/i18n/resources/en.ts         |   1 +
 packages/app/src/i18n/resources/es.ts         |   1 +
 packages/app/src/i18n/resources/fr.ts         |   1 +
 packages/app/src/i18n/resources/ja.ts         |   1 +
 packages/app/src/i18n/resources/ko.ts         |   1 +
 packages/app/src/i18n/resources/pt-BR.ts      |   1 +
 packages/app/src/i18n/resources/ru.ts         |   1 +
 packages/app/src/i18n/resources/zh-CN.ts      |   1 +
 .../expo-two-way-audio/android/build.gradle   |   6 +
 .../src/androidTest/AndroidManifest.xml       |   8 +
 .../modules/twowayaudio/AudioEngineTest.kt    | 223 ++++++++++++++++++
 .../expo/modules/twowayaudio/AudioEngine.kt   | 212 ++++++++++-------
 .../twowayaudio/ExpoTwoWayAudioModule.kt      |   6 +
 .../ios/ExpoTwoWayAudioModule.swift           |   6 +
 packages/expo-two-way-audio/src/core.ts       |  10 +
 26 files changed, 479 insertions(+), 111 deletions(-)
 create mode 100644 packages/expo-two-way-audio/android/src/androidTest/AndroidManifest.xml
 create mode 100644 packages/expo-two-way-audio/android/src/androidTest/java/expo/modules/twowayaudio/AudioEngineTest.kt

diff --git a/docs/mobile-testing.md b/docs/mobile-testing.md
index 93fa35aedd..375da30708 100644
--- a/docs/mobile-testing.md
+++ b/docs/mobile-testing.md
@@ -300,16 +300,33 @@ done
 
 ### Android audio focus interruptions
 
-Voice mode uses the custom `expo-two-way-audio` Android module, so incoming calls and other system audio owners must be tested with emulator/system commands, not a JS-only test. To verify that voice resume handles denied audio focus without crashing:
+Use native instrumentation for audio interruptions. JS-only tests cannot prove Android focus,
+input silencing, or route recovery. The module's `android/src/androidTest` suite runs through
+Gradle's `connectedDebugAndroidTest` task and uses real `AudioManager` and `AudioRecord` instances.
+Run the microphone-privacy cases on Android 12 or newer.
+
+Verify these distinct outcomes:
+
+- Dictation continues when another media owner takes permanent, temporary, or ducking focus.
+- Disabling microphone access pauses audio delivery without discarding the dictation. Enabling
+  access resumes it. Starting dictation while access is disabled waits for the same recovery.
+- Returning from music controls resumes dictation without pausing music again. Cancelling a
+  backgrounded recording must prevent the lifecycle callback from restarting it.
+- Two-way voice still stops coherently on focus loss. Keep the incoming-call check below: it
+  exercises denied focus during lifecycle resume, beyond an ordinary media takeover.
 
 ```bash
-adb shell am start -n sh.paseo/.MainActivity
-# Start voice mode in an existing composer, then background Paseo with Home.
+# Start voice mode in an existing composer, then background Paseo.
 adb emu gsm call 5551234
-# Foreground Paseo while the call is still ringing.
+# Foreground Paseo while the call is still ringing, then end the simulated call.
+adb emu gsm cancel 5551234
 ```
 
-Expected result: Paseo does not throw `RuntimeException: Audio focus request failed`; native audio reports an interruption and voice mode stops or pauses coherently.
+Expected result: no `RuntimeException: Audio focus request failed`, and voice mode stops or pauses
+coherently. Repeat with dictation: it must retain captured audio and recover microphone access.
+Use browser/device automation to operate the app; the commands above only control emulator telephony.
+
+This fix requires a rebuilt native app. An OTA update on an older binary retains legacy capture.
 
 ### Releasing the audio session when idle
 
diff --git a/packages/app/src/audio/audio-engine-types.ts b/packages/app/src/audio/audio-engine-types.ts
index 90bec732fb..d96f9c5ef9 100644
--- a/packages/app/src/audio/audio-engine-types.ts
+++ b/packages/app/src/audio/audio-engine-types.ts
@@ -2,6 +2,7 @@ export interface AudioEngineCallbacks {
   onCaptureData(pcm: Uint8Array): void;
   onVolumeLevel(level: number): void;
   onInterruption?(): void;
+  onCaptureAvailabilityChange?(available: boolean): void;
   onError?(error: Error): void;
 }
 
@@ -25,3 +26,8 @@ export interface AudioEngine {
   clearQueue(): void;
   isPlaying(): boolean;
 }
+
+export interface AudioEngineOptions {
+  traceLabel?: string;
+  captureMode?: "conversation" | "dictation";
+}
diff --git a/packages/app/src/audio/audio-engine.native.ts b/packages/app/src/audio/audio-engine.native.ts
index 86a6fc3d26..ed9f15a765 100644
--- a/packages/app/src/audio/audio-engine.native.ts
+++ b/packages/app/src/audio/audio-engine.native.ts
@@ -1,4 +1,9 @@
-import type { AudioEngine, AudioEngineCallbacks, AudioPlaybackSource } from "./audio-engine-types";
+import type {
+  AudioEngine,
+  AudioEngineCallbacks,
+  AudioEngineOptions,
+  AudioPlaybackSource,
+} from "./audio-engine-types";
 
 import { createAudioPlayer, setAudioModeAsync } from "expo-audio";
 import { File, Paths } from "expo-file-system";
@@ -8,7 +13,7 @@ import { playPcm16 } from "./pcm";
 
 export function createAudioEngine(
   callbacks: AudioEngineCallbacks,
-  _options?: { traceLabel?: string },
+  options?: AudioEngineOptions,
 ): AudioEngine {
   const native = require("@getpaseo/expo-two-way-audio");
 
@@ -47,6 +52,12 @@ export function createAudioEngine(
   const interruptionSubscription = native.addExpoTwoWayAudioEventListener(
     "onAudioInterruption",
     (event: { data: string }) => {
+      if (event.data === "capture_paused" || event.data === "capture_resumed") {
+        if (refs.captureActive) {
+          callbacks.onCaptureAvailabilityChange?.(event.data === "capture_resumed");
+        }
+        return;
+      }
       if (event.data !== "blocked") {
         return;
       }
@@ -180,7 +191,10 @@ export function createAudioEngine(
       try {
         await ensureMicrophonePermission();
         await ensureInitialized();
-        const isRecording = native.toggleRecording(true);
+        const isRecording =
+          options?.captureMode === "dictation"
+            ? native.startDictation()
+            : native.toggleRecording(true);
         if (!isRecording) {
           throw new Error(
             "Microphone capture could not start because Android audio focus is unavailable.",
@@ -201,6 +215,7 @@ export function createAudioEngine(
       refs.captureActive = false;
       refs.muted = false;
       callbacks.onVolumeLevel(0);
+      callbacks.onCaptureAvailabilityChange?.(true);
       releaseSessionIfIdle();
     },
 
diff --git a/packages/app/src/audio/audio-engine.web.ts b/packages/app/src/audio/audio-engine.web.ts
index dc0f049ca7..5516575e69 100644
--- a/packages/app/src/audio/audio-engine.web.ts
+++ b/packages/app/src/audio/audio-engine.web.ts
@@ -1,6 +1,11 @@
 import { parsePcmSampleRate, resampleToPcm16 } from "./pcm";
 import { isElectronRuntime } from "@/desktop/host";
-import type { AudioEngine, AudioEngineCallbacks, AudioPlaybackSource } from "./audio-engine-types";
+import type {
+  AudioEngine,
+  AudioEngineCallbacks,
+  AudioEngineOptions,
+  AudioPlaybackSource,
+} from "./audio-engine-types";
 
 import { createPlaybackQueue } from "./playback";
 
@@ -46,7 +51,7 @@ async function decodeAudioData(context: AudioContext, buffer: ArrayBuffer): Prom
 
 export function createAudioEngine(
   callbacks: AudioEngineCallbacks,
-  _options?: { traceLabel?: string },
+  _options?: AudioEngineOptions,
 ): AudioEngine {
   const refs: {
     playbackContext: AudioContext | null;
diff --git a/packages/app/src/components/dictation-controls.tsx b/packages/app/src/components/dictation-controls.tsx
index 5c8a990987..2191f0d480 100644
--- a/packages/app/src/components/dictation-controls.tsx
+++ b/packages/app/src/components/dictation-controls.tsx
@@ -87,7 +87,9 @@ export function DictationControls({
       <View style={styles.meterWrapper}>
         <VolumeMeter volume={volume} isMuted={false} isSpeaking={false} orientation="horizontal" />
       </View>
-      <Text style={timerTextStyle}>{formatDuration(duration)}</Text>
+      <Text style={timerTextStyle}>
+        {status === "paused" ? t("message.dictation.paused") : formatDuration(duration)}
+      </Text>
       <View style={styles.actionGroup}>
         <Pressable
           onPress={handleCancel}
@@ -210,6 +212,11 @@ export function DictationOverlay({
           />
           <Text style={overlayTimerTextStyle}>{formatDuration(duration)}</Text>
         </View>
+        {status === "paused" ? (
+          <Text numberOfLines={2} style={overlayTranscriptTextStyle}>
+            {t("message.dictation.paused")}
+          </Text>
+        ) : null}
         {isFailed ? (
           <Text numberOfLines={2} style={overlayTranscriptTextStyle}>
             {errorText
diff --git a/packages/app/src/hooks/use-dictation-audio-source.native.ts b/packages/app/src/hooks/use-dictation-audio-source.native.ts
index 293412fe1a..c34f9bbd02 100644
--- a/packages/app/src/hooks/use-dictation-audio-source.native.ts
+++ b/packages/app/src/hooks/use-dictation-audio-source.native.ts
@@ -14,6 +14,7 @@ export function useDictationAudioSource(config: DictationAudioSourceConfig): Dic
   const onErrorRef = useRef(config.onError);
   const onInterruptionRef = useRef(config.onInterruption);
   const [volume, setVolume] = useState(0);
+  const [isPaused, setIsPaused] = useState(false);
   const engineRef = useRef<ReturnType<typeof createAudioEngine> | null>(null);
 
   const getOrCreateEngine = useCallback(() => {
@@ -21,20 +22,24 @@ export function useDictationAudioSource(config: DictationAudioSourceConfig): Dic
       return engineRef.current;
     }
 
-    engineRef.current = createAudioEngine({
-      onCaptureData: (pcm) => {
-        onPcmSegmentRef.current(Buffer.from(pcm).toString("base64"));
+    engineRef.current = createAudioEngine(
+      {
+        onCaptureData: (pcm) => {
+          onPcmSegmentRef.current(Buffer.from(pcm).toString("base64"));
+        },
+        onVolumeLevel: (level) => {
+          setVolume(level);
+        },
+        onError: (error) => {
+          onErrorRef.current?.(error);
+        },
+        onInterruption: () => {
+          onInterruptionRef.current?.();
+        },
+        onCaptureAvailabilityChange: (available) => setIsPaused(!available),
       },
-      onVolumeLevel: (level) => {
-        setVolume(level);
-      },
-      onError: (error) => {
-        onErrorRef.current?.(error);
-      },
-      onInterruption: () => {
-        onInterruptionRef.current?.();
-      },
-    });
+      { captureMode: "dictation" },
+    );
     return engineRef.current;
   }, []);
 
@@ -67,5 +72,6 @@ export function useDictationAudioSource(config: DictationAudioSourceConfig): Dic
     start,
     stop,
     volume,
+    isPaused,
   };
 }
diff --git a/packages/app/src/hooks/use-dictation-audio-source.types.ts b/packages/app/src/hooks/use-dictation-audio-source.types.ts
index 711cf690c8..8fe82ef63e 100644
--- a/packages/app/src/hooks/use-dictation-audio-source.types.ts
+++ b/packages/app/src/hooks/use-dictation-audio-source.types.ts
@@ -8,4 +8,5 @@ export interface DictationAudioSource {
   start: () => Promise<void>;
   stop: () => Promise<void>;
   volume: number;
+  isPaused: boolean;
 }
diff --git a/packages/app/src/hooks/use-dictation-audio-source.web.ts b/packages/app/src/hooks/use-dictation-audio-source.web.ts
index c482bece18..6b71ca7181 100644
--- a/packages/app/src/hooks/use-dictation-audio-source.web.ts
+++ b/packages/app/src/hooks/use-dictation-audio-source.web.ts
@@ -442,6 +442,7 @@ export function useDictationAudioSource(config: DictationAudioSourceConfig): Dic
       },
       stop,
       volume,
+      isPaused: false,
     }),
     [start, stop, volume],
   );
diff --git a/packages/app/src/hooks/use-dictation.shared.ts b/packages/app/src/hooks/use-dictation.shared.ts
index 275c9d93d7..fee3da46c1 100644
--- a/packages/app/src/hooks/use-dictation.shared.ts
+++ b/packages/app/src/hooks/use-dictation.shared.ts
@@ -1,6 +1,6 @@
 import { i18n } from "@/i18n/i18next";
 
-export type DictationStatus = "idle" | "recording" | "uploading" | "failed";
+export type DictationStatus = "idle" | "recording" | "paused" | "uploading" | "failed";
 
 export interface UseDictationOptions {
   client: import("@getpaseo/client/internal/daemon-client").DaemonClient | null;
diff --git a/packages/app/src/hooks/use-dictation.ts b/packages/app/src/hooks/use-dictation.ts
index dde72964bc..a2a3f46bcc 100644
--- a/packages/app/src/hooks/use-dictation.ts
+++ b/packages/app/src/hooks/use-dictation.ts
@@ -461,7 +461,7 @@ export function useDictation(options: UseDictationOptions): UseDictationResult {
     volume: audio.volume,
     duration,
     error,
-    status,
+    status: status === "recording" && audio.isPaused ? "paused" : status,
     startDictation,
     cancelDictation,
     confirmDictation,
diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index c5b9cf42d6..2f1fd7397f 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -360,6 +360,7 @@ export const ar: TranslationResources = {
       details: "تفاصيل",
     },
     dictation: {
+      paused: "تمت مقاطعة الميكروفون. في انتظار الاستئناف…",
       start: "بدء الإملاء الصوتي",
       cancel: "إلغاء الإملاء",
       retry: "أعد محاولة الإملاء",
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 76135fb6c9..14cde732e7 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -357,6 +357,7 @@ export const en = {
       details: "Details",
     },
     dictation: {
+      paused: "Microphone interrupted. Waiting to resume…",
       start: "Start voice dictation",
       cancel: "Cancel dictation",
       retry: "Retry dictation",
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index d2572a4bab..18eb17f291 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -365,6 +365,7 @@ export const es: TranslationResources = {
       details: "Detalles",
     },
     dictation: {
+      paused: "Micrófono interrumpido. Esperando para reanudar…",
       start: "Iniciar dictado de voz",
       cancel: "Cancelar dictado",
       retry: "Reintentar el dictado",
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index 48fd08c9ed..2bae7b8647 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -365,6 +365,7 @@ export const fr: TranslationResources = {
       details: "Détails",
     },
     dictation: {
+      paused: "Microphone interrompu. En attente de reprise…",
       start: "Démarrer la dictée vocale",
       cancel: "Annuler la dictée",
       retry: "Relancer la dictée",
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index b3482f5c15..58e2706b95 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -365,6 +365,7 @@ export const ja: TranslationResources = {
       details: "詳細",
     },
     dictation: {
+      paused: "マイクが中断されました。再開を待っています…",
       start: "音声入力を開始",
       cancel: "音声入力をキャンセル",
       retry: "音声入力を再試行",
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index e39d625253..fa962a5562 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -361,6 +361,7 @@ export const ko: TranslationResources = {
       details: "세부 정보",
     },
     dictation: {
+      paused: "마이크가 중단되었습니다. 재개를 기다리는 중…",
       start: "음성 받아쓰기 시작",
       cancel: "받아쓰기 취소",
       retry: "받아쓰기 다시 시도",
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index 8c3d93499a..c5c6607ca6 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -364,6 +364,7 @@ export const ptBR: TranslationResources = {
       details: "Detalhes",
     },
     dictation: {
+      paused: "Microfone interrompido. Aguardando para retomar…",
       start: "Iniciar ditado por voz",
       cancel: "Cancelar ditado",
       retry: "Tentar ditado novamente",
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index df57855cb6..4df3f721bb 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -364,6 +364,7 @@ export const ru: TranslationResources = {
       details: "Подробности",
     },
     dictation: {
+      paused: "Микрофон прерван. Ожидание возобновления…",
       start: "Начать диктовку голосом",
       cancel: "Отменить диктовку",
       retry: "Повторить диктовку",
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index 984cc0d71a..bad9cc4690 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -360,6 +360,7 @@ export const zhCN: TranslationResources = {
       details: "详情",
     },
     dictation: {
+      paused: "麦克风已中断，正在等待恢复…",
       start: "开始语音听写",
       cancel: "取消听写",
       retry: "重试听写",
diff --git a/packages/expo-two-way-audio/android/build.gradle b/packages/expo-two-way-audio/android/build.gradle
index 84a7837cf9..5bb7508992 100644
--- a/packages/expo-two-way-audio/android/build.gradle
+++ b/packages/expo-two-way-audio/android/build.gradle
@@ -36,8 +36,14 @@ android {
   defaultConfig {
     versionCode 1
     versionName "0.1.0"
+    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   lintOptions {
     abortOnError false
   }
 }
+
+dependencies {
+  androidTestImplementation 'androidx.test:runner:1.6.2'
+  androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+}
diff --git a/packages/expo-two-way-audio/android/src/androidTest/AndroidManifest.xml b/packages/expo-two-way-audio/android/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000000..6501d613de
--- /dev/null
+++ b/packages/expo-two-way-audio/android/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <application>
+        <activity android:name="expo.modules.twowayaudio.AudioEngineTestActivity"
+            android:exported="true" />
+    </application>
+</manifest>
diff --git a/packages/expo-two-way-audio/android/src/androidTest/java/expo/modules/twowayaudio/AudioEngineTest.kt b/packages/expo-two-way-audio/android/src/androidTest/java/expo/modules/twowayaudio/AudioEngineTest.kt
new file mode 100644
index 0000000000..ad840deb20
--- /dev/null
+++ b/packages/expo-two-way-audio/android/src/androidTest/java/expo/modules/twowayaudio/AudioEngineTest.kt
@@ -0,0 +1,223 @@
+package expo.modules.twowayaudio
+
+import AudioEngine
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.media.AudioAttributes
+import android.media.AudioFocusRequest
+import android.media.AudioManager
+import android.os.Handler
+import android.os.Looper
+import android.os.SystemClock
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.filters.SdkSuppress
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicInteger
+
+class AudioEngineTestActivity : Activity()
+
+/** Real AudioManager and AudioRecord: focus loss is delivered by Android, never injected. */
+@RunWith(AndroidJUnit4::class)
+class AudioEngineTest {
+    private val instrumentation = InstrumentationRegistry.getInstrumentation()
+    private lateinit var activity: Activity
+    private lateinit var engine: AudioEngine
+    private lateinit var audio: AudioManager
+    private val packets = AtomicInteger()
+    private val events = CopyOnWriteArrayList<String>()
+    private val requests = mutableListOf<AudioFocusRequest>()
+
+    @Before fun setUp() {
+        val context = instrumentation.context
+        shell("pm grant ${context.packageName} android.permission.RECORD_AUDIO")
+        activity = instrumentation.startActivitySync(
+            Intent(context, AudioEngineTestActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        )
+        instrumentation.waitForIdleSync()
+        audio = activity.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        main {
+            engine = AudioEngine(activity)
+            engine.onMicDataCallback = { packets.incrementAndGet() }
+            engine.onAudioInterruptionCallback = { events.add(it) }
+        }
+    }
+
+    @After fun tearDown() {
+        shell("cmd sensor_privacy disable 0 microphone")
+        main {
+            requests.forEach { audio.abandonAudioFocusRequest(it) }
+            engine.tearDown()
+            activity.finish()
+        }
+    }
+
+    @Test fun dictationContinuesWhenMusicTakesFocus() {
+        assertDictationSurvives(AudioManager.AUDIOFOCUS_GAIN)
+    }
+
+    @Test fun dictationContinuesWhenFocusIsTemporarilyLost() {
+        assertDictationSurvives(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT)
+    }
+
+    @Test fun dictationContinuesWhenAnotherAppRequestsDucking() {
+        assertDictationSurvives(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK)
+    }
+
+    @Test fun conversationStillStopsOnFocusLoss() {
+        main { assertTrue(engine.toggleRecording(true)) }
+        await("conversation microphone data") { packets.get() > 2 }
+        takeFocus(AudioManager.AUDIOFOCUS_GAIN)
+        await("terminal conversation interruption") { events.contains("blocked") }
+        assertFalse(engine.isRecording)
+    }
+
+    @Test fun dictationStartsWhileMusicOwnsFocusAndCanBeStartedAgain() {
+        takeFocus(AudioManager.AUDIOFOCUS_GAIN)
+        startDictation()
+        main { engine.toggleRecording(false); engine.releaseAudioSession() }
+        val stoppedAt = packets.get()
+        startDictation()
+        await("new recording data") { packets.get() > stoppedAt + 2 }
+        assertFalse(events.contains("blocked"))
+    }
+
+    @Test fun cancellingWhileBackgroundedDoesNotRestartOnResume() {
+        startDictation()
+        main {
+            engine.pauseRecordingAndPlayer()
+            engine.toggleRecording(false)
+            engine.releaseAudioSession()
+            engine.resumeRecordingAndPlayer()
+        }
+        assertFalse(engine.isRecording)
+    }
+
+    @Test fun dictationKeepsItsCaptureModeAfterBackgroundResume() {
+        startDictation()
+        main { engine.pauseRecordingAndPlayer(); engine.resumeRecordingAndPlayer() }
+        val resumedAt = packets.get()
+        takeFocus(AudioManager.AUDIOFOCUS_GAIN)
+        await("resumed dictation data after focus loss") { packets.get() > resumedAt + 3 }
+        assertTrue(engine.isRecording)
+        assertFalse(events.contains("blocked"))
+    }
+
+    @Test @SdkSuppress(minSdkVersion = 31)
+    fun microphonePrivacyInterruptionPreservesCaptureAndRecovers() {
+        startDictation()
+        shell("cmd sensor_privacy enable 0 microphone")
+        await("input paused") { events.contains("capture_paused") }
+        assertTrue(engine.isRecording)
+        assertFalse(events.contains("blocked"))
+        // Once Android reports silencing, do not enqueue artificial silence for transcription.
+        SystemClock.sleep(100)
+        val pausedAt = packets.get()
+        SystemClock.sleep(150)
+        assertEquals(pausedAt, packets.get())
+        shell("cmd sensor_privacy disable 0 microphone")
+        await("input resumed") { events.contains("capture_resumed") }
+        await("microphone data after recovery") { packets.get() > pausedAt + 3 }
+        assertTrue(engine.isRecording)
+        assertEquals(listOf("capture_paused", "capture_resumed"), events.toList())
+    }
+
+    @Test @SdkSuppress(minSdkVersion = 31)
+    fun startingWithMicrophonePrivacyEnabledWaitsAndRecovers() {
+        shell("cmd sensor_privacy enable 0 microphone")
+        main { assertTrue(engine.startDictation()) }
+        await("initial input paused") { events.contains("capture_paused") }
+        assertTrue(engine.isRecording)
+        assertFalse(events.contains("blocked"))
+        shell("cmd sensor_privacy disable 0 microphone")
+        await("initial input resumed") { events.contains("capture_resumed") }
+        await("microphone data") { packets.get() > 3 }
+    }
+
+    @Test fun resumingDictationDoesNotTakeFocusBackFromMusic() {
+        startDictation()
+        main { engine.pauseRecordingAndPlayer() }
+        val changes = CopyOnWriteArrayList<Int>()
+        val request = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+            .setOnAudioFocusChangeListener({ changes.add(it) }, Handler(Looper.getMainLooper()))
+            .build()
+        requests.add(request)
+        main { assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, audio.requestAudioFocus(request)) }
+        val before = packets.get()
+        main { engine.resumeRecordingAndPlayer() }
+        await("resumed microphone data") { packets.get() > before + 3 }
+        assertTrue(engine.isRecording)
+        assertTrue("Music lost focus on dictation resume: $changes", changes.isEmpty())
+    }
+
+    @Test @SdkSuppress(minSdkVersion = 31)
+    fun stoppingDictationReleasesTheCommunicationRoute() {
+        startDictation()
+        await("selected communication route") { hasCommunicationRoute() }
+        main { engine.toggleRecording(false); engine.releaseAudioSession() }
+        await("normal audio mode") { audio.mode == AudioManager.MODE_NORMAL }
+        await("cleared communication route") { !hasCommunicationRoute() }
+        assertFalse(engine.isRecording)
+    }
+
+    private fun assertDictationSurvives(gain: Int) {
+        startDictation()
+        val before = packets.get()
+        val request = takeFocus(gain)
+        await("microphone data while focus is lost") { packets.get() > before + 3 }
+        assertTrue(engine.isRecording)
+        assertFalse(events.contains("blocked"))
+        val during = packets.get()
+        main { audio.abandonAudioFocusRequest(request) }
+        await("microphone data after focus release") { packets.get() > during + 3 }
+        assertTrue(engine.isRecording)
+        assertFalse(events.contains("blocked"))
+    }
+
+    private fun startDictation() {
+        val before = packets.get()
+        main { assertTrue(engine.startDictation()) }
+        await("initial microphone data") { packets.get() > before + 3 }
+    }
+
+    private fun takeFocus(gain: Int): AudioFocusRequest {
+        val request = AudioFocusRequest.Builder(gain)
+            .setAudioAttributes(AudioAttributes.Builder()
+                .setUsage(AudioAttributes.USAGE_MEDIA)
+                .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC).build())
+            .setOnAudioFocusChangeListener({}, Handler(Looper.getMainLooper()))
+            .build()
+        requests.add(request)
+        main { assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, audio.requestAudioFocus(request)) }
+        return request
+    }
+
+    private fun main(action: () -> Unit) = instrumentation.runOnMainSync(action)
+
+    private fun await(description: String, condition: () -> Boolean) {
+        val deadline = SystemClock.elapsedRealtime() + 5000
+        while (!condition() && SystemClock.elapsedRealtime() < deadline) SystemClock.sleep(20)
+        assertTrue("Timed out waiting for $description; events=$events packets=${packets.get()}", condition())
+    }
+
+    // communicationDevice reports the effective system device even after our selection is cleared.
+    // Inspect only current route clients, never the historical routing event log.
+    private fun hasCommunicationRoute(): Boolean {
+        val dump = shell("dumpsys audio")
+        assertTrue("Missing Android communication route diagnostics", dump.contains("Communication route clients:"))
+        return dump.lineSequence().any {
+            it.trimStart().startsWith("[CommunicationRouteClient: mUid: ${android.os.Process.myUid()} ")
+        }
+    }
+
+    private fun shell(command: String): String =
+        instrumentation.uiAutomation.executeShellCommand(command).use {
+            android.os.ParcelFileDescriptor.AutoCloseInputStream(it).readBytes().toString(Charsets.UTF_8)
+        }
+}
diff --git a/packages/expo-two-way-audio/android/src/main/java/expo/modules/twowayaudio/AudioEngine.kt b/packages/expo-two-way-audio/android/src/main/java/expo/modules/twowayaudio/AudioEngine.kt
index a6fe25303e..48aff1f1df 100644
--- a/packages/expo-two-way-audio/android/src/main/java/expo/modules/twowayaudio/AudioEngine.kt
+++ b/packages/expo-two-way-audio/android/src/main/java/expo/modules/twowayaudio/AudioEngine.kt
@@ -6,12 +6,14 @@ import android.media.AudioFocusRequest
 import android.media.AudioFormat
 import android.media.AudioManager
 import android.media.AudioRecord
+import android.media.AudioRecordingConfiguration
 import android.media.AudioTrack
 import android.media.MediaRecorder
 import android.media.audiofx.AcousticEchoCanceler
 import android.media.audiofx.NoiseSuppressor
 import android.os.Build
-import android.os.PowerManager
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import androidx.annotation.RequiresApi
 import java.util.LinkedList
@@ -34,7 +36,26 @@ class AudioEngine (context: Context) {
     private var noiseSuppressor: NoiseSuppressor? = null
     private val executorServiceMicrophone = Executors.newFixedThreadPool(1)
     private val executorServicePlayback = Executors.newFixedThreadPool(1)
-    private var speakerDevice: AudioDeviceInfo? = null
+    private enum class CaptureMode { CONVERSATION, DICTATION }
+    private var captureMode = CaptureMode.CONVERSATION
+    private val mainHandler = Handler(Looper.getMainLooper())
+    @Volatile private var captureSilenced = false
+    private val recordingCallback = object : AudioManager.AudioRecordingCallback() {
+        override fun onRecordingConfigChanged(configs: MutableList<AudioRecordingConfiguration>) {
+            if (!isRecording || !::audioRecord.isInitialized) return
+            val config = configs.firstOrNull { it.clientAudioSessionId == audioRecord.audioSessionId }
+                ?: return
+            setCaptureSilenced(config.isClientSilenced)
+        }
+    }
+    private val deviceCallback = object : android.media.AudioDeviceCallback() {
+        override fun onAudioDevicesAdded(devices: Array<out AudioDeviceInfo>) {
+            if (communicationRouteActive) updateAudioRouting()
+        }
+        override fun onAudioDevicesRemoved(devices: Array<out AudioDeviceInfo>) {
+            if (communicationRouteActive) updateAudioRouting()
+        }
+    }
     private var communicationRouteActive = false
     private var bridgeWindowStartedAtMs = System.currentTimeMillis()
     private var micEvents = 0
@@ -44,7 +65,7 @@ class AudioEngine (context: Context) {
     private var playbackWrites = 0
     private var playbackWriteBytes = 0L
 
-    var isRecording = false
+    @Volatile var isRecording = false
     private var isRecordingBeforePause = false
     var isPlaying = false
 
@@ -83,28 +104,9 @@ class AudioEngine (context: Context) {
     @SuppressLint("NewApi")
     private fun initializeAudio(context:Context) {
         audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-        activateCommunicationRoute()
-        if (!requestAudioFocus()) {
-            handleAudioFocusBlocked()
-        }
-
-        // Listen for changes in audio routing
-        audioManager.registerAudioDeviceCallback(object:android.media.AudioDeviceCallback(){
-            override fun onAudioDevicesAdded(addedDevices: Array<out AudioDeviceInfo>?) {
-                Log.d("AudioEngine", "onAudioDevicesAdded")
-                super.onAudioDevicesAdded(addedDevices)
-                if (communicationRouteActive) {
-                    updateAudioRouting()
-                }
-            }
-            override fun onAudioDevicesRemoved(removedDevices: Array<out AudioDeviceInfo>?) {
-                Log.d("AudioEngine", "onAudioDevicesRemoved")
-                super.onAudioDevicesRemoved(removedDevices)
-                if (communicationRouteActive) {
-                    updateAudioRouting()
-                }
-            }
-        }, null)
+        // Initialization must not interrupt music before a capture/playback operation owns a session.
+        audioManager.registerAudioDeviceCallback(deviceCallback, mainHandler)
+        audioManager.registerAudioRecordingCallback(recordingCallback, mainHandler)
 
         val bufferSize = AudioTrack.getMinBufferSize(
             SAMPLE_RATE,
@@ -125,49 +127,42 @@ class AudioEngine (context: Context) {
             bufferSize,
             AudioTrack.MODE_STREAM,
             audioManager.generateAudioSessionId()
-        ).apply {
-            play()
-        }
+        )
     }
 
+    @SuppressLint("NewApi")
     private fun updateAudioRouting() {
-        val devices = audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
-        var isExternalDeviceConnected = false
-        var selectedDevice: AudioDeviceInfo? = null
-
-        for (device in devices) {
-            if (device.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER) {
-                speakerDevice = device
-            }
-            if (device.type == AudioDeviceInfo.TYPE_WIRED_HEADPHONES ||
-                device.type == AudioDeviceInfo.TYPE_WIRED_HEADSET ||
-                device.type == AudioDeviceInfo.TYPE_BLUETOOTH_A2DP ||
-                device.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO) {
-                isExternalDeviceConnected = true
-                selectedDevice = device
-                break
-            } else if (device.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER) {
-                selectedDevice = device
-            }
-        }
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            // Use the modern API for Android S and above
-            try {
-                selectedDevice?.let {
-                    audioManager.setCommunicationDevice(it)
-                }
-            }catch (e:Exception){
-                Log.e("AudioEngine", "Error setting communication device. Using speaker")
-                speakerDevice?.let {
-                    audioManager.setCommunicationDevice(it)
-                }
+            val devices = audioManager.availableCommunicationDevices
+            // A2DP is a music output, not a microphone route. Android chooses the matching
+            // input for a valid communication sink (including SCO and BLE headsets).
+            val selected = devices.firstOrNull { it.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO ||
+                it.type == AudioDeviceInfo.TYPE_BLE_HEADSET }
+                ?: devices.firstOrNull { it.type == AudioDeviceInfo.TYPE_WIRED_HEADSET ||
+                    it.type == AudioDeviceInfo.TYPE_WIRED_HEADPHONES ||
+                    it.type == AudioDeviceInfo.TYPE_USB_HEADSET }
+                ?: devices.firstOrNull { it.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER }
+            val routed = try {
+                selected != null && audioManager.setCommunicationDevice(selected)
+            } catch (_: IllegalArgumentException) {
+                // The device disconnected between enumeration and selection.
+                false
             }
-
+            if (!routed) audioManager.clearCommunicationDevice()
         } else {
-            // Fall back to deprecated method for older Android versions
             @Suppress("DEPRECATION")
-            audioManager.isSpeakerphoneOn = !isExternalDeviceConnected
+            val devices = audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
+            // Before Android 12, A2DP signals a connected headset; start SCO to open its mic.
+            val bluetooth = devices.any { it.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO ||
+                it.type == AudioDeviceInfo.TYPE_BLUETOOTH_A2DP }
+            @Suppress("DEPRECATION")
+            if (bluetooth) audioManager.startBluetoothSco() else audioManager.stopBluetoothSco()
+            @Suppress("DEPRECATION")
+            audioManager.isSpeakerphoneOn = !bluetooth && !devices.any {
+                it.type == AudioDeviceInfo.TYPE_WIRED_HEADSET ||
+                    it.type == AudioDeviceInfo.TYPE_WIRED_HEADPHONES ||
+                    it.type == AudioDeviceInfo.TYPE_USB_HEADSET
+            }
         }
     }
 
@@ -186,6 +181,8 @@ class AudioEngine (context: Context) {
         } else {
             @Suppress("DEPRECATION")
             audioManager.isSpeakerphoneOn = false
+            @Suppress("DEPRECATION")
+            audioManager.stopBluetoothSco()
         }
         audioManager.mode = AudioManager.MODE_NORMAL
     }
@@ -245,8 +242,8 @@ class AudioEngine (context: Context) {
             audioFocusRequest = null
         }
 
-        val focusRequest =
-            AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE)
+        lateinit var focusRequest: AudioFocusRequest
+        focusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE)
                 .setAudioAttributes(
                     AudioAttributes.Builder()
                         .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
@@ -255,6 +252,7 @@ class AudioEngine (context: Context) {
                 )
                 .setAcceptsDelayedFocusGain(true)
                 .setOnAudioFocusChangeListener { focusChange ->
+                    if (audioFocusRequest !== focusRequest) return@setOnAudioFocusChangeListener
                     when (focusChange) {
                         AudioManager.AUDIOFOCUS_GAIN -> {
                             Log.d("AudioEngine", "Audio focus gained")
@@ -286,6 +284,14 @@ class AudioEngine (context: Context) {
     }
 
     private fun handleAudioFocusBlocked() {
+        // Focus governs playback. Dictation keeps its AudioRecord alive; Android's
+        // recording configuration reports real input silencing and restores it after calls.
+        if (captureMode == CaptureMode.DICTATION) {
+            stopPlayback()
+            audioFocusRequest?.let { audioManager.abandonAudioFocusRequest(it) }
+            audioFocusRequest = null
+            return
+        }
         if (isRecording) {
             stopRecording()
         }
@@ -306,11 +312,11 @@ class AudioEngine (context: Context) {
 
     @RequiresApi(Build.VERSION_CODES.Q)
     @SuppressLint("MissingPermission")
-    private fun startRecording(): Boolean {
+    private fun startRecording(requestFocus: Boolean = true): Boolean {
         activateCommunicationRoute()
-        if (!requestAudioFocus()) {
+        if (requestFocus && !requestAudioFocus()) {
             handleAudioFocusBlocked()
-            return false
+            if (captureMode == CaptureMode.CONVERSATION) return false
         }
 
         val bufferSize = AudioRecord.getMinBufferSize(SAMPLE_RATE, CHANNEL_CONFIG, AUDIO_FORMAT)
@@ -344,17 +350,27 @@ class AudioEngine (context: Context) {
 
         audioRecord.startRecording()
         isRecording = true
-        startMicSampleTap()
+        setCaptureSilenced(audioRecord.activeRecordingConfiguration?.isClientSilenced ?: false)
+        startMicSampleTap(audioRecord)
         return true
     }
 
-    private fun startMicSampleTap(){
+    private fun setCaptureSilenced(silenced: Boolean) {
+        if (captureSilenced == silenced) return
+        captureSilenced = silenced
+        if (silenced) onInputVolumeCallback?.invoke(0.0F)
+        onAudioInterruptionCallback?.invoke(if (silenced) "capture_paused" else "capture_resumed")
+    }
+
+    private fun startMicSampleTap(recorder: AudioRecord){
         executorServiceMicrophone.execute {
             val buffer = ByteArray(1024)
             try {
-                while (isRecording) {
-                    val read = audioRecord.read(buffer, 0, buffer.size)
-                    if (read > 0) {
+                while (isRecording && audioRecord === recorder) {
+                    val read = recorder.read(buffer, 0, buffer.size)
+                    if (!isRecording || audioRecord !== recorder) break
+                    if (read < 0) throw IllegalStateException("AudioRecord read failed: $read")
+                    if (read > 0 && !captureSilenced) {
                         val data = buffer.copyOf(read)
                         micEvents += 1
                         micBytes += data.size.toLong()
@@ -367,9 +383,13 @@ class AudioEngine (context: Context) {
                 Log.d("AudioEngine", "Mic sample tap stopped.")
             }catch (e: Exception){
                 Log.e("AudioEngine", "Error reading mic sample data", e)
-                isRecording = false
-                tearDown()
-                throw e
+                mainHandler.post {
+                    if (isRecording && audioRecord === recorder) {
+                        stopRecording()
+                        releaseAudioSession()
+                        onAudioInterruptionCallback?.invoke("blocked")
+                    }
+                }
             }
         }
     }
@@ -379,16 +399,31 @@ class AudioEngine (context: Context) {
         isRecording = false
         if (audioRecord.recordingState == AudioRecord.RECORDSTATE_RECORDING) {
             audioRecord.stop()
-            audioRecord.release()
         }
+        audioRecord.release()
+        echoCanceler?.release()
+        echoCanceler = null
+        noiseSuppressor?.release()
+        noiseSuppressor = null
+        setCaptureSilenced(false)
         onInputVolumeCallback?.invoke(0.0F)
     }
 
+    @RequiresApi(Build.VERSION_CODES.Q)
+    fun startDictation(): Boolean {
+        isRecordingBeforePause = false
+        if (isRecording) return true
+        captureMode = CaptureMode.DICTATION
+        return startRecording()
+    }
+
     @RequiresApi(Build.VERSION_CODES.Q)
     fun toggleRecording(value: Boolean): Boolean {
+        isRecordingBeforePause = false
         if (value == isRecording) return isRecording
 
         if (value) {
+            captureMode = CaptureMode.CONVERSATION
             return startRecording()
         } else {
             stopRecording()
@@ -401,6 +436,7 @@ class AudioEngine (context: Context) {
     @SuppressLint("NewApi")
     fun playPCMData(data: ByteArray) {
         acquireAudioSessionIfNeeded()
+        audioTrack.play()
         audioSampleQueue.add(data)
         playbackEvents += 1
         playbackQueuedBytes += data.size.toLong()
@@ -464,7 +500,7 @@ class AudioEngine (context: Context) {
     @RequiresApi(Build.VERSION_CODES.Q)
     fun pauseRecordingAndPlayer() {
         isRecordingBeforePause = isRecording
-        isRecording = toggleRecording(false)
+        stopRecording()
         audioTrack.pause()
     }
 
@@ -478,16 +514,18 @@ class AudioEngine (context: Context) {
         if (!wasRecordingBeforePause && !isPlaying) {
             return
         }
-        activateCommunicationRoute()
-        if (!requestAudioFocus()) {
-            handleAudioFocusBlocked()
-            return
+        isRecordingBeforePause = false
+        if (wasRecordingBeforePause) {
+            // Returning from music controls must not pause music the user explicitly resumed.
+            if (!startRecording(requestFocus = captureMode == CaptureMode.CONVERSATION)) return
+        } else {
+            activateCommunicationRoute()
+            if (!requestAudioFocus()) {
+                handleAudioFocusBlocked()
+                return
+            }
         }
-        isRecording = toggleRecording(wasRecordingBeforePause)
-        if (wasRecordingBeforePause && !isRecording) {
-            return
-        }
-        audioTrack.play()
+        if (captureMode == CaptureMode.CONVERSATION) audioTrack.play()
     }
 
     fun stopPlayback() {
@@ -520,7 +558,11 @@ class AudioEngine (context: Context) {
             audioManager.abandonAudioFocusRequest(request)
         }
         audioFocusRequest = null
+        audioManager.unregisterAudioDeviceCallback(deviceCallback)
+        audioManager.unregisterAudioRecordingCallback(recordingCallback)
+        audioTrack.release()
         executorServiceMicrophone.shutdownNow()
+        executorServicePlayback.shutdownNow()
     }
 
 
diff --git a/packages/expo-two-way-audio/android/src/main/java/expo/modules/twowayaudio/ExpoTwoWayAudioModule.kt b/packages/expo-two-way-audio/android/src/main/java/expo/modules/twowayaudio/ExpoTwoWayAudioModule.kt
index f9b107c99f..68f1489de7 100644
--- a/packages/expo-two-way-audio/android/src/main/java/expo/modules/twowayaudio/ExpoTwoWayAudioModule.kt
+++ b/packages/expo-two-way-audio/android/src/main/java/expo/modules/twowayaudio/ExpoTwoWayAudioModule.kt
@@ -42,6 +42,12 @@ class ExpoTwoWayAudioModule : Module() {
              audioEngine?.isRecording ?: false
          }
 
+         Function("startDictation") {
+             val isRecording = audioEngine?.startDictation() ?: false
+             sendEvent(ON_RECORDING_CHANGE_EVENT, mapOf("data" to isRecording))
+             isRecording
+         }
+
          Function("toggleRecording") { value: Boolean ->
              audioEngine?.let { engine ->
                  val isRecording = engine.toggleRecording(value)
diff --git a/packages/expo-two-way-audio/ios/ExpoTwoWayAudioModule.swift b/packages/expo-two-way-audio/ios/ExpoTwoWayAudioModule.swift
index baec747995..046f856747 100644
--- a/packages/expo-two-way-audio/ios/ExpoTwoWayAudioModule.swift
+++ b/packages/expo-two-way-audio/ios/ExpoTwoWayAudioModule.swift
@@ -59,6 +59,12 @@ public class ExpoTwoWayAudioModule: Module {
             return audioEngine.isRecording
         }
 
+        Function("startDictation") { () -> Bool in
+            let isRecording = self.audioEngine?.toggleRecording(true) ?? false
+            self.sendEvent(ON_RECORDING_CHANGE_EVENT_NAME, ["data": isRecording])
+            return isRecording
+        }
+
         Function("toggleRecording") { (val: Bool) -> Bool in
             guard let audioEngine = self.audioEngine else {
                 print("AudioEngine not initialized")
diff --git a/packages/expo-two-way-audio/src/core.ts b/packages/expo-two-way-audio/src/core.ts
index 1a54e0e9ce..48215f2bae 100644
--- a/packages/expo-two-way-audio/src/core.ts
+++ b/packages/expo-two-way-audio/src/core.ts
@@ -17,6 +17,16 @@ export function toggleRecording(val: boolean): boolean {
   return ExpoTwoWayAudioModule.toggleRecording(val);
 }
 
+/** Capture speech without treating another app's playback focus as a microphone failure. */
+export function startDictation(): boolean {
+  // COMPAT(dictationCapture): added after v0.11.2, remove after 2027-01-16 once
+  // the native binary floor includes startDictation. Older OTA clients retain legacy capture.
+  if (typeof ExpoTwoWayAudioModule.startDictation !== "function") {
+    return ExpoTwoWayAudioModule.toggleRecording(true);
+  }
+  return ExpoTwoWayAudioModule.startDictation();
+}
+
 export function isRecording(): boolean {
   return ExpoTwoWayAudioModule.isRecording();
 }

From 30799fda19f50febc62349c64460368adc85ff07 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 07:57:22 +0200
Subject: [PATCH 229/270] Return actionable errors to OpenCode agents for
 invalid tool calls (#7183)

* fix(server): return actionable OpenCode bridge errors

* fix(server): surface OpenCode tool input errors

* fix(server): surface OpenCode v2 tool errors

* test(server): cover OpenCode v2 bridge errors

* fix(server): classify missing schedules as tool input

* fix(server): surface schedule state conflicts

* fix(server): validate schedule tool inputs

* fix(server): keep tool contracts while reporting OpenCode input errors

Preserve the removal of create_agent.background and keep legacy schedule fields hidden. Verify client errors through the real bridge, catalog, and schedule service rather than mocked schedule failures.

Co-authored-by: Felipe Fidelix <felipe@fdx.is>

* fix(server): distinguish caller errors from stored data failures

Tag validation failures where tool arguments are parsed, so schema errors from persisted state remain internal failures. Preserve the missing-agent error at its producer and translate it for prompt delivery. Real HTTP regressions fail for both misclassifications before this change.

* fix(server): preserve messages for unclassified tool failures

Keep existing error messages on HTTP 500 responses so agents can correct failed tool calls. Exercise missing workspaces through the real script service and bridge route.

* fix(server): preserve clearing schedule names with blank strings

---------

Co-authored-by: Felipe Fidelix <felipe@fdx.is>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../server/src/server/agent/agent-loading.ts  |   9 +-
 .../opencode/bridge-input-errors.test.ts      | 202 ++++++++++++
 .../providers/opencode/bridge-plugin.mjs      |  16 +-
 .../agent/providers/opencode/bridge.test.ts   | 125 ++++++-
 .../server/agent/providers/opencode/bridge.ts |  46 ++-
 .../providers/opencode/v2/bridge-plugin.mjs   |  15 +-
 .../src/server/agent/tools/paseo-tools.ts     | 308 ++++++++++++------
 .../server/src/server/agent/tools/types.ts    |  12 +
 .../server/src/server/schedule/service.ts     |  29 +-
 9 files changed, 637 insertions(+), 125 deletions(-)
 create mode 100644 packages/server/src/server/agent/providers/opencode/bridge-input-errors.test.ts

diff --git a/packages/server/src/server/agent/agent-loading.ts b/packages/server/src/server/agent/agent-loading.ts
index 248e8d2b1b..761f1008bd 100644
--- a/packages/server/src/server/agent/agent-loading.ts
+++ b/packages/server/src/server/agent/agent-loading.ts
@@ -12,6 +12,13 @@ import {
   toAgentPersistenceHandle,
 } from "../persistence-hooks.js";
 
+export class AgentNotFoundError extends Error {
+  constructor(agentId: string) {
+    super(`Agent not found: ${agentId}`);
+    this.name = "AgentNotFoundError";
+  }
+}
+
 interface PendingAgentInitialization {
   promise: Promise<ManagedAgent>;
   options: { broadcastTimeline: boolean };
@@ -94,7 +101,7 @@ export async function ensureAgentLoaded(
   const initPromise = (async () => {
     const record = await deps.agentStorage.get(agentId);
     if (!record) {
-      throw new Error(`Agent not found: ${agentId}`);
+      throw new AgentNotFoundError(agentId);
     }
 
     const validProviders = deps.validProviders ?? deps.agentManager.getRegisteredProviderIds();
diff --git a/packages/server/src/server/agent/providers/opencode/bridge-input-errors.test.ts b/packages/server/src/server/agent/providers/opencode/bridge-input-errors.test.ts
new file mode 100644
index 0000000000..f9a776d168
--- /dev/null
+++ b/packages/server/src/server/agent/providers/opencode/bridge-input-errors.test.ts
@@ -0,0 +1,202 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { expect, test } from "vitest";
+import { createTestLogger } from "../../../../test-utils/test-logger.js";
+import { createPaseoToolCatalog } from "../../tools/paseo-tools.js";
+import { AgentManager } from "../../agent-manager.js";
+import { AgentStorage } from "../../agent-storage.js";
+import { ProviderSnapshotManager } from "../../provider-snapshot-manager.js";
+import { OpenCodeBridge } from "./bridge.js";
+import { ScheduleService } from "../../../schedule/service.js";
+import { createWorkspaceScriptsService } from "../../../session/workspace-scripts/workspace-scripts-service.js";
+import {
+  FileBackedProjectRegistry,
+  FileBackedWorkspaceRegistry,
+} from "../../../workspace-registry.js";
+import { createServiceProxySubsystem } from "../../../service-proxy.js";
+import { WorkspaceScriptRuntimeStore } from "../../../workspace-script-runtime-store.js";
+import { createTerminalManager } from "../../../../terminal/terminal-manager.js";
+
+test("bridge preserves tool failure messages and classifies invalid requests as client errors", async () => {
+  const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-7045-"));
+  const logger = createTestLogger();
+  const providerSnapshotManager = new ProviderSnapshotManager({ logger });
+  const agentManager = new AgentManager({ logger });
+  const agentStorage = new AgentStorage(paseoHome, logger);
+  const unused = async (): Promise<never> => {
+    throw new Error("Unexpected workspace or agent creation");
+  };
+  const scheduleService = new ScheduleService({
+    paseoHome,
+    logger,
+    agentManager,
+    agentStorage,
+    createAgent: unused,
+    createDirectoryWorkspace: unused,
+    createPaseoWorktreeWorkspace: unused,
+    archiveWorkspace: unused,
+    runner: async () => ({ agentId: null, output: "done" }),
+  });
+  const workspaceScripts = createWorkspaceScriptsService({
+    serviceProxy: createServiceProxySubsystem({ logger }),
+    scriptRuntimeStore: new WorkspaceScriptRuntimeStore(),
+    terminalManager: createTerminalManager(),
+    workspaceRegistry: new FileBackedWorkspaceRegistry(
+      path.join(paseoHome, "workspaces.json"),
+      logger,
+    ),
+    projectRegistry: new FileBackedProjectRegistry(path.join(paseoHome, "projects.json"), logger),
+    workspaceGitService: {
+      peekSnapshot: () => {
+        throw new Error("Unexpected git lookup");
+      },
+    },
+    getDaemonTcpPort: null,
+    getDaemonTcpHost: null,
+    serviceProxyPublicBaseUrl: null,
+    resolveScriptHealth: null,
+    logger,
+    emit: () => {},
+    publishStatusUpdate: () => {},
+    spawnWorkspaceScript: unused,
+    assertAutomationAllowed: unused,
+  });
+  const catalog = createPaseoToolCatalog({
+    workspaceScripts,
+    agentManager,
+    agentStorage,
+    scheduleService,
+    providerSnapshotManager,
+    logger,
+  });
+  const bridge = new OpenCodeBridge({ paseoHome, logger });
+  try {
+    await bridge.start();
+    bridge.setManifestCatalog(catalog);
+    bridge.bindSession({ sessionId: "diagnosis", env: {}, tools: catalog });
+    const config = JSON.parse(bridge.decorateServerEnv({}).OPENCODE_CONFIG_CONTENT);
+    const { baseUrl, token } = config.plugin[0][1];
+    const completed = await scheduleService.create({
+      prompt: "Run once",
+      name: "Daily check",
+      cadence: { type: "cron", expression: "0 0 * * *" },
+      target: { type: "new-agent", config: { provider: "codex", cwd: paseoHome } },
+      maxRuns: 1,
+      runOnCreate: true,
+    });
+    await scheduleService.tick();
+    expect((await scheduleService.inspect(completed.id)).status).toBe("completed");
+    const manifest = await fetch(`${baseUrl}/_internal/opencode/tools`, {
+      headers: { Authorization: `Bearer ${token}` },
+    });
+    const { tools } = await manifest.json();
+    expect(
+      tools.find((tool: { name: string }) => tool.name === "create_agent").inputSchema.properties,
+    ).not.toHaveProperty("background");
+    expect(
+      tools.find((tool: { name: string }) => tool.name === "update_schedule").inputSchema
+        .properties,
+    ).not.toHaveProperty("every");
+    await writeFile(
+      path.join(paseoHome, "schedules", "broken.json"),
+      JSON.stringify({ id: "broken", prompt: 17 }),
+    );
+    const observed = [];
+    for (const [tool, body, expected] of [
+      [
+        "create_agent",
+        JSON.stringify({ title: "Probe", provider: "opencode", initialPrompt: "Reply OK" }),
+        400,
+      ],
+      ["create_agent", "{", 400],
+      ["nonexistent_tool", "{}", 404],
+      ["inspect_schedule", JSON.stringify({ id: "missing" }), 400],
+      ...["pause_schedule", "resume_schedule", "run_schedule_once"].map(
+        (action) => [action, JSON.stringify({ id: completed.id }), 400] as const,
+      ),
+      [
+        "create_schedule",
+        JSON.stringify({ prompt: "Probe", provider: "codex", cron: "not-a-cron" }),
+        400,
+      ],
+      [
+        "create_schedule",
+        JSON.stringify({
+          prompt: "Probe",
+          provider: "codex",
+          cron: "0 0 * * *",
+          timezone: "Mars/Phobos",
+        }),
+        400,
+      ],
+      ["update_schedule", JSON.stringify({ id: completed.id, name: "" }), 200],
+      ["update_schedule", JSON.stringify({ id: completed.id, cron: "0 0 30 2 *" }), 400],
+      ["update_schedule", JSON.stringify({ id: completed.id, expiresIn: "not-a-duration" }), 400],
+      ["send_agent_prompt", JSON.stringify({ agentId: "missing", prompt: "Hello" }), 400],
+      ["inspect_schedule", JSON.stringify({ id: "broken" }), 500],
+      ["list_workspace_scripts", JSON.stringify({ workspaceId: "wks_typo" }), 500],
+      [
+        "start_workspace_script",
+        JSON.stringify({ workspaceId: "wks_typo", scriptName: "web" }),
+        500,
+      ],
+    ] as const) {
+      const response = await fetch(
+        `${baseUrl}/_internal/opencode/sessions/diagnosis/tools/${tool}`,
+        {
+          method: "POST",
+          headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
+          body,
+        },
+      );
+      observed.push({
+        tool,
+        body,
+        expected,
+        status: response.status,
+        payload: await response.json(),
+      });
+    }
+
+    for (const result of observed) expect.soft(result.status, result.body).toBe(result.expected);
+    expect((await scheduleService.inspect(completed.id)).name).toBeNull();
+    expect(
+      tools.find((tool: { name: string }) => tool.name === "update_schedule").inputSchema.properties
+        .name,
+    ).not.toHaveProperty("minLength");
+    for (const result of observed.slice(14)) {
+      expect.soft(result.payload).toEqual({ error: "Workspace not found: wks_typo" });
+    }
+    expect.soft(observed[12].payload).toEqual({ error: "Agent not found: missing" });
+    expect.soft(observed[13].payload).toEqual({ error: expect.stringContaining('"prompt"') });
+    expect.soft(observed[13].payload).not.toHaveProperty("issues");
+    expect(observed[3].payload).toEqual({ error: "Schedule not found: missing" });
+    for (const result of observed.slice(4, 7))
+      expect(result.payload).toEqual({ error: `Schedule ${completed.id} is already completed` });
+    for (const [index, field] of [
+      [7, "cron"],
+      [8, "timezone"],
+      [10, "cron"],
+      [11, "expiresIn"],
+    ] as const) {
+      expect(observed[index].payload).toMatchObject({
+        error: "Invalid tool input",
+        issues: expect.arrayContaining([expect.objectContaining({ path: [field] })]),
+      });
+    }
+    expect(observed[0].payload).toMatchObject({
+      error: "Invalid tool input",
+      issues: expect.arrayContaining([
+        expect.objectContaining({
+          path: ["provider"],
+          message: expect.stringContaining("provider/model"),
+        }),
+      ]),
+    });
+  } finally {
+    await bridge.close();
+    await providerSnapshotManager.shutdown();
+    await rm(paseoHome, { recursive: true, force: true });
+  }
+});
diff --git a/packages/server/src/server/agent/providers/opencode/bridge-plugin.mjs b/packages/server/src/server/agent/providers/opencode/bridge-plugin.mjs
index 82e4166492..6b3a38da9c 100644
--- a/packages/server/src/server/agent/providers/opencode/bridge-plugin.mjs
+++ b/packages/server/src/server/agent/providers/opencode/bridge-plugin.mjs
@@ -13,8 +13,11 @@ export default async function paseoPlugin(input, options) {
     });
     const payload = await response.json().catch(() => ({}));
     if (!response.ok) {
-      const error = new Error(payload.error ?? `Paseo OpenCode bridge failed: ${response.status}`);
+      const detail = formatErrorDetail(payload.issues ?? payload.details);
+      const message = payload.error ?? `Paseo OpenCode bridge failed: ${response.status}`;
+      const error = new Error(detail ? `${message}: ${detail}` : message);
       error.status = response.status;
+      if (detail) error.details = detail;
       throw error;
     }
     return payload;
@@ -79,6 +82,17 @@ export default async function paseoPlugin(input, options) {
   };
 }
 
+function formatErrorDetail(details) {
+  if (!Array.isArray(details)) return typeof details === "string" ? details : "";
+  return details
+    .map((issue) => {
+      const path =
+        Array.isArray(issue?.path) && issue.path.length > 0 ? issue.path.join(".") : "input";
+      return `${path}: ${issue?.message ?? "Invalid value"}`;
+    })
+    .join("; ");
+}
+
 function logPluginError(stage, context, error) {
   console.error(`[paseo-opencode-plugin] ${stage} failed`, {
     ...context,
diff --git a/packages/server/src/server/agent/providers/opencode/bridge.test.ts b/packages/server/src/server/agent/providers/opencode/bridge.test.ts
index 076cbe94bd..4b42410845 100644
--- a/packages/server/src/server/agent/providers/opencode/bridge.test.ts
+++ b/packages/server/src/server/agent/providers/opencode/bridge.test.ts
@@ -9,6 +9,7 @@ import { afterEach, describe, expect, test, vi } from "vitest";
 
 import { createTestLogger } from "../../../../test-utils/test-logger.js";
 import type { PaseoToolCatalog } from "../../tools/types.js";
+import { PaseoToolInputError } from "../../tools/types.js";
 import { createPaseoToolCatalog } from "../../tools/paseo-tools.js";
 import { AgentManager } from "../../agent-manager.js";
 import { AgentStorage } from "../../agent-storage.js";
@@ -36,8 +37,12 @@ function createCatalog(): PaseoToolCatalog {
     description: "Returns the supplied value.",
     inputSchema: { value: z.string() },
     async handler(input: unknown) {
-      const parsed = z.object({ value: z.string() }).parse(input);
-      return { content: [{ type: "text", text: parsed.value }] };
+      const parsed = z
+        .object({ value: z.string().min(2, "value must be at least 2 characters") })
+        .strict()
+        .safeParse(input);
+      if (!parsed.success) throw new PaseoToolInputError(parsed.error.message, parsed.error.issues);
+      return { content: [{ type: "text", text: parsed.data.value }] };
     },
   };
   const tools = new Map([[tool.name, tool]]);
@@ -193,6 +198,13 @@ describe("OpenCodeBridge", () => {
       expect(asked).toEqual([
         { permission: "paseo_echo_context", patterns: ["*"], always: ["*"], metadata: {} },
       ]);
+      asked.length = 0;
+      await expect(
+        hooks.tool.paseo_echo_context.execute(
+          { value: "x" },
+          { sessionID: "ses_one", ask: async () => undefined },
+        ),
+      ).rejects.toThrow("value: value must be at least 2 characters");
 
       executedInputs.length = 0;
       await expect(
@@ -357,12 +369,17 @@ describe("OpenCodeBridge", () => {
             body: JSON.stringify(input),
           },
         );
-        expect(response.status).toBe(500);
+        expect(response.status).toBe(400);
         const payload = await response.json();
-        expect(payload.error).toContain("provider must be provider/model");
+        expect(payload).toMatchObject({ error: "Invalid tool input", issues: expect.any(Array) });
         await expect(
           tools.get("paseo_create_agent")!.execute(input, { sessionID: "caller" }),
-        ).rejects.toMatchObject({ message: payload.error, status: 500 });
+        ).rejects.toMatchObject({
+          status: 400,
+          message: expect.stringContaining(
+            "Invalid tool input: provider: provider must be provider/model, for example codex/gpt-5.4",
+          ),
+        });
       } finally {
         await dispose();
       }
@@ -550,6 +567,104 @@ describe("OpenCodeBridge", () => {
     }
   });
 
+  test("returns actionable 4xx responses for invalid bridge requests", async () => {
+    const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-opencode-bridge-errors-"));
+    temporaryDirectories.push(paseoHome);
+    const bridge = new OpenCodeBridge({ paseoHome, logger: createTestLogger() });
+    await bridge.start();
+    const catalog = createCatalog();
+    bridge.bindSession({ sessionId: "ses_errors", env: {}, tools: catalog });
+    const expectedErrorCatalog: PaseoToolCatalog = {
+      tools: new Map([
+        [
+          "expected_error",
+          {
+            name: "expected_error",
+            description: "Throws an expected tool error.",
+            inputSchema: {},
+            async handler() {
+              throw new PaseoToolInputError("Agent not found: missing-agent");
+            },
+          },
+        ],
+        [
+          "internal_error",
+          {
+            name: "internal_error",
+            description: "Throws an internal error.",
+            inputSchema: {},
+            async handler() {
+              throw new Error("Provider unavailable");
+            },
+          },
+        ],
+      ]),
+      getTool(name) {
+        return this.tools.get(name);
+      },
+      async executeTool(name, input, context) {
+        const tool = this.tools.get(name);
+        if (!tool) throw new Error(`Unknown tool: ${name}`);
+        return tool.handler(input, context ?? {});
+      },
+    };
+    bridge.bindSession({ sessionId: "ses_expected_error", env: {}, tools: expectedErrorCatalog });
+
+    try {
+      const plugin = readPluginOptions(bridge.decorateServerEnv({}));
+      const headers = {
+        Authorization: `Bearer ${plugin.token}`,
+        "Content-Type": "application/json",
+      };
+      const invalidInput = await fetch(
+        `${plugin.baseUrl}/_internal/opencode/sessions/ses_errors/tools/echo_context`,
+        { method: "POST", headers, body: JSON.stringify({ value: "ok", extra: true }) },
+      );
+      expect(invalidInput.status).toBe(400);
+      expect(await invalidInput.json()).toEqual({
+        error: "Invalid tool input",
+        issues: [
+          {
+            code: "unrecognized_keys",
+            keys: ["extra"],
+            path: [],
+            message: 'Unrecognized key: "extra"',
+          },
+        ],
+      });
+
+      const unknownTool = await fetch(
+        `${plugin.baseUrl}/_internal/opencode/sessions/ses_errors/tools/missing`,
+        { method: "POST", headers, body: "{}" },
+      );
+      expect(unknownTool.status).toBe(404);
+      expect(await unknownTool.json()).toEqual({ error: "Paseo tool not found: missing" });
+
+      const malformedBody = await fetch(
+        `${plugin.baseUrl}/_internal/opencode/sessions/ses_errors/tools/echo_context`,
+        { method: "POST", headers, body: "{" },
+      );
+      expect(malformedBody.status).toBe(400);
+      expect(await malformedBody.json()).toEqual({ error: "Malformed JSON request body" });
+
+      const expectedError = await fetch(
+        `${plugin.baseUrl}/_internal/opencode/sessions/ses_expected_error/tools/expected_error`,
+        { method: "POST", headers, body: "{}" },
+      );
+      expect(expectedError.status).toBe(400);
+      expect(await expectedError.json()).toEqual({ error: "Agent not found: missing-agent" });
+
+      const internalError = await fetch(
+        `${plugin.baseUrl}/_internal/opencode/sessions/ses_expected_error/tools/internal_error`,
+        { method: "POST", headers, body: "{}" },
+      );
+      expect(internalError.status).toBe(500);
+      expect(await internalError.json()).toEqual({ error: "Provider unavailable" });
+    } finally {
+      await bridge.close();
+    }
+  });
+
   test("preserves user OpenCode config while installing one content-addressed plugin", async () => {
     const paseoHome = await mkdtemp(path.join(tmpdir(), "paseo-opencode-bridge-config-"));
     temporaryDirectories.push(paseoHome);
diff --git a/packages/server/src/server/agent/providers/opencode/bridge.ts b/packages/server/src/server/agent/providers/opencode/bridge.ts
index 52a2cd3612..4e9902bd7a 100644
--- a/packages/server/src/server/agent/providers/opencode/bridge.ts
+++ b/packages/server/src/server/agent/providers/opencode/bridge.ts
@@ -11,11 +11,22 @@ import {
   addModelVisibleStructuredContent,
   serializePaseoToolInputParameters,
 } from "../../tools/paseo-tool-serialization.js";
-import type { PaseoToolCatalog } from "../../tools/types.js";
+import { PaseoToolInputError, type PaseoToolCatalog } from "../../tools/types.js";
 
 const INTERNAL_PREFIX = "/_internal/opencode";
 const MAX_REQUEST_BYTES = 1024 * 1024;
 
+class OpenCodeBridgeClientError extends Error {
+  constructor(
+    readonly status: number,
+    message: string,
+    readonly details?: unknown,
+  ) {
+    super(message);
+    this.name = "OpenCodeBridgeClientError";
+  }
+}
+
 interface OpenCodeBridgeOptions {
   paseoHome: string;
   logger: Logger;
@@ -187,10 +198,26 @@ export class OpenCodeBridge {
       sendJson(response, 404, { error: "Not found" });
     } catch (error) {
       this.logger.warn({ err: error }, "OpenCode bridge request failed");
+      const failure = error instanceof Error ? error : new Error(String(error));
       if (!response.headersSent) {
-        sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) });
+        if (error instanceof OpenCodeBridgeClientError) {
+          sendJson(response, error.status, {
+            error: error.message,
+            ...(error.details === undefined ? {} : { details: error.details }),
+          });
+        } else if (error instanceof PaseoToolInputError) {
+          sendJson(
+            response,
+            error.status,
+            error.issues
+              ? { error: "Invalid tool input", issues: error.issues }
+              : { error: error.message },
+          );
+        } else {
+          sendJson(response, 500, { error: failure.message });
+        }
       } else {
-        response.destroy(error instanceof Error ? error : new Error(String(error)));
+        response.destroy(failure);
       }
     }
   }
@@ -224,6 +251,9 @@ export class OpenCodeBridge {
       sendJson(input.response, 403, { error: "Paseo tools are disabled for this session" });
       return;
     }
+    if (!binding.tools.getTool(input.toolName)) {
+      throw new OpenCodeBridgeClientError(404, `Paseo tool not found: ${input.toolName}`);
+    }
     const body = await readJsonBody(input.request);
     const controller = new AbortController();
     input.request.once("aborted", () =>
@@ -349,11 +379,17 @@ async function readJsonBody(request: IncomingMessage): Promise<unknown> {
   for await (const chunk of request) {
     const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
     size += buffer.byteLength;
-    if (size > MAX_REQUEST_BYTES) throw new Error("OpenCode bridge request body is too large");
+    if (size > MAX_REQUEST_BYTES) {
+      throw new OpenCodeBridgeClientError(413, "OpenCode bridge request body is too large");
+    }
     chunks.push(buffer);
   }
   if (chunks.length === 0) return {};
-  return JSON.parse(Buffer.concat(chunks).toString("utf8")) as unknown;
+  try {
+    return JSON.parse(Buffer.concat(chunks).toString("utf8")) as unknown;
+  } catch {
+    throw new OpenCodeBridgeClientError(400, "Malformed JSON request body");
+  }
 }
 
 function sendJson(response: ServerResponse, status: number, body: unknown): void {
diff --git a/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs b/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs
index 6b845d19ed..1664c0b59f 100644
--- a/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs
+++ b/packages/server/src/server/agent/providers/opencode/v2/bridge-plugin.mjs
@@ -15,12 +15,14 @@ export default {
       if (allowMissing && response.status === 404) return null;
       if (!response.ok) {
         const payload = await response.json().catch(() => null);
+        const detail = formatErrorDetail(payload?.issues ?? payload?.details);
         const message =
           typeof payload?.error === "string" && payload.error
             ? payload.error
             : `Paseo tool bridge returned HTTP ${response.status}`;
-        const error = new Error(message);
+        const error = new Error(detail ? `${message}: ${detail}` : message);
         error.status = response.status;
+        if (detail) error.details = detail;
         throw error;
       }
       return response.json();
@@ -78,6 +80,17 @@ export default {
   },
 };
 
+function formatErrorDetail(details) {
+  if (!Array.isArray(details)) return typeof details === "string" ? details : "";
+  return details
+    .map((issue) => {
+      const path =
+        Array.isArray(issue?.path) && issue.path.length > 0 ? issue.path.join(".") : "input";
+      return `${path}: ${issue?.message ?? "Invalid value"}`;
+    })
+    .join("; ");
+}
+
 // OpenCode tool content is text or a file; MCP images arrive as base64 data.
 function toOpenCodeContent(part) {
   if (part.type === "image") {
diff --git a/packages/server/src/server/agent/tools/paseo-tools.ts b/packages/server/src/server/agent/tools/paseo-tools.ts
index dae9c16f4f..68e9d99a40 100644
--- a/packages/server/src/server/agent/tools/paseo-tools.ts
+++ b/packages/server/src/server/agent/tools/paseo-tools.ts
@@ -25,7 +25,7 @@ import {
 import { curateAgentActivity } from "../activity-curator.js";
 import { selectItemsByProjectedLimit } from "../timeline-projection.js";
 import type { AgentStorage } from "../agent-storage.js";
-import { ensureAgentLoaded } from "../agent-loading.js";
+import { AgentNotFoundError, ensureAgentLoaded } from "../agent-loading.js";
 import { isStoredAgentProviderAvailable } from "../../persistence-hooks.js";
 import {
   archiveByScope,
@@ -40,7 +40,12 @@ import { everyMsToFiveFieldCron } from "@getpaseo/protocol/schedule/cadence";
 import { expandUserPath, isSameOrDescendantPath, resolvePathFromBase } from "../../path-utils.js";
 import type { TerminalManager } from "../../../terminal/terminal-manager.js";
 import type { CreatePaseoWorktreeWorkflowFn } from "../../worktree-session.js";
-import type { ScheduleService } from "../../schedule/service.js";
+import { computeNextRunAt, validateScheduleCadence } from "../../schedule/cron.js";
+import {
+  ScheduleNotFoundError,
+  ScheduleStateConflictError,
+  type ScheduleService,
+} from "../../schedule/service.js";
 import {
   ScheduleRunSchema,
   ScheduleSummarySchema,
@@ -91,12 +96,13 @@ import {
 } from "../../worktree/commands.js";
 import { registerBrowserTools } from "../../browser-tools/tools.js";
 import type { BrowserToolsBroker } from "../../browser-tools/broker.js";
-import type {
-  PaseoToolCatalog,
-  PaseoToolConfig,
-  PaseoToolDefinition,
-  PaseoToolExecutionContext,
-  PaseoToolResult,
+import {
+  PaseoToolInputError,
+  type PaseoToolCatalog,
+  type PaseoToolConfig,
+  type PaseoToolDefinition,
+  type PaseoToolExecutionContext,
+  type PaseoToolResult,
 } from "./types.js";
 import type { ProviderPaseoToolsPolicy } from "@getpaseo/protocol/provider-config";
 import { isPaseoToolEnabled } from "../paseo-tool-policy.js";
@@ -229,7 +235,7 @@ function assertOptionsAbsent(
   message: string,
 ): void {
   if (options.some(([, value]) => value !== undefined)) {
-    throw new Error(message);
+    throw new PaseoToolInputError(message);
   }
 }
 
@@ -265,7 +271,7 @@ function resolveWorkspaceWorktreeTarget(input: WorkspaceWorktreeOptions): Worksp
       };
     case "checkout-branch":
       if (!input.branch) {
-        throw new Error("branch is required for checkout-branch mode");
+        throw new PaseoToolInputError("branch is required for checkout-branch mode");
       }
       assertOptionsAbsent(
         [
@@ -279,7 +285,7 @@ function resolveWorkspaceWorktreeTarget(input: WorkspaceWorktreeOptions): Worksp
       return { action: "checkout", refName: input.branch };
     case "checkout-pr":
       if (input.prNumber === undefined) {
-        throw new Error("prNumber is required for checkout-pr mode");
+        throw new PaseoToolInputError("prNumber is required for checkout-pr mode");
       }
       assertOptionsAbsent(
         [
@@ -355,7 +361,7 @@ function resolveScheduleProviderAndModel(params: {
   const provider = providerInput.slice(0, slashIndex).trim();
   const model = providerInput.slice(slashIndex + 1).trim();
   if (!provider || !model) {
-    throw new Error("provider must be <provider> or <provider>/<model>");
+    throw new PaseoToolInputError("provider must be <provider> or <provider>/<model>");
   }
 
   return {
@@ -372,7 +378,7 @@ function resolveScheduleUpdateProviderAndModel(params: {
   const modelInput = typeof params.model === "string" ? params.model.trim() : params.model;
 
   if (params.model !== undefined && modelInput === "") {
-    throw new Error("model cannot be empty");
+    throw new PaseoToolInputError("model cannot be empty");
   }
 
   if (!providerInput) {
@@ -390,13 +396,13 @@ function resolveScheduleUpdateProviderAndModel(params: {
   const provider = providerInput.slice(0, slashIndex).trim();
   const modelFromProvider = providerInput.slice(slashIndex + 1).trim();
   if (!provider || !modelFromProvider) {
-    throw new Error("provider must be <provider> or <provider>/<model>");
+    throw new PaseoToolInputError("provider must be <provider> or <provider>/<model>");
   }
   if (params.model === null) {
-    throw new Error("provider specifies a model but model is null");
+    throw new PaseoToolInputError("provider specifies a model but model is null");
   }
   if (typeof modelInput === "string" && modelInput !== modelFromProvider) {
-    throw new Error("Conflicting model values provided");
+    throw new PaseoToolInputError("Conflicting model values provided");
   }
 
   return {
@@ -438,26 +444,82 @@ function normalizeScheduleTimeZoneArg(value: string | undefined): string | undef
   return normalizeScheduleCadenceArg(value);
 }
 
+function addScheduleCadenceIssue(
+  input: { cron?: string; timezone?: string },
+  context: z.RefinementCtx,
+): void {
+  const expression = input.cron?.trim();
+  if (!expression) {
+    return;
+  }
+  const cadence: ScheduleCadence = {
+    type: "cron",
+    expression,
+    ...(input.timezone !== undefined ? { timezone: input.timezone.trim() } : {}),
+  };
+  try {
+    validateScheduleCadence(cadence);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    context.addIssue({
+      code: "custom",
+      path: [message.startsWith("Invalid cron time zone:") ? "timezone" : "cron"],
+      message,
+    });
+    return;
+  }
+  try {
+    computeNextRunAt(cadence, new Date());
+  } catch (error) {
+    context.addIssue({
+      code: "custom",
+      path: ["cron"],
+      message: error instanceof Error ? error.message : String(error),
+    });
+  }
+}
+
+function parseToolArguments<T>(schema: z.ZodType<T>, input: unknown): T {
+  const result = schema.safeParse(input);
+  if (!result.success) {
+    throw new PaseoToolInputError(result.error.message, result.error.issues);
+  }
+  return result.data;
+}
+
+function addScheduleDurationIssue(value: string, context: z.RefinementCtx): void {
+  try {
+    parseDurationString(value);
+  } catch (error) {
+    context.addIssue({
+      code: "custom",
+      message: error instanceof Error ? error.message : String(error),
+    });
+  }
+}
+
+const scheduleDurationInputSchema = z.string().superRefine(addScheduleDurationIssue);
+
 function resolveScheduleUpdateCadence(input: ScheduleUpdateToolInput): ScheduleCadence | undefined {
   const every = normalizeScheduleCadenceArg(input.every);
   const cron = normalizeScheduleCadenceArg(input.cron);
   const timeZone = normalizeScheduleTimeZoneArg(input.timezone);
 
   if (every !== undefined && cron !== undefined) {
-    throw new Error("Specify at most one of every or cron");
+    throw new PaseoToolInputError("Specify at most one of every or cron");
   }
   if (timeZone !== undefined && cron === undefined) {
-    throw new Error("timezone can only be used with cron");
+    throw new PaseoToolInputError("timezone can only be used with cron");
   }
   if (every !== undefined) {
     // COMPAT(scheduleEveryInput): accept the old hidden field and canonicalize it before write.
     // Added in v0.2.0; remove after 2027-01-17.
-    const everyMs = parseDurationString(every);
+    const everyMs = parseDurationString(parseToolArguments(scheduleDurationInputSchema, every));
     const expression = everyMsToFiveFieldCron(everyMs);
     if (expression) {
       return { type: "cron", expression };
     }
-    throw new Error(`${every} cannot be represented faithfully by five-field cron`);
+    throw new PaseoToolInputError(`${every} cannot be represented faithfully by five-field cron`);
   }
   if (cron !== undefined) {
     return {
@@ -471,7 +533,7 @@ function resolveScheduleUpdateCadence(input: ScheduleUpdateToolInput): ScheduleC
 
 function resolveScheduleUpdateExpiresAt(input: ScheduleUpdateToolInput): string | null | undefined {
   if (input.expiresIn !== undefined && input.clearExpires) {
-    throw new Error("Specify at most one of expiresIn or clearExpires");
+    throw new PaseoToolInputError("Specify at most one of expiresIn or clearExpires");
   }
   if (input.expiresIn !== undefined) {
     return new Date(Date.now() + parseDurationString(input.expiresIn)).toISOString();
@@ -593,7 +655,11 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       typeof (inputSchema as { safeParseAsync?: unknown }).safeParseAsync === "function"
         ? (inputSchema as z.ZodType)
         : z.object(inputSchema as z.ZodRawShape).passthrough();
-    return schema.parseAsync(input);
+    const result = await schema.safeParseAsync(input);
+    if (!result.success) {
+      throw new PaseoToolInputError(result.error.message, result.error.issues);
+    }
+    return result.data;
   };
 
   const tools = new Map<string, PaseoToolDefinition>();
@@ -627,7 +693,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     ): Promise<PaseoToolResult> {
       const tool = tools.get(name);
       if (!tool) {
-        throw new Error(`Paseo tool not found: ${name}`);
+        throw new PaseoToolInputError(`Paseo tool not found: ${name}`);
       }
       return tool.handler(await parseToolInput(tool, input), context);
     },
@@ -639,7 +705,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
   }): ScheduleCadence => {
     const expression = input.cron?.trim() ?? "";
     if (!expression) {
-      throw new Error("cron is required");
+      throw new PaseoToolInputError("cron is required");
     }
     const timezone = normalizeScheduleTimeZoneArg(input.timezone);
     return {
@@ -661,7 +727,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     }
     const parentAgent = agentManager.getAgent(callerAgentId);
     if (!parentAgent) {
-      throw new Error(`Parent agent ${callerAgentId} not found`);
+      throw new PaseoToolInputError(`Parent agent ${callerAgentId} not found`);
     }
     return parentAgent;
   };
@@ -690,9 +756,9 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     const trimmedCwd = requestedCwd?.trim();
     if (!trimmedCwd) {
       if (opts?.required) {
-        throw new Error("cwd is required");
+        throw new PaseoToolInputError("cwd is required");
       }
-      throw new Error("cwd is required outside an agent-scoped session");
+      throw new PaseoToolInputError("cwd is required outside an agent-scoped session");
     }
 
     return expandUserPath(trimmedCwd);
@@ -707,11 +773,12 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     }
 
     if (!options.ensureWorkspaceForCreate) {
-      throw new Error(
-        callerAgentId
-          ? `Caller agent ${callerAgentId} has no workspace and workspace minting is not configured`
-          : "workspaceId is required outside an agent-scoped session",
-      );
+      if (callerAgentId) {
+        throw new Error(
+          `Caller agent ${callerAgentId} has no workspace and workspace minting is not configured`,
+        );
+      }
+      throw new PaseoToolInputError("workspaceId is required outside an agent-scoped session");
     }
 
     return options.ensureWorkspaceForCreate(resolvedCwd);
@@ -726,11 +793,11 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     if (callerAgentId) {
       const callerAgent = resolveCallerAgent();
       if (!callerAgent?.workspaceId) {
-        throw new Error(`Caller agent ${callerAgentId} has no current workspace`);
+        throw new PaseoToolInputError(`Caller agent ${callerAgentId} has no current workspace`);
       }
       return callerAgent.workspaceId;
     }
-    throw new Error("workspaceId is required outside an agent-scoped session");
+    throw new PaseoToolInputError("workspaceId is required outside an agent-scoped session");
   }
 
   const buildCallerAgentScheduleConfigExtras = (
@@ -800,7 +867,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     }
 
     if (!params?.provider?.trim()) {
-      throw new Error("provider is required when target is new-agent");
+      throw new PaseoToolInputError("provider is required when target is new-agent");
     }
 
     const resolvedProviderModel = resolveScheduleProviderAndModel({
@@ -822,22 +889,41 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     if (!scheduleService) {
       throw new Error("Schedule service is not configured");
     }
-    const schedule = await scheduleService.inspect(id);
+    let schedule: Awaited<ReturnType<ScheduleService["inspect"]>>;
+    try {
+      schedule = await scheduleService.inspect(id);
+    } catch (error) {
+      if (error instanceof ScheduleNotFoundError) {
+        throw new PaseoToolInputError(error.message);
+      }
+      throw error;
+    }
     if (schedule.target.type !== type) {
-      throw new Error(
+      throw new PaseoToolInputError(
         type === "agent" ? `Heartbeat not found: ${id}` : `Schedule not found: ${id}`,
       );
     }
     return schedule;
   }
 
+  async function runScheduleAction<T>(action: () => Promise<T>): Promise<T> {
+    try {
+      return await action();
+    } catch (error) {
+      if (error instanceof ScheduleStateConflictError) {
+        throw new PaseoToolInputError(error.message);
+      }
+      throw error;
+    }
+  }
+
   async function requireCallerHeartbeat(id: string) {
     if (!callerAgentId) {
-      throw new Error("Heartbeat operations require an agent-scoped session");
+      throw new PaseoToolInputError("Heartbeat operations require an agent-scoped session");
     }
     const schedule = await requireScheduleTarget(id, "agent");
     if (schedule.target.type !== "agent" || schedule.target.agentId !== callerAgentId) {
-      throw new Error(`Heartbeat ${id} does not belong to caller ${callerAgentId}`);
+      throw new PaseoToolInputError(`Heartbeat ${id} does not belong to caller ${callerAgentId}`);
     }
     return schedule;
   }
@@ -847,6 +933,9 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     })
     .refine(
       (value) => {
+        if (!value.includes("/")) {
+          return true;
+        }
         try {
           resolveRequiredProviderModel(value);
           return true;
@@ -1184,11 +1273,13 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       },
       async (args, context) => {
         if (!callerAgentId) {
-          throw new Error("speak is only available to agent-scoped tool sessions");
+          throw new PaseoToolInputError("speak is only available to agent-scoped tool sessions");
         }
         const handler = resolveSpeakHandler?.(callerAgentId) ?? null;
         if (!handler) {
-          throw new Error(`No speak handler registered for your session '${callerAgentId}'`);
+          throw new PaseoToolInputError(
+            `No speak handler registered for your session '${callerAgentId}'`,
+          );
         }
         await handler({
           text: args.text,
@@ -1289,7 +1380,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       if (isolation === "local") {
         const cwd = resolveScopedCwd(path, { required: true });
         if (!(await isExistingDirectory(cwd))) {
-          throw new Error(`Directory not found: ${cwd}`);
+          throw new PaseoToolInputError(`Directory not found: ${cwd}`);
         }
         assertOptionsAbsent(
           [
@@ -1534,7 +1625,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       if (hasLegacyCreateAgentPlacement(args)) {
         // COMPAT(nestedCreateAgentPlacement): accept the old relationship/workspace shape without
         // advertising it to models. Added in v0.2.0; remove after 2027-01-17.
-        const parsed = legacyAgentToAgentCreateAgentArgsSchema.parse(args);
+        const parsed = parseToolArguments(legacyAgentToAgentCreateAgentArgsSchema, args);
         const { cwd, workspaceId, worktree } = await resolveCreateAgentWorkspace(parsed.workspace, {
           prompt: parsed.initialPrompt,
         });
@@ -1547,7 +1638,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
           worktree,
         };
       }
-      const parsed = agentToAgentCreateAgentArgsSchema.parse(args);
+      const parsed = parseToolArguments(agentToAgentCreateAgentArgsSchema, args);
       const { cwd, workspaceId } = await resolveCanonicalCreateAgentWorkspace(parsed.workspaceId, {
         prompt: parsed.initialPrompt,
       });
@@ -1563,13 +1654,15 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     if (hasLegacyCreateAgentPlacement(args)) {
       // COMPAT(nestedCreateAgentPlacement): see the agent-scoped branch above.
       const parsedArgs = normalizeTopLevelCreateAgentArgs(
-        legacyTopLevelCreateAgentArgsSchema.parse(args),
+        parseToolArguments(legacyTopLevelCreateAgentArgsSchema, args),
       );
       if (parsedArgs.relationship?.kind === "subagent") {
-        throw new Error("relationship subagent requires an agent-scoped tool session");
+        throw new PaseoToolInputError(
+          "relationship subagent requires an agent-scoped tool session",
+        );
       }
       if (!parsedArgs.workspace) {
-        throw new Error("Legacy create_agent placement could not be resolved");
+        throw new PaseoToolInputError("Legacy create_agent placement could not be resolved");
       }
       const { cwd, workspaceId, worktree } = await resolveCreateAgentWorkspace(
         parsedArgs.workspace,
@@ -1584,7 +1677,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         worktree,
       };
     }
-    const parsedArgs = canonicalTopLevelCreateAgentArgsSchema.parse(args);
+    const parsedArgs = parseToolArguments(canonicalTopLevelCreateAgentArgsSchema, args);
     const { cwd, workspaceId } = await resolveCanonicalCreateAgentWorkspace(
       parsedArgs.workspaceId,
       { prompt: parsedArgs.initialPrompt },
@@ -1644,7 +1737,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     }
     const caller = resolveCallerAgent();
     if (!caller?.workspaceId) {
-      throw new Error(`Caller agent ${callerAgentId} has no current workspace`);
+      throw new PaseoToolInputError(`Caller agent ${callerAgentId} has no current workspace`);
     }
     return { cwd: undefined, workspaceId: caller.workspaceId };
   }
@@ -1672,18 +1765,18 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     };
 
     if (canonicalCandidate.relationship && canonicalCandidate.workspace) {
-      return legacyTopLevelCreateAgentArgsSchema.parse({
+      return parseToolArguments(legacyTopLevelCreateAgentArgsSchema, {
         ...canonicalCandidate,
         ...(Object.keys(settings).length > 0 ? { settings } : {}),
       });
     }
 
     if (canonicalCandidate.relationship || canonicalCandidate.workspace) {
-      throw new Error("relationship and workspace must be provided together");
+      throw new PaseoToolInputError("relationship and workspace must be provided together");
     }
 
     if (!cwd?.trim()) {
-      throw new Error("cwd is required for legacy top-level create_agent calls");
+      throw new PaseoToolInputError("cwd is required for legacy top-level create_agent calls");
     }
 
     const legacyWorktreeTarget = resolveLegacyCreateAgentWorktreeTarget({
@@ -1710,7 +1803,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
           },
         };
 
-    return legacyTopLevelCreateAgentArgsSchema.parse({
+    return parseToolArguments(legacyTopLevelCreateAgentArgsSchema, {
       ...canonicalCandidate,
       relationship: { kind: "detached" },
       workspace,
@@ -1763,11 +1856,11 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
   }> {
     if (workspace.kind === "current") {
       if (!callerAgentId) {
-        throw new Error("workspace current requires an agent-scoped tool session");
+        throw new PaseoToolInputError("workspace current requires an agent-scoped tool session");
       }
       const callerAgent = resolveCallerAgent();
       if (!callerAgent?.workspaceId) {
-        throw new Error(`Caller agent ${callerAgentId} has no current workspace`);
+        throw new PaseoToolInputError(`Caller agent ${callerAgentId} has no current workspace`);
       }
       return {
         cwd: workspace.cwd,
@@ -1784,14 +1877,16 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         (candidate) => candidate.workspaceId === workspace.workspaceId,
       );
       if (!existingWorkspace) {
-        throw new Error(`Workspace ${workspace.workspaceId} not found`);
+        throw new PaseoToolInputError(`Workspace ${workspace.workspaceId} not found`);
       }
       const cwd = workspace.cwd
         ? resolveScopedCwd(workspace.cwd, { required: true })
         : existingWorkspace.cwd;
       const lockedCwd = callerContext?.lockedCwd?.trim();
       if (lockedCwd && !isSameOrDescendantPath(expandUserPath(lockedCwd), cwd)) {
-        throw new Error(`Workspace ${workspace.workspaceId} is outside the allowed cwd`);
+        throw new PaseoToolInputError(
+          `Workspace ${workspace.workspaceId} is outside the allowed cwd`,
+        );
       }
       return {
         cwd,
@@ -1893,6 +1988,9 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         logger: childLogger,
       }).catch((error) => {
         stopNotification?.();
+        if (error instanceof AgentNotFoundError) {
+          throw new PaseoToolInputError(error.message);
+        }
         throw error;
       });
 
@@ -1956,7 +2054,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
 
       const record = await agentStorage.get(agentId);
       if (!record || record.internal) {
-        throw new Error(`Agent ${agentId} not found`);
+        throw new PaseoToolInputError(`Agent ${agentId} not found`);
       }
 
       const structuredSnapshot = buildStoredAgentPayload(
@@ -2194,10 +2292,10 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       const workspaceId = resolveWorkspaceIdForRename(requestedWorkspaceId);
       const existing = await options.workspaceRegistry.get(workspaceId);
       if (!existing) {
-        throw new Error(`Workspace ${workspaceId} not found`);
+        throw new PaseoToolInputError(`Workspace ${workspaceId} not found`);
       }
       if (existing.archivedAt) {
-        throw new Error(`Workspace ${workspaceId} is archived`);
+        throw new PaseoToolInputError(`Workspace ${workspaceId} is archived`);
       }
 
       await options.workspaceRegistry.upsert({
@@ -2401,7 +2499,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
 
       const terminal = terminalManager.getTerminal(terminalId);
       if (!terminal) {
-        throw new Error(`Terminal ${terminalId} not found`);
+        throw new PaseoToolInputError(`Terminal ${terminalId} not found`);
       }
 
       terminal.kill();
@@ -2437,7 +2535,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       }
 
       if (!terminalManager.getTerminal(terminalId)) {
-        throw new Error(`Terminal ${terminalId} not found`);
+        throw new PaseoToolInputError(`Terminal ${terminalId} not found`);
       }
 
       const capture = await terminalManager.captureTerminal(terminalId, {
@@ -2478,7 +2576,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
 
       const terminal = terminalManager.getTerminal(terminalId);
       if (!terminal) {
-        throw new Error(`Terminal ${terminalId} not found`);
+        throw new PaseoToolInputError(`Terminal ${terminalId} not found`);
       }
 
       terminal.send({
@@ -2498,24 +2596,26 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     {
       title: "Create schedule",
       description: "Create a recurring schedule that starts a new agent on a cron cadence.",
-      inputSchema: {
-        prompt: z.string().trim().min(1, "prompt is required"),
-        cron: z.string().trim().min(1, "cron is required"),
-        timezone: z
-          .string()
-          .trim()
-          .min(1)
-          .optional()
-          .describe("IANA time zone for the cron cadence. For example: America/New_York."),
-        name: z.string().optional(),
-        provider: (callerAgentId ? AgentProviderEnum.optional() : AgentProviderEnum).describe(
-          "Provider, or provider/model (for example: codex or codex/gpt-5.4). Defaults to the caller's provider in an agent-scoped session.",
-        ),
-        cwd: z.string().optional(),
-        isolation: z.enum(["local", "worktree"]).optional(),
-        maxRuns: z.number().int().positive().optional(),
-        expiresIn: z.string().optional(),
-      },
+      inputSchema: z
+        .object({
+          prompt: z.string().trim().min(1, "prompt is required"),
+          cron: z.string().trim().min(1, "cron is required"),
+          timezone: z
+            .string()
+            .trim()
+            .min(1)
+            .optional()
+            .describe("IANA time zone for the cron cadence. For example: America/New_York."),
+          name: z.string().optional(),
+          provider: (callerAgentId ? AgentProviderEnum.optional() : AgentProviderEnum).describe(
+            "Provider, or provider/model (for example: codex or codex/gpt-5.4). Defaults to the caller's provider in an agent-scoped session.",
+          ),
+          cwd: z.string().optional(),
+          isolation: z.enum(["local", "worktree"]).optional(),
+          maxRuns: z.number().int().positive().optional(),
+          expiresIn: scheduleDurationInputSchema.optional(),
+        })
+        .superRefine(addScheduleCadenceIssue),
       outputSchema: ScheduleSummarySchema.shape,
     },
     async ({ prompt, cron, timezone, name, provider, cwd, isolation, maxRuns, expiresIn }) => {
@@ -2548,19 +2648,21 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     {
       title: "Create heartbeat",
       description: "Create a recurring heartbeat that sends you a prompt on a cron cadence.",
-      inputSchema: {
-        prompt: z.string().trim().min(1, "prompt is required"),
-        cron: z.string().trim().min(1, "cron is required"),
-        timezone: z
-          .string()
-          .trim()
-          .min(1)
-          .optional()
-          .describe("IANA time zone for the cron cadence. For example: America/New_York."),
-        name: z.string().optional(),
-        maxRuns: z.number().int().positive().optional(),
-        expiresIn: z.string().optional(),
-      },
+      inputSchema: z
+        .object({
+          prompt: z.string().trim().min(1, "prompt is required"),
+          cron: z.string().trim().min(1, "cron is required"),
+          timezone: z
+            .string()
+            .trim()
+            .min(1)
+            .optional()
+            .describe("IANA time zone for the cron cadence. For example: America/New_York."),
+          name: z.string().optional(),
+          maxRuns: z.number().int().positive().optional(),
+          expiresIn: scheduleDurationInputSchema.optional(),
+        })
+        .superRefine(addScheduleCadenceIssue),
       outputSchema: ScheduleSummarySchema.shape,
     },
     async ({ prompt, cron, timezone, name, maxRuns, expiresIn }) => {
@@ -2568,7 +2670,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         throw new Error("Schedule service is not configured");
       }
       if (!callerAgentId) {
-        throw new Error("create_heartbeat requires an agent-scoped session");
+        throw new PaseoToolInputError("create_heartbeat requires an agent-scoped session");
       }
       resolveCallerAgent();
 
@@ -2679,7 +2781,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       }
 
       await requireScheduleTarget(id, "new-agent");
-      await scheduleService.pause(id);
+      await runScheduleAction(() => scheduleService.pause(id));
       return {
         content: [],
         structuredContent: ensureValidJson({ success: true }),
@@ -2705,7 +2807,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       }
 
       await requireScheduleTarget(id, "new-agent");
-      await scheduleService.resume(id);
+      await runScheduleAction(() => scheduleService.resume(id));
       return {
         content: [],
         structuredContent: ensureValidJson({ success: true }),
@@ -2787,13 +2889,13 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
             .optional()
             .describe("New mode for new-agent target (null to clear)."),
           cwd: z.string().trim().min(1).optional().describe("New cwd for new-agent target."),
-          expiresIn: z
-            .string()
+          expiresIn: scheduleDurationInputSchema
             .optional()
             .describe("New relative expiry duration (for example: 1h, 2d)."),
           clearExpires: z.boolean().optional().describe("Clear any schedule expiry."),
         })
-        .passthrough(),
+        .passthrough()
+        .superRefine(addScheduleCadenceIssue),
       outputSchema: StoredScheduleSchema.shape,
     },
     async (input) => {
@@ -2850,7 +2952,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         throw new Error("Schedule service is not configured");
       }
       await requireScheduleTarget(id, "new-agent");
-      const schedule = await scheduleService.runOnce(id);
+      const schedule = await runScheduleAction(() => scheduleService.runOnce(id));
       return {
         content: [],
         structuredContent: ensureValidJson(schedule),
@@ -2963,10 +3065,10 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       });
       const summary = toProviderSummary(entry);
       if (!entry.enabled) {
-        throw new Error(`Provider '${providerId}' is disabled`);
+        throw new PaseoToolInputError(`Provider '${providerId}' is disabled`);
       }
       if (entry.status !== "ready") {
-        throw new Error(entry.error ?? `Provider '${providerId}' is unavailable`);
+        throw new PaseoToolInputError(entry.error ?? `Provider '${providerId}' is unavailable`);
       }
       const selectedModel = settings?.model ?? resolvedProviderModel.model;
       const features = await agentManager.listDraftFeatures({
diff --git a/packages/server/src/server/agent/tools/types.ts b/packages/server/src/server/agent/tools/types.ts
index 66a4a23da2..f82ad7549a 100644
--- a/packages/server/src/server/agent/tools/types.ts
+++ b/packages/server/src/server/agent/tools/types.ts
@@ -1,6 +1,18 @@
 import type { z } from "zod";
 import type { ProviderPaseoToolsPolicy } from "@getpaseo/protocol/provider-config";
 
+export class PaseoToolInputError extends Error {
+  readonly status = 400;
+
+  constructor(
+    message: string,
+    readonly issues?: z.ZodError["issues"],
+  ) {
+    super(message);
+    this.name = "PaseoToolInputError";
+  }
+}
+
 export interface PaseoToolExecutionContext {
   signal?: AbortSignal;
   sendUpdate?: (update: PaseoToolResult) => void;
diff --git a/packages/server/src/server/schedule/service.ts b/packages/server/src/server/schedule/service.ts
index 7b5487c3f8..3b462cc5b1 100644
--- a/packages/server/src/server/schedule/service.ts
+++ b/packages/server/src/server/schedule/service.ts
@@ -38,6 +38,20 @@ export class ScheduleTargetGoneError extends Error {
   }
 }
 
+export class ScheduleNotFoundError extends Error {
+  constructor(id: string) {
+    super(`Schedule not found: ${id}`);
+    this.name = "ScheduleNotFoundError";
+  }
+}
+
+export class ScheduleStateConflictError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "ScheduleStateConflictError";
+  }
+}
+
 function advanceNextRunAtPast(
   cadence: StoredSchedule["cadence"],
   nextRunAt: Date,
@@ -158,7 +172,7 @@ function shouldCompleteSchedule(schedule: StoredSchedule, now: Date): boolean {
 
 function requireSchedule(schedule: StoredSchedule | null, id: string): StoredSchedule {
   if (!schedule) {
-    throw new Error(`Schedule not found: ${id}`);
+    throw new ScheduleNotFoundError(id);
   }
   return schedule;
 }
@@ -392,10 +406,7 @@ export class ScheduleService {
 
   async inspect(id: string): Promise<StoredSchedule> {
     const schedule = await this.store.get(id);
-    if (!schedule) {
-      throw new Error(`Schedule not found: ${id}`);
-    }
-    return schedule;
+    return requireSchedule(schedule, id);
   }
 
   async logs(id: string): Promise<ScheduleRun[]> {
@@ -406,7 +417,7 @@ export class ScheduleService {
   async pause(id: string): Promise<StoredSchedule> {
     const paused = await this.store.update(id, (schedule) => {
       if (schedule.status === "completed") {
-        throw new Error(`Schedule ${id} is already completed`);
+        throw new ScheduleStateConflictError(`Schedule ${id} is already completed`);
       }
       if (schedule.status === "paused") {
         return schedule;
@@ -426,7 +437,7 @@ export class ScheduleService {
   async resume(id: string): Promise<StoredSchedule> {
     const resumed = await this.store.update(id, (schedule) => {
       if (schedule.status === "completed") {
-        throw new Error(`Schedule ${id} is already completed`);
+        throw new ScheduleStateConflictError(`Schedule ${id} is already completed`);
       }
       if (schedule.status === "active") {
         return schedule;
@@ -546,10 +557,10 @@ export class ScheduleService {
   async runOnce(id: string): Promise<StoredSchedule> {
     const schedule = await this.inspect(id);
     if (schedule.status === "completed") {
-      throw new Error(`Schedule ${id} is already completed`);
+      throw new ScheduleStateConflictError(`Schedule ${id} is already completed`);
     }
     if (this.runningScheduleIds.has(id)) {
-      throw new Error(`Schedule ${id} is already running`);
+      throw new ScheduleStateConflictError(`Schedule ${id} is already running`);
     }
     await this.runSchedule(schedule, this.now(), { manual: true });
     return this.inspect(id);

From fa70b215a80fc0b3fe59e1dcff8e286ace020be1 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 09:53:28 +0200
Subject: [PATCH 230/270] Open chat folder links in Files with their contents
 visible (#7205)

* fix(app): open folders from inline path links in the file explorer

Clicking a folder path in an assistant message opened a file tab that
failed with "Requested path is not a file". Extension-less
workspace-relative paths without a line number are now probed with a
directory listing before opening: directories open the Files explorer
navigated to that folder, everything else opens as a file like before.
Lexical directories (trailing slash, workspace root) now navigate the
explorer to the folder instead of only preloading its listing.

* fix(app): reveal linked folders and their contents

Resolve workspace folder links from directory metadata and expand their ancestor paths in Files. Preserve file and line-reference opening, including extensionless files.

Co-authored-by: Moy <moyfoxther@gmail.com>

* fix(app): cancel stale path opens and reveal hidden folders

Keep pending directory checks inside the path-opening model so a later click or navigation supersedes them. Explicitly revealing a hidden directory also enables the existing hidden-file visibility preference.

---------

Co-authored-by: Moy <moyfoxther@gmail.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/e2e/browser/folder-links.spec.ts |  45 +++++++
 packages/app/src/agent-stream/view.tsx        | 110 ++++++++----------
 .../app/src/assistant-file-links/index.ts     |   2 +
 .../assistant-file-links/path-open.test.ts    | 104 +++++++++++++++++
 .../app/src/assistant-file-links/path-open.ts |  74 ++++++++++++
 packages/app/src/file-explorer/tree.ts        |  23 +++-
 .../src/hooks/use-file-explorer-actions.ts    |  24 ++++
 7 files changed, 319 insertions(+), 63 deletions(-)
 create mode 100644 packages/app/e2e/browser/folder-links.spec.ts
 create mode 100644 packages/app/src/assistant-file-links/path-open.test.ts
 create mode 100644 packages/app/src/assistant-file-links/path-open.ts

diff --git a/packages/app/e2e/browser/folder-links.spec.ts b/packages/app/e2e/browser/folder-links.spec.ts
new file mode 100644
index 0000000000..7e1bfac1ae
--- /dev/null
+++ b/packages/app/e2e/browser/folder-links.spec.ts
@@ -0,0 +1,45 @@
+import { mkdir, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { expect, test, type Page } from "../support/fixtures";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+
+async function openReportedFolderLink(page: Page, name: string) {
+  const link = page.getByTestId("assistant-message").getByRole("link", { name, exact: true });
+  await link.click();
+}
+
+async function expectFolderContents(page: Page) {
+  await expect(page.getByText("Requested path is not a file", { exact: true })).toHaveCount(0);
+  await expect(page.getByTestId("file-explorer-tree-scroll")).toBeVisible();
+  await expect(
+    page.getByTestId("file-explorer-tree-scroll").getByText("guide.md", { exact: true }),
+  ).toBeVisible();
+}
+
+for (const folder of ["docs/guides", "docs/guides/", "docs/reports.v1", ".github/workflows"]) {
+  test(`chat folder link opens folder contents: ${folder}`, async ({ page }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "folder-link-repro-",
+      title: "Folder link reproduction",
+      initialPrompt: "Show the folder link",
+      featureValues: { mockAssistantResponse: `[Open folder](./${folder})` },
+    });
+    try {
+      await mkdir(path.join(session.cwd, folder), { recursive: true });
+      await writeFile(path.join(session.cwd, folder, "guide.md"), "# Folder link destination\n");
+      await session.client.waitForFinish(session.agentId, 30_000);
+      await page.addInitScript(() => {
+        localStorage.setItem(
+          "panel-state",
+          JSON.stringify({ state: { explorerShowHiddenFiles: false }, version: 0 }),
+        );
+      });
+      await openAgentRoute(page, session);
+      await openReportedFolderLink(page, "Open folder");
+      await expectFolderContents(page);
+    } finally {
+      await page.screenshot({ path: test.info().outputPath("folder-link-result.png") });
+      await session.cleanup();
+    }
+  });
+}
diff --git a/packages/app/src/agent-stream/view.tsx b/packages/app/src/agent-stream/view.tsx
index 09b02cda18..c9b44ed679 100644
--- a/packages/app/src/agent-stream/view.tsx
+++ b/packages/app/src/agent-stream/view.tsx
@@ -87,13 +87,10 @@ import {
 } from "./bottom-anchor-controller";
 import { createAssistantImageOccurrenceKey } from "@/assistant-image/acquisition-cache";
 import { AssistantSelectionCopySurface } from "@/assistant-selection-copy/surface";
-import {
-  AssistantFileLinkResolverProvider,
-  normalizeInlinePathTarget,
-} from "@/assistant-file-links";
+import { AssistantFileLinkResolverProvider, createInlinePathOpener } from "@/assistant-file-links";
 import {
   createWorkspaceFileTabTarget,
-  normalizeWorkspaceFileLocation,
+  type WorkspaceFileLocation,
   type OpenFileDisposition,
   type WorkspaceFileOpenRequest,
 } from "@/workspace/file-open";
@@ -387,7 +384,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     );
 
     const workspaceRoot = context.cwd?.trim() || "";
-    const { requestDirectoryListing } = useFileExplorerActions({
+    const { revealDirectory } = useFileExplorerActions({
       serverId: resolvedServerId,
       workspaceId: context.workspaceId,
       workspaceRoot,
@@ -426,63 +423,53 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       setExpandedToolCallGroupIds(new Set());
     }, [agentId]);
 
+    const isActive = useRetainedPanelActive();
+    const openInlineFile = useStableEvent(
+      (location: WorkspaceFileLocation, disposition: OpenFileDisposition) => {
+        if (onOpenWorkspaceFile) {
+          onOpenWorkspaceFile({ location, disposition });
+        } else if (context.workspaceId) {
+          navigateToWorkspace({
+            serverId: resolvedServerId,
+            workspaceId: context.workspaceId,
+            target: createWorkspaceFileTabTarget(location),
+          });
+        }
+      },
+    );
+    const openInlineDirectory = useStableEvent((directoryPath: string) => {
+      void revealDirectory(directoryPath);
+      openExplorerSidebarView({
+        isCompact: isMobile,
+        workspaceKey: buildWorkspaceTabPersistenceKey({
+          serverId: resolvedServerId,
+          workspaceId: context.workspaceId ?? "",
+        }),
+        checkout: {
+          serverId: resolvedServerId,
+          cwd: context.cwd,
+          isGit: context.projectPlacement?.checkout?.isGit ?? true,
+        },
+        view: "files",
+      });
+    });
+    const inlinePathOpener = useMemo(
+      () =>
+        createInlinePathOpener({
+          workspaceRoot,
+          client,
+          openFile: openInlineFile,
+          openDirectory: openInlineDirectory,
+        }),
+      [workspaceRoot, client, openInlineFile, openInlineDirectory],
+    );
+    useEffect(() => {
+      if (!isActive) inlinePathOpener.cancel();
+      return () => inlinePathOpener.cancel();
+    }, [inlinePathOpener, isActive, agentId]);
     const handleInlinePathPress = useStableEvent(
       (target: InlinePathTarget, disposition: OpenFileDisposition) => {
-        if (!target.path) {
-          return;
-        }
-
-        const normalized = normalizeInlinePathTarget(target.path, context.cwd);
-        if (!normalized) {
-          return;
-        }
-
-        if (normalized.file) {
-          const location = normalizeWorkspaceFileLocation({
-            path: normalized.file,
-            lineStart: target.lineStart,
-            lineEnd: target.lineEnd,
-          });
-          if (!location) {
-            return;
-          }
-
-          if (onOpenWorkspaceFile) {
-            onOpenWorkspaceFile({
-              location,
-              disposition,
-            });
-            return;
-          }
-
-          if (context.workspaceId) {
-            navigateToWorkspace({
-              serverId: resolvedServerId,
-              workspaceId: context.workspaceId,
-              target: createWorkspaceFileTabTarget(location),
-            });
-          }
-          return;
-        }
-
-        void requestDirectoryListing(normalized.directory, {
-          recordHistory: false,
-          setCurrentPath: false,
-        });
-
-        openExplorerSidebarView({
-          isCompact: isMobile,
-          workspaceKey: buildWorkspaceTabPersistenceKey({
-            serverId: resolvedServerId,
-            workspaceId: context.workspaceId ?? "",
-          }),
-          checkout: {
-            serverId: resolvedServerId,
-            cwd: context.cwd,
-            isGit: context.projectPlacement?.checkout?.isGit ?? true,
-          },
-          view: "files",
-        });
+        if (isActive) void inlinePathOpener.open(target, disposition);
       },
     );
 
@@ -519,7 +506,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     // cell-window and turn-lifecycle renders from background agents.
     // When isActive flips back to true, the context change triggers a re-render and
     // the component reads the current (fresh) streamItems/streamHead from props.
-    const isActive = useRetainedPanelActive();
     const effectiveStreamItems = useRetainedValue(streamItems, isActive);
     const effectiveStreamHead = useRetainedValue(streamHead, isActive);
     const effectiveTurnPresentation = useRetainedValue(turnPresentation, isActive);
diff --git a/packages/app/src/assistant-file-links/index.ts b/packages/app/src/assistant-file-links/index.ts
index 169afc38b0..9b66e99c18 100644
--- a/packages/app/src/assistant-file-links/index.ts
+++ b/packages/app/src/assistant-file-links/index.ts
@@ -10,3 +10,5 @@ export {
 } from "./provider";
 export type { AssistantFileLinkSource } from "./resolver";
 export { useAssistantFileLinkActions, useFileLink } from "./use-file-link";
+
+export { createInlinePathOpener } from "./path-open";
diff --git a/packages/app/src/assistant-file-links/path-open.test.ts b/packages/app/src/assistant-file-links/path-open.test.ts
new file mode 100644
index 0000000000..a046a598f6
--- /dev/null
+++ b/packages/app/src/assistant-file-links/path-open.test.ts
@@ -0,0 +1,104 @@
+import { mkdtemp, mkdir, readdir, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { afterEach, expect, it } from "vitest";
+import { resolveInlinePathOpen } from "./path-open";
+
+const roots: string[] = [];
+afterEach(async () => {
+  await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })));
+});
+
+it("distinguishes dotted and extensionless folders from files using the filesystem", async () => {
+  const workspaceRoot = await mkdtemp(path.join(tmpdir(), "folder-link-"));
+  roots.push(workspaceRoot);
+  await mkdir(path.join(workspaceRoot, "docs/guides"), { recursive: true });
+  await mkdir(path.join(workspaceRoot, "docs/reports.v1"));
+  await writeFile(path.join(workspaceRoot, "Makefile"), "all:\n");
+  await writeFile(path.join(workspaceRoot, "README.md"), "# Readme\n");
+  const client = {
+    listDirectory: (root: string, file: string) => readdir(path.resolve(root, file)),
+  };
+  for (const file of ["docs/guides", "docs/reports.v1"]) {
+    await expect(
+      resolveInlinePathOpen({ file, directory: "docs", workspaceRoot, client }),
+    ).resolves.toEqual({ kind: "directory", directoryPath: file });
+  }
+  for (const file of ["Makefile", "README.md", "missing.md"]) {
+    await expect(
+      resolveInlinePathOpen({ file, directory: ".", workspaceRoot, client }),
+    ).resolves.toEqual({ kind: "file" });
+  }
+});
+
+it("preserves explicit directory destinations and file line references", async () => {
+  const workspaceRoot = "/repo";
+  await expect(
+    resolveInlinePathOpen({ directory: "docs/guides", workspaceRoot, client: null }),
+  ).resolves.toEqual({ kind: "directory", directoryPath: "docs/guides" });
+  await expect(
+    resolveInlinePathOpen({
+      file: "docs/guides",
+      directory: "docs",
+      lineStart: 12,
+      workspaceRoot,
+      client: null,
+    }),
+  ).resolves.toEqual({ kind: "file" });
+});
+
+it("keeps unavailable probes and external paths on the existing file-open path", async () => {
+  for (const file of ["Makefile", "/external/folder", "C:/external/folder"]) {
+    await expect(
+      resolveInlinePathOpen({ file, directory: ".", workspaceRoot: "/repo", client: null }),
+    ).resolves.toEqual({ kind: "file" });
+  }
+});
+
+it("ignores an older probe after a newer file link opens", async () => {
+  const { createInlinePathOpener } = await import("./path-open");
+  let rejectProbe!: (error: Error) => void;
+  const pendingProbe = new Promise<never>((_, reject) => {
+    rejectProbe = reject;
+  });
+  const opened: string[] = [];
+  const opener = createInlinePathOpener({
+    workspaceRoot: "/repo",
+    client: { listDirectory: () => pendingProbe },
+    openFile: (location) => {
+      opened.push(location.path);
+    },
+    openDirectory: (directory) => {
+      opened.push(directory);
+    },
+  });
+  const first = opener.open({ raw: "./first.md", path: "/repo/first.md" }, "preferred");
+  await opener.open({ raw: "./second.md:2", path: "/repo/second.md", lineStart: 2 }, "preferred");
+  rejectProbe(new Error("Not a directory"));
+  await first;
+  expect(opened).toEqual(["second.md"]);
+});
+
+it("ignores a pending probe when its view is left", async () => {
+  const { createInlinePathOpener } = await import("./path-open");
+  let resolveProbe!: (value: unknown) => void;
+  const pendingProbe = new Promise((resolve) => {
+    resolveProbe = resolve;
+  });
+  const opened: string[] = [];
+  const opener = createInlinePathOpener({
+    workspaceRoot: "/repo",
+    client: { listDirectory: () => pendingProbe },
+    openFile: (location) => {
+      opened.push(location.path);
+    },
+    openDirectory: (directory) => {
+      opened.push(directory);
+    },
+  });
+  const pending = opener.open({ raw: "./docs", path: "/repo/docs" }, "preferred");
+  opener.cancel();
+  resolveProbe({});
+  await pending;
+  expect(opened).toEqual([]);
+});
diff --git a/packages/app/src/assistant-file-links/path-open.ts b/packages/app/src/assistant-file-links/path-open.ts
new file mode 100644
index 0000000000..b3d2178165
--- /dev/null
+++ b/packages/app/src/assistant-file-links/path-open.ts
@@ -0,0 +1,74 @@
+import { normalizeInlinePathTarget, type InlinePathTarget } from "./parse";
+import {
+  normalizeWorkspaceFileLocation,
+  type WorkspaceFileLocation,
+  type OpenFileDisposition,
+} from "@/workspace/file-open";
+import { isAbsolutePath } from "@/utils/path";
+
+interface PathOpenInput {
+  file?: string;
+  directory: string;
+  lineStart?: number;
+  workspaceRoot: string;
+  client: { listDirectory(root: string, path: string): Promise<unknown> } | null;
+}
+
+type PathOpenTarget = { kind: "file" } | { kind: "directory"; directoryPath: string };
+
+/** Resolve workspace folders from filesystem facts, including names that contain dots. */
+export async function resolveInlinePathOpen(input: PathOpenInput): Promise<PathOpenTarget> {
+  if (!input.file) {
+    return { kind: "directory", directoryPath: input.directory };
+  }
+  if (
+    input.lineStart !== undefined ||
+    isAbsolutePath(input.file) ||
+    !input.workspaceRoot.trim() ||
+    !input.client
+  ) {
+    return { kind: "file" };
+  }
+  try {
+    await input.client.listDirectory(input.workspaceRoot, input.file);
+  } catch {
+    return { kind: "file" };
+  }
+  return { kind: "directory", directoryPath: input.file };
+}
+
+export function createInlinePathOpener(input: {
+  workspaceRoot: string;
+  client: PathOpenInput["client"];
+  openFile: (location: WorkspaceFileLocation, disposition: OpenFileDisposition) => void;
+  openDirectory: (path: string) => void;
+}) {
+  let generation = 0;
+  return {
+    async open(target: InlinePathTarget, disposition: OpenFileDisposition) {
+      const ownGeneration = ++generation;
+      const normalized = normalizeInlinePathTarget(target.path, input.workspaceRoot);
+      if (!normalized) return;
+      const destination = await resolveInlinePathOpen({
+        ...normalized,
+        lineStart: target.lineStart,
+        workspaceRoot: input.workspaceRoot,
+        client: input.client,
+      });
+      if (ownGeneration !== generation) return;
+      if (destination.kind === "directory") {
+        input.openDirectory(destination.directoryPath);
+      } else if (normalized.file) {
+        const location = normalizeWorkspaceFileLocation({
+          path: normalized.file,
+          lineStart: target.lineStart,
+          lineEnd: target.lineEnd,
+        });
+        if (location) input.openFile(location, disposition);
+      }
+    },
+    cancel() {
+      generation += 1;
+    },
+  };
+}
diff --git a/packages/app/src/file-explorer/tree.ts b/packages/app/src/file-explorer/tree.ts
index 472c3d7075..8b75ae7b25 100644
--- a/packages/app/src/file-explorer/tree.ts
+++ b/packages/app/src/file-explorer/tree.ts
@@ -1,6 +1,6 @@
 import type { ExplorerDirectory, ExplorerEntry } from "@/stores/session-store";
 import type { SortOption } from "@/stores/panel-store/state";
-import { filterVisibleExplorerEntries } from "./visibility";
+import { filterVisibleExplorerEntries, isHiddenExplorerPath } from "./visibility";
 
 export const MAX_AUTO_EXPANDED_DIRECTORY_DEPTH = 5;
 
@@ -201,3 +201,24 @@ function sortExplorerEntries(entries: ExplorerEntry[], sortOption: SortOption):
   });
   return sorted;
 }
+
+/** Load and expand the path to a directory selected outside the tree. */
+export async function revealExplorerDirectory(input: {
+  directoryPath: string;
+  requestDirectoryListing: (path: string) => Promise<ExplorerDirectory | null>;
+  expandPaths: (paths: string[]) => void;
+  showHiddenFiles: () => void;
+}): Promise<void> {
+  if (isHiddenExplorerPath(input.directoryPath)) input.showHiddenFiles();
+  const paths = ["."];
+  if (input.directoryPath !== ".") {
+    const segments = input.directoryPath.split("/").filter(Boolean);
+    for (let length = 1; length <= segments.length; length += 1) {
+      paths.push(segments.slice(0, length).join("/"));
+    }
+  }
+  for (const path of paths) {
+    if (!(await input.requestDirectoryListing(path))) return;
+  }
+  input.expandPaths(paths);
+}
diff --git a/packages/app/src/hooks/use-file-explorer-actions.ts b/packages/app/src/hooks/use-file-explorer-actions.ts
index c29feb5241..ca3c99649b 100644
--- a/packages/app/src/hooks/use-file-explorer-actions.ts
+++ b/packages/app/src/hooks/use-file-explorer-actions.ts
@@ -6,6 +6,8 @@ import {
   type ExplorerDirectory,
 } from "@/stores/session-store";
 import { explorerFileFromReadResult } from "@/file-explorer/read-result";
+import { usePanelStore } from "@/stores/panel-store";
+import { revealExplorerDirectory } from "@/file-explorer/tree";
 import { parentExplorerPath } from "@/utils/explorer-paths";
 
 function createExplorerState(): AgentFileExplorerState {
@@ -172,6 +174,27 @@ export function useFileExplorerActions(params: { serverId: string } & FileExplor
     [client, normalizedWorkspaceRoot, t, updateExplorerState, workspaceStateKey],
   );
 
+  const revealDirectory = useCallback(
+    async (directoryPath: string) => {
+      if (!workspaceStateKey) return;
+      await revealExplorerDirectory({
+        directoryPath,
+        requestDirectoryListing,
+        showHiddenFiles: () => {
+          const panel = usePanelStore.getState();
+          if (!panel.explorerShowHiddenFiles) panel.toggleExplorerShowHiddenFiles();
+        },
+        expandPaths: (paths) =>
+          usePanelStore
+            .getState()
+            .setExpandedPathsForWorkspace(workspaceStateKey, (current) =>
+              Array.from(new Set([...current, ...paths])),
+            ),
+      });
+    },
+    [requestDirectoryListing, workspaceStateKey],
+  );
+
   const requestFilePreview = useCallback(
     async (path: string) => {
       if (!workspaceStateKey) {
@@ -354,6 +377,7 @@ export function useFileExplorerActions(params: { serverId: string } & FileExplor
 
   return {
     workspaceStateKey,
+    revealDirectory,
     requestDirectoryListing,
     requestFilePreview,
     requestFileDownloadToken,

From 74c8172f8b0ebdb10292b17b549e076fa5b03f2f Mon Sep 17 00:00:00 2001
From: HelloThereEveryone <49528864+Mtuchel@users.noreply.github.com>
Date: Sat, 17 Oct 2026 10:57:10 +0200
Subject: [PATCH 231/270] Wait for a plugin reload to finish instead of failing
 at the request deadline (#6306)

* Wait for plugin reload completion instead of the request deadline

The daemon answers plugin.reload.request only once the plugin is running
again or has failed, and a reload queues behind other plugin lifecycle
work such as an install with a preparation command. The shared client
applied its sixty-second session RPC deadline to that request, so a slow
reload failed with "Timeout waiting for message" while the daemon kept
loading the plugin, inviting a reload the daemon was still running.

Reload now waits for the daemon's own answer. Enable and disable keep the
session deadline, and a real startup failure still reaches the caller.

* Cover a slow plugin reload end to end

The CLI fixture now holds its own git build on a gate file, starts a
reload of an installed plugin behind that queued install, observes the
reload request at the proxy, keeps the gate closed past the client's
former one-minute deadline, and then asserts the reload's real result:
CLI exit 0, the plugin running, and exactly one reactivation. Listing the
plugin during the wait stays readable and does not restart it. A plugin
that cannot start still fails its reload with the daemon's error.

The request proxy that recorded install sources becomes a small observer
that records any session request, so the wait is measured from the
request boundary rather than from process start.

Verified: npx tsx packages/cli/tests/e2e/plugin-lifecycle.test.ts exits 0
in 135 s; the same fixture without the new scenario takes 66 s.

* Document how a reload reports its result

The CLI docs now say `paseo plugin reload` waits for the daemon to stop
and start the plugin, that cancelling the command or losing the
connection does not stop the daemon's work, and that `plugin ls` shows
the previous state until the reload finishes.

The plugin reference records the lifecycle fact behind it: a reload
queues behind the daemon's other plugin work, the daemon answers when
the plugin is running again or has failed, and status reads, Settings and
the logs are not the reload's outcome.

* Cover the Settings reload wait end to end

Adds a browser scenario for the ticket's user-facing half: with a gated
git install holding the daemon's plugin lifecycle queue, the row's Reload
goes out, the test keeps the gate closed past sixty seconds, asserts the
row stays pending with no error feedback, then releases the build and
asserts the daemon's plugin.reload.response and the app's "Reloaded
e2e-plugin" result.

The scenario turns plugins on through the daemon instead of the global
switch, whose transient "Plugins enabled" confirmation is not its
subject. The wait is measured from the reload request frame, which is an
outbound frame, not from the response stream.

Verified: npx playwright test --project=browser
e2e/browser/plugin-management.spec.ts -g "keeps Reload pending past a
minute" -> 1 passed (1.5m); plugin-reload-pending.png,
plugin-reload-past-deadline.png and plugin-reload-completed.png show the
pending row, the surface past the former deadline with no error, and the
finished reload.

* Correct the status guidance for a cancelled reload

Review finding: the note said a listing keeps the plugin's previous
state until the reload finishes, but that only holds while the reload is
still queued. Once it executes, the daemon removes the plugin from the
runtime catalog before stopping it (plugins/runtime.ts:377-382) and
resolvePluginStatus maps an enabled plugin that is not running to
"failed" (plugins/index.ts:71-78), so a listing read in that window
shows failed for a healthy reload.

Both passages now separate the two windows and say that neither a
listing nor the logs report the outcome of the outstanding reload.
The interim "failed" itself is TUC-1401.

* Harden the reload coverage against failures and lost connections

Review findings folded into the tests:

The Settings scenario releases its gated build in a finally block. Before
this, a failing assertion left the build polling forever, the daemon's
plugin lifecycle queue stayed blocked, and the fixture teardown's own
removePlugin timed out behind it. It also asserts the row's actions are
enabled again once the reload settles, next to the result feedback.

The connection-close regression now reconnects and asserts nothing
resends the lost reload; the no-replay invariant already covered for
legacy requests now holds for a pending reload too.

Verified: npx vitest run packages/client/src/daemon-client.test.ts -> 161
passed. npx playwright test --project=browser
e2e/browser/plugin-management.spec.ts -g "keeps Reload pending past a
minute" -> 1 passed (1.4m).

* Let the gated build finish before its files go

Review finding on packages/cli/tests/e2e/plugin-lifecycle.test.ts:450:
the finally block released the gate and deleted the gate directory
without waiting for the install and the reload it had started. The build
polls for the gate file, so cleanup could delete the release before the
child saw it and leave the build waiting until daemon shutdown.

The fixture now keeps both promises, releases the gate, and awaits them
before deleting their files.

Verified: npx tsx packages/cli/tests/e2e/plugin-lifecycle.test.ts -> exit
0, 161 s.

* Read the reload scenario as intent, not transport code

Review finding: the new browser scenario kept frame parsing, selectors,
polling, deadline arithmetic, screenshots and gate cleanup in one body.
docs/testing.md asks for complex setup in reusable helpers.

The wire observation, the gated queue hold, the row-state assertions, the
deadline wait and the surface captures are helpers now, and the body
reads as the flow: open Settings, hold the queue, reload, still pending
past the deadline, release, read the daemon's result.

Verified: npx playwright test --project=browser
e2e/browser/plugin-management.spec.ts -g "keeps Reload pending past a
minute" -> 1 passed (1.4m).

* Keep the reload lifecycle fact in one document

Review finding: the cli.md paragraph repeated the queue and interim-state
explanation that the plugin reference already owns. CLAUDE.md: "One fact,
one doc. Every other mention is a link."

The reference keeps the full explanation; the CLI page states what the
command does and links there.

* Release the gated build when its setup fails

Review finding: holdPluginLifecycleQueue started the install, then
waited up to 30 seconds for the build's started marker. A preparation
that took longer made the helper throw before it returned its cleanup
handle and before the test entered its try block, so nothing wrote the
release file: the build polled forever, the daemon's plugin lifecycle
queue stayed blocked, and the fixture's own removePlugin timed out
behind it.

The helper now owns that failure path: it releases the gate and drains
the install before rethrowing, so a queue it hands out is always
settleable.

Verified on Linux (Chromium, Playwright):
- With the started marker suppressed in a temporary local patch, the run
  fails at the 30-second marker wait inside the helper and the teardown
  still completes (both attempts ~33 seconds, no removePlugin request
  timeout).
- With the marker in place, the scenario passes: 1 passed (1.4m).

* Keep an early install failure out of the unhandled path

Review finding: the marker wait in holdPluginLifecycleQueue ran before
the install promise had a rejection handler, so a preparation that failed
or a connection that closed before the build wrote its marker surfaced as
an unhandled rejection, which fails the run before the helper's own catch
can drain the queue.

The helper attaches a handler the moment the install starts and races the
marker wait against the install, so an early failure reaches the caller
as the daemon's own error, a build that never writes its marker still
fails as a 30-second marker timeout, and every path releases the gate and
drains the install.

Verified on Linux (Chromium, Playwright), patching the build command
locally for each failure branch:
- Early failure (build exits 1): fails in 4.2 s with the daemon's
  DaemonRpcError for plugin.source.install.request, no unhandled
  rejection, teardown completes.
- No marker (build waits for the gate): fails at the 30-second marker
  wait, no unhandled rejection, teardown completes with no removePlugin
  request timeout.
- Unpatched: 1 passed (1.5m).

* Keep a failed launch from ending the run before its cleanup
---
 .../app/e2e/browser/plugin-management.spec.ts | 194 ++++++++++++
 .../cli/tests/e2e/plugin-lifecycle.test.ts    | 283 ++++++++++++++++--
 packages/client/src/daemon-client.test.ts     | 194 ++++++++++++
 packages/client/src/daemon-client.ts          |   4 +
 public-docs/cli.md                            |   7 +
 public-docs/plugins/reference.md              |   6 +
 6 files changed, 655 insertions(+), 33 deletions(-)

diff --git a/packages/app/e2e/browser/plugin-management.spec.ts b/packages/app/e2e/browser/plugin-management.spec.ts
index 84b4cc63a2..4a866a8f44 100644
--- a/packages/app/e2e/browser/plugin-management.spec.ts
+++ b/packages/app/e2e/browser/plugin-management.spec.ts
@@ -1,3 +1,4 @@
+import { existsSync } from "node:fs";
 import overviewCorpus from "../../../protocol/tests/fixtures/plugin-overview.json";
 import { pluginRequirements } from "../support/helpers/plugin-fixture";
 import { execFileSync } from "node:child_process";
@@ -316,6 +317,47 @@ export default function contribute(plugin) {
   return directory;
 }
 
+/** Build command that holds the plugin lifecycle queue until the test writes the release file. */
+const gatedBuildCommand = [
+  'const fs = require("node:fs");',
+  'fs.writeFileSync(process.argv[1], "started");',
+  "const wait = () => {",
+  "  if (fs.existsSync(process.argv[2])) return;",
+  "  setTimeout(wait, 50);",
+  "};",
+  "wait();",
+].join("\n");
+
+async function createGatedBuildRepository(
+  root: string,
+  gate: { started: string; release: string },
+): Promise<string> {
+  const repository = path.join(root, "gated-repository");
+  await mkdir(repository);
+  await writeFile(
+    path.join(repository, "paseo-plugin.json"),
+    JSON.stringify({
+      id: "gated-build-plugin",
+      description: "Holds the plugin lifecycle queue while its build waits",
+      requirements: pluginRequirements,
+      build: [[process.execPath, "-e", gatedBuildCommand, gate.started, gate.release]],
+    }),
+  );
+  await writeFile(path.join(repository, "index.client.tsx"), pluginSource("Gated build plugin"));
+  execFileSync("git", ["init", "-b", "main"], { cwd: repository, stdio: "ignore" });
+  execFileSync("git", ["config", "user.name", "Paseo Tests"], {
+    cwd: repository,
+    stdio: "ignore",
+  });
+  execFileSync("git", ["config", "user.email", "paseo@example.test"], {
+    cwd: repository,
+    stdio: "ignore",
+  });
+  execFileSync("git", ["add", "-A"], { cwd: repository, stdio: "ignore" });
+  execFileSync("git", ["commit", "-m", "initial"], { cwd: repository, stdio: "ignore" });
+  return repository;
+}
+
 async function installFailedPlugin(
   page: Page,
   client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>,
@@ -680,3 +722,155 @@ async function installPluginWithUntrustedDescription(
   );
   await environment.client.installPluginSource({ source: directory });
 }
+
+/** Waits for the reload request and the daemon's answer on the wire, so a scenario can measure it. */
+function observePluginReload(page: Page) {
+  const requests: number[] = [];
+  const responses: number[] = [];
+  const isSessionMessage = (payload: unknown, type: string): boolean => {
+    if (typeof payload !== "string") return false;
+    try {
+      const envelope = JSON.parse(payload) as { type?: unknown; message?: { type?: unknown } };
+      const message = envelope.type === "session" ? envelope.message : envelope;
+      return message?.type === type;
+    } catch {
+      return false;
+    }
+  };
+  page.on("websocket", (socket) => {
+    // The reload request travels client -> daemon (outbound); the answer comes back inbound.
+    socket.on("framesent", ({ payload }) => {
+      if (isSessionMessage(payload, "plugin.reload.request")) requests.push(Date.now());
+    });
+    socket.on("framereceived", ({ payload }) => {
+      if (isSessionMessage(payload, "plugin.reload.response")) responses.push(Date.now());
+    });
+  });
+  return {
+    waitForRequest: () => expect.poll(() => requests.length, { timeout: 30_000 }).toBe(1),
+    waitForResponse: () => expect.poll(() => responses.length, { timeout: 120_000 }).toBe(1),
+    requestedAt: () => requests[0]!,
+    requestCount: () => requests.length,
+  };
+}
+
+/** Starts a gated git install that holds the daemon's plugin lifecycle queue until it is released. */
+async function holdPluginLifecycleQueue(
+  client: PluginEnvironment["client"],
+  root: string,
+): Promise<{ release: () => Promise<void>; settle: () => Promise<void> }> {
+  const gate = {
+    started: path.join(root, "build-started"),
+    release: path.join(root, "build-release"),
+  };
+  const repository = await createGatedBuildRepository(root, gate);
+  const install = client.installPluginSource({ source: `git:${pathToFileURL(repository).href}` });
+  // The marker wait below can outlive an early failure: a refused preparation, a dropped
+  // connection, or a build command that exits before writing its marker. Handle that rejection now
+  // so it never surfaces as an unhandled one, and drain the same promise in finish().
+  const installDrained = install.catch(() => undefined);
+  // Every path releases the gate and drains the install: a build still polling for its gate holds
+  // the daemon's plugin lifecycle queue open, and the fixture's own plugin removal would stall.
+  const finish = async () => {
+    await writeFile(gate.release, "go").catch(() => undefined);
+    await installDrained;
+  };
+  try {
+    // Whichever comes first decides the scenario: the build reports that it started, or the setup
+    // fails with the daemon's own error instead of a bare marker timeout.
+    await Promise.race([
+      expect.poll(() => existsSync(gate.started), { timeout: 30_000 }).toBe(true),
+      install,
+    ]);
+  } catch (error) {
+    // Setup that never reached the build must not hand the caller a queue it cannot settle.
+    await finish();
+    throw error;
+  }
+  return {
+    release: () => writeFile(gate.release, "go"),
+    settle: finish,
+  };
+}
+
+function pluginRowActions(page: Page, pluginId: string) {
+  return page.getByRole("button", { name: `Actions for ${pluginId}`, exact: true });
+}
+
+async function expectPluginRowPending(page: Page, pluginId: string): Promise<void> {
+  await expect(pluginRowActions(page, pluginId)).toBeDisabled();
+}
+
+async function expectPluginRowSettled(page: Page, pluginId: string): Promise<void> {
+  await expect(pluginRowActions(page, pluginId)).toBeEnabled();
+  await expect(page.getByLabel(`${pluginId} running`)).toBeVisible();
+}
+
+async function capturePluginSurface(page: Page, testInfo: TestInfo, name: string): Promise<void> {
+  await page.screenshot({
+    path: testInfo.outputPath(name),
+    fullPage: true,
+    animations: "disabled",
+  });
+}
+
+/** The wait under test is the daemon's lifecycle queue, so the scenario has to spend real time. */
+async function waitPastFormerReloadDeadline(page: Page, requestedAt: number): Promise<void> {
+  const remaining = 66_000 - (Date.now() - requestedAt);
+  if (remaining > 0) await page.waitForTimeout(remaining);
+}
+
+test("keeps Reload pending past a minute while the plugin queue is busy", async ({
+  page,
+  pluginEnvironment,
+}, testInfo) => {
+  test.setTimeout(180_000);
+  const { client, directory } = pluginEnvironment;
+  const pluginDirectory = await createDirectoryPlugin(
+    directory,
+    "e2e-plugin",
+    "Exercises the complete local plugin lifecycle",
+    "Plugin v1",
+  );
+
+  // Observe before the app loads: its daemon socket comes up with the page.
+  const reload = observePluginReload(page);
+  await gotoAppShell(page);
+  await openPluginSettings(page);
+  // Plugins on is a precondition here, not the subject: set it through the daemon instead of the
+  // switch, whose transient "Plugins enabled" confirmation this scenario must not depend on.
+  await client.patchDaemonConfig({ pluginsEnabled: true });
+  await client.installPluginSource({ source: pluginDirectory });
+  await expectPluginRowSettled(page, "e2e-plugin");
+
+  const queue = await holdPluginLifecycleQueue(client, directory);
+  try {
+    await selectPluginAction(page, "e2e-plugin", "Reload");
+    await reload.waitForRequest();
+    // Pending: the row's actions stay disabled, so a second reload cannot be submitted.
+    await expectPluginRowPending(page, "e2e-plugin");
+    await capturePluginSurface(page, testInfo, "plugin-reload-pending.png");
+
+    await waitPastFormerReloadDeadline(page, reload.requestedAt());
+
+    // Past the former deadline the reload is still pending, the row shows its previous state, and
+    // no timeout error reached the surface.
+    await expectPluginRowPending(page, "e2e-plugin");
+    await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
+    await expect(page.getByTestId("plugin-management-feedback")).toHaveCount(0);
+    await capturePluginSurface(page, testInfo, "plugin-reload-past-deadline.png");
+
+    await queue.release();
+    // The daemon's answer only arrives once the plugin really started again; a request timeout
+    // would have shown up as feedback during the wait above.
+    await reload.waitForResponse();
+    expect(reload.requestCount()).toBe(1);
+    await expect(page.getByTestId("plugin-management-feedback")).toContainText(
+      "Reloaded e2e-plugin",
+    );
+    await expectPluginRowSettled(page, "e2e-plugin");
+    await capturePluginSurface(page, testInfo, "plugin-reload-completed.png");
+  } finally {
+    await queue.settle();
+  }
+});
diff --git a/packages/cli/tests/e2e/plugin-lifecycle.test.ts b/packages/cli/tests/e2e/plugin-lifecycle.test.ts
index 3e71b6b608..ee5b525c12 100644
--- a/packages/cli/tests/e2e/plugin-lifecycle.test.ts
+++ b/packages/cli/tests/e2e/plugin-lifecycle.test.ts
@@ -29,6 +29,116 @@ async function git(cwd: string, args: string[]): Promise<void> {
   await execFileAsync("git", args, { cwd });
 }
 
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function waitFor(
+  condition: () => Promise<boolean>,
+  description: string,
+  timeoutMs = 60_000,
+): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (await condition()) return;
+    await sleep(50);
+  }
+  throw new Error(`Timed out waiting for ${description}`);
+}
+
+interface ObservedRequest {
+  type: string;
+  message: Record<string, unknown>;
+  observedAt: number;
+}
+
+/**
+ * Observes real CLI requests while forwarding them to the isolated daemon.
+ *
+ * Requests are recorded where the CLI sends them, so a scenario can measure a wait from the
+ * request boundary instead of from process start.
+ */
+async function startRequestObserver(upstreamPort: number): Promise<{
+  port: number;
+  requests: ObservedRequest[];
+  waitForRequest: (type: string) => Promise<number>;
+  close: () => Promise<void>;
+}> {
+  const server = new WebSocketServer({ host: "127.0.0.1", port: 0 });
+  const requests: ObservedRequest[] = [];
+  server.on("connection", (socket, request) => {
+    const upstream = new WebSocket(`ws://127.0.0.1:${upstreamPort}${request.url}`, {
+      headers: { authorization: request.headers.authorization ?? "" },
+    });
+    const ready = once(upstream, "open");
+    socket.on("message", async (data, isBinary) => {
+      const frame = JSON.parse(data.toString()) as {
+        type?: string;
+        message?: { type?: string } & Record<string, unknown>;
+      };
+      if (frame.type === "session" && typeof frame.message?.type === "string") {
+        requests.push({
+          type: frame.message.type,
+          message: frame.message,
+          observedAt: Date.now(),
+        });
+      }
+      await ready;
+      upstream.send(data, { binary: isBinary });
+    });
+    upstream.on("message", (data, isBinary) => socket.send(data, { binary: isBinary }));
+    socket.on("close", () => upstream.close());
+    upstream.on("close", () => socket.close());
+  });
+  await once(server, "listening");
+  const address = server.address();
+  assert.ok(address && typeof address !== "string");
+  return {
+    port: address.port,
+    requests,
+    waitForRequest: async (type: string) => {
+      await waitFor(
+        async () => requests.some((entry) => entry.type === type),
+        `${type} to reach the daemon`,
+      );
+      return requests.find((entry) => entry.type === type)!.observedAt;
+    },
+    close: async () => {
+      for (const socket of server.clients) socket.close();
+      await promisify(server.close.bind(server))();
+    },
+  };
+}
+
+/** Build command that blocks the plugin lifecycle queue until the test writes the gate file. */
+const gateWaitBuild = [
+  'const fs = require("node:fs");',
+  'fs.writeFileSync(process.argv[1], "started");',
+  "const wait = () => {",
+  "  if (fs.existsSync(process.argv[2])) return;",
+  "  setTimeout(wait, 50);",
+  "};",
+  "wait();",
+].join("\n");
+
+/** Plugin whose every activation appends one line, so a test can count real reactivations. */
+function activationCountingPlugin(logPath: string): string {
+  return [
+    'import { appendFileSync } from "node:fs";',
+    `const activationLog = ${JSON.stringify(logPath)};`,
+    "export default function contribute(plugin: unknown) {",
+    '  appendFileSync(activationLog, "activate\\n");',
+    "  void plugin;",
+    "  return () => undefined;",
+    "}",
+  ].join("\n");
+}
+
+async function countActivations(logPath: string): Promise<number> {
+  const content = await readFile(logPath, "utf8").catch(() => "");
+  return content.split("\n").filter(Boolean).length;
+}
+
 async function main(): Promise<void> {
   const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-cli-e2e-"));
   const gitDirectory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-git-cli-e2e-"));
@@ -48,31 +158,11 @@ async function main(): Promise<void> {
     await writeFile(path.join(directory, "index.server.ts"), pluginSource);
 
     // Observe real CLI requests while forwarding them to the isolated daemon.
-    const proxy = new WebSocketServer({ host: "127.0.0.1", port: 0 });
-    const sources: string[] = [];
-    proxy.on("connection", (socket, request) => {
-      const upstream = new WebSocket(`ws://127.0.0.1:${context.port}${request.url}`, {
-        headers: { authorization: request.headers.authorization ?? "" },
-      });
-      const ready = once(upstream, "open");
-      socket.on("message", async (data, isBinary) => {
-        const message = JSON.parse(data.toString());
-        if (
-          message.type === "session" &&
-          message.message.type === "plugin.source.install.request"
-        ) {
-          sources.push(message.message.source);
-        }
-        await ready;
-        upstream.send(data, { binary: isBinary });
-      });
-      upstream.on("message", (data, isBinary) => socket.send(data, { binary: isBinary }));
-      socket.on("close", () => upstream.close());
-      upstream.on("close", () => socket.close());
-    });
-    await once(proxy, "listening");
-    const address = proxy.address();
-    assert.ok(address && typeof address !== "string");
+    const observer = await startRequestObserver(context.port);
+    const installedSources = () =>
+      observer.requests
+        .filter((entry) => entry.type === "plugin.source.install.request")
+        .map((entry) => entry.message.source);
     const sibling = path.join(context.workDir, "x");
     const caller = path.join(context.workDir, "caller");
     await mkdir(caller);
@@ -96,12 +186,12 @@ async function main(): Promise<void> {
         ["~", context.paseoHome, context.paseoHome, []],
         ["~/.:.", `${context.paseoHome}:.`, context.paseoHome, []],
       ] as const) {
-        sources.length = 0;
+        observer.requests.length = 0;
         const result = await context.paseo(
-          ["plugin", "add", source, ...extraArgs, "--host", `127.0.0.1:${address.port}`, "--json"],
+          ["plugin", "add", source, ...extraArgs, "--host", `127.0.0.1:${observer.port}`, "--json"],
           { cwd: caller },
         );
-        assert.deepEqual(sources, [expectedSource]);
+        assert.deepEqual(installedSources(), [expectedSource]);
         assert.equal(result.exitCode, 0, result.stderr);
         assert.equal(JSON.parse(result.stdout).path, expectedDirectory);
         const removed = await context.paseo(["plugin", "remove", "relative-cli", "--json"]);
@@ -109,17 +199,16 @@ async function main(): Promise<void> {
       }
       // An absolute path belongs to the daemon's platform, which can differ from the CLI's.
       const windowsSource = `C:\\${path.basename(context.workDir)}\\missing:sub`;
-      sources.length = 0;
+      observer.requests.length = 0;
       const missing = await context.paseo(
-        ["plugin", "add", windowsSource, "--host", `127.0.0.1:${address.port}`, "--json"],
+        ["plugin", "add", windowsSource, "--host", `127.0.0.1:${observer.port}`, "--json"],
         { cwd: caller },
       );
-      assert.deepEqual(sources, [windowsSource]);
+      assert.deepEqual(installedSources(), [windowsSource]);
       assert.equal(missing.exitCode, 1);
       assert.match(missing.stderr, /Plugin directory does not exist/);
     } finally {
-      for (const socket of proxy.clients) socket.close();
-      await promisify(proxy.close.bind(proxy))();
+      await observer.close();
     }
 
     const install = await context.paseo(["plugin", "install", directory, "--json"]);
@@ -242,6 +331,134 @@ async function main(): Promise<void> {
     assert.equal(enable.exitCode, 0, enable.stderr);
     assert.equal(JSON.parse(enable.stdout).status, "running");
 
+    // A reload that finishes after the client's former one-minute deadline must still report its
+    // real result. The wait is the daemon's own lifecycle queue, so it runs on real wall-clock time.
+    const gateDirectory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-reload-e2e-"));
+    const buildStarted = path.join(gateDirectory, "build-started");
+    const buildGate = path.join(gateDirectory, "build-gate");
+    const activationLog = path.join(gateDirectory, "activations.log");
+    const targetDirectory = path.join(gateDirectory, "slow-reload-target");
+    const slowRepository = path.join(gateDirectory, "slow-build");
+    const reloadObserver = await startRequestObserver(context.port);
+    let slowInstall: ReturnType<typeof context.paseo> | undefined;
+    let slowReload: ReturnType<typeof context.paseo> | undefined;
+    try {
+      await mkdir(targetDirectory);
+      await writeFile(
+        path.join(targetDirectory, "paseo-plugin.json"),
+        JSON.stringify({
+          id: "slow-reload-target",
+          requirements: { paseo: `>=${resolveCliVersion()}` },
+        }),
+      );
+      await writeFile(
+        path.join(targetDirectory, "index.server.ts"),
+        activationCountingPlugin(activationLog),
+      );
+      const targetInstall = await context.paseo(["plugin", "install", targetDirectory, "--json"]);
+      assert.equal(targetInstall.exitCode, 0, targetInstall.stderr);
+      assert.equal(await countActivations(activationLog), 1);
+
+      await mkdir(slowRepository);
+      await git(slowRepository, ["init", "-b", "main"]);
+      await git(slowRepository, ["config", "user.name", "Paseo Tests"]);
+      await git(slowRepository, ["config", "user.email", "paseo@example.test"]);
+      await writeFile(
+        path.join(slowRepository, "paseo-plugin.json"),
+        JSON.stringify({
+          id: "slow-build",
+          requirements: { paseo: `>=${resolveCliVersion()}` },
+          build: [[process.execPath, "-e", gateWaitBuild, buildStarted, buildGate]],
+        }),
+      );
+      await writeFile(path.join(slowRepository, "index.server.ts"), pluginSource);
+      await git(slowRepository, ["add", "-A"]);
+      await git(slowRepository, ["commit", "-m", "blocking build"]);
+
+      // This install holds the plugin lifecycle queue while its build waits for the gate.
+      slowInstall = context.paseo(
+        ["plugin", "add", `git:${pathToFileURL(slowRepository).href}`, "--json"],
+        { timeout: 180_000 },
+      );
+      // A failed launch must not arrive as an unhandled rejection: that ends this direct Node run
+      // before the finally block below releases the build gate. Its result is still asserted.
+      void slowInstall.catch(() => undefined);
+      await waitFor(
+        async () =>
+          readFile(buildStarted, "utf8").then(
+            () => true,
+            () => false,
+          ),
+        "the blocking build to start",
+      );
+
+      slowReload = context.paseo(
+        [
+          "plugin",
+          "reload",
+          "slow-reload-target",
+          "--host",
+          `127.0.0.1:${reloadObserver.port}`,
+          "--json",
+        ],
+        { timeout: 180_000 },
+      );
+      // Same as the install above: a launch failure must not end the run before the cleanup.
+      void slowReload.catch(() => undefined);
+      const reloadRequestedAt = await reloadObserver.waitForRequest("plugin.reload.request");
+
+      // The interim listing is not the reload's outcome: it still reports the plugin running and
+      // no restart has happened while the reload waits behind the queue.
+      const duringReload = await context.paseo(["plugin", "ls", "slow-reload-target", "--json"]);
+      assert.equal(duringReload.exitCode, 0, duringReload.stderr);
+      assert.equal(JSON.parse(duringReload.stdout)[0].status, "running");
+      assert.equal(await countActivations(activationLog), 1);
+
+      const heldMs = Date.now() - reloadRequestedAt;
+      if (heldMs < 66_000) {
+        await sleep(66_000 - heldMs);
+      }
+      await writeFile(buildGate, "go");
+
+      const [buildResult, reloadResult] = await Promise.all([slowInstall, slowReload]);
+      assert.equal(buildResult.exitCode, 0, buildResult.stderr);
+      assert.equal(reloadResult.exitCode, 0, reloadResult.stderr);
+      assert.equal(JSON.parse(reloadResult.stdout).status, "running");
+      assert.equal(await countActivations(activationLog), 2);
+
+      // A plugin that cannot start still fails its reload with the daemon's error.
+      const brokenDirectory = path.join(gateDirectory, "broken-plugin");
+      await mkdir(brokenDirectory);
+      await writeFile(
+        path.join(brokenDirectory, "paseo-plugin.json"),
+        JSON.stringify({
+          id: "broken-reload",
+          requirements: { paseo: `>=${resolveCliVersion()}` },
+        }),
+      );
+      await writeFile(path.join(brokenDirectory, "index.server.ts"), "export default broken !!!");
+      const brokenInstall = await context.paseo(["plugin", "install", brokenDirectory, "--json"]);
+      assert.equal(brokenInstall.exitCode, 1);
+      assert.match(brokenInstall.stderr, /broken-reload|broken|failed/i);
+      const brokenReload = await context.paseo(["plugin", "reload", "broken-reload", "--json"], {
+        timeout: 60_000,
+      });
+      assert.equal(brokenReload.exitCode, 1);
+      assert.match(brokenReload.stderr, /broken-reload|broken|failed/i);
+
+      for (const pluginId of ["slow-reload-target", "slow-build", "broken-reload"]) {
+        const removed = await context.paseo(["plugin", "remove", pluginId, "--json"]);
+        assert.equal(removed.exitCode, 0, removed.stderr);
+      }
+    } finally {
+      // Release the gate, then let the install and the reload settle before their files go: the
+      // build polls for the gate file, so cleanup must not delete it while the child still waits.
+      await writeFile(buildGate, "go").catch(() => undefined);
+      await Promise.all([slowInstall?.catch(() => undefined), slowReload?.catch(() => undefined)]);
+      await reloadObserver.close();
+      await rm(gateDirectory, { recursive: true, force: true });
+    }
+
     const remove = await context.paseo(["plugin", "remove", "cli-e2e", "--json"]);
     assert.equal(remove.exitCode, 0, remove.stderr);
     const removeGit = await context.paseo(["plugin", "remove", "git-cli-e2e", "--json"]);
diff --git a/packages/client/src/daemon-client.test.ts b/packages/client/src/daemon-client.test.ts
index c02e1720cb..6b82922841 100644
--- a/packages/client/src/daemon-client.test.ts
+++ b/packages/client/src/daemon-client.test.ts
@@ -1963,6 +1963,200 @@ test("gets a structured plugin log snapshot", async () => {
   ]);
 });
 
+test("keeps a plugin reload pending past the session RPC deadline", async () => {
+  useHeartbeatClock();
+  try {
+    const mock = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_unit_test",
+      logger: createMockLogger(),
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+
+    const connectPromise = client.connect();
+    mock.triggerOpen();
+    await connectPromise;
+
+    const reload = client.reloadPlugin("example");
+    let settled: "pending" | "resolved" | "rejected" = "pending";
+    void reload.then(
+      () => {
+        settled = "resolved";
+        return null;
+      },
+      () => {
+        settled = "rejected";
+        return null;
+      },
+    );
+
+    const request = parseSentFrame(mock.sent[0]);
+    expect(request).toEqual({
+      type: "plugin.reload.request",
+      requestId: expect.any(String),
+      pluginId: "example",
+    });
+
+    // A daemon that reloads for almost two minutes is still reloading, not a failed request.
+    await vi.advanceTimersByTimeAsync(114_034);
+    expect(settled).toBe("pending");
+
+    // Another plugin's reload finishing early must not settle this request.
+    mock.triggerMessage(
+      wrapSessionMessage({
+        type: "plugin.reload.response",
+        payload: {
+          requestId: "req-other-plugin",
+          plugin: { id: "other", path: "/plugins/other", enabled: true, status: "running" },
+        },
+      }),
+    );
+    await vi.advanceTimersByTimeAsync(0);
+    expect(settled).toBe("pending");
+
+    mock.triggerMessage(
+      wrapSessionMessage({
+        type: "plugin.reload.response",
+        payload: {
+          requestId: request.requestId,
+          plugin: { id: "example", path: "/plugins/example", enabled: true, status: "running" },
+        },
+      }),
+    );
+
+    await expect(reload).resolves.toEqual({
+      id: "example",
+      path: "/plugins/example",
+      enabled: true,
+      status: "running",
+    });
+  } finally {
+    vi.useRealTimers();
+  }
+});
+
+test("keeps enable and disable inside the session RPC deadline", async () => {
+  useHeartbeatClock();
+  try {
+    for (const action of ["enable", "disable"] as const) {
+      const mock = createMockTransport();
+      const client = new DaemonClient({
+        url: "ws://test",
+        clientId: "clsk_unit_test",
+        logger: createMockLogger(),
+        reconnect: { enabled: false },
+        transportFactory: () => mock.transport,
+      });
+      clients.push(client);
+
+      const connectPromise = client.connect();
+      mock.triggerOpen();
+      await connectPromise;
+
+      const pending =
+        action === "enable" ? client.enablePlugin("example") : client.disablePlugin("example");
+      let settled = false;
+      void pending.then(
+        () => {
+          settled = true;
+          return null;
+        },
+        () => {
+          settled = true;
+          return null;
+        },
+      );
+
+      expect(parseSentFrame(mock.sent[0])).toEqual({
+        type: `plugin.${action}.request`,
+        requestId: expect.any(String),
+        pluginId: "example",
+      });
+
+      await vi.advanceTimersByTimeAsync(59_999);
+      expect(settled).toBe(false);
+
+      await vi.advanceTimersByTimeAsync(1);
+      await expect(pending).rejects.toThrow("Timeout waiting for message (60000ms)");
+    }
+  } finally {
+    vi.useRealTimers();
+  }
+});
+
+test("reports a plugin reload failure that arrives after the session RPC deadline", async () => {
+  useHeartbeatClock();
+  try {
+    const mock = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_unit_test",
+      logger: createMockLogger(),
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+
+    const connectPromise = client.connect();
+    mock.triggerOpen();
+    await connectPromise;
+
+    const reload = client.reloadPlugin("example");
+    const request = parseSentFrame(mock.sent[0]);
+
+    await vi.advanceTimersByTimeAsync(114_034);
+    mock.triggerMessage(
+      wrapSessionMessage({
+        type: "rpc_error",
+        payload: {
+          requestId: request.requestId,
+          requestType: "plugin.reload.request",
+          error: "Request failed: Plugin failed to start: example",
+          code: "handler_error",
+        },
+      }),
+    );
+
+    await expect(reload).rejects.toThrow(
+      "Request failed: Plugin failed to start: example requestType=plugin.reload.request code=handler_error",
+    );
+  } finally {
+    vi.useRealTimers();
+  }
+});
+
+test("rejects a pending plugin reload when the connection closes", async () => {
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger: createMockLogger(),
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+
+  const connectPromise = client.connect();
+  mock.triggerOpen();
+  await connectPromise;
+
+  const reload = client.reloadPlugin("example");
+  expect(parseSentFrame(mock.sent[0])).toMatchObject({ type: "plugin.reload.request" });
+
+  mock.triggerClose({ code: 1006, reason: "network lost" });
+
+  await expect(reload).rejects.toThrow(/network lost|disconnected|closed/i);
+
+  // Reconnecting must not resend the lost reload: only the caller decides to reload again.
+  const reconnecting = client.connect();
+  mock.triggerOpen();
+  await reconnecting;
+  expect(mock.sent).toEqual([]);
+});
+
 test("keeps waitForAgentUpsert initial fetch inside the requested deadline", async () => {
   useHeartbeatClock();
   const logger = createMockLogger();
diff --git a/packages/client/src/daemon-client.ts b/packages/client/src/daemon-client.ts
index 1aa0d3e995..e0e4d9ddc5 100644
--- a/packages/client/src/daemon-client.ts
+++ b/packages/client/src/daemon-client.ts
@@ -5692,6 +5692,10 @@ export class DaemonClient {
       requestId,
       message: { type: `plugin.${action}.request`, requestId, pluginId },
       responseType: `plugin.${action}.response`,
+      // Reload tears the plugin down and starts it again before the daemon answers, and it queues
+      // behind other plugin lifecycle work. Wait for that answer instead of failing the reload at
+      // the request deadline while the daemon keeps loading it.
+      ...(action === "reload" ? { timeout: 0 } : {}),
     });
     return payload.plugin;
   }
diff --git a/public-docs/cli.md b/public-docs/cli.md
index 48f37e89de..c8f3cc0e1a 100644
--- a/public-docs/cli.md
+++ b/public-docs/cli.md
@@ -244,6 +244,13 @@ paseo plugin enable my-plugin
 paseo plugin remove my-plugin
 ```
 
+`paseo plugin reload <id>` reports the result of the reload itself: it waits while the daemon stops
+and starts the plugin, however long that takes, and it queues behind the daemon's other plugin work.
+Cancelling the command or losing the connection does not stop the daemon's work, and no listing or
+log entry settles what a cancelled reload did — the [Plugin reference](/docs/plugins/reference)
+covers those interim states. Running the reload again is what reports the result: it waits behind the
+outstanding one, then stops and starts the plugin once more.
+
 Bare `owner/slug` installs a reviewed registry listing. Use `git:owner/repository` for GitHub
 source, or `./plugin` for a local directory. Append `:<directory>` for a plugin in a monorepo.
 
diff --git a/public-docs/plugins/reference.md b/public-docs/plugins/reference.md
index 525ffe1423..cc8023b251 100644
--- a/public-docs/plugins/reference.md
+++ b/public-docs/plugins/reference.md
@@ -2269,6 +2269,12 @@ remove Command Center items and clear the installation's query state. An already
 remains as unavailable until its matching contribution returns or the user closes it. Panel render
 failures stay inside the plugin error boundary.
 
+Reload queues behind the daemon's other plugin work, such as a running installation or preparation
+command, and the daemon answers when the plugin is running again or has failed. Nothing reads the
+plugin's status as the reload's outcome: while the reload is queued, `plugin ls`, Settings, and the
+logs show the plugin's previous state, and while the daemon stops and starts it, a status read
+reports `failed` because the plugin is absent from the runtime catalog until its start completes.
+
 ## Plugin sources
 
 Paste one of these source identifiers into **Settings → Plugins**, or pass it to

From 1b450e487e8398aa5c58934ed42e6ee174f4b906 Mon Sep 17 00:00:00 2001
From: sulthan zahran <zsulthan9@gmail.com>
Date: Sat, 17 Oct 2026 16:51:24 +0700
Subject: [PATCH 232/270] fix(claude): don't treat a wrapper command's
 --version output as Claude Code's version (#7209)

resolveClaudeCodeVersion() probes <configured command> --version and parsed any output with the generic fallback in parseClaudeCodeVersion. With a wrapper command (e.g. cux), that output is the wrapper's own version, which then failed every minimumClaudeCodeVersion gate and silently hid Opus 5.5, Opus 5, Fable 5, Sonnet 5.5 and Haiku 5.5. Only trust output that identifies itself as Claude Code (x.y.z (Claude Code)); anything else falls into the existing unknown-version path that does not gate models.
---
 .../agent/providers/claude/agent.test.ts      | 30 +++++++++++++++++++
 .../server/agent/providers/claude/agent.ts    |  8 ++++-
 .../agent/providers/claude/models.test.ts     | 27 +++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)

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

From 4a32f958488ad0b2e9187ba75a303dce34b3d494 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 17:20:06 +0700
Subject: [PATCH 233/270] fix(app): soften the compact composer shadow in light
 mode (#7214)

The compact composer used a hardcoded box shadow shared by both themes,
so it read as a heavy band on light backgrounds. It now uses the shared
sm shadow token, whose light value is raised from 0.02 to 0.08 opacity
so the lift stays visible. Dark sm is unchanged.
---
 packages/app/src/composer/input/input.tsx | 2 +-
 packages/app/src/styles/theme.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/composer/input/input.tsx b/packages/app/src/composer/input/input.tsx
index c6c267a38f..9fdab3fa28 100644
--- a/packages/app/src/composer/input/input.tsx
+++ b/packages/app/src/composer/input/input.tsx
@@ -2226,7 +2226,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
   },
   // Lifts the composer off the chat it sits under on phones.
   inputWrapperCompact: {
-    boxShadow: "0px 4px 16px rgba(0, 0, 0, 0.2)",
+    ...theme.shadow.sm,
   },
   // Dotted says "this surface is the same box, but there is nothing to type
   // into it" without swapping the border colour, which reads as an error state.
diff --git a/packages/app/src/styles/theme.ts b/packages/app/src/styles/theme.ts
index 8e1e77aac7..977a382c41 100644
--- a/packages/app/src/styles/theme.ts
+++ b/packages/app/src/styles/theme.ts
@@ -741,7 +741,7 @@ export const darkPureBlackTheme = buildDarkTheme(pureBlackDarkColors);
 
 const lightShadow = {
   sm: {
-    shadowColor: "rgba(0, 0, 0, 0.02)",
+    shadowColor: "rgba(0, 0, 0, 0.08)",
     shadowOffset: { width: 0, height: 2 },
     shadowRadius: 8,
     elevation: 2,

From 06cdc5a0b83a2f2f6875613441a86aaa96e59c15 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 12:55:19 +0200
Subject: [PATCH 234/270] fix(app): open nested Markdown folder links without
 dot prefixes (#7210)

Explicit Markdown hrefs were rejected by the filename heuristic used for inferred text. Let authored nested paths resolve without a recognized extension while preserving inline-code, automatic-link, and domain handling.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/e2e/browser/folder-links.spec.ts | 12 +++++-
 .../app/src/assistant-file-links/parse.ts     | 19 ++++++---
 .../src/assistant-file-links/resolver.test.ts | 42 +++++++++++++++++++
 .../app/src/assistant-file-links/resolver.ts  |  1 +
 4 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/packages/app/e2e/browser/folder-links.spec.ts b/packages/app/e2e/browser/folder-links.spec.ts
index 7e1bfac1ae..8c1339a8c6 100644
--- a/packages/app/e2e/browser/folder-links.spec.ts
+++ b/packages/app/e2e/browser/folder-links.spec.ts
@@ -16,13 +16,21 @@ async function expectFolderContents(page: Page) {
   ).toBeVisible();
 }
 
-for (const folder of ["docs/guides", "docs/guides/", "docs/reports.v1", ".github/workflows"]) {
+for (const folder of [
+  "./docs/guides",
+  "./docs/guides/",
+  "./docs/reports.v1",
+  "./.github/workflows",
+  "docs/guides",
+  "docs/guides/",
+  "docs/指南",
+]) {
   test(`chat folder link opens folder contents: ${folder}`, async ({ page }) => {
     const session = await seedMockAgentWorkspace({
       repoPrefix: "folder-link-repro-",
       title: "Folder link reproduction",
       initialPrompt: "Show the folder link",
-      featureValues: { mockAssistantResponse: `[Open folder](./${folder})` },
+      featureValues: { mockAssistantResponse: `[Open folder](${folder})` },
     });
     try {
       await mkdir(path.join(session.cwd, folder), { recursive: true });
diff --git a/packages/app/src/assistant-file-links/parse.ts b/packages/app/src/assistant-file-links/parse.ts
index 1904c11907..c195a277cf 100644
--- a/packages/app/src/assistant-file-links/parse.ts
+++ b/packages/app/src/assistant-file-links/parse.ts
@@ -30,6 +30,8 @@ export interface AssistantHrefParseOptions {
    * send a real file named `my%20file.md` to `my file.md`.
    */
   decodeHref?: boolean;
+  /** Explicit Markdown links can name nested folders without a filename extension. */
+  allowExtensionlessNestedPaths?: boolean;
 }
 
 export type AssistantFileLinkClassification =
@@ -278,6 +280,7 @@ export function parseAssistantFileLink(
   const relativeTarget = parseWorkspaceRelativeFileLink(trimmed, {
     workspaceRoot: options.workspaceRoot,
     decodeHref: options.decodeHref,
+    allowExtensionlessNestedPaths: options.allowExtensionlessNestedPaths,
   });
   if (relativeTarget) {
     return relativeTarget;
@@ -411,7 +414,7 @@ function parseWorkspaceRelativeFileLink(
 
 function parseLocalPathParts(
   value: string,
-  options: Pick<AssistantHrefParseOptions, "decodeHref"> = {},
+  options: Pick<AssistantHrefParseOptions, "decodeHref" | "allowExtensionlessNestedPaths"> = {},
 ): {
   path: string;
   lines: Pick<InlinePathTarget, "lineStart" | "lineEnd">;
@@ -437,7 +440,7 @@ function parseLocalPathParts(
     if (options.decodeHref) {
       pathPart = safeDecodeURIComponent(pathPart);
     }
-    if (!isPlausibleAssistantLocalPath(pathPart)) {
+    if (!isPlausibleAssistantLocalPath(pathPart, options)) {
       return null;
     }
     return {
@@ -458,7 +461,7 @@ function parseLocalPathParts(
     decodedBeforeHash = safeDecodeURIComponent(beforeHash);
   }
   const plausiblePath = parseInlinePathToken(decodedBeforeHash)?.path ?? decodedBeforeHash;
-  if (!isPlausibleAssistantLocalPath(plausiblePath)) {
+  if (!isPlausibleAssistantLocalPath(plausiblePath, options)) {
     return null;
   }
 
@@ -583,7 +586,10 @@ function getHeuristicLocalPath(value: string): string | null {
   return beforeHash;
 }
 
-function isPlausibleAssistantLocalPath(pathValue: string): boolean {
+function isPlausibleAssistantLocalPath(
+  pathValue: string,
+  options: Pick<AssistantHrefParseOptions, "allowExtensionlessNestedPaths"> = {},
+): boolean {
   const normalized = normalizePathToken(pathValue);
   if (!normalized) {
     return false;
@@ -607,7 +613,10 @@ function isPlausibleAssistantLocalPath(pathValue: string): boolean {
 
   if (segments.length > 1) {
     const lastSegment = segments[segments.length - 1];
-    return !isDomainLikePathSegment(firstSegment) && isPlausibleAssistantFileName(lastSegment);
+    return (
+      !isDomainLikePathSegment(firstSegment) &&
+      (options.allowExtensionlessNestedPaths === true || isPlausibleAssistantFileName(lastSegment))
+    );
   }
 
   return isPlausibleAssistantFileName(firstSegment);
diff --git a/packages/app/src/assistant-file-links/resolver.test.ts b/packages/app/src/assistant-file-links/resolver.test.ts
index 384c3b6857..854c358627 100644
--- a/packages/app/src/assistant-file-links/resolver.test.ts
+++ b/packages/app/src/assistant-file-links/resolver.test.ts
@@ -18,6 +18,48 @@ const CONTEXT: AssistantFileLinkContext = {
   workspaceRoot: "/Users/test/project",
 };
 
+it.each(["docs/guides", "docs/guides/", "docs/%E6%8C%87%E5%8D%97"])(
+  "resolves an explicit extensionless folder href: %s",
+  (href) => {
+    expect(classifyForResolution({ href }, CONTEXT)).toMatchObject({
+      kind: "resolved",
+      value: {
+        kind: "file",
+        target: { path: `${CONTEXT.workspaceRoot}/${decodeURIComponent(href).replace(/\/$/, "")}` },
+      },
+    });
+  },
+);
+
+it.each(["docs/guides", "origin/main"])("leaves extensionless inline code alone: %s", (text) => {
+  expect(classifyForResolution({ href: text, text, sourceType: "inline-code" }, CONTEXT)).toEqual({
+    kind: "resolved",
+    value: { kind: "ignored" },
+  });
+});
+
+it.each([{ markup: "linkify" }, { sourceInfo: "auto" }])(
+  "keeps auto-recognized extensionless text ignored: %j",
+  (origin) => {
+    expect(
+      classifyForResolution({ href: "docs/guides", text: "docs/guides", ...origin }, CONTEXT),
+    ).toEqual({
+      kind: "resolved",
+      value: { kind: "ignored" },
+    });
+  },
+);
+
+it.each(["example.com/guides", "docs/guides?view=all"])(
+  "does not turn URL-like hrefs into workspace paths: %s",
+  (href) => {
+    expect(classifyForResolution({ href }, CONTEXT)).toEqual({
+      kind: "resolved",
+      value: { kind: "ignored" },
+    });
+  },
+);
+
 it("opens the existing non-ASCII file named by a rendered markdown link", async () => {
   const workspaceRoot = await mkdtemp(path.join(tmpdir(), "assistant-file-link-"));
   try {
diff --git a/packages/app/src/assistant-file-links/resolver.ts b/packages/app/src/assistant-file-links/resolver.ts
index 774d39278b..59057ba0ca 100644
--- a/packages/app/src/assistant-file-links/resolver.ts
+++ b/packages/app/src/assistant-file-links/resolver.ts
@@ -117,6 +117,7 @@ export function classifyForResolution(
   const classification = classifyAssistantFileLink(token, {
     workspaceRoot: context.workspaceRoot,
     decodeHref: tokenInfo.fromHref,
+    allowExtensionlessNestedPaths: tokenInfo.fromHref && !isLinkifiedSource(source),
   });
   if (!classification) {
     return { kind: "resolved", value: { kind: "ignored" } };

From 5384abdbaaf69db588ff0d924929bda31bd19d94 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 14:49:56 +0200
Subject: [PATCH 235/270] fix(app): open Markdown preview folder links in Files
 (#7229)

Preview links bypassed the directory-aware opener and opened folder destinations as file tabs. Use the existing opener and explorer reveal actions, retaining preferred file placement and canceling pending checks when leaving the source tab.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/e2e/browser/folder-links.spec.ts | 57 +++++++++++++++++++
 .../screens/workspace/workspace-screen.tsx    | 47 +++++++++++++--
 2 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/packages/app/e2e/browser/folder-links.spec.ts b/packages/app/e2e/browser/folder-links.spec.ts
index 8c1339a8c6..a893fbcb68 100644
--- a/packages/app/e2e/browser/folder-links.spec.ts
+++ b/packages/app/e2e/browser/folder-links.spec.ts
@@ -2,6 +2,63 @@ import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import {
+  expectFileTabOpen,
+  openFileExplorer,
+  openFileFromExplorer,
+} from "../support/helpers/file-explorer";
+import { ensureWorkspaceAgentPaneVisible } from "../support/helpers/workspace-tabs";
+
+async function openMarkdownPreview(page: Page) {
+  await openFileExplorer(page);
+  await openFileFromExplorer(page, "README.md");
+  await expectFileTabOpen(page, "README.md");
+  await page
+    .getByTestId("file-panel-bar")
+    .getByRole("button", { name: "Preview", exact: true })
+    .click();
+  await ensureWorkspaceAgentPaneVisible(page);
+}
+
+async function followPreviewLink(page: Page, name: string) {
+  await page
+    .getByTestId("workspace-file-pane")
+    .filter({ visible: true })
+    .getByRole("link", { name, exact: true })
+    .click();
+}
+
+test("Markdown preview folder links reveal Files and file links still open a file", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace({ prefix: "preview-folder-links-" });
+  await mkdir(path.join(workspace.repoPath, "docs/guides"), { recursive: true });
+  await writeFile(
+    path.join(workspace.repoPath, "docs/guides/guide.md"),
+    "# Folder link destination\n",
+  );
+  await writeFile(
+    path.join(workspace.repoPath, "README.md"),
+    "[Dot](./docs/guides)\n\n[Bare](docs/guides)\n\n[Guide](docs/guides/guide.md)\n",
+  );
+  await workspace.navigateTo();
+
+  await openMarkdownPreview(page);
+  await followPreviewLink(page, "Guide");
+  await expect(page.getByText("Folder link destination", { exact: true })).toBeVisible();
+
+  await openMarkdownPreview(page);
+  await followPreviewLink(page, "Dot");
+  await expectFolderContents(page);
+  await expect(page.getByTestId("workspace-tab-file_docs/guides")).toHaveCount(0);
+
+  await openMarkdownPreview(page);
+  await followPreviewLink(page, "Bare");
+  await expectFolderContents(page);
+  await expect(page.getByTestId("workspace-tab-file_docs/guides")).toHaveCount(0);
+  await page.screenshot({ path: test.info().outputPath("preview-folder-links.png") });
+});
 
 async function openReportedFolderLink(page: Page, name: string) {
   const link = page.getByTestId("assistant-message").getByRole("link", { name, exact: true });
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index 0872c0dc92..48e123c26a 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -1,4 +1,9 @@
-import { AssistantFileLinkResolverProvider, type InlinePathTarget } from "@/assistant-file-links";
+import {
+  AssistantFileLinkResolverProvider,
+  createInlinePathOpener,
+  type InlinePathTarget,
+} from "@/assistant-file-links";
+import { useFileExplorerActions } from "@/hooks/use-file-explorer-actions";
 import {
   WorkspaceComposerEditingSessionsProvider,
   useComposerTabFullscreen,
@@ -203,6 +208,7 @@ import { PluginHeaderButtons } from "@/plugins";
 import {
   createWorkspaceFileTabTarget,
   normalizeWorkspaceFileLocation,
+  type OpenFileDisposition,
   type WorkspaceFileLocation,
   type WorkspaceFileOpenRequest,
 } from "@/workspace/file-open";
@@ -3658,9 +3664,42 @@ function WorkspaceScreenContent({
     </View>
   );
 
-  const openMarkdownFile = useStableEvent((target: InlinePathTarget) => {
-    handleOpenPreferredAssistantFile({ location: target, parentTabId: activeTabId });
+  const { revealDirectory } = useFileExplorerActions({
+    serverId: normalizedServerId,
+    workspaceId: normalizedWorkspaceId,
+    workspaceRoot: workspaceDirectory,
   });
+  const openMarkdownFile = useStableEvent((location: WorkspaceFileLocation) => {
+    handleOpenPreferredAssistantFile({ location, parentTabId: activeTabId });
+  });
+  const openMarkdownDirectory = useStableEvent((directoryPath: string) => {
+    void revealDirectory(directoryPath);
+    openExplorerSidebarView({
+      isCompact: isMobile,
+      workspaceKey: persistenceKey,
+      checkout: activeExplorerCheckout,
+      view: "files",
+    });
+  });
+  const markdownPathOpener = useMemo(
+    () =>
+      createInlinePathOpener({
+        workspaceRoot: workspaceDirectory ?? "",
+        client,
+        openFile: openMarkdownFile,
+        openDirectory: openMarkdownDirectory,
+      }),
+    [workspaceDirectory, client, openMarkdownFile, openMarkdownDirectory],
+  );
+  useEffect(() => {
+    if (!isRouteFocused) markdownPathOpener.cancel();
+    return () => markdownPathOpener.cancel();
+  }, [markdownPathOpener, isRouteFocused, activeTabId]);
+  const openMarkdownPath = useStableEvent(
+    (target: InlinePathTarget, disposition: OpenFileDisposition) => {
+      if (isRouteFocused) void markdownPathOpener.open(target, disposition);
+    },
+  );
 
   const renderedWorkspaceScreen = (
     <RenderProfile id="WorkspaceScreenContent">
@@ -3705,7 +3744,7 @@ function WorkspaceScreenContent({
         client={client}
         serverId={normalizedServerId}
         workspaceRoot={workspaceDirectory ?? undefined}
-        onOpenWorkspaceFile={openMarkdownFile}
+        onOpenWorkspaceFile={openMarkdownPath}
         toast={toast}
       >
         {renderedWorkspaceScreen}

From a0aeca967c9cf0af433c76b1f0ba0c50daa419c4 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 19:59:49 +0700
Subject: [PATCH 236/270] fix(app): open explicit file links regardless of
 extension (#7233)

Authored Markdown destinations were filtered by the filename heuristics intended for inferred text, silently ignoring screenshot links. Resolve explicit destinations directly through the existing workspace opener so reads and failures reach the file pane.
---
 packages/app/e2e/browser/file-editing.spec.ts | 31 +++++++++++++++++++
 .../app/src/assistant-file-links/parse.ts     | 24 ++++++--------
 .../src/assistant-file-links/resolver.test.ts | 17 +++++++++-
 .../app/src/assistant-file-links/resolver.ts  |  2 +-
 4 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/packages/app/e2e/browser/file-editing.spec.ts b/packages/app/e2e/browser/file-editing.spec.ts
index da729381d2..0d63336d59 100644
--- a/packages/app/e2e/browser/file-editing.spec.ts
+++ b/packages/app/e2e/browser/file-editing.spec.ts
@@ -105,6 +105,37 @@ async function seedAgentWithFileLink(input: LinkedFile) {
 }
 
 test.describe("CodeMirror workspace file editing", () => {
+  test("opens explicit screenshot links and explains missing files", async ({ page }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "screenshot-markdown-link-",
+      title: "Screenshot file links",
+      initialPrompt: "Show screenshots",
+      featureValues: {
+        mockAssistantResponse:
+          "[Capture](.dev/tablet-review/capture.png) [Missing capture](.dev/tablet-review/missing.png)",
+      },
+    });
+    try {
+      await mkdir(path.join(session.cwd, ".dev/tablet-review"), { recursive: true });
+      await writeFile(path.join(session.cwd, ".dev/tablet-review/capture.png"), RED_PIXEL);
+      await openAgentRoute(page, session);
+      await test.step("Open the linked screenshot", async () => {
+        await openAssistantMarkdownLink(page, "Capture");
+        await expectFileTabOpen(page, ".dev/tablet-review/capture.png");
+        await expect(page.getByTestId("image-file-preview-canvas")).toBeVisible();
+      });
+      await test.step("Explain why the missing screenshot cannot open", async () => {
+        await returnToAssistant(page, session.agentId);
+        await openAssistantMarkdownLink(page, "Missing capture");
+        await expectFileTabOpen(page, ".dev/tablet-review/missing.png");
+        await expect(page.getByText(/ENOENT/)).toBeVisible();
+        await expect(page.getByRole("button", { name: "Retry", exact: true })).toBeVisible();
+      });
+    } finally {
+      await session.cleanup();
+    }
+  });
+
   test("opens the non-ASCII file named by an assistant markdown link", async ({ page }) => {
     const session = await seedMockAgentWorkspace({
       repoPrefix: "encoded-markdown-link-",
diff --git a/packages/app/src/assistant-file-links/parse.ts b/packages/app/src/assistant-file-links/parse.ts
index c195a277cf..4fb41a72ca 100644
--- a/packages/app/src/assistant-file-links/parse.ts
+++ b/packages/app/src/assistant-file-links/parse.ts
@@ -23,6 +23,8 @@ const INLINE_PAREN_LINE_SUFFIX = /^(.+?)\(([0-9]+)(?:,[0-9]+)?(?:-([0-9]+)(?:,[0
 const INLINE_WORD_LINE_SUFFIX = /^(.+?)\s+lines?\s+([0-9]+)(?:-([0-9]+))?$/i;
 export interface AssistantHrefParseOptions {
   workspaceRoot?: string;
+  /** Authored links identify a file; only inferred text needs filename heuristics. */
+  explicitLink?: boolean;
   /**
    * True only when `value` is a markdown href — the renderer percent-encodes
    * non-ASCII and space characters, so the path must be decoded. Raw path
@@ -30,8 +32,6 @@ export interface AssistantHrefParseOptions {
    * send a real file named `my%20file.md` to `my file.md`.
    */
   decodeHref?: boolean;
-  /** Explicit Markdown links can name nested folders without a filename extension. */
-  allowExtensionlessNestedPaths?: boolean;
 }
 
 export type AssistantFileLinkClassification =
@@ -236,7 +236,7 @@ export function classifyAssistantFileLink(
     return null;
   }
 
-  if (isAmbiguousWorkspaceCandidate(trimmed, target, options)) {
+  if (!options.explicitLink && isAmbiguousWorkspaceCandidate(trimmed, target, options)) {
     return {
       kind: "ambiguousFileCandidate",
       target,
@@ -280,7 +280,7 @@ export function parseAssistantFileLink(
   const relativeTarget = parseWorkspaceRelativeFileLink(trimmed, {
     workspaceRoot: options.workspaceRoot,
     decodeHref: options.decodeHref,
-    allowExtensionlessNestedPaths: options.allowExtensionlessNestedPaths,
+    explicitLink: options.explicitLink,
   });
   if (relativeTarget) {
     return relativeTarget;
@@ -414,7 +414,7 @@ function parseWorkspaceRelativeFileLink(
 
 function parseLocalPathParts(
   value: string,
-  options: Pick<AssistantHrefParseOptions, "decodeHref" | "allowExtensionlessNestedPaths"> = {},
+  options: Pick<AssistantHrefParseOptions, "decodeHref" | "explicitLink"> = {},
 ): {
   path: string;
   lines: Pick<InlinePathTarget, "lineStart" | "lineEnd">;
@@ -440,7 +440,7 @@ function parseLocalPathParts(
     if (options.decodeHref) {
       pathPart = safeDecodeURIComponent(pathPart);
     }
-    if (!isPlausibleAssistantLocalPath(pathPart, options)) {
+    if (!options.explicitLink && !isPlausibleAssistantLocalPath(pathPart)) {
       return null;
     }
     return {
@@ -461,7 +461,7 @@ function parseLocalPathParts(
     decodedBeforeHash = safeDecodeURIComponent(beforeHash);
   }
   const plausiblePath = parseInlinePathToken(decodedBeforeHash)?.path ?? decodedBeforeHash;
-  if (!isPlausibleAssistantLocalPath(plausiblePath, options)) {
+  if (!options.explicitLink && !isPlausibleAssistantLocalPath(plausiblePath)) {
     return null;
   }
 
@@ -586,10 +586,7 @@ function getHeuristicLocalPath(value: string): string | null {
   return beforeHash;
 }
 
-function isPlausibleAssistantLocalPath(
-  pathValue: string,
-  options: Pick<AssistantHrefParseOptions, "allowExtensionlessNestedPaths"> = {},
-): boolean {
+function isPlausibleAssistantLocalPath(pathValue: string): boolean {
   const normalized = normalizePathToken(pathValue);
   if (!normalized) {
     return false;
@@ -613,10 +610,7 @@ function isPlausibleAssistantLocalPath(
 
   if (segments.length > 1) {
     const lastSegment = segments[segments.length - 1];
-    return (
-      !isDomainLikePathSegment(firstSegment) &&
-      (options.allowExtensionlessNestedPaths === true || isPlausibleAssistantFileName(lastSegment))
-    );
+    return !isDomainLikePathSegment(firstSegment) && isPlausibleAssistantFileName(lastSegment);
   }
 
   return isPlausibleAssistantFileName(firstSegment);
diff --git a/packages/app/src/assistant-file-links/resolver.test.ts b/packages/app/src/assistant-file-links/resolver.test.ts
index 854c358627..96884c21c7 100644
--- a/packages/app/src/assistant-file-links/resolver.test.ts
+++ b/packages/app/src/assistant-file-links/resolver.test.ts
@@ -50,7 +50,7 @@ it.each([{ markup: "linkify" }, { sourceInfo: "auto" }])(
   },
 );
 
-it.each(["example.com/guides", "docs/guides?view=all"])(
+it.each(["docs/guides?view=all"])(
   "does not turn URL-like hrefs into workspace paths: %s",
   (href) => {
     expect(classifyForResolution({ href }, CONTEXT)).toEqual({
@@ -60,6 +60,21 @@ it.each(["example.com/guides", "docs/guides?view=all"])(
   },
 );
 
+it.each([
+  ".dev/tablet-review/tablet-agent-draft.png",
+  "images/capture.jpg",
+  "downloads/archive.custom",
+  "assets/LICENSE",
+  "example.com/guides",
+  "capture.png",
+  "missing.png",
+])("opens explicit file link %s without filename guessing", (href) => {
+  expect(classifyForResolution({ href }, CONTEXT)).toMatchObject({
+    kind: "resolved",
+    value: { kind: "file", target: { path: `${CONTEXT.workspaceRoot}/${href}` } },
+  });
+});
+
 it("opens the existing non-ASCII file named by a rendered markdown link", async () => {
   const workspaceRoot = await mkdtemp(path.join(tmpdir(), "assistant-file-link-"));
   try {
diff --git a/packages/app/src/assistant-file-links/resolver.ts b/packages/app/src/assistant-file-links/resolver.ts
index 59057ba0ca..be012077a3 100644
--- a/packages/app/src/assistant-file-links/resolver.ts
+++ b/packages/app/src/assistant-file-links/resolver.ts
@@ -117,7 +117,7 @@ export function classifyForResolution(
   const classification = classifyAssistantFileLink(token, {
     workspaceRoot: context.workspaceRoot,
     decodeHref: tokenInfo.fromHref,
-    allowExtensionlessNestedPaths: tokenInfo.fromHref && !isLinkifiedSource(source),
+    explicitLink: source.sourceType !== "inline-code" && !isLinkifiedSource(source),
   });
   if (!classification) {
     return { kind: "resolved", value: { kind: "ignored" } };

From f22775a8e14908052e4b933c7e8007663449c7c4 Mon Sep 17 00:00:00 2001
From: Derick Wells <drckwells@gmail.com>
Date: Sat, 17 Oct 2026 21:39:05 +0800
Subject: [PATCH 237/270] Default agent-to-agent messages to steering in CLI
 and MCP (#5164)

* Let agents steer a running turn from send_agent_prompt and paseo send

When an agent used the send_agent_prompt MCP tool on a target that was
mid-turn, sendPromptToAgent ran without activeTurnBehavior, so the
prompt path fell through to replaceAgentRun. That cancelled the target's
active turn and every provider subagent it had in flight. The web UI,
child finish notifications and schedules already pass "steer"; the MCP
tool and the CLI had no way to ask for it.

Add an optional activeTurnBehavior input to send_agent_prompt. It
defaults to "steer" for agent-scoped callers and to "interrupt" for
top-level callers, so existing top-level behaviour is unchanged. Add
--steer to paseo send. Document both and cover them with tests.

* fix(agents): retain finish notifications during steering acknowledgement

Observe completion before dispatch and hold delivery until acceptance. A replacement discards the displaced turn observation and starts a fresh listener before its iterator runs.

* fix(agents): preserve notification ownership when follow-ups fail

Keep the previous observation until dispatch succeeds and suppress duplicate delivery during acknowledgement. Decide whether to retain the running turn from the dispatch result, including side commands requested with interrupt.

* fix(agents): deduplicate notifications across overlapping follow-ups

---------

Co-authored-by: Mohamed Boudra <boudra.moha@gmail.com>
---
 packages/cli/src/cli-surface.test.ts          |  16 +
 packages/cli/src/commands/agent/send.ts       |  14 +-
 .../server/src/server/agent/agent-prompt.ts   |  66 +++-
 .../src/server/agent/mcp-server.test.ts       | 310 +++++++++++++++++-
 .../src/server/agent/tools/paseo-tools.ts     |  52 ++-
 public-docs/cli.md                            |   5 +-
 public-docs/orchestration-workflows.md        |   2 +-
 skills/paseo/SKILL.md                         |   2 +-
 8 files changed, 440 insertions(+), 27 deletions(-)

diff --git a/packages/cli/src/cli-surface.test.ts b/packages/cli/src/cli-surface.test.ts
index 18f4348ff7..83db3408e6 100644
--- a/packages/cli/src/cli-surface.test.ts
+++ b/packages/cli/src/cli-surface.test.ts
@@ -2,6 +2,22 @@ import { describe, expect, it } from "vitest";
 import { createCli } from "./cli.js";
 
 describe("canonical CLI surface", () => {
+  it.each(["send", "agent send"])("%s accepts an explicit behavior override", async (path) => {
+    const cli = createCli();
+    const owner =
+      path === "send" ? cli : cli.commands.find((command) => command.name() === "agent")!;
+    const send = owner.commands.find((command) => command.name() === "send")!;
+    send.action(() => {});
+    await send.parseAsync(["target", "message", "--behavior", "interrupt"], { from: "user" });
+    expect(send.opts().behavior).toBe("interrupt");
+    await send.parseAsync(["target", "message", "--behavior", "steer"], { from: "user" });
+    expect(send.opts().behavior).toBe("steer");
+    send.exitOverride().configureOutput({ writeErr: () => {} });
+    await expect(
+      send.parseAsync(["target", "message", "--behavior", "queue"], { from: "user" }),
+    ).rejects.toThrow();
+  });
+
   it("offers daemon host selection as a global option", () => {
     expect(createCli().helpInformation()).toContain("--host <host>");
   });
diff --git a/packages/cli/src/commands/agent/send.ts b/packages/cli/src/commands/agent/send.ts
index 69e0c36d9d..1f288d4ca2 100644
--- a/packages/cli/src/commands/agent/send.ts
+++ b/packages/cli/src/commands/agent/send.ts
@@ -1,4 +1,5 @@
-import { type Command } from "commander";
+import { type Command, Option } from "commander";
+import type { ActiveTurnBehavior } from "@getpaseo/protocol/messages";
 import { collectMultiple } from "../../utils/command-options.js";
 import { connectToDaemon } from "../../utils/client.js";
 import type {
@@ -28,6 +29,7 @@ export const agentSendSchema: OutputSchema<AgentSendResult> = {
 };
 
 export interface AgentSendOptions extends CommandOptions {
+  behavior?: ActiveTurnBehavior;
   wait?: boolean;
   image?: string[];
   prompt?: string;
@@ -42,6 +44,12 @@ export function addSendOptions(cmd: Command): Command {
     .option("--prompt <text>", "Provide the message inline as a flag")
     .option("--prompt-file <path>", "Read the message from a UTF-8 text file")
     .option("--image <path>", "Attach image(s) to the message", collectMultiple, [])
+    .addOption(
+      new Option(
+        "--behavior <behavior>",
+        "Active-turn behavior (agent default: steer; otherwise: interrupt)",
+      ).choices(["interrupt", "steer"]),
+    )
     .option("--no-wait", "Return immediately without waiting for completion");
 }
 
@@ -191,10 +199,12 @@ export async function runSendCommand(
     const images =
       options.image && options.image.length > 0 ? await readImageFiles(options.image) : undefined;
 
+    const sourceAgentId = process.env.PASEO_AGENT_ID?.trim() || undefined;
     // Send the message
     await client.sendAgentMessage(agentIdArg, promptInput, {
       images,
-      sourceAgentId: process.env.PASEO_AGENT_ID?.trim() || undefined,
+      sourceAgentId,
+      activeTurnBehavior: options.behavior ?? (sourceAgentId ? "steer" : "interrupt"),
     });
 
     // If --no-wait, return immediately
diff --git a/packages/server/src/server/agent/agent-prompt.ts b/packages/server/src/server/agent/agent-prompt.ts
index 4044fd84bc..bf6d50480b 100644
--- a/packages/server/src/server/agent/agent-prompt.ts
+++ b/packages/server/src/server/agent/agent-prompt.ts
@@ -402,6 +402,8 @@ export interface SetupFinishNotificationParams {
   childAgentId: string;
   callerAgentId: string;
   requireParentOwnership?: boolean;
+  /** Retain pre-dispatch outcomes only when dispatch keeps the existing turn. */
+  dispatchResult?: Promise<PromptDispatchDisposition | false>;
   /** A replacement must observe its new start, not the displaced running snapshot. */
   waitForTurnStart?: boolean;
   logger: Logger;
@@ -466,10 +468,17 @@ interface NotifySafelyOptions {
   permissionRequest?: AgentPermissionRequest;
 }
 
-// A caller waits on a child through one armed notification. Arming again, such as a
-// follow-up prompt while the child still runs, replaces the earlier one so the child's
-// next finish reaches the caller once.
-const armedFinishNotifications = new WeakMap<AgentManager, Map<string, () => void>>();
+// Pending follow-ups coexist until acknowledgement. A successful dispatch replaces
+// every earlier observation for the caller/child pair; a failure removes only itself.
+interface ArmedFinishNotification {
+  stop(): void;
+  supersedeWhen(accepted: Promise<boolean>): void;
+}
+
+const armedFinishNotifications = new WeakMap<
+  AgentManager,
+  Map<string, Set<ArmedFinishNotification>>
+>();
 
 export function setupFinishNotification(params: SetupFinishNotificationParams): () => void {
   const {
@@ -491,15 +500,49 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
   const armedByManager = armedFinishNotifications.get(agentManager) ?? new Map();
   armedFinishNotifications.set(agentManager, armedByManager);
   const armedKey = JSON.stringify([childAgentId, callerAgentId]);
-  armedByManager.get(armedKey)?.();
-  armedByManager.set(armedKey, stop);
+  const registrations = armedByManager.get(armedKey) ?? new Set<ArmedFinishNotification>();
+  armedByManager.set(armedKey, registrations);
+  const previous = [...registrations];
+  let superseded = Promise.resolve(false);
+  let dispatchPending = Boolean(params.dispatchResult);
+  const registration: ArmedFinishNotification = {
+    stop,
+    supersedeWhen(accepted) {
+      superseded = superseded.then(
+        async (alreadySuperseded) => alreadySuperseded || (await accepted),
+      );
+    },
+  };
+  registrations.add(registration);
+  if (params.dispatchResult) {
+    const dispatchAccepted = params.dispatchResult.then((result) => result !== false);
+    for (const observer of previous) observer.supersedeWhen(dispatchAccepted);
+    void params.dispatchResult.then((accepted) => {
+      dispatchPending = false;
+      if (accepted) {
+        for (const observer of previous) observer.stop();
+        if (stopped || accepted === "turn_started") stop();
+      } else {
+        stop();
+      }
+      return undefined;
+    });
+  } else {
+    for (const observer of previous) {
+      observer.supersedeWhen(Promise.resolve(true));
+      observer.stop();
+    }
+  }
 
   function stop(): void {
-    if (stopped) return;
     stopped = true;
     unsubscribe?.();
-    if (armedByManager.get(armedKey) === stop) {
-      armedByManager.delete(armedKey);
+    // Pending observations remain visible to overlapping sends until acknowledgement.
+    if (!dispatchPending) {
+      registrations.delete(registration);
+      if (registrations.size === 0 && armedByManager.get(armedKey) === registrations) {
+        armedByManager.delete(armedKey);
+      }
     }
   }
 
@@ -507,6 +550,11 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
     reason: FinishNotificationReason,
     permissionRequest?: AgentPermissionRequest,
   ): Promise<void> {
+    if (params.dispatchResult) {
+      const result = await params.dispatchResult;
+      if (result === false || result === "turn_started") return;
+    }
+    if (await superseded) return;
     const callerRecord = await agentStorage.get(callerAgentId);
     if (callerRecord?.archivedAt) {
       return;
diff --git a/packages/server/src/server/agent/mcp-server.test.ts b/packages/server/src/server/agent/mcp-server.test.ts
index 33467b22f6..9246f463d0 100644
--- a/packages/server/src/server/agent/mcp-server.test.ts
+++ b/packages/server/src/server/agent/mcp-server.test.ts
@@ -1,3 +1,4 @@
+import { setupFinishNotification, type PromptDispatchDisposition } from "./agent-prompt.js";
 import { parseAgentMessage } from "./agent-messages/index.js";
 import { execFileSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
@@ -242,6 +243,7 @@ function buildAgentManagerSpies() {
     appendTimelineItem: vi.fn().mockResolvedValue(undefined),
     emitLiveTimelineItem: vi.fn().mockResolvedValue(undefined),
     hasInFlightRun: vi.fn().mockReturnValue(false),
+    steerOrReplaceActiveTurn: async () => ({ status: "inactive" as const }),
     tryRunOutOfBand: vi.fn().mockReturnValue(false),
     subscribe: vi.fn().mockReturnValue(() => {}),
     streamAgent: vi.fn(() => (async function* noop() {})()),
@@ -3860,6 +3862,9 @@ const HELD_TURN_CAPABILITIES = {
 } as const;
 
 interface HeldTurnOptions {
+  finishDuringSteer?: boolean;
+  rejectSteer?: boolean;
+  steerResult?: "accepted" | "unavailable";
   /** Run the whole turn before the turn-start request returns. */
   finishTurnsDuringStart?: boolean;
 }
@@ -3872,6 +3877,7 @@ class HeldTurnAgentSession implements AgentSession {
   readonly capabilities = HELD_TURN_CAPABILITIES;
   readonly id = randomUUID();
   readonly prompts: string[] = [];
+  readonly steeredPrompts: AgentPromptInput[] = [];
   private readonly subscribers = new Set<(event: AgentStreamEvent) => void>();
   private activeTurnId: string | null = null;
   private turnStartGate: Promise<void> | null = null;
@@ -3904,6 +3910,14 @@ class HeldTurnAgentSession implements AgentSession {
     return prompt === "/side-command" ? { run: async () => {} } : null;
   }
 
+  async steerActiveTurn(prompt: AgentPromptInput) {
+    const status = this.options.steerResult ?? "unavailable";
+    if (status === "accepted") this.steeredPrompts.push(prompt);
+    if (status === "accepted" && this.options.finishDuringSteer) this.finishTurn();
+    if (this.options.rejectSteer) throw new Error("Steer rejected");
+    return { status };
+  }
+
   async startTurn(prompt: AgentPromptInput): Promise<{ turnId: string }> {
     this.prompts.push(typeof prompt === "string" ? prompt : JSON.stringify(prompt));
     await this.turnStartGate;
@@ -4050,6 +4064,295 @@ class HeldTurnAgentClient implements AgentClient {
 }
 
 describe("send_agent_prompt MCP tool", () => {
+  it.each([
+    { agentScoped: true, behavior: undefined, available: true, steered: true },
+    { agentScoped: true, behavior: "interrupt", available: true, steered: false },
+    { agentScoped: true, behavior: "steer", available: true, steered: true },
+    { agentScoped: false, behavior: undefined, available: true, steered: false },
+    { agentScoped: false, behavior: "steer", available: true, steered: true },
+    { agentScoped: true, behavior: undefined, available: false, steered: false },
+  ] as const)(
+    "dispatches behavior $behavior for agent-scoped=$agentScoped, steering available=$available",
+    async ({ agentScoped, behavior, available, steered }) => {
+      const workdir = await mkdtemp(join(tmpdir(), "mcp-send-behavior-"));
+      const storage = new AgentStorage(join(workdir, "agents"), logger);
+      const client = new HeldTurnAgentClient("codex", true, {
+        steerResult: available ? "accepted" : "unavailable",
+      });
+      const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
+      try {
+        const parent = await manager.createAgent(
+          { provider: "codex", cwd: existingCwd },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const child = await manager.createAgent(
+          { provider: "codex", cwd: existingCwd },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const server = await createAgentMcpServer({
+          agentManager: manager,
+          agentStorage: storage,
+          callerAgentId: agentScoped ? parent.id : undefined,
+          providerSnapshotManager: createOpenCodeManager().manager,
+          logger,
+        });
+        const tool = registeredTool(server, "send_agent_prompt");
+        await invokeToolWithParsedInput(tool, {
+          agentId: child.id,
+          prompt: "Original work",
+          notifyOnFinish: false,
+        });
+        const originalTurn = manager.getAgent(child.id)!.activeTurnId;
+        const response = await invokeToolWithParsedInput(tool, {
+          agentId: child.id,
+          prompt: "New message",
+          notifyOnFinish: false,
+          ...(behavior ? { activeTurnBehavior: behavior } : {}),
+        });
+        expect(response.structuredContent).toMatchObject({
+          success: true,
+          disposition: steered ? "steered" : "turn_started",
+        });
+        expect(client.sessions[1]!.prompts).toHaveLength(steered ? 1 : 2);
+        expect(client.sessions[1]!.steeredPrompts).toHaveLength(steered ? 1 : 0);
+        expect(manager.getAgent(child.id)!.activeTurnId === originalTurn).toBe(steered);
+      } finally {
+        await removeAgentStateDir(manager, storage, workdir);
+      }
+    },
+  );
+
+  it.each([
+    { rejected: false, priorNotification: false },
+    { rejected: true, priorNotification: false },
+    { rejected: false, priorNotification: true },
+  ])(
+    "buffers completion until steer acknowledgement (rejected: $rejected, prior notification: $priorNotification)",
+    async ({ rejected, priorNotification }) => {
+      const workdir = await mkdtemp(join(tmpdir(), "mcp-send-behavior-"));
+      const storage = new AgentStorage(join(workdir, "agents"), logger);
+      const client = new HeldTurnAgentClient("codex", true, {
+        steerResult: "accepted",
+        finishDuringSteer: true,
+        rejectSteer: rejected,
+      });
+      const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
+      let mcpClient: Client | undefined;
+      try {
+        const parent = await manager.createAgent(
+          { provider: "codex", cwd: existingCwd },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const child = await manager.createAgent(
+          { provider: "codex", cwd: existingCwd },
+          undefined,
+          { workspaceId: "wks_parent" },
+        );
+        const server = await createAgentMcpServer({
+          agentManager: manager,
+          agentStorage: storage,
+          callerAgentId: parent.id,
+          providerSnapshotManager: createOpenCodeManager().manager,
+          logger,
+        });
+        mcpClient = await connectInMemoryMcpClient(server);
+        const send = (input: Record<string, unknown>) =>
+          mcpClient!.callTool({ name: "send_agent_prompt", arguments: input });
+        await send({
+          agentId: child.id,
+          prompt: "Original work",
+          notifyOnFinish: priorNotification,
+        });
+        const sending = send({
+          agentId: child.id,
+          prompt: "New message",
+          notifyOnFinish: true,
+        });
+        if (rejected) {
+          expect(await sending).toMatchObject({
+            isError: true,
+            content: [{ type: "text", text: expect.stringContaining("Steer rejected") }],
+          });
+          // Flush asynchronous notification work before checking that a rejected
+          // dispatch did not notify. Then prove a later successful send still can.
+          await new Promise((resolve) => setTimeout(resolve, 50));
+          expect(client.sessions[0]!.prompts).toHaveLength(0);
+          await send({
+            agentId: child.id,
+            prompt: "Retry after rejection",
+          });
+          client.sessions[1]!.finishTurn();
+        } else {
+          const response = await sending;
+          expect(response.structuredContent).toMatchObject({
+            success: true,
+            disposition: "steered",
+          });
+        }
+        await vi.waitFor(() => expect(client.sessions[0]!.prompts).toHaveLength(1));
+        expect(parseAgentMessage(client.sessions[0]!.prompts[0])).toMatchObject({
+          source: { kind: "agent-notification", agentId: child.id, event: "finished" },
+        });
+      } finally {
+        await mcpClient?.close();
+        await removeAgentStateDir(manager, storage, workdir);
+      }
+    },
+  );
+
+  it.each([false, true])(
+    "preserves the original notification after rejection (completion during send: %s)",
+    async (finishDuringSteer) => {
+      const workdir = await mkdtemp(join(tmpdir(), "mcp-send-behavior-"));
+      const storage = new AgentStorage(join(workdir, "agents"), logger);
+      const client = new HeldTurnAgentClient("codex", true, {
+        steerResult: "accepted",
+        finishDuringSteer,
+        rejectSteer: true,
+      });
+      const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
+      let mcpClient: Client | undefined;
+      try {
+        const parent = await manager.createAgent(
+          { provider: "codex", cwd: existingCwd },
+          undefined,
+          {
+            workspaceId: "wks_parent",
+          },
+        );
+        const child = await manager.createAgent(
+          { provider: "codex", cwd: existingCwd },
+          undefined,
+          {
+            workspaceId: "wks_parent",
+          },
+        );
+        const server = await createAgentMcpServer({
+          agentManager: manager,
+          agentStorage: storage,
+          callerAgentId: parent.id,
+          providerSnapshotManager: createOpenCodeManager().manager,
+          logger,
+        });
+        mcpClient = await connectInMemoryMcpClient(server);
+        const send = (input: Record<string, unknown>) =>
+          mcpClient!.callTool({ name: "send_agent_prompt", arguments: input });
+        await send({
+          agentId: child.id,
+          prompt: "Original work",
+          notifyOnFinish: true,
+        });
+        const sending = send({
+          agentId: child.id,
+          prompt: "New message",
+          notifyOnFinish: true,
+        });
+        expect(await sending).toMatchObject({
+          isError: true,
+          content: [{ type: "text", text: expect.stringContaining("Steer rejected") }],
+        });
+        if (!finishDuringSteer) {
+          await new Promise((resolve) => setTimeout(resolve, 50));
+          expect(client.sessions[0]!.prompts).toHaveLength(0);
+          client.sessions[1]!.finishTurn();
+        }
+        await vi.waitFor(() => expect(client.sessions[0]!.prompts).toHaveLength(1));
+        expect(parseAgentMessage(client.sessions[0]!.prompts[0])).toMatchObject({
+          source: { kind: "agent-notification", agentId: child.id, event: "finished" },
+        });
+      } finally {
+        await mcpClient?.close();
+        await removeAgentStateDir(manager, storage, workdir);
+      }
+    },
+  );
+
+  it.each([
+    [false, true],
+    [true, false],
+    [false, false],
+    [true, true],
+  ])(
+    "overlapping follow-ups notify once (first accepted: %s, second accepted: %s)",
+    async (firstAccepted, secondAccepted) => {
+      const workdir = await mkdtemp(join(tmpdir(), "mcp-send-behavior-"));
+      const storage = new AgentStorage(join(workdir, "agents"), logger);
+      const client = new HeldTurnAgentClient("codex", true, {
+        steerResult: "accepted",
+        finishDuringSteer: false,
+        rejectSteer: true,
+      });
+      const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
+      let mcpClient: Client | undefined;
+      try {
+        const parent = await manager.createAgent(
+          { provider: "codex", cwd: existingCwd },
+          undefined,
+          {
+            workspaceId: "wks_parent",
+          },
+        );
+        const child = await manager.createAgent(
+          { provider: "codex", cwd: existingCwd },
+          undefined,
+          {
+            workspaceId: "wks_parent",
+          },
+        );
+        const server = await createAgentMcpServer({
+          agentManager: manager,
+          agentStorage: storage,
+          callerAgentId: parent.id,
+          providerSnapshotManager: createOpenCodeManager().manager,
+          logger,
+        });
+        mcpClient = await connectInMemoryMcpClient(server);
+        const send = (input: Record<string, unknown>) =>
+          mcpClient!.callTool({ name: "send_agent_prompt", arguments: input });
+        await send({
+          agentId: child.id,
+          prompt: "Original work",
+          notifyOnFinish: true,
+        });
+        let firstResolve!: (result: PromptDispatchDisposition | false) => void;
+        let secondResolve!: (result: PromptDispatchDisposition | false) => void;
+        const first = new Promise<PromptDispatchDisposition | false>((resolve) => {
+          firstResolve = resolve;
+        });
+        const second = new Promise<PromptDispatchDisposition | false>((resolve) => {
+          secondResolve = resolve;
+        });
+        for (const dispatchResult of [first, second]) {
+          setupFinishNotification({
+            agentManager: manager,
+            agentStorage: storage,
+            childAgentId: child.id,
+            callerAgentId: parent.id,
+            dispatchResult,
+            logger,
+          });
+        }
+        firstResolve(firstAccepted ? "steered" : false);
+        await first;
+        secondResolve(secondAccepted ? "steered" : false);
+        await second;
+        client.sessions[1]!.finishTurn();
+        await vi.waitFor(() => expect(client.sessions[0]!.prompts).toHaveLength(1));
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        expect(client.sessions[0]!.prompts).toHaveLength(1);
+        expect(parseAgentMessage(client.sessions[0]!.prompts[0])).toMatchObject({
+          source: { kind: "agent-notification", agentId: child.id, event: "finished" },
+        });
+      } finally {
+        await mcpClient?.close();
+        await removeAgentStateDir(manager, storage, workdir);
+      }
+    },
+  );
+
   const logger = createTestLogger();
   const existingCwd = process.cwd();
 
@@ -4100,7 +4403,7 @@ describe("send_agent_prompt MCP tool", () => {
 
     const response = await tool.handler(parsed.data as Record<string, unknown>);
 
-    expect(spies.agentManager.subscribe).toHaveBeenCalledTimes(1);
+    expect(spies.agentManager.subscribe).toHaveBeenCalled();
     expect(spies.agentManager.waitForAgentEvent).not.toHaveBeenCalled();
     expect(response.structuredContent.guidance).toBe(
       "You will get notified when the prompted agent finishes, errors, or needs permission. Do not poll for status; continue with other work until the notification arrives.",
@@ -4270,7 +4573,7 @@ describe("send_agent_prompt MCP tool", () => {
     },
   );
 
-  it.each(["out_of_band", "startup_failure"] as const)(
+  it.each(["out_of_band", "out_of_band_interrupt", "startup_failure"] as const)(
     "preserves %s dispatch notification semantics",
     async (scenario) => {
       const workdir = await mkdtemp(join(tmpdir(), "mcp-dispatch-notification-"));
@@ -4306,10 +4609,11 @@ describe("send_agent_prompt MCP tool", () => {
           prompt: "Ongoing task",
           notifyOnFinish: false,
         });
-        if (scenario === "out_of_band") {
+        if (scenario !== "startup_failure") {
           const response = await invokeToolWithParsedInput(tool, {
             agentId: child.id,
             prompt: "/side-command",
+            activeTurnBehavior: scenario === "out_of_band_interrupt" ? "interrupt" : "steer",
           });
           expect(response.structuredContent).toMatchObject({
             success: true,
diff --git a/packages/server/src/server/agent/tools/paseo-tools.ts b/packages/server/src/server/agent/tools/paseo-tools.ts
index 68e9d99a40..64d36d3b52 100644
--- a/packages/server/src/server/agent/tools/paseo-tools.ts
+++ b/packages/server/src/server/agent/tools/paseo-tools.ts
@@ -6,7 +6,7 @@ import type { Logger } from "pino";
 
 import type { AgentMode, AgentProvider, AgentSessionConfig } from "../agent-sdk-types.js";
 import type { AgentManager } from "../agent-manager.js";
-import { AgentProfileSchema } from "@getpaseo/protocol/messages";
+import { ActiveTurnBehaviorSchema, AgentProfileSchema } from "@getpaseo/protocol/messages";
 import type { DaemonConfigStore } from "../../daemon-config-store.js";
 import {
   AgentFeatureSchema,
@@ -1209,6 +1209,9 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
     .object(legacyTopLevelCreateAgentInputSchema)
     .strict();
   const commonSendAgentPromptInputSchema = {
+    activeTurnBehavior: ActiveTurnBehaviorSchema.optional().describe(
+      'How to send into a running turn: "steer" joins it, falling back to interrupt when unavailable; "interrupt" replaces it. Defaults to steer for agent callers and interrupt otherwise.',
+    ),
     agentId: z.string(),
     prompt: z.string(),
     sessionMode: z.string().optional().describe("Optional mode to set before running the prompt."),
@@ -1955,28 +1958,55 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
       inputSchema: sendAgentPromptInputSchema,
       outputSchema: {
         success: z.boolean(),
-        disposition: z.enum(["turn_started", "out_of_band"]).optional(),
+        disposition: z.enum(["turn_started", "out_of_band", "steered"]).optional(),
         status: AgentStatusEnum,
         guidance: z.string().optional(),
       },
     },
-    async ({ agentId, prompt, sessionMode, notifyOnFinish = Boolean(callerAgentId) }) => {
+    async ({
+      agentId,
+      prompt,
+      sessionMode,
+      notifyOnFinish = Boolean(callerAgentId),
+      activeTurnBehavior = callerAgentId ? "steer" : "interrupt",
+    }) => {
       let stopNotification: (() => void) | undefined;
-      function armFinishNotification(disposition: PromptDispatchDisposition): void {
-        if (!callerAgentId || !notifyOnFinish) {
-          return;
-        }
+      let acceptDispatch!: (result: PromptDispatchDisposition | false) => void;
+      const dispatchResult = new Promise<PromptDispatchDisposition | false>((resolve) => {
+        acceptDispatch = resolve;
+      });
+      const notifying = Boolean(callerAgentId && notifyOnFinish);
+      if (callerAgentId && notifyOnFinish) {
         stopNotification = setupFinishNotification({
           agentManager,
           agentStorage,
           childAgentId: agentId,
           callerAgentId,
-          waitForTurnStart: disposition === "turn_started",
+          waitForTurnStart: false,
+          dispatchResult,
+          logger: childLogger,
+        });
+      }
+      function confirmDispatch(disposition: PromptDispatchDisposition): void {
+        // A new turn must ignore outcomes from the displaced turn. Its iterator
+        // has not started yet, so rearm here; steering keeps the early observer.
+        if (disposition !== "turn_started") {
+          acceptDispatch(disposition);
+          return;
+        }
+        acceptDispatch(disposition);
+        if (!callerAgentId || !notifyOnFinish) return;
+        stopNotification?.();
+        stopNotification = setupFinishNotification({
+          agentManager,
+          agentStorage,
+          childAgentId: agentId,
+          callerAgentId,
+          waitForTurnStart: true,
           logger: childLogger,
         });
       }
 
-      const notifying = Boolean(callerAgentId && notifyOnFinish);
       const { disposition } = await sendPromptToAgent({
         agentManager,
         agentStorage,
@@ -1984,9 +2014,11 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
         prompt,
         source: callerAgentId ? { kind: "agent-message", agentId: callerAgentId } : undefined,
         sessionMode,
-        onDispatch: armFinishNotification,
+        activeTurnBehavior,
+        onDispatch: confirmDispatch,
         logger: childLogger,
       }).catch((error) => {
+        acceptDispatch(false);
         stopNotification?.();
         if (error instanceof AgentNotFoundError) {
           throw new PaseoToolInputError(error.message);
diff --git a/public-docs/cli.md b/public-docs/cli.md
index c8f3cc0e1a..f118d35894 100644
--- a/public-docs/cli.md
+++ b/public-docs/cli.md
@@ -289,9 +289,12 @@ Use the recipient's agent ID from `paseo ls`, or [copy it from the agent's tab](
 ```bash
 paseo send <id> "now run the tests"
 paseo send <id> --image screenshot.png "what's wrong here?"
-paseo send <id> --no-wait "queue this task"
+paseo send <id> --no-wait "run this task"
+paseo send <id> --behavior interrupt "stop and do this instead"
 ```
 
+Agent-originated sends (`PASEO_AGENT_ID` set) default to steering the running turn. Other sends default to interrupting it. Use `--behavior steer` or `--behavior interrupt` to override the default. Steering uses the same fallback as the client: if steering is unavailable, the running turn is interrupted and replaced.
+
 ## Viewing logs
 
 ```bash
diff --git a/public-docs/orchestration-workflows.md b/public-docs/orchestration-workflows.md
index e7e5f271c3..61343e5cff 100644
--- a/public-docs/orchestration-workflows.md
+++ b/public-docs/orchestration-workflows.md
@@ -51,7 +51,7 @@ Agents can prompt each other by **agent ID**, the identifier Paseo uses to addre
 
 > Use Paseo to send this prompt to agent [paste agent ID here]: “Review the parser changes in your workspace and report any missing test cases.”
 
-The receiving agent gets the prompt in its existing conversation. To have it send a separate message back, give it the sender's agent ID too.
+The receiving agent gets the prompt in its existing conversation. Agent-originated sends default to steering a running turn, with interruption fallback when steering is unavailable. Set MCP `activeTurnBehavior` or CLI `--behavior` to `steer` or `interrupt` to override that default. To have it send a separate message back, give it the sender's agent ID too.
 
 Underneath, the agent calls `send_agent_prompt` with the recipient's `agentId` and a `prompt`. Agents can also discover IDs with `list_agents`; the CLI uses [`paseo send <id>`](/docs/cli#sending-messages). For another host, use the [remote CLI workflow](#work-on-another-machine).
 
diff --git a/skills/paseo/SKILL.md b/skills/paseo/SKILL.md
index b7fe95811d..83d329f948 100644
--- a/skills/paseo/SKILL.md
+++ b/skills/paseo/SKILL.md
@@ -63,7 +63,7 @@ Detach is an explicit user action in the subagents track, not an agent tool. A c
 
 Agent-scoped `create_agent` defaults `notifyOnFinish` to true. Set it to `false` only for truly fire-and-forget agents.
 
-**`send_agent_prompt`** — `{ agentId, prompt }`. Use for follow-ups to an existing agent. Returns after dispatch acknowledgement. Agent-scoped calls default `notifyOnFinish` to true; top-level calls have no parent callback.
+**`send_agent_prompt`** — `{ agentId, prompt, activeTurnBehavior? }`. Use for follow-ups to an existing agent. Agent-scoped calls default to `steer`; top-level calls default to `interrupt`. Set `activeTurnBehavior` to `steer` or `interrupt` to override the default. Steering falls back to interruption when unavailable. CLI agent sends use the same defaults and accept `--behavior steer|interrupt`. Returns after dispatch acknowledgement. Agent-scoped calls default `notifyOnFinish` to true; top-level calls have no parent callback.
 
 **`update_agent`** — `{ agentId, name?, labels?, settings? }`. Use `settings` for runtime changes on an existing agent: `modeId`, `model`, `thinkingOptionId`, and provider-specific `features`. For Codex fast mode, pass `settings: { features: { "fast_mode": true } }`.
 

From 6e5a4682eeeaed24a7b1bfab48df89b31f1fe0fe Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 21:36:41 +0700
Subject: [PATCH 238/270] fix(markdown): render own-line images as blocks
 (#7237)

An image alone on its line, inside a paragraph with other lines, rendered inline
on iOS and web: the library only treats sole-child paragraph images as blocks,
and with hardSoftBreaks every newline is a break node. The source adaptation now
gives such images their own paragraph (keeping quote markers and list
indentation), so all platforms render them as blocks with image margins. Images
sharing a line with text stay inline. Verified through the library's md4c wasm
parser in the renderer tests.
---
 docs/markdown-renderer.md                     |  2 +-
 .../src/components/markdown/renderer.test.ts  | 53 +++++++++++++++++++
 .../app/src/components/markdown/source.ts     | 42 ++++++++++++++-
 3 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/docs/markdown-renderer.md b/docs/markdown-renderer.md
index 418095730a..a4d6a93b5e 100644
--- a/docs/markdown-renderer.md
+++ b/docs/markdown-renderer.md
@@ -8,7 +8,7 @@ Native selection belongs to the library's text view. Keep an assistant message i
 
 Workspace file links use the shared file-link resolver. The workspace supplies its client, root and open-file action once; chat can supply the agent's more specific context. URLs use the same link press path. Recognized inline-code paths stay tappable. The library callback carries the tapped occurrence’s syntax context. Preserve it when opening files: explicit Markdown links decode URL escapes, while recognized inline-code paths preserve literal percent characters and use suffix lookup. Identical URL strings in different occurrences must stay distinct. Explicit absolute workspace links receive a relative hover title; existing authored titles remain intact.
 
-Resolve workspace image paths over the existing session RPC, then give the library a cached native file URL or web blob URL. HTTP(S) images pass through unchanged. This preserves relay, SSH and local socket connections, which do not expose a daemon HTTP endpoint. Each mounted renderer owns its image acquisition identity, so a later reply reads a rewritten path again while the earlier mounted reply retains its snapshot. Image taps open the attachment lightbox. File previews resolve relative images against the Markdown file's directory.
+Resolve workspace image paths over the existing session RPC, then give the library a cached native file URL or web blob URL. HTTP(S) images pass through unchanged. This preserves relay, SSH and local socket connections, which do not expose a daemon HTTP endpoint. Each mounted renderer owns its image acquisition identity, so a later reply reads a rewritten path again while the earlier mounted reply retains its snapshot. Image taps open the attachment lightbox. File previews resolve relative images against the Markdown file's directory. An image alone on its line becomes its own paragraph before the library sees it, so it renders as a block on every platform; the library only treats sole-child paragraph images as blocks, and with hard soft breaks every newline is a break node, which left own-line images inline on iOS and web. Images that share a line with text stay inline.
 
 ## Engine constraints
 
diff --git a/packages/app/src/components/markdown/renderer.test.ts b/packages/app/src/components/markdown/renderer.test.ts
index 218cdc8884..8791cf40de 100644
--- a/packages/app/src/components/markdown/renderer.test.ts
+++ b/packages/app/src/components/markdown/renderer.test.ts
@@ -1,5 +1,8 @@
 import { fromMarkdown } from "mdast-util-from-markdown";
 import { toNativeLinkRecognition } from "react-native-enriched-markdown/src/utils/regexParser";
+import { parseMarkdown } from "react-native-enriched-markdown/src/web/parseMarkdown";
+import { markInlineImages } from "react-native-enriched-markdown/src/web/utils";
+import type { ASTNode } from "react-native-enriched-markdown/src/web/types";
 import { QueryClient } from "@tanstack/react-query";
 import { decodeMarkdownImage, getMarkdownImageStatus } from "./image-decoding";
 import { describe, expect, it } from "vitest";
@@ -31,6 +34,56 @@ describe("shared Markdown source adaptation", () => {
       "> - ![Image](<file:///cache/a.png>)\n\n[picture]: ../a.png",
     );
   });
+  it("gives an image alone on its line its own paragraph", () => {
+    expect(
+      prepareMarkdownSource("Before the shot:\n![Shot](https://x/a.png)\nAfter it.").render(),
+    ).toBe("Before the shot:\n\n![Shot](https://x/a.png)\n\nAfter it.");
+    expect(prepareMarkdownSource("![A](https://x/a.png)\n![B](https://x/b.png)").render()).toBe(
+      "![A](https://x/a.png)\n\n![B](https://x/b.png)",
+    );
+    expect(
+      prepareMarkdownSource(
+        "Line one\\\n[![Linked](https://x/a.png)](https://x)\nLine three",
+      ).render(),
+    ).toBe("Line one\n\n[![Linked](https://x/a.png)](https://x)\n\nLine three");
+  });
+  it("keeps images that share a line with text inline", () => {
+    const source = "Icon ![i](https://x/i.png) in text\n![a](https://x/a.png) caption\nNext line";
+    expect(prepareMarkdownSource(source).render()).toBe(source);
+  });
+  it("splits own-line images inside quotes and list items without ending the container", () => {
+    expect(prepareMarkdownSource("> Quote text\n> ![Shot](https://x/a.png)\n> More").render()).toBe(
+      "> Quote text\n>\n> ![Shot](https://x/a.png)\n>\n> More",
+    );
+    expect(
+      prepareMarkdownSource("- Item text\n  ![Shot](https://x/a.png)\n  More\n- Next").render(),
+    ).toBe("- Item text\n\n  ![Shot](https://x/a.png)\n\n  More\n- Next");
+    expect(prepareMarkdownSource("- ![Shot](https://x/a.png)\n  Caption line").render()).toBe(
+      "- ![Shot](https://x/a.png)\n\n  Caption line",
+    );
+  });
+  it("renders own-line images as blocks through the library parser", async () => {
+    const source =
+      "Before:\n![Shot](https://x/a.png)\nIcon ![i](https://x/i.png) in text\n> Quoted\n> ![Q](https://x/q.png)";
+    const tree = await parseMarkdown(prepareMarkdownSource(source).render(), {
+      hardSoftBreaks: true,
+      latexMath: false,
+    });
+    markInlineImages(tree);
+    const images: ASTNode[] = [];
+    const collect = (node: ASTNode) => {
+      if (node.type === "Image") images.push(node);
+      node.children?.forEach(collect);
+    };
+    collect(tree);
+    expect(
+      images.map((image) => [image.attributes?.url, image.attributes?.isInline === true]),
+    ).toEqual([
+      ["https://x/a.png", false],
+      ["https://x/i.png", true],
+      ["https://x/q.png", false],
+    ]);
+  });
   it("escapes spoiler delimiters only in prose", () => {
     expect(prepareMarkdownSource("Show ||words|| and `||code||`.").render()).toBe(
       "Show \\|\\|words\\|\\| and `||code||`.",
diff --git a/packages/app/src/components/markdown/source.ts b/packages/app/src/components/markdown/source.ts
index fc6f7463a5..9fda25b728 100644
--- a/packages/app/src/components/markdown/source.ts
+++ b/packages/app/src/components/markdown/source.ts
@@ -5,7 +5,7 @@ import { gfmTableFromMarkdown } from "mdast-util-gfm-table";
 import type { AssistantFileLinkSource } from "@/assistant-file-links";
 import { decodeString } from "micromark-util-decode-string";
 import { fromMarkdown } from "mdast-util-from-markdown";
-import type { Link, Nodes, Root } from "mdast";
+import type { Link, Nodes, Paragraph, PhrasingContent, Root } from "mdast";
 
 // Keep this regex in the syntax shared by JavaScript, ICU and java.util.regex.
 // The Unicode flag makes Metro expand it to escapes rejected by native engines.
@@ -130,10 +130,50 @@ export function prepareMarkdownSource(
         end,
       });
   }
+  // Line boundaries already turned into paragraph breaks, by offset of their newline.
+  const splitBoundaries = new Set<number>();
+  function isImageLike(node: PhrasingContent): boolean {
+    if (node.type === "image" || node.type === "imageReference") return true;
+    return (
+      (node.type === "link" || node.type === "linkReference") &&
+      node.children.length === 1 &&
+      isImageLike(node.children[0])
+    );
+  }
+  // An image alone on its line becomes its own paragraph, so every platform renders
+  // it as a block. The library only treats sole-child paragraph images as blocks;
+  // with hardSoftBreaks every newline is a break node, which made these inline.
+  function splitStandaloneImages(paragraph: Paragraph, start: number, end: number) {
+    for (const child of paragraph.children) {
+      const childStart = child.position?.start.offset;
+      const childEnd = child.position?.end.offset;
+      if (childStart === undefined || childEnd === undefined || !isImageLike(child)) continue;
+      const lineStart = source.lastIndexOf("\n", childStart - 1) + 1;
+      const newline = source.indexOf("\n", childEnd);
+      const lineEnd = newline === -1 ? source.length : newline;
+      const prefix = source.slice(lineStart, childStart);
+      const suffix = source.slice(childEnd, lineEnd);
+      const aloneBefore = childStart === start || /^[\s>]*$/.test(prefix);
+      const aloneAfter = /^\s*\\?$/.test(suffix);
+      if (!aloneBefore || !aloneAfter) continue;
+      // Continuation lines inside quotes and lists keep their quote markers on the blank line.
+      const blank = prefix.replace(/[^>]/g, " ").trimEnd();
+      const split = (boundary: number) => {
+        if (splitBoundaries.has(boundary)) return;
+        splitBoundaries.add(boundary);
+        // A trailing backslash was a hard break; at a paragraph end it would render literally.
+        const cut = source[boundary - 1] === "\\" ? boundary - 1 : boundary;
+        edits.push({ start: cut, end: boundary + 1, text: `\n${blank}\n` });
+      };
+      if (lineStart > start) split(lineStart - 1);
+      if (lineEnd < end) split(lineEnd);
+    }
+  }
   function visit(node: Nodes) {
     const start = node.position?.start.offset;
     const end = node.position?.end.offset;
     if (start !== undefined && end !== undefined) {
+      if (node.type === "paragraph") splitStandaloneImages(node, start, end);
       if (node.type === "link") {
         const title = workspaceHoverTitle(node, source.slice(start, end), workspaceRoot);
         if (title !== null)

From 86ab49153ae7aa43017fadda2eb115879d05c5b8 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 16:54:51 +0200
Subject: [PATCH 239/270] Let Copilot implement plans after selecting Allow All
 (#7234)

Selecting Allow All now moves Copilot to Agent mode before enabling allow_all, so a session that was in Plan can implement the plan.

Closes #3855.

Co-authored-by: KiraPC <pasqualecarmine.carbone@gmail.com>
---
 .../server/agent/providers/acp-agent.test.ts  | 14 +++-
 .../agent/providers/copilot-acp-agent.ts      |  4 +
 .../copilot-allow-all-mode.real.e2e.test.ts   | 82 +++++++++++++++++++
 3 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 packages/server/src/server/agent/providers/copilot-allow-all-mode.real.e2e.test.ts

diff --git a/packages/server/src/server/agent/providers/acp-agent.test.ts b/packages/server/src/server/agent/providers/acp-agent.test.ts
index 33c9696900..a050aa9077 100644
--- a/packages/server/src/server/agent/providers/acp-agent.test.ts
+++ b/packages/server/src/server/agent/providers/acp-agent.test.ts
@@ -1617,7 +1617,12 @@ describe("ACPAgentSession Zed parity", () => {
       configId: "allow_all",
       value: "on",
     });
-    expect(setSessionMode).not.toHaveBeenCalled();
+    // Allow All is agent mode with permissions pre-granted, so it has to leave
+    // whatever mode the session is in, not just flip the flag.
+    expect(setSessionMode).toHaveBeenCalledWith({
+      sessionId: "session-1",
+      modeId: "https://agentclientprotocol.com/protocol/session-modes#agent",
+    });
     await expect(session.getCurrentMode()).resolves.toBe(COPILOT_ALLOW_ALL_MODE_ID);
     expect(events.some((event) => event.type === "permission_requested")).toBe(false);
   });
@@ -1648,7 +1653,12 @@ describe("ACPAgentSession Zed parity", () => {
       configId: "allow_all",
       value: "on",
     });
-    expect(setSessionMode).not.toHaveBeenCalled();
+    // Allow All is agent mode with permissions pre-granted, so it has to leave
+    // whatever mode the session is in, not just flip the flag.
+    expect(setSessionMode).toHaveBeenCalledWith({
+      sessionId: "session-1",
+      modeId: "https://agentclientprotocol.com/protocol/session-modes#agent",
+    });
     await expect(session.getCurrentMode()).resolves.toBe(COPILOT_ALLOW_ALL_MODE_ID);
   });
 
diff --git a/packages/server/src/server/agent/providers/copilot-acp-agent.ts b/packages/server/src/server/agent/providers/copilot-acp-agent.ts
index b9497d910b..5307fe0d5e 100644
--- a/packages/server/src/server/agent/providers/copilot-acp-agent.ts
+++ b/packages/server/src/server/agent/providers/copilot-acp-agent.ts
@@ -209,6 +209,10 @@ export async function writeCopilotProviderMode(
   if (!requestsAllowAll) {
     return { handled: false };
   }
+  await context.connection.setSessionMode({
+    sessionId: context.sessionId,
+    modeId: COPILOT_AGENT_MODE_ID,
+  });
   const response = await context.connection.setSessionConfigOption({
     sessionId: context.sessionId,
     configId: COPILOT_ALLOW_ALL_CONFIG_ID,
diff --git a/packages/server/src/server/agent/providers/copilot-allow-all-mode.real.e2e.test.ts b/packages/server/src/server/agent/providers/copilot-allow-all-mode.real.e2e.test.ts
new file mode 100644
index 0000000000..840ad29695
--- /dev/null
+++ b/packages/server/src/server/agent/providers/copilot-allow-all-mode.real.e2e.test.ts
@@ -0,0 +1,82 @@
+import { beforeAll, describe, expect, test } from "vitest";
+import { spawn } from "node:child_process";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { Readable, Writable } from "node:stream";
+import { ClientSideConnection, ndJsonStream, PROTOCOL_VERSION } from "@agentclientprotocol/sdk";
+
+import { isCommandAvailable } from "../../../executable-resolution/executable-resolution.js";
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import { terminateWithTreeKill } from "../../../utils/tree-kill.js";
+import { resolveACPModeSelection } from "./acp-agent.js";
+import {
+  COPILOT_ALLOW_ALL_MODE_ID,
+  COPILOT_MODES,
+  writeCopilotProviderMode,
+} from "./copilot-acp-agent.js";
+
+const AGENT_MODE_ID = "https://agentclientprotocol.com/protocol/session-modes#agent";
+const PLAN_MODE_ID = "https://agentclientprotocol.com/protocol/session-modes#plan";
+
+describe("Copilot ACP provider (real) Allow All mode", () => {
+  let canRun = false;
+
+  beforeAll(async () => {
+    canRun = await isCommandAvailable("copilot");
+  });
+
+  test("selecting Allow All from Plan leaves the real provider in Agent mode", async (context) => {
+    if (!canRun) {
+      context.skip();
+    }
+    const cwd = await mkdtemp(join(tmpdir(), "copilot-allow-all-real-"));
+    const child = spawn("copilot", ["--acp"], { cwd, stdio: ["pipe", "pipe", "ignore"] });
+    const connection = new ClientSideConnection(
+      () => ({
+        sessionUpdate: async () => {},
+        requestPermission: async () => ({ outcome: { outcome: "cancelled" } }),
+      }),
+      ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout)),
+    );
+
+    try {
+      await connection.initialize({ protocolVersion: PROTOCOL_VERSION, clientCapabilities: {} });
+      const session = await connection.newSession({ cwd, mcpServers: [] });
+      const plan = await connection.setSessionConfigOption({
+        sessionId: session.sessionId,
+        configId: "mode",
+        value: PLAN_MODE_ID,
+      });
+      expect(plan.configOptions).toContainEqual(
+        expect.objectContaining({ id: "mode", currentValue: PLAN_MODE_ID }),
+      );
+
+      // This is the same provider writer called by ACPAgentSession. Assert its
+      // untransformed ACP response, since Paseo's displayed mode hides this bug.
+      const result = await writeCopilotProviderMode({
+        connection,
+        sessionId: session.sessionId,
+        requestedModeId: COPILOT_ALLOW_ALL_MODE_ID,
+        currentModeId: PLAN_MODE_ID,
+        selection: resolveACPModeSelection({
+          modeId: COPILOT_ALLOW_ALL_MODE_ID,
+          availableModes: COPILOT_MODES,
+          configOptions: plan.configOptions,
+        }),
+        configOptions: plan.configOptions,
+        logger: createTestLogger(),
+      });
+
+      expect(result.configOptions).toContainEqual(
+        expect.objectContaining({ id: "mode", currentValue: AGENT_MODE_ID }),
+      );
+      expect(result.configOptions).toContainEqual(
+        expect.objectContaining({ id: "allow_all", currentValue: "on" }),
+      );
+    } finally {
+      await terminateWithTreeKill(child, { gracefulTimeoutMs: 1000, forceTimeoutMs: 1000 });
+      await rm(cwd, { recursive: true, force: true });
+    }
+  }, 60_000);
+});

From 86817a24fc01469a50ee7a437574dcfd3c7dc782 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 22:06:09 +0700
Subject: [PATCH 240/270] perf(app): fetch project and workspace directories
 concurrently (#7242)

---
 .../src/runtime/directory-sync/index.test.ts  | 54 +++++++++++++++++++
 .../app/src/runtime/directory-sync/index.ts   | 28 ++++++----
 2 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/packages/app/src/runtime/directory-sync/index.test.ts b/packages/app/src/runtime/directory-sync/index.test.ts
index 2dea552239..98e0ea29b3 100644
--- a/packages/app/src/runtime/directory-sync/index.test.ts
+++ b/packages/app/src/runtime/directory-sync/index.test.ts
@@ -1207,6 +1207,60 @@ describe("DirectorySync session readiness", () => {
     directory.dispose();
   });
 
+  it.each(["projects", "workspaces"] as const)(
+    "requests projects and workspaces together and commits once when %s responds first",
+    async (firstResponse) => {
+      const serverId = `parallel-directory-${firstResponse}`;
+      const { client, directory } = createDirectory(serverId);
+      const store = useSessionStore.getState();
+      store.initializeSession(serverId, client as unknown as DaemonClient, 1);
+      store.updateSessionServerInfo(serverId, {
+        serverId,
+        hostname: null,
+        version: "test",
+        features: { workspaceMultiplicity: true, projectList: true },
+      });
+      const releaseProjects = client.holdProjectFetch();
+      const releaseWorkspaces = client.holdWorkspaceFetch();
+      const project = {
+        projectId: "parallel-project",
+        projectDisplayName: "Project baseline",
+        projectRootPath: "/repo/parallel",
+        projectKind: "git" as const,
+      };
+      const projects: ProjectListResult = { requestId: "projects", projects: [project] };
+      const workspaces: WorkspaceFetchResult = {
+        requestId: "workspaces",
+        entries: [createWorkspaceEntry("parallel-workspace")],
+        emptyProjects: [{ ...project, projectDisplayName: "Newer workspace overlay" }],
+        pageInfo: { hasMore: false, nextCursor: null, prevCursor: null },
+      };
+      const refresh = directory.refreshWorkspaces();
+      try {
+        await expect.poll(() => client.listProjectsCalls).toBe(1);
+        await expect.poll(() => client.fetchWorkspacesCalls).toBe(1);
+        if (firstResponse === "projects") releaseProjects(projects);
+        else releaseWorkspaces(workspaces);
+        await new Promise<void>((resolve) => setTimeout(resolve, 0));
+        expect(useSessionStore.getState().sessions[serverId].workspaces.size).toBe(0);
+        expect(useSessionStore.getState().sessions[serverId].projects.size).toBe(0);
+        releaseProjects(projects);
+        releaseWorkspaces(workspaces);
+        await refresh;
+        const session = useSessionStore.getState().sessions[serverId];
+        expect(session.workspaces.has("parallel-workspace")).toBe(true);
+        expect(session.projects.get(project.projectId)?.projectDisplayName).toBe(
+          "Newer workspace overlay",
+        );
+      } finally {
+        releaseProjects(projects);
+        releaseWorkspaces(workspaces);
+        await refresh;
+        directory.dispose();
+      }
+    },
+  );
+
   it("keeps the accepted baseline when an old connection finishes its workspace request", async () => {
     const serverId = "superseded-workspace-baseline";
     const { client, directory } = createDirectory(serverId);
diff --git a/packages/app/src/runtime/directory-sync/index.ts b/packages/app/src/runtime/directory-sync/index.ts
index 28b217fea6..b59440d782 100644
--- a/packages/app/src/runtime/directory-sync/index.ts
+++ b/packages/app/src/runtime/directory-sync/index.ts
@@ -563,16 +563,20 @@ export class DirectorySync {
       const serverInfo = useSessionStore.getState().sessions[this.serverId]?.serverInfo;
       const supportsProjectList = serverInfo?.features?.projectList === true;
       const supportsDirectorySync = serverInfo?.features?.directorySync === true;
-      if (supportsProjectList) {
-        await this.fetchProjectSnapshot(client, source, transaction, supportsDirectorySync);
-      }
-      await this.fetchWorkspaceSnapshot(
-        client,
-        source,
-        transaction,
-        input?.subscribe === true,
-        supportsDirectorySync,
-      );
+      const projectsReady = supportsProjectList
+        ? this.fetchProjectSnapshot(client, source, transaction, supportsDirectorySync)
+        : Promise.resolve();
+      await Promise.all([
+        projectsReady,
+        this.fetchWorkspaceSnapshot(
+          client,
+          source,
+          transaction,
+          input?.subscribe === true,
+          supportsDirectorySync,
+          projectsReady,
+        ),
+      ]);
       if (!supportsProjectList) {
         this.buildLegacyProjectSnapshot(transaction.snapshot);
         (transaction.snapshot.syncModes ??= {}).projects =
@@ -592,6 +596,7 @@ export class DirectorySync {
     transaction: DirectoryTransaction<WorkspaceRefreshSnapshot, WorkspaceDirectoryDelta>,
     initialSubscribe: boolean,
     supportsDirectorySync: boolean,
+    projectsReady: Promise<void>,
   ): Promise<void> {
     let cursor: string | null = null;
     let subscribe = initialSubscribe;
@@ -618,6 +623,9 @@ export class DirectorySync {
         });
         payload = await subscription.ready;
       } else payload = await client.fetchWorkspaces(query);
+      // Fetch both directories together, but apply the project baseline before the
+      // workspace page's empty-project overlays, regardless of response order.
+      await projectsReady;
       this.assertWorkspaceTransactionCurrent(client, source, transaction);
       applyWorkspaceSnapshotPage(transaction.snapshot, payload, cursor === null);
       if (!payload.pageInfo.hasMore || !payload.pageInfo.nextCursor) return;

From ecd42015b98f27f2ddf4708f7266a5267ac638d4 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 22:27:55 +0700
Subject: [PATCH 241/270] Redesign the compact New workspace form as full-width
 field triggers (#7239)

* Redesign the compact New workspace form as full-width field triggers

Each compact field is one full-width trigger with its label inside, above the
value, so the whole field is the tap target and presses highlight. The stack
stays anchored on the composer with Isolation and Branch rows reserved, so
nothing shifts as they come and go. Import session moves into the compact
header, and the title is gone; the fields name themselves.

The form's presentational code moves out of new-workspace-screen.tsx into
screens/new-workspace/form, where desktop badges and compact fields share one
FieldTrigger.

* Restore the desktop badge pressed colour

Main pressed badges to surface0; the field-trigger extraction folded it into the surface2 hover state.

* Use base text size for compact field values

docs/design.md sets interface text at fontSize.base; hierarchy comes from the muted label above.
---
 packages/app/src/i18n/resources/ar.ts         |    3 +-
 packages/app/src/i18n/resources/en.ts         |    3 +-
 packages/app/src/i18n/resources/es.ts         |    3 +-
 packages/app/src/i18n/resources/fr.ts         |    3 +-
 packages/app/src/i18n/resources/ja.ts         |    3 +-
 packages/app/src/i18n/resources/ko.ts         |    3 +-
 packages/app/src/i18n/resources/pt-BR.ts      |    3 +-
 packages/app/src/i18n/resources/ru.ts         |    3 +-
 packages/app/src/i18n/resources/zh-CN.ts      |    3 +-
 .../app/src/screens/new-workspace-screen.tsx  | 1038 +----------------
 .../new-workspace/form/field-trigger.tsx      |  217 ++++
 .../src/screens/new-workspace/form/icons.tsx  |   49 +
 .../src/screens/new-workspace/form/index.tsx  |  392 +++++++
 .../new-workspace/form}/launch-control.tsx    |   72 +-
 .../screens/new-workspace/form/options.tsx    |  166 +++
 .../new-workspace/import-session-button.tsx   |    7 +-
 16 files changed, 914 insertions(+), 1054 deletions(-)
 create mode 100644 packages/app/src/screens/new-workspace/form/field-trigger.tsx
 create mode 100644 packages/app/src/screens/new-workspace/form/icons.tsx
 create mode 100644 packages/app/src/screens/new-workspace/form/index.tsx
 rename packages/app/src/{new-workspace-launch => screens/new-workspace/form}/launch-control.tsx (79%)
 create mode 100644 packages/app/src/screens/new-workspace/form/options.tsx

diff --git a/packages/app/src/i18n/resources/ar.ts b/packages/app/src/i18n/resources/ar.ts
index 2f1fd7397f..4adf945b61 100644
--- a/packages/app/src/i18n/resources/ar.ts
+++ b/packages/app/src/i18n/resources/ar.ts
@@ -1334,8 +1334,9 @@ export const ar: TranslationResources = {
     },
     fields: {
       project: "المشروع",
-      base: "الأساس",
+      branch: "الفرع",
       baseNotApplicable: "غير قابل للتطبيق",
+      host: "المضيف",
     },
     titlePlaceholder: "العنوان (اختياري)",
     errors: {
diff --git a/packages/app/src/i18n/resources/en.ts b/packages/app/src/i18n/resources/en.ts
index 14cde732e7..9bb0460036 100644
--- a/packages/app/src/i18n/resources/en.ts
+++ b/packages/app/src/i18n/resources/en.ts
@@ -1342,8 +1342,9 @@ export const en = {
     },
     fields: {
       project: "Project",
-      base: "Base",
+      branch: "Branch",
       baseNotApplicable: "Not applicable",
+      host: "Host",
     },
     titlePlaceholder: "Title (optional)",
     errors: {
diff --git a/packages/app/src/i18n/resources/es.ts b/packages/app/src/i18n/resources/es.ts
index 18eb17f291..9ed1e85572 100644
--- a/packages/app/src/i18n/resources/es.ts
+++ b/packages/app/src/i18n/resources/es.ts
@@ -1370,8 +1370,9 @@ export const es: TranslationResources = {
     },
     fields: {
       project: "Proyecto",
-      base: "Base",
+      branch: "Rama",
       baseNotApplicable: "No aplicable",
+      host: "Host",
     },
     titlePlaceholder: "Título (opcional)",
     errors: {
diff --git a/packages/app/src/i18n/resources/fr.ts b/packages/app/src/i18n/resources/fr.ts
index 2bae7b8647..6563b1100e 100644
--- a/packages/app/src/i18n/resources/fr.ts
+++ b/packages/app/src/i18n/resources/fr.ts
@@ -1363,8 +1363,9 @@ export const fr: TranslationResources = {
     },
     fields: {
       project: "Projet",
-      base: "Base",
+      branch: "Branche",
       baseNotApplicable: "Non applicable",
+      host: "Hôte",
     },
     titlePlaceholder: "Titre (facultatif)",
     errors: {
diff --git a/packages/app/src/i18n/resources/ja.ts b/packages/app/src/i18n/resources/ja.ts
index 58e2706b95..eb22dd663a 100644
--- a/packages/app/src/i18n/resources/ja.ts
+++ b/packages/app/src/i18n/resources/ja.ts
@@ -1348,8 +1348,9 @@ export const ja: TranslationResources = {
     },
     fields: {
       project: "プロジェクト",
-      base: "ベース",
+      branch: "ブランチ",
       baseNotApplicable: "該当なし",
+      host: "ホスト",
     },
     titlePlaceholder: "タイトル（任意）",
     errors: {
diff --git a/packages/app/src/i18n/resources/ko.ts b/packages/app/src/i18n/resources/ko.ts
index fa962a5562..afdb8974e9 100644
--- a/packages/app/src/i18n/resources/ko.ts
+++ b/packages/app/src/i18n/resources/ko.ts
@@ -1341,8 +1341,9 @@ export const ko: TranslationResources = {
     },
     fields: {
       project: "프로젝트",
-      base: "기준",
+      branch: "브랜치",
       baseNotApplicable: "해당 없음",
+      host: "호스트",
     },
     titlePlaceholder: "제목(선택 사항)",
     errors: {
diff --git a/packages/app/src/i18n/resources/pt-BR.ts b/packages/app/src/i18n/resources/pt-BR.ts
index c5c6607ca6..f89fb97bf0 100644
--- a/packages/app/src/i18n/resources/pt-BR.ts
+++ b/packages/app/src/i18n/resources/pt-BR.ts
@@ -1360,8 +1360,9 @@ export const ptBR: TranslationResources = {
     },
     fields: {
       project: "Projeto",
-      base: "Base",
+      branch: "Branch",
       baseNotApplicable: "Não aplicável",
+      host: "Host",
     },
     titlePlaceholder: "Título (opcional)",
     errors: {
diff --git a/packages/app/src/i18n/resources/ru.ts b/packages/app/src/i18n/resources/ru.ts
index 4df3f721bb..a1a70822b4 100644
--- a/packages/app/src/i18n/resources/ru.ts
+++ b/packages/app/src/i18n/resources/ru.ts
@@ -1352,8 +1352,9 @@ export const ru: TranslationResources = {
     },
     fields: {
       project: "Проект",
-      base: "Базовая ветка",
+      branch: "Ветка",
       baseNotApplicable: "Неприменимо",
+      host: "Хост",
     },
     titlePlaceholder: "Заголовок (необязательно)",
     errors: {
diff --git a/packages/app/src/i18n/resources/zh-CN.ts b/packages/app/src/i18n/resources/zh-CN.ts
index bad9cc4690..ca221d7d3a 100644
--- a/packages/app/src/i18n/resources/zh-CN.ts
+++ b/packages/app/src/i18n/resources/zh-CN.ts
@@ -1323,8 +1323,9 @@ export const zhCN: TranslationResources = {
     },
     fields: {
       project: "项目",
-      base: "基线",
+      branch: "分支",
       baseNotApplicable: "不适用",
+      host: "主机",
     },
     titlePlaceholder: "标题（可选）",
     errors: {
diff --git a/packages/app/src/screens/new-workspace-screen.tsx b/packages/app/src/screens/new-workspace-screen.tsx
index 6d8fd3de5a..3cb01ae9df 100644
--- a/packages/app/src/screens/new-workspace-screen.tsx
+++ b/packages/app/src/screens/new-workspace-screen.tsx
@@ -6,15 +6,13 @@ import type { AgentSnapshotPayload, CreationSnapshot } from "@getpaseo/protocol/
 import { encodeImages } from "@/utils/encode-images";
 import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from "react";
-import type { ReactElement, ReactNode, RefObject } from "react";
+import type { ReactNode } from "react";
 import { useTranslation } from "react-i18next";
-import type { TFunction } from "i18next";
-import { Pressable, Text, View } from "react-native";
-import type { PressableStateCallbackType } from "react-native";
-import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
+import { router } from "expo-router";
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
 import { createNameId } from "mnemonic-id";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { ChevronDown, Folder, FolderPlus, GitBranch, GitPullRequest } from "lucide-react-native";
 import { Composer } from "@/composer";
 import { ComposerDock } from "@/composer/dock";
 import { useComposerEditingSession, useComposerFullscreen } from "@/composer/editing-session";
@@ -23,14 +21,6 @@ import {
   resolveComposerAttachmentSubmitFormat,
   splitComposerAttachmentsForSubmit,
 } from "@/composer/attachments/submit";
-import { HostStatusDot } from "@/components/host-status-dot";
-import { HostPicker } from "@/components/hosts/host-picker";
-import { ProjectIconView } from "@/components/project-icon-view";
-import { Combobox, ComboboxItem } from "@/components/ui/combobox";
-import type { ComboboxOption as ComboboxOptionType, ComboboxProps } from "@/components/ui/combobox";
-import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
-import { Shortcut } from "@/components/ui/shortcut";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
 import { MenuHeader } from "@/components/headers/menu-header";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -42,7 +32,6 @@ import { ensureCheckoutStatus } from "@/git/checkout-status-cache";
 import { useDaemonConfig } from "@/hooks/use-daemon-config";
 import { resolveTerminalProfiles } from "@getpaseo/protocol/terminal-profiles";
 import type { TerminalProfile } from "@getpaseo/protocol/messages";
-import { LaunchControl } from "@/new-workspace-launch/launch-control";
 import { resolveLaunchTarget, type LaunchTarget } from "@/new-workspace-launch/target";
 import { useTerminalComposerState } from "@/new-workspace-launch/composer-state";
 import { runCreateTerminalWorkspace } from "./new-workspace-terminal";
@@ -71,12 +60,10 @@ import {
 import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
 import type { KeyboardActionId } from "@/keyboard/keyboard-action-dispatcher";
 import { useFormPreferences } from "@/hooks/use-form-preferences";
-import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
 import type { CreateAgentInitialValues } from "@/hooks/use-agent-form-state";
 import { toErrorMessage } from "@/utils/error-messages";
-import { projectIconPlaceholderLabelFromDisplayName } from "@/utils/project-display-name";
+import { buildSettingsAddHostRoute } from "@/utils/host-routes";
 import {
-  getHostProjectSourceDirectory,
   getHostProjectId,
   getWorktreeSupportForHostProject,
   hostProjectFromRoute,
@@ -86,7 +73,6 @@ import {
   type HostProjectListItem,
 } from "@/projects/host-projects";
 import { useProjectIcons } from "@/projects/icons";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
 import type { ComposerAttachment } from "@/attachments/types";
 import { useDraftWorkspaceAttachmentScopeKey } from "@/attachments/workspace-attachments-store";
 import type { MessagePayload } from "@/composer/types";
@@ -122,6 +108,7 @@ import {
 } from "./new-workspace-initial-context";
 import { buildNewWorkspaceProjectIconTargets } from "./new-workspace/project-icon-targets";
 import { useNewWorkspaceProjectPicker } from "./new-workspace/project-picker";
+import { useNewWorkspaceForm } from "./new-workspace/form";
 import { ImportSessionButton } from "./new-workspace/import-session-button";
 import { useImportSession } from "@/hooks/use-import-session";
 import {
@@ -132,12 +119,6 @@ import {
 import { captureWorkspaceDraftCleanup } from "./new-workspace/background-handoff";
 import { useNewWorkspaceScreenPresence } from "./new-workspace/screen-presence";
 
-const ThemedFolderPlus = withUnistyles(FolderPlus);
-const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-const addProjectIcon = (
-  <ThemedFolderPlus size={ICON_SIZE.sm} uniProps={foregroundMutedColorMapping} />
-);
-
 function useIsNewWorkspaceDraftHandoffActive(input: {
   draftId: string | undefined;
   selectedServerId: string;
@@ -198,504 +179,8 @@ const NO_TERMINAL_ATTACHMENTS: UserComposerAttachment[] = [];
 function noopChangeAttachments() {}
 function noopClearDraft() {}
 
-const PROJECT_ICON_FALLBACK_FONT_SIZE = 10;
-const ThemedChevronDown = withUnistyles(ChevronDown);
-const chevronExtraMutedMapping = (theme: Theme) => ({ color: theme.colors.foregroundExtraMuted });
-
-// Every picker chip on this screen shares one chevron so they stay a single
-// visual family. Extra-muted: the chevron is an affordance, not information,
-// and it should sit behind the label it belongs to.
-function MetaChevron(): ReactElement {
-  return (
-    <View style={styles.chevronContainer}>
-      <ThemedChevronDown size={ICON_SIZE.sm} uniProps={chevronExtraMutedMapping} />
-    </View>
-  );
-}
-
-const metaChevron = <MetaChevron />;
-
 // Stable reference so the keyboard-action handler doesn't re-register each render.
 const PROJECT_PICK_ACTIONS: readonly KeyboardActionId[] = ["workspace.project.pick"];
-// Height of a single picker-trigger badge. The Base-row spacer reserves exactly
-// this so toggling Isolation to Local hides the row without shifting the form.
-const BADGE_HEIGHT = 28;
-
-function RefPickerBadgeContent({
-  selectedItem,
-  triggerLabel,
-  iconColor,
-  iconSize,
-}: {
-  selectedItem: PickerItem | null;
-  triggerLabel: string;
-  iconColor: string;
-  iconSize: number;
-}) {
-  return (
-    <>
-      <View style={styles.badgeIconBox}>
-        {selectedItem?.kind === "github-pr" ? (
-          <GitPullRequest size={iconSize} color={iconColor} />
-        ) : (
-          <GitBranch size={iconSize} color={iconColor} />
-        )}
-      </View>
-      <Text style={styles.badgeText} numberOfLines={1}>
-        {triggerLabel}
-      </Text>
-    </>
-  );
-}
-
-function RefPickerTrigger({
-  pickerAnchorRef,
-  onPress,
-  disabled,
-  badgePressableStyle,
-  selectedItem,
-  triggerLabel,
-  accessibilityLabel,
-  tooltipLabel,
-  iconColor,
-  iconSize,
-}: {
-  pickerAnchorRef: React.RefObject<View | null>;
-  onPress: () => void;
-  disabled: boolean;
-  badgePressableStyle: React.ComponentProps<typeof Pressable>["style"];
-  selectedItem: PickerItem | null;
-  triggerLabel: string;
-  accessibilityLabel: string;
-  tooltipLabel: string;
-  iconColor: string;
-  iconSize: number;
-}) {
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild triggerRefProp="ref">
-        <ComboboxTrigger
-          chevron={metaChevron}
-          ref={pickerAnchorRef}
-          testID="new-workspace-ref-picker-trigger"
-          onPress={onPress}
-          disabled={disabled}
-          style={badgePressableStyle}
-          accessibilityRole="button"
-          accessibilityLabel={accessibilityLabel}
-        >
-          <RefPickerBadgeContent
-            selectedItem={selectedItem}
-            triggerLabel={triggerLabel}
-            iconColor={iconColor}
-            iconSize={iconSize}
-          />
-        </ComboboxTrigger>
-      </TooltipTrigger>
-      <TooltipContent side="top" align="center" offset={8}>
-        <Text style={styles.tooltipText}>{tooltipLabel}</Text>
-      </TooltipContent>
-    </Tooltip>
-  );
-}
-
-function ProjectPickerTrigger({
-  pickerAnchorRef,
-  onPress,
-  disabled,
-  badgePressableStyle,
-  label,
-  tooltipLabel,
-  projectViewKey,
-  iconDataUri,
-  iconColor,
-  iconSize,
-}: {
-  pickerAnchorRef: React.RefObject<View | null>;
-  onPress: () => void;
-  disabled: boolean;
-  badgePressableStyle: React.ComponentProps<typeof Pressable>["style"];
-  label: string;
-  tooltipLabel: string;
-  projectViewKey: string | null;
-  iconDataUri: string | null;
-  iconColor: string;
-  iconSize: number;
-}) {
-  const placeholderLabel = projectIconPlaceholderLabelFromDisplayName(label);
-  const placeholderInitial = placeholderLabel.charAt(0).toUpperCase() || "?";
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild triggerRefProp="ref">
-        <ComboboxTrigger
-          chevron={metaChevron}
-          ref={pickerAnchorRef}
-          testID="new-workspace-project-picker-trigger"
-          onPress={onPress}
-          disabled={disabled}
-          style={badgePressableStyle}
-          accessibilityRole="button"
-          accessibilityLabel="Workspace project"
-        >
-          <View style={styles.badgeIconBox}>
-            {projectViewKey ? (
-              <ProjectIconView
-                iconDataUri={iconDataUri}
-                initial={placeholderInitial}
-                projectViewKey={projectViewKey}
-                size={ICON_SIZE.md}
-                textStyle={styles.projectIconFallbackText}
-              />
-            ) : (
-              <Folder size={iconSize} color={iconColor} />
-            )}
-          </View>
-          <Text style={styles.badgeText} numberOfLines={1}>
-            {label}
-          </Text>
-        </ComboboxTrigger>
-      </TooltipTrigger>
-      <TooltipContent side="top" align="center" offset={8}>
-        <Text style={styles.tooltipText}>{tooltipLabel}</Text>
-      </TooltipContent>
-    </Tooltip>
-  );
-}
-
-function PickerOptionItem({
-  testID,
-  label,
-  description,
-  selected,
-  active,
-  disabled,
-  onPress,
-  isBranch,
-  trailingLabel,
-  accessibilityLabel,
-  iconColor,
-  iconSize,
-}: {
-  testID: string;
-  label: string;
-  description: string | undefined;
-  selected: boolean;
-  active: boolean;
-  disabled: boolean;
-  onPress: () => void;
-  isBranch: boolean;
-  trailingLabel?: string;
-  accessibilityLabel?: string;
-  iconColor: string;
-  iconSize: number;
-}) {
-  const leadingSlot = useMemo(
-    () => (
-      <View style={styles.rowIconBox}>
-        {isBranch ? (
-          <GitBranch size={iconSize} color={iconColor} />
-        ) : (
-          <GitPullRequest size={iconSize} color={iconColor} />
-        )}
-      </View>
-    ),
-    [isBranch, iconSize, iconColor],
-  );
-  const trailingSlot = useMemo(
-    () =>
-      trailingLabel ? <Text style={styles.refDivergenceLabel}>{trailingLabel}</Text> : undefined,
-    [trailingLabel],
-  );
-  return (
-    <ComboboxItem
-      testID={testID}
-      label={label}
-      description={description}
-      selected={selected}
-      active={active}
-      disabled={disabled}
-      onPress={onPress}
-      leadingSlot={leadingSlot}
-      trailingSlot={trailingSlot}
-      accessibilityLabel={accessibilityLabel}
-    />
-  );
-}
-
-function IsolationOptionItem({
-  optionId,
-  label,
-  selected,
-  active,
-  disabled,
-  onPress,
-  iconColor,
-  iconSize,
-}: {
-  optionId: string;
-  label: string;
-  selected: boolean;
-  active: boolean;
-  disabled: boolean;
-  onPress: () => void;
-  iconColor: string;
-  iconSize: number;
-}) {
-  const leadingSlot = useMemo(
-    () => (
-      <View style={styles.rowIconBox}>
-        {optionId === "worktree" ? (
-          <GitBranch size={iconSize} color={iconColor} />
-        ) : (
-          <Folder size={iconSize} color={iconColor} />
-        )}
-      </View>
-    ),
-    [optionId, iconSize, iconColor],
-  );
-  return (
-    <ComboboxItem
-      testID={`workspace-create-isolation-${optionId}`}
-      label={label}
-      selected={selected}
-      active={active}
-      disabled={disabled}
-      onPress={onPress}
-      leadingSlot={leadingSlot}
-    />
-  );
-}
-
-function ProjectOptionItem({
-  testID,
-  projectViewKey,
-  iconDataUri,
-  label,
-  description,
-  selected,
-  active,
-  disabled,
-  onPress,
-}: {
-  testID: string;
-  projectViewKey: string;
-  iconDataUri: string | null;
-  label: string;
-  description: string | undefined;
-  selected: boolean;
-  active: boolean;
-  disabled: boolean;
-  onPress: () => void;
-}) {
-  const placeholderLabel = projectIconPlaceholderLabelFromDisplayName(label);
-  const placeholderInitial = placeholderLabel.charAt(0).toUpperCase() || "?";
-  const leadingSlot = useMemo(
-    () => (
-      <View style={styles.rowIconBox}>
-        <ProjectIconView
-          iconDataUri={iconDataUri}
-          initial={placeholderInitial}
-          projectViewKey={projectViewKey}
-          size={ICON_SIZE.md}
-          textStyle={styles.projectIconFallbackText}
-        />
-      </View>
-    ),
-    [iconDataUri, placeholderInitial, projectViewKey],
-  );
-
-  return (
-    <ComboboxItem
-      testID={testID}
-      label={label}
-      description={description}
-      selected={selected}
-      active={active}
-      disabled={disabled}
-      onPress={onPress}
-      leadingSlot={leadingSlot}
-    />
-  );
-}
-
-function NewWorkspacePickerOption({
-  option,
-  selected,
-  active,
-  onPress,
-  itemById,
-  isPending,
-}: {
-  option: ComboboxOptionType;
-  selected: boolean;
-  active: boolean;
-  onPress: () => void;
-  itemById: Map<string, PickerItem>;
-  isPending: boolean;
-}) {
-  const { theme } = useUnistyles();
-  const { t } = useTranslation();
-  const item = itemById.get(option.id);
-  if (!item) return <View key={option.id} />;
-
-  const isBranch = item.kind === "branch";
-  const testID = isBranch
-    ? `new-workspace-ref-picker-branch-${item.name}`
-    : `new-workspace-ref-picker-pr-${item.item.number}`;
-  const description =
-    !isBranch && item.item.baseRefName
-      ? t("newWorkspace.refPicker.intoBase", { baseRef: item.item.baseRefName })
-      : undefined;
-
-  return (
-    <PickerOptionItem
-      testID={testID}
-      label={pickerItemLabel(item)}
-      description={description}
-      selected={selected}
-      active={active}
-      disabled={isPending}
-      onPress={onPress}
-      isBranch={isBranch}
-      trailingLabel={isBranch ? item.divergenceLabel : undefined}
-      accessibilityLabel={isBranch ? item.accessibilityLabel : undefined}
-      iconColor={theme.colors.foregroundMuted}
-      iconSize={theme.iconSize.sm}
-    />
-  );
-}
-
-function NewWorkspaceProjectPickerOption({
-  option,
-  selected,
-  active,
-  onPress,
-  projectByOptionId,
-  projectIconDataByProjectViewKey,
-  selectedServerId,
-  isPending,
-  supportsWorkspaceMultiplicity,
-}: {
-  option: ComboboxOptionType;
-  selected: boolean;
-  active: boolean;
-  onPress: () => void;
-  projectByOptionId: Map<string, HostProjectListItem>;
-  projectIconDataByProjectViewKey: Map<string, string | null>;
-  selectedServerId: string;
-  isPending: boolean;
-  supportsWorkspaceMultiplicity: boolean;
-}) {
-  const project = projectByOptionId.get(option.id);
-  if (!project) return <View key={option.id} />;
-  const sourceDirectory =
-    getHostProjectSourceDirectory(project, selectedServerId) ?? project.iconWorkingDir;
-
-  return (
-    <ProjectOptionItem
-      testID={`new-workspace-project-picker-option-${project.viewKey}`}
-      projectViewKey={project.viewKey}
-      iconDataUri={projectIconDataByProjectViewKey.get(project.viewKey) ?? null}
-      label={project.projectName}
-      description={sourceDirectory}
-      selected={selected}
-      active={active}
-      disabled={
-        isPending ||
-        (!supportsWorkspaceMultiplicity &&
-          !project.hosts.some((host) => host.worktreeSupport !== "unsupported"))
-      }
-      onPress={onPress}
-    />
-  );
-}
-
-function AddProjectPickerAction({ onPress }: { onPress: () => void }) {
-  const { t } = useTranslation();
-  const openProjectKeys = useShortcutKeys("new-agent");
-  const shortcut = useMemo(
-    () => (openProjectKeys ? <Shortcut chord={openProjectKeys} /> : null),
-    [openProjectKeys],
-  );
-
-  return (
-    <ComboboxItem
-      testID="new-workspace-project-picker-add-project"
-      label={t("sidebar.actions.addProject")}
-      onPress={onPress}
-      leadingSlot={addProjectIcon}
-      trailingSlot={shortcut}
-    />
-  );
-}
-
-function newWorkspaceHostOptionTestID(serverId: string): string {
-  return `new-workspace-host-picker-option-${serverId}`;
-}
-
-function IsolationPickerTrigger({
-  pickerAnchorRef,
-  onPress,
-  disabled,
-  badgePressableStyle,
-  isolation,
-  label,
-  tooltipLabel,
-  iconColor,
-  iconSize,
-}: {
-  pickerAnchorRef: React.RefObject<View | null>;
-  onPress: () => void;
-  disabled: boolean;
-  badgePressableStyle: React.ComponentProps<typeof Pressable>["style"];
-  isolation: "local" | "worktree";
-  label: string;
-  tooltipLabel: string;
-  iconColor: string;
-  iconSize: number;
-}) {
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild triggerRefProp="ref">
-        <ComboboxTrigger
-          chevron={metaChevron}
-          ref={pickerAnchorRef}
-          testID="workspace-create-isolation-trigger"
-          onPress={onPress}
-          disabled={disabled}
-          style={badgePressableStyle}
-          accessibilityRole="button"
-          accessibilityLabel="Workspace isolation"
-        >
-          <View style={styles.badgeIconBox}>
-            {isolation === "worktree" ? (
-              <GitBranch size={iconSize} color={iconColor} />
-            ) : (
-              <Folder size={iconSize} color={iconColor} />
-            )}
-          </View>
-          <Text style={styles.badgeText} numberOfLines={1}>
-            {label}
-          </Text>
-        </ComboboxTrigger>
-      </TooltipTrigger>
-      <TooltipContent side="top" align="center" offset={8}>
-        <Text style={styles.tooltipText}>{tooltipLabel}</Text>
-      </TooltipContent>
-    </Tooltip>
-  );
-}
-
-// Wraps a single argument control in the mobile vertical stack. On desktop the
-// controls are laid out in one horizontal row, so no per-control wrapper is used.
-// Decorative padding must not block the dock background from iOS hit testing.
-function FormRow({ children }: { children: React.ReactNode }) {
-  return (
-    <View style={styles.row} pointerEvents="box-none">
-      {children}
-    </View>
-  );
-}
 
 interface WorkspaceIsolationState {
   isolation: "local" | "worktree";
@@ -738,12 +223,6 @@ function useWorkspaceIsolation(input: {
   };
 }
 
-function isolationLabel(t: TFunction, isolation: "local" | "worktree"): string {
-  return isolation === "worktree"
-    ? t("newWorkspace.isolation.worktree")
-    : t("newWorkspace.isolation.local");
-}
-
 function normalizeBranchDetails(
   data: { branchDetails?: BranchPickerDetail[]; branches?: string[] } | undefined,
 ): BranchPickerDetail[] {
@@ -1367,264 +846,6 @@ function useNewWorkspaceInitialContext({
   };
 }
 
-type RefPickerRenderOption = NonNullable<ComboboxProps["renderOption"]>;
-
-interface FormPickerControl {
-  anchorRef: RefObject<View | null>;
-  open: () => void;
-  openState: boolean;
-  onOpenChange: (open: boolean) => void;
-}
-
-interface NewWorkspaceFormStackInput {
-  isCompact: boolean;
-  isPending: boolean;
-  project: FormPickerControl & {
-    options: ComboboxOptionType[];
-    triggerLabel: string;
-    selectedProject: HostProjectListItem | null;
-    iconDataByProjectViewKey: Map<string, string | null>;
-    selectedOptionId: string;
-    onSelect: (id: string) => void;
-    onAddProject: () => void;
-    renderOption: RefPickerRenderOption;
-  };
-  host: FormPickerControl & {
-    allHosts: HostProfile[];
-    selectedServerId: string;
-    onSelect: (id: string) => void;
-  };
-  isolation: FormPickerControl & {
-    effectiveIsolation: "local" | "worktree";
-    options: ComboboxOptionType[];
-    onSelect: (id: string) => void;
-    renderOption: RefPickerRenderOption;
-    canCreateWorktree: boolean;
-  };
-  base: FormPickerControl & {
-    selectedSourceDirectory: string | null;
-    selectedItem: PickerItem | null;
-    triggerLabel: string;
-    options: ComboboxOptionType[];
-    selectedOptionId: string;
-    onSelect: (id: string) => void;
-    setSearchQuery: (query: string) => void;
-    emptyText: string;
-    renderOption: RefPickerRenderOption;
-    showRefPicker: boolean;
-  };
-  launch: {
-    serverId: string;
-    target: LaunchTarget;
-    onChange: (target: LaunchTarget) => void;
-    profiles: readonly TerminalProfile[];
-    disabled: boolean;
-  };
-}
-
-function useNewWorkspaceFormStack(input: NewWorkspaceFormStackInput): ReactElement {
-  const { theme } = useUnistyles();
-  const { t } = useTranslation();
-  const { isCompact, isPending, project, host, isolation, base, launch } = input;
-
-  const selectedHostLabel =
-    host.allHosts.find((h) => h.serverId === host.selectedServerId)?.label ?? "Host";
-  const showHostControl = host.allHosts.length > 1;
-  const isolationTriggerLabel = isolationLabel(t, isolation.effectiveIsolation);
-  const addProjectAction = useMemo(
-    () => <AddProjectPickerAction onPress={project.onAddProject} />,
-    [project.onAddProject],
-  );
-
-  const badgePressableStyle = useCallback(
-    ({ pressed, hovered }: PressableStateCallbackType & { hovered?: boolean }) => [
-      styles.badge,
-      Boolean(hovered) && !isPending && styles.badgeHovered,
-      pressed && !isPending && styles.badgePressed,
-      isPending && styles.badgeDisabled,
-    ],
-    [isPending],
-  );
-
-  const desktopControlStyle = isCompact ? undefined : styles.desktopControl;
-
-  const projectControl = (
-    <View style={desktopControlStyle}>
-      <ProjectPickerTrigger
-        pickerAnchorRef={project.anchorRef}
-        onPress={project.open}
-        disabled={isPending}
-        badgePressableStyle={badgePressableStyle}
-        label={project.triggerLabel}
-        tooltipLabel={t("newWorkspace.tooltips.project")}
-        projectViewKey={project.selectedProject?.viewKey ?? null}
-        iconDataUri={
-          project.selectedProject
-            ? (project.iconDataByProjectViewKey.get(project.selectedProject.viewKey) ?? null)
-            : null
-        }
-        iconColor={theme.colors.foregroundMuted}
-        iconSize={theme.iconSize.sm}
-      />
-      <Combobox
-        options={project.options}
-        value={project.selectedOptionId}
-        onSelect={project.onSelect}
-        searchable
-        searchPlaceholder="Search projects"
-        title="Project"
-        open={project.openState}
-        onOpenChange={project.onOpenChange}
-        desktopPlacement="bottom-start"
-        desktopMinWidth={360}
-        anchorRef={project.anchorRef}
-        emptyText="No projects available."
-        renderOption={project.renderOption}
-        footer={addProjectAction}
-      />
-    </View>
-  );
-
-  const hostControl = showHostControl ? (
-    <View style={desktopControlStyle}>
-      <HostPicker
-        hosts={host.allHosts}
-        value={host.selectedServerId}
-        onSelect={host.onSelect}
-        open={host.openState}
-        onOpenChange={host.onOpenChange}
-        anchorRef={host.anchorRef}
-        searchable={false}
-        title="Host"
-        desktopPlacement="bottom-start"
-        desktopMinWidth={200}
-        hostOptionTestID={newWorkspaceHostOptionTestID}
-      >
-        <Tooltip>
-          <TooltipTrigger asChild triggerRefProp="ref">
-            <Pressable
-              ref={host.anchorRef}
-              accessibilityRole="button"
-              accessibilityLabel="Host"
-              onPress={host.open}
-              disabled={isPending || host.allHosts.length === 0}
-              style={badgePressableStyle}
-              testID="host-picker-trigger"
-            >
-              <View style={styles.badgeIconBox}>
-                <HostStatusDot serverId={host.selectedServerId} />
-              </View>
-              <Text style={styles.badgeText} numberOfLines={1}>
-                {selectedHostLabel}
-              </Text>
-              {metaChevron}
-            </Pressable>
-          </TooltipTrigger>
-          <TooltipContent side="top" align="center" offset={8}>
-            <Text style={styles.tooltipText}>{t("newWorkspace.tooltips.host")}</Text>
-          </TooltipContent>
-        </Tooltip>
-      </HostPicker>
-    </View>
-  ) : null;
-
-  const isolationControl = isolation.canCreateWorktree ? (
-    <View style={desktopControlStyle}>
-      <IsolationPickerTrigger
-        pickerAnchorRef={isolation.anchorRef}
-        onPress={isolation.open}
-        disabled={isPending}
-        badgePressableStyle={badgePressableStyle}
-        isolation={isolation.effectiveIsolation}
-        label={isolationTriggerLabel}
-        tooltipLabel={t("newWorkspace.tooltips.isolation")}
-        iconColor={theme.colors.foregroundMuted}
-        iconSize={theme.iconSize.sm}
-      />
-      <Combobox
-        options={isolation.options}
-        value={isolation.effectiveIsolation}
-        onSelect={isolation.onSelect}
-        title={t("newWorkspace.isolation.label")}
-        open={isolation.openState}
-        onOpenChange={isolation.onOpenChange}
-        desktopPlacement="bottom-start"
-        anchorRef={isolation.anchorRef}
-        renderOption={isolation.renderOption}
-      />
-    </View>
-  ) : null;
-
-  const baseControl = base.showRefPicker ? (
-    <View style={desktopControlStyle}>
-      <RefPickerTrigger
-        pickerAnchorRef={base.anchorRef}
-        onPress={base.open}
-        disabled={isPending || !base.selectedSourceDirectory}
-        badgePressableStyle={badgePressableStyle}
-        selectedItem={base.selectedItem}
-        triggerLabel={base.triggerLabel}
-        accessibilityLabel={t("newWorkspace.refPicker.startingRef")}
-        tooltipLabel={t("newWorkspace.tooltips.startingRef")}
-        iconColor={theme.colors.foregroundMuted}
-        iconSize={theme.iconSize.sm}
-      />
-      <Combobox
-        options={base.options}
-        value={base.selectedOptionId}
-        onSelect={base.onSelect}
-        searchable
-        searchPlaceholder={t("newWorkspace.refPicker.searchPlaceholder")}
-        title={t("newWorkspace.refPicker.title")}
-        open={base.openState}
-        onOpenChange={base.onOpenChange}
-        onSearchQueryChange={base.setSearchQuery}
-        desktopPlacement="bottom-start"
-        anchorRef={base.anchorRef}
-        emptyText={base.emptyText}
-        renderOption={base.renderOption}
-      />
-    </View>
-  ) : null;
-
-  const launchControl = (
-    <LaunchControl
-      serverId={launch.serverId}
-      target={launch.target}
-      onChange={launch.onChange}
-      profiles={launch.profiles}
-      disabled={launch.disabled}
-      badgePressableStyle={badgePressableStyle}
-    />
-  );
-
-  return isCompact ? (
-    <View testID="new-workspace-ref-picker-row" style={styles.formStack} pointerEvents="box-none">
-      <FormRow>{projectControl}</FormRow>
-      {hostControl ? <FormRow>{hostControl}</FormRow> : null}
-      {isolationControl ? <FormRow>{isolationControl}</FormRow> : null}
-      {baseControl ? <FormRow>{baseControl}</FormRow> : null}
-      <FormRow>{launchControl}</FormRow>
-      {/* Keep fixed stack height without separating the visible controls. */}
-      {isolationControl ? null : <View style={styles.baseSpacer} pointerEvents="none" />}
-      {baseControl ? null : <View style={styles.baseSpacer} pointerEvents="none" />}
-    </View>
-  ) : (
-    <View
-      testID="new-workspace-ref-picker-row"
-      style={styles.formStackDesktop}
-      pointerEvents="box-none"
-    >
-      {projectControl}
-      {hostControl}
-      {isolationControl}
-      {baseControl}
-      <View style={styles.launchSpacer} pointerEvents="none" />
-      {launchControl}
-    </View>
-  );
-}
-
 export function NewWorkspaceScreen({
   serverId,
   sourceDirectory: sourceDirectoryProp,
@@ -1633,7 +854,6 @@ export function NewWorkspaceScreen({
   draftId,
 }: NewWorkspaceScreenProps) {
   const queryClient = useQueryClient();
-  const { theme } = useUnistyles();
   const { t } = useTranslation();
   const isCompact = useIsCompactFormFactor();
   const toast = useToast();
@@ -1946,6 +1166,10 @@ export function NewWorkspaceScreen({
     openAddProjectPicker(selectedServerId);
   }, [openAddProjectPicker, selectedServerId]);
 
+  const handleAddHost = useCallback(() => {
+    router.push(buildSettingsAddHostRoute(Date.now()));
+  }, []);
+
   const openPicker = useCallback(() => {
     setPickerOpen(true);
   }, []);
@@ -1978,50 +1202,6 @@ export function NewWorkspaceScreen({
     setIsolationPickerOpen(nextOpen);
   }, []);
 
-  // "New worktree" is omitted entirely (not disabled) when the project isn't a
-  // git checkout, since worktree isolation is impossible there.
-  const isolationOptions = useMemo<ComboboxOptionType[]>(() => {
-    const localOption = { id: "local", label: isolationLabel(t, "local") };
-    if (!canCreateWorktree) return [localOption];
-    return [localOption, { id: "worktree", label: isolationLabel(t, "worktree") }];
-  }, [canCreateWorktree, t]);
-
-  const handleSelectIsolationOption = useCallback(
-    (id: string) => {
-      setIsolation(id === "worktree" ? "worktree" : "local");
-      setIsolationPickerOpen(false);
-    },
-    [setIsolation],
-  );
-
-  const renderIsolationOption = useCallback(
-    ({
-      option,
-      selected,
-      active,
-      onPress,
-    }: {
-      option: ComboboxOptionType;
-      selected: boolean;
-      active: boolean;
-      onPress: () => void;
-    }) => {
-      return (
-        <IsolationOptionItem
-          optionId={option.id}
-          label={option.label}
-          selected={selected}
-          active={active}
-          disabled={isPending}
-          onPress={onPress}
-          iconColor={theme.colors.foregroundMuted}
-          iconSize={theme.iconSize.sm}
-        />
-      );
-    },
-    [isPending, theme.colors.foregroundMuted, theme.iconSize.sm],
-  );
-
   const handleClearDraft = useCallback(() => {
     // No-op: screen navigates away on success, text should stay for retry on error
   }, []);
@@ -2261,41 +1441,6 @@ export function NewWorkspaceScreen({
     withConnectedClient,
   ]);
 
-  const renderPickerOption = useCallback(
-    (props: {
-      option: ComboboxOptionType;
-      selected: boolean;
-      active: boolean;
-      onPress: () => void;
-    }) => <NewWorkspacePickerOption {...props} itemById={itemById} isPending={isPending} />,
-    [isPending, itemById],
-  );
-
-  const renderProjectOption = useCallback(
-    (props: {
-      option: ComboboxOptionType;
-      selected: boolean;
-      active: boolean;
-      onPress: () => void;
-    }) => (
-      <NewWorkspaceProjectPickerOption
-        {...props}
-        projectByOptionId={projectByOptionId}
-        projectIconDataByProjectViewKey={projectIconDataByProjectViewKey}
-        selectedServerId={selectedServerId}
-        isPending={isPending}
-        supportsWorkspaceMultiplicity={supportsWorkspaceMultiplicity}
-      />
-    ),
-    [
-      isPending,
-      projectByOptionId,
-      projectIconDataByProjectViewKey,
-      selectedServerId,
-      supportsWorkspaceMultiplicity,
-    ],
-  );
-
   const agentControlsWithDisabled = useMemo(
     () =>
       composerState
@@ -2312,57 +1457,58 @@ export function NewWorkspaceScreen({
       ? t("newWorkspace.refPicker.searching")
       : t("newWorkspace.refPicker.noMatchingRefs");
 
-  const formStack = useNewWorkspaceFormStack({
+  const formStack = useNewWorkspaceForm({
     isCompact,
     isPending,
     project: {
       anchorRef: projectPickerAnchorRef,
       open: openProjectPicker,
-      options: projectPickerOptions,
-      triggerLabel: projectTriggerLabel,
-      selectedProject,
-      iconDataByProjectViewKey: projectIconDataByProjectViewKey,
-      selectedOptionId: selectedProjectOptionId,
-      onSelect: handleSelectProjectOption,
-      onAddProject: handleAddProject,
       openState: projectPickerOpen,
       onOpenChange: handleProjectPickerOpenChange,
-      renderOption: renderProjectOption,
+      options: projectPickerOptions,
+      projectByOptionId,
+      iconDataByProjectViewKey: projectIconDataByProjectViewKey,
+      selectedProject,
+      selectedOptionId: selectedProjectOptionId,
+      triggerLabel: projectTriggerLabel,
+      selectedServerId,
+      supportsWorkspaceMultiplicity,
+      onSelect: handleSelectProjectOption,
+      onAddProject: handleAddProject,
     },
     host: {
+      anchorRef: hostPickerAnchorRef,
+      open: openHostPicker,
+      openState: hostPickerOpen,
+      onOpenChange: handleHostPickerOpenChange,
       allHosts,
       selectedServerId,
       onSelect: handleSelectWorkspaceHost,
-      openState: hostPickerOpen,
-      onOpenChange: handleHostPickerOpenChange,
-      anchorRef: hostPickerAnchorRef,
-      open: openHostPicker,
+      onAddHost: handleAddHost,
     },
     isolation: {
       anchorRef: isolationPickerAnchorRef,
       open: openIsolationPicker,
-      effectiveIsolation,
-      options: isolationOptions,
-      onSelect: handleSelectIsolationOption,
       openState: isolationPickerOpen,
       onOpenChange: handleIsolationPickerOpenChange,
-      renderOption: renderIsolationOption,
+      effectiveIsolation,
       canCreateWorktree,
+      onSelect: setIsolation,
     },
     base: {
       anchorRef: pickerAnchorRef,
       open: openPicker,
+      openState: pickerOpen,
+      onOpenChange: handlePickerOpenChange,
       selectedSourceDirectory,
       selectedItem,
       triggerLabel,
       options,
+      itemById,
       selectedOptionId,
       onSelect: handleSelectOption,
-      openState: pickerOpen,
-      onOpenChange: handlePickerOpenChange,
       setSearchQuery: setPickerSearchQuery,
       emptyText: pickerEmptyText,
-      renderOption: renderPickerOption,
       showRefPicker,
     },
     launch: {
@@ -2491,11 +1637,17 @@ function NewWorkspaceLayout({
   onImportSession: () => void;
   children: ReactNode;
 }) {
-  // At the top of the screen on compact layouts, under the composer otherwise.
+  // In the header on compact layouts, under the composer otherwise.
   const importSessionButton = <ImportSessionButton compact={isCompact} onPress={onImportSession} />;
-  const setupFields = (
+  // Compact has no title: the fields name themselves. The free space above pushes them down onto
+  // the composer, where the thumb is.
+  const setupFields = isCompact ? (
+    <>
+      <View style={styles.compactSetupSpace} pointerEvents="none" />
+      {formStack}
+    </>
+  ) : (
     <>
-      {isCompact ? <View style={styles.compactTopActions}>{importSessionButton}</View> : null}
       <View style={styles.composerTitleContainer} pointerEvents="none">
         <Text style={styles.composerTitle}>{title}</Text>
       </View>
@@ -2504,7 +1656,9 @@ function NewWorkspaceLayout({
   );
   return (
     <>
-      {fullscreen ? null : <MenuHeader borderless />}
+      {fullscreen ? null : (
+        <MenuHeader borderless rightContent={isCompact ? importSessionButton : undefined} />
+      )}
       <View style={styles.content}>
         <TitlebarDragRegion />
         <ComposerDock centered={!isCompact} fullscreen={fullscreen}>
@@ -2529,11 +1683,8 @@ const styles = StyleSheet.create((theme) => ({
     position: "relative",
     flex: 1,
   },
-  // Takes the free space above the setup fields, so its button sits at the top of the screen.
-  // The inset puts the ghost button's icon on the setup rows' icon rail.
-  compactTopActions: {
+  compactSetupSpace: {
     flex: 1,
-    paddingHorizontal: theme.spacing[3],
   },
   composerTitleContainer: {
     marginBottom: theme.spacing[8],
@@ -2550,105 +1701,4 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.destructive,
     lineHeight: 20,
   },
-  formStack: {
-    marginBottom: theme.spacing[8],
-    gap: theme.spacing[2],
-  },
-  formStackDesktop: {
-    flexDirection: "row",
-    alignItems: "center",
-    // Matches the gap between the composer and the Import session pill below it.
-    marginBottom: theme.spacing[4],
-    // The badge adds its own left padding; offset it so the project icon's left
-    // edge lands exactly on the "New workspace" title's left edge. The trailing
-    // inset mirrors it so the launch chip stops on the composer's inner content
-    // rather than running out to the composer's border.
-    paddingLeft: theme.spacing[4],
-    paddingRight: theme.spacing[4],
-    gap: theme.spacing[2],
-  },
-  desktopControl: {
-    minWidth: 0,
-    flexShrink: 1,
-  },
-  // The row's left inset matches the heading's text x (composerTitleContainer
-  // paddingLeft) so the control aligns with the "New workspace" glyph. The badge
-  // adds its own left padding, so the row inset is reduced by that amount.
-  row: {
-    flexDirection: "row",
-    alignItems: "center",
-    paddingLeft: theme.spacing[4],
-    gap: theme.spacing[1],
-  },
-  baseSpacer: {
-    height: BADGE_HEIGHT,
-  },
-  // Pushes the launch control to the trailing edge of the desktop meta row,
-  // next to project/host/branch. The row's own right inset (formStackDesktop)
-  // lands it on the composer's inner content, matching the left chips.
-  launchSpacer: {
-    flex: 1,
-  },
-  badge: {
-    flexDirection: "row",
-    alignItems: "center",
-    height: BADGE_HEIGHT,
-    maxWidth: 240,
-    overflow: "hidden",
-    paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius["2xl"],
-    gap: theme.spacing[1],
-  },
-  badgeHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-  badgePressed: {
-    backgroundColor: theme.colors.surface0,
-  },
-  badgeDisabled: {
-    opacity: 0.6,
-  },
-  badgeText: {
-    minWidth: 0,
-    fontSize: theme.fontSize.base,
-    color: theme.colors.foregroundMuted,
-    flexShrink: 1,
-  },
-  tooltipText: {
-    fontSize: theme.fontSize.base,
-    color: theme.colors.popoverForeground,
-  },
-  refDivergenceLabel: {
-    fontSize: theme.fontSize.sm,
-    color: theme.colors.foregroundMuted,
-    fontVariant: ["tabular-nums"],
-  },
-  chevronContainer: {
-    flexShrink: 0,
-    transform: [{ translateY: 1 }],
-  },
-  badgeIconBox: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
-    alignItems: "center",
-    justifyContent: "center",
-    flexShrink: 0,
-  },
-  projectIconFallbackText: {
-    // Single uppercase initial inside an iconSize.md (16px) square — below the
-    // smallest font-size token, so it stays a literal sized to the box.
-    fontSize: PROJECT_ICON_FALLBACK_FONT_SIZE,
-    fontWeight: "600",
-  },
-  rowIconBox: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  hostStatusDot: {
-    width: 8,
-    height: 8,
-    borderRadius: 4,
-  },
 }));
diff --git a/packages/app/src/screens/new-workspace/form/field-trigger.tsx b/packages/app/src/screens/new-workspace/form/field-trigger.tsx
new file mode 100644
index 0000000000..c82cadb14a
--- /dev/null
+++ b/packages/app/src/screens/new-workspace/form/field-trigger.tsx
@@ -0,0 +1,217 @@
+import { forwardRef, useCallback, type ReactElement, type ReactNode } from "react";
+import { Text, View, type PressableStateCallbackType } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { ChevronDown } from "lucide-react-native";
+import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
+import { CONTROL_HEIGHTS } from "@/components/ui/control-geometry";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
+
+/**
+ * `badge` is the desktop meta row: a borderless pill that names its field in a tooltip.
+ * `field` is the compact form: a full-width filled box with the field's label inside, above the
+ * value, so the whole field is one tap target.
+ */
+export type FieldTriggerVariant = "badge" | "field";
+
+const ThemedChevronDown = withUnistyles(ChevronDown);
+const extraMutedColor = (theme: Theme) => ({ color: theme.colors.foregroundExtraMuted });
+
+// Extra-muted: the chevron is an affordance, not information, and sits behind its label.
+function Chevron(): ReactElement {
+  return (
+    <View style={styles.chevron}>
+      <ThemedChevronDown size={ICON_SIZE.sm} uniProps={extraMutedColor} />
+    </View>
+  );
+}
+
+const chevron = <Chevron />;
+
+export interface FieldTriggerContentProps {
+  variant: FieldTriggerVariant;
+  /** The field's name, shown inside a `field`. */
+  label: string;
+  icon: ReactNode;
+  value: string;
+  /** Secondary text after the value, such as a terminal profile's name. */
+  detail?: string;
+}
+
+export function FieldTriggerContent({
+  variant,
+  label,
+  icon,
+  value,
+  detail,
+}: FieldTriggerContentProps): ReactElement {
+  const valueLine = (
+    <>
+      <View style={styles.iconBox}>{icon}</View>
+      <Text style={variant === "field" ? styles.fieldValue : styles.value} numberOfLines={1}>
+        {value}
+        {detail ? <Text style={styles.detail}> {detail}</Text> : null}
+      </Text>
+    </>
+  );
+  if (variant === "badge") {
+    return (
+      <>
+        {valueLine}
+        {chevron}
+      </>
+    );
+  }
+  return (
+    <>
+      <View style={styles.fieldBody}>
+        <Text style={styles.fieldLabel} numberOfLines={1}>
+          {label}
+        </Text>
+        <View style={styles.fieldValueLine}>{valueLine}</View>
+      </View>
+      {chevron}
+    </>
+  );
+}
+
+/** Pressable style for a field trigger, for triggers that bring their own Pressable. */
+export function useFieldTriggerStyle(variant: FieldTriggerVariant, disabled: boolean) {
+  return useCallback(
+    (state: PressableStateCallbackType & { hovered?: boolean }) => [
+      variant === "field" ? styles.field : styles.badge,
+      !disabled && Boolean(state.hovered) && styles.highlighted,
+      !disabled &&
+        state.pressed &&
+        (variant === "field" ? styles.highlighted : styles.badgePressed),
+      disabled && styles.disabled,
+    ],
+    [disabled, variant],
+  );
+}
+
+export interface FieldTriggerProps extends FieldTriggerContentProps {
+  /** What a screen reader announces; defaults to `label`. */
+  accessibilityLabel?: string;
+  onPress: () => void;
+  disabled?: boolean;
+  /** Desktop hover hint; badges only, since a field shows its label. */
+  tooltip?: string;
+  testID?: string;
+}
+
+/** A field trigger that anchors a Combobox. */
+export const FieldTrigger = forwardRef<View, FieldTriggerProps>(function FieldTrigger(
+  { accessibilityLabel, onPress, disabled = false, tooltip, testID, ...content },
+  ref,
+): ReactElement {
+  const style = useFieldTriggerStyle(content.variant, disabled);
+  const trigger = (
+    <ComboboxTrigger
+      ref={ref}
+      chevron={null}
+      block={content.variant === "field"}
+      testID={testID}
+      onPress={onPress}
+      disabled={disabled}
+      style={style}
+      accessibilityRole="button"
+      accessibilityLabel={accessibilityLabel ?? content.label}
+    >
+      <FieldTriggerContent {...content} />
+    </ComboboxTrigger>
+  );
+  if (content.variant === "field" || !tooltip) return trigger;
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild triggerRefProp="ref">
+        {trigger}
+      </TooltipTrigger>
+      <TooltipContent side="top" align="center" offset={8}>
+        <Text style={styles.tooltipText}>{tooltip}</Text>
+      </TooltipContent>
+    </Tooltip>
+  );
+});
+
+// Height of a badge. The desktop row sizes from it.
+export const FIELD_BADGE_HEIGHT = CONTROL_HEIGHTS.tight;
+// Height of a compact field: label line plus value line. The compact stack reserves rows from it.
+export const FIELD_HEIGHT = 56;
+
+const styles = StyleSheet.create((theme) => ({
+  badge: {
+    flexDirection: "row",
+    alignItems: "center",
+    height: FIELD_BADGE_HEIGHT,
+    maxWidth: 240,
+    overflow: "hidden",
+    paddingHorizontal: theme.spacing[2],
+    borderRadius: theme.borderRadius["2xl"],
+    gap: theme.spacing[1],
+  },
+  field: {
+    flexDirection: "row",
+    alignItems: "center",
+    height: FIELD_HEIGHT,
+    paddingLeft: theme.spacing[3],
+    paddingRight: theme.spacing[3],
+    borderRadius: theme.borderRadius.xl,
+    backgroundColor: theme.colors.surface1,
+    gap: theme.spacing[2],
+  },
+  highlighted: {
+    backgroundColor: theme.colors.surface2,
+  },
+  badgePressed: {
+    backgroundColor: theme.colors.surface0,
+  },
+  disabled: {
+    opacity: 0.6,
+  },
+  // Optical: the chevron's ink sits high in its box.
+  chevron: {
+    flexShrink: 0,
+    transform: [{ translateY: 1 }],
+  },
+  iconBox: {
+    width: theme.iconSize.md,
+    height: theme.iconSize.md,
+    alignItems: "center",
+    justifyContent: "center",
+    flexShrink: 0,
+  },
+  value: {
+    minWidth: 0,
+    flexShrink: 1,
+    fontSize: theme.fontSize.base,
+    color: theme.colors.foregroundMuted,
+  },
+  fieldBody: {
+    flex: 1,
+    minWidth: 0,
+    gap: theme.spacing[0.5],
+  },
+  fieldLabel: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foregroundMuted,
+  },
+  fieldValueLine: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1.5],
+  },
+  fieldValue: {
+    minWidth: 0,
+    flexShrink: 1,
+    fontSize: theme.fontSize.base,
+    color: theme.colors.foreground,
+  },
+  detail: {
+    color: theme.colors.foregroundExtraMuted,
+  },
+  tooltipText: {
+    fontSize: theme.fontSize.base,
+    color: theme.colors.popoverForeground,
+  },
+}));
diff --git a/packages/app/src/screens/new-workspace/form/icons.tsx b/packages/app/src/screens/new-workspace/form/icons.tsx
new file mode 100644
index 0000000000..9fa277542d
--- /dev/null
+++ b/packages/app/src/screens/new-workspace/form/icons.tsx
@@ -0,0 +1,49 @@
+import type { ReactElement } from "react";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { Folder, FolderPlus, GitBranch, GitPullRequest } from "lucide-react-native";
+import { ProjectIconView } from "@/components/project-icon-view";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
+import { projectIconPlaceholderLabelFromDisplayName } from "@/utils/project-display-name";
+
+const ThemedFolder = withUnistyles(Folder);
+const ThemedFolderPlus = withUnistyles(FolderPlus);
+const ThemedGitBranch = withUnistyles(GitBranch);
+const ThemedGitPullRequest = withUnistyles(GitPullRequest);
+const mutedColor = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+
+export const folderIcon = <ThemedFolder size={ICON_SIZE.sm} uniProps={mutedColor} />;
+export const addProjectIcon = <ThemedFolderPlus size={ICON_SIZE.sm} uniProps={mutedColor} />;
+export const branchIcon = <ThemedGitBranch size={ICON_SIZE.sm} uniProps={mutedColor} />;
+export const pullRequestIcon = <ThemedGitPullRequest size={ICON_SIZE.sm} uniProps={mutedColor} />;
+
+// Single uppercase initial inside an iconSize.md (16px) square — below the smallest font-size
+// token, so it stays a literal sized to the box.
+const PROJECT_ICON_FALLBACK_FONT_SIZE = 10;
+
+export function ProjectIcon({
+  projectViewKey,
+  projectName,
+  iconDataUri,
+}: {
+  projectViewKey: string;
+  projectName: string;
+  iconDataUri: string | null;
+}): ReactElement {
+  const placeholderLabel = projectIconPlaceholderLabelFromDisplayName(projectName);
+  return (
+    <ProjectIconView
+      iconDataUri={iconDataUri}
+      initial={placeholderLabel.charAt(0).toUpperCase() || "?"}
+      projectViewKey={projectViewKey}
+      size={ICON_SIZE.md}
+      textStyle={styles.fallbackText}
+    />
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  fallbackText: {
+    fontSize: PROJECT_ICON_FALLBACK_FONT_SIZE,
+    fontWeight: theme.fontWeight.semibold,
+  },
+}));
diff --git a/packages/app/src/screens/new-workspace/form/index.tsx b/packages/app/src/screens/new-workspace/form/index.tsx
new file mode 100644
index 0000000000..d05adb2e61
--- /dev/null
+++ b/packages/app/src/screens/new-workspace/form/index.tsx
@@ -0,0 +1,392 @@
+import { useCallback, useMemo, type ReactElement, type ReactNode, type RefObject } from "react";
+import { View } from "react-native";
+import { useTranslation } from "react-i18next";
+import { StyleSheet } from "react-native-unistyles";
+import type { TerminalProfile } from "@getpaseo/protocol/messages";
+import { Combobox, type ComboboxOption, type ComboboxProps } from "@/components/ui/combobox";
+import { HostStatusDot } from "@/components/host-status-dot";
+import { HostPicker } from "@/components/hosts/host-picker";
+import type { LaunchTarget } from "@/new-workspace-launch/target";
+import type { HostProjectListItem } from "@/projects/host-projects";
+import type { HostProfile } from "@/types/host-connection";
+import type { PickerItem } from "../../new-workspace-picker-item";
+import {
+  FIELD_BADGE_HEIGHT,
+  FIELD_HEIGHT,
+  FieldTrigger,
+  type FieldTriggerVariant,
+} from "./field-trigger";
+import { branchIcon, folderIcon, ProjectIcon, pullRequestIcon } from "./icons";
+import { LaunchControl } from "./launch-control";
+import { AddProjectOption, IsolationOption, ProjectOption, RefOption } from "./options";
+
+type Isolation = "local" | "worktree";
+type RenderOption = NonNullable<ComboboxProps["renderOption"]>;
+
+interface PickerControl {
+  anchorRef: RefObject<View | null>;
+  open: () => void;
+  openState: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+export interface NewWorkspaceFormProps {
+  isCompact: boolean;
+  isPending: boolean;
+  project: PickerControl & {
+    options: ComboboxOption[];
+    projectByOptionId: Map<string, HostProjectListItem>;
+    iconDataByProjectViewKey: Map<string, string | null>;
+    selectedProject: HostProjectListItem | null;
+    selectedOptionId: string;
+    triggerLabel: string;
+    selectedServerId: string;
+    /** COMPAT(workspaceMultiplicity): without it only worktree-capable projects are selectable. */
+    supportsWorkspaceMultiplicity: boolean;
+    onSelect: (id: string) => void;
+    onAddProject: () => void;
+  };
+  host: PickerControl & {
+    allHosts: HostProfile[];
+    selectedServerId: string;
+    onSelect: (id: string) => void;
+    onAddHost: () => void;
+  };
+  isolation: PickerControl & {
+    effectiveIsolation: Isolation;
+    canCreateWorktree: boolean;
+    onSelect: (isolation: Isolation) => void;
+  };
+  base: PickerControl & {
+    selectedSourceDirectory: string | null;
+    selectedItem: PickerItem | null;
+    triggerLabel: string;
+    options: ComboboxOption[];
+    itemById: Map<string, PickerItem>;
+    selectedOptionId: string;
+    onSelect: (id: string) => void;
+    setSearchQuery: (query: string) => void;
+    emptyText: string;
+    showRefPicker: boolean;
+  };
+  launch: {
+    serverId: string;
+    target: LaunchTarget;
+    onChange: (target: LaunchTarget) => void;
+    profiles: readonly TerminalProfile[];
+    disabled: boolean;
+  };
+}
+
+function hostOptionTestID(serverId: string): string {
+  return `new-workspace-host-picker-option-${serverId}`;
+}
+
+function isProjectSelectable(
+  project: HostProjectListItem,
+  supportsWorkspaceMultiplicity: boolean,
+): boolean {
+  return (
+    supportsWorkspaceMultiplicity ||
+    project.hosts.some((host) => host.worktreeSupport !== "unsupported")
+  );
+}
+
+function useProjectPicker(
+  project: NewWorkspaceFormProps["project"],
+  isPending: boolean,
+): { renderOption: RenderOption; footer: ReactNode } {
+  const { projectByOptionId, iconDataByProjectViewKey, selectedServerId } = project;
+  const { supportsWorkspaceMultiplicity, onAddProject } = project;
+  const renderOption = useCallback<RenderOption>(
+    (row) => {
+      const item = projectByOptionId.get(row.option.id);
+      return (
+        <ProjectOption
+          {...row}
+          project={item}
+          iconDataUri={item ? (iconDataByProjectViewKey.get(item.viewKey) ?? null) : null}
+          selectedServerId={selectedServerId}
+          disabled={isPending || !item || !isProjectSelectable(item, supportsWorkspaceMultiplicity)}
+        />
+      );
+    },
+    [
+      iconDataByProjectViewKey,
+      isPending,
+      projectByOptionId,
+      selectedServerId,
+      supportsWorkspaceMultiplicity,
+    ],
+  );
+  const footer = useMemo(() => <AddProjectOption onPress={onAddProject} />, [onAddProject]);
+  return { renderOption, footer };
+}
+
+function useIsolationPicker(
+  isolation: NewWorkspaceFormProps["isolation"],
+  isPending: boolean,
+): { options: ComboboxOption[]; onSelect: (id: string) => void; renderOption: RenderOption } {
+  const { t } = useTranslation();
+  const { canCreateWorktree, onSelect, onOpenChange } = isolation;
+  // "New worktree" is omitted entirely (not disabled) when the project isn't a
+  // git checkout, since worktree isolation is impossible there.
+  const options = useMemo<ComboboxOption[]>(() => {
+    const local = { id: "local", label: t("newWorkspace.isolation.local") };
+    if (!canCreateWorktree) return [local];
+    return [local, { id: "worktree", label: t("newWorkspace.isolation.worktree") }];
+  }, [canCreateWorktree, t]);
+  const handleSelect = useCallback(
+    (id: string) => {
+      onSelect(id === "worktree" ? "worktree" : "local");
+      onOpenChange(false);
+    },
+    [onOpenChange, onSelect],
+  );
+  const renderOption = useCallback<RenderOption>(
+    (row) => <IsolationOption {...row} disabled={isPending} />,
+    [isPending],
+  );
+  return { options, onSelect: handleSelect, renderOption };
+}
+
+function useRefRenderOption(itemById: Map<string, PickerItem>, isPending: boolean): RenderOption {
+  return useCallback<RenderOption>(
+    (row) => <RefOption {...row} item={itemById.get(row.option.id)} disabled={isPending} />,
+    [isPending, itemById],
+  );
+}
+
+/**
+ * The New workspace setup fields, one trigger per field, each opening its picker. Compact: a stack
+ * of full-width fields with the label inside. Desktop: one meta row of badges. Either way, a field
+ * that does not apply to the selected project is left out, and Host only shows with a second host.
+ */
+export function useNewWorkspaceForm(props: NewWorkspaceFormProps): ReactElement {
+  const { t } = useTranslation();
+  const { isCompact, isPending, project, host, isolation, base, launch } = props;
+  const variant: FieldTriggerVariant = isCompact ? "field" : "badge";
+  const projectPicker = useProjectPicker(project, isPending);
+  const isolationPicker = useIsolationPicker(isolation, isPending);
+  const renderRefOption = useRefRenderOption(base.itemById, isPending);
+
+  const showHost = host.allHosts.length > 1;
+  const selectedHostLabel =
+    host.allHosts.find((h) => h.serverId === host.selectedServerId)?.label ?? "Host";
+  const selectedProject = project.selectedProject;
+  const selectedProjectIconUri = selectedProject
+    ? (project.iconDataByProjectViewKey.get(selectedProject.viewKey) ?? null)
+    : null;
+  const projectIcon = useMemo(
+    () =>
+      selectedProject ? (
+        <ProjectIcon
+          projectViewKey={selectedProject.viewKey}
+          projectName={selectedProject.projectName}
+          iconDataUri={selectedProjectIconUri}
+        />
+      ) : (
+        folderIcon
+      ),
+    [selectedProject, selectedProjectIconUri],
+  );
+  const hostIcon = useMemo(
+    () => <HostStatusDot serverId={host.selectedServerId} />,
+    [host.selectedServerId],
+  );
+  const isWorktree = isolation.effectiveIsolation === "worktree";
+  const isolationValue = isWorktree
+    ? t("newWorkspace.isolation.worktree")
+    : t("newWorkspace.isolation.local");
+  const refIcon = base.selectedItem?.kind === "github-pr" ? pullRequestIcon : branchIcon;
+
+  const projectField = (
+    <FieldTrigger
+      ref={project.anchorRef}
+      variant={variant}
+      label={t("newWorkspace.fields.project")}
+      accessibilityLabel="Workspace project"
+      tooltip={t("newWorkspace.tooltips.project")}
+      icon={projectIcon}
+      value={project.triggerLabel}
+      onPress={project.open}
+      disabled={isPending}
+      testID="new-workspace-project-picker-trigger"
+    />
+  );
+  const hostField = showHost ? (
+    <HostPicker
+      hosts={host.allHosts}
+      value={host.selectedServerId}
+      onSelect={host.onSelect}
+      open={host.openState}
+      onOpenChange={host.onOpenChange}
+      anchorRef={host.anchorRef}
+      includeAddHost={isCompact}
+      onAddHost={host.onAddHost}
+      searchable={false}
+      title={t("newWorkspace.fields.host")}
+      desktopPlacement="bottom-start"
+      desktopMinWidth={200}
+      hostOptionTestID={hostOptionTestID}
+    >
+      <FieldTrigger
+        ref={host.anchorRef}
+        variant={variant}
+        label={t("newWorkspace.fields.host")}
+        tooltip={t("newWorkspace.tooltips.host")}
+        icon={hostIcon}
+        value={selectedHostLabel}
+        onPress={host.open}
+        disabled={isPending}
+        testID="host-picker-trigger"
+      />
+    </HostPicker>
+  ) : null;
+  const isolationField = isolation.canCreateWorktree ? (
+    <FieldTrigger
+      ref={isolation.anchorRef}
+      variant={variant}
+      label={t("newWorkspace.isolation.label")}
+      accessibilityLabel="Workspace isolation"
+      tooltip={t("newWorkspace.tooltips.isolation")}
+      icon={isWorktree ? branchIcon : folderIcon}
+      value={isolationValue}
+      onPress={isolation.open}
+      disabled={isPending}
+      testID="workspace-create-isolation-trigger"
+    />
+  ) : null;
+  const baseField = base.showRefPicker ? (
+    <FieldTrigger
+      ref={base.anchorRef}
+      variant={variant}
+      label={t("newWorkspace.fields.branch")}
+      accessibilityLabel={t("newWorkspace.refPicker.startingRef")}
+      tooltip={t("newWorkspace.tooltips.startingRef")}
+      icon={refIcon}
+      value={base.triggerLabel}
+      onPress={base.open}
+      disabled={isPending || !base.selectedSourceDirectory}
+      testID="new-workspace-ref-picker-trigger"
+    />
+  ) : null;
+  const launchField = (
+    <LaunchControl
+      variant={variant}
+      serverId={launch.serverId}
+      target={launch.target}
+      onChange={launch.onChange}
+      profiles={launch.profiles}
+      disabled={launch.disabled}
+    />
+  );
+
+  const pickers = (
+    <>
+      <Combobox
+        options={project.options}
+        value={project.selectedOptionId}
+        onSelect={project.onSelect}
+        searchable
+        searchPlaceholder="Search projects"
+        title={t("newWorkspace.fields.project")}
+        open={project.openState}
+        onOpenChange={project.onOpenChange}
+        desktopPlacement="bottom-start"
+        desktopMinWidth={360}
+        anchorRef={project.anchorRef}
+        emptyText="No projects available."
+        renderOption={projectPicker.renderOption}
+        footer={projectPicker.footer}
+      />
+      <Combobox
+        options={isolationPicker.options}
+        value={isolation.effectiveIsolation}
+        onSelect={isolationPicker.onSelect}
+        title={t("newWorkspace.isolation.label")}
+        open={isolation.openState}
+        onOpenChange={isolation.onOpenChange}
+        desktopPlacement="bottom-start"
+        anchorRef={isolation.anchorRef}
+        renderOption={isolationPicker.renderOption}
+      />
+      <Combobox
+        options={base.options}
+        value={base.selectedOptionId}
+        onSelect={base.onSelect}
+        searchable
+        searchPlaceholder={t("newWorkspace.refPicker.searchPlaceholder")}
+        title={t("newWorkspace.refPicker.title")}
+        open={base.openState}
+        onOpenChange={base.onOpenChange}
+        onSearchQueryChange={base.setSearchQuery}
+        desktopPlacement="bottom-start"
+        anchorRef={base.anchorRef}
+        emptyText={base.emptyText}
+        renderOption={renderRefOption}
+      />
+    </>
+  );
+
+  if (isCompact) {
+    return (
+      <View testID="new-workspace-ref-picker-row" style={styles.compactStack}>
+        {projectField}
+        {hostField}
+        {isolationField}
+        {baseField}
+        {launchField}
+        {/* Isolation and Base come and go with the project; their rows stay reserved so the
+            stack keeps one height and nothing above the composer jumps. */}
+        {isolationField ? null : <View style={styles.reservedField} pointerEvents="none" />}
+        {baseField ? null : <View style={styles.reservedField} pointerEvents="none" />}
+        {pickers}
+      </View>
+    );
+  }
+
+  return (
+    <View testID="new-workspace-ref-picker-row" style={styles.desktopRow} pointerEvents="box-none">
+      <View style={styles.desktopControl}>{projectField}</View>
+      {hostField ? <View style={styles.desktopControl}>{hostField}</View> : null}
+      {isolationField ? <View style={styles.desktopControl}>{isolationField}</View> : null}
+      {baseField ? <View style={styles.desktopControl}>{baseField}</View> : null}
+      <View style={styles.launchSpacer} pointerEvents="none" />
+      {launchField}
+      {pickers}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  compactStack: {
+    marginBottom: theme.spacing[4],
+    paddingHorizontal: theme.spacing[4],
+    gap: theme.spacing[2],
+  },
+  reservedField: {
+    height: FIELD_HEIGHT,
+  },
+  desktopRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    minHeight: FIELD_BADGE_HEIGHT,
+    // Matches the gap between the composer and the Import session pill below it.
+    marginBottom: theme.spacing[4],
+    // The badge adds its own left padding; offset it so the project icon's left
+    // edge lands exactly on the "New workspace" title's left edge. The trailing
+    // inset mirrors it so the launch chip stops on the composer's inner content
+    // rather than running out to the composer's border.
+    paddingHorizontal: theme.spacing[4],
+    gap: theme.spacing[2],
+  },
+  desktopControl: {
+    minWidth: 0,
+    flexShrink: 1,
+  },
+  // Pushes the launch control to the trailing edge of the desktop meta row.
+  launchSpacer: {
+    flex: 1,
+  },
+}));
diff --git a/packages/app/src/new-workspace-launch/launch-control.tsx b/packages/app/src/screens/new-workspace/form/launch-control.tsx
similarity index 79%
rename from packages/app/src/new-workspace-launch/launch-control.tsx
rename to packages/app/src/screens/new-workspace/form/launch-control.tsx
index 785cfb56ac..fb6af66022 100644
--- a/packages/app/src/new-workspace-launch/launch-control.tsx
+++ b/packages/app/src/screens/new-workspace/form/launch-control.tsx
@@ -1,8 +1,8 @@
 import { useCallback, useMemo, useState, type ReactElement } from "react";
-import { Pressable, Text, View } from "react-native";
+import { Text, View } from "react-native";
 import { useTranslation } from "react-i18next";
 import { useRouter } from "expo-router";
-import { ChevronDown, MessageCircle, SquareTerminal } from "lucide-react-native";
+import { MessageCircle, SquareTerminal } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import {
   DropdownMenu,
@@ -30,14 +30,17 @@ import {
   resolveLaunchProfile,
   terminalLaunchTarget,
   type LaunchTarget,
-} from "./target";
+} from "@/new-workspace-launch/target";
+import {
+  FieldTriggerContent,
+  useFieldTriggerStyle,
+  type FieldTriggerVariant,
+} from "./field-trigger";
 
 const ThemedMessageCircle = withUnistyles(MessageCircle);
 const ThemedSquareTerminal = withUnistyles(SquareTerminal);
-const ThemedChevronDown = withUnistyles(ChevronDown);
 
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-const extraMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundExtraMuted });
 
 const chatIcon = <ThemedMessageCircle size={ICON_SIZE.sm} uniProps={mutedColorMapping} />;
 const blankTerminalIcon = <ThemedSquareTerminal size={ICON_SIZE.sm} uniProps={mutedColorMapping} />;
@@ -83,12 +86,7 @@ export interface LaunchControlProps {
   onChange: (target: LaunchTarget) => void;
   profiles: readonly TerminalProfile[];
   disabled?: boolean;
-  /**
-   * The meta row's shared badge style. Passed in rather than redeclared so this
-   * trigger stays pixel-identical to the project, host, and branch triggers it
-   * sits beside; a local copy drifts the moment one of them changes.
-   */
-  badgePressableStyle: React.ComponentProps<typeof Pressable>["style"];
+  variant: FieldTriggerVariant;
 }
 
 function TriggerIcon({
@@ -108,8 +106,8 @@ function TriggerIcon({
 }
 
 /**
- * The meta-row control choosing what New workspace submits to: the chat agent,
- * or a terminal. One trigger shaped like every other chip on that row, opening
+ * The form control choosing what New workspace submits to: the chat agent,
+ * or a terminal. One trigger shaped like every other field trigger, opening
  * a menu whose Chat and Terminal groups are what keep a terminal profile named
  * "Codex" from reading as a chat Codex agent.
  */
@@ -119,13 +117,18 @@ export function LaunchControl({
   onChange,
   profiles,
   disabled = false,
-  badgePressableStyle,
+  variant,
 }: LaunchControlProps) {
   const { t } = useTranslation();
   const router = useRouter();
   const [open, setOpen] = useState(false);
 
   const selectedProfile = useMemo(() => resolveLaunchProfile(target, profiles), [target, profiles]);
+  const triggerStyle = useFieldTriggerStyle(variant, disabled);
+  const triggerIcon = useMemo(
+    () => <TriggerIcon target={target} profile={selectedProfile} />,
+    [selectedProfile, target],
+  );
 
   // A profile's own name and logo say nothing about where it runs: a row
   // reading "(openai logo) Codex" is indistinguishable from a chat Codex agent.
@@ -149,32 +152,26 @@ export function LaunchControl({
 
   return (
     <DropdownMenu open={open} onOpenChange={setOpen} compactMode="sheet">
-      {/* The trigger is the Pressable itself, styled by the meta row's shared
-          badge style, so it lands pixel-identical to the project, host, and
-          branch chips it sits beside. */}
       {/* MenuTrigger is not a forwardRef component and pins its own ref, so the
           tooltip anchors to a wrapping View instead. Suppressed while the menu
           is open so the two surfaces never overlap. */}
-      <Tooltip delayDuration={300} enabledOnDesktop={!open}>
+      <Tooltip delayDuration={300} enabledOnDesktop={!open && variant === "badge"}>
         <TooltipTrigger asChild>
           <View>
             <DropdownMenuTrigger
               testID="new-workspace-launch-trigger"
               disabled={disabled}
-              style={badgePressableStyle}
+              style={triggerStyle}
               accessibilityRole="button"
               accessibilityLabel={t("newWorkspace.tooltips.launch")}
             >
-              <View style={styles.iconBox}>
-                <TriggerIcon target={target} profile={selectedProfile} />
-              </View>
-              <Text style={styles.label} numberOfLines={1}>
-                {triggerLabel}
-                {selectedProfile ? (
-                  <Text style={styles.profileName}> {selectedProfile.name}</Text>
-                ) : null}
-              </Text>
-              <ThemedChevronDown size={ICON_SIZE.sm} uniProps={extraMutedColorMapping} />
+              <FieldTriggerContent
+                variant={variant}
+                label={t("newWorkspace.launch.title")}
+                icon={triggerIcon}
+                value={triggerLabel}
+                detail={selectedProfile?.name}
+              />
             </DropdownMenuTrigger>
           </View>
         </TooltipTrigger>
@@ -232,27 +229,10 @@ export function LaunchControl({
 }
 
 const styles = StyleSheet.create((theme) => ({
-  iconBox: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
-    alignItems: "center",
-    justifyContent: "center",
-    flexShrink: 0,
-  },
-  label: {
-    minWidth: 0,
-    fontSize: theme.fontSize.base,
-    color: theme.colors.foregroundMuted,
-    flexShrink: 1,
-  },
   tooltipText: {
     fontSize: theme.fontSize.base,
     color: theme.colors.popoverForeground,
   },
-  profileName: {
-    fontSize: theme.fontSize.base,
-    color: theme.colors.foregroundExtraMuted,
-  },
   command: {
     fontFamily: theme.fontFamily.mono,
     fontSize: theme.fontSize.sm,
diff --git a/packages/app/src/screens/new-workspace/form/options.tsx b/packages/app/src/screens/new-workspace/form/options.tsx
new file mode 100644
index 0000000000..88f5c5d4dd
--- /dev/null
+++ b/packages/app/src/screens/new-workspace/form/options.tsx
@@ -0,0 +1,166 @@
+import { useMemo, type ReactElement } from "react";
+import { Text, View } from "react-native";
+import { useTranslation } from "react-i18next";
+import { StyleSheet } from "react-native-unistyles";
+import { ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
+import { Shortcut } from "@/components/ui/shortcut";
+import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
+import { getHostProjectSourceDirectory, type HostProjectListItem } from "@/projects/host-projects";
+import { pickerItemLabel, type PickerItem } from "../../new-workspace-picker-item";
+import { addProjectIcon, branchIcon, folderIcon, ProjectIcon, pullRequestIcon } from "./icons";
+
+interface OptionRowState {
+  option: ComboboxOption;
+  selected: boolean;
+  active: boolean;
+  onPress: () => void;
+}
+
+function IconBox({ children }: { children: ReactElement }): ReactElement {
+  return <View style={styles.iconBox}>{children}</View>;
+}
+
+export function ProjectOption({
+  option,
+  selected,
+  active,
+  onPress,
+  project,
+  iconDataUri,
+  selectedServerId,
+  disabled,
+}: OptionRowState & {
+  project: HostProjectListItem | undefined;
+  iconDataUri: string | null;
+  selectedServerId: string;
+  disabled: boolean;
+}): ReactElement {
+  const leadingSlot = useMemo(
+    () =>
+      project ? (
+        <IconBox>
+          <ProjectIcon
+            projectViewKey={project.viewKey}
+            projectName={project.projectName}
+            iconDataUri={iconDataUri}
+          />
+        </IconBox>
+      ) : undefined,
+    [iconDataUri, project],
+  );
+  if (!project) return <View key={option.id} />;
+  return (
+    <ComboboxItem
+      testID={`new-workspace-project-picker-option-${project.viewKey}`}
+      label={project.projectName}
+      description={
+        getHostProjectSourceDirectory(project, selectedServerId) ?? project.iconWorkingDir
+      }
+      selected={selected}
+      active={active}
+      disabled={disabled}
+      onPress={onPress}
+      leadingSlot={leadingSlot}
+    />
+  );
+}
+
+export function AddProjectOption({ onPress }: { onPress: () => void }): ReactElement {
+  const { t } = useTranslation();
+  const openProjectKeys = useShortcutKeys("new-agent");
+  const shortcut = useMemo(
+    () => (openProjectKeys ? <Shortcut chord={openProjectKeys} /> : null),
+    [openProjectKeys],
+  );
+  return (
+    <ComboboxItem
+      testID="new-workspace-project-picker-add-project"
+      label={t("sidebar.actions.addProject")}
+      onPress={onPress}
+      leadingSlot={addProjectIcon}
+      trailingSlot={shortcut}
+    />
+  );
+}
+
+const worktreeLeading = <IconBox>{branchIcon}</IconBox>;
+const localLeading = <IconBox>{folderIcon}</IconBox>;
+
+export function IsolationOption({
+  option,
+  selected,
+  active,
+  onPress,
+  disabled,
+}: OptionRowState & { disabled: boolean }): ReactElement {
+  return (
+    <ComboboxItem
+      testID={`workspace-create-isolation-${option.id}`}
+      label={option.label}
+      selected={selected}
+      active={active}
+      disabled={disabled}
+      onPress={onPress}
+      leadingSlot={option.id === "worktree" ? worktreeLeading : localLeading}
+    />
+  );
+}
+
+const branchLeading = <IconBox>{branchIcon}</IconBox>;
+const pullRequestLeading = <IconBox>{pullRequestIcon}</IconBox>;
+
+export function RefOption({
+  option,
+  selected,
+  active,
+  onPress,
+  item,
+  disabled,
+}: OptionRowState & { item: PickerItem | undefined; disabled: boolean }): ReactElement {
+  const { t } = useTranslation();
+  const divergenceLabel = item?.kind === "branch" ? item.divergenceLabel : undefined;
+  const trailingSlot = useMemo(
+    () =>
+      divergenceLabel ? <Text style={styles.divergenceLabel}>{divergenceLabel}</Text> : undefined,
+    [divergenceLabel],
+  );
+  if (!item) return <View key={option.id} />;
+
+  const isBranch = item.kind === "branch";
+  return (
+    <ComboboxItem
+      testID={
+        isBranch
+          ? `new-workspace-ref-picker-branch-${item.name}`
+          : `new-workspace-ref-picker-pr-${item.item.number}`
+      }
+      label={pickerItemLabel(item)}
+      description={
+        !isBranch && item.item.baseRefName
+          ? t("newWorkspace.refPicker.intoBase", { baseRef: item.item.baseRefName })
+          : undefined
+      }
+      selected={selected}
+      active={active}
+      disabled={disabled}
+      onPress={onPress}
+      leadingSlot={isBranch ? branchLeading : pullRequestLeading}
+      trailingSlot={trailingSlot}
+      accessibilityLabel={isBranch ? item.accessibilityLabel : undefined}
+    />
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  iconBox: {
+    width: theme.iconSize.md,
+    height: theme.iconSize.md,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  divergenceLabel: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foregroundMuted,
+    fontVariant: ["tabular-nums"],
+  },
+}));
diff --git a/packages/app/src/screens/new-workspace/import-session-button.tsx b/packages/app/src/screens/new-workspace/import-session-button.tsx
index 39b55e1b2e..39d4efc1ce 100644
--- a/packages/app/src/screens/new-workspace/import-session-button.tsx
+++ b/packages/app/src/screens/new-workspace/import-session-button.tsx
@@ -5,7 +5,7 @@ import { StyleSheet } from "react-native-unistyles";
 import { Button } from "@/components/ui/button";
 
 /**
- * The new workspace screen's way into Import session: a ghost button at the top on compact
+ * The new workspace screen's way into Import session: a ghost button in the header on compact
  * layouts, an outlined pill under the composer otherwise. Both are muted until hovered.
  */
 export function ImportSessionButton({
@@ -17,7 +17,7 @@ export function ImportSessionButton({
 }) {
   const { t } = useTranslation();
   return (
-    <View style={compact ? styles.compact : styles.wide}>
+    <View style={compact ? null : styles.wide}>
       <Button
         // Ghost for its muted text that turns foreground on hover; the pill adds the outline.
         variant="ghost"
@@ -34,9 +34,6 @@ export function ImportSessionButton({
 }
 
 const styles = StyleSheet.create((theme) => ({
-  compact: {
-    alignItems: "flex-start",
-  },
   // The composer sits spacing[4] in from the dock and leaves spacing[4] below itself; the pill's
   // border lines up with the composer's border.
   wide: {

From 6ff071a487f2c38bc7e0a2281bc7c38f197ceaa6 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 22:45:08 +0700
Subject: [PATCH 242/270] Keep the compact sidebar close button beside the
 first nav item (#7244)

* fix(app): keep the compact sidebar close button beside the first nav row

The close button was absolutely positioned over the nav group, so it covered
the first row's label and hover fill. It now shares a flex row with the first
item, which shrinks to make room, and uses the compact header's icon button so
it gets the same size and round press highlight.

* test(app): cover the compact sidebar close button beside the first nav row
---
 .../app/e2e/browser/sidebar-workspace.spec.ts | 11 +++
 packages/app/src/components/left-sidebar.tsx  | 91 ++++++++++---------
 .../components/sidebar/sidebar-nav-rows.tsx   | 62 +++++++++----
 3 files changed, 103 insertions(+), 61 deletions(-)

diff --git a/packages/app/e2e/browser/sidebar-workspace.spec.ts b/packages/app/e2e/browser/sidebar-workspace.spec.ts
index 8071b3b4f3..85de01a376 100644
--- a/packages/app/e2e/browser/sidebar-workspace.spec.ts
+++ b/packages/app/e2e/browser/sidebar-workspace.spec.ts
@@ -504,6 +504,17 @@ test.describe("Mobile sidebar panelState transition", () => {
     await expectMobileAgentSidebarHidden(page);
   });
 
+  test("places the close button beside the first nav row instead of over it", async ({ page }) => {
+    await gotoAppShell(page);
+    await openMobileAgentSidebar(page);
+    await expectMobileAgentSidebarVisible(page);
+
+    const firstRow = await page.getByTestId("sidebar-global-new-workspace").boundingBox();
+    const closeButton = await page.getByTestId("sidebar-close").boundingBox();
+    if (!firstRow || !closeButton) throw new Error("first nav row and close button must render");
+    expect(closeButton.x).toBeGreaterThanOrEqual(firstRow.x + firstRow.width);
+  });
+
   test("keeps a pinned workspace rendered while the retained sidebar is closed", async ({
     page,
   }) => {
diff --git a/packages/app/src/components/left-sidebar.tsx b/packages/app/src/components/left-sidebar.tsx
index 943c1edd27..58d0dee053 100644
--- a/packages/app/src/components/left-sidebar.tsx
+++ b/packages/app/src/components/left-sidebar.tsx
@@ -21,8 +21,14 @@ import { Gesture } from "react-native-gesture-handler";
 import Animated, { runOnJS, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
 import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
+import { HeaderToggleButton } from "@/components/headers/header-toggle-button";
+import {
+  IconButtonChromeProvider,
+  iconButtonChromeGlyphSize,
+  mutedIconColorMapping,
+} from "@/components/ui/icon-button-chrome";
 import { resolveDesktopSidebarWidth } from "@/components/desktop-sidebar-layout";
 import {
   SIDEBAR_RESIZE_ACTIVATION_OFFSET,
@@ -62,6 +68,7 @@ import { usePanelStore } from "@/stores/panel-store";
 import { useOwnsWindowChromeCorner, WindowChromeSafeArea } from "@/utils/desktop-window";
 import { useCloseAgentListGesture } from "@/mobile-panels/gestures";
 import { MobilePanelOverlay } from "@/mobile-panels/presentation";
+import type { ShortcutKey } from "@/utils/format-shortcut";
 import { buildSettingsAddHostRoute, buildSettingsRoute } from "@/utils/host-routes";
 import { openHostOverview } from "@/navigation/settings-navigation";
 import {
@@ -74,6 +81,8 @@ import { SidebarAgentListSkeleton } from "./sidebar-agent-list-skeleton";
 import { SidebarCalloutSlot } from "./sidebar-callout-slot";
 import { SidebarWorkspaceList } from "./sidebar-workspace-list";
 
+const ThemedX = withUnistyles(X);
+
 type SidebarTheme = ReturnType<typeof useUnistyles>["theme"];
 
 const DEV_BUILD_LABEL = process.env.EXPO_PUBLIC_PASEO_DEV_BUILD_LABEL?.trim() || null;
@@ -545,6 +554,11 @@ function MobileSidebar({
     closeSidebar();
   }, [closeSidebar]);
 
+  const closeButton = useMemo(
+    () => <SidebarCloseButton label={labels.closeSidebar} onPress={closeSidebar} />,
+    [labels.closeSidebar, closeSidebar],
+  );
+
   const mobileSidebarInsetStyle = useMemo(
     () => ({
       paddingTop: insetsTop,
@@ -562,30 +576,11 @@ function MobileSidebar({
     >
       <View style={styles.sidebarContent} pointerEvents="auto">
         <WindowChromeSafeArea placement="below" />
-        <SidebarNavRows style={styles.sidebarHeaderGroup} onBeforeNavigate={closeSidebar} />
-        <WindowChromeSafeArea
-          placement="inline"
-          pointerEvents="box-none"
-          style={styles.mobileCloseButtonRow}
-        >
-          <Pressable
-            style={styles.mobileCloseButton}
-            onPress={closeSidebar}
-            testID="sidebar-close"
-            nativeID="sidebar-close"
-            accessible
-            accessibilityRole="button"
-            accessibilityLabel={labels.closeSidebar}
-            hitSlop={8}
-          >
-            {({ hovered, pressed }) => (
-              <X
-                size={theme.iconSize.md}
-                color={hovered || pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
-              />
-            )}
-          </Pressable>
-        </WindowChromeSafeArea>
+        <SidebarNavRows
+          style={styles.sidebarHeaderGroup}
+          onBeforeNavigate={closeSidebar}
+          firstRowTrailing={closeButton}
+        />
 
         {isInitialLoad && !hasActiveHostFilter ? (
           <SidebarAgentListSkeleton />
@@ -626,6 +621,34 @@ function MobileSidebar({
   );
 }
 
+const NO_SHORTCUT: ShortcutKey[] = [];
+
+/** The compact header's icon button, so the sidebar's close reads like the header it covers. */
+function SidebarCloseButton({ label, onPress }: { label: string; onPress: () => void }) {
+  return (
+    <IconButtonChromeProvider value="header-island">
+      <HeaderToggleButton
+        onPress={onPress}
+        tooltipLabel={label}
+        tooltipKeys={NO_SHORTCUT}
+        tooltipSide="bottom"
+        style={styles.mobileCloseButton}
+        testID="sidebar-close"
+        nativeID="sidebar-close"
+        accessible
+        accessibilityRole="button"
+        accessibilityLabel={label}
+      >
+        <ThemedX
+          size={iconButtonChromeGlyphSize("large")}
+          strokeWidth={1.5}
+          uniProps={mutedIconColorMapping}
+        />
+      </HeaderToggleButton>
+    </IconButtonChromeProvider>
+  );
+}
+
 function DesktopSidebar({
   theme,
   workspaceGroups,
@@ -856,24 +879,8 @@ const styles = StyleSheet.create((theme) => ({
     flex: 1,
     minHeight: 0,
   },
-  mobileCloseButtonRow: {
-    position: "absolute",
-    top: theme.spacing[3],
-    left: 0,
-    right: 0,
-    zIndex: 2,
-    alignItems: "flex-end",
-  },
   mobileCloseButton: {
-    // The 16px X paints farther inside its 32px hit target than the 14px Settings2 glyph.
-    // This optical inset puts their painted right edges on the same sidebar rail.
-    marginRight: theme.spacing[2] + 1.5,
-    width: 32,
-    height: 32,
-    alignItems: "center",
-    justifyContent: "center",
-    borderRadius: theme.borderRadius.lg,
-    backgroundColor: theme.colors.surfaceSidebar,
+    marginRight: theme.spacing[2],
   },
   desktopSidebarBorder: {
     borderRightWidth: 1,
diff --git a/packages/app/src/components/sidebar/sidebar-nav-rows.tsx b/packages/app/src/components/sidebar/sidebar-nav-rows.tsx
index 425280207e..a1481dcff9 100644
--- a/packages/app/src/components/sidebar/sidebar-nav-rows.tsx
+++ b/packages/app/src/components/sidebar/sidebar-nav-rows.tsx
@@ -1,8 +1,9 @@
 import { router, usePathname } from "expo-router";
 import { CalendarClock, History, Plus, Search } from "lucide-react-native";
-import { memo, useCallback, useMemo, useRef, type ComponentType } from "react";
+import { memo, useCallback, useMemo, useRef, type ComponentType, type ReactNode } from "react";
 import { useTranslation } from "react-i18next";
 import { View, type StyleProp, type ViewStyle } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
 import { SidebarHeaderRow } from "@/components/sidebar/sidebar-header-row";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
 import { PluginSidebarItem } from "@/plugins/sidebar-items";
@@ -30,37 +31,49 @@ interface SidebarNavRowProps {
 interface SidebarNavRowsProps extends SidebarNavRowProps {
   /** Style for the group wrapper, which the sidebar owns. */
   style?: StyleProp<ViewStyle>;
+  /** Sits to the right of the first row, which shrinks to make room. */
+  firstRowTrailing?: ReactNode;
 }
 
 /**
  * Top-level sidebar navigation, ordered and filtered by the user's
  * `sidebarNavItems` preference. Renders nothing — not even the bordered group
- * wrapper — when every item is hidden.
+ * wrapper — when every item is hidden and there is no `firstRowTrailing`.
  */
-export function SidebarNavRows({ style, onBeforeNavigate }: SidebarNavRowsProps) {
+export function SidebarNavRows({ style, onBeforeNavigate, firstRowTrailing }: SidebarNavRowsProps) {
   const { items } = useSidebarNavItems("header");
   const visibleItems = useMemo(() => items.filter((item) => item.visible), [items]);
   const groupRef = useRef<View | null>(null);
 
-  if (visibleItems.length === 0) return null;
+  if (visibleItems.length === 0 && !firstRowTrailing) return null;
+
+  const [firstRow, ...restRows] = visibleItems.map((item) => {
+    if (item.kind === "plugin") {
+      return (
+        <PluginSidebarItem
+          key={item.key}
+          group={item.group}
+          section="header"
+          fallbackAnchorRef={groupRef}
+          onBeforeNavigate={onBeforeNavigate}
+        />
+      );
+    }
+    const Row = BUILTIN_ROWS[item.id];
+    return <Row key={item.key} onBeforeNavigate={onBeforeNavigate} />;
+  });
 
   return (
     <View ref={groupRef} collapsable={false} style={style}>
-      {visibleItems.map((item) => {
-        if (item.kind === "plugin") {
-          return (
-            <PluginSidebarItem
-              key={item.key}
-              group={item.group}
-              section="header"
-              fallbackAnchorRef={groupRef}
-              onBeforeNavigate={onBeforeNavigate}
-            />
-          );
-        }
-        const Row = BUILTIN_ROWS[item.id];
-        return <Row key={item.key} onBeforeNavigate={onBeforeNavigate} />;
-      })}
+      {firstRowTrailing ? (
+        <View style={styles.firstRow}>
+          <View style={styles.firstRowItem}>{firstRow}</View>
+          {firstRowTrailing}
+        </View>
+      ) : (
+        firstRow
+      )}
+      {restRows}
     </View>
   );
 }
@@ -179,3 +192,14 @@ const BUILTIN_ROWS: Record<BuiltinSidebarNavId, ComponentType<SidebarNavRowProps
   search: SidebarSearchRow,
   schedules: SidebarSchedulesRow,
 };
+
+const styles = StyleSheet.create({
+  firstRow: {
+    flexDirection: "row",
+    alignItems: "center",
+  },
+  firstRowItem: {
+    flex: 1,
+    minWidth: 0,
+  },
+});

From a4eb0adcf62b643a7b817743f7a6fa752f4068af Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 23:01:36 +0700
Subject: [PATCH 243/270] test(app): consolidate overlapping Playwright
 journeys (#7245)

---
 packages/app/e2e/browser/launcher-tab.spec.ts |  67 ++++--------
 .../app/e2e/browser/projects-settings.spec.ts | 100 +++++++-----------
 .../browser/provider-settings-refresh.spec.ts |  22 +---
 .../app/e2e/browser/workspace-cwd.spec.ts     |  99 -----------------
 .../e2e/browser/workspace-lifecycle.spec.ts   |   4 +-
 packages/app/e2e/support/helpers/launcher.ts  |  14 ---
 .../support/helpers/workspace-lifecycle.ts    |  33 ++++++
 7 files changed, 94 insertions(+), 245 deletions(-)
 delete mode 100644 packages/app/e2e/browser/workspace-cwd.spec.ts

diff --git a/packages/app/e2e/browser/launcher-tab.spec.ts b/packages/app/e2e/browser/launcher-tab.spec.ts
index e9d43ced27..a34aa259d2 100644
--- a/packages/app/e2e/browser/launcher-tab.spec.ts
+++ b/packages/app/e2e/browser/launcher-tab.spec.ts
@@ -2,9 +2,7 @@ import { test, expect } from "../support/fixtures";
 import type { Locator } from "@playwright/test";
 import {
   gotoWorkspace,
-  assertNewChatTileVisible,
   assertNewTabMenuTriggerVisible,
-  assertSingleNewTabButton,
   openNewTabMenuWithShortcut,
   clickNewChat,
   clickNewTerminal,
@@ -126,6 +124,7 @@ test.describe("Tab creation", () => {
     page,
   }) => {
     await gotoWorkspace(page, workspace.workspaceId);
+    await assertNewTabMenuTriggerVisible(page);
     await pressNewTabShortcut(page);
     const newTabs = page
       .locator('[data-testid^="workspace-tab-tab_"]')
@@ -190,11 +189,18 @@ test.describe("Tab creation", () => {
     await expect(agent).toBeFocused();
   });
 
-  test("clicking new agent tab creates a draft tab", async ({ page }) => {
+  test("the Agent menu creates a draft and shows its composer within the visual budget", async ({
+    page,
+  }) => {
     await gotoWorkspace(page, workspace.workspaceId);
 
-    await clickNewChat(page);
-
+    const elapsed = await measureTileTransition(
+      page,
+      () => clickNewChat(page),
+      composerLocator(page),
+      10_000,
+    );
+    expect(elapsed).toBeLessThan(3_000);
     await expectComposerVisible(page);
 
     const tabsAfter = await getTabTestIds(page);
@@ -202,12 +208,17 @@ test.describe("Tab creation", () => {
     expect(draftCountAfter).toBeGreaterThanOrEqual(1);
   });
 
-  test("clicking terminal button creates a standalone terminal", async ({ page }) => {
+  test("the Terminal menu creates a terminal within the visual budget", async ({ page }) => {
     test.setTimeout(45_000);
     await gotoWorkspace(page, workspace.workspaceId);
 
-    await clickNewTerminal(page);
-
+    const elapsed = await measureTileTransition(
+      page,
+      () => clickNewTerminal(page),
+      terminalSurfaceLocator(page),
+      20_000,
+    );
+    expect(elapsed).toBeLessThan(5_000);
     await expectTerminalSurfaceVisible(page);
 
     const tabsAfter = await getTabTestIds(page);
@@ -295,13 +306,6 @@ test.describe("Tab creation", () => {
       await profileSeed.restore();
     }
   });
-
-  test("tab bar shows action buttons per pane", async ({ page }) => {
-    await gotoWorkspace(page, workspace.workspaceId);
-    await assertSingleNewTabButton(page);
-    await assertNewChatTileVisible(page);
-    await assertNewTabMenuTriggerVisible(page);
-  });
 });
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -339,37 +343,4 @@ test.describe("Tab transitions (no flash)", () => {
     expect(new Set(snapshots.map(tabIdentityKey)).size).toBeLessThanOrEqual(2);
     await expectTabTitleFits(page, "New Agent", { min: 64, max: 160 });
   });
-
-  test("Terminal transition completes within visual budget", async ({ page }) => {
-    test.setTimeout(30_000);
-    await gotoWorkspace(page, workspace.workspaceId);
-
-    const elapsed = await measureTileTransition(
-      page,
-      () => clickNewTerminal(page),
-      terminalSurfaceLocator(page),
-      20_000,
-    );
-
-    // Terminal surface should appear within a reasonable budget.
-    // Note: terminal creation involves a server round-trip, so we allow more time
-    // than a pure in-memory transition, but it should still be well under 5 seconds.
-    expect(elapsed).toBeLessThan(5_000);
-  });
-
-  test("New agent tab click shows composer without flash", async ({ page }) => {
-    await gotoWorkspace(page, workspace.workspaceId);
-
-    const elapsed = await measureTileTransition(
-      page,
-      () => clickNewChat(page),
-      composerLocator(page),
-      10_000,
-    );
-
-    // Draft creation is fully in-memory — should be fast
-    // We use a generous budget here because CI can be slow, but the key assertion
-    // is that no blank/flash frame appears (tested above).
-    expect(elapsed).toBeLessThan(3_000);
-  });
 });
diff --git a/packages/app/e2e/browser/projects-settings.spec.ts b/packages/app/e2e/browser/projects-settings.spec.ts
index 3845e017a6..0612d5ce07 100644
--- a/packages/app/e2e/browser/projects-settings.spec.ts
+++ b/packages/app/e2e/browser/projects-settings.spec.ts
@@ -223,7 +223,10 @@ test.describe("Projects settings", () => {
     }
   });
 
-  test("user edits worktree setup from the projects page", async ({ page, editableProject }) => {
+  test("edits worktree setup, navigates within the host, and removes a script", async ({
+    page,
+    editableProject,
+  }) => {
     await openProjects(page);
     await openProjectSettings(page, editableProject.name);
     await expectNoUncommittedSetupWarning(page);
@@ -236,15 +239,22 @@ test.describe("Projects settings", () => {
     await returnToProjectsList(page);
     await openProjectSettings(page, editableProject.name);
     await expectNoUncommittedSetupWarning(page);
-  });
 
-  test("project navigation stays inside the selected host", async ({ page, editableProject }) => {
-    await openProjects(page);
-    await openProjectSettings(page, editableProject.name);
-    await expectProjectHostContextHidden(page);
-    await returnToProjectsList(page);
-    await openProjectSettings(page, editableProject.name);
-    await expectProjectSettingsHistoryRoundTrip(page, editableProject.name);
+    await test.step("navigation stays inside the selected host", async () => {
+      await expectProjectHostContextHidden(page);
+      await returnToProjectsList(page);
+      await openProjectSettings(page, editableProject.name);
+      await expectProjectSettingsHistoryRoundTrip(page, editableProject.name);
+    });
+
+    await test.step("removing a script leaves the committed setup unchanged", async () => {
+      await expectScriptRowCount(page, 1);
+      await removeProjectScript(page, "dev");
+      await expectScriptRowCount(page, 0);
+      await expectEmptyScriptList(page);
+      await clickSaveProjectSettings(page);
+      await expectNoUncommittedSetupWarning(page);
+    });
   });
 
   test("user edits worktree setup on a non-GitHub remote project", async ({
@@ -259,18 +269,7 @@ test.describe("Projects settings", () => {
     await expectProjectConfigSaved(gitlabRemoteProject);
   });
 
-  test("user renames a project from the edit sheet", async ({ page, editableProject }) => {
-    await openProjects(page);
-    await openProjectSettings(page, editableProject.name);
-    await openProjectEditSheet(page);
-    await fillProjectName(page, "Renamed project");
-    await saveProjectEdits(page);
-
-    await expectProjectEditSaved(page);
-    await expectProjectTitle(page, "Renamed project");
-  });
-
-  test("reopening the edit sheet seeds from the saved project", async ({
+  test("renames a project, reopens the saved edit sheet, and adds an icon", async ({
     page,
     editableProject,
   }) => {
@@ -279,26 +278,26 @@ test.describe("Projects settings", () => {
     await openProjectEditSheet(page);
     await fillProjectName(page, "Renamed project");
     await saveProjectEdits(page);
+
     await expectProjectEditSaved(page);
+    await expectProjectTitle(page, "Renamed project");
 
-    await openProjectEditSheet(page);
-
-    await expectProjectEditName(page, "Renamed project");
-    await expectProjectEditsSaveDisabled(page);
-  });
-
-  test("user picks a custom project icon from a file", async ({ page, editableProject }) => {
-    await openProjects(page);
-    await openProjectSettings(page, editableProject.name);
-    await openProjectEditSheet(page);
-    await chooseProjectIconImage(page, {
-      name: "logo.png",
-      mimeType: "image/png",
-      buffer: PNG_1X1,
+    await test.step("reopening seeds the saved name with no unsaved changes", async () => {
+      await openProjectEditSheet(page);
+      await expectProjectEditName(page, "Renamed project");
+      await expectProjectEditsSaveDisabled(page);
     });
-    await saveProjectEdits(page);
 
-    await expectProjectEditSaved(page);
+    await test.step("an icon can be saved without another name change", async () => {
+      await chooseProjectIconImage(page, {
+        name: "logo.png",
+        mimeType: "image/png",
+        buffer: PNG_1X1,
+      });
+      await saveProjectEdits(page);
+      await expectProjectEditSaved(page);
+      await expectProjectTitle(page, "Renamed project");
+    });
   });
 
   test("user sets a project name and icon in one save", async ({ page, editableProject }) => {
@@ -459,31 +458,4 @@ test.describe("Projects settings — error UX", () => {
 
     await expectNoEditableTarget(page);
   });
-
-  test("project detail does not render a second host selector", async ({
-    page,
-    editableProject,
-  }) => {
-    await openProjects(page);
-    await openProjectSettings(page, editableProject.name);
-
-    await expectProjectHostContextHidden(page);
-  });
-
-  test("script removal via kebab menu removes the row from the form", async ({
-    page,
-    editableProject,
-  }) => {
-    await openProjects(page);
-    await openProjectSettings(page, editableProject.name);
-
-    await expectScriptRowCount(page, 1);
-
-    await removeProjectScript(page, "dev");
-
-    await expectScriptRowCount(page, 0);
-    await expectEmptyScriptList(page);
-    await clickSaveProjectSettings(page);
-    await expectNoUncommittedSetupWarning(page);
-  });
 });
diff --git a/packages/app/e2e/browser/provider-settings-refresh.spec.ts b/packages/app/e2e/browser/provider-settings-refresh.spec.ts
index efc4fc7f88..961b518435 100644
--- a/packages/app/e2e/browser/provider-settings-refresh.spec.ts
+++ b/packages/app/e2e/browser/provider-settings-refresh.spec.ts
@@ -116,28 +116,12 @@ async function exerciseProviderSettingsStack(page: Page) {
 
   await page.getByRole("button", { name: "Refresh", exact: true }).click();
   await expectProviderSettingsVisible(page);
+  await expect(page.getByText("Updated just now", { exact: true })).toBeVisible({
+    timeout: 30_000,
+  });
 }
 
 test.describe("provider settings overlay stack", () => {
-  test("provider model update age says just now", async ({ page }) => {
-    const session = await seedMockAgentWorkspace({
-      repoPrefix: "provider-relative-time-",
-      title: "Provider relative time",
-    });
-    try {
-      await page.clock.install({ time: Date.now() });
-      await page.setViewportSize(MOBILE_VIEWPORT);
-      await openAgentRoute(page, session);
-      await expectComposerVisible(page);
-      await openProviderSettingsFromModelSelector(page);
-      await expect(page.getByText("Updated just now", { exact: true })).toBeVisible({
-        timeout: 30_000,
-      });
-    } finally {
-      await session.cleanup();
-    }
-  });
-
   test("provider settings covers the desktop model selector without closing it", async ({
     page,
   }) => {
diff --git a/packages/app/e2e/browser/workspace-cwd.spec.ts b/packages/app/e2e/browser/workspace-cwd.spec.ts
deleted file mode 100644
index e702cc0f7d..0000000000
--- a/packages/app/e2e/browser/workspace-cwd.spec.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { expect, test } from "../support/fixtures";
-import { clickNewChat, clickNewTerminal, gotoWorkspace } from "../support/helpers/launcher";
-import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
-import {
-  expectTerminalSurfaceVisible,
-  focusTerminalSurface,
-  typeInTerminal,
-  setupDeterministicPrompt,
-  waitForTerminalContent,
-} from "../support/helpers/terminal-perf";
-
-interface CreatedAgentCwdAssertion {
-  workspaceId: string;
-  cwd: string | null;
-}
-
-async function fetchSingleAgentForWorkspace(
-  workspace: SeededWorkspace,
-): Promise<CreatedAgentCwdAssertion | null> {
-  const agents = (await workspace.client.fetchAgents({ scope: "active" })).entries
-    .map((entry) => entry.agent)
-    .filter((agent) => agent.workspaceId === workspace.workspaceId);
-  if (agents.length !== 1) {
-    return null;
-  }
-  const [agent] = agents;
-  return {
-    workspaceId: workspace.workspaceId,
-    cwd: agent.cwd,
-  };
-}
-
-test.describe("Workspace cwd correctness", () => {
-  test("main checkout workspace opens terminals in the project root", async ({
-    page,
-    withWorkspace,
-  }) => {
-    test.setTimeout(60_000);
-
-    const workspace = await withWorkspace({ prefix: "workspace-cwd-main-" });
-    await workspace.navigateTo();
-    await clickNewTerminal(page);
-
-    await expectTerminalSurfaceVisible(page);
-    await focusTerminalSurface(page);
-    await setupDeterministicPrompt(page, `PWD_READY_${Date.now()}`);
-    await typeInTerminal(page, "pwd\n");
-    await waitForTerminalContent(page, (text) => text.includes(workspace.repoPath), 10_000);
-  });
-
-  test("draft tab creates an agent in the workspace cwd", async ({ page }) => {
-    test.setTimeout(60_000);
-
-    const workspace = await seedWorkspace({ repoPrefix: "workspace-cwd-draft-agent-" });
-    try {
-      await gotoWorkspace(page, workspace.workspaceId);
-
-      await clickNewChat(page);
-      const composer = page.getByRole("textbox", { name: "Message agent..." }).first();
-      const message = `cwd draft create ${Date.now()}`;
-      await expect(composer).toBeEditable({ timeout: 15_000 });
-      await composer.fill(message);
-      await composer.press("Enter");
-      await expect(page.getByText(message, { exact: true }).first()).toBeVisible({
-        timeout: 30_000,
-      });
-
-      await expect(page.locator('[data-testid^="workspace-tab-agent_"]').first()).toBeVisible({
-        timeout: 30_000,
-      });
-
-      await expect
-        .poll(() => fetchSingleAgentForWorkspace(workspace), { timeout: 30_000 })
-        .toEqual({
-          workspaceId: workspace.workspaceId,
-          cwd: workspace.repoPath,
-        });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("worktree workspace opens terminals in the worktree directory", async ({
-    page,
-    withWorkspace,
-  }) => {
-    test.setTimeout(90_000);
-
-    const workspace = await withWorkspace({ worktree: true, prefix: "workspace-cwd-worktree-" });
-    await workspace.navigateTo();
-    await clickNewTerminal(page);
-
-    await expectTerminalSurfaceVisible(page);
-    await focusTerminalSurface(page);
-    await setupDeterministicPrompt(page, `PWD_READY_${Date.now()}`);
-    await typeInTerminal(page, "pwd\n");
-    await waitForTerminalContent(page, (text) => text.includes(workspace.repoPath), 10_000);
-  });
-});
diff --git a/packages/app/e2e/browser/workspace-lifecycle.spec.ts b/packages/app/e2e/browser/workspace-lifecycle.spec.ts
index 7c7a20658f..83659cd001 100644
--- a/packages/app/e2e/browser/workspace-lifecycle.spec.ts
+++ b/packages/app/e2e/browser/workspace-lifecycle.spec.ts
@@ -3,6 +3,7 @@ import {
   createAgentChatFromLauncher,
   createStandaloneTerminalFromLauncher,
   expectTerminalCwd,
+  submitAgentChatAndExpectCwd,
 } from "../support/helpers/workspace-lifecycle";
 
 test.describe("Workspace lifecycle", () => {
@@ -19,8 +20,9 @@ test.describe("Workspace lifecycle", () => {
     const workspace = await withWorkspace({ prefix: "lifecycle-main-" });
     await workspace.navigateTo();
 
-    await test.step("creates an agent chat", async () => {
+    await test.step("submitting a draft creates an agent in the project root", async () => {
       await createAgentChatFromLauncher(page);
+      await submitAgentChatAndExpectCwd(page, workspace);
     });
 
     await test.step("creates a terminal in the project root", async () => {
diff --git a/packages/app/e2e/support/helpers/launcher.ts b/packages/app/e2e/support/helpers/launcher.ts
index cf4a6b14a0..e967dc4d6d 100644
--- a/packages/app/e2e/support/helpers/launcher.ts
+++ b/packages/app/e2e/support/helpers/launcher.ts
@@ -80,13 +80,6 @@ export async function pressDirectNewTabShortcut(page: Page, key: string): Promis
 
 // ─── Tab bar assertions ───────────────────────────────────────────────────
 
-/** Assert the inline plus button is visible in the tab bar. */
-export async function assertNewChatTileVisible(page: Page): Promise<void> {
-  await expect(
-    page.getByTestId("workspace-new-tab-button").filter({ visible: true }).first(),
-  ).toBeVisible();
-}
-
 /** Assert the New tab button is visible in the tab bar. */
 export async function assertNewTabMenuTriggerVisible(page: Page): Promise<void> {
   await expect(
@@ -132,13 +125,6 @@ export async function waitForTabWithTitle(
   ).toBeVisible({ timeout });
 }
 
-/** Assert the inline plus button is visible in the tab bar. */
-export async function assertSingleNewTabButton(page: Page): Promise<void> {
-  const buttons = page.getByTestId("workspace-new-tab-button").filter({ visible: true });
-  const count = await buttons.count();
-  expect(count).toBeGreaterThanOrEqual(1);
-}
-
 // ─── No-flash measurement ──────────────────────────────────────────────────
 
 /**
diff --git a/packages/app/e2e/support/helpers/workspace-lifecycle.ts b/packages/app/e2e/support/helpers/workspace-lifecycle.ts
index 383872850a..dde9490dea 100644
--- a/packages/app/e2e/support/helpers/workspace-lifecycle.ts
+++ b/packages/app/e2e/support/helpers/workspace-lifecycle.ts
@@ -1,5 +1,6 @@
 import { expect, type Page } from "@playwright/test";
 import { clickNewChat, clickNewTerminal } from "./launcher";
+import { connectSeedClient } from "./seed-client";
 import { setupDeterministicPrompt, waitForTerminalContent } from "./terminal-perf";
 
 function terminalSurface(page: Page) {
@@ -30,3 +31,35 @@ export async function createAgentChatFromLauncher(page: Page): Promise<void> {
   await expect(composerInput(page)).toBeEditable({ timeout: 15_000 });
   await expect(page.getByTestId("agent-loading")).toHaveCount(0);
 }
+
+export async function submitAgentChatAndExpectCwd(
+  page: Page,
+  workspace: { workspaceId: string; repoPath: string },
+): Promise<void> {
+  const client = await connectSeedClient();
+  try {
+    const message = "cwd draft create";
+    await composerInput(page).fill(message);
+    await composerInput(page).press("Enter");
+    await expect(page.getByText(message, { exact: true }).first()).toBeVisible({
+      timeout: 30_000,
+    });
+    await expect(page.locator('[data-testid^="workspace-tab-agent_"]').first()).toBeVisible({
+      timeout: 30_000,
+    });
+    await expect
+      .poll(
+        async () => {
+          const agents = await client.fetchAgents({ scope: "active" });
+          return agents.entries
+            .map((entry) => entry.agent)
+            .filter((agent) => agent.workspaceId === workspace.workspaceId)
+            .map((agent) => ({ workspaceId: agent.workspaceId, cwd: agent.cwd }));
+        },
+        { timeout: 30_000 },
+      )
+      .toEqual([{ workspaceId: workspace.workspaceId, cwd: workspace.repoPath }]);
+  } finally {
+    await client.close();
+  }
+}

From 3c48ac3ad28488355b1aaf3435cb6ea07ada33d4 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 00:30:19 +0700
Subject: [PATCH 244/270] Restore inline-code file path links (#7251)

* fix(app): restore inline-code file path links

Classify complete inline-code spans with the file-link classifier before adapting them to the Markdown engine recognition pattern. Keep bare-text heuristics separate so route punctuation and line fragments work without adding prose false positives.

* perf(app): avoid parsing inline-link source on every reveal

Collect candidate values between equal-length backtick runs and let the Markdown engine own code boundaries. This preserves classifier decisions without reparsing long fenced blocks in JavaScript during streaming.
---
 .../e2e/browser/plan-card-markdown.spec.ts    |  71 +++++++++++
 .../src/components/markdown/renderer.test.ts  | 120 ++++++++++++++++--
 .../app/src/components/markdown/source.ts     |  41 +++++-
 3 files changed, 217 insertions(+), 15 deletions(-)

diff --git a/packages/app/e2e/browser/plan-card-markdown.spec.ts b/packages/app/e2e/browser/plan-card-markdown.spec.ts
index 5dcf2a2cec..13428ce445 100644
--- a/packages/app/e2e/browser/plan-card-markdown.spec.ts
+++ b/packages/app/e2e/browser/plan-card-markdown.spec.ts
@@ -188,3 +188,74 @@ async function measureInlineCode(message: Locator) {
     return { codes, right: paragraph.getBoundingClientRect().right };
   });
 }
+
+test("inline-code paths preserve stable recognition and file navigation", async ({
+  page,
+  context,
+}, testInfo) => {
+  const { writeFile, mkdir } = await import("node:fs/promises");
+  const paths = ["src/app/[id].tsx", "src/app/(tabs)/index.tsx", "src/a$b.ts"];
+  const source =
+    paths.map((path) => `Open \`${path}\`.`).join("\n\n") +
+    "\n\nOpen `.gitignore` and `src/index.ts#L10-L20`. Compare before/after and `before/after`. Keep `word.word` plain.";
+  const session = await seedMockAgentWorkspace({
+    repoPrefix: "inline-path-regression-",
+    title: "Inline path regression",
+    initialPrompt: "Show file paths",
+    featureValues: { mockAssistantResponse: source },
+  });
+  try {
+    await mkdir(`${session.cwd}/src/app/(tabs)`, { recursive: true });
+    for (const path of paths) await writeFile(`${session.cwd}/${path}`, `Opened ${path}`);
+    await writeFile(
+      `${session.cwd}/src/index.ts`,
+      Array.from({ length: 30 }, (_, i) => `export const line${i + 1} = ${i + 1};`).join("\n"),
+    );
+    await session.client.waitForFinish(session.agentId, 30_000);
+    await openAgentRoute(page, session);
+    const message = page.getByTestId("assistant-message");
+    await expect(message.getByRole("link", { name: ".gitignore", exact: true })).toBeVisible();
+    await expect(message.getByRole("link", { name: "before/after", exact: true })).toHaveCount(0);
+    await expect(message.getByRole("link", { name: "word.word", exact: true })).toHaveCount(0);
+    for (const path of paths) {
+      await openInlineRegressionFile(page, path);
+      await expect(page.getByTestId("file-source-editor").filter({ visible: true })).toContainText(
+        `Opened ${path}`,
+      );
+    }
+    await openInlineRegressionFile(page, "src/index.ts#L10-L20");
+    await expect(page.getByLabel("Line 20, column 26")).toBeVisible();
+    await context.grantPermissions(["clipboard-read", "clipboard-write"]);
+    await page
+      .getByTestId("file-source-editor")
+      .filter({ visible: true })
+      .locator(".cm-content")
+      .focus();
+    await page.keyboard.press("ControlOrMeta+c");
+    await expect
+      .poll(() => page.evaluate(() => navigator.clipboard.readText()))
+      .toBe(
+        Array.from({ length: 11 }, (_, i) => `export const line${i + 10} = ${i + 10};`).join("\n"),
+      );
+    await expect(
+      page
+        .getByTestId("file-source-editor")
+        .filter({ visible: true })
+        .locator(".cm-selectionBackground"),
+    ).not.toHaveCount(0);
+    await testInfo.attach("inline-path-line-selection", {
+      body: await page.screenshot(),
+      contentType: "image/png",
+    });
+  } finally {
+    await session.cleanup();
+  }
+});
+
+async function openInlineRegressionFile(page: Page, path: string) {
+  await page.getByRole("button", { name: "Inline path regression", exact: true }).click();
+  await page
+    .getByTestId("assistant-message")
+    .getByRole("link", { name: path, exact: true })
+    .click();
+}
diff --git a/packages/app/src/components/markdown/renderer.test.ts b/packages/app/src/components/markdown/renderer.test.ts
index 8791cf40de..c8a7375737 100644
--- a/packages/app/src/components/markdown/renderer.test.ts
+++ b/packages/app/src/components/markdown/renderer.test.ts
@@ -1,6 +1,8 @@
 import { fromMarkdown } from "mdast-util-from-markdown";
 import { toNativeLinkRecognition } from "react-native-enriched-markdown/src/utils/regexParser";
 import { parseMarkdown } from "react-native-enriched-markdown/src/web/parseMarkdown";
+import { recognizeTextLinks } from "react-native-enriched-markdown/src/web/recognizeTextLinks";
+import { classifyAssistantFileLink } from "@/assistant-file-links";
 import { markInlineImages } from "react-native-enriched-markdown/src/web/utils";
 import type { ASTNode } from "react-native-enriched-markdown/src/web/types";
 import { QueryClient } from "@tanstack/react-query";
@@ -112,7 +114,7 @@ it.each([
   "src/file.ts:10-20",
   "src/file.ts(10,2)",
 ])("recognizes inline paths through the file resolver: %s", (path) => {
-  const prepared = prepareMarkdownSource(`Open \`${path}\`.`);
+  const prepared = prepareMarkdownSource(`Open \`${path}\`.`, "/repo");
   expect(prepared.linkRecognition.inlineCode?.test(path)).toBe(true);
   expect(prepared.linkSource(path, "inline-code")).toEqual({
     href: path,
@@ -121,6 +123,106 @@ it.each([
   });
 });
 
+it("preserves stable inline-code file classification through the library parser", async () => {
+  const paths = [
+    "src/app/[id].tsx",
+    "src/app/(tabs)/index.tsx",
+    "src/a$b.ts",
+    ".gitignore",
+    "src/index.ts#L10-L20",
+    "src/index.ts:10-20",
+    "src/index.ts:20-10",
+    "src/index.ts#L0",
+    "src/index.ts?raw",
+    "before/after",
+    "word.word",
+    "README.md",
+    "./scripts/run",
+    "src/file.ts(10,2)",
+    "src/file.ts lines 10-20",
+    "/tmp/[route].tsx",
+    "file:///tmp/file.ts#L10-L20",
+  ];
+  const source = paths.map((path) => `\`${path}\``).join(" and ");
+  const prepared = prepareMarkdownSource(source, "/repo");
+  const tree = recognizeTextLinks(
+    await parseMarkdown(prepared.render(), { latexMath: false }),
+    prepared.linkRecognition.text,
+    prepared.linkRecognition.inlineCode,
+  );
+  const links: string[] = [];
+  function collect(node: ASTNode) {
+    if (node.type === "Link") links.push(String(node.attributes?.url));
+    node.children?.forEach(collect);
+  }
+  collect(tree);
+  expect(links).toEqual([
+    "src/app/[id].tsx",
+    "src/app/(tabs)/index.tsx",
+    "src/a$b.ts",
+    ".gitignore",
+    "src/index.ts#L10-L20",
+    "src/index.ts:10-20",
+    "README.md",
+    "./scripts/run",
+    "src/file.ts(10,2)",
+    "/tmp/[route].tsx",
+    "file:///tmp/file.ts#L10-L20",
+  ]);
+  expect(
+    classifyAssistantFileLink("src/index.ts#L10-L20", { workspaceRoot: "/repo" }),
+  ).toMatchObject({ target: { path: "/repo/src/index.ts", lineStart: 10, lineEnd: 20 } });
+});
+
+it("lets the engine own code boundaries while classifying candidate values", async () => {
+  const source = [
+    "```ts\n`src/fenced.ts`\n```",
+    "`` src/app/[id].tsx `` and `  src/spaced.ts  `",
+    "``src/a`b.ts`` and `src/after.ts`",
+    "\\`src/escaped.ts` and `src/final.ts`",
+    "`\nsrc/newline.ts\n`",
+    "[`src/explicit.ts`](https://example.com)",
+  ].join("\n\n");
+  const prepared = prepareMarkdownSource(source, "/repo");
+  const tree = recognizeTextLinks(
+    await parseMarkdown(prepared.render(), { latexMath: false }),
+    prepared.linkRecognition.text,
+    prepared.linkRecognition.inlineCode,
+  );
+  const recognized: string[] = [];
+  function collect(node: ASTNode) {
+    if (node.type === "Link" && node.attributes?.recognizedLink === "true") {
+      recognized.push(String(node.attributes.url));
+    }
+    node.children?.forEach(collect);
+  }
+  collect(tree);
+  expect(recognized).toEqual([
+    "src/app/[id].tsx",
+    " src/spaced.ts ",
+    "src/a`b.ts",
+    "src/after.ts",
+    "src/escaped.ts",
+    "src/final.ts",
+    "src/newline.ts",
+  ]);
+});
+
+it("requires workspace context for relative inline paths and escapes literal regex characters", () => {
+  const source = "`src/app/[id].tsx` and `src/a+b.ts` and `README.md` and `/tmp/file.ts`";
+  const withoutWorkspace = prepareMarkdownSource(source).linkRecognition.inlineCode;
+  expect(withoutWorkspace.test("src/app/[id].tsx")).toBe(false);
+  expect(withoutWorkspace.test("README.md")).toBe(false);
+  expect(withoutWorkspace.test("/tmp/file.ts")).toBe(true);
+  const prepared = prepareMarkdownSource(source, "/repo");
+  const native = toNativeLinkRecognition(prepared.linkRecognition);
+  const pattern = new RegExp(native.inlineCode.pattern);
+  expect(pattern.test("src/app/[id].tsx")).toBe(true);
+  expect(pattern.test("src/a+b.ts")).toBe(true);
+  expect(pattern.test("src/app/i.tsx")).toBe(false);
+  expect(pattern.test("src/ab.ts")).toBe(false);
+});
+
 it("recognizes bare Unicode filenames and preserves inline-code URLs", () => {
   const prepared = prepareMarkdownSource("Read 说明.md, or `https://example.com`.");
   expect([..."说明.md,".matchAll(prepared.linkRecognition.text)].map(([text]) => text)).toEqual([
@@ -489,7 +591,7 @@ it.each([
   "×/÷",
   "２０２４/１０/１６",
 ])("leaves non-path tokens unlinked in prose and inline code: %s", (token) => {
-  const { linkRecognition } = prepareMarkdownSource(`Value ${token}, then continue.`);
+  const { linkRecognition } = prepareMarkdownSource(`Value ${token}, then \`${token}\`.`, "/repo");
   expect([...`Value ${token}, then continue.`.matchAll(linkRecognition.text)]).toEqual([]);
   expect(linkRecognition.inlineCode.test(token)).toBe(false);
 });
@@ -514,12 +616,11 @@ it.each([
   "123.ts",
   "FILE.TS",
   "https://example.com/path",
-])("recognizes complete paths and URLs in prose and inline code: %s", (token) => {
-  const { linkRecognition } = prepareMarkdownSource(`Open ${token} then continue.`);
+])("recognizes complete paths and URLs in prose: %s", (token) => {
+  const { linkRecognition } = prepareMarkdownSource(`Open ${token} then \`${token}\`.`, "/repo");
   expect(
     [...`Open ${token} then continue.`.matchAll(linkRecognition.text)].map(([text]) => text),
   ).toEqual([token]);
-  expect(linkRecognition.inlineCode.test(token)).toBe(true);
 });
 
 it.each([
@@ -530,10 +631,13 @@ it.each([
   "packages/app",
   "123/file",
   "src/123",
-])("requires stronger path intent in prose while preserving inline code: %s", (token) => {
-  const { linkRecognition } = prepareMarkdownSource(`Compare ${token}, then continue.`);
+])("leaves extensionless relative paths unlinked in prose and inline code: %s", (token) => {
+  const { linkRecognition } = prepareMarkdownSource(
+    `Compare ${token}, then \`${token}\`.`,
+    "/repo",
+  );
   expect([...`Compare ${token}, then continue.`.matchAll(linkRecognition.text)]).toEqual([]);
-  expect(linkRecognition.inlineCode.test(token)).toBe(true);
+  expect(linkRecognition.inlineCode.test(token)).toBe(false);
 });
 
 it("keeps prose and inline-code recognition enabled through the native regex adapter", () => {
diff --git a/packages/app/src/components/markdown/source.ts b/packages/app/src/components/markdown/source.ts
index 9fda25b728..9977ccfef3 100644
--- a/packages/app/src/components/markdown/source.ts
+++ b/packages/app/src/components/markdown/source.ts
@@ -1,3 +1,4 @@
+import { classifyAssistantFileLink } from "@/assistant-file-links";
 import { ASSISTANT_FILE_EXTENSIONS } from "@/assistant-file-links/extensions";
 import { normalizeMarkdownHtml } from "./html";
 import { gfmTable } from "micromark-extension-gfm-table";
@@ -22,7 +23,6 @@ const SEPARATED_PATH = String.raw`${PATH_SEGMENT}(?:[\\/]${PATH_SEGMENT})+`;
 const FILE_NAME = String.raw`${PATH_SEGMENT}\.(?:${FILE_EXTENSIONS})`;
 // Bare prose paths need a known extension, a line suffix, or at least two separators.
 const PROSE_PATH = String.raw`(?:${PATH_PREFIX}${HAS_PATH_LETTER}${SEPARATED_PATH}|${HAS_PATH_LETTER}(?:${PATH_SEGMENT}(?:[\\/]${PATH_SEGMENT})*[\\/]${FILE_NAME}|${PATH_SEGMENT}(?:[\\/]${PATH_SEGMENT}){2,}|${SEPARATED_PATH}(?=:)))`;
-const INLINE_CODE_PATH = String.raw`${PATH_PREFIX}?${HAS_PATH_LETTER}${SEPARATED_PATH}`;
 
 function createFilePattern(path: string): RegExp {
   // The native adapter mistakes a literal + in lookbehind for a quantifier; use its hex escape.
@@ -33,20 +33,46 @@ function createFilePattern(path: string): RegExp {
 }
 
 const FILE_PATTERN = createFilePattern(PROSE_PATH);
-const INLINE_CODE_FILE_PATTERN = createFilePattern(INLINE_CODE_PATH);
-
-function linkMetadata() {
+function linkMetadata(inlineCodePaths: ReadonlySet<string>) {
+  // The engine accepts regexes on both platforms. Classify complete code spans
+  // first, then pass literal matches rather than maintaining a second path grammar.
+  const alternatives = [...inlineCodePaths].map((path) =>
+    path.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"),
+  );
   return {
     linkRecognition: {
       text: FILE_PATTERN,
       inlineCode: new RegExp(
-        String.raw`^(?:${INLINE_CODE_FILE_PATTERN.source})(?:\(\d+(?:,\d+)?(?:-\d+(?:,\d+)?)?\)| lines? \d+(?:-\d+)?)?$`,
+        String.raw`^(?:https?://[^\s<>]+${alternatives.length ? `|${alternatives.join("|")}` : ""})$`,
       ),
     },
     linkSource: markdownLinkSource,
   };
 }
 
+function collectInlineCodePaths(source: string, workspaceRoot?: string): ReadonlySet<string> {
+  const paths = new Set<string>();
+  const previousEnds = new Map<number, number>();
+  // Collect candidates between consecutive runs of equal length. The engine owns
+  // Markdown context (escapes, fences, authored links); extra candidates are harmless
+  // because recognition only applies to complete Code nodes. This avoids an AST
+  // parse on every streaming reveal, including updates inside long code fences.
+  for (const match of source.matchAll(/`+/g)) {
+    const length = match[0].length;
+    const previousEnd = previousEnds.get(length);
+    previousEnds.set(length, match.index + length);
+    if (previousEnd === undefined) continue;
+    let value = source.slice(previousEnd, match.index).replace(/\r\n?|\n/g, " ");
+    // CommonMark code spans replace line endings and strip one surrounding space.
+    if (value.startsWith(" ") && value.endsWith(" ") && /[^ ]/.test(value)) {
+      value = value.slice(1, -1);
+    }
+    const classification = classifyAssistantFileLink(value, { workspaceRoot });
+    if (classification && classification.kind !== "external") paths.add(value);
+  }
+  return paths;
+}
+
 export function markdownLinkSource(
   url: string,
   sourceType?: "markdown" | "text" | "inline-code",
@@ -90,6 +116,7 @@ export function prepareMarkdownSource(
       extensions: [gfmTable()],
       mdastExtensions: [gfmTableFromMarkdown()],
     }));
+  const metadata = linkMetadata(collectInlineCodePaths(source, workspaceRoot));
   const edits: { start: number; end: number; text: string }[] = [];
   if (
     !source.includes("![") &&
@@ -97,7 +124,7 @@ export function prepareMarkdownSource(
     !source.includes("&") &&
     !(workspaceRoot && source.includes("]("))
   ) {
-    return { images, ...linkMetadata(), render: () => source };
+    return { images, ...metadata, render: () => source };
   }
 
   const definitions = new Map<string, { url: string; title?: string | null }>();
@@ -206,7 +233,7 @@ export function prepareMarkdownSource(
   visit(getTree());
   return {
     images,
-    ...linkMetadata(),
+    ...metadata,
     render(
       urls: ReadonlyMap<string, string> = new Map(),
       unavailableImages: ReadonlySet<string> = new Set(),

From 6388c466b119f9a631f7258772cf9bb330a41678 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 20:03:33 +0200
Subject: [PATCH 245/270] docs(changelog): 0.12.0-beta.2

---
 CHANGELOG.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80dc5d17e4..34d2871886 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.12.0-beta.1 - 2026-10-16
+## 0.12.0-beta.2 - 2026-10-17
 
 Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and close to 100 fixes.
 
@@ -27,8 +27,11 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Changed phones to open files and subagents in a closable sheet, with Open as tab for subagents ([#6827](https://github.com/getpaseo/paseo/pull/6827), [#6885](https://github.com/getpaseo/paseo/pull/6885), [#6958](https://github.com/getpaseo/paseo/pull/6958))
 - Changed diff comments on phones to open in a sheet instead of an editor inside the code ([#6455](https://github.com/getpaseo/paseo/pull/6455))
 - Changed Settings on phones to large tiles grouped into App and Host ([#7129](https://github.com/getpaseo/paseo/pull/7129))
+- Changed the New workspace form on phones to full-width fields, with Import session in the header ([#7239](https://github.com/getpaseo/paseo/pull/7239))
 - Reduced rendering work in long chats while a reply streams ([#7052](https://github.com/getpaseo/paseo/pull/7052) by [@colonelpanic8](https://github.com/colonelpanic8))
 - Made reopening the sidebar about 45% faster ([#7157](https://github.com/getpaseo/paseo/pull/7157))
+- Made projects and workspaces load faster after the app reconnects ([#7242](https://github.com/getpaseo/paseo/pull/7242))
+- Changed messages one agent sends another through the CLI or MCP to steer its running turn instead of interrupting it ([#5164](https://github.com/getpaseo/paseo/pull/5164) by [@derwells](https://github.com/derwells))
 - Changed Gitea and Forgejo fork PR checkouts to include the fork owner in the branch name, such as `bob/patch-1` ([#6829](https://github.com/getpaseo/paseo/pull/6829) by [@alexanderadam](https://github.com/alexanderadam))
 
 ### Plugins
@@ -37,6 +40,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed `providers.waitForReady` throwing in plugins on the mobile app ([#6760](https://github.com/getpaseo/paseo/pull/6760) by [@GeorgeR](https://github.com/GeorgeR))
 - Fixed the chat outline not jumping to prompts rendered by a timeline plugin ([#6690](https://github.com/getpaseo/paseo/pull/6690) by [@lukeRRD](https://github.com/lukeRRD))
 - Fixed Escape stopping the running agent instead of first closing an open plugin preview ([#7110](https://github.com/getpaseo/paseo/pull/7110) by [@RRD-dev](https://github.com/RRD-dev), [@luoph](https://github.com/luoph))
+- Fixed `paseo plugin reload` failing with a 60-second timeout while the reload was still running ([#6306](https://github.com/getpaseo/paseo/pull/6306) by [@Mtuchel](https://github.com/Mtuchel))
 
 ### Fixed
 
@@ -51,6 +55,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed the Linux desktop window never appearing when the hidden window renders no frames ([#6726](https://github.com/getpaseo/paseo/pull/6726) by [@EhEo](https://github.com/EhEo))
 - Fixed opening another agent or workspace stalling while a different agent on the same host is streaming ([#7074](https://github.com/getpaseo/paseo/pull/7074) by [@colonelpanic8](https://github.com/colonelpanic8))
 - Fixed agent creation showing an error and a retry draft when the provider rejected the first prompt ([#6379](https://github.com/getpaseo/paseo/pull/6379))
+- Fixed question cards spinning forever when an answer fails to send; they now show the error and keep your answers ([#7098](https://github.com/getpaseo/paseo/pull/7098) by [@xzthemeofsss](https://github.com/xzthemeofsss))
 - Fixed parent agents missing the finish notification when a child finished its first turn very quickly ([#6008](https://github.com/getpaseo/paseo/pull/6008) by [@ahmet-izgi](https://github.com/ahmet-izgi))
 - Fixed parent agents being told a child finished when its task was stopped or reloaded ([#6660](https://github.com/getpaseo/paseo/pull/6660) by [@Mar-garet](https://github.com/Mar-garet))
 - Fixed Codex chats containing U+2028 or U+2029 failing to reopen on Node 24 ([#5999](https://github.com/getpaseo/paseo/pull/5999) by [@grahameger](https://github.com/grahameger), [@jtsang4](https://github.com/jtsang4), [@kotusenka](https://github.com/kotusenka))
@@ -59,7 +64,12 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed answering multi-select OpenCode v2 questions failing with "Invalid answer" ([#6149](https://github.com/getpaseo/paseo/pull/6149) by [@gammons](https://github.com/gammons))
 - Fixed browser screenshots failing the turn on OpenCode v2 agents ([#6330](https://github.com/getpaseo/paseo/pull/6330))
 - Fixed OpenCode v2 agents receiving "HTTP 500" instead of the Paseo tool error ([#6519](https://github.com/getpaseo/paseo/pull/6519))
+- Fixed OpenCode agents receiving "HTTP 500" instead of a readable error when they call a Paseo tool with invalid arguments or an unknown name ([#7183](https://github.com/getpaseo/paseo/pull/7183))
 - Fixed rewinding a Claude conversation failing with "Session not found" when the provider sets `CLAUDE_CONFIG_DIR` ([#6325](https://github.com/getpaseo/paseo/pull/6325))
+- Fixed changing a running Claude agent's thinking level and then its mode killing its running command ([#7179](https://github.com/getpaseo/paseo/pull/7179))
+- Fixed Claude models that need a recent Claude Code being hidden when the provider command is a wrapper script ([#7209](https://github.com/getpaseo/paseo/pull/7209) by [@SulthanZahran1](https://github.com/SulthanZahran1))
+- Fixed background Claude subagent cards staying empty while the subagent works ([#6242](https://github.com/getpaseo/paseo/pull/6242))
+- Fixed Copilot staying in Plan mode and refusing edits after you select Allow All ([#7234](https://github.com/getpaseo/paseo/pull/7234))
 - Fixed imported Claude Code sessions taking their first prompt as the name instead of their `/rename` title ([#6930](https://github.com/getpaseo/paseo/pull/6930) by [@platanus-kr](https://github.com/platanus-kr))
 - Fixed a wrongly shaped answer to a Claude question reporting success and discarding the question ([#6936](https://github.com/getpaseo/paseo/pull/6936) by [@thomasvan](https://github.com/thomasvan))
 - Fixed Cursor agents showing no plan usage in their context details ([#6353](https://github.com/getpaseo/paseo/pull/6353) by [@gengjiawen](https://github.com/gengjiawen))
@@ -85,9 +95,13 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed assistant file links with spaces or non-ASCII characters failing with ENOENT ([#6520](https://github.com/getpaseo/paseo/pull/6520) by [@apple-ouyang](https://github.com/apple-ouyang), [@sunshinehomeyu-blip](https://github.com/sunshinehomeyu-blip))
 - Fixed local images in agent replies failing to load when their path contains spaces or non-ASCII characters ([#6877](https://github.com/getpaseo/paseo/pull/6877))
 - Fixed Markdown file previews not showing images referenced by relative paths ([#6750](https://github.com/getpaseo/paseo/pull/6750) by [@apple-ouyang](https://github.com/apple-ouyang))
+- Fixed folder links in chats and Markdown previews opening an error tab or doing nothing; they now open Files with the folder's contents visible ([#7205](https://github.com/getpaseo/paseo/pull/7205), [#7210](https://github.com/getpaseo/paseo/pull/7210), [#7229](https://github.com/getpaseo/paseo/pull/7229))
+- Fixed Markdown links to files such as `[Capture](capture.png)` doing nothing for some file types ([#7233](https://github.com/getpaseo/paseo/pull/7233))
 - Fixed iOS sidebar rows staying highlighted and swallowing the next tap after a brief hold ([#7159](https://github.com/getpaseo/paseo/pull/7159) by [@kassamkhoja](https://github.com/kassamkhoja))
 - Fixed Android chats scrolling when you long-press to select text ([#7131](https://github.com/getpaseo/paseo/pull/7131) by [@RRD-dev](https://github.com/RRD-dev), [@luoph](https://github.com/luoph))
 - Fixed sidebar rows, footer buttons, and Settings items showing no feedback when tapped on touch devices ([#7150](https://github.com/getpaseo/paseo/pull/7150))
+- Fixed home screen actions being cut off on short phone screens ([#7167](https://github.com/getpaseo/paseo/pull/7167))
+- Fixed Android dictation stopping with "Dictation was interrupted by another audio source" when another app plays audio ([#7200](https://github.com/getpaseo/paseo/pull/7200))
 - Fixed Page Up and Page Down not scrolling the chat after clicking a message ([#7033](https://github.com/getpaseo/paseo/pull/7033) by [@panta82](https://github.com/panta82))
 - Fixed Add Project keyboard selection moving to directories scrolled out of view ([#7081](https://github.com/getpaseo/paseo/pull/7081) by [@superheher](https://github.com/superheher))
 - Fixed Enter replacing an email address in the composer with a file mention ([#6471](https://github.com/getpaseo/paseo/pull/6471) by [@jasonhnd](https://github.com/jasonhnd))
@@ -108,6 +122,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed the Pi thinking level not updating when a Pi extension changes it ([#6741](https://github.com/getpaseo/paseo/pull/6741))
 - Fixed Pi subagents from `@tintinweb/pi-subagents` staying running after their turn limit ([#6594](https://github.com/getpaseo/paseo/pull/6594) by [@Chen-DaYi](https://github.com/Chen-DaYi))
 - Fixed manual `/compact` on OMP agents showing no progress and leaving the context meter stale ([#6106](https://github.com/getpaseo/paseo/pull/6106))
+- Fixed follow-ups to idle OMP agents staying queued instead of starting the agent ([#7169](https://github.com/getpaseo/paseo/pull/7169) by [@nhthung](https://github.com/nhthung))
 - Fixed voice mode TTS rejecting model and voice names from OpenAI-compatible servers ([#6060](https://github.com/getpaseo/paseo/pull/6060) by [@khimaros](https://github.com/khimaros))
 - Fixed the xhigh thinking option showing "Extra high" instead of its configured label ([#6005](https://github.com/getpaseo/paseo/pull/6005) by [@EliorFureraj](https://github.com/EliorFureraj))
 - Fixed the Remove button going off screen for long custom model names in provider settings ([#6507](https://github.com/getpaseo/paseo/pull/6507))

From c517d07d6f0ede85d8447e6c02179264116aa715 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 17 Oct 2026 20:07:37 +0200
Subject: [PATCH 246/270] chore(release): cut 0.12.0-beta.2

---
 package-lock.json                        |  56 ++--
 package.json                             |   2 +-
 packages/app/Gemfile.lock                | 376 +++++++++++++++++++++++
 packages/app/package.json                |   2 +-
 packages/cli/package.json                |   8 +-
 packages/client/package.json             |   6 +-
 packages/desktop/package.json            |   2 +-
 packages/expo-two-way-audio/package.json |   2 +-
 packages/highlight/package.json          |   2 +-
 packages/plugin/package.json             |  10 +-
 packages/protocol/package.json           |   2 +-
 packages/relay/package.json              |   2 +-
 packages/server/package.json             |  12 +-
 packages/website/package.json            |   2 +-
 plugins/package.json                     |   2 +-
 15 files changed, 431 insertions(+), 55 deletions(-)
 create mode 100644 packages/app/Gemfile.lock

diff --git a/package-lock.json b/package-lock.json
index e91904fd01..150a1553e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -36349,7 +36349,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -37469,12 +37469,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.12.0-beta.1",
-        "@getpaseo/protocol": "0.12.0-beta.1",
-        "@getpaseo/server": "0.12.0-beta.1",
+        "@getpaseo/client": "0.12.0-beta.2",
+        "@getpaseo/protocol": "0.12.0-beta.2",
+        "@getpaseo/server": "0.12.0-beta.2",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -37721,10 +37721,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "dependencies": {
-        "@getpaseo/protocol": "0.12.0-beta.1",
-        "@getpaseo/relay": "0.12.0-beta.1",
+        "@getpaseo/protocol": "0.12.0-beta.2",
+        "@getpaseo/relay": "0.12.0-beta.2",
         "zod": "^4.4.3"
       },
       "devDependencies": {
@@ -37735,7 +37735,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -37979,7 +37979,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -38875,7 +38875,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "dependencies": {
         "@codemirror/language": "6.12.4",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -38904,14 +38904,14 @@
     },
     "packages/plugin": {
       "name": "@getpaseo/plugin",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "dependencies": {
         "@agentclientprotocol/sdk": "^1.4.0",
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.12.0-beta.1",
-        "@getpaseo/protocol": "0.12.0-beta.1",
+        "@getpaseo/client": "0.12.0-beta.2",
+        "@getpaseo/protocol": "0.12.0-beta.2",
         "@types/node": "^20.9.0",
         "@types/react": "~19.2.0",
         "react": "19.1.0",
@@ -38921,8 +38921,8 @@
         "zod": "^4.4.3"
       },
       "peerDependencies": {
-        "@getpaseo/client": "0.12.0-beta.1",
-        "@getpaseo/protocol": "0.12.0-beta.1",
+        "@getpaseo/client": "0.12.0-beta.2",
+        "@getpaseo/protocol": "0.12.0-beta.2",
         "react": "~19.1.0",
         "react-native": ">=0.81.5",
         "zod": "^4.4.3"
@@ -38944,7 +38944,7 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "dependencies": {
         "semver": "^7.8.5",
         "zod": "^4.4.3"
@@ -38971,7 +38971,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -39189,16 +39189,16 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "0.3.246",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.12.0-beta.1",
-        "@getpaseo/highlight": "0.12.0-beta.1",
-        "@getpaseo/plugin": "0.12.0-beta.1",
-        "@getpaseo/protocol": "0.12.0-beta.1",
-        "@getpaseo/relay": "0.12.0-beta.1",
+        "@getpaseo/client": "0.12.0-beta.2",
+        "@getpaseo/highlight": "0.12.0-beta.2",
+        "@getpaseo/plugin": "0.12.0-beta.2",
+        "@getpaseo/protocol": "0.12.0-beta.2",
+        "@getpaseo/relay": "0.12.0-beta.2",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "1.29.0",
         "@opencode-ai/sdk": "1.14.46",
@@ -40119,7 +40119,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",
@@ -41727,7 +41727,7 @@
     },
     "plugins": {
       "name": "@getpaseo/builtin-plugins",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "dependencies": {
         "@getpaseo/plugin": "*",
         "zod": "^4.4.3"
diff --git a/package.json b/package.json
index edc25df8f9..23a2b676f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [
diff --git a/packages/app/Gemfile.lock b/packages/app/Gemfile.lock
new file mode 100644
index 0000000000..01b02af852
--- /dev/null
+++ b/packages/app/Gemfile.lock
@@ -0,0 +1,376 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.8)
+    abbrev (0.1.2)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1296.0)
+    aws-sdk-core (3.257.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
+      jmespath (~> 1, >= 1.6.1)
+      logger
+      rexml (~> 3.4, >= 3.4.2)
+    aws-sdk-kms (1.132.0)
+      aws-sdk-core (~> 3, >= 3.256.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.233.2)
+      aws-sdk-core (~> 3, >= 3.256.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.3)
+    cgi (0.5.2)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    csv (3.3.6)
+    declarative (0.0.20)
+    digest-crc (0.7.0)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.7.20261007)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    erb (6.0.7)
+    excon (1.7.3)
+      logger
+    faraday (2.15.0)
+      faraday-net_http (>= 2.0, < 3.6)
+      json
+      logger
+    faraday-cookie_jar (0.0.8)
+      faraday (>= 0.8.0)
+      http-cookie (>= 1.0.0)
+    faraday-follow_redirects (0.5.0)
+      faraday (>= 1, < 3)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (3.5.0)
+      net-http (~> 0.5)
+    faraday-retry (2.4.0)
+      faraday (~> 2.0)
+    fastimage (2.4.1)
+    fastlane (2.241.1)
+      CFPropertyList (>= 2.3, < 5.0.0)
+      abbrev (~> 0.1)
+      addressable (>= 2.9.0, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.197)
+      babosa (>= 1.0.3, < 2.0.0)
+      base64 (~> 0.2)
+      benchmark (>= 0.1.0)
+      bundler (>= 2.4.0, < 5.0.0)
+      cgi (~> 0.4)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      csv (~> 3.3)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      erb (>= 4.0, < 7.0)
+      excon (>= 1.0.0, < 2.0.0)
+      faraday (~> 2.7)
+      faraday-cookie_jar (~> 0.0.8)
+      faraday-follow_redirects (~> 0.3)
+      faraday-multipart (~> 1.0)
+      faraday-retry (~> 2.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.1.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.99)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.5.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      irb (>= 1.8)
+      json (< 3.0.0)
+      jwt (>= 2.10.3, < 4)
+      logger (>= 1.6, < 2.0)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multi_json (~> 1.12)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3)
+      naturally (~> 2.2)
+      nkf (~> 0.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      ostruct (>= 0.1.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 3.4.0, < 4.0.0)
+      security (~> 0.3)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 3.1.0, < 4.0.0)
+      terminal-table (~> 4)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.4.1)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.1.0)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.109.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-core (1.3.1)
+      addressable (~> 2.9)
+      faraday (~> 2.13)
+      faraday-follow_redirects (~> 0.3)
+      googleauth (~> 1.14)
+      mini_mime (~> 1.1)
+      multi_json (~> 1.11)
+      representable (~> 3.0)
+      retriable (>= 3.1, < 5.0)
+    google-apis-iamcredentials_v1 (0.28.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.18.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.69.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.9.0)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (2.4.1)
+      base64 (~> 0.2)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.7.0)
+    google-cloud-storage (1.62.1)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-core (>= 0.18, < 2)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (>= 0.42)
+      google-cloud-core (~> 1.6)
+      googleauth (~> 1.9)
+      mini_mime (~> 1.0)
+    google-logging-utils (0.2.1)
+    googleauth (1.17.5)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
+      jwt (>= 1.4, < 4.0)
+      os (>= 0.9, < 2.0)
+      pstore (~> 0.1)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.1.6)
+      domain_name (~> 0.5)
+    io-console (0.9.4)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    jmespath (1.6.2)
+    json (2.21.2)
+    jwt (3.3.0)
+      base64
+    logger (1.7.0)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    multi_json (1.21.2)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    naturally (2.3.0)
+    net-http (0.10.0)
+      net-protocol (>= 0.3.0)
+      uri (>= 0.11.1)
+    net-protocol (0.4.0)
+      timeout
+    nkf (0.3.0)
+    optparse (0.8.1)
+    os (1.1.4)
+    ostruct (0.6.3)
+    plist (3.7.2)
+    pp (0.6.4)
+      prettyprint
+    prettyprint (0.2.1)
+    prism (1.9.0)
+    pstore (0.2.1)
+    public_suffix (7.0.5)
+    rake (13.4.2)
+    rbs (4.2.0)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.1.0)
+      erb
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
+      tsort
+    reline (0.7.0)
+      io-console (~> 0.5)
+    representable (3.3.1)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (4.2.0)
+    rexml (3.4.4)
+    rouge (3.28.0)
+    rubyzip (3.7.0)
+    security (0.3.0)
+    signet (0.22.1)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 4.0)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    terminal-notifier (3.1.0)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    timeout (0.6.1)
+    trailblazer-option (0.1.2)
+    tsort (0.2.0)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unicode-display_width (3.3.0)
+      unicode-emoji (~> 4.3)
+    unicode-emoji (4.3.0)
+    uri (1.1.2)
+    word_wrap (1.0.0)
+    xcodeproj (1.28.1)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      base64
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.4.0)
+      nkf
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+  x86_64-linux-gnu
+
+DEPENDENCIES
+  fastlane (~> 2.234)
+  multi_json
+
+CHECKSUMS
+  CFPropertyList (3.0.8) sha256=2c99d0d980536d3d7ab252f7bd59ac8be50fbdd1ff487c98c949bb66bb114261
+  abbrev (0.1.2) sha256=ad1b4eaaaed4cb722d5684d63949e4bde1d34f2a95e20db93aecfe7cbac74242
+  addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af
+  artifactory (3.0.17) sha256=3023d5c964c31674090d655a516f38ca75665c15084140c08b7f2841131af263
+  atomos (0.1.3) sha256=7d43b22f2454a36bace5532d30785b06de3711399cb1c6bf932573eda536789f
+  aws-eventstream (1.4.0) sha256=116bf85c436200d1060811e6f5d2d40c88f65448f2125bc77ffce5121e6e183b
+  aws-partitions (1.1296.0) sha256=70cc7a44fa4824a9df5652b853dc96aaaf09ec20642cd9d42ed7335a36cc3567
+  aws-sdk-core (3.257.0) sha256=a92ad19c7ff668cec6688ee3200ee562da80647a3bbeed9fda02e8b0ca6492c6
+  aws-sdk-kms (1.132.0) sha256=094b0097bb3be9d5c1ac87e971ca7f5aebb746801dfb5f0f576480bf98dca69c
+  aws-sdk-s3 (1.233.2) sha256=b138737a0de8b02f163ae47a9fc184ac98fc9b90926237c7d7af716a14ea1221
+  aws-sigv4 (1.12.1) sha256=6973ff95cb0fd0dc58ba26e90e9510a2219525d07620c8babeb70ef831826c00
+  babosa (1.0.4) sha256=18dea450f595462ed7cb80595abd76b2e535db8c91b350f6c4b3d73986c5bc99
+  base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
+  benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
+  bigdecimal (4.1.3) sha256=61ebe1e5e559bdc3cc6f2c0ee7f427321fc838f59611c294356eb04d6e21cf66
+  bundler (4.0.23) sha256=407ba8a1d928f412847f819aa5f8b6aef7c59fb51feb517112af8a165487287b
+  cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
+  claide (1.1.0) sha256=6d3c5c089dde904d96aa30e73306d0d4bd444b1accb9b3125ce14a3c0183f82e
+  colored (1.2) sha256=9d82b47ac589ce7f6cab64b1f194a2009e9fd00c326a5357321f44afab2c1d2c
+  colored2 (3.1.2) sha256=b13c2bd7eeae2cf7356a62501d398e72fde78780bd26aec6a979578293c28b4a
+  commander (4.6.0) sha256=7d1ddc3fccae60cc906b4131b916107e2ef0108858f485fdda30610c0f2913d9
+  csv (3.3.6) sha256=aba61e7e507a66f03d45cb1f3c4b6359861c3504038b422962875dce099e4456
+  declarative (0.0.20) sha256=8021dd6cb17ab2b61233c56903d3f5a259c5cf43c80ff332d447d395b17d9ff9
+  digest-crc (0.7.0) sha256=64adc23a26a241044cbe6732477ca1b3c281d79e2240bcff275a37a5a0d78c07
+  domain_name (0.7.20261007) sha256=0976c6ab837dbde991b433d03acc38fdb91fa8839df31a1ed75ce0318dc0441c
+  dotenv (2.8.1) sha256=c5944793349ae03c432e1780a2ca929d60b88c7d14d52d630db0508c3a8a17d8
+  emoji_regex (3.2.3) sha256=ecd8be856b7691406c6bf3bb3a5e55d6ed683ffab98b4aa531bb90e1ddcc564b
+  erb (6.0.7) sha256=c5ca6dc25b0ef974a44dc8f59fe847577122483b1968a38dec305c60bf91ee92
+  excon (1.7.3) sha256=ea13fabcab2b5f5bb64e2952a0ac018bf9882832fe7a58206630be18ba888fa9
+  faraday (2.15.0) sha256=3be0eff0187ed913a1b4f679e9fcfe845b542cdd4f75b76cd6181a4ae1335fff
+  faraday-cookie_jar (0.0.8) sha256=0140605823f8cc63c7028fccee486aaed8e54835c360cffc1f7c8c07c4299dbb
+  faraday-follow_redirects (0.5.0) sha256=5cde93c894b30943a5d2b93c2fe9284216a6b756f7af406a1e55f211d97d10ad
+  faraday-multipart (1.2.0) sha256=7d89a949693714176f612323ca13746a2ded204031a6ba528adee788694ef757
+  faraday-net_http (3.5.0) sha256=2e7094c34e38754ee048cc3df47376f8657005d9375f8473bce1c3b526a22e36
+  faraday-retry (2.4.0) sha256=7b79c48fb7e56526faf247b12d94a680071ff40c9fda7cf1ec1549439ad11ebe
+  fastimage (2.4.1) sha256=c64bebd46b6fd8943ab70c1e6e85ff728f970f2e48f92ecd249b6bc3a540ad20
+  fastlane (2.241.1) sha256=e8e97f3274d678c74d9e473b98d202621262c40dfce2b43b7a05afde7caa2ea5
+  fastlane-sirp (1.1.0) sha256=10bc94f9682efd8e1badfb31452a76dd8981f1f3a33717c765fde6d75b54d847
+  gh_inspector (1.1.3) sha256=04cca7171b87164e053aa43147971d3b7f500fcb58177698886b48a9fc4a1939
+  google-apis-androidpublisher_v3 (0.109.0) sha256=b4fdbb8af4a0d235e86bd173bd51eccd10effdc5de067ab10c1c0d22048a2a56
+  google-apis-core (1.3.1) sha256=20ce9ee1fde0be87fe30a135dfdbd4b9ee33ba32172794c1f2770e7a45361b2f
+  google-apis-iamcredentials_v1 (0.28.0) sha256=0a92ffe6cc39c569554af2a77a25dfc61519ed8bbb64ab04cffdd352dc5ef106
+  google-apis-playcustomapp_v1 (0.18.0) sha256=44b277b9dee4a59ac5e9d98be1485edc5e382d2f9d73c79ae8908a455786a254
+  google-apis-storage_v1 (0.69.0) sha256=ca5faad4a244c609bb434f81884432c449e34b31a87623f7c32b582e464ca7c8
+  google-cloud-core (1.9.0) sha256=ab55409f51488e8deefb6edcc1ce4771dfb5da2fe7b3bc075709a030c2b682a4
+  google-cloud-env (2.4.1) sha256=987cc58afc50ce2903128ab4dcd442159be4457246b8137e41d49d5c3fc590dd
+  google-cloud-errors (1.7.0) sha256=6e682f42d89aae08689f36f28495de629d756da076bafff0003bac7f8042ebb3
+  google-cloud-storage (1.62.1) sha256=10dbf2ebda3af1b4b841335364cb889827c6cb17bf6c9f8bc5313b6bef7a4d3c
+  google-logging-utils (0.2.1) sha256=73945c3ac6800eba802c26b1744765d5057cc4d89182c7255ee1347b0ca96dc7
+  googleauth (1.17.5) sha256=92498efc6883630a7e011ce4e667f887e314e588d584410ba18df49f1303f3d7
+  highline (2.0.3) sha256=2ddd5c127d4692721486f91737307236fe005352d12a4202e26c48614f719479
+  http-cookie (1.1.6) sha256=ba4b82be64de61dc281243dac70e3c382c45142f20268ed9276a3670c93feaa9
+  io-console (0.9.4) sha256=a403304f32928ee85e56d457b4612ca43f2703b561a3258844992bd24085fbb1
+  irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
+  jmespath (1.6.2) sha256=238d774a58723d6c090494c8879b5e9918c19485f7e840f2c1c7532cf84ebcb1
+  json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
+  jwt (3.3.0) sha256=44cc34fbc341c148233cf66641522b4bce0dfb1ce55e8073f05c56f44f4ee546
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  mini_magick (4.13.2) sha256=71d6258e0e8a3d04a9a0a09784d5d857b403a198a51dd4f882510435eb95ddd9
+  mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef
+  multi_json (1.21.2) sha256=245531eaf54bdba57aba515ff08b4503505c5e09911daa89c5a561e2f85bea8e
+  multipart-post (2.4.1) sha256=9872d03a8e552020ca096adadbf5e3cb1cd1cdd6acd3c161136b8a5737cdb4a8
+  mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751
+  nanaimo (0.4.0) sha256=faf069551bab17f15169c1f74a1c73c220657e71b6e900919897a10d991d0723
+  naturally (2.3.0) sha256=459923cf76c2e6613048301742363200c3c7e4904c324097d54a67401e179e01
+  net-http (0.10.0) sha256=1a2ff6e37a05724973c43f2bf7bf105f59c36a4cd0a7e9b1c021a0a566987c27
+  net-protocol (0.4.0) sha256=f9f90c8c6f64794a45160bf422177a336db12809de3beeeaa26b88fcd2e8c853
+  nkf (0.3.0) sha256=357a8dbeba38b727b75930f665146546076a394a1c243faf634ff176e3588895
+  optparse (0.8.1) sha256=42bea10d53907ccff4f080a69991441d611fbf8733b60ed1ce9ee365ce03bd1a
+  os (1.1.4) sha256=57816d6a334e7bd6aed048f4b0308226c5fb027433b67d90a9ab435f35108d3f
+  ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
+  plist (3.7.2) sha256=d37a4527cc1116064393df4b40e1dbbc94c65fa9ca2eec52edf9a13616718a42
+  pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
+  prettyprint (0.2.1) sha256=d555d57ea6d7cf001d4774b693546a6bd88bec1e778ddffb5c60b68ceec4b7d4
+  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
+  pstore (0.2.1) sha256=03904d0f2c66579e96d1e6704cdabc0c88df7ea8ed8782d9f3569f6f6c702c1a
+  public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+  rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
+  rdoc (8.1.0) sha256=befc37880a5cfd36dcb176c748b5fd5ee39dd3536a75e81824e4972ce230f60a
+  reline (0.7.0) sha256=5b012d8e55dbf9d450f12bde2cf7d15ff546ae80b3f8f3b30e570d431815583d
+  representable (3.3.1) sha256=8a5fc8eef99f598147eee0390f606386268b429a840419fcfd3f7a8ccc40f566
+  retriable (4.2.0) sha256=90c3b257472a1c02f2a3dfa64dd35a420f7a624cef1a5981e20fdac5730f8cdc
+  rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142
+  rouge (3.28.0) sha256=0d6de482c7624000d92697772ab14e48dca35629f8ddf3f4b21c99183fd70e20
+  rubyzip (3.7.0) sha256=65c19294da75297a939006f3516deacc33185fbd721ff1954f7a231db6d3e121
+  security (0.3.0) sha256=bc9d06718258a96c8552ce4044bfe69144491b10d3403d74c4753a03a720ecf0
+  signet (0.22.1) sha256=6e73e9f2bdc2f038a5fdc8a89d248792b1b55e9ca50ee1ba458d8f1d9f0a2151
+  simctl (1.6.10) sha256=b99077f4d13ad81eace9f86bf5ba4df1b0b893a4d1b368bd3ed59b5b27f9236b
+  terminal-notifier (3.1.0) sha256=073609e9da7bb60176ffadda903c8d9231fcdf18ffa7074dc9478b63fe25c69c
+  terminal-table (4.0.0) sha256=f504793203f8251b2ea7c7068333053f0beeea26093ec9962e62ea79f94301d2
+  timeout (0.6.1) sha256=78f57368a7e7bbadec56971f78a3f5ecbcfb59b7fcbb0a3ed6ddc08a5094accb
+  trailblazer-option (0.1.2) sha256=20e4f12ea4e1f718c8007e7944ca21a329eee4eed9e0fa5dde6e8ad8ac4344a3
+  tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
+  tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48
+  tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50
+  tty-spinner (0.9.3) sha256=0e036f047b4ffb61f2aa45f5a770ec00b4d04130531558a94bfc5b192b570542
+  uber (0.1.0) sha256=5beeb407ff807b5db994f82fa9ee07cfceaa561dad8af20be880bc67eba935dc
+  unicode-display_width (3.3.0) sha256=4b7aa66a4b11db50f6f7e98411215cd0dd10eaecb665d36eec5bcacb3fa0b613
+  unicode-emoji (4.3.0) sha256=11c02fa73290378c066bb0562cd4c87d8e1b706fbbe0059ca12746a4244de8ce
+  uri (1.1.2) sha256=89292e98eabbef6248b0a0ed5e7e398e152f83f17560023a6d94a7f492b169fb
+  word_wrap (1.0.0) sha256=f556d4224c812e371000f12a6ee8102e0daa724a314c3f246afaad76d82accc7
+  xcodeproj (1.28.1) sha256=6f12670f00739d9817ca27ac89d6ef01cc86050e22a0bc08a3131487e5b5cddc
+  xcpretty (0.4.1) sha256=b14c50e721f6589ee3d6f5353e2c2cfcd8541fa1ea16d6c602807dd7327f3892
+  xcpretty-travis-formatter (1.0.1) sha256=aacc332f17cb7b2cba222994e2adc74223db88724fe76341483ad3098e232f93
+
+BUNDLED WITH
+  4.0.23
diff --git a/packages/app/package.json b/packages/app/package.json
index 670e0d93ab..43192eedad 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "private": true,
   "main": "index.ts",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index bebedc5c93..51201254e9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/cli",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "description": "Paseo CLI - control your AI coding agents from the command line",
   "bin": {
     "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.0.0",
-    "@getpaseo/client": "0.12.0-beta.1",
-    "@getpaseo/protocol": "0.12.0-beta.1",
-    "@getpaseo/server": "0.12.0-beta.1",
+    "@getpaseo/client": "0.12.0-beta.2",
+    "@getpaseo/protocol": "0.12.0-beta.2",
+    "@getpaseo/server": "0.12.0-beta.2",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "mime-types": "^2.1.35",
diff --git a/packages/client/package.json b/packages/client/package.json
index b10a452edd..00ca259e85 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/client",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "description": "Paseo client SDK package",
   "files": [
     "dist",
@@ -39,8 +39,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@getpaseo/protocol": "0.12.0-beta.1",
-    "@getpaseo/relay": "0.12.0-beta.1",
+    "@getpaseo/protocol": "0.12.0-beta.2",
+    "@getpaseo/relay": "0.12.0-beta.2",
     "zod": "^4.4.3"
   },
   "devDependencies": {
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index ac128ee180..edf8fb913b 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/desktop",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "private": true,
   "description": "Paseo desktop app (Electron wrapper)",
   "homepage": "https://paseo.sh",
diff --git a/packages/expo-two-way-audio/package.json b/packages/expo-two-way-audio/package.json
index 9e49135e39..e71431723d 100644
--- a/packages/expo-two-way-audio/package.json
+++ b/packages/expo-two-way-audio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "description": "Native module for two way audio streaming",
   "keywords": [
     "ExpoTwoWayAudio",
diff --git a/packages/highlight/package.json b/packages/highlight/package.json
index 2e3a55146c..bfbfab8cb5 100644
--- a/packages/highlight/package.json
+++ b/packages/highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/highlight",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "files": [
     "dist",
     "!dist/**/*.map",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index a7354bc086..b189218837 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/plugin",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "description": "Paseo plugin SDK package",
   "files": [
     "dist",
@@ -70,8 +70,8 @@
     "use-sync-external-store": "^1.6.0"
   },
   "devDependencies": {
-    "@getpaseo/client": "0.12.0-beta.1",
-    "@getpaseo/protocol": "0.12.0-beta.1",
+    "@getpaseo/client": "0.12.0-beta.2",
+    "@getpaseo/protocol": "0.12.0-beta.2",
     "@types/node": "^20.9.0",
     "@types/react": "~19.2.0",
     "react": "19.1.0",
@@ -81,8 +81,8 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@getpaseo/client": "0.12.0-beta.1",
-    "@getpaseo/protocol": "0.12.0-beta.1",
+    "@getpaseo/client": "0.12.0-beta.2",
+    "@getpaseo/protocol": "0.12.0-beta.2",
     "react": "~19.1.0",
     "react-native": ">=0.81.5",
     "zod": "^4.4.3"
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index 964ff5a51e..217f13eb74 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/protocol",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "description": "Paseo shared protocol schemas and wire types",
   "files": [
     "dist",
diff --git a/packages/relay/package.json b/packages/relay/package.json
index c182f2c403..04372d00c1 100644
--- a/packages/relay/package.json
+++ b/packages/relay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/relay",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "description": "Paseo relay for bridging daemon and client connections",
   "files": [
     "dist",
diff --git a/packages/server/package.json b/packages/server/package.json
index 1116605bf4..ec2d4cbe65 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/server",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "description": "Paseo backend server",
   "files": [
     "dist/server",
@@ -107,11 +107,11 @@
     "@agentclientprotocol/sdk": "^0.17.1",
     "@anthropic-ai/claude-agent-sdk": "0.3.246",
     "@anthropic-ai/sdk": "^0.104.2",
-    "@getpaseo/client": "0.12.0-beta.1",
-    "@getpaseo/highlight": "0.12.0-beta.1",
-    "@getpaseo/plugin": "0.12.0-beta.1",
-    "@getpaseo/protocol": "0.12.0-beta.1",
-    "@getpaseo/relay": "0.12.0-beta.1",
+    "@getpaseo/client": "0.12.0-beta.2",
+    "@getpaseo/highlight": "0.12.0-beta.2",
+    "@getpaseo/plugin": "0.12.0-beta.2",
+    "@getpaseo/protocol": "0.12.0-beta.2",
+    "@getpaseo/relay": "0.12.0-beta.2",
     "@isaacs/ttlcache": "^2.1.4",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@opencode-ai/sdk": "1.14.46",
diff --git a/packages/website/package.json b/packages/website/package.json
index 3646d4da47..7df1a84aa7 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/website",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/plugins/package.json b/plugins/package.json
index 8f37f073c8..6bd8965d25 100644
--- a/plugins/package.json
+++ b/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/builtin-plugins",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "private": true,
   "type": "module",
   "scripts": {

From 142cdac8d2083a0796dcd551d990f4a3f13d7c02 Mon Sep 17 00:00:00 2001
From: "paseo-ai[bot]" <266920839+paseo-ai[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 18:18:08 +0000
Subject: [PATCH 247/270] fix: update lockfile signatures and Nix hash [skip
 ci]

---
 nix/npm-deps.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/npm-deps.hash b/nix/npm-deps.hash
index 25fc44e53a..297a783afb 100644
--- a/nix/npm-deps.hash
+++ b/nix/npm-deps.hash
@@ -1 +1 @@
-sha256-1WmrHvE68Lzyil4On7xtsPMQTODXZ3Jb3/juUg3nHi4=
+sha256-O8sNh6oXFIddUljYiC6RbVZF5/7a7A7W9UWrOd0tIV4=

From e2ad26d23875eb0161c46e7376abfca7054e578b Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 21:58:07 +0200
Subject: [PATCH 248/270] Find source-message text in plugin timeline rows
 (#7253)

* fix(app): find text in rows a timeline plugin draws

Chat find located a replaced message by its source id but counted matches
only inside elements marked as message text, which a plugin renderer never
sets, so a replaced prompt or reply reported no matches. Mark plugin rows and
search the whole row, with each view bounding a match.

* docs(plugins): qualify search in replacement timeline rows

Chat find discovers source-message matches before inspecting a replacement renderer. Document that renderer-added text is not independently indexed.

Co-authored-by: a-grasso <antonino.grasso@device-insight.com>

* fix(app): find visible text within contiguous plugin blocks

A whole-row walk counted closed popover text and reunited text before and after nested blocks. Keep consecutive block groups and exclude plugin text the browser is not drawing.

---------

Co-authored-by: a-grasso <antonino.grasso@device-insight.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/e2e/browser/chat-find.spec.ts    | 34 +++++++++++-
 .../chat-find/ranges.browser.test.ts          | 46 ++++++++++++++++
 .../src/agent-stream/chat-find/ranges.web.ts  | 53 ++++++++++++++-----
 .../app/src/agent-stream/strategy-web.tsx     |  3 ++
 public-docs/plugins/reference.md              |  7 +++
 5 files changed, 129 insertions(+), 14 deletions(-)

diff --git a/packages/app/e2e/browser/chat-find.spec.ts b/packages/app/e2e/browser/chat-find.spec.ts
index b29a5f5b89..a7316fe165 100644
--- a/packages/app/e2e/browser/chat-find.spec.ts
+++ b/packages/app/e2e/browser/chat-find.spec.ts
@@ -19,6 +19,10 @@ import {
 } from "../support/helpers/composer";
 
 import { openCommandCenter, closeCommandCenter } from "../support/helpers/command-center";
+import {
+  expectPromptsDrawnByPlugin,
+  withPromptTimelinePlugin,
+} from "../support/helpers/plugin-timeline";
 
 const MAC_USER_AGENT =
   "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36";
@@ -174,7 +178,7 @@ async function highlightedMessage(page: Page) {
     const range = entry && Array.from(entry[1])[0];
     if (!(range instanceof Range)) return null;
     const message = range.startContainer.parentElement?.closest<HTMLElement>(
-      '[data-testid="user-message"], [data-testid="assistant-message"]',
+      '[data-testid="user-message"], [data-testid="plugin-prompt"], [data-testid="assistant-message"]',
     );
     return message?.dataset.testid ?? null;
   });
@@ -219,6 +223,34 @@ test("counts and steps through every match in the chat, not just the selected me
   }
 });
 
+test("finds text in a prompt a timeline plugin draws", async ({ page }, testInfo) => {
+  testInfo.setTimeout(120_000);
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-find-plugin-prompt-",
+    title: "Chat Find plugin prompt",
+    initialPrompt: ACROSS_PROMPT,
+    featureValues: { mockAssistantResponse: ACROSS_RESPONSE },
+  });
+  try {
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    await withPromptTimelinePlugin(async () => {
+      await openAgentRoute(page, agent);
+      await expectPromptsDrawnByPlugin(page);
+      await openChatFind(page);
+      await query(page).fill("scope-needle");
+      await expect(status(page)).toHaveText("1 of 3");
+      await expectHighlight(page, "scope-needle");
+      await expectHighlightedMessage(page, "plugin-prompt");
+      await page.screenshot({ path: testInfo.outputPath("chat-find-plugin-prompt.png") });
+      await expectNextMatch(page, "2 of 3", "scope-needle");
+      await expectHighlightedMessage(page, "assistant-message");
+      await closeFind(page);
+    });
+  } finally {
+    await agent.cleanup();
+  }
+});
+
 test("rejects invisible source matches and ignores a late reply after closing", async ({
   page,
 }) => {
diff --git a/packages/app/src/agent-stream/chat-find/ranges.browser.test.ts b/packages/app/src/agent-stream/chat-find/ranges.browser.test.ts
index 631b8f1d27..8af6f83f65 100644
--- a/packages/app/src/agent-stream/chat-find/ranges.browser.test.ts
+++ b/packages/app/src/agent-stream/chat-find/ranges.browser.test.ts
@@ -76,3 +76,49 @@ it("keeps semantic Markdown paragraphs separate while finding inline matches", (
   ]);
   expect(findRenderedMatches(row, ".another")).toEqual([]);
 });
+
+function pluginRow(html: string) {
+  const row = document.createElement("div");
+  row.dataset.pluginRow = "true";
+  row.dataset.messageId = "message-1";
+  row.innerHTML = html;
+  document.body.append(row);
+  return row;
+}
+
+it("searches a plugin row that sets no text marker, bounding matches by view", () => {
+  const row = pluginRow(
+    "<div><div>Prompt</div><div>find <span>this</span> needle</div><div>needle</div><button>needle</button></div>",
+  );
+  expect(findRenderedMatches(row, "needle").map((range) => range.toString())).toEqual([
+    "needle",
+    "needle",
+  ]);
+  expect(findRenderedMatches(row, "Promptfind")).toEqual([]);
+  expect(findRenderedMatches(row, "find this needle")).toHaveLength(1);
+  expect(findMessageMatches(row.parentElement, "message-1", "needle")).toHaveLength(2);
+});
+
+it("leaves rows without the plugin marker limited to marked message text", () => {
+  const row = document.createElement("div");
+  row.innerHTML = "<div>needle</div>";
+  document.body.append(row);
+  expect(findRenderedMatches(row, "needle")).toEqual([]);
+});
+
+it("counts only drawn text in a plugin row, including an opened popover", () => {
+  const row = pluginRow(
+    '<div><span>visible needle</span><div hidden>hidden needle</div><div style="display:none">display needle</div><span style="visibility:hidden">visibility needle</span><span style="opacity:0">transparent needle</span><div popover="manual">popover needle</div></div>',
+  );
+  expect(findRenderedMatches(row, "needle").map((range) => range.toString())).toEqual(["needle"]);
+  row.querySelector<HTMLElement>("[popover]")!.showPopover();
+  expect(findRenderedMatches(row, "needle")).toHaveLength(2);
+});
+
+it("keeps text around nested plugin blocks in separate occurrences", () => {
+  const row = pluginRow("<div>alpha <div>details</div>beta</div><div>gamma <div></div>delta</div>");
+  expect(findRenderedMatches(row, "alpha beta")).toEqual([]);
+  expect(findRenderedMatches(row, "gamma delta")).toEqual([]);
+  expect(findRenderedMatches(row, "details").map((range) => range.toString())).toEqual(["details"]);
+  expect(findRenderedMatches(row, "beta").map((range) => range.toString())).toEqual(["beta"]);
+});
diff --git a/packages/app/src/agent-stream/chat-find/ranges.web.ts b/packages/app/src/agent-stream/chat-find/ranges.web.ts
index ea2e901c2d..13da1034a2 100644
--- a/packages/app/src/agent-stream/chat-find/ranges.web.ts
+++ b/packages/app/src/agent-stream/chat-find/ranges.web.ts
@@ -21,28 +21,55 @@ export function findMessageMatches(
   return findMessageRows(root, messageId).flatMap((row) => findRenderedMatches(row, query));
 }
 
+function renderedTextGroups(row: HTMLElement): Text[][] {
+  const groups: Text[][] = [];
+  // A plugin renderer owns the DOM of the message it replaced and sets no markers, so the
+  // whole row is searched and each div (a React Native View or Text) bounds a match.
+  const pluginRow = row.dataset.pluginRow === "true";
+  const blocks = pluginRow ? `${BLOCKS},div` : BLOCKS;
+  const contents = pluginRow
+    ? [row]
+    : row.querySelectorAll<HTMLElement>('[data-message-text="true"]');
+  for (const content of contents) {
+    let group: { block: Element; texts: Text[] } | undefined;
+    const walker = document.createTreeWalker(
+      content,
+      NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_TEXT,
+    );
+    let node: Node | null;
+    while ((node = walker.nextNode())) {
+      if (node instanceof Element) {
+        // Even an empty nested block separates the text before and after it.
+        if (node.matches(blocks)) group = undefined;
+        continue;
+      }
+      if (!(node instanceof Text) || node.parentElement?.closest(IGNORED)) continue;
+      if (
+        pluginRow &&
+        !node.parentElement?.checkVisibility({ opacityProperty: true, visibilityProperty: true })
+      )
+        continue;
+      const block = node.parentElement?.closest(blocks) ?? content;
+      if (group?.block !== block) {
+        group = { block, texts: [] };
+        groups.push(group.texts);
+      }
+      group.texts.push(node);
+    }
+  }
+  return groups;
+}
+
 /** Local offsets belong to the DOM that supplied the text, never to a host parser. */
 export function findRenderedMatches(row: HTMLElement, query: string): Range[] {
   if (!query.trim()) return [];
-  const groups = new Map<Element, Text[]>();
-  for (const content of row.querySelectorAll<HTMLElement>('[data-message-text="true"]')) {
-    const walker = document.createTreeWalker(content, NodeFilter.SHOW_TEXT);
-    let node: Node | null;
-    while ((node = walker.nextNode())) {
-      if (!(node instanceof Text) || node.parentElement?.closest(IGNORED)) continue;
-      const block = node.parentElement?.closest(BLOCKS) ?? content;
-      const texts = groups.get(block) ?? [];
-      texts.push(node);
-      groups.set(block, texts);
-    }
-  }
   const pattern = query
     .trim()
     .split(/\s+/)
     .map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
     .join("\\s+");
   const ranges: Range[] = [];
-  for (const texts of groups.values()) {
+  for (const texts of renderedTextGroups(row)) {
     const points = texts.map((node) => ({ node, start: 0, end: 0 }));
     let text = "";
     for (const point of points) {
diff --git a/packages/app/src/agent-stream/strategy-web.tsx b/packages/app/src/agent-stream/strategy-web.tsx
index 97490c2a17..00974867e4 100644
--- a/packages/app/src/agent-stream/strategy-web.tsx
+++ b/packages/app/src/agent-stream/strategy-web.tsx
@@ -1250,6 +1250,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
         key={item.id}
         data-history-row-id={item.id}
         data-message-id={getStreamItemMessageId(item)}
+        data-plugin-row={item.kind === "plugin" ? "true" : undefined}
         style={streamRowStyle}
       >
         <StreamRowContent
@@ -1267,6 +1268,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
         key={item.id}
         data-history-row-id={item.id}
         data-message-id={getStreamItemMessageId(item)}
+        data-plugin-row={item.kind === "plugin" ? "true" : undefined}
         style={streamRowStyle}
       >
         <StreamRowContent
@@ -1329,6 +1331,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
                     data-index={virtualRow.index}
                     data-history-row-id={item.id}
                     data-message-id={getStreamItemMessageId(item)}
+                    data-plugin-row={item.kind === "plugin" ? "true" : undefined}
                     ref={measureVirtualizedRowElement}
                     style={renderVirtualRowStyle(virtualRow.start)}
                   >
diff --git a/public-docs/plugins/reference.md b/public-docs/plugins/reference.md
index cc8023b251..4a8f74af9a 100644
--- a/public-docs/plugins/reference.md
+++ b/public-docs/plugins/reference.md
@@ -1318,6 +1318,13 @@ the source row, so updates to one streaming item do not remount its renderer. Us
 `useRevealedText(text, phase)` hook when a renderer should pace streaming text like Paseo's built-in
 assistant rows.
 
+Chat find (Ctrl or Cmd+F) finds and highlights text in replacement rows when the query also
+matches the original message. The host searches the original prompt text or the assistant reply
+with Markdown syntax removed, then the app counts matches in the text your renderer draws.
+Text added only by your renderer is not independently indexed. Matches stay within a rendered
+block, and find skips buttons, icons, and anything with `aria-hidden="true"`. Find only runs on
+the web and desktop apps.
+
 ### Append a timeline row from the daemon
 
 A server handler can add a plugin-owned row to canonical history:

From 9bd58f66b2dfc195898bf1178e84f02933c0d41e Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 22:57:04 +0200
Subject: [PATCH 249/270] Copy Korean terminal text without extra spaces
 (#7254)

* fix(terminal): preserve Korean text when copying native terminal cells

* fix(terminal): omit continuation cells from copied text

Native terminal buffers already retain authoritative cell widths. Skip zero-width continuation cells when serializing a selection so Korean text copies with only its real spaces, while preserving the buffer representation.

Co-authored-by: helloimdevman <333048235+helloimdevman@users.noreply.github.com>

---------

Co-authored-by: helloimdevman <333048235+helloimdevman@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../terminal-selection.test.ts                | 45 +++++++++++++++++++
 .../native-renderer/terminal-selection.ts     |  5 ++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/packages/app/src/terminal/native-renderer/terminal-selection.test.ts b/packages/app/src/terminal/native-renderer/terminal-selection.test.ts
index 5f2a4bb593..3c390a1f5c 100644
--- a/packages/app/src/terminal/native-renderer/terminal-selection.test.ts
+++ b/packages/app/src/terminal/native-renderer/terminal-selection.test.ts
@@ -41,6 +41,51 @@ function rowWithText(
 }
 
 describe("native terminal selection", () => {
+  it("copies Korean output without adding spaces for continuation cells", async () => {
+    const terminal = createNativeHeadlessTerminal({ rows: 3, cols: 30 });
+    const copied: string[] = [];
+    try {
+      await terminal.write("한글 문장");
+      const bounds = terminal.getBufferBounds();
+      await copyTerminalSelection({
+        terminal,
+        selection: {
+          start: { row: bounds.cursorRow, col: 0 },
+          end: { row: bounds.cursorRow, col: bounds.cursorCol - 1 },
+          coordinateEpoch: bounds.coordinateEpoch,
+        },
+        clipboard: {
+          writeText: async (text) => {
+            copied.push(text);
+          },
+        },
+      });
+      expect(copied).toEqual(["한글 문장"]);
+    } finally {
+      terminal.dispose();
+    }
+  });
+
+  it("copies Korean text and real spaces without wide-character continuation spaces", async () => {
+    const terminal = createNativeHeadlessTerminal({ rows: 3, cols: 30 });
+    try {
+      await terminal.write("한글 문장 | 성공");
+      const bounds = terminal.getBufferBounds();
+      expect(
+        extractTerminalSelectedText({
+          terminal,
+          selection: {
+            start: { row: bounds.cursorRow, col: 0 },
+            end: { row: bounds.cursorRow, col: bounds.cursorCol - 1 },
+            coordinateEpoch: bounds.coordinateEpoch,
+          },
+        }),
+      ).toBe("한글 문장 | 성공");
+    } finally {
+      terminal.dispose();
+    }
+  });
+
   it("expands a long-press coordinate to the whole terminal word", async () => {
     const terminal = createNativeHeadlessTerminal({ rows: 4, cols: 32, scrollbackLines: 20 });
     await terminal.write("before PASEO_TARGET after\r\n");
diff --git a/packages/app/src/terminal/native-renderer/terminal-selection.ts b/packages/app/src/terminal/native-renderer/terminal-selection.ts
index 1bda469e42..02fb415aac 100644
--- a/packages/app/src/terminal/native-renderer/terminal-selection.ts
+++ b/packages/app/src/terminal/native-renderer/terminal-selection.ts
@@ -327,7 +327,10 @@ export function extractTerminalSelectedText(input: TerminalSelectedTextInput): s
     const startCol = startsOnThisRow ? selection.start.col : 0;
     const endCol = endsOnThisRow ? selection.end.col : cells.length - 1;
     const selectedCells = cells.slice(Math.max(0, startCol), Math.max(0, endCol) + 1);
-    const line = selectedCells.map((cell) => cell.char || " ").join("");
+    const line = selectedCells
+      .filter((cell) => cell.width !== 0)
+      .map((cell) => cell.char)
+      .join("");
     if (offset > 0 && window.wrappedRows[offset] !== true) {
       text += "\n";
     }

From 90c6de058039fd6ea57f68e4b3417300835f9805 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Oct 2026 00:01:33 +0200
Subject: [PATCH 250/270] fix(app): keep streaming replies complete after
 reloading (#7256)

A catch-up projection could replace the live reply while leaving its cached prefix in the committed rows. Completion then discarded the complete reply as a duplicate. Reconcile the covered cached prefix together with the live reply.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/src/timeline/replica.test.ts     | 84 +++++++++++++++++++
 .../src/timeline/session-stream-reducers.ts   | 16 +++-
 2 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/timeline/replica.test.ts b/packages/app/src/timeline/replica.test.ts
index fa7521e487..47bd36596a 100644
--- a/packages/app/src/timeline/replica.test.ts
+++ b/packages/app/src/timeline/replica.test.ts
@@ -77,6 +77,90 @@ function applySynced(agentId: string, seq: number): void {
 afterEach(() => useSessionStore.getState().clearSession(SERVER_ID));
 
 describe("viewed timeline persistence", () => {
+  it("keeps one complete reply when live chunks arrive before a cached chat catches up", async () => {
+    useSessionStore.getState().initializeSession(SERVER_ID, null);
+    const partial = "Paragraph 1. Paragraph 2.";
+    const complete = `${partial} Paragraph 3. END`;
+    const owner = createOwner({
+      readTimeline: async () => ({
+        agentId: AGENT_ID,
+        items: [{ ...item("reply-1", partial, 4), messageId: "reply-1" }],
+        range: { epoch: "epoch-1", startSeq: 1, endSeq: 4 },
+        hasOlder: false,
+      }),
+      commitTimeline: () => undefined,
+    });
+    try {
+      owner.replaceVisibleAgentIds("test", [AGENT_ID]);
+      await expect
+        .poll(
+          () =>
+            selectAgentTimelineState(useSessionStore.getState().sessions[SERVER_ID], AGENT_ID)
+              .status,
+        )
+        .toBe("painted");
+      owner.enqueueStreamEvent(AGENT_ID, {
+        event: {
+          type: "timeline",
+          provider: "codex",
+          item: { type: "assistant_message", text: " Paragraph 3.", messageId: "reply-1" },
+        } as AgentStreamEventPayload,
+        seq: 5,
+        epoch: "epoch-1",
+        timestamp: new Date("2026-08-26T10:00:01.000Z"),
+      });
+      owner.flushStreamAgent(AGENT_ID);
+      owner.applyTimelineResponse({
+        requestId: "resume",
+        agentId: AGENT_ID,
+        agent: null,
+        direction: "after",
+        projection: "projected",
+        reset: false,
+        epoch: "epoch-1",
+        window: { minSeq: 1, maxSeq: 6, nextSeq: 7 },
+        startCursor: { epoch: "epoch-1", seq: 5 },
+        endCursor: { epoch: "epoch-1", seq: 6 },
+        entries: [
+          {
+            provider: "codex",
+            item: { type: "assistant_message", text: complete, messageId: "reply-1" },
+            timestamp: "2026-08-26T10:00:02.000Z",
+            seqStart: 2,
+            seqEnd: 6,
+            sourceSeqRanges: [{ startSeq: 2, endSeq: 6 }],
+            collapsed: ["assistant_merge"],
+          },
+        ],
+        error: null,
+        hasNewer: false,
+        hasOlder: false,
+        staleCursor: false,
+        gap: false,
+      });
+      const replyTexts = () => {
+        const session = useSessionStore.getState().sessions[SERVER_ID];
+        return [
+          ...(session?.agentStreamTail.get(AGENT_ID) ?? []),
+          ...(session?.agentStreamHead.get(AGENT_ID) ?? []),
+        ]
+          .filter((entry) => entry.kind === "assistant_message")
+          .map((entry) => entry.text);
+      };
+      expect.soft(replyTexts()).toEqual([complete]);
+      owner.enqueueStreamEvent(AGENT_ID, {
+        event: { type: "turn_completed", provider: "codex" } as AgentStreamEventPayload,
+        seq: 7,
+        epoch: "epoch-1",
+        timestamp: new Date("2026-08-26T10:00:03.000Z"),
+      });
+      owner.flushStreamAgent(AGENT_ID);
+      expect.soft(replyTexts()).toEqual([complete]);
+    } finally {
+      owner.dispose();
+    }
+  });
+
   it("shares an in-flight cache preparation with the viewed owner", async () => {
     useSessionStore.getState().initializeSession(SERVER_ID, null);
     let release!: (value: CachedTimeline) => void;
diff --git a/packages/app/src/timeline/session-stream-reducers.ts b/packages/app/src/timeline/session-stream-reducers.ts
index dce9daa4da..34a461d893 100644
--- a/packages/app/src/timeline/session-stream-reducers.ts
+++ b/packages/app/src/timeline/session-stream-reducers.ts
@@ -811,7 +811,7 @@ function reconcileOverlappingProjectedAssistant(params: {
   };
 
   const headMatch = findMatch(params.head);
-  const tailMatch = headMatch ? null : findMatch(params.tail);
+  const tailMatch = findMatch(params.tail);
   const match = headMatch ?? tailMatch;
   if (!match) {
     return { tail: params.tail, head: params.head, reconciled: false };
@@ -833,8 +833,20 @@ function reconcileOverlappingProjectedAssistant(params: {
   };
 
   if (headMatch) {
+    const tailCursor = tailMatch?.current.timelineCursor;
+    const replacesCachedPrefix =
+      tailMatch !== null &&
+      tailCursor?.epoch === params.epoch &&
+      unit.sourceSeqRanges.some(
+        (range) => range.startSeq <= tailCursor.seq && tailCursor.seq <= range.endSeq,
+      );
     return {
-      tail: params.tail,
+      // Live chunks can arrive before catch-up while their cached prefix is still painted.
+      // The projected reply owns both copies; keeping the prefix would duplicate it and
+      // cause completion to discard the updated head as an already-committed item.
+      tail: replacesCachedPrefix
+        ? [...params.tail.slice(0, tailMatch.index), ...params.tail.slice(tailMatch.index + 1)]
+        : params.tail,
       head: replaceMatch(params.head, headMatch.index),
       reconciled: true,
     };

From e5d9307cf9ef1a719729765fa5fe59f25102f090 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Oct 2026 00:55:08 +0200
Subject: [PATCH 251/270] fix(terminal): copy wide characters selected from
 either half (#7260)

Include the leading cell when a selection starts on a wide character continuation, matching the native renderer highlight. Keep continuation cells out of copied text so real spaces remain unchanged.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../terminal-selection.test.ts                | 42 +++++++++++++++++++
 .../native-renderer/terminal-selection.ts     |  8 +++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/terminal/native-renderer/terminal-selection.test.ts b/packages/app/src/terminal/native-renderer/terminal-selection.test.ts
index 3c390a1f5c..ecd2b44ffa 100644
--- a/packages/app/src/terminal/native-renderer/terminal-selection.test.ts
+++ b/packages/app/src/terminal/native-renderer/terminal-selection.test.ts
@@ -41,6 +41,48 @@ function rowWithText(
 }
 
 describe("native terminal selection", () => {
+  it.each([
+    { startCol: 1, endCol: 8, expected: "한글 문장" },
+    { startCol: 3, endCol: 8, expected: "글 문장" },
+    { startCol: 1, endCol: 1, expected: "한" },
+    { startCol: 0, endCol: 0, expected: "한" },
+    { startCol: 0, endCol: 1, expected: "한" },
+    { startCol: 4, endCol: 6, expected: " 문" },
+  ])(
+    "copies complete wide characters for selected columns $startCol through $endCol",
+    async ({ startCol, endCol, expected }) => {
+      const terminal = createNativeHeadlessTerminal({ rows: 3, cols: 30 });
+      const copied: string[] = [];
+      try {
+        await terminal.write("한글 문장");
+        const bounds = terminal.getBufferBounds();
+        const selection = createTerminalSelectionModel();
+        selection.begin({
+          coordinate: { row: bounds.cursorRow, col: endCol },
+          bounds,
+        });
+        selection.update({
+          coordinate: { row: bounds.cursorRow, col: startCol },
+          bounds,
+        });
+
+        await copyTerminalSelection({
+          terminal,
+          selection: selection.getSnapshot().range,
+          clipboard: {
+            writeText: async (text) => {
+              copied.push(text);
+            },
+          },
+        });
+
+        expect(copied).toEqual([expected]);
+      } finally {
+        terminal.dispose();
+      }
+    },
+  );
+
   it("copies Korean output without adding spaces for continuation cells", async () => {
     const terminal = createNativeHeadlessTerminal({ rows: 3, cols: 30 });
     const copied: string[] = [];
diff --git a/packages/app/src/terminal/native-renderer/terminal-selection.ts b/packages/app/src/terminal/native-renderer/terminal-selection.ts
index 02fb415aac..d222a4cc90 100644
--- a/packages/app/src/terminal/native-renderer/terminal-selection.ts
+++ b/packages/app/src/terminal/native-renderer/terminal-selection.ts
@@ -324,9 +324,13 @@ export function extractTerminalSelectedText(input: TerminalSelectedTextInput): s
     const cells = window.rows[offset] ?? [];
     const startsOnThisRow = row === selection.start.row;
     const endsOnThisRow = row === selection.end.row;
-    const startCol = startsOnThisRow ? selection.start.col : 0;
+    let startCol = Math.max(0, startsOnThisRow ? selection.start.col : 0);
+    // Selecting either half highlights the whole wide character, so copy its leading cell too.
+    if (startCol > 0 && cells[startCol]?.width === 0) {
+      startCol -= 1;
+    }
     const endCol = endsOnThisRow ? selection.end.col : cells.length - 1;
-    const selectedCells = cells.slice(Math.max(0, startCol), Math.max(0, endCol) + 1);
+    const selectedCells = cells.slice(startCol, Math.max(0, endCol) + 1);
     const line = selectedCells
       .filter((cell) => cell.width !== 0)
       .map((cell) => cell.char)

From b2da58b5bf08d079e88906ee08cfd1c24a5f7695 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Oct 2026 01:51:49 +0200
Subject: [PATCH 252/270] fix(app): keep chat keyboard scrolling after closing
 Find (#7263)

Closing Find focused its non-scrolling wrapper, leaving Page Up and Page Down unable to move the feed. Return focus through the viewport handle while preserving the reading position.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 packages/app/e2e/browser/chat-find.spec.ts    | 44 +++++++++++++++++++
 .../src/agent-stream/chat-find/index.web.tsx  |  4 +-
 .../app/src/agent-stream/strategy-web.tsx     |  1 +
 packages/app/src/agent-stream/strategy.ts     |  2 +
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/packages/app/e2e/browser/chat-find.spec.ts b/packages/app/e2e/browser/chat-find.spec.ts
index a7316fe165..e8c4b279ae 100644
--- a/packages/app/e2e/browser/chat-find.spec.ts
+++ b/packages/app/e2e/browser/chat-find.spec.ts
@@ -5,6 +5,7 @@ import {
   seedMockAgentWorkspace,
   type MockAgentWorkspace,
 } from "../support/helpers/mock-agent";
+import { waitForTimelineGeometryToSettle } from "../support/helpers/timeline-pagination";
 import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
 import {
   expectReconnectingToastGone,
@@ -124,6 +125,49 @@ async function closeFind(page: Page) {
     .toEqual([]);
 }
 
+async function expectChatKeyboardScroll(page: Page, key: "PageUp" | "PageDown") {
+  // The scrolling surface has no accessible name; use its existing test id.
+  const viewport = page.getByTestId("agent-chat-scroll");
+  await waitForTimelineGeometryToSettle(page);
+  const before = await viewport.evaluate((element) => element.scrollTop);
+  await page.keyboard.press(key);
+  const direction = key === "PageUp" ? -1 : 1;
+  await expect
+    .poll(
+      async () => direction * ((await viewport.evaluate((element) => element.scrollTop)) - before),
+    )
+    .toBeGreaterThan(100);
+}
+
+test("keeps keyboard scrolling the chat after closing Find", async ({ page }, testInfo) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "chat-find-scroll-focus-",
+    title: "Chat Find keyboard scrolling",
+    initialPrompt: "Render the response",
+    featureValues: { mockAssistantResponse: TALL_RESPONSE },
+  });
+  try {
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+    await openAgentRoute(page, agent);
+    await expect(page.getByTestId("assistant-message").first()).toBeVisible();
+    await searchChat(page, "Closing paragraph");
+    await expectHighlight(page, "Closing paragraph");
+    await waitForTimelineGeometryToSettle(page);
+    await closeFind(page);
+    await expectChatKeyboardScroll(page, "PageUp");
+    await page.screenshot({ path: testInfo.outputPath("chat-after-find-page-up.png") });
+    await expectChatKeyboardScroll(page, "PageDown");
+    await searchChat(page, "Closing paragraph");
+    await expectHighlight(page, "Closing paragraph");
+    await waitForTimelineGeometryToSettle(page);
+    await page.getByRole("button", { name: "Close Find", exact: true }).click();
+    await expect(query(page)).toHaveCount(0);
+    await expectChatKeyboardScroll(page, "PageUp");
+  } finally {
+    await agent.cleanup();
+  }
+});
+
 test("loads older history through prompt navigation and finds repeated rendered Markdown", async ({
   page,
 }, testInfo) => {
diff --git a/packages/app/src/agent-stream/chat-find/index.web.tsx b/packages/app/src/agent-stream/chat-find/index.web.tsx
index c817b55028..a083dc5d9e 100644
--- a/packages/app/src/agent-stream/chat-find/index.web.tsx
+++ b/packages/app/src/agent-stream/chat-find/index.web.tsx
@@ -118,8 +118,8 @@ export function ChatFind({
   }, [active, isInteractive, model]);
   const close = useCallback(() => {
     model.close();
-    root.current?.focus({ preventScroll: true });
-  }, [model]);
+    viewportRef.current?.focus?.();
+  }, [model, viewportRef]);
   let status = "";
   if (state.phase === "searching") status = t("paneFind.searching");
   else if (state.phase === "loading") status = t("paneFind.loading");
diff --git a/packages/app/src/agent-stream/strategy-web.tsx b/packages/app/src/agent-stream/strategy-web.tsx
index 00974867e4..e57fc98e48 100644
--- a/packages/app/src/agent-stream/strategy-web.tsx
+++ b/packages/app/src/agent-stream/strategy-web.tsx
@@ -1162,6 +1162,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
 
   useEffect(() => {
     const handle: StreamViewportHandle = {
+      focus: () => scrollContainerRef.current?.focus({ preventScroll: true }),
       scrollToBottom: () => {
         setFollowOutput(true);
         cancelPendingStickToBottom();
diff --git a/packages/app/src/agent-stream/strategy.ts b/packages/app/src/agent-stream/strategy.ts
index 5f43f8f6b1..7604b48cdd 100644
--- a/packages/app/src/agent-stream/strategy.ts
+++ b/packages/app/src/agent-stream/strategy.ts
@@ -51,6 +51,8 @@ export interface ScrollToMessageOccurrence {
 }
 
 export interface StreamViewportHandle {
+  /** Give keyboard navigation back to the scrolling surface on web. */
+  focus?: () => void;
   scrollToBottom: (reason?: BottomAnchorLocalRequest["reason"]) => void;
   prepareForViewportChange: () => void;
   scrollToMessage?: (messageId: string, occurrence?: ScrollToMessageOccurrence) => void;

From a7a21d91c2ef5556d80cd764aa47d9d0f31c858f Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Oct 2026 03:52:15 +0200
Subject: [PATCH 253/270] Keep overlapping directory searches from exhausting
 the heap (#7265)

* fix(server): keep overlapping directory searches within their scan budget

Construct child paths and branch iterators as the round-robin walk consumes them. Eager sibling expansion retained hundreds of thousands of unvisited children per search and exhausted the heap when requests overlapped.

* test(server): stop directory-search children before fixture cleanup

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/utils/directory-suggestions.test.ts   | 97 ++++++++++++++++++-
 .../server/src/utils/directory-suggestions.ts | 91 +++++++++--------
 2 files changed, 138 insertions(+), 50 deletions(-)

diff --git a/packages/server/src/utils/directory-suggestions.test.ts b/packages/server/src/utils/directory-suggestions.test.ts
index 711a721e48..a7d5d5e9eb 100644
--- a/packages/server/src/utils/directory-suggestions.test.ts
+++ b/packages/server/src/utils/directory-suggestions.test.ts
@@ -1,5 +1,5 @@
 import { createHook } from "node:async_hooks";
-import { execFileSync } from "node:child_process";
+import { execFileSync, spawn, type ChildProcess } from "node:child_process";
 import {
   mkdtempSync,
   mkdirSync,
@@ -1066,6 +1066,16 @@ describe("relative typed-entry configuration", () => {
   });
 });
 
+interface SearchProcessExit {
+  code: number | null;
+  signal: string | null;
+}
+
+interface SearchProcess {
+  child: ChildProcess;
+  exited: Promise<SearchProcessExit>;
+}
+
 // Reading a tree is cheap; re-deriving each entry's path state is not. A scan that asks whether
 // every ancestor of every entry is inside the root, or is Git-ignored, costs multiples of the
 // read and is what made large home directories exceed the client request timeout.
@@ -1073,6 +1083,7 @@ describe("home-tree scan cost", () => {
   const DEPTH = 8;
   const CHAINS = 40;
   let scanRoot: string;
+  let searchProcess: SearchProcess | null = null;
 
   beforeEach(() => {
     scanRoot = realpathSync.native(mkdtempSync(path.join(tmpdir(), "directory-scan-cost-")));
@@ -1083,8 +1094,16 @@ describe("home-tree scan cost", () => {
     }
   });
 
-  afterEach(() => {
-    rmSync(scanRoot, { recursive: true, force: true });
+  afterEach(async () => {
+    try {
+      if (searchProcess) {
+        searchProcess.child.kill();
+        await searchProcess.exited;
+      }
+    } finally {
+      searchProcess = null;
+      rmSync(scanRoot, { recursive: true, force: true });
+    }
   });
 
   // Nothing matches, so the scan walks the whole tree instead of stopping at a confident result.
@@ -1102,6 +1121,78 @@ describe("home-tree scan cost", () => {
     return stopPathContainmentMetrics();
   }
 
+  it("finishes overlapping broad-tree searches within a bounded heap", async () => {
+    const broadRoot = path.join(scanRoot, "broad");
+    mkdirSync(broadRoot);
+    for (let branch = 0; branch < 30; branch += 1) {
+      const branchRoot = path.join(broadRoot, `branch-${branch}`);
+      mkdirSync(branchRoot);
+      for (let group = 0; group < 30; group += 1) {
+        const groupRoot = path.join(branchRoot, `group-${group}`);
+        mkdirSync(groupRoot);
+        for (let leaf = 0; leaf < 30; leaf += 1) {
+          mkdirSync(path.join(groupRoot, `leaf-${leaf}`));
+        }
+      }
+    }
+    // A smaller real tree and explicit heap budget keep the million-directory repro cheap in CI.
+    const moduleUrl = new URL("./directory-suggestions.ts", import.meta.url).href;
+    const source = `
+      const { searchDirectoryEntries } = await import(${JSON.stringify(moduleUrl)});
+      const results = await Promise.all(Array.from({ length: 14 }, (_, index) =>
+        searchDirectoryEntries({
+          root: ${JSON.stringify(broadRoot)},
+          query: "z".repeat(index + 1),
+          pathFormat: "absolute",
+          includeFiles: false,
+          includeDirectories: true,
+          pathQueryPolicy: "rooted",
+          rootAliases: ["~"],
+          blankQueryBehavior: "none",
+          confidentResultScanThreshold: 5000,
+          maxEntriesScanned: 2000,
+          limit: 30,
+        })
+      ));
+      process.stdout.write(JSON.stringify(results));
+    `;
+    const child = spawn(
+      process.execPath,
+      [
+        "--max-old-space-size=128",
+        "--conditions=source",
+        "--import",
+        "tsx",
+        "--input-type=module",
+        "--eval",
+        source,
+      ],
+      { stdio: ["ignore", "pipe", "pipe"], timeout: 20_000 },
+    );
+    let stdout = "";
+    let stderr = "";
+    child.stdout.setEncoding("utf8");
+    child.stderr.setEncoding("utf8");
+    child.stdout.on("data", (chunk: string) => {
+      stdout += chunk;
+    });
+    child.stderr.on("data", (chunk: string) => {
+      stderr += chunk;
+    });
+    const exited = new Promise<SearchProcessExit>((resolve, reject) => {
+      child.on("error", reject);
+      child.on("close", (code, signal) => resolve({ code, signal }));
+    });
+    searchProcess = { child, exited };
+    const exit = await exited;
+    expect({ ...exit, outOfMemory: stderr.includes("heap out of memory") }).toEqual({
+      code: 0,
+      signal: null,
+      outOfMemory: false,
+    });
+    expect(JSON.parse(stdout)).toEqual(Array.from({ length: 14 }, () => []));
+  });
+
   it("derives no containment for a tree that cannot leave the root", async () => {
     const checks = await countContainmentChecks(scanWholeTree);
 
diff --git a/packages/server/src/utils/directory-suggestions.ts b/packages/server/src/utils/directory-suggestions.ts
index e0443475bc..e731ccef0f 100644
--- a/packages/server/src/utils/directory-suggestions.ts
+++ b/packages/server/src/utils/directory-suggestions.ts
@@ -63,6 +63,13 @@ interface WalkStart {
   resolvedPath: string;
 }
 
+interface WalkChildrenOptions {
+  parent: WalkStart;
+  depth: number;
+  input: SearchInput;
+  visited: Set<string>;
+}
+
 interface TraversedEntry extends ChildEntry {
   visiblePath: string;
   depth: number;
@@ -318,17 +325,18 @@ async function searchChildren(input: SearchInput): Promise<RankedEntry[]> {
   const discoveryInput = isInsideExcludedPath(parent, input)
     ? { ...input, excludedDiscoveryPaths: new Set<string>() }
     : input;
-  const entries = await readChildren(parent);
-  return entries.flatMap((entry) => {
+  const ranked: RankedEntry[] = [];
+  for await (const entry of readChildren(parent)) {
     if (!isPathInsideRoot(input.root, entry.resolvedPath) || !shouldDiscover(entry, discoveryInput))
-      return [];
+      continue;
     const candidate: TraversedEntry = {
       ...entry,
       visiblePath: path.join(visibleParent, entry.name),
       depth: 1,
     };
-    return shouldSuggest(candidate, input) ? [rank(candidate, input)] : [];
-  });
+    if (shouldSuggest(candidate, input)) ranked.push(rank(candidate, input));
+  }
+  return ranked;
 }
 
 async function searchTree(
@@ -336,21 +344,8 @@ async function searchTree(
   start: WalkStart = { visiblePath: input.root, resolvedPath: input.root },
 ): Promise<RankedEntry[]> {
   if (!(input.maxEntriesScanned > 0)) return [];
-  const roots = (await readChildren(start.resolvedPath)).filter((entry) =>
-    staysInsideRoot(entry, input.root),
-  );
   const visited = new Set<string>([start.resolvedPath]);
-  const branches = roots.flatMap((entry) =>
-    shouldDiscover(entry, input)
-      ? [
-          walkBranch(
-            { ...entry, visiblePath: path.join(start.visiblePath, entry.name), depth: 1 },
-            input,
-            visited,
-          ),
-        ]
-      : [],
-  );
+  const branches = walkChildren({ parent: start, depth: 1, input, visited });
   const ranked: RankedEntry[] = [];
   let scanned = 0;
   const threshold = input.confidentResultScanThreshold;
@@ -381,38 +376,39 @@ async function* walkBranch(
   )
     return;
   visited.add(entry.resolvedPath);
-  const children = (await readChildren(entry.resolvedPath)).filter((child) =>
-    staysInsideRoot(child, input.root),
-  );
-  const branches = children.flatMap((child) =>
-    shouldDiscover(child, input)
-      ? [
-          walkBranch(
-            {
-              ...child,
-              visiblePath: path.join(entry.visiblePath, child.name),
-              depth: entry.depth + 1,
-            },
-            input,
-            visited,
-          ),
-        ]
-      : [],
-  );
-  yield* roundRobin(branches);
+  yield* roundRobin(walkChildren({ parent: entry, depth: entry.depth + 1, input, visited }));
 }
 
-async function* roundRobin<T>(branches: Array<AsyncGenerator<T>>): AsyncGenerator<T> {
-  let active = branches;
-  while (active.length) {
+// Create a child's path and iterator only when its branch gets a turn. Eagerly constructing every
+// sibling's subtree retained hundreds of thousands of unvisited children beyond the scan budget.
+async function* walkChildren({
+  parent,
+  depth,
+  input,
+  visited,
+}: WalkChildrenOptions): AsyncGenerator<AsyncGenerator<TraversedEntry>> {
+  for await (const child of readChildren(parent.resolvedPath)) {
+    if (!staysInsideRoot(child, input.root) || !shouldDiscover(child, input)) continue;
+    yield walkBranch(
+      { ...child, visiblePath: path.join(parent.visiblePath, child.name), depth },
+      input,
+      visited,
+    );
+  }
+}
+
+async function* roundRobin<T>(branches: AsyncIterable<AsyncGenerator<T>>): AsyncGenerator<T> {
+  let active: AsyncIterable<AsyncGenerator<T>> | Array<AsyncGenerator<T>> = branches;
+  while (true) {
     const nextRound: Array<AsyncGenerator<T>> = [];
-    for (const branch of active) {
+    for await (const branch of active) {
       const next = await branch.next();
       if (!next.done) {
         nextRound.push(branch);
         yield next.value;
       }
     }
+    if (!nextRound.length) return;
     active = nextRound;
   }
 }
@@ -742,9 +738,9 @@ async function resolveDirectory(inputPath: string): Promise<string | null> {
   return info?.isDirectory() ? resolved : null;
 }
 
-async function readChildren(directory: string): Promise<ChildEntry[]> {
+async function* readChildren(directory: string): AsyncGenerator<ChildEntry> {
   const directoryInfo = await stat(directory).catch(() => null);
-  if (!directoryInfo?.isDirectory()) return [];
+  if (!directoryInfo?.isDirectory()) return;
 
   const cached = CAN_VALIDATE_DIRECTORY_CACHE_FROM_METADATA
     ? directoryListCache.get(directory)
@@ -774,9 +770,10 @@ async function readChildren(directory: string): Promise<ChildEntry[]> {
     }
   }
 
-  return (await Promise.all(rawEntries.map((entry) => resolveChild(directory, entry))))
-    .filter((entry): entry is ChildEntry => entry !== null)
-    .sort((left, right) => left.name.localeCompare(right.name));
+  for (const rawEntry of rawEntries) {
+    const entry = await resolveChild(directory, rawEntry);
+    if (entry) yield entry;
+  }
 }
 
 async function loadGitIgnoredPaths(root: string): Promise<Set<string>> {

From 1a6a9fa8d04a4a0b552eb44596201e078c118cbe Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Oct 2026 05:02:33 +0200
Subject: [PATCH 254/270] fix(claude): keep background child action logs after
 the parent finishes (#7266)

Late child frames were discarded after the launching turn ended, and parent completion cleared accumulated child actions. Keep card updates attached to the launching turn and release child actions on task completion.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../claude/agent.background-subagent.test.ts  | 249 ++++++++++--------
 .../server/agent/providers/claude/agent.ts    |  27 +-
 .../claude/sidechain-tracker.test.ts          |  34 +++
 .../providers/claude/sidechain-tracker.ts     |   2 +-
 ...round-subagent-action-log.real.e2e.test.ts | 105 ++++++++
 5 files changed, 289 insertions(+), 128 deletions(-)
 create mode 100644 packages/server/src/server/daemon-e2e/background-subagent-action-log.real.e2e.test.ts

diff --git a/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts b/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts
index d0a5bf644a..4cab1a5005 100644
--- a/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.background-subagent.test.ts
@@ -122,7 +122,7 @@ async function collectTimelineAcrossTurns(
           seq: rows.length + 1,
           timestamp: new Date(Date.UTC(2026, 9, 4, 0, 0, rows.length)).toISOString(),
           item: event.item,
-          ...(currentTurnId ? { turnId: currentTurnId } : {}),
+          ...((event.turnId ?? currentTurnId) ? { turnId: event.turnId ?? currentTurnId } : {}),
         });
       }
       if (event.type === "turn_completed" && ++completedTurns === turnCount) resolve();
@@ -469,122 +469,145 @@ describe("background Claude subagents", () => {
     });
   });
 
-  test("keeps one logged Task card when the child streams on after the parent's turn ends", async () => {
-    // A child can stream across the main session's turn boundary. Claude opens the next
-    // main-session turn with system/init; bare child frames do not open a turn.
-    queryFactory.mockImplementation(() =>
-      buildQueryMock([
-        { type: "system", subtype: "init", session_id: "bg-session", permissionMode: "default" },
-        {
-          type: "assistant",
-          message: {
-            model: "claude-haiku-4-5",
-            content: [
-              {
-                type: "tool_use",
-                id: "toolu_background",
-                name: "Agent",
-                input: {
-                  subagent_type: "general-purpose",
-                  description: "Count files here",
-                  prompt: "Run ls and reply with the number of entries.",
-                  run_in_background: true,
+  test.each(["before", "after"])(
+    "keeps one logged Task card when child tools start %s the parent finishes",
+    async (timing) => {
+      // A child can stream across the main session's turn boundary. Claude opens the next
+      // main-session turn with system/init; bare child frames do not open a turn.
+      queryFactory.mockImplementation(() =>
+        buildQueryMock([
+          { type: "system", subtype: "init", session_id: "bg-session", permissionMode: "default" },
+          {
+            type: "assistant",
+            message: {
+              model: "claude-haiku-4-5",
+              content: [
+                {
+                  type: "tool_use",
+                  id: "toolu_background",
+                  name: "Agent",
+                  input: {
+                    subagent_type: "general-purpose",
+                    description: "Count files here",
+                    prompt: "Run ls and reply with the number of entries.",
+                    run_in_background: true,
+                  },
                 },
-              },
-            ],
+              ],
+            },
           },
-        },
-        {
-          type: "system",
-          subtype: "task_started",
-          task_id: "bg-task",
-          tool_use_id: "toolu_background",
-          task_type: "local_agent",
-          subagent_type: "general-purpose",
+          {
+            type: "system",
+            subtype: "task_started",
+            task_id: "bg-task",
+            tool_use_id: "toolu_background",
+            task_type: "local_agent",
+            subagent_type: "general-purpose",
+            description: "Count files here",
+            prompt: "Run ls and reply with the number of entries.",
+          },
+          {
+            type: "user",
+            message: {
+              role: "user",
+              content: [
+                {
+                  type: "tool_result",
+                  tool_use_id: "toolu_background",
+                  content: "Async agent launched successfully.",
+                },
+              ],
+            },
+          },
+          ...(timing === "after"
+            ? [
+                { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
+                {
+                  type: "system",
+                  subtype: "init",
+                  session_id: "bg-session",
+                  permissionMode: "default",
+                },
+              ]
+            : []),
+          {
+            type: "assistant",
+            parent_tool_use_id: "toolu_background",
+            message: {
+              model: "claude-haiku-4-5",
+              content: [
+                {
+                  type: "tool_use",
+                  id: "toolu_ls",
+                  name: "Bash",
+                  input: { command: "ls -1", description: "List files" },
+                },
+              ],
+            },
+          },
+          ...(timing === "before"
+            ? [
+                { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
+                {
+                  type: "system",
+                  subtype: "init",
+                  session_id: "bg-session",
+                  permissionMode: "default",
+                },
+              ]
+            : []),
+          {
+            type: "user",
+            parent_tool_use_id: "toolu_background",
+            message: {
+              role: "user",
+              content: [{ type: "tool_result", tool_use_id: "toolu_ls", content: "a\nb\nc" }],
+            },
+          },
+          {
+            type: "assistant",
+            parent_tool_use_id: "toolu_background",
+            message: { model: "claude-haiku-4-5", content: [{ type: "text", text: "3" }] },
+          },
+          {
+            type: "system",
+            subtype: "task_updated",
+            task_id: "bg-task",
+            patch: { status: "completed" },
+          },
+          {
+            type: "system",
+            subtype: "task_notification",
+            task_id: "bg-task",
+            tool_use_id: "toolu_background",
+            status: "completed",
+          },
+          { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
+        ]),
+      );
+      const session = await new ClaudeAgentClient({
+        logger: createTestLogger(),
+        queryFactory,
+        resolveBinary: async () => "/test/claude/bin",
+      }).createSession({ provider: "claude", cwd: process.cwd() });
+      const rows = await collectTimelineAcrossTurns(session, "delegate work", 2);
+
+      const cards = projectTimelineRows({ rows, mode: "projected" })
+        .map((entry) => entry.item)
+        .filter((item) => item.type === "tool_call" && item.callId === "toolu_background");
+
+      expect(cards).toHaveLength(1);
+      expect(cards[0]).toMatchObject({
+        status: "completed",
+        detail: {
+          type: "sub_agent",
+          subAgentType: "general-purpose",
           description: "Count files here",
-          prompt: "Run ls and reply with the number of entries.",
+          log: "[Bash] ls -1",
         },
-        {
-          type: "user",
-          message: {
-            role: "user",
-            content: [
-              {
-                type: "tool_result",
-                tool_use_id: "toolu_background",
-                content: "Async agent launched successfully.",
-              },
-            ],
-          },
-        },
-        {
-          type: "assistant",
-          parent_tool_use_id: "toolu_background",
-          message: {
-            model: "claude-haiku-4-5",
-            content: [
-              {
-                type: "tool_use",
-                id: "toolu_ls",
-                name: "Bash",
-                input: { command: "ls -1", description: "List files" },
-              },
-            ],
-          },
-        },
-        { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
-        { type: "system", subtype: "init", session_id: "bg-session", permissionMode: "default" },
-        {
-          type: "user",
-          parent_tool_use_id: "toolu_background",
-          message: {
-            role: "user",
-            content: [{ type: "tool_result", tool_use_id: "toolu_ls", content: "a\nb\nc" }],
-          },
-        },
-        {
-          type: "assistant",
-          parent_tool_use_id: "toolu_background",
-          message: { model: "claude-haiku-4-5", content: [{ type: "text", text: "3" }] },
-        },
-        {
-          type: "system",
-          subtype: "task_updated",
-          task_id: "bg-task",
-          patch: { status: "completed" },
-        },
-        {
-          type: "system",
-          subtype: "task_notification",
-          task_id: "bg-task",
-          tool_use_id: "toolu_background",
-          status: "completed",
-        },
-        { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
-      ]),
-    );
-    const session = await new ClaudeAgentClient({
-      logger: createTestLogger(),
-      queryFactory,
-      resolveBinary: async () => "/test/claude/bin",
-    }).createSession({ provider: "claude", cwd: process.cwd() });
-    const rows = await collectTimelineAcrossTurns(session, "delegate work", 2);
-
-    const cards = projectTimelineRows({ rows, mode: "projected" })
-      .map((entry) => entry.item)
-      .filter((item) => item.type === "tool_call" && item.callId === "toolu_background");
-
-    expect(cards).toHaveLength(1);
-    expect(cards[0]).toMatchObject({
-      status: "completed",
-      detail: {
-        type: "sub_agent",
-        subAgentType: "general-purpose",
-        description: "Count files here",
-        log: "[Bash] ls -1",
-      },
-    });
-  });
+      });
+    },
+  );
 
   test.each([
     {
diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts
index b12ab706da..2af8983de0 100644
--- a/packages/server/src/server/agent/providers/claude/agent.ts
+++ b/packages/server/src/server/agent/providers/claude/agent.ts
@@ -2250,7 +2250,7 @@ class ClaudeAgentSession implements AgentSession {
   private readonly sidechainTracker = new ClaudeSidechainTracker({
     getToolInput: (toolUseId) =>
       this.toolUseCache.get(toolUseId)?.input ??
-      this.settledSubagentToolCallInCurrentTurn(toolUseId)?.input ??
+      this.settledSubagentToolCalls.get(toolUseId)?.input ??
       null,
     // Releases that predate the task protocol announce nothing, so the tracker keeps deriving
     // identity and status from frames for them. Detecting the capability beats comparing version
@@ -2258,13 +2258,11 @@ class ClaudeAgentSession implements AgentSession {
     isDescriptorOwnedElsewhere: () => this.taskProtocolSource.isActive,
     // A background child streams its frames after Claude has already answered the call, so its
     // card is rebuilt from the settled call: a running one would replace the settled, labeled card.
-    // A card belongs to the turn that answered the call, so frames from a later turn leave it be.
+    // Late card updates retain the turn that answered the call.
     needsSyntheticParentToolCard: (toolUseId) =>
-      (this.toolUseCache.has(toolUseId) ||
-        this.settledSubagentToolCallInCurrentTurn(toolUseId) !== undefined) &&
+      (this.toolUseCache.has(toolUseId) || this.settledSubagentToolCalls.has(toolUseId)) &&
       this.taskProtocolSource.needsSyntheticParentToolCard(toolUseId),
-    getSettledParentToolCall: (toolUseId) =>
-      this.settledSubagentToolCallInCurrentTurn(toolUseId)?.item,
+    getSettledParentToolCall: (toolUseId) => this.settledSubagentToolCalls.get(toolUseId)?.item,
   });
   private persistedHistory: PersistedTimelineEntry[] = [];
   private persistedProviderSubagentEvents: Extract<
@@ -4490,7 +4488,12 @@ class ClaudeAgentSession implements AgentSession {
       ),
     ).map((event): AgentStreamEvent => ({ type: "provider_subagent", provider: "claude", event }));
     const routedId = canonicalSubagentId ?? parentToolUseId;
-    return [...runtimeEvents, ...this.sidechainTracker.handleMessage(message, routedId)];
+    const settled = this.settledSubagentToolCalls.get(routedId);
+    const sidechainEvents = this.sidechainTracker.handleMessage(message, routedId).map((event) => {
+      if (event.type === "timeline" && settled?.turnId) event.turnId = settled.turnId;
+      return event;
+    });
+    return [...runtimeEvents, ...sidechainEvents];
   }
 
   /**
@@ -5145,7 +5148,8 @@ class ClaudeAgentSession implements AgentSession {
   }
 
   private notifySubscribers(event: AgentStreamEvent): void {
-    const turnId = this.activeForegroundTurnId ?? this.autonomousTurn?.id;
+    const turnId =
+      getAgentStreamEventTurnId(event) ?? this.activeForegroundTurnId ?? this.autonomousTurn?.id;
     const tagged = turnId ? { ...event, turnId } : event;
     this.logger.trace(
       {
@@ -5621,17 +5625,12 @@ class ClaudeAgentSession implements AgentSession {
     });
   }
 
-  private settledSubagentToolCallInCurrentTurn(subagentId: string) {
-    const settled = this.settledSubagentToolCalls.get(subagentId);
-    const currentTurnId = this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? null;
-    return settled && settled.turnId === currentTurnId ? settled : undefined;
-  }
-
   /** A finished child streams no more frames, so its settled call has nothing left to update. */
   private releaseFinishedSubagentToolCalls(observations: SubagentObservation[]): void {
     for (const observation of observations) {
       if (observation.kind === "status" && observation.status !== "running") {
         this.settledSubagentToolCalls.delete(observation.id);
+        this.sidechainTracker.delete(observation.id);
       }
     }
   }
diff --git a/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts b/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts
index f762557879..a17c1cd58c 100644
--- a/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts
+++ b/packages/server/src/server/agent/providers/claude/sidechain-tracker.test.ts
@@ -4,6 +4,40 @@ import type { SDKMessage } from "@anthropic-ai/claude-agent-sdk";
 import { ClaudeSidechainTracker } from "./sidechain-tracker.js";
 
 describe("ClaudeSidechainTracker", () => {
+  it("retains a background child's actions across the parent finishing", () => {
+    const tracker = new ClaudeSidechainTracker({
+      getToolInput: () => ({ subagent_type: "general-purpose", description: "List files" }),
+      isDescriptorOwnedElsewhere: () => true,
+    });
+    const action = (id: string, command: string) =>
+      ({
+        type: "assistant",
+        parent_tool_use_id: "task-1",
+        message: { content: [{ type: "tool_use", id, name: "Bash", input: { command } }] },
+      }) as unknown as SDKMessage;
+    tracker.handleMessage(action("ls", "ls -1"), "task-1");
+    expect(tracker.finishAll("completed")).toEqual([]);
+    const events = tracker.handleMessage(action("pwd", "pwd"), "task-1");
+    expect(events).toContainEqual(
+      expect.objectContaining({
+        type: "timeline",
+        item: expect.objectContaining({
+          detail: expect.objectContaining({ log: "[Bash] ls -1\n[Bash] pwd" }),
+        }),
+      }),
+    );
+    tracker.delete("task-1");
+    const next = tracker.handleMessage(action("next", "ls"), "task-1");
+    expect(next).toContainEqual(
+      expect.objectContaining({
+        type: "timeline",
+        item: expect.objectContaining({
+          detail: expect.objectContaining({ log: "[Bash] ls" }),
+        }),
+      }),
+    );
+  });
+
   it("uses Claude's native agent name for the provider subagent title", () => {
     const tracker = new ClaudeSidechainTracker({
       getToolInput: () => ({
diff --git a/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts b/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
index f054523126..083b82cea6 100644
--- a/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
+++ b/packages/server/src/server/agent/providers/claude/sidechain-tracker.ts
@@ -199,7 +199,7 @@ export class ClaudeSidechainTracker {
   finishAll(status: "completed" | "failed" | "canceled"): AgentStreamEvent[] {
     const events: AgentStreamEvent[] = [];
     if (this.isDescriptorOwnedElsewhere()) {
-      this.activeSidechains.clear();
+      // The task protocol owns child completion; the parent finishing does not end its children.
       return events;
     }
     for (const [id, state] of this.activeSidechains) {
diff --git a/packages/server/src/server/daemon-e2e/background-subagent-action-log.real.e2e.test.ts b/packages/server/src/server/daemon-e2e/background-subagent-action-log.real.e2e.test.ts
new file mode 100644
index 0000000000..7eba32f22a
--- /dev/null
+++ b/packages/server/src/server/daemon-e2e/background-subagent-action-log.real.e2e.test.ts
@@ -0,0 +1,105 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { fileURLToPath } from "node:url";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import pino from "pino";
+import { expect, test } from "vitest";
+import { ClaudeAgentClient } from "../agent/providers/claude/agent.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+
+test("background cards retain child actions after the parent finishes (#6253)", async () => {
+  const cwd = mkdtempSync(path.join(tmpdir(), "paseo-background-card-"));
+  const logger = pino({ level: "silent" });
+  const daemon = await createTestPaseoDaemon({
+    logger,
+    agentClients: { claude: new ClaudeAgentClient({ logger }) },
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  try {
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    const agent = await client.createAgent({
+      provider: "claude",
+      model: "haiku",
+      modeId: "bypassPermissions",
+      cwd,
+      title: "Background action log reproduction",
+    });
+    await client.sendMessage(
+      agent.id,
+      'In one message, call Agent twice with run_in_background true: first with subagent_type "general-purpose", description "List files", prompt "Run ls -1, then run sleep 20, then reply with the number of entries."; second with subagent_type "general-purpose", description "Print cwd", prompt "Run pwd, then run sleep 20, then reply with the path." After launching both, reply "launched" and end your turn immediately without waiting.',
+    );
+    await client.waitForFinish(agent.id, 180_000);
+    const atFinish = await client.fetchAgentTimeline(agent.id, {
+      direction: "tail",
+      limit: 0,
+      projection: "projected",
+    });
+    await expect
+      .poll(
+        async () => {
+          const { subagents } = await client.listProviderSubagents(agent.id);
+          return subagents.length === 2 && subagents.every((child) => child.status === "completed");
+        },
+        { timeout: 180_000, interval: 1000 },
+      )
+      .toBe(true);
+    const { subagents } = await client.listProviderSubagents(agent.id);
+    const children = await Promise.all(
+      subagents.map(async (child) => ({
+        description: child.description,
+        timeline: await client.fetchProviderSubagentTimeline(agent.id, child.id, {
+          direction: "tail",
+          limit: 0,
+        }),
+      })),
+    );
+    const final = await client.fetchAgentTimeline(agent.id, {
+      direction: "tail",
+      limit: 0,
+      projection: "projected",
+    });
+    const { stdout } = await promisify(execFile)(
+      process.execPath,
+      [
+        "--conditions=source",
+        "--import",
+        "tsx",
+        fileURLToPath(new URL("../../../../cli/src/index.ts", import.meta.url)),
+        "--host",
+        `127.0.0.1:${daemon.port}`,
+        "logs",
+        agent.id,
+      ],
+      { env: { ...process.env, PASEO_HOME: daemon.paseoHome }, timeout: 30_000 },
+    );
+    expect(stdout).toContain("[Bash] ls -1");
+    expect(stdout).toContain("[Bash] pwd");
+    expect(
+      atFinish.entries.filter(
+        (row) => row.item.type === "tool_call" && row.item.detail?.type === "sub_agent",
+      ),
+    ).toHaveLength(2);
+    const cards = final.entries
+      .map((row) => row.item)
+      .filter((item) => item.type === "tool_call" && item.detail?.type === "sub_agent");
+    expect(cards).toHaveLength(2);
+    for (const child of children) {
+      expect(
+        child.timeline.rows.some(
+          (row) => row.item.type === "tool_call" && row.item.name === "Bash",
+        ),
+      ).toBe(true);
+    }
+    for (const card of cards) {
+      expect(card.detail?.type === "sub_agent" ? card.detail.log : "").toContain("[Bash]");
+    }
+  } finally {
+    await client.close();
+    await daemon.close();
+    rmSync(cwd, { recursive: true, force: true });
+  }
+}, 420_000);

From efd6d95f91db3b6f028467e22cdf2652436555b4 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Oct 2026 06:06:08 +0200
Subject: [PATCH 255/270] fix(plugins): return unavailable when steering
 provider without prompt.steer capability (#7270)

Co-authored-by: Simone Primarosa <simone.primarosa@gmail.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
---
 .../src/server/agent/plugin-provider.test.ts  | 66 +++++++++++++++++++
 .../src/server/agent/plugin-provider.ts       |  3 +
 2 files changed, 69 insertions(+)

diff --git a/packages/server/src/server/agent/plugin-provider.test.ts b/packages/server/src/server/agent/plugin-provider.test.ts
index ae8ed805d7..aa0aa1a924 100644
--- a/packages/server/src/server/agent/plugin-provider.test.ts
+++ b/packages/server/src/server/agent/plugin-provider.test.ts
@@ -761,6 +761,72 @@ describe("PluginAgentClientRegistry", () => {
     await expect.poll(harness.closeCount).toBe(1);
     expect(harness.inputs.map((input) => input.type)).toContain("session.close");
   });
+
+  test("delivers a supported steer to the active turn", async () => {
+    const harness = createProviderHarness({
+      capabilities: [...CAPABILITIES, "prompt.steer"],
+      handleInput: async (input, emit) => {
+        if (input.type !== "session.prompt") return false;
+        emit({
+          type: "session.prompt_result",
+          sessionId: input.sessionId,
+          clientMessageId: input.prompt.clientMessageId,
+          result: { type: "steer", turnId: "turn-1" },
+        });
+        return true;
+      },
+    });
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    const client = registry.clients()[harness.registration.id]!;
+    const session = await client.createSession({ provider: harness.registration.id, cwd: "/tmp" });
+    try {
+      await expect(
+        session.steerActiveTurn!("follow up", {
+          expectedTurnId: "turn-1",
+          clientMessageId: "steer-1",
+          clearPendingPermissions: true,
+        }),
+      ).resolves.toEqual({ status: "accepted" });
+      expect(harness.inputs.find((input) => input.type === "session.prompt")).toMatchObject({
+        prompt: {
+          delivery: "steer",
+          clientMessageId: "steer-1",
+          input: { type: "message", content: [{ type: "text", text: "follow up" }] },
+          clearPendingPermissions: true,
+        },
+      });
+    } finally {
+      await session.close();
+      registry.replace([]);
+    }
+  });
+
+  test("returns unavailable when steering a provider without prompt.steer capability", async () => {
+    const harness = createProviderHarness({
+      capabilities: [
+        "prompt.message",
+        "session.configure",
+        "session.persistence",
+        "session.subsession",
+        "permission",
+      ],
+    });
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    const session = await registry.clients()[harness.registration.id]!.createSession({
+      provider: harness.registration.id,
+      cwd: "/workspace",
+    });
+    try {
+      const result = await session.steerActiveTurn!("hello", { expectedTurnId: "turn-1" });
+      expect(result).toEqual({ status: "unavailable" });
+      expect(harness.inputs.filter((input) => input.type === "session.prompt")).toHaveLength(0);
+    } finally {
+      await session.close();
+      registry.replace([]);
+    }
+  });
 });
 
 type RequestKind = "session.open" | "catalog" | "session.configure" | "session.prompt";
diff --git a/packages/server/src/server/agent/plugin-provider.ts b/packages/server/src/server/agent/plugin-provider.ts
index e575ff0d45..db5d7651a2 100644
--- a/packages/server/src/server/agent/plugin-provider.ts
+++ b/packages/server/src/server/agent/plugin-provider.ts
@@ -1175,6 +1175,9 @@ class PluginAgentSession implements AgentSession {
     prompt: AgentPromptInput,
     options: SteerActiveTurnOptions,
   ): Promise<SteerResult> {
+    if (!this.bridge.negotiatedCapabilities.includes("prompt.steer")) {
+      return { status: "unavailable" };
+    }
     const result = await this.bridge.prompt({
       clientMessageId: options.clientMessageId ?? randomUUID(),
       delivery: "steer",

From cf62b009116ad1365928a605b1f4887dcbc810e6 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 11:06:31 +0700
Subject: [PATCH 256/270] Keep last successful usage visible when refresh fails
 (#7246)

* fix(usage): retain last successful data when polls fail

Keep the latest poll outcome separate from its successful snapshot so errors remain visible without discarding known usage or advancing its freshness. Preserve attempt timestamps for response ordering and isolate retained values by scoped login set.

* fix(usage): preserve history through discovery failures

A failed account-store read does not confirm that an account was removed. Retain its existing host mapping until successful discovery replaces it, without carrying mappings across agent launch environments.
---
 packages/app/e2e/browser/usage-modal.spec.ts  |  66 +++++-
 .../app/e2e/support/helpers/usage-login.ts    |  11 +
 packages/app/src/usage/balance-bar.tsx        |  10 +-
 packages/app/src/usage/card.tsx               |  68 +++---
 packages/app/src/usage/format.test.ts         |   9 +-
 packages/app/src/usage/format.ts              |   3 +-
 packages/app/src/usage/model.test.ts          |  70 ++++++
 packages/app/src/usage/model.ts               |  43 +++-
 packages/app/src/usage/pinned.test.ts         |   6 +-
 packages/app/src/usage/window-bar.tsx         |   9 +-
 packages/cli/src/commands/usage/index.test.ts |  37 ++++
 .../cli/src/commands/usage/presentation.ts    |  73 +++++--
 packages/protocol/src/messages.ts             |  20 +-
 .../protocol/src/messages.wire-compat.test.ts |  38 ++++
 .../plugins/usage-sources/index.test.ts       | 205 ++++++++++++++++++
 .../src/server/plugins/usage-sources/index.ts |  70 +++++-
 16 files changed, 645 insertions(+), 93 deletions(-)

diff --git a/packages/app/e2e/browser/usage-modal.spec.ts b/packages/app/e2e/browser/usage-modal.spec.ts
index a923971d09..f51c0ad510 100644
--- a/packages/app/e2e/browser/usage-modal.spec.ts
+++ b/packages/app/e2e/browser/usage-modal.spec.ts
@@ -16,6 +16,7 @@ import {
 } from "../support/helpers/usage-reports";
 import {
   installLoginUsage,
+  expectLoginUsageFreshness,
   installCodexWindowUsage,
   expectCodexReportedWindows,
   refreshLoginUsage,
@@ -588,6 +589,69 @@ async function expectLoginErrors(page: Page, lines: string[]) {
 
 async function expectLoginUsageOnly(page: Page, percentage: string) {
   const card = page.getByTestId("usage-report-login-journey:account");
-  await expect(card.getByText(percentage, { exact: true })).toBeVisible();
+  await expect(card.getByText(new RegExp(`^${percentage}(?:$| ·)`))).toBeVisible();
   await expect(card.getByTestId("usage-login-error")).toHaveCount(0);
 }
+
+for (const compact of [false, true]) {
+  test(`failed polls retain usage and successful freshness (${compact ? "footer" : "tooltip"})`, async ({
+    page,
+  }) => {
+    const fixture = await installLoginUsage({ status: "error", error: "Initial failure" });
+    try {
+      await page.setViewportSize(
+        compact ? { width: 390, height: 844 } : { width: 1440, height: 900 },
+      );
+      await gotoAppShell(page);
+      if (compact) await openCompactSidebar(page);
+      await openUsageFromIcon(page);
+      await expectLoginErrors(page, ["Claude: Initial failure"]);
+      await expectLoginUsageFreshness(page, "No successful update", compact);
+
+      await fixture.setReport({
+        status: "available",
+        windows: [{ id: "weekly", label: "Weekly", usedPct: 42, resetsAt: "2000-01-01T00:00:00Z" }],
+      });
+      // Move only the browser clock; real daemon fetches continue using the host clock.
+      await page.clock.setFixedTime(new Date(Date.now() + 3_900_000));
+      await refreshLoginUsage(page);
+      await expectLoginUsageOnly(page, "42%");
+      await expectLoginUsageFreshness(page, "Updated 1h ago", compact);
+
+      await fixture.setReport({ status: "error", error: "Rate limited" });
+      await refreshLoginUsage(page);
+      await expectRetainedLoginUsage(page, "Claude: Rate limited");
+      await expectLoginUsageFreshness(page, "Last updated 1h ago", compact);
+      await refreshLoginUsage(page);
+      await expectRetainedLoginUsage(page, "Claude: Rate limited");
+      await expectLoginUsageFreshness(page, "Last updated 1h ago", compact);
+
+      await fixture.setReport({
+        status: "unavailable",
+        problem: { kind: "no_quota", detail: "No active quota" },
+      });
+      await refreshLoginUsage(page);
+      await expectRetainedLoginUsage(page, "Claude: No active quota");
+      await expectLoginUsageFreshness(page, "Last updated 1h ago", compact);
+
+      await fixture.setReport({
+        status: "available",
+        windows: [{ id: "weekly", label: "Weekly", usedPct: 43 }],
+      });
+      await page.clock.setFixedTime(new Date(Date.now() + 150_000));
+      await refreshLoginUsage(page);
+      await expectLoginUsageOnly(page, "43%");
+      await expect(page.getByText("42%", { exact: true })).toHaveCount(0);
+      await expectLoginUsageFreshness(page, "Updated 2m ago", compact);
+    } finally {
+      await fixture.cleanup();
+    }
+  });
+}
+
+async function expectRetainedLoginUsage(page: Page, message: string) {
+  const card = page.getByTestId("usage-report-login-journey:account");
+  await expect(card.getByText(/^42%(?:$| ·)/)).toBeVisible();
+  await expect(card.getByTestId("usage-login-error")).toHaveText(message);
+  await expect(card.getByText("Reset time passed", { exact: false })).toBeVisible();
+}
diff --git a/packages/app/e2e/support/helpers/usage-login.ts b/packages/app/e2e/support/helpers/usage-login.ts
index 6129f0259e..25ee01d5d5 100644
--- a/packages/app/e2e/support/helpers/usage-login.ts
+++ b/packages/app/e2e/support/helpers/usage-login.ts
@@ -135,3 +135,14 @@ export async function expectCodexReportedWindows(page: Page, shape: "seven-day-o
     );
   }
 }
+
+export async function expectLoginUsageFreshness(page: Page, text: string, compact: boolean) {
+  const card = page.getByTestId("usage-report-login-journey:account");
+  if (compact) {
+    await expect(card.getByTestId("usage-freshness")).toHaveText(text);
+    return;
+  }
+  await card.getByRole("button", { name: "Refresh Claude", exact: true }).hover();
+  await expect(page.getByTestId("usage-freshness-tooltip")).toHaveText(text);
+  await page.mouse.move(0, 0);
+}
diff --git a/packages/app/src/usage/balance-bar.tsx b/packages/app/src/usage/balance-bar.tsx
index 751193eec0..38b2f0804a 100644
--- a/packages/app/src/usage/balance-bar.tsx
+++ b/packages/app/src/usage/balance-bar.tsx
@@ -41,11 +41,17 @@ function fillToneStyle(tone: UsageTone) {
   }
 }
 
-export function UsageBalanceBar({ balance }: { balance: UsageBalance }) {
+export function UsageBalanceBar({
+  balance,
+  retained = false,
+}: {
+  balance: UsageBalance;
+  retained?: boolean;
+}) {
   const { i18n } = useTranslation();
   const { amountText, usedPct } = resolveBalance(balance, i18n.language);
   const tone = balance.tone ?? "default";
-  const resetLabel = formatResetLabel(balance.resetsAt);
+  const resetLabel = formatResetLabel(balance.resetsAt, retained);
 
   const fillStyle = useMemo<StyleProp<ViewStyle>>(
     () => [styles.fill, fillToneStyle(tone), { width: `${clampPct(usedPct ?? 0)}%` }],
diff --git a/packages/app/src/usage/card.tsx b/packages/app/src/usage/card.tsx
index a1936e0f97..562f3805a1 100644
--- a/packages/app/src/usage/card.tsx
+++ b/packages/app/src/usage/card.tsx
@@ -16,7 +16,7 @@ import { useCompactTimeAgo } from "@/hooks/use-time-ago";
 import { UsageBalanceBar } from "./balance-bar";
 import { usageCopy } from "./copy";
 import type { UsageDisplay } from "./display";
-import { formatUsageFreshness, type UsageRefresh } from "./model";
+import { formatUsageFreshness, resolveUsageReport, type UsageRefresh } from "./model";
 import { useReportRefresh } from "./queries";
 import { UsageSourceIcon } from "./source-icon";
 import type { UsageReport, UsageReportEntry, UsageWindow } from "./types";
@@ -27,31 +27,6 @@ function statusText(report: UsageReport): string | null {
   return report.status === "error" ? "Error" : "Unavailable";
 }
 
-function reportContent(report: UsageReport) {
-  if (report.status === "available")
-    return {
-      windows: report.windows,
-      balances: report.balances ?? [],
-      details: report.details ?? [],
-      message: undefined,
-    };
-  const message =
-    report.status === "unavailable" ? usageCopy.problem(report.problem) : report.error;
-  return { windows: [], balances: [], details: [], message };
-}
-
-function reportMessages(entry: UsageReportEntry): string[] {
-  if (entry.report.status === "available") return [];
-  if (entry.loginErrors)
-    return entry.loginErrors.map(
-      (login) => `${login.harness}: ${reportContent(login.report).message}`,
-    );
-  // COMPAT(usageLoginErrors): added in v0.11.0, remove after 2027-04-05 once daemon floor >= v0.11.0.
-  return [
-    entry.report.status === "error" ? entry.report.error : usageCopy.problem(entry.report.problem),
-  ];
-}
-
 const ThemedRotateCw = withUnistyles(RotateCw);
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 
@@ -81,8 +56,8 @@ export function UsageCard({
   const usage = entry.report;
   const status = statusText(usage);
   const footer = entry.account.label ?? null;
-  const { windows, balances, details } = reportContent(usage);
-  const messages = reportMessages(entry);
+  const { windows, balances, details, planLabel, successfulAt, retained, messages } =
+    resolveUsageReport(entry);
 
   const containerStyle = useMemo(
     () => [styles.container, compact ? styles.containerCompact : styles.containerPadded],
@@ -104,9 +79,7 @@ export function UsageCard({
         <Text style={styles.name} numberOfLines={1}>
           {entry.sourceLabel}
         </Text>
-        {usage.status === "available" && usage.planLabel ? (
-          <StatusBadge label={usage.planLabel} variant="muted" size="xs" />
-        ) : null}
+        {planLabel ? <StatusBadge label={planLabel} variant="muted" size="xs" /> : null}
         <View style={styles.headerSpacer} />
         {status ? (
           <View style={styles.statusRow}>
@@ -117,7 +90,8 @@ export function UsageCard({
         {refreshable ? (
           <UsageRefreshButton
             sourceLabel={entry.sourceLabel}
-            fetchedAt={entry.fetchedAt}
+            successfulAt={successfulAt}
+            retained={retained}
             refreshState={refreshState}
             onRefresh={refresh}
             compact={isCompact}
@@ -138,12 +112,13 @@ export function UsageCard({
               key={window.id}
               entry={entry}
               window={window}
+              retained={retained}
               display={display}
               pinnable={pinnable}
             />
           ))}
           {balances.map((balance) => (
-            <UsageBalanceBar key={balance.id} balance={balance} />
+            <UsageBalanceBar key={balance.id} balance={balance} retained={retained} />
           ))}
         </View>
       ) : null}
@@ -170,7 +145,8 @@ export function UsageCard({
           </Text>
           {showsFreshnessInline ? (
             <UsageFreshness
-              fetchedAt={entry.fetchedAt}
+              successfulAt={successfulAt}
+              retained={retained}
               style={styles.freshness}
               testID="usage-freshness"
             />
@@ -192,7 +168,9 @@ function CardWindowBar({
   window,
   display,
   pinnable,
+  retained,
 }: {
+  retained: boolean;
   entry: UsageReportEntry;
   window: UsageWindow;
   display: UsageDisplay;
@@ -207,6 +185,7 @@ function CardWindowBar({
   return (
     <UsageWindowBar
       window={window}
+      retained={retained}
       displayAs={display.displayAs}
       pinnable={pinnable}
       pinned={display.isPinned(pin)}
@@ -220,13 +199,15 @@ function CardWindowBar({
 /** Refreshes this one report. Its tooltip says when the report on screen was fetched. */
 function UsageRefreshButton({
   sourceLabel,
-  fetchedAt,
+  successfulAt,
+  retained,
   refreshState,
   onRefresh,
   compact,
 }: {
   sourceLabel: string;
-  fetchedAt: string;
+  successfulAt: string | null;
+  retained: boolean;
   refreshState: UsageRefresh;
   onRefresh: () => void;
   compact: boolean;
@@ -236,12 +217,13 @@ function UsageRefreshButton({
   const freshness = useMemo(
     () => (
       <UsageFreshness
-        fetchedAt={fetchedAt}
+        successfulAt={successfulAt}
+        retained={retained}
         style={styles.tooltipText}
         testID="usage-freshness-tooltip"
       />
     ),
-    [fetchedAt],
+    [successfulAt, retained],
   );
   return (
     <ToolbarButton
@@ -265,18 +247,20 @@ function UsageRefreshButton({
 
 /** Its own component so the relative-time clock re-renders one `<Text>`, not the card. */
 function UsageFreshness({
-  fetchedAt,
+  successfulAt,
+  retained,
   style,
   testID,
 }: {
-  fetchedAt: string;
+  successfulAt: string | null;
+  retained: boolean;
   style: StyleProp<TextStyle>;
   testID: string;
 }) {
-  const elapsed = useCompactTimeAgo(new Date(fetchedAt));
+  const elapsed = useCompactTimeAgo(successfulAt ? new Date(successfulAt) : null);
   return (
     <Text style={style} numberOfLines={1} testID={testID}>
-      {formatUsageFreshness(elapsed)}
+      {successfulAt ? formatUsageFreshness(elapsed, retained) : "No successful update"}
     </Text>
   );
 }
diff --git a/packages/app/src/usage/format.test.ts b/packages/app/src/usage/format.test.ts
index 88fe227ae6..22529c8d71 100644
--- a/packages/app/src/usage/format.test.ts
+++ b/packages/app/src/usage/format.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { formatAmount } from "./format";
+import { formatAmount, formatResetLabel } from "./format";
 
 describe("formatAmount", () => {
   it("groups thousands in the app's language", () => {
@@ -13,3 +13,10 @@ describe("formatAmount", () => {
     expect(formatAmount(1234.5, "usd", "fr").replace(/\s/g, " ")).toBe("1 234,50 $US");
   });
 });
+
+it("retained reset times that have passed do not claim the quota is resetting", () => {
+  const past = "2000-01-01T00:00:00.000Z";
+  expect(formatResetLabel(past, true)).toBe("Reset time passed");
+  expect(formatResetLabel(past)).toBe("resetting now");
+  expect(formatResetLabel(null, true)).toBeNull();
+});
diff --git a/packages/app/src/usage/format.ts b/packages/app/src/usage/format.ts
index 5adef2154d..e13a550e7b 100644
--- a/packages/app/src/usage/format.ts
+++ b/packages/app/src/usage/format.ts
@@ -27,10 +27,11 @@ function relativeDuration(iso: string): string | null {
   return `${diffMinutes}m`;
 }
 
-export function formatResetLabel(iso: string | null | undefined): string | null {
+export function formatResetLabel(iso: string | null | undefined, retained = false): string | null {
   if (!iso) return null;
   const rel = relativeDuration(iso);
   if (!rel) return null;
+  if (rel === "now" && retained) return "Reset time passed";
   return rel === "now" ? "resetting now" : `resets ${rel}`;
 }
 
diff --git a/packages/app/src/usage/model.test.ts b/packages/app/src/usage/model.test.ts
index a2c493619d..13da42a6eb 100644
--- a/packages/app/src/usage/model.test.ts
+++ b/packages/app/src/usage/model.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import {
+  resolveUsageReport,
   displayPercent,
   formatUsageFreshness,
   resolveAgentUsageView,
@@ -325,3 +326,72 @@ describe("resolveAgentUsageView", () => {
     ).toEqual({ kind: "error", message: "Unable to load usage: Unknown agent" });
   });
 });
+
+it("resolves retained usage and successful time without inventing old-daemon history", () => {
+  const success = entry({ windows: [{ id: "weekly", label: "Weekly", usedPct: 42 }] });
+  const failure: UsageReportEntry = {
+    ...success,
+    fetchedAt: "2026-01-01T00:06:00.000Z",
+    report: { status: "error", error: "Rate limited" },
+    lastSuccessful: {
+      fetchedAt: success.fetchedAt,
+      report: success.report as Extract<UsageReportEntry["report"], { status: "available" }>,
+    },
+  };
+  expect(resolveUsageReport(failure)).toEqual({
+    windows: success.report.status === "available" ? success.report.windows : [],
+    balances: [],
+    details: [],
+    planLabel: null,
+    successfulAt: success.fetchedAt,
+    retained: true,
+    messages: ["Rate limited"],
+  });
+  expect(resolveUsageReport({ ...failure, lastSuccessful: undefined })).toEqual({
+    windows: [],
+    balances: [],
+    details: [],
+    planLabel: null,
+    successfulAt: null,
+    retained: false,
+    messages: ["Rate limited"],
+  });
+  expect(resolveUsageReport(success)).toEqual({
+    windows: success.report.status === "available" ? success.report.windows : [],
+    balances: [],
+    details: [],
+    planLabel: null,
+    successfulAt: success.fetchedAt,
+    retained: false,
+    messages: [],
+  });
+});
+
+it("orders failed polls by attempt time even when successful data is older", () => {
+  const success = entry({});
+  if (success.report.status !== "available") throw new Error("fixture must be available");
+  const failure: UsageReportEntry = {
+    ...success,
+    fetchedAt: "2026-01-01T00:06:00.000Z",
+    report: { status: "error", error: "Rate limited" },
+    lastSuccessful: { fetchedAt: success.fetchedAt, report: success.report },
+  };
+  expect(upsertReport([failure], success)).toEqual([failure]);
+  expect(settleReports([failure], [success])).toEqual([failure]);
+  expect(upsertReport([success], failure)).toEqual([failure]);
+});
+
+it("available and retained usage show the same successful completion time", () => {
+  const success: UsageReportEntry = { ...entry({}), successfulAt: "2026-01-01T00:00:15.000Z" };
+  if (success.report.status !== "available") throw new Error("fixture must be available");
+  expect(resolveUsageReport(success).successfulAt).toBe("2026-01-01T00:00:15.000Z");
+  const failure: UsageReportEntry = {
+    ...success,
+    successfulAt: undefined,
+    fetchedAt: "2026-01-01T00:06:00.000Z",
+    report: { status: "error", error: "Rate limited" },
+    lastSuccessful: { fetchedAt: success.successfulAt!, report: success.report },
+  };
+  expect(resolveUsageReport(failure).successfulAt).toBe(resolveUsageReport(success).successfulAt);
+  expect(upsertReport([failure], success)).toEqual([failure]);
+});
diff --git a/packages/app/src/usage/model.ts b/packages/app/src/usage/model.ts
index ed8a39163a..1f1c82cce3 100644
--- a/packages/app/src/usage/model.ts
+++ b/packages/app/src/usage/model.ts
@@ -1,7 +1,7 @@
 import { formatCompactTimeAgoAsProse } from "@/utils/time";
 import { usageCopy } from "./copy";
 import type { UsageDisplayAs } from "./preferences";
-import type { UsageReportEntry, UsageView, UsageWindow } from "./types";
+import type { UsageReport, UsageReportEntry, UsageView, UsageWindow } from "./types";
 
 export function usedPercent(window: UsageWindow): number | null {
   if (window.usedPct != null) return window.usedPct;
@@ -32,8 +32,8 @@ export function usageWindowRowLabel(input: {
 }
 
 /** When a report was fetched, from its compact relative time: "Updated 3m ago". */
-export function formatUsageFreshness(compactTimeAgo: string): string {
-  return `${usageCopy.updated} ${formatCompactTimeAgoAsProse(compactTimeAgo)}`;
+export function formatUsageFreshness(compactTimeAgo: string, retained = false): string {
+  return `${retained ? "Last updated" : usageCopy.updated} ${formatCompactTimeAgoAsProse(compactTimeAgo)}`;
 }
 
 /** A user-requested refresh of one report. The previous report stays on screen throughout. */
@@ -192,3 +192,40 @@ export function resolveUsageModalHostId(choice: UsageHostChoice): string | null
   const picked = connected.find((host) => host.serverId === choice.pickedServerId);
   return picked?.serverId ?? resolveUsageHostId(choice) ?? connected[0]?.serverId ?? null;
 }
+
+/** Current outcome owns messages; only a successful poll owns values and freshness. */
+export function resolveUsageReport(entry: UsageReportEntry) {
+  const available = entry.report.status === "available";
+  // COMPAT(usageLastSuccessful): added in v0.12.0, remove after 2027-04-17 once daemon floor >= v0.12.0.
+  // Older daemons cannot provide history; a failed attempt is never a successful update.
+  const snapshot = available ? null : (entry.lastSuccessful ?? null);
+  const content = entry.report.status === "available" ? entry.report : (snapshot?.report ?? null);
+  const messages: string[] = [];
+  if (!available) {
+    if (entry.loginErrors)
+      messages.push(
+        ...entry.loginErrors.map((login) => `${login.harness}: ${usageProblemText(login.report)}`),
+      );
+    // COMPAT(usageLoginErrors): added in v0.11.0, remove after 2027-04-05 once daemon floor >= v0.11.0.
+    else messages.push(usageProblemText(entry.report));
+  }
+  return {
+    windows: content?.windows ?? [],
+    balances: content?.balances ?? [],
+    details: content?.details ?? [],
+    planLabel: content?.planLabel ?? null,
+    // COMPAT(usageSuccessfulAt): added in v0.12.0, remove after 2027-04-17 once daemon floor >= v0.12.0.
+    // Old daemons expose only attempt time for available reports, never for failures.
+    successfulAt: available
+      ? (entry.successfulAt ?? entry.fetchedAt)
+      : (snapshot?.fetchedAt ?? null),
+    retained: snapshot !== null,
+    messages,
+  };
+}
+
+function usageProblemText(report: UsageReport): string {
+  if (report.status === "error") return report.error;
+  if (report.status === "unavailable") return usageCopy.problem(report.problem);
+  return "";
+}
diff --git a/packages/app/src/usage/pinned.test.ts b/packages/app/src/usage/pinned.test.ts
index 9965251595..8c2c2e58fd 100644
--- a/packages/app/src/usage/pinned.test.ts
+++ b/packages/app/src/usage/pinned.test.ts
@@ -257,9 +257,12 @@ describe("resolvePinnedUsage", () => {
   });
 });
 
-it("keeps unavailable and error reports out of the sidebar summary", () => {
+it("keeps unavailable and error reports out of the sidebar summary even with retained data", () => {
+  if (claude.report.status !== "available" || codex.report.status !== "available")
+    throw new Error("fixtures must be available");
   const expired: UsageReportEntry = {
     ...claude,
+    lastSuccessful: { fetchedAt: claude.fetchedAt, report: claude.report },
     report: {
       status: "unavailable",
       problem: { kind: "expired", expiresAt: "2026-10-01T00:00:00.000Z", refreshedBy: "claude" },
@@ -267,6 +270,7 @@ it("keeps unavailable and error reports out of the sidebar summary", () => {
   };
   const failed: UsageReportEntry = {
     ...codex,
+    lastSuccessful: { fetchedAt: codex.fetchedAt, report: codex.report },
     report: { status: "error", error: "Store deleted" },
   };
   expect(resolvePinnedUsage([expired, failed], preferences(null))).toEqual([]);
diff --git a/packages/app/src/usage/window-bar.tsx b/packages/app/src/usage/window-bar.tsx
index 5260a1c44b..79ea6b9f2d 100644
--- a/packages/app/src/usage/window-bar.tsx
+++ b/packages/app/src/usage/window-bar.tsx
@@ -26,7 +26,9 @@ export function UsageWindowBar({
   onTogglePin,
   pinLabel,
   pinTestID,
+  retained = false,
 }: {
+  retained?: boolean;
   window: UsageWindow;
   displayAs: UsageDisplayAs;
   /** Whether the row pins the window to the sidebar. When false the row is a plain bar. */
@@ -40,10 +42,13 @@ export function UsageWindowBar({
   const shownPct = displayPercent(window, displayAs);
   const tone = windowTone(window);
 
-  const isAtRisk = window.runsOutAt != null && window.shortfallPct != null;
+  const isAtRisk =
+    window.runsOutAt != null &&
+    window.shortfallPct != null &&
+    (!retained || Date.parse(window.runsOutAt) > Date.now());
   const trailing = isAtRisk
     ? `runs out ${formatResetLabel(window.runsOutAt)?.replace("resets ", "") ?? ""}`.trim()
-    : formatResetLabel(window.resetsAt);
+    : formatResetLabel(window.resetsAt, retained);
 
   const value = shownPct != null ? formatDisplayPct(shownPct, displayAs) : "—";
   const accessibilityState = useMemo(() => ({ checked: pinned }), [pinned]);
diff --git a/packages/cli/src/commands/usage/index.test.ts b/packages/cli/src/commands/usage/index.test.ts
index 9c2e3e8bbf..d6d5b62ee1 100644
--- a/packages/cli/src/commands/usage/index.test.ts
+++ b/packages/cli/src/commands/usage/index.test.ts
@@ -277,3 +277,40 @@ describe("usage CLI registration", () => {
     expect(usage.commands[1]!.helpInformation()).toContain("<report-id>");
   });
 });
+
+it("shows retained values with current failures and separates successful time from latest attempt", async () => {
+  const success: UsageReportEntry = { ...reports[0]!, successfulAt: "2026-10-09T12:00:15Z" };
+  const current = await runUsageCommand(
+    options,
+    { kind: "inspect", id: success.id },
+    host([success]).connect,
+  );
+  expect(render(current)).toContain("Latest attempt: 2026-10-09T12:00:00Z");
+  expect(render(current)).toContain("Last successful: 2026-10-09T12:00:15Z");
+  const currentList = await runUsageCommand(options, { kind: "list" }, host([success]).connect);
+  expect(render(currentList)).toContain("Last successful: 2026-10-09T12:00:15Z");
+  if (success.report.status !== "available") throw new Error("fixture must be available");
+  const retained: UsageReportEntry = {
+    ...success,
+    fetchedAt: "2026-10-09T12:06:00Z",
+    report: { status: "error", error: "Rate limited" },
+    successfulAt: undefined,
+    lastSuccessful: { fetchedAt: success.successfulAt!, report: success.report },
+  };
+  const daemon = host([retained]);
+  const listed = await runUsageCommand(options, { kind: "list" }, daemon.connect);
+  expect(render(listed)).toContain("Retained: Five hours: 12.5% used");
+  expect(render(listed)).toContain("Last successful: 2026-10-09T12:00:15Z");
+  expect(render(listed)).toContain("Rate limited");
+  expect(JSON.parse(render(listed, { format: "json" }))).toEqual([retained]);
+  const inspected = await runUsageCommand(
+    options,
+    { kind: "inspect", id: retained.id },
+    daemon.connect,
+  );
+  expect(render(inspected)).toContain("Latest attempt: 2026-10-09T12:06:00Z");
+  expect(render(inspected)).toContain("Last successful: 2026-10-09T12:00:15Z");
+  expect(render(inspected)).toContain("Retained usage:");
+  expect(render(inspected)).toContain("Five hours: 12.5% used");
+  expect(render(inspected)).toContain("Reason: Rate limited");
+});
diff --git a/packages/cli/src/commands/usage/presentation.ts b/packages/cli/src/commands/usage/presentation.ts
index ecc4aba405..2ecadafc59 100644
--- a/packages/cli/src/commands/usage/presentation.ts
+++ b/packages/cli/src/commands/usage/presentation.ts
@@ -44,8 +44,18 @@ function summary(entry: UsageReportEntry): string[] {
     const lines = [failureText(report)];
     for (const login of entry.loginErrors ?? [])
       lines.push(`${login.harness}: ${failureText(login.report)}`);
+    if (entry.lastSuccessful) {
+      lines.push(`Last successful: ${entry.lastSuccessful.fetchedAt}`);
+      lines.push(
+        ...availableSummary(entry.lastSuccessful.report).map((line) => `Retained: ${line}`),
+      );
+    } else lines.push("No successful update");
     return lines;
   }
+  return [...availableSummary(report), `Last successful: ${successfulTime(entry)}`];
+}
+
+function availableSummary(report: Extract<UsageReport, { status: "available" }>): string[] {
   const lines = report.windows.map(windowText);
   lines.push(...(report.balances ?? []).map(balanceText));
   return lines.length ? lines : ["-"];
@@ -68,7 +78,7 @@ const summarySchema: OutputSchema<SummaryRow> = {
     { header: "ACCOUNT", field: "account" },
     { header: "STATUS", field: "status" },
     { header: "USAGE", field: "usage" },
-    { header: "FETCHED", field: "fetched" },
+    { header: "FETCHED (LATEST ATTEMPT)", field: "fetched" },
   ],
 };
 
@@ -79,30 +89,15 @@ function inspect(entry: UsageReportEntry): string {
     `Source ID: ${entry.sourceId}`,
     `Account: ${value(entry.account.label)}`,
     `Status: ${entry.report.status}`,
-    `Fetched: ${value(entry.fetchedAt)}`,
+    `Latest attempt: ${value(entry.fetchedAt)}`,
   ];
-  const { report } = entry;
-  if (report.status === "available") {
-    lines.push(`Plan: ${value(report.planLabel)}`, "Windows:");
-    if (!report.windows.length) lines.push("  -");
-    for (const window of report.windows) {
-      lines.push(`  ${windowText(window)} [${window.id}]`, `    Resets: ${value(window.resetsAt)}`);
-      if (window.runsOutAt != null) lines.push(`    Runs out: ${window.runsOutAt}`);
-      if (window.shortfallPct != null) lines.push(`    Shortfall: ${percent(window.shortfallPct)}`);
-    }
-    lines.push("Balances:");
-    if (!report.balances?.length) lines.push("  -");
-    for (const balance of report.balances ?? []) {
-      lines.push(
-        `  ${balanceText(balance)} [${balance.id}]`,
-        `    Resets: ${value(balance.resetsAt)}`,
-      );
-    }
-    lines.push("Details:");
-    if (!report.details?.length) lines.push("  -");
-    for (const detail of report.details ?? []) lines.push(`  ${detail.label}: ${detail.value}`);
-  } else {
-    lines.push(`Reason: ${failureText(report)}`);
+  const report = entry.report.status === "available" ? entry.report : entry.lastSuccessful?.report;
+  const successfulAt = successfulTime(entry);
+  lines.push(successfulAt ? `Last successful: ${successfulAt}` : "No successful update");
+  if (entry.report.status !== "available") lines.push(`Reason: ${failureText(entry.report)}`);
+  if (report) {
+    if (entry.report.status !== "available") lines.push("Retained usage:");
+    lines.push(...availableDetails(report));
   }
   if (entry.loginErrors?.length) {
     lines.push("Login failures:");
@@ -135,3 +130,33 @@ export const usageSchema: OutputSchema<UsageReportEntry> = {
     return renderTable<SummaryRow>({ type: "list", data: rows, schema: summarySchema }, options);
   },
 };
+
+function availableDetails(report: Extract<UsageReport, { status: "available" }>): string[] {
+  const lines: string[] = [];
+  lines.push(`Plan: ${value(report.planLabel)}`, "Windows:");
+  if (!report.windows.length) lines.push("  -");
+  for (const window of report.windows) {
+    lines.push(`  ${windowText(window)} [${window.id}]`, `    Resets: ${value(window.resetsAt)}`);
+    if (window.runsOutAt != null) lines.push(`    Runs out: ${window.runsOutAt}`);
+    if (window.shortfallPct != null) lines.push(`    Shortfall: ${percent(window.shortfallPct)}`);
+  }
+  lines.push("Balances:");
+  if (!report.balances?.length) lines.push("  -");
+  for (const balance of report.balances ?? []) {
+    lines.push(
+      `  ${balanceText(balance)} [${balance.id}]`,
+      `    Resets: ${value(balance.resetsAt)}`,
+    );
+  }
+  lines.push("Details:");
+  if (!report.details?.length) lines.push("  -");
+  for (const detail of report.details ?? []) lines.push(`  ${detail.label}: ${detail.value}`);
+  return lines;
+}
+
+function successfulTime(entry: UsageReportEntry): string | undefined {
+  // COMPAT(usageSuccessfulAt): added in v0.12.0, remove after 2027-04-17 once daemon floor >= v0.12.0.
+  // Only available reports from older daemons can use their attempt timestamp as freshness.
+  if (entry.report.status === "available") return entry.successfulAt ?? entry.fetchedAt;
+  return entry.lastSuccessful?.fetchedAt;
+}
diff --git a/packages/protocol/src/messages.ts b/packages/protocol/src/messages.ts
index c8fe60ff67..a7a2182d94 100644
--- a/packages/protocol/src/messages.ts
+++ b/packages/protocol/src/messages.ts
@@ -6306,14 +6306,15 @@ export const UsageProblemSchema = z.discriminatedUnion("kind", [
   }),
   z.object({ kind: z.literal("no_quota"), detail: z.string() }),
 ]);
+const AvailableUsageReportSchema = z.object({
+  status: z.literal("available"),
+  planLabel: z.string().optional(),
+  windows: z.array(ProviderUsageWindowSchema),
+  balances: z.array(ProviderUsageBalanceSchema).optional(),
+  details: z.array(ProviderUsageDetailSchema).optional(),
+});
 export const UsageReportSchema = z.discriminatedUnion("status", [
-  z.object({
-    status: z.literal("available"),
-    planLabel: z.string().optional(),
-    windows: z.array(ProviderUsageWindowSchema),
-    balances: z.array(ProviderUsageBalanceSchema).optional(),
-    details: z.array(ProviderUsageDetailSchema).optional(),
-  }),
+  AvailableUsageReportSchema,
   z.object({ status: z.literal("unavailable"), problem: UsageProblemSchema }),
   z.object({ status: z.literal("error"), error: z.string() }),
 ]);
@@ -6325,6 +6326,11 @@ export const UsageReportEntrySchema = z.object({
   sourceLabel: z.string(),
   icon: z.string().optional(),
   report: UsageReportSchema,
+  // Successful completion time; fetchedAt remains the attempt timestamp for ordering.
+  successfulAt: z.string().optional(),
+  lastSuccessful: z
+    .object({ fetchedAt: z.string(), report: AvailableUsageReportSchema })
+    .optional(),
   loginErrors: z
     .array(
       z.object({
diff --git a/packages/protocol/src/messages.wire-compat.test.ts b/packages/protocol/src/messages.wire-compat.test.ts
index 2298d680a4..6903aa2cd1 100644
--- a/packages/protocol/src/messages.wire-compat.test.ts
+++ b/packages/protocol/src/messages.wire-compat.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, test } from "vitest";
 import { z } from "zod";
 import {
+  UsageReportEntrySchema,
   AgentSnapshotPayloadSchema,
   AgentTimelineItemPayloadSchema,
   ServerInfoStatusPayloadSchema,
@@ -436,3 +437,40 @@ test("usage login errors are additive and older reports still parse", () => {
   expect(SessionOutboundMessageSchema.parse(newMessage)).toEqual(newMessage);
   expect(legacy.parse(newMessage)).toEqual(oldMessage);
 });
+
+test("usage entries accept older failures and additive successful snapshots", () => {
+  const oldEntry = {
+    id: "source:account",
+    sourceId: "source",
+    sourceLabel: "Source",
+    account: {},
+    fetchedAt: "2026-10-17T10:06:00Z",
+    report: { status: "error", error: "Rate limited" },
+  };
+  expect(UsageReportEntrySchema.parse(oldEntry)).toEqual(oldEntry);
+  const retained = {
+    ...oldEntry,
+    lastSuccessful: {
+      fetchedAt: "2026-10-17T10:00:00Z",
+      report: { status: "available", windows: [{ id: "weekly", label: "Weekly", usedPct: 42 }] },
+    },
+  };
+  expect(UsageReportEntrySchema.parse(retained)).toEqual(retained);
+  const available = {
+    ...oldEntry,
+    report: retained.lastSuccessful.report,
+    successfulAt: "2026-10-17T10:00:15Z",
+  };
+  expect(UsageReportEntrySchema.parse(available)).toEqual(available);
+  expect(
+    UsageReportEntrySchema.omit({ lastSuccessful: true, successfulAt: true }).parse(available),
+  ).toEqual({ ...oldEntry, report: available.report });
+  // An older client's entry shape strips the additive snapshot and still sees the failure.
+  expect(UsageReportEntrySchema.omit({ lastSuccessful: true }).parse(retained)).toEqual(oldEntry);
+  expect(
+    UsageReportEntrySchema.safeParse({
+      ...oldEntry,
+      lastSuccessful: { fetchedAt: oldEntry.fetchedAt, report: oldEntry.report },
+    }).success,
+  ).toBe(false);
+});
diff --git a/packages/server/src/server/plugins/usage-sources/index.test.ts b/packages/server/src/server/plugins/usage-sources/index.test.ts
index eeea242788..f0173691c8 100644
--- a/packages/server/src/server/plugins/usage-sources/index.test.ts
+++ b/packages/server/src/server/plugins/usage-sources/index.test.ts
@@ -556,3 +556,208 @@ test("a hung login records its own timeout and still tries the next login", asyn
     { harness: "OpenCode", report: { status: "error", error: "Login rejected" } },
   ]);
 });
+
+test("retains the last successful poll across failures, cache expiry, and recovery", async () => {
+  let now = 0;
+  let report: unknown = {
+    status: "available",
+    windows: [{ id: "week", label: "Weekly", usedPct: 42 }],
+  };
+  const registry = new UsageSourceRegistry(() => now);
+  registry.register(
+    source({
+      id: "quota",
+      discover: async () => [{ key: "account", input: {} }],
+      fetch: async () => report,
+    }),
+  );
+  registry.register(source({ id: "other", discover: async () => [{ key: "account", input: {} }] }));
+  const [success] = await registry.listReports();
+  now = 360_000;
+  // An unrelated write evicts the expired fetch result, but must not discard its snapshot.
+  await registry.listReports({ reportIds: ["other:account"], forceRefresh: true });
+  report = { status: "error", error: "Rate limited" };
+  const [failure] = await registry.listReports({ reportIds: ["quota:account"] });
+  expect(failure).toMatchObject({
+    fetchedAt: new Date(now).toISOString(),
+    report,
+    lastSuccessful: { fetchedAt: success!.fetchedAt, report: success!.report },
+  });
+  now += 360_000;
+  const [repeated] = await registry.listReports({ reportIds: ["quota:account"] });
+  expect(repeated?.lastSuccessful).toEqual(failure?.lastSuccessful);
+  report = { status: "unavailable", problem: { kind: "no_quota", detail: "No quota" } };
+  const [unavailable] = await registry.listReports({
+    reportIds: ["quota:account"],
+    forceRefresh: true,
+  });
+  expect(unavailable?.lastSuccessful).toEqual(failure?.lastSuccessful);
+  now += 1000;
+  report = { status: "available", windows: [{ id: "week", label: "Weekly", usedPct: 43 }] };
+  const [recovered] = await registry.listReports({
+    reportIds: ["quota:account"],
+    forceRefresh: true,
+  });
+  expect(recovered?.report).toEqual(report);
+  expect(recovered?.lastSuccessful).toBeUndefined();
+  expect(recovered?.fetchedAt).toBe(new Date(now).toISOString());
+});
+
+test("successful history is isolated by login set and pruned when identities retire", async () => {
+  let login = "old";
+  let present = true;
+  let available = true;
+  const registry = new UsageSourceRegistry();
+  const fixture = source({
+    id: "source",
+    discover: async () => (present ? [{ key: "same", input: login }] : []),
+    fetch: async () =>
+      available ? { status: "available", windows: [] } : { status: "error", error: "failed" },
+  });
+  registry.register(fixture);
+  await registry.listReports();
+  available = false;
+  login = "new";
+  expect((await registry.listReports({ forceRefresh: true }))[0]?.lastSuccessful).toBeUndefined();
+  login = "old";
+  expect((await registry.listReports({ forceRefresh: true }))[0]?.lastSuccessful).toBeUndefined();
+  available = true;
+  await registry.listReports({ forceRefresh: true });
+  present = false;
+  expect(await registry.listReports()).toEqual([]);
+  present = true;
+  available = false;
+  expect((await registry.listReports())[0]?.lastSuccessful).toBeUndefined();
+  available = true;
+  await registry.listReports({ forceRefresh: true });
+  registry.unregister("source");
+  registry.register(fixture);
+  available = false;
+  expect((await registry.listReports())[0]?.lastSuccessful).toBeUndefined();
+});
+
+test("host fallback history never supplies an agent's failed login, and removed agents lose history", async () => {
+  const sessions = new Map([["agent", { provider: "codex", env: {}, sessionKey: "one" }]]);
+  let available = true;
+  const registry = new UsageSourceRegistry(Date.now, 300_000, undefined, {
+    hasAgent: (id) => sessions.has(id),
+    usageSession: (id) => sessions.get(id) ?? null,
+  });
+  registry.register({
+    id: "source",
+    label: "Source",
+    discover: async (scope) =>
+      (scope.kind === "global" ? ["host", "agent"] : ["agent"]).map((input) => ({
+        key: "same",
+        input,
+      })),
+    fetch: async () =>
+      available ? { status: "available", windows: [] } : { status: "error", error: "failed" },
+  });
+  await registry.listReports();
+  available = false;
+  expect((await registry.listReports({ agentId: "agent" }))[0]?.lastSuccessful).toBeUndefined();
+  available = true;
+  const [success] = await registry.listReports({ agentId: "agent", forceRefresh: true });
+  available = false;
+  expect(
+    (await registry.listReports({ agentId: "agent", forceRefresh: true }))[0]?.lastSuccessful
+      ?.report,
+  ).toEqual(success?.report);
+  sessions.delete("agent");
+  await registry.listReports();
+  sessions.set("agent", { provider: "codex", env: {}, sessionKey: "two" });
+  expect((await registry.listReports({ agentId: "agent" }))[0]?.lastSuccessful).toBeUndefined();
+});
+
+test("a timed out poll retains successful values and late completion cannot replace the failure", async () => {
+  let now = 1000;
+  let finish!: (value: unknown) => void;
+  let slow = false;
+  const registry = new UsageSourceRegistry(() => now, 300_000, undefined, undefined, 10);
+  registry.register(
+    source({
+      id: "source",
+      discover: async () => [{ key: "same", input: {} }],
+      fetch: async () =>
+        slow
+          ? new Promise((resolve) => {
+              finish = resolve;
+            })
+          : { status: "available", windows: [] },
+    }),
+  );
+  const [success] = await registry.listReports();
+  now = 2000;
+  slow = true;
+  const [failure] = await registry.listReports({ forceRefresh: true });
+  expect(failure?.report).toEqual({ status: "error", error: "Usage fetch timed out" });
+  expect(failure?.lastSuccessful).toEqual({
+    fetchedAt: success?.fetchedAt,
+    report: success?.report,
+  });
+  finish({ status: "available", windows: [{ id: "late", label: "Late" }] });
+  expect((await registry.listReports())[0]).toEqual(failure);
+});
+
+test("attempt ordering keeps its timestamp while retained freshness records successful completion", async () => {
+  let now = 1000;
+  let available = true;
+  const registry = new UsageSourceRegistry(() => now);
+  registry.register(
+    source({
+      id: "source",
+      discover: async () => [{ key: "same", input: {} }],
+      fetch: async () => {
+        if (available) now = 2000;
+        return available
+          ? { status: "available", windows: [] }
+          : { status: "error", error: "failed" };
+      },
+    }),
+  );
+  const [success] = await registry.listReports();
+  expect(success?.fetchedAt).toBe(new Date(1000).toISOString());
+  expect(success?.successfulAt).toBe(new Date(2000).toISOString());
+  available = false;
+  now = 3000;
+  const [failure] = await registry.listReports({ forceRefresh: true });
+  expect(failure?.fetchedAt).toBe(new Date(3000).toISOString());
+  expect(failure?.lastSuccessful?.fetchedAt).toBe(success?.successfulAt);
+});
+
+test("failed discovery preserves history until discovery confirms account removal", async () => {
+  let discoveryFails = false;
+  let present = true;
+  let available = true;
+  const registry = new UsageSourceRegistry(() => 1000, 300_000, { warn: () => {} });
+  registry.register(
+    source({
+      id: "source",
+      discover: async () => {
+        if (discoveryFails) throw new Error("Login store temporarily unavailable");
+        return present ? [{ key: "account", input: {} }] : [];
+      },
+      fetch: async () =>
+        available
+          ? { status: "available", windows: [{ id: "weekly", label: "Weekly", usedPct: 42 }] }
+          : { status: "error", error: "Rate limited" },
+    }),
+  );
+  const [success] = await registry.listReports();
+  available = false;
+  discoveryFails = true;
+  const [duringDiscoveryFailure] = await registry.listReports({ forceRefresh: true });
+  expect(duringDiscoveryFailure?.lastSuccessful).toEqual({
+    fetchedAt: success?.successfulAt,
+    report: success?.report,
+  });
+  discoveryFails = false;
+  const [afterDiscoveryRecovery] = await registry.listReports({ forceRefresh: true });
+  expect(afterDiscoveryRecovery?.lastSuccessful).toEqual(duringDiscoveryFailure?.lastSuccessful);
+  expect(afterDiscoveryRecovery?.report).toEqual({ status: "error", error: "Rate limited" });
+  present = false;
+  expect(await registry.listReports()).toEqual([]);
+  present = true;
+  expect((await registry.listReports())[0]?.lastSuccessful).toBeUndefined();
+});
diff --git a/packages/server/src/server/plugins/usage-sources/index.ts b/packages/server/src/server/plugins/usage-sources/index.ts
index c0c9d781e5..e9e2e9c8af 100644
--- a/packages/server/src/server/plugins/usage-sources/index.ts
+++ b/packages/server/src/server/plugins/usage-sources/index.ts
@@ -56,6 +56,7 @@ export class UsageSourceRegistry {
   private defaults = new Map<string, KnownReport>();
   private readonly byAgent = new Map<string, AgentReports>();
   private readonly cache = new Map<string, { at: number; entry: UsageReportEntry }>();
+  private readonly successful = new Map<string, NonNullable<UsageReportEntry["lastSuccessful"]>>();
   private readonly pending = new Map<string, Promise<UsageReportEntry>>();
 
   constructor(
@@ -81,6 +82,8 @@ export class UsageSourceRegistry {
     }
     for (const key of this.known.keys()) if (key.startsWith(`${id}:`)) this.known.delete(key);
     for (const key of this.cache.keys()) if (key.startsWith(`${id}:`)) this.cache.delete(key);
+    for (const key of this.successful.keys())
+      if (key.startsWith(`${id}:`)) this.successful.delete(key);
     for (const key of this.pending.keys()) if (key.startsWith(`${id}:`)) this.pending.delete(key);
   }
 
@@ -96,7 +99,7 @@ export class UsageSourceRegistry {
     } else if (options.reportIds !== undefined) {
       ids = options.reportIds;
     } else {
-      this.defaults = await this.discover({ kind: "global" });
+      this.defaults = await this.discover({ kind: "global" }, this.defaults);
       this.mergeKnown();
       ids = [...this.known.keys()];
     }
@@ -124,7 +127,11 @@ export class UsageSourceRegistry {
   private async discoverAgent(agentId: string): Promise<string[]> {
     if (!this.agents.hasAgent(agentId)) throw new Error(`Unknown agent: ${agentId}`);
     const session = this.agents.usageSession(agentId);
-    if (!session) return [];
+    if (!session) {
+      this.byAgent.delete(agentId);
+      this.mergeKnown();
+      return [];
+    }
     const previous = this.byAgent.get(agentId);
     const sameScope =
       previous?.sessionKey === session.sessionKey &&
@@ -168,9 +175,26 @@ export class UsageSourceRegistry {
         }
       }
     }
+    // Fetch freshness expires independently of successful snapshots. Retain only live identities.
+    const active = this.activeCacheKeys();
+    for (const key of this.successful.keys()) if (!active.has(key)) this.successful.delete(key);
+    for (const key of this.cache.keys()) if (!active.has(key)) this.cache.delete(key);
   }
 
-  private async discover(scope: UsageScope): Promise<Map<string, KnownReport>> {
+  private activeCacheKeys(): Set<string> {
+    return new Set(
+      [
+        this.known,
+        this.defaults,
+        ...[...this.byAgent.values()].map((agent) => agent.reports),
+      ].flatMap((reports) => [...reports].map(([id, report]) => cacheIdentity(id, report))),
+    );
+  }
+
+  private async discover(
+    scope: UsageScope,
+    previous: ReadonlyMap<string, KnownReport> = new Map(),
+  ): Promise<Map<string, KnownReport>> {
     const discovered = await Promise.all(
       [...this.sources.values()].map(async (source) => {
         const reports = new Map<string, KnownReport>();
@@ -197,6 +221,11 @@ export class UsageSourceRegistry {
           }
         } catch (error) {
           this.logger.warn({ sourceId: source.id, err: error }, "Usage source discovery failed");
+          // A failed store read does not confirm removal. Session discovery has no previous
+          // mapping because a resumed agent may use a different launch environment.
+          for (const [id, report] of previous) {
+            if (report.source === source) reports.set(id, report);
+          }
         }
         return reports;
       }),
@@ -235,25 +264,42 @@ export class UsageSourceRegistry {
 
   private fetchId(id: string, known: KnownReport, forceRefresh = false): Promise<UsageReportEntry> {
     // Account identity groups cards; the ordered login set identifies a fetch result.
-    const cacheKey = `${id}:${createHash("sha256")
-      .update(JSON.stringify([known.label, known.logins.map(loginKey)]))
-      .digest("hex")}`;
+    const cacheKey = cacheIdentity(id, known);
     const cached = this.cache.get(cacheKey);
     if (!forceRefresh && cached && this.now() - cached.at < this.ttlMs)
       return Promise.resolve(cached.entry);
     const pending = this.pending.get(cacheKey);
     if (pending) return pending;
     const request = (async () => {
+      const fetchedAt = new Date(this.now()).toISOString();
+      const outcome = await this.fetchWithFallback(known);
+      const completedAt = new Date(this.now()).toISOString();
       const entry: UsageReportEntry = {
         id,
         sourceId: known.source.id,
         sourceLabel: known.source.label,
         icon: known.source.icon,
         account: { label: known.label },
-        fetchedAt: new Date(this.now()).toISOString(),
-        ...(await this.fetchWithFallback(known)),
+        fetchedAt,
+        ...outcome,
       };
-      if (this.sources.get(known.source.id) === known.source) this.writeCache(cacheKey, entry);
+      if (entry.report.status === "available") {
+        entry.successfulAt = completedAt;
+      } else {
+        entry.lastSuccessful = this.successful.get(cacheKey);
+      }
+      if (
+        this.sources.get(known.source.id) === known.source &&
+        this.activeCacheKeys().has(cacheKey)
+      ) {
+        if (entry.report.status === "available") {
+          this.successful.set(cacheKey, {
+            fetchedAt: completedAt,
+            report: entry.report,
+          });
+        }
+        this.writeCache(cacheKey, entry);
+      }
       return entry;
     })();
     this.pending.set(cacheKey, request);
@@ -346,3 +392,9 @@ function loginKey(login: Login): string {
       : value,
   );
 }
+
+function cacheIdentity(id: string, known: KnownReport): string {
+  return `${id}:${createHash("sha256")
+    .update(JSON.stringify([known.label, known.logins.map(loginKey)]))
+    .digest("hex")}`;
+}

From df7f1f0b75a18fb78541cb63f6fe3e9e5ab01fa1 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 12:48:10 +0700
Subject: [PATCH 257/270] Restore Markdown link hover underline and spacing
 after code blocks on web (#7276)

* fix(markdown): restore link hover underline and code block spacing on web

The web renderer swap dropped both. Links: the library styles anchors
inline with text-decoration: none, so the link renderer has to track hover
itself; a stylesheet :hover rule cannot win. Spacing: the patched
renderers.codeBlock override returned the custom block bare, so it lost
the library's codeBlock margins and whatever followed sat flush against
it. The override now keeps those margins, including the zeroed trailing
margin of the last block, so web and native share one spacing config.

* test(desktop): expect Find to return focus to the chat viewport

#7263 moved focus on closing Find from the no-drag focus scope to the
scroll viewport so Page Up and Page Down keep working. The viewport emits
no window region by design (#5233), so the old assertion that the focused
element is no-drag failed on every run. Assert the new focus target and
re-check that the titlebar still has no drag exclusions.
---
 docs/markdown-renderer.md                     |  2 +-
 .../e2e/browser/plan-card-markdown.spec.ts    | 68 +++++++++++++++++++
 .../src/components/markdown/renderers.web.tsx | 23 +++++--
 .../desktop/e2e/workspace-restart.spec.ts     | 21 +++---
 ...own+1.2.0-nightly-20261014-766fc0e67.patch | 16 +++--
 5 files changed, 111 insertions(+), 19 deletions(-)

diff --git a/docs/markdown-renderer.md b/docs/markdown-renderer.md
index a4d6a93b5e..0afbcc1cb3 100644
--- a/docs/markdown-renderer.md
+++ b/docs/markdown-renderer.md
@@ -18,7 +18,7 @@ Math and video are disabled. Task lists and admonitions are enabled; task checkb
 
 Mermaid fences use the existing isolated diagram runtime and fullscreen viewer. Web dispatches them through the library’s code-block override. Native has no block-renderer hook, so the renderer extracts only Mermaid fences and places the existing WebView host between library-rendered segments. This is the only block exception; see [native selection limitations](native-text-selection.md) for diagram grouping and leading inline images. Streaming keeps the last valid diagram visible while the next revision renders.
 
-Native code blocks use the library's copy control and compiled grammars. Web code blocks use `HighlightedCodeBlock` through the library's `renderers.codeBlock` override. The patch also preserves web list numbering and link titles, marks pending parses with `aria-busy` so Find waits for rendered text, and carries link syntax through native and web tap events. Web inline code inside a link inherits only the link colour; its code font, size and background stay intact. Keep link variants colour-only: native pills replace text runs and prevent paths from wrapping; Android pills also use the surrounding block’s font size. The package patch is tracked by [upstream PR #997](https://github.com/software-mansion/enriched-markdown/pull/997); remove the patch when the pinned release includes it.
+Native code blocks use the library's copy control and compiled grammars. Web code blocks use `HighlightedCodeBlock` through the library's `renderers.codeBlock` override. The patch also keeps the library's block spacing around the web code block override, preserves web list numbering and link titles, marks pending parses with `aria-busy` so Find waits for rendered text, and carries link syntax through native and web tap events. Web inline code inside a link inherits only the link colour; its code font, size and background stay intact. Keep link variants colour-only: native pills replace text runs and prevent paths from wrapping; Android pills also use the surrounding block’s font size. The package patch is tracked by [upstream PR #997](https://github.com/software-mansion/enriched-markdown/pull/997); remove the patch when the pinned release includes it.
 
 The package patch also keeps overflowing native horizontal blocks in control of their drags: Android claims parent interception at touch-down and releases it for vertical drags so the chat list can scroll; iOS keeps its scroll recognizer active for outward drags at the leading edge. This prevents compact sidebar pans from taking block scrolling without changing sidebar swipes on prose or non-overflowing blocks. Native changes require a client rebuild.
 
diff --git a/packages/app/e2e/browser/plan-card-markdown.spec.ts b/packages/app/e2e/browser/plan-card-markdown.spec.ts
index 13428ce445..90bdb8b6db 100644
--- a/packages/app/e2e/browser/plan-card-markdown.spec.ts
+++ b/packages/app/e2e/browser/plan-card-markdown.spec.ts
@@ -259,3 +259,71 @@ async function openInlineRegressionFile(page: Page, path: string) {
     .getByRole("link", { name: path, exact: true })
     .click();
 }
+
+// Web links are styled inline by the library, so hover state has to restyle the anchor.
+test("markdown links underline on hover", async ({ page }) => {
+  const session = await seedMockAgentWorkspace({
+    repoPrefix: "markdown-link-hover-",
+    title: "Markdown link hover",
+    featureValues: {
+      mockAssistantResponse: "See [the docs](https://example.com/docs) and [README](README.md).",
+    },
+    initialPrompt: "Show links",
+  });
+  try {
+    await session.client.waitForFinish(session.agentId, 30_000);
+    await openAgentRoute(page, session);
+    const message = page.getByTestId("assistant-message");
+    for (const name of ["the docs", "README"]) {
+      const link = message.getByRole("link", { name, exact: true });
+      await expect(link).toHaveCSS("text-decoration-line", "none");
+      await link.hover();
+      await expect(link).toHaveCSS("text-decoration-line", "underline");
+      await page.mouse.move(0, 0);
+      await expect(link).toHaveCSS("text-decoration-line", "none");
+    }
+  } finally {
+    await session.cleanup();
+  }
+});
+
+// The web code block replaces the library's own block, which must keep its spacing.
+test("blocks around a web code block keep their spacing", async ({ page }) => {
+  const session = await seedMockAgentWorkspace({
+    repoPrefix: "markdown-block-spacing-",
+    title: "Markdown block spacing",
+    featureValues: {
+      mockAssistantResponse:
+        "Intro.\n\n```sh\nnpx playwright test\n```\n\n| Step | Result |\n| --- | --- |\n| hover | none |\n\nMiddle.\n\n```ts\nconst a = 1;\n```\n\nClosing.",
+    },
+    initialPrompt: "Show blocks",
+  });
+  try {
+    await session.client.waitForFinish(session.agentId, 30_000);
+    await openAgentRoute(page, session);
+    const message = page.getByTestId("assistant-message");
+    await expect(message.getByRole("table")).toBeVisible();
+    const gaps = await measureBlockGaps(message.locator(".enrm-text").first());
+    for (const { between, gap } of gaps) expect(gap, between).toBeGreaterThanOrEqual(8);
+  } finally {
+    await session.cleanup();
+  }
+});
+
+async function measureBlockGaps(root: Locator) {
+  return root.evaluate((element) => {
+    const blocks = Array.from(element.children).map((block) => {
+      // Wrappers with display: contents have no box; measure their first rendered child.
+      let box: Element = block;
+      while (box.getBoundingClientRect().height === 0 && box.firstElementChild) {
+        box = box.firstElementChild;
+      }
+      const rect = box.getBoundingClientRect();
+      return { text: (block.textContent ?? "").slice(0, 20), top: rect.top, bottom: rect.bottom };
+    });
+    return blocks.slice(1).map((block, index) => ({
+      between: `${blocks[index].text} -> ${block.text}`,
+      gap: Math.round(block.top - blocks[index].bottom),
+    }));
+  });
+}
diff --git a/packages/app/src/components/markdown/renderers.web.tsx b/packages/app/src/components/markdown/renderers.web.tsx
index 6f0afc666b..1d05b3b603 100644
--- a/packages/app/src/components/markdown/renderers.web.tsx
+++ b/packages/app/src/components/markdown/renderers.web.tsx
@@ -1,5 +1,5 @@
 import { Text } from "react-native";
-import { forwardRef, useMemo, type ComponentProps } from "react";
+import { forwardRef, useCallback, useMemo, useState, type ComponentProps } from "react";
 import type {
   CodeBlockRendererProps,
   LinkRendererProps,
@@ -27,14 +27,29 @@ function WebCodeBlock({ code, language }: CodeBlockRendererProps) {
   return <ThemedCodeBlock code={code} language={language} uniProps={codeStyle} />;
 }
 
+// The library styles links inline, so a stylesheet :hover rule cannot underline them.
+const LINK_HOVER_STYLE = { textDecoration: "underline" } as const;
+
 function WebLink({ link, anchorProps, children }: LinkRendererProps) {
   const { tooltipPath, onHoverIn } = useFileLink(markdownLinkSource(link.url, link.sourceType));
+  const [hovered, setHovered] = useState(false);
+  const handleMouseEnter = useCallback(() => setHovered(true), []);
+  const handleMouseLeave = useCallback(() => setHovered(false), []);
   const anchorStyle = useMemo(
-    () => ({ ...anchorProps.style, overflowWrap: "anywhere" as const }),
-    [anchorProps.style],
+    () => ({
+      ...anchorProps.style,
+      overflowWrap: "anywhere" as const,
+      ...(hovered ? LINK_HOVER_STYLE : null),
+    }),
+    [anchorProps.style, hovered],
   );
   const anchor = (
-    <a {...anchorProps} style={anchorStyle}>
+    <a
+      {...anchorProps}
+      style={anchorStyle}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
+    >
       {children}
     </a>
   );
diff --git a/packages/desktop/e2e/workspace-restart.spec.ts b/packages/desktop/e2e/workspace-restart.spec.ts
index 67bc8408ea..9f01b351f6 100644
--- a/packages/desktop/e2e/workspace-restart.spec.ts
+++ b/packages/desktop/e2e/workspace-restart.spec.ts
@@ -232,17 +232,18 @@ test("scrolled chat does not exclude the workspace titlebar from dragging", asyn
     }
     await page.getByRole("button", { name: "Close Find", exact: true }).click();
     await expect(find).toBeHidden();
+    // Closing Find returns keyboard scrolling to the chat viewport, which emits no window region.
     await expect
-      .poll(() =>
-        chat.evaluate((scroll) => ({
-          focusReturned: document.activeElement?.contains(scroll),
-          tabindex: document.activeElement?.getAttribute("tabindex"),
-          appRegion: getComputedStyle(document.activeElement!).getPropertyValue(
-            "-webkit-app-region",
-          ),
-        })),
-      )
-      .toEqual({ focusReturned: true, tabindex: "-1", appRegion: "no-drag" });
+      .poll(() => chat.evaluate((scroll) => document.activeElement === scroll))
+      .toBe(true);
+    await expect
+      .poll(() => chat.evaluate(inspectChatDragExclusions))
+      .toEqual({
+        contentCrossesHeader: true,
+        contentCrossesTabRow: true,
+        focusScopeRegion: "no-drag",
+        exclusions: 0,
+      });
     await page.screenshot({ path: testInfo.outputPath("scrolled-chat-titlebar.png") });
   } finally {
     await agent.cleanup();
diff --git a/patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch b/patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch
index b41700d65b..535f61b6ef 100644
--- a/patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch
+++ b/patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch
@@ -1304,7 +1304,7 @@ diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/renderer
 index dd70713..ca0385a 100644
 --- a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js
 +++ b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js
-@@ -101,12 +101,20 @@ function AdmonitionRenderer({
+@@ -101,12 +101,28 @@ function AdmonitionRenderer({
    });
  }
  function CodeBlockRenderer({
@@ -1317,9 +1317,17 @@ index dd70713..ca0385a 100644
    const language = node.attributes?.language;
 +  const CustomCodeBlock = capabilities.renderers?.codeBlock;
 +  if (CustomCodeBlock) {
-+    return /*#__PURE__*/_jsx(CustomCodeBlock, {
-+      code: extractNodeText(node),
-+      language: language ?? ''
++    // The custom renderer owns the block's look; the library keeps its spacing,
++    // including the zeroed trailing margin of the last block.
++    return /*#__PURE__*/_jsx("div", {
++      style: {
++        marginTop: styles.codeBlock.marginTop,
++        marginBottom: styles.codeBlock.marginBottom
++      },
++      children: /*#__PURE__*/_jsx(CustomCodeBlock, {
++        code: extractNodeText(node),
++        language: language ?? ''
++      })
 +    });
 +  }
    const label = language ? `Code block: ${language}` : 'Code block';

From bd5061e7bd99b863dd5275de5210c41472788790 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 13:05:33 +0700
Subject: [PATCH 258/270] fix(app): stop blank rows while scrolling tall
 Android chats (#7278)

Two causes, both reproduced on a clone of a real long thinking-partner chat
(replies and thinking rows several screens tall, GFM tables).

1. The window lowered in e42771970 (initial 2 / batch 2 / window 5) holds only
   two or three tall rows, so a fling outruns the mounted range and the viewport
   crosses unmounted rows: 65 blank frames over a 4,152-frame traversal. Keep the
   small initial render that bounds cold-open measurement, but refill a window of
   10 in batches of 10: 0 blank frames over 4,347, p95 25 ms.

2. Scroll-to-bottom from deep history animated across every row in between,
   which no finite window can mount in time: 9 blank frames (~150 ms) per jump.
   Animate only when the current offset is within the bottom-side overscan,
   otherwise jump instantly. Near-bottom jumps still animate. Web already does
   not animate this jump.

Cold open on the same chat is unchanged (first content 569 -> 568 ms); the
deeper window costs first-scroll acknowledgement (2.58 -> 2.94 s in a debug
build).
---
 .../native-scroll-animation.test.ts           | 34 +++++++++++++++++++
 .../agent-stream/native-scroll-animation.ts   | 10 ++++++
 .../app/src/agent-stream/strategy-native.tsx  | 18 +++++++---
 3 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 packages/app/src/agent-stream/native-scroll-animation.test.ts
 create mode 100644 packages/app/src/agent-stream/native-scroll-animation.ts

diff --git a/packages/app/src/agent-stream/native-scroll-animation.test.ts b/packages/app/src/agent-stream/native-scroll-animation.test.ts
new file mode 100644
index 0000000000..947b8c3d1d
--- /dev/null
+++ b/packages/app/src/agent-stream/native-scroll-animation.test.ts
@@ -0,0 +1,34 @@
+import { describe, expect, it } from "vitest";
+import { shouldAnimateNativeScrollToBottom } from "./native-scroll-animation";
+
+describe("native scroll-to-bottom animation", () => {
+  it("jumps across unmounted history instead of animating through blank rows", () => {
+    expect(
+      shouldAnimateNativeScrollToBottom({ offsetY: 60_000, viewportHeight: 600, windowSize: 10 }),
+    ).toBe(false);
+  });
+
+  it("keeps near-bottom movement eligible for animation", () => {
+    expect(
+      shouldAnimateNativeScrollToBottom({ offsetY: 300, viewportHeight: 600, windowSize: 10 }),
+    ).toBe(true);
+  });
+
+  it("bounds travel by the bottom-side overscan, not the whole window", () => {
+    expect(
+      shouldAnimateNativeScrollToBottom({ offsetY: 2700, viewportHeight: 600, windowSize: 10 }),
+    ).toBe(true);
+    expect(
+      shouldAnimateNativeScrollToBottom({ offsetY: 2701, viewportHeight: 600, windowSize: 10 }),
+    ).toBe(false);
+    expect(
+      shouldAnimateNativeScrollToBottom({ offsetY: 1500, viewportHeight: 600, windowSize: 5 }),
+    ).toBe(false);
+  });
+
+  it("does not animate before the viewport has been measured", () => {
+    expect(
+      shouldAnimateNativeScrollToBottom({ offsetY: 0, viewportHeight: 0, windowSize: 10 }),
+    ).toBe(false);
+  });
+});
diff --git a/packages/app/src/agent-stream/native-scroll-animation.ts b/packages/app/src/agent-stream/native-scroll-animation.ts
new file mode 100644
index 0000000000..72bc39108c
--- /dev/null
+++ b/packages/app/src/agent-stream/native-scroll-animation.ts
@@ -0,0 +1,10 @@
+export function shouldAnimateNativeScrollToBottom(input: {
+  offsetY: number;
+  viewportHeight: number;
+  windowSize: number;
+}): boolean {
+  // VirtualizedList splits the extra window around the viewport. An animated
+  // jump farther than the bottom-side overscan crosses unmounted history.
+  const bottomOverscanHeight = ((input.windowSize - 1) / 2) * input.viewportHeight;
+  return input.viewportHeight > 0 && input.offsetY <= bottomOverscanHeight;
+}
diff --git a/packages/app/src/agent-stream/strategy-native.tsx b/packages/app/src/agent-stream/strategy-native.tsx
index 66409f23e1..e7568edfe8 100644
--- a/packages/app/src/agent-stream/strategy-native.tsx
+++ b/packages/app/src/agent-stream/strategy-native.tsx
@@ -23,6 +23,7 @@ import type { StreamItem } from "@/types/stream";
 import type { Theme } from "@/styles/theme";
 import { useStableEvent } from "@/hooks/use-stable-event";
 import { useKeyboardStreamInset } from "@/keyboard/shift";
+import { shouldAnimateNativeScrollToBottom } from "./native-scroll-animation";
 import { useRevisedHistoryRows } from "./history-row-revision";
 import { useBottomAnchorController } from "./bottom-anchor-controller";
 import { useScrollKeyboardDismiss } from "./scroll-keyboard-dismiss/use-scroll-keyboard-dismiss";
@@ -64,6 +65,7 @@ const historyStartSlotStyle: ViewStyle = {
   flexShrink: 0,
 };
 const HISTORY_START_SETTLE_FRAMES = 2;
+const NATIVE_STREAM_WINDOW_SIZE = 10;
 
 function keyExtractor(item: { id: string }): string {
   return item.id;
@@ -238,7 +240,13 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
       programmaticScrollEventBudgetRef.current = 3;
       flatListRef.current?.scrollToOffset({
         offset: 0,
-        animated,
+        animated:
+          animated &&
+          shouldAnimateNativeScrollToBottom({
+            offsetY: scrollOffsetYRef.current,
+            viewportHeight: streamViewportMetricsRef.current.viewportHeight,
+            windowSize: NATIVE_STREAM_WINDOW_SIZE,
+          }),
       });
       scrollOffsetYRef.current = 0;
       streamViewportMetricsRef.current = {
@@ -591,11 +599,11 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
       scrollEventThrottle={16}
       onContentSizeChange={handleContentSizeChange}
       maintainVisibleContentPosition={maintainVisibleContentPosition}
-      // A history row can contain an entire long reply. Keep synchronous native
-      // Markdown measurement bounded while FlatList fills the surrounding window.
+      // Tall Markdown rows exhaust a shallow window during flings. Keep the initial
+      // render small, then refill a deeper window in batches large enough to keep up.
       initialNumToRender={2}
-      maxToRenderPerBatch={2}
-      windowSize={5}
+      maxToRenderPerBatch={10}
+      windowSize={NATIVE_STREAM_WINDOW_SIZE}
       removeClippedSubviews={false}
       scrollEnabled={scrollEnabled}
       showsVerticalScrollIndicator

From 9521ee99552d1ecd6c9f103566874778cdf37ec5 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 13:10:09 +0700
Subject: [PATCH 259/270] feat(app): label Paseo tool calls verb-first with
 their context (#7283)

Paseo tool rows put the variable part first ("QA messenger finished"), so
truncation hid the fixed part, and MCP calls showed only the humanized tool
name with no context. Every Paseo tool now has one catalog entry in
protocol/paseo-tool-presentation owning its fixed label, the input field
shown as context, and its detail layout. Agent-message events read
noun-first ("Agent finished" + sender) and use the Paseo icon; the app
ignored it before because the wire detail's legacy "bot" icon won.

Summaries are capped in code at 120 characters because prompts can be one
enormous line; the renderer is not trusted to clip them.

The activity curator behind `paseo logs` and get_agent_activity printed a
bare "[Agent message]" because the server tool-call type never declared the
agentMessage field the projection sets; it now prints the event, sender,
and body.
---
 docs/timeline-sync.md                         |   3 +-
 ...paseo-tool-call-details.codex.real.spec.ts |   2 +-
 packages/app/src/agent-stream/view.tsx        |   3 +-
 packages/app/src/components/message.tsx       |   9 +-
 .../app/src/components/tool-call-details.tsx  |   2 +-
 .../app/src/tool-calls/presentation.test.ts   |  77 ++--
 packages/app/src/tool-calls/presentation.ts   |   7 +-
 .../src/tool-calls/use-target-agent-title.ts  |  19 +
 .../app/src/utils/tool-call-icon-name.test.ts |  10 +
 packages/app/src/utils/tool-call-icon-name.ts |  11 +-
 packages/app/src/utils/tool-call-icon.ts      |   4 +-
 .../protocol/src/agent-message-display.ts     |  25 --
 .../paseo-tool-presentation/agent-message.ts  |  31 ++
 .../src/paseo-tool-presentation/catalog.ts    | 349 ++++++++++++++++++
 .../detail-sections.test.ts}                  |   2 +-
 .../detail-sections.ts}                       | 160 +-------
 .../src/paseo-tool-presentation/index.test.ts | 141 +++++++
 .../src/paseo-tool-presentation/index.ts      |  85 +++++
 .../paseo-tool-presentation/summary-text.ts   |  21 ++
 packages/protocol/src/tool-call-display.ts    |  31 +-
 .../src/server/agent/activity-curator.test.ts |  23 ++
 .../src/server/agent/activity-curator.ts      |  17 +
 .../src/server/agent/agent-sdk-types.ts       |   3 +
 .../src/server/agent/mcp-server.test.ts       |  35 ++
 24 files changed, 840 insertions(+), 230 deletions(-)
 create mode 100644 packages/app/src/tool-calls/use-target-agent-title.ts
 delete mode 100644 packages/protocol/src/agent-message-display.ts
 create mode 100644 packages/protocol/src/paseo-tool-presentation/agent-message.ts
 create mode 100644 packages/protocol/src/paseo-tool-presentation/catalog.ts
 rename packages/protocol/src/{paseo-tool-call-detail.test.ts => paseo-tool-presentation/detail-sections.test.ts} (98%)
 rename packages/protocol/src/{paseo-tool-call-detail.ts => paseo-tool-presentation/detail-sections.ts} (54%)
 create mode 100644 packages/protocol/src/paseo-tool-presentation/index.test.ts
 create mode 100644 packages/protocol/src/paseo-tool-presentation/index.ts
 create mode 100644 packages/protocol/src/paseo-tool-presentation/summary-text.ts

diff --git a/docs/timeline-sync.md b/docs/timeline-sync.md
index d1a770f219..118ad628ce 100644
--- a/docs/timeline-sync.md
+++ b/docs/timeline-sync.md
@@ -251,7 +251,8 @@ do not imply local ownership or authorization. Capture the sender title at deliv
 removed senders must remain understandable without a live directory lookup.
 
 The optional `agentMessage` payload carries event, sender, and delivered text. Shared client
-presentation (`protocol/agent-message-display`) owns its heading and expanded details. The daemon
+presentation (`protocol/paseo-tool-presentation`) owns its heading and expanded details, next to the
+labels for every Paseo MCP tool. The daemon
 must not construct UI labels or prepend sender labels to the semantic message body. The existing
 `tool_call` / `plain_text` envelope is a compatibility adapter: older clients still parse the row and
 expand its body. New clients use the typed payload, never infer the event from a tool name or parse
diff --git a/packages/app/e2e/browser/paseo-tool-call-details.codex.real.spec.ts b/packages/app/e2e/browser/paseo-tool-call-details.codex.real.spec.ts
index 87afd783a4..597a1ebd54 100644
--- a/packages/app/e2e/browser/paseo-tool-call-details.codex.real.spec.ts
+++ b/packages/app/e2e/browser/paseo-tool-call-details.codex.real.spec.ts
@@ -84,7 +84,7 @@ test.describe("real Codex Paseo tool-call presentation", () => {
         expectedText: ["Prompt", GREETING, "Greeting child", "codex/gpt-5.4-mini", "Result"],
       });
       await captureToolCall(page, testInfo, {
-        label: "Send agent prompt",
+        label: "Send message",
         artifact: "send-prompt-presentation",
         expectedText: ["Prompt", GREETING, "Agent", "Result"],
       });
diff --git a/packages/app/src/agent-stream/view.tsx b/packages/app/src/agent-stream/view.tsx
index c9b44ed679..c1466b3682 100644
--- a/packages/app/src/agent-stream/view.tsx
+++ b/packages/app/src/agent-stream/view.tsx
@@ -771,6 +771,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
               status={data.status}
               detail={data.detail}
               cwd={context.cwd}
+              serverId={resolvedServerId}
               metadata={data.metadata}
               agentMessage={data.agentMessage}
               isLastInSequence={isLastInSequence}
@@ -795,7 +796,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
           />
         );
       },
-      [context.cwd, setInlineDetailsExpanded, handleToolCallOpenFile],
+      [context.cwd, resolvedServerId, setInlineDetailsExpanded, handleToolCallOpenFile],
     );
 
     // Read through a stable event so live group updates do not change the renderer identity
diff --git a/packages/app/src/components/message.tsx b/packages/app/src/components/message.tsx
index 314f414d48..d5a2244505 100644
--- a/packages/app/src/components/message.tsx
+++ b/packages/app/src/components/message.tsx
@@ -26,6 +26,7 @@ import { writeMarkdownToRichClipboard } from "@/utils/rich-clipboard";
 import { getDefaultMarkdownClipboardEnvironment } from "@/utils/rich-clipboard-default-environment";
 import { formatDuration, formatMessageTimestamp } from "@/utils/time";
 import { resolveToolCallIcon } from "@/utils/tool-call-icon";
+import { useTargetAgentTitle } from "@/tool-calls/use-target-agent-title";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { AgentMessage } from "@getpaseo/protocol/agent-message";
 import type { AgentCapabilityFlags, ToolCallDetail } from "@getpaseo/protocol/agent-types";
@@ -2208,6 +2209,7 @@ function areExpandableBadgePropsEqual(previous: ExpandableBadgeProps, next: Expa
 
 interface ToolCallProps {
   agentMessage?: AgentMessage;
+  serverId?: string;
   toolName: string;
   args?: unknown;
   result?: unknown;
@@ -2228,6 +2230,7 @@ interface ToolCallProps {
 
 export const ToolCall = memo(function ToolCall({
   agentMessage,
+  serverId,
   toolName,
   args,
   result,
@@ -2265,6 +2268,7 @@ export const ToolCall = memo(function ToolCall({
     return undefined;
   }, [detail, args, result]);
 
+  const targetAgentTitle = useTargetAgentTitle({ serverId, toolName, detail: effectiveDetail });
   const presentation = useMemo(
     () =>
       buildToolCallPresentation({
@@ -2275,9 +2279,10 @@ export const ToolCall = memo(function ToolCall({
         detail: effectiveDetail,
         metadata,
         cwd,
+        targetAgentTitle,
         resolveIcon: resolveToolCallIcon,
       }),
-    [toolName, status, error, effectiveDetail, metadata, cwd, agentMessage],
+    [toolName, status, error, effectiveDetail, metadata, cwd, agentMessage, targetAgentTitle],
   );
   const handleOpenFile = useMemo(() => {
     const openFilePath = presentation.openFilePath;
@@ -2393,6 +2398,8 @@ export const ToolCall = memo(function ToolCall({
 
 function areToolCallPropsEqual(previous: ToolCallProps, next: ToolCallProps) {
   if (previous.toolName !== next.toolName) return false;
+  if (previous.serverId !== next.serverId) return false;
+  if (previous.agentMessage !== next.agentMessage) return false;
   if (previous.args !== next.args) return false;
   if (previous.result !== next.result) return false;
   if (previous.error !== next.error) return false;
diff --git a/packages/app/src/components/tool-call-details.tsx b/packages/app/src/components/tool-call-details.tsx
index 50e4052118..d67eb15f26 100644
--- a/packages/app/src/components/tool-call-details.tsx
+++ b/packages/app/src/components/tool-call-details.tsx
@@ -14,7 +14,7 @@ import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
 import {
   buildPaseoToolDetailSections,
   type PaseoToolDetailSection,
-} from "@getpaseo/protocol/paseo-tool-call-detail";
+} from "@getpaseo/protocol/paseo-tool-presentation/index";
 import { buildLineDiff, parseUnifiedDiff, type DiffLine } from "@/utils/tool-call-parsers";
 import { highlightDiffLines } from "@/utils/diff-highlight";
 import { hasMeaningfulToolCallDetail } from "@/utils/tool-call-detail-state";
diff --git a/packages/app/src/tool-calls/presentation.test.ts b/packages/app/src/tool-calls/presentation.test.ts
index fde0ba020f..fc609ee8f6 100644
--- a/packages/app/src/tool-calls/presentation.test.ts
+++ b/packages/app/src/tool-calls/presentation.test.ts
@@ -1,9 +1,11 @@
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
 import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
 import { describe, expect, it } from "vitest";
 
 import { buildToolCallPresentation, type ToolCallPresentationIcon } from "./presentation";
 
 const fakeIcons = {
+  paseo: (() => null) as ToolCallPresentationIcon,
   brain: (() => null) as ToolCallPresentationIcon,
   eye: (() => null) as ToolCallPresentationIcon,
   wrench: (() => null) as ToolCallPresentationIcon,
@@ -12,7 +14,11 @@ const fakeIcons = {
 function fakeResolveIcon(
   toolName: string,
   detail: ToolCallDetail | undefined,
+  agentMessage: AgentMessage | undefined,
 ): ToolCallPresentationIcon {
+  if (agentMessage) {
+    return fakeIcons.paseo;
+  }
   if (detail?.type === "plan") {
     return fakeIcons.brain;
   }
@@ -94,32 +100,35 @@ describe("tool-call presentation", () => {
 });
 
 it.each([
-  ["message", "Message from QA messenger"],
-  ["finished", "QA messenger finished"],
-  ["errored", "QA messenger errored"],
-  ["permission-required", "QA messenger needs permission"],
-  ["closed", "QA messenger closed"],
-] as const)("presents %s from structured provenance without a second label", (event, heading) => {
-  const presentation = buildToolCallPresentation({
-    toolName: "internal_name_should_not_be_visible",
-    status: "completed",
-    error: null,
-    detail: { type: "plain_text", label: "legacy summary", text: "legacy body" },
-    agentMessage: {
-      event,
-      sender: { id: "server::sender", title: "QA messenger" },
-      text: "The delivered message.",
-    },
-    resolveIcon: fakeResolveIcon,
-  });
-  expect(presentation.displayName).toBe(heading);
-  expect(presentation.summary).toBeUndefined();
-  expect(presentation.detail).toEqual({
-    type: "plain_text",
-    icon: "bot",
-    text: "From agent: server::sender\n\nThe delivered message.",
-  });
-});
+  ["message", "Message received"],
+  ["finished", "Agent finished"],
+  ["errored", "Agent errored"],
+  ["permission-required", "Agent needs permission"],
+  ["closed", "Agent closed"],
+] as const)(
+  "presents %s with a fixed label, the sender as context, and the Paseo icon",
+  (event, heading) => {
+    const presentation = buildToolCallPresentation({
+      toolName: "internal_name_should_not_be_visible",
+      status: "completed",
+      error: null,
+      detail: { type: "plain_text", label: "legacy summary", text: "legacy body", icon: "bot" },
+      agentMessage: {
+        event,
+        sender: { id: "server::sender", title: "QA messenger" },
+        text: "The delivered message.",
+      },
+      resolveIcon: fakeResolveIcon,
+    });
+    expect(presentation.displayName).toBe(heading);
+    expect(presentation.summary).toBe("QA messenger");
+    expect(presentation.icon).toBe(fakeIcons.paseo);
+    expect(presentation.detail).toEqual({
+      type: "plain_text",
+      text: "From agent: server::sender\n\nThe delivered message.",
+    });
+  },
+);
 
 it("uses an opaque sender ID when no title is available", () => {
   const presentation = buildToolCallPresentation({
@@ -129,5 +138,19 @@ it("uses an opaque sender ID when no title is available", () => {
     agentMessage: { event: "message", sender: { id: "remote::worker" }, text: "Hello" },
     resolveIcon: fakeResolveIcon,
   });
-  expect(presentation.displayName).toBe("Message from remote::worker");
+  expect(presentation.displayName).toBe("Message received");
+  expect(presentation.summary).toBe("remote::worker");
+});
+
+it("shows the target agent title as context for Paseo agent tools", () => {
+  const presentation = buildToolCallPresentation({
+    toolName: "mcp__paseo__kill_agent",
+    status: "completed",
+    error: null,
+    detail: { type: "unknown", input: { agentId: "agt_1" }, output: null },
+    targetAgentTitle: "Reviewer",
+    resolveIcon: fakeResolveIcon,
+  });
+  expect(presentation.displayName).toBe("Kill agent");
+  expect(presentation.summary).toBe("Reviewer");
 });
diff --git a/packages/app/src/tool-calls/presentation.ts b/packages/app/src/tool-calls/presentation.ts
index f25d752624..b0ffbb4d5d 100644
--- a/packages/app/src/tool-calls/presentation.ts
+++ b/packages/app/src/tool-calls/presentation.ts
@@ -1,5 +1,5 @@
 import type { AgentMessage } from "@getpaseo/protocol/agent-message";
-import { buildAgentMessageDisplay } from "@getpaseo/protocol/agent-message-display";
+import { buildAgentMessageDisplay } from "@getpaseo/protocol/paseo-tool-presentation/index";
 import type { PlanOutcome } from "@/components/plan-card";
 import type { ComponentType } from "react";
 import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
@@ -22,6 +22,7 @@ interface BuildToolCallPresentationInput {
   detail?: ToolCallDetail;
   cwd?: string;
   metadata?: Record<string, unknown>;
+  targetAgentTitle?: string;
   resolveIcon: ToolCallIconResolver;
 }
 
@@ -42,6 +43,7 @@ export interface ToolCallPresentation {
 export type ToolCallIconResolver = (
   toolName: string,
   detail: ToolCallDetail | undefined,
+  agentMessage: AgentMessage | undefined,
 ) => ToolCallPresentationIcon;
 
 function displayStatus(status: ToolCallStatus): ToolCallDisplayInput["status"] {
@@ -67,6 +69,7 @@ export function buildToolCallPresentation(
     detail: detailForDisplay,
     metadata: input.metadata,
     cwd: input.cwd,
+    targetAgentTitle: input.targetAgentTitle,
   });
   const isLoadingDetails = isPendingToolCallDetail({
     detail,
@@ -80,7 +83,7 @@ export function buildToolCallPresentation(
     displayName: displayModel.displayName,
     summary: displayModel.summary,
     errorText: displayModel.errorText,
-    icon: input.resolveIcon(input.toolName, detail),
+    icon: input.resolveIcon(input.toolName, detail, input.agentMessage),
     isLoadingDetails,
     hasDetails,
     canOpenDetails: hasDetails || isLoadingDetails,
diff --git a/packages/app/src/tool-calls/use-target-agent-title.ts b/packages/app/src/tool-calls/use-target-agent-title.ts
new file mode 100644
index 0000000000..877478d396
--- /dev/null
+++ b/packages/app/src/tool-calls/use-target-agent-title.ts
@@ -0,0 +1,19 @@
+import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
+import { getPaseoToolTargetAgentId } from "@getpaseo/protocol/paseo-tool-presentation/index";
+import { useSessionStore } from "@/stores/session-store";
+
+/** Title of the agent a Paseo tool call acts on, when this host knows it. */
+export function useTargetAgentTitle(input: {
+  serverId: string | undefined;
+  toolName: string;
+  detail: ToolCallDetail | undefined;
+}): string | undefined {
+  const agentId = getPaseoToolTargetAgentId(input.toolName, input.detail);
+  const { serverId } = input;
+  return useSessionStore((state) => {
+    if (!serverId || !agentId) return undefined;
+    const session = state.sessions[serverId];
+    const agent = session?.agents.get(agentId) ?? session?.agentDetails.get(agentId);
+    return agent?.title ?? undefined;
+  });
+}
diff --git a/packages/app/src/utils/tool-call-icon-name.test.ts b/packages/app/src/utils/tool-call-icon-name.test.ts
index 14da899c39..272422ecbd 100644
--- a/packages/app/src/utils/tool-call-icon-name.test.ts
+++ b/packages/app/src/utils/tool-call-icon-name.test.ts
@@ -53,4 +53,14 @@ describe("resolveToolCallIconName", () => {
 
     expect(icon).toBe("wrench");
   });
+
+  it("uses the Paseo icon for agent messages despite the legacy bot detail icon", () => {
+    const icon = resolveToolCallIconName(
+      "agent_message",
+      { type: "plain_text", text: "Done.", icon: "bot" },
+      { event: "finished", sender: { id: "agt_1" }, text: "Done." },
+    );
+
+    expect(icon).toBe("paseo");
+  });
 });
diff --git a/packages/app/src/utils/tool-call-icon-name.ts b/packages/app/src/utils/tool-call-icon-name.ts
index 28bfedb700..f5fb12559d 100644
--- a/packages/app/src/utils/tool-call-icon-name.ts
+++ b/packages/app/src/utils/tool-call-icon-name.ts
@@ -1,3 +1,4 @@
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
 import type { ToolCallDetail, ToolCallIconName } from "@getpaseo/protocol/agent-types";
 import { isPaseoToolName } from "@getpaseo/protocol/tool-name-normalization";
 
@@ -17,7 +18,15 @@ const TOOL_DETAIL_ICON_NAMES: Record<ToolCallDetail["type"], ToolCallIcon> = {
   unknown: "wrench",
 };
 
-export function resolveToolCallIconName(toolName: string, detail?: ToolCallDetail): ToolCallIcon {
+export function resolveToolCallIconName(
+  toolName: string,
+  detail?: ToolCallDetail,
+  agentMessage?: AgentMessage,
+): ToolCallIcon {
+  // Agent messages are Paseo deliveries; the wire detail's legacy "bot" icon is for old clients.
+  if (agentMessage) {
+    return "paseo";
+  }
   const lowerName = toolName.trim().toLowerCase();
 
   if (detail?.type === "plain_text" && detail.icon) {
diff --git a/packages/app/src/utils/tool-call-icon.ts b/packages/app/src/utils/tool-call-icon.ts
index 804b68c4ca..4e1d83e040 100644
--- a/packages/app/src/utils/tool-call-icon.ts
+++ b/packages/app/src/utils/tool-call-icon.ts
@@ -10,6 +10,7 @@ import {
   SquareTerminal,
   Wrench,
 } from "lucide-react-native";
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
 import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
 import { PaseoLogo } from "@/components/icons/paseo-logo";
 import { resolveToolCallIconName, type ToolCallIcon } from "./tool-call-icon-name";
@@ -36,6 +37,7 @@ export function componentForToolCallIcon(name: ToolCallIcon): ToolCallIconCompon
 export function resolveToolCallIcon(
   toolName: string,
   detail?: ToolCallDetail,
+  agentMessage?: AgentMessage,
 ): ToolCallIconComponent {
-  return componentForToolCallIcon(resolveToolCallIconName(toolName, detail));
+  return componentForToolCallIcon(resolveToolCallIconName(toolName, detail, agentMessage));
 }
diff --git a/packages/protocol/src/agent-message-display.ts b/packages/protocol/src/agent-message-display.ts
deleted file mode 100644
index c95f9e8206..0000000000
--- a/packages/protocol/src/agent-message-display.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { AgentMessage } from "./agent-message.js";
-import type { ToolCallDetail } from "./agent-types.js";
-
-/** Presentation shared by clients; never used to encode provider prompts. */
-export function buildAgentMessageDisplay(message: AgentMessage): {
-  displayName: string;
-  detail: ToolCallDetail;
-} {
-  const sender = message.sender.title ?? message.sender.id;
-  const headings: Record<AgentMessage["event"], string> = {
-    message: `Message from ${sender}`,
-    finished: `${sender} finished`,
-    errored: `${sender} errored`,
-    "permission-required": `${sender} needs permission`,
-    closed: `${sender} closed`,
-  };
-  return {
-    displayName: headings[message.event],
-    detail: {
-      type: "plain_text",
-      icon: "bot",
-      text: `From agent: ${message.sender.id}\n\n${message.text}`,
-    },
-  };
-}
diff --git a/packages/protocol/src/paseo-tool-presentation/agent-message.ts b/packages/protocol/src/paseo-tool-presentation/agent-message.ts
new file mode 100644
index 0000000000..33eb44163b
--- /dev/null
+++ b/packages/protocol/src/paseo-tool-presentation/agent-message.ts
@@ -0,0 +1,31 @@
+import type { AgentMessage } from "../agent-message.js";
+import type { ToolCallDetail } from "../agent-types.js";
+import { toSummaryText } from "./summary-text.js";
+
+export interface AgentMessageDisplay {
+  displayName: string;
+  summary?: string;
+  detail: ToolCallDetail;
+}
+
+/** Events read noun-first ("Agent finished"); the sender goes in the summary. */
+const EVENT_LABELS: Record<AgentMessage["event"], string> = {
+  message: "Message received",
+  finished: "Agent finished",
+  errored: "Agent errored",
+  "permission-required": "Agent needs permission",
+  closed: "Agent closed",
+};
+
+/** Presentation shared by clients; never used to encode provider prompts. */
+export function buildAgentMessageDisplay(message: AgentMessage): AgentMessageDisplay {
+  const summary = toSummaryText(message.sender.title ?? message.sender.id);
+  return {
+    displayName: EVENT_LABELS[message.event],
+    ...(summary ? { summary } : {}),
+    detail: {
+      type: "plain_text",
+      text: `From agent: ${message.sender.id}\n\n${message.text}`,
+    },
+  };
+}
diff --git a/packages/protocol/src/paseo-tool-presentation/catalog.ts b/packages/protocol/src/paseo-tool-presentation/catalog.ts
new file mode 100644
index 0000000000..1706134523
--- /dev/null
+++ b/packages/protocol/src/paseo-tool-presentation/catalog.ts
@@ -0,0 +1,349 @@
+/**
+ * One entry per Paseo MCP tool: the timeline label, the context shown after it,
+ * and how the expanded details lay out the call.
+ *
+ * Labels are fixed text so truncation never hides them. Actions read verb-first
+ * ("Send message"); the context goes in the summary.
+ */
+
+type ToolInput = Readonly<Record<string, unknown>>;
+
+/** `targetAgent` is the target agent's title when known, else its ID. */
+export type PaseoToolContext = (input: ToolInput, targetAgent: string | undefined) => unknown;
+
+export interface PaseoToolDetailSpec {
+  promptField?: string;
+  inputOrder?: readonly string[];
+  outputFields?: readonly string[];
+}
+
+export interface PaseoToolEntry {
+  label: string;
+  context?: PaseoToolContext;
+  detail?: PaseoToolDetailSpec;
+}
+
+const WORKSPACE_FIELDS = [
+  "title",
+  "workspaceId",
+  "projectId",
+  "isolation",
+  "path",
+  "mode",
+  "worktreeSlug",
+  "branchName",
+  "baseBranch",
+  "branch",
+  "prNumber",
+  "forge",
+] as const;
+const AGENT_FIELDS = [
+  "title",
+  "agentId",
+  "provider",
+  "workspaceId",
+  "cwd",
+  "sessionMode",
+  "modeId",
+  "background",
+  "notifyOnFinish",
+  "internal",
+  "settings",
+  "labels",
+] as const;
+const AUTOMATION_FIELDS = [
+  "name",
+  "id",
+  "cron",
+  "timezone",
+  "provider",
+  "cwd",
+  "isolation",
+  "maxRuns",
+  "expiresIn",
+  "clearExpires",
+] as const;
+const BROWSER_FIELDS = [
+  "browserId",
+  "url",
+  "ref",
+  "sourceRef",
+  "targetRef",
+  "value",
+  "text",
+  "key",
+  "button",
+  "doubleClick",
+  "modifiers",
+  "filePaths",
+  "fullPage",
+  "maxEntries",
+  "timeoutMs",
+  "deltaX",
+  "deltaY",
+  "width",
+  "height",
+  "function",
+] as const;
+
+const AUTOMATION_OUTPUT = ["id", "status", "nextRunAt", "expiresAt"] as const;
+
+function field(...keys: string[]): PaseoToolContext {
+  return (input) => keys.map((key) => input[key]).find(isPresent);
+}
+
+function targetAgent(): PaseoToolContext {
+  return (_input, agent) => agent;
+}
+
+function fieldOrTargetAgent(key: string): PaseoToolContext {
+  return (input, agent) => (isPresent(input[key]) ? input[key] : agent);
+}
+
+function workspaceContext(): PaseoToolContext {
+  return (input) =>
+    [input.title, input.branchName, input.branch, baseName(input.path)].find(isPresent);
+}
+
+function viewportContext(): PaseoToolContext {
+  return (input) =>
+    typeof input.width === "number" && typeof input.height === "number"
+      ? `${input.width}×${input.height}`
+      : undefined;
+}
+
+function isPresent(value: unknown): boolean {
+  if (typeof value === "string") return value.trim().length > 0;
+  if (Array.isArray(value)) return value.length > 0;
+  return typeof value === "number";
+}
+
+function baseName(value: unknown): string | undefined {
+  if (typeof value !== "string") return undefined;
+  return value.split(/[\\/]/).findLast((segment) => segment.length > 0);
+}
+
+function browser(label: string, context?: PaseoToolContext): PaseoToolEntry {
+  return { label, ...(context ? { context } : {}), detail: { inputOrder: BROWSER_FIELDS } };
+}
+
+export const PASEO_TOOL_CATALOG = {
+  // Agents
+  create_agent: {
+    label: "Create agent",
+    context: field("title", "initialPrompt"),
+    detail: {
+      promptField: "initialPrompt",
+      inputOrder: AGENT_FIELDS,
+      outputFields: ["agentId", "status", "currentModeId", "cwd"],
+    },
+  },
+  send_agent_prompt: {
+    label: "Send message",
+    context: field("prompt"),
+    detail: {
+      promptField: "prompt",
+      inputOrder: AGENT_FIELDS,
+      outputFields: ["status", "lastMessage", "permission"],
+    },
+  },
+  get_agent_status: {
+    label: "Check agent",
+    context: targetAgent(),
+    detail: { inputOrder: ["agentId"] },
+  },
+  get_agent_activity: {
+    label: "Read agent activity",
+    context: targetAgent(),
+    detail: { inputOrder: ["agentId", "limit"] },
+  },
+  list_agents: {
+    label: "List agents",
+    detail: { inputOrder: ["cwd", "statuses", "sinceHours", "limit", "includeArchived"] },
+  },
+  update_agent: {
+    label: "Update agent",
+    context: fieldOrTargetAgent("name"),
+    detail: { inputOrder: AGENT_FIELDS },
+  },
+  set_agent_mode: {
+    label: "Set agent mode",
+    context: field("modeId"),
+    detail: { inputOrder: ["agentId", "modeId"] },
+  },
+  cancel_agent: {
+    label: "Cancel agent",
+    context: targetAgent(),
+    detail: { inputOrder: ["agentId"] },
+  },
+  archive_agent: {
+    label: "Archive agent",
+    context: targetAgent(),
+    detail: { inputOrder: ["agentId"] },
+  },
+  kill_agent: { label: "Kill agent", context: targetAgent(), detail: { inputOrder: ["agentId"] } },
+  list_pending_permissions: { label: "List permissions" },
+  respond_to_permission: {
+    label: "Respond to permission",
+    context: targetAgent(),
+    detail: { inputOrder: ["agentId", "requestId", "response"] },
+  },
+
+  // Workspaces and scripts
+  create_workspace: {
+    label: "Create workspace",
+    context: workspaceContext(),
+    detail: { inputOrder: WORKSPACE_FIELDS, outputFields: ["workspaceId", "projectId"] },
+  },
+  list_workspaces: { label: "List workspaces" },
+  rename_workspace: {
+    label: "Rename workspace",
+    context: field("title"),
+    detail: { inputOrder: ["title", "workspaceId"] },
+  },
+  archive_workspace: {
+    label: "Archive workspace",
+    context: field("workspaceId"),
+    detail: {
+      inputOrder: ["workspaceId"],
+      outputFields: ["workspaceId", "archivedAgentIds", "removedDirectory"],
+    },
+  },
+  list_workspace_scripts: { label: "List scripts", detail: { inputOrder: ["workspaceId"] } },
+  start_workspace_script: {
+    label: "Start script",
+    context: field("scriptName"),
+    detail: { inputOrder: ["workspaceId", "scriptName"] },
+  },
+  stop_workspace_script: {
+    label: "Stop script",
+    context: field("scriptName"),
+    detail: { inputOrder: ["workspaceId", "scriptName"] },
+  },
+
+  // Terminals
+  create_terminal: {
+    label: "Create terminal",
+    context: field("name", "command"),
+    detail: { inputOrder: ["cwd", "workspaceId", "name", "command"] },
+  },
+  list_terminals: { label: "List terminals", detail: { inputOrder: ["cwd", "all"] } },
+  capture_terminal: {
+    label: "Read terminal",
+    context: field("terminalId"),
+    detail: { inputOrder: ["terminalId", "lines"] },
+  },
+  send_terminal_keys: {
+    label: "Send keys",
+    context: field("keys"),
+    detail: { inputOrder: ["terminalId", "keys", "literal"] },
+  },
+  kill_terminal: {
+    label: "Kill terminal",
+    context: field("terminalId"),
+    detail: { inputOrder: ["terminalId"] },
+  },
+
+  // Schedules and heartbeats
+  create_schedule: {
+    label: "Create schedule",
+    context: field("name", "cron"),
+    detail: {
+      promptField: "prompt",
+      inputOrder: AUTOMATION_FIELDS,
+      outputFields: AUTOMATION_OUTPUT,
+    },
+  },
+  create_heartbeat: {
+    label: "Create heartbeat",
+    context: field("name", "cron"),
+    detail: {
+      promptField: "prompt",
+      inputOrder: AUTOMATION_FIELDS,
+      outputFields: AUTOMATION_OUTPUT,
+    },
+  },
+  update_schedule: {
+    label: "Update schedule",
+    context: field("name", "id"),
+    detail: { promptField: "prompt", inputOrder: AUTOMATION_FIELDS },
+  },
+  list_schedules: { label: "List schedules" },
+  inspect_schedule: {
+    label: "Inspect schedule",
+    context: field("id"),
+    detail: { inputOrder: ["id"] },
+  },
+  schedule_logs: {
+    label: "Read schedule logs",
+    context: field("id"),
+    detail: { inputOrder: ["id"] },
+  },
+  run_schedule_once: {
+    label: "Run schedule",
+    context: field("id"),
+    detail: { inputOrder: ["id"] },
+  },
+  pause_schedule: { label: "Pause schedule", context: field("id"), detail: { inputOrder: ["id"] } },
+  resume_schedule: {
+    label: "Resume schedule",
+    context: field("id"),
+    detail: { inputOrder: ["id"] },
+  },
+  delete_schedule: {
+    label: "Delete schedule",
+    context: field("id"),
+    detail: { inputOrder: ["id"] },
+  },
+  delete_heartbeat: {
+    label: "Delete heartbeat",
+    context: field("id"),
+    detail: { inputOrder: ["id"] },
+  },
+
+  // Providers
+  list_providers: { label: "List providers" },
+  list_models: {
+    label: "List models",
+    context: field("provider"),
+    detail: { inputOrder: ["provider"] },
+  },
+  list_profiles: { label: "List profiles" },
+  inspect_provider: {
+    label: "Inspect provider",
+    context: field("provider"),
+    detail: { inputOrder: ["provider", "cwd", "settings"] },
+  },
+
+  // Browser
+  browser_list_tabs: browser("List browser tabs"),
+  browser_new_tab: browser("Open browser tab", field("url")),
+  browser_close_tab: browser("Close browser tab", field("browserId")),
+  browser_navigate: browser("Navigate", field("url")),
+  browser_back: browser("Go back"),
+  browser_forward: browser("Go forward"),
+  browser_reload: browser("Reload page"),
+  browser_snapshot: browser("Snapshot page"),
+  browser_screenshot: browser("Take screenshot"),
+  browser_click: browser("Click element", field("ref")),
+  browser_hover: browser("Hover element", field("ref")),
+  browser_drag: browser("Drag element", field("sourceRef")),
+  browser_fill: browser("Fill field", field("ref")),
+  browser_select: browser("Select option", field("value", "ref")),
+  browser_type: browser("Type text", field("text")),
+  browser_keypress: browser("Press key", field("key")),
+  browser_upload: browser("Upload files", field("filePaths")),
+  browser_wait: browser("Wait for page", field("text", "url")),
+  browser_scroll: browser("Scroll page"),
+  browser_resize: browser("Resize browser", viewportContext()),
+  browser_logs: browser("Read browser logs"),
+  browser_evaluate: browser("Run JavaScript", field("function")),
+} satisfies Record<string, PaseoToolEntry>;
+
+export type PaseoToolName = keyof typeof PASEO_TOOL_CATALOG;
+
+export function getPaseoToolEntry(leafName: string): PaseoToolEntry | undefined {
+  return Object.prototype.hasOwnProperty.call(PASEO_TOOL_CATALOG, leafName)
+    ? PASEO_TOOL_CATALOG[leafName as PaseoToolName]
+    : undefined;
+}
diff --git a/packages/protocol/src/paseo-tool-call-detail.test.ts b/packages/protocol/src/paseo-tool-presentation/detail-sections.test.ts
similarity index 98%
rename from packages/protocol/src/paseo-tool-call-detail.test.ts
rename to packages/protocol/src/paseo-tool-presentation/detail-sections.test.ts
index 25a637e45c..ab3c123e17 100644
--- a/packages/protocol/src/paseo-tool-call-detail.test.ts
+++ b/packages/protocol/src/paseo-tool-presentation/detail-sections.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import { buildPaseoToolDetailSections } from "./paseo-tool-call-detail.js";
+import { buildPaseoToolDetailSections } from "./index.js";
 
 describe("Paseo tool-call detail presentation", () => {
   it.each(["mcp__paseo__create_agent", "paseo.create_agent", "paseo_remote.create_agent"])(
diff --git a/packages/protocol/src/paseo-tool-call-detail.ts b/packages/protocol/src/paseo-tool-presentation/detail-sections.ts
similarity index 54%
rename from packages/protocol/src/paseo-tool-call-detail.ts
rename to packages/protocol/src/paseo-tool-presentation/detail-sections.ts
index 4b06d49923..e2fbcbe9b0 100644
--- a/packages/protocol/src/paseo-tool-call-detail.ts
+++ b/packages/protocol/src/paseo-tool-presentation/detail-sections.ts
@@ -1,4 +1,5 @@
-import { getPaseoToolLeafName } from "./tool-name-normalization.js";
+import { getPaseoToolLeafName } from "../tool-name-normalization.js";
+import { getPaseoToolEntry, type PaseoToolDetailSpec } from "./catalog.js";
 
 export interface PaseoToolDetailField {
   label: string;
@@ -17,161 +18,6 @@ export type PaseoToolDetailSection =
       fields: PaseoToolDetailField[];
     };
 
-interface ToolDetailSpec {
-  promptField?: string;
-  inputOrder?: readonly string[];
-  outputFields?: readonly string[];
-}
-
-const WORKSPACE_FIELDS = [
-  "title",
-  "workspaceId",
-  "projectId",
-  "isolation",
-  "path",
-  "mode",
-  "worktreeSlug",
-  "branchName",
-  "baseBranch",
-  "branch",
-  "prNumber",
-  "forge",
-] as const;
-const AGENT_FIELDS = [
-  "title",
-  "agentId",
-  "provider",
-  "workspaceId",
-  "cwd",
-  "sessionMode",
-  "modeId",
-  "background",
-  "notifyOnFinish",
-  "internal",
-  "settings",
-  "labels",
-] as const;
-const AUTOMATION_FIELDS = [
-  "name",
-  "id",
-  "cron",
-  "timezone",
-  "provider",
-  "cwd",
-  "isolation",
-  "maxRuns",
-  "expiresIn",
-  "clearExpires",
-] as const;
-const BROWSER_FIELDS = [
-  "browserId",
-  "url",
-  "ref",
-  "sourceRef",
-  "targetRef",
-  "value",
-  "text",
-  "key",
-  "button",
-  "doubleClick",
-  "modifiers",
-  "filePaths",
-  "fullPage",
-  "maxEntries",
-  "timeoutMs",
-  "deltaX",
-  "deltaY",
-  "width",
-  "height",
-  "function",
-] as const;
-
-const TOOL_SPECS: Readonly<Record<string, ToolDetailSpec>> = {
-  create_workspace: {
-    inputOrder: WORKSPACE_FIELDS,
-    outputFields: ["workspaceId", "projectId"],
-  },
-  list_workspaces: {},
-  archive_workspace: {
-    inputOrder: ["workspaceId"],
-    outputFields: ["workspaceId", "archivedAgentIds", "removedDirectory"],
-  },
-  rename_workspace: { inputOrder: ["title", "workspaceId"] },
-  create_agent: {
-    promptField: "initialPrompt",
-    inputOrder: AGENT_FIELDS,
-    outputFields: ["agentId", "status", "currentModeId", "cwd"],
-  },
-  send_agent_prompt: {
-    promptField: "prompt",
-    inputOrder: AGENT_FIELDS,
-    outputFields: ["status", "lastMessage", "permission"],
-  },
-  get_agent_status: { inputOrder: ["agentId"] },
-  list_agents: { inputOrder: ["cwd", "statuses", "sinceHours", "limit", "includeArchived"] },
-  cancel_agent: { inputOrder: ["agentId"] },
-  archive_agent: { inputOrder: ["agentId"] },
-  kill_agent: { inputOrder: ["agentId"] },
-  update_agent: { inputOrder: AGENT_FIELDS },
-  get_agent_activity: { inputOrder: ["agentId", "limit"] },
-  set_agent_mode: { inputOrder: ["agentId", "modeId"] },
-  list_workspace_scripts: { inputOrder: ["workspaceId"] },
-  start_workspace_script: { inputOrder: ["workspaceId", "scriptName"] },
-  stop_workspace_script: { inputOrder: ["workspaceId", "scriptName"] },
-  list_terminals: { inputOrder: ["cwd", "all"] },
-  create_terminal: { inputOrder: ["cwd", "workspaceId", "name", "command"] },
-  kill_terminal: { inputOrder: ["terminalId"] },
-  capture_terminal: { inputOrder: ["terminalId", "lines"] },
-  send_terminal_keys: { inputOrder: ["terminalId", "keys", "literal"] },
-  create_schedule: {
-    promptField: "prompt",
-    inputOrder: AUTOMATION_FIELDS,
-    outputFields: ["id", "status", "nextRunAt", "expiresAt"],
-  },
-  create_heartbeat: {
-    promptField: "prompt",
-    inputOrder: AUTOMATION_FIELDS,
-    outputFields: ["id", "status", "nextRunAt", "expiresAt"],
-  },
-  delete_heartbeat: { inputOrder: ["id"] },
-  list_schedules: {},
-  inspect_schedule: { inputOrder: ["id"] },
-  pause_schedule: { inputOrder: ["id"] },
-  resume_schedule: { inputOrder: ["id"] },
-  delete_schedule: { inputOrder: ["id"] },
-  update_schedule: { promptField: "prompt", inputOrder: AUTOMATION_FIELDS },
-  schedule_logs: { inputOrder: ["id"] },
-  run_schedule_once: { inputOrder: ["id"] },
-  list_providers: {},
-  list_models: { inputOrder: ["provider"] },
-  list_profiles: {},
-  inspect_provider: { inputOrder: ["provider", "cwd", "settings"] },
-  list_pending_permissions: {},
-  respond_to_permission: { inputOrder: ["agentId", "requestId", "response"] },
-  browser_list_tabs: {},
-  browser_new_tab: { inputOrder: BROWSER_FIELDS },
-  browser_snapshot: { inputOrder: BROWSER_FIELDS },
-  browser_click: { inputOrder: BROWSER_FIELDS },
-  browser_fill: { inputOrder: BROWSER_FIELDS },
-  browser_wait: { inputOrder: BROWSER_FIELDS },
-  browser_type: { inputOrder: BROWSER_FIELDS },
-  browser_keypress: { inputOrder: BROWSER_FIELDS },
-  browser_navigate: { inputOrder: BROWSER_FIELDS },
-  browser_back: { inputOrder: BROWSER_FIELDS },
-  browser_forward: { inputOrder: BROWSER_FIELDS },
-  browser_reload: { inputOrder: BROWSER_FIELDS },
-  browser_screenshot: { inputOrder: BROWSER_FIELDS },
-  browser_upload: { inputOrder: BROWSER_FIELDS },
-  browser_hover: { inputOrder: BROWSER_FIELDS },
-  browser_select: { inputOrder: BROWSER_FIELDS },
-  browser_drag: { inputOrder: BROWSER_FIELDS },
-  browser_logs: { inputOrder: BROWSER_FIELDS },
-  browser_evaluate: { inputOrder: BROWSER_FIELDS },
-  browser_scroll: { inputOrder: BROWSER_FIELDS },
-  browser_resize: { inputOrder: BROWSER_FIELDS },
-  browser_close_tab: { inputOrder: BROWSER_FIELDS },
-};
-
 const FIELD_LABELS: Readonly<Record<string, string>> = {
   agentId: "Agent",
   archivedAgentIds: "Archived agents",
@@ -330,7 +176,7 @@ export function buildPaseoToolDetailSections(
   const leafName = getPaseoToolLeafName(toolName);
   if (!leafName) return null;
 
-  const spec = TOOL_SPECS[leafName] ?? {};
+  const spec: PaseoToolDetailSpec = getPaseoToolEntry(leafName)?.detail ?? {};
   const sections: PaseoToolDetailSection[] = [];
   if (spec.promptField && isRecord(input)) {
     const prompt = input[spec.promptField];
diff --git a/packages/protocol/src/paseo-tool-presentation/index.test.ts b/packages/protocol/src/paseo-tool-presentation/index.test.ts
new file mode 100644
index 0000000000..bea9acd400
--- /dev/null
+++ b/packages/protocol/src/paseo-tool-presentation/index.test.ts
@@ -0,0 +1,141 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  buildAgentMessageDisplay,
+  buildPaseoToolDisplay,
+  getPaseoToolTargetAgentId,
+  MAX_SUMMARY_CHARS,
+  PASEO_TOOL_NAMES,
+} from "./index.js";
+
+function display(toolName: string, input: unknown, targetAgentTitle?: string) {
+  return buildPaseoToolDisplay({
+    toolName,
+    detail: { type: "unknown", input, output: null },
+    ...(targetAgentTitle ? { targetAgentTitle } : {}),
+  });
+}
+
+describe("Paseo tool display", () => {
+  it.each([
+    [
+      "send_agent_prompt",
+      { agentId: "agt_1", prompt: "Fix the failing test" },
+      "Send message",
+      "Fix the failing test",
+    ],
+    ["create_agent", { title: "Reviewer", initialPrompt: "Review it" }, "Create agent", "Reviewer"],
+    ["create_agent", { initialPrompt: "Review it" }, "Create agent", "Review it"],
+    ["get_agent_status", { agentId: "agt_1" }, "Check agent", "agt_1"],
+    ["update_agent", { agentId: "agt_1", name: "Renamed" }, "Update agent", "Renamed"],
+    ["create_workspace", { path: "/tmp/repo/feature-x" }, "Create workspace", "feature-x"],
+    ["create_workspace", { title: "Docs", branchName: "docs" }, "Create workspace", "Docs"],
+    ["start_workspace_script", { scriptName: "web" }, "Start script", "web"],
+    ["send_terminal_keys", { terminalId: "t1", keys: "npm test" }, "Send keys", "npm test"],
+    ["create_schedule", { prompt: "Check CI", cron: "0 9 * * 1" }, "Create schedule", "0 9 * * 1"],
+    ["browser_navigate", { url: "https://paseo.sh" }, "Navigate", "https://paseo.sh"],
+    [
+      "browser_upload",
+      { ref: "@e1", filePaths: ["/a.png", "/b.png"] },
+      "Upload files",
+      "/a.png +1",
+    ],
+    ["browser_resize", { width: 800, height: 600 }, "Resize browser", "800×600"],
+  ])("presents %s with a fixed label and its context", (tool, input, label, summary) => {
+    expect(display(`mcp__paseo__${tool}`, input)).toEqual({ displayName: label, summary });
+  });
+
+  it("omits the summary when a call has no context", () => {
+    expect(display("mcp__paseo__list_agents", {})).toEqual({ displayName: "List agents" });
+  });
+
+  it("recognizes every Paseo namespace format", () => {
+    for (const name of ["mcp__paseo__kill_agent", "paseo.kill_agent", "paseo_remote.kill_agent"]) {
+      expect(display(name, { agentId: "agt_1" })?.displayName).toBe("Kill agent");
+    }
+  });
+
+  it("returns null outside the Paseo namespace, including speak", () => {
+    expect(display("Bash", {})).toBeNull();
+    expect(display("mcp__paseo__speak", { text: "hi" })).toBeNull();
+  });
+
+  it("humanizes a Paseo tool that has no catalog entry", () => {
+    expect(display("mcp__paseo__brand_new_tool", {})).toEqual({ displayName: "Brand new tool" });
+  });
+
+  it("prefers the known agent title over the agent ID", () => {
+    expect(display("mcp__paseo__cancel_agent", { agentId: "agt_1" }, "Reviewer")).toEqual({
+      displayName: "Cancel agent",
+      summary: "Reviewer",
+    });
+    expect(
+      getPaseoToolTargetAgentId("mcp__paseo__cancel_agent", {
+        type: "unknown",
+        input: { agentId: "agt_1" },
+        output: null,
+      }),
+    ).toBe("agt_1");
+    expect(
+      getPaseoToolTargetAgentId("Bash", { type: "unknown", input: { agentId: "x" }, output: null }),
+    ).toBeNull();
+  });
+
+  it("truncates a massive single-line prompt and collapses whitespace", () => {
+    const prompt = `Line one\n\n   line two ${"x".repeat(1_000_000)}`;
+    const summary = display("mcp__paseo__send_agent_prompt", { agentId: "a", prompt })?.summary;
+    expect(summary).toHaveLength(MAX_SUMMARY_CHARS);
+    expect(summary?.startsWith("Line one line two xxx")).toBe(true);
+    expect(summary?.endsWith("…")).toBe(true);
+  });
+
+  it("bounds the scan even when the prompt opens with a wall of whitespace", () => {
+    const prompt = `${" ".repeat(10_000)}hidden`;
+    const summary = display("mcp__paseo__send_agent_prompt", { agentId: "a", prompt })?.summary;
+    expect(summary).toBeUndefined();
+  });
+
+  it("keeps a short prompt intact", () => {
+    expect(
+      display("mcp__paseo__send_agent_prompt", { agentId: "a", prompt: " hi\nthere " })?.summary,
+    ).toBe("hi there");
+  });
+
+  it("catalogs tool names as lowercase leaf names", () => {
+    for (const name of PASEO_TOOL_NAMES) {
+      expect(name).toMatch(/^[a-z_]+$/);
+    }
+  });
+});
+
+describe("agent message display", () => {
+  it.each([
+    ["message", "Message received"],
+    ["finished", "Agent finished"],
+    ["errored", "Agent errored"],
+    ["permission-required", "Agent needs permission"],
+    ["closed", "Agent closed"],
+  ] as const)("labels %s noun-first with the sender as context", (event, label) => {
+    const result = buildAgentMessageDisplay({
+      event,
+      sender: { id: "srv::agt_1", title: "QA messenger" },
+      text: "Done.",
+    });
+    expect(result.displayName).toBe(label);
+    expect(result.summary).toBe("QA messenger");
+    expect(result.detail).toEqual({ type: "plain_text", text: "From agent: srv::agt_1\n\nDone." });
+  });
+
+  it("falls back to the sender ID and truncates a long title", () => {
+    expect(
+      buildAgentMessageDisplay({ event: "finished", sender: { id: "srv::agt_1" }, text: "" })
+        .summary,
+    ).toBe("srv::agt_1");
+    const summary = buildAgentMessageDisplay({
+      event: "finished",
+      sender: { id: "a", title: "t".repeat(500) },
+      text: "",
+    }).summary;
+    expect(summary).toHaveLength(MAX_SUMMARY_CHARS);
+  });
+});
diff --git a/packages/protocol/src/paseo-tool-presentation/index.ts b/packages/protocol/src/paseo-tool-presentation/index.ts
new file mode 100644
index 0000000000..c04606a231
--- /dev/null
+++ b/packages/protocol/src/paseo-tool-presentation/index.ts
@@ -0,0 +1,85 @@
+import type { ToolCallDetail } from "../agent-types.js";
+import { getPaseoToolLeafName, isPaseoToolName } from "../tool-name-normalization.js";
+import { getPaseoToolEntry, PASEO_TOOL_CATALOG, type PaseoToolName } from "./catalog.js";
+import { toSummaryText } from "./summary-text.js";
+
+export { buildAgentMessageDisplay, type AgentMessageDisplay } from "./agent-message.js";
+export {
+  buildPaseoToolDetailSections,
+  type PaseoToolDetailField,
+  type PaseoToolDetailSection,
+} from "./detail-sections.js";
+export { MAX_SUMMARY_CHARS } from "./summary-text.js";
+export type { PaseoToolName };
+
+export interface PaseoToolDisplayInput {
+  toolName: string;
+  detail: ToolCallDetail;
+  /** Title of the agent named by the call's `agentId`, when the caller knows it. */
+  targetAgentTitle?: string;
+}
+
+export interface PaseoToolDisplay {
+  displayName: string;
+  summary?: string;
+}
+
+export const PASEO_TOOL_NAMES = Object.keys(PASEO_TOOL_CATALOG) as readonly PaseoToolName[];
+
+/** Returns null for tools outside the Paseo namespace. */
+export function buildPaseoToolDisplay(input: PaseoToolDisplayInput): PaseoToolDisplay | null {
+  const leafName = paseoLeafName(input.toolName);
+  if (!leafName) return null;
+  const entry = getPaseoToolEntry(leafName);
+  if (!entry) return { displayName: humanizeLeafName(leafName) };
+
+  const toolInput = readToolInput(input.detail);
+  const targetAgent = input.targetAgentTitle ?? readString(toolInput.agentId);
+  const summary = formatContext(entry.context?.(toolInput, targetAgent));
+  return { displayName: entry.label, ...(summary ? { summary } : {}) };
+}
+
+/** The agent a Paseo call acts on, so callers can resolve its title. */
+export function getPaseoToolTargetAgentId(
+  toolName: string,
+  detail: ToolCallDetail | undefined,
+): string | null {
+  if (!detail || !paseoLeafName(toolName)) return null;
+  return readString(readToolInput(detail).agentId) ?? null;
+}
+
+function paseoLeafName(toolName: string): string | null {
+  return isPaseoToolName(toolName) ? getPaseoToolLeafName(toolName) : null;
+}
+
+function readToolInput(detail: ToolCallDetail): Readonly<Record<string, unknown>> {
+  if (detail.type !== "unknown") return {};
+  const value = detail.input;
+  return typeof value === "object" && value !== null && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {};
+}
+
+function readString(value: unknown): string | undefined {
+  return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+
+function formatContext(value: unknown): string | undefined {
+  if (typeof value === "string") return toSummaryText(value);
+  if (typeof value === "number") return String(value);
+  if (Array.isArray(value)) {
+    const [first, ...rest] = value;
+    const head = typeof first === "string" ? toSummaryText(first) : undefined;
+    if (!head) return undefined;
+    return rest.length > 0 ? `${head} +${rest.length}` : head;
+  }
+  return undefined;
+}
+
+function humanizeLeafName(leafName: string): string {
+  const sentence = leafName
+    .replace(/[._-]+/g, " ")
+    .trim()
+    .toLowerCase();
+  return `${sentence[0]?.toUpperCase() ?? ""}${sentence.slice(1)}`;
+}
diff --git a/packages/protocol/src/paseo-tool-presentation/summary-text.ts b/packages/protocol/src/paseo-tool-presentation/summary-text.ts
new file mode 100644
index 0000000000..57e7405771
--- /dev/null
+++ b/packages/protocol/src/paseo-tool-presentation/summary-text.ts
@@ -0,0 +1,21 @@
+/**
+ * Prompts and results can be one enormous line. Summaries are capped here so no
+ * consumer relies on its renderer to clip them.
+ */
+export const MAX_SUMMARY_CHARS = 120;
+// Bounds the whitespace scan: inputs can be megabytes.
+const SCAN_WINDOW_CHARS = MAX_SUMMARY_CHARS * 4;
+
+export function toSummaryText(value: string): string | undefined {
+  const isPartial = value.length > SCAN_WINDOW_CHARS;
+  const collapsed = value.slice(0, SCAN_WINDOW_CHARS).replace(/\s+/g, " ").trim();
+  if (!collapsed) return undefined;
+  if (collapsed.length <= MAX_SUMMARY_CHARS && !isPartial) return collapsed;
+  const kept = dropTrailingHighSurrogate(collapsed.slice(0, MAX_SUMMARY_CHARS - 1)).trimEnd();
+  return `${kept}…`;
+}
+
+function dropTrailingHighSurrogate(text: string): string {
+  const last = text.charCodeAt(text.length - 1);
+  return last >= 0xd800 && last <= 0xdbff ? text.slice(0, -1) : text;
+}
diff --git a/packages/protocol/src/tool-call-display.ts b/packages/protocol/src/tool-call-display.ts
index ab597b5acd..db0aa6db20 100644
--- a/packages/protocol/src/tool-call-display.ts
+++ b/packages/protocol/src/tool-call-display.ts
@@ -1,6 +1,8 @@
-import { buildAgentMessageDisplay } from "./agent-message-display.js";
 import type { ToolCallTimelineItem } from "./agent-types.js";
-import { getPaseoToolLeafName, isPaseoToolName } from "./tool-name-normalization.js";
+import {
+  buildAgentMessageDisplay,
+  buildPaseoToolDisplay,
+} from "./paseo-tool-presentation/index.js";
 import { stripCwdPrefix } from "./path-utils.js";
 
 export type ToolCallDisplayInput = Pick<
@@ -8,6 +10,8 @@ export type ToolCallDisplayInput = Pick<
   "name" | "status" | "error" | "metadata" | "detail" | "agentMessage"
 > & {
   cwd?: string;
+  /** Title of the agent a Paseo call targets, when the caller knows it. */
+  targetAgentTitle?: string;
 };
 
 export interface ToolCallDisplayModel {
@@ -34,12 +38,6 @@ function humanizeToolName(name: string): string {
   if (!trimmed) {
     return name;
   }
-  if (isPaseoToolName(trimmed)) {
-    const leaf = getPaseoToolLeafName(trimmed);
-    if (leaf) {
-      return humanizeToolName(leaf);
-    }
-  }
   if (/[:./]/.test(trimmed) || trimmed.includes("__")) {
     return trimmed;
   }
@@ -152,8 +150,20 @@ function buildUnknownDetailOverride(input: ToolCallDisplayInput): DetailDisplay
 }
 
 export function buildToolCallDisplayModel(input: ToolCallDisplayInput): ToolCallDisplayModel {
-  if (input.agentMessage) {
-    return { displayName: buildAgentMessageDisplay(input.agentMessage).displayName };
+  const errorText = input.status === "failed" ? formatErrorText(input.error) : undefined;
+  const paseoDisplay = input.agentMessage
+    ? buildAgentMessageDisplay(input.agentMessage)
+    : buildPaseoToolDisplay({
+        toolName: input.name,
+        detail: input.detail,
+        targetAgentTitle: input.targetAgentTitle,
+      });
+  if (paseoDisplay) {
+    return {
+      displayName: paseoDisplay.displayName,
+      ...(paseoDisplay.summary ? { summary: paseoDisplay.summary } : {}),
+      ...(errorText ? { errorText } : {}),
+    };
   }
   const canonicalDisplay = buildCanonicalDetailDisplay(input);
   const unknownDetailOverride = buildUnknownDetailOverride(input);
@@ -162,7 +172,6 @@ export function buildToolCallDisplayModel(input: ToolCallDisplayInput): ToolCall
     canonicalDisplay.displayName ??
     humanizeToolName(input.name);
   const summary = unknownDetailOverride.summary ?? canonicalDisplay.summary;
-  const errorText = input.status === "failed" ? formatErrorText(input.error) : undefined;
 
   return {
     displayName,
diff --git a/packages/server/src/server/agent/activity-curator.test.ts b/packages/server/src/server/agent/activity-curator.test.ts
index 58a8a8b4f1..77814f1779 100644
--- a/packages/server/src/server/agent/activity-curator.test.ts
+++ b/packages/server/src/server/agent/activity-curator.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 import { buildAgentForkContextAttachment, curateAgentActivity } from "./activity-curator.js";
 import type { AgentTimelineItem } from "./agent-sdk-types.js";
 import type { AgentTimelineRow } from "./agent-timeline-store-types.js";
+import { formatAgentMessage, projectAgentMessage } from "./agent-messages/index.js";
 
 function toolCallItem(params: {
   callId: string;
@@ -78,6 +79,28 @@ describe("curateAgentActivity", () => {
     );
   });
 
+  it("renders delivered agent messages with their event, sender, and body", () => {
+    const delivered = (source: Parameters<typeof formatAgentMessage>[0]["source"], text: string) =>
+      projectAgentMessage({
+        type: "user_message",
+        text: formatAgentMessage({ id: `msg-${text.length}`, source, text }),
+      })!;
+    const timeline: AgentTimelineItem[] = [
+      delivered(
+        { kind: "agent-message", agentId: "agt_lead", title: "CI lead" },
+        "Take ownership.\nRead the handoff.",
+      ),
+      delivered(
+        { kind: "agent-notification", agentId: "agt_child", event: "finished" },
+        "Child is done.",
+      ),
+    ];
+
+    expect(curateAgentActivity(timeline)).toBe(
+      "[Message received] CI lead\nTake ownership.\nRead the handoff.\n[Agent finished] agt_child\nChild is done.",
+    );
+  });
+
   it("renders user/assistant/reasoning entries", () => {
     const timeline: AgentTimelineItem[] = [
       { type: "user_message", text: "Hello" },
diff --git a/packages/server/src/server/agent/activity-curator.ts b/packages/server/src/server/agent/activity-curator.ts
index efd0a8e48d..ec5bceb1cb 100644
--- a/packages/server/src/server/agent/activity-curator.ts
+++ b/packages/server/src/server/agent/activity-curator.ts
@@ -1,7 +1,9 @@
 import type { AgentTimelineItem } from "./agent-sdk-types.js";
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
 import type { AgentAttachment } from "@getpaseo/protocol/messages";
 import type { AgentTimelineRow } from "./agent-timeline-store-types.js";
 import { isLikelyExternalToolName } from "@getpaseo/protocol/tool-name-normalization";
+import { buildAgentMessageDisplay } from "@getpaseo/protocol/paseo-tool-presentation/index";
 import { buildToolCallDisplayModel } from "@getpaseo/protocol/tool-call-display";
 import { projectTimelineRows } from "./timeline-projection.js";
 
@@ -119,6 +121,17 @@ function formatToolCallEntry(
   return activityEntry(summary ? `[${displayName}] ${summary}` : `[${displayName}]`);
 }
 
+function appendAgentMessageEntries(entries: ActivityEntry[], message: AgentMessage) {
+  const display = buildAgentMessageDisplay(message);
+  entries.push(
+    activityEntry(
+      display.summary ? `[${display.displayName}] ${display.summary}` : `[${display.displayName}]`,
+    ),
+  );
+  const body = message.text.trim();
+  if (body) entries.push(activityEntry(body));
+}
+
 function curateProjectedActivityEntries(
   items: readonly AgentTimelineItem[],
   options?: ActivityCuratorOptions,
@@ -146,6 +159,10 @@ function curateProjectedActivityEntries(
         appendTextEntry(entries, item, options);
         break;
       case "tool_call": {
+        if (item.agentMessage) {
+          appendAgentMessageEntries(entries, item.agentMessage);
+          break;
+        }
         entries.push(formatToolCallEntry(item, options));
         if (item.detail.type === "sub_agent" && item.detail.log.trim()) {
           entries.push(activityEntry(item.detail.log.trim()));
diff --git a/packages/server/src/server/agent/agent-sdk-types.ts b/packages/server/src/server/agent/agent-sdk-types.ts
index 34d36c9e16..59fb6022e9 100644
--- a/packages/server/src/server/agent/agent-sdk-types.ts
+++ b/packages/server/src/server/agent/agent-sdk-types.ts
@@ -8,6 +8,7 @@ import type {
   ProviderOptions,
   ToolPolicy,
 } from "@getpaseo/protocol/agent-types";
+import type { AgentMessage } from "@getpaseo/protocol/agent-message";
 import type { AgentAttachment } from "@getpaseo/protocol/messages";
 import type { PaseoToolCatalog } from "./tools/types.js";
 
@@ -342,6 +343,8 @@ interface ToolCallBase {
   name: string;
   detail: ToolCallDetail;
   metadata?: Record<string, unknown>;
+  /** Set when the row is a delivered agent message rather than a provider tool call. */
+  agentMessage?: AgentMessage;
 }
 
 type ToolCallRunningTimelineItem = ToolCallBase & {
diff --git a/packages/server/src/server/agent/mcp-server.test.ts b/packages/server/src/server/agent/mcp-server.test.ts
index 9246f463d0..cf2e6ab217 100644
--- a/packages/server/src/server/agent/mcp-server.test.ts
+++ b/packages/server/src/server/agent/mcp-server.test.ts
@@ -66,6 +66,7 @@ import type { ForgeService } from "../../services/forge-service.js";
 import { areEquivalentPaths } from "../../utils/path.js";
 import type { TerminalManager } from "../../terminal/terminal-manager.js";
 import { PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
+import { PASEO_TOOL_NAMES } from "@getpaseo/protocol/paseo-tool-presentation/index";
 import { MutableDaemonConfigSchema, type AgentProfile } from "@getpaseo/protocol/messages";
 import type { DaemonConfigStore } from "../daemon-config-store.js";
 import type { BrowserToolsBroker, BrowserToolsExecuteInput } from "../browser-tools/broker.js";
@@ -888,6 +889,40 @@ describe("bundled Paseo skill", () => {
   });
 });
 
+describe("Paseo tool timeline presentation", () => {
+  it("catalogs a timeline label for every advertised tool", async () => {
+    const server = await createAgentMcpServer({
+      agentManager: new BoundaryAgentManagerFake() as AgentManager,
+      agentStorage: new BoundaryAgentStorageFake() as AgentStorage,
+      providerSnapshotManager:
+        new BoundaryProviderSnapshotManagerFake() as unknown as ProviderSnapshotManager,
+      browserToolsEnabled: true,
+      browserToolsBroker: new FakeBrowserToolsBroker({
+        requestId: "req-catalog",
+        ok: true,
+        result: { command: "list_tabs", tabs: [] },
+      }) as BrowserToolsBroker,
+      callerAgentId: "agent-1",
+      logger: createTestLogger(),
+    });
+    const client = await connectInMemoryMcpClient(server);
+
+    try {
+      const { tools } = await client.listTools();
+      const cataloged = new Set<string>(PASEO_TOOL_NAMES);
+      // speak renders as a voice message, not a tool call row.
+      const uncataloged = tools
+        .map((tool) => tool.name)
+        .filter((name) => name !== "speak" && !cataloged.has(name));
+      expect(tools.length).toBeGreaterThan(40);
+      expect(uncataloged).toEqual([]);
+    } finally {
+      await client.close();
+      await server.close();
+    }
+  });
+});
+
 describe("browser MCP tools", () => {
   const logger = createTestLogger();
 

From a5c566f807ad4d7dff5401aace37bff41c950879 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 13:52:54 +0700
Subject: [PATCH 260/270] Make full CI finish sooner: eight browser shards,
 split Windows server job, cancel superseded runs (#7275)

Eight Playwright shards with two workers each, format/lint/relay/sdk combined into one routed quality job, Windows server integration in its own job, cancel-in-progress on every ref, one vitest start for the filtered integration files, no fan-in gate, and a deadline for the heap-bound directory search test that covers its 27,000-directory fixture on Windows.

First run on the Team plan: 19m48s from creation to last job with zero queue, all 21 jobs green, 224 runner-minutes. The same workflow under the old 20-job cap finished in 58 minutes with up to 40 minutes of queue per job.
---
 .github/workflows/ci.yml                      | 253 +++++++++++-------
 packages/server/package.json                  |   2 +-
 .../src/utils/directory-suggestions.test.ts   |   6 +-
 packages/server/vitest.config.ts              |   3 -
 scripts/ci-workflow.test.mjs                  | 204 +++++++++++++-
 5 files changed, 359 insertions(+), 109 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e3f65f336..a2cbb0c29a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,9 +8,13 @@ on:
   merge_group:
   workflow_dispatch:
 
+# A newer push to the same ref cancels the run still in progress, main included.
+# A full run costs about 200 runner-minutes against the org's 20 concurrent
+# jobs, and a superseded main run only answers a question the newer commit
+# answers again.
 concurrency:
   group: ci-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  cancel-in-progress: true
 
 env:
   # CI does not use the CUDA execution provider, and the onnxruntime-node
@@ -54,10 +58,10 @@ jobs:
       - name: Validate CI contracts
         run: node --test scripts/ci-workflow.test.mjs scripts/daemon-launch-contract.test.mjs scripts/sync-fdroid-changelogs.test.mjs scripts/upload-release-assets.test.mjs
 
-  format:
-    name: format
+  quality:
+    name: quality
     needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.format != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.format != 'false' || needs.changes.outputs.quality != 'false' || needs.changes.outputs.relay != 'false' || needs.changes.outputs.sdk != 'false') }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -68,36 +72,63 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
+        id: install
         run: node scripts/npm-retry.mjs ci
 
+      # Explicit status checks keep independent domains running after a failure.
+      # A failed step still fails quality; no continue-on-error or success shim.
       - name: Check formatting
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.format != 'false') }}
         run: npm run format:check
 
-  lint:
-    name: lint
-    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-          cache: "npm"
-
-      - name: Install dependencies
-        run: node scripts/npm-retry.mjs ci
-
       - name: Lint lockfile
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
         run: npx --yes lockfile-lint --path package-lock.json --type npm --allowed-hosts npm --validate-https --validate-integrity
 
       - name: Verify dependency signatures
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
         run: npm audit signatures
 
       - name: Lint
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
         run: npm run lint
 
+      - name: Build relay
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.relay != 'false') }}
+        run: npm run build:relay
+
+      - name: Run relay tests
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.relay != 'false') }}
+        run: npm run test --workspace=@getpaseo/relay
+
+      - name: Build client dependencies
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
+        run: npm run build:relay && npm run build:client
+
+      - name: Build plugin SDK
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
+        run: npm run build:plugin
+
+      - name: Run plugin SDK tests
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
+        run: npm run test --workspace=@getpaseo/plugin
+
+      - name: Run protocol tests
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
+        run: npm run test --workspace=@getpaseo/protocol
+
+      - name: Run client tests
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
+        run: npm run test --workspace=@getpaseo/client
+
+      - name: Run highlight tests
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
+        run: npm run test --workspace=@getpaseo/highlight
+
+      - name: Typecheck client examples
+        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
+        run: npm run typecheck:examples --workspace=@getpaseo/client
+
   typecheck:
     name: typecheck
     needs: changes
@@ -143,43 +174,56 @@ jobs:
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' || needs.changes.outputs.hub != 'false') }}
     runs-on: ubuntu-latest
-    steps: &server_test_steps
-      - uses: actions/checkout@v4
+    steps:
+      - &server_capacity
+        name: Log runner capacity
+        run: |
+          node -e "const os = require('node:os'); console.log(JSON.stringify({cpus: os.cpus().length, model: os.cpus()[0].model, ramGiB: os.totalmem() / 2 ** 30}))"
+
+      - &server_checkout
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-node@v4
+      - &server_node
+        uses: actions/setup-node@v4
         with:
           node-version: "22"
           cache: "npm"
 
-      - name: Fetch origin/main (worktree tests)
+      - &server_fetch
+        name: Fetch origin/main (worktree tests)
         if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
         run: git fetch --no-tags origin main:refs/remotes/origin/main
 
-      - name: Install dependencies
+      - &server_install
+        name: Install dependencies
         run: node scripts/npm-retry.mjs ci
 
-      - name: Install agent CLIs for provider tests
+      - &server_agent_clis
+        name: Install agent CLIs for provider tests
         if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
         run: node scripts/npm-retry.mjs install -g @anthropic-ai/claude-code opencode-ai
 
-      - name: Build server dependencies
+      - &server_build
+        name: Build server dependencies
         run: npm run build:server-deps
 
       - name: Run server tests
         if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
         run: npm run test --workspace=@getpaseo/server
-        env:
+        env: &server_test_env
           CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           OPENROUTER_API_KEY: ${{ secrets.OPENROUTER_API_KEY }}
 
-      - name: Run built-in plugin tests
+      - &server_plugin_tests
+        name: Run built-in plugin tests
         if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
         run: npm run test --workspace=@getpaseo/builtin-plugins
 
-      - name: Run Hub CLI/daemon contract
+      - &server_hub_contract
+        name: Run Hub CLI/daemon contract
         if: ${{ needs.changes.outputs.full == 'false' && needs.changes.outputs.server == 'false' && needs.changes.outputs.hub != 'false' }}
         run: npm run test:hub-cli-contract --workspace=@getpaseo/server
 
@@ -188,7 +232,41 @@ jobs:
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' || needs.changes.outputs.hub != 'false') }}
     runs-on: windows-latest
-    steps: *server_test_steps
+    steps:
+      - *server_capacity
+      - *server_checkout
+      - *server_node
+      - *server_fetch
+      - *server_install
+      - *server_agent_clis
+      - *server_build
+
+      - name: Run server unit tests
+        if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
+        run: npm run test:unit --workspace=@getpaseo/server
+        env: *server_test_env
+
+      - *server_plugin_tests
+      - *server_hub_contract
+
+  # Keep the serial integration chain off the Windows unit critical path.
+  server-integration-windows:
+    name: server-integration (windows-latest)
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false') }}
+    runs-on: windows-latest
+    steps:
+      - *server_capacity
+      - *server_checkout
+      - *server_node
+      - *server_fetch
+      - *server_install
+      - *server_agent_clis
+      - *server_build
+
+      - name: Run server integration tests
+        run: npm run test:integration --workspace=@getpaseo/server
+        env: *server_test_env
 
   # native-recursive.ts serves darwin and win32, but windows-latest above is the only
   # runner that exercises it. macOS — the platform the reported watcher bug was on —
@@ -332,52 +410,19 @@ jobs:
       - name: Run app unit tests
         run: npm run test --workspace=@getpaseo/app
 
-  sdk-tests:
-    name: sdk-tests
-    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-          cache: "npm"
-
-      - name: Install dependencies
-        run: node scripts/npm-retry.mjs ci
-
-      - name: Build client dependencies
-        run: npm run build:relay && npm run build:client
-
-      - name: Build plugin SDK
-        run: npm run build:plugin
-
-      - name: Run plugin SDK tests
-        run: npm run test --workspace=@getpaseo/plugin
-
-      - name: Run protocol tests
-        run: npm run test --workspace=@getpaseo/protocol
-
-      - name: Run client tests
-        run: npm run test --workspace=@getpaseo/client
-
-      - name: Run highlight tests
-        run: npm run test --workspace=@getpaseo/highlight
-
-      - name: Typecheck client examples
-        run: npm run typecheck:examples --workspace=@getpaseo/client
-
   playwright-1:
-    name: playwright (shard 1/4)
+    name: playwright (shard 1/8)
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
     runs-on: ubuntu-latest
     env:
-      PLAYWRIGHT_SHARD: "1/4"
+      PLAYWRIGHT_SHARD: "1/8"
       PLAYWRIGHT_ARTIFACT: "1"
     steps: &playwright_test_steps
+      - name: Log runner capacity
+        run: |
+          node -e "const os = require('node:os'); console.log(JSON.stringify({cpus: os.cpus().length, model: os.cpus()[0].model, ramGiB: os.totalmem() / 2 ** 30}))"
+
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4
@@ -405,9 +450,9 @@ jobs:
         run: npm run test:e2e --workspace=@getpaseo/app -- --shard=${{ env.PLAYWRIGHT_SHARD }}
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          # Weight file groups by observed duration; raw test counts overload
-          # early agent/Changes specs. Required check names remain unchanged.
-          PWTEST_SHARD_WEIGHTS: "111:172:137:160"
+          E2E_WORKERS: "2"
+          # File groups are weighted by observed reporter durations.
+          PWTEST_SHARD_WEIGHTS: "93:100:101:104:91:94:122:110"
 
       - name: Upload test artifacts
         uses: actions/upload-artifact@v4
@@ -420,56 +465,74 @@ jobs:
           retention-days: 7
 
   playwright-2:
-    name: playwright (shard 2/4)
+    name: playwright (shard 2/8)
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
     runs-on: ubuntu-latest
     env:
-      PLAYWRIGHT_SHARD: "2/4"
+      PLAYWRIGHT_SHARD: "2/8"
       PLAYWRIGHT_ARTIFACT: "2"
     steps: *playwright_test_steps
 
   playwright-3:
-    name: playwright (shard 3/4)
+    name: playwright (shard 3/8)
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
     runs-on: ubuntu-latest
     env:
-      PLAYWRIGHT_SHARD: "3/4"
+      PLAYWRIGHT_SHARD: "3/8"
       PLAYWRIGHT_ARTIFACT: "3"
     steps: *playwright_test_steps
 
   playwright-4:
-    name: playwright (shard 4/4)
+    name: playwright (shard 4/8)
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
     runs-on: ubuntu-latest
     env:
-      PLAYWRIGHT_SHARD: "4/4"
+      PLAYWRIGHT_SHARD: "4/8"
       PLAYWRIGHT_ARTIFACT: "4"
     steps: *playwright_test_steps
 
-  relay-tests:
-    name: relay-tests
+  playwright-5:
+    name: playwright (shard 5/8)
     needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.relay != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
+    env:
+      PLAYWRIGHT_SHARD: "5/8"
+      PLAYWRIGHT_ARTIFACT: "5"
+    steps: *playwright_test_steps
 
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-          cache: "npm"
+  playwright-6:
+    name: playwright (shard 6/8)
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
+    runs-on: ubuntu-latest
+    env:
+      PLAYWRIGHT_SHARD: "6/8"
+      PLAYWRIGHT_ARTIFACT: "6"
+    steps: *playwright_test_steps
 
-      - name: Install dependencies
-        run: node scripts/npm-retry.mjs ci
+  playwright-7:
+    name: playwright (shard 7/8)
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
+    runs-on: ubuntu-latest
+    env:
+      PLAYWRIGHT_SHARD: "7/8"
+      PLAYWRIGHT_ARTIFACT: "7"
+    steps: *playwright_test_steps
 
-      - name: Build relay
-        run: npm run build:relay
-
-      - name: Run relay tests
-        run: npm run test --workspace=@getpaseo/relay
+  playwright-8:
+    name: playwright (shard 8/8)
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
+    runs-on: ubuntu-latest
+    env:
+      PLAYWRIGHT_SHARD: "8/8"
+      PLAYWRIGHT_ARTIFACT: "8"
+    steps: *playwright_test_steps
 
   cli-tests-1:
     name: cli-tests (shard 1/3)
diff --git a/packages/server/package.json b/packages/server/package.json
index ec2d4cbe65..49549cdff3 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/checkout-diff-content.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/workspace-create-worktree-source.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\" && vitest run --maxWorkers=1 src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"oversized attachments\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/checkout-diff-content.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/workspace-create-worktree-source.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts src/server/session.create-agent-worktree-autoarchive.e2e.test.ts src/server/agent/providers/opencode-bridge.local.e2e.test.ts src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"merges into|creates a worktree and auto-archives both|versioned runtime|oversized attachments\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",
diff --git a/packages/server/src/utils/directory-suggestions.test.ts b/packages/server/src/utils/directory-suggestions.test.ts
index a7d5d5e9eb..72c77a4ce2 100644
--- a/packages/server/src/utils/directory-suggestions.test.ts
+++ b/packages/server/src/utils/directory-suggestions.test.ts
@@ -1121,6 +1121,10 @@ describe("home-tree scan cost", () => {
     return stopPathContainmentMetrics();
   }
 
+  // Creating the 27,000-directory fixture alone takes about 20 s on Windows
+  // runners under parallel load, and it has crossed the default 30 s deadline.
+  // The heap bound is enforced by the child's --max-old-space-size and its own
+  // 20 s timeout, so the test deadline only has to cover fixture setup.
   it("finishes overlapping broad-tree searches within a bounded heap", async () => {
     const broadRoot = path.join(scanRoot, "broad");
     mkdirSync(broadRoot);
@@ -1191,7 +1195,7 @@ describe("home-tree scan cost", () => {
       outOfMemory: false,
     });
     expect(JSON.parse(stdout)).toEqual(Array.from({ length: 14 }, () => []));
-  });
+  }, 120_000);
 
   it("derives no containment for a tree that cannot leave the root", async () => {
     const checks = await countContainmentChecks(scanWholeTree);
diff --git a/packages/server/vitest.config.ts b/packages/server/vitest.config.ts
index c80345c79e..9f3717a9bc 100644
--- a/packages/server/vitest.config.ts
+++ b/packages/server/vitest.config.ts
@@ -19,9 +19,6 @@ export default defineConfig({
     setupFiles: [path.resolve(__dirname, "./src/test-utils/vitest-setup.ts")],
     pool: "forks",
     fileParallelism: false,
-    // Even two concurrent Git-heavy suites can exhaust Windows test deadlines.
-    // Run files serially so their subprocesses do not compete across suites.
-    maxWorkers: process.platform === "win32" ? 1 : undefined,
     exclude: ["**/node_modules/**", "**/dist/**", "**/.claude/**", "**/.dev/**"],
   },
 });
diff --git a/scripts/ci-workflow.test.mjs b/scripts/ci-workflow.test.mjs
index d71fa6e184..7034ec4893 100644
--- a/scripts/ci-workflow.test.mjs
+++ b/scripts/ci-workflow.test.mjs
@@ -2,6 +2,7 @@ import assert from "node:assert/strict";
 import { readFileSync, readdirSync } from "node:fs";
 import { relative as relativePath } from "node:path";
 import test from "node:test";
+import { runInNewContext } from "node:vm";
 
 const repoRoot = new URL("../", import.meta.url);
 const ciWorkflowPath = new URL(".github/workflows/ci.yml", repoRoot);
@@ -12,21 +13,26 @@ const serverTsconfigPath = new URL("packages/server/tsconfig.server.json", repoR
 const desktopPackagePath = new URL("packages/desktop/package.json", repoRoot);
 
 const gatedCiJobs = new Map([
-  ["format", { name: "format", contract: "format" }],
-  ["lint", { name: "lint", contract: "quality" }],
+  ["quality", { name: "quality", contracts: ["format", "quality", "relay", "sdk"] }],
   ["typecheck", { name: "typecheck", contract: "quality" }],
   ["server-tests-ubuntu", { name: "server-tests (ubuntu-latest)", contracts: ["server", "hub"] }],
   ["server-tests-windows", { name: "server-tests (windows-latest)", contracts: ["server", "hub"] }],
+  [
+    "server-integration-windows",
+    { name: "server-integration (windows-latest)", contract: "server" },
+  ],
   ["server-tests-macos", { name: "server-tests (macos-14, file observation)", contract: "server" }],
   ["desktop-tests-ubuntu", { name: "desktop-tests (ubuntu-latest)", contract: "desktop" }],
   ["desktop-tests-windows", { name: "desktop-tests (windows-latest)", contract: "desktop" }],
   ["app-tests", { name: "app-tests", contract: "app" }],
-  ["sdk-tests", { name: "sdk-tests", contract: "sdk" }],
-  ["playwright-1", { name: "playwright (shard 1/4)", contract: "browser" }],
-  ["playwright-2", { name: "playwright (shard 2/4)", contract: "browser" }],
-  ["playwright-3", { name: "playwright (shard 3/4)", contract: "browser" }],
-  ["playwright-4", { name: "playwright (shard 4/4)", contract: "browser" }],
-  ["relay-tests", { name: "relay-tests", contract: "relay" }],
+  ["playwright-1", { name: "playwright (shard 1/8)", contract: "browser" }],
+  ["playwright-2", { name: "playwright (shard 2/8)", contract: "browser" }],
+  ["playwright-3", { name: "playwright (shard 3/8)", contract: "browser" }],
+  ["playwright-4", { name: "playwright (shard 4/8)", contract: "browser" }],
+  ["playwright-5", { name: "playwright (shard 5/8)", contract: "browser" }],
+  ["playwright-6", { name: "playwright (shard 6/8)", contract: "browser" }],
+  ["playwright-7", { name: "playwright (shard 7/8)", contract: "browser" }],
+  ["playwright-8", { name: "playwright (shard 8/8)", contract: "browser" }],
   ["cli-tests-1", { name: "cli-tests (shard 1/3)", contract: "cli" }],
   ["cli-tests-2", { name: "cli-tests (shard 2/3)", contract: "cli" }],
   ["cli-tests-3", { name: "cli-tests (shard 3/3)", contract: "cli" }],
@@ -36,7 +42,7 @@ function jobBlocks(source) {
   const jobs = new Map();
   let currentJob;
 
-  for (const line of source.split("\n")) {
+  for (const line of (source.split("\njobs:\n")[1] ?? source).split("\n")) {
     const jobMatch = /^  ([a-z0-9_-]+):\s*$/.exec(line);
     if (jobMatch) {
       currentJob = jobMatch[1];
@@ -100,6 +106,12 @@ test("gated checks are statically named jobs with real job-level gating", () =>
 });
 
 test("change gating allows superseded workflow runs to cancel", () => {
+  const ci = readFileSync(ciWorkflowPath, "utf8");
+  assert.match(
+    ci,
+    /^concurrency:\n  group: ci-\$\{\{ github\.workflow \}\}-\$\{\{ github\.ref \}\}\n  cancel-in-progress: true$/m,
+    "a newer push to any ref, main included, cancels the superseded run",
+  );
   for (const workflowPath of [ciWorkflowPath, dockerWorkflowPath, nixWorkflowPath]) {
     const source = readFileSync(workflowPath, "utf8");
     assert.doesNotMatch(
@@ -331,3 +343,177 @@ test("stable iOS releases upload once and distribute to external testers before
   );
   assert.match(review, /bundle exec fastlane ios submit_review/);
 });
+
+test("eight Playwright shards share two-worker coverage", () => {
+  const source = readFileSync(ciWorkflowPath, "utf8");
+  const jobs = jobBlocks(source);
+  assert.equal(jobs.size, 21);
+  for (let shard = 1; shard <= 8; shard++) {
+    const job = jobs.get(`playwright-${shard}`).join("\n");
+    assert.match(job, new RegExp(`PLAYWRIGHT_SHARD: "${shard}/8"`));
+    assert.match(job, new RegExp(`PLAYWRIGHT_ARTIFACT: "${shard}"`));
+    assert.match(
+      job,
+      shard === 1 ? /steps: &playwright_test_steps/ : /steps: \*playwright_test_steps/,
+    );
+  }
+  const shared = jobs.get("playwright-1").join("\n");
+  assert.match(shared, /E2E_WORKERS: "2"/);
+  const weights = /PWTEST_SHARD_WEIGHTS: "([\d:]+)"/.exec(shared)[1].split(":").map(Number);
+  assert.equal(weights.length, 8);
+  assert.ok(weights.every((weight) => weight > 0));
+  assert.match(shared, /npm run test:e2e --workspace=@getpaseo\/app -- --shard=/);
+
+  // No fan-in result job: a gate needs its own runner and under contention it
+  // queued 8m08s behind the last shard. Required checks name the shards directly.
+  assert.equal(jobs.has("playwright"), false);
+});
+
+test("quality preserves commands and routes each domain independently after failures", () => {
+  const jobs = jobBlocks(readFileSync(ciWorkflowPath, "utf8"));
+  const quality = jobs.get("quality").join("\n");
+  assert.doesNotMatch(quality, /^\s+continue-on-error:/m);
+  const commands = {
+    format: ["npm run format:check"],
+    quality: [
+      "npx --yes lockfile-lint --path package-lock.json --type npm --allowed-hosts npm --validate-https --validate-integrity",
+      "npm audit signatures",
+      "npm run lint",
+    ],
+    relay: ["npm run build:relay", "npm run test --workspace=@getpaseo/relay"],
+    sdk: [
+      "npm run build:relay && npm run build:client",
+      "npm run build:plugin",
+      "npm run test --workspace=@getpaseo/plugin",
+      "npm run test --workspace=@getpaseo/protocol",
+      "npm run test --workspace=@getpaseo/client",
+      "npm run test --workspace=@getpaseo/highlight",
+      "npm run typecheck:examples --workspace=@getpaseo/client",
+    ],
+  };
+  const checks = [...quality.matchAll(/        if: \$\{\{ (.+) \}\}\n        run: (.+)/g)];
+  assert.deepEqual(
+    checks.map(([, , command]) => command),
+    Object.values(commands).flat(),
+  );
+  const domains = Object.keys(commands);
+  function accepts(expression, outputs, { cancelled = false, installed = true } = {}) {
+    // Prior checks have failed: success() is false. Explicit !cancelled() must
+    // override Actions' default success condition so later domains still run.
+    assert.match(expression, /!cancelled\(\)/);
+    return runInNewContext(expression, {
+      needs: { changes: { outputs } },
+      steps: { install: { outcome: installed ? "success" : "failure" } },
+      cancelled: () => cancelled,
+      success: () => false,
+    });
+  }
+  const disabled = { full: "false", ...Object.fromEntries(domains.map((key) => [key, "false"])) };
+  const jobCondition = /    if: \$\{\{ (.+) \}\}/.exec(quality)[1];
+  assert.equal(accepts(jobCondition, disabled), false);
+  for (const selected of domains) {
+    const outputs = { ...disabled, [selected]: "true" };
+    assert.equal(accepts(jobCondition, outputs), true);
+    for (const [, expression, command] of checks) {
+      assert.equal(accepts(expression, outputs), commands[selected].includes(command), command);
+    }
+  }
+  for (const [, expression] of checks) {
+    assert.equal(accepts(expression, { ...disabled, full: "true" }), true);
+    assert.equal(accepts(expression, {}), true, "missing routing outputs fail open");
+    assert.equal(accepts(expression, {}, { cancelled: true }), false);
+    assert.equal(accepts(expression, {}, { installed: false }), false);
+  }
+  assert.equal(accepts(jobCondition, {}, { cancelled: true }), false);
+});
+
+test("Windows units and integration run independently with complete routed coverage", () => {
+  const source = readFileSync(ciWorkflowPath, "utf8");
+  const jobs = jobBlocks(source);
+  const ubuntu = jobs.get("server-tests-ubuntu").join("\n");
+  const windows = jobs.get("server-tests-windows").join("\n");
+  const integration = jobs.get("server-integration-windows").join("\n");
+  assert.match(ubuntu, /run: npm run test --workspace=@getpaseo\/server/);
+  assert.match(windows, /run: npm run test:unit --workspace=@getpaseo\/server/);
+  assert.doesNotMatch(windows, /run: npm run test(?: |:integration)/);
+  assert.match(integration, /run: npm run test:integration --workspace=@getpaseo\/server/);
+  assert.doesNotMatch(integration, /test:unit|server_plugin_tests|server_hub_contract/);
+  for (const job of [windows, integration]) {
+    assert.match(job, /^    needs: changes$/m, "both phases become eligible independently");
+    assert.match(job, /^    runs-on: windows-latest$/m);
+    assert.doesNotMatch(job, /continue-on-error|maxWorkers|--exclude/);
+    for (const step of [
+      "server_capacity",
+      "server_checkout",
+      "server_node",
+      "server_fetch",
+      "server_install",
+      "server_agent_clis",
+      "server_build",
+    ]) {
+      assert.match(ubuntu, new RegExp(`&${step}\\b`));
+      assert.match(job, new RegExp(`- \\*${step}\\b`));
+    }
+    assert.match(job, /env: \*server_test_env/);
+  }
+  assert.match(windows, /- \*server_plugin_tests/);
+  assert.match(windows, /- \*server_hub_contract/);
+  assert.match(ubuntu, /run: npm run test --workspace=@getpaseo\/builtin-plugins/);
+  assert.match(ubuntu, /run: npm run test:hub-cli-contract --workspace=@getpaseo\/server/);
+
+  const scripts = JSON.parse(
+    readFileSync(new URL("packages/server/package.json", repoRoot), "utf8"),
+  ).scripts;
+  assert.equal(scripts.test, "npm run test:unit && npm run test:integration");
+  assert.equal(scripts["test:unit"], 'vitest run --fileParallelism --exclude "**/*.e2e.test.ts"');
+  const invocations = scripts["test:integration"].split(" && ");
+  // Each vitest start costs about half a minute on Windows, so the four
+  // name-filtered files share one invocation and one combined filter.
+  assert.equal(invocations.length, 2);
+  assert.ok(invocations.every((command) => command.startsWith("vitest run --maxWorkers=1 ")));
+  assert.doesNotMatch(invocations[0], / -t /);
+  assert.equal(
+    invocations[1],
+    'vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts src/server/session.create-agent-worktree-autoarchive.e2e.test.ts src/server/agent/providers/opencode-bridge.local.e2e.test.ts src/server/daemon-e2e/relay-transport.e2e.test.ts -t "merges into|creates a worktree and auto-archives both|versioned runtime|oversized attachments"',
+  );
+  const serverConfig = readFileSync(new URL("packages/server/vitest.config.ts", repoRoot), "utf8");
+  assert.doesNotMatch(serverConfig, /maxWorkers/);
+
+  function condition(job) {
+    return /    if: \$\{\{ (.+) \}\}/.exec(job)[1];
+  }
+  function selected(expression, outputs, cancelled = false) {
+    return runInNewContext(expression, {
+      needs: { changes: { outputs } },
+      cancelled: () => cancelled,
+    });
+  }
+  const unitCondition = condition(windows);
+  const integrationCondition = condition(integration);
+  const unitStep = /      - name: Run server unit tests\n        if: \$\{\{ (.+) \}\}/.exec(
+    windows,
+  )[1];
+  const hubStep =
+    /      - &server_hub_contract\n        name: Run Hub CLI\/daemon contract\n        if: \$\{\{ (.+) \}\}/.exec(
+      ubuntu,
+    )[1];
+  const pluginStep =
+    /      - &server_plugin_tests\n        name: Run built-in plugin tests\n        if: \$\{\{ (.+) \}\}/.exec(
+      ubuntu,
+    )[1];
+  for (const [outputs, units, integrations, hub] of [
+    [{ full: "true", server: "false", hub: "false" }, true, true, false],
+    [{ full: "false", server: "true", hub: "false" }, true, true, false],
+    [{ full: "false", server: "false", hub: "true" }, true, false, true],
+    [{ full: "false", server: "false", hub: "false" }, false, false, false],
+    [{}, true, true, false],
+  ]) {
+    assert.equal(selected(unitCondition, outputs), units);
+    assert.equal(selected(integrationCondition, outputs), integrations);
+    assert.equal(selected(unitStep, outputs), integrations);
+    assert.equal(selected(pluginStep, outputs), integrations);
+    assert.equal(selected(hubStep, outputs), hub);
+    assert.equal(selected(unitCondition, outputs, true), false);
+    assert.equal(selected(integrationCondition, outputs, true), false);
+  }
+});

From fc12843cef20c1b414ebd62ffa686a4b6bfddba1 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 14:16:28 +0700
Subject: [PATCH 261/270] feat(app): show each subagent's model and effort
 under its title (#7290)

Paseo subagent rows in the subagents list had an empty info strip: the row
only rendered the daemon-provided subtitle, which only provider subagents
carry. The row now uses the same facts line an agent's sheet shows when it
opens without its composer, so both surfaces resolve model, thinking, mode,
and context the way the composer's controls do.

The facts sit under the title instead of beside it, so a long task name
keeps the row's width instead of fighting the strip for it.
---
 .../browser/compact-workspace-sheet.spec.ts   |  8 +++
 packages/app/src/panels/agent-facts-line.ts   | 29 ++++++++++
 packages/app/src/panels/agent-panel.tsx       | 26 +--------
 packages/app/src/subagents/track.tsx          | 54 +++++++++++++++----
 4 files changed, 83 insertions(+), 34 deletions(-)

diff --git a/packages/app/e2e/browser/compact-workspace-sheet.spec.ts b/packages/app/e2e/browser/compact-workspace-sheet.spec.ts
index 77a2a0882b..990d490d9b 100644
--- a/packages/app/e2e/browser/compact-workspace-sheet.spec.ts
+++ b/packages/app/e2e/browser/compact-workspace-sheet.spec.ts
@@ -71,6 +71,14 @@ test("compact opens files and subagents in a sheet, leaving the tabs for agents"
       await closeSheet(page, "linked.ts");
     });
 
+    await test.step("a subagent's row shows the facts its sheet shows", async () => {
+      await page.getByTestId("subagents-track-header").click();
+      await expect(page.getByTestId(`subagents-track-row-facts-${child.id}`)).toHaveText(
+        "Ten second stream · Low · Load test",
+      );
+      await tapSheetBackdrop(page);
+    });
+
     await test.step("a subagent opens in a sheet over the subagents list", async () => {
       await openSubagentFromCompactTrack(page, child.id);
 
diff --git a/packages/app/src/panels/agent-facts-line.ts b/packages/app/src/panels/agent-facts-line.ts
index 7d3cd80332..7c01e5ce42 100644
--- a/packages/app/src/panels/agent-facts-line.ts
+++ b/packages/app/src/panels/agent-facts-line.ts
@@ -1,7 +1,10 @@
 import type { AgentMode, AgentModelDefinition } from "@getpaseo/protocol/agent-types";
+import { useShallow } from "zustand/shallow";
 import { formatAgentModeLabel } from "@/agent-controls/labels";
 import { formatTokenCount } from "@/components/context-window-meter.utils";
 import { resolveAgentModelSelection } from "@/composer/agent-controls/utils";
+import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
+import { useSessionStore } from "@/stores/session-store";
 
 export interface AgentFactsInput {
   models: AgentModelDefinition[] | null;
@@ -33,6 +36,32 @@ export function buildAgentFactsLine(input: AgentFactsInput): string | null {
   return parts.join(" · ");
 }
 
+/** The facts line for a Paseo agent in the session store, kept current as the agent reports. */
+export function useAgentFactsLine(serverId: string, agentId: string): string | null {
+  const agent = useSessionStore(
+    useShallow((state) => {
+      const current = state.sessions[serverId]?.agents.get(agentId);
+      return current
+        ? {
+            provider: current.provider,
+            cwd: current.cwd,
+            runtimeModelId: current.runtimeInfo?.model ?? null,
+            configuredModelId: current.model ?? null,
+            runtimeThinkingOptionId: current.runtimeInfo?.thinkingOptionId ?? null,
+            explicitThinkingOptionId: current.thinkingOptionId ?? null,
+            availableModes: current.availableModes,
+            currentModeId: current.currentModeId,
+            contextWindowUsedTokens: current.lastUsage?.contextWindowUsedTokens ?? null,
+            contextWindowMaxTokens: current.lastUsage?.contextWindowMaxTokens ?? null,
+          }
+        : null;
+    }),
+  );
+  const { entries } = useProvidersSnapshot(serverId, { cwd: agent?.cwd });
+  const models = entries?.find((entry) => entry.provider === agent?.provider)?.models ?? null;
+  return agent ? buildAgentFactsLine({ ...agent, models }) : null;
+}
+
 /** The mode control shows the current mode, or the provider's first one until the agent reports. */
 function resolveModeLabel(modes: AgentMode[], currentModeId: string | null | undefined) {
   const mode = modes.find((candidate) => candidate.id === currentModeId) ?? modes[0];
diff --git a/packages/app/src/panels/agent-panel.tsx b/packages/app/src/panels/agent-panel.tsx
index a9e11df570..7ae7d0c470 100644
--- a/packages/app/src/panels/agent-panel.tsx
+++ b/packages/app/src/panels/agent-panel.tsx
@@ -60,9 +60,8 @@ import { useContainerWidthBelow } from "@/hooks/use-container-width";
 import { reconcileMissingAgentStateWithPresentAgent } from "@/panels/agent-panel-load-state";
 import { TimelineSyncStatus } from "@/timeline/sync-status";
 import { usePaneContext, usePaneFocus } from "@/panels/pane-context";
-import { buildAgentFactsLine } from "@/panels/agent-facts-line";
+import { useAgentFactsLine } from "@/panels/agent-facts-line";
 import { PaneSubtitle } from "@/panels/pane-subtitle";
-import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import { definePanel, type PanelDescriptor } from "@/panels/panel-registry";
 import { RenderProfile } from "@/utils/render-profiler";
 import { useHasPluginComposerPills } from "@/plugins";
@@ -1384,28 +1383,7 @@ function TimelineSyncErrorCallout({
  * without its composer.
  */
 function SheetAgentFacts({ serverId, agentId }: { serverId: string; agentId: string }) {
-  const agent = useSessionStore(
-    useShallow((state) => {
-      const current = state.sessions[serverId]?.agents.get(agentId);
-      return current
-        ? {
-            provider: current.provider,
-            cwd: current.cwd,
-            runtimeModelId: current.runtimeInfo?.model ?? null,
-            configuredModelId: current.model ?? null,
-            runtimeThinkingOptionId: current.runtimeInfo?.thinkingOptionId ?? null,
-            explicitThinkingOptionId: current.thinkingOptionId ?? null,
-            availableModes: current.availableModes,
-            currentModeId: current.currentModeId,
-            contextWindowUsedTokens: current.lastUsage?.contextWindowUsedTokens ?? null,
-            contextWindowMaxTokens: current.lastUsage?.contextWindowMaxTokens ?? null,
-          }
-        : null;
-    }),
-  );
-  const { entries } = useProvidersSnapshot(serverId, { cwd: agent?.cwd });
-  const models = entries?.find((entry) => entry.provider === agent?.provider)?.models ?? null;
-  const text = agent ? buildAgentFactsLine({ ...agent, models }) : null;
+  const text = useAgentFactsLine(serverId, agentId);
   return text ? <PaneSubtitle text={text} testID="agent-pane-subtitle" /> : null;
 }
 
diff --git a/packages/app/src/subagents/track.tsx b/packages/app/src/subagents/track.tsx
index c1834587d2..1914993700 100644
--- a/packages/app/src/subagents/track.tsx
+++ b/packages/app/src/subagents/track.tsx
@@ -13,6 +13,7 @@ import {
   type WorkspaceTabPresentation,
 } from "@/screens/workspace/workspace-tab-presentation";
 import type { Theme } from "@/styles/theme";
+import { useAgentFactsLine } from "@/panels/agent-facts-line";
 import { getPanelManifest } from "@/panels/panel-manifest";
 import type { SubagentRow } from "./select";
 import type { ArchiveFinishedStatus } from "./use-archive-finished";
@@ -219,14 +220,16 @@ function SubagentsTrackRow({
     ({ active }: { active: boolean }) => (
       <>
         <WorkspaceTabIcon presentation={presentation} backdrop={active ? "surface2" : "surface1"} />
-        <Text style={styles.rowLabel} numberOfLines={1}>
-          {displayLabel}
-        </Text>
-        {presentation.subtitle ? (
-          <Text style={styles.rowTrailing} numberOfLines={1}>
-            {presentation.subtitle}
+        <View style={styles.rowText}>
+          <Text style={styles.rowTitle} numberOfLines={1}>
+            {displayLabel}
           </Text>
-        ) : null}
+          {row.kind === "paseo" ? (
+            <PaseoSubagentFacts serverId={serverId} agentId={row.id} />
+          ) : (
+            <SubagentFacts rowId={row.id} text={presentation.subtitle} />
+          )}
+        </View>
         {row.kind === "paseo" ? (
           <SubagentRowActions
             rowId={row.id}
@@ -247,6 +250,7 @@ function SubagentsTrackRow({
       presentation,
       row.kind,
       row.id,
+      serverId,
     ],
   );
 
@@ -262,6 +266,21 @@ function SubagentsTrackRow({
   );
 }
 
+/** The same facts line the agent's sheet shows when it opens without its composer. */
+function PaseoSubagentFacts({ serverId, agentId }: { serverId: string; agentId: string }) {
+  const text = useAgentFactsLine(serverId, agentId);
+  return <SubagentFacts rowId={agentId} text={text} />;
+}
+
+function SubagentFacts({ rowId, text }: { rowId: string; text: string | null }) {
+  if (!text) return null;
+  return (
+    <Text style={styles.rowFacts} numberOfLines={1} testID={`subagents-track-row-facts-${rowId}`}>
+      {text}
+    </Text>
+  );
+}
+
 function SubagentRowActions({
   rowId,
   displayLabel,
@@ -360,9 +379,24 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
     color: theme.colors.foreground,
   },
-  // Trailing metadata — provider context on a subagent row, progress on the archive row. No width
-  // cap: the panel's own ceiling bounds it. It shrinks twice as fast as the label, so a wordy
-  // provider subtitle gives way first instead of squeezing the thing that names the row.
+  // Title over facts. The facts sit under the title rather than beside it, so a long task name
+  // keeps the row's full width and neither line truncates the other.
+  rowText: {
+    flexGrow: 1,
+    flexShrink: 1,
+    flexBasis: "auto",
+    minWidth: 0,
+  },
+  rowTitle: {
+    fontSize: theme.fontSize.base,
+    color: theme.colors.foreground,
+  },
+  rowFacts: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foregroundMuted,
+  },
+  // Progress on the archive row. It shrinks twice as fast as the label, so a long retry count
+  // gives way first instead of squeezing the thing that names the row.
   rowTrailing: {
     flexShrink: 2,
     minWidth: 0,

From a65478d0bfd25fa8b08adac54273e3e490ca341a Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 14:24:14 +0700
Subject: [PATCH 262/270] Rank Command Center results by match then recency,
 with highlights, timestamps, and project icons (#7277)

* feat(app): rank, highlight, and timestamp Command Center results

Workspace and agent rows now show when they were last active, rank by
match quality and then recency, mark the query terms in every result
kind, and lead workspaces with their project icon.

Ties used to be broken by where the match landed in the string, so
"Deliver sidebar usage" beat "expose usage data" on sentence position
and recency almost never decided anything. Built-in rows now compare
only which fields matched and the matcher tier, then the most recent
row wins. The empty query follows the same rule, so it lists the most
recent workspaces and agents instead of alphabetical workspaces and
status-first agents.

Row and section heights live in list-metrics: a layout picks one row
inset and every height derives from it plus shared line boxes, which
the styles also read. The layout is chosen once at the top, so rows
never branch on it, and two-line rows are now vertically centered.
Desktop is denser (32/46); compact keeps 44pt touch rows (44/58).

findHighlightRanges takes the matcher's options so the marks match
what the list matched: the Command Center is not typo-tolerant, the
history list is.

* fix(app): keep the project icon out of Command Center row names

The fallback project icon draws the project's initial as text, which
became the first word of the row's accessible name ("C Command Center
..."), so screen readers announced it. The icon is decorative.

The scroll spec now reads the newest seeded workspace: the empty query
lists the most recent workspaces, so the first one seeded is no longer
among them.
---
 .../e2e/browser/agent-relative-time.spec.ts   |   2 +-
 .../e2e/browser/command-center-scroll.spec.ts |   3 +-
 .../helpers/command-center-file-search.ts     |   3 +-
 .../app/src/command-center/command-center.tsx | 349 ++++++++++++------
 .../app/src/command-center/list-metrics.ts    |  53 +++
 .../app/src/command-center/results.test.ts    | 157 +++++---
 packages/app/src/command-center/results.ts    |  66 +++-
 .../command-center/workspace-search.test.ts   |  21 +-
 .../src/command-center/workspace-search.ts    |  20 +-
 packages/app/src/components/agent-list.tsx    |  11 +-
 .../ui/highlighted-text-segments.test.ts      |   7 +-
 .../ui/highlighted-text-segments.ts           |  18 +-
 .../app/src/screens/projects-screen.test.tsx  |   1 +
 packages/app/src/utils/projects.ts            |   2 +
 14 files changed, 494 insertions(+), 219 deletions(-)
 create mode 100644 packages/app/src/command-center/list-metrics.ts

diff --git a/packages/app/e2e/browser/agent-relative-time.spec.ts b/packages/app/e2e/browser/agent-relative-time.spec.ts
index 4fe1efe887..9a34350782 100644
--- a/packages/app/e2e/browser/agent-relative-time.spec.ts
+++ b/packages/app/e2e/browser/agent-relative-time.spec.ts
@@ -26,7 +26,7 @@ test("agent list age advances and command center says just now for a fresh agent
     const agentResult = commandCenter.getByTestId(
       `command-center-agent-${getServerId()}:${session.agentId}`,
     );
-    await expect(agentResult.getByTestId("command-center-agent-subtitle")).toContainText(
+    await expect(agentResult.getByTestId("command-center-result-timestamp")).toContainText(
       "just now",
     );
     await page.keyboard.press("Escape");
diff --git a/packages/app/e2e/browser/command-center-scroll.spec.ts b/packages/app/e2e/browser/command-center-scroll.spec.ts
index 598e35e592..f6762bb4cc 100644
--- a/packages/app/e2e/browser/command-center-scroll.spec.ts
+++ b/packages/app/e2e/browser/command-center-scroll.spec.ts
@@ -45,7 +45,8 @@ test("opening the command center keeps its first result fully visible", async ({
     await expectCommandCenterToRemainAtTheTop(page);
     await expectPrimaryCommandCenterActions(panel);
     await expectVisibleKeyboardNavigationNotToScroll(page, panel);
-    await expectTightTwoLineResultSpacing(panel, "Command Center Scroll 00");
+    // The empty query lists the most recent workspaces, so the last one seeded leads it.
+    await expectTightTwoLineResultSpacing(panel, "Command Center Scroll 08");
     await expectWorkspaceResultsToBeLimitedUntilSearch(panel);
   } finally {
     await seeded.cleanup();
diff --git a/packages/app/e2e/support/helpers/command-center-file-search.ts b/packages/app/e2e/support/helpers/command-center-file-search.ts
index 781470b582..ec6ade4102 100644
--- a/packages/app/e2e/support/helpers/command-center-file-search.ts
+++ b/packages/app/e2e/support/helpers/command-center-file-search.ts
@@ -203,7 +203,8 @@ export async function expectOneLineTruncatedFileResult(
   expect(lineBox).not.toBeNull();
   expect(filenameBox).not.toBeNull();
   expect(pathBox).not.toBeNull();
-  expect(rowBox?.height).toBe(36);
+  // COMMAND_CENTER_LIST_METRICS.desktop.singleLineRow (list-metrics imports react-native).
+  expect(rowBox?.height).toBe(32);
   expect(Math.abs((filenameBox?.y ?? 0) - (pathBox?.y ?? 0))).toBeLessThanOrEqual(1);
   expect(overflow.scrollWidth).toBeGreaterThan(overflow.clientWidth);
   expect(overflow.overflow).toBe("hidden");
diff --git a/packages/app/src/command-center/command-center.tsx b/packages/app/src/command-center/command-center.tsx
index 607f24c214..febac60a14 100644
--- a/packages/app/src/command-center/command-center.tsx
+++ b/packages/app/src/command-center/command-center.tsx
@@ -16,7 +16,10 @@ import { Check, ChevronRight, Folder, X } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { BottomSheetFlatList, type BottomSheetFlatListMethods } from "@gorhom/bottom-sheet";
 import { AgentStatusDot } from "@/components/agent-status-dot";
+import { HighlightedText, type HighlightedTextProps } from "@/components/ui/highlighted-text";
+import { findHighlightRanges } from "@/components/ui/highlighted-text-segments";
 import { MaterialFileIcon } from "@/components/material-file-icon";
+import { ProjectIconView } from "@/components/project-icon-view";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import {
   EditingTextInput as TextInput,
@@ -29,8 +32,11 @@ import {
 } from "@/components/ui/isolated-bottom-sheet-modal";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { isNative, isWeb } from "@/constants/platform";
-import { useAggregatedAgents, type AggregatedAgent } from "@/hooks/use-aggregated-agents";
+import { useAggregatedAgents } from "@/hooks/use-aggregated-agents";
 import { useProjects } from "@/hooks/use-projects";
+import { useTimeAgo } from "@/hooks/use-time-ago";
+import { createProjectIconTarget } from "@/projects/icon-target";
+import { useProjectIcons } from "@/projects/icons";
 import {
   OverlayLayerProvider,
   useGlobalWebOverlayLayer,
@@ -49,8 +55,14 @@ import {
 } from "@/utils/command-center-focus-restore";
 import { focusWithRetries } from "@/utils/web-focus";
 import { navigateToAgent } from "@/utils/navigate-to-agent";
-import { formatTimeAgo } from "@/utils/time";
 import { shortenPath } from "@/utils/shorten-path";
+import { projectIconPlaceholderLabelFromDisplayName } from "@/utils/project-display-name";
+import {
+  COMMAND_CENTER_LINE_HEIGHT,
+  COMMAND_CENTER_LIST_METRICS,
+  COMMAND_CENTER_SECTION_GAP,
+  type CommandCenterListMetrics,
+} from "./list-metrics";
 import { useCommandCenterContributions } from "./provider";
 import { filterAndRankWorkspaces } from "./workspace-search";
 import {
@@ -89,42 +101,14 @@ const ThemedLoadingSpinner = withUnistyles(LoadingSpinner, (theme) => ({
 const COMMAND_CENTER_SNAP_POINTS = ["60%", "90%"];
 const KEYBOARD_SHOULD_PERSIST_TAPS = "always" as const;
 
-function sortAgents(left: AggregatedAgent, right: AggregatedAgent): number {
-  const leftNeedsInput = (left.pendingPermissionCount ?? 0) > 0 ? 1 : 0;
-  const rightNeedsInput = (right.pendingPermissionCount ?? 0) > 0 ? 1 : 0;
-  if (leftNeedsInput !== rightNeedsInput) return rightNeedsInput - leftNeedsInput;
-  const leftAttention = left.requiresAttention ? 1 : 0;
-  const rightAttention = right.requiresAttention ? 1 : 0;
-  if (leftAttention !== rightAttention) return rightAttention - leftAttention;
-  const leftRunning = left.status === "running" ? 1 : 0;
-  const rightRunning = right.status === "running" ? 1 : 0;
-  if (leftRunning !== rightRunning) return rightRunning - leftRunning;
-  return right.lastActivityAt.getTime() - left.lastActivityAt.getTime();
-}
-
-function compareWorkspacesByTitle(
-  left: CommandCenterWorkspaceResult,
-  right: CommandCenterWorkspaceResult,
-): number {
-  const titleDelta = left.title.localeCompare(right.title, undefined, {
-    numeric: true,
-    sensitivity: "base",
-  });
-  return titleDelta || left.subtitle.localeCompare(right.subtitle);
-}
-
 /** `cwd` is not rendered, so a path match must never outrank a match on text the user can see. */
 function agentSearchFields(result: CommandCenterAgentResult): CommandCenterSearchFields {
   return { visible: [result.title, result.subtitle], hidden: [result.agent.cwd] };
 }
 
 /**
- * Build every pinned row, in its default order. Deliberately not keyed on `query`: none of this
- * work depends on what was typed, and rebuilding it per keystroke means re-running an Intl
- * collation sort over every workspace.
- *
- * The cost is that `formatTimeAgo` is baked into the agent subtitle here, so relative timestamps
- * now refresh when agents or projects change rather than on every keystroke.
+ * Build every pinned row. Deliberately not keyed on `query`: none of this work depends on what
+ * was typed. Ordering belongs to `filterAndRankBuiltInResults`, which ranks on every keystroke.
  */
 function useBuiltInRows(open: boolean): {
   workspaces: CommandCenterWorkspaceResult[];
@@ -134,11 +118,32 @@ function useBuiltInRows(open: boolean): {
   const { agents } = useAggregatedAgents({ demand: open });
   const { projects } = useProjects({ enabled: open });
   const showHost = useHosts().length > 1;
+  const iconTargets = useMemo(
+    () =>
+      open
+        ? projects.flatMap((project) =>
+            project.hosts.flatMap((host) => {
+              const target = createProjectIconTarget({
+                projectViewKey: project.viewKey,
+                placement: { ...host, iconWorkingDir: host.repoRoot },
+              });
+              return target ? [target] : [];
+            }),
+          )
+        : [],
+    [open, projects],
+  );
+  const iconDataByProjectViewKey = useProjectIcons({ projects: iconTargets });
 
   return useMemo(() => {
     if (!open) return { workspaces: [], agents: [] };
     const allWorkspaces: CommandCenterWorkspaceResult[] = [];
     for (const project of projects) {
+      const workspaceProject = {
+        viewKey: project.viewKey,
+        name: project.projectName,
+        iconDataUri: iconDataByProjectViewKey.get(project.viewKey) ?? null,
+      };
       for (const host of project.hosts) {
         for (const workspace of host.workspaces) {
           if (workspace.archivingAt) continue;
@@ -151,7 +156,9 @@ function useBuiltInRows(open: boolean): {
               project.projectName,
               workspace.currentBranch,
             ]),
+            project: workspaceProject,
             changeRequestNumber: workspace.changeRequestNumber,
+            activityAt: workspace.statusEnteredAt,
             run: () => {
               clearCommandCenterFocusRestoreElement();
               navigateToWorkspace({ serverId: host.serverId, workspaceId: workspace.id });
@@ -160,34 +167,31 @@ function useBuiltInRows(open: boolean): {
         }
       }
     }
-    allWorkspaces.sort(compareWorkspacesByTitle);
     const workspaceTitleByKey = new Map(
       allWorkspaces.map((workspace) => [workspace.id.slice("workspace:".length), workspace.title]),
     );
-    const agentRows = agents
-      .map<CommandCenterAgentResult>((agent) => {
-        const workspaceTitle = agent.workspaceId
-          ? workspaceTitleByKey.get(`${agent.serverId}:${agent.workspaceId}`)
-          : undefined;
-        return {
-          kind: "agent",
-          id: `agent:${agent.serverId}:${agent.id}`,
-          agent,
-          title: agent.title || t("shell.commandCenter.newAgent"),
-          subtitle: joinSubtitleParts([
-            showHost ? agent.serverLabel : null,
-            workspaceTitle ?? shortenPath(agent.cwd),
-            formatTimeAgo(agent.lastActivityAt),
-          ]),
-          run: () => {
-            clearCommandCenterFocusRestoreElement();
-            navigateToAgent({ serverId: agent.serverId, agentId: agent.id });
-          },
-        };
-      })
-      .sort((left, right) => sortAgents(left.agent, right.agent));
+    const agentRows = agents.map<CommandCenterAgentResult>((agent) => {
+      const workspaceTitle = agent.workspaceId
+        ? workspaceTitleByKey.get(`${agent.serverId}:${agent.workspaceId}`)
+        : undefined;
+      return {
+        kind: "agent",
+        id: `agent:${agent.serverId}:${agent.id}`,
+        agent,
+        title: agent.title || t("shell.commandCenter.newAgent"),
+        subtitle: joinSubtitleParts([
+          showHost ? agent.serverLabel : null,
+          workspaceTitle ?? shortenPath(agent.cwd),
+        ]),
+        activityAt: agent.lastActivityAt,
+        run: () => {
+          clearCommandCenterFocusRestoreElement();
+          navigateToAgent({ serverId: agent.serverId, agentId: agent.id });
+        },
+      };
+    });
     return { workspaces: allWorkspaces, agents: agentRows };
-  }, [agents, open, projects, showHost, t]);
+  }, [agents, iconDataByProjectViewKey, open, projects, showHost, t]);
 }
 
 function useBuiltInSections(open: boolean, query: string): CommandCenterResultSection[] {
@@ -202,16 +206,14 @@ function useBuiltInSections(open: boolean, query: string): CommandCenterResultSe
         band: PINNED_SECTION_BAND,
         rank: 2,
         title: t("shell.commandCenter.workspaces"),
-        results: filterAndRankWorkspaces(rows.workspaces, query, compareWorkspacesByTitle),
+        results: filterAndRankWorkspaces(rows.workspaces, query),
       },
       {
         id: "agents",
         band: PINNED_SECTION_BAND,
         rank: 3,
         title: t("shell.commandCenter.agents"),
-        results: filterAndRankBuiltInResults(rows.agents, query, agentSearchFields, (left, right) =>
-          sortAgents(left.agent, right.agent),
-        ),
+        results: filterAndRankBuiltInResults(rows.agents, query, agentSearchFields),
       },
     ];
   }, [open, query, rows, t]);
@@ -236,7 +238,7 @@ interface CommandCenterState {
   key(key: string): boolean;
 }
 
-function useCommandCenterState(): CommandCenterState {
+function useCommandCenterState(listMetrics: CommandCenterListMetrics): CommandCenterState {
   const keyboardActionDispatcher = useKeyboardActionDispatcher();
   const { t } = useTranslation();
   const open = useKeyboardShortcutsStore((state) => state.commandCenterOpen);
@@ -290,8 +292,9 @@ function useCommandCenterState(): CommandCenterState {
         scope === "files"
           ? fileSections
           : [...contributionSections, ...fileSections, ...builtInSections],
+        listMetrics,
       ),
-    [builtInSections, contributionSections, fileSections, scope],
+    [builtInSections, contributionSections, fileSections, listMetrics, scope],
   );
   const resolvedActiveId = preserveActiveResultId(activeId, projection.selectableResults);
 
@@ -381,11 +384,19 @@ function useCommandCenterState(): CommandCenterState {
 
 interface ResultRowProps {
   result: CommandCenterResult;
+  height: number;
+  query: string;
   active: boolean;
   onSelect(result: CommandCenterResult): void;
 }
 
-const ResultRow = memo(function ResultRow({ result, active, onSelect }: ResultRowProps) {
+const ResultRow = memo(function ResultRow({
+  result,
+  height,
+  query,
+  active,
+  onSelect,
+}: ResultRowProps) {
   const press = useCallback(() => onSelect(result), [onSelect, result]);
   const choice =
     result.kind === "contribution" && result.contribution.presentation.kind === "choice"
@@ -402,15 +413,10 @@ const ResultRow = memo(function ResultRow({ result, active, onSelect }: ResultRo
   const style = useCallback(
     ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
       styles.row,
-      (result.kind === "agent" ||
-        result.kind === "workspace" ||
-        (result.kind === "contribution" &&
-          result.contribution.presentation.kind === "action" &&
-          Boolean(result.contribution.presentation.subtitle))) &&
-        styles.tallRow,
+      { height },
       (Boolean(hovered) || pressed || active) && styles.activeRow,
     ],
-    [active, result],
+    [active, height],
   );
   return (
     <Pressable
@@ -424,12 +430,75 @@ const ResultRow = memo(function ResultRow({ result, active, onSelect }: ResultRo
         result.kind === "file" ? `command-center-file-row-${result.filePath}` : choice?.testId
       }
     >
-      <ResultContent result={result} />
+      <ResultContent result={result} query={query} />
     </Pressable>
   );
 });
 
-function ResultContent({ result }: { result: CommandCenterResult }) {
+/**
+ * Text with the query's terms marked. Marks use the same matcher options the rows were ranked
+ * with, so a mark always points at something that made the row match.
+ */
+function QueryHighlightedText({
+  query,
+  text,
+  ...props
+}: { query: string } & Omit<HighlightedTextProps, "ranges">) {
+  const ranges = useMemo(() => findHighlightRanges(query, text), [query, text]);
+  return <HighlightedText text={text} ranges={ranges} {...props} />;
+}
+
+/**
+ * The subtitle line of a workspace or agent row. The timestamp is its own text so a long branch
+ * truncates without pushing the time out of view, and so the time is never part of what the
+ * query matches against. It keeps itself current while the command center stays open.
+ */
+function SubtitleWithTimestamp({
+  query,
+  subtitle,
+  activityAt,
+  testID,
+}: {
+  query: string;
+  subtitle: string;
+  activityAt: Date | null;
+  testID: string;
+}) {
+  const timeAgo = useTimeAgo(activityAt);
+  return (
+    <View style={styles.subtitleLine}>
+      <QueryHighlightedText
+        query={query}
+        text={subtitle}
+        style={[styles.subtitle, styles.subtitleText]}
+        numberOfLines={1}
+        testID={testID}
+      />
+      {timeAgo ? (
+        <Text style={styles.subtitle} numberOfLines={1} testID="command-center-result-timestamp">
+          {/* Non-breaking: web collapses a leading plain space in its own flex item. */}
+          {subtitle ? `\u00a0· ${timeAgo}` : timeAgo}
+        </Text>
+      ) : null}
+    </View>
+  );
+}
+
+/** The same project icon the sidebar's workspace rows lead with: its image, or a lettered square. */
+function WorkspaceProjectIcon({ project }: { project: CommandCenterWorkspaceResult["project"] }) {
+  const initial = projectIconPlaceholderLabelFromDisplayName(project.name).charAt(0).toUpperCase();
+  return (
+    <ProjectIconView
+      iconDataUri={project.iconDataUri}
+      initial={initial}
+      projectViewKey={project.viewKey}
+      size={16}
+      textStyle={styles.projectIconFallbackText}
+    />
+  );
+}
+
+function ResultContent({ result, query }: { result: CommandCenterResult; query: string }) {
   if (result.kind === "file") {
     return (
       <View style={styles.rowContent}>
@@ -438,13 +507,16 @@ function ResultContent({ result }: { result: CommandCenterResult }) {
             <MaterialFileIcon fileName={result.title} size={16} />
           </View>
           <Text style={styles.fileLine} numberOfLines={1} testID="command-center-file-line">
-            <Text style={styles.fileName} testID="command-center-file-name">
-              {result.title}
-            </Text>
+            <QueryHighlightedText
+              query={query}
+              text={result.title}
+              style={styles.fileName}
+              testID="command-center-file-name"
+            />
             {result.subtitle ? (
               <Text style={styles.filePath} testID="command-center-file-path">
                 {" "}
-                {result.subtitle}
+                <QueryHighlightedText query={query} text={result.subtitle} />
               </Text>
             ) : null}
           </Text>
@@ -465,12 +537,18 @@ function ResultContent({ result }: { result: CommandCenterResult }) {
             />
           </View>
           <View style={styles.textContent}>
-            <Text style={styles.title} numberOfLines={1}>
-              {result.title}
-            </Text>
-            <Text style={styles.subtitle} numberOfLines={1} testID="command-center-agent-subtitle">
-              {result.subtitle}
-            </Text>
+            <QueryHighlightedText
+              query={query}
+              text={result.title}
+              style={styles.title}
+              numberOfLines={1}
+            />
+            <SubtitleWithTimestamp
+              query={query}
+              subtitle={result.subtitle}
+              activityAt={result.activityAt}
+              testID="command-center-agent-subtitle"
+            />
           </View>
         </View>
       </View>
@@ -481,20 +559,28 @@ function ResultContent({ result }: { result: CommandCenterResult }) {
     return (
       <View style={styles.rowContent} testID={`command-center-workspace-${key}`}>
         <View style={styles.rowMain}>
-          <View style={styles.iconSlot}>
-            <ThemedFolder size={16} strokeWidth={2.2} />
+          {/* Decorative: the fallback icon's initial must not prefix the row's accessible name. */}
+          <View
+            style={styles.iconSlot}
+            accessibilityElementsHidden
+            importantForAccessibility="no-hide-descendants"
+            aria-hidden
+          >
+            <WorkspaceProjectIcon project={result.project} />
           </View>
           <View style={styles.textContent}>
-            <Text style={styles.title} numberOfLines={1}>
-              {result.title}
-            </Text>
-            <Text
-              style={styles.subtitle}
+            <QueryHighlightedText
+              query={query}
+              text={result.title}
+              style={styles.title}
               numberOfLines={1}
+            />
+            <SubtitleWithTimestamp
+              query={query}
+              subtitle={result.subtitle}
+              activityAt={result.activityAt}
               testID="command-center-workspace-subtitle"
-            >
-              {result.subtitle}
-            </Text>
+            />
           </View>
         </View>
       </View>
@@ -512,11 +598,19 @@ function ResultContent({ result }: { result: CommandCenterResult }) {
             </View>
           ) : null}
           <View style={styles.textContent}>
-            <Text style={styles.title} numberOfLines={1}>
-              {presentation.title}
-            </Text>
+            <QueryHighlightedText
+              query={query}
+              text={presentation.title}
+              style={styles.title}
+              numberOfLines={1}
+            />
             {presentation.subtitle ? (
-              <Text style={styles.subtitle}>{presentation.subtitle}</Text>
+              <QueryHighlightedText
+                query={query}
+                text={presentation.subtitle}
+                style={styles.subtitle}
+                numberOfLines={1}
+              />
             ) : null}
           </View>
         </View>
@@ -541,14 +635,14 @@ function ResultContent({ result }: { result: CommandCenterResult }) {
               style={styles.breadcrumbPart}
             >
               {index > 0 ? <ThemedChevronRight size={13} strokeWidth={2} /> : null}
-              <Text
+              <QueryHighlightedText
+                query={query}
+                text={part}
                 style={
                   index === presentation.path.length - 1 ? styles.title : styles.breadcrumbGroup
                 }
                 numberOfLines={1}
-              >
-                {part}
-              </Text>
+              />
             </View>
           ))}
         </View>
@@ -563,11 +657,9 @@ function ResultContent({ result }: { result: CommandCenterResult }) {
 }
 
 function SectionRow({ row }: { row: Extract<CommandCenterListRow, { kind: "section" }> }) {
-  let sizeStyle = styles.dividerSection;
-  if (row.title && row.divider) sizeStyle = styles.dividedSection;
-  if (row.title && !row.divider) sizeStyle = styles.titledSection;
+  const style = useMemo(() => [styles.section, { height: row.height }], [row.height]);
   return (
-    <View style={sizeStyle}>
+    <View style={style}>
       {row.divider ? <View style={styles.sectionDivider} /> : null}
       {row.title ? <Text style={styles.sectionLabel}>{row.title}</Text> : null}
     </View>
@@ -576,8 +668,10 @@ function SectionRow({ row }: { row: Extract<CommandCenterListRow, { kind: "secti
 
 export function CommandCenter() {
   const { t } = useTranslation();
-  const state = useCommandCenterState();
   const isCompact = useIsCompactFormFactor();
+  const state = useCommandCenterState(
+    isCompact ? COMMAND_CENTER_LIST_METRICS.compact : COMMAND_CENTER_LIST_METRICS.desktop,
+  );
   const showBottomSheet = isCompact && isNative;
   const modalLayer = useGlobalWebOverlayLayer("modal", isWeb && state.open && !showBottomSheet);
   const listRef = useRef<FlatList<CommandCenterListRow>>(null);
@@ -644,11 +738,13 @@ export function CommandCenter() {
       ) : (
         <ResultRow
           result={item.result}
+          height={item.height}
+          query={state.query}
           active={item.result.id === state.activeId}
           onSelect={state.select}
         />
       ),
-    [state.activeId, state.select],
+    [state.activeId, state.query, state.select],
   );
   const getItemLayout = useCallback(
     (_data: ArrayLike<CommandCenterListRow> | null | undefined, index: number) => ({
@@ -901,20 +997,21 @@ const styles = StyleSheet.create((theme) => ({
     fontWeight: "500",
   },
   results: { flex: 1 },
+  // Sections and rows take their height from list-metrics; these styles only place content in it.
+  section: { justifyContent: "flex-end" },
   sectionLabel: {
     paddingHorizontal: theme.spacing[4],
-    paddingBottom: theme.spacing[2],
+    paddingBottom: COMMAND_CENTER_SECTION_GAP,
     fontSize: theme.fontSize.sm,
+    lineHeight: COMMAND_CENTER_LINE_HEIGHT.sectionLabel,
     color: theme.colors.foregroundMuted,
   },
   sectionDivider: {
     height: 1,
-    marginTop: theme.spacing[2],
-    marginBottom: theme.spacing[2],
+    marginVertical: COMMAND_CENTER_SECTION_GAP,
     backgroundColor: theme.colors.border,
   },
-  row: { height: 36, paddingHorizontal: theme.spacing[4], paddingVertical: theme.spacing[2] },
-  tallRow: { height: 56 },
+  row: { paddingHorizontal: theme.spacing[4], justifyContent: "center" },
   activeRow: { backgroundColor: theme.colors.surface1 },
   rowContent: {
     flexDirection: "row",
@@ -933,14 +1030,31 @@ const styles = StyleSheet.create((theme) => ({
   title: {
     color: theme.colors.foreground,
     fontSize: theme.fontSize.base,
-    lineHeight: 18,
+    lineHeight: COMMAND_CENTER_LINE_HEIGHT.title,
     flexShrink: 1,
   },
-  fileLine: { flex: 1, minWidth: 0, fontSize: theme.fontSize.base, lineHeight: 20 },
+  fileLine: {
+    flex: 1,
+    minWidth: 0,
+    fontSize: theme.fontSize.base,
+    lineHeight: COMMAND_CENTER_LINE_HEIGHT.singleLine,
+  },
   fileName: { color: theme.colors.foreground },
   filePath: { color: theme.colors.foregroundMuted },
-  subtitle: { color: theme.colors.foregroundMuted, fontSize: theme.fontSize.sm, lineHeight: 16 },
-  iconSlot: { width: 16, height: 20, alignItems: "center", justifyContent: "center" },
+  subtitle: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+    lineHeight: COMMAND_CENTER_LINE_HEIGHT.subtitle,
+  },
+  subtitleLine: { flexDirection: "row", minWidth: 0 },
+  subtitleText: { flexShrink: 1, minWidth: 0 },
+  iconSlot: {
+    width: 16,
+    height: COMMAND_CENTER_LINE_HEIGHT.singleLine,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  projectIconFallbackText: { fontSize: 9 },
   rowShortcut: { flexShrink: 0 },
   breadcrumb: {
     flex: 1,
@@ -958,7 +1072,7 @@ const styles = StyleSheet.create((theme) => ({
   breadcrumbGroup: {
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.base,
-    lineHeight: 20,
+    lineHeight: COMMAND_CENTER_LINE_HEIGHT.singleLine,
     flexShrink: 0,
   },
   emptyText: {
@@ -978,7 +1092,4 @@ const styles = StyleSheet.create((theme) => ({
   },
   sheetBackground: { backgroundColor: theme.colors.surface0 },
   sheetHandle: { backgroundColor: theme.colors.palette.zinc[600] },
-  titledSection: { height: 32, justifyContent: "flex-end" },
-  dividedSection: { height: 49, justifyContent: "flex-end" },
-  dividerSection: { height: 17, justifyContent: "flex-end" },
 }));
diff --git a/packages/app/src/command-center/list-metrics.ts b/packages/app/src/command-center/list-metrics.ts
new file mode 100644
index 0000000000..603fc91e4c
--- /dev/null
+++ b/packages/app/src/command-center/list-metrics.ts
@@ -0,0 +1,53 @@
+import { SPACING } from "@/styles/theme";
+
+/**
+ * Every vertical size in the Command Center list, in one place.
+ *
+ * The list is virtualized, so it needs each row's height before rendering it. Rather than keep
+ * those numbers in sync with the styles by hand, rows render at exactly the height computed here
+ * and center their content. The styles read the line heights below, so this arithmetic is the
+ * layout.
+ *
+ * A layout chooses one thing: the inset above and below a row's text. Both layouts share the same
+ * shape, so nothing downstream asks which one it got.
+ */
+export const COMMAND_CENTER_LINE_HEIGHT = {
+  /** A row with no subtitle. Also the icon slot, so the icon centers on the title. */
+  singleLine: 20,
+  title: 18,
+  subtitle: 16,
+  sectionLabel: 16,
+} as const;
+
+/** Space around a section's label and around the rule between sections. */
+export const COMMAND_CENTER_SECTION_GAP = SPACING[2];
+const SECTION_DIVIDER_THICKNESS = 1;
+
+export interface CommandCenterListMetrics {
+  singleLineRow: number;
+  twoLineRow: number;
+  /** A section label and the gaps around it. */
+  sectionTitle: number;
+  /** The rule between two sections and the gaps around it. */
+  sectionDivider: number;
+}
+
+function listMetrics(rowInset: number): CommandCenterListMetrics {
+  const line = COMMAND_CENTER_LINE_HEIGHT;
+  return {
+    singleLineRow: rowInset + line.singleLine + rowInset,
+    twoLineRow: rowInset + line.title + line.subtitle + rowInset,
+    sectionTitle: COMMAND_CENTER_SECTION_GAP + line.sectionLabel + COMMAND_CENTER_SECTION_GAP,
+    sectionDivider:
+      COMMAND_CENTER_SECTION_GAP + SECTION_DIVIDER_THICKNESS + COMMAND_CENTER_SECTION_GAP,
+  };
+}
+
+/**
+ * Desktop is dense for a pointer. Compact keeps single-line rows at the 44pt touch height that
+ * `density.rowHeight` uses on compact layouts.
+ */
+export const COMMAND_CENTER_LIST_METRICS = {
+  desktop: listMetrics(SPACING[1.5]),
+  compact: listMetrics(SPACING[3]),
+} as const satisfies Record<string, CommandCenterListMetrics>;
diff --git a/packages/app/src/command-center/results.test.ts b/packages/app/src/command-center/results.test.ts
index 4f6a43d704..688352f00f 100644
--- a/packages/app/src/command-center/results.test.ts
+++ b/packages/app/src/command-center/results.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import type { CommandCenterContribution } from "./contributions";
+import { COMMAND_CENTER_LIST_METRICS } from "./list-metrics";
 import {
   buildContributionSections,
   filterAndRankBuiltInResults,
@@ -101,17 +102,28 @@ function autoModeChoice(): CommandCenterContribution {
   });
 }
 
-function workspace(id: string, title = id, subtitle = "host"): CommandCenterWorkspaceResult {
+function workspace(
+  id: string,
+  title = id,
+  subtitle = "host",
+  activityAt: Date | null = null,
+): CommandCenterWorkspaceResult {
   return {
     kind: "workspace",
     id,
     title,
     subtitle,
+    project: { viewKey: "project", name: "project", iconDataUri: null },
     changeRequestNumber: null,
+    activityAt,
     run: () => undefined,
   };
 }
 
+function minutesAgo(minutes: number): Date {
+  return new Date(Date.UTC(2026, 9, 18, 12, 0) - minutes * 60_000);
+}
+
 function sectionResultIds(sections: ReturnType<typeof buildContributionSections>): string[] {
   const ids: string[] = [];
   for (const section of sections) {
@@ -120,6 +132,8 @@ function sectionResultIds(sections: ReturnType<typeof buildContributionSections>
   return ids;
 }
 
+const metrics = COMMAND_CENTER_LIST_METRICS.desktop;
+
 describe("Command Center result projection", () => {
   it("query-gates model choices and creates one flat row index", () => {
     const contributions = [
@@ -130,16 +144,19 @@ describe("Command Center result projection", () => {
     expect(sectionResultIds(emptySections)).toEqual(["settings"]);
 
     const sections = buildContributionSections(contributions, "o");
-    const projection = projectCommandCenterRows([
-      ...sections,
-      {
-        id: "workspaces",
-        band: PINNED_SECTION_BAND,
-        rank: 2,
-        title: "Workspaces",
-        results: [workspace("workspace:1")],
-      },
-    ]);
+    const projection = projectCommandCenterRows(
+      [
+        ...sections,
+        {
+          id: "workspaces",
+          band: PINNED_SECTION_BAND,
+          rank: 2,
+          title: "Workspaces",
+          results: [workspace("workspace:1")],
+        },
+      ],
+      metrics,
+    );
     expect(projection.rows.map((row) => row.key)).toEqual([
       "section:models",
       "opus",
@@ -147,7 +164,12 @@ describe("Command Center result projection", () => {
       "workspace:1",
     ]);
     expect(projection.rowIndexByResultId.get("workspace:1")).toBe(3);
-    expect(projection.offsets).toEqual([0, 32, 68, 117]);
+    expect(projection.offsets).toEqual([
+      0,
+      metrics.sectionTitle,
+      metrics.sectionTitle + metrics.singleLineRow,
+      metrics.sectionTitle + metrics.singleLineRow + metrics.sectionDivider + metrics.sectionTitle,
+    ]);
   });
 
   it("shows query-only actions only when their group matches a search", () => {
@@ -177,15 +199,18 @@ describe("Command Center result projection", () => {
 
   it("keeps keyboard selection aligned with rows beyond the render window", () => {
     const workspaces = Array.from({ length: 200 }, (_, index) => workspace(`workspace:${index}`));
-    const projection = projectCommandCenterRows([
-      {
-        id: "workspaces",
-        band: PINNED_SECTION_BAND,
-        rank: 0,
-        title: "Workspaces",
-        results: workspaces,
-      },
-    ]);
+    const projection = projectCommandCenterRows(
+      [
+        {
+          id: "workspaces",
+          band: PINNED_SECTION_BAND,
+          rank: 0,
+          title: "Workspaces",
+          results: workspaces,
+        },
+      ],
+      metrics,
+    );
 
     let activeId: string | null = workspaces[0].id;
     for (let index = 0; index < 150; index += 1) {
@@ -195,7 +220,7 @@ describe("Command Center result projection", () => {
     const targetId = workspaces[150].id;
     expect(activeId).toBe(targetId);
     expect(projection.rowIndexByResultId.get(targetId)).toBe(151);
-    expect(projection.offsets[151]).toBe(32 + 150 * 56);
+    expect(projection.offsets[151]).toBe(metrics.sectionTitle + 150 * metrics.twoLineRow);
   });
 });
 
@@ -248,7 +273,7 @@ describe("Command Center relevance ordering", () => {
       schedulesAction(),
       action({ id: "new-agent", group: "workspace", groupRank: -1, title: "New agent" }),
     ];
-    const projection = projectCommandCenterRows(buildContributionSections(shuffled, ""));
+    const projection = projectCommandCenterRows(buildContributionSections(shuffled, ""), metrics);
 
     // Query-gated choices stay hidden; the rest fall back to groupRank, unchanged by this feature.
     expect(projection.selectableResults.map((result) => result.id)).toEqual([
@@ -301,16 +326,19 @@ describe("Command Center relevance ordering", () => {
   });
 
   it("keeps Workspaces below contributions even on a perfect match", () => {
-    const projection = projectCommandCenterRows([
-      ...buildContributionSections([schedulesAction()], "auto"),
-      {
-        id: "workspaces",
-        band: PINNED_SECTION_BAND,
-        rank: 2,
-        title: "Workspaces",
-        results: [workspace("auto")],
-      },
-    ]);
+    const projection = projectCommandCenterRows(
+      [
+        ...buildContributionSections([schedulesAction()], "auto"),
+        {
+          id: "workspaces",
+          band: PINNED_SECTION_BAND,
+          rank: 2,
+          title: "Workspaces",
+          results: [workspace("auto")],
+        },
+      ],
+      metrics,
+    );
 
     expect(projection.selectableResults.map((result) => result.id)).toEqual(["schedules", "auto"]);
   });
@@ -324,7 +352,7 @@ describe("Command Center relevance ordering", () => {
       title: "Workspaces",
       results: [workspace("auto")],
     };
-    const projection = projectCommandCenterRows([workspaces, ...sections.toReversed()]);
+    const projection = projectCommandCenterRows([workspaces, ...sections.toReversed()], metrics);
 
     expect(projection.selectableResults.map((result) => result.id)).toEqual([
       "mode:auto",
@@ -461,15 +489,19 @@ describe("filterAndRankBuiltInResults", () => {
     visible: [row.title, row.subtitle],
     hidden: [],
   });
-  const byTitle = (left: CommandCenterWorkspaceResult, right: CommandCenterWorkspaceResult) =>
-    left.title.localeCompare(right.title);
 
-  it("caps an empty query and preserves the caller's order", () => {
-    const rows = Array.from({ length: 8 }, (_, index) => workspace(`w${index}`));
+  it("shows the five most recent rows for an empty query", () => {
+    const rows = Array.from({ length: 8 }, (_, index) =>
+      workspace(`w${index}`, `w${index}`, "host", minutesAgo(8 - index)),
+    );
 
-    expect(
-      filterAndRankBuiltInResults(rows, "", visibleOnly, byTitle).map((row) => row.id),
-    ).toEqual(["w0", "w1", "w2", "w3", "w4"]);
+    expect(filterAndRankBuiltInResults(rows, "", visibleOnly).map((row) => row.id)).toEqual([
+      "w7",
+      "w6",
+      "w5",
+      "w4",
+      "w3",
+    ]);
   });
 
   it("puts the best match first even when it sorts last alphabetically", () => {
@@ -480,9 +512,9 @@ describe("filterAndRankBuiltInResults", () => {
     ];
 
     // Alphabetically this is Alpha, Label, Zebra. "lab des" only matches Label as Design.
-    expect(
-      filterAndRankBuiltInResults(rows, "lab des", visibleOnly, byTitle).map((row) => row.id),
-    ).toEqual(["c"]);
+    expect(filterAndRankBuiltInResults(rows, "lab des", visibleOnly).map((row) => row.id)).toEqual([
+      "c",
+    ]);
   });
 
   it("ranks a title match above a match that only the hidden field reached", () => {
@@ -492,24 +524,41 @@ describe("filterAndRankBuiltInResults", () => {
         ? { visible: [row.title], hidden: ["deploy"] }
         : { visible: [row.title], hidden: [] };
 
-    expect(
-      filterAndRankBuiltInResults(rows, "deploy", fields, byTitle).map((row) => row.id),
-    ).toEqual(["title-hit", "hidden-hit"]);
+    expect(filterAndRankBuiltInResults(rows, "deploy", fields).map((row) => row.id)).toEqual([
+      "title-hit",
+      "hidden-hit",
+    ]);
   });
 
-  it("breaks an equal score with the caller's tiebreak, not with match order", () => {
-    // Both titles are an exact prefix match for "task", so only the tiebreak separates them.
-    const rows = [workspace("second", "Task zebra"), workspace("first", "Task alpha")];
+  it("orders rows in the same match tier by recency, not by where the word sits", () => {
+    // Both are whole-word matches for "usage"; the older one finds it earlier in the title.
+    const rows = [
+      workspace("older", "Deliver sidebar usage", "host", minutesAgo(60)),
+      workspace("newer", "design the cli interface to expose usage data", "host", minutesAgo(5)),
+    ];
 
-    expect(
-      filterAndRankBuiltInResults(rows, "task", visibleOnly, byTitle).map((row) => row.id),
-    ).toEqual(["first", "second"]);
+    expect(filterAndRankBuiltInResults(rows, "usage", visibleOnly).map((row) => row.id)).toEqual([
+      "newer",
+      "older",
+    ]);
+  });
+
+  it("keeps a better match tier above a more recent weaker match", () => {
+    const rows = [
+      workspace("subsequence", "Fix stuck toast", "fix/updating-messages", minutesAgo(1)),
+      workspace("whole-word", "Usage hover card", "host", minutesAgo(600)),
+    ];
+
+    expect(filterAndRankBuiltInResults(rows, "usage", visibleOnly).map((row) => row.id)).toEqual([
+      "whole-word",
+      "subsequence",
+    ]);
   });
 
   it("drops a row when one token matches nothing", () => {
     const rows = [workspace("a", "Label as Design")];
 
-    expect(filterAndRankBuiltInResults(rows, "lab zzz", visibleOnly, byTitle)).toEqual([]);
+    expect(filterAndRankBuiltInResults(rows, "lab zzz", visibleOnly)).toEqual([]);
   });
 });
 
diff --git a/packages/app/src/command-center/results.ts b/packages/app/src/command-center/results.ts
index 8f3528cd2c..84fc91d3f0 100644
--- a/packages/app/src/command-center/results.ts
+++ b/packages/app/src/command-center/results.ts
@@ -5,6 +5,7 @@ import {
   scoreTextFields,
 } from "@getpaseo/protocol/search/text-match";
 import type { CommandCenterContribution } from "./contributions";
+import type { CommandCenterListMetrics } from "./list-metrics";
 
 /** Sections that reorder by how well they match the query. */
 export const CONTRIBUTION_SECTION_BAND = 0;
@@ -43,13 +44,21 @@ export function compareCommandCenterScores(
   return left.fieldRank - right.fieldRank || compareMatchScores(left.match, right.match);
 }
 
+export interface CommandCenterWorkspaceProject {
+  viewKey: string;
+  name: string;
+  iconDataUri: string | null;
+}
+
 export interface CommandCenterWorkspaceResult {
   kind: "workspace";
   id: string;
   title: string;
   subtitle: string;
+  project: CommandCenterWorkspaceProject;
   /** PR/MR number backing this workspace, so a number query can match it exactly. */
   changeRequestNumber: number | null;
+  activityAt: Date | null;
   run(): void;
 }
 
@@ -59,6 +68,7 @@ export interface CommandCenterAgentResult {
   agent: AggregatedAgent;
   title: string;
   subtitle: string;
+  activityAt: Date | null;
   run(): void;
 }
 
@@ -169,13 +179,12 @@ function contributionSearchFields(
   return { visible, hidden: contribution.keywords };
 }
 
-function resultHeight(result: CommandCenterResult): number {
-  if (result.kind === "workspace" || result.kind === "agent") return 56;
-  if (result.kind === "file") return 36;
-  if (result.contribution.presentation.kind === "action") {
-    return result.contribution.presentation.subtitle ? 56 : 36;
-  }
-  return 36;
+/** Whether the row draws a second, subtitle line under its title. */
+function hasSubtitleLine(result: CommandCenterResult): boolean {
+  if (result.kind === "workspace" || result.kind === "agent") return true;
+  if (result.kind === "file") return false;
+  const presentation = result.contribution.presentation;
+  return presentation.kind === "action" && Boolean(presentation.subtitle);
 }
 
 /**
@@ -203,22 +212,42 @@ function resultScore(result: CommandCenterResult): CommandCenterScore | undefine
 /** Rows shown when nothing has been typed, per pinned category. */
 const DEFAULT_CATEGORY_RESULT_LIMIT = 5;
 
+/** A built-in row (workspace or agent) that orders by how recently it saw activity. */
+export interface CommandCenterRecentRow {
+  activityAt: Date | null;
+}
+
+/** Most recent first. A row with no timestamp sorts after every row that has one. */
+export function compareByRecency(left: CommandCenterRecentRow, right: CommandCenterRecentRow) {
+  return (right.activityAt?.getTime() ?? 0) - (left.activityAt?.getTime() ?? 0);
+}
+
+/**
+ * Rank built-in rows by the kind of match they made: which fields matched, then the matcher's
+ * tier. Offset and spread are deliberately left out. They only say where in the title the word
+ * happened to sit, so "usage" in "Deliver sidebar usage" and in "expose usage data" would be
+ * ordered by sentence position. Leaving them out makes those rows equal, and recency decides.
+ */
+export function compareBuiltInScores(left: CommandCenterScore, right: CommandCenterScore): number {
+  return left.fieldRank - right.fieldRank || left.match.tier - right.match.tier;
+}
+
 /**
  * Filter and rank already-built rows. Rows in, rows out — building them needs translations,
  * navigation callbacks and the project tree, none of which matching cares about, so that stays
  * with the caller and this stays testable without mounting React.
  *
- * `tiebreak` is the caller's own ordering (alphabetical for workspaces, status and recency for
- * agents). It decides equal-scoring rows, so an agent awaiting input still outranks an idle one
- * that matched exactly as well.
+ * Rows rank by `compareBuiltInScores`; rows that rank equally, including every row of an empty
+ * query, go most recent first.
  */
-export function filterAndRankBuiltInResults<Row>(
+export function filterAndRankBuiltInResults<Row extends CommandCenterRecentRow>(
   rows: readonly Row[],
   query: string,
   fieldsOf: (row: Row) => CommandCenterSearchFields,
-  tiebreak: (left: Row, right: Row) => number,
 ): Row[] {
-  if (!query.trim()) return rows.slice(0, DEFAULT_CATEGORY_RESULT_LIMIT);
+  if (!query.trim()) {
+    return [...rows].sort(compareByRecency).slice(0, DEFAULT_CATEGORY_RESULT_LIMIT);
+  }
 
   const scored: { row: Row; score: CommandCenterScore }[] = [];
   for (const row of rows) {
@@ -227,7 +256,7 @@ export function filterAndRankBuiltInResults<Row>(
   }
   scored.sort(
     (left, right) =>
-      compareCommandCenterScores(left.score, right.score) || tiebreak(left.row, right.row),
+      compareBuiltInScores(left.score, right.score) || compareByRecency(left.row, right.row),
   );
   return scored.map((entry) => entry.row);
 }
@@ -293,6 +322,7 @@ export function buildContributionSections(
 
 export function projectCommandCenterRows(
   sections: readonly CommandCenterResultSection[],
+  metrics: CommandCenterListMetrics,
 ): CommandCenterListProjection {
   const populated = sections
     .filter((section) => section.results.length > 0)
@@ -305,10 +335,8 @@ export function projectCommandCenterRows(
 
   for (const [sectionIndex, section] of populated.entries()) {
     const divider = sectionIndex > 0;
-    let sectionHeight = 0;
-    if (section.title && divider) sectionHeight = 49;
-    if (section.title && !divider) sectionHeight = 32;
-    if (!section.title && divider) sectionHeight = 17;
+    const sectionHeight =
+      (divider ? metrics.sectionDivider : 0) + (section.title ? metrics.sectionTitle : 0);
     if (sectionHeight > 0) {
       offsets.push(offset);
       rows.push({
@@ -321,7 +349,7 @@ export function projectCommandCenterRows(
       offset += sectionHeight;
     }
     for (const result of section.results) {
-      const height = resultHeight(result);
+      const height = hasSubtitleLine(result) ? metrics.twoLineRow : metrics.singleLineRow;
       offsets.push(offset);
       rowIndexByResultId.set(result.id, rows.length);
       rows.push({ kind: "result", key: result.id, result, height });
diff --git a/packages/app/src/command-center/workspace-search.test.ts b/packages/app/src/command-center/workspace-search.test.ts
index 2cdae53dd2..93bb5fc6bf 100644
--- a/packages/app/src/command-center/workspace-search.test.ts
+++ b/packages/app/src/command-center/workspace-search.test.ts
@@ -7,21 +7,22 @@ function workspace(input: {
   title?: string;
   subtitle?: string;
   changeRequestNumber?: number | null;
+  activityAt?: Date | null;
 }): CommandCenterWorkspaceResult {
   return {
     kind: "workspace",
     id: input.id,
     title: input.title ?? input.id,
     subtitle: input.subtitle ?? "",
+    project: { viewKey: "project", name: "project", iconDataUri: null },
     changeRequestNumber: input.changeRequestNumber ?? null,
+    activityAt: input.activityAt ?? null,
     run: () => undefined,
   };
 }
 
 function ids(rows: readonly CommandCenterWorkspaceResult[], query: string): string[] {
-  return filterAndRankWorkspaces(rows, query, (left, right) => left.id.localeCompare(right.id)).map(
-    (row) => row.id,
-  );
+  return filterAndRankWorkspaces(rows, query).map((row) => row.id);
 }
 
 describe("filterAndRankWorkspaces", () => {
@@ -79,4 +80,18 @@ describe("filterAndRankWorkspaces", () => {
     const text = workspace({ id: "a-text", title: "Migration 42" });
     expect(ids([text, subject], "42")).toEqual(["payments", "a-text"]);
   });
+
+  it("orders workspaces in the same match tier by recency", () => {
+    const older = workspace({
+      id: "older",
+      title: "Usage hover card",
+      activityAt: new Date("2026-10-01T00:00:00Z"),
+    });
+    const newer = workspace({
+      id: "newer",
+      title: "Deliver sidebar usage",
+      activityAt: new Date("2026-10-17T00:00:00Z"),
+    });
+    expect(ids([older, newer], "usage")).toEqual(["newer", "older"]);
+  });
 });
diff --git a/packages/app/src/command-center/workspace-search.ts b/packages/app/src/command-center/workspace-search.ts
index 317d1f1561..40c7c34d01 100644
--- a/packages/app/src/command-center/workspace-search.ts
+++ b/packages/app/src/command-center/workspace-search.ts
@@ -1,5 +1,6 @@
 import {
-  compareCommandCenterScores,
+  compareBuiltInScores,
+  compareByRecency,
   filterAndRankBuiltInResults,
   scoreSearchFields,
   type CommandCenterScore,
@@ -33,29 +34,22 @@ function searchFields(workspace: CommandCenterWorkspaceResult) {
   return { visible: [workspace.title, workspace.subtitle], hidden: [] };
 }
 
-function compareScoredWorkspaces(
-  left: ScoredWorkspace,
-  right: ScoredWorkspace,
-  tiebreak: (left: CommandCenterWorkspaceResult, right: CommandCenterWorkspaceResult) => number,
-): number {
+function compareScoredWorkspaces(left: ScoredWorkspace, right: ScoredWorkspace): number {
   if (left.changeRequestHit !== right.changeRequestHit) {
     return left.changeRequestHit ? -1 : 1;
   }
   if (left.score && right.score) {
-    const scoreDelta = compareCommandCenterScores(left.score, right.score);
+    const scoreDelta = compareBuiltInScores(left.score, right.score);
     if (scoreDelta !== 0) return scoreDelta;
   }
-  return tiebreak(left.workspace, right.workspace);
+  return compareByRecency(left.workspace, right.workspace);
 }
 
 export function filterAndRankWorkspaces(
   workspaces: readonly CommandCenterWorkspaceResult[],
   query: string,
-  tiebreak: (left: CommandCenterWorkspaceResult, right: CommandCenterWorkspaceResult) => number,
 ): CommandCenterWorkspaceResult[] {
-  if (!query.trim()) {
-    return filterAndRankBuiltInResults(workspaces, query, searchFields, tiebreak);
-  }
+  if (!query.trim()) return filterAndRankBuiltInResults(workspaces, query, searchFields);
 
   const changeRequestNumber = parseChangeRequestQuery(query);
   const matches: ScoredWorkspace[] = [];
@@ -65,6 +59,6 @@ export function filterAndRankWorkspaces(
       changeRequestNumber !== null && workspace.changeRequestNumber === changeRequestNumber;
     if (score || changeRequestHit) matches.push({ workspace, score, changeRequestHit });
   }
-  matches.sort((left, right) => compareScoredWorkspaces(left, right, tiebreak));
+  matches.sort(compareScoredWorkspaces);
   return matches.map((match) => match.workspace);
 }
diff --git a/packages/app/src/components/agent-list.tsx b/packages/app/src/components/agent-list.tsx
index 7da36742ae..b487e53660 100644
--- a/packages/app/src/components/agent-list.tsx
+++ b/packages/app/src/components/agent-list.tsx
@@ -48,6 +48,8 @@ const DATE_SECTION_ORDER = [
   "older",
 ] as const satisfies readonly DateSectionKey[];
 
+const HISTORY_MATCH_OPTIONS = { typoTolerant: true } as const;
+
 type FlatListItem =
   | { type: "header"; key: string; section: DateSectionKey }
   | { type: "agent"; key: string; agent: AggregatedAgent };
@@ -190,10 +192,11 @@ function SessionRow({
   const pendingPermissionCount = agent.pendingPermissionCount ?? 0;
   const ranges = useMemo(
     () => ({
-      workspace: findHighlightRanges(search ?? "", workspaceName),
-      title: findHighlightRanges(search ?? "", agent.title ?? ""),
-      branch: findHighlightRanges(search ?? "", branch),
-      project: findHighlightRanges(search ?? "", projectName),
+      // History search matches typo-tolerantly on the daemon, so the marks do too.
+      workspace: findHighlightRanges(search ?? "", workspaceName, HISTORY_MATCH_OPTIONS),
+      title: findHighlightRanges(search ?? "", agent.title ?? "", HISTORY_MATCH_OPTIONS),
+      branch: findHighlightRanges(search ?? "", branch, HISTORY_MATCH_OPTIONS),
+      project: findHighlightRanges(search ?? "", projectName, HISTORY_MATCH_OPTIONS),
     }),
     [search, workspaceName, agent.title, branch, projectName],
   );
diff --git a/packages/app/src/components/ui/highlighted-text-segments.test.ts b/packages/app/src/components/ui/highlighted-text-segments.test.ts
index 6f42fe823d..4e23389fde 100644
--- a/packages/app/src/components/ui/highlighted-text-segments.test.ts
+++ b/packages/app/src/components/ui/highlighted-text-segments.test.ts
@@ -63,7 +63,9 @@ describe("findHighlightRanges", () => {
     );
   });
   it("uses the search matcher for typo and scattered-character matches", () => {
-    expect(marked("billing", findHighlightRanges("bulling", "billing"))).toBe("[billing]");
+    expect(
+      marked("billing", findHighlightRanges("bulling", "billing", { typoTolerant: true })),
+    ).toBe("[billing]");
     expect(marked("paseo-babysit", findHighlightRanges("pasbab", "paseo-babysit"))).toBe(
       "[pas]eo-[bab]ysit",
     );
@@ -79,6 +81,9 @@ describe("findHighlightRanges", () => {
       "check [conf]i[g]uration",
     );
   });
+  it("marks typos only when the list was matched typo-tolerantly", () => {
+    expect(findHighlightRanges("bulling", "billing")).toEqual([]);
+  });
   it("merges overlapping tokens and ignores empty or unmatched queries", () => {
     expect(marked("billing", findHighlightRanges("bill billing", "billing"))).toBe("[billing]");
     expect(findHighlightRanges("", "billing")).toEqual([]);
diff --git a/packages/app/src/components/ui/highlighted-text-segments.ts b/packages/app/src/components/ui/highlighted-text-segments.ts
index 0bd4f1e0bd..f65f6c44eb 100644
--- a/packages/app/src/components/ui/highlighted-text-segments.ts
+++ b/packages/app/src/components/ui/highlighted-text-segments.ts
@@ -4,6 +4,7 @@ import {
   scoreMatch,
   tokenizeQuery,
   type MatchRange,
+  type TextFieldsOptions,
 } from "@getpaseo/protocol/search/text-match";
 
 export interface HighlightSegment {
@@ -40,11 +41,22 @@ export function toHighlightSegments(
   return segments;
 }
 
-/** Best-effort presentation of each query token in this field, independently of other fields. */
-export function findHighlightRanges(query: string, text: string): MatchRange[] {
+/**
+ * Best-effort presentation of each query token in this field, independently of other fields.
+ * Pass the same options the list was matched with, so a mark never claims a match the list did
+ * not make.
+ */
+export function findHighlightRanges(
+  query: string,
+  text: string,
+  options: TextFieldsOptions = {},
+): MatchRange[] {
   const ranges = tokenizeQuery(query)
     .flatMap((token) => {
-      const score = scoreMatch(token, text, { fuzzy: fuzzyPolicyForToken(token) });
+      const score = scoreMatch(token, text, {
+        fuzzy: options.typoTolerant ? fuzzyPolicyForToken(token) : null,
+        subsequence: options.subsequence,
+      });
       return score ? matchRanges(token, text, score) : [];
     })
     .sort((left, right) => left.start - right.start);
diff --git a/packages/app/src/screens/projects-screen.test.tsx b/packages/app/src/screens/projects-screen.test.tsx
index 0e3337e240..a91043a709 100644
--- a/packages/app/src/screens/projects-screen.test.tsx
+++ b/packages/app/src/screens/projects-screen.test.tsx
@@ -182,6 +182,7 @@ function workspaceSummary(overrides: Partial<WorkspaceSummary> = {}): WorkspaceS
     status: "done",
     currentBranch: "main",
     changeRequestNumber: null,
+    statusEnteredAt: null,
     ...overrides,
   };
 }
diff --git a/packages/app/src/utils/projects.ts b/packages/app/src/utils/projects.ts
index f5ee1142c4..647561c56f 100644
--- a/packages/app/src/utils/projects.ts
+++ b/packages/app/src/utils/projects.ts
@@ -13,6 +13,7 @@ export interface WorkspaceSummary {
   archivingAt?: string;
   /** Pull/merge request number backing this workspace, so a query can find it. */
   changeRequestNumber: number | null;
+  statusEnteredAt: Date | null;
 }
 
 export interface ProjectHostEntry {
@@ -161,6 +162,7 @@ function toWorkspaceSummary(workspace: WorkspaceDescriptor): WorkspaceSummary {
     currentBranch: currentBranch && currentBranch !== "HEAD" ? currentBranch : null,
     ...(workspace.archivingAt ? { archivingAt: workspace.archivingAt } : {}),
     changeRequestNumber: toChangeRequestNumber(workspace),
+    statusEnteredAt: workspace.statusEnteredAt,
   };
 }
 

From 095dd0316e4681af3b3f7ccaa70e004e1cd3e26f Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Oct 2026 09:25:57 +0200
Subject: [PATCH 263/270] fix(app): avoid pane rerenders while resizing
 Explorer (#7284)

Keep drag widths out of the shared stylesheet and skip unchanged panes during width previews. Preserve the existing resize state and persistence behavior.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: Ivan Malison <1246619+colonelpanic8@users.noreply.github.com>
---
 .../explorer-resize-performance.spec.ts       | 118 ++++++++++++++++++
 .../app/src/components/split-container.tsx    |  11 +-
 2 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 packages/app/e2e/browser/explorer-resize-performance.spec.ts

diff --git a/packages/app/e2e/browser/explorer-resize-performance.spec.ts b/packages/app/e2e/browser/explorer-resize-performance.spec.ts
new file mode 100644
index 0000000000..33cf48c94c
--- /dev/null
+++ b/packages/app/e2e/browser/explorer-resize-performance.spec.ts
@@ -0,0 +1,118 @@
+import type { Page } from "@playwright/test";
+import { test, expect } from "../support/fixtures";
+import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
+
+interface DragMeasurement {
+  observer: MutationObserver;
+  stylesheetMutations: number;
+}
+
+declare global {
+  interface Window {
+    __PASEO_EXPLORER_DRAG_MEASUREMENT__?: DragMeasurement;
+  }
+}
+
+async function waitForResizePaint(page: Page): Promise<void> {
+  await page.evaluate(
+    () =>
+      new Promise<void>((resolve) => {
+        requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
+      }),
+  );
+}
+
+async function beginResizeMeasurement(page: Page): Promise<void> {
+  await page.evaluate(() => {
+    const stylesheet = document.getElementById("unistyles-web");
+    if (!stylesheet) throw new Error("Shared stylesheet is missing");
+    globalThis.__PASEO_RESET_RENDER_PROFILE__!();
+    const measurement: DragMeasurement = {
+      stylesheetMutations: 0,
+      observer: new MutationObserver((records) => {
+        measurement.stylesheetMutations += records.length;
+      }),
+    };
+    measurement.observer.observe(stylesheet, {
+      childList: true,
+      subtree: true,
+      characterData: true,
+    });
+    window.__PASEO_EXPLORER_DRAG_MEASUREMENT__ = measurement;
+  });
+}
+
+async function previewExplorerResize(page: Page, distance: number) {
+  const handle = page
+    .getByTestId("workspace-explorer-sidebar-resize-handle")
+    .getByRole("separator");
+  const explorer = page.getByTestId("workspace-explorer-sidebar");
+  const bounds = await handle.boundingBox();
+  if (!bounds) throw new Error("Explorer resize handle is missing");
+  const before = (await explorer.boundingBox())!.width;
+  const x = bounds.x + bounds.width / 2;
+  const y = bounds.y + 100;
+  await page.mouse.move(x, y);
+  await page.mouse.down();
+  await waitForResizePaint(page);
+  await beginResizeMeasurement(page);
+  for (let move = 1; move <= 20; move++) {
+    await page.mouse.move(x + (distance * move) / 20, y);
+    await waitForResizePaint(page);
+  }
+  const during = (await explorer.boundingBox())!.width;
+  const measurement = await page.evaluate(() => {
+    const state = window.__PASEO_EXPLORER_DRAG_MEASUREMENT__!;
+    state.observer.disconnect();
+    return {
+      stylesheetMutations: state.stylesheetMutations,
+      paneRenders: Object.entries(globalThis.__PASEO_RENDER_PROFILE_REASONS__ ?? {})
+        .filter(([id]) => id.startsWith("SplitPaneView:"))
+        .reduce((sum, [, reasons]) => sum + (reasons.render ?? 0), 0),
+    };
+  });
+  await page.mouse.up();
+  await waitForResizePaint(page);
+  const after = (await explorer.boundingBox())!.width;
+  expect(during).toBeCloseTo(before - distance, 0);
+  expect(after).toBeCloseTo(during, 0);
+  return { ...measurement, width: after };
+}
+
+async function expectExplorerWidthSurvivesReload(page: Page, width: number): Promise<void> {
+  await page.reload();
+  const explorer = page.getByTestId("workspace-explorer-sidebar");
+  await expect(explorer).toBeVisible();
+  await expect.poll(async () => (await explorer.boundingBox())?.width).toBeCloseTo(width, 0);
+}
+
+test("Explorer drag previews without rerendering panes or rewriting the shared stylesheet", async ({
+  page,
+  withWorkspace,
+}) => {
+  await page.setViewportSize({ width: 1600, height: 1000 });
+  await page.addInitScript(() => {
+    globalThis.__PASEO_RENDER_PROFILE_ENABLED__ = true;
+  });
+  const workspace = await withWorkspace();
+  await workspace.navigateTo();
+  await runWorkspaceActionFromCommandCenter(page, "Split pane right");
+  await runWorkspaceActionFromCommandCenter(page, "Split pane right");
+  await page.getByTestId("workspace-explorer-toggle").first().click();
+  await expect(page.getByTestId("workspace-explorer-sidebar")).toBeVisible();
+  // Verify that direct pane renders are being counted before resetting them.
+  expect(
+    await page.evaluate(() =>
+      Object.keys(globalThis.__PASEO_RENDER_PROFILE_REASONS__ ?? {}).some((id) =>
+        id.startsWith("SplitPaneView:"),
+      ),
+    ),
+  ).toBe(true);
+  const grown = await previewExplorerResize(page, -100);
+  const shrunk = await previewExplorerResize(page, 50);
+  expect(grown.stylesheetMutations).toBe(0);
+  expect(grown.paneRenders).toBe(0);
+  expect(shrunk.stylesheetMutations).toBe(0);
+  expect(shrunk.paneRenders).toBe(0);
+  await expectExplorerWidthSurvivesReload(page, shrunk.width);
+});
diff --git a/packages/app/src/components/split-container.tsx b/packages/app/src/components/split-container.tsx
index 9705f3be15..c6d95f40b7 100644
--- a/packages/app/src/components/split-container.tsx
+++ b/packages/app/src/components/split-container.tsx
@@ -1,5 +1,6 @@
 import {
   Fragment,
+  memo,
   useCallback,
   useEffect,
   useMemo,
@@ -88,7 +89,8 @@ import {
   type WorkspaceLayout,
 } from "@/stores/workspace-layout-store";
 import type { WorkspaceTab } from "@/workspace-tabs/model";
-import { RenderProfile } from "@/utils/render-profiler";
+import { recordRenderProfileReasons, RenderProfile } from "@/utils/render-profiler";
+import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import { isNative } from "@/constants/platform";
 import { panelTargetSupportsHost } from "@/plugins/workspace-panels/locations";
 
@@ -435,7 +437,7 @@ export function SplitContainer({
     : inheritedWindowChromeCorners;
   const mainColumnStyle = styles.mainColumn;
   const explorerSidebarDockStyle = useMemo(
-    () => [styles.explorerSidebarDock, { width: explorerSidebarWidth }],
+    () => [styles.explorerSidebarDock, inlineUnistylesStyle({ width: explorerSidebarWidth })],
     [explorerSidebarWidth],
   );
   const handleWorkspaceShellLayout = useCallback((event: LayoutChangeEvent) => {
@@ -1121,7 +1123,7 @@ function SplitNodeView({
   );
 }
 
-function SplitPaneView({
+const SplitPaneView = memo(function SplitPaneView({
   pane,
   uiTabs,
   isFocused,
@@ -1158,6 +1160,7 @@ function SplitPaneView({
   focusModeEnabled,
   onExitFocusMode,
 }: SplitPaneViewProps) {
+  recordRenderProfileReasons(`SplitPaneView:${pane.id}`, ["render"]);
   const paneRef = useRef<View | null>(null);
   const stableOnFocusPane = useStableEvent(onFocusPane);
   const paneState = useMemo(
@@ -1312,7 +1315,7 @@ function SplitPaneView({
       </View>
     </RenderProfile>
   );
-}
+});
 
 function collectPanesById(node: SplitNode): Map<string, SplitPane> {
   const next = new Map<string, SplitPane>();

From 3882b957a63439f9d5c6e8513fc7cb420167d818 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 14:56:39 +0700
Subject: [PATCH 264/270] ci: rebalance Playwright shard weights from measured
 step minutes (#7297)

Weights derived from the Playwright step minutes of five eight-shard runs; shard 8 drops from about 16 minutes to 10 and the shards sit within about 4 minutes of each other once normalized for runner CPU.
---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2cbb0c29a..35432703cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -452,7 +452,9 @@ jobs:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           E2E_WORKERS: "2"
           # File groups are weighted by observed reporter durations.
-          PWTEST_SHARD_WEIGHTS: "93:100:101:104:91:94:122:110"
+          # Share of the test list per shard, rebalanced from the Playwright step
+          # minutes of five eight-shard runs so the slowest and fastest shards meet.
+          PWTEST_SHARD_WEIGHTS: "85:94:117:128:91:103:127:85"
 
       - name: Upload test artifacts
         uses: actions/upload-artifact@v4

From 233997ed5c932a450e399ec241f153894befd812 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 15:12:28 +0700
Subject: [PATCH 265/270] Give Markdown blocks one consistent gap, roomier on
 desktop, and a zoom-in cursor on images (#7298)

* fix(scripts): recover installs when a dependency patch changed

patch-package cannot apply a patch over a package patched with an earlier
version of it, and without --error-on-fail it exits 0 locally. Checkouts kept
the stale patch silently: the Markdown code block spacing fix never reached
them. The script now fails the install and removes that package so the next
npm install reinstalls it clean with the current patch. A patch-package that
cannot start fails the install without removing anything.

* fix(app): give Markdown blocks one gap and roomier desktop spacing

Every Markdown block is followed by one gap, density.blockGap: 12 on compact
layouts and 16 wider. The library's element styles and the views stacked
outside it (Mermaid segments on native, streaming head and tail) take the same
token, so no block type carries its own margins. Desktop was too tight at 12.

Markdown images show a zoom-in cursor on web, since tapping opens the lightbox.
---
 .github/workflows/ci.yml                      |  3 +
 docs/development.md                           |  4 +-
 docs/markdown-renderer.md                     |  4 +
 .../e2e/browser/plan-card-markdown.spec.ts    | 41 ++------
 .../src/components/markdown/block-stack.tsx   | 28 ++++++
 .../markdown/fence/mermaid/host.web.tsx       | 17 +---
 .../markdown/fence/mermaid/presentation.ts    |  3 -
 .../app/src/components/markdown/frame.tsx     | 18 ----
 .../src/components/markdown/renderer.test.ts  |  8 +-
 .../app/src/components/markdown/renderer.tsx  | 73 +++++++-------
 .../app/src/components/markdown/styles.ts     | 12 +--
 packages/app/src/styles/density.ts            |  9 +-
 ...own+1.2.0-nightly-20261014-766fc0e67.patch | 12 +++
 scripts/postinstall-patches.mjs               | 50 +++++-----
 scripts/postinstall-patches.test.mjs          | 99 +++++++++++++++++++
 15 files changed, 245 insertions(+), 136 deletions(-)
 create mode 100644 packages/app/src/components/markdown/block-stack.tsx
 delete mode 100644 packages/app/src/components/markdown/frame.tsx
 create mode 100644 scripts/postinstall-patches.test.mjs

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 35432703cd..5d2d489f09 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -145,6 +145,9 @@ jobs:
       - name: Install dependencies
         run: node scripts/npm-retry.mjs ci
 
+      - name: Verify dependency patch recovery
+        run: node --test scripts/postinstall-patches.test.mjs
+
       - name: Build server stack
         run: npm run build:server
 
diff --git a/docs/development.md b/docs/development.md
index 437b635fec..7eb92375ab 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -535,7 +535,9 @@ For tighter loops, you can rebuild a single workspace:
 `patches/*.patch` are applied by `scripts/postinstall-patches.mjs` on every install. A patch only
 runs when its package is actually present, so add the package to that script's `patchedPackages`
 list when you introduce a new patch — otherwise the file sits in `patches/` and never applies.
-Regenerate a patch with `npx patch-package <package>` after editing `node_modules/<package>`, and
+patch-package cannot apply a patch that changed after an earlier version was applied, so the
+script removes that package and fails the install; the next `npm install` reinstalls it clean
+with the current patch. Regenerate a patch with `npx patch-package <package>` after editing `node_modules/<package>`, and
 patch every build the consumers use: Metro resolves the `react-native` field of a package
 (`src/*.ts` for `react-native-svg`), while Node and Vitest resolve `main`/`module`
 (`lib/commonjs`, `lib/module`). Patching only `lib/` leaves the app bundle unfixed.
diff --git a/docs/markdown-renderer.md b/docs/markdown-renderer.md
index 0afbcc1cb3..d2508f0004 100644
--- a/docs/markdown-renderer.md
+++ b/docs/markdown-renderer.md
@@ -4,6 +4,10 @@ Use `MarkdownRenderer` for chat replies, file previews, plans, pull requests and
 
 Native selection belongs to the library's text view. Keep an assistant message in one row so selection can cross paragraphs, headings and lists. Code blocks and tables use the library's native views and their selection behavior. Web uses browser selection over semantic HTML. Once its WASM parser is initialized, the library parses synchronously for the first commit of each mounted row; an empty interim row would corrupt virtualized measurements and move the reader. Chat owns paced reveal, the web render cap, message identity and list measurement. Native renders completed messages together. While streaming, it keeps closed blocks in one head view and updates a separate tail, then reunites the text on completion. See [native parsing cost](agent-stream-performance.md#native-parsing-cost) for the boundary and pacing constraints.
 
+## Block spacing
+
+Every block is separated by one gap, `density.blockGap`: 12 on compact layouts, 16 wider. Inside the library's text, every element style ends with that gap and the library drops it after the last block. Views stacked outside the library (Mermaid segments, streaming head and tail) use the same gap through `MarkdownBlockStack`. Do not give a block type its own margins; change the gap.
+
 ## Links and images
 
 Workspace file links use the shared file-link resolver. The workspace supplies its client, root and open-file action once; chat can supply the agent's more specific context. URLs use the same link press path. Recognized inline-code paths stay tappable. The library callback carries the tapped occurrence’s syntax context. Preserve it when opening files: explicit Markdown links decode URL escapes, while recognized inline-code paths preserve literal percent characters and use suffix lookup. Identical URL strings in different occurrences must stay distinct. Explicit absolute workspace links receive a relative hover title; existing authored titles remain intact.
diff --git a/packages/app/e2e/browser/plan-card-markdown.spec.ts b/packages/app/e2e/browser/plan-card-markdown.spec.ts
index 90bdb8b6db..7faae09dca 100644
--- a/packages/app/e2e/browser/plan-card-markdown.spec.ts
+++ b/packages/app/e2e/browser/plan-card-markdown.spec.ts
@@ -287,43 +287,22 @@ test("markdown links underline on hover", async ({ page }) => {
   }
 });
 
-// The web code block replaces the library's own block, which must keep its spacing.
-test("blocks around a web code block keep their spacing", async ({ page }) => {
+const PIXEL_PNG =
+  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
+
+test("Markdown images show a zoom-in cursor", async ({ page }) => {
   const session = await seedMockAgentWorkspace({
-    repoPrefix: "markdown-block-spacing-",
-    title: "Markdown block spacing",
-    featureValues: {
-      mockAssistantResponse:
-        "Intro.\n\n```sh\nnpx playwright test\n```\n\n| Step | Result |\n| --- | --- |\n| hover | none |\n\nMiddle.\n\n```ts\nconst a = 1;\n```\n\nClosing.",
-    },
-    initialPrompt: "Show blocks",
+    repoPrefix: "markdown-image-cursor-",
+    title: "Markdown image cursor",
+    featureValues: { mockAssistantResponse: `Before.\n\n![pixel](${PIXEL_PNG})\n\nAfter.` },
+    initialPrompt: "Show image",
   });
   try {
     await session.client.waitForFinish(session.agentId, 30_000);
     await openAgentRoute(page, session);
-    const message = page.getByTestId("assistant-message");
-    await expect(message.getByRole("table")).toBeVisible();
-    const gaps = await measureBlockGaps(message.locator(".enrm-text").first());
-    for (const { between, gap } of gaps) expect(gap, between).toBeGreaterThanOrEqual(8);
+    const image = page.getByTestId("assistant-message").getByRole("button", { name: "pixel" });
+    await expect(image).toHaveCSS("cursor", "zoom-in");
   } finally {
     await session.cleanup();
   }
 });
-
-async function measureBlockGaps(root: Locator) {
-  return root.evaluate((element) => {
-    const blocks = Array.from(element.children).map((block) => {
-      // Wrappers with display: contents have no box; measure their first rendered child.
-      let box: Element = block;
-      while (box.getBoundingClientRect().height === 0 && box.firstElementChild) {
-        box = box.firstElementChild;
-      }
-      const rect = box.getBoundingClientRect();
-      return { text: (block.textContent ?? "").slice(0, 20), top: rect.top, bottom: rect.bottom };
-    });
-    return blocks.slice(1).map((block, index) => ({
-      between: `${blocks[index].text} -> ${block.text}`,
-      gap: Math.round(block.top - blocks[index].bottom),
-    }));
-  });
-}
diff --git a/packages/app/src/components/markdown/block-stack.tsx b/packages/app/src/components/markdown/block-stack.tsx
new file mode 100644
index 0000000000..e17421a84c
--- /dev/null
+++ b/packages/app/src/components/markdown/block-stack.tsx
@@ -0,0 +1,28 @@
+import type { ReactNode } from "react";
+import { View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import { markdownCopyImageSourcesDataSet } from "@/assistant-selection-copy/markup";
+import { isWeb } from "@/constants/platform";
+import { density } from "@/styles/density";
+
+/** Stacks Markdown blocks rendered as separate views with the same gap the text puts between its blocks. */
+export function MarkdownBlockStack({
+  imageSources,
+  children,
+}: {
+  imageSources?: Record<string, string>;
+  children: ReactNode;
+}) {
+  return (
+    <View
+      style={styles.stack}
+      dataSet={isWeb && imageSources ? markdownCopyImageSourcesDataSet(imageSources) : undefined}
+    >
+      {children}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  stack: { gap: density.blockGap },
+});
diff --git a/packages/app/src/components/markdown/fence/mermaid/host.web.tsx b/packages/app/src/components/markdown/fence/mermaid/host.web.tsx
index fed9afe3a3..9370bc90c0 100644
--- a/packages/app/src/components/markdown/fence/mermaid/host.web.tsx
+++ b/packages/app/src/components/markdown/fence/mermaid/host.web.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useMemo, useState } from "react";
-import { Pressable, View, type TextStyle, type ViewStyle } from "react-native";
+import { Pressable, View, type ViewStyle } from "react-native";
 import { Code, Maximize2, Workflow } from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
@@ -68,15 +68,6 @@ function MermaidFenceHostImpl({
     ],
     [openFullscreen, showSourcePress, t],
   );
-  const sourceView = useMemo(() => {
-    const { marginTop, marginBottom, marginVertical, ...sourceTextStyle } = textStyle;
-    const margins: ViewStyle = {
-      marginTop: marginTop ?? marginVertical,
-      marginBottom: marginBottom ?? marginVertical,
-    };
-    const text: TextStyle = sourceTextStyle;
-    return { container: [margins, sourceContainerStyle], text };
-  }, [textStyle]);
   const diagramStyle = useMemo(
     () => [
       getDiagramBoxStyle(textStyle),
@@ -90,19 +81,17 @@ function MermaidFenceHostImpl({
     [visible],
   );
   const sourceVisible = !diagramVisible;
-  const sourceContainer = showSource ? sourceView.container : sourceContainerStyle;
-  const sourceTextStyle = showSource ? sourceView.text : textStyle;
   const viewportStyle = diagramVisible ? diagramStyle : measuringStyle;
 
   return (
     <>
       {sourceVisible ? (
-        <View style={sourceContainer}>
+        <View style={sourceContainerStyle}>
           <HighlightedCodeBlock
             code={code}
             language="mermaid"
             inheritedStyles={inheritedStyles}
-            textStyle={sourceTextStyle}
+            textStyle={textStyle}
           />
           {showSource && canShowDiagram ? (
             <Pressable
diff --git a/packages/app/src/components/markdown/fence/mermaid/presentation.ts b/packages/app/src/components/markdown/fence/mermaid/presentation.ts
index 48d0d879fe..369bf1280c 100644
--- a/packages/app/src/components/markdown/fence/mermaid/presentation.ts
+++ b/packages/app/src/components/markdown/fence/mermaid/presentation.ts
@@ -6,9 +6,6 @@ export function getDiagramBoxStyle(style: TextStyle): ViewStyle {
     borderColor: style.borderColor,
     borderRadius: style.borderRadius,
     borderWidth: style.borderWidth,
-    marginBottom: style.marginBottom,
-    marginTop: style.marginTop,
-    marginVertical: style.marginVertical,
     padding: style.padding,
   };
 }
diff --git a/packages/app/src/components/markdown/frame.tsx b/packages/app/src/components/markdown/frame.tsx
deleted file mode 100644
index 86e8a4df13..0000000000
--- a/packages/app/src/components/markdown/frame.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React, { type ReactElement } from "react";
-import { View } from "react-native";
-import { markdownCopyImageSourcesDataSet } from "@/assistant-selection-copy/markup";
-import { isWeb } from "@/constants/platform";
-
-export function MarkdownRendererFrame({
-  imageSources,
-  children,
-}: {
-  imageSources: Record<string, string>;
-  children: ReactElement;
-}) {
-  return (
-    <View dataSet={isWeb ? markdownCopyImageSourcesDataSet(imageSources) : undefined}>
-      {children}
-    </View>
-  );
-}
diff --git a/packages/app/src/components/markdown/renderer.test.ts b/packages/app/src/components/markdown/renderer.test.ts
index c8a7375737..670dcf6c1e 100644
--- a/packages/app/src/components/markdown/renderer.test.ts
+++ b/packages/app/src/components/markdown/renderer.test.ts
@@ -307,7 +307,7 @@ describe("shared Markdown theme colours", () => {
     ["dark", darkTheme],
     ["light", lightTheme],
   ] as const)("uses %s theme colours for tables and task labels", (_name, theme) => {
-    const { markdownStyle: style } = createMarkdownStyles(theme);
+    const { markdownStyle: style } = createMarkdownStyles(theme, { blockGap: 16 });
     expect(style.table).toMatchObject({
       color: theme.colors.foreground,
       headerTextColor: theme.colors.foreground,
@@ -337,7 +337,7 @@ it.each([
 ] as const)(
   "uses %s theme colours for quotes, admonitions, code, links and dividers",
   (_name, theme) => {
-    const { markdownStyle: style } = createMarkdownStyles(theme);
+    const { markdownStyle: style } = createMarkdownStyles(theme, { blockGap: 16 });
     expect(style.blockquote).toMatchObject({
       color: `${theme.colors.foreground}cc`,
       backgroundColor: theme.colors.surface1,
@@ -364,7 +364,7 @@ it.each([
 );
 
 it.each([darkTheme, lightTheme])("supplies the theme selection colour to the renderer", (theme) => {
-  expect(createMarkdownStyles(theme)).toHaveProperty(
+  expect(createMarkdownStyles(theme, { blockGap: 16 })).toHaveProperty(
     "selectionColor",
     theme.colors.terminal.selectionBackground,
   );
@@ -431,7 +431,7 @@ it("preserves backslashes and decodes entities inside HTML code", () => {
 it.each([false, true])(
   "caps inline images to the paragraph line height (compact: %s)",
   (compact) => {
-    const { markdownStyle } = createMarkdownStyles(darkTheme, compact);
+    const { markdownStyle } = createMarkdownStyles(darkTheme, { compact, blockGap: 16 });
     expect(markdownStyle.inlineImage?.size).toBe(markdownStyle.paragraph?.lineHeight);
   },
 );
diff --git a/packages/app/src/components/markdown/renderer.tsx b/packages/app/src/components/markdown/renderer.tsx
index c4a832342f..4d6f042c2f 100644
--- a/packages/app/src/components/markdown/renderer.tsx
+++ b/packages/app/src/components/markdown/renderer.tsx
@@ -9,7 +9,8 @@ import { useStableEvent } from "@/hooks/use-stable-event";
 import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
 import type { Theme } from "@/styles/theme";
 import { isWeb } from "@/constants/platform";
-import { MarkdownRendererFrame } from "./frame";
+import { density, resolveDensity } from "@/styles/density";
+import { MarkdownBlockStack } from "./block-stack";
 import { WEB_RENDERERS } from "./renderers";
 import { createMarkdownStyles } from "./styles";
 import { PENDING_MARKDOWN_IMAGE } from "./source";
@@ -21,8 +22,11 @@ import { MermaidFence, MermaidStreamingContext, splitMermaidFences } from "./fen
 const ThemedMarkdown = withUnistyles(EnrichedMarkdownText);
 const MD4C_FLAGS = { latexMath: false, hardSoftBreaks: true, admonitions: true };
 
-const regularStyle = (theme: Theme) => createMarkdownStyles(theme);
-const compactStyle = (theme: Theme) => createMarkdownStyles(theme, true);
+// Reading the breakpoint here makes Unistyles restyle the text when the layout crosses it.
+const markdownStyle = (compact: boolean) => (theme: Theme, rt: { breakpoint?: string }) =>
+  createMarkdownStyles(theme, { compact, blockGap: resolveDensity(rt, density.blockGap) });
+const regularStyle = markdownStyle(false);
+const compactStyle = markdownStyle(true);
 const WEB_CONTAINER = { userSelect: "text" as const };
 
 export interface MarkdownRendererProps extends MarkdownImageContext {
@@ -43,21 +47,20 @@ export const MarkdownRenderer = memo(function MarkdownRenderer(props: MarkdownRe
   );
   if (!streaming || boundary === 0) return <MarkdownPart {...props} />;
   return (
-    <>
-      <MarkdownPart {...props} text={props.text.slice(0, boundary)} continues />
+    <MarkdownBlockStack>
+      <MarkdownPart {...props} text={props.text.slice(0, boundary)} />
       <MarkdownPart {...props} text={props.text.slice(boundary)} />
-    </>
+    </MarkdownBlockStack>
   );
 });
 
 const MarkdownPart = memo(function MarkdownPart({
   text,
-  continues = false,
   compact = false,
   streaming = false,
   onLinkPress,
   ...imageContext
-}: MarkdownRendererProps & { continues?: boolean }) {
+}: MarkdownRendererProps) {
   const environment = useAssistantFileLinkEnvironment();
   const actions = useAssistantFileLinkActions();
   const client =
@@ -86,35 +89,35 @@ const MarkdownPart = memo(function MarkdownPart({
       isWeb ? [{ kind: "markdown", id: "0", source: markdown }] : splitMermaidFences(markdown),
     [markdown],
   );
-  const content = (
+  return (
     <MermaidStreamingContext.Provider value={streaming}>
-      {segments.map((segment) =>
-        segment.kind === "mermaid" ? (
-          <MermaidFence key={`${segment.kind}:${segment.id}`} code={segment.source} />
-        ) : (
-          <ThemedMarkdown
-            key={`${segment.kind}:${segment.id}`}
-            markdown={segment.source}
-            containerStyle={isWeb ? WEB_CONTAINER : undefined}
-            uniProps={compact ? compactStyle : regularStyle}
-            flavor="github"
-            selectable
-            allowTrailingMargin={continues && segment === segments[segments.length - 1]}
-            md4cFlags={MD4C_FLAGS}
-            linkRecognition={linkRecognition}
-            enableTaskListItemToggle={false}
-            enableLinkPreview={false}
-            enableBlockContextMenu={false}
-            // JS reveal owns pacing; native fade animation is a separate experiment.
-            streamingAnimation={false}
-            onLinkPress={pressLink}
-            onImagePress={pressImage}
-            renderers={isWeb ? WEB_RENDERERS : undefined}
-          />
-        ),
-      )}
+      <MarkdownBlockStack imageSources={imageSources}>
+        {segments.map((segment) =>
+          segment.kind === "mermaid" ? (
+            <MermaidFence key={`${segment.kind}:${segment.id}`} code={segment.source} />
+          ) : (
+            <ThemedMarkdown
+              key={`${segment.kind}:${segment.id}`}
+              markdown={segment.source}
+              containerStyle={isWeb ? WEB_CONTAINER : undefined}
+              uniProps={compact ? compactStyle : regularStyle}
+              flavor="github"
+              selectable
+              md4cFlags={MD4C_FLAGS}
+              linkRecognition={linkRecognition}
+              enableTaskListItemToggle={false}
+              enableLinkPreview={false}
+              enableBlockContextMenu={false}
+              // JS reveal owns pacing; native fade animation is a separate experiment.
+              streamingAnimation={false}
+              onLinkPress={pressLink}
+              onImagePress={pressImage}
+              renderers={isWeb ? WEB_RENDERERS : undefined}
+            />
+          ),
+        )}
+      </MarkdownBlockStack>
       {image ? <AttachmentLightbox source={image} onClose={closeImage} /> : null}
     </MermaidStreamingContext.Provider>
   );
-  return <MarkdownRendererFrame imageSources={imageSources}>{content}</MarkdownRendererFrame>;
 });
diff --git a/packages/app/src/components/markdown/styles.ts b/packages/app/src/components/markdown/styles.ts
index 03d6c69b23..57ee40ff12 100644
--- a/packages/app/src/components/markdown/styles.ts
+++ b/packages/app/src/components/markdown/styles.ts
@@ -4,23 +4,23 @@ import { isWeb } from "@/constants/platform";
 
 export function createMarkdownStyles(
   theme: Theme,
-  compact = false,
+  { compact = false, blockGap }: { compact?: boolean; blockGap: number },
 ): { markdownStyle: MarkdownStyle; selectionColor: string } {
   const fontSize = compact ? theme.fontSize.base : theme.fontSize.content;
+  // Every block is followed by the same gap; the library drops it after the last block.
+  const block = { marginTop: 0, marginBottom: blockGap };
   const paragraph = {
     fontSize,
     fontFamily: theme.fontFamily.ui,
     lineHeight: Math.round(fontSize * 1.4),
     color: theme.colors.foreground,
-    marginTop: 0,
-    marginBottom: theme.spacing[3],
+    ...block,
   };
   const heading = (scale: number) => ({
     ...paragraph,
     fontSize: Math.round(fontSize * scale),
     lineHeight: Math.round(fontSize * scale * 1.3),
     fontWeight: "bold",
-    marginTop: theme.spacing[3],
   });
   return {
     selectionColor: theme.colors.terminal.selectionBackground,
@@ -93,8 +93,8 @@ export function createMarkdownStyles(
         borderColor: theme.colors.foregroundMuted,
       },
       inlineImage: { size: paragraph.lineHeight },
-      image: { height: 320, resizeMode: "contain", borderRadius: 8 },
-      thematicBreak: { color: theme.colors.border, height: 1, marginTop: 12, marginBottom: 12 },
+      image: { ...block, height: 320, resizeMode: "contain", borderRadius: 8 },
+      thematicBreak: { ...block, color: theme.colors.border, height: 1 },
     },
   };
 }
diff --git a/packages/app/src/styles/density.ts b/packages/app/src/styles/density.ts
index 2383685d24..d29547ee88 100644
--- a/packages/app/src/styles/density.ts
+++ b/packages/app/src/styles/density.ts
@@ -26,15 +26,22 @@ export const density = {
   tightRowHeight: byLayout(36, 28),
   /** A square icon-only button that sits in a row or toolbar. */
   iconButton: byLayout(44, 28),
+  /** The space between two blocks of rich text, such as Markdown paragraphs, code and images. */
+  blockGap: byLayout(12, 16),
 };
 
+/** Resolves a density value for a prop, which Unistyles cannot resolve on its own. */
+export function resolveDensity<T>(rt: { breakpoint?: string }, value: { xs: T; md: T }): T {
+  return isCompactBreakpoint(rt.breakpoint) ? value.xs : value.md;
+}
+
 /** The width or height of a slot that holds an icon of `size`. */
 export function densityIconBox(size: DensityIconSize) {
   return byLayout(COMPACT_ICON_SIZE[size], ICON_SIZE[size]);
 }
 
 export function densityIconSize(rt: { breakpoint?: string }, size: DensityIconSize): number {
-  return isCompactBreakpoint(rt.breakpoint) ? COMPACT_ICON_SIZE[size] : ICON_SIZE[size];
+  return resolveDensity(rt, densityIconBox(size));
 }
 
 /** Extends a `withUnistyles` icon mapping so the icon also takes its density size. */
diff --git a/patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch b/patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch
index 535f61b6ef..8226f81bc2 100644
--- a/patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch
+++ b/patches/react-native-enriched-markdown+1.2.0-nightly-20261014-766fc0e67.patch
@@ -1333,6 +1333,18 @@ index dd70713..ca0385a 100644
    const label = language ? `Code block: ${language}` : 'Code block';
    if (callbacks.onCodeBlockPress == null) {
      return /*#__PURE__*/_jsx("pre", {
+@@ -214,7 +230,10 @@ function ImageRenderer({
+     src: url,
+     alt: alt,
+     title: title,
+-    style: imgStyle,
++    style: {
++      ...imgStyle,
++      cursor: 'zoom-in'
++    },
+     role: "button",
+     tabIndex: 0,
+     "aria-label": alt,
 diff --git a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js.map b/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js.map
 index dc917c4..cf59150 100644
 --- a/node_modules/react-native-enriched-markdown/lib/module/web/renderers/BlockRenderers.js.map
diff --git a/scripts/postinstall-patches.mjs b/scripts/postinstall-patches.mjs
index a571614c5a..5a2e62c5c6 100644
--- a/scripts/postinstall-patches.mjs
+++ b/scripts/postinstall-patches.mjs
@@ -60,30 +60,37 @@ if (!existsSync("patches") || installedPackages.length === 0) {
 
 const patchFiles = readdirSync("patches").filter((file) => file.endsWith(".patch"));
 
-// Group patch files by the directory patch-package must run from.
-const patchFilesByCwd = new Map();
-for (const { patchPrefix, cwd = "." } of installedPackages) {
+const isWindows = process.platform === "win32";
+const cmd = isWindows ? "patch-package.cmd" : "patch-package";
+
+let failed = false;
+for (const [index, { nodeModulesPath, patchPrefix, cwd = "." }] of installedPackages.entries()) {
   const files = patchFiles.filter((file) => file.startsWith(patchPrefix));
   if (files.length === 0) {
     continue;
   }
-  const group = patchFilesByCwd.get(cwd) ?? [];
-  group.push(...files);
-  patchFilesByCwd.set(cwd, group);
+  const outcome = applyPatches(cwd, files, index);
+  if (outcome === "applied") {
+    continue;
+  }
+  failed = true;
+  if (outcome === "unavailable") {
+    continue;
+  }
+  // patch-package cannot apply a patch that changed after an earlier version of it was
+  // applied. Without the package, the next install fetches it clean and applies the patch.
+  rmSync(nodeModulesPath, { recursive: true, force: true });
+  console.error(
+    `postinstall-patches: removed ${nodeModulesPath} because its patch did not apply. ` +
+      "Run npm install again to reinstall it with the current patch. " +
+      "If it fails again on the clean package, the patch is out of date and must be regenerated.",
+  );
 }
 
-if (patchFilesByCwd.size === 0) {
-  process.exit(0);
-}
-
-const isWindows = process.platform === "win32";
-const cmd = isWindows ? "patch-package.cmd" : "patch-package";
-
-let groupIndex = 0;
-for (const [cwd, files] of patchFilesByCwd) {
-  groupIndex += 1;
-  const tempPatchDir = join(".tmp", `postinstall-patches-${process.pid}-${groupIndex}`);
+process.exit(failed ? 1 : 0);
 
+function applyPatches(cwd, files, index) {
+  const tempPatchDir = join(".tmp", `postinstall-patches-${process.pid}-${index}`);
   mkdirSync(tempPatchDir, { recursive: true });
   for (const patchFile of files) {
     copyFileSync(join("patches", patchFile), join(tempPatchDir, patchFile));
@@ -91,7 +98,7 @@ for (const [cwd, files] of patchFilesByCwd) {
 
   let result;
   try {
-    result = spawnSync(cmd, ["--patch-dir", relative(cwd, tempPatchDir)], {
+    result = spawnSync(cmd, ["--patch-dir", relative(cwd, tempPatchDir), "--error-on-fail"], {
       cwd,
       shell: isWindows,
       stdio: "inherit",
@@ -103,10 +110,7 @@ for (const [cwd, files] of patchFilesByCwd) {
 
   if (result.error) {
     console.error("postinstall-patches: patch-package failed to spawn:", result.error.message);
+    return "unavailable";
   }
-  if (result.status !== 0) {
-    process.exit(result.status ?? 1);
-  }
+  return result.status === 0 ? "applied" : "rejected";
 }
-
-process.exit(0);
diff --git a/scripts/postinstall-patches.test.mjs b/scripts/postinstall-patches.test.mjs
new file mode 100644
index 0000000000..9e4d4c0722
--- /dev/null
+++ b/scripts/postinstall-patches.test.mjs
@@ -0,0 +1,99 @@
+import assert from "node:assert/strict";
+import { spawnSync } from "node:child_process";
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { test } from "node:test";
+
+const script = path.resolve("scripts", "postinstall-patches.mjs");
+const bin = path.resolve("node_modules", ".bin");
+const packageName = "react-native-draggable-flatlist";
+const patchFile = `${packageName}+4.0.3.patch`;
+
+function createCheckout() {
+  const root = mkdtempSync(path.join(tmpdir(), "postinstall-patches-"));
+  writeFileSync(path.join(root, "package.json"), JSON.stringify({ name: "checkout" }));
+  const packageDir = path.join(root, "node_modules", packageName);
+  mkdirSync(packageDir, { recursive: true });
+  writeFileSync(
+    path.join(packageDir, "package.json"),
+    JSON.stringify({ name: packageName, version: "4.0.3" }),
+  );
+  writeFileSync(path.join(packageDir, "index.js"), "export const value = 1;\n");
+  mkdirSync(path.join(root, "patches"));
+  return { root, packageDir };
+}
+
+function writePatch(root, from, to) {
+  const file = `node_modules/${packageName}/index.js`;
+  writeFileSync(
+    path.join(root, "patches", patchFile),
+    [
+      `diff --git a/${file} b/${file}`,
+      `--- a/${file}`,
+      `+++ b/${file}`,
+      "@@ -1 +1 @@",
+      `-export const value = ${from};`,
+      `+export const value = ${to};`,
+      "",
+    ].join("\n"),
+  );
+}
+
+function install(root, PATH = `${bin}${path.delimiter}${process.env.PATH}`) {
+  return spawnSync(process.execPath, [script], {
+    cwd: root,
+    encoding: "utf8",
+    env: { ...process.env, PATH },
+  });
+}
+
+test("a patch that changed since it was applied removes the package for a clean reinstall", () => {
+  const { root, packageDir } = createCheckout();
+  try {
+    writePatch(root, 1, 2);
+    assert.equal(install(root).status, 0);
+    assert.equal(
+      readFileSync(path.join(packageDir, "index.js"), "utf8"),
+      "export const value = 2;\n",
+    );
+
+    writePatch(root, 1, 3);
+    const result = install(root);
+
+    assert.equal(result.status, 1);
+    assert.match(result.stderr, /Run npm install again/);
+    assert.equal(existsSync(packageDir), false);
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});
+
+test("an already applied patch leaves the package in place", () => {
+  const { root, packageDir } = createCheckout();
+  try {
+    writePatch(root, 1, 2);
+    assert.equal(install(root).status, 0);
+    assert.equal(install(root).status, 0);
+    assert.equal(
+      readFileSync(path.join(packageDir, "index.js"), "utf8"),
+      "export const value = 2;\n",
+    );
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});
+
+test("a missing patch-package fails the install and leaves the package in place", () => {
+  const { root, packageDir } = createCheckout();
+  try {
+    writePatch(root, 1, 2);
+    const result = install(root, root);
+
+    assert.equal(result.status, 1);
+    assert.match(result.stderr, /failed to spawn/);
+    assert.equal(existsSync(packageDir), true);
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});

From 60fa12c4de17be6ec87be6ed3bce980077b697f2 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Oct 2026 11:57:41 +0200
Subject: [PATCH 266/270] Report disconnected hosts in new agent drafts (#7303)

* fix(app): report offline hosts in new agent drafts

A disconnected client still exists, and pending form resolution and retained loading catalogs outlive the connection. Use host connection state for draft readiness and model loading while keeping known models available for reconnect.

Co-authored-by: Ivan Malison <IvanMalison@gmail.com>

* test(app): confirm draft recovery on a fresh host connection

---------

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: Ivan Malison <IvanMalison@gmail.com>
---
 .../app/e2e/browser/offline-draft.spec.ts     | 32 +++++++++++++++++++
 .../src/composer/draft/workspace-tab-core.ts  |  6 ++--
 .../src/composer/draft/workspace-tab.test.ts  | 16 +++++++++-
 .../app/src/composer/draft/workspace-tab.tsx  |  5 +--
 .../app/src/hooks/use-agent-form-state.ts     | 10 ++++--
 .../provider-selection.test.ts                | 21 ++++++++++--
 .../provider-selection/provider-selection.ts  | 16 ++++++----
 7 files changed, 88 insertions(+), 18 deletions(-)
 create mode 100644 packages/app/e2e/browser/offline-draft.spec.ts

diff --git a/packages/app/e2e/browser/offline-draft.spec.ts b/packages/app/e2e/browser/offline-draft.spec.ts
new file mode 100644
index 0000000000..36ae726457
--- /dev/null
+++ b/packages/app/e2e/browser/offline-draft.spec.ts
@@ -0,0 +1,32 @@
+import { expect, test } from "../support/fixtures";
+import { expectComposerModel } from "../support/helpers/agent-profiles";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import { createAgentTabFromMenu } from "../support/helpers/workspace-tabs";
+import { submitMessage } from "../support/helpers/composer";
+
+async function restoreHostConnection(gate: Awaited<ReturnType<typeof installDaemonWebSocketGate>>) {
+  gate.holdNextServerMessage("status");
+  gate.restore();
+  await gate.waitForHeldServerMessage("status");
+  gate.releaseHeldServerMessage("status");
+}
+
+test("an offline workspace draft reports the disconnected host instead of loading models", async ({
+  page,
+  withWorkspace,
+}) => {
+  const gate = await installDaemonWebSocketGate(page);
+  const workspace = await withWorkspace();
+  await workspace.navigateTo();
+  await gate.drop();
+  await gate.waitForBlockedConnection();
+  await createAgentTabFromMenu(page);
+  await submitMessage(page, "hello");
+  await expect(page.getByRole("alert").filter({ hasText: "Host is not connected" })).toHaveText(
+    "Host is not connected",
+  );
+  await expect(page.getByText("Loading...", { exact: true })).toHaveCount(0);
+  await restoreHostConnection(gate);
+  await expectComposerModel(page, "Ten second stream");
+  await expect(page.getByRole("textbox", { name: "Message agent..." })).toHaveValue("hello");
+});
diff --git a/packages/app/src/composer/draft/workspace-tab-core.ts b/packages/app/src/composer/draft/workspace-tab-core.ts
index 30411aeb00..26bf548064 100644
--- a/packages/app/src/composer/draft/workspace-tab-core.ts
+++ b/packages/app/src/composer/draft/workspace-tab-core.ts
@@ -24,7 +24,7 @@ export function validateDraftSubmission(input: {
   };
   autoSubmitConfig: WorkspaceDraftAutoSubmitConfig | null;
   workspaceDirectory: string | null;
-  hasClient: boolean;
+  isConnected: boolean;
 }): string | null {
   const {
     text,
@@ -32,7 +32,7 @@ export function validateDraftSubmission(input: {
     composerState,
     autoSubmitConfig,
     workspaceDirectory,
-    hasClient,
+    isConnected,
   } = input;
   const readiness = resolveSubmissionReadiness({
     text,
@@ -46,7 +46,7 @@ export function validateDraftSubmission(input: {
     },
     autoSubmitConfig,
     workspaceDirectory,
-    hasClient,
+    isConnected,
   });
   return readiness.ok ? null : (readiness.reason ?? null);
 }
diff --git a/packages/app/src/composer/draft/workspace-tab.test.ts b/packages/app/src/composer/draft/workspace-tab.test.ts
index 5952083a62..1d7e2d4b2c 100644
--- a/packages/app/src/composer/draft/workspace-tab.test.ts
+++ b/packages/app/src/composer/draft/workspace-tab.test.ts
@@ -17,12 +17,26 @@ function validate(overrides = {}) {
     composerState: baseComposerState,
     autoSubmitConfig: null,
     workspaceDirectory: "/tmp/project",
-    hasClient: true,
+    isConnected: true,
     ...overrides,
   });
 }
 
 describe("workspace draft agent model validation", () => {
+  test("reports an offline host before an absent catalog or pending model defaults", () => {
+    expect(
+      validate({
+        isConnected: false,
+        composerState: {
+          ...baseComposerState,
+          providerDefinitions: [],
+          selectedProvider: null,
+          isModelLoading: true,
+        },
+      }),
+    ).toBe("Host is not connected");
+  });
+
   test("allows a ready provider with no models to submit without a selected model", () => {
     expect(validate({})).toBeNull();
   });
diff --git a/packages/app/src/composer/draft/workspace-tab.tsx b/packages/app/src/composer/draft/workspace-tab.tsx
index b54b344a36..27ca8b8af8 100644
--- a/packages/app/src/composer/draft/workspace-tab.tsx
+++ b/packages/app/src/composer/draft/workspace-tab.tsx
@@ -16,7 +16,7 @@ import { useAgentInputDraft } from "@/composer/draft/input-draft";
 import type { CreateAgentInitialValues } from "@/hooks/use-agent-form-state";
 import { useDraftAgentCreateFlow, type DraftCreateAttempt } from "@/composer/draft/create-flow";
 import { resolveTurnPresentation, TURN_LIVENESS_IDLE } from "@/timeline/turn-liveness";
-import { useHostRuntimeClient } from "@/runtime/host-runtime";
+import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { buildWorkspaceDraftAgentConfig } from "@/screens/workspace/workspace-draft-agent-config";
 import { buildDraftStoreKey } from "@/stores/draft-keys";
 import { useCreateFlowStore } from "@/stores/create-flow-store";
@@ -305,6 +305,7 @@ export function WorkspaceDraftAgentTab({
 }: WorkspaceDraftAgentTabProps) {
   const { t } = useTranslation();
   const client = useHostRuntimeClient(serverId);
+  const isConnected = useHostRuntimeIsConnected(serverId);
   const workspaceFields = useWorkspaceFields(serverId, workspaceId, (w) => ({
     workspaceDirectory: w.workspaceDirectory,
     id: w.id,
@@ -445,7 +446,7 @@ export function WorkspaceDraftAgentTab({
         composerState,
         autoSubmitConfig,
         workspaceDirectory: draftWorkingDirectory,
-        hasClient: Boolean(client),
+        isConnected,
       });
     },
     onBeforeSubmit: async () => {
diff --git a/packages/app/src/hooks/use-agent-form-state.ts b/packages/app/src/hooks/use-agent-form-state.ts
index 26908bd6a0..1522ce082e 100644
--- a/packages/app/src/hooks/use-agent-form-state.ts
+++ b/packages/app/src/hooks/use-agent-form-state.ts
@@ -36,6 +36,7 @@ import {
   type FormState,
   type ProviderModelsByProvider,
 } from "@/provider-selection/resolve-agent-form";
+import { useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import type { MaterializedAgentProfile } from "@/agent-profiles";
 
 export type { FormInitialValues } from "@/provider-selection/resolve-agent-form";
@@ -186,6 +187,8 @@ export function useAgentFormState(options: UseAgentFormStateOptions): UseAgentFo
     refetchIfStale: refetchSnapshotIfStale,
   } = useProvidersSnapshot(serverId, { cwd: workingDir });
 
+  const isConnected = useHostRuntimeIsConnected(serverId ?? "");
+
   const allProviderEntries = useMemo(() => snapshotEntries ?? [], [snapshotEntries]);
   const snapshotProviderDefinitions = useMemo(
     () => buildProviderDefinitions(snapshotEntries),
@@ -220,8 +223,8 @@ export function useAgentFormState(options: UseAgentFormStateOptions): UseAgentFo
     [snapshotEntries],
   );
   const snapshotModelSelectorProviders = useMemo(
-    () => buildSelectableProviderSelectorProviders(snapshotEntries),
-    [snapshotEntries],
+    () => buildSelectableProviderSelectorProviders(snapshotEntries, isConnected),
+    [snapshotEntries, isConnected],
   );
   const snapshotSelectedEntry = useMemo(
     () =>
@@ -247,7 +250,8 @@ export function useAgentFormState(options: UseAgentFormStateOptions): UseAgentFo
   const availableModels = snapshotSelectedProviderModels;
   const modeOptions = snapshotSelectedProviderModes;
   const isModelSelectionLoading =
-    resolution.status === "pending" || snapshotIsLoading || selectedProviderIsLoading;
+    isConnected &&
+    (resolution.status === "pending" || snapshotIsLoading || selectedProviderIsLoading);
   const isAllModelsLoading = isModelSelectionLoading;
 
   useEffect(() => {
diff --git a/packages/app/src/provider-selection/provider-selection.test.ts b/packages/app/src/provider-selection/provider-selection.test.ts
index 6c13ad3d83..1c04c0b154 100644
--- a/packages/app/src/provider-selection/provider-selection.test.ts
+++ b/packages/app/src/provider-selection/provider-selection.test.ts
@@ -15,6 +15,21 @@ import {
 } from "./provider-selection";
 
 describe("combined model selector data", () => {
+  it("shows a disconnected error for unfinished catalogs while keeping known models", () => {
+    const providers = buildSelectableProviderSelectorProviders(
+      [
+        snapshotEntry({ provider: "waiting", status: "loading", models: [] }),
+        snapshotEntry({ provider: "codex", status: "ready", models: [codexModel] }),
+      ],
+      false,
+    );
+    expect(providers[0].modelSelection).toEqual({
+      kind: "error",
+      message: "Host is not connected",
+    });
+    expect(providers[1].modelSelection.kind).toBe("models");
+  });
+
   const codexModel: AgentModelDefinition = {
     provider: "codex",
     id: "gpt-5.4",
@@ -367,7 +382,7 @@ describe("combined model selector data", () => {
         },
         autoSubmitConfig: null,
         workspaceDirectory: "/repo",
-        hasClient: true,
+        isConnected: true,
       }),
     ).toEqual({
       ok: false,
@@ -387,7 +402,7 @@ describe("combined model selector data", () => {
         },
         autoSubmitConfig: null,
         workspaceDirectory: "/repo",
-        hasClient: true,
+        isConnected: true,
       }),
     ).toEqual({ ok: true });
   });
@@ -426,7 +441,7 @@ describe("combined model selector data", () => {
           },
           autoSubmitConfig: null,
           workspaceDirectory: "/repo",
-          hasClient: true,
+          isConnected: true,
         }),
       ).toEqual({ ok: false, reason: "初始 prompt 必填" });
     } finally {
diff --git a/packages/app/src/provider-selection/provider-selection.ts b/packages/app/src/provider-selection/provider-selection.ts
index f66a1b1476..e0313c6623 100644
--- a/packages/app/src/provider-selection/provider-selection.ts
+++ b/packages/app/src/provider-selection/provider-selection.ts
@@ -103,6 +103,7 @@ function buildModelSelection(
 function buildEntryModelSelection(
   entry: ProviderSnapshotEntry,
   label: string,
+  isConnected: boolean,
 ): ProviderModelSelection {
   if ((entry.models?.length ?? 0) > 0) {
     return buildModelSelection(entry.provider, label, entry.models ?? null);
@@ -111,7 +112,9 @@ function buildEntryModelSelection(
     return buildModelSelection(entry.provider, label, entry.models ?? null);
   }
   if (entry.status === "loading") {
-    return { kind: "loading" };
+    return isConnected
+      ? { kind: "loading" }
+      : { kind: "error", message: i18n.t("providerSelection.readiness.hostDisconnected") };
   }
   return {
     kind: "error",
@@ -142,6 +145,7 @@ export function buildProviderSelectorProviders(input: {
 
 export function buildSelectableProviderSelectorProviders(
   entries: ProviderSnapshotEntry[] | undefined,
+  isConnected = true,
 ): ProviderSelectorProvider[] {
   return (entries ?? [])
     .filter((entry) => entry.enabled)
@@ -150,7 +154,7 @@ export function buildSelectableProviderSelectorProviders(
       return {
         id: entry.provider,
         label,
-        modelSelection: buildEntryModelSelection(entry, label),
+        modelSelection: buildEntryModelSelection(entry, label, isConnected),
       };
     });
 }
@@ -345,11 +349,14 @@ export function resolveSubmissionReadiness(input: {
   };
   autoSubmitConfig: { provider: string; model: string | null } | null;
   workspaceDirectory: string | null;
-  hasClient: boolean;
+  isConnected: boolean;
 }): ProviderSelectionReadiness {
   if (!input.allowsEmptyAutoSubmit && !input.text.trim()) {
     return { ok: false, reason: i18n.t("providerSelection.readiness.initialPromptRequired") };
   }
+  if (!input.isConnected) {
+    return { ok: false, reason: i18n.t("providerSelection.readiness.hostDisconnected") };
+  }
   if (input.providerCount === 0) {
     return { ok: false, reason: i18n.t("providerSelection.readiness.noProviders") };
   }
@@ -366,8 +373,5 @@ export function resolveSubmissionReadiness(input: {
   if (!input.workspaceDirectory) {
     return { ok: false, reason: i18n.t("providerSelection.readiness.workspaceDirectoryNotFound") };
   }
-  if (!input.hasClient) {
-    return { ok: false, reason: i18n.t("providerSelection.readiness.hostDisconnected") };
-  }
   return { ok: true };
 }

From 38a8e607806d46dcdf1f885e0ff439f667e74c7f Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 12:43:26 +0200
Subject: [PATCH 267/270] docs(changelog): 0.12.0-beta.3

---
 CHANGELOG.md | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34d2871886..12b4568cb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.12.0-beta.2 - 2026-10-17
+## 0.12.0-beta.3 - 2026-10-18
 
 Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and close to 100 fixes.
 
@@ -27,6 +27,9 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Changed phones to open files and subagents in a closable sheet, with Open as tab for subagents ([#6827](https://github.com/getpaseo/paseo/pull/6827), [#6885](https://github.com/getpaseo/paseo/pull/6885), [#6958](https://github.com/getpaseo/paseo/pull/6958))
 - Changed diff comments on phones to open in a sheet instead of an editor inside the code ([#6455](https://github.com/getpaseo/paseo/pull/6455))
 - Changed Settings on phones to large tiles grouped into App and Host ([#7129](https://github.com/getpaseo/paseo/pull/7129))
+- Changed Command Center to rank workspaces and agents by match and then recency, and to show timestamps, project icons, and highlighted matches ([#7277](https://github.com/getpaseo/paseo/pull/7277))
+- Added each Paseo subagent's model, thinking, mode, and context under its title in the subagents list ([#7290](https://github.com/getpaseo/paseo/pull/7290))
+- Changed Paseo tool calls in chats to lead with the action and its context, such as Send message · the first line of the prompt ([#7283](https://github.com/getpaseo/paseo/pull/7283))
 - Changed the New workspace form on phones to full-width fields, with Import session in the header ([#7239](https://github.com/getpaseo/paseo/pull/7239))
 - Reduced rendering work in long chats while a reply streams ([#7052](https://github.com/getpaseo/paseo/pull/7052) by [@colonelpanic8](https://github.com/colonelpanic8))
 - Made reopening the sidebar about 45% faster ([#7157](https://github.com/getpaseo/paseo/pull/7157))
@@ -41,6 +44,8 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed the chat outline not jumping to prompts rendered by a timeline plugin ([#6690](https://github.com/getpaseo/paseo/pull/6690) by [@lukeRRD](https://github.com/lukeRRD))
 - Fixed Escape stopping the running agent instead of first closing an open plugin preview ([#7110](https://github.com/getpaseo/paseo/pull/7110) by [@RRD-dev](https://github.com/RRD-dev), [@luoph](https://github.com/luoph))
 - Fixed `paseo plugin reload` failing with a 60-second timeout while the reload was still running ([#6306](https://github.com/getpaseo/paseo/pull/6306) by [@Mtuchel](https://github.com/Mtuchel))
+- Fixed follow-ups sent while a plugin ACP agent runs failing with "Provider does not support prompt.steer" ([#7270](https://github.com/getpaseo/paseo/pull/7270) by [@simonepri](https://github.com/simonepri))
+- Fixed Find showing no matches for prompt text drawn by a timeline plugin ([#7253](https://github.com/getpaseo/paseo/pull/7253) by [@a-grasso](https://github.com/a-grasso))
 
 ### Fixed
 
@@ -54,7 +59,11 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed an incomplete font name in Appearance breaking the app's styling ([#6695](https://github.com/getpaseo/paseo/pull/6695))
 - Fixed the Linux desktop window never appearing when the hidden window renders no frames ([#6726](https://github.com/getpaseo/paseo/pull/6726) by [@EhEo](https://github.com/EhEo))
 - Fixed opening another agent or workspace stalling while a different agent on the same host is streaming ([#7074](https://github.com/getpaseo/paseo/pull/7074) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Fixed the daemon running out of memory when several directory searches overlap on a large folder tree ([#7265](https://github.com/getpaseo/paseo/pull/7265))
+- Fixed dragging the Explorer edge stuttering with several panes open ([#7284](https://github.com/getpaseo/paseo/pull/7284) by [@colonelpanic8](https://github.com/colonelpanic8))
 - Fixed agent creation showing an error and a retry draft when the provider rejected the first prompt ([#6379](https://github.com/getpaseo/paseo/pull/6379))
+- Fixed new agent drafts staying on "Loading…" when the host is disconnected; they now say "Host is not connected" and keep your draft ([#7303](https://github.com/getpaseo/paseo/pull/7303) by [@colonelpanic8](https://github.com/colonelpanic8))
+- Fixed reloading a chat during a streaming reply showing a frozen copy above the live one and dropping the ending ([#7256](https://github.com/getpaseo/paseo/pull/7256))
 - Fixed question cards spinning forever when an answer fails to send; they now show the error and keep your answers ([#7098](https://github.com/getpaseo/paseo/pull/7098) by [@xzthemeofsss](https://github.com/xzthemeofsss))
 - Fixed parent agents missing the finish notification when a child finished its first turn very quickly ([#6008](https://github.com/getpaseo/paseo/pull/6008) by [@ahmet-izgi](https://github.com/ahmet-izgi))
 - Fixed parent agents being told a child finished when its task was stopped or reloaded ([#6660](https://github.com/getpaseo/paseo/pull/6660) by [@Mar-garet](https://github.com/Mar-garet))
@@ -68,7 +77,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed rewinding a Claude conversation failing with "Session not found" when the provider sets `CLAUDE_CONFIG_DIR` ([#6325](https://github.com/getpaseo/paseo/pull/6325))
 - Fixed changing a running Claude agent's thinking level and then its mode killing its running command ([#7179](https://github.com/getpaseo/paseo/pull/7179))
 - Fixed Claude models that need a recent Claude Code being hidden when the provider command is a wrapper script ([#7209](https://github.com/getpaseo/paseo/pull/7209) by [@SulthanZahran1](https://github.com/SulthanZahran1))
-- Fixed background Claude subagent cards staying empty while the subagent works ([#6242](https://github.com/getpaseo/paseo/pull/6242))
+- Fixed background Claude subagent cards staying empty while the subagent works, including after the parent finishes ([#6242](https://github.com/getpaseo/paseo/pull/6242), [#7266](https://github.com/getpaseo/paseo/pull/7266))
 - Fixed Copilot staying in Plan mode and refusing edits after you select Allow All ([#7234](https://github.com/getpaseo/paseo/pull/7234))
 - Fixed imported Claude Code sessions taking their first prompt as the name instead of their `/rename` title ([#6930](https://github.com/getpaseo/paseo/pull/6930) by [@platanus-kr](https://github.com/platanus-kr))
 - Fixed a wrongly shaped answer to a Claude question reporting success and discarding the question ([#6936](https://github.com/getpaseo/paseo/pull/6936) by [@thomasvan](https://github.com/thomasvan))
@@ -91,6 +100,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed workspace service URLs returning 502 when the service listens only on IPv6 localhost ([#6753](https://github.com/getpaseo/paseo/pull/6753) by [@marcelocastrobarbosa](https://github.com/marcelocastrobarbosa))
 - Fixed terminals that could not be closed when their command was missing or exited immediately ([#6792](https://github.com/getpaseo/paseo/pull/6792) by [@KiraPC](https://github.com/KiraPC))
 - Fixed CJK terminal text gaining spaces between characters after returning to a workspace ([#6452](https://github.com/getpaseo/paseo/pull/6452) by [@jasonhnd](https://github.com/jasonhnd), [@liujin0506](https://github.com/liujin0506), [@seob717](https://github.com/seob717))
+- Fixed copying Korean text from the terminal on iOS and Android adding spaces between characters or dropping the first one ([#7254](https://github.com/getpaseo/paseo/pull/7254), [#7260](https://github.com/getpaseo/paseo/pull/7260) by [@helloimdevman](https://github.com/helloimdevman))
 - Fixed the self-hosted web app failing to connect through a reverse proxy on port 80 or 443 ([#6638](https://github.com/getpaseo/paseo/pull/6638) by [@kiawin](https://github.com/kiawin))
 - Fixed assistant file links with spaces or non-ASCII characters failing with ENOENT ([#6520](https://github.com/getpaseo/paseo/pull/6520) by [@apple-ouyang](https://github.com/apple-ouyang), [@sunshinehomeyu-blip](https://github.com/sunshinehomeyu-blip))
 - Fixed local images in agent replies failing to load when their path contains spaces or non-ASCII characters ([#6877](https://github.com/getpaseo/paseo/pull/6877))
@@ -102,7 +112,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed sidebar rows, footer buttons, and Settings items showing no feedback when tapped on touch devices ([#7150](https://github.com/getpaseo/paseo/pull/7150))
 - Fixed home screen actions being cut off on short phone screens ([#7167](https://github.com/getpaseo/paseo/pull/7167))
 - Fixed Android dictation stopping with "Dictation was interrupted by another audio source" when another app plays audio ([#7200](https://github.com/getpaseo/paseo/pull/7200))
-- Fixed Page Up and Page Down not scrolling the chat after clicking a message ([#7033](https://github.com/getpaseo/paseo/pull/7033) by [@panta82](https://github.com/panta82))
+- Fixed Page Up and Page Down not scrolling the chat after clicking a message or closing Find ([#7033](https://github.com/getpaseo/paseo/pull/7033), [#7263](https://github.com/getpaseo/paseo/pull/7263) by [@panta82](https://github.com/panta82))
 - Fixed Add Project keyboard selection moving to directories scrolled out of view ([#7081](https://github.com/getpaseo/paseo/pull/7081) by [@superheher](https://github.com/superheher))
 - Fixed Enter replacing an email address in the composer with a file mention ([#6471](https://github.com/getpaseo/paseo/pull/6471) by [@jasonhnd](https://github.com/jasonhnd))
 - Fixed letter shortcuts not running with non-Latin keyboard layouts such as Russian ([#6755](https://github.com/getpaseo/paseo/pull/6755))
@@ -147,6 +157,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed Google Play listing Android devices without a camera as incompatible ([#6339](https://github.com/getpaseo/paseo/pull/6339))
 - Fixed `nix build .#desktop` running out of memory on Macs with less than 15 GB of RAM ([#6537](https://github.com/getpaseo/paseo/pull/6537) by [@truelecter](https://github.com/truelecter))
 - Fixed usage providers changing places after Refresh all ([#6947](https://github.com/getpaseo/paseo/pull/6947) by [@sleroq](https://github.com/sleroq))
+- Fixed usage cards losing their last values and showing "Updated" when a refresh fails ([#7246](https://github.com/getpaseo/paseo/pull/7246))
 - Fixed the OpenCode Go usage icon being nearly invisible on dark themes ([#6362](https://github.com/getpaseo/paseo/pull/6362) by [@az33zy](https://github.com/az33zy))
 
 ## 0.11.4 - 2026-10-15

From cc748dfe12590675eb9803d52a0ffddbe964a905 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 18 Oct 2026 12:47:46 +0200
Subject: [PATCH 268/270] chore(release): cut 0.12.0-beta.3

---
 package-lock.json                        | 56 ++++++++++++------------
 package.json                             |  2 +-
 packages/app/package.json                |  2 +-
 packages/cli/package.json                |  8 ++--
 packages/client/package.json             |  6 +--
 packages/desktop/package.json            |  2 +-
 packages/expo-two-way-audio/package.json |  2 +-
 packages/highlight/package.json          |  2 +-
 packages/plugin/package.json             | 10 ++---
 packages/protocol/package.json           |  2 +-
 packages/relay/package.json              |  2 +-
 packages/server/package.json             | 12 ++---
 packages/website/package.json            |  2 +-
 plugins/package.json                     |  2 +-
 14 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 150a1553e8..aba978195d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -36349,7 +36349,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -37469,12 +37469,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.12.0-beta.2",
-        "@getpaseo/protocol": "0.12.0-beta.2",
-        "@getpaseo/server": "0.12.0-beta.2",
+        "@getpaseo/client": "0.12.0-beta.3",
+        "@getpaseo/protocol": "0.12.0-beta.3",
+        "@getpaseo/server": "0.12.0-beta.3",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -37721,10 +37721,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "dependencies": {
-        "@getpaseo/protocol": "0.12.0-beta.2",
-        "@getpaseo/relay": "0.12.0-beta.2",
+        "@getpaseo/protocol": "0.12.0-beta.3",
+        "@getpaseo/relay": "0.12.0-beta.3",
         "zod": "^4.4.3"
       },
       "devDependencies": {
@@ -37735,7 +37735,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -37979,7 +37979,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -38875,7 +38875,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "dependencies": {
         "@codemirror/language": "6.12.4",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -38904,14 +38904,14 @@
     },
     "packages/plugin": {
       "name": "@getpaseo/plugin",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "dependencies": {
         "@agentclientprotocol/sdk": "^1.4.0",
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.12.0-beta.2",
-        "@getpaseo/protocol": "0.12.0-beta.2",
+        "@getpaseo/client": "0.12.0-beta.3",
+        "@getpaseo/protocol": "0.12.0-beta.3",
         "@types/node": "^20.9.0",
         "@types/react": "~19.2.0",
         "react": "19.1.0",
@@ -38921,8 +38921,8 @@
         "zod": "^4.4.3"
       },
       "peerDependencies": {
-        "@getpaseo/client": "0.12.0-beta.2",
-        "@getpaseo/protocol": "0.12.0-beta.2",
+        "@getpaseo/client": "0.12.0-beta.3",
+        "@getpaseo/protocol": "0.12.0-beta.3",
         "react": "~19.1.0",
         "react-native": ">=0.81.5",
         "zod": "^4.4.3"
@@ -38944,7 +38944,7 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "dependencies": {
         "semver": "^7.8.5",
         "zod": "^4.4.3"
@@ -38971,7 +38971,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -39189,16 +39189,16 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "0.3.246",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.12.0-beta.2",
-        "@getpaseo/highlight": "0.12.0-beta.2",
-        "@getpaseo/plugin": "0.12.0-beta.2",
-        "@getpaseo/protocol": "0.12.0-beta.2",
-        "@getpaseo/relay": "0.12.0-beta.2",
+        "@getpaseo/client": "0.12.0-beta.3",
+        "@getpaseo/highlight": "0.12.0-beta.3",
+        "@getpaseo/plugin": "0.12.0-beta.3",
+        "@getpaseo/protocol": "0.12.0-beta.3",
+        "@getpaseo/relay": "0.12.0-beta.3",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "1.29.0",
         "@opencode-ai/sdk": "1.14.46",
@@ -40119,7 +40119,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",
@@ -41727,7 +41727,7 @@
     },
     "plugins": {
       "name": "@getpaseo/builtin-plugins",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.3",
       "dependencies": {
         "@getpaseo/plugin": "*",
         "zod": "^4.4.3"
diff --git a/package.json b/package.json
index 23a2b676f5..a4be513632 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [
diff --git a/packages/app/package.json b/packages/app/package.json
index 43192eedad..ac427837c3 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "private": true,
   "main": "index.ts",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 51201254e9..8c7d796963 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/cli",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "description": "Paseo CLI - control your AI coding agents from the command line",
   "bin": {
     "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.0.0",
-    "@getpaseo/client": "0.12.0-beta.2",
-    "@getpaseo/protocol": "0.12.0-beta.2",
-    "@getpaseo/server": "0.12.0-beta.2",
+    "@getpaseo/client": "0.12.0-beta.3",
+    "@getpaseo/protocol": "0.12.0-beta.3",
+    "@getpaseo/server": "0.12.0-beta.3",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "mime-types": "^2.1.35",
diff --git a/packages/client/package.json b/packages/client/package.json
index 00ca259e85..a042d0cd8c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/client",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "description": "Paseo client SDK package",
   "files": [
     "dist",
@@ -39,8 +39,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@getpaseo/protocol": "0.12.0-beta.2",
-    "@getpaseo/relay": "0.12.0-beta.2",
+    "@getpaseo/protocol": "0.12.0-beta.3",
+    "@getpaseo/relay": "0.12.0-beta.3",
     "zod": "^4.4.3"
   },
   "devDependencies": {
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index edf8fb913b..60ea32fe5c 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/desktop",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "private": true,
   "description": "Paseo desktop app (Electron wrapper)",
   "homepage": "https://paseo.sh",
diff --git a/packages/expo-two-way-audio/package.json b/packages/expo-two-way-audio/package.json
index e71431723d..ca03114da2 100644
--- a/packages/expo-two-way-audio/package.json
+++ b/packages/expo-two-way-audio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "description": "Native module for two way audio streaming",
   "keywords": [
     "ExpoTwoWayAudio",
diff --git a/packages/highlight/package.json b/packages/highlight/package.json
index bfbfab8cb5..9da2494d13 100644
--- a/packages/highlight/package.json
+++ b/packages/highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/highlight",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "files": [
     "dist",
     "!dist/**/*.map",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index b189218837..e04c383488 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/plugin",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "description": "Paseo plugin SDK package",
   "files": [
     "dist",
@@ -70,8 +70,8 @@
     "use-sync-external-store": "^1.6.0"
   },
   "devDependencies": {
-    "@getpaseo/client": "0.12.0-beta.2",
-    "@getpaseo/protocol": "0.12.0-beta.2",
+    "@getpaseo/client": "0.12.0-beta.3",
+    "@getpaseo/protocol": "0.12.0-beta.3",
     "@types/node": "^20.9.0",
     "@types/react": "~19.2.0",
     "react": "19.1.0",
@@ -81,8 +81,8 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@getpaseo/client": "0.12.0-beta.2",
-    "@getpaseo/protocol": "0.12.0-beta.2",
+    "@getpaseo/client": "0.12.0-beta.3",
+    "@getpaseo/protocol": "0.12.0-beta.3",
     "react": "~19.1.0",
     "react-native": ">=0.81.5",
     "zod": "^4.4.3"
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index 217f13eb74..89bb95b50a 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/protocol",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "description": "Paseo shared protocol schemas and wire types",
   "files": [
     "dist",
diff --git a/packages/relay/package.json b/packages/relay/package.json
index 04372d00c1..43f328c5cd 100644
--- a/packages/relay/package.json
+++ b/packages/relay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/relay",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "description": "Paseo relay for bridging daemon and client connections",
   "files": [
     "dist",
diff --git a/packages/server/package.json b/packages/server/package.json
index 49549cdff3..41457e6564 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/server",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "description": "Paseo backend server",
   "files": [
     "dist/server",
@@ -107,11 +107,11 @@
     "@agentclientprotocol/sdk": "^0.17.1",
     "@anthropic-ai/claude-agent-sdk": "0.3.246",
     "@anthropic-ai/sdk": "^0.104.2",
-    "@getpaseo/client": "0.12.0-beta.2",
-    "@getpaseo/highlight": "0.12.0-beta.2",
-    "@getpaseo/plugin": "0.12.0-beta.2",
-    "@getpaseo/protocol": "0.12.0-beta.2",
-    "@getpaseo/relay": "0.12.0-beta.2",
+    "@getpaseo/client": "0.12.0-beta.3",
+    "@getpaseo/highlight": "0.12.0-beta.3",
+    "@getpaseo/plugin": "0.12.0-beta.3",
+    "@getpaseo/protocol": "0.12.0-beta.3",
+    "@getpaseo/relay": "0.12.0-beta.3",
     "@isaacs/ttlcache": "^2.1.4",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@opencode-ai/sdk": "1.14.46",
diff --git a/packages/website/package.json b/packages/website/package.json
index 7df1a84aa7..c6035507c6 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/website",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/plugins/package.json b/plugins/package.json
index 6bd8965d25..79166d816c 100644
--- a/plugins/package.json
+++ b/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/builtin-plugins",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "private": true,
   "type": "module",
   "scripts": {

From 9ed4f1069b2cde963f7c4424e5b85fad648f4d58 Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Oct 2026 12:57:54 +0200
Subject: [PATCH 269/270] fix(app): create project workspaces on the active
 host (#7308)

Grouped sidebar projects chose the first eligible host even while a workspace on another host was active. Prefer that active host when online and eligible, keeping the existing fallback for other placements.

Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>
Co-authored-by: Michael Whitman <michael.whitman@getsteward.ai>
---
 .../browser/sidebar-project-grouping.spec.ts  | 27 +++++++++++++
 .../e2e/support/helpers/project-grouping.ts   | 16 ++++++++
 .../src/components/sidebar-workspace-list.tsx | 13 ++++++-
 .../utils/sidebar-project-row-model.test.ts   | 39 +++++++++++++++++++
 .../src/utils/sidebar-project-row-model.ts    | 17 ++++++--
 5 files changed, 107 insertions(+), 5 deletions(-)

diff --git a/packages/app/e2e/browser/sidebar-project-grouping.spec.ts b/packages/app/e2e/browser/sidebar-project-grouping.spec.ts
index bd9b934aad..6243d52fdf 100644
--- a/packages/app/e2e/browser/sidebar-project-grouping.spec.ts
+++ b/packages/app/e2e/browser/sidebar-project-grouping.spec.ts
@@ -9,6 +9,8 @@ import {
   expectProjectWorkspaceCountForHost,
   expectSeparateProjects,
   openGroupedProjectSettings,
+  openGroupedProjectWorkspace,
+  expectWorkspaceHost,
   openProjectsForSettingsHost,
   openProjectDirectory,
   openProjectDirectoryWithHosts,
@@ -418,4 +420,29 @@ test.describe("Sidebar project grouping", () => {
       count: 2,
     });
   });
+  test("creates grouped project workspaces on the active workspace host", async ({
+    page,
+    crossHostProject,
+  }) => {
+    await openScenario(page, crossHostProject);
+    await openGroupedProjectWorkspace(page, GROUPED_PROJECT_NAME, "Secondary workspace");
+    await beginWorkspaceFromProject(page, GROUPED_PROJECT_NAME);
+    await expectWorkspaceHost(page, SECONDARY_HOST_LABEL);
+    await createWorkspaceWithoutAgent(page);
+    await expectProjectWorkspaceCountForHost(page, {
+      projectName: GROUPED_PROJECT_NAME,
+      hostName: SECONDARY_HOST_LABEL,
+      count: 2,
+    });
+
+    await openGroupedProjectWorkspace(page, GROUPED_PROJECT_NAME, "Primary workspace");
+    await beginWorkspaceFromProject(page, GROUPED_PROJECT_NAME);
+    await expectWorkspaceHost(page, PRIMARY_HOST_LABEL);
+    await createWorkspaceWithoutAgent(page);
+    await expectProjectWorkspaceCountForHost(page, {
+      projectName: GROUPED_PROJECT_NAME,
+      hostName: PRIMARY_HOST_LABEL,
+      count: 2,
+    });
+  });
 });
diff --git a/packages/app/e2e/support/helpers/project-grouping.ts b/packages/app/e2e/support/helpers/project-grouping.ts
index fc56d4bf9a..49c2f1c9b4 100644
--- a/packages/app/e2e/support/helpers/project-grouping.ts
+++ b/packages/app/e2e/support/helpers/project-grouping.ts
@@ -134,3 +134,19 @@ export async function expectProjectSettingsName(page: Page, projectName: string)
     timeout: PROJECT_VISIBILITY_TIMEOUT,
   });
 }
+
+export async function openGroupedProjectWorkspace(
+  page: Page,
+  projectName: string,
+  workspaceName: string,
+): Promise<void> {
+  await projectGroup(page, projectName)
+    .getByRole("button")
+    .filter({ hasText: workspaceName })
+    .click();
+  await expect(page).toHaveURL(/\/workspace\//);
+}
+
+export async function expectWorkspaceHost(page: Page, hostName: string): Promise<void> {
+  await expect(page.getByRole("button", { name: "Host", exact: true })).toContainText(hostName);
+}
diff --git a/packages/app/src/components/sidebar-workspace-list.tsx b/packages/app/src/components/sidebar-workspace-list.tsx
index c750121368..9ce91b5a10 100644
--- a/packages/app/src/components/sidebar-workspace-list.tsx
+++ b/packages/app/src/components/sidebar-workspace-list.tsx
@@ -41,7 +41,11 @@ import { ExternalLink, Settings, MoreVertical, Plus, Trash2 } from "lucide-react
 import { NestableScrollContainer } from "react-native-draggable-flatlist";
 import { DraggableList, type DraggableRenderItemInfo } from "./draggable-list";
 import type { DraggableListDragHandleProps } from "./draggable-list.types";
-import { getHostRuntimeStore, useHosts } from "@/runtime/host-runtime";
+import {
+  getHostRuntimeStore,
+  useHosts,
+  useHostRuntimeConnectionStatus,
+} from "@/runtime/host-runtime";
 import type { PinnedSidebarGroups } from "@/hooks/use-sidebar-pins";
 import {
   useSidebarWorkspacePinController,
@@ -1596,14 +1600,18 @@ function ProjectBlock({
     canToggle: canToggleWorkspaces,
     toggleExpanded: toggleWorkspacesExpanded,
   } = useLimitedSidebarGroup(project.workspaces);
+  const activeServerId = activeWorkspaceSelection?.serverId ?? null;
+  const activeHostStatus = useHostRuntimeConnectionStatus(activeServerId ?? "");
+  const preferredServerId = activeHostStatus === "online" ? activeServerId : null;
   const rowModel = useMemo(
     () =>
       buildSidebarProjectRowModel({
         project,
         collapsed,
         supportsMultiplicityByServerId,
+        preferredServerId,
       }),
-    [collapsed, project, supportsMultiplicityByServerId],
+    [collapsed, preferredServerId, project, supportsMultiplicityByServerId],
   );
 
   // Collapsed rows hide their workspace rows, so the project row carries the most urgent
@@ -1848,6 +1856,7 @@ function areProjectBlockPropsEqual(previous: ProjectBlockProps, next: ProjectBlo
     previous.useNestable === next.useNestable &&
     previous.dragGestureHostActive === next.dragGestureHostActive &&
     previous.creatingWorkspaceIds === next.creatingWorkspaceIds &&
+    previous.activeWorkspaceSelection?.serverId === next.activeWorkspaceSelection?.serverId &&
     areProjectBlockSelectionsEqual(previous, next)
   );
 }
diff --git a/packages/app/src/utils/sidebar-project-row-model.test.ts b/packages/app/src/utils/sidebar-project-row-model.test.ts
index de23319c97..a2978a669c 100644
--- a/packages/app/src/utils/sidebar-project-row-model.test.ts
+++ b/packages/app/src/utils/sidebar-project-row-model.test.ts
@@ -65,6 +65,45 @@ function project(overrides: ProjectOverrides = {}): SidebarProjectEntry {
 }
 
 describe("buildSidebarProjectRowModel", () => {
+  it("prefers the active host when the grouped project can create there", () => {
+    const result = buildSidebarProjectRowModel({
+      project: project({
+        hosts: [
+          { serverId: "host-a", iconWorkingDir: "/repo/a", worktreeSupport: "supported" },
+          { serverId: "host-b", iconWorkingDir: "/repo/b", worktreeSupport: "supported" },
+        ],
+      }),
+      collapsed: false,
+      preferredServerId: "host-b",
+    });
+
+    expect(result.trailingAction).toEqual({
+      kind: "new_workspace",
+      target: { serverId: "host-b", projectId: "project-host-b", iconWorkingDir: "/repo/b" },
+    });
+  });
+
+  it.each(["host-b", "another-host"])(
+    "keeps the first eligible placement when preferred host %s cannot create here",
+    (preferredServerId) => {
+      const result = buildSidebarProjectRowModel({
+        project: project({
+          hosts: [
+            { serverId: "host-a", iconWorkingDir: "/repo/a", worktreeSupport: "supported" },
+            { serverId: "host-b", iconWorkingDir: "/repo/b", worktreeSupport: "unsupported" },
+          ],
+        }),
+        collapsed: false,
+        preferredServerId,
+      });
+
+      expect(result.trailingAction).toEqual({
+        kind: "new_workspace",
+        target: { serverId: "host-a", projectId: "project-host-a", iconWorkingDir: "/repo/a" },
+      });
+    },
+  );
+
   it("renders a non-git single-workspace project as an expandable section", () => {
     const result = buildSidebarProjectRowModel({
       project: project({
diff --git a/packages/app/src/utils/sidebar-project-row-model.ts b/packages/app/src/utils/sidebar-project-row-model.ts
index 619e08dc4f..d5504d08bb 100644
--- a/packages/app/src/utils/sidebar-project-row-model.ts
+++ b/packages/app/src/utils/sidebar-project-row-model.ts
@@ -85,7 +85,9 @@ export function resolveSidebarProjectLocalPath(
 function resolveNewWorkspaceTarget(
   project: SidebarProjectEntry,
   supportsMultiplicityByServerId: ReadonlyMap<string, boolean>,
+  preferredServerId: string | null | undefined,
 ): SidebarProjectHostTarget | null {
+  let fallbackTarget: SidebarProjectHostTarget | null = null;
   for (const host of project.hosts) {
     if (
       host.worktreeSupport === "unsupported" &&
@@ -94,22 +96,30 @@ function resolveNewWorkspaceTarget(
       continue;
     }
     const target = hostTarget(host);
-    if (target) return target;
+    if (!target) continue;
+    if (host.serverId === preferredServerId) return target;
+    fallbackTarget ??= target;
   }
-  return null;
+  return fallbackTarget;
 }
 
 function projectTrailingAction(
   project: SidebarProjectEntry,
   supportsMultiplicityByServerId: ReadonlyMap<string, boolean>,
+  preferredServerId: string | null | undefined,
 ): SidebarProjectTrailingAction {
-  const target = resolveNewWorkspaceTarget(project, supportsMultiplicityByServerId);
+  const target = resolveNewWorkspaceTarget(
+    project,
+    supportsMultiplicityByServerId,
+    preferredServerId,
+  );
   return target ? { kind: "new_workspace", target } : { kind: "none" };
 }
 
 export function buildSidebarProjectRowModel(input: {
   project: SidebarProjectEntry;
   collapsed: boolean;
+  preferredServerId?: string | null;
   supportsMultiplicityByServerId?: ReadonlyMap<string, boolean>;
 }): SidebarProjectRowModel {
   return {
@@ -118,6 +128,7 @@ export function buildSidebarProjectRowModel(input: {
     trailingAction: projectTrailingAction(
       input.project,
       input.supportsMultiplicityByServerId ?? EMPTY_MULTIPLICITY_MAP,
+      input.preferredServerId,
     ),
   };
 }

From 2a9e86b542326e62abea5c062bae3ff3c191c3bf Mon Sep 17 00:00:00 2001
From: "paseo-ai[bot]" <266920839+paseo-ai[bot]@users.noreply.github.com>
Date: Sun, 18 Oct 2026 11:09:08 +0000
Subject: [PATCH 270/270] fix: update lockfile signatures and Nix hash [skip
 ci]

---
 nix/npm-deps.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/npm-deps.hash b/nix/npm-deps.hash
index 297a783afb..a35c995ec6 100644
--- a/nix/npm-deps.hash
+++ b/nix/npm-deps.hash
@@ -1 +1 @@
-sha256-O8sNh6oXFIddUljYiC6RbVZF5/7a7A7W9UWrOd0tIV4=
+sha256-tSE4nb4E06GFZ8I9UEbo93nlPiAKtW00nkywgKQmMhI=