From 1557c97e0e2f599ea77e362b641a12e62c1d36fe Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Wed, 4 Nov 2026 02:50:29 +0000
Subject: [PATCH 1/5] test(shared): reproduce #30576, hosted URLs nested in
 other links become thread links

---
 packages/shared/src/threadLinks.test.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/shared/src/threadLinks.test.ts b/packages/shared/src/threadLinks.test.ts
index 0c19f18163e64..e8ced79531f0a 100644
--- a/packages/shared/src/threadLinks.test.ts
+++ b/packages/shared/src/threadLinks.test.ts
@@ -236,4 +236,14 @@ describe("hosted thread links", () => {
       ref("there", "t:1"),
     ]);
   });
+
+  it("leaves a hosted URL inside another URL or another link's label as written", () => {
+    const nested = [
+      "https://example.com/?next=https://app.t3.codes/threads/one/same",
+      "[Example](https://example.com/?next=https://app.t3.codes/threads/one/same)",
+      "[ https://app.t3.codes/threads/one/same ](https://example.com)",
+    ].join("\n");
+    expect(relabelThreadLinks(nested, local, () => "Title")).toBe(nested);
+    expect(threadLinkRefs(nested, local)).toEqual([]);
+  });
 });

From 633178135bff5d41b90a98a4c15b8745f3069c64 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Wed, 4 Nov 2026 03:09:04 +0000
Subject: [PATCH 2/5] fix(shared): hosted thread URLs inside other links stay
 as written

A hosted thread URL nested in another URL's query, or in a non-thread link's
label or destination, was rewritten into a thread link. The link pattern was
also quadratic on runs of `[` and on repeated unclosed `[a](t3-thread://v1/`.

Every inline link is now matched whole, whatever its href, and only thread
hrefs are rewritten. A bare hosted link needs a non-URL character before it.
Labels and hrefs cannot contain `[`, so matching stays linear.

Fixes pingdotgg/t3code#30576
---
 packages/shared/src/threadLinks.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/shared/src/threadLinks.ts b/packages/shared/src/threadLinks.ts
index aba7d5f983a0a..9085f8725a939 100644
--- a/packages/shared/src/threadLinks.ts
+++ b/packages/shared/src/threadLinks.ts
@@ -11,8 +11,10 @@ const HOSTED_PREFIX = `${DEFAULT_HOSTED_APP_URL}/threads/`;
 const HOSTED_SEGMENT = "[A-Za-z0-9_%-]+";
 const HOSTED_LINK = `${HOSTED_PREFIX.replace(/[.*+?^${}()|[\]\\/]/g, "\\$&")}${HOSTED_SEGMENT}/${HOSTED_SEGMENT}`;
 // Code comes first in the alternation so a link written inside a code span or fence is skipped.
+// Every inline link is taken whole, so a hosted URL in another link's label or href stays as written.
+// Neither part may hold `[`, which keeps the scan linear: no match attempt runs past the next `[`.
 const THREAD_LINK_OUTSIDE_CODE = new RegExp(
-  String.raw`(?<fence>(\`{3,}|~{3,})[\s\S]*?(?:\2|$))|(?<span>(\`+)[^\n]*?\4)|\[(?<label>[^\]\n]*)\]\((?<href>t3-thread:\/\/v[12]\/[^\s)]+|${HOSTED_LINK})\)|<(?<autolink>t3-thread:\/\/v[12]\/[^\s<>]+|${HOSTED_LINK})>|(?<bare>${HOSTED_LINK})(?![\w%/?#-])`,
+  String.raw`(?<fence>(\`{3,}|~{3,})[\s\S]*?(?:\2|$))|(?<span>(\`+)[^\n]*?\4)|\[(?<label>[^[\]\n]*)\]\((?<href>[^\s)[]*)\)|<(?<autolink>t3-thread:\/\/v[12]\/[^\s<>]+|${HOSTED_LINK})>|(?<![\w%/?#=&.:@+~-])(?<bare>${HOSTED_LINK})(?![\w%/?#-])`,
   "g",
 );
 

From f1aaa5f284f7e7bcc89de425c89da9d50df63666 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Tue, 10 Nov 2026 23:41:48 +0000
Subject: [PATCH 3/5] fix(shared): thread link labels scan backticks in linear
 time

Drop code-span matching inside link labels: its repeated backtick
capture backtracked exponentially on unclosed labels and rejected
labels holding a literal unmatched backtick.

AI-assisted; verified with the tests and tools listed above.
---
 packages/shared/src/threadLinks.test.ts | 19 +++++++++++++++++--
 packages/shared/src/threadLinks.ts      |  5 ++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/shared/src/threadLinks.test.ts b/packages/shared/src/threadLinks.test.ts
index b81cc999028a7..b28c45a3eed81 100644
--- a/packages/shared/src/threadLinks.test.ts
+++ b/packages/shared/src/threadLinks.test.ts
@@ -229,6 +229,9 @@ describe("hosted thread links", () => {
       "[Fix ci](https://app.t3.codes/threads/e/t1)",
     );
     expect(formatHostedThreadLink(ref("e", "t1"), " ")).toBe("https://app.t3.codes/threads/e/t1");
+    const copied = formatHostedThreadLink(ref("e", "t1"), "Fix ` escaping");
+    expect(threadLinkRefs(copied, local)).toEqual([ref("e", "t1")]);
+    expect(relabelThreadLinks(copied, local, () => "New")).toBe("[New](t3-thread://v2/e/t1)");
   });
 
   it("titles hosted links in every Markdown form and writes them as v2 links", () => {
@@ -264,16 +267,28 @@ describe("hosted thread links", () => {
     ]);
   });
 
-  it("leaves a hosted URL inside another URL, another link, or a code span as written", () => {
+  it("leaves a hosted URL inside another URL or another link as written", () => {
     const nested = [
       "https://example.com/?next=https://app.t3.codes/threads/one/same",
       "[Example](https://example.com/?next=https://app.t3.codes/threads/one/same)",
       "[Example](<https://example.com/?next=https://app.t3.codes/threads/one/same>)",
       "[ https://app.t3.codes/threads/one/same ](https://example.com)",
       '[Example](https://example.com "https://app.t3.codes/threads/one/same")',
-      "[a `code](https://example.com) https://app.t3.codes/threads/one/same`",
     ].join("\n");
     expect(relabelThreadLinks(nested, local, () => "Title")).toBe(nested);
     expect(threadLinkRefs(nested, local)).toEqual([]);
   });
+
+  // Each row backtracked for seconds or more when the label pattern could split backtick runs.
+  it("scans an unclosed label full of backticks without stalling", () => {
+    const bare = "https://app.t3.codes/threads/e/t";
+    for (const [prefix, refs] of [
+      [`Flags [${"``--opt``, ".repeat(18)} see `, [ref("e", "t")]],
+      [`[${"``a``".repeat(20)} `, [ref("e", "t")]],
+      // Three or more backticks open a fence that runs to the end.
+      [`[${"`".repeat(80)}\n${"a ".repeat(3000)}`, []],
+    ] as const) {
+      expect(threadLinkRefs(prefix + bare, local)).toEqual(refs);
+    }
+  });
 });
diff --git a/packages/shared/src/threadLinks.ts b/packages/shared/src/threadLinks.ts
index 49803210300ca..ab11ca5502b91 100644
--- a/packages/shared/src/threadLinks.ts
+++ b/packages/shared/src/threadLinks.ts
@@ -12,10 +12,9 @@ const HOSTED_SEGMENT = "[A-Za-z0-9_%-]+";
 const HOSTED_LINK = `${HOSTED_PREFIX.replace(/[.*+?^${}()|[\]\\/]/g, "\\$&")}${HOSTED_SEGMENT}/${HOSTED_SEGMENT}`;
 // Code comes first in the alternation so a link written inside a code span or fence is skipped.
 // Inline links, titled or angle-bracketed, are taken whole so URLs inside them stay as written.
-// A code span running past a label fails the link and is taken as code. `[` ends a label or
-// destination, which keeps the scan linear.
+// `[` ends a label or destination, which keeps the scan linear.
 const THREAD_LINK_OUTSIDE_CODE = new RegExp(
-  String.raw`(?<fence>(\`{3,}|~{3,})[\s\S]*?(?:\2|$))|(?<span>(\`+)[^\n]*?\4)|\[(?<label>(?:[^[\]\n\`]|(?<tick>\`+)[^\`\n]*?\k<tick>)*)\]\((?:<(?<angleHref>[^\s<>[]*)>|(?<href>[^\s<>)[]*))(?:\s+(?:"[^"\n]*"|'[^'\n]*'|\([^()\n]*\)))?\s*\)|<(?<autolink>t3-thread:\/\/v[12]\/[^\s<>]+|${HOSTED_LINK})>|(?<![\w%/?#=&.:@+~-]|\]\()(?<bare>${HOSTED_LINK})(?![\w%/?#-])`,
+  String.raw`(?<fence>(\`{3,}|~{3,})[\s\S]*?(?:\2|$))|(?<span>(\`+)[^\n]*?\4)|\[(?<label>[^[\]\n]*)\]\((?:<(?<angleHref>[^\s<>[]*)>|(?<href>[^\s<>)[]*))(?:\s+(?:"[^"\n]*"|'[^'\n]*'|\([^()\n]*\)))?\s*\)|<(?<autolink>t3-thread:\/\/v[12]\/[^\s<>]+|${HOSTED_LINK})>|(?<![\w%/?#=&.:@+~-]|\]\()(?<bare>${HOSTED_LINK})(?![\w%/?#-])`,
   "g",
 );
 

From 80fad38fd18e353109d880bb1d039b737934b936 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Tue, 10 Nov 2026 23:53:51 +0000
Subject: [PATCH 4/5] fix(shared): thread link labels keep escapes and
 cross-label code spans

A label may hold backslash escapes, so "[draft \[one](url)" is one link,
and an escaped [ never opens one. A code span that opens inside a
label and closes past it is shielded as code again: matches now go
through one exec loop that checks such labels with an anchored scan.

AI-assisted; verified with the tests and tools listed above.
---
 packages/shared/src/threadLinks.test.ts |  3 ++
 packages/shared/src/threadLinks.ts      | 68 +++++++++++++++++++------
 2 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/packages/shared/src/threadLinks.test.ts b/packages/shared/src/threadLinks.test.ts
index b28c45a3eed81..3e07ad817abf5 100644
--- a/packages/shared/src/threadLinks.test.ts
+++ b/packages/shared/src/threadLinks.test.ts
@@ -242,6 +242,7 @@ describe("hosted thread links", () => {
           "See https://app.t3.codes/threads/there/t1.",
           "[old](https://app.t3.codes/threads/there/t1)",
           '[`old`](https://app.t3.codes/threads/there/t1 "title")',
+          "[draft \\[old](https://app.t3.codes/threads/there/t1)",
           "<https://app.t3.codes/threads/there/t1>",
           "`https://app.t3.codes/threads/there/t1`",
           "https://app.t3.codes/threads/there/t1?prompt=go",
@@ -255,6 +256,7 @@ describe("hosted thread links", () => {
         "[There](t3-thread://v2/there/t1)",
         "[There](t3-thread://v2/there/t1)",
         "[There](t3-thread://v2/there/t1)",
+        "[There](t3-thread://v2/there/t1)",
         "`https://app.t3.codes/threads/there/t1`",
         "https://app.t3.codes/threads/there/t1?prompt=go",
       ].join("\n"),
@@ -274,6 +276,7 @@ describe("hosted thread links", () => {
       "[Example](<https://example.com/?next=https://app.t3.codes/threads/one/same>)",
       "[ https://app.t3.codes/threads/one/same ](https://example.com)",
       '[Example](https://example.com "https://app.t3.codes/threads/one/same")',
+      "[x `](https://example.com) https://app.t3.codes/threads/one/same `",
     ].join("\n");
     expect(relabelThreadLinks(nested, local, () => "Title")).toBe(nested);
     expect(threadLinkRefs(nested, local)).toEqual([]);
diff --git a/packages/shared/src/threadLinks.ts b/packages/shared/src/threadLinks.ts
index ab11ca5502b91..690444f27adab 100644
--- a/packages/shared/src/threadLinks.ts
+++ b/packages/shared/src/threadLinks.ts
@@ -12,9 +12,9 @@ const HOSTED_SEGMENT = "[A-Za-z0-9_%-]+";
 const HOSTED_LINK = `${HOSTED_PREFIX.replace(/[.*+?^${}()|[\]\\/]/g, "\\$&")}${HOSTED_SEGMENT}/${HOSTED_SEGMENT}`;
 // Code comes first in the alternation so a link written inside a code span or fence is skipped.
 // Inline links, titled or angle-bracketed, are taken whole so URLs inside them stay as written.
-// `[` ends a label or destination, which keeps the scan linear.
+// Only an unescaped `[` opens a link or ends its label or destination, which keeps the scan linear.
 const THREAD_LINK_OUTSIDE_CODE = new RegExp(
-  String.raw`(?<fence>(\`{3,}|~{3,})[\s\S]*?(?:\2|$))|(?<span>(\`+)[^\n]*?\4)|\[(?<label>[^[\]\n]*)\]\((?:<(?<angleHref>[^\s<>[]*)>|(?<href>[^\s<>)[]*))(?:\s+(?:"[^"\n]*"|'[^'\n]*'|\([^()\n]*\)))?\s*\)|<(?<autolink>t3-thread:\/\/v[12]\/[^\s<>]+|${HOSTED_LINK})>|(?<![\w%/?#=&.:@+~-]|\]\()(?<bare>${HOSTED_LINK})(?![\w%/?#-])`,
+  String.raw`(?<fence>(\`{3,}|~{3,})[\s\S]*?(?:\2|$))|(?<span>(\`+)[^\n]*?\4)|(?<!\\)\[(?<label>(?:[^[\]\\\n]|\\.)*)\]\((?:<(?<angleHref>[^\s<>[]*)>|(?<href>[^\s<>)[]*))(?:\s+(?:"[^"\n]*"|'[^'\n]*'|\([^()\n]*\)))?\s*\)|<(?<autolink>t3-thread:\/\/v[12]\/[^\s<>]+|${HOSTED_LINK})>|(?<![\w%/?#=&.:@+~-]|\]\()(?<bare>${HOSTED_LINK})(?![\w%/?#-])`,
   "g",
 );
 
@@ -147,18 +147,53 @@ export function hasThreadLinks(markdown: string): boolean {
   return markdown.includes(`${THREAD_LINK_PROTOCOL}://v`) || markdown.includes(HOSTED_PREFIX);
 }
 
+// THREAD_LINK_OUTSIDE_CODE's code span, anchored where a backtick in a label opens one.
+const CODE_SPAN_AT = /(`+)[^\n]*?\1/y;
+
+/** Where a code span opening in a link's label ends, when it runs past the label. */
+function codeSpanEndPastLabel(markdown: string, labelStart: number, labelEnd: number) {
+  let index = markdown.indexOf("`", labelStart);
+  while (index !== -1 && index < labelEnd) {
+    CODE_SPAN_AT.lastIndex = index;
+    if (CODE_SPAN_AT.exec(markdown) === null) {
+      index = markdown.indexOf("`", index + 1);
+      continue;
+    }
+    if (CODE_SPAN_AT.lastIndex > labelEnd) return CODE_SPAN_AT.lastIndex;
+    index = markdown.indexOf("`", CODE_SPAN_AT.lastIndex);
+  }
+  return null;
+}
+
+// Hermes' matchAll yields matches without `groups`; exec keeps them.
+function* threadLinkMatches(markdown: string) {
+  const pattern = new RegExp(THREAD_LINK_OUTSIDE_CODE);
+  for (let match = pattern.exec(markdown); match !== null; match = pattern.exec(markdown)) {
+    const label = match.groups?.label;
+    if (label?.includes("`")) {
+      const spanEnd = codeSpanEndPastLabel(
+        markdown,
+        match.index + 1,
+        match.index + 1 + label.length,
+      );
+      if (spanEnd !== null) {
+        pattern.lastIndex = spanEnd;
+        continue;
+      }
+    }
+    const href =
+      match.groups?.angleHref ?? match.groups?.href ?? match.groups?.autolink ?? match.groups?.bare;
+    yield { match, link: href === undefined ? null : parseThreadLinkHref(href) };
+  }
+}
+
 /** Every thread the markdown's links can name, so their titles are keyed reads. */
 export function threadLinkRefs(
   markdown: string,
   messageEnvironmentId: EnvironmentId,
 ): ReadonlyArray<ScopedThreadRef> {
   const refs = new Map<string, ScopedThreadRef>();
-  // Hermes' matchAll yields matches without `groups`; exec keeps them.
-  const pattern = new RegExp(THREAD_LINK_OUTSIDE_CODE);
-  for (let match = pattern.exec(markdown); match !== null; match = pattern.exec(markdown)) {
-    const href =
-      match.groups?.angleHref ?? match.groups?.href ?? match.groups?.autolink ?? match.groups?.bare;
-    const link = href === undefined ? null : parseThreadLinkHref(href);
+  for (const { link } of threadLinkMatches(markdown)) {
     if (link === null) continue;
     for (const ref of threadLinkCandidates(link, messageEnvironmentId)) {
       refs.set(`${ref.environmentId}/${ref.threadId}`, ref);
@@ -182,14 +217,15 @@ export function replaceThreadLinks(
   replace: (link: ThreadLink, label: string | undefined) => string | undefined,
 ): string {
   if (!hasThreadLinks(markdown)) return markdown;
-  return markdown.replace(THREAD_LINK_OUTSIDE_CODE, (source, ...args) => {
-    const groups = args.at(-1) as Partial<
-      Record<"angleHref" | "href" | "autolink" | "bare" | "label", string>
-    >;
-    const href = groups.angleHref ?? groups.href ?? groups.autolink ?? groups.bare;
-    const link = href === undefined ? null : parseThreadLinkHref(href);
-    return (link && replace(link, groups.label)) ?? source;
-  });
+  let result = "";
+  let copied = 0;
+  for (const { match, link } of threadLinkMatches(markdown)) {
+    const replacement = link === null ? undefined : replace(link, match.groups?.label);
+    if (replacement === undefined) continue;
+    result += markdown.slice(copied, match.index) + replacement;
+    copied = match.index + match[0].length;
+  }
+  return result + markdown.slice(copied);
 }
 
 /**

From cbe8fe0f1fa95a110a97a964cb8774299ad860aa Mon Sep 17 00:00:00 2001
From: Elliot Drel <156480527+ElliotDrel@users.noreply.github.com>
Date: Wed, 11 Nov 2026 12:45:32 -0500
Subject: [PATCH 5/5] fix(shared): preserve code shielding and titled Markdown
 links (#30665)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Muzammil Hussain <58479501+Muzammil-Bit@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Anton 🌻 <tsapa44@gmail.com>
Co-authored-by: Theo Browne <me@t3.gg>
Co-authored-by: Md.Sadiq <mohammadsadiq4950@gmail.com>
---
 .github/workflows/ci.yml                      |  20 +-
 .../workflows/mobile-showcase-screenshots.yml |   2 +-
 .gitignore                                    |   1 +
 AGENTS.md                                     |   2 +-
 apps/desktop/package.json                     |   2 +-
 apps/desktop/src/app/DesktopClerk.ts          |   5 +
 .../src/app/DesktopPreReadyFileSystem.ts      |   7 +
 apps/desktop/src/app/DesktopUserData.test.ts  | 100 ++-
 apps/desktop/src/app/DesktopUserData.ts       |  40 +
 apps/desktop/src/ipc/DesktopIpc.test.ts       |  67 ++
 apps/desktop/src/ipc/DesktopIpc.ts            |  54 +-
 .../src/ipc/methods/notificationBadge.test.ts |   2 +-
 apps/desktop/src/ipc/methods/preview.test.ts  |  17 +-
 apps/desktop/src/ipc/methods/window.test.ts   |   2 +-
 apps/desktop/src/main.ts                      |   2 +-
 apps/desktop/src/window/DesktopWindow.test.ts |  49 ++
 apps/desktop/src/window/DesktopWindow.ts      |   5 +-
 apps/mobile/src/components/ui/ListRow.tsx     |  51 +-
 .../PullRequestDiscussionScreen.tsx           |  51 +-
 .../pull-requests/PullRequestRouteScreen.tsx  | 165 +++-
 .../pull-requests/PullRequestStatusRows.tsx   |   9 +-
 .../pull-requests/PullRequestTimeline.tsx     |  32 +-
 .../guide/guideDiffFocus.test.ts              |  30 +
 .../pull-requests/guide/guideDiffFocus.ts     |  18 +
 .../pullRequestNavigation.test.ts             |   8 +-
 .../pull-requests/usePullRequestDiff.ts       |   2 +
 .../features/settings/CloudVoiceSection.tsx   | 495 ++++++-----
 .../settings/SettingsVoiceRouteScreen.tsx     | 139 +--
 .../features/settings/VoiceModelSection.tsx   |  71 +-
 .../features/threads/ComposerUsageLimits.tsx  |   5 +-
 .../src/features/threads/LinkRequestCard.tsx  |  81 +-
 .../src/features/usage/UsageLimitsPooled.tsx  |  15 +-
 .../src/features/usage/UsageLimitsSection.tsx |  85 +-
 apps/mobile/src/lib/attachmentUpload.test.ts  |  15 +
 apps/mobile/src/lib/attachmentUpload.ts       |   4 +-
 apps/mobile/src/lib/pullRequestNavigation.ts  |   2 +
 apps/mobile/src/lib/threadActivity.ts         |   3 +-
 apps/mobile/src/native/useOpenPullRequest.ts  |   8 +-
 apps/mobile/src/state/entities.ts             |  10 +-
 apps/server/package.json                      |   2 +-
 apps/server/src/device/AgentDeviceShim.ts     |   5 +-
 apps/server/src/device/DeviceToolchain.ts     |  13 +
 .../server/src/device/LocalDeviceHost.test.ts |  85 +-
 apps/server/src/device/LocalDeviceHost.ts     |  67 +-
 .../server/src/device/deviceToolVersions.json |   4 +-
 apps/server/src/git/GitManager.ts             |   5 +
 apps/server/src/mcp/OrchestratorMcpService.ts |   4 +-
 .../Adapters/OpenCode2AdapterV2.test.ts       | 422 ++++++++-
 .../Adapters/OpenCode2AdapterV2.testkit.ts    |   9 +
 .../DelegatedCompletionDelivery.test.ts       |   3 +-
 .../src/orchestration-v2/Orchestrator.ts      |   2 +
 .../src/orchestration-v2/ThreadFind.test.ts   |  39 +
 .../server/src/orchestration-v2/ThreadFind.ts |  49 +-
 .../orchestration-v2/ThreadLaunchService.ts   |   1 +
 .../ThreadTitleRegenerationService.ts         |   1 +
 apps/server/src/peer/PeerLinkRequests.test.ts |  47 +-
 apps/server/src/peer/PeerLinkRequests.ts      |  35 +-
 apps/server/src/peer/PeerLinks.test.ts        |  25 +
 apps/server/src/peer/PeerLinks.testkit.ts     |   2 +
 apps/server/src/peer/PeerLinks.ts             |  55 +-
 .../src/preview/ServerBrowserPage.test.ts     |   1 -
 .../src/project/AgentSessionScanner.test.ts   | 167 ++++
 .../server/src/project/AgentSessionScanner.ts |  83 +-
 .../src/provider/Drivers/ClaudeDriver.ts      |  10 +-
 .../provider/ProviderInstanceRegistry.test.ts |   2 +-
 .../src/provider/antigravityUsageLimits.ts    |  39 +-
 .../src/provider/claudeResetCredits.test.ts   |  44 +-
 .../server/src/provider/claudeResetCredits.ts |  62 +-
 .../PullRequestReviewGuideService.ts          |   1 +
 .../src/speech/SpeechModelStore.test.ts       |  52 ++
 apps/server/src/speech/SpeechModelStore.ts    | 120 +++
 apps/server/src/speech/SpeechService.test.ts  |   2 +
 apps/server/src/speech/SpeechService.ts       |  23 +-
 apps/server/src/speech/http.test.ts           |  44 +-
 apps/server/src/speech/http.ts                |  40 +-
 .../CodexTextGeneration.test.ts               |  14 +-
 .../src/textGeneration/TextGeneration.ts      |  35 +-
 apps/server/src/usage/cliproxyApi.test.ts     | 198 ++++-
 apps/server/src/usage/cliproxyApi.ts          | 391 ++++++---
 apps/server/src/ws.ts                         |   2 +-
 apps/web/package.json                         |   2 +-
 .../components/ChatMarkdown.browser.test.tsx  |  33 +
 apps/web/src/components/ChatMarkdown.tsx      |  22 +-
 apps/web/src/components/CommandPalette.tsx    |   7 +-
 .../src/components/CommandPaletteResults.tsx  |  10 +-
 ...ditorTiptap.citationDraft.browser.test.tsx |  62 ++
 .../components/ComposerPromptEditorTiptap.tsx |  41 +-
 apps/web/src/components/chat/ChatComposer.tsx |  13 +-
 .../chat/ComposerAttachmentStrip.tsx          |  71 +-
 .../ComposerImageThumbnail.browser.test.tsx   |  69 ++
 .../chat/ComposerImageThumbnail.tsx           |  31 +-
 .../chat/ComposerPendingUserInputPanel.tsx    |   4 +-
 .../src/components/chat/LinkRequestCard.tsx   |  67 +-
 apps/web/src/components/chat/McpAppFrame.tsx  |   8 +-
 .../chat/RightPanelSurfaceContent.tsx         |   4 +
 .../chat/TimelineUserMessageRow.tsx           |   6 +-
 .../composerContextPresentation.tsx           |  21 +-
 .../diffs/useCodeViewFileReveal.test.ts       | 122 ++-
 .../components/diffs/useCodeViewFileReveal.ts | 163 +++-
 .../PullRequestCodeTab.browser.test.tsx       |  71 +-
 .../pullRequest/PullRequestCodeTab.tsx        |  84 +-
 .../pullRequest/PullRequestDetailPanel.tsx    | 132 ++-
 .../pullRequest/PullRequestLinkPreview.tsx    | 101 ++-
 .../PullRequestReviewAnnotation.tsx           |   8 +-
 .../pullRequest/PullRequestSummaryTab.tsx     | 107 ++-
 .../PullRequestTimelineTab.browser.test.tsx   |  89 +-
 .../pullRequest/PullRequestTimelineTab.tsx    | 112 ++-
 .../pullRequest/PullRequestsPage.tsx          |  10 +
 .../pullRequest/holdLinkedNodeInView.ts       |  39 +
 .../pullRequestDetail.logic.test.ts           |  53 ++
 .../pullRequest/pullRequestDetail.logic.ts    |  81 ++
 .../pullRequest/usePullRequestListView.ts     |  12 +
 .../components/settings/LinkMachineSelect.tsx |  25 +-
 .../settings/LinkedEnvironmentsSettings.tsx   |  22 +-
 ...ngsSidebarNav.composition.browser.test.tsx |  23 +
 .../settings/SettingsSidebarNav.tsx           |  15 +-
 .../settings/VoiceSettingsPanel.tsx           |  54 +-
 apps/web/src/components/usage/UsageLimits.tsx |  82 +-
 .../components/usage/UsageLimitsPooled.tsx    |  58 +-
 ...eAttachmentUploadProgress.browser.test.tsx |  47 +
 .../src/hooks/useAttachmentUploadProgress.ts  |  18 +
 apps/web/src/hooks/useDelayedStatus.ts        |   6 +-
 apps/web/src/index.css                        |   4 +
 apps/web/src/lib/imageCompression.test.ts     |  70 +-
 apps/web/src/lib/imageCompression.ts          |  96 +-
 .../lib/openPullRequestLink.browser.test.tsx  |   2 +
 apps/web/src/lib/openPullRequestLink.ts       |  18 +-
 apps/web/src/markdown-clipboard.test.ts       |  12 +
 apps/web/src/markdown-clipboard.ts            |  11 +-
 apps/web/src/rightPanelStore.test.ts          |  39 +
 apps/web/src/rightPanelStore.ts               |  61 +-
 apps/web/src/routes/_chat.pull-requests.tsx   |   1 +
 .../test/fixtures/usage-limits-hub/README.md  |  21 +-
 .../test/fixtures/usage-limits-hub/hub.mjs    |  35 +-
 .../fixtures/usage-limits-hub/scenarios.json  |  86 ++
 docs/README.md                                |   1 +
 docs/internals/remote.md                      |  12 +-
 docs/internals/voice-input.md                 |   3 +
 docs/operations/scenarios.md                  | 173 ++++
 docs/user/remote-access.md                    |  11 +-
 docs/user/source-control.md                   |   4 +
 docs/user/usage.md                            |   6 +-
 docs/user/voice-input.md                      |  10 +
 evals/mcp-tool-use/agent-device-help.txt      |  27 +-
 knip.jsonc                                    |   6 +-
 package.json                                  |   2 +
 .../client-runtime/src/linkRequest.test.ts    |  87 +-
 packages/client-runtime/src/linkRequest.ts    |  94 +-
 .../src/pullRequestQuery.test.ts              |  15 +
 .../client-runtime/src/pullRequestQuery.ts    |  30 +-
 .../src/voice-input/environment.ts            |  11 +
 .../client-runtime/src/voice-input/index.ts   |   1 +
 packages/contracts/src/environmentHttp.ts     |   9 +
 packages/contracts/src/orchestrationV2.ts     |   5 +-
 packages/contracts/src/providerUsageLimits.ts |  17 +-
 packages/contracts/src/pullRequest.ts         |   2 +
 packages/contracts/src/speech.ts              |   7 +
 packages/provider-core/src/server/driver.ts   |   7 +-
 .../src/server/managedProvider.test.ts        | 111 ++-
 .../src/server/managedProvider.ts             |  83 +-
 packages/provider-core/src/server/snapshot.ts |  14 +-
 .../src/server/textGeneration.ts              |   6 +
 packages/provider-grok/src/server.ts          |   5 +
 .../provider-grok/src/server/usageLimits.ts   |   7 +-
 .../provider-muse/src/server/adapter.test.ts  |  30 +-
 packages/provider-muse/src/server/adapter.ts  |  12 +-
 .../provider-muse/src/server/driver.test.ts   | 216 +++++
 packages/provider-muse/src/server/driver.ts   |  38 +-
 .../src/server/usageLimits.test.ts            |  34 +-
 .../provider-muse/src/server/usageLimits.ts   |  33 +-
 .../src/server/v2/OpenCode2Client.test.ts     |  81 ++
 .../src/server/v2/OpenCode2Client.ts          |  82 ++
 .../src/server/v2/adapter.ts                  | 211 ++++-
 packages/shared/package.json                  |   4 +
 .../shared/src/markdownListIndentation.ts     |   5 +
 .../shared/src/markdownOrderedListNumbers.ts  |  62 ++
 packages/shared/src/markdownPipeline.test.ts  |  44 +-
 packages/shared/src/markdownPipeline.ts       |   5 +
 packages/shared/src/mcpApp.test.ts            |  23 +
 packages/shared/src/mcpApp.ts                 |  12 +
 packages/shared/src/pullRequestAnchor.test.ts | 135 +++
 packages/shared/src/pullRequestAnchor.ts      | 149 ++++
 packages/shared/src/threadLinks.test.ts       | 140 ++-
 packages/shared/src/threadLinks.ts            | 143 +--
 packages/shared/src/usageLimits.test.ts       |  39 +
 packages/shared/src/usageLimits.ts            |  51 ++
 .../src/server/GitHubPullRequestApi.test.ts   |   1 +
 .../src/server/gitHubPullRequestJson.test.ts  |  15 +-
 .../src/server/gitHubPullRequestJson.ts       |   2 +
 .../src/server/pullRequestReviews.graphql     |   4 +
 .../src/server/pullRequestReviews.graphql.ts  |  15 +-
 pnpm-lock.yaml                                | 817 +++++++++++++++---
 scripts/e2e.config.ts                         | 186 ++++
 scripts/package.json                          |   8 +-
 scripts/prove-scenario.test.ts                | 110 +++
 scripts/prove-scenario.ts                     | 325 +++++++
 .../add-project-tab-reaches-submit.e2e.ts     |  22 +
 .../mobile-opens-a-seeded-thread.e2e.ts       |  21 +
 scripts/scenarios/replay-turn-streams.e2e.ts  |  26 +
 scripts/scenarios/shell.ts                    |  64 ++
 scripts/scenarios/start-app.ts                | 266 ++++++
 scripts/scenarios/t3-mobile.ts                |  93 ++
 scripts/scenarios/t3.ts                       | 140 +++
 203 files changed, 9386 insertions(+), 1386 deletions(-)
 create mode 100644 apps/desktop/src/ipc/DesktopIpc.test.ts
 create mode 100644 apps/mobile/src/features/pull-requests/guide/guideDiffFocus.test.ts
 create mode 100644 apps/web/src/components/chat/ComposerImageThumbnail.browser.test.tsx
 create mode 100644 apps/web/src/components/pullRequest/holdLinkedNodeInView.ts
 create mode 100644 apps/web/src/hooks/useAttachmentUploadProgress.browser.test.tsx
 create mode 100644 apps/web/src/hooks/useAttachmentUploadProgress.ts
 create mode 100644 docs/operations/scenarios.md
 create mode 100644 packages/provider-muse/src/server/driver.test.ts
 create mode 100644 packages/shared/src/markdownOrderedListNumbers.ts
 create mode 100644 packages/shared/src/pullRequestAnchor.test.ts
 create mode 100644 packages/shared/src/pullRequestAnchor.ts
 create mode 100644 scripts/e2e.config.ts
 create mode 100644 scripts/prove-scenario.test.ts
 create mode 100644 scripts/prove-scenario.ts
 create mode 100644 scripts/scenarios/add-project-tab-reaches-submit.e2e.ts
 create mode 100644 scripts/scenarios/mobile-opens-a-seeded-thread.e2e.ts
 create mode 100644 scripts/scenarios/replay-turn-streams.e2e.ts
 create mode 100644 scripts/scenarios/shell.ts
 create mode 100644 scripts/scenarios/start-app.ts
 create mode 100644 scripts/scenarios/t3-mobile.ts
 create mode 100644 scripts/scenarios/t3.ts

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 260be6436c3e8..5343dbb754ff8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -140,10 +140,16 @@ jobs:
       - name: Start installing browser secret helper build libraries
         if: needs.changes.outputs.build != 'false'
         run: |
-          sudo sed -i 's|http://|https://|g' /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
+          # Fetch only the indexes these main and universe packages need. The full set is ~42 MB,
+          # which a slow mirror can stretch past the wait below.
+          sudo sed -i -e 's|http://|https://|g' -e 's/^Components: .*/Components: main universe/' \
+            /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
           (
             set +e
-            sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config xvfb
+            sudo apt-get update -o Acquire::Languages=none \
+              -o Acquire::IndexTargets::deb::DEP-11::DefaultEnabled=false \
+              -o Acquire::IndexTargets::deb::CNF::DefaultEnabled=false &&
+              sudo apt-get install -y libsecret-1-dev pkg-config xvfb
             echo "$?" > "$RUNNER_TEMP/apt-status"
           ) > "$RUNNER_TEMP/apt.log" 2>&1 < /dev/null &
 
@@ -287,10 +293,16 @@ jobs:
       # the background while Vite+ installs; the step before the tests waits for it.
       - name: Start installing browser secret helper build libraries
         run: |
-          sudo sed -i 's|http://|https://|g' /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
+          # Fetch only the indexes these main and universe packages need. The full set is ~42 MB,
+          # which a slow mirror can stretch past the wait below.
+          sudo sed -i -e 's|http://|https://|g' -e 's/^Components: .*/Components: main universe/' \
+            /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
           (
             set +e
-            sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config
+            sudo apt-get update -o Acquire::Languages=none \
+              -o Acquire::IndexTargets::deb::DEP-11::DefaultEnabled=false \
+              -o Acquire::IndexTargets::deb::CNF::DefaultEnabled=false &&
+              sudo apt-get install -y libsecret-1-dev pkg-config
             echo "$?" > "$RUNNER_TEMP/apt-status"
           ) > "$RUNNER_TEMP/apt.log" 2>&1 < /dev/null &
 
diff --git a/.github/workflows/mobile-showcase-screenshots.yml b/.github/workflows/mobile-showcase-screenshots.yml
index c02be425c1ab7..53b0a74a1f5aa 100644
--- a/.github/workflows/mobile-showcase-screenshots.yml
+++ b/.github/workflows/mobile-showcase-screenshots.yml
@@ -88,7 +88,7 @@ jobs:
           axe --version
 
       - name: Install foldable simulator controls
-        run: npm install --global agent-device@0.21.25
+        run: npm install --global agent-device@0.21.36
 
       - name: Capture iOS showcase
         run: pnpm screenshots:mobile --platform ios --appearance "${{ inputs.appearance }}" --theme "${{ inputs.theme }}"
diff --git a/.gitignore b/.gitignore
index b6b793e020ef1..85b7c5b4bf02f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ apps/mobile/.android-cache/
 artifacts/app-store/screenshots/
 artifacts/mobile-e2e/
 artifacts/mobile-behavior/
+scripts/.e2e/
 .github/pr-assets/
 native/**/target/
 node_modules/
diff --git a/AGENTS.md b/AGENTS.md
index 2effa629d25e0..87f21a8a0a2f6 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -108,7 +108,7 @@ An empty database is a bad test. Seed your worktree's `.t3` with a copy of real
 - [Testing](docs/internals/testing.md) carries these same test rules, plus review guidance, for review bots. Change both together.
 - **Do not run repo-wide checks.** No `vp check`, no `vp run -r test`, no `vp run -r typecheck` unless I ask. CI owns the full suite.
 - Backend behavior changes ship with focused tests for that behavior.
-- Proof for a bug fix depends on the bug. Logic, data, state, and protocol bugs get a failing test first (the fewest that fail on `main` for that reason, in an existing case of the module's test file where one fits), then the fix. Purely visual bugs (spacing, colour, alignment, a layout shift) get before/after captures as their proof and no test: do not add UI tests for nitpicks, and do not ask for one in review when a capture already shows it. A server-only fix with no visible surface ships the test plus a short runtime transcript.
+- Proof for a bug fix depends on the bug. Logic, data, state, and protocol bugs get a failing test first (the fewest that fail on `main` for that reason, in an existing case of the module's test file where one fits), then the fix. Purely visual bugs (spacing, colour, alignment, a layout shift) get before/after captures as their proof and no test: do not add UI tests for nitpicks, and do not ask for one in review when a capture already shows it. A server-only fix with no visible surface ships the test plus a short runtime transcript. For a bug a user can reproduce in the web client, `vp run scenarios:prove` shows it failing on base and passing on the fix in the real app; see [Scenarios](docs/operations/scenarios.md).
 - The server is event-sourced, and side effects run after the command commits. In tests, drain the effect worker (`OrchestrationEffectWorkerV2.drain`) or await the specific persisted event or `Deferred` that marks the milestone. Never wait on sleeps or polling. A test that needs a timeout to pass is wrong. Concretely:
   - `it.effect` runs on a `TestClock`; `Effect.sleep` only advances through `TestClock.adjust`. `it.live` is wall-clock and only for subprocess or network fixtures.
   - No `yieldNow` or `sleep` polling loops. Await the `Deferred`, take from the `Queue`, or drain the worker.
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 4a4884ba73e29..ab4e1ed382dab 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -27,7 +27,7 @@
     "electron-updater": "^6.8.9",
     "electron-webauthn": "catalog:",
     "ffi-rs": "1.3.2",
-    "playwright-core": "1.60.0",
+    "playwright-core": "1.64.1",
     "react-grab": "^0.1.32",
     "tldts": "catalog:"
   },
diff --git a/apps/desktop/src/app/DesktopClerk.ts b/apps/desktop/src/app/DesktopClerk.ts
index ef9d2aad56795..206a143128a8e 100644
--- a/apps/desktop/src/app/DesktopClerk.ts
+++ b/apps/desktop/src/app/DesktopClerk.ts
@@ -116,6 +116,11 @@ export const make = Effect.gen(function* () {
     yield* electronApp.quit;
     return yield* Effect.interrupt;
   }
+  // Chromium opens these caches at the first event-loop turn, before ready.
+  yield* DesktopUserData.clearStaleGpuCaches({
+    userDataPath,
+    electronVersion: process.versions.electron,
+  });
 
   const pendingSecondInstances: Array<readonly string[]> = [];
   let handleSecondInstance = (argv: readonly string[]) => {
diff --git a/apps/desktop/src/app/DesktopPreReadyFileSystem.ts b/apps/desktop/src/app/DesktopPreReadyFileSystem.ts
index 6a7473e2f1b1a..de3230de02624 100644
--- a/apps/desktop/src/app/DesktopPreReadyFileSystem.ts
+++ b/apps/desktop/src/app/DesktopPreReadyFileSystem.ts
@@ -49,6 +49,13 @@ export const make = FileSystem.makeNoop({
     syncFs("makeDirectory", path, () => {
       NodeFS.mkdirSync(path, { recursive: options?.recursive ?? false });
     }),
+  remove: (path, options) =>
+    syncFs("remove", path, () =>
+      NodeFS.rmSync(path, {
+        recursive: options?.recursive ?? false,
+        force: options?.force ?? false,
+      }),
+    ),
   writeFileString: (path, data, options) =>
     syncFs("writeFileString", path, () =>
       NodeFS.writeFileSync(path, data, { flag: options?.flag ?? "w" }),
diff --git a/apps/desktop/src/app/DesktopUserData.test.ts b/apps/desktop/src/app/DesktopUserData.test.ts
index 78bab4085627b..53e548bd1d41b 100644
--- a/apps/desktop/src/app/DesktopUserData.test.ts
+++ b/apps/desktop/src/app/DesktopUserData.test.ts
@@ -3,8 +3,9 @@ import { assert, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
+import * as PlatformError from "effect/PlatformError";
 
-import { resolveUserDataPath } from "./DesktopUserData.ts";
+import { clearStaleGpuCaches, resolveUserDataPath } from "./DesktopUserData.ts";
 
 it.effect.each(["t3code", "T3 Code (Alpha)"])(
   "preserves Windows credential keys from %s without copying browser databases",
@@ -40,3 +41,100 @@ it.effect.each(["t3code", "T3 Code (Alpha)"])(
       );
     }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
 );
+
+const gpuCacheDirectories = [
+  "GPUCache",
+  "GrShaderCache",
+  "ShaderCache",
+  "DawnGraphiteCache",
+  "DawnWebGPUCache",
+  "GPUPersistentCache",
+];
+
+it.effect.each([
+  { profile: "written by Electron 44.10.0", marker: "44.10.0" },
+  { profile: "with no recorded Electron version", marker: undefined },
+])("clears GPU caches $profile once when Electron 44.10.1 starts", ({ marker }) =>
+  Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const userDataPath = yield* fs.makeTempDirectoryScoped({ prefix: "t3-v2-gpu-cache-" });
+    for (const name of gpuCacheDirectories) {
+      yield* fs.makeDirectory(path.join(userDataPath, name), { recursive: true });
+      yield* fs.writeFileString(path.join(userDataPath, name, "data_0"), "44.10.0 shaders");
+    }
+    yield* fs.makeDirectory(path.join(userDataPath, "Local Storage"), { recursive: true });
+    yield* fs.writeFileString(path.join(userDataPath, "Local Storage", "LOCK"), "profile");
+    yield* fs.writeFileString(path.join(userDataPath, "Local State"), "profile");
+    if (marker !== undefined) {
+      yield* fs.writeFileString(path.join(userDataPath, "gpu-cache-electron-version"), marker);
+    }
+
+    yield* clearStaleGpuCaches({ userDataPath, electronVersion: "44.10.1" });
+
+    const survivingCaches: Array<string> = [];
+    for (const name of gpuCacheDirectories) {
+      if (yield* fs.exists(path.join(userDataPath, name))) survivingCaches.push(name);
+    }
+    assert.deepStrictEqual(survivingCaches, []);
+    assert.equal(
+      yield* fs.readFileString(path.join(userDataPath, "Local Storage", "LOCK")),
+      "profile",
+    );
+    assert.equal(yield* fs.readFileString(path.join(userDataPath, "Local State")), "profile");
+
+    yield* fs.makeDirectory(path.join(userDataPath, "GPUCache"));
+    yield* fs.writeFileString(path.join(userDataPath, "GPUCache", "data_0"), "44.10.1 shaders");
+    yield* clearStaleGpuCaches({ userDataPath, electronVersion: "44.10.1" });
+    assert.equal(
+      yield* fs.readFileString(path.join(userDataPath, "GPUCache", "data_0")),
+      "44.10.1 shaders",
+    );
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("keeps GPU caches built on the first launch of a fresh install", () =>
+  Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const appData = yield* fs.makeTempDirectoryScoped({ prefix: "t3-v2-fresh-" });
+    const userDataPath = path.join(appData, "t3code-v2");
+
+    yield* clearStaleGpuCaches({ userDataPath, electronVersion: "44.10.1" });
+    yield* fs.makeDirectory(path.join(userDataPath, "GPUCache"));
+    yield* fs.writeFileString(path.join(userDataPath, "GPUCache", "data_0"), "44.10.1 shaders");
+    yield* clearStaleGpuCaches({ userDataPath, electronVersion: "44.10.1" });
+
+    assert.equal(
+      yield* fs.readFileString(path.join(userDataPath, "GPUCache", "data_0")),
+      "44.10.1 shaders",
+    );
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("retries on the next launch when a GPU cache cannot be removed", () =>
+  Effect.gen(function* () {
+    const writes: Array<string> = [];
+    const fileSystem = FileSystem.makeNoop({
+      remove: (path) =>
+        Effect.fail(
+          PlatformError.systemError({
+            _tag: "PermissionDenied",
+            module: "FileSystem",
+            method: "remove",
+            pathOrDescriptor: path,
+          }),
+        ),
+      writeFileString: (path) =>
+        Effect.sync(() => {
+          writes.push(path);
+        }),
+    });
+
+    yield* clearStaleGpuCaches({ userDataPath: "/profile", electronVersion: "44.10.1" }).pipe(
+      Effect.provideService(FileSystem.FileSystem, fileSystem),
+    );
+
+    assert.deepStrictEqual(writes, []);
+  }).pipe(Effect.provide(NodeServices.layer)),
+);
diff --git a/apps/desktop/src/app/DesktopUserData.ts b/apps/desktop/src/app/DesktopUserData.ts
index 99a082b438b0d..0124aa72e0ad5 100644
--- a/apps/desktop/src/app/DesktopUserData.ts
+++ b/apps/desktop/src/app/DesktopUserData.ts
@@ -95,3 +95,43 @@ export const resolveUserDataPath = Effect.fn("desktop.userData.resolveUserDataPa
     return destinationPath;
   },
 );
+
+const GPU_CACHE_DIRECTORIES = [
+  "GPUCache",
+  "GrShaderCache",
+  "ShaderCache",
+  "DawnGraphiteCache",
+  "DawnWebGPUCache",
+  "GPUPersistentCache",
+];
+
+// Keyed on Electron, not Chromium: Electron patches ship Chromium backports under the same Chrome version.
+export const clearStaleGpuCaches = Effect.fn("desktop.userData.clearStaleGpuCaches")(
+  function* (input: { readonly userDataPath: string; readonly electronVersion: string }) {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const markerPath = path.join(input.userDataPath, "gpu-cache-electron-version");
+    const cachedVersion = yield* fs.readFileString(markerPath).pipe(
+      Effect.catchIf(
+        (error) => error.reason._tag === "NotFound",
+        () => Effect.undefined,
+      ),
+    );
+    if (cachedVersion?.trim() === input.electronVersion) return;
+    for (const name of GPU_CACHE_DIRECTORIES) {
+      yield* fs.remove(path.join(input.userDataPath, name), { recursive: true, force: true });
+    }
+    yield* fs.makeDirectory(input.userDataPath, { recursive: true });
+    yield* fs.writeFileString(markerPath, input.electronVersion);
+  },
+  (effect, input) =>
+    effect.pipe(
+      Effect.catch((error) =>
+        Effect.logWarning("could not clear stale GPU caches", {
+          userDataPath: input.userDataPath,
+          electronVersion: input.electronVersion,
+          error: error.message,
+        }),
+      ),
+    ),
+);
diff --git a/apps/desktop/src/ipc/DesktopIpc.test.ts b/apps/desktop/src/ipc/DesktopIpc.test.ts
new file mode 100644
index 0000000000000..45f63b951f366
--- /dev/null
+++ b/apps/desktop/src/ipc/DesktopIpc.test.ts
@@ -0,0 +1,67 @@
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
+import { assert, it } from "@effect/vitest";
+import { vi } from "vite-plus/test";
+
+vi.mock("electron", () => ({}));
+
+import * as ElectronWindow from "../electron/ElectronWindow.ts";
+import * as DesktopIpc from "./DesktopIpc.ts";
+
+it.effect("answers only the main window's top frame", () =>
+  Effect.gen(function* () {
+    const mainFrame = {};
+    const invoke = new Map<string, DesktopIpc.DesktopIpcHandleListener>();
+    const sync = new Map<string, DesktopIpc.DesktopIpcSyncListener>();
+    const ipc = yield* DesktopIpc.DesktopIpc.pipe(
+      Effect.provide(
+        DesktopIpc.layer({
+          removeHandler: (channel) => void invoke.delete(channel),
+          handle: (channel, listener) => void invoke.set(channel, listener),
+          removeAllListeners: (channel) => void sync.delete(channel),
+          on: (channel, listener) => void sync.set(channel, listener),
+        }).pipe(
+          Layer.provide(
+            Layer.mock(ElectronWindow.ElectronWindow, {
+              main: Effect.succeedSome({
+                webContents: { id: 1, mainFrame },
+              } as unknown as Electron.BrowserWindow),
+            }),
+          ),
+        ),
+      ),
+    );
+    yield* ipc.handle(
+      DesktopIpc.makeIpcMethod({
+        channel: "token",
+        payload: Schema.Void,
+        result: Schema.String,
+        handler: () => Effect.succeed("secret"),
+      }),
+    );
+    yield* ipc.handleSync({ channel: "token-sync", handler: () => Effect.succeed("secret") });
+
+    const senders = {
+      app: { sender: { id: 1 }, senderFrame: mainFrame },
+      appSubframe: { sender: { id: 1 }, senderFrame: {} },
+      previewGuest: { sender: { id: 2 }, senderFrame: {} },
+    };
+    const results: Record<string, unknown> = {};
+    for (const [name, sender] of Object.entries(senders)) {
+      const event = { ...sender, returnValue: "unset" as unknown };
+      sync.get("token-sync")!(event);
+      results[name] = [
+        yield* Effect.promise(() =>
+          Promise.resolve(invoke.get("token")!(sender, undefined)).catch(() => "rejected"),
+        ),
+        event.returnValue,
+      ];
+    }
+    assert.deepEqual(results, {
+      app: ["secret", "secret"],
+      appSubframe: ["rejected", undefined],
+      previewGuest: ["rejected", undefined],
+    });
+  }).pipe(Effect.scoped),
+);
diff --git a/apps/desktop/src/ipc/DesktopIpc.ts b/apps/desktop/src/ipc/DesktopIpc.ts
index 354acc5a81552..69d4f70c15a0e 100644
--- a/apps/desktop/src/ipc/DesktopIpc.ts
+++ b/apps/desktop/src/ipc/DesktopIpc.ts
@@ -1,17 +1,23 @@
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 import * as Scope from "effect/Scope";
 
+import * as ElectronWindow from "../electron/ElectronWindow.ts";
+
 export interface DesktopIpcInvokeEvent {
   readonly sender: { readonly id: number };
+  readonly senderFrame?: unknown;
 }
 
-export interface DesktopIpcSyncEvent {
+export interface DesktopIpcSyncEvent extends DesktopIpcInvokeEvent {
   returnValue: unknown;
 }
 
+export type DesktopIpcSenderGuard = (event: DesktopIpcInvokeEvent) => Effect.Effect<boolean>;
+
 export type DesktopIpcHandleListener = (
   event: DesktopIpcInvokeEvent,
   raw: unknown,
@@ -52,6 +58,15 @@ export class DesktopIpcUnregistrationError extends Schema.TaggedError<DesktopIpc
   }
 }
 
+export class DesktopIpcUntrustedSenderError extends Schema.TaggedError<DesktopIpcUntrustedSenderError>()(
+  "DesktopIpcUntrustedSenderError",
+  { channel: Schema.String },
+) {
+  override get message(): string {
+    return `Rejected ${this.channel} from a sender that is not the app window.`;
+  }
+}
+
 export const DesktopIpcError = Schema.Union([
   DesktopIpcRegistrationError,
   DesktopIpcUnregistrationError,
@@ -80,7 +95,11 @@ export class DesktopIpc extends Context.Service<
   }
 >()("@t3tools/desktop/ipc/DesktopIpc") {}
 
-export const make = (ipcMain: DesktopIpcMain): DesktopIpc["Service"] =>
+// ipcMain is shared by every webContents, including preview guests that load arbitrary pages.
+export const make = (
+  ipcMain: DesktopIpcMain,
+  isTrustedSender: DesktopIpcSenderGuard,
+): DesktopIpc["Service"] =>
   DesktopIpc.of({
     handle: Effect.fn("desktop.ipc.registerInvoke")(function* <E, R>({
       channel,
@@ -98,6 +117,9 @@ export const make = (ipcMain: DesktopIpcMain): DesktopIpc["Service"] =>
               runPromise(
                 Effect.gen(function* () {
                   yield* Effect.annotateCurrentSpan({ channel });
+                  if (!(yield* isTrustedSender(event))) {
+                    return yield* new DesktopIpcUntrustedSenderError({ channel });
+                  }
                   return yield* handler(raw, event);
                 }).pipe(Effect.annotateLogs({ channel }), Effect.withSpan("desktop.ipc.invoke")),
               ),
@@ -131,6 +153,11 @@ export const make = (ipcMain: DesktopIpcMain): DesktopIpc["Service"] =>
               event.returnValue = runSync(
                 Effect.gen(function* () {
                   yield* Effect.annotateCurrentSpan({ channel });
+                  // Throwing here would surface as an uncaught main-process exception.
+                  if (!(yield* isTrustedSender(event))) {
+                    yield* Effect.logWarning("Rejected sync IPC from an untrusted sender.");
+                    return undefined;
+                  }
                   return yield* handler();
                 }).pipe(
                   Effect.annotateLogs({ channel }),
@@ -152,7 +179,28 @@ export const make = (ipcMain: DesktopIpcMain): DesktopIpc["Service"] =>
     }),
   });
 
-export const layer = (ipcMain: DesktopIpcMain) => Layer.succeed(DesktopIpc, make(ipcMain));
+export const layer = (ipcMain: DesktopIpcMain) =>
+  Layer.effect(
+    DesktopIpc,
+    Effect.gen(function* () {
+      const electronWindow = yield* ElectronWindow.ElectronWindow;
+      return make(ipcMain, (event) =>
+        Effect.map(
+          electronWindow.main,
+          (main) =>
+            Option.isSome(main) &&
+            main.value.webContents.id === event.sender.id &&
+            main.value.webContents.mainFrame === event.senderFrame,
+        ),
+      );
+    }),
+  );
+
+export const layerTest = (ipcMain: DesktopIpcMain) =>
+  Layer.succeed(
+    DesktopIpc,
+    make(ipcMain, () => Effect.succeed(true)),
+  );
 
 export interface DesktopIpcMethodRegistration<
   Payload,
diff --git a/apps/desktop/src/ipc/methods/notificationBadge.test.ts b/apps/desktop/src/ipc/methods/notificationBadge.test.ts
index 7126b1cd31945..b3c85c9ead283 100644
--- a/apps/desktop/src/ipc/methods/notificationBadge.test.ts
+++ b/apps/desktop/src/ipc/methods/notificationBadge.test.ts
@@ -80,7 +80,7 @@ it.effect("validates IPC and clears on native focus, quit, and disposal", () =>
       Effect.provideService(HostProcess.Platform, "linux"),
       Effect.provide([
         ElectronApp.layer,
-        DesktopIpc.layer({
+        DesktopIpc.layerTest({
           handle: (channel, handler) => {
             handlers.set(channel, handler);
           },
diff --git a/apps/desktop/src/ipc/methods/preview.test.ts b/apps/desktop/src/ipc/methods/preview.test.ts
index 802f2f3fb18b6..bd7e44bec8307 100644
--- a/apps/desktop/src/ipc/methods/preview.test.ts
+++ b/apps/desktop/src/ipc/methods/preview.test.ts
@@ -42,14 +42,17 @@ describe("preview IPC methods", () => {
     Effect.scoped(
       Effect.gen(function* () {
         let listener: DesktopIpc.DesktopIpcHandleListener | undefined;
-        const ipc = DesktopIpc.make({
-          removeHandler: vi.fn(),
-          handle: (_channel, registered) => {
-            listener = registered;
+        const ipc = DesktopIpc.make(
+          {
+            removeHandler: vi.fn(),
+            handle: (_channel, registered) => {
+              listener = registered;
+            },
+            removeAllListeners: vi.fn(),
+            on: vi.fn(),
           },
-          removeAllListeners: vi.fn(),
-          on: vi.fn(),
-        });
+          () => Effect.succeed(true),
+        );
         yield* ipc.handle(method);
         return yield* Effect.promise(async () =>
           structuredClone(await listener!({ sender: { id: 7 } }, { tabId: "capture-tab" })),
diff --git a/apps/desktop/src/ipc/methods/window.test.ts b/apps/desktop/src/ipc/methods/window.test.ts
index eebabd429025d..376f85d2baf9d 100644
--- a/apps/desktop/src/ipc/methods/window.test.ts
+++ b/apps/desktop/src/ipc/methods/window.test.ts
@@ -202,7 +202,7 @@ describe("installRelayTelemetryEnabled", () => {
       yield* installRelayTelemetryEnabled().pipe(
         Effect.provideService(HostProcess.Environment, env),
         Effect.provide(
-          Layer.mergeAll(DesktopIpc.layer(ipcMain), DesktopManagedPolicy.layerTest(policy)),
+          Layer.mergeAll(DesktopIpc.layerTest(ipcMain), DesktopManagedPolicy.layerTest(policy)),
         ),
       );
       const event = { returnValue: undefined as unknown };
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index d109518be15e4..e3971d7c74ea5 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -139,7 +139,7 @@ const layerElectron = Layer.mergeAll(
   ElectronTheme.layer,
   ElectronUpdater.layer,
   ElectronWindow.layer,
-  DesktopIpc.layer(Electron.ipcMain),
+  DesktopIpc.layer(Electron.ipcMain).pipe(Layer.provide(ElectronWindow.layer)),
 );
 
 const layerDesktopFoundation = Layer.mergeAll(
diff --git a/apps/desktop/src/window/DesktopWindow.test.ts b/apps/desktop/src/window/DesktopWindow.test.ts
index 3e461303556ab..91d034cbd772b 100644
--- a/apps/desktop/src/window/DesktopWindow.test.ts
+++ b/apps/desktop/src/window/DesktopWindow.test.ts
@@ -697,6 +697,55 @@ describe("DesktopWindow", () => {
     }),
   );
 
+  it.effect("ignores input that arrives after the window is destroyed", () =>
+    Effect.gen(function* () {
+      const fakeWindow = makeFakeBrowserWindow();
+      const createCount = yield* Ref.make(0);
+      const mainWindow = yield* Ref.make<Option.Option<Electron.BrowserWindow>>(Option.none());
+      const layer = layerTest({
+        window: fakeWindow.window,
+        createCount,
+        mainWindow,
+      });
+
+      yield* Effect.gen(function* () {
+        const desktopWindow = yield* DesktopWindow.DesktopWindow;
+        yield* desktopWindow.handleBackendReady(new URL("http://127.0.0.1:3773"));
+
+        const beforeInput = fakeWindow.webContentsListeners.get("before-input-event");
+        const inputEvent = fakeWindow.webContentsListeners.get("input-event");
+        if (!beforeInput || !inputEvent) {
+          return yield* Effect.die("input listeners were not registered");
+        }
+
+        // Electron throws on any member access of a destroyed BrowserWindow.
+        fakeWindow.isDestroyed.mockReturnValue(true);
+        Object.defineProperty(fakeWindow.window, "webContents", {
+          get: () => {
+            throw new TypeError("Object has been destroyed");
+          },
+        });
+
+        // A held Cmd+Q quits from the grace timer, so the trailing Q keyUp lands here.
+        assert.doesNotThrow(() =>
+          beforeInput(
+            { preventDefault: () => {} },
+            {
+              type: "keyUp",
+              isAutoRepeat: false,
+              key: "q",
+              meta: true,
+              control: false,
+              alt: false,
+              shift: false,
+            },
+          ),
+        );
+        assert.doesNotThrow(() => inputEvent({}, { type: "gestureScrollEnd" }));
+      }).pipe(Effect.provide(layer));
+    }),
+  );
+
   // Chromium hands the main window's zoom level down to embedded preview
   // guests, so every app zoom has to put the preview browser back at its own
   // zoom or zooming the UI drags the previewed page with it.
diff --git a/apps/desktop/src/window/DesktopWindow.ts b/apps/desktop/src/window/DesktopWindow.ts
index b8446f78740c4..73f5b41810dae 100644
--- a/apps/desktop/src/window/DesktopWindow.ts
+++ b/apps/desktop/src/window/DesktopWindow.ts
@@ -705,6 +705,7 @@ export const make = Effect.gen(function* () {
     });
     window.webContents.on("before-input-event", (event, input) => {
       quitShortcutHandler(event, input);
+      if (window.isDestroyed()) return;
       // Cmd/Ctrl+W reaches the renderer; DevTools uses the native menu shortcut.
       window.webContents.setIgnoreMenuShortcuts(
         (environment.platform === "darwin" ? input.meta : input.control) &&
@@ -720,6 +721,7 @@ export const make = Effect.gen(function* () {
       }
     });
     window.webContents.on("input-event", (_event, input) => {
+      if (window.isDestroyed()) return;
       if (input.type === "gestureScrollBegin") {
         window.webContents.send(TRACKPAD_SCROLL_BEGIN_CHANNEL);
       } else if (input.type === "gestureScrollEnd") {
@@ -905,6 +907,8 @@ export const make = Effect.gen(function* () {
       void runPromise(revealWhenReady);
     });
 
+    // Desktop IPC only answers the main window, so register it before its renderer can call in.
+    yield* electronWindow.setMain(window);
     loadApplication();
     if (environment.isDevelopment) {
       window.webContents.openDevTools({ mode: "detach" });
@@ -923,7 +927,6 @@ export const make = Effect.gen(function* () {
   const createMain = Effect.gen(function* () {
     const window = yield* createWindow();
     if (Option.isSome(window)) {
-      yield* electronWindow.setMain(window.value);
       mainClosedDuringStartup = false;
       yield* logWindowInfo("main window created");
     }
diff --git a/apps/mobile/src/components/ui/ListRow.tsx b/apps/mobile/src/components/ui/ListRow.tsx
index de8bba51beb35..8f2ce11259bc9 100644
--- a/apps/mobile/src/components/ui/ListRow.tsx
+++ b/apps/mobile/src/components/ui/ListRow.tsx
@@ -1,17 +1,27 @@
-import { Platform } from "react-native";
+import { Platform, View } from "react-native";
 
 import { useResolveClassNames } from "uniwind";
 import { SymbolView } from "./AppSymbol";
 import { ListRowLayout, type ListRowContentProps } from "./ListRowLayout";
+import { RadioIndicator } from "./RadioIndicator";
 import { RowPressable } from "./RowPressable";
 
-export function ListRow(props: ListRowContentProps & { readonly onPress: () => void }) {
+export function ListRow(
+  props: ListRowContentProps & {
+    readonly onPress: () => void;
+    /** Marks the row as the chosen option while it still navigates. */
+    readonly selected?: boolean;
+  },
+) {
   const rippleStyle = useResolveClassNames("bg-subtle-strong");
   return (
     <RowPressable
       accessibilityRole="button"
       accessibilityLabel={[props.label, props.description, props.detail].filter(Boolean).join(", ")}
-      accessibilityState={{ disabled: Boolean(props.disabled) }}
+      accessibilityState={{
+        disabled: Boolean(props.disabled),
+        ...(props.selected === undefined ? {} : { checked: props.selected }),
+      }}
       disabled={props.disabled}
       onPress={props.onPress}
       android_ripple={{ color: rippleStyle.backgroundColor }}
@@ -21,13 +31,34 @@ export function ListRow(props: ListRowContentProps & { readonly onPress: () => v
       <ListRowLayout
         {...props}
         accessory={
-          <SymbolView
-            name="chevron.right"
-            size={16}
-            tintColorClassName="accent-chevron"
-            type="monochrome"
-            weight="semibold"
-          />
+          <View className="flex-row items-center gap-3">
+            {props.selected === undefined ? null : (
+              <View
+                accessibilityElementsHidden
+                importantForAccessibility="no-hide-descendants"
+                className="size-6 items-center justify-center"
+              >
+                {Platform.OS === "android" ? (
+                  <RadioIndicator selected={props.selected} />
+                ) : props.selected ? (
+                  <SymbolView
+                    name="checkmark"
+                    size={18}
+                    tintColorClassName="accent-primary-text"
+                    type="monochrome"
+                    weight="semibold"
+                  />
+                ) : null}
+              </View>
+            )}
+            <SymbolView
+              name="chevron.right"
+              size={16}
+              tintColorClassName="accent-chevron"
+              type="monochrome"
+              weight="semibold"
+            />
+          </View>
         }
       />
     </RowPressable>
diff --git a/apps/mobile/src/features/pull-requests/PullRequestDiscussionScreen.tsx b/apps/mobile/src/features/pull-requests/PullRequestDiscussionScreen.tsx
index 9e4231ad65dd2..40a7d0b675af4 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestDiscussionScreen.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestDiscussionScreen.tsx
@@ -1,3 +1,8 @@
+import {
+  parsePullRequestAnchor,
+  pullRequestAnchorMatchesUrl,
+  resolvePullRequestReviewAnchor,
+} from "@t3tools/shared/pullRequestAnchor";
 import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
 import { useAtomRefresh } from "@effect/atom-react";
 import { useFocusEffect, useNavigation, type StaticScreenProps } from "@react-navigation/native";
@@ -8,7 +13,7 @@ import {
 import { AsyncResult } from "effect/reactivity";
 import type { PullRequestThreadComment } from "@t3tools/contracts";
 import { useRef, useState } from "react";
-import { ScrollView, View } from "react-native";
+import { ScrollView, View, type ScrollViewInstance } from "react-native";
 import { KeyboardAvoidingView, useKeyboardState } from "react-native-keyboard-controller";
 import { NativeScrollViewMarker as ScrollViewMarker } from "../../native/NativeScrollViewMarker";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
@@ -138,11 +143,27 @@ function Discussion({ params }: { params: PullRequestParams & { readonly discuss
       [...extra, ...(thread?.comments ?? [])].map((comment) => [comment.id, comment]),
     ).values(),
   ].sort((left, right) => left.createdAt.localeCompare(right.createdAt));
+  const scrollRef = useRef<ScrollViewInstance>(null);
+  const pendingTop = useRef<number | null>(null);
+  const positionedComment = useRef<string | null>(null);
+  const location = parsePullRequestAnchor(params.navigationUrl);
+  const anchor =
+    location?.kind === "timeline"
+      ? resolvePullRequestReviewAnchor(location.anchor, [], [{ comments }])
+      : null;
   const canReply = permissions.canReply && Boolean(thread);
   const resolveLabel = thread?.isResolved ? "Unresolve" : "Resolve";
   return (
     <PullRequestMarkdownRepository params={params} changeRequest={detail.data}>
-      <KeyboardAvoidingView automaticOffset behavior="height" className="flex-1 bg-screen">
+      <KeyboardAvoidingView
+        automaticOffset
+        behavior="height"
+        className="flex-1 bg-screen"
+        // Any touch, such as replying or loading replies, ends the wait to reposition the link.
+        onTouchStart={() => {
+          pendingTop.current = null;
+        }}
+      >
         <AppBar
           title="Discussion"
           subtitle={`#${params.number}`}
@@ -162,6 +183,12 @@ function Discussion({ params }: { params: PullRequestParams & { readonly discuss
         />
         <ScrollViewMarker style={{ flex: 1 }}>
           <ScrollView
+            ref={scrollRef}
+            onContentSizeChange={() => {
+              if (pendingTop.current === null) return;
+              scrollRef.current?.scrollTo({ y: pendingTop.current, animated: false });
+              pendingTop.current = null;
+            }}
             className="flex-1"
             contentInsetAdjustmentBehavior="automatic"
             keyboardShouldPersistTaps="handled"
@@ -192,7 +219,25 @@ function Discussion({ params }: { params: PullRequestParams & { readonly discuss
               <Text>This discussion is no longer available.</Text>
             ) : null}
             {comments.map((comment) => (
-              <View key={comment.id} className="gap-3 border-b border-border-subtle py-4">
+              <View
+                key={comment.id}
+                onLayout={(event) => {
+                  if (
+                    anchor === null ||
+                    !pullRequestAnchorMatchesUrl(anchor, comment.url) ||
+                    positionedComment.current === comment.id
+                  )
+                    return;
+                  positionedComment.current = comment.id;
+                  pendingTop.current = event.nativeEvent.layout.y;
+                  scrollRef.current?.scrollTo({ y: pendingTop.current, animated: false });
+                }}
+                className={
+                  anchor !== null && pullRequestAnchorMatchesUrl(anchor, comment.url)
+                    ? "-mx-3 gap-3 rounded-2xl border border-primary bg-primary/10 px-3 py-4"
+                    : "gap-3 border-b border-border-subtle py-4"
+                }
+              >
                 <View className="flex-row items-center gap-2">
                   <PullRequestAvatar actor={comment.author} size={28} />
                   <Text className="min-w-0 flex-1 text-sm font-t3-medium">
diff --git a/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx b/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
index f78cd9caa58cd..a58de3b87a781 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
@@ -1,3 +1,10 @@
+import {
+  parsePullRequestAnchor,
+  pullRequestAnchorMatchesUrl,
+  pullRequestDiffPathMatches,
+  pullRequestLinkCommit,
+  resolvePullRequestReviewAnchor,
+} from "@t3tools/shared/pullRequestAnchor";
 import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
 import { Chip } from "../../components/ui/Chip";
 import { pullRequestTabOffset } from "./pullRequestTabScroll";
@@ -154,8 +161,34 @@ function usePullRequestActivityRows(params: PullRequestParams, filter: ActivityF
       });
     return rows;
   })();
+  const location = parsePullRequestAnchor(params.navigationUrl);
+  const anchor =
+    location?.kind !== "timeline"
+      ? null
+      : result.data
+        ? resolvePullRequestReviewAnchor(
+            location.anchor,
+            result.data.comments,
+            result.data.reviewThreads,
+          )
+        : location.anchor;
+  const targetComment = anchor
+    ? result.data?.comments.find((comment) => pullRequestAnchorMatchesUrl(anchor, comment.url))
+    : null;
+  const targetThread = anchor
+    ? result.data?.reviewThreads.find((thread) =>
+        thread.comments.some((comment) => pullRequestAnchorMatchesUrl(anchor, comment.url)),
+      )
+    : null;
+  const targetKey = targetThread
+    ? `discussion:${targetThread.id}`
+    : targetComment
+      ? `comment:${targetComment.id}`
+      : null;
   return {
     rows,
+    targetKey,
+    targetThread,
     hiddenCount: filtered?.hiddenCount ?? 0,
     pending: result.isPending && !result.data,
     error: result.error,
@@ -334,7 +367,10 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
   const params = route.params;
   usePullRequestEnvironmentFallback(params);
   const connected = usePullRequestConnected(params.environmentId);
-  const [chosenSection, setSection] = useState<"overview" | "activity" | "guide">("overview");
+  const [chosenSection, setSection] = useState<"overview" | "activity" | "guide">(() => {
+    const kind = parsePullRequestAnchor(params.navigationUrl)?.kind;
+    return kind === "timeline" || kind === "commits" ? "activity" : "overview";
+  });
   const requestedSection = useRef(chosenSection);
   const [listAnimationsReady, setListAnimationsReady] = useState(false);
   const [descriptionExpanded, setDescriptionExpanded] = useState(false);
@@ -345,7 +381,14 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
   const shown = (tab: typeof chosenSection) =>
     !guidesEnabled && tab === "guide" ? "overview" : tab;
   const section = shown(chosenSection);
-  const [activityFilter, setActivityFilter] = useState<ActivityFilter>(DEFAULT_ACTIVITY_FILTER);
+  const [activityFilter, setActivityFilter] = useState<ActivityFilter>(() => {
+    const kind = parsePullRequestAnchor(params.navigationUrl)?.kind;
+    return kind === "timeline"
+      ? { ...DEFAULT_ACTIVITY_FILTER, bots: true, resolved: true }
+      : kind === "commits"
+        ? { ...DEFAULT_ACTIVITY_FILTER, kind: "commits" }
+        : DEFAULT_ACTIVITY_FILTER;
+  });
   const activityContent = usePullRequestActivityRows(params, activityFilter);
   const scrollOffsets = useRef<Record<string, number>>({});
   // The offset of the tab last shown, and which tab that was: a tab standing in for a hidden guide
@@ -386,6 +429,74 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
     scrollViews.current[next]?.scrollToOffset({ offset, animated: false });
     setSection(next);
   };
+  const followLink = useEffectEvent(() => {
+    const target = parsePullRequestAnchor(params.navigationUrl);
+    if (target?.kind === "diff" || target?.kind === "code") {
+      const commit = pullRequestLinkCommit(params.navigationUrl);
+      navigation.navigate("PullRequestFile", {
+        ...params,
+        path: "",
+        ...(commit ? { commit } : {}),
+      });
+    } else if (target?.kind === "timeline") {
+      selectSection("activity");
+      setActivityFilter((filter) => ({ ...filter, kind: "all", bots: true, resolved: true }));
+    } else if (target?.kind === "commits") {
+      selectSection("activity");
+      setActivityFilter((filter) => ({ ...filter, kind: "commits" }));
+    } else if (target?.kind === "checks") {
+      selectSection("overview");
+      // Checks head Overview, which a reused screen may have scrolled past.
+      scrollViews.current.overview?.scrollToOffset({ offset: -contentTopInset, animated: false });
+    } else if (target?.kind === "summary") {
+      selectSection("overview");
+    }
+  });
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- a link selects its native PR section or diff even when the route is reused
+  useEffect(() => {
+    // oxlint-disable-next-line react/set-state-in-effect -- URL navigation selects the PR section and makes its target visible
+    followLink();
+    // oxlint-disable-next-line react/exhaustive-effect-dependencies -- each clicked URL is a fresh navigation request
+  }, [params.navigationUrl, params.navigationId]);
+
+  const activityTargetIndex = activityContent.rows.findIndex(
+    (row) => row.key === activityContent.targetKey,
+  );
+  const openedDiscussion = useRef<string | null>(null);
+  const positionedActivity = useRef<string | null>(null);
+  // Rows above the target measure in after the first jump, so it is held until the user scrolls.
+  const heldActivityRow = useRef<number | null>(null);
+  const positionActivityRow = (index: number) =>
+    void scrollViews.current.activity?.scrollToIndex({
+      index,
+      viewPosition: 0,
+      viewOffset: contentTopInset + 12,
+      animated: false,
+    });
+  const revealActivity = useEffectEvent(() => {
+    const key = `${params.navigationUrl}:${params.navigationId ?? 0}`;
+    if (activityContent.targetThread && openedDiscussion.current !== key) {
+      openedDiscussion.current = key;
+      navigation.navigate("PullRequestDiscussion", {
+        ...params,
+        discussionId: activityContent.targetThread.id,
+      });
+      return;
+    }
+    // Later filter or refresh changes move the row; they must not pull the user back to it.
+    if (activityTargetIndex >= 0 && positionedActivity.current !== key) {
+      positionedActivity.current = key;
+      // Its top sits under the app bar; centering a long comment pushed its start off screen.
+      heldActivityRow.current = activityTargetIndex + 1;
+      positionActivityRow(activityTargetIndex + 1);
+    }
+  });
+  const targetThreadId = activityContent.targetThread?.id;
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- reveals the requested activity once its asynchronous rows arrive
+  useEffect(() => {
+    revealActivity();
+    // oxlint-disable-next-line react/exhaustive-effect-dependencies -- reruns when activity resolves the URL target, even a thread the filter hides
+  }, [params.navigationUrl, params.navigationId, activityTargetIndex, targetThreadId]);
   const tabContent = activityContent;
   const filesY = useRef(0);
   const descriptionY = useRef(0);
@@ -596,6 +707,13 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
                   // The scroll view owns its resting offset. LegendList keeps the first
                   // initialScrollOffset it gets, and the first render has the window's top
                   // inset (0 on the folded iPhone Duo), not the header's.
+                  onScrollBeginDrag={
+                    tab === "activity"
+                      ? () => {
+                          heldActivityRow.current = null;
+                        }
+                      : undefined
+                  }
                   onScroll={(event) => {
                     const offset = event.nativeEvent.contentOffset.y;
                     scrollOffsets.current[tab] = offset;
@@ -619,6 +737,13 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
                   alwaysBounceVertical
                   scrollsToTop={section === tab}
                   onItemSizeChanged={({ itemKey }) => {
+                    const held = heldActivityRow.current;
+                    if (tab === "activity" && held !== null) {
+                      // A filter or refresh that moved the row ends the hold.
+                      if (held !== activityTargetIndex + 1) heldActivityRow.current = null;
+                      else positionActivityRow(held);
+                      return;
+                    }
                     if (
                       tab !== "overview" ||
                       section !== "overview" ||
@@ -848,9 +973,20 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
     (detail.data ?? route.params.initialSummary)?.provider,
   ).changeRequest;
   const result = usePullRequestDiff(route.params, terminology);
+  // Other screens open files with the link's params spread in; only the link's own entry follows it.
+  const linkAnchor =
+    route.params.path === "" &&
+    (route.params.commit ?? null) === pullRequestLinkCommit(route.params.navigationUrl)
+      ? parsePullRequestAnchor(route.params.navigationUrl)
+      : null;
+  const linkPath =
+    linkAnchor?.kind === "diff" && result.parsed.kind === "files"
+      ? result.parsed.files.find((file) => pullRequestDiffPathMatches(linkAnchor.digest, file.path))
+          ?.path
+      : undefined;
   const filter = usePullRequestFileFilter(
     result.parsed,
-    route.params.focus ? route.params.path : undefined,
+    linkPath ?? (route.params.focus ? route.params.path : undefined),
   );
   const { refresh: refreshDetail } = detail;
   useFocusEffect(refreshDetail);
@@ -922,15 +1058,30 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
       code: row.content ?? "",
     });
   };
-  const [jumpPath, setJumpPath] = useState(route.params.path);
+  const [pickedPath, setJumpPath] = useState<string | null>(null);
+  const jumpPath = pickedPath ?? linkPath ?? route.params.path;
   const requestedFile =
     result.parsed.kind === "files"
       ? result.parsed.files.find((file) => file.path === jumpPath)
       : undefined;
   const targetFile =
     data.files.find((file) => file.path === jumpPath) ??
-    (!jumpPath || requestedFile ? data.files[0] : undefined);
-  const focus = route.params.focus;
+    (linkAnchor?.kind === "diff" && !linkPath
+      ? undefined
+      : !jumpPath || requestedFile
+        ? data.files[0]
+        : undefined);
+  const range = pickedPath === null && linkAnchor?.kind === "diff" ? linkAnchor.range : null;
+  const focus =
+    route.params.focus ??
+    (range
+      ? {
+          side: range.side === "left" ? ("old" as const) : ("new" as const),
+          start: range.start,
+          end: range.end,
+          endSide: range.endSide === "left" ? ("old" as const) : ("new" as const),
+        }
+      : undefined);
   const focusedRows = guideFocusedRows(data.rows, targetFile?.id, focus);
   const focusIndex = focusedRows.length
     ? data.rows.findIndex((row) => row.id === focusedRows[0]?.id)
@@ -941,7 +1092,7 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
   // The filter the current jump was made under. Hiding or showing test files replaces the rows,
   // so a jump made under the other filter has to run again. Native applies the entry
   // destination before its first viewport, so the first one counts as made.
-  const jumpedUnder = useRef<boolean | null>(filter.hideTestFiles);
+  const jumpedUnder = useRef<boolean | null>(targetFile ? filter.hideTestFiles : null);
   const hasTestFiles =
     result.parsed.kind === "files" &&
     result.parsed.files.some((file) => isTestChangedFile(file.path));
diff --git a/apps/mobile/src/features/pull-requests/PullRequestStatusRows.tsx b/apps/mobile/src/features/pull-requests/PullRequestStatusRows.tsx
index 52d5505c45604..03ba26f2247cf 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestStatusRows.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestStatusRows.tsx
@@ -1,3 +1,4 @@
+import { parsePullRequestAnchor } from "@t3tools/shared/pullRequestAnchor";
 import { usePullRequestConnected } from "./usePullRequestConnected";
 import { useAtomValue } from "@effect/atom-react";
 import { useNavigation } from "@react-navigation/native";
@@ -102,7 +103,13 @@ export function PullRequestStatusMenu(props: RowProps) {
 }
 
 export function PullRequestChecksRow(props: RowProps) {
-  const [expanded, setExpanded] = useState(false);
+  const linked = parsePullRequestAnchor(props.params.navigationUrl)?.kind === "checks";
+  const [expanded, setExpanded] = useState(linked);
+  const [seenNavigation, setSeenNavigation] = useState(props.params.navigationId);
+  if (props.params.navigationId !== seenNavigation) {
+    setSeenNavigation(props.params.navigationId);
+    if (linked) setExpanded(true);
+  }
   const checks = pullRequestChecksSummary(props.pr);
   const action = usePullRequestAction(props.params, props.pr);
   const definition = sourceControlClients.get(props.pr.provider);
diff --git a/apps/mobile/src/features/pull-requests/PullRequestTimeline.tsx b/apps/mobile/src/features/pull-requests/PullRequestTimeline.tsx
index e9f288ea9c60c..f3a491f2ef059 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestTimeline.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestTimeline.tsx
@@ -1,3 +1,7 @@
+import {
+  parsePullRequestAnchor,
+  pullRequestAnchorMatchesUrl,
+} from "@t3tools/shared/pullRequestAnchor";
 import { PullRequestEntryRow } from "./PullRequestEntryRow";
 import Svg, { Defs, LinearGradient, Rect, Stop } from "react-native-svg";
 import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
@@ -74,7 +78,10 @@ function TimelineComment({
   params: PullRequestParams;
   actions: CommentActions;
 }) {
-  const [expanded, setExpanded] = useState(false);
+  const target = parsePullRequestAnchor(params.navigationUrl);
+  const linked =
+    target?.kind === "timeline" && pullRequestAnchorMatchesUrl(target.anchor, comment.url);
+  const [expanded, setExpanded] = useState(linked);
   const { themeVariables: colors } = useAppearancePreferences();
   const long = comment.body.length > 450 || comment.body.split("\n").length > 8;
   const content = useMemo(
@@ -108,7 +115,13 @@ function TimelineComment({
         </Text>
       ) : null}
       {preview.trim() || content.attachments.length ? (
-        <View className="gap-2 overflow-hidden rounded-2xl bg-grouped-card p-3">
+        <View
+          className={
+            linked
+              ? "gap-2 overflow-hidden rounded-2xl border border-primary bg-primary/10 p-3"
+              : "gap-2 overflow-hidden rounded-2xl bg-grouped-card p-3"
+          }
+        >
           <View style={long && !expanded ? { maxHeight: 240, overflow: "hidden" } : undefined}>
             <PullRequestMarkdown
               markdown={long && !expanded ? comment.body.slice(0, 1200) : comment.body}
@@ -202,6 +215,7 @@ export function pullRequestTimelineRows(
   navigation: Pick<NavigationProp<ReactNavigation.RootParamList>, "navigate" | "dispatch">,
   actions: CommentActions,
 ) {
+  const linkTarget = parsePullRequestAnchor(params.navigationUrl);
   const discussionIds = new Set(
     activity.reviewThreads.flatMap((thread) => thread.comments.map((comment) => comment.id)),
   );
@@ -211,7 +225,19 @@ export function pullRequestTimelineRows(
       .map((comment) => ({
         key: `comment:${comment.id}`,
         date: comment.createdAt,
-        content: <TimelineComment comment={comment} params={params} actions={actions} />,
+        content: (
+          <TimelineComment
+            key={
+              linkTarget?.kind === "timeline" &&
+              pullRequestAnchorMatchesUrl(linkTarget.anchor, comment.url)
+                ? `${comment.id}:${params.navigationId ?? params.navigationUrl}`
+                : comment.id
+            }
+            comment={comment}
+            params={params}
+            actions={actions}
+          />
+        ),
       })),
     ...activity.reviewThreads.map((thread) => ({
       key: `discussion:${thread.id}`,
diff --git a/apps/mobile/src/features/pull-requests/guide/guideDiffFocus.test.ts b/apps/mobile/src/features/pull-requests/guide/guideDiffFocus.test.ts
new file mode 100644
index 0000000000000..49f09276d3659
--- /dev/null
+++ b/apps/mobile/src/features/pull-requests/guide/guideDiffFocus.test.ts
@@ -0,0 +1,30 @@
+import { expect, it } from "vite-plus/test";
+import type { NativeReviewDiffRow } from "../../diffs/nativeReviewDiffSurface";
+import { guideFocusedRows } from "./guideDiffFocus";
+
+it("focuses a range that crosses diff sides in either direction", () => {
+  const rows: NativeReviewDiffRow[] = [
+    { kind: "file", id: "file", fileId: "f" },
+    { kind: "line", id: "a", fileId: "f", oldLineNumber: 12 },
+    { kind: "line", id: "b", fileId: "f", oldLineNumber: 13 },
+    { kind: "line", id: "c", fileId: "f", newLineNumber: 12 },
+    { kind: "line", id: "d", fileId: "f", newLineNumber: 13 },
+    { kind: "line", id: "other", fileId: "other", newLineNumber: 13 },
+  ];
+  expect(
+    guideFocusedRows(rows, "f", { side: "old", start: 12, endSide: "new", end: 13 }).map(
+      (row) => row.id,
+    ),
+  ).toEqual(["a", "b", "c", "d"]);
+  expect(
+    guideFocusedRows(rows, "f", { side: "new", start: 13, endSide: "old", end: 12 }).map(
+      (row) => row.id,
+    ),
+  ).toEqual(["a", "b", "c", "d"]);
+  expect(
+    guideFocusedRows(rows, "f", { side: "old", start: 12, end: 13 }).map((row) => row.id),
+  ).toEqual(["a", "b"]);
+  expect(guideFocusedRows(rows, "f", { side: "old", start: 99, endSide: "new", end: 13 })).toEqual(
+    [],
+  );
+});
diff --git a/apps/mobile/src/features/pull-requests/guide/guideDiffFocus.ts b/apps/mobile/src/features/pull-requests/guide/guideDiffFocus.ts
index cc03bdbb60411..d840efb041f74 100644
--- a/apps/mobile/src/features/pull-requests/guide/guideDiffFocus.ts
+++ b/apps/mobile/src/features/pull-requests/guide/guideDiffFocus.ts
@@ -2,6 +2,7 @@ import type { NativeReviewDiffRow } from "../../diffs/nativeReviewDiffSurface";
 
 export type GuideDiffFocus = {
   readonly side: "old" | "new";
+  readonly endSide?: "old" | "new";
   readonly start: number;
   readonly end: number;
 };
@@ -12,6 +13,23 @@ export function guideFocusedRows(
   focus: GuideDiffFocus | undefined,
 ) {
   if (!fileId || !focus) return [];
+  if (focus.endSide && focus.endSide !== focus.side) {
+    const start = rows.findIndex(
+      (row) =>
+        row.fileId === fileId &&
+        (focus.side === "old" ? row.oldLineNumber : row.newLineNumber) === focus.start,
+    );
+    const end = rows.findIndex(
+      (row) =>
+        row.fileId === fileId &&
+        (focus.endSide === "old" ? row.oldLineNumber : row.newLineNumber) === focus.end,
+    );
+    return start < 0 || end < 0
+      ? []
+      : rows
+          .slice(Math.min(start, end), Math.max(start, end) + 1)
+          .filter((row) => row.fileId === fileId && row.kind === "line");
+  }
   return rows.filter((row) => {
     const line = focus.side === "old" ? row.oldLineNumber : row.newLineNumber;
     return (
diff --git a/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts b/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts
index 8a97deffaf06a..8a95397cb3d3a 100644
--- a/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts
+++ b/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts
@@ -34,7 +34,13 @@ describe("native PR entry points", () => {
         context,
         projects,
       ),
-    ).toEqual({ ...context, host: "github.com", repository: "org/repo", number: 12 });
+    ).toEqual({
+      ...context,
+      host: "github.com",
+      repository: "org/repo",
+      number: 12,
+      navigationUrl: "https://github.com/org/repo/pull/12/files#diff",
+    });
     expect(
       nativePullRequestDestination(
         "https://git.example/group/sub/repo/-/merge_requests/9",
diff --git a/apps/mobile/src/features/pull-requests/usePullRequestDiff.ts b/apps/mobile/src/features/pull-requests/usePullRequestDiff.ts
index 6f5180d8ab6bc..6e49993a137f3 100644
--- a/apps/mobile/src/features/pull-requests/usePullRequestDiff.ts
+++ b/apps/mobile/src/features/pull-requests/usePullRequestDiff.ts
@@ -23,6 +23,8 @@ export type PullRequestParams = {
   readonly repository: string;
   readonly number: number;
   readonly host?: string;
+  readonly navigationUrl?: string;
+  readonly navigationId?: number;
   readonly initialSummary?: PullRequestListEntry | PullRequestSummary;
 };
 
diff --git a/apps/mobile/src/features/settings/CloudVoiceSection.tsx b/apps/mobile/src/features/settings/CloudVoiceSection.tsx
index 684f8dbc83769..6ca61ece7b90a 100644
--- a/apps/mobile/src/features/settings/CloudVoiceSection.tsx
+++ b/apps/mobile/src/features/settings/CloudVoiceSection.tsx
@@ -21,7 +21,7 @@ import {
 import * as Schema from "effect/Schema";
 import Constants from "expo-constants";
 import { AsyncResult } from "effect/reactivity";
-import { useState } from "react";
+import { type ReactNode, useState } from "react";
 import { ScrollView, TextInput, View } from "react-native";
 import { Sheet } from "../../components/ui/Sheet";
 import * as Dialog from "../../components/ui/Dialog";
@@ -30,6 +30,7 @@ import { AppText as Text } from "../../components/ui/AppText";
 import { ListActionRow } from "../../components/ui/ListActionRow";
 import { ListChoiceRow } from "../../components/ui/ListChoiceRow";
 import { Chip } from "../../components/ui/Chip";
+import { ListSection } from "../../components/ui/ListSection";
 import type { EnvironmentPresentation } from "../../state/environments";
 import { useEnvironmentScope } from "../../state/session";
 import {
@@ -40,7 +41,6 @@ import {
   cloudVoiceModelsAtom,
   runSpeech,
 } from "../voice-input/voiceDestination";
-import { SettingsSection } from "./components/SettingsSection";
 
 type CloudDestination = Extract<VoiceTranscriptionDestination, { kind: "cloud" }>;
 type Props = { environment: EnvironmentPresentation; active: CloudDestination | null };
@@ -48,23 +48,38 @@ const isApiKey = Schema.is(CloudSpeechApiKey);
 const isModelId = Schema.is(CloudSpeechModelId);
 const MODEL_ROWS = 6;
 
-export function CloudVoiceSection({ environment, active }: Props) {
-  const [open, setOpen] = useState(false);
+/** The cloud method row for one environment; opens the provider sheet. */
+export function CloudVoiceChoice({
+  environment,
+  active,
+  open,
+  onOpenChange,
+}: Props & { open: boolean; onOpenChange: (open: boolean) => void }) {
+  const usable = useAtomValue(cloudVoiceConnectionAtom(environment.environmentId)) !== null;
   return (
-    <SettingsSection title={`Cloud via ${environment.label}`}>
-      <ListActionRow
-        label="Cloud providers"
+    <>
+      <ListChoiceRow
+        label="Cloud provider"
         description={
           active
-            ? `Using ${CLOUD_SPEECH_LABELS[active.provider]}`
-            : "Optional · use your own API key"
+            ? `${CLOUD_SPEECH_LABELS[active.provider]}${active.provider === "openrouter" ? ` · ${active.model}` : ""}`
+            : usable
+              ? "Use your own API key"
+              : "Not connected"
         }
-        onPress={() => setOpen(true)}
+        selected={active !== null}
+        disabled={!usable}
+        separated
+        onPress={() => onOpenChange(true)}
       />
       {open && (
-        <CloudChoices environment={environment} active={active} onClose={() => setOpen(false)} />
+        <CloudChoices
+          environment={environment}
+          active={active}
+          onClose={() => onOpenChange(false)}
+        />
       )}
-    </SettingsSection>
+    </>
   );
 }
 
@@ -92,54 +107,70 @@ function ModelPicker({
   const shown = showAll ? matches : matches.slice(0, MODEL_ROWS);
   const delisted = current !== undefined && !models.some((model) => model.id === current);
   return (
-    <>
-      <TextInput
-        accessibilityLabel="Search OpenRouter models"
-        placeholder="Search transcription models"
-        autoCapitalize="none"
-        autoCorrect={false}
-        editable={!disabled}
-        value={query}
-        onChangeText={setQuery}
-        className="mx-4 rounded-lg bg-background px-3 py-2 text-foreground"
-      />
-      {delisted ? (
-        <Text className="mx-4 text-sm text-destructive">
-          OpenRouter no longer lists {current}. Dictation stays off until you choose another model.
-        </Text>
-      ) : null}
+    <ListSection
+      title="Model"
+      footer={
+        delisted
+          ? `OpenRouter no longer lists ${current}. Dictation stays off until you choose another model.`
+          : undefined
+      }
+    >
+      <View className="px-4 py-3">
+        <TextInput
+          accessibilityLabel="Search OpenRouter models"
+          placeholder="Search transcription models"
+          autoCapitalize="none"
+          autoCorrect={false}
+          editable={!disabled}
+          value={query}
+          onChangeText={setQuery}
+          className="rounded-lg bg-background px-3 py-2 text-foreground"
+        />
+      </View>
       {selected && !shown.some((model) => model.id === selected.id) ? (
         <ListChoiceRow
           label={selected.name}
           description={selected.id}
           selected
+          separated
           disabled={disabled}
           onPress={() => {}}
         />
       ) : null}
-      {shown.map((model, index) => (
+      {shown.map((model) => (
         <ListChoiceRow
           key={model.id}
           label={model.name}
           description={model.id}
           selected={model.id === value}
-          separated={index > 0}
+          separated
           disabled={disabled}
           onPress={() => onChange(model.id)}
         />
       ))}
       {matches.length === 0 ? (
-        <Text className="mx-4 text-sm text-foreground-muted">No transcription model matches.</Text>
+        <Separated>
+          <Text className="px-4 py-3 text-sm text-foreground-muted">
+            No transcription model matches.
+          </Text>
+        </Separated>
       ) : matches.length > shown.length ? (
-        <ListActionRow
-          label={`Show all ${matches.length} models`}
-          onPress={() => setShowAll(true)}
-        />
+        <Separated>
+          <ListActionRow
+            label={`Show all ${matches.length} models`}
+            onPress={() => setShowAll(true)}
+          />
+        </Separated>
       ) : null}
-    </>
+    </ListSection>
   );
 }
 
+/** A hairline above a row that has no `separated` prop of its own. */
+function Separated({ children }: { children: ReactNode }) {
+  return <View className="border-t border-border-subtle">{children}</View>;
+}
+
 function CloudChoices({ environment, active, onClose }: Props & { onClose: () => void }) {
   const id = environment.environmentId;
   const connection = useAtomValue(cloudVoiceConnectionAtom(id));
@@ -223,58 +254,35 @@ function CloudChoices({ environment, active, onClose }: Props & { onClose: () =>
     onClose();
   };
   const catalog = AsyncResult.isSuccess(models) ? (models.value?.models ?? null) : null;
-  const content =
-    !AsyncResult.isSuccess(keys) || !keys.value || !connection ? (
-      <ListActionRow
-        label={
-          !connection
-            ? "Environment not connected"
-            : keys._tag === "Failure"
-              ? "Could not load keys · Retry"
-              : "Checking API keys…"
-        }
-        disabled={!connection || keys._tag !== "Failure"}
-        onPress={reload}
-      />
-    ) : (
-      CloudSpeechProvider.literals.map((provider) => {
-        if (editing && provider !== editing.provider) return null;
-        const label = CLOUD_SPEECH_LABELS[provider];
-        const company = CLOUD_SPEECH_PROVIDER_NAMES[provider];
-        const routed = provider === "openrouter";
-        const disclosure = cloudSpeechDisclosure(provider, environment.label);
-        const saved = keys.value![provider];
-        const isActive = active?.provider === provider;
-        const isEditing = editing?.provider === provider;
-        const modelChosen =
-          isModelId(model) && (catalog?.some((entry) => entry.id === model) ?? false);
-        const modelChanged = model !== (activeModel ?? "");
-        const original = environment.serverConfig?.settings.cloudSpeechCredentials?.[provider];
-        const keyChanged =
-          credential !== undefined &&
-          !(
-            isSecretReference(credential) &&
-            isSecretReference(original) &&
-            original.provider === credential.provider &&
-            original.reference === credential.reference
-          );
-        const routedReady =
-          modelChosen &&
-          (draft.trim() ? credential !== undefined : Boolean(saved)) &&
-          (!isActive || modelChanged || keyChanged);
-        const saveRouted = () => {
-          if (!routedReady || !isModelId(model)) return;
-          const grantChanges = !isActive || modelChanged;
-          if (credential !== undefined && keyChanged)
-            return void changeKey(provider, credential, model);
-          // Model-only changes never write to the environment.
-          if (grantChanges) enable(() => chooseVoiceDestination(id, provider, model));
-          onClose();
-        };
-        return (
-          <View key={provider}>
-            {!isEditing && (
+  const content = (() => {
+    if (!AsyncResult.isSuccess(keys) || !keys.value || !connection)
+      return (
+        <ListSection>
+          <ListActionRow
+            label={
+              !connection
+                ? "Environment not connected"
+                : keys._tag === "Failure"
+                  ? "Could not load keys · Retry"
+                  : "Checking API keys…"
+            }
+            disabled={!connection || keys._tag !== "Failure"}
+            onPress={reload}
+          />
+        </ListSection>
+      );
+    const saved = keys.value;
+    if (!editing)
+      return (
+        <ListSection footer={`Audio is sent through ${environment.label} using its API key.`}>
+          {CloudSpeechProvider.literals.map((provider, index) => {
+            const label = CLOUD_SPEECH_LABELS[provider];
+            const routed = provider === "openrouter";
+            const key = saved[provider];
+            const isActive = active?.provider === provider;
+            return (
               <ListChoiceRow
+                key={provider}
                 label={label}
                 leading={
                   <ProviderIcon
@@ -285,176 +293,217 @@ function CloudChoices({ environment, active, onClose }: Props & { onClose: () =>
                   />
                 }
                 selected={isActive}
-                disabled={saved === undefined || (!saved && !canManage) || saving}
+                separated={index > 0}
+                disabled={key === undefined || (!key && !canManage) || saving}
                 description={
-                  saved === undefined
+                  key === undefined
                     ? "Update the environment to use this provider"
                     : isActive && routed
                       ? `${activeModel} · Tap to change model${canManage ? " or key" : ""}`
-                      : isActive && saved && canManage
+                      : isActive && key && canManage
                         ? "Tap to manage key"
-                        : saved
+                        : key
                           ? routed
                             ? "API key saved · choose a model to use it"
-                            : "API key saved on this environment"
+                            : "API key saved"
                           : canManage
                             ? "Add an API key to use this provider"
                             : "Ask an environment administrator to add an API key"
                 }
                 onPress={() => {
                   if (routed) return edit(provider, !isActive);
-                  if (!saved) return edit(provider, true);
+                  if (!key) return edit(provider, true);
                   if (isActive) {
                     if (canManage) edit(provider, false);
                     return;
                   }
                   Dialog.confirm({
                     title: `Use ${label} for dictation?`,
-                    message: `${disclosure} Select This device to stop sharing.`,
+                    message: `${cloudSpeechDisclosure(provider, environment.label)} Select This device to stop sharing.`,
                     confirmText: `Use ${label}`,
                     onConfirm: () => enable(pendingCloudVoiceChoice(id, provider)),
                   });
                 }}
               />
-            )}
-            {isEditing && routed && (
-              <>
-                <Text className="mx-4 text-sm text-foreground-muted">{disclosure}</Text>
-                {catalog ? (
-                  <ModelPicker
-                    models={catalog}
-                    value={model}
-                    current={activeModel}
+            );
+          })}
+        </ListSection>
+      );
+
+    const provider = editing.provider;
+    const label = CLOUD_SPEECH_LABELS[provider];
+    const company = CLOUD_SPEECH_PROVIDER_NAMES[provider];
+    const routed = provider === "openrouter";
+    const disclosure = cloudSpeechDisclosure(provider, environment.label);
+    const key = saved[provider];
+    const isActive = active?.provider === provider;
+    const modelChosen = isModelId(model) && (catalog?.some((entry) => entry.id === model) ?? false);
+    const modelChanged = model !== (activeModel ?? "");
+    const original = environment.serverConfig?.settings.cloudSpeechCredentials?.[provider];
+    const keyChanged =
+      credential !== undefined &&
+      !(
+        isSecretReference(credential) &&
+        isSecretReference(original) &&
+        original.provider === credential.provider &&
+        original.reference === credential.reference
+      );
+    const routedReady =
+      modelChosen &&
+      (draft.trim() ? credential !== undefined : Boolean(key)) &&
+      (!isActive || modelChanged || keyChanged);
+    const saveRouted = () => {
+      if (!routedReady || !isModelId(model)) return;
+      const grantChanges = !isActive || modelChanged;
+      if (credential !== undefined && keyChanged)
+        return void changeKey(provider, credential, model);
+      // Model-only changes never write to the environment.
+      if (grantChanges) enable(() => chooseVoiceDestination(id, provider, model));
+      onClose();
+    };
+    const submit = () => {
+      if (routed) saveRouted();
+      else if (credential) void changeKey(provider, credential);
+    };
+    const keyFooter =
+      draft && !credential
+        ? (source?.invalidReferenceMessage ?? "Enter a valid API key.")
+        : routed
+          ? key && !credential
+            ? "Uses the API key saved on this environment. The model choice applies only to this device."
+            : `Anyone with dictation access to ${environment.label} can bill this key.`
+          : editing.enable
+            ? `Anyone with dictation access to ${environment.label} can bill this key.`
+            : `Updates the ${company} key on ${environment.label}. Your dictation destination stays the same.`;
+    return (
+      <>
+        <Text className="px-2 text-sm text-foreground-muted">{disclosure}</Text>
+        {routed ? (
+          catalog ? (
+            <ModelPicker
+              models={catalog}
+              value={model}
+              current={activeModel}
+              disabled={saving}
+              onChange={setModel}
+            />
+          ) : (
+            <ListSection title="Model">
+              <ListActionRow
+                label={
+                  AsyncResult.isFailure(models)
+                    ? "Could not load models · Retry"
+                    : "Loading transcription models…"
+                }
+                disabled={!AsyncResult.isFailure(models)}
+                onPress={reloadModels}
+              />
+            </ListSection>
+          )
+        ) : null}
+        {canManage ? (
+          <ListSection title="API key" footer={keyFooter}>
+            <View className="gap-3 px-4 py-3">
+              {sources.length > 0 && (
+                <View className="flex-row flex-wrap gap-2">
+                  <Chip
+                    label="Value"
+                    size="small"
+                    selected={sourceId === null}
                     disabled={saving}
-                    onChange={setModel}
-                  />
-                ) : (
-                  <ListActionRow
-                    label={
-                      AsyncResult.isFailure(models)
-                        ? "Could not load models · Retry"
-                        : "Loading transcription models…"
-                    }
-                    disabled={!AsyncResult.isFailure(models)}
-                    onPress={reloadModels}
+                    onPress={() => {
+                      setDraft("");
+                      setSourceId(null);
+                    }}
                   />
-                )}
-              </>
-            )}
-            {isEditing && (canManage || routed) && (
-              <>
-                {canManage && sources.length > 0 && (
-                  <View className="mx-4 flex-row flex-wrap gap-2">
+                  {sources.map((candidate) => (
                     <Chip
-                      label="Value"
+                      key={candidate.id}
+                      label={candidate.label}
                       size="small"
-                      selected={sourceId === null}
+                      selected={sourceId === candidate.id}
                       disabled={saving}
                       onPress={() => {
                         setDraft("");
-                        setSourceId(null);
+                        setSourceId(candidate.id);
                       }}
                     />
-                    {sources.map((candidate) => (
-                      <Chip
-                        key={candidate.id}
-                        label={candidate.label}
-                        size="small"
-                        selected={sourceId === candidate.id}
-                        disabled={saving}
-                        onPress={() => {
-                          setDraft("");
-                          setSourceId(candidate.id);
-                        }}
-                      />
-                    ))}
-                  </View>
-                )}
-                {canManage && (
-                  <TextInput
-                    key={sourceId ?? "literal"}
-                    accessibilityLabel={
-                      sourceId ? `${label} API key reference` : `${label} API key`
-                    }
-                    placeholder={
-                      source?.referencePlaceholder ??
-                      (routed && saved ? "Saved key · enter a new one to replace" : "API key")
-                    }
-                    secureTextEntry={sourceId === null}
-                    autoCapitalize="none"
-                    autoCorrect={false}
-                    autoComplete="off"
-                    importantForAutofill="no"
-                    maxLength={4096}
-                    editable={!saving}
-                    returnKeyType="done"
-                    onSubmitEditing={() => {
-                      if (routed) saveRouted();
-                      else if (credential) void changeKey(provider, credential);
-                    }}
-                    value={draft}
-                    onChangeText={setDraft}
-                    className="mx-4 rounded-lg bg-background px-3 py-2 text-foreground"
-                  />
-                )}
-                {routed && !saved && !canManage ? (
-                  <ListActionRow
-                    label="Ask an administrator to add an OpenRouter key"
-                    disabled
-                    onPress={() => {}}
-                  />
-                ) : (
-                  <ListActionRow
-                    label={
-                      routed
-                        ? isActive
-                          ? "Save"
-                          : "Save and enable"
-                        : editing.enable
-                          ? "Save and enable"
-                          : "Save key"
-                    }
-                    description={
-                      draft && !credential
-                        ? (source?.invalidReferenceMessage ?? "Enter a valid API key.")
-                        : routed
-                          ? saved && !credential
-                            ? "Uses the API key saved on this environment. The model choice applies only to this device."
-                            : `Anyone with dictation access to ${environment.label} can bill this key.`
-                          : editing.enable
-                            ? `${disclosure} Anyone with dictation access to ${environment.label} can bill this key.`
-                            : `Updates the ${company} key on ${environment.label}. Your dictation destination stays the same.`
-                    }
-                    disabled={(routed ? !routedReady : !credential) || saving}
-                    onPress={() => {
-                      if (routed) saveRouted();
-                      else if (credential) void changeKey(provider, credential);
-                    }}
-                  />
-                )}
-                {saved && canManage && (
-                  <ListActionRow
-                    tone="danger"
-                    label="Remove key from environment"
-                    disabled={saving}
-                    onPress={() =>
-                      Dialog.confirm({
-                        title: `Remove the ${label} key from ${environment.label}?`,
-                        message: "Everyone using it for dictation will lose access.",
-                        confirmText: "Remove key",
-                        destructive: true,
-                        onConfirm: () => void changeKey(provider, null),
-                      })
-                    }
-                  />
-                )}
-                <ListActionRow label="Back to providers" disabled={saving} onPress={reset} />
-              </>
+                  ))}
+                </View>
+              )}
+              <TextInput
+                key={sourceId ?? "literal"}
+                accessibilityLabel={sourceId ? `${label} API key reference` : `${label} API key`}
+                placeholder={
+                  source?.referencePlaceholder ??
+                  (key ? "Saved key · enter a new one to replace" : "API key")
+                }
+                secureTextEntry={sourceId === null}
+                autoCapitalize="none"
+                autoCorrect={false}
+                autoComplete="off"
+                importantForAutofill="no"
+                maxLength={4096}
+                editable={!saving}
+                returnKeyType="done"
+                onSubmitEditing={submit}
+                value={draft}
+                onChangeText={setDraft}
+                className="rounded-lg bg-background px-3 py-2 text-foreground"
+              />
+            </View>
+          </ListSection>
+        ) : null}
+        {canManage || routed ? (
+          <ListSection>
+            {routed && !key && !canManage ? (
+              <ListActionRow
+                label="Ask an administrator to add an OpenRouter key"
+                disabled
+                onPress={() => {}}
+              />
+            ) : (
+              <ListActionRow
+                label={
+                  routed
+                    ? isActive
+                      ? "Save"
+                      : "Save and enable"
+                    : editing.enable
+                      ? "Save and enable"
+                      : "Save key"
+                }
+                loading={saving}
+                disabled={routed ? !routedReady : !credential}
+                onPress={submit}
+              />
             )}
-          </View>
-        );
-      })
+            {key && canManage ? (
+              <Separated>
+                <ListActionRow
+                  tone="danger"
+                  label="Remove key from environment"
+                  disabled={saving}
+                  onPress={() =>
+                    Dialog.confirm({
+                      title: `Remove the ${label} key from ${environment.label}?`,
+                      message: "Everyone using it for dictation will lose access.",
+                      confirmText: "Remove key",
+                      destructive: true,
+                      onConfirm: () => void changeKey(provider, null),
+                    })
+                  }
+                />
+              </Separated>
+            ) : null}
+          </ListSection>
+        ) : null}
+        <ListSection>
+          <ListActionRow label="Back to providers" disabled={saving} onPress={reset} />
+        </ListSection>
+      </>
     );
+  })();
   return (
     <Sheet
       title={editing ? CLOUD_SPEECH_LABELS[editing.provider] : "Cloud providers"}
@@ -464,7 +513,7 @@ function CloudChoices({ environment, active, onClose }: Props & { onClose: () =>
       <ScrollView
         contentInsetAdjustmentBehavior="automatic"
         keyboardShouldPersistTaps="handled"
-        contentContainerClassName="gap-2 pb-8"
+        contentContainerClassName="gap-4 px-5 pt-2 pb-8"
       >
         {content}
       </ScrollView>
diff --git a/apps/mobile/src/features/settings/SettingsVoiceRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsVoiceRouteScreen.tsx
index 5f7328214cb16..4b0ca00e88666 100644
--- a/apps/mobile/src/features/settings/SettingsVoiceRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsVoiceRouteScreen.tsx
@@ -24,13 +24,14 @@ import * as Dialog from "../../components/ui/Dialog";
 import { useEnvironments, type EnvironmentPresentation } from "../../state/environments";
 import {
   chooseVoiceDestination,
+  cloudVoiceConnectionAtom,
   voiceConnectionAtom,
   voiceGrantAtom,
-  voiceSpeechStatusAtom,
   hasEnvironmentVoiceCapture,
 } from "../voice-input/voiceDestination";
-import { VoiceModelSection } from "./VoiceModelSection";
-import { CloudVoiceSection } from "./CloudVoiceSection";
+import { LocalModelChoice } from "./VoiceModelSection";
+import { CloudVoiceChoice } from "./CloudVoiceSection";
+import type { VoiceGrant } from "../voice-input/voiceGrantStorage";
 import type { EnvironmentId } from "@t3tools/contracts";
 import { ThreadSwipeable } from "../home/thread-swipe-actions";
 import { ListActionRow as SettingsActionRow } from "../../components/ui/ListActionRow";
@@ -127,45 +128,81 @@ function saveDestination(id: EnvironmentId | null) {
 function EnvironmentChoice({
   environment,
   selected,
+  onCloudOnly,
 }: {
   environment: EnvironmentPresentation;
   selected: boolean;
+  /** Called instead of a local grant when the environment only offers cloud transcription. */
+  onCloudOnly: () => void;
 }) {
-  const usable = useAtomValue(voiceConnectionAtom(environment.environmentId)) !== null;
-  const status = AsyncResult.getOrElse(
-    useAtomValue(voiceSpeechStatusAtom(environment.environmentId)),
-    () => null,
-  );
+  const local = useAtomValue(voiceConnectionAtom(environment.environmentId)) !== null;
+  const cloud = useAtomValue(cloudVoiceConnectionAtom(environment.environmentId)) !== null;
+  const usable = local || cloud;
   return (
     <ListChoiceRow
       label={environment.label}
       selected={selected}
       disabled={!usable}
       description={
-        !usable
-          ? environment.connection.phase !== "connected"
-            ? "Not connected"
-            : "Transcription unavailable"
-          : status?.supported === false
-            ? status.reason
-            : status?.state === "missing-model"
-              ? "No transcription model installed"
-              : (environment.displayUrl ?? "Send finished recordings to this environment.")
+        environment.connection.phase !== "connected"
+          ? "Not connected"
+          : !usable
+            ? "Transcription unavailable"
+            : (environment.displayUrl ?? "Send finished recordings to this environment.")
       }
       separated
       onPress={() => {
-        if (!selected)
-          Dialog.confirm({
-            title: `Send microphone audio to ${environment.label}?`,
-            message: `Finished recordings will be sent to ${environment.displayUrl ?? environment.label} for transcription. You can switch back to This device at any time.`,
-            confirmText: "Use environment",
-            onConfirm: () => saveDestination(environment.environmentId),
-          });
+        if (selected) return;
+        if (!local) return onCloudOnly();
+        Dialog.confirm({
+          title: `Send microphone audio to ${environment.label}?`,
+          message: `Finished recordings will be sent to ${environment.displayUrl ?? environment.label} for transcription. You can switch back to This device at any time.`,
+          confirmText: "Use environment",
+          onConfirm: () => saveDestination(environment.environmentId),
+        });
       }}
     />
   );
 }
 
+/** How the selected environment transcribes: its own model or a cloud provider. */
+function EnvironmentMethodSection({
+  environment,
+  grant,
+  cloudOpen,
+  onCloudOpenChange,
+}: {
+  environment: EnvironmentPresentation;
+  grant: VoiceGrant | null;
+  cloudOpen: boolean;
+  onCloudOpenChange: (open: boolean) => void;
+}) {
+  const id = environment.environmentId;
+  const destination = grant?.destination.environmentId === id ? grant.destination : null;
+  const cloudCapable =
+    environment.serverConfig?.environment.capabilities.cloudVoiceTranscription === true ||
+    destination?.kind === "cloud";
+  return (
+    <SettingsSection title={`Method on ${environment.label}`}>
+      <LocalModelChoice
+        environmentId={id}
+        label={environment.label}
+        selected={destination?.kind === "environment"}
+        // The user already agreed to send audio to this environment.
+        onSelect={() => saveDestination(id)}
+      />
+      {cloudCapable ? (
+        <CloudVoiceChoice
+          environment={environment}
+          active={destination?.kind === "cloud" ? destination : null}
+          open={cloudOpen}
+          onOpenChange={onCloudOpenChange}
+        />
+      ) : null}
+    </SettingsSection>
+  );
+}
+
 export function SettingsVoiceRouteScreen() {
   const transcriber = useAtomValue(localVoiceTranscriberAtom);
   const grant = useAtomValue(voiceGrantAtom);
@@ -175,6 +212,15 @@ export function SettingsVoiceRouteScreen() {
         (environment) => environment.environmentId === grant.destination.environmentId,
       )
     : undefined;
+  // An environment whose cloud sheet is open; it may not hold the grant yet.
+  const [cloudSheet, setCloudSheet] = useState<EnvironmentId | null>(null);
+  // A sheet whose environment lost cloud transcription is gone, so its pending choice is too.
+  const sheetEnvironment = environments.find(
+    (environment) =>
+      environment.environmentId === cloudSheet &&
+      environment.serverConfig?.environment.capabilities.cloudVoiceTranscription === true,
+  );
+  const methodEnvironment = sheetEnvironment ?? grantEnvironment;
   const insets = useSafeAreaInsets();
   const preferencesResult = useAtomValue(mobilePreferencesAtom);
   const savePreferences = useAtomSet(updateMobilePreferencesAtom);
@@ -234,8 +280,11 @@ export function SettingsVoiceRouteScreen() {
           <ListChoiceRow
             label="This device"
             description="Audio stays on this device and is transcribed here."
-            selected={!grant}
-            onPress={() => saveDestination(null)}
+            selected={!grant && !sheetEnvironment}
+            onPress={() => {
+              setCloudSheet(null);
+              saveDestination(null);
+            }}
           />
           {hasEnvironmentVoiceCapture &&
             environments.map((environment) => (
@@ -243,9 +292,11 @@ export function SettingsVoiceRouteScreen() {
                 key={environment.environmentId}
                 environment={environment}
                 selected={
-                  grant?.destination.kind === "environment" &&
-                  grant.destination.environmentId === environment.environmentId
+                  sheetEnvironment
+                    ? sheetEnvironment.environmentId === environment.environmentId
+                    : grant?.destination.environmentId === environment.environmentId
                 }
+                onCloudOnly={() => setCloudSheet(environment.environmentId)}
               />
             ))}
           {isReady && grant && !grantEnvironment ? (
@@ -259,30 +310,14 @@ export function SettingsVoiceRouteScreen() {
             />
           ) : null}
         </SettingsSection>
-        {hasEnvironmentVoiceCapture &&
-          environments
-            .filter(
-              (env) =>
-                env.serverConfig?.environment.capabilities.cloudVoiceTranscription ||
-                (grant?.destination.kind === "cloud" &&
-                  grant.destination.environmentId === env.environmentId),
-            )
-            .map((environment) => (
-              <CloudVoiceSection
-                key={environment.environmentId}
-                environment={environment}
-                active={
-                  grant?.destination.kind === "cloud" &&
-                  grant.destination.environmentId === environment.environmentId
-                    ? grant.destination
-                    : null
-                }
-              />
-            ))}
-        {grantEnvironment && grant?.destination.kind === "environment" ? (
-          <VoiceModelSection
-            environmentId={grantEnvironment.environmentId}
-            label={grantEnvironment.label}
+        {hasEnvironmentVoiceCapture && methodEnvironment ? (
+          <EnvironmentMethodSection
+            environment={methodEnvironment}
+            grant={grant}
+            cloudOpen={cloudSheet === methodEnvironment.environmentId}
+            onCloudOpenChange={(open) =>
+              setCloudSheet(open ? methodEnvironment.environmentId : null)
+            }
           />
         ) : null}
         {!grant && transcriber === null ? (
diff --git a/apps/mobile/src/features/settings/VoiceModelSection.tsx b/apps/mobile/src/features/settings/VoiceModelSection.tsx
index 2403f113b2af8..0bee9748b19cb 100644
--- a/apps/mobile/src/features/settings/VoiceModelSection.tsx
+++ b/apps/mobile/src/features/settings/VoiceModelSection.tsx
@@ -29,7 +29,6 @@ import {
   voiceSpeechModelsAtom,
   voiceSpeechStatusAtom,
 } from "../voice-input/voiceDestination";
-import { SettingsSection } from "./components/SettingsSection";
 
 const isDownloading = (model: EnvironmentSpeechModel) =>
   model.state === "downloading" || model.state === "verifying";
@@ -272,51 +271,59 @@ export function VoiceModelRow(props: {
   );
 }
 
-export function VoiceModelSection(props: {
+/** The environment's local-model method: chosen by its mark, opens the model list. */
+export function LocalModelChoice(props: {
   readonly environmentId: EnvironmentId;
   readonly label: string;
+  readonly selected: boolean;
+  readonly onSelect: () => void;
 }) {
   const navigation = useNavigation();
   const voice = useVoiceModels(props.environmentId, props.label);
   const { status } = voice;
-  if (!voice.connection || !status) return null;
-  const title = `Transcription model on ${props.label}`;
-  if (!status.supported) {
+  const open = () =>
+    navigation.navigate("SettingsVoiceModels", { environmentId: props.environmentId });
+  if (!voice.connection || !status || !status.supported)
     return (
-      <SettingsSection title={title} footer={status.reason}>
-        {null}
-      </SettingsSection>
+      <ListChoiceRow
+        label="Local model"
+        description={
+          !voice.connection
+            ? "Not available on this environment"
+            : status?.supported === false
+              ? status.reason
+              : "Checking…"
+        }
+        selected={props.selected}
+        disabled
+        onPress={() => {}}
+      />
     );
-  }
 
   const active = status.state === "missing-model" ? null : status;
   const pending = voice.models.find(isDownloading);
   const progress =
     pending?.downloaded === undefined ? undefined : pending.downloaded / pending.size;
   return (
-    <SettingsSection
-      title={title}
-      footer={
-        voice.canManage
-          ? undefined
-          : `This connection can’t change settings on ${props.label}. Add a transcription model using T3 Code on that machine.`
+    <ListRow
+      label={active?.model ?? "Local model"}
+      description={
+        pending
+          ? pending.state === "verifying"
+            ? `Verifying ${pending.name}…`
+            : `Downloading ${pending.name} · ${Math.round((progress ?? 0) * 100)}%`
+          : active
+            ? `Local model · ${formatBytes(active.size)}`
+            : voice.canManage
+              ? "No model installed · Choose one to download"
+              : `No model installed · Add one using T3 Code on ${props.label}`
       }
-    >
-      <ListRow
-        label={active?.model ?? "No model selected"}
-        description={
-          pending
-            ? pending.state === "verifying"
-              ? `Verifying ${pending.name}…`
-              : `Downloading ${pending.name} · ${Math.round((progress ?? 0) * 100)}%`
-            : active
-              ? formatBytes(active.size)
-              : "Choose a transcription model to dictate on this environment."
-        }
-        onPress={() =>
-          navigation.navigate("SettingsVoiceModels", { environmentId: props.environmentId })
-        }
-      />
-    </SettingsSection>
+      selected={props.selected}
+      onPress={() => {
+        if (!props.selected) props.onSelect();
+        // Switching to an installed model needs no further step.
+        if (props.selected || !active) open();
+      }}
+    />
   );
 }
diff --git a/apps/mobile/src/features/threads/ComposerUsageLimits.tsx b/apps/mobile/src/features/threads/ComposerUsageLimits.tsx
index ef39ef51ff4cb..49f43cc2161b2 100644
--- a/apps/mobile/src/features/threads/ComposerUsageLimits.tsx
+++ b/apps/mobile/src/features/threads/ComposerUsageLimits.tsx
@@ -1,3 +1,4 @@
+import { providerClients } from "@t3tools/client-runtime/provider-clients";
 import type { EnvironmentId, UsageLimitsReport } from "@t3tools/contracts";
 import { Pressable, ScrollView, View } from "react-native";
 
@@ -5,8 +6,6 @@ import { SymbolView } from "../../components/ui/AppSymbol";
 import { AppText as Text } from "../../components/ui/AppText";
 import { AccountLimits, ResetCredits } from "../usage/UsageLimitsSection";
 
-const DRIVER_LABEL: Partial<Record<string, string>> = { codex: "Codex", claudeAgent: "Claude" };
-
 export function ComposerUsageLimits({
   report,
   environmentId,
@@ -37,7 +36,7 @@ export function ComposerUsageLimits({
           const resetCreditInput =
             account.resetCreditInput ??
             (account.instanceId ? { instanceId: account.instanceId } : undefined);
-          const driverLabel = DRIVER_LABEL[account.driver] ?? String(account.driver);
+          const driverLabel = providerClients.get(account.driver)?.label ?? account.driver;
           return (
             <AccountLimits
               key={account.id}
diff --git a/apps/mobile/src/features/threads/LinkRequestCard.tsx b/apps/mobile/src/features/threads/LinkRequestCard.tsx
index 53c5408b6d595..b13e9e447057f 100644
--- a/apps/mobile/src/features/threads/LinkRequestCard.tsx
+++ b/apps/mobile/src/features/threads/LinkRequestCard.tsx
@@ -1,13 +1,16 @@
 import { pipe } from "effect/Function";
 import { useAtomValue } from "@effect/atom-react";
 import {
+  ANOTHER_ADDRESS,
   type LinkableMachine,
+  linkDestination,
   linkRequestAnswerInput,
   linkRequestDefaultAccess,
   linkRequestDisplay,
   linkRequestFailureMessage,
   linkRequestInitialMachine,
   type LinkRequestItem,
+  linkRequestTarget,
   linkRequestTargetName,
   rankMachinesByHint,
 } from "@t3tools/client-runtime/link-request";
@@ -58,9 +61,6 @@ const accessLabel = (access: AuthMcpClientAccess) =>
 
 const LINK_SYMBOL: AppSymbolName = { ios: "link", android: "desktop_windows" };
 
-/** The machine list's row for linking by an address typed in. */
-const ANOTHER_ADDRESS = "another-address";
-
 /** Whether the agent left the machine for the user to pick. */
 const picksMachine = (item: LinkRequestItem) =>
   item.environmentId === undefined && item.url === undefined;
@@ -141,11 +141,6 @@ function PendingLinkRequest(props: {
         {item.reason.trim() ? (
           <Text className="font-sans text-sm leading-5 text-foreground-muted">{item.reason}</Text>
         ) : null}
-        {item.label !== undefined && item.url !== undefined ? (
-          <Text className="font-sans text-xs text-foreground-muted" numberOfLines={1}>
-            {item.url}
-          </Text>
-        ) : null}
       </View>
       {error !== null ? (
         <Text
@@ -194,37 +189,6 @@ function PendingLinkRequest(props: {
   );
 }
 
-/** What the sheet links; see web's LinkRequestDialog for the same rules. */
-type SheetTarget =
-  | { readonly kind: "none" }
-  | {
-      readonly kind: "machine";
-      readonly environmentId: EnvironmentId;
-      readonly label: string;
-      readonly urls: ReadonlyArray<string>;
-      readonly linked: boolean;
-    }
-  | { readonly kind: "address" };
-
-function resolveTarget(
-  item: LinkRequestItem,
-  machines: ReadonlyArray<LinkableMachine>,
-  choice: string | null,
-): SheetTarget {
-  if (item.environmentId === undefined && item.url !== undefined) return { kind: "address" };
-  const chosen = item.environmentId ?? choice;
-  if (chosen === null) return { kind: "none" };
-  if (chosen === ANOTHER_ADDRESS) return { kind: "address" };
-  const machine = machines.find((candidate) => candidate.environmentId === chosen);
-  return {
-    kind: "machine",
-    environmentId: machine?.environmentId ?? (chosen as EnvironmentId),
-    label: machine?.label ?? linkRequestTargetName(item),
-    urls: [...new Set([...(machine?.urls ?? []), ...(item.url === undefined ? [] : [item.url])])],
-    linked: machine?.linked ?? false,
-  };
-}
-
 function LinkRequestSheet(props: {
   readonly environmentId: EnvironmentId;
   readonly item: LinkRequestItem;
@@ -251,17 +215,22 @@ function LinkRequestSheet(props: {
     reportDefect: false,
   });
   const selected = choice ?? linkRequestInitialMachine(item, machines);
-  const target = resolveTarget(item, machines, selected);
+  const target = linkRequestTarget(item, machines, selected);
   const targetName = target.kind === "machine" ? target.label : linkRequestTargetName(item);
-  // This phone can mint a code there when it is connected to that environment
-  // with a session that may create pairing links.
   const targetId = target.kind === "machine" ? target.environmentId : null;
   const connected = usePreparedConnection(targetId);
   const mayMint = useEnvironmentScope(targetId, AuthAccessWriteScope);
-  const canMint =
-    targetId !== null && Option.isSome(connected) && mayMint && !mintFailed.has(targetId);
   const needsAddress =
     target.kind === "address" || (target.kind === "machine" && target.urls.length === 0);
+  // This phone mints a code there when it is connected with a session that may
+  // create pairing links, and only for its own addresses: anything can answer
+  // as that machine at one typed in, so that one gets a code the user fetched.
+  const canMint =
+    targetId !== null &&
+    !needsAddress &&
+    Option.isSome(connected) &&
+    mayMint &&
+    !mintFailed.has(targetId);
   const useExisting = target.kind === "machine" && target.linked;
   const ready =
     target.kind !== "none" &&
@@ -288,10 +257,7 @@ function LinkRequestSheet(props: {
     }
     return linkRequestAnswerInput(item, {
       type: "link",
-      target:
-        target.kind === "address"
-          ? { url: address }
-          : { ...target, urls: needsAddress ? [address.trim()] : target.urls },
+      target: target.kind === "machine" && target.urls.length > 0 ? target : { url: address },
       access,
       pairingCode: code,
     });
@@ -335,12 +301,27 @@ function LinkRequestSheet(props: {
             Agents here can then launch, message and wait on threads there. It appears in that
             machine's Connections, where it can be revoked.
           </Text>
-          {!pickMachine && item.url !== undefined ? (
+          {item.url !== undefined && target.kind === "machine" ? (
             <Text className="font-sans text-xs text-foreground-muted" numberOfLines={1}>
               {item.url}
             </Text>
           ) : null}
         </View>
+        {needsAddress && !useExisting && address.trim() ? (
+          <View
+            accessibilityRole="alert"
+            className="gap-1 rounded-xl border border-warning-border bg-warning p-3"
+          >
+            <Text className="font-t3-bold text-sm text-warning-foreground">Check this address</Text>
+            <Text className="font-sans text-xs leading-snug text-warning-foreground">
+              This app cannot confirm it is one of your machines. The pairing code you paste is sent
+              there.
+            </Text>
+            <Text selectable className="font-sans text-xs leading-snug text-warning-foreground">
+              {linkDestination(address)}
+            </Text>
+          </View>
+        ) : null}
         {pickMachine ? (
           <SettingsSection title="Machine">
             {machines.map((machine, index) => (
@@ -369,7 +350,7 @@ function LinkRequestSheet(props: {
             />
           </SettingsSection>
         ) : null}
-        {needsAddress && !(item.url !== undefined && item.environmentId === undefined) ? (
+        {needsAddress && item.url === undefined ? (
           <View className="gap-2">
             <TextInput
               accessibilityLabel="Address"
diff --git a/apps/mobile/src/features/usage/UsageLimitsPooled.tsx b/apps/mobile/src/features/usage/UsageLimitsPooled.tsx
index a9780d9954ae7..2f0ad0f89dfc0 100644
--- a/apps/mobile/src/features/usage/UsageLimitsPooled.tsx
+++ b/apps/mobile/src/features/usage/UsageLimitsPooled.tsx
@@ -1,6 +1,7 @@
 import { useAtomValue } from "@effect/atom-react";
 import { useNavigation, type StaticScreenProps } from "@react-navigation/native";
 import { EnvironmentId } from "@t3tools/contracts";
+import { providerClients } from "@t3tools/client-runtime/provider-clients";
 import { normalizeProviderAccentColor } from "@t3tools/client-runtime/state/provider-instance-display";
 import {
   collectLimitAccounts,
@@ -29,17 +30,11 @@ import { environmentPresentations } from "../../state/presentation";
 import { ResetCredits } from "./UsageLimitsSection";
 import { usageProviderKind, useProviderColors } from "./usageProviders";
 
-const DRIVER_LABEL: Partial<Record<string, string>> = {
-  codex: "Codex",
-  claudeAgent: "Claude",
-  grok: "Grok",
-  antigravity: "Antigravity",
-};
 const PACE_LABEL = { ahead: "Ahead of pace", on: "On pace", under: "Under pace" } as const;
 
 function accountName(account: LimitAccount) {
   if (account.displayName) return account.displayName;
-  if (!account.email) return DRIVER_LABEL[account.driver] ?? String(account.driver);
+  if (!account.email) return providerClients.get(account.driver)?.label ?? account.driver;
   return emailInitials(account.email) || "Account";
 }
 
@@ -444,7 +439,7 @@ export function UsageLimitsSection({
               <View className="flex-row items-center gap-2 px-1">
                 <ProviderIcon provider={pool.driver} size={18} />
                 <Text className="text-base font-t3-medium text-foreground">
-                  {DRIVER_LABEL[pool.driver] ?? pool.driver}
+                  {providerClients.get(pool.driver)?.label ?? pool.driver}
                 </Text>
               </View>
               {windows.map((window) => {
@@ -559,7 +554,9 @@ export function UsageLimitAccountScreen({ route }: AccountScreenProps) {
               <View className="flex-row items-center gap-2">
                 <ProviderIcon provider={account.driver} size={24} />
                 <Text className="flex-1 text-xl font-t3-bold text-foreground">
-                  {account.displayName ?? DRIVER_LABEL[account.driver] ?? account.driver}
+                  {account.displayName ??
+                    providerClients.get(account.driver)?.label ??
+                    account.driver}
                 </Text>
               </View>
               {account.email ? (
diff --git a/apps/mobile/src/features/usage/UsageLimitsSection.tsx b/apps/mobile/src/features/usage/UsageLimitsSection.tsx
index 214e64fab628b..be4bf0c929d11 100644
--- a/apps/mobile/src/features/usage/UsageLimitsSection.tsx
+++ b/apps/mobile/src/features/usage/UsageLimitsSection.tsx
@@ -11,7 +11,8 @@ import {
   type ServerProviderUsageWindow,
 } from "@t3tools/contracts";
 import {
-  formatDuration,
+  type ResetCreditChoice,
+  resetCreditChoices,
   formatResetsIn,
   limitsNotice,
   paceOf,
@@ -243,21 +244,11 @@ export function ResetCredits(props: {
   const [status, setStatus] = useState<string | null>(null);
   if (dense && credits.availableCount === 0 && status === null) return null;
 
-  const expiresIn = credits.nextExpiresAt
-    ? formatDuration(Date.parse(credits.nextExpiresAt) - now)
-    : null;
-  const summary =
-    credits.availableCount === 0
-      ? "No reset credits banked"
-      : `${credits.availableCount} ${credits.availableCount === 1 ? "reset credit" : "reset credits"} banked${
-          expiresIn ? ` · next expires in ${expiresIn}` : ""
-        }`;
-
-  const redeem = async () => {
+  const redeem = async (choice: ResetCreditChoice) => {
     if (!readEnvironmentScope(environmentId, AuthProvidersManageScope)) return;
     setBusy(true);
     setStatus(null);
-    const result = await consume({ environmentId, input });
+    const result = await consume({ environmentId, input: choice.input });
     setBusy(false);
     if (result._tag === "Success") {
       setStatus(result.value.warning ?? OUTCOME_TEXT[result.value.outcome]);
@@ -270,44 +261,44 @@ export function ResetCredits(props: {
     );
   };
 
-  const confirm = () => {
+  const confirm = (choice: ResetCreditChoice) => {
     if (!readEnvironmentScope(environmentId, AuthProvidersManageScope)) return;
-    Dialog.alert(
-      "Use a reset credit?",
-      "This redeems one credit on your account and clears the current rate-limit windows. It cannot be undone.",
-      [
-        { text: "Cancel", style: "cancel" },
-        { text: "Use credit", onPress: () => void redeem() },
-      ],
-    );
+    Dialog.alert("Use a reset credit?", choice.confirmDescription, [
+      { text: "Cancel", style: "cancel" },
+      { text: "Use credit", onPress: () => void redeem(choice) },
+    ]);
   };
 
   return (
-    <View className="flex-row flex-wrap items-center gap-x-3 gap-y-1">
-      <Text className="text-xs tabular-nums text-foreground-tertiary">{summary}</Text>
-      {credits.availableCount > 0 ? (
-        <Pressable
-          accessibilityRole="button"
-          accessibilityState={{ disabled: busy || !canManageProviders }}
-          disabled={busy || !canManageProviders}
-          onPress={confirm}
-          className={
-            dense
-              ? "rounded-full bg-subtle-strong px-2.5 py-1 disabled:opacity-[0.45]"
-              : "min-h-[44px] justify-center rounded-full bg-subtle-strong px-3 py-1.5 disabled:opacity-[0.45]"
-          }
-        >
-          <Text
-            className={
-              dense
-                ? "text-xs font-t3-medium text-foreground"
-                : "text-sm font-t3-medium text-foreground"
-            }
-          >
-            {busy ? "Using…" : "Use reset"}
-          </Text>
-        </Pressable>
-      ) : null}
+    <View className="gap-1">
+      {resetCreditChoices(credits, input, now).map((choice) => (
+        <View key={choice.key} className="flex-row flex-wrap items-center gap-x-3 gap-y-1">
+          <Text className="text-xs tabular-nums text-foreground-tertiary">{choice.summary}</Text>
+          {choice.availableCount > 0 ? (
+            <Pressable
+              accessibilityRole="button"
+              accessibilityState={{ disabled: busy || !canManageProviders }}
+              disabled={busy || !canManageProviders}
+              onPress={() => confirm(choice)}
+              className={
+                dense
+                  ? "rounded-full bg-subtle-strong px-2.5 py-1 disabled:opacity-[0.45]"
+                  : "min-h-[44px] justify-center rounded-full bg-subtle-strong px-3 py-1.5 disabled:opacity-[0.45]"
+              }
+            >
+              <Text
+                className={
+                  dense
+                    ? "text-xs font-t3-medium text-foreground"
+                    : "text-sm font-t3-medium text-foreground"
+                }
+              >
+                {busy ? "Using…" : choice.actionLabel}
+              </Text>
+            </Pressable>
+          ) : null}
+        </View>
+      ))}
       {!canManageProviders ? (
         <Text className="text-xs text-foreground-tertiary">
           This connection cannot manage provider accounts.
diff --git a/apps/mobile/src/lib/attachmentUpload.test.ts b/apps/mobile/src/lib/attachmentUpload.test.ts
index 54dfa536ff366..0097ab7ed77c0 100644
--- a/apps/mobile/src/lib/attachmentUpload.test.ts
+++ b/apps/mobile/src/lib/attachmentUpload.test.ts
@@ -321,12 +321,27 @@ describe("prepareTurnAttachments", () => {
 
   // regression: #9713 read file-backed image drafts before enabling them
   it("uploads a file-backed image from its owned copy without staging base64", async () => {
+    mocks.upload.mockImplementation(
+      async (
+        _uri: string,
+        _url: string,
+        options: { onProgress?: (event: { bytesSent: unknown; totalBytes: unknown }) => void },
+      ) => {
+        // expo-modules-jsi delivers native Int64 progress counts as BigInt.
+        options.onProgress?.({ bytesSent: BigInt(1), totalBytes: BigInt(4) });
+        return { status: 204, body: "", headers: {} };
+      },
+    );
+    const progress: Array<number> = [];
     const prepared = await prepareTurnAttachments({
       environmentId,
       attachments: [fileBackedImage],
       supportsImageUploads: true,
+      onUploadProgress: (_, value) => progress.push(value),
     });
 
+    expect(progress).toEqual([0.25]);
+
     expect(mocks.upload).toHaveBeenCalledWith(
       fileBackedImage.fileUri,
       "https://environment.example/api/attachments/upload/signed",
diff --git a/apps/mobile/src/lib/attachmentUpload.ts b/apps/mobile/src/lib/attachmentUpload.ts
index aef8dd4447513..57699af22819e 100644
--- a/apps/mobile/src/lib/attachmentUpload.ts
+++ b/apps/mobile/src/lib/attachmentUpload.ts
@@ -232,8 +232,10 @@ async function uploadFileBytes(
       signal,
       ...(onProgress
         ? {
+            // Native events carry Int64 counts, which expo-modules-jsi delivers as BigInt despite the `number` type.
             onProgress: ({ bytesSent, totalBytes }) => {
-              if (totalBytes > 0) onProgress(bytesSent / totalBytes);
+              const total = Number(totalBytes);
+              if (total > 0) onProgress(Number(bytesSent) / total);
             },
           }
         : {}),
diff --git a/apps/mobile/src/lib/pullRequestNavigation.ts b/apps/mobile/src/lib/pullRequestNavigation.ts
index ecc25375b37d4..40c593b3cab1c 100644
--- a/apps/mobile/src/lib/pullRequestNavigation.ts
+++ b/apps/mobile/src/lib/pullRequestNavigation.ts
@@ -1,3 +1,4 @@
+import { parsePullRequestAnchor } from "@t3tools/shared/pullRequestAnchor";
 import { resolveChangeRequestLinkTarget } from "@t3tools/client-runtime/change-request-links";
 import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
 import { EnvironmentId, ProjectId } from "@t3tools/contracts";
@@ -24,6 +25,7 @@ export function nativePullRequestDestination(
     projectId: String(target.project.id),
     repository: target.repository,
     number: target.number,
+    ...(parsePullRequestAnchor(url) ? { navigationUrl: url } : {}),
     ...(target.host === undefined ? {} : { host: target.host }),
   };
 }
diff --git a/apps/mobile/src/lib/threadActivity.ts b/apps/mobile/src/lib/threadActivity.ts
index 3c336b0292389..50c90a05106a2 100644
--- a/apps/mobile/src/lib/threadActivity.ts
+++ b/apps/mobile/src/lib/threadActivity.ts
@@ -2,6 +2,7 @@ import type {
   ThreadPendingApproval,
   ThreadPendingUserInput,
 } from "@t3tools/client-runtime/state/thread-requests";
+import { linkRequestTargetName } from "@t3tools/client-runtime/link-request";
 import { turnItemIsWorkspacePreparation } from "@t3tools/client-runtime/state/turn-item-presentation";
 import type { ThreadCheckpointSummary } from "@t3tools/client-runtime/state/thread-checkpoints";
 import { formatSubagentDisplayTitle } from "@t3tools/client-runtime/state/subagent-display";
@@ -624,7 +625,7 @@ function itemSummary(
     case "secret_request":
       return item.label;
     case "link_request":
-      return `Link ${item.label ?? item.url ?? "an environment"}`;
+      return `Link ${linkRequestTargetName(item)}`;
     case "dynamic_tool": {
       const classified = classifyToolActivity({
         itemType: "dynamic_tool_call",
diff --git a/apps/mobile/src/native/useOpenPullRequest.ts b/apps/mobile/src/native/useOpenPullRequest.ts
index ca6edda06a3bc..6608b7b5493db 100644
--- a/apps/mobile/src/native/useOpenPullRequest.ts
+++ b/apps/mobile/src/native/useOpenPullRequest.ts
@@ -9,6 +9,9 @@ import { appAtomRegistry } from "../state/atom-registry";
 import { environmentServerConfigsAtom } from "../state/server";
 import { withKnownPullRequestSummary } from "../state/use-thread-pr";
 
+let linkNavigationId = 0;
+const nextLinkNavigationId = () => ++linkNavigationId;
+
 type PullRequestContext = { readonly environmentId: string; readonly projectId: string };
 
 // Avoid useRoute so layouts without route context can open any thread's pull requests.
@@ -24,7 +27,10 @@ export function useNavigateToPullRequest(options?: { readonly replace?: boolean
       serverConfigs.has(environmentId),
     );
     if (!destination) return tryOpenExternalUrl(url, "pull-request");
-    const params = withKnownPullRequestSummary(destination);
+    const params = withKnownPullRequestSummary({
+      ...destination,
+      ...(destination.navigationUrl ? { navigationId: nextLinkNavigationId() } : {}),
+    });
     // Android shows one page at a time; iOS opens it over the current page, so Back returns.
     if (Platform.OS === "android") selectDetail({ name: "PullRequest", params });
     else if (replace) navigation.dispatch(StackActions.replace("PullRequest", params));
diff --git a/apps/mobile/src/state/entities.ts b/apps/mobile/src/state/entities.ts
index c9d1834a78bdb..e675193b6324e 100644
--- a/apps/mobile/src/state/entities.ts
+++ b/apps/mobile/src/state/entities.ts
@@ -1,3 +1,4 @@
+import { useMemo } from "react";
 import { useAtomValue } from "@effect/atom-react";
 import { deriveReportedModelSelection } from "@t3tools/client-runtime/state/thread-execution";
 
@@ -18,7 +19,7 @@ import {
 import { scopeThreadRef } from "@t3tools/client-runtime/environment";
 import {
   guessThreadLinkRef,
-  hasThreadLinks,
+  prepareThreadLinks,
   parseThreadLinkHref,
   relabelThreadLinks,
   threadLinkCandidates,
@@ -230,12 +231,13 @@ export function useSideChats(ref: ScopedThreadRef) {
 }
 
 export function useLiveThreadLinkLabels(markdown: string, environmentId: EnvironmentId): string {
+  const prepared = useMemo(() => prepareThreadLinks(markdown), [markdown]);
   const titles = useAtomValue(
-    hasThreadLinks(markdown)
-      ? threadLinkTitlesAtom(JSON.stringify(threadLinkRefs(markdown, environmentId).map(threadKey)))
+    prepared.matches.length > 0
+      ? threadLinkTitlesAtom(JSON.stringify(threadLinkRefs(prepared, environmentId).map(threadKey)))
       : EMPTY_THREAD_LINK_TITLES_ATOM,
   );
-  return relabelThreadLinks(markdown, environmentId, (ref) => titles.get(threadKey(ref)));
+  return relabelThreadLinks(prepared, environmentId, (ref) => titles.get(threadKey(ref)));
 }
 
 /** Keyed reads; every thread is read only to place a v1 link its message's environment lacks. */
diff --git a/apps/server/package.json b/apps/server/package.json
index 284084065e61a..d7e4d21f08b82 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -67,7 +67,7 @@
     "effect": "catalog:",
     "ffi-rs": "1.3.2",
     "node-pty": "^1.2.0-beta.15",
-    "playwright-core": "1.60.0",
+    "playwright-core": "1.64.1",
     "proper-lockfile": "4.1.2",
     "saxes": "6.0.0",
     "stream-chain": "^4.2.5",
diff --git a/apps/server/src/device/AgentDeviceShim.ts b/apps/server/src/device/AgentDeviceShim.ts
index b50f4dfbf2a40..e5b42557a1e10 100644
--- a/apps/server/src/device/AgentDeviceShim.ts
+++ b/apps/server/src/device/AgentDeviceShim.ts
@@ -12,7 +12,7 @@ const STALE_RUNTIME =
 
 const quoteShell = (value: string) => "'" + value.replaceAll("'", "'\"'\"'") + "'";
 
-/** agent-device 0.21.31's flags that take a value, so the launcher can find the command past them. */
+/** agent-device 0.21.36's flags that take a value, so the launcher can find the command past them. */
 const VALUE_FLAGS: ReadonlyArray<string> = [
   "--activity",
   "--all",
@@ -53,6 +53,7 @@ const VALUE_FLAGS: ReadonlyArray<string> = [
   "--header",
   "--hold-ms",
   "--host",
+  "--image-tag",
   "--in-app",
   "--include",
   "--interval-ms",
@@ -79,6 +80,7 @@ const VALUE_FLAGS: ReadonlyArray<string> = [
   "--metro-port",
   "--network-profile",
   "--on-error",
+  "--os",
   "--os-version",
   "--out",
   "--pattern",
@@ -101,6 +103,7 @@ const VALUE_FLAGS: ReadonlyArray<string> = [
   "--provider-geo-location",
   "--provider-language",
   "--provider-locale",
+  "--provider-network-hosts",
   "--provider-network-profile",
   "--provider-os-version",
   "--provider-project",
diff --git a/apps/server/src/device/DeviceToolchain.ts b/apps/server/src/device/DeviceToolchain.ts
index 250e6cf14f3be..eb299f9e29cdd 100644
--- a/apps/server/src/device/DeviceToolchain.ts
+++ b/apps/server/src/device/DeviceToolchain.ts
@@ -209,6 +209,19 @@ export const isDeviceHubInstalled = (baseDir: string) =>
 export const isAgentDeviceInstalled = (baseDir: string) =>
   isToolInstalled(baseDir, AGENT_DEVICE_SPEC, (paths) => paths.agentDevice);
 
+/** Entry of the first installed agent-device among `versions`; never installs. */
+export const installedAgentDeviceEntry = Effect.fn("DeviceToolchain.installedAgentDeviceEntry")(
+  function* (baseDir: string, versions: ReadonlyArray<string>) {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    for (const version of versions) {
+      const paths = toolPaths(path, baseDir, { ...AGENT_DEVICE_SPEC, version });
+      if (yield* isInstalled(fs, paths, version)) return paths.entryPath;
+    }
+    return null;
+  },
+);
+
 export const deviceToolVersions = Effect.fn("DeviceToolchain.versions")(function* (
   baseDir: string,
   running: { hub?: string; agent?: string } = {},
diff --git a/apps/server/src/device/LocalDeviceHost.test.ts b/apps/server/src/device/LocalDeviceHost.test.ts
index 6b86a4d032610..e133b4f9db36c 100644
--- a/apps/server/src/device/LocalDeviceHost.test.ts
+++ b/apps/server/src/device/LocalDeviceHost.test.ts
@@ -40,6 +40,7 @@ const agentFixture = Effect.fn("agentFixture")(function* (
     stateDir: string,
   ) => Effect.Effect<ProcessRunner.ProcessRunOutput, ProcessRunner.ProcessRunError>,
   avdOutput: ProcessRunner.ProcessRunOutput = processOutput(0),
+  previousDaemon?: typeof LocalDeviceHost.__testing.AgentDeviceDaemonFile.Type,
 ) {
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
@@ -47,6 +48,7 @@ const agentFixture = Effect.fn("agentFixture")(function* (
   const hub = { running: true, spawnFails: false };
   const stateDir = agentDeviceStateDir(path, path.join(baseDir, "userdata"));
   const daemonHealthy = yield* Ref.make(true);
+  const runs: Array<ProcessRunner.ProcessRunInput> = [];
   for (const [name, version, entry] of [
     ["expo-device-hub", DEVICE_HUB_VERSION, "dist/server/cli.mjs"],
     ["agent-device", AGENT_DEVICE_VERSION, "bin/agent-device.mjs"],
@@ -57,6 +59,10 @@ const agentFixture = Effect.fn("agentFixture")(function* (
     yield* fs.writeFileString(entryPath, "");
     yield* fs.writeFileString(path.join(installDir, ".install-complete"), version!);
   }
+  if (previousDaemon) {
+    yield* fs.makeDirectory(stateDir, { recursive: true });
+    yield* fs.writeFileString(path.join(stateDir, "daemon.json"), JSON.stringify(previousDaemon));
+  }
   const host = yield* LocalDeviceHost.make().pipe(
     Effect.provide(Layer.mergeAll(ServerConfig.layerTest(baseDir, baseDir), NetService.layer)),
     Effect.provideService(HostProcess.Environment, { HOME: baseDir, PATH: "" }),
@@ -92,10 +98,12 @@ const agentFixture = Effect.fn("agentFixture")(function* (
       ),
     ),
     Effect.provideService(ProcessRunner.ProcessRunner, {
-      run: (input) =>
-        input.args.includes("devices")
+      run: (input) => {
+        runs.push(input);
+        return input.args.includes("devices")
           ? startup(stateDir)
-          : Effect.succeed(input.args.includes("-list-avds") ? avdOutput : processOutput(0)),
+          : Effect.succeed(input.args.includes("-list-avds") ? avdOutput : processOutput(0));
+      },
     }),
     Effect.provideService(
       HttpClient.HttpClient,
@@ -114,7 +122,7 @@ const agentFixture = Effect.fn("agentFixture")(function* (
     ),
   );
   yield* host.ensureReady(() => Effect.void);
-  return { host, fs, stateDir, hub, daemonHealthy };
+  return { host, fs, baseDir, stateDir, hub, daemonHealthy, runs };
 });
 
 describe("AgentDevice startup", () => {
@@ -276,6 +284,75 @@ describe("AgentDevice startup", () => {
       expect((yield* host.current)?.releaseAgentSession).toBeTypeOf("function");
     }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
   );
+
+  it.effect("stops a previous server's daemon with the agent-device version it recorded", () =>
+    Effect.gen(function* () {
+      const path = yield* Path.Path;
+      const { host, fs, baseDir, runs } = yield* agentFixture(
+        () => Effect.die("A session that never readies agent tools must not start the daemon"),
+        processOutput(0),
+        { httpPort: 12345, token: "previous-token", pid: process.pid, version: "0.0.1" },
+      );
+      const olderInstall = path.join(baseDir, "tools", "agent-device", "0.0.1");
+      const olderEntry = path.join(
+        olderInstall,
+        "node_modules",
+        "agent-device",
+        "bin",
+        "agent-device.mjs",
+      );
+      yield* fs.makeDirectory(path.dirname(olderEntry), { recursive: true });
+      yield* fs.writeFileString(olderEntry, "");
+      yield* fs.writeFileString(path.join(olderInstall, ".install-complete"), "0.0.1");
+      yield* host.stop;
+      expect(runs.find((run) => run.args.includes("daemon"))?.args[0]).toBe(olderEntry);
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+
+  // regression: #33552 a daemon left by a previous server survived every later graceful quit
+  it.effect("stops a previous server's daemon with the current pin when its version is gone", () =>
+    Effect.gen(function* () {
+      const path = yield* Path.Path;
+      const { host, baseDir, stateDir, runs } = yield* agentFixture(
+        () => Effect.die("A session that never readies agent tools must not start the daemon"),
+        processOutput(0),
+        { httpPort: 12345, token: "previous-token", pid: process.pid, version: "0.0.1" },
+      );
+      yield* host.stop;
+      expect(runs.find((run) => run.args.includes("daemon"))?.args).toEqual([
+        path.join(
+          baseDir,
+          "tools",
+          "agent-device",
+          AGENT_DEVICE_VERSION,
+          "node_modules",
+          "agent-device",
+          "bin",
+          "agent-device.mjs",
+        ),
+        "daemon",
+        "stop",
+        "--state-dir",
+        stateDir,
+      ]);
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+
+  it.effect("drops a dead daemon's record without running agent-device when the host stops", () =>
+    Effect.gen(function* () {
+      // Above the Linux and macOS PID limits, so never a live process.
+      const deadPid = 4_194_305;
+      const path = yield* Path.Path;
+      const { host, fs, stateDir, runs } = yield* agentFixture(
+        () => Effect.die("A session that never readies agent tools must not start the daemon"),
+        processOutput(0),
+        { httpPort: 12345, token: "previous-token", pid: deadPid, version: AGENT_DEVICE_VERSION },
+      );
+      yield* host.stop;
+      expect(runs.filter((run) => run.args.includes("daemon"))).toEqual([]);
+      expect(yield* fs.exists(path.join(stateDir, "daemon.json"))).toBe(false);
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
 });
 
 const diagnose = (
diff --git a/apps/server/src/device/LocalDeviceHost.ts b/apps/server/src/device/LocalDeviceHost.ts
index afb408f5cc0fb..c5097509dcade 100644
--- a/apps/server/src/device/LocalDeviceHost.ts
+++ b/apps/server/src/device/LocalDeviceHost.ts
@@ -47,7 +47,9 @@ import {
   isAgentDeviceInstalled,
   isDeviceHubInstalled,
   deviceToolVersions,
+  AGENT_DEVICE_VERSION,
   DEVICE_HUB_VERSION,
+  installedAgentDeviceEntry,
 } from "./DeviceToolchain.ts";
 
 const HUB_READY_TIMEOUT_MS = 30_000;
@@ -624,28 +626,44 @@ export const make = Effect.fn("LocalDeviceHost.make")(function* () {
     }
   });
 
-  const stopAgentDeviceDaemon = (
-    agentTool: { readonly entryPath: string; readonly nodePath: string } | null,
-  ) =>
-    agentTool
-      ? runner
-          .run({
-            command: agentTool.nodePath,
-            args: [
-              agentTool.entryPath,
-              "daemon",
-              "stop",
-              "--state-dir",
-              agentDeviceStateDir(path, config.stateDir),
-            ],
-            env: { ...hostEnvironment, AGENT_DEVICE_NO_UPDATE_NOTIFIER: "1" },
-            timeout: Duration.seconds(10),
-            timeoutBehavior: "timedOutResult",
-          })
-          .pipe(Effect.ignore)
-      : Effect.void;
-
-  let agentToolRef: { readonly entryPath: string; readonly nodePath: string } | null = null;
+  // The daemon may predate this process (an earlier server was killed, possibly on an
+  // older pin), so stop it with the CLI of its recorded version when that is installed.
+  const stopAgentDeviceDaemon = Effect.gen(function* () {
+    if (!(yield* fs.exists(daemonFilePath()))) return;
+    const recorded = yield* readDaemonFile().pipe(Effect.option);
+    if (
+      Option.isSome(recorded) &&
+      recorded.value.pid &&
+      !(yield* isProcessAlive(recorded.value.pid))
+    ) {
+      return yield* fs.remove(daemonFilePath(), { force: true });
+    }
+    const entryPath = yield* installedAgentDeviceEntry(config.baseDir, [
+      ...(Option.isSome(recorded) && recorded.value.version ? [recorded.value.version] : []),
+      AGENT_DEVICE_VERSION,
+    ]);
+    if (!entryPath) return;
+    const nodePath = yield* resolveNodeExecutable("Local device support", hostEnvironment).pipe(
+      Effect.provideService(HostProcess.Platform, hostPlatform),
+    );
+    yield* runner.run({
+      command: nodePath,
+      args: [
+        entryPath,
+        "daemon",
+        "stop",
+        "--state-dir",
+        agentDeviceStateDir(path, config.stateDir),
+      ],
+      env: { ...hostEnvironment, AGENT_DEVICE_NO_UPDATE_NOTIFIER: "1" },
+      timeout: Duration.seconds(10),
+      timeoutBehavior: "timedOutResult",
+    });
+  }).pipe(
+    Effect.provideService(FileSystem.FileSystem, fs),
+    Effect.provideService(Path.Path, path),
+    Effect.ignore,
+  );
 
   const ensureHubReady = Effect.fn("LocalDeviceHost.ensureHubReady")(function* (
     onPhase: (phase: "installing" | "starting", detail?: string) => Effect.Effect<void>,
@@ -760,7 +778,6 @@ export const make = Effect.fn("LocalDeviceHost.make")(function* () {
               }),
           ),
         );
-        agentToolRef = { entryPath: agentTool.entryPath, nodePath: running.hub.nodePath };
         yield* onPhase("starting");
         const agentDevice = yield* startAgentDeviceDaemon(agentTool, running.hub.nodePath);
         yield* pruneLocalDeviceTools(config.baseDir, running.hub.nodePath, "agent").pipe(
@@ -843,7 +860,7 @@ export const make = Effect.fn("LocalDeviceHost.make")(function* () {
 
   const stopAgent: DeviceHost.DeviceHost["Service"]["stopAgent"] = startLock.withPermits(1)(
     Effect.gen(function* () {
-      yield* stopAgentDeviceDaemon(agentToolRef);
+      yield* stopAgentDeviceDaemon;
       yield* Ref.update(runningRef, (running) =>
         running ? { ...running, agentDevice: null } : running,
       );
@@ -855,7 +872,7 @@ export const make = Effect.fn("LocalDeviceHost.make")(function* () {
       const running = yield* Ref.getAndSet(runningRef, null);
       yield* stopHub(running?.hub);
       yield* fs.remove(hubStatePath(), { force: true }).pipe(Effect.ignore);
-      yield* stopAgentDeviceDaemon(agentToolRef);
+      yield* stopAgentDeviceDaemon;
     }),
   );
 
diff --git a/apps/server/src/device/deviceToolVersions.json b/apps/server/src/device/deviceToolVersions.json
index e441cc55a9d34..ce61669b26573 100644
--- a/apps/server/src/device/deviceToolVersions.json
+++ b/apps/server/src/device/deviceToolVersions.json
@@ -1,4 +1,4 @@
 {
-  "agent-device": "0.21.31",
-  "expo-device-hub": "0.19.1"
+  "agent-device": "0.21.36",
+  "expo-device-hub": "0.22.1"
 }
diff --git a/apps/server/src/git/GitManager.ts b/apps/server/src/git/GitManager.ts
index d9e1d7d4c09e1..db0d3c91ad194 100644
--- a/apps/server/src/git/GitManager.ts
+++ b/apps/server/src/git/GitManager.ts
@@ -114,6 +114,7 @@ export type GitBranchPullRequest = NonNullable<VcsStatusResult["pr"]> & {
 
 interface SourceControlTextGenerationSettings {
   readonly modelSelection: ModelSelection;
+  readonly projectId: ProjectId | null;
   readonly style: SourceControlWritingStyleSettings;
 }
 
@@ -2156,6 +2157,7 @@ export const make = Effect.gen(function* () {
           ...(input.includeBranch ? { includeBranch: true } : {}),
           ...(policy ? { policy } : {}),
           modelSelection: input.settings.modelSelection,
+          projectId: input.settings.projectId,
         })
         .pipe(Effect.map((result) => sanitizeCommitMessage(result)));
 
@@ -2386,6 +2388,7 @@ export const make = Effect.gen(function* () {
       ...(threadContext ? { threadContext } : {}),
       ...(policy ? { policy } : {}),
       modelSelection: settings.modelSelection,
+      projectId: settings.projectId,
     });
 
     const bodyFile = path.join(
@@ -3231,6 +3234,7 @@ export const make = Effect.gen(function* () {
             settings.sourceControlWriterModelSelection === null
               ? Effect.succeed({
                   modelSelection: settings.textGenerationModelSelection,
+                  projectId,
                   style: settings.sourceControlWritingStyle,
                 })
               : providerRegistry.getProviders.pipe(
@@ -3240,6 +3244,7 @@ export const make = Effect.gen(function* () {
                       providers,
                       projectId,
                     ),
+                    projectId,
                     style: settings.sourceControlWritingStyle,
                   })),
                 ),
diff --git a/apps/server/src/mcp/OrchestratorMcpService.ts b/apps/server/src/mcp/OrchestratorMcpService.ts
index 066722ea6625f..401b91f24e0c8 100644
--- a/apps/server/src/mcp/OrchestratorMcpService.ts
+++ b/apps/server/src/mcp/OrchestratorMcpService.ts
@@ -969,8 +969,8 @@ function turnItemText(item: OrchestrationV2TurnItem): string | null {
       return `Asked the user for ${item.label}: ${item.secretStatus}.`;
     case "link_request":
       return item.linkStatus === "linked"
-        ? `Linked ${item.linkedLabel ?? item.label ?? item.url ?? "an environment"} (${item.linkedAccess}).`
-        : `Asked the user to link ${item.label ?? item.url ?? "an environment"}: ${item.linkStatus}.`;
+        ? `Linked ${item.linkedLabel ?? item.url ?? "an environment"} (${item.linkedAccess}).`
+        : `Asked the user to link ${item.url ?? "an environment"}: ${item.linkStatus}.`;
     case "subagent":
       return item.result ?? item.progress ?? item.prompt;
     case "dynamic_tool":
diff --git a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
index aae63afa9962e..b07bb23c85eb4 100644
--- a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
@@ -317,7 +317,7 @@ const colorForm = {
 const resumed = (
   entries: ReadonlyArray<ProviderReplayEntry>,
   options?: {
-    readonly version?: "2.2.5";
+    readonly version?: "2.2.5" | "2.2.6";
     readonly goal?: OrchestrationV2ProviderThread["goal"];
     readonly external?: boolean;
     readonly supervised?: boolean;
@@ -326,6 +326,7 @@ const resumed = (
     readonly resolveExtractedTextPath?: (path: string) => Effect.Effect<string | undefined>;
     readonly fileSystem?: FileSystem.FileSystem;
     readonly onPrompt?: (input: unknown) => void;
+    readonly borrowers?: { current: number };
   },
 ) =>
   Effect.gen(function* () {
@@ -335,7 +336,7 @@ const resumed = (
         out("session.get", { sessionID: SESSION }),
         replyData("session.get", sessionInfo()),
         ...noOpenRequests,
-        ...(options?.version === "2.2.5"
+        ...(options?.version !== undefined
           ? [out("rpc.call", "<any>"), reply("rpc.call", { output: null })]
           : []),
         ...withInstructions([
@@ -352,6 +353,7 @@ const resumed = (
       ],
       {
         ...(options?.version === undefined ? {} : { version: options.version }),
+        ...(options?.borrowers === undefined ? {} : { borrowers: options.borrowers }),
         ...(options?.fileSystem === undefined ? {} : { fileSystem: options.fileSystem }),
         ...(options?.onPrompt === undefined ? {} : { onPrompt: options.onPrompt }),
         ...(options?.external === undefined ? {} : { external: options.external }),
@@ -2891,6 +2893,422 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       }).pipe(Effect.scoped),
   );
 
+  it.effect.each(["completed", "error", "cancelled"] as const)(
+    "retains native image job %s after its launch returns",
+    (outcome) =>
+      Effect.gen(function* () {
+        const tool = { sessionID: SESSION, assistantMessageID: "msg_assistant", id: "call-image" };
+        const notice = (sessionID: string) =>
+          event("session.inbox.enqueued", {
+            sessionID,
+            inboxID: `msg_image_${sessionID}`,
+            item: {
+              type: "synthetic",
+              delivery: "steer",
+              payload: {
+                description: "Image generation",
+                text:
+                  outcome === "completed"
+                    ? "Image outcome retained. Saved image: /work/opencode2/image.png (test/image)."
+                    : "Image outcome retained",
+                metadata: {
+                  source: "experimental_image_generate",
+                  jobID: "image_test",
+                  state: outcome,
+                  path: "/work/opencode2/image",
+                },
+              },
+            },
+          });
+        const { runtime, thread } = yield* resumed(
+          [
+            out("session.prompt", { sessionID: SESSION, text: "<any>" }),
+            promptAccepted,
+            event("session.tool.input.started", { ...tool, name: "experimental_image_generate" }),
+            event("session.tool.called", { ...tool, input: { prompt: "A tree" }, executed: false }),
+            event(
+              "session.tool.success",
+              {
+                ...tool,
+                content: [{ type: "text", text: "Job launched" }],
+                metadata: {
+                  jobID: "image_test",
+                  path: "/work/opencode2/image",
+                  model: "test/image",
+                },
+                executed: false,
+              },
+              undefined,
+              2,
+            ),
+            event("session.execution.succeeded", { sessionID: SESSION }),
+            notice("ses_other"),
+            notice(SESSION),
+            ...(outcome === "completed"
+              ? [
+                  out("image.read", {
+                    path: "/api/fs/read/image.png",
+                    "location[directory]": WORK,
+                  }),
+                  reply("image.read", { imageBase64: "iVBORw0KGgo=" }),
+                ]
+              : []),
+          ],
+          { external: true },
+        );
+        let launched = false;
+        const events = yield* runtime.events.pipe(
+          Stream.takeUntil((e) => {
+            if (e.type !== "provider_thread.updated") return false;
+            if (
+              e.providerThread.pendingBackgroundTasks?.some((task) => task.taskId === "image_test")
+            )
+              launched = true;
+            return launched && e.pendingBackgroundWork === false;
+          }),
+          Stream.runCollect,
+          Effect.forkScoped,
+        );
+        yield* runtime.startTurn(turnInput(thread));
+        const collected = yield* Fiber.join(events);
+        const items = collected.flatMap((e) =>
+          e.type === "turn_item.updated" && e.turnItem.nativeItemRef?.nativeId === "call-image"
+            ? [e.turnItem]
+            : [],
+        );
+        assert.deepEqual(
+          items.map((item) => item.status),
+          [
+            "running",
+            "running",
+            "running",
+            outcome === "error" ? "failed" : outcome === "cancelled" ? "interrupted" : "completed",
+          ],
+        );
+        assert.include(JSON.stringify(items.at(-1)), "Image outcome retained");
+        if (outcome === "completed") {
+          const item = items.at(-1);
+          assert.deepEqual(item?.type === "dynamic_tool" ? toolOutputImages(item.output) : [], [
+            { mimeType: "image/png", data: "iVBORw0KGgo=" },
+          ]);
+        }
+        const rosters = collected.flatMap((e) =>
+          e.type === "provider_thread.updated"
+            ? [e.providerThread.pendingBackgroundTasks ?? []]
+            : [],
+        );
+        assert.isTrue(rosters.some((tasks) => tasks.some((task) => task.taskId === "image_test")));
+        assert.deepEqual(rosters.at(-1), []);
+      }).pipe(Effect.scoped),
+  );
+
+  it.effect.each(["history", "list", "late-preview"] as const)(
+    "recovers native image job outcomes from %s after reconnect",
+    (source) =>
+      Effect.gen(function* () {
+        const { runtime, thread } = yield* resumed(
+          [
+            out("session.prompt", { sessionID: SESSION, id: PROMPT_ID, text: "<any>" }),
+            promptAccepted,
+            ...(() => {
+              const frames: Array<ProviderReplayEntry> = reconnected({}, "succeeded", {
+                content: [
+                  {
+                    type: "tool",
+                    id: "call-image-gap",
+                    name: "experimental_image_generate",
+                    executed: false,
+                    state: {
+                      status: "completed",
+                      input: { prompt: "A tree" },
+                      content: [{ type: "text", text: "Job launched" }],
+                      metadata: { jobID: "image_gap", path: "/tmp/image", model: "test/image" },
+                    },
+                    time: { created: 2, ran: 2, completed: 2 },
+                  },
+                ],
+              });
+              if (source !== "history")
+                frames.splice(2, 0, out("rpc.call", "<any>"), reply("rpc.call", { output: null }));
+              return frames;
+            })(),
+            out("message.list", { sessionID: SESSION, type: "synthetic", limit: "100" }),
+            reply("message.list", {
+              data:
+                source !== "history"
+                  ? []
+                  : [
+                      {
+                        id: "msg_image_gap",
+                        time: { created: 3 },
+                        type: "synthetic",
+                        text: "Recovered image failure",
+                        description: "Image generation",
+                        metadata: {
+                          source: "experimental_image_generate",
+                          jobID: "image_gap",
+                          state: "error",
+                          path: "/tmp/image",
+                        },
+                      },
+                    ],
+              cursor: {},
+            }),
+            ...(source !== "history"
+              ? [
+                  out("imageJobs", { sessionID: SESSION, kind: "image" }),
+                  reply("imageJobs", {
+                    data: [
+                      {
+                        kind: "image",
+                        id: "image_gap",
+                        sessionID: SESSION,
+                        status: source === "late-preview" ? "completed" : "error",
+                        path: "/tmp/image",
+                        model: "test/image",
+                        time: { started: 2, completed: 3 },
+                      },
+                    ],
+                  }),
+                ]
+              : []),
+            ...(source === "late-preview"
+              ? [
+                  event("session.inbox.enqueued", {
+                    sessionID: SESSION,
+                    inboxID: "msg_image_late",
+                    item: {
+                      type: "synthetic",
+                      delivery: "steer",
+                      payload: {
+                        description: "Image generation",
+                        text: "Image request finished. Saved image: /tmp/image.png (test/image).",
+                        metadata: {
+                          source: "experimental_image_generate",
+                          jobID: "image_gap",
+                          state: "completed",
+                          path: "/tmp/image",
+                        },
+                      },
+                    },
+                  }),
+                  out("image.read", {
+                    path: "/api/fs/read/image.png",
+                    "location[directory]": "/tmp",
+                  }),
+                  reply("image.read", { imageBase64: "iVBORw0KGgo=" }),
+                ]
+              : []),
+          ],
+          { ...(source !== "history" ? { version: "2.2.6" as const } : {}), external: true },
+        );
+        const events = yield* runtime.events.pipe(
+          Stream.takeUntil(
+            (e) =>
+              e.type === "turn_item.updated" &&
+              e.turnItem.nativeItemRef?.nativeId === "call-image-gap" &&
+              (source === "late-preview"
+                ? e.turnItem.type === "dynamic_tool" &&
+                  toolOutputImages(e.turnItem.output).length > 0
+                : e.turnItem.status === "failed"),
+          ),
+          Stream.runCollect,
+          Effect.forkScoped,
+        );
+        yield* runtime.startTurn(turnInput(thread));
+        const collected = yield* Fiber.join(events);
+        assert.include(
+          JSON.stringify(collected.at(-1)),
+          source === "late-preview"
+            ? "Saved image: /tmp/image.png"
+            : source !== "history"
+              ? "Image generation error"
+              : "Recovered image failure",
+        );
+        assert.isTrue(
+          collected.some(
+            (e) =>
+              e.type === "provider_thread.updated" &&
+              e.providerThread.pendingBackgroundTasks?.some((task) => task.taskId === "image_gap"),
+          ),
+        );
+      }).pipe(Effect.scoped),
+  );
+
+  it.effect("settles a recovered image outcome when preview I/O is interrupted", () =>
+    Effect.gen(function* () {
+      const reading = yield* Deferred.make<void>();
+      const interrupted = yield* Deferred.make<void>();
+      const fs = yield* FileSystem.FileSystem;
+      const { runtime, thread } = yield* resumed(
+        [
+          out("session.prompt", { sessionID: SESSION, id: PROMPT_ID, text: "<any>" }),
+          promptAccepted,
+          ...reconnected({}, "succeeded", {
+            content: [
+              {
+                type: "tool",
+                id: "call-image-slow",
+                name: "experimental_image_generate",
+                executed: false,
+                state: {
+                  status: "completed",
+                  input: { prompt: "A tree" },
+                  content: [{ type: "text", text: "Launched" }],
+                  metadata: { jobID: "image_slow", path: "/tmp/image", model: "test/image" },
+                },
+                time: { created: 2, ran: 2, completed: 2 },
+              },
+            ],
+          }),
+          out("message.list", { sessionID: SESSION, type: "synthetic", limit: "100" }),
+          reply("message.list", {
+            data: [
+              {
+                id: "msg_image_slow",
+                type: "synthetic",
+                time: { created: 3 },
+                text: "Image request finished. Saved image: /tmp/image.png (test/image).",
+                description: "Image generation",
+                metadata: {
+                  source: "experimental_image_generate",
+                  jobID: "image_slow",
+                  state: "completed",
+                  path: "/tmp/image",
+                },
+              },
+            ],
+            cursor: {},
+          }),
+          event("session.model.selected", {
+            sessionID: SESSION,
+            model: { providerID: "opencode", id: "big-pickle", variant: "recovery-observed" },
+          }),
+        ],
+        {
+          fileSystem: {
+            ...fs,
+            stat: (path) =>
+              path === "/tmp/image.png"
+                ? Deferred.succeed(reading, undefined).pipe(
+                    Effect.andThen(Effect.never),
+                    Effect.onInterrupt(() => Deferred.succeed(interrupted, undefined)),
+                  )
+                : fs.stat(path),
+          },
+        },
+      );
+      const events = yield* runtime.events.pipe(
+        Stream.takeUntil(
+          (e) =>
+            e.type === "provider_thread.updated" &&
+            e.providerThread.nativeMetadata?.modelSelection?.options?.some(
+              (option) => option.value === "recovery-observed",
+            ) === true,
+        ),
+        Stream.runCollect,
+        Effect.forkScoped,
+      );
+      yield* runtime.startTurn(turnInput(thread));
+      yield* Deferred.await(reading);
+      yield* TestClock.adjust("5 seconds");
+      yield* Deferred.await(interrupted);
+      const collected = yield* Fiber.join(events);
+      assert.isTrue(
+        collected.some(
+          (e) =>
+            e.type === "turn_item.updated" &&
+            e.turnItem.nativeItemRef?.nativeId === "call-image-slow" &&
+            e.turnItem.status === "completed",
+        ),
+      );
+      assert.isFalse(yield* runtime.hasPendingBackgroundWorkForThread!(thread));
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+
+  it.effect.each(["root", "child"] as const)(
+    "settles %s native image tasks when reconnect attempts fail",
+    (owner) =>
+      Effect.gen(function* () {
+        const attempts = yield* Effect.forEach([0, 1, 2, 3, 4], () => Deferred.make<void>());
+        let count = 0;
+        let failures = 0;
+        const borrowers = {
+          get current() {
+            return count;
+          },
+          set current(next: number) {
+            if (next < count && count === 2) {
+              const attempt = attempts[failures++];
+              if (attempt !== undefined) Deferred.doneUnsafe(attempt, Effect.void);
+            }
+            count = next;
+          },
+        };
+        const tool = {
+          sessionID: owner === "root" ? SESSION : CHILD,
+          assistantMessageID: "msg_assistant",
+          id: "call-image-lost",
+        };
+        const { runtime, thread } = yield* resumed(
+          [
+            ...(owner === "root"
+              ? [out("session.prompt", { sessionID: SESSION, text: "<any>" }), promptAccepted]
+              : [
+                  ...backgroundLaunch(CHILD),
+                  event("session.execution.started", { sessionID: CHILD }),
+                ]),
+            event("session.tool.input.started", { ...tool, name: "experimental_image_generate" }),
+            event(
+              "session.tool.success",
+              {
+                ...tool,
+                content: [{ type: "text", text: "Launched" }],
+                metadata: { jobID: "image_lost", path: "/tmp/image", model: "test/image" },
+                executed: false,
+              },
+              undefined,
+              2,
+            ),
+            ...(owner === "child"
+              ? [event("session.execution.succeeded", { sessionID: CHILD })]
+              : []),
+            event("session.execution.succeeded", { sessionID: SESSION }),
+            { type: "runtime_exit", status: "success" },
+          ],
+          { borrowers },
+        );
+        const events = yield* runtime.events.pipe(Stream.runCollect, Effect.forkScoped);
+        yield* runtime.startTurn(withLineage(thread));
+        yield* Deferred.await(attempts[0]!);
+        for (const attempt of attempts.slice(1)) {
+          yield* TestClock.adjust("2 seconds");
+          yield* Deferred.await(attempt);
+        }
+        const collected = yield* Fiber.join(events);
+        assert.isFalse(yield* runtime.hasPendingBackgroundWorkForThread!(thread));
+        assert.isTrue(
+          collected.some(
+            (e) =>
+              e.type === "turn_item.updated" &&
+              e.turnItem.nativeItemRef?.nativeId ===
+                (owner === "root" ? tool.id : `${CHILD}:${tool.id}`) &&
+              e.turnItem.status === "failed",
+          ),
+        );
+        const rootSnapshots = collected.flatMap((e) =>
+          e.type === "provider_thread.updated" && e.providerThread.id === thread.id ? [e] : [],
+        );
+        assert.isFalse(rootSnapshots.at(-1)?.pendingBackgroundWork);
+        assert.deepEqual(rootSnapshots.at(-1)?.providerThread.pendingBackgroundTasks, []);
+        assert.isTrue(
+          rootSnapshots.some((e) =>
+            e.providerThread.pendingBackgroundTasks?.some((task) => task.taskId === "image_lost"),
+          ),
+        );
+      }).pipe(Effect.scoped),
+  );
+
   it.effect("projects successful native todo updates into one checklist", () =>
     Effect.gen(function* () {
       const updates = [
diff --git a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.testkit.ts b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.testkit.ts
index e4ad66e76539f..2714b3a360d12 100644
--- a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.testkit.ts
+++ b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.testkit.ts
@@ -54,6 +54,10 @@ const operationOf = (
   query: Record<string, unknown>,
   body: unknown,
 ) => {
+  if (method === "GET" && path === "/api/experimental/job")
+    return { type: "imageJobs", input: query };
+  if (method === "GET" && path.startsWith("/api/fs/read/"))
+    return { type: "image.read", input: { path, ...query } };
   const rpc = /^\/api\/rpc\/([^/]+)\/([^/]+)$/.exec(path);
   if (method === "POST" && rpc !== null)
     return {
@@ -176,6 +180,11 @@ const replayHttpClient = (
         }
         // Recorded responses are the raw HTTP bodies; `null` is an empty 204.
         const body = await controller.response(operation.type);
+        if (typeof body === "object" && body !== null && "imageBase64" in body) {
+          return new Response(Buffer.from(String(body.imageBase64), "base64"), {
+            headers: { "content-type": "image/png" },
+          });
+        }
         if (body === "<hang>") return new Promise<Response>(() => {});
         if (typeof body === "object" && body !== null && "status" in body && "body" in body) {
           return new Response(encodeJson(body.body), {
diff --git a/apps/server/src/orchestration-v2/DelegatedCompletionDelivery.test.ts b/apps/server/src/orchestration-v2/DelegatedCompletionDelivery.test.ts
index 5cabb1c363722..a5c123157bae1 100644
--- a/apps/server/src/orchestration-v2/DelegatedCompletionDelivery.test.ts
+++ b/apps/server/src/orchestration-v2/DelegatedCompletionDelivery.test.ts
@@ -2575,7 +2575,8 @@ it.layer(Layer.merge(layerTest, ProviderContinuationRequests.layer))(
             creationSource: outcome === "failed" ? "web" : "mcp",
             commandId: CommandId.make(`command:followup-send-${outcome}`),
             threadId: child.childThreadId,
-            senderThreadId: parentThreadId,
+            // `t3 thread send` and unscoped MCP sessions carry no sender thread.
+            ...(outcome === "completed" ? {} : { senderThreadId: parentThreadId }),
             messageId,
             text: "Check the same work again.",
             attachments: [],
diff --git a/apps/server/src/orchestration-v2/Orchestrator.ts b/apps/server/src/orchestration-v2/Orchestrator.ts
index eab5cda62027e..3157f55cacfa6 100644
--- a/apps/server/src/orchestration-v2/Orchestrator.ts
+++ b/apps/server/src/orchestration-v2/Orchestrator.ts
@@ -8486,12 +8486,14 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
     if (!startsAttempt) return;
     const child = yield* projectionStore.getThread(command.threadId);
     const parentThreadId = child.lineage.parentThreadId;
+    // A send with no sender thread comes from a client acting for the owner, like a user send.
     if (
       child.lineage.relationshipToParent !== "subagent" ||
       parentThreadId === null ||
       (command.notification === undefined &&
         command.createdBy !== "user" &&
         command.usageLimitContinuationOfRunId === undefined &&
+        command.senderThreadId !== undefined &&
         command.senderThreadId !== parentThreadId)
     )
       return;
diff --git a/apps/server/src/orchestration-v2/ThreadFind.test.ts b/apps/server/src/orchestration-v2/ThreadFind.test.ts
index 6793421a64333..9366fdf193dbf 100644
--- a/apps/server/src/orchestration-v2/ThreadFind.test.ts
+++ b/apps/server/src/orchestration-v2/ThreadFind.test.ts
@@ -1,4 +1,5 @@
 import { assert, it, describe } from "@effect/vitest";
+import { searchableMessageSegments } from "@t3tools/shared/threadFindText";
 import {
   EventId,
   MessageId,
@@ -19,6 +20,8 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as SqlClient from "effect/sql/SqlClient";
 import * as Stream from "effect/Stream";
+import * as TestClock from "effect/testing/TestClock";
+import { vi } from "vite-plus/test";
 
 import * as SqlitePersistence from "../persistence/Sqlite.ts";
 import * as ProjectionStore from "./ProjectionStore.ts";
@@ -31,6 +34,8 @@ import {
 } from "./threadHistoryPaging.ts";
 import { projectTurnItemForWire } from "./WireProjection.ts";
 
+vi.mock("@t3tools/shared/threadFindText", { spy: true });
+
 const layerTest = Layer.mergeAll(EventStore.layer, ProjectionStore.layer, ProjectStore.layer).pipe(
   Layer.provideMerge(SqlitePersistence.layerMemory),
 );
@@ -460,6 +465,40 @@ describe("V2 thread find", () => {
     }).pipe(Effect.provide(layerTest)),
   );
 
+  it.effect("keeps its caches while Find is in use and drops them after one idle minute", () =>
+    Effect.gen(function* () {
+      const projection = yield* setup;
+      yield* putItems([item("one", 1, "idle needle one"), item("two", 2, "idle needle two")]);
+      const parses = () =>
+        vi
+          .mocked(searchableMessageSegments)
+          .mock.calls.filter(([message]) => message.text.startsWith("idle needle")).length;
+      const search = (query: string) => projection.searchThread({ threadId, query });
+      // One idle minute passes inside this search. The later counts fail if it let the caches go.
+      yield* projection.searchThreadStream({ threadId, query: "needle" }).pipe(
+        Stream.tap((frame) =>
+          frame.complete === false ? TestClock.adjust("1 minute") : Effect.void,
+        ),
+        Stream.runDrain,
+      );
+      assert.equal(parses(), 2);
+      yield* TestClock.adjust("40 seconds");
+      yield* search("idle");
+      yield* TestClock.adjust("40 seconds");
+      // A repeated query is answered from the completed scan and still counts as use.
+      const repeated = yield* projection
+        .searchThreadStream({ threadId, query: "needle" })
+        .pipe(Stream.runCollect);
+      assert.equal(repeated.length, 1);
+      yield* TestClock.adjust("40 seconds");
+      yield* search("one");
+      assert.equal(parses(), 2);
+      yield* TestClock.adjust("1 minute");
+      yield* search("needle");
+      assert.equal(parses(), 4);
+    }).pipe(Effect.provide(layerTest)),
+  );
+
   it.effect("invalidates cached counts when streamed text changes or a run rolls back", () =>
     Effect.gen(function* () {
       const projection = yield* setup;
diff --git a/apps/server/src/orchestration-v2/ThreadFind.ts b/apps/server/src/orchestration-v2/ThreadFind.ts
index ead68680a21c9..c6a2c012f758c 100644
--- a/apps/server/src/orchestration-v2/ThreadFind.ts
+++ b/apps/server/src/orchestration-v2/ThreadFind.ts
@@ -12,6 +12,7 @@ import { countThreadSearchOccurrences } from "@t3tools/shared/threadSearch";
 import * as Cache from "effect/Cache";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
+import * as RcRef from "effect/RcRef";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
@@ -38,6 +39,14 @@ interface FindDocument extends FindRow {
   readonly runId: OrchestrationV2TurnItem["runId"];
   readonly count: number;
 }
+type CompletedScans = Map<
+  string,
+  {
+    sequence: number;
+    documents: readonly FindDocument[];
+    sourceThreadIds: readonly ThreadId[];
+  }
+>;
 class TextKey extends Data.Class<{
   text: string;
   role: "user" | "assistant" | "plan";
@@ -232,26 +241,21 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* (
           });
     });
   });
-  // Scans visit every message; a cache smaller than the thread churns without hits.
-  const textCache = yield* Cache.make({
-    capacity: 8192,
-    timeToLive: "1 minute",
-    lookup: (key: TextKey) => Effect.sync(() => parseText(key)),
-  });
-  // Bounded separately because each entry can hold a large body; typing reuses the parse.
-  const largeTextCache = yield* Cache.make({
-    capacity: 32,
-    timeToLive: "1 minute",
-    lookup: (key: TextKey) => Effect.sync(() => parseText(key)),
+  const makeTextCache = (capacity: number) =>
+    Cache.make({ capacity, lookup: (key: TextKey) => Effect.sync(() => parseText(key)) });
+  // Text keys are message content, so entries never go stale. Cache TTL only expires on access
+  // and would keep the last searched threads forever. Each search borrows this for its whole
+  // stream, and all of it is dropped once Find is idle.
+  const findCaches = yield* RcRef.make({
+    acquire: Effect.all({
+      // Scans visit every message; a cache smaller than the thread churns without hits.
+      text: makeTextCache(8192),
+      // Bounded separately because each entry can hold a large body; typing reuses the parse.
+      largeText: makeTextCache(32),
+      scans: Effect.sync((): CompletedScans => new Map()),
+    }),
+    idleTimeToLive: "1 minute",
   });
-  const scans = new Map<
-    string,
-    {
-      sequence: number;
-      documents: readonly FindDocument[];
-      sourceThreadIds: readonly ThreadId[];
-    }
-  >();
   const readRevision = Effect.fn("ThreadFind.readRevision")(function* (
     threadIds: readonly ThreadId[],
   ) {
@@ -275,7 +279,7 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* (
     return revision[0]?.sequence ?? 0;
   });
   const snapshot = Effect.fn("ThreadFind.snapshot")(
-    function* (input: OrchestrationV2SearchThreadInput) {
+    function* (input: OrchestrationV2SearchThreadInput, scans: CompletedScans) {
       const { threadId } = input;
       const active = yield* sql<{ cwd: string | null }>`
       SELECT COALESCE(json_extract(t.payload_json, '$.worktreePath'), p.workspace_root) AS cwd
@@ -326,8 +330,9 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* (
   const searchThreadStream = (input: OrchestrationV2SearchThreadInput) =>
     Stream.unwrap(
       Effect.gen(function* () {
+        const { scans, ...textCache } = yield* RcRef.get(findCaches);
         // Release SQLite before decoding and parsing. Both frames describe one snapshot.
-        const data = yield* snapshot(input);
+        const data = yield* snapshot(input, scans);
         if (data.result) return Stream.succeed(data.result);
         const { payloads, cwd, sequence, cacheKey, sourceThreadIds } = data;
         const decode = (row: FindPayload) =>
@@ -357,7 +362,7 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* (
           const decoded = yield* decode(row);
           const key = textKey(decoded.item, cwd, input.skills ?? []);
           const segments = yield* Cache.get(
-            key.text.length <= 32_768 ? textCache : largeTextCache,
+            key.text.length <= 32_768 ? textCache.text : textCache.largeText,
             key,
           );
           const document = documentFor(decoded, countSegments(segments, input.query));
diff --git a/apps/server/src/orchestration-v2/ThreadLaunchService.ts b/apps/server/src/orchestration-v2/ThreadLaunchService.ts
index 7e7829ba947cf..6397bfdb3bc72 100644
--- a/apps/server/src/orchestration-v2/ThreadLaunchService.ts
+++ b/apps/server/src/orchestration-v2/ThreadLaunchService.ts
@@ -361,6 +361,7 @@ const make = Effect.gen(function* () {
               attachments: message.attachments,
               ...(message.context ? { context: message.context } : {}),
               modelSelection,
+              projectId: input.projectId,
             })
             .pipe(
               Effect.map((result) => ({
diff --git a/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts b/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts
index 6c80def39059f..395e8768996e8 100644
--- a/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts
+++ b/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts
@@ -175,6 +175,7 @@ const make = Effect.gen(function* () {
         ...(inherited === undefined ? {} : { forkSource: inherited }),
         instructions: settings.threadTitleInstructions,
         modelSelection: settings.textGenerationModelSelection,
+        projectId: projection.thread.projectId,
       });
       const generatedTitle = result.title.trim();
       return generatedTitle === "New thread" ||
diff --git a/apps/server/src/peer/PeerLinkRequests.test.ts b/apps/server/src/peer/PeerLinkRequests.test.ts
index 09f285954992b..ab16197ba05b7 100644
--- a/apps/server/src/peer/PeerLinkRequests.test.ts
+++ b/apps/server/src/peer/PeerLinkRequests.test.ts
@@ -469,14 +469,14 @@ it.live("the agent asks without waiting, and the user links the box after its tu
       // The call returns at once: no tool call outlives a provider's timeout.
       expect(asked.isError).toBe(false);
       expect(asked.structuredContent).toEqual({ status: "pending", turnItemId: card.id });
-      // The card names the box, found by asking its address.
       expect(card).toMatchObject({
         url: b.url,
         reason: "Run the suite on the box.",
-        environmentId: box.environmentId,
-        label: "Box",
         requestedAccess: "approval-required",
       });
+      // Anything can answer at an address as the box, so the card names no machine.
+      expect(card.environmentId).toBeUndefined();
+      expect(card.label).toBeUndefined();
       // The agent waits on the user, so the thread asks for input.
       expect((yield* a.orchestrator.getThreadShell(threadId))?.pendingRuntimeRequest).toMatchObject(
         { kind: "user_input" },
@@ -675,7 +675,7 @@ it.live("a declined request links nothing and tells the agent", () =>
       const { messages } = yield* outcomeMessages(a);
       expect(messages).toHaveLength(1);
       expect(messages[0]).toMatchObject({
-        notification: { outcome: "cancelled", summary: "Declined to link Box" },
+        notification: { outcome: "cancelled", summary: `Declined to link ${b.url}` },
       });
       expect(messages[0]!.text).toContain("declined");
     }),
@@ -904,6 +904,45 @@ it.live("a code the box refuses fails the request with its reason, and links not
   ),
 );
 
+it.live("a card an older server left naming a machine beside its address links no machine", () =>
+  withBoth((a, b) =>
+    Effect.gen(function* () {
+      yield* seedThread(a);
+      yield* a.orchestrator.dispatch({
+        type: "link_request.record",
+        commandId: CommandId.make("command:pending:older"),
+        threadId,
+        runId,
+        nodeId: rootNode,
+        turnItemId: TurnItemId.make("turn-item:link-request:older"),
+        url: b.url,
+        environmentId: box.environmentId,
+        label: "Box",
+        reason: "",
+        linkStatus: "pending",
+      });
+      const card = yield* pendingCard(a);
+      // An older client takes the machine from the card and mints a code on it.
+      const pairing = yield* b.auth.issuePairingCredential();
+      yield* a.requests.answer({
+        threadId,
+        turnItemId: card.id,
+        answer: {
+          type: "link",
+          environmentId: box.environmentId,
+          label: "Box",
+          urls: [b.url],
+          access: "auto",
+          pairingCode: pairing.credential,
+        },
+      });
+      expect(yield* cardOf(a)).toMatchObject({ linkStatus: "failed" });
+      expect(Option.isNone(yield* a.links.get(box.environmentId))).toBe(true);
+      expect(yield* b.linkedSessions).toEqual([]);
+    }),
+  ),
+);
+
 it.live("an agent below full access may not ask, and no card is shown", () =>
   withBoth((a, b) =>
     Effect.gen(function* () {
diff --git a/apps/server/src/peer/PeerLinkRequests.ts b/apps/server/src/peer/PeerLinkRequests.ts
index 390589a81b4e4..3d1129a599f84 100644
--- a/apps/server/src/peer/PeerLinkRequests.ts
+++ b/apps/server/src/peer/PeerLinkRequests.ts
@@ -39,7 +39,7 @@ type LinkRequestItem = Extract<OrchestrationV2TurnItem, { readonly type: "link_r
 /** The request as it was asked, which every update of its card repeats. */
 type LinkRequestAsk = Pick<
   LinkRequestItem,
-  "id" | "threadId" | "url" | "reason" | "environmentId" | "label" | "hint" | "requestedAccess"
+  "id" | "threadId" | "url" | "reason" | "environmentId" | "hint" | "requestedAccess"
 > & { readonly runId: RunId; readonly nodeId: NodeId };
 
 /** The notification that tells the agent how its card ended. */
@@ -129,7 +129,6 @@ const make = Effect.gen(function* () {
       ...(card.url === undefined ? {} : { url: card.url }),
       reason: card.reason,
       ...(card.environmentId === undefined ? {} : { environmentId: card.environmentId }),
-      ...(card.label === undefined ? {} : { label: card.label }),
       ...(card.hint === undefined ? {} : { hint: card.hint }),
       ...(card.requestedAccess === undefined ? {} : { requestedAccess: card.requestedAccess }),
       ...outcome,
@@ -252,9 +251,8 @@ const make = Effect.gen(function* () {
             "Asking to link an environment requires an active run owned by this MCP provider session.",
         });
       }
-      // Best effort: the card names the machine at an address the agent was
-      // given, and the client finds it by id.
-      const peer = input.url === undefined ? Option.none() : yield* peerLinks.describe(input.url);
+      // Anything can answer at an address as any machine, so a card for an
+      // address names none. The client names it from addresses it already has.
       yield* record(
         {
           id: turnItemId,
@@ -263,11 +261,7 @@ const make = Effect.gen(function* () {
           nodeId: run.rootNodeId,
           ...(input.url === undefined ? {} : { url: input.url }),
           reason: input.reason ?? "",
-          ...(Option.isSome(peer)
-            ? { environmentId: peer.value.environmentId, label: peer.value.label }
-            : input.environmentId === undefined
-              ? {}
-              : { environmentId: input.environmentId }),
+          ...(input.environmentId === undefined ? {} : { environmentId: input.environmentId }),
           ...(input.hint === undefined ? {} : { hint: input.hint }),
           ...(input.requestedAccess === undefined
             ? {}
@@ -357,7 +351,18 @@ const make = Effect.gen(function* () {
       if (card.linkStatus !== "pending") {
         return yield* new PeerLinkRequestError({ reason: "already_answered" });
       }
-      const outcome = yield* answerOutcome(input.answer);
+      // An id beside an address is what answered there, recorded by an older
+      // server. Linking that machine could send its pairing code to the address.
+      const outcome: LinkRequestOutcome =
+        card.url !== undefined &&
+        card.environmentId !== undefined &&
+        input.answer.type === "link" &&
+        input.answer.environmentId !== undefined
+          ? {
+              linkStatus: "failed",
+              failure: "This request is from before an update. Ask for the link again.",
+            }
+          : yield* answerOutcome(input.answer);
       // If Stop closed the card while linking, the card keeps that; the link
       // itself stands and Settings lists it.
       yield* record(
@@ -416,16 +421,16 @@ const resultOf = (card: LinkRequestItem): OrchestratorMcpEnvironmentLinkResult =
   }
 };
 
-/** What the agent's words call the target: its name, its address, or the user's pick. */
-const linkTarget = (card: Pick<LinkRequestItem, "url" | "label" | "environmentId">) =>
-  card.label ?? card.url ?? card.environmentId ?? "a machine";
+/** What the agent's words call the target: its address, its id, or the user's pick. */
+const linkTarget = (card: Pick<LinkRequestItem, "url" | "environmentId">) =>
+  card.url ?? card.environmentId ?? "a machine";
 
 /**
  * The notification an answer sends the agent: what the card says, and what
  * to do next. It carries the outcome only, never the pairing code.
  */
 const outcomeNotice = (
-  card: Pick<LinkRequestItem, "url" | "label" | "environmentId">,
+  card: Pick<LinkRequestItem, "url" | "environmentId">,
   outcome: LinkRequestOutcome,
 ): Omit<LinkRequestWake, "messageId"> => {
   const target = linkTarget(card);
diff --git a/apps/server/src/peer/PeerLinks.test.ts b/apps/server/src/peer/PeerLinks.test.ts
index 5198fc443f768..2ff34859c8a97 100644
--- a/apps/server/src/peer/PeerLinks.test.ts
+++ b/apps/server/src/peer/PeerLinks.test.ts
@@ -603,10 +603,35 @@ it.effect(
           expectedEnvironmentId: box.environmentId,
         });
         expect(linked).toMatchObject({ environmentId: box.environmentId, urls: [b.url] });
+        // A picked machine is never linked at this machine's own loopback.
+        const own = yield* a.links
+          .link({
+            url: b.url.replace("127.0.0.1", "localhost"),
+            pairingCode: pairing.credential,
+            access: "auto",
+            expectedEnvironmentId: box.environmentId,
+          })
+          .pipe(Effect.flip);
+        expect(own.message).toContain("is this machine");
         yield* probe(a);
         expect(yield* linkedSessions(impostor)).toEqual([]);
         expect(yield* Ref.get(impostor.bearers)).toEqual([]);
         expect((yield* linkedSessions(b)).length).toBe(1);
+
+        // An address alone that answers as the linked box never takes over its link.
+        yield* Ref.set(impostor.descriptor, box);
+        const second = yield* impostor.auth.issuePairingCredential();
+        const taken = yield* a.links
+          .link({ url: impostor.url, pairingCode: second.credential, access: "auto" })
+          .pipe(Effect.flip);
+        expect(taken.message).toContain("already linked");
+        expect(yield* linkedSessions(impostor)).toEqual([]);
+        expect(Option.getOrUndefined(yield* a.links.get(box.environmentId))?.urls).toEqual([b.url]);
+        // The address the link already has still renews it.
+        const renewal = yield* b.auth.issuePairingCredential();
+        expect(
+          yield* a.links.link({ url: b.url, pairingCode: renewal.credential, access: "auto" }),
+        ).toMatchObject({ urls: [b.url] });
       }),
     ).pipe(Effect.provide(NodeHttpServer.layerTest)),
 );
diff --git a/apps/server/src/peer/PeerLinks.testkit.ts b/apps/server/src/peer/PeerLinks.testkit.ts
index 9fa7b74d340c6..7ba3d144ef104 100644
--- a/apps/server/src/peer/PeerLinks.testkit.ts
+++ b/apps/server/src/peer/PeerLinks.testkit.ts
@@ -184,6 +184,8 @@ export const layerLinkingEnvironment = <E = never>(
     Layer.provideMerge(ServerSettings.layerTest({ linkedEnvironmentsEnabled: true })),
     Layer.provideMerge(database),
     Layer.provide(Layer.mergeAll(secrets, FetchHttpClient.layer)),
+    // Peers here are served on 127.0.0.1, so only `localhost` stands for this machine.
+    Layer.provide(Layer.succeed(PeerLinks.LoopbackHost, (host) => host === "localhost")),
     // Services that act for this environment, such as delegation, name it too.
     Layer.provideMerge(
       Layer.succeed(ServerEnvironment.ServerEnvironment, {
diff --git a/apps/server/src/peer/PeerLinks.ts b/apps/server/src/peer/PeerLinks.ts
index f52faecfcc3e2..f5796d7a6994d 100644
--- a/apps/server/src/peer/PeerLinks.ts
+++ b/apps/server/src/peer/PeerLinks.ts
@@ -92,15 +92,6 @@ export class PeerLinks extends Context.Service<
     /** Whether the Linked environments beta (Settings → Labs) is on here. */
     readonly enabled: Effect.Effect<boolean>;
     readonly link: (input: PeerLinkCreateInput) => Effect.Effect<PeerLink, PeerLinkError>;
-    /**
-     * The environment answering at `url`, or nothing when it is not a usable
-     * address or does not answer as T3 Code. Sends no credential.
-     */
-    readonly describe: (
-      url: string,
-    ) => Effect.Effect<
-      Option.Option<{ readonly environmentId: EnvironmentId; readonly label: string }>
-    >;
     readonly list: Effect.Effect<ReadonlyArray<PeerLinkSummary>, PeerLinkError>;
     /** The stored link, without asking the peer whether it answers. */
     readonly get: (
@@ -182,6 +173,12 @@ const peerOrigin = (url: string) => {
   return Effect.succeed(parsed.origin);
 };
 
+/** Whether a host is this machine's own loopback. Tests serve their peers there, so they narrow it. */
+export const LoopbackHost = Context.Reference<(host: string) => boolean>(
+  "t3/peer/PeerLinks/LoopbackHost",
+  { defaultValue: () => isLocalLoopbackHost },
+);
+
 /** Whether a peer holds a linked agent to its limits and keeps its work within its link. */
 const linkLimitsHold = (peer: { readonly capabilities: ExecutionEnvironmentCapabilities }) =>
   peer.capabilities.mcpModeLimitHeader === true && peer.capabilities.linkFence === true;
@@ -194,6 +191,7 @@ const make = Effect.gen(function* () {
   const httpClient = yield* HttpClient.HttpClient;
   const environment = yield* ServerEnvironment.ServerEnvironment;
   const serverSettings = yield* ServerSettings.ServerSettingsService;
+  const isOwnLoopback = yield* LoopbackHost;
   const enabled = serverSettings.getSettings.pipe(
     Effect.map((settings) => settings.linkedEnvironmentsEnabled),
     Effect.orElseSucceed(() => false),
@@ -409,6 +407,13 @@ const make = Effect.gen(function* () {
       (url) =>
         Effect.gen(function* () {
           const origin = yield* peerOrigin(url);
+          // Loopback is this machine, where anything may answer as the one picked.
+          if (isOwnLoopback(new URL(origin).hostname)) {
+            return yield* new PeerLinkError({
+              reason: "unreachable",
+              message: `${origin} is this machine, not ${name}.`,
+            });
+          }
           return { origin, descriptor: yield* describe(origin) };
         }).pipe(Effect.result),
       { concurrency: "unbounded" },
@@ -457,8 +462,8 @@ const make = Effect.gen(function* () {
       return yield* new PeerLinkError({ reason: "disabled", message: LINKED_ENVIRONMENTS_OFF });
     }
     const urls = [input.url, ...(input.alternateUrls ?? [])];
-    // The user picked a machine: link through the addresses that prove to
-    // be it, so a reused LAN address never receives the pairing code.
+    // The user picked a machine: link through the addresses that answer as
+    // it, so one that now answers as another never receives the pairing code.
     const { primary, peer, origins } =
       input.expectedEnvironmentId === undefined
         ? yield* answeringAt(urls)
@@ -467,6 +472,22 @@ const make = Effect.gen(function* () {
             input.expectedEnvironmentId,
             input.expectedLabel ?? input.expectedEnvironmentId,
           );
+    // Anything can answer as a linked machine, so an address alone renews its
+    // link only where the link already reaches it, and never moves it.
+    if (input.expectedEnvironmentId === undefined) {
+      const row = yield* readRow(peer.environmentId);
+      const existing = Option.isSome(row) ? yield* toLink(row.value) : undefined;
+      if (
+        existing !== undefined &&
+        DateTime.isGreaterThan(existing.expiresAt, yield* DateTime.now) &&
+        !existing.urls.includes(primary)
+      ) {
+        return yield* new PeerLinkError({
+          reason: "pairing_rejected",
+          message: `${primary} answers as ${existing.label}, which is already linked at another address. If ${existing.label} moved, forget that link first.`,
+        });
+      }
+    }
     const self = yield* environment.getDescriptor;
     if (peer.environmentId === self.environmentId) {
       return yield* new PeerLinkError({
@@ -532,13 +553,6 @@ const make = Effect.gen(function* () {
     return linked;
   });
 
-  const describeUrl: PeerLinks["Service"]["describe"] = (url) =>
-    peerOrigin(url).pipe(
-      Effect.flatMap(describe),
-      Effect.map(Option.map((peer) => ({ environmentId: peer.environmentId, label: peer.label }))),
-      Effect.orElseSucceed(() => Option.none()),
-    );
-
   /** A peer's label follows its machine name, so the link takes the one its own address answers with. */
   const withLabel = (link: PeerLink, label: string) =>
     label === link.label
@@ -621,8 +635,8 @@ const make = Effect.gen(function* () {
           message: `The link to ${link.label} lost its credential. Link it again.`,
         });
       }
-      // The token goes only to an address that proves it is this peer, so a
-      // reused LAN address or a moved hostname never receives it.
+      // The token goes only to an address that still answers as this peer,
+      // so one that now answers as another machine never receives it.
       let fenced = true;
       let label = link.label;
       const url = yield* Effect.findFirst(link.urls, (candidate) =>
@@ -678,7 +692,6 @@ const make = Effect.gen(function* () {
   return PeerLinks.of({
     enabled,
     link,
-    describe: describeUrl,
     list,
     get,
     unlink,
diff --git a/apps/server/src/preview/ServerBrowserPage.test.ts b/apps/server/src/preview/ServerBrowserPage.test.ts
index 78f03f1f91b72..855d30f80ee0d 100644
--- a/apps/server/src/preview/ServerBrowserPage.test.ts
+++ b/apps/server/src/preview/ServerBrowserPage.test.ts
@@ -180,7 +180,6 @@ describe("server browser element refs", () => {
     );
     expect(result.visibleText).not.toContain("editable-pass");
     expect(result.visibleText).toContain("Order ••••••••-2");
-    expect(tree).toMatch(/row "password: •+"/);
     expect(tree).toMatch(/textbox "Username" [^\n]*: maria$/m);
     const line = tree.split("\n").find((line) => line.includes('textbox "Password"'));
     expect(line).toMatch(/: •+$/);
diff --git a/apps/server/src/project/AgentSessionScanner.test.ts b/apps/server/src/project/AgentSessionScanner.test.ts
index f9c7aaf3fd3d4..6ab04f7e302a4 100644
--- a/apps/server/src/project/AgentSessionScanner.test.ts
+++ b/apps/server/src/project/AgentSessionScanner.test.ts
@@ -4,6 +4,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as NodeChildProcess from "node:child_process";
 import * as NodeFS from "node:fs";
 import * as NodeOS from "node:os";
+import * as NodeSqlite from "node:sqlite";
 import { describe, expect, it } from "@effect/vitest";
 import {
   AgentSessionImportSource,
@@ -1087,6 +1088,38 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
         ]);
       }),
     );
+
+    it.effect("keeps Codex rollout cwds when the Codex state database is unreadable", () =>
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const claudeHomePath = yield* makeTempDir("t3code-claude-home-");
+        const codexHomePath = yield* makeTempDir("t3code-codex-home-");
+        const workspace = yield* makeTempDir("t3code-workspace-");
+        yield* writeTranscript({
+          filePath: path.join(
+            codexHomePath,
+            "sessions",
+            "2026",
+            "05",
+            "03",
+            "rollout-2026-05-03T00-00-00-019a5f00-0000-7000-8000-00000000000a.jsonl",
+          ),
+          contents: codexRolloutLine(workspace),
+          mtimeMs: Date.parse("2026-05-03T00:00:00.000Z"),
+        });
+        yield* fileSystem.writeFileString(
+          path.join(codexHomePath, "state_5.sqlite"),
+          "not a database",
+        );
+
+        const result = yield* runScan({ claudeHomePath, codexHomePath });
+
+        expect(result.candidates.map(({ path, threadCount }) => ({ path, threadCount }))).toEqual([
+          { path: workspace, threadCount: 1 },
+        ]);
+      }),
+    );
   });
 
   describe("recentThreads", () => {
@@ -1345,6 +1378,140 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
       }),
     );
 
+    it.effect("imports Codex chats moved from a scratch folder into a Codex project", () =>
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const nowMs = Date.parse("2026-11-08T12:00:00.000Z");
+        yield* TestClock.setTime(nowMs);
+        const claudeHomePath = yield* makeTempDir("t3code-claude-home-");
+        const codexHomePath = yield* makeTempDir("t3code-codex-home-");
+        const homeDir = yield* makeTempDir("t3code-home-");
+        const projectDir = path.join(homeDir, "code", "my-project");
+        const scratchDir = path.join(homeDir, "Documents", "Codex", "2026-11-08", "new-chat");
+        const otherDir = path.join(homeDir, "code", "other-project");
+        yield* fileSystem.makeDirectory(projectDir, { recursive: true });
+        yield* fileSystem.makeDirectory(scratchDir, { recursive: true });
+        yield* fileSystem.makeDirectory(otherDir, { recursive: true });
+
+        const projectId = "019a5f00-0000-7000-8000-000000000001";
+        const chats = [
+          {
+            id: "019a5f00-0000-7000-8000-00000000000a",
+            cwd: scratchDir,
+            message: "Started with no project",
+          },
+          {
+            id: "019a5f00-0000-7000-8000-00000000000b",
+            cwd: projectDir,
+            message: "Started in the project",
+          },
+          {
+            id: "019a5f00-0000-7000-8000-00000000000c",
+            cwd: otherDir,
+            message: "Started in another folder",
+          },
+          {
+            id: "019a5f00-0000-7000-8000-00000000000d",
+            rolloutId: "019a5f00-0000-7000-8000-0000000000d1",
+            cwd: scratchDir,
+            message: "Rewound with no project",
+          },
+        ];
+        const rolloutPaths: Array<string> = [];
+        for (const [index, chat] of chats.entries()) {
+          const filePath = path.join(
+            codexHomePath,
+            "sessions",
+            "2026",
+            "11",
+            "08",
+            `rollout-2026-11-08T08-0${index}-00-${"rolloutId" in chat ? `${chat.id}_${chat.rolloutId}` : chat.id}.jsonl`,
+          );
+          rolloutPaths.push(filePath);
+          yield* writeTranscript({
+            filePath,
+            contents: [
+              encodeTranscriptRecord({
+                type: "session_meta",
+                payload: { id: chat.id, cwd: chat.cwd },
+              }),
+              encodeTranscriptRecord({ type: "turn_context", payload: { cwd: chat.cwd } }),
+              encodeTranscriptRecord({
+                type: "event_msg",
+                payload: { type: "user_message", message: chat.message },
+              }),
+            ].join("\n"),
+            mtimeMs: nowMs - 60_000 + index,
+          });
+        }
+        // Codex records a chat's project only in its state DB; the rollout keeps the original cwd.
+        yield* Effect.sync(() => {
+          const db = new NodeSqlite.DatabaseSync(path.join(codexHomePath, "state_5.sqlite"));
+          try {
+            db.exec(`
+              CREATE TABLE projects (
+                id TEXT PRIMARY KEY,
+                name TEXT NOT NULL,
+                metadata TEXT NOT NULL DEFAULT '{}',
+                position INTEGER NOT NULL,
+                created_at_ms INTEGER NOT NULL,
+                updated_at_ms INTEGER NOT NULL
+              );
+              CREATE TABLE project_roots (
+                project_id TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+                position INTEGER NOT NULL,
+                path TEXT NOT NULL,
+                PRIMARY KEY (project_id, position)
+              );
+              CREATE TABLE threads (
+                id TEXT PRIMARY KEY,
+                rollout_path TEXT NOT NULL,
+                cwd TEXT NOT NULL,
+                project_id TEXT REFERENCES projects(id) ON DELETE SET NULL
+              );
+            `);
+            db.prepare("INSERT INTO projects VALUES (?, ?, '{}', 0, ?, ?)").run(
+              projectId,
+              "my-project",
+              nowMs,
+              nowMs,
+            );
+            db.prepare("INSERT INTO project_roots VALUES (?, 0, ?)").run(projectId, projectDir);
+            const insertThread = db.prepare("INSERT INTO threads VALUES (?, ?, ?, ?)");
+            for (const [index, chat] of chats.entries()) {
+              insertThread.run(chat.id, rolloutPaths[index]!, chat.cwd, projectId);
+            }
+          } finally {
+            db.close();
+          }
+        });
+
+        const threads = yield* runRecentThreads({
+          claudeHomePath,
+          codexHomePath,
+          workspaceRoot: projectDir,
+        }).pipe(Effect.provideService(HostProcess.HomeDirectory, homeDir));
+        expect(threads.map((thread) => thread.title).toSorted()).toEqual([
+          "Rewound with no project",
+          "Started in the project",
+          "Started with no project",
+        ]);
+
+        const result = yield* runScan({ claudeHomePath, codexHomePath }).pipe(
+          Effect.provideService(HostProcess.HomeDirectory, homeDir),
+        );
+        expect(
+          result.candidates
+            .map(({ path, threadCount }) => ({ path, threadCount }))
+            .toSorted((left, right) => left.path.localeCompare(right.path)),
+        ).toEqual([
+          { path: projectDir, threadCount: 3 },
+          { path: otherDir, threadCount: 1 },
+        ]);
+      }),
+    );
+
     it.effect("imports a rewound Codex thread with the history its new rollout inherits", () =>
       Effect.gen(function* () {
         const path = yield* Path.Path;
diff --git a/apps/server/src/project/AgentSessionScanner.ts b/apps/server/src/project/AgentSessionScanner.ts
index dc67bd9387e04..1b32de22a8878 100644
--- a/apps/server/src/project/AgentSessionScanner.ts
+++ b/apps/server/src/project/AgentSessionScanner.ts
@@ -1,4 +1,5 @@
 import * as NodeOS from "node:os";
+import * as NodeSqlite from "node:sqlite";
 
 import {
   AgentSessionScanError,
@@ -55,9 +56,19 @@ class TranscriptParseError extends Schema.TaggedError<TranscriptParseError>()(
     return `Could not parse the transcript at ${this.filePath}.`;
   }
 }
+
+class CodexStateReadError extends Schema.TaggedError<CodexStateReadError>()("CodexStateReadError", {
+  databasePath: Schema.String,
+  cause: Schema.Defect(),
+}) {
+  override get message(): string {
+    return `Could not read Codex projects from ${this.databasePath}.`;
+  }
+}
 const METADATA_READ_BYTES = 8 * 1024;
 const MAX_TRANSCRIPT_SCAN_BYTES = 1024 * 1024;
 const MAX_CODEX_SESSION_INDEX_BYTES = 1024 * 1024;
+const MAX_CODEX_PROJECT_ROOT_ROWS = 100_000;
 
 const MAX_TRANSCRIPTS_PER_SOURCE = 5000;
 
@@ -159,7 +170,9 @@ const decodeCodexHistoryBase = Schema.decodeUnknownOption(
 );
 // Original rollouts end in their thread ID, rewound ones in `<thread ID>_<rollout ID>`.
 const CODEX_ROLLOUT_ID_PATTERN =
-  /[-_]([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/i;
+  /-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(?:_([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}))?\.jsonl$/i;
+// Codex records a chat's project only here; moving a chat leaves its rollout cwd unchanged.
+const CODEX_STATE_DATABASE = "state_5.sqlite";
 const decodeCodexSessionIndexEntry = Schema.decodeUnknownOption(
   Schema.fromJsonString(CodexSessionIndexEntry),
 );
@@ -224,6 +237,7 @@ interface RawCandidate {
   readonly transcripts: ReadonlyArray<{
     readonly filePath: string;
     readonly mtimeMs: number | null;
+    readonly projectRoots?: ReadonlyArray<string> | undefined;
   }>;
 }
 
@@ -233,6 +247,7 @@ interface TranscriptCandidate {
   readonly providerInstanceId: ProviderInstanceId;
   readonly homePath: string;
   readonly size: number;
+  readonly projectRoots?: ReadonlyArray<string> | undefined;
 }
 
 interface MetadataReadBudget {
@@ -1234,6 +1249,47 @@ export const make = Effect.gen(function* () {
     },
   );
 
+  const readCodexProjectRoots = Effect.fn("AgentSessionScanner.readCodexProjectRoots")(function* (
+    homePath: string,
+  ) {
+    const rootsByThread = new Map<string, Array<string>>();
+    const databasePath = path.join(homePath, CODEX_STATE_DATABASE);
+    return yield* Effect.try({
+      try: () => {
+        const database = new NodeSqlite.DatabaseSync(databasePath, { readOnly: true });
+        try {
+          database.exec("PRAGMA busy_timeout = 100");
+          const rows = database
+            .prepare(
+              `SELECT threads.id AS id, project_roots.path AS path
+               FROM threads JOIN project_roots ON project_roots.project_id = threads.project_id
+               ORDER BY threads.rowid DESC, project_roots.position LIMIT ?`,
+            )
+            .all(MAX_CODEX_PROJECT_ROOT_ROWS);
+          for (const { id, path: root } of rows) {
+            if (typeof id !== "string" || typeof root !== "string" || root.trim().length === 0) {
+              continue;
+            }
+            const roots = rootsByThread.get(id);
+            if (roots === undefined) rootsByThread.set(id, [root]);
+            else roots.push(root);
+          }
+          return rootsByThread;
+        } finally {
+          database.close();
+        }
+      },
+      catch: (cause) => new CodexStateReadError({ databasePath, cause }),
+    }).pipe(Effect.orElseSucceed((): ReadonlyMap<string, ReadonlyArray<string>> => new Map()));
+  });
+
+  // Only chats left in an excluded folder, such as Codex's scratch folder, take their project's root.
+  const projectCwd = (cwd: string, projectRoots: ReadonlyArray<string> | undefined) =>
+    projectRoots !== undefined &&
+    isExcludedProjectPath(path.resolve(expandHomePath(cwd.trim(), homeDir)))
+      ? projectRoots[0]!
+      : cwd;
+
   const discoverCodexTranscripts = Effect.fn("AgentSessionScanner.discoverCodexTranscripts")(
     function* (homePath: string, providerInstanceId: ProviderInstanceId, operationBudget: number) {
       const sessionsDir = path.join(homePath, "sessions");
@@ -1295,7 +1351,15 @@ export const make = Effect.gen(function* () {
           }
         }
       }
-      return { transcripts, truncated };
+      const projectRoots = yield* readCodexProjectRoots(homePath);
+      return {
+        transcripts: transcripts.map((transcript) => {
+          const threadId = CODEX_ROLLOUT_ID_PATTERN.exec(transcript.filePath)?.[1];
+          const roots = threadId === undefined ? undefined : projectRoots.get(threadId);
+          return roots === undefined ? transcript : { ...transcript, projectRoots: roots };
+        }),
+        truncated,
+      };
     },
   );
 
@@ -1365,13 +1429,14 @@ export const make = Effect.gen(function* () {
         providerInstanceId: ProviderInstanceId;
         homePath: string;
         lastActiveAtMs: number;
-        transcripts: Array<{ filePath: string; mtimeMs: number }>;
+        transcripts: Array<TranscriptCandidate>;
       }
     >();
 
     for (const transcript of transcripts) {
-      const cwd = yield* readCwd(source, transcript, budget);
-      if (cwd === null || cwd === false) continue;
+      const rolloutCwd = yield* readCwd(source, transcript, budget);
+      if (rolloutCwd === null || rolloutCwd === false) continue;
+      const cwd = projectCwd(rolloutCwd, transcript.projectRoots);
       const key = `${transcript.providerInstanceId}\0${cwd}`;
       const existing = byOwnerAndCwd.get(key);
       if (existing) {
@@ -1718,7 +1783,8 @@ export const make = Effect.gen(function* () {
           candidates.flatMap((candidate) =>
             candidate.source === "codex" && candidate.providerInstanceId === providerInstanceId
               ? candidate.transcripts.flatMap((transcript) => {
-                  const id = CODEX_ROLLOUT_ID_PATTERN.exec(transcript.filePath)?.[1];
+                  const match = CODEX_ROLLOUT_ID_PATTERN.exec(transcript.filePath);
+                  const id = match?.[2] ?? match?.[1];
                   return id === undefined ? [] : [[id, transcript.filePath] as const];
                 })
               : [],
@@ -1804,7 +1870,10 @@ export const make = Effect.gen(function* () {
           if (Option.isNone(snapshot.cwd)) {
             return Option.some<AgentSessionRecentThread>({ _tag: "Skipped" });
           }
-          const expandedCwd = expandHomePath(snapshot.cwd.value.trim(), homeDir);
+          const expandedCwd = expandHomePath(
+            projectCwd(snapshot.cwd.value, transcript.projectRoots).trim(),
+            homeDir,
+          );
           if (
             !path.isAbsolute(expandedCwd) ||
             (yield* directoryIdentity(path.resolve(expandedCwd))) !== rootIdentity
diff --git a/apps/server/src/provider/Drivers/ClaudeDriver.ts b/apps/server/src/provider/Drivers/ClaudeDriver.ts
index c2d4b63861074..3ada12297649d 100644
--- a/apps/server/src/provider/Drivers/ClaudeDriver.ts
+++ b/apps/server/src/provider/Drivers/ClaudeDriver.ts
@@ -309,9 +309,15 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv, Path.
     const consumeResetCredit: NonNullable<ProviderInstance["consumeResetCredit"]> = Effect.fn(
       "ClaudeDriver.consumeResetCredit",
     )(
-      function* () {
+      function* (creditId) {
         const current = yield* snapshot.getSnapshot;
-        const grantId = current.usageLimits?.resetCredits?.nextCreditId;
+        const credits = current.usageLimits?.resetCredits;
+        const grantId =
+          creditId === undefined
+            ? credits?.nextCreditId
+            : credits?.options?.some((option) => option.creditId === creditId)
+              ? creditId
+              : undefined;
         if (!grantId || !current.version) return "noCredit" as const;
         const version = current.version;
         return yield* resetCreditCoordinator.redeem(
diff --git a/apps/server/src/provider/ProviderInstanceRegistry.test.ts b/apps/server/src/provider/ProviderInstanceRegistry.test.ts
index e998332d3e92f..95866780189ac 100644
--- a/apps/server/src/provider/ProviderInstanceRegistry.test.ts
+++ b/apps/server/src/provider/ProviderInstanceRegistry.test.ts
@@ -664,7 +664,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => {
       const before = yield* instance!.snapshot.refresh;
       expect(before.usageLimits?.windows[0]?.usedPercent).toBe(100);
       expect(before.usageLimits?.resetCredits?.nextCreditId).toBe("grant_a");
-      const outcome = yield* instance!.consumeResetCredit!().pipe(Effect.result);
+      const outcome = yield* instance!.consumeResetCredit!(undefined).pipe(Effect.result);
       return { outcome, after: yield* instance!.snapshot.getSnapshot };
     }).pipe(
       // macOS logins live in the Keychain, where resets are never read.
diff --git a/apps/server/src/provider/antigravityUsageLimits.ts b/apps/server/src/provider/antigravityUsageLimits.ts
index da21333dad95e..ede0e5c47d20e 100644
--- a/apps/server/src/provider/antigravityUsageLimits.ts
+++ b/apps/server/src/provider/antigravityUsageLimits.ts
@@ -15,6 +15,10 @@ import {
   makeUsageLimits,
 } from "@t3tools/provider-core/server/usageLimits";
 
+export function antigravityUserAgent(platform: NodeJS.Platform, architecture: NodeJS.Architecture) {
+  return `antigravity/hub/2.24.0 (aidev_client; os_type=${platform}; arch=${architecture}; cl=963137146)`;
+}
+
 const DAILY_ENDPOINT = "https://daily-cloudcode-pa.googleapis.com";
 const PROD_ENDPOINT = "https://cloudcode-pa.googleapis.com";
 // The ACP runtime meters consumer tiers on the daily host and GCP-terms tiers on prod.
@@ -120,6 +124,22 @@ function summaryResetTime(
   return untouched ? undefined : bucket.resetTime;
 }
 
+const sha256 = Effect.fnUntraced(function* (text: string) {
+  const digest = yield* (yield* Digest.Digest).digest(
+    Digest.sha256,
+    new TextEncoder().encode(text),
+  );
+  return Array.from(digest, (byte) => byte.toString(16).padStart(2, "0")).join("");
+});
+
+/** Keys an account by its Google ID, which matches across machines and hubs; refresh tokens do not. */
+export const antigravityAccountFingerprint = (userInfo: unknown) =>
+  decodeUserInfo(userInfo).pipe(Effect.flatMap((info) => sha256(`google-account\0${info.id}`)));
+
+/** Windows from a `retrieveUserQuotaSummary` answer requested at `requestedAt`. */
+export const antigravitySummaryWindows = (response: unknown, requestedAt: number) =>
+  decodeSummary(response).pipe(Effect.map((summary) => summaryWindows(summary, requestedAt)));
+
 function summaryWindows(summary: typeof Summary.Type, requestedAt: number) {
   const windows = new Map<string, ServerProviderUsageWindow>();
   const groups = summary.groups?.some((group) => group.buckets?.length)
@@ -203,15 +223,6 @@ export const makeAntigravityUsageProbe = Effect.fn("makeAntigravityUsageProbe")(
     | undefined;
   let generation = 0;
 
-  const sha256 = (text: string) =>
-    crypto
-      .digest(Digest.sha256, new TextEncoder().encode(text))
-      .pipe(
-        Effect.map((digest) =>
-          Array.from(digest, (byte) => byte.toString(16).padStart(2, "0")).join(""),
-        ),
-      );
-
   const request = (request: HttpClientRequest.HttpClientRequest) =>
     client.execute(request).pipe(
       Effect.provideService(FetchHttpClient.RequestInit, MANUAL_REDIRECT),
@@ -259,8 +270,7 @@ export const makeAntigravityUsageProbe = Effect.fn("makeAntigravityUsageProbe")(
           HttpClientRequest.setHeaders({ Authorization: `Bearer ${accessToken}` }),
         ),
       ).pipe(
-        Effect.flatMap(decodeUserInfo),
-        Effect.flatMap((info) => sha256(`google-account\0${info.id}`)),
+        Effect.flatMap(antigravityAccountFingerprint),
         Effect.orElseSucceed(() => fingerprint),
       );
       if (generation === startedGeneration) {
@@ -294,7 +304,7 @@ export const makeAntigravityUsageProbe = Effect.fn("makeAntigravityUsageProbe")(
               HttpClientRequest.post(`${endpoint}/v1internal:${operation}`).pipe(
                 HttpClientRequest.setHeaders({
                   Authorization: `Bearer ${accessToken}`,
-                  "User-Agent": `antigravity/hub/2.24.0 (aidev_client; os_type=${platform}; arch=${architecture}; cl=963137146)`,
+                  "User-Agent": antigravityUserAgent(platform, architecture),
                 }),
                 HttpClientRequest.bodyJsonUnsafe(
                   token.project_id ? { project: token.project_id } : {},
@@ -313,9 +323,7 @@ export const makeAntigravityUsageProbe = Effect.fn("makeAntigravityUsageProbe")(
       }
       return [...windows.values()];
     });
-    const summary = yield* fetchWindows("retrieveUserQuotaSummary", (response, requestedAt) =>
-      decodeSummary(response).pipe(Effect.map((summary) => summaryWindows(summary, requestedAt))),
-    );
+    const summary = yield* fetchWindows("retrieveUserQuotaSummary", antigravitySummaryWindows);
     const windows = summary.length
       ? summary
       : yield* fetchWindows("fetchAvailableModels", (response) =>
@@ -331,6 +339,7 @@ export const makeAntigravityUsageProbe = Effect.fn("makeAntigravityUsageProbe")(
     return { ...makeUsageLimits({ checkedAt, windows }), credentialFingerprint: account };
   });
   const probe = read.pipe(
+    Effect.provideService(Digest.Digest, crypto),
     Effect.timeout("30 seconds"),
     Effect.catch(() =>
       Effect.gen(function* () {
diff --git a/apps/server/src/provider/claudeResetCredits.test.ts b/apps/server/src/provider/claudeResetCredits.test.ts
index 8db751657454c..a3a1110d87d34 100644
--- a/apps/server/src/provider/claudeResetCredits.test.ts
+++ b/apps/server/src/provider/claudeResetCredits.test.ts
@@ -62,9 +62,51 @@ describe("claudeResetCreditsToContract", () => {
       availableCount: 2,
       nextCreditId: "grant_a",
       nextExpiresAt: "2026-10-01T00:00:00.000Z",
+      options: [
+        expect.objectContaining({
+          creditId: "grant_a",
+          label: "Full reset",
+          availableCount: 2,
+          expiresAt: "2026-10-01T00:00:00.000Z",
+        }),
+      ],
     });
   });
 
+  it("offers each kind of reset by its own grant", () => {
+    const credits = ClaudeResetCredits.claudeResetCreditsToContract(
+      {
+        eligible: true,
+        next_grant_id: "weekly_a",
+        grants: [
+          grant({ id: "weekly_a", clears: ["seven_day"], ends_at: "2026-12-10T22:00:00Z" }),
+          grant({
+            id: "fable_a",
+            clears: ["seven_day_overage_included"],
+            gives_back_weekly: true,
+            ends_at: "2027-03-09T07:59:00Z",
+          }),
+          grant({ id: "fable_b", gives_back_weekly: true, type: "weekly" }),
+          grant({ id: "session_a", type: "session" }),
+          grant({ id: "spent", clears: ["seven_day"], resets_left: 0 }),
+        ],
+      },
+      NOW,
+    );
+    expect(
+      credits?.options?.map(({ creditId, label, availableCount }) => [
+        creditId,
+        label,
+        availableCount,
+      ]),
+    ).toEqual([
+      ["session_a", "5-hour reset", 1],
+      ["weekly_a", "Weekly reset", 1],
+      ["fable_a", "Fable reset", 2],
+    ]);
+    expect(credits).toMatchObject({ availableCount: 4, nextCreditId: "weekly_a" });
+  });
+
   it("offers nothing to redeem without a usable next grant or an eligible account", () => {
     expect(
       ClaudeResetCredits.claudeResetCreditsToContract(
@@ -111,7 +153,7 @@ effectIt.layer(NodeServices.layer)("readClaudeResetCredits", (it) => {
         Effect.provideService(HostProcess.Platform, "linux"),
         Effect.provideService(HttpClient.HttpClient, client),
       );
-      expect(credits).toEqual({ availableCount: 1, nextCreditId: "grant_a" });
+      expect(credits).toMatchObject({ availableCount: 1, nextCreditId: "grant_a" });
     }),
   );
 
diff --git a/apps/server/src/provider/claudeResetCredits.ts b/apps/server/src/provider/claudeResetCredits.ts
index 35973378edada..e1dbacc34ba71 100644
--- a/apps/server/src/provider/claudeResetCredits.ts
+++ b/apps/server/src/provider/claudeResetCredits.ts
@@ -1,5 +1,6 @@
 import type {
   ProviderConsumeResetCreditOutcome,
+  ServerProviderResetCreditOption,
   ServerProviderResetCredits,
 } from "@t3tools/contracts";
 import * as HostProcess from "@t3tools/shared/HostProcess";
@@ -31,6 +32,9 @@ const Grant = Schema.Struct({
   ends_at: Schema.optional(Schema.NullOr(Schema.String)),
   paused: Schema.optional(Schema.Boolean),
   usable_now: Schema.optional(Schema.Boolean),
+  clears: Schema.optional(Schema.Array(Schema.Unknown)),
+  type: Schema.optional(Schema.Unknown),
+  gives_back_weekly: Schema.optional(Schema.Boolean),
 });
 const decodeGrant = Schema.decodeUnknownOption(Grant);
 const CedarEmber = Schema.Struct({
@@ -95,6 +99,31 @@ const isFutureTimestamp = (value: string, nowMs: number) => {
   );
 };
 
+// Claude Code's own grouping: a grant that gives back weekly usage is a Fable reset, else its
+// declared type, else what it clears.
+const RESET_KINDS = {
+  session: { label: "5-hour reset", description: "Refills your 5-hour limit." },
+  weekly: { label: "Weekly reset", description: "Refills your weekly limit." },
+  fable: {
+    label: "Fable reset",
+    description:
+      "Refills your Fable allowance and gives back what Fable used on your weekly limit. It doesn't reset your whole week.",
+  },
+  full: { label: "Full reset", description: "Refills your 5-hour and weekly limits." },
+} as const;
+type ResetKind = keyof typeof RESET_KINDS;
+
+const grantKind = (grant: typeof Grant.Type): ResetKind => {
+  if (grant.gives_back_weekly) return "fable";
+  if (grant.type === "session" || grant.type === "weekly" || grant.type === "full") {
+    return grant.type;
+  }
+  const clears = grant.clears ?? [];
+  const session = clears.includes("five_hour");
+  const other = clears.some((limit) => limit !== "five_hour");
+  return session && !other ? "session" : other && !session ? "weekly" : "full";
+};
+
 export function claudeResetCreditsToContract(
   block: unknown,
   nowMs: number,
@@ -110,13 +139,38 @@ export function claudeResetCreditsToContract(
         (grant.ends_at == null || isFutureTimestamp(grant.ends_at, nowMs)),
     );
   const next = live.find((grant) => grant.id === parsed.value.next_grant_id);
-  const nextExpiresAt = next?.ends_at ? DateTime.make(next.ends_at) : Option.none();
+  const expiresAt = (grant: typeof Grant.Type | undefined) => {
+    const at = grant?.ends_at ? DateTime.make(grant.ends_at) : Option.none();
+    return Option.isSome(at) ? DateTime.formatIso(at.value) : undefined;
+  };
+  const byKind = new Map<ResetKind, Array<typeof Grant.Type>>();
+  for (const grant of live) {
+    if (grant.resets_left === 0) continue;
+    const kind = grantKind(grant);
+    byKind.set(kind, [...(byKind.get(kind) ?? []), grant]);
+  }
+  const options = (Object.keys(RESET_KINDS) as Array<ResetKind>).flatMap(
+    (kind): Array<ServerProviderResetCreditOption> => {
+      const grants = byKind.get(kind);
+      const target = grants?.[0];
+      if (!grants || !target) return [];
+      const optionExpiresAt = expiresAt(target);
+      return [
+        {
+          creditId: target.id,
+          ...RESET_KINDS[kind],
+          availableCount: grants.reduce((sum, grant) => sum + grant.resets_left, 0),
+          ...(optionExpiresAt ? { expiresAt: optionExpiresAt } : {}),
+        },
+      ];
+    },
+  );
+  const nextExpiresAt = expiresAt(next);
   return {
     availableCount: next ? live.reduce((sum, grant) => sum + grant.resets_left, 0) : 0,
-    ...(Option.isSome(nextExpiresAt)
-      ? { nextExpiresAt: DateTime.formatIso(nextExpiresAt.value) }
-      : {}),
+    ...(nextExpiresAt ? { nextExpiresAt } : {}),
     ...(next ? { nextCreditId: next.id } : {}),
+    ...(next ? { options } : {}),
   };
 }
 
diff --git a/apps/server/src/pullRequest/PullRequestReviewGuideService.ts b/apps/server/src/pullRequest/PullRequestReviewGuideService.ts
index 8994837fcdd80..450d42ebc3cb1 100644
--- a/apps/server/src/pullRequest/PullRequestReviewGuideService.ts
+++ b/apps/server/src/pullRequest/PullRequestReviewGuideService.ts
@@ -403,6 +403,7 @@ const make = Effect.gen(function* () {
               ...reviewGuideInputFromPullRequest(detail, activity, checkout.baseCommit),
               cwd: checkout.path,
               modelSelection,
+              projectId: input.projectId,
               instructions: projectSettings.reviewGuideInstructions,
               stack: checkout.stack,
             }),
diff --git a/apps/server/src/speech/SpeechModelStore.test.ts b/apps/server/src/speech/SpeechModelStore.test.ts
index e08a4cf022f4a..be25e4f290b17 100644
--- a/apps/server/src/speech/SpeechModelStore.test.ts
+++ b/apps/server/src/speech/SpeechModelStore.test.ts
@@ -12,6 +12,8 @@ import * as Path from "effect/Path";
 import * as Stream from "effect/Stream";
 import { HttpClient, HttpClientError, HttpClientRequest, HttpClientResponse } from "effect/http";
 
+import * as HostProcess from "@t3tools/shared/HostProcess";
+
 import * as ServerConfig from "../config.ts";
 import * as SpeechModelStore from "./SpeechModelStore.ts";
 
@@ -168,3 +170,53 @@ it.effect("cleans only download partials on cancellation or restart", () =>
     ]);
   }).pipe(Effect.provide(dependencies)),
 );
+
+it.effect("links a verified model file from another folder and never deletes it", () =>
+  Effect.gen(function* () {
+    const h = yield* harness;
+    const path = yield* Path.Path;
+    const elsewhere = yield* h.fs.makeTempDirectoryScoped({ prefix: "speech-other-app-" });
+    const nested = path.join(elsewhere, "hub", "snapshots");
+    yield* h.fs.makeDirectory(nested, { recursive: true });
+    const impostor = path.join(elsewhere, "same-size.gguf");
+    const existing = path.join(nested, "renamed-by-the-other-app.gguf");
+    yield* h.fs.writeFile(impostor, new Uint8Array(bytes.length));
+    yield* h.fs.writeFile(existing, bytes);
+
+    expect(yield* h.store.link([h.model], impostor)).toEqual([]);
+    expect(yield* h.store.linkedFrom(h.model)).toBeUndefined();
+
+    expect(yield* h.store.link([h.model], elsewhere)).toEqual([h.model.id]);
+    expect(yield* h.store.linkedFrom(h.model)).toBe(existing);
+    expect(yield* h.store.installedPath(h.model)).toBe(h.stale);
+    expect(h.requests).toHaveLength(0);
+    // Pointing at T3 Code's own folder must not turn the link into a link to itself.
+    expect(yield* h.store.link([h.model], h.directory)).toEqual([]);
+    expect(yield* h.store.installedPath(h.model)).toBe(h.stale);
+
+    yield* h.store.remove(h.model);
+    expect(yield* h.store.isReady(h.model)).toBe(false);
+    expect([...(yield* h.fs.readFile(existing))]).toEqual([...bytes]);
+  }).pipe(Effect.scoped, Effect.provide(dependencies)),
+);
+
+it.effect("installs from a Hugging Face cache copy instead of downloading", () =>
+  Effect.gen(function* () {
+    const h = yield* harness;
+    const path = yield* Path.Path;
+    const home = yield* h.fs.makeTempDirectoryScoped({ prefix: "speech-home-" });
+    const snapshot = path.join(
+      home,
+      ".cache/huggingface/hub/models--fixture--speech-model/snapshots",
+      h.model.revision,
+    );
+    yield* h.fs.makeDirectory(snapshot, { recursive: true });
+    const cached = path.join(snapshot, h.model.filename);
+    yield* h.fs.writeFile(cached, bytes);
+    const store = yield* h.openStore.pipe(Effect.provideService(HostProcess.HomeDirectory, home));
+
+    expect(yield* store.download(h.model)).toBe(h.stale);
+    expect(yield* store.linkedFrom(h.model)).toBe(cached);
+    expect(h.requests).toHaveLength(0);
+  }).pipe(Effect.scoped, Effect.provide(dependencies)),
+);
diff --git a/apps/server/src/speech/SpeechModelStore.ts b/apps/server/src/speech/SpeechModelStore.ts
index 99f3fe6ca5bbc..d12999194df21 100644
--- a/apps/server/src/speech/SpeechModelStore.ts
+++ b/apps/server/src/speech/SpeechModelStore.ts
@@ -14,7 +14,10 @@ import type { PlatformError } from "effect/PlatformError";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
 
+import * as HostProcess from "@t3tools/shared/HostProcess";
+
 import * as ServerConfig from "../config.ts";
+import { expandHomePath } from "../os-jank.ts";
 import type { SpeechModel } from "./model.ts";
 
 type ModelFile = Pick<SpeechModel, "id" | "filename" | "revision" | "size" | "sha256">;
@@ -44,6 +47,7 @@ export class SpeechModelStore extends Context.Service<
     readonly isReady: (model: ModelFile) => Effect.Effect<boolean>;
     /** The installed file once its SHA-256 has been verified, hashing it on first use. */
     readonly installedPath: (model: ModelFile) => Effect.Effect<string | undefined>;
+    /** Links a copy the Hugging Face cache or Handy already holds; fetches only without one. */
     readonly download: (
       model: ModelFile,
       progress?: SpeechModelDownloadProgress,
@@ -51,6 +55,17 @@ export class SpeechModelStore extends Context.Service<
       string,
       SpeechModelDownloadError | PlatformError | HttpClientError.HttpClientError
     >;
+    /**
+     * Installs catalog files already on this machine as symlinks, never copies.
+     * `source` is a file or a folder to search; returns the ids it installed.
+     */
+    readonly link: (
+      models: ReadonlyArray<ModelFile>,
+      source: string,
+    ) => Effect.Effect<ReadonlyArray<string>, PlatformError>;
+    /** The outside file a linked model points at. */
+    readonly linkedFrom: (model: ModelFile) => Effect.Effect<string | undefined>;
+    /** Removes T3 Code's file or link; a linked file itself is left in place. */
     readonly remove: (model: ModelFile) => Effect.Effect<void, PlatformError>;
   }
 >()("t3/speech/SpeechModelStore") {}
@@ -59,9 +74,14 @@ const DOWNLOAD_ATTEMPTS = 3;
 const PARTIAL_FILENAME =
   /\.gguf\.[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.part$/i;
 
+const LINK_SEARCH_DEPTH = 5;
+const LINK_SEARCH_ENTRIES = 5_000;
+
 const make = Effect.gen(function* () {
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
+  const home = yield* HostProcess.HomeDirectory;
+  const platform = yield* HostProcess.Platform;
   const http = yield* HttpClient.HttpClient;
   const random = yield* SecureRandom.SecureRandom;
   const config = yield* ServerConfig.ServerConfig;
@@ -73,6 +93,28 @@ const make = Effect.gen(function* () {
     }
   }
   const modelPath = (model: ModelFile) => path.join(directory, model.filename);
+  const appDataDirectories =
+    platform === "darwin"
+      ? [path.join(home, "Library", "Application Support")]
+      : platform === "win32"
+        ? [path.join(home, "AppData", "Roaming")]
+        : [path.join(home, ".local", "share"), path.join(home, ".config")];
+  // Where the Hugging Face cache and Handy keep these same pinned files.
+  const knownCopies = (model: ModelFile) => [
+    path.join(
+      home,
+      ".cache",
+      "huggingface",
+      "hub",
+      `models--${model.id.replace("/", "--")}`,
+      "snapshots",
+      model.revision,
+      model.filename,
+    ),
+    ...appDataDirectories.map((appData) =>
+      path.join(appData, "com.pais.handy", "models", model.filename),
+    ),
+  ];
   // Files whose digest failed, by identity, so status polls stop calling them ready.
   const corrupt = new Map<string, string>();
 
@@ -179,12 +221,81 @@ const make = Effect.gen(function* () {
     return downloaded;
   });
 
+  const filesUnder = Effect.fn("SpeechModelStore.filesUnder")(function* (source: string) {
+    const files: Array<{ readonly file: string; readonly size: number }> = [];
+    const pending = [{ entry: source, depth: LINK_SEARCH_DEPTH }];
+    for (let visited = 0; pending.length > 0 && visited < LINK_SEARCH_ENTRIES; visited += 1) {
+      const { entry, depth } = pending.pop()!;
+      const info = yield* statFile(entry);
+      if (info?.type === "File") files.push({ file: entry, size: Number(info.size) });
+      if (info?.type !== "Directory" || depth === 0) continue;
+      for (const name of yield* fs.readDirectory(entry).pipe(Effect.orElseSucceed(() => [])))
+        pending.push({ entry: path.join(entry, name), depth: depth - 1 });
+    }
+    return files;
+  });
+
+  const realPath = (file: string) => fs.realPath(file).pipe(Effect.orElseSucceed(() => undefined));
+
+  const link: SpeechModelStore["Service"]["link"] = Effect.fn("SpeechModelStore.link")(
+    function* (models, source) {
+      const root = path.resolve(
+        yield* expandHomePath(source.trim()).pipe(
+          Effect.provideService(Path.Path, path),
+          Effect.provideService(HostProcess.HomeDirectory, home),
+        ),
+      );
+      yield* fs.makeDirectory(directory, { recursive: true });
+      const linked: string[] = [];
+      for (const { file, size } of yield* filesUnder(root)) {
+        for (const model of models) {
+          if (model.size !== size || linked.includes(model.id)) continue;
+          const finalPath = modelPath(model);
+          // Pointing at T3 Code's own model folder must not replace a file with a link to itself.
+          if ((yield* realPath(file)) === (yield* realPath(finalPath))) continue;
+          if (yield* verifiedPath(model, finalPath)) continue;
+          const hashed = yield* expectedFile(model, file);
+          if (!hashed || !(yield* digestMatches(model, file))) continue;
+          // Staged then renamed, so a failed link never removes the file already installed.
+          const staged = `${finalPath}.${yield* random.uuidV4()}.part`;
+          // Windows grants symlinks only to privileged accounts; a hard link also shares the bytes.
+          const hardLinked = yield* fs.symlink(file, staged).pipe(
+            Effect.as(false),
+            Effect.catch(() => fs.link(file, staged).pipe(Effect.as(true))),
+          );
+          const current = yield* expectedFile(model, staged);
+          const marker = identity(model, hashed);
+          if (!current || identity(model, current) !== marker) {
+            yield* fs.remove(staged, { force: true });
+            continue;
+          }
+          yield* fs.rename(staged, finalPath);
+          // A hard link cannot be read back, so its origin is recorded beside it.
+          yield* (
+            hardLinked
+              ? fs.writeFileString(`${finalPath}.source`, file, { mode: 0o600 })
+              : fs.remove(`${finalPath}.source`, { force: true })
+          ).pipe(Effect.ignore);
+          yield* fs
+            .writeFileString(`${finalPath}.verified`, marker, { mode: 0o600 })
+            .pipe(Effect.ignore);
+          linked.push(model.id);
+        }
+      }
+      return linked;
+    },
+  );
+
   const download: SpeechModelStore["Service"]["download"] = Effect.fn("SpeechModelStore.download")(
     function* (model, progress = {}) {
       yield* Effect.annotateCurrentSpan({ modelId: model.id });
       const finalPath = modelPath(model);
       yield* fs.makeDirectory(directory, { recursive: true });
       if (yield* verifiedPath(model, finalPath, progress.onVerificationStart)) return finalPath;
+      for (const copy of knownCopies(model)) {
+        const linked = yield* link([model], copy).pipe(Effect.orElseSucceed(() => []));
+        if (linked.length > 0) return finalPath;
+      }
       const partialPath = `${finalPath}.${yield* random.uuidV4()}.part`;
       const url = `https://huggingface.co/${model.id}/resolve/${model.revision}/${model.filename}`;
       return yield* Effect.gen(function* () {
@@ -211,6 +322,7 @@ const make = Effect.gen(function* () {
         if (!complete || !(yield* digestMatches(model, partialPath)))
           return yield* new SpeechModelDownloadError({ modelId: model.id, reason: "verification" });
         yield* fs.rename(partialPath, finalPath);
+        yield* fs.remove(`${finalPath}.source`, { force: true }).pipe(Effect.ignore);
         // Rename changes file metadata, so record the verified file's final identity.
         const info = yield* fs.stat(finalPath);
         yield* fs
@@ -228,6 +340,13 @@ const make = Effect.gen(function* () {
   );
 
   return SpeechModelStore.of({
+    link,
+    linkedFrom: Effect.fn("SpeechModelStore.linkedFrom")((model) =>
+      fs.readLink(modelPath(model)).pipe(
+        Effect.catch(() => fs.readFileString(`${modelPath(model)}.source`)),
+        Effect.orElseSucceed(() => undefined),
+      ),
+    ),
     isReady: Effect.fn("SpeechModelStore.isReady")((model) =>
       expectedFile(model, modelPath(model)).pipe(
         Effect.map(
@@ -243,6 +362,7 @@ const make = Effect.gen(function* () {
       const file = modelPath(model);
       yield* fs.remove(file, { force: true });
       yield* fs.remove(`${file}.verified`, { force: true });
+      yield* fs.remove(`${file}.source`, { force: true });
     }),
   });
 });
diff --git a/apps/server/src/speech/SpeechService.test.ts b/apps/server/src/speech/SpeechService.test.ts
index 41db47f0376a4..8d980f2846271 100644
--- a/apps/server/src/speech/SpeechService.test.ts
+++ b/apps/server/src/speech/SpeechService.test.ts
@@ -103,6 +103,8 @@ const store = Layer.succeed(
     installedPath: (model) =>
       Effect.sync(() => (readyModels.has(model.id) ? "test.gguf" : undefined)),
     download,
+    link: () => Effect.succeed([]),
+    linkedFrom: () => Effect.undefined,
     remove: (model) =>
       Effect.sync(() => {
         readyModels.delete(model.id);
diff --git a/apps/server/src/speech/SpeechService.ts b/apps/server/src/speech/SpeechService.ts
index c5f0faebe18f4..b4ae198b9447d 100644
--- a/apps/server/src/speech/SpeechService.ts
+++ b/apps/server/src/speech/SpeechService.ts
@@ -138,6 +138,8 @@ export class SpeechService extends Context.Service<
     readonly selectModel: (modelId: string) => Effect.Effect<SpeechModels, SpeechError>;
     readonly cancelDownload: (modelId: string) => Effect.Effect<SpeechModels, SpeechError>;
     readonly removeModel: (modelId: string) => Effect.Effect<SpeechModels, SpeechError>;
+    /** Uses catalog model files already on this machine, from a file or folder path. */
+    readonly linkModels: (source: string) => Effect.Effect<SpeechModels, SpeechError>;
     readonly prepareModel: Effect.Effect<void, SpeechError>;
     readonly transcribe: (
       pcmBytes: Uint8Array,
@@ -467,6 +469,7 @@ const make = Effect.gen(function* () {
       size: definition.size,
       supportsStreaming: definition.supportsStreaming,
       supportsBufferedStreaming: true,
+      supportsModelLinking: true,
       supportsTranslation: definition.supportsTranslation,
       languages: definition.languages,
       supportsLanguageDetection: definition.supportsLanguageDetection,
@@ -489,8 +492,8 @@ const make = Effect.gen(function* () {
     const models = yield* Effect.forEach(
       SPEECH_MODELS,
       (definition) =>
-        store.isReady(definition).pipe(
-          Effect.map((ready): EnvironmentSpeechModel => {
+        Effect.all([store.isReady(definition), store.linkedFrom(definition)]).pipe(
+          Effect.map(([ready, linkedFrom]): EnvironmentSpeechModel => {
             const operation = downloading?.modelId === definition.id ? downloading : undefined;
             return {
               id: definition.id,
@@ -514,6 +517,7 @@ const make = Effect.gen(function* () {
                   ? "installed"
                   : "downloadable",
               ...(operation ? { downloaded: operation.downloaded } : {}),
+              ...(ready && linkedFrom ? { linkedFrom } : {}),
             };
           }),
         ),
@@ -951,6 +955,21 @@ const make = Effect.gen(function* () {
         ),
       ),
     ),
+    linkModels: Effect.fn("SpeechService.linkModels")(function* (source) {
+      yield* requireSupported;
+      const settings = yield* readSettings("model linking");
+      const linked = yield* exclusive(
+        "model linking",
+        store
+          .link(SPEECH_MODELS, source)
+          .pipe(Effect.mapError((cause) => speechError("model linking", cause))),
+      );
+      const first = linked[0];
+      if (first === undefined) return yield* new SpeechModelNotFoundError({ modelId: source });
+      if (!(yield* store.isReady(selectedModel(settings))))
+        yield* writeSettings("model linking", { speechModelId: first });
+      return yield* modelsEffect;
+    }),
     updateAcceleration: Effect.fn("SpeechService.updateAcceleration")((acceleration) =>
       writeSettings("acceleration update", { speechAcceleration: acceleration }).pipe(
         Effect.andThen(freshStatus("acceleration update")),
diff --git a/apps/server/src/speech/http.test.ts b/apps/server/src/speech/http.test.ts
index f67129be60423..d86f77fbdbd83 100644
--- a/apps/server/src/speech/http.test.ts
+++ b/apps/server/src/speech/http.test.ts
@@ -80,6 +80,7 @@ effectIt.live("rejects oversized chunked audio without invoking transcription",
           prepareModel: Effect.void,
           models: () => Effect.succeed({ models: [] }),
           downloadModel: () => Effect.succeed({ models: [] }),
+          linkModels: () => Effect.succeed({ models: [] }),
           selectModel: () => Effect.succeed({ models: [] }),
           cancelDownload: () => Effect.succeed({ models: [] }),
           updateAcceleration: () => Effect.succeed({ supported: false as const, reason: "test" }),
@@ -164,7 +165,31 @@ effectIt.effect(
         HttpApiBuilder.layer(HttpApi.make("environment").add(EnvironmentVoiceHttpApi)).pipe(
           Layer.provide(speechHttpApiLayer),
           Layer.provide(principal(AuthOrchestrationOperateScope, AuthSettingsWriteScope)),
-          Layer.provide(Layer.mock(SpeechService.SpeechService)({})),
+          Layer.provide(
+            Layer.mock(SpeechService.SpeechService)({
+              models: () =>
+                Effect.succeed({
+                  models: [
+                    {
+                      id: "fixture/model",
+                      name: "Fixture",
+                      description: "",
+                      size: 1,
+                      languages: ["en"],
+                      accuracy: 0,
+                      speed: 0,
+                      recommended: false,
+                      supportsStreaming: false,
+                      supportsLanguageDetection: false,
+                      supportsTranslation: false,
+                      active: true,
+                      state: "installed",
+                      linkedFrom: "/home/someone/models/fixture.gguf",
+                    },
+                  ],
+                }),
+            }),
+          ),
           Layer.provide(cloud),
           Layer.provide(dependencies),
           Layer.provide(HttpServer.layerServices),
@@ -228,6 +253,22 @@ effectIt.effect(
         422,
       );
       expect(transcribe).toHaveBeenLastCalledWith("openrouter", "acme/transcribe-1");
+      // Naming a path on the environment needs filesystem access, not only settings access.
+      const link = yield* Effect.promise(() =>
+        handler(
+          new Request("http://localhost/api/voice/models/link", {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({ path: "/models" }),
+          }),
+          context,
+        ),
+      );
+      expect(link.status).toBe(403);
+      const listed = yield* Effect.promise(() =>
+        handler(new Request("http://localhost/api/voice/models"), context),
+      );
+      expect(yield* Effect.promise(() => listed.text())).not.toContain("/home/someone");
     }).pipe(Effect.scoped),
 );
 
@@ -268,6 +309,7 @@ effectIt.effect.each([
         prepareModel: Effect.void,
         models: () => Effect.succeed({ models: [] }),
         downloadModel: () => Effect.fail(error),
+        linkModels: () => Effect.fail(error),
         selectModel: () => Effect.fail(error),
         cancelDownload: () => Effect.fail(error),
         updateAcceleration: () => Effect.fail(error),
diff --git a/apps/server/src/speech/http.ts b/apps/server/src/speech/http.ts
index eb4a7a01b88fb..bf91b4c1ef3a6 100644
--- a/apps/server/src/speech/http.ts
+++ b/apps/server/src/speech/http.ts
@@ -1,9 +1,12 @@
 import { decodeSpeechPcmRequest } from "@t3tools/shared/speech";
 import {
+  AuthFilesystemReadScope,
   AuthOrchestrationOperateScope,
   AuthSettingsWriteScope,
   type AuthEnvironmentScope,
+  EnvironmentAuthenticatedPrincipal,
   EnvironmentHttpApi,
+  type EnvironmentSpeechModels,
   EnvironmentVoiceBodyLimit,
   SPEECH_MAX_OPTIONS_BYTES,
 } from "@t3tools/contracts";
@@ -53,6 +56,14 @@ const mapSpeechError = <A, R>(effect: Effect.Effect<A, SpeechService.SpeechError
     }),
   );
 
+// A linked model's origin is a path on this machine; only filesystem readers may see it.
+// Untraced: it runs inside each handler's own span.
+const withoutHostPaths = Effect.fnUntraced(function* (result: EnvironmentSpeechModels) {
+  const session = yield* EnvironmentAuthenticatedPrincipal;
+  if (session.scopes.has(AuthFilesystemReadScope)) return result;
+  return { models: result.models.map(({ linkedFrom: _, ...model }) => model) };
+});
+
 export const speechHttpApiLayer = HttpApiBuilder.group(
   EnvironmentHttpApi,
   "voice",
@@ -133,35 +144,54 @@ export const speechHttpApiLayer = HttpApiBuilder.group(
         "models",
         Effect.fn("environment.voice.models")(function* (args) {
           yield* guard(args.endpoint.name);
-          return yield* speech.models(args.query.benchmarks === "1").pipe(mapSpeechError);
+          return yield* speech
+            .models(args.query.benchmarks === "1")
+            .pipe(mapSpeechError, Effect.flatMap(withoutHostPaths));
         }),
       )
       .handle(
         "downloadModel",
         Effect.fn("environment.voice.downloadModel")(function* (args) {
           yield* guard(args.endpoint.name, AuthSettingsWriteScope);
-          return yield* speech.downloadModel(args.payload.modelId).pipe(mapSpeechError);
+          return yield* speech
+            .downloadModel(args.payload.modelId)
+            .pipe(mapSpeechError, Effect.flatMap(withoutHostPaths));
         }),
       )
       .handle(
         "selectModel",
         Effect.fn("environment.voice.selectModel")(function* (args) {
           yield* guard(args.endpoint.name, AuthSettingsWriteScope);
-          return yield* speech.selectModel(args.payload.modelId).pipe(mapSpeechError);
+          return yield* speech
+            .selectModel(args.payload.modelId)
+            .pipe(mapSpeechError, Effect.flatMap(withoutHostPaths));
         }),
       )
       .handle(
         "cancelModelDownload",
         Effect.fn("environment.voice.cancelModelDownload")(function* (args) {
           yield* guard(args.endpoint.name, AuthSettingsWriteScope);
-          return yield* speech.cancelDownload(args.payload.modelId).pipe(mapSpeechError);
+          return yield* speech
+            .cancelDownload(args.payload.modelId)
+            .pipe(mapSpeechError, Effect.flatMap(withoutHostPaths));
         }),
       )
       .handle(
         "removeModel",
         Effect.fn("environment.voice.removeModel")(function* (args) {
           yield* guard(args.endpoint.name, AuthSettingsWriteScope);
-          return yield* speech.removeModel(args.payload.modelId).pipe(mapSpeechError);
+          return yield* speech
+            .removeModel(args.payload.modelId)
+            .pipe(mapSpeechError, Effect.flatMap(withoutHostPaths));
+        }),
+      )
+      .handle(
+        "linkModels",
+        Effect.fn("environment.voice.linkModels")(function* (args) {
+          yield* guard(args.endpoint.name, AuthSettingsWriteScope);
+          // The request names a path on this machine and the result reveals what is there.
+          yield* requireEnvironmentScope(AuthFilesystemReadScope);
+          return yield* speech.linkModels(args.payload.path).pipe(mapSpeechError);
         }),
       )
       .handle(
diff --git a/apps/server/src/textGeneration/CodexTextGeneration.test.ts b/apps/server/src/textGeneration/CodexTextGeneration.test.ts
index 40fd6e7eed9c2..86c6cb9a8cfef 100644
--- a/apps/server/src/textGeneration/CodexTextGeneration.test.ts
+++ b/apps/server/src/textGeneration/CodexTextGeneration.test.ts
@@ -1,5 +1,6 @@
 import {
   DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER,
+  ProjectId,
   ProviderDriverKind,
   type ModelSelection,
   type ServerProvider,
@@ -542,6 +543,7 @@ const PREFLIGHT_PRIMARY_STATES = [
   "pending",
   "exhausted",
   "not installed",
+  "not installed, fallback disabled for project",
   "signed out",
   "signed out, fallback failed",
 ] as const;
@@ -550,6 +552,7 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
   Effect.gen(function* () {
     const primary = ProviderInstanceId.make("codex");
     const fallback = ProviderInstanceId.make("claude_work");
+    const projectId = ProjectId.make("project-a");
     const selection = {
       instanceId: primary,
       model: "chat-model",
@@ -573,7 +576,7 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
         ...(primaryState === "pending" && instanceId === primary
           ? { installed: false, status: "warning", auth: { status: "unknown" } }
           : {}),
-        ...(primaryState === "not installed" && instanceId === primary
+        ...(primaryState.startsWith("not installed") && instanceId === primary
           ? { installed: false, status: "error", auth: { status: "unknown" } }
           : {}),
         ...(primaryState.startsWith("signed out") && instanceId === primary
@@ -625,6 +628,13 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
             providerInstances: {
               [fallback]: { driver: ProviderDriverKind.make("claudeAgent"), config: {} },
             },
+            ...(primaryState === "not installed, fallback disabled for project"
+              ? {
+                  projectSettingsOverrides: {
+                    [projectId]: { providerInstances: { [fallback]: { enabled: false } } },
+                  },
+                }
+              : {}),
           }),
           Layer.mock(TextGenerators.TextGenerators)({ runner: () => Effect.undefined }),
           Layer.mock(SourceControlProviderRegistry.SourceControlProviderRegistry)({
@@ -639,11 +649,13 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
         message: "hello",
         linkedContext: "",
         modelSelection: selection,
+        projectId,
       }),
     ).toEqual({ title: "Generated title" });
     expect(calls).toEqual([
       primaryState === "ready" ||
       primaryState === "pending" ||
+      primaryState === "not installed, fallback disabled for project" ||
       primaryState === "signed out, fallback failed"
         ? selection
         : {
diff --git a/apps/server/src/textGeneration/TextGeneration.ts b/apps/server/src/textGeneration/TextGeneration.ts
index fcdddd2052d8e..612d473071bcf 100644
--- a/apps/server/src/textGeneration/TextGeneration.ts
+++ b/apps/server/src/textGeneration/TextGeneration.ts
@@ -1,7 +1,7 @@
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import type { ModelSelection, ProviderInstanceId } from "@t3tools/contracts";
+import type { ModelSelection, ProjectId, ProviderInstanceId } from "@t3tools/contracts";
 import {
   isProviderAvailable,
   isProviderTextGenerationCapable,
@@ -81,6 +81,7 @@ export const make = Effect.gen(function* () {
   const generate = Effect.fn("TextGeneration.generate")(function* <A>(
     operation: TextGenerationOp,
     selection: ModelSelection,
+    projectId: ProjectId | null | undefined,
     invoke: (
       service: ProviderTextGeneration,
       modelSelection: ModelSelection,
@@ -129,7 +130,7 @@ export const make = Effect.gen(function* () {
             return (
               instanceId !== selection.instanceId &&
               provider?.enabled === true &&
-              resolveProjectProviderInstanceEnabled(settings, null, instanceId) &&
+              resolveProjectProviderInstanceEnabled(settings, projectId ?? null, instanceId) &&
               provider.installed &&
               provider.auth.status !== "unauthenticated" &&
               provider.status !== "error" &&
@@ -155,23 +156,35 @@ export const make = Effect.gen(function* () {
   });
   return TextGeneration.of({
     generateCommitMessage: Effect.fn("TextGeneration.generateCommitMessage")(function (input) {
-      return generate("generateCommitMessage", input.modelSelection, (service, modelSelection) =>
-        service.generateCommitMessage({ ...input, modelSelection }),
+      return generate(
+        "generateCommitMessage",
+        input.modelSelection,
+        input.projectId,
+        (service, modelSelection) => service.generateCommitMessage({ ...input, modelSelection }),
       );
     }),
     generatePrContent: Effect.fn("TextGeneration.generatePrContent")(function (input) {
-      return generate("generatePrContent", input.modelSelection, (service, modelSelection) =>
-        service.generatePrContent({ ...input, modelSelection }),
+      return generate(
+        "generatePrContent",
+        input.modelSelection,
+        input.projectId,
+        (service, modelSelection) => service.generatePrContent({ ...input, modelSelection }),
       );
     }),
     generateBranchName: Effect.fn("TextGeneration.generateBranchName")(function (input) {
-      return generate("generateBranchName", input.modelSelection, (service, modelSelection) =>
-        service.generateBranchName({ ...input, modelSelection }),
+      return generate(
+        "generateBranchName",
+        input.modelSelection,
+        input.projectId,
+        (service, modelSelection) => service.generateBranchName({ ...input, modelSelection }),
       );
     }),
     generateReviewGuide: Effect.fn("TextGeneration.generateReviewGuide")(function (input) {
-      return generate("generateReviewGuide", input.modelSelection, (service, modelSelection) =>
-        service.generateReviewGuide({ ...input, modelSelection }),
+      return generate(
+        "generateReviewGuide",
+        input.modelSelection,
+        input.projectId,
+        (service, modelSelection) => service.generateReviewGuide({ ...input, modelSelection }),
       );
     }),
     generateTranscriptionPostProcessing: Effect.fn(
@@ -180,6 +193,7 @@ export const make = Effect.gen(function* () {
       return generate(
         "generateTranscriptionPostProcessing",
         input.modelSelection,
+        null,
         (service, modelSelection) =>
           service.generateTranscriptionPostProcessing({ ...input, modelSelection }),
       );
@@ -188,6 +202,7 @@ export const make = Effect.gen(function* () {
       return generate(
         "generateThreadTitle",
         input.modelSelection,
+        input.projectId,
         (textGeneration, modelSelection) =>
           Effect.gen(function* () {
             const linkedContext =
diff --git a/apps/server/src/usage/cliproxyApi.test.ts b/apps/server/src/usage/cliproxyApi.test.ts
index b9f357522bb7b..431af7b5971ff 100644
--- a/apps/server/src/usage/cliproxyApi.test.ts
+++ b/apps/server/src/usage/cliproxyApi.test.ts
@@ -1,4 +1,5 @@
 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
+import * as HostProcess from "@t3tools/shared/HostProcess";
 import { describe, expect, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
@@ -48,12 +49,15 @@ const encodeJson = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
 
 function fixture(
   options: {
-    accounts?: Array<
-      (typeof accounts)[number] & {
-        disabled?: boolean;
-        id_token: { chatgpt_account_id: string; plan_type?: string; chatgpt_plan_type?: string };
-      }
-    >;
+    accounts?: Array<{
+      id: string;
+      auth_index: string;
+      provider: string;
+      email?: string;
+      disabled?: boolean;
+      project_id?: string;
+      id_token?: { chatgpt_account_id: string; plan_type?: string; chatgpt_plan_type?: string };
+    }>;
     upstream?: (request: RequestBody) => { status: number; body: unknown };
     cooldownStatus?: number;
   } = {},
@@ -433,6 +437,188 @@ describe("CLIProxyAPI built-in management API", () => {
     }),
   );
 
+  const antigravitySummary = {
+    buckets: [
+      {
+        bucketId: "gemini-weekly",
+        window: "weekly",
+        remainingFraction: 0.75,
+        resetTime: "2099-01-01T00:00:00Z",
+      },
+    ],
+  };
+
+  it.effect("reads an xAI account as Grok with Grok CLI headers", () =>
+    Effect.gen(function* () {
+      const test = fixture({
+        accounts: [{ id: "xai.json", auth_index: "x", provider: "xai", email: "x@example.com" }],
+        upstream: () => ({
+          status: 200,
+          body: {
+            config: {
+              creditUsagePercent: 40,
+              currentPeriod: { type: "USAGE_PERIOD_TYPE_WEEKLY", end: "2099-01-01T00:00:00Z" },
+            },
+          },
+        }),
+      });
+      const [account] = yield* (yield* test.api).readAccounts(config);
+      expect(account).toMatchObject({ driver: "grok", email: "x@example.com" });
+      expect(account?.usageLimits.windows).toMatchObject([
+        { id: "subscription", kind: "weekly", usedPercent: 40 },
+      ]);
+      const call = test.requests.find((request) => request.body?.url)?.body;
+      expect(call?.method).toBe("GET");
+      expect(call?.url).toBe("https://cli-chat-proxy.grok.com/v1/billing?format=credits");
+      expect(call?.header).toMatchObject({
+        "x-xai-token-auth": "xai-grok-cli",
+        "x-grok-client-version": expect.any(String),
+        "User-Agent": expect.stringMatching(/^grok-cli\//),
+      });
+    }),
+  );
+
+  it.effect("reads an Antigravity summary and keys the account by its Google ID", () =>
+    Effect.gen(function* () {
+      const test = fixture({
+        accounts: [
+          {
+            id: "antigravity-g@example.com.json",
+            auth_index: "g",
+            provider: "antigravity",
+            email: "g@example.com",
+            project_id: "project-7",
+          },
+        ],
+        upstream: (request) => ({
+          status: 200,
+          body: request.url?.endsWith("/userinfo") ? { id: "google-42" } : antigravitySummary,
+        }),
+      });
+      const [account] = yield* (yield* test.api).readAccounts(config);
+      expect(account?.driver).toBe("antigravity");
+      expect(account?.email).toBeUndefined();
+      expect(account?.usageLimits.credentialFingerprint).toBe(
+        // sha256("google-account\0google-42"), as a local Antigravity probe reports it.
+        "136d4952771fd67a3600053f37492cbd05828712e0b1c89ebab03d4c22ab6554",
+      );
+      expect(account?.usageLimits.windows).toMatchObject([
+        { id: "gemini-weekly", kind: "weekly", usedPercent: 25 },
+      ]);
+      const summary = test.requests.find((request) => request.body?.method === "POST")?.body;
+      expect(summary?.url).toBe(
+        "https://daily-cloudcode-pa.googleapis.com/v1internal:retrieveUserQuotaSummary",
+      );
+      expect(summary?.data).toBe(encodeJson({ project: "project-7" }));
+      expect(summary).toMatchObject({
+        auth_index: "g",
+        method: "POST",
+        header: {
+          Authorization: "Bearer $TOKEN$",
+          "Content-Type": "application/json",
+          "User-Agent":
+            "antigravity/hub/2.24.0 (aidev_client; os_type=linux; arch=x64; cl=963137146)",
+        },
+      });
+      const identityCalls = test.requests.filter((request) =>
+        request.body?.url?.endsWith("/userinfo"),
+      );
+      expect(identityCalls).toHaveLength(1);
+      expect(identityCalls[0]?.body).toMatchObject({
+        method: "GET",
+        url: "https://www.googleapis.com/oauth2/v2/userinfo",
+        header: { Authorization: "Bearer $TOKEN$" },
+      });
+    }).pipe(
+      Effect.provideService(HostProcess.Platform, "linux"),
+      Effect.provideService(HostProcess.Architecture, "x64"),
+    ),
+  );
+
+  it.effect("keeps Antigravity limits and listing email when its identity read fails", () =>
+    Effect.gen(function* () {
+      const test = fixture({
+        accounts: [
+          {
+            id: "antigravity.json",
+            auth_index: "g",
+            provider: "antigravity",
+            email: "g@example.com",
+            project_id: "project-7",
+          },
+        ],
+        upstream: (request) =>
+          request.url?.endsWith("/userinfo")
+            ? { status: 403, body: { error: "denied" } }
+            : {
+                status: 200,
+                body: antigravitySummary,
+              },
+      });
+      const result = yield* (yield* test.api).readAccounts(config);
+      expect(result).toHaveLength(1);
+      const [account] = result;
+      expect(account).toMatchObject({ driver: "antigravity", email: "g@example.com" });
+      expect(account?.usageLimits.credentialFingerprint).toBeUndefined();
+      expect(account?.usageLimits.unavailable).toBeUndefined();
+      expect(account?.usageLimits.windows).toMatchObject([
+        { id: "gemini-weekly", kind: "weekly", usedPercent: 25 },
+      ]);
+    }),
+  );
+
+  it.effect.each([
+    { name: "a refused xAI call", provider: "xai", status: 403, body: { error: "denied" } },
+    { name: "a malformed xAI answer", provider: "xai", status: 200, body: { config: "x" } },
+    { name: "a refused Antigravity call", provider: "antigravity", status: 401, body: {} },
+    { name: "a malformed Antigravity answer", provider: "antigravity", status: 200, body: [] },
+    { name: "an empty Antigravity summary", provider: "antigravity", status: 200, body: {} },
+  ])("reports $name as unreadable", ({ provider, status, body }) =>
+    Effect.gen(function* () {
+      const test = fixture({
+        accounts: [{ id: `${provider}.json`, auth_index: "a", provider, project_id: "project-7" }],
+        upstream: () => ({ status, body }),
+      });
+      const [account] = yield* (yield* test.api).readAccounts(config);
+      expect(account?.usageLimits.unavailable?.reason).toBe("probeFailed");
+    }),
+  );
+
+  it.effect.each([undefined, "", "  "])(
+    "rejects a missing or blank Antigravity project (%s) before upstream calls",
+    (project_id) =>
+      Effect.gen(function* () {
+        const test = fixture({
+          accounts: [
+            {
+              id: "antigravity.json",
+              auth_index: "a",
+              provider: "antigravity",
+              ...(project_id === undefined ? {} : { project_id }),
+            },
+          ],
+        });
+        const [account] = yield* (yield* test.api).readAccounts(config);
+        expect(account?.usageLimits.unavailable?.reason).toBe("probeFailed");
+        expect(test.requests.map((request) => request.path)).toEqual(["/v0/management/auth-files"]);
+      }),
+  );
+
+  it.effect("skips accounts of providers the hub table does not know", () =>
+    Effect.gen(function* () {
+      const test = fixture({
+        accounts: [
+          { id: "kiro.json", auth_index: "k", provider: "kiro", email: "k@example.com" },
+          { ...accounts[0]!, provider: "claude" },
+        ],
+        upstream: () => ({ status: 200, body: { five_hour: { utilization: 1, resets_at: null } } }),
+      });
+      const result = yield* (yield* test.api).readAccounts(config);
+      expect(result.map((account) => account.driver)).toEqual(["claudeAgent"]);
+      expect(test.requests.map((request) => request.body?.auth_index)).not.toContain("k");
+    }),
+  );
+
   it.effect("pins redemption to the displayed credit and clears only that account's cooldown", () =>
     Effect.gen(function* () {
       const test = fixture();
diff --git a/apps/server/src/usage/cliproxyApi.ts b/apps/server/src/usage/cliproxyApi.ts
index 87ec1e05b8f77..030983f50e33d 100644
--- a/apps/server/src/usage/cliproxyApi.ts
+++ b/apps/server/src/usage/cliproxyApi.ts
@@ -5,18 +5,33 @@ import {
   type UsageLimitSourceAccount,
   type UsageLimitSourceConfig,
 } from "@t3tools/contracts";
+import * as HostProcess from "@t3tools/shared/HostProcess";
 import * as Cause from "effect/Cause";
 import * as Digest from "effect/crypto/Digest";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as Hex from "effect/encoding/Hex";
+import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 import { HttpClient, HttpClientError, HttpClientRequest, HttpClientResponse } from "effect/http";
 
+import {
+  GROK_USAGE_URL,
+  GrokUsageResponse,
+  grokUsageResponseToLimits,
+} from "@t3tools/provider-grok/server";
 import { codexPlanLabel } from "../provider/CodexProvider.ts";
 import { codexRateLimitsToLimits } from "../provider/codexUsageLimits.ts";
 import { claudeUsageResponseToLimits } from "../provider/claudeUsageLimits.ts";
-import { makeUnavailableUsageLimits } from "@t3tools/provider-core/server/usageLimits";
+import {
+  antigravityAccountFingerprint,
+  antigravitySummaryWindows,
+  antigravityUserAgent,
+} from "../provider/antigravityUsageLimits.ts";
+import {
+  makeUnavailableUsageLimits,
+  makeUsageLimits,
+} from "@t3tools/provider-core/server/usageLimits";
 
 /** A hub with its management key already read from wherever the setting keeps it. */
 export interface CliproxyHub {
@@ -30,6 +45,7 @@ const AuthFile = Schema.Struct({
   provider: Schema.String,
   email: Schema.optional(Schema.String),
   disabled: Schema.optional(Schema.Boolean),
+  project_id: Schema.optional(Schema.String),
   id_token: Schema.optional(
     Schema.Struct({
       chatgpt_account_id: Schema.optional(Schema.String),
@@ -106,6 +122,8 @@ const decodeApiResponse = Schema.decodeUnknownEffect(ApiResponse);
 const decodeCreditList = Schema.decodeUnknownEffect(Schema.fromJsonString(CreditList));
 const decodeClaudeUsage = Schema.decodeUnknownEffect(Schema.fromJsonString(ClaudeUsage));
 const decodeCodexUsage = Schema.decodeUnknownEffect(Schema.fromJsonString(CodexUsage));
+const decodeGrokUsage = Schema.decodeUnknownEffect(Schema.fromJsonString(GrokUsageResponse));
+const decodeJson = Schema.decodeUnknownEffect(Schema.fromJsonString(Schema.Unknown));
 const isUsageLimitSourceError = Schema.is(UsageLimitSourceError);
 
 // Extra CAs can fix untrusted chains; expiry/hostname failures report codes only.
@@ -174,9 +192,216 @@ const creditRedeemRequestId = Effect.fn("CliproxyApi.creditRedeemRequestId")(fun
   return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
 });
 
+type AuthFile = typeof AuthFile.Type;
+/** Sends one upstream request with the account's token, as GET or as a JSON POST of `data`. */
+type HubCall = (
+  url: string,
+  data?: unknown,
+) => Effect.Effect<string, UsageLimitSourceError | Schema.SchemaError>;
+type HubReading = Omit<UsageLimitSourceAccount, "id" | "driver">;
+interface HubProvider {
+  readonly driver: ProviderDriverKind;
+  readonly header: (
+    account: AuthFile,
+    platform: NodeJS.Platform,
+    architecture: NodeJS.Architecture,
+  ) => Record<string, string>;
+  readonly read: (input: {
+    readonly account: AuthFile;
+    readonly call: HubCall;
+    readonly checkedAt: string;
+  }) => Effect.Effect<HubReading, UsageLimitSourceError | Schema.SchemaError, Digest.Digest>;
+}
+
+const listedIdentity = (account: AuthFile) => ({
+  ...(account.email ? { email: account.email } : {}),
+  ...(account.id_token?.chatgpt_account_id?.trim()
+    ? { workspaceId: account.id_token.chatgpt_account_id.trim() }
+    : {}),
+});
+
+const credits = Effect.fn("CliproxyApi.credits")(function* (call: HubCall) {
+  const response = yield* decodeCreditList(yield* call(CREDIT_URL));
+  const now = DateTime.toEpochMillis(yield* DateTime.now);
+  return response.credits
+    .filter(
+      (credit) =>
+        credit.reset_type === "codex_rate_limits" &&
+        credit.status === "available" &&
+        Date.parse(credit.expires_at) > now,
+    )
+    .toSorted((a, b) => Date.parse(a.expires_at) - Date.parse(b.expires_at));
+});
+
+const CODEX_HUB: HubProvider = {
+  driver: ProviderDriverKind.make("codex"),
+  header: (account) => ({
+    Authorization: "Bearer $TOKEN$",
+    "Content-Type": "application/json",
+    "OpenAI-Beta": "codex-1",
+    Originator: "Codex Desktop",
+    ...(account.id_token?.chatgpt_account_id
+      ? { "Chatgpt-Account-Id": account.id_token.chatgpt_account_id }
+      : {}),
+  }),
+  read: Effect.fnUntraced(function* ({ account, call, checkedAt }) {
+    const usage = yield* decodeCodexUsage(yield* call(`${CODEX_BASE}/usage`));
+    const toWindow = (window: typeof CodexWindow.Type | null | undefined) =>
+      window
+        ? {
+            usedPercent: window.used_percent,
+            resetsAt: window.reset_at ?? null,
+            ...(window.limit_window_seconds === undefined
+              ? {}
+              : { windowDurationMins: window.limit_window_seconds / 60 }),
+          }
+        : null;
+    const available = yield* credits(call).pipe(Effect.orElseSucceed(() => undefined));
+    const next = available?.[0];
+    const planType =
+      usage.plan_type ?? account.id_token?.plan_type ?? account.id_token?.chatgpt_plan_type;
+    return {
+      ...listedIdentity(account),
+      plan: codexPlanLabel(planType),
+      usageLimits: {
+        ...codexRateLimitsToLimits({
+          checkedAt,
+          snapshot: {
+            planType: planType ?? null,
+            primary: toWindow(usage.rate_limit?.primary_window),
+            secondary: toWindow(usage.rate_limit?.secondary_window),
+          },
+        }),
+        ...(available
+          ? {
+              resetCredits: {
+                availableCount: available.length,
+                ...(next
+                  ? {
+                      nextCreditId: next.id,
+                      nextExpiresAt: DateTime.formatIso(DateTime.makeUnsafe(next.expires_at)),
+                    }
+                  : {}),
+              },
+            }
+          : {}),
+      },
+    };
+  }),
+};
+
+const GROK_CLI_VERSION = "1.0.77";
+const ANTIGRAVITY_SUMMARY_URL =
+  "https://daily-cloudcode-pa.googleapis.com/v1internal:retrieveUserQuotaSummary";
+
+// Keyed by the auth-files `provider`; accounts of any other provider are skipped.
+const HUB_PROVIDERS = new Map<string, HubProvider>([
+  ["codex", CODEX_HUB],
+  [
+    "claude",
+    {
+      driver: ProviderDriverKind.make("claudeAgent"),
+      header: () => ({
+        Authorization: "Bearer $TOKEN$",
+        "anthropic-beta": "oauth-2025-04-20",
+        // The OAuth usage endpoint can return 429 without a Claude Code user agent.
+        "User-Agent": "claude-code/2.1.273",
+      }),
+      read: Effect.fnUntraced(function* ({ account, call, checkedAt }) {
+        const usage = yield* decodeClaudeUsage(
+          yield* call("https://api.anthropic.com/api/oauth/usage"),
+        );
+        const model_scoped = (usage.limits ?? []).flatMap((limit) =>
+          limit.kind === "weekly_scoped" && limit.scope?.model && typeof limit.percent === "number"
+            ? [
+                {
+                  display_name: limit.scope.model.display_name,
+                  utilization: limit.percent,
+                  resets_at: limit.resets_at ?? null,
+                },
+              ]
+            : [],
+        );
+        const rateLimits = {
+          five_hour: usage.five_hour ?? null,
+          seven_day: usage.seven_day ?? null,
+          model_scoped,
+          spend: usage.spend,
+          extra_usage: usage.extra_usage ?? null,
+        };
+        return {
+          ...listedIdentity(account),
+          plan: "Claude Subscription",
+          usageLimits: claudeUsageResponseToLimits({
+            checkedAt,
+            response: { rate_limits_available: true, rate_limits: rateLimits },
+          }).limits,
+        };
+      }),
+    },
+  ],
+  [
+    "xai",
+    {
+      driver: ProviderDriverKind.make("grok"),
+      header: () => ({
+        Authorization: "Bearer $TOKEN$",
+        "x-xai-token-auth": "xai-grok-cli",
+        "x-grok-client-version": GROK_CLI_VERSION,
+        "User-Agent": `grok-cli/${GROK_CLI_VERSION}`,
+      }),
+      read: Effect.fnUntraced(function* ({ account, call, checkedAt }) {
+        const usage = yield* decodeGrokUsage(yield* call(GROK_USAGE_URL));
+        return {
+          ...listedIdentity(account),
+          usageLimits: grokUsageResponseToLimits(usage, checkedAt),
+        };
+      }),
+    },
+  ],
+  [
+    "antigravity",
+    {
+      driver: ProviderDriverKind.make("antigravity"),
+      header: (_account, platform, architecture) => ({
+        Authorization: "Bearer $TOKEN$",
+        "Content-Type": "application/json",
+        "User-Agent": antigravityUserAgent(platform, architecture),
+      }),
+      read: Effect.fnUntraced(function* ({ account, call, checkedAt }) {
+        const project = account.project_id?.trim();
+        if (!project) {
+          return yield* new UsageLimitSourceError({ detail: "No Antigravity project reported." });
+        }
+        const requestedAt = DateTime.toEpochMillis(yield* DateTime.now);
+        const summary = yield* call(ANTIGRAVITY_SUMMARY_URL, { project });
+        const windows = yield* antigravitySummaryWindows(yield* decodeJson(summary), requestedAt);
+        if (windows.length === 0) {
+          return yield* new UsageLimitSourceError({ detail: "No Antigravity quota reported." });
+        }
+        // Local Antigravity reports no e-mail, so the Google account fingerprint is what pools the two.
+        const fingerprint = yield* call("https://www.googleapis.com/oauth2/v2/userinfo").pipe(
+          Effect.flatMap(decodeJson),
+          Effect.flatMap(antigravityAccountFingerprint),
+          Effect.option,
+        );
+        const usageLimits = makeUsageLimits({ checkedAt, windows });
+        return Option.match(fingerprint, {
+          onNone: () => ({ ...listedIdentity(account), usageLimits }),
+          onSome: (credentialFingerprint) => ({
+            usageLimits: { ...usageLimits, credentialFingerprint },
+          }),
+        });
+      }),
+    },
+  ],
+]);
+
 export const makeCliproxyApi = Effect.gen(function* () {
   const client = yield* HttpClient.HttpClient;
   const digest = yield* Digest.Digest;
+  const platform = yield* HostProcess.Platform;
+  const architecture = yield* HostProcess.Architecture;
 
   const management = Effect.fn("CliproxyApi.management")(function* (
     hub: CliproxyHub,
@@ -215,27 +440,11 @@ export const makeCliproxyApi = Effect.gen(function* () {
 
   const apiCall = Effect.fn("CliproxyApi.apiCall")(function* (
     hub: CliproxyHub,
-    account: typeof AuthFile.Type,
+    account: AuthFile,
+    header: Record<string, string>,
     url: string,
     data?: unknown,
   ) {
-    const header =
-      account.provider === "codex"
-        ? {
-            Authorization: "Bearer $TOKEN$",
-            "Content-Type": "application/json",
-            "OpenAI-Beta": "codex-1",
-            Originator: "Codex Desktop",
-            ...(account.id_token?.chatgpt_account_id
-              ? { "Chatgpt-Account-Id": account.id_token.chatgpt_account_id }
-              : {}),
-          }
-        : {
-            Authorization: "Bearer $TOKEN$",
-            "anthropic-beta": "oauth-2025-04-20",
-            // The OAuth usage endpoint can return 429 without a Claude Code user agent.
-            "User-Agent": "claude-code/2.1.273",
-          };
     const raw = yield* management(hub, "api-call", {
       auth_index: account.auth_index,
       method: data === undefined ? "GET" : "POST",
@@ -252,117 +461,18 @@ export const makeCliproxyApi = Effect.gen(function* () {
     return response.body;
   });
 
-  const credits = Effect.fn("CliproxyApi.credits")(function* (
-    hub: CliproxyHub,
-    account: typeof AuthFile.Type,
-  ) {
-    const body = yield* apiCall(hub, account, CREDIT_URL);
-    const response = yield* decodeCreditList(body);
-    const now = DateTime.toEpochMillis(yield* DateTime.now);
-    return response.credits
-      .filter(
-        (credit) =>
-          credit.reset_type === "codex_rate_limits" &&
-          credit.status === "available" &&
-          Date.parse(credit.expires_at) > now,
-      )
-      .toSorted((a, b) => Date.parse(a.expires_at) - Date.parse(b.expires_at));
-  });
-
   const readAccount = Effect.fn("CliproxyApi.readAccount")(function* (
     hub: CliproxyHub,
-    account: typeof AuthFile.Type,
+    account: AuthFile,
+    provider: HubProvider,
   ) {
     const checkedAt = DateTime.formatIso(yield* DateTime.now);
-    const base = {
-      id: account.id,
-      driver: ProviderDriverKind.make(account.provider === "codex" ? "codex" : "claudeAgent"),
-      ...(account.email ? { email: account.email } : {}),
-      ...(account.id_token?.chatgpt_account_id?.trim()
-        ? { workspaceId: account.id_token.chatgpt_account_id.trim() }
-        : {}),
-    };
-    const read = Effect.gen(function* () {
-      if (account.provider === "claude") {
-        const body = yield* apiCall(hub, account, "https://api.anthropic.com/api/oauth/usage");
-        const usage = yield* decodeClaudeUsage(body);
-        const model_scoped = (usage.limits ?? []).flatMap((limit) =>
-          limit.kind === "weekly_scoped" && limit.scope?.model && typeof limit.percent === "number"
-            ? [
-                {
-                  display_name: limit.scope.model.display_name,
-                  utilization: limit.percent,
-                  resets_at: limit.resets_at ?? null,
-                },
-              ]
-            : [],
-        );
-        const rateLimits = {
-          five_hour: usage.five_hour ?? null,
-          seven_day: usage.seven_day ?? null,
-          model_scoped,
-          spend: usage.spend,
-          extra_usage: usage.extra_usage ?? null,
-        };
-        return {
-          ...base,
-          plan: "Claude Subscription",
-          usageLimits: claudeUsageResponseToLimits({
-            checkedAt,
-            response: {
-              rate_limits_available: true,
-              rate_limits: rateLimits,
-            },
-          }).limits,
-        };
-      }
-      const body = yield* apiCall(hub, account, `${CODEX_BASE}/usage`);
-      const usage = yield* decodeCodexUsage(body);
-      const toWindow = (window: typeof CodexWindow.Type | null | undefined) =>
-        window
-          ? {
-              usedPercent: window.used_percent,
-              resetsAt: window.reset_at ?? null,
-              ...(window.limit_window_seconds === undefined
-                ? {}
-                : { windowDurationMins: window.limit_window_seconds / 60 }),
-            }
-          : null;
-      const available = yield* credits(hub, account).pipe(Effect.orElseSucceed(() => undefined));
-      const next = available?.[0];
-      const planType =
-        usage.plan_type ?? account.id_token?.plan_type ?? account.id_token?.chatgpt_plan_type;
-      return {
-        ...base,
-        plan: codexPlanLabel(planType),
-        usageLimits: {
-          ...codexRateLimitsToLimits({
-            checkedAt,
-            snapshot: {
-              planType: planType ?? null,
-              primary: toWindow(usage.rate_limit?.primary_window),
-              secondary: toWindow(usage.rate_limit?.secondary_window),
-            },
-          }),
-          ...(available
-            ? {
-                resetCredits: {
-                  availableCount: available.length,
-                  ...(next
-                    ? {
-                        nextCreditId: next.id,
-                        nextExpiresAt: DateTime.formatIso(DateTime.makeUnsafe(next.expires_at)),
-                      }
-                    : {}),
-                },
-              }
-            : {}),
-        },
-      };
-    });
-    return yield* read.pipe(
+    const call: HubCall = (url, data) =>
+      apiCall(hub, account, provider.header(account, platform, architecture), url, data);
+    const reading = yield* provider.read({ account, call, checkedAt }).pipe(
+      Effect.provideService(Digest.Digest, digest),
       Effect.orElseSucceed(() => ({
-        ...base,
+        ...listedIdentity(account),
         usageLimits: makeUnavailableUsageLimits({
           checkedAt,
           reason: "probeFailed",
@@ -370,6 +480,7 @@ export const makeCliproxyApi = Effect.gen(function* () {
         }),
       })),
     );
+    return { id: account.id, driver: provider.driver, ...reading };
   });
 
   const readAccounts = Effect.fn("CliproxyApi.readAccounts")(function* (
@@ -383,11 +494,11 @@ export const makeCliproxyApi = Effect.gen(function* () {
       ),
     );
     return yield* Effect.forEach(
-      accounts.filter(
-        (account) =>
-          !account.disabled && (account.provider === "codex" || account.provider === "claude"),
-      ),
-      (account) => readAccount(hub, account),
+      accounts.flatMap((account) => {
+        const provider = HUB_PROVIDERS.get(account.provider);
+        return provider && !account.disabled ? [{ account, provider }] : [];
+      }),
+      ({ account, provider }) => readAccount(hub, account, provider),
       { concurrency: 4 },
     );
   });
@@ -404,13 +515,19 @@ export const makeCliproxyApi = Effect.gen(function* () {
           detail: "The Codex hub account is missing or disabled.",
         });
       }
-      const body = yield* apiCall(hub, account, `${CREDIT_URL}/consume`, {
-        redeem_request_id: yield* creditRedeemRequestId(
-          account.id_token?.chatgpt_account_id ?? account.id,
-          creditId,
-        ).pipe(Effect.provideService(Digest.Digest, digest)),
-        credit_id: creditId,
-      });
+      const body = yield* apiCall(
+        hub,
+        account,
+        CODEX_HUB.header(account, platform, architecture),
+        `${CREDIT_URL}/consume`,
+        {
+          redeem_request_id: yield* creditRedeemRequestId(
+            account.id_token?.chatgpt_account_id ?? account.id,
+            creditId,
+          ).pipe(Effect.provideService(Digest.Digest, digest)),
+          credit_id: creditId,
+        },
+      );
       const response = yield* decodeConsumeResponse(body);
       const outcome = (
         {
diff --git a/apps/server/src/ws.ts b/apps/server/src/ws.ts
index 8a8c4e1be719c..9721864fcdfd5 100644
--- a/apps/server/src/ws.ts
+++ b/apps/server/src/ws.ts
@@ -2649,7 +2649,7 @@ export const layerWsRpc = (
                 detail: "This provider does not bank reset credits.",
               });
             }
-            const outcome = yield* instance.consumeResetCredit().pipe(
+            const outcome = yield* instance.consumeResetCredit(input.creditId).pipe(
               Effect.mapError(
                 (error) =>
                   new ProviderSetupError({
diff --git a/apps/web/package.json b/apps/web/package.json
index e1dc0fbf90c1e..6cb69713aec27 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -111,7 +111,7 @@
     "compression": "^1.8.2",
     "micromark-util-types": "catalog:",
     "oxc-transform-react": "~0.152.0",
-    "playwright": "1.60.0",
+    "playwright": "1.64.1",
     "tailwindcss": "^4.0.0",
     "vite": "catalog:",
     "vite-plus": "catalog:"
diff --git a/apps/web/src/components/ChatMarkdown.browser.test.tsx b/apps/web/src/components/ChatMarkdown.browser.test.tsx
index 76b77f15ea674..b03612507f917 100644
--- a/apps/web/src/components/ChatMarkdown.browser.test.tsx
+++ b/apps/web/src/components/ChatMarkdown.browser.test.tsx
@@ -9,6 +9,7 @@ import "../index.css";
 
 import { filesystemEnvironment } from "../state/filesystem";
 import { useRightPanelStore } from "../rightPanelStore";
+import { remarkEnableOrderedListNumbers } from "@t3tools/shared/markdownPipeline";
 import { setMarkdownTaskChecked } from "@t3tools/shared/markdownTaskList";
 import { HostImageUrlContext } from "./chat/hostImageUrl";
 
@@ -162,6 +163,38 @@ function buttonsLabelled(container: HTMLElement, label: string) {
   );
 }
 
+const SOURCE_NUMBER_PLUGINS = [remarkEnableOrderedListNumbers];
+
+it("keeps decimal markers in nested user lists while documents keep their counter styles", async () => {
+  setup();
+  const text = "1. Outer\n   1. Nested\n   7. Skipped\n      1. Deeper\n      4. Fourth";
+  await using screen = await render(
+    <div className="grid grid-cols-2 gap-8 p-8">
+      <section>
+        <h2>User message</h2>
+        <ChatMarkdown
+          cwd={undefined}
+          text={text}
+          className="user-message-markdown"
+          extraRemarkPlugins={SOURCE_NUMBER_PLUGINS}
+        />
+      </section>
+      <section>
+        <h2>Markdown preview</h2>
+        <ChatMarkdown cwd={undefined} text={text} />
+      </section>
+    </div>,
+  );
+  await expect.element(screen.getByText("User message", { exact: true })).toBeVisible();
+  const [message, preview] = screen.container.querySelectorAll(".chat-markdown");
+  expect(
+    [...message!.querySelectorAll("ol")].map((list) => getComputedStyle(list).listStyleType),
+  ).toEqual(["decimal", "decimal", "decimal"]);
+  expect(
+    [...preview!.querySelectorAll("ol")].map((list) => getComputedStyle(list).listStyleType),
+  ).toEqual(["decimal", "lower-alpha", "lower-roman"]);
+});
+
 it("shows unavailable audio when a workspace embed has no thread", async () => {
   setup();
   await using screen = await renderText("![recording](clip.wav)");
diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx
index e7e55fd078321..0b0116be549cb 100644
--- a/apps/web/src/components/ChatMarkdown.tsx
+++ b/apps/web/src/components/ChatMarkdown.tsx
@@ -322,13 +322,18 @@ function CodexArtifactTemplateCard(props: {
 const WINDOWS_DRIVE_PATH_REGEX = /^[A-Za-z]:[\\/]/;
 
 function orderedListGutterStyle(
-  itemCount: number,
+  itemValues: ReadonlyArray<unknown>,
   start: unknown,
 ): { "--list-gutter": string } | undefined {
   const parsedStart = Number.parseInt(String(start ?? 1), 10);
-  const firstNumber = Number.isNaN(parsedStart) ? 1 : parsedStart;
-  const lastNumber = firstNumber + Math.max(itemCount - 1, 0);
-  const markerWidth = Math.max(String(firstNumber).length, String(lastNumber).length);
+  let number = Number.isNaN(parsedStart) ? 1 : parsedStart;
+  let markerWidth = String(number).length;
+  for (const value of itemValues) {
+    const written = Number.parseInt(String(value ?? ""), 10);
+    if (!Number.isNaN(written)) number = written;
+    markerWidth = Math.max(markerWidth, String(number).length);
+    number += 1;
+  }
   if (markerWidth <= 1) return undefined;
   return { "--list-gutter": `${markerWidth + 2}ch` };
 }
@@ -1017,10 +1022,11 @@ const CHAT_MARKDOWN_COMPONENTS = {
     );
   },
   ol: function MarkdownOrderedList({ node, start, style, ...props }) {
-    const itemCount =
-      node?.children?.filter((child) => child.type === "element" && child.tagName === "li")
-        .length ?? 0;
-    const gutterStyle = orderedListGutterStyle(itemCount, start);
+    const itemValues =
+      node?.children?.flatMap((child) =>
+        child.type === "element" && child.tagName === "li" ? [child.properties.value] : [],
+      ) ?? [];
+    const gutterStyle = orderedListGutterStyle(itemValues, start);
     return (
       <ol {...props} start={start} style={gutterStyle ? { ...style, ...gutterStyle } : style} />
     );
diff --git a/apps/web/src/components/CommandPalette.tsx b/apps/web/src/components/CommandPalette.tsx
index a73322fc65114..a6dd4fe1d40c7 100644
--- a/apps/web/src/components/CommandPalette.tsx
+++ b/apps/web/src/components/CommandPalette.tsx
@@ -2650,6 +2650,7 @@ function OpenCommandPaletteDialog(props: {
       scrollCommandPaletteRowIntoView(
         resultListRef.current,
         resultRows.rowIndexByItemIndex[0] ?? 0,
+        true,
       );
       return;
     }
@@ -2921,7 +2922,11 @@ function OpenCommandPaletteDialog(props: {
         setHighlightedItemValue(typeof value === "string" ? value : null);
         const rowIndex = resultRows.rowIndexByItemIndex[eventDetails.index];
         if (eventDetails.reason === "keyboard" && rowIndex !== undefined) {
-          scrollCommandPaletteRowIntoView(resultListRef.current, rowIndex);
+          scrollCommandPaletteRowIntoView(
+            resultListRef.current,
+            rowIndex,
+            eventDetails.index === 0,
+          );
         }
       }}
       onValueChange={(nextQuery, { event }) => handleQueryChange(nextQuery, event.target)}
diff --git a/apps/web/src/components/CommandPaletteResults.tsx b/apps/web/src/components/CommandPaletteResults.tsx
index f337f555382b5..864c190b89c54 100644
--- a/apps/web/src/components/CommandPaletteResults.tsx
+++ b/apps/web/src/components/CommandPaletteResults.tsx
@@ -78,7 +78,15 @@ export function CommandPaletteResults(props: CommandPaletteResultsProps) {
   );
 }
 
-export function scrollCommandPaletteRowIntoView(list: LegendListRef | null, rowIndex: number) {
+export function scrollCommandPaletteRowIntoView(
+  list: LegendListRef | null,
+  rowIndex: number,
+  isFirstItem: boolean,
+) {
+  if (isFirstItem) {
+    void list?.scrollToOffset({ offset: 0, animated: false });
+    return;
+  }
   void list?.scrollIndexIntoView({
     index: rowIndex,
     animated: false,
diff --git a/apps/web/src/components/ComposerPromptEditorTiptap.citationDraft.browser.test.tsx b/apps/web/src/components/ComposerPromptEditorTiptap.citationDraft.browser.test.tsx
index a1a69a7968ee9..8da54f5f72141 100644
--- a/apps/web/src/components/ComposerPromptEditorTiptap.citationDraft.browser.test.tsx
+++ b/apps/web/src/components/ComposerPromptEditorTiptap.citationDraft.browser.test.tsx
@@ -31,9 +31,11 @@ const promptBefore = `See ${serializeAssistantCitation(citation)} `;
 function Composer({
   question,
   editorRef,
+  send = "clears",
 }: {
   question: boolean;
   editorRef: React.RefObject<ComposerPromptEditorHandle | null>;
+  send?: "clears" | "blocked" | "refusedLater";
 }) {
   const [prompt, setPrompt] = useState(promptBefore);
   const [answer, setAnswer] = useState("");
@@ -61,6 +63,11 @@ function Composer({
         onCitationDraftSave={(replacedValue, savedValue) => {
           if (replacedValue === prompt) setPrompt(savedValue);
         }}
+        onCitationSubmitAndSend={() => {
+          if (send === "blocked") return false;
+          if (send === "clears") setPrompt("");
+          return true;
+        }}
         onPaste={() => {}}
       />
     </>
@@ -97,3 +104,58 @@ it("keeps an unsaved citation comment when a question takes the composer", async
   );
   await expect.element(page.getByLabelText("Edit citation comment")).toBeInTheDocument();
 });
+
+it("clears the sent prompt when an empty citation comment sends it", async () => {
+  const editorRef = createRef<ComposerPromptEditorHandle>();
+  await using screen = await render(<Composer question={false} editorRef={editorRef} />);
+
+  const sourceAnchor = findAssistantCitationSourceAnchor(document, citation);
+  if (!sourceAnchor) throw new Error("Citation source did not resolve");
+  await act(async () =>
+    editorRef.current?.requestCitationComment({
+      previousValue: "See ",
+      value: promptBefore,
+      citationStart: "See ".length,
+      sourceAnchor,
+      insertedSpaces: { before: false, after: true },
+    }),
+  );
+  const comment = page.getByLabelText("Comment on selected text");
+  await expect.element(comment).toHaveFocus();
+  await userEvent.keyboard("{Control>}{Enter}{/Control}");
+
+  await expect.element(comment).not.toBeInTheDocument();
+  await expect.element(page.getByTestId("composer-editor")).toHaveFocus();
+  await expect.element(screen.getByRole("status")).toHaveAttribute("data-prompt", "");
+});
+
+it.each(["blocked", "refusedLater"] as const)(
+  "keeps the caret after the citation when save-and-send is %s",
+  async (send) => {
+    const editorRef = createRef<ComposerPromptEditorHandle>();
+    await using screen = await render(
+      <Composer question={false} editorRef={editorRef} send={send} />,
+    );
+
+    const sourceAnchor = findAssistantCitationSourceAnchor(document, citation);
+    if (!sourceAnchor) throw new Error("Citation source did not resolve");
+    await act(async () =>
+      editorRef.current?.requestCitationComment({
+        previousValue: "See ",
+        value: promptBefore,
+        citationStart: "See ".length,
+        sourceAnchor,
+        insertedSpaces: { before: false, after: true },
+      }),
+    );
+    const comment = page.getByLabelText("Comment on selected text");
+    await expect.element(comment).toHaveFocus();
+    await userEvent.keyboard("{Control>}{Enter}{/Control}");
+    await expect.element(comment).not.toBeInTheDocument();
+    await userEvent.keyboard("x");
+
+    await expect
+      .element(screen.getByRole("status"))
+      .toHaveAttribute("data-prompt", `See ${serializeAssistantCitation(citation)}x `);
+  },
+);
diff --git a/apps/web/src/components/ComposerPromptEditorTiptap.tsx b/apps/web/src/components/ComposerPromptEditorTiptap.tsx
index bb8f5a5a2211a..1986cc888efba 100644
--- a/apps/web/src/components/ComposerPromptEditorTiptap.tsx
+++ b/apps/web/src/components/ComposerPromptEditorTiptap.tsx
@@ -21,6 +21,7 @@ import {
   Plugin,
   PluginKey,
   TextSelection,
+  type Transaction,
 } from "@tiptap/pm/state";
 import { Decoration, DecorationSet, type EditorView } from "@tiptap/pm/view";
 import type { NodeType, ResolvedPos } from "@tiptap/pm/model";
@@ -186,7 +187,7 @@ export interface ComposerPromptEditorProps {
   onPageScrollKeyDown?: (key: "PageUp" | "PageDown") => void;
   onPageScrollKeyUp?: (key: string) => void;
   onPageScrollRelease?: () => void;
-  onCitationSubmitAndSend?: () => void;
+  onCitationSubmitAndSend?: () => boolean;
   /** Saves unsaved citation text into replacedValue when a controlled rewrite replaces the document. */
   onCitationDraftSave?: (replacedValue: string, savedValue: string) => void;
   onPaste: React.ClipboardEventHandler<HTMLElement>;
@@ -213,12 +214,12 @@ const ComposerCitationCommentContext = createContext<{
   openComment: OpenCitationComment | null;
   onOpenChange: (citeKey: string, open: boolean) => void;
   onDraftChange: (citeKey: string, comment: string) => void;
-  onSubmitAndSend: () => void;
+  onSubmitAndSend: () => boolean;
 }>({
   openComment: null,
   onOpenChange: () => {},
   onDraftChange: () => {},
-  onSubmitAndSend: () => {},
+  onSubmitAndSend: () => false,
 });
 
 const RichComposerSkillsContext = createContext<ReadonlyArray<ServerProviderSkill>>([]);
@@ -477,13 +478,23 @@ function ComposerCitationNodeView({ node, editor, getPos }: NodeViewProps) {
     editor.chain().focus().deleteRange({ from, to }).run();
   };
 
+  const sentRef = useRef(false);
   const onRestoreFocus = () => {
+    const sent = sentRef.current;
+    sentRef.current = false;
     if (!editor.isEditable) return;
     const pos = nodePos();
-    if (pos === null) return;
-    const current = editor.state.doc.nodeAt(pos);
-    if (!current || current.type.name !== "composer-citation") return;
-    editor.commands.focus(pos + current.nodeSize);
+    const current = pos === null ? null : editor.state.doc.nodeAt(pos);
+    if (pos === null || current?.type.name !== "composer-citation") {
+      if (sent) editor.view.focus();
+      return;
+    }
+    // The send's controlled rewrite may still be pending; emitting this caret move would restore the old prompt.
+    editor
+      .chain()
+      .setMeta(SILENT_SELECTION_META, sent)
+      .focus(pos + current.nodeSize)
+      .run();
   };
 
   return (
@@ -525,7 +536,7 @@ function ComposerCitationNodeView({ node, editor, getPos }: NodeViewProps) {
           onDraftChange: (comment) => commentContext.onDraftChange(citeKey, comment),
           onSaveAndSend: (comment) => {
             if (!onSaveComment(comment)) return false;
-            commentContext.onSubmitAndSend();
+            sentRef.current = commentContext.onSubmitAndSend();
             return true;
           },
           onRestoreFocus,
@@ -729,6 +740,8 @@ function chipSelectionDecorations({ doc, selection }: EditorState): DecorationSe
 
 type TiptapEditor = NonNullable<ReturnType<typeof useEditor>>;
 
+const SILENT_SELECTION_META = "composerSilentSelection";
+
 function replaceSkillChips(
   editor: TiptapEditor,
   replacements: ReturnType<typeof skillChipReplacements>,
@@ -995,10 +1008,10 @@ function ComposerPromptEditorTiptapInner(
     onDraftChange: (nodeKey: string, comment: string) => {
       citationDraftRef.current = { key: nodeKey, comment };
     },
-    onSubmitAndSend: onCitationSubmitAndSend ?? (() => {}),
+    onSubmitAndSend: onCitationSubmitAndSend ?? (() => false),
   };
 
-  const handleEditorChange = (updated: TiptapEditor) => {
+  const handleEditorChange = (updated: TiptapEditor, transaction: Transaction) => {
     const map = serializeEditorDoc(updated.state.doc);
     const contextIds = literalText ? [] : [...map.contextIds];
     const { from, to } = updated.state.selection;
@@ -1025,7 +1038,7 @@ function ComposerPromptEditorTiptapInner(
       previousSnapshot.contextIds.length === contextIds.length &&
       previousSnapshot.contextIds.every((id, index) => id === contextIds[index])
     );
-    if (isApplyingControlledUpdateRef.current) return;
+    if (isApplyingControlledUpdateRef.current || transaction.getMeta(SILENT_SELECTION_META)) return;
     if (!snapshotChanged) {
       if (didComposerSelectionChangeVisibly(previousSelectionRange, nextSelectionRange)) {
         readCallbacks().onVisibleSelectionChange?.();
@@ -1459,10 +1472,10 @@ function ComposerPromptEditorTiptapInner(
             return;
           }
         }
-        handleEditorChange(updated);
+        handleEditorChange(updated, transaction);
       },
-      onSelectionUpdate: ({ editor: updated }) => {
-        handleEditorChange(updated);
+      onSelectionUpdate: ({ editor: updated, transaction }) => {
+        handleEditorChange(updated, transaction);
       },
     },
     [],
diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index f722fd1eb6e1f..cba7c434b1bab 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -2096,7 +2096,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     if (voiceInputActive) {
       event?.preventDefault();
       submitAfterDictation(() => submitComposerRef.current(dispatchMode, submissionIntent));
-      return;
+      return false;
     }
     if (
       noProviderAvailable ||
@@ -2104,7 +2104,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       !readEnvironmentScope(environmentId, AuthOrchestrationOperateScope)
     ) {
       event?.preventDefault();
-      return;
+      return false;
     }
     // A send while a pasted image is still compressing would strand that image:
     // the turn snapshot wouldn't include it, and it would surface in the *next*
@@ -2116,7 +2116,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
         title: "Still compressing a pasted image.",
         description: "Send again once its thumbnail appears.",
       });
-      return;
+      return false;
     }
     if (pendingDraftWork.has(attachmentTargetKey)) {
       event?.preventDefault();
@@ -2125,7 +2125,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
         title: "Still bringing attached context into this message.",
         description: "Send again once its chip resolves.",
       });
-      return;
+      return false;
     }
     const submission = submitComposerDraft({
       prompt: promptRef.current,
@@ -2148,11 +2148,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       },
     });
     setComposerSubmissionError(submission.validationMessage);
-    if (!submission.didDispatch) return;
+    if (!submission.didDispatch) return false;
     onTypingGuardSend();
     if (shouldBlurMobileComposerOnSubmit()) {
       blurMobileComposerAfterSend();
     }
+    return true;
   };
   const submitComposerStable = useStableCallback(submitComposer);
   // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- publishes the committed submission handler to the asynchronous dictation completion
@@ -2201,7 +2202,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   };
   const handleSubmitMessageStable = useStableCallback(handleSubmitMessage);
   const submitCitationAndSend = () => {
-    submitComposer(
+    return submitComposer(
       undefined,
       resolveComposerDispatchMode({
         running: phase === "running",
diff --git a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
index e3560312925e5..ca98b4d2f6c79 100644
--- a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
+++ b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
@@ -6,7 +6,7 @@ import type {
   SnapShotSource,
 } from "@t3tools/contracts";
 import { formatAttachmentSize } from "@t3tools/client-runtime/state/attachments";
-import { CircleAlertIcon, PaperclipIcon, PlayIcon, XIcon } from "lucide-react";
+import { CircleAlertIcon, ImageIcon, PaperclipIcon, PlayIcon, XIcon } from "lucide-react";
 import { type ComponentProps, useLayoutEffect, useRef } from "react";
 
 import {
@@ -16,7 +16,8 @@ import {
   composerFileNeedsReattach,
 } from "../../composerDraftStore";
 import { retryAttachmentUpload, useAttachmentUploadStore } from "../../lib/attachmentUploadQueue";
-import { formatAttachmentUploadProgress } from "../../lib/attachmentUploadState";
+import type { AttachmentUploadState } from "../../lib/attachmentUploadState";
+import { useAttachmentUploadProgress } from "../../hooks/useAttachmentUploadProgress";
 import { isHeicImageFile } from "../../lib/imageCompression";
 import {
   type PendingSnapShotAnimation,
@@ -47,6 +48,30 @@ import {
 } from "./SnapShotAttachmentDetails";
 import { prepareVideoFirstFrame } from "../../lib/videoFirstFrame";
 
+function ComposerAttachmentUploadProgress({
+  id,
+  upload,
+  fallback,
+}: {
+  id: string;
+  upload: AttachmentUploadState | undefined;
+  fallback?: string;
+}) {
+  return useAttachmentUploadProgress(id, upload) ?? fallback ?? null;
+}
+
+function ComposerImageFallback() {
+  return (
+    <span
+      role="img"
+      aria-label="Image attachment"
+      className="flex size-full items-center justify-center p-3 text-secondary-label"
+    >
+      <ImageIcon aria-hidden="true" className="size-4" />
+    </span>
+  );
+}
+
 function ComposerVideoThumbnail({ file }: { file: File }) {
   const setVideo = (video: HTMLVideoElement | null) => {
     if (!video) return;
@@ -214,21 +239,17 @@ export function ComposerAttachmentMediaRow({
                           name={ready.name}
                           mimeType={ready.mimeType}
                           src={ready.previewUrl}
-                          alt={image.name}
+                          alt=""
                           className="h-full w-full object-cover"
                         />
                       ) : (
-                        <span className="flex h-full items-center justify-center px-1 text-3xs text-secondary-label">
-                          {image.name}
-                        </span>
+                        <ComposerImageFallback />
                       )
                     }
                   />
                 </button>
               ) : (
-                <div className="flex h-full w-full items-center justify-center px-1 text-center text-3xs text-secondary-label">
-                  {image.name}
-                </div>
+                <ComposerImageFallback />
               )}
               {source?.kind === "snap-shot" ? (
                 <SnapShotAttachmentDetails
@@ -257,10 +278,12 @@ export function ComposerAttachmentMediaRow({
                   </TooltipPopup>
                 </Tooltip>
               )}
-              {(ready ? upload?.status === "uploading" : supportsAttachmentUploads) && (
+              {(!ready || upload?.status === "uploading") && (
                 <span className="pointer-events-none absolute inset-x-0 bottom-0 bg-background/85 px-1 text-center text-3xs text-foreground">
-                  {formatAttachmentUploadProgress(
-                    upload?.status === "uploading" ? upload.progress : 0,
+                  {upload?.status === "uploading" ? (
+                    <ComposerAttachmentUploadProgress id={image.id} upload={upload} />
+                  ) : (
+                    "Preparing"
                   )}
                 </span>
               )}
@@ -359,7 +382,7 @@ export function ComposerAttachmentMediaRow({
             </button>
             {upload?.status === "uploading" && (
               <span className="pointer-events-none absolute inset-x-0 bottom-0 bg-background/85 px-1 text-center text-3xs text-foreground">
-                {formatAttachmentUploadProgress(upload.progress)}
+                <ComposerAttachmentUploadProgress id={file.id} upload={upload} />
               </span>
             )}
             {upload?.status === "failed" && (
@@ -453,13 +476,21 @@ export function ComposerAttachmentFileList({
               {file.name}
             </button>
             <span className="shrink-0 text-xs text-secondary-label">
-              {needsReattach
-                ? canReattachFile
-                  ? "Attach again"
-                  : "Remove to send"
-                : upload?.status === "uploading"
-                  ? formatAttachmentUploadProgress(upload.progress)
-                  : formatAttachmentSize(file.sizeBytes)}
+              {needsReattach ? (
+                canReattachFile ? (
+                  "Attach again"
+                ) : (
+                  "Remove to send"
+                )
+              ) : upload?.status === "uploading" ? (
+                <ComposerAttachmentUploadProgress
+                  id={file.id}
+                  upload={upload}
+                  fallback={formatAttachmentSize(file.sizeBytes)}
+                />
+              ) : (
+                formatAttachmentSize(file.sizeBytes)
+              )}
             </span>
             {!needsReattach && upload?.status === "failed" ? (
               <Tooltip>
diff --git a/apps/web/src/components/chat/ComposerImageThumbnail.browser.test.tsx b/apps/web/src/components/chat/ComposerImageThumbnail.browser.test.tsx
new file mode 100644
index 0000000000000..9994d1552027a
--- /dev/null
+++ b/apps/web/src/components/chat/ComposerImageThumbnail.browser.test.tsx
@@ -0,0 +1,69 @@
+import { expect, it, vi } from "vite-plus/test";
+
+import { act, render } from "../../../test/render";
+import { createComposerImageThumbnail } from "../../lib/imageCompression";
+import { ComposerImageThumbnail } from "./ComposerImageThumbnail";
+
+it("keeps a native preview available after thumbnail generation has failed", async () => {
+  const canvas = document.createElement("canvas");
+  canvas.width = 2;
+  canvas.height = 2;
+  const blob = await new Promise<Blob>((resolve) => canvas.toBlob((blob) => resolve(blob!)));
+  const file = new File([blob], "screenshot.png", { type: "image/png" });
+  using _bitmap = vi
+    .spyOn(window, "createImageBitmap")
+    .mockRejectedValue(new Error("Thumbnail decoder unavailable"));
+  expect(await createComposerImageThumbnail(file)).toBeNull();
+
+  const container = document.createElement("div");
+  const holdLoad = (event: Event) => event.stopPropagation();
+  container.addEventListener("load", holdLoad, true);
+  using complete = vi.spyOn(HTMLImageElement.prototype, "complete", "get").mockReturnValue(false);
+  await using screen = await render(
+    <ComposerImageThumbnail
+      file={file}
+      alt={file.name}
+      className="size-16 object-cover"
+      fallback={<span>Preview unavailable</span>}
+    />,
+    { container },
+  );
+  using revoke = vi.spyOn(URL, "revokeObjectURL");
+  await expect.element(screen.getByText("Preview unavailable")).toBeVisible();
+  const loadingImage = screen.container.querySelector("img")!;
+  await loadingImage.decode();
+  complete.mockRestore();
+  container.removeEventListener("load", holdLoad, true);
+  await act(() => loadingImage.dispatchEvent(new Event("load")));
+  const image = screen.getByRole("img", { name: file.name });
+  await expect.element(image).toBeVisible();
+  await expect.element(screen.getByText("Preview unavailable")).not.toBeInTheDocument();
+  const src = image.element().getAttribute("src");
+  expect(src).toMatch(/^blob:/);
+  await screen.unmount();
+  expect(revoke).toHaveBeenCalledWith(src);
+});
+
+it("shows the fallback while HEIC preparation is pending", async () => {
+  let finishReading!: (bytes: ArrayBuffer) => void;
+  const metadata = new Promise<ArrayBuffer>((resolve) => {
+    finishReading = resolve;
+  });
+  using _read = vi.spyOn(Blob.prototype, "arrayBuffer").mockReturnValue(metadata);
+  const file = new File(["pending"], "photo.heic", { type: "image/heic" });
+
+  await using screen = await render(
+    <ComposerImageThumbnail
+      file={file}
+      alt={file.name}
+      className="size-16 object-cover"
+      fallback={<span role="img" aria-label="Preparing image" />}
+    />,
+  );
+  try {
+    expect(screen.container.querySelector('[aria-label="Preparing image"]')).not.toBeNull();
+  } finally {
+    finishReading(new ArrayBuffer(0));
+    await createComposerImageThumbnail(file);
+  }
+});
diff --git a/apps/web/src/components/chat/ComposerImageThumbnail.tsx b/apps/web/src/components/chat/ComposerImageThumbnail.tsx
index 68158c7151b2f..b6fc4d2b9a482 100644
--- a/apps/web/src/components/chat/ComposerImageThumbnail.tsx
+++ b/apps/web/src/components/chat/ComposerImageThumbnail.tsx
@@ -33,11 +33,7 @@ export const ComposerImageThumbnail = memo(function ComposerImageThumbnail({
     let disposed = false;
     let localUrl: string | undefined;
     const cached = readComposerImageThumbnail(file);
-    if (
-      file.size <= MAX_COMPRESSIBLE_SOURCE_BYTES &&
-      !isHeicImageFile(file) &&
-      cached === undefined
-    ) {
+    if (file.size <= MAX_COMPRESSIBLE_SOURCE_BYTES && !isHeicImageFile(file) && !cached) {
       localUrl = URL.createObjectURL(file);
       // oxlint-disable-next-line react/set-state-in-effect -- the blob URL is created and revoked by this effect
       setPreview({ file, src: localUrl });
@@ -66,17 +62,20 @@ export const ComposerImageThumbnail = memo(function ComposerImageThumbnail({
   }, [file]);
 
   return src && failedSrc !== src ? (
-    <img
-      ref={(image) => {
-        if (image?.complete && image.naturalWidth > 0) setLoadedSrc(src);
-      }}
-      src={src}
-      alt={alt}
-      onLoad={() => setLoadedSrc(src)}
-      onError={() => setFailedSrc(src)}
-      className={cn(className, loadedSrc !== src && "invisible")}
-    />
-  ) : src === undefined ? null : (
+    <span className="relative block size-full">
+      {loadedSrc !== src && fallback}
+      <img
+        ref={(image) => {
+          if (image?.complete && image.naturalWidth > 0) setLoadedSrc(src);
+        }}
+        src={src}
+        alt={alt}
+        onLoad={() => setLoadedSrc(src)}
+        onError={() => setFailedSrc(src)}
+        className={cn(className, loadedSrc !== src && "invisible absolute inset-0")}
+      />
+    </span>
+  ) : (
     fallback
   );
 });
diff --git a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
index a19e7f205cef9..c25eacd506715 100644
--- a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
+++ b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
@@ -205,7 +205,7 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
           isCollapsed ? "Show the question and its options" : "Hide the question and its options"
         }
         data-pending-user-input-toggle={isCollapsed ? "collapsed" : "expanded"}
-        className="px-4 pt-1.5"
+        className="px-4 py-1.5"
       >
         <ComposerBanner.Content>
           <span
@@ -262,7 +262,7 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
               text={activeQuestion.question}
               cwd={cwd}
               threadRef={threadRef}
-              className={cn("pt-2 text-foreground/85", questionTextAlign)}
+              className={cn("pt-0.5 text-foreground/85", questionTextAlign)}
             />
             {/* Rows span the header row's width so the radios align with the question text and the shortcut column sits under the dismiss button. */}
             <div className="-ms-2 mt-1.5 sm:-ms-1.5">
diff --git a/apps/web/src/components/chat/LinkRequestCard.tsx b/apps/web/src/components/chat/LinkRequestCard.tsx
index a9bdd0fb1114a..f4a7fbfb7c133 100644
--- a/apps/web/src/components/chat/LinkRequestCard.tsx
+++ b/apps/web/src/components/chat/LinkRequestCard.tsx
@@ -1,6 +1,7 @@
 import { pipe } from "effect/Function";
 import { useAtomValue } from "@effect/atom-react";
 import {
+  ANOTHER_ADDRESS,
   type LinkableMachine,
   linkRequestAnswerInput,
   linkRequestDefaultAccess,
@@ -8,6 +9,7 @@ import {
   linkRequestFailureMessage,
   linkRequestInitialMachine,
   type LinkRequestItem,
+  linkRequestTarget,
   linkRequestTargetName,
   rankMachinesByHint,
 } from "@t3tools/client-runtime/link-request";
@@ -33,7 +35,7 @@ import { useAtomCommand } from "../../state/use-atom-command";
 import { accessConfig } from "../auth/ConnectAgentSurface";
 import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
 import { LinkAccessPicker } from "../settings/LinkAccessPicker";
-import { ANOTHER_ADDRESS, LinkMachineBadge } from "../settings/LinkMachineSelect";
+import { LinkAddressWarning, LinkMachineBadge } from "../settings/LinkMachineSelect";
 import { Button } from "../ui/button";
 import { Dialog } from "../ui/dialog";
 import { Input } from "../ui/input";
@@ -122,9 +124,6 @@ function PendingLinkRequest(props: {
             : `Link ${target} to this environment`}
         </p>
         {item.reason.trim() ? <p className="text-sm text-muted-foreground">{item.reason}</p> : null}
-        {item.label !== undefined && item.url !== undefined ? (
-          <p className="truncate text-xs text-muted-foreground/80">{item.url}</p>
-        ) : null}
       </div>
       {error !== null ? (
         <p role="alert" className="text-xs text-destructive">
@@ -161,41 +160,6 @@ function PendingLinkRequest(props: {
   );
 }
 
-/**
- * What the dialog links: a machine from the client's catalog, or an address.
- * `urls` is empty when the client knows no direct address for the machine,
- * so the user types one.
- */
-type DialogTarget =
-  | { readonly kind: "none" }
-  | {
-      readonly kind: "machine";
-      readonly environmentId: EnvironmentId;
-      readonly label: string;
-      readonly urls: ReadonlyArray<string>;
-      readonly linked: boolean;
-    }
-  | { readonly kind: "address" };
-
-function resolveTarget(
-  item: LinkRequestItem,
-  machines: ReadonlyArray<LinkableMachine>,
-  choice: string | null,
-): DialogTarget {
-  if (item.environmentId === undefined && item.url !== undefined) return { kind: "address" };
-  const chosen = item.environmentId ?? choice;
-  if (chosen === null) return { kind: "none" };
-  if (chosen === ANOTHER_ADDRESS) return { kind: "address" };
-  const machine = machines.find((candidate) => candidate.environmentId === chosen);
-  return {
-    kind: "machine",
-    environmentId: machine?.environmentId ?? (chosen as EnvironmentId),
-    label: machine?.label ?? linkRequestTargetName(item),
-    urls: [...new Set([...(machine?.urls ?? []), ...(item.url === undefined ? [] : [item.url])])],
-    linked: machine?.linked ?? false,
-  };
-}
-
 /** The dialog's steps: where to link, then what agents may do there. */
 type LinkStep = "machine" | "access";
 
@@ -229,19 +193,24 @@ function LinkRequestDialog(props: {
     reportDefect: false,
   });
   const selected = choice ?? linkRequestInitialMachine(item, machines);
-  const target = resolveTarget(item, machines, selected);
+  const target = linkRequestTarget(item, machines, selected);
   const targetName = target.kind === "machine" ? target.label : linkRequestTargetName(item);
-  // This client can mint a code there when it is connected to that
-  // environment with a session that may create pairing links.
   const targetId = target.kind === "machine" ? target.environmentId : null;
   const connected = usePreparedConnection(targetId);
   const mayMint = useEnvironmentScope(targetId, AuthAccessWriteScope);
-  const canMint =
-    targetId !== null && Option.isSome(connected) && mayMint && !mintFailed.has(targetId);
   const needsAddress =
     target.kind === "address" || (target.kind === "machine" && target.urls.length === 0);
+  // This client mints a code there when it is connected with a session that may
+  // create pairing links, and only for its own addresses: anything can answer
+  // as that machine at one typed in, so that one gets a code the user fetched.
+  const canMint =
+    targetId !== null &&
+    !needsAddress &&
+    Option.isSome(connected) &&
+    mayMint &&
+    !mintFailed.has(targetId);
   // An address the agent gave is already filled in; only one the user must type is asked for.
-  const asksAddress = needsAddress && !(item.url !== undefined && item.environmentId === undefined);
+  const asksAddress = needsAddress && item.url === undefined;
   const useExisting = target.kind === "machine" && target.linked;
   // A named machine with an address it answers at has nothing to choose before access.
   const steps: ReadonlyArray<LinkStep> =
@@ -287,10 +256,7 @@ function LinkRequestDialog(props: {
     }
     return linkRequestAnswerInput(item, {
       type: "link",
-      target:
-        target.kind === "address"
-          ? { url: address }
-          : { ...target, urls: needsAddress ? [address.trim()] : target.urls },
+      target: target.kind === "machine" && target.urls.length > 0 ? target : { url: address },
       access,
       pairingCode: code,
     });
@@ -393,11 +359,12 @@ function LinkRequestDialog(props: {
               </>
             ) : (
               <>
-                {item.url !== undefined && !pickMachine ? (
+                {item.url !== undefined && target.kind === "machine" ? (
                   <p className="truncate text-xs text-muted-foreground">{item.url}</p>
                 ) : null}
                 {useExisting ? null : (
                   <>
+                    {needsAddress ? <LinkAddressWarning address={address} /> : null}
                     {canMint ? null : (
                       <label className="block space-y-1.5">
                         <span className="block text-xs font-medium text-foreground">
diff --git a/apps/web/src/components/chat/McpAppFrame.tsx b/apps/web/src/components/chat/McpAppFrame.tsx
index fc697333d6108..d1be91fd6e677 100644
--- a/apps/web/src/components/chat/McpAppFrame.tsx
+++ b/apps/web/src/components/chat/McpAppFrame.tsx
@@ -12,6 +12,7 @@ import {
 import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
 import {
   clampMcpAppHeight,
+  MCP_APP_COLOR_SCHEME_PARAM,
   MCP_APP_DEFAULT_HEIGHT,
   MCP_APP_MAX_HEIGHT,
   mcpAppAllowAttribute,
@@ -125,7 +126,12 @@ export function McpAppFrame(props: {
   // The frame keeps its first URL: a re-minted one would reload the app.
   const [src, setSrc] = useState<string | null>(null);
   const asset = useLongLivedAssetUrl(src === null ? props.environmentId : null, resource);
-  if (src === null && asset._tag === "Success") setSrc(asset.url);
+  if (src === null && asset._tag === "Success") {
+    // The app paints before `ui/initialize`, so it reads the initial scheme from its URL.
+    const url = new URL(asset.url);
+    url.searchParams.set(MCP_APP_COLOR_SCHEME_PARAM, theme.appearance);
+    setSrc(url.toString());
+  }
 
   const detail = useTurnItemDetail({
     environmentId: props.environmentId,
diff --git a/apps/web/src/components/chat/RightPanelSurfaceContent.tsx b/apps/web/src/components/chat/RightPanelSurfaceContent.tsx
index f0d8afa5f319c..5ba6985e19d21 100644
--- a/apps/web/src/components/chat/RightPanelSurfaceContent.tsx
+++ b/apps/web/src/components/chat/RightPanelSurfaceContent.tsx
@@ -150,6 +150,10 @@ export function RightPanelSurfaceContent(props: {
             number: surface.number,
           }}
           initialTab={surface.detailTab ?? "summary"}
+          revealUrl={surface.revealUrl}
+          onRevealSettled={(revealUrl) => {
+            useRightPanelStore.getState().settlePullRequestReveal(threadRef, surface.id, revealUrl);
+          }}
           onTabChange={(tab) => {
             useRightPanelStore.getState().setPullRequestDetailTab(threadRef, surface.id, tab);
           }}
diff --git a/apps/web/src/components/chat/TimelineUserMessageRow.tsx b/apps/web/src/components/chat/TimelineUserMessageRow.tsx
index 79f0c1fc9a41d..808e52714da36 100644
--- a/apps/web/src/components/chat/TimelineUserMessageRow.tsx
+++ b/apps/web/src/components/chat/TimelineUserMessageRow.tsx
@@ -1,5 +1,6 @@
 import { InlineAudioPreview } from "../files/InlineAudioPreview";
 import { filePreviewKind } from "@t3tools/shared/filePreview";
+import { remarkEnableOrderedListNumbers } from "@t3tools/shared/markdownPipeline";
 import { findRevealRef } from "./markdownFindContext";
 import {
   type EnvironmentId,
@@ -1184,6 +1185,8 @@ const CollapsibleUserMessageBody = memo(function CollapsibleUserMessageBody(prop
   );
 });
 
+const USER_MESSAGE_REMARK_PLUGINS = [remarkEnableOrderedListNumbers];
+
 const UserMessageBody = memo(function UserMessageBody(props: {
   text: string;
   renderContextReference?: (reference: ChatMarkdownContextReference) => ReactNode;
@@ -1200,9 +1203,10 @@ const UserMessageBody = memo(function UserMessageBody(props: {
       cwd={props.markdownCwd}
       threadRef={ctx.threadRef ?? undefined}
       skills={props.skills}
-      className="text-foreground"
+      className="text-foreground user-message-markdown"
       lineBreaks
       parseRawHtml={false}
+      extraRemarkPlugins={USER_MESSAGE_REMARK_PLUGINS}
       renderContextReference={props.renderContextReference}
       headingLevelOffset={MESSAGE_HEADING_LEVEL}
     />
diff --git a/apps/web/src/components/composerContextPresentation.tsx b/apps/web/src/components/composerContextPresentation.tsx
index 845e921725b55..ad9be211cb3cf 100644
--- a/apps/web/src/components/composerContextPresentation.tsx
+++ b/apps/web/src/components/composerContextPresentation.tsx
@@ -15,10 +15,8 @@ import { ComposerContextActionsContext } from "./composerContextActions";
 import type { ComposerFileAttachment, ComposerImageAttachment } from "~/composerDraftStore";
 import { composerFileNeedsReattach } from "~/composerDraftStore";
 import { useTheme } from "~/hooks/useTheme";
-import {
-  formatAttachmentUploadProgress,
-  type AttachmentUploadState,
-} from "~/lib/attachmentUploadState";
+import type { AttachmentUploadState } from "~/lib/attachmentUploadState";
+import { useAttachmentUploadProgress } from "~/hooks/useAttachmentUploadProgress";
 import { PullRequestGlyph } from "~/components/pullRequest/pullRequestIcons";
 import {
   fileContextReference,
@@ -167,10 +165,13 @@ function ContextChip(props: {
   );
 }
 
-function uploadStatusSuffix(upload: AttachmentUploadState | undefined): string | null {
-  if (upload?.status === "uploading") return formatAttachmentUploadProgress(upload.progress);
+function useUploadStatusSuffix(
+  key: string,
+  upload: AttachmentUploadState | undefined,
+): string | null {
+  const progress = useAttachmentUploadProgress(key, upload);
   if (upload?.status === "failed") return "upload failed";
-  return null;
+  return progress;
 }
 
 function attachmentTooltip(
@@ -187,6 +188,7 @@ function ImageContextChip(props: {
   upload: AttachmentUploadState | undefined;
 }) {
   const actions = use(ComposerContextActionsContext);
+  const suffix = useUploadStatusSuffix(props.record.id, props.upload);
   return (
     <Tooltip>
       <TooltipTrigger
@@ -195,7 +197,7 @@ function ImageContextChip(props: {
             name={props.record.name}
             previewUrl={props.record.previewUrl}
             size={formatAttachmentSize(props.record.sizeBytes)}
-            suffix={uploadStatusSuffix(props.upload)}
+            suffix={suffix}
             onClick={() => actions.expandImage(props.record.id)}
           />
         }
@@ -214,7 +216,8 @@ function FileContextChip(props: {
   const actions = use(ComposerContextActionsContext);
   const { resolvedTheme } = useTheme();
   const needsReattach = composerFileNeedsReattach(props.record);
-  const suffix = needsReattach ? "attach again" : uploadStatusSuffix(props.upload);
+  const uploadSuffix = useUploadStatusSuffix(props.record.id, props.upload);
+  const suffix = needsReattach ? "attach again" : uploadSuffix;
   const size = formatAttachmentSize(props.record.sizeBytes);
   const isVideo = videoMimeType(props.record) !== null;
   return (
diff --git a/apps/web/src/components/diffs/useCodeViewFileReveal.test.ts b/apps/web/src/components/diffs/useCodeViewFileReveal.test.ts
index c153120d2b481..d82c09ef2aa53 100644
--- a/apps/web/src/components/diffs/useCodeViewFileReveal.test.ts
+++ b/apps/web/src/components/diffs/useCodeViewFileReveal.test.ts
@@ -6,11 +6,13 @@ import { createCodeViewFileReveal } from "./useCodeViewFileReveal";
 function viewer(initialItems: ReadonlyArray<string>) {
   const items = new Set(initialItems);
   const scrolls: CodeViewScrollTarget[] = [];
+  const collapsed = new Set<string>();
   return {
     items,
+    collapsed,
     scrolls,
     getInstance: () => ({}),
-    getItem: (id: string) => (items.has(id) ? {} : undefined),
+    getItem: (id: string) => (items.has(id) ? { collapsed: collapsed.has(id) } : undefined),
     scrollTo: (target: CodeViewScrollTarget) => scrolls.push(target),
   };
 }
@@ -24,6 +26,13 @@ describe("createCodeViewFileReveal", () => {
     reveal.request("a");
 
     expect(view.scrolls).toEqual([{ type: "item", id: "a", align: "start" }]);
+    const range = { start: 12, side: "deletions", end: 15, endSide: "additions" } as const;
+    view.collapsed.add("a");
+    reveal.request("a", range);
+    expect(view.scrolls).toHaveLength(1);
+    view.collapsed.delete("a");
+    reveal.flush();
+    expect(view.scrolls.at(-1)).toEqual({ type: "range", id: "a", range, align: "center" });
   });
 
   it("keeps a missing file pending until a flush finds it, then drops it", () => {
@@ -54,19 +63,126 @@ describe("createCodeViewFileReveal", () => {
     expect(view.scrolls).toEqual([{ type: "item", id: "a", align: "start" }]);
   });
 
-  it("drops a pending reveal when its viewer detaches, and positions the next viewer on request", () => {
+  it("renders the destination file and expands context before positioning its range", () => {
+    const reveal = createCodeViewFileReveal();
+    const view = viewer(["a"]);
+    let rendered = false;
+    let expanded = false;
+    const instance = {
+      revealLine: () => {
+        if (expanded) return false;
+        expanded = true;
+        return true;
+      },
+      getLinePosition: () => (expanded ? { top: 100, height: 20 } : undefined),
+    };
+    reveal.attach({
+      ...view,
+      getInstance: () => ({ getRenderedItems: () => (rendered ? [{ id: "a", instance }] : []) }),
+    });
+    const range = { start: 12, end: 15, side: "additions" } as const;
+    reveal.request("a", range);
+    expect(view.scrolls).toEqual([{ type: "item", id: "a", align: "start" }]);
+    rendered = true;
+    reveal.flush();
+    expect(expanded).toBe(true);
+    expect(view.scrolls).toHaveLength(1);
+    reveal.flush();
+    expect(view.scrolls.at(-1)).toEqual({ type: "range", id: "a", range, align: "center" });
+  });
+
+  it("expands a patch-only file to an unchanged line before positioning it", () => {
+    const reveal = createCodeViewFileReveal();
+    const view = viewer(["a"]);
+    let partial = true;
+    const expanded: unknown[] = [];
+    const instance = {
+      getDiffForSearch: () =>
+        ({
+          isPartial: partial,
+          hunks: [{ additionStart: 10, additionCount: 5, deletionStart: 10, deletionCount: 5 }],
+        }) as never,
+      expandHunk: (...args: unknown[]) => expanded.push(args),
+      revealLine: () => false,
+      getLinePosition: () => ({ top: 100, height: 20 }),
+    };
+    reveal.attach({
+      ...view,
+      getInstance: () => ({ getRenderedItems: () => [{ id: "a", instance }] }),
+    });
+    const range = { start: 30, end: 30, side: "additions" } as const;
+    reveal.request("a", range);
+    expect(expanded).toEqual([[1, "up", 26]]);
+    reveal.flush();
+    expect(view.scrolls).toEqual([]);
+    // The expander loads the file; the next render holds the line.
+    partial = false;
+    reveal.flush();
+    expect(view.scrolls).toEqual([{ type: "range", id: "a", range, align: "center" }]);
+
+    // Removed lines always sit in a hunk, and a deleted file has no contents to load.
+    const deleted = viewer(["d"]);
+    const removedRange = { start: 3, end: 4, side: "deletions" } as const;
+    reveal.attach({
+      ...deleted,
+      getInstance: () => ({
+        getRenderedItems: () => [
+          {
+            id: "d",
+            instance: {
+              ...instance,
+              getDiffForSearch: () =>
+                ({
+                  isPartial: true,
+                  hunks: [
+                    { additionStart: 0, additionCount: 0, deletionStart: 1, deletionCount: 8 },
+                  ],
+                }) as never,
+            },
+          },
+        ],
+      }),
+    });
+    reveal.request("d", removedRange);
+    expect(expanded).toHaveLength(1);
+    expect(deleted.scrolls).toEqual([
+      { type: "range", id: "d", range: removedRange, align: "center" },
+    ]);
+  });
+
+  it("drops a pending reveal when another diff's viewer replaces it, but repositions a range a remount loses", () => {
     const reveal = createCodeViewFileReveal();
     const first = viewer([]);
-    const second = viewer(["a"]);
+    // Item ids carry the diff's scope, so another diff's viewer holds other ids.
+    const second = viewer(["b"]);
     reveal.attach(first);
 
     reveal.request("a");
     reveal.attach(null);
     reveal.attach(second);
+    second.items.add("a");
     reveal.flush();
     expect(second.scrolls).toEqual([]);
 
     reveal.request("a");
     expect(second.scrolls).toHaveLength(1);
+
+    // The first diff load remounts the viewer right after a range scroll, so it is repeated once.
+    const range = { start: 3, end: 4, side: "additions" } as const;
+    const remounted = viewer(["a"]);
+    reveal.request("a", range);
+    reveal.attach(null);
+    reveal.attach(remounted);
+    reveal.flush();
+    expect(remounted.scrolls).toEqual([{ type: "range", id: "a", range, align: "center" }]);
+
+    // Scrolling away before that second pass keeps the user where they went.
+    const scrolledAway = viewer(["a"]);
+    reveal.request("a", range);
+    reveal.cancel();
+    reveal.attach(null);
+    reveal.attach(scrolledAway);
+    reveal.flush();
+    expect(scrolledAway.scrolls).toEqual([]);
   });
 });
diff --git a/apps/web/src/components/diffs/useCodeViewFileReveal.ts b/apps/web/src/components/diffs/useCodeViewFileReveal.ts
index f0779262dd1ac..60b76290fbe2f 100644
--- a/apps/web/src/components/diffs/useCodeViewFileReveal.ts
+++ b/apps/web/src/components/diffs/useCodeViewFileReveal.ts
@@ -1,37 +1,176 @@
-import type { CodeViewScrollTarget } from "@pierre/diffs";
+import type {
+  CodeViewScrollTarget,
+  SelectedLineRange,
+  FileDiffMetadata,
+  SelectionSide,
+} from "@pierre/diffs";
 import { useState } from "react";
 
 interface FileRevealHandle {
-  getInstance(): object | undefined;
-  getItem(id: string): object | undefined;
+  getInstance():
+    | {
+        getRenderedItems?(): readonly {
+          id: string;
+          instance: {
+            getDiffForSearch?(): FileDiffMetadata | undefined;
+            revealLine?(line: number): boolean;
+            expandHunk?(hunkIndex: number, direction: "up" | "down", lineCount: number): void;
+            getLinePosition(
+              line: number,
+              side?: SelectionSide,
+            ): { top: number; height: number } | undefined;
+          };
+        }[];
+      }
+    | undefined;
+  getItem(id: string): { collapsed?: boolean } | undefined;
   scrollTo(target: CodeViewScrollTarget): void;
 }
 
+// Mirrors the viewer's `revealLine`, which reads distances from the edges of the collapsed gap.
+function expandPartialDiffToLine(
+  diff: FileDiffMetadata,
+  line: number,
+  expandHunk: (hunkIndex: number, direction: "up" | "down", lineCount: number) => void,
+): boolean {
+  const { hunks } = diff;
+  if (
+    hunks.some(
+      (hunk) => line >= hunk.additionStart && line < hunk.additionStart + hunk.additionCount,
+    )
+  ) {
+    return false;
+  }
+  const next = hunks.findIndex((hunk) => line < hunk.additionStart);
+  const previous = next === -1 ? hunks.at(-1) : hunks[next - 1];
+  const fromStart = line - (previous ? previous.additionStart + previous.additionCount : 1) + 1;
+  const after = next === -1 ? undefined : hunks[next];
+  if (after === undefined) expandHunk(hunks.length, "up", fromStart + REVEAL_CONTEXT_LINES);
+  else if (fromStart <= after.additionStart - line) {
+    expandHunk(next, "up", fromStart + REVEAL_CONTEXT_LINES);
+  } else expandHunk(next, "down", after.additionStart - line + REVEAL_CONTEXT_LINES);
+  return true;
+}
+
+const REVEAL_CONTEXT_LINES = 10;
+
 /**
  * Scrolls a code view to a file. `attach` is the viewer's ref and `flush` its post-render
  * handler, so a reveal asked before the viewer mounts, or for a file it does not hold yet, is
- * positioned once it does. A reveal belongs to the diff it was asked of, so detaching the viewer,
- * such as remounting it for another diff scope, drops it.
+ * positioned once it does. A reveal belongs to the diff it was asked of, so a viewer remounted for
+ * another diff scope, which no longer holds the file, drops it.
  */
 export function createCodeViewFileReveal() {
   let viewer: FileRevealHandle | null = null;
-  let pending: string | null = null;
+  let detachedInstance: object | undefined;
+  let pending: {
+    id: string;
+    range?: SelectedLineRange;
+    positionedFile?: boolean;
+    loadingFile?: boolean;
+    settling?: boolean;
+  } | null = null;
   const flush = () => {
     if (pending === null || viewer === null) return;
-    if (!viewer.getInstance() || viewer.getItem(pending) === undefined) return;
-    viewer.scrollTo({ type: "item", id: pending, align: "start" });
-    pending = null;
+    const item = viewer.getItem(pending.id);
+    if (!viewer.getInstance() || item === undefined || item.collapsed === true) return;
+    const renderedItems = viewer.getInstance()?.getRenderedItems?.();
+    if (pending.range && renderedItems) {
+      const rendered = renderedItems.find((entry) => entry.id === pending?.id);
+      if (!rendered) {
+        if (!pending.positionedFile) {
+          pending.positionedFile = true;
+          viewer.scrollTo({ type: "item", id: pending.id, align: "start" });
+        }
+        return;
+      }
+      const diff = rendered.instance.getDiffForSearch?.();
+      const additionLine = (line: number, side: SelectionSide | undefined) => {
+        if (side !== "deletions" || !diff) return line;
+        const next = diff.hunks.find((hunk) => line < hunk.deletionStart + hunk.deletionCount);
+        const last = diff.hunks.at(-1);
+        return next
+          ? line + next.additionStart - next.deletionStart
+          : last
+            ? line +
+              last.additionStart +
+              last.additionCount -
+              last.deletionStart -
+              last.deletionCount
+            : line;
+      };
+      const { range } = pending;
+      const startLine = additionLine(range.start, range.side);
+      const endLine = additionLine(range.end, range.endSide ?? range.side);
+      // A patch-only diff holds no unchanged lines, and `revealLine` declines to expand it. The
+      // viewer's own expander loads the file first, so a line outside every hunk is opened with it.
+      if (diff?.isPartial && rendered.instance.expandHunk) {
+        // Wait for the file contents the expander asked for.
+        if (pending.loadingFile) return;
+        const { expandHunk } = rendered.instance;
+        // A removed line is always in a hunk, and a deleted file has no contents to load.
+        const removed = (line: number, side: SelectionSide | undefined) =>
+          side === "deletions" &&
+          diff.hunks.some(
+            (hunk) => line >= hunk.deletionStart && line < hunk.deletionStart + hunk.deletionCount,
+          );
+        const outside = [
+          ...new Set([
+            ...(removed(range.start, range.side) ? [] : [startLine]),
+            ...(removed(range.end, range.endSide ?? range.side) ? [] : [endLine]),
+          ]),
+        ];
+        const opened = outside.map((line) => expandPartialDiffToLine(diff, line, expandHunk));
+        if (opened.some(Boolean)) {
+          pending.loadingFile = true;
+          return;
+        }
+      }
+      const startExpanded = rendered.instance.revealLine?.(startLine);
+      const endExpanded = rendered.instance.revealLine?.(endLine);
+      if (startExpanded || endExpanded) return;
+      if (
+        !rendered.instance.getLinePosition(range.start, range.side) ||
+        !rendered.instance.getLinePosition(range.end, range.endSide ?? range.side)
+      )
+        return;
+    }
+    const target = pending;
+    // The diff's first load can remount the viewer or re-render it right after this scroll, which
+    // loses it; the range is positioned once more on the next render that can hold it.
+    pending = target.range && !target.settling ? { ...target, settling: true } : null;
+    viewer.scrollTo(
+      target.range
+        ? { type: "range", id: target.id, range: target.range, align: "center" }
+        : { type: "item", id: target.id, align: "start" },
+    );
   };
   return {
     attach(next: FileRevealHandle | null) {
-      if (viewer !== null && next !== viewer) pending = null;
+      // The viewer rebuilds its handle on every render and can remount during the diff's first
+      // load. Item ids carry the diff's scope, so only a viewer without the item drops the reveal.
+      const previous = viewer?.getInstance() ?? detachedInstance;
+      if (next === null) detachedInstance = previous;
+      else {
+        const instance = next.getInstance();
+        if (pending !== null && previous !== undefined && instance !== previous) {
+          if (instance === undefined || next.getItem(pending.id) === undefined) pending = null;
+          // A new instance starts from the patch again, so it must expand the line itself.
+          else pending.loadingFile = false;
+        }
+        detachedInstance = undefined;
+      }
       viewer = next;
       flush();
     },
-    request(fileKey: string) {
-      pending = fileKey;
+    request(fileKey: string, range?: SelectedLineRange) {
+      pending = { id: fileKey, ...(range ? { range } : {}) };
       flush();
     },
+    /** The user scrolled; a reveal still being positioned must not pull them back. */
+    cancel() {
+      pending = null;
+    },
     flush,
   };
 }
diff --git a/apps/web/src/components/pullRequest/PullRequestCodeTab.browser.test.tsx b/apps/web/src/components/pullRequest/PullRequestCodeTab.browser.test.tsx
index cea33e74ffc99..96ef692c4aa13 100644
--- a/apps/web/src/components/pullRequest/PullRequestCodeTab.browser.test.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestCodeTab.browser.test.tsx
@@ -1,3 +1,5 @@
+import { sha256 } from "@noble/hashes/sha2";
+import { bytesToHex } from "@noble/hashes/utils";
 import {
   EnvironmentId,
   ProjectId,
@@ -8,6 +10,8 @@ import {
 import { expect, it, vi } from "vite-plus/test";
 
 import "~/index.css";
+import { __setClientSettingsForTests } from "../../hooks/useSettings";
+import { DEFAULT_CLIENT_SETTINGS } from "@t3tools/contracts/settings";
 
 const { diffAtom, pagedDiffAtom } = await vi.hoisted(async () => {
   const { AsyncResult, Atom } = await import("effect/reactivity");
@@ -34,11 +38,13 @@ const { diffAtom, pagedDiffAtom } = await vi.hoisted(async () => {
   };
   const pages: Record<string, PullRequestDiffResult> = {
     first: {
-      patch: Array.from({ length: 40 }, (_, index) => filePatch(`early-${index}.ts`)).join(""),
+      patch: Array.from({ length: 40 }, (_, index) =>
+        filePatch(index === 1 ? "early-1.test.ts" : `early-${index}.ts`),
+      ).join(""),
       truncated: true,
       nextCursor: "page-2",
     },
-    "page-2": { patch: filePatch("late.ts"), truncated: false, nextCursor: null },
+    "page-2": { patch: filePatch("late.test.ts"), truncated: false, nextCursor: null },
   };
   return {
     // An environment query whose refetch returns equal content hands back the previous value
@@ -126,6 +132,8 @@ const detail: PullRequestDetailView = {
 };
 
 function setup({ paged }: { paged: boolean }) {
+  window.localStorage.removeItem("t3code.diffHideTestFiles");
+  __setClientSettingsForTests(DEFAULT_CLIENT_SETTINGS);
   mocks.paged = paged;
   mocks.diffCommits = [];
 }
@@ -133,6 +141,8 @@ function setup({ paged }: { paged: boolean }) {
 const tab = (
   refreshToken: number,
   revealRequest: { readonly path: string; readonly nonce: number } | null = null,
+  revealUrl?: string,
+  onRevealSettled?: (url: string) => void,
 ) => (
   <PullRequestCodeTab
     scrollerRef={() => {}}
@@ -144,6 +154,8 @@ const tab = (
     onRefresh={() => {}}
     refreshToken={refreshToken}
     revealRequest={revealRequest}
+    revealUrl={revealUrl}
+    onRevealSettled={onRevealSettled}
   />
 );
 
@@ -193,13 +205,30 @@ it("scrolls to a file asked for as the tab opens", async () => {
 
 it("pages forward to a file asked for that is not loaded yet, then scrolls to it", async () => {
   setup({ paged: true });
+  __setClientSettingsForTests({ ...DEFAULT_CLIENT_SETTINGS, diffFilesCollapsed: true });
+  using _preferences = {
+    [Symbol.dispose]() {
+      window.localStorage.removeItem("t3code.diffHideTestFiles");
+      __setClientSettingsForTests(DEFAULT_CLIENT_SETTINGS);
+    },
+  };
   const container = pagedContainer();
   await using screen = await render(tab(0), { container });
   await expect.element(screen.getByText("early-0.ts", { exact: true }).first()).toBeVisible();
+  await screen.getByRole("button", { name: "Hide test files" }).click();
 
-  await screen.rerender(tab(0, { path: "late.ts", nonce: 1 }));
+  const url = `${detail.url}/files#diff-${bytesToHex(sha256(new TextEncoder().encode("late.test.ts")))}R4-R5`;
+  const settled = vi.fn();
+  await screen.rerender(tab(0, null, url, settled));
 
-  await expectFileHeaderShown(screen, container, "late.ts");
+  await expectFileHeaderShown(screen, container, "late.test.ts");
+  await expect.element(screen.getByText("three()", { exact: true })).toBeVisible();
+  await vi.waitFor(() => expect(settled).toHaveBeenCalledWith(url));
+  // A settled link keeps its test file past the filter, and a later click reveals it again.
+  await screen.rerender(tab(0, { path: "early-0.ts", nonce: 1 }));
+  await expectFileHeaderShown(screen, container, "early-0.ts");
+  await screen.rerender(tab(0, { path: "early-0.ts", nonce: 1 }, url, settled));
+  await expectFileHeaderShown(screen, container, "late.test.ts");
 });
 
 it("never requests the diff of a selected commit the pull request no longer has", async () => {
@@ -235,3 +264,37 @@ it("never requests the diff of a selected commit the pull request no longer has"
     .toBeVisible();
   expect(mocks.diffCommits).not.toContain("gone");
 });
+
+it("answers a commit's diff link only once that commit's diff is shown", async () => {
+  setup({ paged: false });
+  const container = document.createElement("div");
+  container.className = "flex h-[700px] w-[900px]";
+  const oid = "c".repeat(40);
+  const withCommit = {
+    ...detail,
+    commits: [{ oid, messageHeadline: "Linked commit", committedDate: "2026-09-01T00:00:00Z" }],
+  };
+  const url = `${detail.url}/commits/${oid}#diff-${bytesToHex(sha256(new TextEncoder().encode("a.ts")))}R2`;
+  const settled = vi.fn();
+  const scoped = (selectedCommitOid: string | null, revealUrl?: string) => (
+    <PullRequestCodeTab
+      scrollerRef={() => {}}
+      environmentId={EnvironmentId.make("environment")}
+      reference={detail}
+      detail={withCommit}
+      selectedCommitOid={selectedCommitOid}
+      onSelectedCommitChange={() => {}}
+      onRefresh={() => {}}
+      revealUrl={revealUrl}
+      onRevealSettled={settled}
+    />
+  );
+  await using screen = await render(scoped(null), { container });
+  await expect.element(screen.getByText("1 file", { exact: true })).toBeVisible();
+
+  // The panel selects the link's commit after this tab has already seen the link.
+  await screen.rerender(scoped(null, url));
+  expect(settled).not.toHaveBeenCalled();
+  await screen.rerender(scoped(oid, url));
+  await vi.waitFor(() => expect(settled).toHaveBeenCalledWith(url));
+});
diff --git a/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx b/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
index 31fd309348be7..554b9f19b14e1 100644
--- a/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
@@ -1,3 +1,8 @@
+import {
+  parsePullRequestAnchor,
+  pullRequestDiffPathMatches,
+  pullRequestLinkCommit,
+} from "@t3tools/shared/pullRequestAnchor";
 import {
   capitalizeTerm,
   sourceControlClients,
@@ -348,6 +353,8 @@ function PullRequestCodeTab({
   refreshToken = 0,
   backgroundRefreshToken = 0,
   revealRequest = null,
+  revealUrl,
+  onRevealSettled,
 }: {
   scrollerRef: (node: HTMLDivElement | null) => void;
   environmentId: EnvironmentId;
@@ -364,6 +371,9 @@ function PullRequestCodeTab({
   onRefresh: () => void;
   refreshToken?: number;
   backgroundRefreshToken?: number;
+  /** A clicked link to a file or line range, until onRevealSettled reports it shown. */
+  revealUrl?: string | undefined;
+  onRevealSettled?: ((revealUrl: string) => void) | undefined;
   revealRequest?: { readonly path: string; readonly nonce: number } | null;
 }) {
   const resolvedTheme = useRenderedAppearance();
@@ -575,6 +585,20 @@ function PullRequestCodeTab({
     `pull-request:${scopeKey}:${resolvedTheme}:${ignoreWhitespace}`,
     ignoreWhitespace,
   );
+  const linkAnchor = parsePullRequestAnchor(revealUrl);
+  const linkFile =
+    linkAnchor?.kind === "diff"
+      ? loadedFiles.find((file) =>
+          pullRequestDiffPathMatches(linkAnchor.digest, resolveFileDiffPath(file)),
+        )
+      : undefined;
+  const pendingLinkPath = linkFile ? resolveFileDiffPath(linkFile) : null;
+  // The linked file stays shown past the test-file filter after the link settles.
+  const [revealedLink, setRevealedLink] = useState<{
+    readonly scope: string;
+    readonly path: string;
+  } | null>(null);
+  const linkPath = pendingLinkPath ?? (revealedLink?.scope === scopeKey ? revealedLink.path : null);
   const testFileCount = loadedFiles.filter((file) =>
     isTestChangedFile(resolveFileDiffPath(file)),
   ).length;
@@ -582,7 +606,7 @@ function PullRequestCodeTab({
   const files = hideTestFiles
     ? loadedFiles.filter((file) => {
         const path = resolveFileDiffPath(file);
-        return path === revealRequest?.path || !isTestChangedFile(path);
+        return path === revealRequest?.path || path === linkPath || !isTestChangedFile(path);
       })
     : loadedFiles;
   const hiddenTestFileCount = loadedFiles.length - files.length;
@@ -790,7 +814,7 @@ function PullRequestCodeTab({
     setFileViewed,
   };
 
-  const revealFile = (path: string) => {
+  const revealFile = (path: string, range?: SelectedLineRange) => {
     const item = items.find((candidate) => resolveFileDiffPath(candidate.fileDiff) === path);
     if (item === undefined) return;
     // Unfold only: a second reveal before the unfold renders must not fold the file again.
@@ -799,7 +823,8 @@ function PullRequestCodeTab({
         toggleFileDiffFoldForViewed(item.id, false, effectiveFoldOverride, current),
       );
     }
-    codeViewReveal.request(item.id);
+    if (range) setSelectedLines({ id: item.id, range });
+    codeViewReveal.request(item.id, range);
   };
 
   const toggleAllFiles = () => {
@@ -1430,6 +1455,53 @@ function PullRequestCodeTab({
     answerReveal();
     // oxlint-disable-next-line react/exhaustive-effect-dependencies -- Re-checked as pages load until the requested file arrives.
   }, [canLoadNextSlice, items, revealRequest]);
+  // The store clears a settled link after this render, so one link must not reveal twice.
+  const answeredLink = useRef<string | null>(null);
+  const revealLink = useEffectEvent(() => {
+    if (revealUrl === undefined) answeredLink.current = null;
+    if (revealUrl === undefined || linkAnchor?.kind !== "diff") return;
+    // The panel selects the link's commit after this tab's effects run, so the files on screen
+    // can still be another commit's.
+    const linkCommit = pullRequestLinkCommit(revealUrl);
+    if ((detail.commits.some((entry) => entry.oid === linkCommit) ? linkCommit : null) !== commit) {
+      return;
+    }
+    const key = `${scopeKey}:${revealUrl}`;
+    if (answeredLink.current === key) return;
+    if (
+      !pendingLinkPath ||
+      !items.some((item) => resolveFileDiffPath(item.fileDiff) === pendingLinkPath)
+    ) {
+      if (canLoadNextSlice) loadNextSlice();
+      // Every page is loaded and none has the file.
+      else if (!pendingLinkPath && loadedSlices.length > 0 && nextCursor === null) {
+        answeredLink.current = key;
+        onRevealSettled?.(revealUrl);
+      }
+      return;
+    }
+    answeredLink.current = key;
+    setRevealedLink({ scope: scopeKey, path: pendingLinkPath });
+    onRevealSettled?.(revealUrl);
+    const range = linkAnchor.range;
+    revealFile(
+      pendingLinkPath,
+      range
+        ? {
+            start: range.start,
+            end: range.end,
+            side: toViewerSide(range.side),
+            endSide: toViewerSide(range.endSide),
+          }
+        : undefined,
+    );
+  });
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- pages and scrolls the virtual diff to a clicked file or line range
+  useEffect(() => {
+    // oxlint-disable-next-line react/set-state-in-effect -- revealing unfolds the target and may request the next diff page
+    revealLink();
+    // oxlint-disable-next-line react/exhaustive-effect-dependencies -- retries the reveal as diff pages and viewer items arrive
+  }, [revealUrl, pendingLinkPath, canLoadNextSlice, items]);
   const withToolbar = (body: ReactNode) => (
     <div className="flex h-full min-h-0 flex-col">
       {toolbar}
@@ -1503,7 +1575,7 @@ function PullRequestCodeTab({
               </CollapsibleTrigger>
             </h2>
             <CollapsiblePanel>
-              <div className="max-h-64 space-y-3 overflow-auto px-4 pb-3">
+              <div className="max-h-64 space-y-1 overflow-auto px-1 pb-1">
                 {[...orphanFiles].map(([path, threads]) => (
                   <div key={path}>
                     <Tooltip>
@@ -1534,6 +1606,10 @@ function PullRequestCodeTab({
       <div className="flex min-h-0 flex-1 overflow-hidden">
         <div
           className="relative min-h-0 min-w-0 flex-1"
+          onWheelCapture={codeViewReveal.cancel}
+          onTouchStartCapture={codeViewReveal.cancel}
+          onPointerDownCapture={codeViewReveal.cancel}
+          onKeyDownCapture={codeViewReveal.cancel}
           // Headers live in shadow DOM; composedPath crosses that boundary.
           onClickCapture={(event) => {
             const composedPath = event.nativeEvent.composedPath?.() ?? [];
diff --git a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
index 9d0f6193f7e3f..81dea810bb0d0 100644
--- a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
@@ -1,3 +1,9 @@
+import {
+  parsePullRequestAnchor,
+  pullRequestLinkCommit,
+  resolvePullRequestReviewAnchor,
+  type PullRequestAnchor,
+} from "@t3tools/shared/pullRequestAnchor";
 import { projectChangeRequestUrl } from "@t3tools/client-runtime/change-request-links";
 import { normalizeThreadPullRequestKey } from "@t3tools/client-runtime/thread-pull-requests";
 import { useAtomValue } from "@effect/atom-react";
@@ -126,6 +132,8 @@ import {
   isStackedPullRequestBase,
   pullRequestActionNeedsHostRefresh,
   pullRequestCheckoutCommand,
+  pullRequestTimelineEventMatches,
+  buildPullRequestTimeline,
   pullRequestFindingKey,
   pullRequestHandoffLabels,
   PULL_REQUEST_MERGE_METHOD_LABELS,
@@ -255,6 +263,22 @@ function pullRequestStackReference(
       };
 }
 
+function linkedTab(anchor: PullRequestAnchor | null): PullRequestDetailTab | null {
+  switch (anchor?.kind) {
+    case "code":
+    case "diff":
+      return "code";
+    case "commits":
+    case "timeline":
+      return "timeline";
+    case "checks":
+    case "summary":
+      return "summary";
+    default:
+      return null;
+  }
+}
+
 export function PullRequestDetailPanel({
   environmentId,
   shortcutsEnabled,
@@ -271,6 +295,8 @@ export function PullRequestDetailPanel({
   onBack,
   onSelectPullRequest,
   onGuideShown,
+  revealUrl,
+  onRevealSettled,
   initialTab = "summary",
   onTabChange,
 }: {
@@ -297,6 +323,10 @@ export function PullRequestDetailPanel({
   composerDraftTarget?: ScopedThreadRef | DraftId;
   onBack?: (() => void) | undefined;
   onGuideShown?: (() => void) | undefined;
+  /** A clicked link into this pull request, waiting to be shown. */
+  revealUrl?: string | undefined;
+  /** Reports the link it was given shown or missing, so a newer link stays pending. */
+  onRevealSettled?: ((revealUrl: string) => void) | undefined;
   initialTab?: PullRequestDetailTab;
   onTabChange?: ((tab: PullRequestDetailTab) => void) | undefined;
 }) {
@@ -355,7 +385,10 @@ export function PullRequestDetailPanel({
     coreDetail,
     detail,
   } = usePullRequestDetail(environmentId, reference, matchingListEntry);
-  const [selectedTab, setTab] = useState<PullRequestDetailTab>(initialTab);
+  const revealAnchor = parsePullRequestAnchor(revealUrl);
+  const [selectedTab, setTab] = useState<PullRequestDetailTab>(
+    () => linkedTab(revealAnchor) ?? initialTab,
+  );
   const reviewGuidesEnabled = useEnvironmentSettings(
     environmentId,
     (settings) => settings.reviewGuidesEnabled,
@@ -379,7 +412,7 @@ export function PullRequestDetailPanel({
   const [codeCommitScope, setCodeCommitScope] = useState<{
     readonly pullRequestKey: string;
     readonly oid: string | null;
-  }>(() => ({ pullRequestKey, oid: null }));
+  }>(() => ({ pullRequestKey, oid: pullRequestLinkCommit(revealUrl) }));
   const selectedCodeCommitOid =
     codeCommitScope.pullRequestKey === pullRequestKey ? codeCommitScope.oid : null;
   const selectCodeCommit = (oid: string | null) => {
@@ -399,6 +432,33 @@ export function PullRequestDetailPanel({
     void loadCodeTab();
     selectTab("code");
   };
+  // Cached activity can predate a linked comment, so a miss waits for one host read. `after` is
+  // when that read's invalidation finished; null while it runs.
+  const revealHostRead = useRef<{ readonly url: string; readonly after: number | null } | null>(
+    null,
+  );
+  const settleReveal = (url: string) => {
+    revealHostRead.current = null;
+    onRevealSettled?.(url);
+  };
+  const followLink = useEffectEvent(() => {
+    if (revealUrl === undefined) return;
+    const next = linkedTab(revealAnchor);
+    if (next === null) return settleReveal(revealUrl);
+    if (next === "code") {
+      selectCodeCommit(pullRequestLinkCommit(revealUrl));
+      void loadCodeTab();
+    }
+    selectTab(next);
+    // These name a tab, not a place in it.
+    if (revealAnchor?.kind === "code" || revealAnchor?.kind === "commits") settleReveal(revealUrl);
+  });
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- a clicked link lives in the panel store and selects its tab even when the panel is already mounted
+  useEffect(() => {
+    // oxlint-disable-next-line react/set-state-in-effect -- link navigation selects the PR tab and commit scope
+    followLink();
+    // oxlint-disable-next-line react/exhaustive-effect-dependencies -- each clicked link is a navigation request
+  }, [revealUrl]);
   const tabScopeKey = `${environmentId}:${pullRequestKey}`;
   const [tabMountState, setTabMountState] = useState(() => ({
     key: tabScopeKey,
@@ -601,14 +661,72 @@ export function PullRequestDetailPanel({
   const invalidate = useAtomCommand(pullRequestEnvironment.invalidate, { reportFailure: false });
   const [isInvalidating, setIsInvalidating] = useState(false);
   const refreshing = isInvalidating || detailQuery.isPending;
-  const refreshFromHost = async () => {
+  /** Resolves whether the host cache was invalidated before the refetch. */
+  const refetchFromHost = async () => {
     setIsInvalidating(true);
     // Atom commands settle without throwing, so reset always runs.
-    await invalidate({ environmentId, input: { reference } });
+    const invalidated = await invalidate({ environmentId, input: { reference } });
     refreshDetail();
     setRefreshToken((token) => token + 1);
     setIsInvalidating(false);
+    return invalidated._tag === "Success";
+  };
+  const refreshFromHost = async () => {
+    await refetchFromHost();
   };
+  const timelineAnchor =
+    revealAnchor?.kind !== "timeline"
+      ? null
+      : detail === null
+        ? revealAnchor.anchor
+        : resolvePullRequestReviewAnchor(
+            revealAnchor.anchor,
+            detail.comments,
+            detail.reviewThreads,
+          );
+  // Loaded activity without the linked item, keyed by load so a refetch is checked again.
+  const revealMissedAt =
+    timelineAnchor !== null &&
+    detail !== null &&
+    !activityQuery.isPending &&
+    !buildPullRequestTimeline(detail).some((event) =>
+      pullRequestTimelineEventMatches(event, timelineAnchor),
+    )
+      ? activityQuery.dataUpdatedAt
+      : null;
+  const revealReadFailed = revealMissedAt !== null && activityQuery.error !== null;
+  const readHostForReveal = useEffectEvent(() => {
+    if (revealUrl === undefined || revealMissedAt === null) return;
+    const read = revealHostRead.current;
+    if (read?.url !== revealUrl) {
+      const request = { url: revealUrl, after: null };
+      revealHostRead.current = request;
+      void refetchFromHost().then((invalidated) => {
+        if (revealHostRead.current !== request) return;
+        // Without an invalidation the refetch could only repeat the cached read.
+        if (!invalidated) return settleReveal(request.url);
+        revealHostRead.current = { url: request.url, after: Date.now() };
+      });
+      return;
+    }
+    // A read that finished before the invalidation cannot show the item is missing. `after` is
+    // stamped once the refetch was requested, so a read in that same millisecond is the new one.
+    if (read.after !== null && (revealReadFailed || revealMissedAt >= read.after)) {
+      settleReveal(revealUrl);
+    }
+  });
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- a linked comment missing from cached activity asks the host once before the link settles
+  useEffect(() => {
+    readHostForReveal();
+    // oxlint-disable-next-line react/exhaustive-effect-dependencies -- each load that misses the linked item is checked against the host read
+  }, [revealMissedAt, revealReadFailed, revealUrl]);
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- a host read outliving the panel must not settle a later link
+  useEffect(
+    () => () => {
+      revealHostRead.current = null;
+    },
+    [],
+  );
   const refreshFromHostOnRequest = useEffectEvent(() => void refreshFromHost());
   const appliedForcedToken = useRef(forcedRefreshToken);
   // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- a new forced refresh token invalidates the host cache and refetches
@@ -1746,6 +1864,8 @@ export function PullRequestDetailPanel({
               <div className={cn("absolute inset-0", tab !== "summary" && "invisible")}>
                 <PullRequestSummaryTab
                   scrollerRef={scrollerRefs.summary}
+                  revealUrl={tab === "summary" ? revealUrl : undefined}
+                  onRevealSettled={settleReveal}
                   environmentId={environmentId}
                   threadRef={threadRef}
                   reference={reference}
@@ -1809,6 +1929,8 @@ export function PullRequestDetailPanel({
                 ) : (
                   <PullRequestTimelineTab
                     scrollerRef={scrollerRefs.timeline}
+                    revealUrl={tab === "timeline" ? revealUrl : undefined}
+                    onRevealSettled={settleReveal}
                     detail={detail}
                     environmentId={environmentId}
                     threadRef={threadRef}
@@ -1844,6 +1966,8 @@ export function PullRequestDetailPanel({
                     refreshToken={refreshToken}
                     backgroundRefreshToken={turnRefresh ?? 0}
                     revealRequest={codeRevealRequest}
+                    revealUrl={tab === "code" ? revealUrl : undefined}
+                    onRevealSettled={settleReveal}
                   />
                 </Suspense>
               </div>
diff --git a/apps/web/src/components/pullRequest/PullRequestLinkPreview.tsx b/apps/web/src/components/pullRequest/PullRequestLinkPreview.tsx
index 8e3ee75602342..4d5668937880e 100644
--- a/apps/web/src/components/pullRequest/PullRequestLinkPreview.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestLinkPreview.tsx
@@ -1,5 +1,6 @@
 import type { PreviewCard as PreviewCardPrimitive } from "@base-ui/react/preview-card";
 import { isAtomCommandInterrupted } from "@t3tools/client-runtime/state/runtime";
+import { parsePullRequestAnchor, pullRequestLinkCommit } from "@t3tools/shared/pullRequestAnchor";
 import type { EnvironmentId, PullRequestRef } from "@t3tools/contracts";
 import {
   cloneElement,
@@ -18,7 +19,12 @@ import { useEnvironmentQuery } from "~/state/query";
 
 import { PreviewCard, PreviewCardPopup, PreviewCardTrigger } from "../ui/preview-card";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
-import { PullRequestActorAvatar, resolvePullRequestState } from "./pullRequestPresentation";
+import { pullRequestLinkSubject, pullRequestReviewOutcome } from "./pullRequestDetail.logic";
+import {
+  PullRequestActorAvatar,
+  PullRequestReviewOutcomeBadge,
+  resolvePullRequestState,
+} from "./pullRequestPresentation";
 
 interface PullRequestLinkPreviewTarget {
   readonly environmentId: EnvironmentId;
@@ -57,6 +63,20 @@ export function PullRequestLinkPreview({
         })
       : null,
   );
+  // A link to a comment or commit shows that, read from the activity the panel shares.
+  const namesSubject =
+    parsePullRequestAnchor(originalUrl)?.kind === "timeline" ||
+    pullRequestLinkCommit(originalUrl) !== null;
+  const activityQuery = useEnvironmentQuery(
+    open && namesSubject
+      ? pullRequestEnvironment.activity({
+          environmentId: target.environmentId,
+          input: target.input,
+        })
+      : null,
+  );
+  const subject =
+    activityQuery.data === null ? null : pullRequestLinkSubject(originalUrl, activityQuery.data);
   const summary = useSharedPullRequestSummary(
     open ? target.environmentId : null,
     open ? target.input : null,
@@ -136,10 +156,16 @@ export function PullRequestLinkPreview({
                     </span>
                   )}
                 </div>
-                <p className="mt-1 text-sm font-medium leading-snug text-foreground text-pretty">
-                  {card.title}
-                </p>
-                {card.author === undefined ? null : (
+                {subject?.kind === "comment" ? (
+                  <LinkedComment subject={subject} />
+                ) : subject?.kind === "commit" ? (
+                  <LinkedCommit commit={subject.commit} />
+                ) : (
+                  <p className="mt-1 text-sm font-medium leading-snug text-foreground text-pretty">
+                    {card.title}
+                  </p>
+                )}
+                {card.author === undefined || subject !== null ? null : (
                   <div className="mt-2 flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground">
                     <PullRequestActorAvatar actor={card.author} className="size-4" />
                     <span className="min-w-0 truncate">{authorLabel}</span>
@@ -161,3 +187,68 @@ export function PullRequestLinkPreview({
     </PreviewCard>
   );
 }
+
+function actorLabel(actor: { readonly login: string } | null | undefined) {
+  return actor?.login ?? "ghost";
+}
+
+function LinkedComment({
+  subject,
+}: {
+  subject: Extract<ReturnType<typeof pullRequestLinkSubject>, { kind: "comment" }>;
+}) {
+  const outcome = pullRequestReviewOutcome(subject.reviewState);
+  return (
+    <div className="mt-2 min-w-0">
+      <div className="flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground">
+        <PullRequestActorAvatar actor={subject.author} className="size-4" />
+        <span className="min-w-0 truncate font-medium text-foreground">
+          {actorLabel(subject.author)}
+        </span>
+        {outcome === null ? (
+          <span className="shrink-0">commented</span>
+        ) : (
+          <PullRequestReviewOutcomeBadge outcome={outcome} className="shrink-0" />
+        )}
+        <span aria-hidden>·</span>
+        <span className="shrink-0">
+          <RelativeTime timestamp={subject.createdAt} />
+        </span>
+      </div>
+      {subject.excerpt === null ? null : (
+        <p className="mt-1.5 line-clamp-4 text-xs leading-relaxed text-foreground text-pretty">
+          {subject.excerpt}
+        </p>
+      )}
+    </div>
+  );
+}
+
+function LinkedCommit({
+  commit,
+}: {
+  commit: Extract<ReturnType<typeof pullRequestLinkSubject>, { kind: "commit" }>["commit"];
+}) {
+  const author = commit.authors?.[0];
+  return (
+    <div className="mt-2 min-w-0">
+      <p className="text-sm font-medium leading-snug text-foreground text-pretty">
+        {commit.messageHeadline}
+      </p>
+      <div className="mt-1.5 flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground">
+        <code className="shrink-0 font-mono">{commit.oid.slice(0, 7)}</code>
+        {author === undefined ? null : (
+          <>
+            <span aria-hidden>·</span>
+            <PullRequestActorAvatar actor={author} className="size-4" />
+            <span className="min-w-0 truncate">{actorLabel(author)}</span>
+          </>
+        )}
+        <span aria-hidden>·</span>
+        <span className="shrink-0">
+          <RelativeTime timestamp={commit.committedDate} />
+        </span>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/components/pullRequest/PullRequestReviewAnnotation.tsx b/apps/web/src/components/pullRequest/PullRequestReviewAnnotation.tsx
index d2ae440fde9e8..23808ed83140e 100644
--- a/apps/web/src/components/pullRequest/PullRequestReviewAnnotation.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestReviewAnnotation.tsx
@@ -229,7 +229,7 @@ export function ReviewThreadCard({
 
   return (
     <div
-      className={CARD_CLASS}
+      className={cn(CARD_CLASS, !expanded && "py-1")}
       contentEditable={false}
       onPointerDown={(event) => event.stopPropagation()}
     >
@@ -250,7 +250,7 @@ export function ReviewThreadCard({
         {thread.isOutdated ? <span>outdated</span> : null}
         {onFix ? (
           <Button
-            size="xs"
+            size="compact"
             variant="ghost"
             className="ml-auto"
             disabled={pending || fixPending}
@@ -262,7 +262,7 @@ export function ReviewThreadCard({
         ) : null}
         {onAddToChat && comments.some((comment) => visibleBody(comment.body) !== null) ? (
           <Button
-            size="xs"
+            size="compact"
             variant="ghost"
             className={onFix ? undefined : "ml-auto"}
             onClick={() => onAddToChat({ ...thread, comments })}
@@ -273,7 +273,7 @@ export function ReviewThreadCard({
         ) : null}
         {canResolve ? (
           <Button
-            size="xs"
+            size="compact"
             variant="ghost"
             className={onFix || onAddToChat ? undefined : "ml-auto"}
             disabled={pending}
diff --git a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
index b98a48a817b0e..21a444cd27378 100644
--- a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
@@ -1,3 +1,5 @@
+import { parsePullRequestAnchor } from "@t3tools/shared/pullRequestAnchor";
+import { holdLinkedNodeInView } from "./holdLinkedNodeInView";
 import { useAtomValue } from "@effect/atom-react";
 import {
   capitalizeTerm,
@@ -23,7 +25,7 @@ import {
   UsersIcon,
 } from "lucide-react";
 import * as Schema from "effect/Schema";
-import { useRef, useState, type ReactNode } from "react";
+import { useEffect, useEffectEvent, useRef, useState, type ReactNode } from "react";
 
 import { pullRequestEnvironment } from "~/state/pullRequests";
 import { useLocalStorage } from "~/hooks/useLocalStorage";
@@ -356,16 +358,27 @@ function Section({
   title,
   defaultOpen = true,
   keepMounted = false,
+  revealCount = 0,
   actions,
   children,
 }: {
   title: string;
   defaultOpen?: boolean;
   keepMounted?: boolean;
+  /** Reopens the section each time a link reveals it. */
+  revealCount?: number;
   actions?: ReactNode;
   children: ReactNode;
 }) {
-  const [open, setOpen] = useState(defaultOpen);
+  // A reveal opens at once: the opening animation would move what was just scrolled to.
+  const [open, setOpen] = useState<boolean | "revealed">(
+    revealCount > 0 ? "revealed" : defaultOpen,
+  );
+  const [seenRevealCount, setSeenRevealCount] = useState(revealCount);
+  if (revealCount !== seenRevealCount) {
+    setSeenRevealCount(revealCount);
+    setOpen("revealed");
+  }
   const headingRef = useRef<HTMLDivElement>(null);
   const setOpenWithScrollAnchor = (nextOpen: boolean) => {
     if (!nextOpen) {
@@ -387,7 +400,7 @@ function Section({
   };
   return (
     <Collapsible
-      open={open}
+      open={open !== false}
       onOpenChange={setOpenWithScrollAnchor}
       render={<section aria-label={title} />}
       data-pull-request-summary-section
@@ -408,7 +421,7 @@ function Section({
         </CollapsibleTrigger>
         {actions}
       </div>
-      <CollapsiblePanel keepMounted={keepMounted}>
+      <CollapsiblePanel keepMounted={keepMounted} animate={open !== "revealed"}>
         <div className="px-4 pb-4">{children}</div>
       </CollapsiblePanel>
     </Collapsible>
@@ -422,6 +435,8 @@ const CommentFilterSchema = Schema.Struct({ bots: Schema.Boolean, resolved: Sche
 const DEFAULT_COMMENT_FILTER: typeof CommentFilterSchema.Type = { bots: false, resolved: false };
 
 export function PullRequestSummaryTab({
+  revealUrl,
+  onRevealSettled,
   scrollerRef,
   environmentId,
   threadRef,
@@ -438,6 +453,9 @@ export function PullRequestSummaryTab({
   onRefresh,
   onRefreshChecks = onRefresh,
 }: {
+  /** A clicked link to scroll to, until onRevealSettled reports it shown. */
+  revealUrl?: string | undefined;
+  onRevealSettled?: ((revealUrl: string) => void) | undefined;
   scrollerRef: (node: HTMLDivElement | null) => void;
   environmentId: EnvironmentId;
   threadRef: ScopedThreadRef | null;
@@ -562,6 +580,60 @@ export function PullRequestSummaryTab({
   const [commentSaving, setCommentSaving] = useState(false);
   const editingCommentId = commentScope?.pullRequest === detail.url ? commentScope.commentId : null;
 
+  const scrollRef = useRef<HTMLDivElement | null>(null);
+  const location = parsePullRequestAnchor(revealUrl);
+  const [checksReveals, setChecksReveals] = useState(0);
+  const [descriptionReveals, setDescriptionReveals] = useState(0);
+  const [seenRevealUrl, setSeenRevealUrl] = useState<string | undefined>(undefined);
+  if (revealUrl !== seenRevealUrl) {
+    setSeenRevealUrl(revealUrl);
+    if (location?.kind === "checks") setChecksReveals((count) => count + 1);
+    if (location?.kind === "summary" && location.anchor !== "top") {
+      setDescriptionReveals((count) => count + 1);
+    }
+  }
+  const stopHolding = useRef<(() => void) | null>(null);
+  const revealSummary = useEffectEvent(() => {
+    const root = scrollRef.current;
+    if (revealUrl === undefined || !root) return;
+    let target: HTMLElement | null | undefined;
+    if (location?.kind === "checks") {
+      target = root.querySelector<HTMLElement>(
+        '[data-pull-request-summary-section][aria-label="Checks"]',
+      );
+    } else if (location?.kind === "summary") {
+      if (location.anchor === "top") {
+        stopHolding.current?.();
+        root.scrollTop = 0;
+        return onRevealSettled?.(revealUrl);
+      }
+      target = /^issue-\d+$/.test(location.anchor)
+        ? root.querySelector<HTMLElement>("[data-pr-description]")
+        : [...root.querySelectorAll<HTMLElement>("[id]")].find(
+            (node) => node.id === location.anchor || node.id === `user-content-${location.anchor}`,
+          );
+    }
+    // A heading may still be rendering; the link stays pending until it appears.
+    if (!target) return;
+    stopHolding.current?.();
+    const heading = target.hasAttribute("data-pull-request-summary-section")
+      ? null
+      : target.closest("[data-pull-request-summary-section]")?.firstElementChild;
+    stopHolding.current = holdLinkedNodeInView(
+      target,
+      root,
+      () => (heading?.getBoundingClientRect().height ?? 0) + (heading ? 8 : 0),
+    );
+    onRevealSettled?.(revealUrl);
+  });
+  const editingDescription = bodyScope?.url === detail.url;
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- scrolls to a linked section, description or heading once it renders
+  useEffect(() => {
+    revealSummary();
+    // oxlint-disable-next-line react/exhaustive-effect-dependencies -- retries once the description markdown renders, including after its editor closes
+  }, [revealUrl, description, checksReveals, descriptionReveals, editingDescription]);
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- the hold observes DOM outside React and must end with the tab
+  useEffect(() => () => stopHolding.current?.(), []);
   // Checkbox ticks and the editor share one draft, so each starts from the other's latest body.
   const saveDescription = async (body: string) => {
     const key = detail.url;
@@ -733,7 +805,14 @@ export function PullRequestSummaryTab({
   };
 
   return (
-    <div ref={scrollerRef} className="h-full overflow-y-auto" data-pull-request-summary-scroll>
+    <div
+      ref={(node) => {
+        scrollRef.current = node;
+        scrollerRef(node);
+      }}
+      className="h-full overflow-y-auto"
+      data-pull-request-summary-scroll
+    >
       <section className="px-4 pt-2.5 pb-1">
         <div className="space-y-2">
           <MetaRow icon={<UsersIcon className="size-3.5" />} label="Reviewers">
@@ -838,9 +917,14 @@ export function PullRequestSummaryTab({
         </div>
       </section>
 
-      <Section key={`description:${detail.url}`} title="Description" keepMounted>
+      <Section
+        key={`description:${detail.url}`}
+        title="Description"
+        keepMounted
+        revealCount={descriptionReveals}
+      >
         <div className="group">
-          {bodyScope?.url === detail.url ? (
+          {editingDescription ? (
             <PullRequestMarkdownEditor
               allowEmpty
               value={bodyScope.body}
@@ -855,7 +939,7 @@ export function PullRequestSummaryTab({
               onCancel={() => setBodyScope(null)}
             />
           ) : (
-            <div className="flex items-start gap-1">
+            <div className="flex items-start gap-1" data-pr-description>
               <PullRequestMarkdown
                 className="min-w-0 flex-1"
                 text={description.trim().length > 0 ? description : "_No description provided._"}
@@ -875,7 +959,12 @@ export function PullRequestSummaryTab({
         </div>
       </Section>
 
-      <Section key={`checks:${detail.url}`} title="Checks" defaultOpen={false}>
+      <Section
+        key={`checks:${detail.url}`}
+        title="Checks"
+        defaultOpen={false}
+        revealCount={checksReveals}
+      >
         {checksStale ? (
           <div className="flex items-center gap-2 text-xs text-muted-foreground">
             <span>Check details are out of date.</span>
diff --git a/apps/web/src/components/pullRequest/PullRequestTimelineTab.browser.test.tsx b/apps/web/src/components/pullRequest/PullRequestTimelineTab.browser.test.tsx
index 4e8f1e4319c5c..847cbb60aa650 100644
--- a/apps/web/src/components/pullRequest/PullRequestTimelineTab.browser.test.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestTimelineTab.browser.test.tsx
@@ -4,7 +4,7 @@ import {
   SourceControlProviderKind,
   type PullRequestDetailView,
 } from "@t3tools/contracts";
-import { expect, it } from "vite-plus/test";
+import { expect, it, vi } from "vite-plus/test";
 
 import { render } from "../../../test/render";
 import "../../index.css";
@@ -87,3 +87,90 @@ it("mounts only the timeline rows near the viewport of a huge pull request", asy
   expect(mounted).toBeGreaterThan(0);
   expect(mounted).toBeLessThan(COMMITS / 10);
 });
+
+it.each(["review", "issue-comment", "resolved-reply"] as const)(
+  "reveals a linked %s below the virtual viewport",
+  async (kind) => {
+    const url = `${detail.url}#${kind === "review" ? "pullrequestreview-123" : kind === "issue-comment" ? "issuecomment-123" : "discussion_r123"}`;
+    const linkedDetail: PullRequestDetailView = {
+      ...detail,
+      comments:
+        kind === "resolved-reply"
+          ? []
+          : [
+              {
+                id: "linked",
+                kind,
+                author: detail.author,
+                body: "Linked reply",
+                createdAt: "2026-10-01T00:00:00Z",
+                url,
+                path: null,
+                reviewState: kind === "review" ? "CHANGES_REQUESTED" : null,
+              },
+            ],
+      reviewThreads:
+        kind !== "resolved-reply"
+          ? []
+          : [
+              {
+                id: "thread",
+                path: "src/test.ts",
+                line: 5,
+                side: "right",
+                isResolved: true,
+                isOutdated: false,
+                comments: [
+                  {
+                    id: "root",
+                    author: detail.author,
+                    body: "Root comment",
+                    createdAt: "2026-10-01T00:00:00Z",
+                    url: `${detail.url}#discussion_r122`,
+                  },
+                  {
+                    id: "reply",
+                    author: detail.author,
+                    body: "Linked reply",
+                    createdAt: "2026-10-01T00:01:00Z",
+                    url,
+                  },
+                ],
+              },
+            ],
+    };
+    const settled = vi.fn();
+    await using screen = await render(
+      <div style={{ height: 600 }}>
+        <PullRequestTimelineTab
+          scrollerRef={() => {}}
+          detail={linkedDetail}
+          environmentId={EnvironmentId.make("environment")}
+          reference={detail}
+          order="oldest"
+          onOpenCommit={() => {}}
+          onRefresh={() => {}}
+          revealUrl={url}
+          onRevealSettled={settled}
+        />
+      </div>,
+    );
+    await expect.element(screen.getByText("Linked reply", { exact: true })).toBeVisible();
+    await vi.waitFor(() => expect(settled).toHaveBeenCalledWith(url));
+    await screen.rerender(
+      <div style={{ height: 600 }}>
+        <PullRequestTimelineTab
+          scrollerRef={() => {}}
+          detail={linkedDetail}
+          environmentId={EnvironmentId.make("environment")}
+          reference={detail}
+          order="oldest"
+          onOpenCommit={() => {}}
+          onRefresh={() => {}}
+          onRevealSettled={settled}
+        />
+      </div>,
+    );
+    await expect.element(screen.getByText("Linked reply", { exact: true })).toBeVisible();
+  },
+);
diff --git a/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx b/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
index 36dca98e23179..df0e9c260d88b 100644
--- a/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
@@ -1,3 +1,9 @@
+import {
+  parsePullRequestAnchor,
+  pullRequestAnchorMatchesUrl,
+  resolvePullRequestReviewAnchor,
+} from "@t3tools/shared/pullRequestAnchor";
+import { holdLinkedNodeInView } from "./holdLinkedNodeInView";
 import {
   capitalizeTerm,
   sourceControlClients,
@@ -20,7 +26,7 @@ import {
   MessageSquareIcon,
   MessageSquarePlusIcon,
 } from "lucide-react";
-import { useState, type ReactNode } from "react";
+import { useEffect, useEffectEvent, useRef, useState, type ReactNode } from "react";
 
 import { cn } from "~/lib/utils";
 import { readLocalApi } from "~/localApi";
@@ -35,6 +41,7 @@ import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import {
   buildPullRequestTimeline,
   groupPullRequestTimelineConversations,
+  pullRequestTimelineEventMatches,
   type PullRequestTimelineRow,
   isPullRequestVerdictStale,
   newestPullRequestCommitAt,
@@ -66,6 +73,7 @@ import {
 import { LegendList, type LegendListRef } from "@legendapp/list/react";
 
 interface ReactionSurface {
+  revealAnchor?: string | null;
   readonly canReact: boolean;
   /** Absent where there is no composer beside the panel to add a remark to. */
   readonly onAddToChat?: ((comment: PullRequestComment) => void) | undefined;
@@ -259,7 +267,16 @@ function ConversationCard({
   };
 
   return (
-    <article className="group py-2">
+    <article
+      {...(reactions.revealAnchor != null &&
+      pullRequestAnchorMatchesUrl(reactions.revealAnchor, event.url)
+        ? {
+            "data-pr-link-target": true,
+            tabIndex: -1,
+            className: "group rounded-lg py-2 ring-1 ring-primary/40 outline-none",
+          }
+        : { className: "group py-2" })}
+    >
       <div className="px-2">
         <div className="flex min-w-0 flex-wrap items-center gap-2">
           <div className="min-w-0 flex-1">
@@ -339,19 +356,25 @@ function uniqueConversationActors(events: ReadonlyArray<PullRequestTimelineEvent
 }
 
 function ConversationGroup({
+  revealAnchor,
   events,
   editable,
   cwd,
   onOpen,
   reactions,
 }: {
+  revealAnchor?: string | null;
   events: ReadonlyArray<PullRequestTimelineEvent>;
   editable: ReadonlyMap<string, PullRequestComment>;
   cwd: string;
   onOpen: (url: string) => void;
   reactions: ReactionSurface;
 }) {
-  const [open, setOpen] = useState(false);
+  const [open, setOpen] = useState(
+    () =>
+      revealAnchor != null &&
+      events.some((event) => pullRequestAnchorMatchesUrl(revealAnchor, event.url)),
+  );
   const actors = uniqueConversationActors(events);
   const first = events[0];
   if (first === undefined) return null;
@@ -413,6 +436,7 @@ function ConversationGroup({
 }
 
 function ReviewThreadEvent({
+  revealAnchor,
   event,
   thread,
   editable,
@@ -420,6 +444,7 @@ function ReviewThreadEvent({
   onOpen,
   reactions,
 }: {
+  revealAnchor?: string | null;
   event: PullRequestTimelineEvent;
   thread: PullRequestTimelineThread;
   editable: ReadonlyMap<string, PullRequestComment>;
@@ -428,7 +453,14 @@ function ReviewThreadEvent({
   reactions: ReactionSurface;
 }) {
   const dismissed = pullRequestReviewOutcome(event.reviewState) === "dismissed";
-  const [expanded, setExpanded] = useState(!thread.isResolved && !dismissed);
+  const [expanded, setExpanded] = useState(
+    () =>
+      (revealAnchor != null &&
+        [event, ...thread.replies].some((item) =>
+          pullRequestAnchorMatchesUrl(revealAnchor, item.url),
+        )) ||
+      (!thread.isResolved && !dismissed),
+  );
   const replyCount = thread.replies.length + thread.moreReplies;
 
   return (
@@ -675,6 +707,8 @@ function ReviewVerdictEvent({
 }
 
 export function PullRequestTimelineTab({
+  revealUrl,
+  onRevealSettled,
   scrollerRef,
   detail,
   environmentId,
@@ -685,6 +719,9 @@ export function PullRequestTimelineTab({
   onAddToChat,
   onRefresh,
 }: {
+  /** A clicked link to scroll to and mark, until onRevealSettled reports it shown. */
+  revealUrl?: string | undefined;
+  onRevealSettled?: ((revealUrl: string) => void) | undefined;
   scrollerRef: (node: HTMLElement | null) => void;
   detail: PullRequestDetailView;
   environmentId: EnvironmentId;
@@ -696,9 +733,29 @@ export function PullRequestTimelineTab({
   onRefresh: () => void;
 }) {
   const events = buildPullRequestTimeline(detail);
+  const location = parsePullRequestAnchor(revealUrl);
+  const revealAnchor = location?.kind === "timeline" ? location.anchor : null;
+  // The linked item stays marked and open after it is shown, until another link replaces it.
+  const [linked, setLinked] = useState<{ readonly anchor: string; readonly count: number } | null>(
+    () => (revealAnchor === null ? null : { anchor: revealAnchor, count: 1 }),
+  );
+  const [seenRevealUrl, setSeenRevealUrl] = useState(revealUrl);
+  if (revealUrl !== seenRevealUrl) {
+    setSeenRevealUrl(revealUrl);
+    // Each click remounts the linked row, so it opens again even after the user closed it.
+    if (revealAnchor !== null) setLinked({ anchor: revealAnchor, count: (linked?.count ?? 0) + 1 });
+  }
+  const anchor = linked
+    ? resolvePullRequestReviewAnchor(linked.anchor, detail.comments, detail.reviewThreads)
+    : null;
+  const listRef = useRef<LegendListRef | null>(null);
+  const matches = (event: PullRequestTimelineEvent) =>
+    anchor !== null && pullRequestTimelineEventMatches(event, anchor);
+
   const term = sourceControlClients.get(detail.provider).changeRequest.singular;
   const newestCommitAt = newestPullRequestCommitAt(detail.commits);
   const reactions: ReactionSurface = {
+    revealAnchor: anchor,
     canReact: detail.capabilities.reactions === true,
     onAddToChat: onAddToChat && ((comment) => onAddToChat({ kind: "comment", comment })),
     environmentId,
@@ -716,23 +773,48 @@ export function PullRequestTimelineTab({
   );
   const orderedEvents = order === "newest" ? events : events.toReversed();
   const rows = groupPullRequestTimelineConversations(orderedEvents);
+  const targetIndex = rows.findIndex((row) =>
+    row.kind === "comments" ? row.events.some(matches) : matches(row.event),
+  );
+  const stopHolding = useRef<(() => void) | null>(null);
+  const reveal = useEffectEvent(() => {
+    const list = listRef.current;
+    const url = revealUrl;
+    if (url === undefined || revealAnchor === null || targetIndex < 0 || !list) return;
+    stopHolding.current?.();
+    void list.scrollToIndex({ index: targetIndex, viewPosition: 0, animated: false }).then(() => {
+      const scroller = list.getScrollableNode();
+      const node = scroller?.querySelector<HTMLElement>("[data-pr-link-target=true]");
+      if (scroller && node) stopHolding.current = holdLinkedNodeInView(node, scroller, () => 16);
+      onRevealSettled?.(url);
+    });
+  });
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- reveals a link destination after activity loading and virtual list mounting
+  useEffect(() => {
+    reveal();
+    // oxlint-disable-next-line react/exhaustive-effect-dependencies -- runs for each clicked link and again when activity resolves its row
+  }, [revealUrl, targetIndex]);
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- the hold observes DOM outside React and must end with the tab
+  useEffect(() => () => stopHolding.current?.(), []);
   const openOnHost = (url: string) => {
     void readLocalApi()?.shell.openExternal(url);
   };
 
   const rowKey = (row: PullRequestTimelineRow) => {
-    if (row.kind === "comments") return `comments:${row.events[0]?.id ?? "empty"}`;
+    if (row.kind === "comments")
+      return `comments:${row.events[0]?.id ?? "empty"}:${row.events.some(matches) ? (linked?.count ?? "") : ""}`;
     const event = row.event;
     // A thread's resolution or dismissal remounts it, so its disclosure starts in the new state.
     return event.thread === undefined
-      ? event.id
-      : `thread:${event.id}:${event.thread.isResolved}:${pullRequestReviewOutcome(event.reviewState) === "dismissed"}`;
+      ? `${event.id}:${matches(event) ? (linked?.count ?? "") : ""}`
+      : `thread:${event.id}:${matches(event) ? (linked?.count ?? "") : ""}:${event.thread.isResolved}:${pullRequestReviewOutcome(event.reviewState) === "dismissed"}`;
   };
   const renderRow = ({ item: row }: { item: PullRequestTimelineRow }) => {
     if (row.kind === "comments") {
       return (
         <ConversationGroup
           events={row.events}
+          revealAnchor={anchor}
           editable={editable}
           cwd={detail.workspaceRoot}
           onOpen={openOnHost}
@@ -746,6 +828,7 @@ export function PullRequestTimelineTab({
         <ReviewThreadEvent
           event={event}
           thread={event.thread}
+          revealAnchor={anchor}
           editable={editable}
           cwd={detail.workspaceRoot}
           onOpen={openOnHost}
@@ -785,7 +868,10 @@ export function PullRequestTimelineTab({
   // the page. The connector line is drawn by the content container, behind the rows.
   return (
     <LegendList<PullRequestTimelineRow>
-      ref={(list: LegendListRef | null) => scrollerRef(list?.getScrollableNode() ?? null)}
+      ref={(list: LegendListRef | null) => {
+        listRef.current = list;
+        scrollerRef(list?.getScrollableNode() ?? null);
+      }}
       data={rows}
       extraData={{ editable, reactions, newestCommitAt }}
       keyExtractor={rowKey}
@@ -793,7 +879,15 @@ export function PullRequestTimelineTab({
       estimatedItemSize={140}
       className="scrollbar-gutter-both h-full px-4"
       contentContainerClassName="relative mx-auto w-full max-w-3xl before:absolute before:bottom-10 before:left-[15px] before:top-6 before:w-px before:bg-border/45"
-      ListHeaderComponent={<div className="h-5" />}
+      ListHeaderComponent={
+        anchor !== null && targetIndex < 0 && revealUrl === undefined ? (
+          <p role="status" className="py-4 text-xs text-muted-foreground">
+            The linked item is not in the loaded activity.
+          </p>
+        ) : (
+          <div className="h-5" />
+        )
+      }
       ListFooterComponent={<div className="h-5" />}
     />
   );
diff --git a/apps/web/src/components/pullRequest/PullRequestsPage.tsx b/apps/web/src/components/pullRequest/PullRequestsPage.tsx
index 2af8383bebcd4..0d494d923e33f 100644
--- a/apps/web/src/components/pullRequest/PullRequestsPage.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestsPage.tsx
@@ -1027,10 +1027,13 @@ export function PullRequestsPage() {
     if (rightPanelState.isOpen) setMaximized((value) => !value);
   };
   const onGuideShown = () => setMaximized(true);
+  // updateSearch leaves selectedUrl out, so a reload does not reveal the link again.
+  const consumeLinkedUrl = useEffectEvent(() => updateSearch({}));
   // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- opens the URL-linked pull request in the right panel store
   useEffect(() => {
     if (!pullRequestsSupported || rightPanelRef === null || linkedSelection === null) return;
     useRightPanelStore.getState().openPullRequest(rightPanelRef, linkedSelection);
+    if (linkedSelection.revealUrl !== undefined) consumeLinkedUrl();
   }, [linkedSelection, pullRequestsSupported, rightPanelRef]);
 
   const selected =
@@ -1521,6 +1524,13 @@ export function PullRequestsPage() {
               getShortcutContext={getShortcutContext}
               shortcutsEnabled={activePullRequestSurface?.id === renderedPullRequestSurface.id}
               key={renderedPullRequestSurface.id}
+              revealUrl={renderedPullRequestSurface.revealUrl}
+              onRevealSettled={(revealUrl) => {
+                if (rightPanelRef === null) return;
+                useRightPanelStore
+                  .getState()
+                  .settlePullRequestReveal(rightPanelRef, renderedPullRequestSurface.id, revealUrl);
+              }}
               environmentId={panelEnvironmentId}
               onGuideShown={onGuideShown}
               onSelectPullRequest={(reference) => {
diff --git a/apps/web/src/components/pullRequest/holdLinkedNodeInView.ts b/apps/web/src/components/pullRequest/holdLinkedNodeInView.ts
new file mode 100644
index 0000000000000..4261cb2fb0da8
--- /dev/null
+++ b/apps/web/src/components/pullRequest/holdLinkedNodeInView.ts
@@ -0,0 +1,39 @@
+import { observeResize } from "~/lib/observeResize";
+
+const USER_SCROLL_INTENT = ["wheel", "touchstart", "pointerdown", "keydown"] as const;
+
+/**
+ * Keeps a linked node `offset()` below the scroller's top while the content around it opens and
+ * its markdown loads, until the user scrolls, the node leaves, or the returned stop runs. Only the
+ * scroller moves; scrollIntoView would also scroll the panel's clipped ancestors.
+ */
+export function holdLinkedNodeInView(
+  node: HTMLElement,
+  scroller: HTMLElement,
+  offset: () => number,
+): () => void {
+  const controller = new AbortController();
+  const stop = () => {
+    unobserve();
+    controller.abort();
+  };
+  const align = () => {
+    if (!node.isConnected) return stop();
+    scroller.scrollTop +=
+      node.getBoundingClientRect().top - scroller.getBoundingClientRect().top - offset();
+  };
+  const unobserve = observeResize([...scroller.children], align);
+  for (const type of USER_SCROLL_INTENT) {
+    scroller.addEventListener(type, stop, { passive: true, signal: controller.signal });
+  }
+  align();
+  // Activity can load after the click; by then the user may be typing elsewhere.
+  const active = document.activeElement;
+  if (
+    !(active instanceof HTMLElement) ||
+    !(active.isContentEditable || active.matches("input, textarea, select"))
+  ) {
+    node.focus({ preventScroll: true });
+  }
+  return stop;
+}
diff --git a/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts b/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts
index 5b298d23c429b..6ea7d6a5b0e1a 100644
--- a/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts
+++ b/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts
@@ -50,6 +50,7 @@ import {
   shouldRefreshPullRequestActivity,
   resolveBaseFreshness,
   buildPullRequestTimeline,
+  pullRequestLinkSubject,
   writePullRequestDetailSnapshot,
   readableFailure,
 } from "./pullRequestDetail.logic";
@@ -313,6 +314,58 @@ describe("review verdicts", () => {
 });
 
 describe("pull request timeline", () => {
+  it("names the comment or commit a link points at for its hover card", () => {
+    const pr = "https://github.com/o/r/pull/1";
+    const sha = "a".repeat(40);
+    const activity = {
+      comments: [
+        {
+          ...TIMELINE_SOURCE.comments[0]!,
+          url: `${pr}#issuecomment-5`,
+          body: "<!-- bot -->\n> [!NOTE]\n> **Looks** good, see `run()` ![shot](x.png)",
+        },
+      ],
+      reviewThreads: [
+        {
+          id: "t",
+          path: "a.ts",
+          line: 1,
+          side: "right" as const,
+          isResolved: false,
+          isOutdated: false,
+          comments: [
+            {
+              id: "r1",
+              author: { login: "reviewer", name: null, avatarUrl: null },
+              body: "nit",
+              createdAt: "2026-07-03T00:00:00Z",
+              url: `${pr}#discussion_r1`,
+              reviewUrl: `${pr}#pullrequestreview-9`,
+            },
+          ],
+        },
+      ],
+      commits: [{ oid: sha, messageHeadline: "fix it", committedDate: "2026-07-02T00:00:00Z" }],
+    };
+    expect(pullRequestLinkSubject(`${pr}#issuecomment-5`, activity)).toMatchObject({
+      kind: "comment",
+      excerpt: "Looks good, see run()",
+    });
+    // A review with no text of its own is shown through the comment it posted.
+    expect(pullRequestLinkSubject(`${pr}#pullrequestreview-9`, activity)).toMatchObject({
+      kind: "comment",
+      author: { login: "reviewer" },
+      excerpt: "nit",
+    });
+    expect(pullRequestLinkSubject(`${pr}/commits/${sha}`, activity)).toMatchObject({
+      kind: "commit",
+      commit: { messageHeadline: "fix it" },
+    });
+    for (const url of [pr, `${pr}/files`, `${pr}/checks`, `${pr}#issuecomment-6`]) {
+      expect(pullRequestLinkSubject(url, activity), url).toBeNull();
+    }
+  });
+
   it("orders host timestamps by instant across offsets and fractional seconds", () => {
     const events = buildPullRequestTimeline({
       ...TIMELINE_SOURCE,
diff --git a/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts b/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
index 537de10a2a8c1..cceadfbee3c60 100644
--- a/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
+++ b/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
@@ -1,3 +1,9 @@
+import {
+  parsePullRequestAnchor,
+  pullRequestAnchorMatchesUrl,
+  pullRequestLinkCommit,
+  resolvePullRequestReviewAnchor,
+} from "@t3tools/shared/pullRequestAnchor";
 import { stripInlineContextReferences } from "~/lib/composerContextReferences";
 import type { Nodes as MdastNodes } from "mdast";
 import { fromMarkdown } from "mdast-util-from-markdown";
@@ -17,6 +23,7 @@ import {
   type PullRequestCheck,
   type PullRequestChecksState as ContractPullRequestChecksState,
   type PullRequestComment,
+  type PullRequestActivity,
   type PullRequestCommit,
   type PullRequestContextMetadata,
   type PullRequestDetailView,
@@ -694,6 +701,80 @@ function readableBody(raw: string): string | null {
  * Merged wins over closed: GitHub sets both timestamps on a merge, and reporting "closed" for a
  * merged pull request would misstate what happened.
  */
+export type PullRequestLinkSubject =
+  | {
+      readonly kind: "comment";
+      readonly author: PullRequestActor | null;
+      readonly createdAt: string;
+      readonly reviewState: string | null;
+      readonly excerpt: string | null;
+    }
+  | { readonly kind: "commit"; readonly commit: PullRequestCommit };
+
+const LINK_EXCERPT_LENGTH = 280;
+
+/** The words of a markdown body, without markup, HTML or images, for a short preview. */
+function markdownExcerpt(body: string): string | null {
+  const words: string[] = [];
+  const visit = (node: MdastNodes) => {
+    if (node.type === "text" || node.type === "inlineCode") words.push(node.value);
+    if (node.type !== "code" && "children" in node) for (const child of node.children) visit(child);
+  };
+  visit(fromMarkdown(body));
+  // GitHub's alert marker (`> [!NOTE]`) parses as text but reads as markup.
+  const text = words
+    .join(" ")
+    .replace(/\[!(?:note|tip|important|warning|caution)\]/giu, "")
+    .replace(/\s+/gu, " ")
+    .trim();
+  if (text === "") return null;
+  return text.length > LINK_EXCERPT_LENGTH ? `${text.slice(0, LINK_EXCERPT_LENGTH - 1)}…` : text;
+}
+
+/** The comment or commit a pull request link names, for its hover card; null for the PR itself. */
+export function pullRequestLinkSubject(
+  url: string,
+  activity: Pick<PullRequestActivity, "comments" | "reviewThreads" | "commits">,
+): PullRequestLinkSubject | null {
+  const oid = pullRequestLinkCommit(url)?.toLowerCase();
+  if (oid !== undefined) {
+    const commit = activity.commits.find((candidate) => candidate.oid.toLowerCase() === oid);
+    return commit === undefined ? null : { kind: "commit", commit };
+  }
+  const location = parsePullRequestAnchor(url);
+  if (location?.kind !== "timeline") return null;
+  const anchor = resolvePullRequestReviewAnchor(
+    location.anchor,
+    activity.comments,
+    activity.reviewThreads,
+  );
+  const comment = activity.comments.find((candidate) =>
+    pullRequestAnchorMatchesUrl(anchor, candidate.url),
+  );
+  const threadComment = activity.reviewThreads
+    .flatMap((thread) => thread.comments)
+    .find((candidate) => pullRequestAnchorMatchesUrl(anchor, candidate.url));
+  const found = comment ?? threadComment;
+  if (found === undefined) return null;
+  return {
+    kind: "comment",
+    author: found.author,
+    createdAt: found.createdAt,
+    reviewState: comment?.reviewState ?? null,
+    excerpt: markdownExcerpt(found.body),
+  };
+}
+
+/** Whether a link anchor names this event or a reply in its review thread. */
+export function pullRequestTimelineEventMatches(
+  event: PullRequestTimelineEvent,
+  anchor: string,
+): boolean {
+  return [event, ...(event.thread?.replies ?? [])].some((item) =>
+    pullRequestAnchorMatchesUrl(anchor, item.url),
+  );
+}
+
 export function buildPullRequestTimeline(
   detail: Pick<
     PullRequestDetailView,
diff --git a/apps/web/src/components/pullRequest/usePullRequestListView.ts b/apps/web/src/components/pullRequest/usePullRequestListView.ts
index fe22fe5af2838..2fad034b2362e 100644
--- a/apps/web/src/components/pullRequest/usePullRequestListView.ts
+++ b/apps/web/src/components/pullRequest/usePullRequestListView.ts
@@ -40,6 +40,7 @@ import { pullRequestFilterProjects } from "@t3tools/client-runtime/pull-request-
 import { pullRequestListEntryId } from "./pullRequestListGroups.logic";
 
 export interface PullRequestsSearch extends PullRequestListPreferences {
+  readonly selectedUrl?: string;
   readonly environmentId?: EnvironmentId;
   readonly projectId?: ProjectId;
   readonly host?: string;
@@ -139,6 +140,16 @@ export function usePullRequestScope(search: PullRequestsSearch) {
   const assignmentKey = environmentQueries
     .map(({ environmentId, projectIds }) => `${environmentId}#${projectIds?.join("+") ?? "*"}`)
     .join("|");
+  // The URL is user-controlled and stands in for the PR link until detail loads.
+  const selectedLink = search.selectedUrl
+    ? sourceControlClients.parseChangeRequestUrl(search.selectedUrl)?.link
+    : undefined;
+  const selectedUrl =
+    selectedLink !== undefined &&
+    selectedLink.number === search.number &&
+    selectedLink.repository.toLowerCase() === search.repository?.toLowerCase()
+      ? search.selectedUrl
+      : undefined;
   const linkedSelection =
     search.repository && search.number && selectedProject
       ? {
@@ -146,6 +157,7 @@ export function usePullRequestScope(search: PullRequestsSearch) {
           repository: search.repository,
           number: search.number,
           projectId: selectedProject.id,
+          ...(selectedUrl ? { url: selectedUrl, revealUrl: selectedUrl } : {}),
           ...(selectedHost ? { host: selectedHost } : {}),
         }
       : null;
diff --git a/apps/web/src/components/settings/LinkMachineSelect.tsx b/apps/web/src/components/settings/LinkMachineSelect.tsx
index 9977f0bfc699e..4cacafdb8d19f 100644
--- a/apps/web/src/components/settings/LinkMachineSelect.tsx
+++ b/apps/web/src/components/settings/LinkMachineSelect.tsx
@@ -1,12 +1,31 @@
-import type { LinkableMachine } from "@t3tools/client-runtime/link-request";
+import {
+  ANOTHER_ADDRESS,
+  type LinkableMachine,
+  linkDestination,
+} from "@t3tools/client-runtime/link-request";
 import { useId } from "react";
 
 import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
+import { Alert, AlertDescription, AlertTitle } from "../ui/alert";
 import { Badge } from "../ui/badge";
 import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../ui/select";
 
-/** The machine choice for linking by an address typed in. */
-export const ANOTHER_ADDRESS = "another-address";
+/**
+ * Shown wherever a link goes to an address this app does not already have for a
+ * machine, with where that address leads.
+ */
+export function LinkAddressWarning({ address }: { readonly address: string }) {
+  return (
+    <Alert variant="warning">
+      <AlertTitle>Check this address</AlertTitle>
+      <AlertDescription>
+        This app cannot confirm it is one of your machines. The pairing code you paste is sent
+        there.
+        <span className="block break-all">{linkDestination(address)}</span>
+      </AlertDescription>
+    </Alert>
+  );
+}
 
 /** Whether a machine is linked already, or how this app knows it when not connected to it. */
 export function LinkMachineBadge({ machine }: { readonly machine: LinkableMachine }) {
diff --git a/apps/web/src/components/settings/LinkedEnvironmentsSettings.tsx b/apps/web/src/components/settings/LinkedEnvironmentsSettings.tsx
index 3b19489dd1e97..4cf6997a571c2 100644
--- a/apps/web/src/components/settings/LinkedEnvironmentsSettings.tsx
+++ b/apps/web/src/components/settings/LinkedEnvironmentsSettings.tsx
@@ -1,5 +1,5 @@
 import { useAtomValue } from "@effect/atom-react";
-import { linkRequestFailureMessage } from "@t3tools/client-runtime/link-request";
+import { ANOTHER_ADDRESS, linkRequestFailureMessage } from "@t3tools/client-runtime/link-request";
 import {
   AuthAccessWriteScope,
   type AuthMcpClientAccess,
@@ -41,7 +41,7 @@ import { Input } from "../ui/input";
 import { stackedThreadToast, toastManager } from "../ui/toast";
 import { ITEM_ROW_CLASSNAME, ITEM_ROW_INNER_CLASSNAME } from "./itemRows";
 import { LinkAccessPicker } from "./LinkAccessPicker";
-import { ANOTHER_ADDRESS, LinkMachineSelect } from "./LinkMachineSelect";
+import { LinkAddressWarning, LinkMachineSelect } from "./LinkMachineSelect";
 import { SettingsRow, SettingsSection } from "./settingsLayout";
 import { useNowMinute } from "../../hooks/useNowMinute";
 import { searchableSetting } from "./settingsSearch";
@@ -183,14 +183,20 @@ function LinkEnvironmentAction({ environmentId }: { readonly environmentId: Envi
   const link = useAtomCommand(peerLinkEnvironment.link, { label: "link environment" });
   const selected = choice ?? (machines.length === 0 ? ANOTHER_ADDRESS : null);
   const machine = machines.find((candidate) => candidate.environmentId === selected) ?? null;
-  // This client can mint a code there when it is connected to that
-  // environment with a session that may create pairing links.
   const targetId = machine?.environmentId ?? null;
   const connected = usePreparedConnection(targetId);
   const mayMint = useEnvironmentScope(targetId, AuthAccessWriteScope);
+  // A picked machine that left the list has no address here either.
+  const needsAddress = selected !== null && (machine === null || machine.urls.length === 0);
+  // This client mints a code there when it is connected with a session that may
+  // create pairing links, and only for its own addresses: anything can answer
+  // as that machine at one typed in, so that one gets a code the user fetched.
   const canMint =
-    targetId !== null && Option.isSome(connected) && mayMint && !mintFailed.has(targetId);
-  const needsAddress = selected === ANOTHER_ADDRESS || machine?.urls.length === 0;
+    targetId !== null &&
+    !needsAddress &&
+    Option.isSome(connected) &&
+    mayMint &&
+    !mintFailed.has(targetId);
   const ready =
     selected !== null &&
     (!needsAddress || address.trim().length > 0) &&
@@ -229,7 +235,8 @@ function LinkEnvironmentAction({ environmentId }: { readonly environmentId: Envi
             input: {
               url,
               ...(alternateUrls.length > 0 ? { alternateUrls } : {}),
-              ...(machine === null
+              // A typed address links alone: only this app's own addresses name a machine.
+              ...(machine === null || needsAddress
                 ? {}
                 : { expectedEnvironmentId: machine.environmentId, expectedLabel: machine.label }),
               pairingCode: code,
@@ -317,6 +324,7 @@ function LinkEnvironmentAction({ environmentId }: { readonly environmentId: Envi
                 ) : null}
               </label>
             ) : null}
+            {needsAddress && address.trim() ? <LinkAddressWarning address={address} /> : null}
             {selected === null || canMint ? null : (
               <label className="block space-y-1.5">
                 <span className="block text-xs font-medium text-foreground">Pairing code</span>
diff --git a/apps/web/src/components/settings/SettingsSidebarNav.composition.browser.test.tsx b/apps/web/src/components/settings/SettingsSidebarNav.composition.browser.test.tsx
index 5191b94cf49f8..892ba7e365bd4 100644
--- a/apps/web/src/components/settings/SettingsSidebarNav.composition.browser.test.tsx
+++ b/apps/web/src/components/settings/SettingsSidebarNav.composition.browser.test.tsx
@@ -42,3 +42,26 @@ it("ignores composing keys in the search", async () => {
     expect(screen.router?.state.location.pathname).toBe("/settings/appearance"),
   );
 });
+
+it("opens search from the physical Slash and F keys on non-US layouts", async () => {
+  await using _screen = await render(
+    <SidebarProvider defaultOpen>
+      <SettingsSidebarNav pathname="/settings/general" />
+    </SidebarProvider>,
+    { router: "/settings/general" },
+  );
+  const search = page.getByRole("combobox", { name: "Search settings" });
+
+  for (const { init, opens } of [
+    { init: { key: "/", code: "Digit7", shiftKey: true }, opens: true }, // German Shift+7
+    { init: { key: ".", code: "Slash" }, opens: true }, // Russian Slash key
+    { init: { key: "а", code: "KeyF", ctrlKey: true }, opens: true }, // Russian Ctrl+F
+    { init: { key: "?", code: "Slash", shiftKey: true }, opens: false },
+  ]) {
+    if (document.activeElement instanceof HTMLElement) document.activeElement.blur();
+    const event = new KeyboardEvent("keydown", { ...init, bubbles: true, cancelable: true });
+    await act(() => document.body.dispatchEvent(event));
+    expect(event.defaultPrevented, JSON.stringify(init)).toBe(opens);
+    if (opens) await expect.element(search).toHaveFocus();
+  }
+});
diff --git a/apps/web/src/components/settings/SettingsSidebarNav.tsx b/apps/web/src/components/settings/SettingsSidebarNav.tsx
index e175fbc439f22..9b47b85e476ef 100644
--- a/apps/web/src/components/settings/SettingsSidebarNav.tsx
+++ b/apps/web/src/components/settings/SettingsSidebarNav.tsx
@@ -33,6 +33,7 @@ import {
   WrenchIcon,
   XIcon,
 } from "lucide-react";
+import { resolveEventKeys } from "@t3tools/shared/keybindings";
 import { useLocation, useNavigate } from "@tanstack/react-router";
 
 import { cn } from "../../lib/utils";
@@ -157,13 +158,17 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
   useEffect(() => {
     const handleKeyDown = (event: globalThis.KeyboardEvent) => {
       if (event.defaultPrevented || event.isComposing) return;
+      const eventKeys = resolveEventKeys(event);
       const isFindShortcut =
-        event.key.toLowerCase() === "f" &&
-        (event.metaKey || event.ctrlKey) &&
-        !event.altKey &&
-        !event.shiftKey;
+        eventKeys.has("f") && (event.metaKey || event.ctrlKey) && !event.altKey && !event.shiftKey;
+      // Shift is allowed only when the layout types "/" with it (German Shift+7); Shift on
+      // the physical Slash key types "?" or "," instead.
       const isSlashShortcut =
-        event.key === "/" && !event.metaKey && !event.ctrlKey && !event.altKey;
+        eventKeys.has("/") &&
+        (event.key === "/" || !event.shiftKey) &&
+        !event.metaKey &&
+        !event.ctrlKey &&
+        !event.altKey;
       if (!isFindShortcut && !isSlashShortcut) return;
 
       const target = event.target;
diff --git a/apps/web/src/components/settings/VoiceSettingsPanel.tsx b/apps/web/src/components/settings/VoiceSettingsPanel.tsx
index 495abdefb6b6e..e2137cf24e13f 100644
--- a/apps/web/src/components/settings/VoiceSettingsPanel.tsx
+++ b/apps/web/src/components/settings/VoiceSettingsPanel.tsx
@@ -3,6 +3,7 @@ import {
   downloadEnvironmentSpeechModel,
   getEnvironmentSpeechModels,
   getEnvironmentSpeechStatus,
+  linkEnvironmentSpeechModels,
   removeEnvironmentSpeechModel,
   selectEnvironmentSpeechModel,
   updateEnvironmentSpeechAcceleration,
@@ -11,6 +12,7 @@ import {
 import type { PreparedConnection } from "@t3tools/client-runtime/connection";
 import { openRouterIcon } from "@t3tools/client-runtime/provider-clients";
 import {
+  AuthFilesystemReadScope,
   AuthSettingsWriteScope,
   CLOUD_SPEECH_LABELS,
   CloudSpeechProvider,
@@ -42,6 +44,7 @@ import {
   StarIcon,
   SlidersHorizontalIcon,
   Trash2Icon,
+  UnlinkIcon,
   XIcon,
 } from "lucide-react";
 import { useEffect, useRef, useState, type ReactNode } from "react";
@@ -215,6 +218,11 @@ function ModelCard(props: ModelCardProps) {
           ) : null}
         </div>
         <p className="mt-0.5 text-xs leading-relaxed text-muted-foreground">{model.description}</p>
+        {model.linkedFrom ? (
+          <p className="mt-0.5 break-all text-2xs text-muted-foreground">
+            Using your file at {model.linkedFrom}
+          </p>
+        ) : null}
         <ModelBenchmarks
           model={model}
           languages={props.comparisonLanguages}
@@ -283,10 +291,18 @@ function ModelCard(props: ModelCardProps) {
             size="icon-sm"
             variant="ghost"
             disabled={props.busy}
-            aria-label={`Delete ${model.name}`}
+            aria-label={
+              model.linkedFrom
+                ? `Stop using your ${model.name} file; the file stays on disk`
+                : `Delete ${model.name}`
+            }
             onClick={props.onDelete}
           >
-            <Trash2Icon className="size-3.5" />
+            {model.linkedFrom ? (
+              <UnlinkIcon className="size-3.5" />
+            ) : (
+              <Trash2Icon className="size-3.5" />
+            )}
           </Button>
         ) : null}
       </div>
@@ -779,6 +795,8 @@ function SpeechModelBrowser(props: {
   const [search, setSearch] = useState("");
   const [sort, setSort] = useState<SpeechModelSort>("recommended");
   const [downloadedOnly, setDownloadedOnly] = useState(false);
+  const [existingPath, setExistingPath] = useState("");
+  const canReadFiles = useEnvironmentScope(prepared.environmentId, AuthFilesystemReadScope);
   const [languageSearch, setLanguageSearch] = useState("");
   const [selection, setSelection] = useState<string[] | null>(null);
   const [preferred] = useState(preferredSpeechLanguages);
@@ -981,6 +999,38 @@ function SpeechModelBrowser(props: {
                   );
                 })}
               </div>
+              {status.supportsModelLinking && canReadFiles ? (
+                <form
+                  className="flex items-center gap-2 border-t border-border/60 p-3"
+                  onSubmit={(event) => {
+                    event.preventDefault();
+                    void run("Could not use a model from that path", async () => {
+                      await runEnvironmentSpeech(
+                        linkEnvironmentSpeechModels(prepared, existingPath),
+                      );
+                      setExistingPath("");
+                    });
+                  }}
+                >
+                  <div className="min-w-0 flex-1">
+                    <Input
+                      size="compact"
+                      aria-label="Path to a model file or folder already on this environment"
+                      placeholder="Already downloaded elsewhere? Paste the model file or folder path"
+                      value={existingPath}
+                      onChange={(e) => setExistingPath(e.target.value)}
+                    />
+                  </div>
+                  <Button
+                    type="submit"
+                    size="sm"
+                    variant="outline"
+                    disabled={controlsDisabled || !existingPath.trim()}
+                  >
+                    Use existing
+                  </Button>
+                </form>
+              ) : null}
             </div>
           </div>
         </>
diff --git a/apps/web/src/components/usage/UsageLimits.tsx b/apps/web/src/components/usage/UsageLimits.tsx
index 43ee023af2400..e41aa20998b1c 100644
--- a/apps/web/src/components/usage/UsageLimits.tsx
+++ b/apps/web/src/components/usage/UsageLimits.tsx
@@ -11,12 +11,13 @@ import {
 import { useAtomValue } from "@effect/atom-react";
 import { normalizeProviderAccentColor } from "@t3tools/client-runtime/state/provider-instance-display";
 import {
-  formatDuration,
   formatResetsIn,
   type LimitPace,
   paceOf,
   paceRemainingPercent,
   remainingPercent,
+  type ResetCreditChoice,
+  resetCreditChoices,
 } from "@t3tools/shared/usageLimits";
 import { GaugeIcon, TrendingDownIcon, TrendingUpIcon } from "lucide-react";
 import { Fragment, useLayoutEffect, useState } from "react";
@@ -237,22 +238,21 @@ const OUTCOME_TEXT: Record<ProviderConsumeResetCreditOutcome, string> = {
   alreadyRedeemed: "That credit was already redeemed.",
 };
 
-export function useResetCredit(
-  environmentId: EnvironmentId,
-  input: ProviderConsumeResetCreditInput,
-) {
+export function useResetCredit(environmentId: EnvironmentId) {
   const canManageProviders = useEnvironmentScope(environmentId, AuthProvidersManageScope);
   const consume = useAtomCommand(serverEnvironment.consumeResetCredit, { reportFailure: false });
+  // Kept after close so the dialog's text survives its exit animation.
+  const [choice, setChoice] = useState<ResetCreditChoice | null>(null);
   const [confirming, setConfirming] = useState(false);
   const [busy, setBusy] = useState(false);
   const [status, setStatus] = useState<string | null>(null);
 
   const redeem = async () => {
     setConfirming(false);
-    if (!readEnvironmentScope(environmentId, AuthProvidersManageScope)) return;
+    if (!choice || !readEnvironmentScope(environmentId, AuthProvidersManageScope)) return;
     setBusy(true);
     setStatus(null);
-    const result = await consume({ environmentId, input });
+    const result = await consume({ environmentId, input: choice.input });
     setBusy(false);
     if (result._tag === "Success") {
       setStatus(result.value.warning ?? OUTCOME_TEXT[result.value.outcome]);
@@ -265,7 +265,13 @@ export function useResetCredit(
     );
   };
 
-  return { canManageProviders, confirming, setConfirming, busy, status, redeem };
+  const confirm = (next: ResetCreditChoice) => {
+    if (!readEnvironmentScope(environmentId, AuthProvidersManageScope)) return;
+    setChoice(next);
+    setConfirming(true);
+  };
+
+  return { canManageProviders, choice, confirming, setConfirming, confirm, busy, status, redeem };
 }
 
 /** Require confirmation because redemption spends credits. Mount outside popovers, which stack above
@@ -273,11 +279,13 @@ export function useResetCredit(
 export function ResetCreditDialog({
   open,
   onOpenChange,
+  choice,
   onConfirm,
   disabled = false,
 }: {
   readonly open: boolean;
   readonly onOpenChange: (open: boolean) => void;
+  readonly choice: ResetCreditChoice | null;
   readonly onConfirm: () => void;
   readonly disabled?: boolean;
 }) {
@@ -286,10 +294,7 @@ export function ResetCreditDialog({
       <AlertDialogPopup>
         <AlertDialogHeader>
           <AlertDialogTitle>Use a reset credit?</AlertDialogTitle>
-          <AlertDialogDescription>
-            This redeems one credit on your account and clears the current rate-limit windows. It
-            cannot be undone.
-          </AlertDialogDescription>
+          <AlertDialogDescription>{choice?.confirmDescription}</AlertDialogDescription>
         </AlertDialogHeader>
         <AlertDialogFooter>
           <AlertDialogClose render={<Button variant="outline" />}>Cancel</AlertDialogClose>
@@ -302,22 +307,6 @@ export function ResetCreditDialog({
   );
 }
 
-export function resetCreditsSummary(
-  credits: ServerProviderResetCredits,
-  now: number,
-  compact = false,
-): string {
-  const expiresIn = credits.nextExpiresAt
-    ? formatDuration(Date.parse(credits.nextExpiresAt) - now)
-    : null;
-  if (credits.availableCount === 0) return "No reset credits banked";
-  if (compact)
-    return `${credits.availableCount} banked${expiresIn ? ` · expires in ${expiresIn}` : ""}`;
-  return `${credits.availableCount} ${credits.availableCount === 1 ? "reset credit" : "reset credits"} banked${
-    expiresIn ? ` · next expires in ${expiresIn}` : ""
-  }`;
-}
-
 export function ResetCredits({
   environmentId,
   input,
@@ -329,30 +318,31 @@ export function ResetCredits({
   readonly credits: ServerProviderResetCredits;
   readonly now: number;
 }) {
-  const { canManageProviders, confirming, setConfirming, busy, status, redeem } = useResetCredit(
-    environmentId,
-    input,
-  );
+  const { canManageProviders, choice, confirming, setConfirming, confirm, busy, status, redeem } =
+    useResetCredit(environmentId);
   if (credits.availableCount === 0 && status === null) return null;
   return (
-    <div className="flex flex-wrap items-center gap-x-3 gap-y-1 text-xs text-muted-foreground">
-      <span className="tabular-nums">{resetCreditsSummary(credits, now)}</span>
-      {credits.availableCount > 0 ? (
-        <Button
-          size="xs"
-          variant="outline"
-          disabled={busy || !canManageProviders}
-          onClick={() => {
-            if (readEnvironmentScope(environmentId, AuthProvidersManageScope)) setConfirming(true);
-          }}
-        >
-          {busy ? "Using…" : "Use reset"}
-        </Button>
-      ) : null}
+    <div className="flex flex-col gap-1 text-xs text-muted-foreground">
+      {resetCreditChoices(credits, input, now).map((choice) => (
+        <div key={choice.key} className="flex flex-wrap items-center gap-x-3 gap-y-1">
+          <span className="tabular-nums">{choice.summary}</span>
+          {choice.availableCount > 0 ? (
+            <Button
+              size="xs"
+              variant="outline"
+              disabled={busy || !canManageProviders}
+              onClick={() => confirm(choice)}
+            >
+              {busy ? "Using…" : choice.actionLabel}
+            </Button>
+          ) : null}
+        </div>
+      ))}
       {status ? <span className="text-foreground">{status}</span> : null}
       <ResetCreditDialog
         open={confirming}
         onOpenChange={setConfirming}
+        choice={choice}
         onConfirm={() => void redeem()}
         disabled={!canManageProviders}
       />
diff --git a/apps/web/src/components/usage/UsageLimitsPooled.tsx b/apps/web/src/components/usage/UsageLimitsPooled.tsx
index 00f437246584f..f2d5790ece53b 100644
--- a/apps/web/src/components/usage/UsageLimitsPooled.tsx
+++ b/apps/web/src/components/usage/UsageLimitsPooled.tsx
@@ -13,6 +13,8 @@ import {
   type LimitPoolWindow,
   paceRemainingPercent,
   remainingPercent,
+  type ResetCreditChoice,
+  resetCreditChoices,
 } from "@t3tools/shared/usageLimits";
 import type { Popover as PopoverPrimitive } from "@base-ui/react/popover";
 import { normalizeProviderAccentColor } from "@t3tools/client-runtime/state/provider-instance-display";
@@ -39,14 +41,7 @@ import { Button } from "../ui/button";
 import { OpenAI } from "../Icons";
 import { Alert, AlertTitle } from "../ui/alert";
 import { Popover, PopoverCreateHandle, PopoverPopup, PopoverTrigger } from "../ui/popover";
-import {
-  PaceIcon,
-  ResetCreditDialog,
-  barColor,
-  usePaceMark,
-  resetCreditsSummary,
-  useResetCredit,
-} from "./UsageLimits";
+import { PaceIcon, ResetCreditDialog, barColor, usePaceMark, useResetCredit } from "./UsageLimits";
 
 function accountInitials(email: string): string {
   const [local = "", domain = ""] = email.split("@");
@@ -146,7 +141,7 @@ function SegmentPopover({
   readonly reset: LimitPoolWindow["resets"][number] | undefined;
   readonly now: number;
   readonly redeem: ReturnType<typeof useResetCredit> | null;
-  readonly onRedeem: () => void;
+  readonly onRedeem: (choice: ResetCreditChoice) => void;
 }) {
   const timestampFormat = usePrimarySettings((settings) => settings.timestampFormat);
   const remaining = remainingPercent(window);
@@ -156,8 +151,10 @@ function SegmentPopover({
     account.environments.length > 0
       ? account.environments.map((environment) => environment.label).join(", ")
       : account.sourceLabel;
-  const credits =
-    redeem && account.limits.resetCredits?.availableCount ? account.limits.resetCredits : null;
+  const choices =
+    redeem && account.redeem && account.limits.resetCredits?.availableCount
+      ? resetCreditChoices(account.limits.resetCredits, account.redeem.input, now, true)
+      : [];
   return (
     <div className="flex w-72 max-w-[calc(100vw-3rem)] flex-col gap-2.5 text-xs">
       <div className="flex min-w-0 flex-col gap-0.5">
@@ -196,20 +193,24 @@ function SegmentPopover({
           <Row label="Restores">+{reset.restoresPercent}% of pool</Row>
         ) : null}
       </div>
-      {credits && redeem ? (
-        <div className="border-t border-border/60 pt-2.5 text-muted-foreground">
-          <span className="flex items-center gap-3">
-            <span className="tabular-nums">{resetCreditsSummary(credits, now, true)}</span>
-            <Button
-              size="xs"
-              variant="outline"
-              disabled={redeem.busy || !redeem.canManageProviders}
-              className="ms-auto"
-              onClick={onRedeem}
-            >
-              {redeem.busy ? "Using…" : "Use reset"}
-            </Button>
-          </span>
+      {choices.length > 0 && redeem ? (
+        <div className="flex flex-col gap-1.5 border-t border-border/60 pt-2.5 text-muted-foreground">
+          {choices.map((choice) => (
+            <span key={choice.key} className="flex items-center gap-3">
+              <span className="tabular-nums">{choice.summary}</span>
+              {choice.availableCount > 0 ? (
+                <Button
+                  size="xs"
+                  variant="outline"
+                  disabled={redeem.busy || !redeem.canManageProviders}
+                  className="ms-auto"
+                  onClick={() => onRedeem(choice)}
+                >
+                  {redeem.busy ? "Using…" : choice.actionLabel}
+                </Button>
+              ) : null}
+            </span>
+          ))}
         </div>
       ) : null}
     </div>
@@ -264,9 +265,9 @@ function ActiveSegmentPopover({
       <SegmentPopover
         {...payload}
         now={now}
-        onRedeem={() => {
+        onRedeem={(choice) => {
           handle.close();
-          payload.redeem?.setConfirming(true);
+          payload.redeem?.confirm(choice);
         }}
       />
     </PopoverPopup>
@@ -303,13 +304,14 @@ function RedeemableSegment({
 }: Omit<Parameters<typeof SegmentTriggers>[0], "redeem"> & {
   readonly redeemAt: NonNullable<LimitAccount["redeem"]>;
 }) {
-  const redeem = useResetCredit(redeemAt.environmentId, redeemAt.input);
+  const redeem = useResetCredit(redeemAt.environmentId);
   return (
     <>
       <SegmentTriggers redeem={redeem} {...props} />
       <ResetCreditDialog
         open={redeem.confirming}
         onOpenChange={redeem.setConfirming}
+        choice={redeem.choice}
         onConfirm={() => void redeem.redeem()}
         disabled={!redeem.canManageProviders}
       />
diff --git a/apps/web/src/hooks/useAttachmentUploadProgress.browser.test.tsx b/apps/web/src/hooks/useAttachmentUploadProgress.browser.test.tsx
new file mode 100644
index 0000000000000..daebd55c0f529
--- /dev/null
+++ b/apps/web/src/hooks/useAttachmentUploadProgress.browser.test.tsx
@@ -0,0 +1,47 @@
+import { EnvironmentId } from "@t3tools/contracts";
+import { expect, it, vi } from "vite-plus/test";
+
+import { act, fakeTimers, render } from "../../test/render";
+import type { AttachmentUploadState } from "../lib/attachmentUploadState";
+import { useAttachmentUploadProgress } from "./useAttachmentUploadProgress";
+
+function Probe({ id = "image", upload }: { id?: string; upload: AttachmentUploadState }) {
+  const progress = useAttachmentUploadProgress(id, upload);
+  return <output>{progress ?? "hidden"}</output>;
+}
+
+it("skips fast uploads and delays each attempt without delaying later progress or completion", async () => {
+  const environmentId = EnvironmentId.make("environment");
+  const uploading = (progress: number) => ({
+    status: "uploading" as const,
+    environmentId,
+    progress,
+  });
+  const ready = { status: "ready" as const, environmentId, attachmentId: "attachment" };
+  // The first render reads the clock to schedule the badge.
+  using _timers = fakeTimers({ now: 0 });
+  await using screen = await render(<Probe upload={uploading(0)} />);
+  await expect.element(screen.getByText("hidden")).toBeInTheDocument();
+  await act(() => vi.advanceTimersByTime(75));
+  await screen.rerender(<Probe upload={ready} />);
+  await act(() => vi.advanceTimersByTime(75));
+  await expect.element(screen.getByText("hidden")).toBeInTheDocument();
+
+  await screen.rerender(<Probe upload={uploading(0)} />);
+  await act(() => vi.advanceTimersByTime(149));
+  await screen.rerender(<Probe upload={uploading(0.45)} />);
+  await expect.element(screen.getByText("hidden")).toBeInTheDocument();
+  await act(() => vi.advanceTimersByTime(1));
+  await expect.element(screen.getByText("45%")).toBeInTheDocument();
+  await screen.rerender(<Probe upload={uploading(0.7)} />);
+  await expect.element(screen.getByText("70%")).toBeInTheDocument();
+  await screen.rerender(<Probe upload={ready} />);
+  await expect.element(screen.getByText("hidden")).toBeInTheDocument();
+
+  await screen.rerender(<Probe upload={uploading(0)} />);
+  await expect.element(screen.getByText("hidden")).toBeInTheDocument();
+  await act(() => vi.advanceTimersByTime(150));
+  await expect.element(screen.getByText("0%")).toBeInTheDocument();
+  await screen.rerender(<Probe id="another-image" upload={uploading(0)} />);
+  await expect.element(screen.getByText("hidden")).toBeInTheDocument();
+});
diff --git a/apps/web/src/hooks/useAttachmentUploadProgress.ts b/apps/web/src/hooks/useAttachmentUploadProgress.ts
new file mode 100644
index 0000000000000..bc320b9eed6df
--- /dev/null
+++ b/apps/web/src/hooks/useAttachmentUploadProgress.ts
@@ -0,0 +1,18 @@
+import {
+  type AttachmentUploadState,
+  formatAttachmentUploadProgress,
+} from "../lib/attachmentUploadState";
+import { useDelayedStatus } from "./useDelayedStatus";
+
+export function useAttachmentUploadProgress(
+  key: string,
+  upload: AttachmentUploadState | undefined,
+) {
+  const uploading = upload?.status === "uploading";
+  const shown = useDelayedStatus(
+    `${key}:${upload?.environmentId ?? ""}:${uploading ? "uploading" : "idle"}`,
+    uploading ? true : null,
+    150,
+  );
+  return uploading && shown ? formatAttachmentUploadProgress(upload.progress) : null;
+}
diff --git a/apps/web/src/hooks/useDelayedStatus.ts b/apps/web/src/hooks/useDelayedStatus.ts
index 718c0f03538e3..d9a4c15c695c5 100644
--- a/apps/web/src/hooks/useDelayedStatus.ts
+++ b/apps/web/src/hooks/useDelayedStatus.ts
@@ -7,12 +7,12 @@ import { useState } from "react";
 
 import { useDeadlinePassed } from "./useDeadline";
 
-export function useDelayedStatus<A>(key: string, value: A | null): A | null {
+export function useDelayedStatus<A>(key: string, value: A | null, showDelayMs?: number): A | null {
   const [state, setState] = useState(() =>
-    stepDelayedStatus<A>(null, { key, value, deadlinePassed: false }, Date.now),
+    stepDelayedStatus<A>(null, { key, value, deadlinePassed: false, showDelayMs }, Date.now),
   );
   const deadlinePassed = useDeadlinePassed(delayedStatusDeadline(state));
-  const next = stepDelayedStatus(state, { key, value, deadlinePassed }, Date.now);
+  const next = stepDelayedStatus(state, { key, value, deadlinePassed, showDelayMs }, Date.now);
   if (next !== state) setState(next);
   return shownDelayedStatus(next, key);
 }
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index b24265d02197e..40daa0da7dcc8 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -2012,6 +2012,10 @@ code {
   list-style-type: lower-roman;
 }
 
+.chat-markdown.user-message-markdown ol {
+  list-style-type: decimal;
+}
+
 .chat-markdown li + li {
   margin-top: 0.25rem;
 }
diff --git a/apps/web/src/lib/imageCompression.test.ts b/apps/web/src/lib/imageCompression.test.ts
index 079c52df5d573..a8d4cfcc1d549 100644
--- a/apps/web/src/lib/imageCompression.test.ts
+++ b/apps/web/src/lib/imageCompression.test.ts
@@ -96,6 +96,7 @@ function stubCanvasPipeline(
   const supportsWebp = options?.supportsWebp ?? true;
   const close = vi.fn();
   const fillRect = vi.fn();
+  const canvasSizes: Array<{ width: number; height: number }> = [];
   vi.stubGlobal(
     "createImageBitmap",
     vi.fn(async () => ({ width: 4000, height: 3000, close })),
@@ -106,7 +107,9 @@ function stubCanvasPipeline(
       constructor(
         public width: number,
         public height: number,
-      ) {}
+      ) {
+        canvasSizes.push({ width, height });
+      }
       getContext() {
         return {
           fillStyle: "",
@@ -131,7 +134,7 @@ function stubCanvasPipeline(
     vi.stubGlobal("HTMLCanvasElement", HtmlCanvas);
     vi.stubGlobal("document", { createElement: () => new HtmlCanvas(0, 0) });
   }
-  return { close, fillRect };
+  return { close, fillRect, canvasSizes };
 }
 
 afterEach(() => {
@@ -263,22 +266,57 @@ describe("composer image thumbnails", () => {
 });
 
 describe("HEIC attachment preparation", () => {
+  it("shares the native decode and shows its thumbnail before JPEG encoding finishes", async () => {
+    const { close } = stubCanvasPipeline(() => 3);
+    let finishEncoding!: (blob: Blob) => void;
+    const jpeg = new Promise<Blob>((resolve) => {
+      finishEncoding = resolve;
+    });
+    const Canvas = globalThis.OffscreenCanvas;
+    vi.stubGlobal(
+      "OffscreenCanvas",
+      class extends Canvas {
+        override convertToBlob(options?: ImageEncodeOptions) {
+          return options?.type === "image/jpeg" ? jpeg : super.convertToBlob(options);
+        }
+      },
+    );
+    const original = makeHeicFile();
+    const preparation = prepareImageForAttachment(original, 1024);
+    const queued = prepareImageForAttachment(makeHeicFile({ name: "next.heic" }), 1024);
+    const results = Promise.all([preparation, queued]);
+    try {
+      const thumbnail = await createComposerImageThumbnail(original);
+      expect(thumbnail).toMatch(/^data:image\/png;base64,/);
+      expect(mocks.heicTo).not.toHaveBeenCalled();
+      expect(createImageBitmap).toHaveBeenCalledTimes(1);
+      expect(close).not.toHaveBeenCalled();
+    } finally {
+      finishEncoding(new Blob([new Uint8Array(4)], { type: "image/jpeg" }));
+      await results;
+    }
+    const [result, next] = await results;
+    expect(result.ok && result.file.type).toBe("image/jpeg");
+    expect(result.ok && result.file.size).toBe(4);
+    expect(next.ok).toBe(true);
+    expect(close).toHaveBeenCalledTimes(2);
+  });
+
   it("converts a HEIC photo with a missing MIME type into a named JPEG", async () => {
     const original = makeHeicFile({
       name: "IMG_1234.HEIC",
       type: "",
       lastModified: 123,
     });
-    mocks.heicTo.mockResolvedValueOnce(
-      new Blob([new Uint8Array([4, 5, 6, 7])], { type: "image/jpeg" }),
-    );
+    const { close } = stubCanvasPipeline(() => 4);
+    vi.mocked(createImageBitmap).mockRejectedValue(new Error("HEIC is not supported natively"));
+    mocks.heicTo.mockResolvedValueOnce({ width: 4000, height: 3000, close });
 
     const result = await prepareImageForAttachment(original, 1024);
 
     expect(mocks.heicTo).toHaveBeenCalledWith({
       blob: original,
-      type: "image/jpeg",
-      quality: 0.92,
+      type: "bitmap",
     });
     expect(result.ok && result.file.name).toBe("IMG_1234.jpg");
     expect(result.ok && result.file.type).toBe("image/jpeg");
@@ -287,24 +325,26 @@ describe("HEIC attachment preparation", () => {
     expect(result.ok && result.recompressed).toBe(true);
   });
 
-  it("compresses JPEG intermediates above the source safety ceiling", async () => {
+  it("resizes decoded HEIC pixels before encoding the JPEG", async () => {
     const original = makeHeicFile({
       name: "large.heic",
       type: "image/heic",
     });
-    mocks.heicTo.mockResolvedValueOnce(
-      new Blob([new Uint8Array(MAX_COMPRESSIBLE_SOURCE_BYTES + 1)], {
-        type: "image/jpeg",
-      }),
-    );
-    const { close } = stubCanvasPipeline(() => 200_000);
+    const { close, canvasSizes } = stubCanvasPipeline(() => 200_000);
+    vi.mocked(createImageBitmap).mockRejectedValue(new Error("HEIC is not supported natively"));
+    mocks.heicTo.mockResolvedValueOnce({ width: 4000, height: 3000, close });
 
     const result = await prepareImageForAttachment(original, 1_000_000);
 
     expect(result.ok && result.file.name).toBe("large.jpg");
     expect(result.ok && result.file.type).toBe("image/jpeg");
     expect(result.ok && result.file.size).toBeLessThanOrEqual(1_000_000);
-    expect(close).toHaveBeenCalled();
+    expect(close).toHaveBeenCalledTimes(1);
+    expect(createImageBitmap).toHaveBeenCalledTimes(1);
+    expect(canvasSizes).toEqual([
+      { width: 2000, height: 1500 },
+      { width: 256, height: 256 },
+    ]);
   });
 
   it("rejects oversized HEIC dimensions before loading the decoder", async () => {
diff --git a/apps/web/src/lib/imageCompression.ts b/apps/web/src/lib/imageCompression.ts
index ed41b9ec45320..e174bebf4b9e4 100644
--- a/apps/web/src/lib/imageCompression.ts
+++ b/apps/web/src/lib/imageCompression.ts
@@ -240,11 +240,22 @@ export function inheritComposerImageThumbnail(source: File, target: File): void
 }
 
 async function renderComposerImageThumbnail(file: File): Promise<string | null> {
+  if (isHeicImageFile(file)) return prepareHeicImage(file).thumbnail;
   // Placeholders thumbnail the uncompressed source, which can be big enough to OOM the decode.
   if (!canRecompress() || file.size > MAX_COMPRESSIBLE_SOURCE_BYTES) return null;
   let bitmap: ImageBitmap | undefined;
   try {
     bitmap = await createImageBitmap(file);
+    return await renderComposerImageThumbnailFromBitmap(bitmap);
+  } catch {
+    return null;
+  } finally {
+    bitmap?.close();
+  }
+}
+
+async function renderComposerImageThumbnailFromBitmap(bitmap: ImageBitmap): Promise<string | null> {
+  try {
     const side = Math.min(bitmap.width, bitmap.height);
     if (side <= 0) return null;
     const dimension = Math.min(256, side);
@@ -265,8 +276,6 @@ async function renderComposerImageThumbnail(file: File): Promise<string | null>
     return blob ? await readFileAsDataUrl(blob) : null;
   } catch {
     return null;
-  } finally {
-    bitmap?.close();
   }
 }
 
@@ -454,35 +463,90 @@ export async function compressImageToByteLimit(
   };
 }
 
-export async function prepareImageForAttachment(
+const heicPreparations = new WeakMap<
+  File,
+  { image: Promise<CompressImageFileResult>; thumbnail: Promise<string | null> }
+>();
+// Preparing tiles share full-size decodes, so keep only one HEIC bitmap alive at a time.
+let heicPreparationQueue = Promise.resolve();
+
+function prepareHeicImage(file: File) {
+  const cached = heicPreparations.get(file);
+  if (cached) return cached;
+  let resolveThumbnail!: (src: string | null) => void;
+  const thumbnail = new Promise<string | null>((resolve) => {
+    resolveThumbnail = resolve;
+  });
+  const image = heicPreparationQueue
+    .then(() => convertHeicImage(file, resolveThumbnail))
+    .finally(() => resolveThumbnail(null));
+  heicPreparationQueue = image.then(
+    () => undefined,
+    () => undefined,
+  );
+  const preparation = { image, thumbnail };
+  heicPreparations.set(file, preparation);
+  return preparation;
+}
+
+async function convertHeicImage(
   file: File,
-  maxBytes: number,
+  onThumbnail: (src: string | null) => void,
 ): Promise<CompressImageFileResult> {
-  if (!isHeicImageFile(file)) {
-    return compressImageToByteLimit(file, maxBytes);
-  }
-
   if (file.size > MAX_COMPRESSIBLE_SOURCE_BYTES) {
     return { ok: false, reason: "too-large" };
   }
 
-  let converted: Blob;
+  let bitmap: ImageBitmap | undefined;
   try {
     const dimensionError = await validateHeicImageDimensions(file);
     if (dimensionError) {
       return { ok: false, reason: dimensionError };
     }
-    const { heicTo } = await import("heic-to/csp");
-    converted = await heicTo({ blob: file, type: "image/jpeg", quality: QUALITY_STEPS[0] });
+    bitmap =
+      typeof createImageBitmap === "function"
+        ? await createImageBitmap(file).catch(() => undefined)
+        : undefined;
+    if (!bitmap) {
+      const { heicTo } = await import("heic-to/csp");
+      bitmap = await heicTo({ blob: file, type: "bitmap" });
+    }
+    const imageSize = fitImageAttachmentSize(bitmap) ?? {
+      width: bitmap.width,
+      height: bitmap.height,
+    };
+    const surface = createCanvas(imageSize.width, imageSize.height);
+    if (!surface) return { ok: false, reason: "unreadable" };
+    surface.context.drawImage(bitmap, 0, 0, imageSize.width, imageSize.height);
+    const [converted] = await Promise.all([
+      encodeCanvas(surface.canvas, QUALITY_STEPS[0], "image/jpeg"),
+      renderComposerImageThumbnailFromBitmap(bitmap).then(onThumbnail),
+    ]);
+    if (!converted) return { ok: false, reason: "unreadable" };
+    return {
+      ok: true,
+      file: new File([converted], fileNameForMimeType(file.name || "image", "image/jpeg"), {
+        type: "image/jpeg",
+        lastModified: file.lastModified,
+      }),
+      recompressed: true,
+      imageSize,
+    };
   } catch {
     return { ok: false, reason: "unreadable" };
+  } finally {
+    bitmap?.close();
   }
+}
 
-  const jpeg = new File([converted], fileNameForMimeType(file.name || "image", "image/jpeg"), {
-    type: "image/jpeg",
-    lastModified: file.lastModified,
-  });
-  const result = await compressImageToByteLimit(jpeg, maxBytes, {
+export async function prepareImageForAttachment(
+  file: File,
+  maxBytes: number,
+): Promise<CompressImageFileResult> {
+  if (!isHeicImageFile(file)) return compressImageToByteLimit(file, maxBytes);
+  const prepared = await prepareHeicImage(file).image;
+  if (!prepared.ok || prepared.file.size <= maxBytes) return prepared;
+  const result = await compressImageToByteLimit(prepared.file, maxBytes, {
     preferredMimeType: "image/jpeg",
     sourceSizeBytes: file.size,
   });
diff --git a/apps/web/src/lib/openPullRequestLink.browser.test.tsx b/apps/web/src/lib/openPullRequestLink.browser.test.tsx
index a93f32a8902f7..7d93882b12b15 100644
--- a/apps/web/src/lib/openPullRequestLink.browser.test.tsx
+++ b/apps/web/src/lib/openPullRequestLink.browser.test.tsx
@@ -85,6 +85,8 @@ it.each([
   ["shiftKey", commitUrl],
   ["altKey", commitUrl],
   ["shiftKey", pullRequestCommitUrl],
+  ["shiftKey", `${pullRequestCommitUrl}#diff-abcR5`],
+  ["altKey", `${pullRequestCommitUrl}#diff-abcR5`],
 ] as const)("keeps %s clicks on %s native", async (modifier, url) => {
   setup();
   await using screen = await render(
diff --git a/apps/web/src/lib/openPullRequestLink.ts b/apps/web/src/lib/openPullRequestLink.ts
index 31c04b6263e5f..74a0b29d7aa22 100644
--- a/apps/web/src/lib/openPullRequestLink.ts
+++ b/apps/web/src/lib/openPullRequestLink.ts
@@ -1,3 +1,4 @@
+import { parsePullRequestAnchor } from "@t3tools/shared/pullRequestAnchor";
 import type { EnvironmentId, ScopedThreadRef } from "@t3tools/contracts";
 import { useAtomValue } from "@effect/atom-react";
 import { useNavigate } from "@tanstack/react-router";
@@ -89,6 +90,7 @@ export function useOpenChangeRequestLink(
       });
       if (target === null) return false;
       const { project, repository, number, host } = target;
+      const revealUrl = parsePullRequestAnchor(targetUrl) === null ? undefined : targetUrl;
       const pullRequestsSearch = {
         repository,
         number,
@@ -106,6 +108,7 @@ export function useOpenChangeRequestLink(
           ...(host === undefined ? {} : { host }),
           repository,
           url: targetUrl,
+          ...(revealUrl === undefined ? {} : { revealUrl }),
           number,
         });
         if (!resolvedThreadRef) {
@@ -124,7 +127,12 @@ export function useOpenChangeRequestLink(
       }
       void navigate({
         to: "/pull-requests",
-        search: { involvement: "all", state: "all", ...pullRequestsSearch },
+        search: {
+          involvement: "all",
+          state: "all",
+          ...pullRequestsSearch,
+          ...(revealUrl === undefined ? {} : { selectedUrl: revealUrl }),
+        },
       });
       return true;
     };
@@ -140,6 +148,14 @@ export function useOpenChangeRequestLink(
     const parsedCommit = sourceControlClients.parseCommitUrl(targetUrl, identity?.provider);
     // Shift and Alt keep their browser meaning (new window, download) on commit links.
     if (parsedCommit !== null && (event.shiftKey || event.altKey)) return false;
+    // A plain commit link stays a workspace commit; one naming a file or line opens the PR's diff.
+    const anchor = parsePullRequestAnchor(targetUrl);
+    if (anchor !== null && anchor.kind !== "code" && openPullRequest()) {
+      event.preventDefault();
+      event.stopPropagation();
+      return true;
+    }
+
     if (
       parsedCommit !== null &&
       commitThread &&
diff --git a/apps/web/src/markdown-clipboard.test.ts b/apps/web/src/markdown-clipboard.test.ts
index ac7afbc8145ac..f389b686742a7 100644
--- a/apps/web/src/markdown-clipboard.test.ts
+++ b/apps/web/src/markdown-clipboard.test.ts
@@ -197,6 +197,18 @@ describe("serializeRenderedMarkdownFragment", () => {
     expect(serializeRenderedMarkdownFragment(asNode(container))).toBe("first line\nsecond line");
   });
 
+  it("preserves explicit ordered-list values and continues from resets when copying", () => {
+    const list = new FakeElement("OL", [], { start: "0" }).append(
+      new FakeElement("LI").append(new FakeText("A")),
+      new FakeElement("LI", [], { value: "5" }).append(new FakeText("B")),
+      new FakeElement("LI").append(new FakeText("C")),
+      new FakeElement("LI", [], { value: "0" }).append(new FakeText("D")),
+    );
+    expect(serializeRenderedMarkdownFragment(asNode(new FakeElement("DIV").append(list)))).toBe(
+      "0. A\n5. B\n6. C\n0. D",
+    );
+  });
+
   it("keeps fences when a bare list item sits alongside the code block", () => {
     const container = new FakeElement("DIV").append(
       new FakeElement("UL").append(new FakeElement("LI")),
diff --git a/apps/web/src/markdown-clipboard.ts b/apps/web/src/markdown-clipboard.ts
index 2364a6c77c4e5..cf55bb8101ae3 100644
--- a/apps/web/src/markdown-clipboard.ts
+++ b/apps/web/src/markdown-clipboard.ts
@@ -144,10 +144,17 @@ function serializeListItem(
 }
 
 function serializeList(list: Element, ordered: boolean, inTableCell: boolean): string {
-  const start = Number.parseInt(list.getAttribute("start") ?? "1", 10) || 1;
+  const start = Number.parseInt(list.getAttribute("start") ?? "1", 10);
   const items = [...list.children].filter((child) => child.tagName === "LI");
   if (items.length === 0) return "";
-  return `${items.map((item, index) => serializeListItem(item, ordered, start + index, inTableCell)).join("\n")}\n\n`;
+  let next = Number.isNaN(start) ? 1 : start;
+  return `${items
+    .map((item) => {
+      const value = Number.parseInt(item.getAttribute("value") ?? "", 10);
+      if (ordered && !Number.isNaN(value)) next = value;
+      return serializeListItem(item, ordered, next++, inTableCell);
+    })
+    .join("\n")}\n\n`;
 }
 
 function serializeBlockquote(quote: Element, inTableCell: boolean): string {
diff --git a/apps/web/src/rightPanelStore.test.ts b/apps/web/src/rightPanelStore.test.ts
index ec0f4e87c12e8..3a6bd304863b0 100644
--- a/apps/web/src/rightPanelStore.test.ts
+++ b/apps/web/src/rightPanelStore.test.ts
@@ -1009,6 +1009,45 @@ describe("rightPanelStore", () => {
       selectActiveRightPanelSurface(useRightPanelStore.getState().byThreadKey, refA),
     ).toMatchObject({ url });
     expect(state.surfaces[1]).not.toHaveProperty("url");
+    expect(state.surfaces[0]).not.toHaveProperty("revealUrl");
+  });
+
+  it("holds a clicked link until the panel settles it, and a later link replaces it", async () => {
+    const pr = { projectId: "project-a", repository: "pingdotgg/t3code", number: 4909 };
+    const id = pullRequestSurfaceId(pr);
+    const url = "https://github.com/pingdotgg/t3code/pull/4909";
+    const surface = () =>
+      selectActiveRightPanelSurface(useRightPanelStore.getState().byThreadKey, refA);
+    const comment = (n: number) => `${url}#issuecomment-${n}`;
+    const store = useRightPanelStore.getState();
+    store.openPullRequest(refA, { ...pr, url: comment(1), revealUrl: comment(1) });
+    expect(surface()).toMatchObject({ url: comment(1), revealUrl: comment(1) });
+    store.openPullRequest(refA, { ...pr, url });
+    expect(surface()).not.toHaveProperty("revealUrl");
+    store.openPullRequest(refA, { ...pr, url: comment(2), revealUrl: comment(2) });
+    // A host read started for an earlier link settles only that link.
+    store.settlePullRequestReveal(refA, id, comment(1));
+    expect(surface()).toMatchObject({ revealUrl: comment(2) });
+    store.settlePullRequestReveal(refA, id, comment(2));
+    expect(surface()).toMatchObject({ url: comment(2) });
+    expect(surface()).not.toHaveProperty("revealUrl");
+    // Reopening a closed tab hands back its surface, whose url still names the comment.
+    store.openPullRequest(refA, { ...pr, url: comment(2) });
+    expect(surface()).not.toHaveProperty("revealUrl");
+    store.openPullRequest(refA, { ...pr, url: comment(3), revealUrl: comment(3) });
+    await reloadRightPanelStore();
+    expect(surface()).toMatchObject({ url: comment(3) });
+    expect(surface()).not.toHaveProperty("revealUrl");
+    store.openPullRequest(refA, { ...pr, url: comment(4), revealUrl: comment(4) });
+    store.closeSurface(refA, id);
+    await reopenClosedView(useClosedViewStore.getState().entries[0]!, {
+      workspaceAvailable: true,
+      openPreview: () => {
+        throw new Error("A PR tab must not create a browser session");
+      },
+    });
+    expect(surface()).toMatchObject({ url: comment(4) });
+    expect(surface()).not.toHaveProperty("revealUrl");
   });
 
   it("restores each environment, thread and PR surface's detail tab after reload and URL reopen", async () => {
diff --git a/apps/web/src/rightPanelStore.ts b/apps/web/src/rightPanelStore.ts
index 1f736d4f119ae..7de186174d348 100644
--- a/apps/web/src/rightPanelStore.ts
+++ b/apps/web/src/rightPanelStore.ts
@@ -73,6 +73,8 @@ export type RightPanelSurface =
       repository: string;
       number: number;
       url?: string;
+      /** A clicked link waiting for the panel to show where it points; cleared once shown. */
+      revealUrl?: string;
       detailTab?: PullRequestDetailTab;
     }
   | { id: "pull-requests"; kind: "pull-requests" }
@@ -148,6 +150,8 @@ interface RightPanelStoreState {
       repository: string;
       number: number;
       url?: string;
+      /** A clicked link to reveal; reopening a surface passes only its `url`. */
+      revealUrl?: string;
       detailTab?: PullRequestDetailTab;
     },
   ) => void;
@@ -156,6 +160,8 @@ interface RightPanelStoreState {
     surfaceId: string,
     detailTab: PullRequestDetailTab,
   ) => void;
+  /** Clears the surface's pending link only while it is still `revealUrl`. */
+  settlePullRequestReveal: (ref: ScopedThreadRef, surfaceId: string, revealUrl: string) => void;
   openTerminal: (ref: ScopedThreadRef, terminalId: string) => void;
   splitTerminal: (
     ref: ScopedThreadRef,
@@ -293,6 +299,13 @@ export function pullRequestSurface(target: {
   };
 }
 
+/** A pending link belongs to the click that made it, not to a reload or a reopen. */
+const withoutReveal = (surface: RightPanelSurface): RightPanelSurface => {
+  if (surface.kind !== "pull-request" || surface.revealUrl === undefined) return surface;
+  const { revealUrl: _pending, ...rest } = surface;
+  return rest;
+};
+
 const upsertSurface = (
   current: ThreadRightPanelState,
   surface: RightPanelSurface,
@@ -752,16 +765,17 @@ export const useRightPanelStore = create<RightPanelStoreState>()(
           userAction(state, scopedThreadKey(ref), (current) => {
             const surface = pullRequestSurface(target);
             const next = upsertSurface(current, surface);
-            return target.url
-              ? {
-                  ...next,
-                  surfaces: next.surfaces.map((entry) =>
-                    entry.id === surface.id && entry.kind === "pull-request"
-                      ? { ...entry, ...surface }
-                      : entry,
-                  ),
-                }
-              : next;
+            const { url, revealUrl } = target;
+            if (!url && !revealUrl) return next;
+            return {
+              ...next,
+              surfaces: next.surfaces.map((entry) => {
+                if (entry.id !== surface.id || entry.kind !== "pull-request") return entry;
+                // A later link replaces one not yet shown.
+                const { revealUrl: _previous, ...rest } = entry;
+                return { ...rest, ...surface, ...(revealUrl ? { revealUrl } : {}) };
+              }),
+            };
           }),
         ),
       setPullRequestDetailTab: (ref, surfaceId, detailTab) =>
@@ -781,6 +795,20 @@ export const useRightPanelStore = create<RightPanelStoreState>()(
             ),
           }));
         }),
+      settlePullRequestReveal: (ref, surfaceId, revealUrl) =>
+        set((state) => {
+          const threadKey = scopedThreadKey(ref);
+          const existing = state.byThreadKey[threadKey]?.surfaces.find(
+            (surface) => surface.id === surfaceId,
+          );
+          if (existing?.kind !== "pull-request" || existing.revealUrl !== revealUrl) return state;
+          return automaticUpdate(state, threadKey, (current) => ({
+            ...current,
+            surfaces: current.surfaces.map((surface) =>
+              surface.id === surfaceId ? withoutReveal(surface) : surface,
+            ),
+          }));
+        }),
       openFile: (ref, requestedPath, line) =>
         set((state) =>
           userAction(state, scopedThreadKey(ref), (current) => {
@@ -1164,8 +1192,15 @@ export const useRightPanelStore = create<RightPanelStoreState>()(
       ),
       partialize: (state) => ({
         byThreadKey: Object.fromEntries(
-          Object.entries(state.byThreadKey).filter(
-            ([threadKey]) => !isPullRequestsPanelKey(threadKey),
+          Object.entries(state.byThreadKey).flatMap(([threadKey, threadState]) =>
+            isPullRequestsPanelKey(threadKey)
+              ? []
+              : [
+                  [
+                    threadKey,
+                    { ...threadState, surfaces: threadState.surfaces.map(withoutReveal) },
+                  ],
+                ],
           ),
         ),
         threadPanelVisibilityByThreadKey: Object.fromEntries(
@@ -1195,7 +1230,7 @@ useRightPanelStore.subscribe((next, previous) => {
       ...removed.filter((surface) => surface.id !== before.activeSurfaceId),
       ...removed.filter((surface) => surface.id === before.activeSurfaceId),
     ];
-    for (const surface of closedInOrder) {
+    for (const surface of closedInOrder.map(withoutReveal)) {
       if (
         surface.kind === "terminal" ||
         (surface.kind === "preview" && surface.resourceId !== null)
diff --git a/apps/web/src/routes/_chat.pull-requests.tsx b/apps/web/src/routes/_chat.pull-requests.tsx
index a95646488ed69..95b72f57992e9 100644
--- a/apps/web/src/routes/_chat.pull-requests.tsx
+++ b/apps/web/src/routes/_chat.pull-requests.tsx
@@ -29,6 +29,7 @@ function pullRequestSearchLabels(raw: unknown): Partial<Pick<PullRequestsSearch,
 
 export const Route = createFileRoute("/_chat/pull-requests")({
   validateSearch: (raw: Record<string, unknown>): PullRequestsSearch => ({
+    ...(typeof raw.selectedUrl === "string" ? { selectedUrl: raw.selectedUrl.slice(0, 4096) } : {}),
     involvement:
       raw.involvement === "reviewing" || raw.involvement === "authored" ? raw.involvement : "all",
     state:
diff --git a/apps/web/test/fixtures/usage-limits-hub/README.md b/apps/web/test/fixtures/usage-limits-hub/README.md
index 102f8a31e573e..ec33b471b9ca7 100644
--- a/apps/web/test/fixtures/usage-limits-hub/README.md
+++ b/apps/web/test/fixtures/usage-limits-hub/README.md
@@ -2,15 +2,18 @@
 
 A fake CLIProxyAPI hub that serves the Limits evidence scenarios in `scenarios.json`:
 
-| Scenario | Accounts                                                       |
-| -------- | -------------------------------------------------------------- |
-| A        | mixed Codex and Claude accounts                                |
-| B        | one account per provider                                       |
-| C        | six long-email Codex accounts                                  |
-| L        | named accounts (no email, so segments show the auth-file name) |
-| T        | forty accounts, so pooled segments are 4px wide at 390px       |
-
-Reset times are minute offsets from `n0`.
+| Scenario | Accounts                                                                 |
+| -------- | ------------------------------------------------------------------------ |
+| A        | mixed Codex and Claude accounts                                          |
+| B        | one account per provider                                                 |
+| C        | six long-email Codex accounts                                            |
+| F        | xAI and Antigravity accounts that read, answer malformed, or are refused |
+| L        | named accounts (no email, so segments show the auth-file name)           |
+| P        | one account per read hub provider, plus an unread Kiro account           |
+| T        | forty accounts, so pooled segments are 4px wide at 390px                 |
+
+Reset times are minute offsets from `n0`. An account's `state` of `malformed` or `refused` makes
+its usage unreadable, so Limits leaves it out.
 
 ## Rebuild a capture
 
diff --git a/apps/web/test/fixtures/usage-limits-hub/hub.mjs b/apps/web/test/fixtures/usage-limits-hub/hub.mjs
index a2ba8d7c2ef09..5d10671fd7f07 100644
--- a/apps/web/test/fixtures/usage-limits-hub/hub.mjs
+++ b/apps/web/test/fixtures/usage-limits-hub/hub.mjs
@@ -13,8 +13,29 @@ const MINUTE = 60_000;
 
 // A window is [usedPercent, minutesFromN0 | null]; null is unknown reset timing.
 const at = (n0, minutes) => (minutes === null ? null : n0 + minutes * MINUTE);
+const iso = (n0, minutes) =>
+  minutes === null ? undefined : new Date(at(n0, minutes)).toISOString();
 const usage = (account, n0) => {
   const [session, weekly, fable] = account.windows;
+  if (account.provider === "xai") {
+    return {
+      config: {
+        creditUsagePercent: session[0],
+        currentPeriod: { type: "USAGE_PERIOD_TYPE_WEEKLY", end: iso(n0, session[1]) },
+      },
+    };
+  }
+  if (account.provider === "antigravity") {
+    const bucket = (bucketId, window, [used, minutes]) => ({
+      bucketId,
+      window,
+      remainingFraction: 1 - used / 100,
+      resetTime: iso(n0, minutes),
+    });
+    return {
+      buckets: [bucket("gemini-5h", "5h", session), bucket("gemini-weekly", "weekly", weekly)],
+    };
+  }
   if (account.provider === "codex") {
     const window = ([used, minutes], seconds) => ({
       used_percent: used,
@@ -68,6 +89,7 @@ NodeHttp.createServer((request, response) => {
           auth_index: id,
           provider: account.provider,
           ...(account.email ? { email: account.email } : {}),
+          ...(account.project_id ? { project_id: account.project_id } : {}),
         })),
       });
     }
@@ -75,6 +97,13 @@ NodeHttp.createServer((request, response) => {
       const call = JSON.parse(raw);
       const account = accounts[call.auth_index];
       if (!account) return json(response, { status_code: 404, body: "{}" });
+      // "refused" fails every upstream call; "malformed" answers the usage call with the wrong shape.
+      if (account.state === "refused") {
+        return json(response, { status_code: 403, body: JSON.stringify({ error: "refused" }) });
+      }
+      if (call.url.endsWith("/userinfo")) {
+        return json(response, { status_code: 200, body: JSON.stringify({ id: call.auth_index }) });
+      }
       if (call.url.endsWith("/rate-limit-reset-credits")) {
         const credits = Array.from({ length: account.credits ?? 0 }, (_, index) => ({
           id: `${call.auth_index}-credit-${index}`,
@@ -84,7 +113,11 @@ NodeHttp.createServer((request, response) => {
         }));
         return json(response, { status_code: 200, body: JSON.stringify({ credits }) });
       }
-      return json(response, { status_code: 200, body: JSON.stringify(usage(account, n0)) });
+      const body =
+        account.state === "malformed"
+          ? { config: "malformed", buckets: "malformed" }
+          : usage(account, n0);
+      return json(response, { status_code: 200, body: JSON.stringify(body) });
     }
     response.writeHead(404).end();
   });
diff --git a/apps/web/test/fixtures/usage-limits-hub/scenarios.json b/apps/web/test/fixtures/usage-limits-hub/scenarios.json
index 70e9be83f9a10..b1d267ad18e0a 100644
--- a/apps/web/test/fixtures/usage-limits-hub/scenarios.json
+++ b/apps/web/test/fixtures/usage-limits-hub/scenarios.json
@@ -512,5 +512,91 @@
         [20, 4480]
       ]
     }
+  },
+  "P": {
+    "c1": {
+      "provider": "codex",
+      "email": "c1.codex.owner@example.com",
+      "windows": [
+        [30, 120],
+        [60, 7560.0]
+      ]
+    },
+    "a1": {
+      "provider": "claude",
+      "email": "a1.claude.owner@example.com",
+      "windows": [
+        [50, 150.0],
+        [10, 9273.6],
+        [0, 10140]
+      ]
+    },
+    "x1": {
+      "provider": "xai",
+      "email": "x1.grok.owner@example.com",
+      "windows": [[35, 4320]]
+    },
+    "g1": {
+      "provider": "antigravity",
+      "project_id": "fixture-project",
+      "email": "g1.antigravity.owner@example.com",
+      "windows": [
+        [60, 200],
+        [25, 6000]
+      ]
+    },
+    "k1": {
+      "provider": "kiro",
+      "email": "k1.kiro.owner@example.com",
+      "windows": [[10, 60]]
+    }
+  },
+  "F": {
+    "x1": {
+      "provider": "xai",
+      "email": "x1.grok.owner@example.com",
+      "windows": [[35, 4320]]
+    },
+    "x2": {
+      "provider": "xai",
+      "email": "x2.grok.owner@example.com",
+      "windows": [[35, 4320]],
+      "state": "malformed"
+    },
+    "x3": {
+      "provider": "xai",
+      "email": "x3.grok.owner@example.com",
+      "windows": [[35, 4320]],
+      "state": "refused"
+    },
+    "g1": {
+      "provider": "antigravity",
+      "project_id": "fixture-project",
+      "email": "g1.antigravity.owner@example.com",
+      "windows": [
+        [60, 200],
+        [25, 6000]
+      ]
+    },
+    "g2": {
+      "provider": "antigravity",
+      "project_id": "fixture-project",
+      "email": "g2.antigravity.owner@example.com",
+      "windows": [
+        [60, 200],
+        [25, 6000]
+      ],
+      "state": "malformed"
+    },
+    "g3": {
+      "provider": "antigravity",
+      "project_id": "fixture-project",
+      "email": "g3.antigravity.owner@example.com",
+      "windows": [
+        [60, 200],
+        [25, 6000]
+      ],
+      "state": "refused"
+    }
   }
 }
diff --git a/docs/README.md b/docs/README.md
index 3c98c72238820..264d509d97642 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -65,6 +65,7 @@ source alone does not explain. Most code changes do not need an internal documen
 ### Runbooks
 
 - [Development and local builds](./operations/development.md)
+- [Scenarios: real-app proof for a fix](./operations/scenarios.md)
 - [T3 Connect setup](./operations/connect-setup.md)
 - [Release](./operations/release.md)
 - [Observability](./operations/observability.md)
diff --git a/docs/internals/remote.md b/docs/internals/remote.md
index 0c328c50317c5..4a348382ac47b 100644
--- a/docs/internals/remote.md
+++ b/docs/internals/remote.md
@@ -94,9 +94,15 @@ Unlinking on the linking side only forgets the token.
   `T3-Mode-Limit`, which the receiving `/mcp` only ever narrows the client's
   approved access with. A plan-mode agent therefore cannot start full-access
   work through a full-access link.
-- **The token goes only to an address that proves it is the linked
-  environment**: its descriptor must report the linked environment id. A LAN
-  address that now belongs to another machine never receives it.
+- **A descriptor's environment id filters addresses; it does not prove
+  identity.** The token goes only to an address that reports the linked id, so
+  a LAN address that now reports another machine's never receives it. Anything can
+  report any id, though, so only addresses from the user's client count as a
+  machine's, and never a loopback one, which names whichever machine opens
+  it. An address an agent gives is recorded alone, and
+  [`linkRequestTarget`](../../packages/client-runtime/src/linkRequest.ts) names
+  a machine for it only when the client already reaches exactly one machine
+  there. An address alone never moves an unexpired link to another address.
 - **All callers on one side share the link's single session on the other**,
   so idempotency keys are hashed with the caller's namespace before they
   leave. Without that, two agents reusing a key would collide on the far side.
diff --git a/docs/internals/voice-input.md b/docs/internals/voice-input.md
index e381debdb792b..00964ab4ae332 100644
--- a/docs/internals/voice-input.md
+++ b/docs/internals/voice-input.md
@@ -63,6 +63,9 @@ at a time. Batch uploads carry their options in the body framing defined in
 [shared/speech.ts](../../packages/shared/src/speech.ts); streaming sends them in
 the socket's first command. Model files and the selected model, hardware
 placement, and unload timeout are environment state in server settings.
+A model file from another app is installed as a symlink only after its SHA-256
+matches a catalog entry, so the store never loads a file the catalog does not pin
+and removing a model never deletes a file T3 Code did not download.
 
 The Silero silence detector is optional. If its download fails, recordings use
 raw audio during the retry cooldown so a detector outage cannot block dictation.
diff --git a/docs/operations/scenarios.md b/docs/operations/scenarios.md
new file mode 100644
index 0000000000000..c49f23a4b2068
--- /dev/null
+++ b/docs/operations/scenarios.md
@@ -0,0 +1,173 @@
+# Scenarios
+
+A scenario is an [e2e](https://e2e.com/docs) test that shows one behavior in the real app: a real
+server on its own T3 home, real HTTP and WebSocket, and a real browser on the web client or a
+pooled iPhone simulator running the mobile app. The
+dev replay agent stands in for the model, so a run is free and repeatable. Use one as the proof
+for a bug fix: it fails on the base commit and passes on the fix.
+
+Scenarios live in [`scripts/scenarios`](../../scripts/scenarios) as `*.e2e.ts`. e2e is the
+runner; its docs ship in `scripts/node_modules/e2e/docs` and `e2e guide` prints them.
+
+## Write one
+
+```ts
+import { expect } from "e2e";
+
+import { test, WEB } from "./t3.ts";
+
+test(
+  "Tab moves from the add-project Git URL field to its submit button",
+  WEB,
+  async ({ t3, app, screen, browser }) => {
+    await t3.project("demo");
+    await t3.open();
+
+    await screen.getByRole("button", "Add project").tap();
+    await screen.getByText("Git URL").tap();
+    await screen.getByRole("combobox").fill("https://github.com/pingdotgg/t3code.git");
+    const submit = screen.getByRole("button", "Continue (Enter)");
+    await expect(submit).toBeEnabled();
+
+    await browser.keyboard.press("Tab");
+    await app.screenshot("after-tab");
+    await expect(submit).toBeFocused();
+  },
+);
+```
+
+`screen`, `browser`, `app`, and `expect` are e2e's own. [`t3.ts`](../../scripts/scenarios/t3.ts)
+adds one fixture for what e2e cannot know about T3 Code:
+
+- `t3.project(title, files)` creates a git repository and adds it as a project.
+- `t3.thread({ project, title, messages })` starts a thread and plays one replayed turn per
+  message before returning, so the thread has real history. `model` picks the recording.
+- `t3.open(path)` opens the app, already signed in.
+
+State is created through the app's own CLI, so it is real events and works on a base commit
+whose schema differs. New threads default to the replay agent's `showcase` recording: type a
+message and send it. To play something else, add a recording to the
+[replay agent](development.md#replay-provider).
+
+Write one test per file: a proof runs the file and needs exactly one test in it.
+
+Take an `app.screenshot("label")` where the bug shows. The proof pairs base and head captures by
+label. e2e adds a capture at the point of failure itself.
+
+Write only `expect` assertions for the thing the bug breaks. A proof counts a failed assertion as
+the bug. A control that cannot be found, or an app that does not start, counts as a scenario that
+could not run.
+
+Keep `agent.act` and `agent.assert` out of scenarios: they call a model, and no model is
+configured.
+
+## Run
+
+```sh
+vp run scenarios                                                  # all of them
+cd scripts && pnpm exec e2e run scenarios/replay-turn-streams.e2e.ts --headed
+```
+
+e2e starts the dev stack through [`start-app.ts`](../../scripts/scenarios/start-app.ts) on a free
+port, runs the tests, and stops it. Results land in `scripts/.e2e`: `report.json`, `summary.md`,
+and per test a `trace.md`, its screenshots, and a video. `vp run scenarios --target web` runs one
+target; flags go straight after the script name, without `--`.
+
+The first run downloads e2e's browser (about 120 MB). To fetch it ahead of time, such as in a
+machine image, run this from the repository root after `vp i`:
+
+```sh
+node scripts/node_modules/playwright-core/cli.js install --only-shell chromium ffmpeg
+```
+
+e2e opens the web app at `127.0.0.1`, and the start script tells the web dev server to bind that
+address. It does not use `localhost`, which some machines resolve to `::1` first.
+
+`e2e run --help` lists the rest: `--grep`, `--watch`, `--last-failed`, `--changed-since`.
+
+Run one at a time per checkout: a run recreates the checkout's scenario T3 home and its `.e2e`
+output. Use a second worktree for a second run.
+
+## Prove a fix
+
+```sh
+vp run scenarios:prove scripts/scenarios/add-project-tab-reaches-submit.e2e.ts \
+  --base e509db3a2f^ --head e509db3a2f --upload-command "ghdrop upload"
+```
+
+[`prove-scenario.ts`](../../scripts/prove-scenario.ts) runs `e2e run` for that scenario on both
+commits and compares the two reports. It prints, and writes to `scripts/.e2e/prove/proof.json`,
+`failsOnBase`, `passesOnHead`, `baseSha`, `headSha`, `verdict`, each side's `steps`, `captures`,
+`videos`, and `markdown`: a table with base and head captures side by side, each labelled with
+its commit, ready for a pull request description. `--upload-command` names a command that takes
+the capture paths and prints one URL per line. `--head` defaults to `HEAD`.
+
+It exits 0 only when the scenario fails on base and passes on head, 1 when it ran and did not
+prove the fix, and 2 when it could not run. A scenario that passes on base does not reproduce the
+bug, and the verdict says so.
+
+The scenario and e2e always come from your checkout. Only the app comes from the commit under
+test: a temporary worktree beside your checkout, installed with `vp i` and removed afterwards. A
+commit that is your clean `HEAD` runs in place. So a new scenario can prove a fix against a base
+that predates it.
+
+## iOS
+
+An iOS scenario imports from [`t3-mobile.ts`](../../scripts/scenarios/t3-mobile.ts) and passes
+`IOS` where a web one passes `WEB`:
+
+```ts
+import { expect } from "e2e";
+
+import { IOS, test } from "./t3-mobile.ts";
+
+test(
+  "The iOS app lists a seeded thread and opens its history",
+  IOS,
+  async ({ t3, app, screen }) => {
+    const project = await t3.project("demo");
+    await t3.thread({ project, title: "Earlier work", messages: ["first", "second"] });
+    await t3.open();
+
+    const thread = screen.getByText("Earlier work", { exact: false }).first();
+    await expect(thread).toBeVisible({ timeout: 120_000 });
+    await thread.tap();
+    await expect(screen.getByText("second fixture turn complete", { exact: false })).toBeVisible();
+  },
+);
+```
+
+`t3.project` and `t3.thread` are the same. `t3.open()` installs the dev client for the checkout's
+native fingerprint, loads it from Metro, and pairs it with the scenario's server. `device` is
+e2e's [device fixture](https://e2e.com/docs/mobile#the-device-fixture) for system actions.
+
+The run leases an iPhone 18 Pro from the Simlock pool, so it needs `SIMLOCK_AGENT_DEVICE_URL`
+and `AGENT_DEVICE_DAEMON_AUTH_TOKEN`, as `mobile:e2e` does, and a gateway on Simlock 0.7.0 or
+later. A web-only run leases nothing. The device reaches this machine over the tailnet on ports
+13990 (server) and 8190 (Metro); set `T3_SCENARIO_SERVER_PORT` and `T3_SCENARIO_METRO_PORT` when
+another run on the machine holds them. An iOS run takes two to three minutes, most of it the
+device and the first bundle. `e2e run --target web` or `--target ios` runs one side.
+
+`scenarios:prove` works the same for an iOS scenario. Each commit gets the dev client built for
+its own native code.
+
+## Other tiers
+
+- **Android.** Add a target with `mobile({ platform: "android", device: simlock("Pixel 9") })`
+  and open the dev client with the Android form of the Expo link. Not built.
+- **Live provider.** Point the default model in `start-app.ts` at a real provider's cheapest
+  model. Assertions on exact reply text would not hold.
+
+## In CI
+
+No job runs scenarios, and none should run all of them on every pull request. e2e can select the
+ones a branch touches with `e2e run --changed-since origin/main` once
+[test filters](https://e2e.com/docs/filters) are configured, and `@e2e-dev/github` posts the
+result as a pull request comment.
+
+## What a scenario cannot cover
+
+- Desktop shell behavior (menus, windows, IPC), and Android.
+- Provider-specific behavior. The replay agent speaks generic ACP.
+- State no command can create, such as a run stopped by a usage limit.
+- Timing. Replay streaming is simulated, so a scenario cannot show a performance regression.
diff --git a/docs/user/remote-access.md b/docs/user/remote-access.md
index 75910d9405c39..a510ff0008c55 100644
--- a/docs/user/remote-access.md
+++ b/docs/user/remote-access.md
@@ -333,14 +333,17 @@ off, its result arrives once it is back on.
 On the machine you will work from, open **Settings → Environments → Linked environments**,
 choose **Link**, and pick the other machine or enter its address. The list
 holds the machines this app knows and those on your T3 Connect account. If this
-app is connected to that machine with a session that manages access there, it
-makes the pairing code itself; otherwise paste one from that machine's
-**Settings → Sharing & access**. From a terminal, use
+app has an address for that machine and is connected to it with a session that
+manages access there, it makes the pairing code itself; otherwise paste one
+from that machine's **Settings → Sharing & access**. An address you type always
+needs a pasted code. From a terminal, use
 `t3 environment link <address> --pairing-code <code> --access <mode>`.
 
 You can also ask an agent to link a machine by name, such as "delegate this to
 my vps". It shows a card in the thread where you pick the machine the same way
-and the access, then approve.
+and the access, then approve. An address the agent gives that this app does
+not know for one of your machines also needs a pasted code. Paste one only for
+an address you trust: the code is sent there.
 
 - The access you pick is the most agents from this machine may do there. An
   agent also never gets more there than its own mode here.
diff --git a/docs/user/source-control.md b/docs/user/source-control.md
index 39731cb3d35b6..e9edbb449dd89 100644
--- a/docs/user/source-control.md
+++ b/docs/user/source-control.md
@@ -194,6 +194,10 @@ Where you can edit a description, you can also tick its checkboxes from the Summ
 (the Overview tab on mobile).
 GitLab calls these merge requests.
 
+A link to part of a pull request opens that part: a comment or review is marked in the activity, a
+changed-line link opens the file at those lines, a checks link opens the checks, and a commit link
+opens that commit's changes. On web and desktop, hovering a comment or commit link previews it.
+
 On mobile, **Pull requests** lists reviews across your connected environments. Open a review
 to read its description, activity, commits, and changed files. Line comments stay as drafts
 until you submit the review. **Work on PR** opens a chat with the review attached; sending
diff --git a/docs/user/usage.md b/docs/user/usage.md
index d7e0dad901bef..e6b3a46d5a14e 100644
--- a/docs/user/usage.md
+++ b/docs/user/usage.md
@@ -165,6 +165,9 @@ Grok reports the remaining subscription allowance and reset time for its current
 after signing in with `grok login`. Explicit `XAI_API_KEY` connections and custom authentication
 or endpoint configurations do not report subscription limits.
 
+Muse Code reports its session and weekly windows and its tier once the Muse CLI has run in a thread.
+Until then it shows no limits. Readings are not kept across a server restart.
+
 API-key accounts may not report subscription limits. This also applies to Claude connections
 using a proxy through `ANTHROPIC_AUTH_TOKEN`.
 
@@ -173,7 +176,8 @@ using a proxy through `ANTHROPIC_AUTH_TOKEN`.
 To see pooled accounts, open **Settings → Providers → Usage providers → Add hub**. Choose the
 environment that will connect to the hub and enter its URL and management key.
 
-The accounts appear under **Usage → Limits**. Codex accounts show banked reset credits; select an
+The hub's Codex, Claude, xAI (shown as Grok) and Antigravity accounts appear under **Usage → Limits**;
+accounts for other providers are not read. Codex accounts show banked reset credits; select an
 account and choose **Use reset** to redeem one. No hub plugin is required.
 
 This connection supplies usage information; configure
diff --git a/docs/user/voice-input.md b/docs/user/voice-input.md
index 7e5c36fa4d1eb..0672ae23ea233 100644
--- a/docs/user/voice-input.md
+++ b/docs/user/voice-input.md
@@ -54,6 +54,16 @@ isn’t already selected. **Test model** lets you try it without sending a messa
 If you use the composer microphone before a model is installed, it offers to download one.
 The recommendation uses your Voice language, or your system’s preferred languages with **Auto-detect**.
 
+If another app already downloaded one of these models, you don’t need a second copy.
+**Download** first looks in Handy’s model folder and the Hugging Face cache on that
+environment and uses a copy it finds there instead of downloading. For a copy anywhere
+else, on web or desktop, paste the path of the model file or its folder under the model
+list and choose **Use existing**. The path is on the environment
+that transcribes, not on the device you are using. T3 Code checks that the file is exactly a
+model from its list and then uses it in place. Removing the model in T3 Code leaves your file
+alone; if the other app deletes it, download or link the model again. Files in another
+format, such as Core ML, ONNX, or MLX builds of the same model, can’t be used.
+
 Select the languages you dictate in to compare models that support all of them.
 Accuracy shows how often the model got words or characters wrong in each
 language; speed is the time to transcribe 30 seconds on a reference GPU. Choose
diff --git a/evals/mcp-tool-use/agent-device-help.txt b/evals/mcp-tool-use/agent-device-help.txt
index a45698bfb2f04..058f29b5bf6a1 100644
--- a/evals/mcp-tool-use/agent-device-help.txt
+++ b/evals/mcp-tool-use/agent-device-help.txt
@@ -1,4 +1,4 @@
-agent-device 0.21.31 prints this help; apps/server/src/device/deviceToolVersions.json pins that version. Regenerate from
+agent-device 0.21.36 prints this help; apps/server/src/device/deviceToolVersions.json pins that version. Regenerate from
 the repo root with: node scripts/node_modules/agent-device/bin/agent-device.mjs help [commands|record|screenshot|open|settings|fill]
 
 $ agent-device help
@@ -54,9 +54,8 @@ Guides (agent-device help <topic>):
   physical-device / ios-system-ui / maestro
   foldable    iPhone Duo panels, the fold command, and why refs die on a pose change
 
-
 $ agent-device help commands
-agent-device 0.21.31 — commands
+agent-device 0.21.36 — commands
 
 Full command catalog. Use agent-device help <command> for exact flags and behavior.
 
@@ -88,7 +87,7 @@ Commands:
   doctor                      Diagnose device, app, dev-server, and RN/Expo readiness
   events                      Read session event timeline
   fill <targetOrX> <yOrText> [text]  Replace text in a UI input
-  find <query> <action> [value]  Find an element and act
+  find <query> [action] [value]  Find an element and act
   focus <x> <y>               Focus input at screen coordinates
   fold [pose]                 Fold or unfold a foldable iPhone simulator or Android emulator
   gesture <pan|fling|swipe|pinch|rotate|transform|tap|drag> ...  Run pan, fling, swipe, pinch, rotate, transform, tap, or drag gestures
@@ -181,7 +180,6 @@ Related:
   agent-device help <command>   command-specific flags
   agent-device help manual-qa   routine QA loop
   agent-device help workflow    full automation reference
-
 $ agent-device help record
 Usage:
   agent-device record start [path] [--scope <app|device|system>] [--fps <n>] [--quality <medium|high>] [--hide-touches] | record stop | record contact-sheet <video.mp4> [--out <sheet.png>]
@@ -194,12 +192,11 @@ Command flags:
   --hide-touches              Record: skip touch-overlay post-processing for faster raw benchmark videos
   --scope <app|device|system>  Record: app requires an active app session; device/system records the whole screen
   --out <path>                Output path
-
 $ agent-device help screenshot
 Usage:
   agent-device screenshot [path] [--out <path>] [--overlay-refs] [--crop-on <selector-expression>] [--pixel-density <n>] [--fullscreen, --full, -f] [--scale <0.01-1>] [--no-stabilize] [--normalize-status-bar]
 
-Capture a screenshot of the active app or web session. Choose the capture scope, density, size, or annotations through the corresponding input fields when needed. Web defaults to the viewport; use --fullscreen, --full, or -f for the entire page. iOS simulators default to 1x logical-point output; use --pixel-density to request a different screenshot density. macOS app sessions default to the app window; use --fullscreen for full desktop, --scale to downscale, --crop-on <selector> to crop the capture to the frame the selector resolves on the same screen (currently iOS simulators, Android emulators, and CoreDevice physical iPhones), --overlay-refs to annotate current refs, --normalize-status-bar for deterministic iOS simulator or Android chrome. Physical iPhone crop verification covers portrait CoreDevice/devicectl captures only. XCTest, runner fallback, and physical iPad crops are refused; landscape iPhone crop is unverified. Android captures immediately by default; --normalize-status-bar also waits for transient UI to fade, and --no-stabilize keeps capture immediate. With the native macOS backend, the front window is the app's frontmost visible, nonempty normal-level (layer-0) window on the current Space: floating palettes and app-modal alerts at window level 8 are skipped, and a sheet is captured as its own window. On macOS, any --surface other than app (desktop, menubar, frontmost-app) always captures the main display and refuses an explicit --fullscreen. On single-display iOS simulators and Android devices, the result reports displayRotation, the rotation the display rendered the capture in, when the device returns a reading in time; otherwise the field is absent.
+Capture a screenshot of the active app or web session. Choose the capture scope, density, size, or annotations through the corresponding input fields when needed. Web defaults to the viewport; use --fullscreen, --full, or -f for the entire page. iOS simulators default to 1x logical-point output; use --pixel-density to request a different screenshot density. macOS app sessions default to the app window; use --fullscreen for full desktop, --scale to downscale, --crop-on <selector> to crop the capture to the frame the selector resolves on the same screen (currently iOS simulators, Android emulators, and CoreDevice physical iPhones), --overlay-refs to annotate current refs, --normalize-status-bar for deterministic iOS simulator or Android chrome. Physical iPhone crop verification covers portrait CoreDevice/devicectl captures only. XCTest, runner fallback, and physical iPad crops are refused; landscape iPhone crop is unverified. Android captures immediately by default; --normalize-status-bar also waits for transient UI to fade, and --no-stabilize keeps capture immediate. With the native macOS backend, the front window is the app's frontmost visible, nonempty normal-level (layer-0) window on the current Space: floating palettes and app-modal alerts at window level 8 are skipped, and a sheet is captured as its own window. On macOS, any --surface other than app (desktop, menubar, frontmost-app) always captures the main display and refuses an explicit --fullscreen. On single-display iOS simulators and Android devices, the result reports displayRotation, the rotation the display rendered the capture in, when the device returns a reading in time; otherwise the field is absent. On iOS simulators a screenshot waits for that simulator's status bar to be free, and a request its caller cancelled while it waits reports the cancellation instead of capturing.
 
 Command flags:
   --out <path>                Output path
@@ -210,15 +207,17 @@ Command flags:
   --scale <0.01-1>            Screenshot: resize both dimensions by this factor (or use AGENT_DEVICE_SCREENSHOT_SCALE)
   --no-stabilize              Screenshot: capture immediately without Android status-bar stabilization (the default)
   --normalize-status-bar      Screenshot: temporarily normalize iOS simulator or ADB-backed Android status-bar chrome for deterministic screenshot diffs; ADB-backed Android waits for transient UI to fade
-
 $ agent-device help open
 Usage:
-  agent-device open [appOrUrl] [url] [--activity <component>] [--launch-console <path>] [--launch-args <arg>] [--test-ime] [--no-test-ime] [--save-script [path]] [--force, --overwrite] [--no-record] [--relaunch] [--foreground] [--timeout <ms>] [--wait <ms>] [--surface app|frontmost-app|desktop|menubar] [--metro-host <host>] [--metro-port <port>] [--bundle-url <url>] [--launch-url <url>]
+  agent-device open [appOrUrl] [url] [--activity <component>] [--launch-console <path>] [--launch-args <arg>] [--test-ime] [--no-test-ime] [--save-script [path]] [--force, --overwrite] [--no-record] [--relaunch] [--foreground] [--timeout <ms>] [--wait <ms>] [--surface app|frontmost-app|desktop|menubar] [--metro-host <host>] [--metro-port <port>] [--bundle-url <url>] [--launch-url <url>] [--os <version|range>] [--image-tag <tag>] [--physical]
 
-Boot the selected device when needed, then open an app, deep link, or URL in a session. Use the app or URL inputs to choose what becomes the foreground automation target. Use --platform to bind URL/deep-link opens to the target platform. For iOS simulator initial stdout/stderr, put --launch-console <path> on this open command, for example agent-device open "Agent Device Tester" --platform ios --launch-console artifacts/launch-console.log. Expo Go/dev-client shells accept host + URL, for example agent-device open "Expo Go" exp://127.0.0.1:8081 --platform ios. macOS also supports --surface app|frontmost-app|desktop|menubar. --metro-host/--metro-port/--bundle-url choose the app's Metro server and save that address for later metro reload calls in the same session. A fresh open without Metro hints clears an older same-name binding; close also clears it. --launch-url supplies the app's launch URL; it does not select the reload server. On an iOS simulator without --launch-url, open connects a detected Expo development client through its expo-development-client URL. The app must declare a single exp+<slug> scheme that no other installed app owns. If detection is inconclusive, the app opens normally. Bare React Native apps receive their server settings before launch. On an iOS simulator, when --launch-url raises an "Open in <App>?" prompt that keeps open from seeing the app, open accepts it if the URL scheme belongs to the session app (data.launchConfirmation: "accepted"); if the scheme belongs to another installed app, the prompt stays on screen and open fails with details.reason launch_confirmation_foreign_app; if the scheme owner cannot be resolved because no single installed app owns it or the lookup failed, the prompt stays on screen and open returns with data.launchConfirmation: "unanswered", launchConfirmationReason url-owner-unresolved, and a warning; a prompt that is seen but not recognized is reported the same way with launchConfirmationReason alert-unrecognized and its own warning; in both cases inspect the warning and answer with alert get then alert accept; when agent-device cannot read whether a prompt is up at all (the alert read, the accept, or the runner itself failed, including after a re-hand of the URL), open stays green, reports no launchConfirmation plus data.launchConfirmationProbeFailure naming the failed step (alert-read, alert-accept, or runner), and appends a warning that says to check with alert get. The prompt is read whenever open cannot see the app afterwards, including on a slow host where the app's target discovery fails on its own deadline. When an accept leaves the app provably not running, open hands the same URL over once more and reads again; still not running, it fails with details.reason launch_confirmation_unanswered. A recognized prompt still visible after a failed accept also fails with this reason, even if the app is running behind it; answer it with alert accept or alert dismiss. A simulator openurl that CoreSimulator never answers fails within 20s with details.reason ios-simulator-openurl-timeout. Only the English prompt title with Cancel and Open buttons is recognized, so on a Simulator set to another language the prompt stays on screen. A prompt that appears after open has already seen the app is not answered; use alert accept. A device another session is holding refuses at once; add --wait <ms> to block up to that budget for it and only then fail with DEVICE_IN_USE naming the owning session.
+Boot the selected device when needed, then open an app, deep link, or URL in a session. Use the app or URL inputs to choose what becomes the foreground automation target. Use --platform to bind URL/deep-link opens to the target platform. For local iOS simulator initial stdout/stderr, put --launch-console <path> on this open command, for example agent-device open "Agent Device Tester" --platform ios --launch-console artifacts/launch-console.log. Expo Go/dev-client shells accept host + URL, for example agent-device open "Expo Go" exp://127.0.0.1:8081 --platform ios. macOS also supports --surface app|frontmost-app|desktop|menubar. --metro-host/--metro-port/--bundle-url choose the app's Metro server and save that address for later metro reload calls in the same session. A fresh open without Metro hints clears an older same-name binding; close also clears it. --launch-url supplies the app's launch URL; it does not select the reload server. On an iOS simulator without --launch-url, open connects a detected Expo development client through its expo-development-client URL. The app must declare a single exp+<slug> scheme that no other installed app owns. If detection is inconclusive, the app opens normally. Bare React Native apps receive their server settings before launch. On an iOS simulator, when --launch-url raises an "Open in <App>?" prompt that keeps open from seeing the app, open accepts it if the URL scheme belongs to the session app (data.launchConfirmation: "accepted"); if the scheme belongs to another installed app, the prompt stays on screen and open fails with details.reason launch_confirmation_foreign_app; if the scheme owner cannot be resolved because no single installed app owns it or the lookup failed, the prompt stays on screen and open returns with data.launchConfirmation: "unanswered", launchConfirmationReason url-owner-unresolved, and a warning; a prompt that is seen but not recognized is reported the same way with launchConfirmationReason alert-unrecognized and its own warning; for url-owner-unresolved, answer the prompt with alert accept; for alert-unrecognized, read the alert with alert get first, because it can be the app's own alert (such as a permission prompt) rather than the launch confirmation, and answer with alert accept only when it is the launch confirmation; when agent-device cannot read whether a prompt is up at all (the alert read, the accept, or the runner itself failed, including after a re-hand of the URL), open stays green, reports no launchConfirmation plus data.launchConfirmationProbeFailure naming the failed step (alert-read, alert-accept, or runner), and appends a warning that says to check with alert get. The prompt is read whenever open cannot see the app afterwards, including on a slow host where the app's target discovery fails on its own deadline. When an accept leaves the app provably not running, open hands the same URL over once more and reads again; still not running, it fails with details.reason launch_confirmation_unanswered. When the runner reports its main-thread timeout for the accept and the prompt is still up, open presses Open again, but only when the time the open request has left covers a whole press and the read that checks it. A recognized prompt still visible after a failed accept, or once that time is gone, also fails with this reason, even if the app is running behind it; answer it with alert accept or alert dismiss. A simulator openurl that CoreSimulator never answers fails within 20s with details.reason ios-simulator-openurl-timeout. The prompt is recognized by the OS's own wording of its title and buttons in the Simulator's preferred languages; when the runner cannot read that wording, the prompt stays on screen as alert-unrecognized. A prompt that appears after open has already seen the app is not answered; use alert accept. A device another session is holding refuses at once; add --wait <ms> to block up to that budget for it and only then fail with DEVICE_IN_USE naming the owning session.
 
 Command flags:
   --force, --overwrite        Force replacement of existing state (connect: replace an active connection; --save-script: overwrite an existing target instead of refusing)
+  --os <version|range>        Proxy lease: OS version or range the backend picks the device by (Android: API level); refused without such a backend
+  --image-tag <tag>           Proxy lease: Android system image tag the backend picks the device by; refused without such a backend
+  --physical                  Proxy lease: ask the backend for a physical device instead of a simulator or emulator; refused without such a backend
   --surface app|frontmost-app|desktop|menubar  macOS session surface for open (defaults to app)
   --metro-host <host>         Session-scoped Metro/debug host hint
   --metro-port <port>         Session-scoped Metro/debug port hint; on an emulator/simulator the host defaults to the loopback alias, physical devices still need --metro-host
@@ -227,7 +226,7 @@ Command flags:
   --test-ime                  open/test/replay: activate the headless Android test IME for deterministic Unicode text entry (default on for emulators; opt-in on real devices; on test/replay it applies to the sessions the flow opens)
   --no-test-ime               open/test/replay: keep the real Android keyboard even on emulators (opt out of the headless test IME; on test/replay it applies to the sessions the flow opens)
   --activity <component>      Android launch activity (package/Class, .Class, or Class) or HarmonyOS ability name; not for URL opens
-  --launch-console <path>     open: capture the initial iOS simulator launch console window to a file
+  --launch-console <path>     open: capture the initial local iOS simulator launch console window to a file
   --launch-args <arg>         open: repeatable launch argument forwarded verbatim to the platform launch command (iOS app process args; Android adb shell am start args). Linux and macOS reject the flag.
   --save-script [path]        Arm evidence capture on open, publish the armed recording on close; close --save-script alone (without an armed open) is rejected — start with open --save-script, or use session save-script mid-session. Optional custom output path.
   --relaunch                  open: terminate app process before launching it
@@ -235,13 +234,14 @@ Command flags:
   --no-record                 Do not record this action
   --timeout <ms>              Boot/Open/Prepare: startup budget covering the device boot (and runner preparation for prepare). Replay/Snapshot/Test: maximum wall-clock time for the command or attempt. With --settle: the settle-wait deadline (default 10s)
   --wait <ms>                 Open: wait up to n ms for a device another session is holding before failing with DEVICE_IN_USE
-
 $ agent-device help settings
 Usage:
   agent-device settings <wifi|bluetooth|airplane|mobile-data|location|animations> <on|off> | settings location set <lat> <lon> | settings appearance <light|dark|toggle> | settings text-size [extra-small|small|medium|large|extra-large|extra-extra-large|extra-extra-extra-large|accessibility-medium|accessibility-large|accessibility-extra-large|accessibility-extra-extra-large|accessibility-extra-extra-extra-large] | settings <faceid|touchid> <match|nonmatch|enroll|unenroll> | settings fingerprint <match|nonmatch> | settings clear-app-state [app-id] | settings reset-keychain clear | settings permission <grant|deny|reset> <all|camera|microphone|photos|contacts|contacts-limited|notifications|calendar|location|location-always|media-library|motion|reminders|siri> [full|limited] | settings permission <grant|reset> <accessibility|screen-recording|input-monitoring> [--app <id-or-name>]
 
 Read or change supported operating-system settings, animation scales, appearance, or app permissions on the selected target. Platform support varies by setting and action. A bare readable setting reads the value the target holds. A target that does not serve a setting refuses it with UNSUPPORTED_OPERATION before anything changes.
 
+On an iOS simulator, settings wifi and settings airplane wait for screenshots and other status bar writes. The request timeout includes this wait (90 seconds for a standalone CLI request). Once the write starts, its status bar command has a separate 10-second timeout. A request or write that times out may already have changed the bar; check the bar before relying on it. Cancelling while still queued guarantees nothing was written.
+
 Settings:
   wifi: Android switches Wi-Fi with svc wifi; an Apple simulator overrides only its status bar.
   bluetooth: Android over adb turns its Bluetooth adapter on or off with svc bluetooth, from Android 8.1. It reports the bluetooth state the device holds afterwards, or fails with bluetooth-not-applied or bluetooth-unreadable. A device without an adapter refuses with android_bluetooth_adapter_missing, and an adapter on a build older than 8.1 with android_bluetooth_command_unavailable, before anything changes. --app is refused.
@@ -260,12 +260,11 @@ Settings:
 
 Command flags:
   --app <id-or-name>  Target an app without opening it: doctor verifies an installed app by id or name; settings applies an app-scoped change (permission, iOS location) to a bundle id or package
-
 $ agent-device help fill
 Usage:
   agent-device fill <x> <y> <text> | fill <@ref|selector> <text> | fill <x y|@ref|selector> --text-stdin
 
-Replace text in a UI input selected by snapshot ref, selector, or coordinates. Pass an empty text to clear the field. Inspect unconfirmed evidence and assert the expected value or resulting screen before continuing. Prefer refs or selectors after snapshot; use recordAs to keep sensitive text out of a recorded replay while sending it to the live app. Every positional after an @ref is the replacement text, so fill @e57 good morning enters "good morning"; quote the text when the shell must preserve exact whitespace. Clear a field with an empty text argument: fill @e57 "" (the argument must be present — fill @e57 alone is a missing argument, not a clear). When visible label text also matches a non-input element, constrain the target with editable=true, for example fill 'label="Email" editable=true' "qa@example.com". To keep a secret out of argv, omit the text and pipe it in: printf %s "$PASSWORD" | fill @e57 --text-stdin (max 64 KiB, one trailing newline removed).
+Replace text in a UI input selected by snapshot ref, selector, or coordinates. Pass an empty text to clear the field. Inspect unconfirmed evidence and assert the expected value or resulting screen before continuing. Prefer refs or selectors after snapshot; use recordAs to keep sensitive text out of a recorded replay while sending it to the live app. Every positional after an @ref is the replacement text, so fill @e57 good morning enters "good morning"; quote the text when the shell must preserve exact whitespace. Clear a field with an empty text argument: fill @e57 "" (the argument must be present — fill @e57 alone is a missing argument, not a clear). When visible label text also matches a non-input element, constrain the target with editable=true, for example fill 'label="Email" editable=true' "qa@example.com". To keep a secret out of argv, omit the text and pipe it in: printf %s "$PASSWORD" | fill @e57 --text-stdin (max 64 KiB, one trailing newline removed). On web, a coordinate fill selects the clicked field in the page and refuses with COMMAND_FAILED and details.reason text_entry_focus_not_observed, before it sends any text or key, when the click did not reach an editable text field it can reach: a read-only, disabled, date, checkbox, or select control, a field in a cross-origin frame, a sandboxed frame without allow-same-origin, or a closed shadow root, or a click that missed. The click has already landed, so run snapshot -i again and fill the field it reports by ref (fill @e2 text); a selector fill reaches the same coordinate path and hits the same limits.
 
 Command flags:
   --delay-ms <ms>      Delay between typed characters
diff --git a/knip.jsonc b/knip.jsonc
index ed4bf19129645..068c8cf84ab69 100644
--- a/knip.jsonc
+++ b/knip.jsonc
@@ -31,13 +31,17 @@
         "linux-after-pack.ts",
         "mobile-behavior/run.ts",
         "mobile-native-client.ts",
+        // e2e loads its config and the scenarios by path, and starts the app script.
+        "e2e.config.ts",
+        "prove-scenario.ts",
+        "scenarios/*.ts",
         "setup-worktree.ts",
         "sign-macos.ts",
         "prepare-server-compile-cache.cjs",
         "smoke-desktop-app.ts",
         "verify-windows-desktop-artifact.ts",
       ],
-      "ignoreDependencies": ["agent-device", "esbuild"],
+      "ignoreDependencies": ["esbuild"],
       // The `t3` npm package's files: copied into the package, never imported.
       // knip-schemas.test.ts writes a throwaway project to .knip-test-*, which a
       // knip run beside it in check:changed must not report.
diff --git a/package.json b/package.json
index c43ef19c7b856..9017f1117394b 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,8 @@
     "mobile:install": "node scripts/mobile-native-client.ts ensure",
     "mobile:behavior": "node scripts/mobile-behavior.ts",
     "mobile:e2e": "node scripts/mobile-e2e.ts",
+    "scenarios": "vp run --filter @t3tools/scripts scenarios",
+    "scenarios:prove": "node scripts/prove-scenario.ts",
     "test": "vp run -r test",
     "test:cached": "node scripts/test-cached.ts",
     "test:perf:v2-wire": "vp test run apps/server/src/orchestration-v2/WireProjection.test.ts apps/server/src/orchestration-v2/threadHistoryPaging.test.ts apps/server/src/orchestration-v2/ThreadStream.test.ts apps/server/src/orchestration-v2/ThreadTransportPerformance.test.ts apps/server/src/orchestration-v2/ShellStream.test.ts apps/server/src/orchestration-v2/CommandPolicy.test.ts apps/server/src/orchestration-v2/runtimeLayer.test.ts apps/server/src/ws.test.ts packages/contracts/src/orchestrationV2.test.ts packages/client-runtime/src/operations/commands.test.ts packages/client-runtime/src/operations/commands.performance.test.ts packages/client-runtime/src/state/boundedThreadSnapshotHttp.test.ts packages/client-runtime/src/state/threadHistoryController.test.ts packages/client-runtime/src/state/threadHistoryMerge.test.ts packages/client-runtime/src/state/threads-sync.test.ts packages/client-runtime/src/state/shellReducer.test.ts",
diff --git a/packages/client-runtime/src/linkRequest.test.ts b/packages/client-runtime/src/linkRequest.test.ts
index 25647abe5aa27..dc8a1b94db9e9 100644
--- a/packages/client-runtime/src/linkRequest.test.ts
+++ b/packages/client-runtime/src/linkRequest.test.ts
@@ -8,12 +8,15 @@ import { BearerConnectionTarget, RelayConnectionTarget } from "./connection/mode
 import type { EnvironmentPresentation } from "./connection/presentation.ts";
 import type { RelayDiscoveredEnvironment } from "./relay/discovery.ts";
 import {
+  ANOTHER_ADDRESS,
   linkableMachines,
   linkedEnvironmentNames,
   linkRequestAnswerInput,
   linkRequestDisplay,
   linkRequestFailureMessage,
   linkRequestInitialMachine,
+  linkRequestTarget,
+  linkRequestTargetName,
   rankMachinesByHint,
 } from "./linkRequest.ts";
 
@@ -187,9 +190,10 @@ const discovered = (
 describe("linkableMachines", () => {
   it("lists the other machines with reported addresses before saved ones, once each", () => {
     const here = presentation("environment-here", "Here", { saved: ["http://localhost:3773"] });
+    // A loopback address would name the linking server itself, so it is no address of the VPS.
     const vps = presentation("environment-vps", "VPS", {
-      saved: ["https://vps.example.com", "https://vps.ts.net"],
-      reported: ["https://vps.ts.net"],
+      saved: ["https://vps.example.com", "https://vps.ts.net", "http://127.0.0.1:3773"],
+      reported: ["https://vps.ts.net", "http://localhost:3773"],
     });
     const mini = presentation("environment-mini", "Mini", { connected: false });
     expect(
@@ -312,6 +316,24 @@ describe("linkableMachines", () => {
       urls: ["https://environment-mini.t3.example"],
     });
     expect(listed[2]).toMatchObject({ machine: "server", linked: true });
+
+    // A Connect record that publishes only a loopback address gives the machine none.
+    const local = discovered("environment-local", "Local");
+    const published = {
+      ...local,
+      environment: {
+        ...local.environment,
+        endpoint: { ...local.environment.endpoint, httpBaseUrl: "http://127.0.0.1:3773/" },
+      },
+    };
+    expect(
+      linkableMachines({
+        environments: [],
+        threadEnvironmentId: EnvironmentId.make("environment-here"),
+        links: [],
+        connect: new Map([["environment-local", published]]),
+      })[0]?.urls,
+    ).toEqual([]);
   });
 });
 
@@ -392,6 +414,67 @@ describe("rankMachinesByHint", () => {
   });
 });
 
+describe("linkRequestTarget", () => {
+  const box = {
+    environmentId: EnvironmentId.make("environment-box"),
+    label: "Box",
+    machine: "server",
+    connected: true,
+    connectOnly: false,
+    linked: false,
+    urls: ["http://10.0.0.2:3773", "https://box.t3connect.example/"],
+  } as const;
+
+  it("takes a machine from an address the agent gave only where this app already reaches it", () => {
+    // Anything can answer at an address as the box, so an id beside one is not trusted.
+    const unfamiliar = {
+      url: "https://other.example",
+      environmentId: box.environmentId,
+      label: "Box",
+    };
+    expect(linkRequestTarget(unfamiliar, [box], null)).toEqual({ kind: "address" });
+    expect(linkRequestTarget(unfamiliar, [box], box.environmentId)).toEqual({ kind: "address" });
+    expect(linkRequestTargetName(unfamiliar)).toBe("https://other.example");
+    // A username in the address must not pass for the host the code goes to.
+    expect(linkRequestTargetName({ url: "https://box.t3connect.example@other.example/x" })).toBe(
+      "https://other.example",
+    );
+    // A known address in another spelling is the box, linked at its own addresses only.
+    expect(
+      linkRequestTarget({ url: "https://BOX.t3connect.example:443/mcp" }, [box], null),
+    ).toEqual({
+      kind: "machine",
+      environmentId: box.environmentId,
+      label: "Box",
+      urls: box.urls,
+      linked: false,
+    });
+    expect(linkRequestTarget({ url: "http://box.t3connect.example" }, [box], null)).toEqual({
+      kind: "address",
+    });
+    expect(linkRequestTarget({ url: "not a url" }, [box], null)).toEqual({ kind: "address" });
+    expect(linkRequestTarget({ url: "blob:https://box.t3connect.example/1" }, [box], null)).toEqual(
+      { kind: "address" },
+    );
+    // A private address two machines share names neither.
+    const mini = { ...box, environmentId: EnvironmentId.make("environment-mini") };
+    expect(linkRequestTarget({ url: "http://10.0.0.2:3773" }, [box, mini], null)).toEqual({
+      kind: "address",
+    });
+  });
+
+  it("links the machine the agent named or the user picked, at the addresses this app has", () => {
+    expect(linkRequestTarget({ environmentId: box.environmentId }, [box], null)).toMatchObject({
+      kind: "machine",
+      label: "Box",
+      urls: box.urls,
+    });
+    expect(linkRequestTarget({}, [box], box.environmentId)).toMatchObject({ kind: "machine" });
+    expect(linkRequestTarget({}, [box], ANOTHER_ADDRESS)).toEqual({ kind: "address" });
+    expect(linkRequestTarget({}, [box], null)).toEqual({ kind: "none" });
+  });
+});
+
 describe("linkRequestFailureMessage", () => {
   it("passes through only known user-facing errors", () => {
     expect(
diff --git a/packages/client-runtime/src/linkRequest.ts b/packages/client-runtime/src/linkRequest.ts
index c5d06ae5de51d..d1cf9e81d9f9e 100644
--- a/packages/client-runtime/src/linkRequest.ts
+++ b/packages/client-runtime/src/linkRequest.ts
@@ -8,6 +8,7 @@ import {
   resolveEnvironmentMachineKind,
   type ServerConfig,
 } from "@t3tools/contracts";
+import { isLocalLoopbackHost } from "@t3tools/shared/hostClassification";
 import * as Option from "effect/Option";
 
 import type { EnvironmentPresentation } from "./connection/presentation.ts";
@@ -50,9 +51,26 @@ export const linkRequestDefaultAccess = (
   item: Pick<LinkRequestItem, "requestedAccess">,
 ): AuthMcpClientAccess => item.requestedAccess ?? "approval-required";
 
-/** What the card calls the other environment: its own name, else the address asked for. */
-export const linkRequestTargetName = (item: Pick<LinkRequestItem, "label" | "url">): string =>
-  item.label?.trim() || item.url || "a machine";
+const parsedUrl = (url: string) => {
+  try {
+    return new URL(url);
+  } catch {
+    return undefined;
+  }
+};
+
+/** The http or https origin of an address: what the server links, and nothing else in it. */
+const originOf = (url: string) => {
+  const parsed = parsedUrl(url);
+  return parsed?.protocol === "http:" || parsed?.protocol === "https:" ? parsed.origin : undefined;
+};
+
+/** Where a link to `address` sends its pairing code, which a username or path in it can hide. */
+export const linkDestination = (address: string): string => originOf(address) ?? address.trim();
+
+/** What the card calls the other environment: where the address asked for leads, never a name it answers with. */
+export const linkRequestTargetName = (item: Pick<LinkRequestItem, "url">): string =>
+  item.url === undefined ? "a machine" : linkDestination(item.url);
 
 /** A machine the user could link a thread's environment to. */
 export interface LinkableMachine {
@@ -68,11 +86,17 @@ export interface LinkableMachine {
    * Where the client knows it answers, most preferred first: the addresses it
    * reports, then its saved routes, then its T3 Connect address. The server
    * keeps only those that answer as this machine. Empty for a machine reached
-   * only over SSH, whose forward lives in this client.
+   * only over SSH or loopback, which name this client's device.
    */
   readonly urls: ReadonlyArray<string>;
 }
 
+/** A loopback address names whichever machine opens it: the linking server, not this one. */
+const isLoopbackUrl = (url: string) => {
+  const hostname = parsedUrl(url)?.hostname;
+  return hostname !== undefined && isLocalLoopbackHost(hostname);
+};
+
 /**
  * The catalog's machines other than the thread's own, in catalog order, then those only T3
  * Connect knows. `links` are the thread environment's; an expired one no longer counts as
@@ -114,7 +138,7 @@ export function linkableMachines(input: {
             ...routes,
             ...(connect === undefined ? [] : [connect.httpBaseUrl]),
           ]),
-        ],
+        ].filter((url) => !isLoopbackUrl(url)),
       };
     });
   const savedIds = new Set<string>(saved.map((machine) => machine.environmentId));
@@ -135,7 +159,7 @@ export function linkableMachines(input: {
         connected: false,
         connectOnly: true,
         linked: linkedIds.has(environment.environmentId),
-        urls: [environment.endpoint.httpBaseUrl],
+        urls: [environment.endpoint.httpBaseUrl].filter((url) => !isLoopbackUrl(url)),
       };
     });
   return [...saved, ...connectOnly];
@@ -192,6 +216,59 @@ export function linkRequestInitialMachine(
     : null;
 }
 
+/** The machine choice for linking by an address typed in. */
+export const ANOTHER_ADDRESS = "another-address";
+
+/**
+ * What a link request links: a machine from the client's catalog, or an address.
+ * `urls` is empty when the client knows no direct address for the machine,
+ * so the user types one.
+ */
+export type LinkRequestTarget =
+  | { readonly kind: "none" }
+  | {
+      readonly kind: "machine";
+      readonly environmentId: EnvironmentId;
+      readonly label: string;
+      readonly urls: ReadonlyArray<string>;
+      readonly linked: boolean;
+    }
+  | { readonly kind: "address" };
+
+/**
+ * Anything can answer at an address as any machine, so an address the agent
+ * gave is a machine only where this client already reaches that machine. Its
+ * pairing code is minted for, and sent to, the client's own addresses alone.
+ */
+export function linkRequestTarget(
+  item: Pick<LinkRequestItem, "environmentId" | "url">,
+  machines: ReadonlyArray<LinkableMachine>,
+  choice: string | null,
+): LinkRequestTarget {
+  const asked = item.url === undefined ? undefined : originOf(item.url);
+  // Two machines on separate networks can share a private address.
+  const [reached, ...others] =
+    asked === undefined
+      ? []
+      : machines.filter((machine) => machine.urls.some((url) => originOf(url) === asked));
+  const chosen =
+    item.url === undefined
+      ? (item.environmentId ?? choice)
+      : reached !== undefined && others.length === 0
+        ? reached.environmentId
+        : ANOTHER_ADDRESS;
+  if (chosen === null) return { kind: "none" };
+  if (chosen === ANOTHER_ADDRESS) return { kind: "address" };
+  const machine = machines.find((candidate) => candidate.environmentId === chosen);
+  return {
+    kind: "machine",
+    environmentId: machine?.environmentId ?? (chosen as EnvironmentId),
+    label: machine?.label ?? linkRequestTargetName(item),
+    urls: machine?.urls ?? [],
+    linked: machine?.linked ?? false,
+  };
+}
+
 /** What a link request card shows: the actions while pending, otherwise a one-line outcome. */
 export type LinkRequestDisplay =
   | { readonly kind: "pending" }
@@ -208,10 +285,7 @@ export type LinkRequestDisplay =
  * names an access level the way the client's access picker does.
  */
 export function linkRequestDisplay(
-  item: Pick<
-    LinkRequestItem,
-    "linkStatus" | "label" | "url" | "linkedLabel" | "linkedAccess" | "failure"
-  >,
+  item: Pick<LinkRequestItem, "linkStatus" | "url" | "linkedLabel" | "linkedAccess" | "failure">,
   visibility: "local" | "inherited" | "synthetic",
   accessLabel: (access: AuthMcpClientAccess) => string,
 ): LinkRequestDisplay {
diff --git a/packages/client-runtime/src/pullRequestQuery.test.ts b/packages/client-runtime/src/pullRequestQuery.test.ts
index 33eddb7f1a6e7..7d73813f3733c 100644
--- a/packages/client-runtime/src/pullRequestQuery.test.ts
+++ b/packages/client-runtime/src/pullRequestQuery.test.ts
@@ -33,6 +33,7 @@ describe("reading qualifiers out of a typed query", () => {
       review: "changes-requested",
       checks: "failing",
     });
+    expect(parsePullRequestQuery("-draft:true").filters).toEqual({ draft: "hide" });
   });
 
   it("leaves an unknown value and a stray colon as text, and reads an unknown key as a label", () => {
@@ -53,6 +54,20 @@ describe("reading qualifiers out of a typed query", () => {
     ]);
   });
 
+  // regression: #30131 a query pasted from github.com lists nothing
+  it("ignores GitHub's own search qualifiers instead of reading them as labels", () => {
+    expect(
+      parsePullRequestQuery(
+        "is:pr state:open archived:false repo:org/repo org:org user:alice sort:updated-desc -repo:org/fork -state:closed fix",
+      ),
+    ).toEqual({ text: "fix", filters: {} });
+  });
+
+  it("sets no author when the query names more than one", () => {
+    expect(parsePullRequestQuery("author:alice author:bob").filters).toEqual({});
+    expect(parsePullRequestQuery("author:me author:@me").filters).toEqual({ author: "me" });
+  });
+
   it("cuts a typed query back to what the contract carries", () => {
     const many = Array.from({ length: 14 }, (_, index) => `l${index}`).join(",");
     const long = "x".repeat(240);
diff --git a/packages/client-runtime/src/pullRequestQuery.ts b/packages/client-runtime/src/pullRequestQuery.ts
index 9b333972d0fac..b80202c94b068 100644
--- a/packages/client-runtime/src/pullRequestQuery.ts
+++ b/packages/client-runtime/src/pullRequestQuery.ts
@@ -29,6 +29,11 @@ function splitQualifierList(raw: string): string[] {
     .filter((part) => part.length > 0);
 }
 
+/** `me` and `@me` both name the viewer; logins are case-insensitive. */
+function authorKey(login: string): string {
+  return login.toLowerCase().replace(/^@me$/, "me");
+}
+
 function boundedNames(names: ReadonlyArray<string>): string[] {
   return names
     .slice(0, MAX_QUALIFIER_VALUES)
@@ -43,7 +48,8 @@ export function parsePullRequestQuery(raw: string): {
   const text: string[] = [];
   const labels: string[][] = [];
   const excludedLabels: string[] = [];
-  let author: string | undefined;
+  // `null` once two different logins are named: GitHub ORs them, the contract carries one.
+  let author: string | null | undefined;
   let draft: PullRequestListFilters["draft"];
   let review: PullRequestListFilters["review"];
   let checks: PullRequestListFilters["checks"];
@@ -59,13 +65,16 @@ export function parsePullRequestQuery(raw: string): {
         else labels.push(names);
         continue;
       }
-      case "author":
+      case "author": {
         if (negated) break;
-        author = value.slice(0, MAX_QUALIFIER_LENGTH).trim();
+        const login = value.slice(0, MAX_QUALIFIER_LENGTH).trim();
+        if (author === undefined) author = login;
+        else if (author === null || authorKey(author) !== authorKey(login)) author = null;
         continue;
+      }
       case "draft":
-        if (negated || (value.toLowerCase() !== "true" && value.toLowerCase() !== "false")) break;
-        draft = value.toLowerCase() === "true" ? "only" : "hide";
+        if (value.toLowerCase() !== "true" && value.toLowerCase() !== "false") break;
+        draft = (value.toLowerCase() === "true") !== negated ? "only" : "hide";
         continue;
       case "review": {
         const decision = negated ? undefined : REVIEW_VALUES[value.toLowerCase()];
@@ -80,6 +89,15 @@ export function parsePullRequestQuery(raw: string): {
         checks = state;
         continue;
       }
+      // GitHub's own search qualifiers, not labels: the list sets scope and order itself.
+      case "is":
+      case "archived":
+      case "state":
+      case "repo":
+      case "org":
+      case "user":
+      case "sort":
+        continue;
       case "":
         break;
       default:
@@ -104,7 +122,7 @@ export function parsePullRequestQuery(raw: string): {
       ...(excludedLabels.length === 0
         ? {}
         : { excludedLabels: excludedLabels.slice(0, MAX_QUALIFIER_VALUES) }),
-      ...(author === undefined ? {} : { author }),
+      ...(typeof author === "string" ? { author } : {}),
       ...(draft === undefined ? {} : { draft }),
       ...(review === undefined ? {} : { review }),
       ...(checks === undefined ? {} : { checks }),
diff --git a/packages/client-runtime/src/voice-input/environment.ts b/packages/client-runtime/src/voice-input/environment.ts
index 52fa5a0d1fe5b..a8ea541f75133 100644
--- a/packages/client-runtime/src/voice-input/environment.ts
+++ b/packages/client-runtime/src/voice-input/environment.ts
@@ -292,6 +292,17 @@ export const updateEnvironmentSpeechModelUnloadTimeout = (
       client.updateModelUnloadTimeout({ headers, payload: { timeout } }),
   });
 
+export const linkEnvironmentSpeechModels = (prepared: PreparedConnection, path: string) =>
+  request({
+    group: "voice",
+    prepared,
+    method: "POST",
+    path: (urls) => urls.linkModels(),
+    // Hashing several multi-gigabyte files takes longer than an ordinary request.
+    timeoutMs: INFERENCE_OR_DOWNLOAD_TIMEOUT_MS,
+    run: ({ client, headers }) => client.linkModels({ headers, payload: { path } }),
+  });
+
 export const removeEnvironmentSpeechModel = (prepared: PreparedConnection, modelId: string) =>
   request({
     group: "voice",
diff --git a/packages/client-runtime/src/voice-input/index.ts b/packages/client-runtime/src/voice-input/index.ts
index 5843267800f67..5283d64eb0dc3 100644
--- a/packages/client-runtime/src/voice-input/index.ts
+++ b/packages/client-runtime/src/voice-input/index.ts
@@ -21,6 +21,7 @@ export {
   transcribeCloudPcm,
   getEnvironmentSpeechStatus,
   getEnvironmentSpeechStreamUrl,
+  linkEnvironmentSpeechModels,
   postProcessEnvironmentTranscript,
   removeEnvironmentSpeechModel,
   selectEnvironmentSpeechModel,
diff --git a/packages/contracts/src/environmentHttp.ts b/packages/contracts/src/environmentHttp.ts
index db0bd2daae610..4bbae77fb922d 100644
--- a/packages/contracts/src/environmentHttp.ts
+++ b/packages/contracts/src/environmentHttp.ts
@@ -56,6 +56,7 @@ import {
   CloudSpeechModels,
   CloudSpeechProvider,
   EnvironmentSpeechAccelerationRequest,
+  EnvironmentSpeechModelLinkRequest,
   EnvironmentSpeechModelRequest,
   EnvironmentSpeechModels,
   EnvironmentSpeechModelUnloadTimeoutRequest,
@@ -888,6 +889,14 @@ export class EnvironmentVoiceHttpApi extends HttpApiGroup.make("voice")
       error: [...EnvironmentScopedOperationErrors, EnvironmentRequestInvalidError],
     }).middleware(EnvironmentAuthenticatedAuth),
   )
+  .add(
+    HttpApiEndpoint.post("linkModels", "/api/voice/models/link", {
+      headers: OptionalBearerHeaders,
+      payload: EnvironmentSpeechModelLinkRequest,
+      success: EnvironmentSpeechModels,
+      error: [...EnvironmentScopedOperationErrors, EnvironmentRequestInvalidError],
+    }).middleware(EnvironmentAuthenticatedAuth),
+  )
   .add(
     HttpApiEndpoint.post("updateAcceleration", "/api/voice/acceleration", {
       headers: OptionalBearerHeaders,
diff --git a/packages/contracts/src/orchestrationV2.ts b/packages/contracts/src/orchestrationV2.ts
index fc38ffd4da9bb..b1fd02b3d3a07 100644
--- a/packages/contracts/src/orchestrationV2.ts
+++ b/packages/contracts/src/orchestrationV2.ts
@@ -1603,8 +1603,9 @@ const OrchestrationV2LinkRequestFields = {
   url: Schema.optional(TrimmedNonEmptyString),
   reason: Schema.String,
   /**
-   * The environment the agent named, or the one answering at `url`. Without
-   * either the user picks the machine in the card.
+   * The environment the agent named. Without it or `url` the user picks the
+   * machine in the card. Beside a `url`, this and `label` are what answered
+   * there on an older server: unauthenticated, so clients ignore both.
    */
   environmentId: Schema.optional(EnvironmentId),
   label: Schema.optional(Schema.String),
diff --git a/packages/contracts/src/providerUsageLimits.ts b/packages/contracts/src/providerUsageLimits.ts
index 5c4927d4a164e..67acbe0d35b05 100644
--- a/packages/contracts/src/providerUsageLimits.ts
+++ b/packages/contracts/src/providerUsageLimits.ts
@@ -20,11 +20,23 @@ export const ServerProviderUsageWindow = Schema.Struct({
 });
 export type ServerProviderUsageWindow = typeof ServerProviderUsageWindow.Type;
 
+/** One kind of banked reset, such as Claude's weekly reset or its Fable-only reset. */
+export const ServerProviderResetCreditOption = Schema.Struct({
+  creditId: TrimmedNonEmptyString,
+  label: TrimmedNonEmptyString,
+  description: TrimmedNonEmptyString,
+  availableCount: NonNegativeInt,
+  expiresAt: Schema.optional(IsoDateTime),
+});
+export type ServerProviderResetCreditOption = typeof ServerProviderResetCreditOption.Type;
+
 export const ServerProviderResetCredits = Schema.Struct({
   availableCount: NonNegativeInt,
   nextExpiresAt: Schema.optional(IsoDateTime),
   /** Pins hub redemption to the displayed credit, including retries from another client. */
   nextCreditId: Schema.optional(TrimmedNonEmptyString),
+  /** Present when resets differ in what they refill; redeem one by its `creditId`. */
+  options: Schema.optional(ForwardCompatibleArray(ServerProviderResetCreditOption)),
 });
 export type ServerProviderResetCredits = typeof ServerProviderResetCredits.Type;
 
@@ -87,7 +99,10 @@ export type UsageLimitSourceConsumeResetCreditInput =
   typeof UsageLimitSourceConsumeResetCreditInput.Type;
 
 export const ProviderConsumeResetCreditInput = Schema.Union([
-  Schema.Struct({ instanceId: ProviderInstanceId }),
+  Schema.Struct({
+    instanceId: ProviderInstanceId,
+    creditId: Schema.optional(TrimmedNonEmptyString),
+  }),
   UsageLimitSourceConsumeResetCreditInput,
 ]);
 export type ProviderConsumeResetCreditInput = typeof ProviderConsumeResetCreditInput.Type;
diff --git a/packages/contracts/src/pullRequest.ts b/packages/contracts/src/pullRequest.ts
index f0f692da3f8da..fd449585180be 100644
--- a/packages/contracts/src/pullRequest.ts
+++ b/packages/contracts/src/pullRequest.ts
@@ -173,6 +173,8 @@ export const PullRequestThreadComment = Schema.Struct({
   createdAt: IsoDateTime,
   editedAt: Schema.optional(Schema.NullOr(IsoDateTime)),
   url: Schema.NullOr(Schema.String),
+  /** The review that posted the comment, so a link to a review with no text finds its comments. */
+  reviewUrl: Schema.optional(Schema.NullOr(Schema.String)),
   reactions: Schema.optional(Schema.Array(PullRequestReaction)),
   canEdit: Schema.optional(Schema.Boolean),
 });
diff --git a/packages/contracts/src/speech.ts b/packages/contracts/src/speech.ts
index ac87096a24cce..ff3362f67fc0c 100644
--- a/packages/contracts/src/speech.ts
+++ b/packages/contracts/src/speech.ts
@@ -194,6 +194,8 @@ export const EnvironmentSpeechModel = Schema.Struct({
   active: Schema.Boolean,
   state: EnvironmentSpeechModelState,
   downloaded: Schema.optionalKey(Schema.Finite),
+  /** The file outside T3 Code's model folder this model is used from. */
+  linkedFrom: Schema.optionalKey(Schema.String),
 });
 export type EnvironmentSpeechModel = typeof EnvironmentSpeechModel.Type;
 
@@ -203,6 +205,10 @@ export const EnvironmentSpeechModels = Schema.Struct({
 export type EnvironmentSpeechModels = typeof EnvironmentSpeechModels.Type;
 
 export const EnvironmentSpeechModelRequest = Schema.Struct({ modelId: SpeechModelId });
+/** A model file, or a folder to search for them, on the environment's own disk. */
+export const EnvironmentSpeechModelLinkRequest = Schema.Struct({
+  path: TrimmedNonEmptyString.check(Schema.isMaxLength(4096)),
+});
 
 export const EnvironmentSpeechState = Schema.Literals(["missing-model", "ready", "transcribing"]);
 export type EnvironmentSpeechState = typeof EnvironmentSpeechState.Type;
@@ -215,6 +221,7 @@ const SupportedSpeechStatus = Schema.Struct({
   size: Schema.Finite,
   supportsStreaming: Schema.Boolean,
   supportsBufferedStreaming: Schema.optionalKey(Schema.Boolean),
+  supportsModelLinking: Schema.optionalKey(Schema.Boolean),
   supportsTranslation: Schema.Boolean,
   languages: Schema.optionalKey(Schema.Array(Schema.String)),
   supportsLanguageDetection: Schema.optionalKey(Schema.Boolean),
diff --git a/packages/provider-core/src/server/driver.ts b/packages/provider-core/src/server/driver.ts
index a1771e2e748e9..3fee55c6fbcab 100644
--- a/packages/provider-core/src/server/driver.ts
+++ b/packages/provider-core/src/server/driver.ts
@@ -45,10 +45,9 @@ export interface ProviderInstance {
   ) => Effect.Effect<ProviderWorkspaceSnapshot, ProviderDriverError>;
   readonly refreshModels?: () => Effect.Effect<void, ProviderDriverError>;
   readonly invalidateCaches?: Effect.Effect<void>;
-  readonly consumeResetCredit?: () => Effect.Effect<
-    ProviderConsumeResetCreditOutcome,
-    ProviderDriverError
-  >;
+  readonly consumeResetCredit?: (
+    creditId: string | undefined,
+  ) => Effect.Effect<ProviderConsumeResetCreditOutcome, ProviderDriverError>;
   readonly orchestrationAdapter: ProviderAdapter.ProviderAdapterV2["Service"];
   readonly textGeneration: ProviderTextGeneration;
   readonly auth?: ProviderAuthController;
diff --git a/packages/provider-core/src/server/managedProvider.test.ts b/packages/provider-core/src/server/managedProvider.test.ts
index 9df85130d6017..5295232d3b14c 100644
--- a/packages/provider-core/src/server/managedProvider.test.ts
+++ b/packages/provider-core/src/server/managedProvider.test.ts
@@ -609,10 +609,16 @@ describe("makeManagedServerProvider", () => {
         yield* provider.applyUsageLimits({
           checkedAt: "2026-04-10T00:05:00.000Z",
           windows: [{ id: "seven_day", kind: "weekly", label: "Weekly", usedPercent: 25 }],
+          authLabel: "tier-1",
+        });
+        yield* provider.applyUsageLimits({
+          checkedAt: "2026-04-10T00:06:00.000Z",
+          windows: [],
+          authLabel: "tier-2",
         });
-        yield* provider.applyUsageLimits({ checkedAt: "2026-04-10T00:06:00.000Z", windows: [] });
 
         const [update] = Array.from(yield* Fiber.join(updatesFiber));
+        assert.strictEqual(update?.auth.label, "tier-1");
         assert.deepStrictEqual(update?.usageLimits, {
           checkedAt: "2026-04-10T00:05:00.000Z",
           windows: [
@@ -631,7 +637,10 @@ describe("makeManagedServerProvider", () => {
     ).pipe(Effect.provide(layerAlwaysRunTest)),
   );
 
-  it.effect("keeps live usage windows across a failed probe and a stale enrichment", () =>
+  it.effect.each([
+    { name: "a live plan", clearPlan: false },
+    { name: "a cleared plan", clearPlan: true },
+  ])("keeps $name and usage across a failed probe and stale enrichment", ({ clearPlan }) =>
     Effect.scoped(
       Effect.gen(function* () {
         const releaseEnrichment = yield* Deferred.make<void>();
@@ -651,7 +660,7 @@ describe("makeManagedServerProvider", () => {
               count === 1
                 ? {
                     ...refreshedSnapshot,
-                    auth: { ...refreshedSnapshot.auth, workspaceId: "ws-a" },
+                    auth: { ...refreshedSnapshot.auth, workspaceId: "ws-a", label: "tier-1" },
                     usageLimits: probedLimits,
                   }
                 : {
@@ -689,9 +698,18 @@ describe("makeManagedServerProvider", () => {
         } as const;
         yield* provider.applyUsageLimits({
           checkedAt: "2026-04-10T00:00:02.000Z",
+          authLabel: "tier-2",
           windows: [liveWindow],
         });
 
+        if (clearPlan) {
+          yield* provider.applyUsageLimits({
+            checkedAt: "2026-04-10T00:00:02.000Z",
+            complete: true,
+            windows: [liveWindow],
+          });
+        }
+
         yield* Deferred.succeed(releaseEnrichment, undefined);
         const enriched = yield* Stream.take(provider.streamChanges, 1).pipe(
           Stream.runCollect,
@@ -699,11 +717,13 @@ describe("makeManagedServerProvider", () => {
         );
         assert.deepStrictEqual(enriched.models, enrichedSnapshot.models);
         assert.deepStrictEqual(enriched.usageLimits?.windows, [liveWindow]);
+        assert.strictEqual(enriched.auth.label, clearPlan ? undefined : "tier-2");
 
         const refreshed = yield* provider.refresh;
         assert.strictEqual(refreshed.message, refreshedSnapshotSecond.message);
         assert.deepStrictEqual(refreshed.usageLimits?.windows, [liveWindow]);
         assert.strictEqual(refreshed.auth.workspaceId, "ws-a");
+        assert.strictEqual(refreshed.auth.label, clearPlan ? undefined : "tier-2");
 
         const switched = yield* provider.refresh;
         assert.strictEqual(switched.auth.workspaceId, "ws-b");
@@ -712,6 +732,91 @@ describe("makeManagedServerProvider", () => {
     ).pipe(Effect.provide(layerAlwaysRunTest)),
   );
 
+  it.effect.each([
+    { name: "an empty reading", hasUsage: true, clearPlan: false },
+    { name: "no reading", hasUsage: false, clearPlan: false },
+    { name: "an empty reading after clearing the plan", hasUsage: true, clearPlan: true },
+    { name: "no reading after clearing the plan", hasUsage: false, clearPlan: true },
+  ])("keeps the live plan and limits after $name", ({ hasUsage, clearPlan }) =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const started = yield* Deferred.make<void>();
+        const release = yield* Deferred.make<void>();
+        const count = yield* Ref.make(0);
+        const provider = yield* makeManagedServerProvider<TestSettings>({
+          resolveMaintenance: () => Effect.succeed(maintenanceCapabilities),
+          getSettings: Effect.succeed({ enabled: true }),
+          streamSettings: Stream.empty,
+          haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
+          initialSnapshot: () => Effect.succeed(initialSnapshot),
+          checkProvider: Effect.gen(function* () {
+            if ((yield* Ref.updateAndGet(count, (n) => n + 1)) > 1) {
+              yield* Deferred.succeed(started, undefined);
+              yield* Deferred.await(release);
+            }
+            return {
+              ...refreshedSnapshot,
+              auth: { status: "authenticated", label: "tier-1" },
+              ...(hasUsage
+                ? { usageLimits: { checkedAt: refreshedSnapshot.checkedAt, windows: [] } }
+                : {}),
+            } satisfies ServerProvider;
+          }),
+        });
+        yield* Stream.take(provider.streamChanges, 1).pipe(Stream.runDrain);
+        const refresh = yield* provider.refresh.pipe(Effect.forkChild);
+        yield* Deferred.await(started);
+        yield* provider.applyUsageLimits({
+          checkedAt: "2026-04-10T00:00:04.000Z",
+          authLabel: "tier-2",
+          complete: true,
+          windows: [{ id: "session", kind: "session", label: "Session", usedPercent: 70 }],
+        });
+        if (clearPlan) {
+          yield* provider.applyUsageLimits({
+            checkedAt: "2026-04-10T00:00:04.000Z",
+            complete: true,
+            windows: [{ id: "session", kind: "session", label: "Session", usedPercent: 70 }],
+          });
+        }
+        yield* Deferred.succeed(release, undefined);
+        const refreshed = yield* Fiber.join(refresh);
+        assert.strictEqual(refreshed.auth.label, clearPlan ? undefined : "tier-2");
+        assert.strictEqual(refreshed.usageLimits?.windows[0]?.usedPercent, 70);
+        assert.strictEqual(refreshed.usageLimits?.unavailable, undefined);
+      }),
+    ).pipe(Effect.provide(layerAlwaysRunTest)),
+  );
+
+  it.effect("drops an earlier plan override after a complete reading without a label", () =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const usageLimits = {
+          checkedAt: "2026-04-10T00:00:04.000Z",
+          windows: [{ id: "session", kind: "session", label: "Session", usedPercent: 70 }],
+        } as const;
+        const provider = yield* makeManagedServerProvider<TestSettings>({
+          resolveMaintenance: () => Effect.succeed(maintenanceCapabilities),
+          getSettings: Effect.succeed({ enabled: true }),
+          streamSettings: Stream.empty,
+          haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
+          initialSnapshot: () => Effect.succeed(initialSnapshot),
+          checkProvider: Effect.succeed({ ...refreshedSnapshot, usageLimits }),
+          refreshOnInterval: false,
+        });
+        yield* Stream.take(provider.streamChanges, 1).pipe(Stream.runDrain);
+        yield* provider.applyUsageLimits({ ...usageLimits, complete: true, authLabel: "tier-2" });
+        assert.strictEqual((yield* provider.refresh).auth.label, "tier-2");
+
+        yield* provider.applyUsageLimits({ ...usageLimits, complete: true });
+        assert.strictEqual((yield* provider.getSnapshot).auth.label, undefined);
+        const refreshed = yield* provider.refresh;
+        assert.strictEqual(refreshed.auth.label, undefined);
+        assert.deepStrictEqual(refreshed.usageLimits, usageLimits);
+      }),
+    ).pipe(Effect.provide(layerAlwaysRunTest)),
+  );
+
   it.effect("keeps sparse usage unavailable after probe failure until a full probe recovers", () =>
     Effect.scoped(
       Effect.gen(function* () {
diff --git a/packages/provider-core/src/server/managedProvider.ts b/packages/provider-core/src/server/managedProvider.ts
index 9471be743f79d..39332d013e2ce 100644
--- a/packages/provider-core/src/server/managedProvider.ts
+++ b/packages/provider-core/src/server/managedProvider.ts
@@ -16,12 +16,18 @@ import * as Stream from "effect/Stream";
 import * as Semaphore from "effect/Semaphore";
 
 import * as ProviderHost from "./ProviderHost.ts";
-import { applyUsageLimitsUpdate, resolveUsageLimitsAfterProbe } from "./usageLimits.ts";
+import {
+  applyUsageLimitsUpdate,
+  makeUsageLimits,
+  resolveUsageLimitsAfterProbe,
+} from "./usageLimits.ts";
 import type { ManagedServerProvider } from "./snapshot.ts";
 
 interface ProviderSnapshotState {
   readonly snapshot: ServerProvider;
   readonly enrichmentGeneration: number;
+  // null preserves an explicitly cleared plan across probes and enrichment.
+  readonly usageAuthLabel: string | null | undefined;
 }
 
 function withUsageLimits(
@@ -72,6 +78,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
   const snapshotStateRef = yield* Ref.make<ProviderSnapshotState>({
     snapshot: initialSnapshot,
     enrichmentGeneration: 0,
+    usageAuthLabel: undefined,
   });
   const settingsRef = yield* Ref.make(initialSettings);
   const enrichmentFiberRef = yield* Ref.make<Fiber.Fiber<void, unknown> | null>(null);
@@ -86,7 +93,15 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
         return [null, state] as const;
       }
       // Enrichment must not revert usage updates newer than its input snapshot.
-      const merged = withUsageLimits(nextSnapshot, state.snapshot.usageLimits);
+      const merged = withUsageLimits(
+        state.usageAuthLabel === undefined
+          ? nextSnapshot
+          : {
+              ...nextSnapshot,
+              auth: { ...nextSnapshot.auth, label: state.usageAuthLabel ?? undefined },
+            },
+        state.snapshot.usageLimits,
+      );
       if (Equal.equals(state.snapshot, merged)) {
         return [null, state] as const;
       }
@@ -150,6 +165,8 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
       return state.snapshot;
     }
 
+    // A probe without usage must not erase a report published while its I/O was in flight.
+    const usageBeforeProbe = (yield* Ref.get(snapshotStateRef)).snapshot.usageLimits;
     const probedSnapshot = yield* input.checkProvider;
     const { snapshot: nextSnapshot, generation: nextGeneration } = yield* Ref.modify(
       snapshotStateRef,
@@ -167,21 +184,35 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
             probedSnapshot.auth.workspaceId !== previous.workspaceId);
         const usageLimits = switchedAccount
           ? probedSnapshot.usageLimits
-          : resolveUsageLimitsAfterProbe({
-              published: state.snapshot.usageLimits,
-              probed: probedSnapshot.usageLimits,
-            });
+          : probedSnapshot.usageLimits === undefined &&
+              state.snapshot.usageLimits !== usageBeforeProbe
+            ? state.snapshot.usageLimits
+            : resolveUsageLimitsAfterProbe({
+                published: state.snapshot.usageLimits,
+                probed: probedSnapshot.usageLimits,
+              });
         const workspaceId =
           usageLimits === probedSnapshot.usageLimits ? undefined : state.snapshot.auth.workspaceId;
+        const usageAuthLabel =
+          !switchedAccount && usageLimits?.checkedAt === state.snapshot.usageLimits?.checkedAt
+            ? state.usageAuthLabel
+            : undefined;
+        const labeledProbe =
+          usageAuthLabel === undefined
+            ? probedSnapshot
+            : {
+                ...probedSnapshot,
+                auth: { ...probedSnapshot.auth, label: usageAuthLabel ?? undefined },
+              };
         const snapshot = withUsageLimits(
           workspaceId && !probedSnapshot.auth.workspaceId
-            ? { ...probedSnapshot, auth: { ...probedSnapshot.auth, workspaceId } }
-            : probedSnapshot,
+            ? { ...labeledProbe, auth: { ...labeledProbe.auth, workspaceId } }
+            : labeledProbe,
           usageLimits,
         );
         return [
           { snapshot, generation },
-          { snapshot, enrichmentGeneration: generation },
+          { snapshot, enrichmentGeneration: generation, usageAuthLabel },
         ] as const;
       },
     );
@@ -197,16 +228,34 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
   const applyUsageLimits: ManagedServerProvider["applyUsageLimits"] = Effect.fnUntraced(
     function* (update) {
       const snapshotToPublish = yield* Ref.modify(snapshotStateRef, (state) => {
-        const usageLimits = applyUsageLimitsUpdate({
-          previous: state.snapshot.usageLimits,
-          update,
-          checkedAt: update.checkedAt,
-        });
-        if (usageLimits === state.snapshot.usageLimits) {
+        const complete = update.complete && update.windows.length > 0;
+        const usageLimits = complete
+          ? makeUsageLimits(update)
+          : applyUsageLimitsUpdate({
+              previous: state.snapshot.usageLimits,
+              update,
+              checkedAt: update.checkedAt,
+            });
+        const { auth } = state.snapshot;
+        const label = update.windows.length > 0 ? update.authLabel : undefined;
+        const relabel =
+          (label !== undefined || (complete && state.usageAuthLabel !== undefined)) &&
+          label !== auth.label;
+        if (usageLimits === state.snapshot.usageLimits && !relabel) {
           return [null, state] as const;
         }
-        const snapshot = withUsageLimits(state.snapshot, usageLimits);
-        return [snapshot, { ...state, snapshot }] as const;
+        const snapshot = withUsageLimits(
+          relabel ? { ...state.snapshot, auth: { ...auth, label } } : state.snapshot,
+          usageLimits,
+        );
+        return [
+          snapshot,
+          {
+            ...state,
+            snapshot,
+            usageAuthLabel: label ?? (complete ? null : state.usageAuthLabel),
+          },
+        ] as const;
       });
       if (snapshotToPublish !== null) {
         yield* PubSub.publish(changesPubSub, snapshotToPublish);
diff --git a/packages/provider-core/src/server/snapshot.ts b/packages/provider-core/src/server/snapshot.ts
index 88f2c1f113848..6cb7ea15c5b10 100644
--- a/packages/provider-core/src/server/snapshot.ts
+++ b/packages/provider-core/src/server/snapshot.ts
@@ -7,6 +7,14 @@ import type * as Effect from "effect/Effect";
 import type * as Stream from "effect/Stream";
 import type { ProviderMaintenanceCapabilities } from "./maintenance.ts";
 
+/** authLabel names the plan, for drivers whose usage report carries it. */
+export type ProviderUsageLimitsReport = ProviderUsageLimitsUpdate & {
+  readonly checkedAt: string;
+  readonly authLabel?: string;
+  /** A full reading replaces sparse windows and clears a previous probe failure. */
+  readonly complete?: boolean;
+};
+
 export interface ManagedServerProvider {
   /** Cached; pass { fresh: true } before executing updates. */
   readonly resolveMaintenance: (options?: {
@@ -16,8 +24,6 @@ export interface ManagedServerProvider {
   readonly refresh: Effect.Effect<ServerProvider>;
   readonly refreshUsage?: Effect.Effect<void, ServerSettingsError>;
   readonly streamChanges: Stream.Stream<ServerProvider>;
-  /** Merge windows by ID; updates with no usable window leave the snapshot untouched. */
-  readonly applyUsageLimits: (
-    update: ProviderUsageLimitsUpdate & { readonly checkedAt: string },
-  ) => Effect.Effect<void>;
+  /** Merge windows by ID and set any authLabel; an update with no window leaves the snapshot untouched. */
+  readonly applyUsageLimits: (update: ProviderUsageLimitsReport) => Effect.Effect<void>;
 }
diff --git a/packages/provider-core/src/server/textGeneration.ts b/packages/provider-core/src/server/textGeneration.ts
index 62369d754abab..5e6600f31809d 100644
--- a/packages/provider-core/src/server/textGeneration.ts
+++ b/packages/provider-core/src/server/textGeneration.ts
@@ -2,6 +2,7 @@ import type {
   BranchNamingOptions,
   ChatAttachment,
   ModelSelection,
+  ProjectId,
   PullRequestReviewGuide,
   TextGenerationError,
 } from "@t3tools/contracts";
@@ -18,6 +19,7 @@ export interface CommitMessageGenerationInput {
   includeBranch?: boolean;
   policy?: TextGenerationPolicy | undefined;
   modelSelection: ModelSelection;
+  projectId?: ProjectId | null | undefined;
 }
 
 export interface CommitMessageGenerationResult {
@@ -37,6 +39,7 @@ export interface PrContentGenerationInput {
   threadContext?: string | undefined;
   policy?: TextGenerationPolicy | undefined;
   modelSelection: ModelSelection;
+  projectId?: ProjectId | null | undefined;
 }
 
 export interface PrContentGenerationResult {
@@ -50,6 +53,7 @@ export interface BranchNameGenerationInput {
   message: string;
   attachments?: ReadonlyArray<ChatAttachment> | undefined;
   modelSelection: ModelSelection;
+  projectId?: ProjectId | null | undefined;
 }
 
 export interface BranchNameGenerationResult {
@@ -65,6 +69,7 @@ export interface ThreadTitleGenerationInput {
   attachments?: ReadonlyArray<ChatAttachment> | undefined;
   instructions?: string | undefined;
   modelSelection: ModelSelection;
+  projectId?: ProjectId | null | undefined;
 }
 
 export interface ThreadTitleGenerationResult {
@@ -90,6 +95,7 @@ export interface ReviewGuideGenerationInput {
   instructions?: string | undefined;
   stack?: ReadonlyArray<ReviewGuideStackLayer> | undefined;
   modelSelection: ModelSelection;
+  projectId?: ProjectId | null | undefined;
 }
 
 export type ReviewGuideGenerationResult = Omit<
diff --git a/packages/provider-grok/src/server.ts b/packages/provider-grok/src/server.ts
index 858f66ac31c11..4837089cf86af 100644
--- a/packages/provider-grok/src/server.ts
+++ b/packages/provider-grok/src/server.ts
@@ -1,2 +1,7 @@
 export { GrokDriver, type GrokDriverEnv } from "./server/driver.ts";
 export { type GrokAdapterV2DriverEnv } from "./server/adapter.ts";
+export {
+  GROK_USAGE_URL,
+  GrokUsageResponse,
+  grokUsageResponseToLimits,
+} from "./server/usageLimits.ts";
diff --git a/packages/provider-grok/src/server/usageLimits.ts b/packages/provider-grok/src/server/usageLimits.ts
index c6ba583c139ce..5bf1ab4fda57f 100644
--- a/packages/provider-grok/src/server/usageLimits.ts
+++ b/packages/provider-grok/src/server/usageLimits.ts
@@ -24,7 +24,8 @@ const GrokCredentials = Schema.Record(
   }),
 );
 const decodeCredentials = Schema.decodeEffect(Schema.fromJsonString(GrokCredentials));
-const GrokUsageResponse = Schema.Struct({
+export const GROK_USAGE_URL = "https://cli-chat-proxy.grok.com/v1/billing?format=credits";
+export const GrokUsageResponse = Schema.Struct({
   config: Schema.optional(
     Schema.Struct({
       creditUsagePercent: Schema.optional(Schema.Number),
@@ -179,9 +180,7 @@ export const readGrokAccount = Effect.fn("readGrokAccount")(function* (
   const usageLimits = yield* Effect.gen(function* () {
     const client = yield* HttpClient.HttpClient;
     const response = yield* client.execute(
-      HttpClientRequest.get("https://cli-chat-proxy.grok.com/v1/billing?format=credits").pipe(
-        HttpClientRequest.bearerToken(token),
-      ),
+      HttpClientRequest.get(GROK_USAGE_URL).pipe(HttpClientRequest.bearerToken(token)),
     );
     if (response.status === 403) {
       const { error } = yield* HttpClientResponse.schemaBodyJson(GrokErrorResponse)(response);
diff --git a/packages/provider-muse/src/server/adapter.test.ts b/packages/provider-muse/src/server/adapter.test.ts
index f903f457af17f..76b46715c6020 100644
--- a/packages/provider-muse/src/server/adapter.test.ts
+++ b/packages/provider-muse/src/server/adapter.test.ts
@@ -42,6 +42,7 @@ import type { MuseItem, MuseSubscriptionUsage } from "./protocol.ts";
 import type { MuseSdkHost, MuseSdkHostOptions } from "./sdk.ts";
 import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
 import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
+import type { ProviderUsageLimitsReport } from "@t3tools/provider-core/server/snapshot";
 import type * as ProviderContinuationRequests from "@t3tools/provider-core/server/ProviderContinuationRequests";
 import { makeMuseAdapterV2, type MuseAdapterV2Options } from "./adapter.ts";
 
@@ -208,7 +209,7 @@ const makeHarness = Effect.fnUntraced(function* (
   policy = runtimePolicy,
   overrides: Pick<
     MuseAdapterV2Options,
-    "createHost" | "nativeEventLogger" | "modelCatalog" | "continuationRequests"
+    "createHost" | "nativeEventLogger" | "modelCatalog" | "continuationRequests" | "onUsageLimits"
   > = {},
 ) {
   let hostCount = 0;
@@ -607,7 +608,16 @@ describe("MuseAdapterV2", () => {
   it.effect("stops at a Meta usage limit until every exhausted window resets", () =>
     Effect.gen(function* () {
       const fake = yield* makeFakeMuse();
-      const harness = yield* makeHarness(fake);
+      const reports: Array<ProviderUsageLimitsReport> = [];
+      const harness = yield* makeHarness(
+        fake,
+        INSTANCE_ID,
+        undefined,
+        undefined,
+        undefined,
+        runtimePolicy,
+        { onUsageLimits: (report) => Effect.sync(() => void reports.push(report)) },
+      );
       yield* fake.emitHostWide("usage/changed", {
         ...SUBSCRIPTION_USAGE,
         window: { ...SUBSCRIPTION_USAGE.window, usedPercent: 103 },
@@ -624,6 +634,10 @@ describe("MuseAdapterV2", () => {
       assert.strictEqual(terminal.threadDisposition, "reusable");
       assert.strictEqual(terminal.failure?.class, "usage_limit");
       assert.strictEqual(terminal.failure?.resetAt, "2026-10-08T13:19:17.000Z");
+      assert.deepStrictEqual(
+        reports.map((report) => [report.authLabel, report.windows[0]?.usedPercent]),
+        [["tier-1", 100]],
+      );
       assert.isTrue(
         harness.allEvents.some(
           (event) =>
@@ -685,7 +699,16 @@ describe("MuseAdapterV2", () => {
   it.effect("skips an unreadable usage report without ending the session", () =>
     Effect.gen(function* () {
       const fake = yield* makeFakeMuse();
-      const harness = yield* makeHarness(fake);
+      const reports: Array<ProviderUsageLimitsReport> = [];
+      const harness = yield* makeHarness(
+        fake,
+        INSTANCE_ID,
+        undefined,
+        undefined,
+        undefined,
+        runtimePolicy,
+        { onUsageLimits: (report) => Effect.sync(() => void reports.push(report)) },
+      );
       yield* fake.emitHostWide("usage/changed", { window: "not usage" });
       yield* fake.emitHostWide("usage/changed", {
         ...SUBSCRIPTION_USAGE,
@@ -700,6 +723,7 @@ describe("MuseAdapterV2", () => {
       const terminal = yield* harness.takeEvent("turn.terminal");
       assert.strictEqual(terminal.failure?.class, "usage_limit");
       assert.isUndefined(terminal.failure?.resetAt);
+      assert.deepStrictEqual(reports, []);
       assert.strictEqual(fake.closeCount(), 0);
     }).pipe(Effect.scoped, Effect.provide(testLayer)),
   );
diff --git a/packages/provider-muse/src/server/adapter.ts b/packages/provider-muse/src/server/adapter.ts
index 82e1adcb42277..d4b58e806517d 100644
--- a/packages/provider-muse/src/server/adapter.ts
+++ b/packages/provider-muse/src/server/adapter.ts
@@ -63,7 +63,11 @@ import {
   museApprovalOptions,
   type MuseItem,
 } from "./protocol.ts";
-import { isMuseUsageLimitFailure, museUsageLimitResetAt } from "./usageLimits.ts";
+import {
+  isMuseUsageLimitFailure,
+  museUsageLimitResetAt,
+  museUsageToLimits,
+} from "./usageLimits.ts";
 import {
   createMuseSdkHostEffect,
   MuseSdkError,
@@ -75,6 +79,7 @@ import {
   type MuseSdkHost,
 } from "./sdk.ts";
 import type * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
+import type { ManagedServerProvider } from "@t3tools/provider-core/server/snapshot";
 import {
   providerMessageTextWithAttachmentPaths,
   isProviderNativeImageAttachment,
@@ -202,6 +207,8 @@ export interface MuseAdapterV2Options {
   readonly createHost?: typeof createMuseSdkHost;
   readonly requestTimeoutMs?: number;
   readonly nativeEventLogger?: ProviderEventLoggers.EventNdjsonLogger;
+  /** Receives every account-wide usage report, whichever session's host sent it. */
+  readonly onUsageLimits?: ManagedServerProvider["applyUsageLimits"];
   readonly continuationRequests?: {
     readonly offer: (
       request: ProviderContinuationRequests.ProviderContinuationRequest,
@@ -1378,6 +1385,9 @@ export const makeMuseAdapterV2 = Effect.fn("makeMuseAdapterV2")(function* (
         // usage/changed is account-wide and carries no session ID.
         if (method === "usage/changed") {
           latestSubscriptionUsage = yield* decode(MuseSubscriptionUsage, params);
+          if (options.onUsageLimits) {
+            yield* options.onUsageLimits(museUsageToLimits(latestSubscriptionUsage));
+          }
           return;
         }
         if (params.sessionId !== nativeSessionId) return;
diff --git a/packages/provider-muse/src/server/driver.test.ts b/packages/provider-muse/src/server/driver.test.ts
new file mode 100644
index 0000000000000..7017b3f4e35a7
--- /dev/null
+++ b/packages/provider-muse/src/server/driver.test.ts
@@ -0,0 +1,216 @@
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { expect, it } from "@effect/vitest";
+import {
+  DEFAULT_SERVER_SETTINGS,
+  ProviderInstanceId,
+  ProviderSessionId,
+  ThreadId,
+} from "@t3tools/contracts";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Queue from "effect/Queue";
+import * as Stream from "effect/Stream";
+import * as Sink from "effect/Sink";
+import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
+import * as HttpClient from "effect/http/HttpClient";
+import { vi } from "vite-plus/test";
+import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
+import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
+import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
+import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
+import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
+import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
+import * as sdk from "./sdk.ts";
+import { MuseDriver } from "./driver.ts";
+
+vi.mock("./sdk.ts", { spy: true });
+
+const layerTest = TestProviderHost.layer({
+  runBackgroundWork: false,
+  settings: { ...DEFAULT_SERVER_SETTINGS, enableProviderUpdateChecks: false },
+}).pipe(
+  Layer.provideMerge(NodeServices.layer),
+  Layer.provideMerge(IdAllocator.layer),
+  Layer.provideMerge(McpProviderSessions.layer),
+  Layer.provideMerge(ProviderLatestVersions.layer),
+  Layer.provideMerge(
+    Layer.succeed(
+      ProviderEventLoggers.ProviderEventLoggers,
+      ProviderEventLoggers.NoOpProviderEventLoggers,
+    ),
+  ),
+  Layer.provideMerge(
+    Layer.succeed(
+      HttpClient.HttpClient,
+      HttpClient.make(() => Effect.die("Unexpected HTTP request")),
+    ),
+  ),
+);
+
+function nativeHost() {
+  let notify: Parameters<sdk.MuseSdkHost["connection"]["onNotification"]>[0] = () => {};
+  let close!: () => void;
+  const closed = new Promise<void>((resolve) => {
+    close = resolve;
+  });
+  const host: sdk.MuseSdkHost = {
+    connection: {
+      mintCommandId: () => "command",
+      request: async (method) =>
+        method.startsWith("session/")
+          ? {
+              session: { sessionId: "command", modelId: "muse-wonder-1.0", activeTurnId: null },
+              history: { items: [] },
+            }
+          : method === "model/list"
+            ? {
+                providerId: "meta",
+                models: [
+                  {
+                    modelId: "muse-wonder-1.0",
+                    displayLabel: "Muse",
+                    providerId: "meta",
+                    isDefault: true,
+                  },
+                ],
+              }
+            : {},
+      command: async (_method, params) => ({
+        session: { sessionId: params.sessionId, modelId: "muse-wonder-1.0", activeTurnId: null },
+        history: { items: [] },
+      }),
+      onNotification: (handler) => {
+        notify = handler;
+      },
+      onProtocolError: () => {},
+      onServerRequest: () => {},
+      closed,
+    },
+    initializeResult: { grantedCapabilities: [] },
+    exited: closed.then(() => ({ code: 0, signal: null })),
+    close: async () => {
+      close();
+    },
+  };
+  return {
+    host,
+    emit: (method: string, params: Record<string, unknown>) =>
+      notify({ jsonrpc: "2.0", method, params }),
+  };
+}
+
+it.layer(layerTest)("MuseDriver usage", (it) => {
+  it.effect(
+    "keeps the newest complete account report across late reports and refresh without probing for usage",
+    () =>
+      Effect.gen(function* () {
+        const hosts: ReturnType<typeof nativeHost>[] = [];
+        const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+        using spawn = vi.spyOn(spawner, "spawn").mockImplementation(() =>
+          Effect.succeed(
+            ChildProcessSpawner.makeHandle({
+              pid: ChildProcessSpawner.ProcessId(1),
+              exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(0)),
+              isRunning: Effect.succeed(false),
+              kill: () => Effect.void,
+              unref: Effect.succeed(Effect.void),
+              stdin: Sink.drain,
+              stdout: Stream.encodeText(Stream.make("muse 1.0.3-R2198.1")),
+              stderr: Stream.empty,
+              all: Stream.empty,
+              getInputFd: () => Sink.drain,
+              getOutputFd: () => Stream.empty,
+            }),
+          ),
+        );
+        const createHost: typeof sdk.createMuseSdkHost = async () => {
+          const fake = nativeHost();
+          hosts.push(fake);
+          return fake.host;
+        };
+        const original = (yield* Effect.promise(() => vi.importActual<typeof sdk>("./sdk.ts")))
+          .createMuseSdkHostEffect;
+        using _hostEffect = vi
+          .spyOn(sdk, "createMuseSdkHostEffect")
+          .mockImplementation((options) => original(options, createHost));
+        using _host = vi.spyOn(sdk, "createMuseSdkHost").mockImplementation(createHost);
+        const instanceId = ProviderInstanceId.make("muse-test");
+        const instance = yield* MuseDriver.create({
+          instanceId,
+          displayName: "Muse test",
+          enabled: true,
+          environment: [],
+          config: { ...MuseDriver.defaultConfig(), binaryPath: process.execPath },
+        });
+        yield* Stream.take(instance.snapshot.streamChanges, 1).pipe(Stream.runDrain);
+        expect((yield* instance.snapshot.getSnapshot).status).toBe("ready");
+        expect((yield* instance.snapshot.getSnapshot).usageLimits).toBeUndefined();
+        const policy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          cwd: null,
+        });
+        const sessions = yield* Effect.forEach(
+          ["one", "two"],
+          Effect.fnUntraced(function* (id) {
+            const runtime = yield* instance.orchestrationAdapter.openSession({
+              threadId: ThreadId.make(id),
+              providerSessionId: ProviderSessionId.make(id),
+              modelSelection: { instanceId, model: "muse-wonder-1.0", options: [] },
+              runtimePolicy: policy,
+            });
+            const events = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
+            yield* runtime.events.pipe(
+              Stream.runForEach((event) => Queue.offer(events, event)),
+              Effect.forkScoped,
+            );
+            yield* runtime.ensureThread({
+              threadId: ThreadId.make(id),
+              modelSelection: { instanceId, model: "muse-wonder-1.0", options: [] },
+              runtimePolicy: policy,
+            });
+            return { fake: hosts.at(-1)!, events };
+          }),
+        );
+        const reading = (observedAtMs: number, usedPercent: number, tier: string) => ({
+          window: { usedPercent, windowDurationMins: 300, resetsAtMs: 1791465557000 },
+          weekly: { usedPercent: 50, resetsAtMs: 1791763200000 },
+          observedAtMs,
+          tier,
+        });
+        const publish = Effect.fnUntraced(function* (
+          index: number,
+          report: ReturnType<typeof reading>,
+        ) {
+          const session = sessions[index]!;
+          session.fake.emit("usage/changed", report);
+          // The following context event acknowledges that this host has processed the report.
+          session.fake.emit("session/contextUsage", {
+            sessionId: "command",
+            usedTokens: report.observedAtMs,
+          });
+          yield* Queue.take(session.events).pipe(
+            Effect.repeat({
+              until: (event) =>
+                event.type === "provider_thread.updated" &&
+                event.providerThread.contextUsage?.usedTokens === report.observedAtMs,
+            }),
+          );
+        });
+        yield* publish(1, reading(1791447762610, 70, "tier-2"));
+        const latest = yield* instance.snapshot.getSnapshot;
+        expect(latest.usageLimits?.unavailable).toBeUndefined();
+        expect(latest.usageLimits?.windows.map((window) => window.usedPercent)).toEqual([70, 50]);
+        expect(latest.auth.label).toBe("tier-2");
+        yield* publish(0, reading(1791447761610, 10, "tier-1"));
+        expect((yield* instance.snapshot.getSnapshot).usageLimits).toEqual(latest.usageLimits);
+        expect((yield* instance.snapshot.getSnapshot).auth.label).toBe("tier-2");
+        const callsBeforeUsageRefresh = spawn.mock.calls.length;
+        yield* instance.snapshot.refreshUsage!;
+        expect(spawn.mock.calls.length).toBe(callsBeforeUsageRefresh);
+        const refreshed = yield* instance.snapshot.refresh;
+        expect(refreshed.usageLimits).toEqual(latest.usageLimits);
+        expect(refreshed.auth.label).toBe("tier-2");
+      }).pipe(Effect.scoped),
+  );
+});
diff --git a/packages/provider-muse/src/server/driver.ts b/packages/provider-muse/src/server/driver.ts
index c24111f07d155..197a219e54ecb 100644
--- a/packages/provider-muse/src/server/driver.ts
+++ b/packages/provider-muse/src/server/driver.ts
@@ -1,8 +1,10 @@
-import { ProviderDriverKind } from "@t3tools/contracts";
+import { ProviderDriverKind, type ServerProvider } from "@t3tools/contracts";
 import { MuseSettings } from "../settings.ts";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
+import * as Ref from "effect/Ref";
+import * as Semaphore from "effect/Semaphore";
 import * as Path from "effect/Path";
 import * as Schema from "effect/Schema";
 import * as HttpClient from "effect/http/HttpClient";
@@ -20,6 +22,8 @@ import * as ProviderContinuationRequests from "@t3tools/provider-core/server/Pro
 import { checkMuseProviderStatus, makePendingMuseProvider } from "./status.ts";
 import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
 import { makeManagedServerProvider } from "@t3tools/provider-core/server/managedProvider";
+import type { ProviderUsageLimitsReport } from "@t3tools/provider-core/server/snapshot";
+import { makeUsageLimits } from "@t3tools/provider-core/server/usageLimits";
 import { enrichMuseSnapshot, latestMuseVersion, museMaintenance } from "./maintenance.ts";
 import { makeMuseEnvironment } from "./sdk.ts";
 import { museUsageReader } from "./usage.ts";
@@ -104,6 +108,26 @@ export const MuseDriver: ProviderDriver<
       accentColor,
       continuationGroupKey: continuationIdentity.continuationKey,
     });
+    // Only a running CLI reports usage; status probes cannot fetch it.
+    const latestUsage = yield* Ref.make<ProviderUsageLimitsReport | undefined>(undefined);
+    const usagePermit = yield* Semaphore.make(1);
+    const withLatestUsage = (provider: ServerProvider) =>
+      Ref.get(latestUsage).pipe(
+        Effect.map((report): ServerProvider =>
+          report
+            ? {
+                ...provider,
+                ...(report.authLabel
+                  ? { auth: { ...provider.auth, label: report.authLabel } }
+                  : {}),
+                usageLimits: makeUsageLimits({
+                  checkedAt: report.checkedAt,
+                  windows: report.windows,
+                }),
+              }
+            : provider,
+        ),
+      );
     const snapshotSettings = yield* makeProviderSnapshotSettingsSource(effectiveConfig);
     const resolveInstallation = yield* makeCachedProviderMaintenanceResolution(
       resolveProviderMaintenanceCapabilitiesEffect(museMaintenance, {
@@ -148,6 +172,7 @@ export const MuseDriver: ProviderDriver<
         makePendingMuseProvider(settings.provider).pipe(Effect.map(stampIdentity)),
       checkProvider: checkMuseProviderStatus(effectiveConfig, processEnvironment, cwd).pipe(
         Effect.map(stampIdentity),
+        Effect.flatMap(withLatestUsage),
         Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
         Effect.provideService(FileSystem.FileSystem, fileSystem),
         Effect.provideService(Path.Path, path),
@@ -185,6 +210,15 @@ export const MuseDriver: ProviderDriver<
       modelCatalog,
       ...(eventLoggers.native ? { nativeEventLogger: eventLoggers.native } : {}),
       continuationRequests,
+      onUsageLimits: (report) =>
+        usagePermit.withPermits(1)(
+          Effect.gen(function* () {
+            const previous = yield* Ref.get(latestUsage);
+            if (previous && Date.parse(report.checkedAt) < Date.parse(previous.checkedAt)) return;
+            yield* Ref.set(latestUsage, report);
+            yield* snapshot.applyUsageLimits({ ...report, complete: true });
+          }),
+        ),
     });
     const textGeneration = yield* makeMuseTextGeneration(effectiveConfig, {
       environment: processEnvironment,
@@ -197,7 +231,7 @@ export const MuseDriver: ProviderDriver<
       displayName,
       accentColor,
       enabled,
-      snapshot: { ...snapshot, resolveMaintenance },
+      snapshot: { ...snapshot, resolveMaintenance, refreshUsage: Effect.void },
       orchestrationAdapter,
       textGeneration,
     } satisfies ProviderInstance;
diff --git a/packages/provider-muse/src/server/usageLimits.test.ts b/packages/provider-muse/src/server/usageLimits.test.ts
index a633a06e82182..dddea9e6ac743 100644
--- a/packages/provider-muse/src/server/usageLimits.test.ts
+++ b/packages/provider-muse/src/server/usageLimits.test.ts
@@ -1,7 +1,11 @@
 import { describe, expect, it } from "@effect/vitest";
 
 import type { MuseSubscriptionUsage } from "./protocol.ts";
-import { isMuseUsageLimitFailure, museUsageLimitResetAt } from "./usageLimits.ts";
+import {
+  isMuseUsageLimitFailure,
+  museUsageLimitResetAt,
+  museUsageToLimits,
+} from "./usageLimits.ts";
 
 const usage = {
   observedAtMs: 1791447762610,
@@ -54,3 +58,31 @@ describe("Muse usage limit failures", () => {
     expect(museUsageLimitResetAt(undefined, afterNamedReset, { message: realRefusal })).toBeNull();
   });
 });
+
+describe("Muse account usage", () => {
+  it("reports the session and weekly windows, capped at 100, with the tier as plan", () => {
+    expect(museUsageToLimits({ ...usage, window: { ...usage.window, usedPercent: 103 } })).toEqual({
+      checkedAt: "2026-10-08T08:22:42.610Z",
+      authLabel: "tier-1",
+      windows: [
+        {
+          id: "session",
+          kind: "session",
+          label: "Session",
+          usedPercent: 100,
+          resetsAt: "2026-10-08T13:19:17.000Z",
+          windowDurationMins: 300,
+        },
+        {
+          id: "weekly",
+          kind: "weekly",
+          label: "Weekly",
+          usedPercent: 5,
+          resetsAt: "2026-10-12T00:00:00.000Z",
+          windowDurationMins: 10080,
+        },
+      ],
+    });
+    expect(museUsageToLimits({ ...usage, tier: " " })).not.toHaveProperty("authLabel");
+  });
+});
diff --git a/packages/provider-muse/src/server/usageLimits.ts b/packages/provider-muse/src/server/usageLimits.ts
index 1f97451c9338c..be981ebc009ad 100644
--- a/packages/provider-muse/src/server/usageLimits.ts
+++ b/packages/provider-muse/src/server/usageLimits.ts
@@ -1,7 +1,38 @@
 import * as DateTime from "effect/DateTime";
+import { clampPercent } from "@t3tools/provider-core/server/usageLimits";
+import type { ProviderUsageLimitsReport } from "@t3tools/provider-core/server/snapshot";
 
 import { LATEST_DATE_MS, type MuseSubscriptionUsage } from "./protocol.ts";
 
+const isoMillis = (ms: number) => DateTime.formatIso(DateTime.makeUnsafe(ms));
+
+/** Muse's account-wide report as Limits windows, with its tier as the plan. */
+export function museUsageToLimits(usage: MuseSubscriptionUsage): ProviderUsageLimitsReport {
+  const tier = usage.tier.trim();
+  return {
+    checkedAt: isoMillis(usage.observedAtMs),
+    windows: [
+      {
+        id: "session",
+        kind: "session",
+        label: "Session",
+        usedPercent: clampPercent(usage.window.usedPercent),
+        resetsAt: isoMillis(usage.window.resetsAtMs),
+        windowDurationMins: usage.window.windowDurationMins,
+      },
+      {
+        id: "weekly",
+        kind: "weekly",
+        label: "Weekly",
+        usedPercent: clampPercent(usage.weekly.usedPercent),
+        resetsAt: isoMillis(usage.weekly.resetsAtMs),
+        windowDurationMins: 7 * 24 * 60,
+      },
+    ],
+    ...(tier ? { authLabel: tier } : {}),
+  };
+}
+
 /** Credential proxies may omit error.quota from 429 refusals; inspect text too. */
 export function isMuseUsageLimitFailure(message: string | undefined): boolean {
   return message !== undefined && /\b429\b/.test(message) && /quota|usage limit/i.test(message);
@@ -30,5 +61,5 @@ export function museUsageLimitResetAt(
     (ms): ms is number =>
       ms !== undefined && Number.isFinite(ms) && ms > nowMs && ms <= LATEST_DATE_MS,
   );
-  return resets.length > 0 ? DateTime.formatIso(DateTime.makeUnsafe(Math.max(...resets))) : null;
+  return resets.length > 0 ? isoMillis(Math.max(...resets)) : null;
 }
diff --git a/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts b/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts
index 5ce763e024b86..30d00390769d2 100644
--- a/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts
+++ b/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts
@@ -8,6 +8,7 @@ import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
 import * as Schema from "effect/Schema";
 import * as TestClock from "effect/testing/TestClock";
+import * as UrlParams from "effect/http/UrlParams";
 import * as HttpClient from "effect/http/HttpClient";
 import * as HttpClientResponse from "effect/http/HttpClientResponse";
 import { describe } from "vite-plus/test";
@@ -167,3 +168,83 @@ describe("OpenCode2Client message history", () => {
     }),
   );
 });
+
+describe("OpenCode2Client native image jobs", () => {
+  it.effect.each([
+    { path: "/work/image.png", location: "/work" },
+    { path: "/tmp/images/session/image.png", location: "/tmp/images/session" },
+  ])("reads remote image $path through its native filesystem location", ({ path, location }) =>
+    Effect.gen(function* () {
+      const transport = HttpClient.make((request) =>
+        Effect.sync(() => {
+          assert.strictEqual(request.url, "http://remote.test/api/fs/read/image.png");
+          assert.deepEqual(UrlParams.toRecord(request.urlParams), {
+            "location[directory]": location,
+          });
+          return HttpClientResponse.fromWeb(
+            request,
+            new Response(Buffer.from("iVBORw0KGgo=", "base64")),
+          );
+        }),
+      );
+      const service = yield* OpenCode2Client.make.pipe(
+        Effect.provideService(HttpClient.HttpClient, transport),
+      );
+      const api = yield* service.connect({ baseUrl: "http://remote.test", password: "secret" });
+      assert.deepEqual(yield* api.readImage(path, "/work"), {
+        uri: "data:image/png;base64,iVBORw0KGgo=",
+        mime: "image/png",
+      });
+    }),
+  );
+
+  it.effect("rejects remote previews above the shared image limit", () =>
+    Effect.gen(function* () {
+      const transport = HttpClient.make((request) =>
+        Effect.succeed(
+          HttpClientResponse.fromWeb(request, new Response(new Uint8Array(11 * 1024 * 1024))),
+        ),
+      );
+      const service = yield* OpenCode2Client.make.pipe(
+        Effect.provideService(HttpClient.HttpClient, transport),
+      );
+      const api = yield* service.connect({ baseUrl: "http://remote.test", password: "secret" });
+      const result = yield* api.readImage("/work/image.png", "/work").pipe(Effect.result);
+      assert.equal(result._tag, "Failure");
+    }),
+  );
+
+  it.effect("reads scoped image jobs without accepting other sessions or job kinds", () =>
+    Effect.gen(function* () {
+      const job = {
+        kind: "image",
+        id: "image_test",
+        sessionID: "ses_owner",
+        status: "running",
+        path: "/work/image",
+        model: "test/image",
+      } as const;
+      const transport = HttpClient.make((request) =>
+        Effect.sync(() => {
+          assert.strictEqual(request.headers.authorization, utf8Basic("secret"));
+          return HttpClientResponse.fromWeb(
+            request,
+            Response.json({
+              data: [
+                job,
+                { ...job, sessionID: "ses_other" },
+                { ...job, kind: "shell" },
+                { ...job, status: "future" },
+              ],
+            }),
+          );
+        }),
+      );
+      const service = yield* OpenCode2Client.make.pipe(
+        Effect.provideService(HttpClient.HttpClient, transport),
+      );
+      const api = yield* service.connect({ baseUrl: "http://remote.test", password: "secret" });
+      assert.deepEqual(yield* api.imageJobs("ses_owner"), [job]);
+    }),
+  );
+});
diff --git a/packages/provider-opencode/src/server/v2/OpenCode2Client.ts b/packages/provider-opencode/src/server/v2/OpenCode2Client.ts
index 71fb1d70ce7d4..c3725156f5848 100644
--- a/packages/provider-opencode/src/server/v2/OpenCode2Client.ts
+++ b/packages/provider-opencode/src/server/v2/OpenCode2Client.ts
@@ -1,3 +1,5 @@
+import * as Path from "effect/Path";
+import { PROVIDER_SEND_TURN_MAX_IMAGE_BYTES } from "@t3tools/contracts";
 import { OpenCode, type OpenCodeClient } from "@opencode/client/effect";
 import { OpenCodeEvent } from "@opencode/protocol/groups/event";
 import * as Context from "effect/Context";
@@ -50,9 +52,43 @@ export type OpenCode2StreamEvent =
   | OpenCode2UnreadableTerminal
   | OpenCode2UnreadableStart;
 
+export class OpenCode2ImageError extends Schema.TaggedError<OpenCode2ImageError>()(
+  "OpenCode2ImageError",
+  { cause: Schema.Defect() },
+) {}
+
+const IMAGE_MIME: Readonly<Record<string, string>> = {
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".webp": "image/webp",
+  ".gif": "image/gif",
+};
+export const imagePreviewMime = (extension: string) => IMAGE_MIME[extension.toLowerCase()];
+
+const NativeImageJob = Schema.Struct({
+  kind: Schema.Literal("image"),
+  id: Schema.String,
+  sessionID: Schema.String,
+  status: Schema.Literals(["running", "completed", "error", "cancelled"]),
+  path: Schema.String,
+  model: Schema.String,
+});
+const decodeJobs = Schema.decodeUnknownEffect(
+  Schema.Struct({ data: Schema.Array(Schema.Unknown) }),
+);
+const decodeImageJob = Schema.decodeUnknownOption(NativeImageJob);
+
 /** events resolves on subscription acceptance; subscribe before work because the stream is volatile. */
 export interface OpenCode2Api {
   readonly client: OpenCodeClient;
+  readonly imageJobs: (
+    sessionID: string,
+  ) => Effect.Effect<ReadonlyArray<typeof NativeImageJob.Type>, OpenCode2ImageError>;
+  readonly readImage: (
+    path: string,
+    directory: string,
+  ) => Effect.Effect<{ uri: string; mime: string }, OpenCode2ImageError>;
   readonly events: Effect.Effect<
     Stream.Stream<
       OpenCode2StreamEvent,
@@ -202,6 +238,7 @@ const fillCompactionRecents = HttpClient.transformResponse(
 /** @public */
 export const make = Effect.gen(function* () {
   const httpClient = yield* HttpClient.HttpClient;
+  const paths = yield* Path.Path.pipe(Effect.provide(Path.layer));
   return OpenCode2Client.of({
     connect: Effect.fn("OpenCode2Client.connect")(function ({ baseUrl, password }) {
       const authenticated = HttpClient.mapRequest(
@@ -212,6 +249,51 @@ export const make = Effect.gen(function* () {
         Effect.provideService(HttpClient.HttpClient, fillCompactionRecents(authenticated)),
         Effect.map((client) => ({
           client,
+          imageJobs: (sessionID: string) =>
+            authenticated
+              .get(`${baseUrl}/api/experimental/job`, {
+                urlParams: { sessionID, kind: "image" },
+              })
+              .pipe(
+                Effect.flatMap(HttpClientResponse.filterStatusOk),
+                Effect.flatMap((response) => response.json),
+                Effect.flatMap(decodeJobs),
+                Effect.map((page) =>
+                  page.data.flatMap((item) => {
+                    const job = decodeImageJob(item);
+                    return Option.isSome(job) && job.value.sessionID === sessionID
+                      ? [job.value]
+                      : [];
+                  }),
+                ),
+                Effect.mapError((cause) => new OpenCode2ImageError({ cause })),
+              ),
+          readImage: Effect.fn("OpenCode2Client.readImage")(
+            function* (path: string, directory: string) {
+              const mime = imagePreviewMime(paths.extname(path));
+              if (mime === undefined)
+                return yield* new OpenCode2ImageError({ cause: "Unsupported image format" });
+              const relative = paths.relative(directory, path);
+              // OpenCode confines reads to the requested location, including its own temp images.
+              const outside =
+                relative === ".." ||
+                relative.startsWith(`..${paths.sep}`) ||
+                paths.isAbsolute(relative);
+              const location = outside ? paths.dirname(path) : directory;
+              const file = outside ? paths.basename(path) : relative;
+              const response = yield* authenticated
+                .get(`${baseUrl}/api/fs/read/${encodeURIComponent(file)}`, {
+                  urlParams: { "location[directory]": location },
+                })
+                .pipe(Effect.flatMap(HttpClientResponse.filterStatusOk));
+              const bytes = yield* response.arrayBuffer;
+              if (bytes.byteLength > PROVIDER_SEND_TURN_MAX_IMAGE_BYTES)
+                return yield* new OpenCode2ImageError({ cause: "Image exceeds preview limit" });
+              return { uri: `data:${mime};base64,${Buffer.from(bytes).toString("base64")}`, mime };
+            },
+            Effect.timeout("10 seconds"),
+            Effect.mapError((cause) => new OpenCode2ImageError({ cause })),
+          ),
           events: readEvents.pipe(
             Effect.provideService(
               HttpClient.HttpClient,
diff --git a/packages/provider-opencode/src/server/v2/adapter.ts b/packages/provider-opencode/src/server/v2/adapter.ts
index bbd70cc108cdc..19673f2597fec 100644
--- a/packages/provider-opencode/src/server/v2/adapter.ts
+++ b/packages/provider-opencode/src/server/v2/adapter.ts
@@ -1,3 +1,5 @@
+import * as Path from "effect/Path";
+import * as Option from "effect/Option";
 import * as NodeURL from "node:url";
 
 import {
@@ -15,6 +17,7 @@ import {
 } from "@opencode/client/effect";
 import { Mcp } from "@opencode/schema/mcp";
 import {
+  PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
   isOrchestrationV2WorkActive,
   parseGoalCommand,
   type ChatAttachment,
@@ -304,6 +307,18 @@ interface ThreadState {
   readonly sessionId: string;
   providerThread: OrchestrationV2ProviderThread;
   publishedBackgroundWork?: boolean;
+  readonly imageJobs: Map<
+    string,
+    {
+      readonly turn: ActiveTurn;
+      readonly toolId: string;
+      readonly tool: { readonly name: string; input: Record<string, unknown> };
+      previewed: boolean;
+      readonly path: string;
+      readonly model: string;
+      status: "running" | "completed" | "error" | "cancelled";
+    }
+  >;
   goalRevision: number;
   goalFresh: boolean;
   goalRefreshing: boolean;
@@ -529,8 +544,11 @@ const sessionIdOf = (providerThread: OrchestrationV2ProviderThread) => {
 const textOf = (content: ReadonlyArray<{ readonly type: string; readonly text?: string }>) =>
   content.flatMap((part) => (part.type === "text" && part.text ? [part.text] : [])).join("\n");
 
-const stringField = (record: Readonly<Record<string, unknown>> | undefined, key: string) => {
-  const value = record?.[key];
+const stringField = (record: unknown, key: string) => {
+  const value =
+    typeof record === "object" && record !== null && key in record
+      ? Reflect.get(record, key)
+      : undefined;
   return typeof value === "string" && value.trim().length > 0 ? value : undefined;
 };
 
@@ -698,6 +716,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
   const host = yield* ProviderHost.ProviderHost;
   const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
   const fileSystem = yield* FileSystem.FileSystem;
+  const paths = yield* Path.Path;
   const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests;
   const crypto = yield* Digest.Digest;
   const driver = OPENCODE_PROVIDER;
@@ -794,6 +813,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
     ): ThreadState => ({
       sessionId,
       providerThread,
+      imageJobs: new Map(),
       goalRevision: 0,
       goalFresh: false,
       goalRefreshing: false,
@@ -870,6 +890,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
     };
 
     const owesWork = (state: ThreadState) =>
+      [...state.imageJobs.values()].some((job) => job.status === "running") ||
       state.wakes.length > 0 ||
       state.reports.size > 0 ||
       (state.subagent !== undefined && busy.has(state.sessionId)) ||
@@ -1161,6 +1182,31 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
           if (projected) return;
         }
       }
+      if (tool.name === "experimental_image_generate" && status === "completed") {
+        const jobID = stringField(result?.metadata, "jobID");
+        const path = stringField(result?.metadata, "path");
+        const model = stringField(result?.metadata, "model");
+        if (jobID !== undefined && path !== undefined && model !== undefined) {
+          // Tool success acknowledges launch, not the background image's outcome.
+          if (
+            state.imageJobs.get(jobID)?.status !== undefined &&
+            state.imageJobs.get(jobID)?.status !== "running"
+          )
+            return;
+          if (!state.imageJobs.has(jobID))
+            state.imageJobs.set(jobID, {
+              turn,
+              toolId: id,
+              tool,
+              previewed: false,
+              path,
+              model,
+              status: "running",
+            });
+          status = "running";
+          yield* syncRosterAncestors(state);
+        }
+      }
       const updatedAt = yield* DateTime.now;
       const startedAt = turn.startedAt.get(id) ?? updatedAt;
       const completedAt = status === "running" ? null : updatedAt;
@@ -1425,14 +1471,28 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
             ? {}
             : { childThreadId: call.child.subagent.appThread.id }),
         }));
+      const imageTasks = sessionsOf(state).flatMap((session) =>
+        [...session.imageJobs.entries()].flatMap(([taskId, job]) =>
+          job.status === "running"
+            ? [
+                {
+                  taskId,
+                  kind: "background_task" as const,
+                  description: `Image generation (${job.model})`,
+                },
+              ]
+            : [],
+        ),
+      );
+      const allTasks = [...roster, ...imageTasks];
       const current = state.providerThread.pendingBackgroundTasks ?? [];
       if (
         state.publishedBackgroundWork === hasBackground(state) &&
-        current.length === roster.length &&
+        current.length === allTasks.length &&
         current.every(
           (task, index) =>
-            task.taskId === roster[index]?.taskId &&
-            task.description === roster[index]?.description &&
+            task.taskId === allTasks[index]?.taskId &&
+            task.description === allTasks[index]?.description &&
             (task.kind === "subagent" ? task.childThreadId : undefined) ===
               roster[index]?.childThreadId,
         )
@@ -1441,7 +1501,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
       }
       state.providerThread = {
         ...state.providerThread,
-        pendingBackgroundTasks: roster,
+        pendingBackgroundTasks: allTasks,
         updatedAt: yield* DateTime.now,
       };
       yield* emitProviderThread(state);
@@ -1726,6 +1786,8 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
         yield* emitText(state, turn, open.block, open.kind, (text) => text, true);
       }
       for (const id of turn.tools.keys()) {
+        if ([...state.imageJobs.values()].some((job) => job.turn === turn && job.toolId === id))
+          continue;
         yield* emitTool(
           state,
           turn,
@@ -2266,7 +2328,12 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
             files: event.data.content.flatMap((part) => (part.type === "file" ? [part] : [])),
             metadata: event.data.metadata,
           });
-          turn.tools.delete(event.data.id);
+          if (
+            ![...state.imageJobs.values()].some(
+              (job) => job.turn === turn && job.toolId === event.data.id,
+            )
+          )
+            turn.tools.delete(event.data.id);
           return;
         }
         case "session.tool.failed": {
@@ -2389,6 +2456,85 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
       yield* offerWake(state, wake);
     });
 
+    const imageReport = Effect.fn("OpenCode2Adapter.imageReport")(function* (
+      state: ThreadState,
+      payload: {
+        readonly text: string;
+        readonly metadata?: Readonly<Record<string, unknown>> | undefined;
+      },
+    ) {
+      const jobID = stringField(payload.metadata, "jobID");
+      const job = jobID === undefined ? undefined : state.imageJobs.get(jobID);
+      const outcome = stringField(payload.metadata, "state");
+      if (
+        job === undefined ||
+        (outcome !== "completed" && outcome !== "error" && outcome !== "cancelled")
+      )
+        return;
+      // Native job inventory exposes the stem, while a completion notice names the saved file.
+      const saved = /Saved image: (.+) \([^\n]+\)\./.exec(payload.text)?.[1];
+      const previewPath =
+        saved !== undefined && saved.startsWith(job.path + ".") ? saved : undefined;
+      if (
+        job.status !== "running" &&
+        !(
+          job.status === "completed" &&
+          outcome === "completed" &&
+          !job.previewed &&
+          previewPath !== undefined
+        )
+      )
+        return;
+      const files: Array<{ uri: string; mime: string }> = [];
+      yield* Effect.gen(function* () {
+        if (outcome !== "completed" || previewPath === undefined) return;
+        const image = yield* (
+          connection.external
+            ? connection.readImage(previewPath, state.directory)
+            : Effect.gen(function* () {
+                const mime = OpenCode2Client.imagePreviewMime(paths.extname(previewPath));
+                const info = yield* fileSystem.stat(previewPath);
+                if (mime === undefined || info.size > PROVIDER_SEND_TURN_MAX_IMAGE_BYTES)
+                  return yield* new OpenCode2Client.OpenCode2ImageError({
+                    cause: "Unsupported image preview",
+                  });
+                const bytes = yield* fileSystem.readFile(previewPath);
+                if (bytes.byteLength > PROVIDER_SEND_TURN_MAX_IMAGE_BYTES)
+                  return yield* new OpenCode2Client.OpenCode2ImageError({
+                    cause: "Image exceeds preview limit",
+                  });
+                return {
+                  uri: `data:${mime};base64,${Buffer.from(bytes).toString("base64")}`,
+                  mime,
+                };
+              })
+        ).pipe(Effect.timeout(INVENTORY_TIMEOUT), Effect.option);
+        if (Option.isSome(image)) files.push(image.value);
+      }).pipe(
+        Effect.ensuring(
+          Effect.gen(function* () {
+            // A known outcome must still settle its tool if preview I/O is interrupted.
+            job.status = outcome;
+            job.previewed ||= files.length > 0;
+            job.turn.tools.set(job.toolId, job.tool);
+            yield* emitTool(
+              state,
+              job.turn,
+              job.toolId,
+              outcome === "completed"
+                ? "completed"
+                : outcome === "error"
+                  ? "failed"
+                  : "interrupted",
+              { output: payload.text, metadata: undefined, files },
+            );
+            job.turn.tools.delete(job.toolId);
+            yield* syncRosterAncestors(state);
+          }),
+        ),
+      );
+    });
+
     const onReport = Effect.fnUntraced(function* (
       state: ThreadState,
       inboxId: string,
@@ -2397,6 +2543,9 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
         readonly metadata?: Readonly<Record<string, unknown>> | undefined;
       },
     ) {
+      if (stringField(payload.metadata, "source") === "experimental_image_generate") {
+        return yield* imageReport(state, payload);
+      }
       const childId = stringField(payload.metadata, "childID");
       if (stringField(payload.metadata, "source") !== "subagent" || childId === undefined) return;
       strays.delete(childId);
@@ -2683,8 +2832,13 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
       }
       for (const state of threads.values()) {
         for (const call of runningCalls(state)) yield* settleCall(call, "failed");
+        for (const [jobID, job] of state.imageJobs) {
+          if (job.status !== "running") continue;
+          yield* imageReport(state, { text: message, metadata: { jobID, state: "error" } });
+        }
         for (const wake of state.wakes.splice(0)) wake.dropped = true;
         state.reports.clear();
+        yield* syncRosterAncestors(state);
       }
       yield* setSessionStatus("error", message);
       yield* Queue.end(events);
@@ -2768,7 +2922,12 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
               ),
               metadata: part.state.metadata,
             });
-            turn.tools.delete(part.id);
+            if (
+              ![...state.imageJobs.values()].some(
+                (job) => job.turn === turn && job.toolId === part.id,
+              )
+            )
+              turn.tools.delete(part.id);
           } else if (part.state.status === "error") {
             yield* emitTool(state, turn, part.id, "failed", {
               output: part.state.error.message,
@@ -2784,6 +2943,36 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
     });
 
     // Restarts retain the previous session.outcome; without an idle item, the lost execution was interrupted.
+    const recoverImages = Effect.fn("OpenCode2Adapter.recoverImages")(function* (
+      state: ThreadState,
+    ) {
+      if (![...state.imageJobs.values()].some((job) => job.status === "running")) return;
+      yield* OpenCode2Client.paginate(
+        { sessionID: Session.ID.make(state.sessionId), type: "synthetic" as const, limit: 100 },
+        client.message.list,
+      ).pipe(
+        Stream.runForEach((message) =>
+          message.type === "synthetic" &&
+          stringField(message.metadata, "source") === "experimental_image_generate"
+            ? imageReport(state, message)
+            : Effect.void,
+        ),
+      );
+      if (
+        ![...state.imageJobs.values()].some((job) => job.status === "running") ||
+        compareSemverVersions(connection.version, "2.2.6") < 0
+      )
+        return;
+      const jobs = yield* connection.imageJobs(state.sessionId);
+      for (const job of jobs) {
+        if (job.status === "running") continue;
+        yield* imageReport(state, {
+          text: `Image generation ${job.status}. Output path: ${job.path} (${job.model}).`,
+          metadata: { source: "experimental_image_generate", jobID: job.id, state: job.status },
+        });
+      }
+    });
+
     const reconcile = Effect.fn("OpenCode2Adapter.reconcile")(function* () {
       // Read deepest sessions first; subagent turns end before their waiting parents.
       const running = [...threads]
@@ -2833,6 +3022,12 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
               : { status: "interrupted" };
         yield* endExecution(state, turn, terminal);
       }
+      for (const state of threads.values()) {
+        yield* recoverImages(state).pipe(
+          Effect.timeout(INVENTORY_TIMEOUT),
+          Effect.ignore({ log: true }),
+        );
+      }
       for (const state of background) {
         for (const call of runningCalls(state)) {
           const child = call.child?.sessionId;
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 5d9a87ac7719d..f5f769236f906 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -3,6 +3,10 @@
   "private": true,
   "type": "module",
   "exports": {
+    "./pullRequestAnchor": {
+      "types": "./src/pullRequestAnchor.ts",
+      "import": "./src/pullRequestAnchor.ts"
+    },
     "./changedFileKind": {
       "types": "./src/changedFileKind.ts",
       "import": "./src/changedFileKind.ts"
diff --git a/packages/shared/src/markdownListIndentation.ts b/packages/shared/src/markdownListIndentation.ts
index f41e6d2eddde2..39342890d1c27 100644
--- a/packages/shared/src/markdownListIndentation.ts
+++ b/packages/shared/src/markdownListIndentation.ts
@@ -1,3 +1,5 @@
+import { keepOrderedListNumbers, keepsOrderedListNumbers } from "./markdownOrderedListNumbers.ts";
+
 interface MarkdownPosition {
   readonly start?: {
     readonly line?: number;
@@ -91,6 +93,9 @@ function parseRecoveredMarkdown(value: string, parser: MarkdownParser): Recovere
 function blocksFromIndentedCode(node: MarkdownAstNode, parser: MarkdownParser): RecoveredMarkdown {
   const value = typeof node.value === "string" ? node.value.trim() : "";
   const recovered = parseRecoveredMarkdown(value, parser);
+  if (keepsOrderedListNumbers(parser)) {
+    for (const block of recovered.blocks) keepOrderedListNumbers(block, recovered.source);
+  }
   const first = recovered.blocks[0];
   return {
     ...recovered,
diff --git a/packages/shared/src/markdownOrderedListNumbers.ts b/packages/shared/src/markdownOrderedListNumbers.ts
new file mode 100644
index 0000000000000..32b3b38de5633
--- /dev/null
+++ b/packages/shared/src/markdownOrderedListNumbers.ts
@@ -0,0 +1,62 @@
+import type { Root } from "mdast";
+import type { Transformer } from "unified";
+
+interface MarkdownListNode {
+  readonly type: string;
+  readonly ordered?: boolean | null | undefined;
+  readonly start?: number | null | undefined;
+  readonly position?:
+    | { readonly start?: { readonly offset?: number | undefined } | undefined }
+    | undefined;
+  data?: { hProperties?: Record<string, unknown> | undefined } | undefined;
+  children?: MarkdownListNode[] | undefined;
+}
+
+const WRITTEN_NUMBER = /[ \t]*(\d{1,9})[.)]/y;
+
+/**
+ * CommonMark numbers an ordered list from its first marker only, so answers to questions 3 and 5
+ * would render as 3 and 4. An item whose written number breaks the sequence keeps it. `source` is
+ * the text the node's offsets point into.
+ */
+export function keepOrderedListNumbers(node: MarkdownListNode, source: string): void {
+  if (!node.children) return;
+  if (node.type === "list" && node.ordered) {
+    let expected = node.start ?? 1;
+    for (const item of node.children) {
+      const offset = item.position?.start?.offset;
+      WRITTEN_NUMBER.lastIndex = offset ?? 0;
+      const digits = offset === undefined ? undefined : WRITTEN_NUMBER.exec(source)?.[1];
+      const value = digits === undefined ? expected : Number(digits);
+      if (value !== expected) {
+        item.data = {
+          ...item.data,
+          hProperties: { ...item.data?.hProperties, value: String(value) },
+        };
+      }
+      expected = value + 1;
+    }
+  }
+  for (const child of node.children) keepOrderedListNumbers(child, source);
+}
+
+const enabledProcessors = new WeakSet<object>();
+
+/**
+ * Opts a processor in. User messages use it so the sent bubble shows the numbers the composer
+ * showed and the agent received; agent replies and files keep CommonMark numbering.
+ */
+export function remarkEnableOrderedListNumbers(this: object): undefined {
+  enabledProcessors.add(this);
+}
+
+export function keepsOrderedListNumbers(processor: object): boolean {
+  return enabledProcessors.has(processor);
+}
+
+/** Sits before list recovery so offsets still point into the file. */
+export function remarkKeepOrderedListNumbers(this: object): Transformer<Root> {
+  return (tree, file) => {
+    if (enabledProcessors.has(this)) keepOrderedListNumbers(tree, String(file));
+  };
+}
diff --git a/packages/shared/src/markdownPipeline.test.ts b/packages/shared/src/markdownPipeline.test.ts
index 0493580e93625..3d4e69be16d9e 100644
--- a/packages/shared/src/markdownPipeline.test.ts
+++ b/packages/shared/src/markdownPipeline.test.ts
@@ -1,5 +1,5 @@
 import { expect, it } from "vite-plus/test";
-import { unified } from "unified";
+import { type PluggableList, unified } from "unified";
 import rehypeRaw from "rehype-raw";
 import remarkParse from "remark-parse";
 import remarkRehype from "remark-rehype";
@@ -8,6 +8,7 @@ import {
   CHAT_MARKDOWN_REHYPE_PLUGINS,
   CHAT_MARKDOWN_REMARK_PLUGINS,
   CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS,
+  remarkEnableOrderedListNumbers,
 } from "./markdownPipeline.ts";
 
 it.each([
@@ -309,6 +310,47 @@ it("keeps an image on its own line under a label but leaves inline images inline
   expect(render("Hard-wrapped\nprose")).toBe("Hard-wrapped\nprose");
 });
 
+it("keeps the number written on each ordered list item only when enabled", () => {
+  type Node = { tagName?: string; properties?: { value?: unknown }; children?: Node[] };
+  const values = (node: Node): unknown[] => [
+    ...(node.tagName === "li" ? [node.properties?.value] : []),
+    ...(node.children ?? []).flatMap(values),
+  ];
+  const renderer = (plugins: PluggableList) => {
+    const processor = unified()
+      .use(remarkParse)
+      .use(plugins)
+      .use(remarkRehype, { allowDangerousHtml: true });
+    return (markdown: string) =>
+      values(processor.runSync(processor.parse(markdown), markdown) as Node);
+  };
+  const render = renderer([
+    ...CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS,
+    remarkEnableOrderedListNumbers,
+  ]);
+
+  expect(render("3. first\n5. second\n6. third")).toEqual([undefined, "5", undefined]);
+  expect(render("1. one\n1. one again")).toEqual([undefined, "1"]);
+  expect(render("> 1. quoted\n> 4. skipped")).toEqual([undefined, "4"]);
+  expect(render("1. outer\n   1. nested\n   7. jump\n9. back")).toEqual([
+    undefined,
+    undefined,
+    "7",
+    "9",
+  ]);
+  expect(render("1. one\n2. two\n- bullet")).toEqual([undefined, undefined, undefined]);
+  expect(render("-       first block\n\n        3. first\n        5. second")).toEqual([
+    undefined,
+    undefined,
+    "5",
+  ]);
+  expect(
+    renderer(CHAT_MARKDOWN_REMARK_PLUGINS)(
+      "3. first\n5. second\n\n-       first block\n\n        3. first\n        5. second",
+    ),
+  ).toEqual([undefined, undefined, undefined, undefined, undefined]);
+});
+
 it("moves a <picture>'s color-scheme sources onto its <img>, which the renderer resolves", () => {
   const processor = unified()
     .use(remarkParse)
diff --git a/packages/shared/src/markdownPipeline.ts b/packages/shared/src/markdownPipeline.ts
index e4527a8a017c9..6a49d0023b0a2 100644
--- a/packages/shared/src/markdownPipeline.ts
+++ b/packages/shared/src/markdownPipeline.ts
@@ -11,6 +11,7 @@ import remarkBreaks from "remark-breaks";
 import remarkGfm from "remark-gfm";
 import { remarkGithubAlerts } from "./markdownGithubAlerts.ts";
 import { remarkNormalizeListItemIndentation } from "./markdownListIndentation.ts";
+import { remarkKeepOrderedListNumbers } from "./markdownOrderedListNumbers.ts";
 import {
   CODEX_ARTIFACT_TEMPLATE_HAST_PROPERTIES,
   remarkCodexDirectives,
@@ -18,6 +19,8 @@ import {
 import { isWindowsDrivePathHref, normalizeMarkdownLinkDestination } from "./markdownLinks.ts";
 import { THREAD_LINK_PROTOCOL } from "./threadLinks.ts";
 
+export { remarkEnableOrderedListNumbers } from "./markdownOrderedListNumbers.ts";
+
 type MarkdownImageHastNode = {
   type?: string;
   value?: string;
@@ -230,6 +233,7 @@ export const CHAT_MARKDOWN_REMARK_PLUGINS: PluggableList = [
   remarkKeepAutolinkSuffixes,
   remarkKeepWindowsPaths,
   remarkGithubAlerts,
+  remarkKeepOrderedListNumbers,
   remarkNormalizeListItemIndentation,
   remarkCodexDirectives,
   remarkBreakAroundImageLines,
@@ -242,6 +246,7 @@ export const CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS: PluggableList = [
   remarkKeepAutolinkSuffixes,
   remarkKeepWindowsPaths,
   remarkGithubAlerts,
+  remarkKeepOrderedListNumbers,
   remarkNormalizeListItemIndentation,
   remarkCodexDirectives,
   remarkBreakAroundImageLines,
diff --git a/packages/shared/src/mcpApp.test.ts b/packages/shared/src/mcpApp.test.ts
index 6dd3c7d011493..e0d902c350566 100644
--- a/packages/shared/src/mcpApp.test.ts
+++ b/packages/shared/src/mcpApp.test.ts
@@ -5,6 +5,7 @@ import {
   injectMcpAppCsp,
   injectMcpAppThemeBootstrap,
   injectMcpAppCookieBootstrap,
+  MCP_APP_COLOR_SCHEME_PARAM,
   mcpAppContentSecurityPolicy,
   mcpAppToolCallableByApp,
   mcpAppToolResourceUri,
@@ -101,6 +102,28 @@ describe("injectMcpAppThemeBootstrap", () => {
     send(initialized);
     expect(style.colorScheme).toBe("dark");
   });
+
+  it("applies only a valid scheme from the frame URL before any message arrives", () => {
+    const html = injectMcpAppThemeBootstrap("<p>app</p>");
+    const script = html.slice(html.indexOf("<script>") + 8, html.indexOf("</script>"));
+    const initialScheme = (search: string) => {
+      const head: Array<{ name?: string; content?: string }> = [];
+      NodeVM.runInNewContext(script, {
+        URLSearchParams,
+        location: { search },
+        window: { parent: {}, addEventListener: () => {} },
+        document: {
+          createElement: () => ({}),
+          head: { append: (element: (typeof head)[number]) => head.push(element) },
+        },
+      });
+      return head.find((element) => element.name === "color-scheme")?.content ?? "normal";
+    };
+    expect(initialScheme(`?a=1&${MCP_APP_COLOR_SCHEME_PARAM}=dark`)).toBe("dark");
+    expect(initialScheme(`?${MCP_APP_COLOR_SCHEME_PARAM}=light`)).toBe("light");
+    expect(initialScheme(`?${MCP_APP_COLOR_SCHEME_PARAM}=normal`)).toBe("normal");
+    expect(initialScheme("")).toBe("normal");
+  });
 });
 
 describe("readMcpAppCsp", () => {
diff --git a/packages/shared/src/mcpApp.ts b/packages/shared/src/mcpApp.ts
index 35a50306423e5..40b3975ebd645 100644
--- a/packages/shared/src/mcpApp.ts
+++ b/packages/shared/src/mcpApp.ts
@@ -5,6 +5,8 @@ export const MCP_APP_MIME_TYPE = "text/html;profile=mcp-app";
 export const MCP_APP_EXTENSION_ID = "io.modelcontextprotocol/ui";
 export const MCP_APP_RESOURCE_SCHEME = "ui://";
 export const MCP_APP_OUTPUT_KEY = "t3McpApp";
+/** Frame URL query parameter carrying the host's color scheme before `ui/initialize`. */
+export const MCP_APP_COLOR_SCHEME_PARAM = "t3-color-scheme";
 
 const MCP_APP_MIN_HEIGHT = 80;
 export const MCP_APP_DEFAULT_HEIGHT = 320;
@@ -201,6 +203,16 @@ export function injectMcpAppCsp(html: string, csp: McpAppCsp | undefined): strin
 export function injectMcpAppThemeBootstrap(html: string): string {
   const script = `<script>
 (() => {
+  try {
+    const initial = new URLSearchParams(location.search).get(${JSON.stringify(MCP_APP_COLOR_SCHEME_PARAM)});
+    if (initial === "light" || initial === "dark") {
+      // A meta tag, unlike an inline style, survives the app's own <html style> attribute.
+      const meta = document.createElement("meta");
+      meta.name = "color-scheme";
+      meta.content = initial;
+      document.head.append(meta);
+    }
+  } catch {}
   window.addEventListener("message", (event) => {
     if (event.source !== window.parent) return;
     const message = event.data;
diff --git a/packages/shared/src/pullRequestAnchor.test.ts b/packages/shared/src/pullRequestAnchor.test.ts
new file mode 100644
index 0000000000000..bd81fbc48fd76
--- /dev/null
+++ b/packages/shared/src/pullRequestAnchor.test.ts
@@ -0,0 +1,135 @@
+import { expect, it } from "vite-plus/test";
+import {
+  parsePullRequestAnchor,
+  pullRequestAnchorMatchesUrl,
+  pullRequestDiffPathMatches,
+  pullRequestLinkCommit,
+  resolvePullRequestReviewAnchor,
+} from "./pullRequestAnchor.ts";
+
+const url = "https://github.com/owner/repo/pull/7";
+it.each(["discussion_r123", "r123", "discussion-diff-123R5-L9", "discussion-diff-123"])(
+  "resolves review comment alias %s",
+  (hash) => {
+    expect(parsePullRequestAnchor(`${url}#${hash}`)).toEqual({
+      kind: "timeline",
+      anchor: "discussion_r123",
+    });
+    expect(pullRequestAnchorMatchesUrl("discussion_r123", `${url}#${hash}`)).toBe(true);
+  },
+);
+it.each([
+  "pullrequestreview-123",
+  "issuecomment-123",
+  "commitcomment-123",
+  "event-123",
+  "note_123",
+  "comment-123",
+])("preserves timeline anchor %s", (anchor) => {
+  expect(parsePullRequestAnchor(`${url}#${anchor}`)).toEqual({ kind: "timeline", anchor });
+});
+it.each(["a".repeat(32), "b".repeat(64)])(
+  "reads file and cross-side line ranges for %s",
+  (digest) => {
+    expect(parsePullRequestAnchor(`${url}/files#diff-${digest}`)).toEqual({
+      kind: "diff",
+      digest,
+      range: null,
+    });
+    expect(parsePullRequestAnchor(`${url}/changes#diff-${digest}L12-R15`)).toEqual({
+      kind: "diff",
+      digest,
+      range: { start: 12, side: "left", end: 15, endSide: "right" },
+    });
+    expect(parsePullRequestAnchor(`${url}#diff-${digest}R42`)).toEqual({
+      kind: "diff",
+      digest,
+      range: { start: 42, side: "right", end: 42, endSide: "right" },
+    });
+  },
+);
+it.each([
+  [
+    "src/hello world.ts",
+    "bcea8deb9d67b305e28c4a0b0d021615",
+    "066802cf2cf056706e4e4951cb7dff2717a2ae32fd9797c1f1b41062d57db929",
+  ],
+  [
+    "src/日本語.ts",
+    "5c66d5d565666e46924cf80d7bbfdab3",
+    "191b8ebf2241225db999eaf8b6ff44b07934d577f347d0ff684591eecad34944",
+  ],
+  [
+    "old/path.ts",
+    "f5d455478d496859b654884654393a61",
+    "aa38d67014e2c59d51ea456a155e039f4e32f636a4c450714c3b517bb8bde7e7",
+  ],
+])("matches GitHub path digests for %s", (path, legacy, current) => {
+  for (const digest of [legacy, current]) {
+    expect(pullRequestDiffPathMatches(digest, path)).toBe(true);
+    expect(pullRequestDiffPathMatches(digest, "other.ts")).toBe(false);
+  }
+});
+it("handles encoded hashes and rejects invalid line numbers and URLs", () => {
+  expect(parsePullRequestAnchor(`${url}#%64iscussion_r123`)).toEqual({
+    kind: "timeline",
+    anchor: "discussion_r123",
+  });
+  expect(parsePullRequestAnchor(`${url}#diff-abcR0`)).toBeNull();
+  expect(parsePullRequestAnchor(`${url}#diff-abcR9999999999999999999`)).toBeNull();
+  expect(parsePullRequestAnchor("invalid")).toBeNull();
+  expect(parsePullRequestAnchor(url)).toBeNull();
+  expect(parsePullRequestAnchor(`${url}#unknown`)).toEqual({ kind: "summary", anchor: "unknown" });
+  expect(parsePullRequestAnchor(`${url}/files-not-a-tab`)).toBeNull();
+  expect(parsePullRequestAnchor(`${url}/commits/main`)).toBeNull();
+  expect(parsePullRequestAnchor(`${url}/checks/extra`)).toBeNull();
+});
+
+it("keeps the commit scope of a PR diff permalink", () => {
+  const sha = "a".repeat(40);
+  expect(pullRequestLinkCommit(`${url}/commits/${sha}#diff-abcR5`)).toBe(sha);
+  expect(pullRequestLinkCommit(`${url}/files#diff-abcR5`)).toBeNull();
+});
+
+const gitlab = "https://gitlab.com/group/repo/-/merge_requests/7";
+it.each([
+  [`${url}/files`, "code"],
+  [`${url}/files/`, "code"],
+  [`${url}/changes`, "code"],
+  [`${url}/commits/${"a".repeat(40)}`, "code"],
+  [`${url}/commits`, "commits"],
+  [`${url}/checks?check_run_id=1`, "checks"],
+  [`${gitlab}/diffs`, "code"],
+  [`${gitlab}/commits`, "commits"],
+  [`${gitlab}/pipelines`, "checks"],
+] as const)("keeps unknown and missing hashes in the tab %s names", (path, kind) => {
+  for (const hash of ["", "#unknown", "#diff-abcR0", "#diff-abcR9999999999999999999", "#%ZZ"]) {
+    expect(parsePullRequestAnchor(`${path}${hash}`)).toEqual({ kind });
+  }
+  expect(parsePullRequestAnchor(`${path}#issuecomment-123`)).toEqual({
+    kind: "timeline",
+    anchor: "issuecomment-123",
+  });
+});
+
+it("finds a review with no text of its own through the earliest comment it posted", () => {
+  const review = `${url}#pullrequestreview-9`;
+  const threads = [
+    {
+      comments: [
+        { url: `${url}#discussion_r3`, createdAt: "2026-07-01T00:02:00Z", reviewUrl: review },
+        { url: `${url}#discussion_r2`, createdAt: "2026-07-01T00:01:00Z", reviewUrl: review },
+        { url: `${url}#discussion_r1`, createdAt: "2026-07-01T00:00:00Z" },
+      ],
+    },
+  ];
+  expect(resolvePullRequestReviewAnchor("pullrequestreview-9", [], threads)).toBe("discussion_r2");
+  // A review shown in its own right, an unknown review and other anchors are kept.
+  expect(resolvePullRequestReviewAnchor("pullrequestreview-9", [{ url: review }], threads)).toBe(
+    "pullrequestreview-9",
+  );
+  expect(resolvePullRequestReviewAnchor("pullrequestreview-8", [], threads)).toBe(
+    "pullrequestreview-8",
+  );
+  expect(resolvePullRequestReviewAnchor("issuecomment-9", [], threads)).toBe("issuecomment-9");
+});
diff --git a/packages/shared/src/pullRequestAnchor.ts b/packages/shared/src/pullRequestAnchor.ts
new file mode 100644
index 0000000000000..37982a7dfd716
--- /dev/null
+++ b/packages/shared/src/pullRequestAnchor.ts
@@ -0,0 +1,149 @@
+import { md5 } from "@noble/hashes/legacy";
+import { sha256 } from "@noble/hashes/sha2";
+import { bytesToHex, utf8ToBytes } from "@noble/hashes/utils";
+
+export interface PullRequestAnchorRange {
+  readonly start: number;
+  readonly side: "left" | "right";
+  readonly end: number;
+  readonly endSide: "left" | "right";
+}
+
+export type PullRequestAnchor =
+  | { readonly kind: "code" }
+  | { readonly kind: "commits" }
+  | { readonly kind: "checks" }
+  | {
+      readonly kind: "diff";
+      readonly digest: string;
+      readonly range: PullRequestAnchorRange | null;
+    }
+  | { readonly kind: "timeline"; readonly anchor: string }
+  | { readonly kind: "summary"; readonly anchor: string };
+
+function pullRequestUrlHash(url: string | null | undefined): string {
+  if (!url) return "";
+  try {
+    return decodeURIComponent(new URL(url).hash.slice(1));
+  } catch {
+    return "";
+  }
+}
+
+function normalizePullRequestCommentAnchor(anchor: string): string {
+  return anchor.replace(
+    /^(?:r|discussion-diff-)(\d+)(?:[LR]\d+(?:-[LR]\d+)?)?$/i,
+    "discussion_r$1",
+  );
+}
+
+// GitHub pull request tabs and their GitLab merge request equivalents.
+function pullRequestPathTab(pathname: string): PullRequestAnchor | null {
+  const tab = /\/(?:pull|-\/merge_requests)\/\d+\/([a-z]+)(?:\/(.*))?$/i.exec(pathname);
+  const rest = tab?.[2] ?? "";
+  switch (tab?.[1]?.toLowerCase()) {
+    case "files":
+    case "changes":
+    case "diffs":
+      return { kind: "code" };
+    case "commits":
+      if (rest === "") return { kind: "commits" };
+      return /^[a-f0-9]{40}\/?$/i.test(rest) ? { kind: "code" } : null;
+    case "checks":
+    case "pipelines":
+      return rest === "" ? { kind: "checks" } : null;
+    default:
+      return null;
+  }
+}
+
+export function parsePullRequestAnchor(url: string | null | undefined): PullRequestAnchor | null {
+  let parsed: URL;
+  try {
+    parsed = new URL(url ?? "");
+  } catch {
+    return null;
+  }
+  const fallback = pullRequestPathTab(parsed.pathname);
+  const anchor = pullRequestUrlHash(url);
+  if (!anchor) return fallback;
+  // GitHub line ranges may cross diff sides; file digests were MD5 before SHA-256.
+  const diff = /^diff-([a-f0-9]+)(?:([LR])(\d+)(?:-([LR])(\d+))?)?$/i.exec(anchor);
+  if (diff) {
+    const start = Number(diff[3]);
+    const end = Number(diff[5] ?? diff[3]);
+    if (
+      diff[2] &&
+      (!Number.isSafeInteger(start) || start < 1 || !Number.isSafeInteger(end) || end < 1)
+    )
+      return fallback;
+    return {
+      kind: "diff",
+      digest: (diff[1] ?? "").toLowerCase(),
+      range: diff[2]
+        ? {
+            start,
+            side: diff[2].toUpperCase() === "L" ? "left" : "right",
+            end,
+            endSide: (diff[4] ?? diff[2]).toUpperCase() === "L" ? "left" : "right",
+          }
+        : null,
+    };
+  }
+  if (
+    /^(?:(?:issuecomment-|pullrequestreview-|discussion_r|r|commitcomment-|event-|note_|comment-)\d+|discussion-diff-\d+(?:[LR]\d+(?:-[LR]\d+)?)?)$/i.test(
+      anchor,
+    )
+  ) {
+    return { kind: "timeline", anchor: normalizePullRequestCommentAnchor(anchor) };
+  }
+  return fallback ?? { kind: "summary", anchor };
+}
+
+export function pullRequestAnchorMatchesUrl(
+  anchor: string,
+  url: string | null | undefined,
+): boolean {
+  return normalizePullRequestCommentAnchor(pullRequestUrlHash(url)) === anchor;
+}
+
+interface AnchoredComment {
+  readonly url: string | null;
+  readonly createdAt: string;
+  readonly reviewUrl?: string | null | undefined;
+}
+
+/**
+ * A review with no text of its own appears only through the line comments it posted, so its link
+ * resolves to the earliest of those. Any other anchor, or a review shown in its own right, is kept.
+ */
+export function resolvePullRequestReviewAnchor(
+  anchor: string,
+  comments: ReadonlyArray<Pick<AnchoredComment, "url">>,
+  reviewThreads: ReadonlyArray<{ readonly comments: ReadonlyArray<AnchoredComment> }>,
+): string {
+  if (!/^pullrequestreview-\d+$/i.test(anchor)) return anchor;
+  if (comments.some((comment) => pullRequestAnchorMatchesUrl(anchor, comment.url))) return anchor;
+  // The earliest comment the review posted; `toSorted` is missing from Hermes.
+  let posted: AnchoredComment | undefined;
+  for (const comment of reviewThreads.flatMap((thread) => thread.comments)) {
+    if (comment.url === null || !pullRequestAnchorMatchesUrl(anchor, comment.reviewUrl)) continue;
+    if (posted === undefined || comment.createdAt < posted.createdAt) posted = comment;
+  }
+  const own = posted ? normalizePullRequestCommentAnchor(pullRequestUrlHash(posted.url)) : "";
+  return own || anchor;
+}
+
+export function pullRequestDiffPathMatches(digest: string, path: string): boolean {
+  const bytes = utf8ToBytes(path);
+  return digest === bytesToHex(digest.length === 32 ? md5(bytes) : sha256(bytes));
+}
+
+export function pullRequestLinkCommit(url: string | null | undefined): string | null {
+  if (!url) return null;
+  try {
+    return /\/pull\/\d+\/commits\/([a-f0-9]{40})\/?$/i.exec(new URL(url).pathname)?.[1] ?? null;
+  } catch {
+    return null;
+  }
+}
diff --git a/packages/shared/src/threadLinks.test.ts b/packages/shared/src/threadLinks.test.ts
index 3e07ad817abf5..447cfb8586a22 100644
--- a/packages/shared/src/threadLinks.test.ts
+++ b/packages/shared/src/threadLinks.test.ts
@@ -7,6 +7,7 @@ import {
   guessThreadLinkRef,
   hostedThreadLink,
   parseThreadLinkHref,
+  prepareThreadLinks,
   relabelThreadLinks,
   threadLinkCandidates,
   threadLinkRefs,
@@ -18,6 +19,7 @@ const ref = (environmentId: string, threadId = "chat-1") => ({
 });
 const v1 = (threadId: string) => ({ environmentId: null, threadId: ThreadId.make(threadId) });
 const local = EnvironmentId.make("local");
+
 const titlesIn =
   (titles: Record<string, Record<string, string>>) =>
   ({ environmentId, threadId }: ScopedThreadRef) =>
@@ -117,15 +119,21 @@ describe("thread links", () => {
       relabelThreadLinks("[Kept label](<t3-thread://v2/local/t1>)", local, () => undefined),
     ).toBe("Kept label");
     expect(threadLinkRefs("[a](<t3-thread://v2/there/t2>)", local)).toEqual([ref("there", "t2")]);
-    for (const threadId of ["mcp:launch:qa(1)", "mcp:launch:qa)"]) {
+    for (const [threadId, destination] of [
+      ["mcp:launch:qa(1)", "<t3-thread://v2/there/mcp:launch:qa(1)>"],
+      ["mcp:launch:qa)", "<t3-thread://v2/there/mcp:launch:qa)>"],
+      ["task[1]", "t3-thread://v2/there/task[1]"],
+    ]) {
       const thread = ref("there", threadId);
       const link = formatThreadLink(thread, "Original");
-      expect(link).toBe(`[Original](<t3-thread://v2/there/${threadId}>)`);
-      expect(threadLinkRefs(link, local)).toEqual([thread]);
-      expect(relabelThreadLinks(link, local, () => "Renamed")).toBe(
-        `[Renamed](<t3-thread://v2/there/${threadId}>)`,
-      );
-      expect(relabelThreadLinks(link, local, () => undefined)).toBe("Original");
+      expect(link).toBe(`[Original](${destination})`);
+      for (const written of [link, `[Original](<t3-thread://v2/there/${threadId}>)`]) {
+        expect(threadLinkRefs(written, local)).toEqual([thread]);
+        expect(relabelThreadLinks(written, local, () => "Renamed")).toBe(
+          `[Renamed](${destination})`,
+        );
+        expect(relabelThreadLinks(written, local, () => undefined)).toBe("Original");
+      }
     }
   });
 
@@ -203,6 +211,47 @@ describe("thread links", () => {
 });
 
 describe("hosted thread links", () => {
+  it.each(["Fix `ci`", "Use ``a ` b``", "Fix `typo"])(
+    "relabels a copied hosted link with backticks in label %s as one link",
+    (label) => {
+      const markdown = formatHostedThreadLink(ref("one", "same"), label);
+      expect(threadLinkRefs(markdown, local)).toEqual([ref("one", "same")]);
+      expect(relabelThreadLinks(markdown, local, () => "Title")).toBe(
+        "[Title](t3-thread://v2/one/same)",
+      );
+      expect(relabelThreadLinks(markdown, local, () => undefined)).toBe(label);
+    },
+  );
+
+  it.each(["before ``", "before ` and ``"])(
+    "shields a cross-boundary span after label %s and processes the following live link",
+    (label) => {
+      const shielded = `[${label}](https://example.com) https://app.t3.codes/threads/one/hidden\`\``;
+      const markdown = `${shielded} https://app.t3.codes/threads/one/live`;
+      expect(threadLinkRefs(markdown, local)).toEqual([ref("one", "live")]);
+      expect(relabelThreadLinks(markdown, local, () => "Title")).toBe(
+        `${shielded} [Title](t3-thread://v2/one/live)`,
+      );
+    },
+  );
+
+  it("does not consume a code span's opening backtick as an ordinary link label", () => {
+    const markdown = "[before `](https://example.com) https://app.t3.codes/threads/one/same`";
+    expect(relabelThreadLinks(markdown, local, () => "Title")).toBe(markdown);
+    expect(threadLinkRefs(markdown, local)).toEqual([]);
+  });
+
+  it.each(['"title"', "'title'\t", "(see [notes])", String.raw`"say \"hi\""`])(
+    "leaves a link with Markdown title %s intact",
+    (title) => {
+      for (const label of ["label", "label `code`"]) {
+        const markdown = `[${label}](https://app.t3.codes/threads/one/same ${title})`;
+        expect(relabelThreadLinks(markdown, local, () => "Title")).toBe(markdown);
+        expect(threadLinkRefs(markdown, local)).toEqual([]);
+      }
+    },
+  );
+
   it("escapes every id character a sentence or path could claim, and reads it back", () => {
     const thread = ref("env.1", "thread:delegated/mcp%3A1.");
     const link = hostedThreadLink(thread);
@@ -229,9 +278,6 @@ describe("hosted thread links", () => {
       "[Fix ci](https://app.t3.codes/threads/e/t1)",
     );
     expect(formatHostedThreadLink(ref("e", "t1"), " ")).toBe("https://app.t3.codes/threads/e/t1");
-    const copied = formatHostedThreadLink(ref("e", "t1"), "Fix ` escaping");
-    expect(threadLinkRefs(copied, local)).toEqual([ref("e", "t1")]);
-    expect(relabelThreadLinks(copied, local, () => "New")).toBe("[New](t3-thread://v2/e/t1)");
   });
 
   it("titles hosted links in every Markdown form and writes them as v2 links", () => {
@@ -240,6 +286,7 @@ describe("hosted thread links", () => {
       relabelThreadLinks(
         [
           "See https://app.t3.codes/threads/there/t1.",
+          "~~https://app.t3.codes/threads/there/t1~~",
           "[old](https://app.t3.codes/threads/there/t1)",
           '[`old`](https://app.t3.codes/threads/there/t1 "title")',
           "[draft \\[old](https://app.t3.codes/threads/there/t1)",
@@ -253,8 +300,9 @@ describe("hosted thread links", () => {
     ).toBe(
       [
         "See [There](t3-thread://v2/there/t1).",
+        "~~[There](t3-thread://v2/there/t1)~~",
         "[There](t3-thread://v2/there/t1)",
-        "[There](t3-thread://v2/there/t1)",
+        '[`old`](https://app.t3.codes/threads/there/t1 "title")',
         "[There](t3-thread://v2/there/t1)",
         "[There](t3-thread://v2/there/t1)",
         "`https://app.t3.codes/threads/there/t1`",
@@ -288,10 +336,76 @@ describe("hosted thread links", () => {
     for (const [prefix, refs] of [
       [`Flags [${"``--opt``, ".repeat(18)} see `, [ref("e", "t")]],
       [`[${"``a``".repeat(20)} `, [ref("e", "t")]],
-      // Three or more backticks open a fence that runs to the end.
-      [`[${"`".repeat(80)}\n${"a ".repeat(3000)}`, []],
+      // A preceding bracket prevents these backticks from opening a CommonMark fence.
+      [`[${"`".repeat(80)}\n${"a ".repeat(3000)}`, [ref("e", "t")]],
     ] as const) {
       expect(threadLinkRefs(prefix + bare, local)).toEqual(refs);
     }
   });
 });
+
+describe("prepared thread links", () => {
+  it("reuses protected source while resolving current titles and environments", () => {
+    const markdown = "`<t3-thread://v1/code>`\n\n[old](t3-thread://v1/chat-1)";
+    const prepared = prepareThreadLinks(markdown);
+    expect(threadLinkRefs(prepared, local)).toEqual([ref("local")]);
+    expect(threadLinkRefs(prepared, EnvironmentId.make("remote"))).toEqual([ref("remote")]);
+    expect(relabelThreadLinks(prepared, local, titlesIn({ local: { "chat-1": "First" } }))).toBe(
+      markdown.replace("[old]", "[First]"),
+    );
+    expect(relabelThreadLinks(prepared, local, titlesIn({ local: { "chat-1": "Renamed" } }))).toBe(
+      markdown.replace("[old]", "[Renamed]"),
+    );
+    expect(
+      relabelThreadLinks(
+        prepared,
+        EnvironmentId.make("remote"),
+        titlesIn({ remote: { "chat-1": "Remote" } }),
+      ),
+    ).toBe(markdown.replace("[old]", "[Remote]"));
+    const changed = prepareThreadLinks(markdown.replace("chat-1", "chat-2"));
+    expect(threadLinkRefs(changed, local)).toEqual([ref("local", "chat-2")]);
+    expect(
+      relabelThreadLinks(changed, local, titlesIn({ local: { "chat-2": "New source" } })),
+    ).toBe(markdown.replace("chat-1", "chat-2").replace("[old]", "[New source]"));
+  });
+});
+
+describe("Markdown code boundaries", () => {
+  const link = "[x](https://app.t3.codes/threads/env/thread)";
+  it("respects opening bracket escape parity", () => {
+    for (const count of [1, 2]) {
+      const source = "\\".repeat(count) + link;
+      expect(relabelThreadLinks(source, local, () => "Title")).toBe(
+        count === 2 ? "\\\\[Title](t3-thread://v2/env/thread)" : source,
+      );
+    }
+  });
+
+  it.each([
+    "`a\nLINK\nb`",
+    "`a`` LINK b`",
+    "``a` LINK b``",
+    "before ```a LINK b``` after",
+    "`unclosed\n\n~~~\nLINK\n~~~",
+    "> ~~~\n> LINK\n> ~~~",
+    "~~~~\n~~~\nLINK\n~~~~",
+  ])("preserves code source and collects no references: %s", (source) => {
+    const markdown = source.replace("LINK", link);
+    expect(threadLinkRefs(markdown, local)).toEqual([]);
+    expect(relabelThreadLinks(markdown, local, () => "Title")).toBe(markdown);
+  });
+
+  it.each([
+    "`a`` LINK",
+    "before ~~~inline LINK",
+    "`unclosed\n\nLINK",
+    "| A | B |\n| --- | --- |\n| ` | first |\n| LINK | second |\n| ` | third |",
+  ])("keeps links live outside actual code: %s", (source) => {
+    const markdown = source.replace("LINK", link);
+    expect(threadLinkRefs(markdown, local)).toEqual([ref("env", "thread")]);
+    expect(relabelThreadLinks(markdown, local, () => "Title")).toBe(
+      markdown.replace(link, "[Title](t3-thread://v2/env/thread)"),
+    );
+  });
+});
diff --git a/packages/shared/src/threadLinks.ts b/packages/shared/src/threadLinks.ts
index 690444f27adab..a3c69b1bb8fa7 100644
--- a/packages/shared/src/threadLinks.ts
+++ b/packages/shared/src/threadLinks.ts
@@ -1,6 +1,10 @@
 import { EnvironmentId, ThreadId, type ScopedThreadRef } from "@t3tools/contracts";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
+import type { Root } from "mdast";
+import remarkGfm from "remark-gfm";
+import remarkParse from "remark-parse";
+import { unified } from "unified";
 
 import { DEFAULT_HOSTED_APP_URL } from "./connectAuth.ts";
 
@@ -10,14 +14,66 @@ const V2_PREFIX = `${THREAD_LINK_PROTOCOL}://v2/`;
 const HOSTED_PREFIX = `${DEFAULT_HOSTED_APP_URL}/threads/`;
 const HOSTED_SEGMENT = "[A-Za-z0-9_%-]+";
 const HOSTED_LINK = `${HOSTED_PREFIX.replace(/[.*+?^${}()|[\]\\/]/g, "\\$&")}${HOSTED_SEGMENT}/${HOSTED_SEGMENT}`;
-// Code comes first in the alternation so a link written inside a code span or fence is skipped.
-// Inline links, titled or angle-bracketed, are taken whole so URLs inside them stay as written.
-// Only an unescaped `[` opens a link or ends its label or destination, which keeps the scan linear.
+// Every inline link is taken whole, so a hosted URL in another link's label or href stays as written.
+// Labels and non-thread destinations stop at the next `[`, while titles may contain literal brackets.
 const THREAD_LINK_OUTSIDE_CODE = new RegExp(
-  String.raw`(?<fence>(\`{3,}|~{3,})[\s\S]*?(?:\2|$))|(?<span>(\`+)[^\n]*?\4)|(?<!\\)\[(?<label>(?:[^[\]\\\n]|\\.)*)\]\((?:<(?<angleHref>[^\s<>[]*)>|(?<href>[^\s<>)[]*))(?:\s+(?:"[^"\n]*"|'[^'\n]*'|\([^()\n]*\)))?\s*\)|<(?<autolink>t3-thread:\/\/v[12]\/[^\s<>]+|${HOSTED_LINK})>|(?<![\w%/?#=&.:@+~-]|\]\()(?<bare>${HOSTED_LINK})(?![\w%/?#-])`,
+  String.raw`\[(?<label>(?:[^[\]\\\n]|\\.)*)\]\((?:<(?<angleHref>t3-thread:\/\/v[12]\/[^\s<>]*|[^\s<>[]*)>|(?<href>t3-thread:\/\/v[12]\/[^\s<>)]*|[^\s<>)[]*))(?<title>\s+(?:"(?:\\[^\n]|[^"\\\n])*"|'(?:\\[^\n]|[^'\\\n])*'|\((?:\\[^\n]|[^()\\\n])*\))[ \t]*)?\)|<(?<autolink>t3-thread:\/\/v[12]\/[^\s<>]+|${HOSTED_LINK})>|(?<![\w%/?#=&.:@+-])(?<bare>${HOSTED_LINK})(?![\w%/?#-])`,
   "g",
 );
 
+const codeParser = unified().use(remarkParse).use(remarkGfm).freeze();
+
+// Let GFM own block precedence and complete backtick runs. Only offsets are used:
+// links still follow the bounded policy above, and untouched source is never serialized.
+function codeRanges(markdown: string) {
+  const ranges: Array<{ start: number; end: number; inline: boolean }> = [];
+  const visit = (node: Root | Root["children"][number]) => {
+    if (node.type === "code" || node.type === "inlineCode") {
+      const start = node.position?.start.offset;
+      const end = node.position?.end.offset;
+      if (start !== undefined && end !== undefined) {
+        ranges.push({ start, end, inline: node.type === "inlineCode" });
+      }
+    } else if ("children" in node) node.children.forEach(visit);
+  };
+  visit(codeParser.parse(markdown));
+  return ranges;
+}
+
+function* threadLinkMatches(markdown: string) {
+  if (!hasThreadLinks(markdown)) return;
+  const pattern = new RegExp(THREAD_LINK_OUTSIDE_CODE);
+  let ranges: ReturnType<typeof codeRanges> | undefined;
+  let rangeIndex = 0;
+  const mayContainCode = /[`~\t]| {4}/.test(markdown);
+  for (let match = pattern.exec(markdown); match !== null; match = pattern.exec(markdown)) {
+    if (match.groups?.label !== undefined) {
+      let start = match.index;
+      while (start > 0 && markdown.charCodeAt(start - 1) === 92) start--;
+      if ((match.index - start) % 2 !== 0) continue;
+    }
+    // Most messages need no Markdown parse; defer it until a candidate and code syntax coexist.
+    if (!mayContainCode) {
+      yield match;
+      continue;
+    }
+    ranges ??= codeRanges(markdown);
+    while (ranges[rangeIndex] && ranges[rangeIndex]!.end <= match.index) rangeIndex++;
+    const end = match.index + match[0].length;
+    const labelEnd = match.index + 1 + (match.groups?.label?.length ?? 0);
+    let protectedEnd: number | undefined;
+    for (let index = rangeIndex; ranges[index] && ranges[index]!.start < end; index++) {
+      const range = ranges[index]!;
+      // Balanced code inside a link label belongs to that whole link.
+      if (range.inline && range.start > match.index && range.end <= labelEnd) continue;
+      protectedEnd = range.end;
+      break;
+    }
+    if (protectedEnd === undefined) yield match;
+    else pattern.lastIndex = Math.max(pattern.lastIndex, protectedEnd);
+  }
+}
+
 const decodeThreadId = Schema.decodeUnknownOption(ThreadId);
 const decodeEnvironmentId = Schema.decodeUnknownOption(EnvironmentId);
 
@@ -147,54 +203,37 @@ export function hasThreadLinks(markdown: string): boolean {
   return markdown.includes(`${THREAD_LINK_PROTOCOL}://v`) || markdown.includes(HOSTED_PREFIX);
 }
 
-// THREAD_LINK_OUTSIDE_CODE's code span, anchored where a backtick in a label opens one.
-const CODE_SPAN_AT = /(`+)[^\n]*?\1/y;
-
-/** Where a code span opening in a link's label ends, when it runs past the label. */
-function codeSpanEndPastLabel(markdown: string, labelStart: number, labelEnd: number) {
-  let index = markdown.indexOf("`", labelStart);
-  while (index !== -1 && index < labelEnd) {
-    CODE_SPAN_AT.lastIndex = index;
-    if (CODE_SPAN_AT.exec(markdown) === null) {
-      index = markdown.indexOf("`", index + 1);
-      continue;
+/** Source and accepted links only; preparation retains no Markdown AST or resolved titles. */
+export function prepareThreadLinks(markdown: string) {
+  const matches = [];
+  // Hermes' matchAll yields matches without `groups`; exec keeps them.
+  for (const match of threadLinkMatches(markdown)) {
+    const groups = match.groups!;
+    if (groups.title !== undefined) continue;
+    const href = groups.angleHref ?? groups.href ?? groups.autolink ?? groups.bare;
+    const link = href === undefined ? null : parseThreadLinkHref(href);
+    if (link !== null) {
+      matches.push({
+        start: match.index,
+        end: match.index + match[0].length,
+        link,
+        label: groups.label,
+      });
     }
-    if (CODE_SPAN_AT.lastIndex > labelEnd) return CODE_SPAN_AT.lastIndex;
-    index = markdown.indexOf("`", CODE_SPAN_AT.lastIndex);
   }
-  return null;
+  return { markdown, matches };
 }
 
-// Hermes' matchAll yields matches without `groups`; exec keeps them.
-function* threadLinkMatches(markdown: string) {
-  const pattern = new RegExp(THREAD_LINK_OUTSIDE_CODE);
-  for (let match = pattern.exec(markdown); match !== null; match = pattern.exec(markdown)) {
-    const label = match.groups?.label;
-    if (label?.includes("`")) {
-      const spanEnd = codeSpanEndPastLabel(
-        markdown,
-        match.index + 1,
-        match.index + 1 + label.length,
-      );
-      if (spanEnd !== null) {
-        pattern.lastIndex = spanEnd;
-        continue;
-      }
-    }
-    const href =
-      match.groups?.angleHref ?? match.groups?.href ?? match.groups?.autolink ?? match.groups?.bare;
-    yield { match, link: href === undefined ? null : parseThreadLinkHref(href) };
-  }
-}
+type PreparedThreadLinks = ReturnType<typeof prepareThreadLinks>;
 
 /** Every thread the markdown's links can name, so their titles are keyed reads. */
 export function threadLinkRefs(
-  markdown: string,
+  source: string | PreparedThreadLinks,
   messageEnvironmentId: EnvironmentId,
 ): ReadonlyArray<ScopedThreadRef> {
   const refs = new Map<string, ScopedThreadRef>();
-  for (const { link } of threadLinkMatches(markdown)) {
-    if (link === null) continue;
+  const prepared = typeof source === "string" ? prepareThreadLinks(source) : source;
+  for (const { link } of prepared.matches) {
     for (const ref of threadLinkCandidates(link, messageEnvironmentId)) {
       refs.set(`${ref.environmentId}/${ref.threadId}`, ref);
     }
@@ -213,19 +252,19 @@ export function unknownThreadLinkLabel(
 
 /** Rewrites each link outside code `replace` answers for. `label` is a Markdown link's own text. */
 export function replaceThreadLinks(
-  markdown: string,
+  source: string | PreparedThreadLinks,
   replace: (link: ThreadLink, label: string | undefined) => string | undefined,
 ): string {
-  if (!hasThreadLinks(markdown)) return markdown;
+  const { markdown, matches } = typeof source === "string" ? prepareThreadLinks(source) : source;
   let result = "";
-  let copied = 0;
-  for (const { match, link } of threadLinkMatches(markdown)) {
-    const replacement = link === null ? undefined : replace(link, match.groups?.label);
+  let cursor = 0;
+  for (const match of matches) {
+    const replacement = replace(match.link, match.label);
     if (replacement === undefined) continue;
-    result += markdown.slice(copied, match.index) + replacement;
-    copied = match.index + match[0].length;
+    result += markdown.slice(cursor, match.start) + replacement;
+    cursor = match.end;
   }
-  return result + markdown.slice(copied);
+  return result + markdown.slice(cursor);
 }
 
 /**
@@ -234,11 +273,11 @@ export function replaceThreadLinks(
  * link, which may open elsewhere.
  */
 export function relabelThreadLinks(
-  markdown: string,
+  source: string | PreparedThreadLinks,
   messageEnvironmentId: EnvironmentId,
   title: (ref: ScopedThreadRef) => string | undefined,
 ): string {
-  return replaceThreadLinks(markdown, (written, label) => {
+  return replaceThreadLinks(source, (written, label) => {
     const environmentId = written.environmentId ?? messageEnvironmentId;
     const decoded = percentDecodedThreadLinkId(written.threadId);
     const threadId =
diff --git a/packages/shared/src/usageLimits.test.ts b/packages/shared/src/usageLimits.test.ts
index 236a8baa13a26..e9d5f6e604f31 100644
--- a/packages/shared/src/usageLimits.test.ts
+++ b/packages/shared/src/usageLimits.test.ts
@@ -344,6 +344,45 @@ describe("pools", () => {
     expect(collectLimitAccounts(input)).toHaveLength(1);
   });
 
+  it("merges a local Antigravity login with its hub account by Google account fingerprint", () => {
+    const antigravity = ProviderDriverKind.make("antigravity");
+    const local = provider({
+      driver: antigravity,
+      instanceId: ProviderInstanceId.make("antigravity"),
+      auth: { status: "authenticated" },
+      usageLimits: {
+        checkedAt,
+        credentialFingerprint: "google-key",
+        windows: [{ ...window, id: "gemini-weekly", usedPercent: 20 }],
+      },
+    });
+    const hubAccount = {
+      id: "antigravity-g@example.com.json",
+      driver: antigravity,
+      usageLimits: {
+        checkedAt: "2026-09-03T11:30:00.000Z",
+        credentialFingerprint: "google-key",
+        windows: [{ ...window, id: "gemini-weekly", usedPercent: 30 }],
+      },
+    };
+    const accounts = collectLimitAccounts(
+      new Map([
+        [
+          EnvironmentId.make("env-a"),
+          {
+            ...laptop,
+            serverConfig: {
+              providers: [local],
+              usageLimitSources: [{ ...source, accounts: [hubAccount] }],
+            },
+          },
+        ],
+      ]),
+    );
+    expect(accounts).toHaveLength(1);
+    expect(accounts[0]?.limits.windows[0]?.usedPercent).toBe(30);
+  });
+
   it("takes windows from a fresher hub read but credits and redeem from the native instance", () => {
     const native = provider({
       driver: claude,
diff --git a/packages/shared/src/usageLimits.ts b/packages/shared/src/usageLimits.ts
index 1707deb735a49..24403fe8a6c5b 100644
--- a/packages/shared/src/usageLimits.ts
+++ b/packages/shared/src/usageLimits.ts
@@ -11,6 +11,7 @@ import {
   isProviderAvailable,
   PROVIDER_DISPLAY_NAMES,
   type ServerProvider,
+  type ServerProviderResetCredits,
   type ServerProviderUsageLimits,
   type ServerProviderUsageWindow,
   type UsageLimitSourceSnapshots,
@@ -675,6 +676,56 @@ export function formatDuration(ms: number): string {
   return `${minutes}m`;
 }
 
+/** One redeemable reset as clients offer it; `input` already names the chosen credit. */
+export interface ResetCreditChoice {
+  readonly key: string;
+  readonly summary: string;
+  readonly actionLabel: string;
+  readonly confirmDescription: string;
+  readonly availableCount: number;
+  readonly input: ProviderConsumeResetCreditInput;
+}
+
+export function resetCreditChoices(
+  credits: ServerProviderResetCredits,
+  input: ProviderConsumeResetCreditInput,
+  now: number,
+  compact = false,
+): ReadonlyArray<ResetCreditChoice> {
+  const expiresIn = (at: string | undefined) => (at ? formatDuration(Date.parse(at) - now) : null);
+  if (credits.options && "instanceId" in input) {
+    return credits.options.map((option) => {
+      const expires = expiresIn(option.expiresAt);
+      return {
+        key: option.creditId,
+        summary: `${option.label} · ${option.availableCount} left${expires ? ` · expires in ${expires}` : ""}`,
+        actionLabel: "Use",
+        confirmDescription: `${option.label}: ${option.description} This cannot be undone.`,
+        availableCount: option.availableCount,
+        input: { ...input, creditId: option.creditId },
+      };
+    });
+  }
+  const count = credits.availableCount;
+  const expires = expiresIn(credits.nextExpiresAt);
+  return [
+    {
+      key: "next",
+      summary:
+        count === 0
+          ? "No reset credits banked"
+          : compact
+            ? `${count} banked${expires ? ` · expires in ${expires}` : ""}`
+            : `${count} ${count === 1 ? "reset credit" : "reset credits"} banked${expires ? ` · next expires in ${expires}` : ""}`,
+      actionLabel: "Use reset",
+      confirmDescription:
+        "This redeems one credit on your account and clears the current rate-limit windows. It cannot be undone.",
+      availableCount: count,
+      input,
+    },
+  ];
+}
+
 export function formatResetsIn(window: ServerProviderUsageWindow, now: number): string | null {
   const resetsAt = resetMillis(window);
   if (resetsAt === null) return null;
diff --git a/packages/source-control-github/src/server/GitHubPullRequestApi.test.ts b/packages/source-control-github/src/server/GitHubPullRequestApi.test.ts
index 8daf82277a083..68edb50064257 100644
--- a/packages/source-control-github/src/server/GitHubPullRequestApi.test.ts
+++ b/packages/source-control-github/src/server/GitHubPullRequestApi.test.ts
@@ -351,6 +351,7 @@ function threadComments(
       lastEditedAt: null,
       url: `https://github.com/acme/web/pull/7#discussion_${id}`,
       isMinimized: false,
+      pullRequestReview: null,
       reactionGroups: [],
     })),
   };
diff --git a/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts b/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts
index acccedcb40f38..df72be04242b7 100644
--- a/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts
+++ b/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts
@@ -110,6 +110,7 @@ const remark = ({ author, reactionGroups: groups, ...raw }: Json) => ({
   lastEditedAt: null,
   isMinimized: false,
   url: "https://github.com/acme/web/pull/1#discussion",
+  pullRequestReview: null,
   ...raw,
   author: actor(author),
   reactionGroups: reactionGroups(groups),
@@ -893,7 +894,14 @@ describe("review thread decoding", () => {
             comments: {
               nodes: [
                 { id: "t1", body: "fix this", createdAt: "2026-07-01T00:00:00Z" },
-                { id: "t2", body: "fixed", createdAt: "2026-07-01T01:00:00Z" },
+                {
+                  id: "t2",
+                  body: "fixed",
+                  createdAt: "2026-07-01T01:00:00Z",
+                  pullRequestReview: {
+                    url: "https://github.com/acme/web/pull/1#pullrequestreview-9",
+                  },
+                },
               ],
             },
           },
@@ -902,6 +910,11 @@ describe("review thread decoding", () => {
     );
     const comments = reviewThreadConversation(result.threads.map((entry) => entry.thread));
     expect(comments.map((comment) => comment.id)).toEqual(["t1", "t2"]);
+    // A reply-only review has no text of its own; its link finds it through the reply it posted.
+    expect(result.threads[0]?.thread.comments.map((comment) => comment.reviewUrl)).toEqual([
+      undefined,
+      "https://github.com/acme/web/pull/1#pullrequestreview-9",
+    ]);
   });
 
   it("leaves out hidden thread comments, and a thread with none left", () => {
diff --git a/packages/source-control-github/src/server/gitHubPullRequestJson.ts b/packages/source-control-github/src/server/gitHubPullRequestJson.ts
index df4756fcc0dda..f3cb11012e73f 100644
--- a/packages/source-control-github/src/server/gitHubPullRequestJson.ts
+++ b/packages/source-control-github/src/server/gitHubPullRequestJson.ts
@@ -1314,6 +1314,7 @@ export function toReviewDismissalsPage(result: ReviewDismissals.Result): {
 }
 
 function toThreadComment(comment: ThreadComment, viewer: string | null): PullRequestThreadComment {
+  const reviewUrl = trimmed(comment.pullRequestReview?.url);
   return {
     id: comment.id,
     author: toActor(comment.author),
@@ -1321,6 +1322,7 @@ function toThreadComment(comment: ThreadComment, viewer: string | null): PullReq
     createdAt: comment.createdAt,
     editedAt: comment.lastEditedAt,
     url: trimmed(comment.url),
+    ...(reviewUrl === null ? {} : { reviewUrl }),
     reactions: toReactions(comment.reactionGroups, viewer),
   };
 }
diff --git a/packages/source-control-github/src/server/pullRequestReviews.graphql b/packages/source-control-github/src/server/pullRequestReviews.graphql
index e01bcccc06a5c..d497615c24693 100644
--- a/packages/source-control-github/src/server/pullRequestReviews.graphql
+++ b/packages/source-control-github/src/server/pullRequestReviews.graphql
@@ -38,6 +38,10 @@ fragment ThreadComment on PullRequestReviewComment {
   lastEditedAt
   url
   isMinimized
+  # A review link names the review, not its comments; this lets it find the comments it posted.
+  pullRequestReview {
+    url
+  }
   ...Reactions
 }
 
diff --git a/packages/source-control-github/src/server/pullRequestReviews.graphql.ts b/packages/source-control-github/src/server/pullRequestReviews.graphql.ts
index 8eb5e0082aa12..bce1451b8c296 100644
--- a/packages/source-control-github/src/server/pullRequestReviews.graphql.ts
+++ b/packages/source-control-github/src/server/pullRequestReviews.graphql.ts
@@ -89,6 +89,13 @@ export const Actor = Schema.Struct({
 })
 export interface Actor extends Schema.Struct.Type<typeof Actor.fields> {}
 
+/** A review object for a given pull request. */
+export const PullRequestReviewPullRequestReview = Schema.Struct({
+  /** The HTTP URL permalink for this PullRequestReview. */
+  url: Shared.URI
+})
+export interface PullRequestReviewPullRequestReview extends Schema.Struct.Type<typeof PullRequestReviewPullRequestReview.fields> {}
+
 /**
  * `fragment ThreadComment on PullRequestReviewComment`
  *
@@ -109,6 +116,8 @@ export const ThreadComment = Schema.Struct({
   url: Shared.URI,
   /** Returns whether or not a comment has been minimized. */
   isMinimized: Schema.Boolean,
+  /** The pull request review associated with this review comment. */
+  pullRequestReview: Schema.NullOr(PullRequestReviewPullRequestReview),
   /** A list of reactions grouped by content left on the subject. */
   reactionGroups: Schema.NullOr(Schema.Array(ReactionGroup))
 })
@@ -425,7 +434,7 @@ export const ReviewThreads = GraphQL.query("ReviewThreads", {
     fragments: [
       { name: "ReviewThreadPage", body: ["on PullRequestReviewThreadConnection{totalCount pageInfo{hasNextPage endCursor}nodes{id isResolved isOutdated path line diffSide comments(first:10){totalCount pageInfo{hasNextPage endCursor}nodes{...ThreadComment}}}}"] },
       { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Organization{login}...on Mannequin{login}}}}}"] },
-      { name: "ThreadComment", body: ["on PullRequestReviewComment{id author{__typename login avatarUrl}body createdAt lastEditedAt url isMinimized...Reactions}"] }
+      { name: "ThreadComment", body: ["on PullRequestReviewComment{id author{__typename login avatarUrl}body createdAt lastEditedAt url isMinimized pullRequestReview{url}...Reactions}"] }
     ]
   },
   variables: {
@@ -475,7 +484,7 @@ export const ReviewThreadPages = GraphQL.query("ReviewThreadPages", {
     ],
     fragments: [
       { name: "ReviewThreadPage", body: ["on PullRequestReviewThreadConnection{totalCount pageInfo{hasNextPage endCursor}nodes{id isResolved isOutdated path line diffSide comments(first:10){totalCount pageInfo{hasNextPage endCursor}nodes{...ThreadComment}}}}"] },
-      { name: "ThreadComment", body: ["on PullRequestReviewComment{id author{__typename login avatarUrl}body createdAt lastEditedAt url isMinimized...Reactions}"] },
+      { name: "ThreadComment", body: ["on PullRequestReviewComment{id author{__typename login avatarUrl}body createdAt lastEditedAt url isMinimized pullRequestReview{url}...Reactions}"] },
       { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Organization{login}...on Mannequin{login}}}}}"] }
     ]
   },
@@ -552,7 +561,7 @@ export const ReviewThreadComments = GraphQL.query("ReviewThreadComments", {
       { name: "node", body: ["(id:$", "threadId", "){__typename...on PullRequestReviewThread{pullRequest{id}comments(first:100 after:$", "after", "){pageInfo{hasNextPage endCursor}nodes{...ThreadComment}}}}"] }
     ],
     fragments: [
-      { name: "ThreadComment", body: ["on PullRequestReviewComment{id author{__typename login avatarUrl}body createdAt lastEditedAt url isMinimized...Reactions}"] },
+      { name: "ThreadComment", body: ["on PullRequestReviewComment{id author{__typename login avatarUrl}body createdAt lastEditedAt url isMinimized pullRequestReview{url}...Reactions}"] },
       { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Organization{login}...on Mannequin{login}}}}}"] }
     ]
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ff6392397431e..e7265664f0a44 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -409,7 +409,7 @@ importers:
         version: 6.34.0
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   apps/desktop:
     dependencies:
@@ -465,8 +465,8 @@ importers:
         specifier: 1.3.2
         version: 1.3.2
       playwright-core:
-        specifier: 1.60.0
-        version: 1.60.0
+        specifier: 1.64.1
+        version: 1.64.1
       react-grab:
         specifier: ^0.1.32
         version: 0.1.44(react@19.3.0)
@@ -476,7 +476,7 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -494,7 +494,7 @@ importers:
         version: 4.3.3
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   apps/marketing:
     dependencies:
@@ -787,7 +787,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@pierre/trees':
         specifier: 1.0.0-beta.6
         version: 1.0.0-beta.6(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)
@@ -912,8 +912,8 @@ importers:
         specifier: 1.2.0-beta.15
         version: 1.2.0-beta.15(patch_hash=f1e680afec85f650699ea756f91f469844ec4c976f4f168492a45c6b3f67d651)
       playwright-core:
-        specifier: 1.60.0
-        version: 1.60.0
+        specifier: 1.64.1
+        version: 1.64.1
       proper-lockfile:
         specifier: 4.1.2
         version: 4.1.2
@@ -947,7 +947,7 @@ importers:
         version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@handy-computer/models':
         specifier: 0.2.3
         version: 0.2.3
@@ -1004,7 +1004,7 @@ importers:
         version: 16.14.1
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   apps/web:
     dependencies:
@@ -1248,7 +1248,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@tailwindcss/vite':
         specifier: 4.3.3
         version: 4.3.3(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))
@@ -1290,7 +1290,7 @@ importers:
         version: 6.1.2(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(babel-plugin-react-compiler@1.0.0)(oxc-transform-react@0.152.0)
       '@vitest/browser-playwright':
         specifier: 5.0.5
-        version: 5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(vitest@5.0.5)(yaml@2.9.0)
+        version: 5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(vitest@5.0.5)(yaml@2.9.0)
       compression:
         specifier: ^1.8.2
         version: 1.8.2(supports-color@8.1.1)
@@ -1301,8 +1301,8 @@ importers:
         specifier: ~0.152.0
         version: 0.152.0
       playwright:
-        specifier: 1.60.0
-        version: 1.60.0
+        specifier: 1.64.1
+        version: 1.64.1
       tailwindcss:
         specifier: 4.3.3
         version: 4.3.3
@@ -1311,7 +1311,7 @@ importers:
         version: '@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   evals:
     dependencies:
@@ -1333,13 +1333,13 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   infra/relay:
     dependencies:
@@ -1394,7 +1394,7 @@ importers:
     devDependencies:
       '@alchemy.run/test':
         specifier: 'catalog:'
-        version: 2.0.0-beta.85(patch_hash=29c0539ea71d9cc372f0b16558640599beb9bc609605feb2a493da268d72713e)(be874ca08ab53e444d5d72e167a81f3f)
+        version: 2.0.0-beta.85(patch_hash=29c0539ea71d9cc372f0b16558640599beb9bc609605feb2a493da268d72713e)(93775fed45909d71c0b8bba962f026cf)
       '@cloudflare/workers-types':
         specifier: ^4.20260601.1
         version: 4.20260604.1
@@ -1403,7 +1403,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@electric-sql/pglite':
         specifier: 0.3.15
         version: 0.3.15
@@ -1418,7 +1418,7 @@ importers:
         version: '@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   infra/task-cache:
     dependencies:
@@ -1446,13 +1446,13 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   oxlint-plugin-t3code:
     dependencies:
@@ -1468,10 +1468,10 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/client-runtime:
     dependencies:
@@ -1535,13 +1535,13 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/three':
         specifier: 0.180.0
         version: 0.180.0
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/contracts:
     dependencies:
@@ -1551,10 +1551,10 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/effect-acp:
     dependencies:
@@ -1570,13 +1570,13 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/effect-codex-app-server:
     dependencies:
@@ -1592,13 +1592,13 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/provider-acp:
     dependencies:
@@ -1623,7 +1623,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -1632,7 +1632,7 @@ importers:
         version: link:../effect-acp
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/provider-acp-registry:
     dependencies:
@@ -1660,7 +1660,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1672,7 +1672,7 @@ importers:
         version: link:../effect-acp
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/provider-core:
     dependencies:
@@ -1691,13 +1691,13 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/provider-cursor:
     dependencies:
@@ -1725,7 +1725,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1734,7 +1734,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/provider-fx:
     dependencies:
@@ -1759,7 +1759,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -1768,7 +1768,7 @@ importers:
         version: link:../effect-acp
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/provider-grok:
     dependencies:
@@ -1793,7 +1793,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1805,7 +1805,7 @@ importers:
         version: link:../effect-acp
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/provider-kiro:
     dependencies:
@@ -1827,7 +1827,7 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -1836,7 +1836,7 @@ importers:
         version: link:../effect-acp
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/provider-muse:
     dependencies:
@@ -1861,7 +1861,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1870,7 +1870,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/provider-opencode:
     dependencies:
@@ -1904,7 +1904,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1913,7 +1913,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/provider-pi:
     dependencies:
@@ -1935,7 +1935,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1944,7 +1944,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/provider-testing:
     dependencies:
@@ -1982,13 +1982,13 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/secret-provider-definitions:
     dependencies:
@@ -2022,13 +2022,13 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/shared:
     dependencies:
@@ -2095,7 +2095,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/mdast':
         specifier: ^4.0.4
         version: 4.0.4
@@ -2107,7 +2107,7 @@ importers:
         version: 2.0.2
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/source-control-azure-devops:
     dependencies:
@@ -2132,7 +2132,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2141,7 +2141,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/source-control-bitbucket:
     dependencies:
@@ -2166,7 +2166,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2175,7 +2175,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/source-control-core:
     dependencies:
@@ -2191,13 +2191,13 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/source-control-cursor-origin:
     dependencies:
@@ -2222,13 +2222,13 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/source-control-definitions:
     dependencies:
@@ -2280,7 +2280,7 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2289,7 +2289,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/source-control-gitcafe:
     dependencies:
@@ -2311,7 +2311,7 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2320,7 +2320,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/source-control-github:
     dependencies:
@@ -2348,7 +2348,7 @@ importers:
         version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2357,7 +2357,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/source-control-gitlab:
     dependencies:
@@ -2376,7 +2376,7 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2385,7 +2385,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/source-control-testing:
     dependencies:
@@ -2426,13 +2426,13 @@ importers:
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/tailscale:
     dependencies:
@@ -2445,16 +2445,22 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   scripts:
     dependencies:
+      '@e2e-dev/mobile':
+        specifier: 0.12.6
+        version: 0.12.6(e2e@0.23.0)
+      '@e2e-dev/web':
+        specifier: 0.15.5
+        version: 0.15.5(e2e@0.23.0)
       '@effect/platform-node':
         specifier: 4.1.2
         version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
@@ -2474,14 +2480,17 @@ importers:
         specifier: workspace:*
         version: link:../packages/tailscale
       agent-device:
-        specifier: 0.21.32
-        version: 0.21.32
+        specifier: 0.21.36
+        version: 0.21.36
+      e2e:
+        specifier: 0.23.0
+        version: 0.23.0
       effect:
         specifier: 4.1.2
         version: 4.1.2
       playwright-core:
-        specifier: 1.60.0
-        version: 1.60.0
+        specifier: 1.64.1
+        version: 1.64.1
       plist:
         specifier: 'catalog:'
         version: 3.1.1
@@ -2494,7 +2503,7 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/plist':
         specifier: 'catalog:'
         version: 3.0.5
@@ -2512,7 +2521,7 @@ importers:
         version: typescript@6.0.3
       vite-plus:
         specifier: 1.4.0
-        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
 packages:
 
@@ -2535,6 +2544,10 @@ packages:
     resolution: {integrity: sha512-IpefF5ssZVOZCD4Wu7zxt6PwZoGT2HLVjxpJ10Bjx6EAmRfLYJPjyrfxb0RYDlwvXnDb9nkQ7Do/oJVDuRFzew==}
     engines: {node: '>=18'}
 
+  '@ai-sdk/provider@4.0.36':
+    resolution: {integrity: sha512-GqvWZSZdBelCGughlBdOoupT258rgM3YMbaLAS9WSZJ0vlt8c9vm3My+ZT31mYhiReMCMCF2qF2axnGbILpk1A==}
+    engines: {node: '>=22'}
+
   '@alchemy.run/acme@2.0.0-beta.85':
     resolution: {integrity: sha512-hOV18VHG6ivrbPnk35hoqlCQPc6bR8b9soGmHlSkbnPIgVZUg7jpliF9AztSSJbJK4GHcBFc9hWetwCRHzGYAg==}
     peerDependencies:
@@ -3712,6 +3725,23 @@ packages:
     peerDependencies:
       react: '>=16.8.0'
 
+  '@e2e-dev/mobile@0.12.6':
+    resolution: {integrity: sha512-V56hOt5cJsoC9M8kMIjsCKOY2pEPHb4awYMLP699yMO4aNUUnpALYK/R2ik6C64CLEq4N1aibLmD7ErPZVc97w==}
+    engines: {node: ^22.22.3 || >=24.8.0}
+    peerDependencies:
+      ai: ^7.0.0
+      e2e: '>=0.22.1 <1'
+    peerDependenciesMeta:
+      ai:
+        optional: true
+
+  '@e2e-dev/web@0.15.5':
+    resolution: {integrity: sha512-fUXrSgfii6w/q7OyX9/kEIDLpIMHpEkTH81hrR8WLnqk8li3bRyXJQBGWqtq9NoWpS2UANnhMI45n6Fv1ErCnw==}
+    engines: {node: ^22.22.3 || >=24.8.0}
+    hasBin: true
+    peerDependencies:
+      e2e: '>=0.22.1 <1'
+
   '@effect/atom-react@4.1.2':
     resolution: {integrity: sha512-XRAm4lks2kzNFQIz9QTGKR02CaDTR9VJNRXDjDAR8OzM15ybrK4YkB7OlFZ9U+hxXe3DXJZx7RU1/xI2Em2PGQ==}
     peerDependencies:
@@ -4817,6 +4847,10 @@ packages:
   '@material/material-color-utilities@0.3.0':
     resolution: {integrity: sha512-ztmtTd6xwnuh2/xu+Vb01btgV8SQWYCaK56CkRK8gEkWe5TuDyBcYJ0wgkMRn+2VcE9KUmhvkz+N9GHrqw/C0g==}
 
+  '@modelcontextprotocol/core@2.4.0':
+    resolution: {integrity: sha512-z8QBKqdfXLPzkLQuG4xp8hrVEMm1PZ1IgxMN2sMbJiFiAKOWXnAzogXn2W4aqIBlP1ea6U5yiqVquvUNM1Cj6Q==}
+    engines: {node: '>=20'}
+
   '@modelcontextprotocol/sdk@1.32.2':
     resolution: {integrity: sha512-SWsVtH/0vULSQStoZ6xxH2K09Li8fXYTMC64ZeogCdpZ3XSi1eCPOByV1OpuJxuI3OcmHhosDWYyii07tpPsLw==}
     engines: {node: '>=18'}
@@ -4827,6 +4861,10 @@ packages:
       '@cfworker/json-schema':
         optional: true
 
+  '@modelcontextprotocol/server@2.4.0':
+    resolution: {integrity: sha512-rgR9yxSaAJ+bcsi/XroT/S2AfPiIWloXAnrdfYSCms9ivVju0ishu/wW0J21Ho6+ZOR1r7RyeRbjiRuF87ix5Q==}
+    engines: {node: '>=20'}
+
   '@muse-code/sdk@1.4.6':
     resolution: {integrity: sha512-pUENCnmn9q4e2xMXicdRbzbSMdH1fiyTIh5fVBXuxNdNP2ZKA0kwQz5fWMxIB8wzxS2ZyH0v27dvfbZuGuoUjg==}
     engines: {node: '>=20'}
@@ -5131,6 +5169,12 @@ packages:
     cpu: [arm]
     os: [android]
 
+  '@oxc-parser/binding-android-arm-eabi@0.157.0':
+    resolution: {integrity: sha512-zFtSEal1K/17LATxVs0VcT/Itt+fxUQ9Ni8HtG+pPcEqy/TenRO74XffkY2dBiy3Pd+w0FuebwCZ6PJx1z7scQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [android]
+
   '@oxc-parser/binding-android-arm64@0.147.0':
     resolution: {integrity: sha512-emjQHOYJaomo4ykaXQ1EItunr/I94Nk01oqBmU4dSkKSTupIDx6OysVDf2e8Eytm77rb+4ZxzgElyWP7rcEX7A==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5143,6 +5187,12 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@oxc-parser/binding-android-arm64@0.157.0':
+    resolution: {integrity: sha512-WSlkFUnjamuv+2+TXW5F1rp2I24KVEXj4S+H7J7Y8T/KLR2xXbHj8lgxbZZtjSKi3Z/aGGrlFEOy7EmCWpIUlg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
   '@oxc-parser/binding-darwin-arm64@0.147.0':
     resolution: {integrity: sha512-kXvBPJL7RmDPJ2mze/vXPPVQimCDtFr9OFLjf7dyhV5Dx64cgcXh9KKrA1sMWvCObvJll9CZZUO0FBlFwD0l6A==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5155,6 +5205,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@oxc-parser/binding-darwin-arm64@0.157.0':
+    resolution: {integrity: sha512-Usk8UoURmtG2qBLwrO+il+kf6CahEJJriRQACuAwF2CqcWqGsvl9xj9JIMDxP9VTinOt/BZUuDZxcpn68QKsAA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
   '@oxc-parser/binding-darwin-x64@0.147.0':
     resolution: {integrity: sha512-mgFF8pLU6R64LbT27lSrtVRspVC/3IcZ0qyIikzmi78Y3Ik2OPnlAHHI0UEBRcC3qmNgtjaef7zkFt7/uPxIcw==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5167,6 +5223,12 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@oxc-parser/binding-darwin-x64@0.157.0':
+    resolution: {integrity: sha512-yOvjPixSD2sYJxtQXOzprXdV1xbr2RZyEnbkwFnnxz332Q4+gwkQgCGXZkFlQpc95Fk4XFITACfbFzze4XXktA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
   '@oxc-parser/binding-freebsd-x64@0.147.0':
     resolution: {integrity: sha512-v38aiF11qufOTBcCAKL4skgQf0zJ4NEvRlivq7B5kHrlyvjCLjvNrMtNWDTz1SDUL6/xVsJRmLDxv2e+Cp4oWw==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5179,6 +5241,12 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
+  '@oxc-parser/binding-freebsd-x64@0.157.0':
+    resolution: {integrity: sha512-BLTsP8TWvmV53jgGBynwv2DR3hKtjpdpL6fXnQs2Fg5P6HsFTShFjrgQrHMSM1cA4lGmlcj7tdTx96RoJfYuuA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
   '@oxc-parser/binding-linux-arm-gnueabihf@0.147.0':
     resolution: {integrity: sha512-AeIiBbwUaP0H1+4/qGW9l5qHecS/+XA5iMuieVcGb1T+tyc2dVGspFW13BWk/XrLsiGP/CiDJTJqAPLLCzZHkw==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5191,6 +5259,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.157.0':
+    resolution: {integrity: sha512-wGMDInIrhayQpNxwpXIWqa2QiKk+/6RxOi4GxPVoqmwrCdn2xj3xXyDUm3RujxQaraZjeWfh0+h9nedoivnL1w==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
   '@oxc-parser/binding-linux-arm-musleabihf@0.147.0':
     resolution: {integrity: sha512-/41MKPW4RgPY4DJco0NCF0RYX3IMZaVlRNMNzvhaxRavc7tN3Txm+qllZbh0aMRs0VHdgUlbI8TcAOiTai4TKg==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5203,6 +5277,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@oxc-parser/binding-linux-arm-musleabihf@0.157.0':
+    resolution: {integrity: sha512-N6OLfOnku4otlU6eF+HLU+1fH2XAaItc+c7dE+S09SzRZHvkaltU9aGTlMhmAIee95hOqkOCVFHNzQYJ1KS+gQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
   '@oxc-parser/binding-linux-arm64-gnu@0.147.0':
     resolution: {integrity: sha512-bmpw/RPhVXgZbtb3xBDuwW5s8+LvZYdqcDSX/sP2ltL77aTio3DP/B5ZTwwgoJ6Mr9vJs4RrmgEKW9XkLNUU1g==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5217,6 +5297,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@oxc-parser/binding-linux-arm64-gnu@0.157.0':
+    resolution: {integrity: sha512-YfY+qZ8d9tHJEvIq+zXyCcSve/jWgTNDiDtr1W4WVMh5+4fsOjYtH2JDIXIXUkILZzPKgJYbQ08Y/mwhr1gQLQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
   '@oxc-parser/binding-linux-arm64-musl@0.147.0':
     resolution: {integrity: sha512-gd7VX/FDVOw6mjQcu45iIcp4QkgybgJwh3a0OFG2NxmPCj628mQWD96QGu1kK8+mZF9qK4b/gIEyC63vQoB7+Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5231,6 +5318,13 @@ packages:
     os: [linux]
     libc: [musl]
 
+  '@oxc-parser/binding-linux-arm64-musl@0.157.0':
+    resolution: {integrity: sha512-ytZeO8BKkezwkLoWH3hK0R9Jd+S1BQhcQaWiSAWhXE7Dncq1XiJKb4w5hCe4lwl2ytgoSBgB0XEABhwD2/IhJg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
   '@oxc-parser/binding-linux-ppc64-gnu@0.147.0':
     resolution: {integrity: sha512-HnAzcfki7dSUNHf510Q2NmbJlz8Ys7rn8l9l588Pkx0tYe1BHLZnmELIgqizJ4WPhHGSwN8Ce+B/menVxS3odA==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5245,6 +5339,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@oxc-parser/binding-linux-ppc64-gnu@0.157.0':
+    resolution: {integrity: sha512-54w3SexApRhsw3DOAXBZ85rEMR2y29NDOUr18t69fcsnemS/N1YU+zQddHCol/HDhBPyLHg5fpxChRCSzxHwqw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
   '@oxc-parser/binding-linux-riscv64-gnu@0.147.0':
     resolution: {integrity: sha512-qlkOL6wT44U+fT5s/+sR6Shx0OdwvQF83JyIPZUxG/ovqZF5/7atOtjH+JPZ5/7ATQLbFBBSmghcy/+2NVB/ew==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5259,6 +5360,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@oxc-parser/binding-linux-riscv64-gnu@0.157.0':
+    resolution: {integrity: sha512-byg0y1OHdjjhll0qWJQyowKdCxM/zCKysIIOqkWgCid/cR+RU5nTz/63OeAZvIb1z/VB1CyypDRdLn2Ov3r+HQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
   '@oxc-parser/binding-linux-riscv64-musl@0.147.0':
     resolution: {integrity: sha512-DlefD7L7sMXs/3hIBH23Egk0phj8kG0SA81dVGOQ3S1ekjOlmTLH2E+F2Thwfh1slKx6aH+lNc5fQYAw0GU7/g==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5273,6 +5381,13 @@ packages:
     os: [linux]
     libc: [musl]
 
+  '@oxc-parser/binding-linux-riscv64-musl@0.157.0':
+    resolution: {integrity: sha512-CiQrt8esQTeL17kscbsfpdx5cywItx3y95YejsihET68oYnxHjbEgj8JaqlIWmhpL2h98piqPBLhWmZbp67nQQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [musl]
+
   '@oxc-parser/binding-linux-s390x-gnu@0.147.0':
     resolution: {integrity: sha512-Xqpagk/031IvZ4svrk2FF01YEqM/iN3MJV3SVZadKg/CsGlDCGoREqKHXYnoV5+8SfGe/m6RM1szXFLusTu/Uw==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5287,6 +5402,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@oxc-parser/binding-linux-s390x-gnu@0.157.0':
+    resolution: {integrity: sha512-wSzuUshJVxcrx0c9UJYUOuUf0XHThC1+f8CEfeFbosg7FzTkjCdt89JKKU7BH8C9eTPrnJ5ir4QM0pWpVSmHnA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
   '@oxc-parser/binding-linux-x64-gnu@0.147.0':
     resolution: {integrity: sha512-QioQOeUbI4ATUr0S2z88uA3Cds2R3Mm5Ge7U8XNYtlTb2GJF3rWlcj70z0AJhhOlbdm0YgVjqPBldUNbFylDIg==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5301,6 +5423,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@oxc-parser/binding-linux-x64-gnu@0.157.0':
+    resolution: {integrity: sha512-C4BY4QSVzN6R03Ner3r6EtIvLNR4VW4RAb63m+L0tiF/zD7grkBHMn1svyrOBFR4i32+GWJHu05xC4gGQYBhtA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
   '@oxc-parser/binding-linux-x64-musl@0.147.0':
     resolution: {integrity: sha512-NXy1tv/OdC+pPTwf9RiCZWPK53V/Xq/2cjSnjOSyKopajdaDqMIkgtDY+jXZemp2e8px5FeWfY2L2LwhKZQovg==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5315,6 +5444,13 @@ packages:
     os: [linux]
     libc: [musl]
 
+  '@oxc-parser/binding-linux-x64-musl@0.157.0':
+    resolution: {integrity: sha512-kN3LdZ2xp9z+TLuzYUWPR/mz/HrKd20vMCGWyby1d8T8K5t5NPemcqfSv3y0oMwXK8OF3lW7MNJnc3uWphvwvw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
   '@oxc-parser/binding-openharmony-arm64@0.147.0':
     resolution: {integrity: sha512-GpGWZ6oKz4bjCWW9Mz5pCaGPyk2Aaze6zEoaslIQqpSLtpx5pXj/ap5gUNb5Jn2LIbqWyjkGLX9yv3NMuNcBVQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5327,6 +5463,12 @@ packages:
     cpu: [arm64]
     os: [openharmony]
 
+  '@oxc-parser/binding-openharmony-arm64@0.157.0':
+    resolution: {integrity: sha512-cQKUrgBAFUaGcqp9Umb3GToFkvow92YeJxJuzbk8YPnButv9aY5HLyKUpxxh4WqJvP6POiNR5fUDDB5wI8Wiaw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
   '@oxc-parser/binding-win32-arm64-msvc@0.147.0':
     resolution: {integrity: sha512-a8mlt7CC8z7LUdCfaxhff4kCd+vSjE+NEFL0cxA8ukfuSnvAto/pWTjytW4BuVLnQGcCVdHJwcRKOfs++H+tjw==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5339,6 +5481,12 @@ packages:
     cpu: [arm64]
     os: [win32]
 
+  '@oxc-parser/binding-win32-arm64-msvc@0.157.0':
+    resolution: {integrity: sha512-qZsymd8L67o5bpzZ7gVO7qJUIF9Uf0/mXcoG0MDchBvdL7Q2tAF4aZBZFqc/YRd0WP3jTvqjs3CxlFhHgi48dA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
   '@oxc-parser/binding-win32-ia32-msvc@0.147.0':
     resolution: {integrity: sha512-M5ViVDBcFLnl2632AuuWuP35zEL5oikK1jTx8r3+902VEDeSNHxFZAB6RZyfZ7MU6Oi5QTOG8MmMkIeHsudSaw==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5351,6 +5499,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@oxc-parser/binding-win32-ia32-msvc@0.157.0':
+    resolution: {integrity: sha512-Ro9PcgwvRglGKI9fEYkbTKvIgh/hzWjv+yPyCTNuxp173i79YbTkkYeOvAEC9SFQPZXYr4+SuIrpCIaWN6sbUA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ia32]
+    os: [win32]
+
   '@oxc-parser/binding-win32-x64-msvc@0.147.0':
     resolution: {integrity: sha512-DUaE13OwnUSlHpLZNcC/nuT10ivlWqc5EZgsfgXuAmWYw0r3nDxGeLD1zlGwYwIgVk1/ZMAxoXpV+05stvbHaA==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -5363,10 +5517,20 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@oxc-parser/binding-win32-x64-msvc@0.157.0':
+    resolution: {integrity: sha512-Ea0fqR+HLzzCt9tYhKbb6aJlM6wBXKWfuDwLhcG519B8HGtxthDzLGfbqMQdlX2Ii5gAZt/Hgxig/iApdxZSzQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
   '@oxc-project/runtime@0.155.0':
     resolution: {integrity: sha512-VbW9raczGS5ZZ1FMunUBYHe4uV/R684qlQCoMdE3n5JT1PcqQsvmFpMYkF8AD+W04fBLGAq6Tr7YsTk0jjvDBA==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
+  '@oxc-project/runtime@0.157.0':
+    resolution: {integrity: sha512-srnUknwVoji5JdmU664pA4XyjBJXmgxP8rWlnZhFovzw6XQxaICGWAuScZdlLmIHI+ZRc7WgeiC2CURF4tAszQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+
   '@oxc-project/types@0.127.0':
     resolution: {integrity: sha512-aIYXQBo4lCbO4z0R3FHeucQHpF46l2LbMdxRvqvuRuW2OxdnSkcng5B8+K12spgLDj93rtN3+J2Vac/TIO+ciQ==}
 
@@ -5385,6 +5549,9 @@ packages:
   '@oxc-project/types@0.155.0':
     resolution: {integrity: sha512-SeE8JPwW1xs1tHeNycjUtUBdhorRa8o4jlvjwk49R7/Z291i+4DQa7JJIgOm/TaYQZx+QrPQbVJ/9c8dMIZN8Q==}
 
+  '@oxc-project/types@0.157.0':
+    resolution: {integrity: sha512-95iTox1qdt6WGWce3xwNOVayByOfLaYAq+qGPpub6NWbBh9sv0GG3+zyfh9ZBCO/jVu5A0EWI+qQI7g6fevjxg==}
+
   '@oxc-resolver/binding-android-arm-eabi@11.24.2':
     resolution: {integrity: sha512-y09e0L0SRI2OA2tUIrjBgoV3eH5hvUKXNkJqXmNo5V2WxIjyC7I7aJfRLMEVpA8yi95f90gFDvO0VMgrDw+vwA==}
     cpu: [arm]
@@ -5610,6 +5777,128 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@oxc-transform/binding-android-arm-eabi@0.157.0':
+    resolution: {integrity: sha512-uRHbSeooFBkwRx9DkedM9YPMAvnwPd9ds6iu+ki9yerAGgTe7dhQAgvrbxrbnhQF3L43QR2LMEkV1zobNpI2cQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [android]
+
+  '@oxc-transform/binding-android-arm64@0.157.0':
+    resolution: {integrity: sha512-sZAV2CvG3hqJPG6O3OYF5hXfbWkb+kJQvYdfa0lC788dpQQI+zBR7RpFDpAY+3u4WpV2+v1H8SfSOdsw7aJ1ug==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
+  '@oxc-transform/binding-darwin-arm64@0.157.0':
+    resolution: {integrity: sha512-/vxwVl483evp5RmWHoz999TL3RW3ghgOlgyd8VNGkBeFgxm2lJRKa0MKzbP7l0v6uIF6789yNe8b7B8BgaTWwA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@oxc-transform/binding-darwin-x64@0.157.0':
+    resolution: {integrity: sha512-Uoqdq4CaoMh2hyeOl5L2f8cnXOW36KZR2/MzY4E4zAkO2xKYaWHa/XWNPkFeTfnaOi9lmMIvZAYZ8R7ELxRhPg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@oxc-transform/binding-freebsd-x64@0.157.0':
+    resolution: {integrity: sha512-QFjfMWa/oPK40lyWBCQR8/PlnpgVdPN6yOZqU5HJIzWyo0FwPd7tLpig7rtQgiBEhj+XoyxexXHUVFlwA9Oa/A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@oxc-transform/binding-linux-arm-gnueabihf@0.157.0':
+    resolution: {integrity: sha512-aQHBtkX/75l8/hvBTggNLpfzPzHZ1vN/qxK9h+r0Gas5XaI4yeW9Qd/VPxGskBgtjmN3BfHXQvAFaj+R9vyBGA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxc-transform/binding-linux-arm-musleabihf@0.157.0':
+    resolution: {integrity: sha512-dJVOATtEl0LxQuYXTsSAWRay19J5uq7bs1PBHBktEwoCdbXUa8Tm2lPZaX2QuEqC98xk7yAWMOlesv40x6m1rA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxc-transform/binding-linux-arm64-gnu@0.157.0':
+    resolution: {integrity: sha512-Jdt0PpTwGWEqFkDqkRrR6yJNMevQebaQFnFZIxxnNXPVDze6mNxpEaPvJEmH0Dxzk1vQQm/I/SM08PAAb2qjpg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@oxc-transform/binding-linux-arm64-musl@0.157.0':
+    resolution: {integrity: sha512-qCLNQRA3KLaiCG9uXQmFbhjoetlCyfFwFdSXqbVVPCUPi1VFhuBGFltb2ZOMrxE2zMyh9RD27xzVULm+SRB1/A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@oxc-transform/binding-linux-ppc64-gnu@0.157.0':
+    resolution: {integrity: sha512-B5bEXT0mG88o2tIoKK/x2KOoXhbab5SjjBm5WfWlcpKLfr8ioYeZPPNT2gZN6FMq+pYuJA3f+i9dFIVlaqFz6w==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@oxc-transform/binding-linux-riscv64-gnu@0.157.0':
+    resolution: {integrity: sha512-dDYzPGj3/SrcCwWK78FDXg5UXjJRxhVXADxIHvxiCFAeOAUGBFqBS1ykxw/VcsMueDr2QVgsYySPp+VB6fUNSg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@oxc-transform/binding-linux-riscv64-musl@0.157.0':
+    resolution: {integrity: sha512-zfplsQ80jaRXnD/l9d1w4awRanMkEiR+rlTJbxOkB+FnuypwHU3JYVJlrQLr/dph3XIrQSkvxsitY2XpyHdLpw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [musl]
+
+  '@oxc-transform/binding-linux-s390x-gnu@0.157.0':
+    resolution: {integrity: sha512-X7rmxwvgEQrg2qs0goelrFU5X1m5yaTNdnNBT94bK0cQB5q+E7HCxV8eX9wK3qMP8p2bae6N8+ck4gW9XGKBBQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@oxc-transform/binding-linux-x64-gnu@0.157.0':
+    resolution: {integrity: sha512-wi5EV43pRIiodHVttWD/785k78IMEyKUaSN1o9JN3Yu1GFBCXJEy9wU4J2V6//4iCeEFywdzQiMbHizG4cl0eQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@oxc-transform/binding-linux-x64-musl@0.157.0':
+    resolution: {integrity: sha512-ZK6gmsC1rGiqov3mRltKCwJiRxAhEv7l72TdfClGlLy1kH97GiPsnhLnIiCfqRwahN3W9DX98xMoijhtI/taTg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@oxc-transform/binding-openharmony-arm64@0.157.0':
+    resolution: {integrity: sha512-gz2syX2odmf8qzbiEVy+y+giea43tXnTavzy44/JsopYvUodDWOx4aZzu+ZrQZsbfmae1ntDv3NZWyTkbip2yQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@oxc-transform/binding-win32-arm64-msvc@0.157.0':
+    resolution: {integrity: sha512-44/lSyHppcduYVtPpWURyUTB8IINPqmwwDFbZKxClGARBhDcPgcvcgI6X4niSUWYJTBHf7vT+OcxmWygRc17dQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@oxc-transform/binding-win32-ia32-msvc@0.157.0':
+    resolution: {integrity: sha512-S7a7wqrwQAMTUCocS4weusiQLNY2WP9kJCGCOD1in6PRq1vQFkPt52mh1GLQCzCH+HMBEMx+wK9XotVZBRIVuA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@oxc-transform/binding-win32-x64-msvc@0.157.0':
+    resolution: {integrity: sha512-lADvsdq/qHDlkdgzaaJbcwQZOEdNcjrLFW/MdJDG3AhUQSIINibJly2U9Q/yMsoUx/tAnR31gRvWWkLjHq5lxA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
   '@oxfmt/binding-android-arm-eabi@0.74.0':
     resolution: {integrity: sha512-xxQwrf5EPI5zxvuCTW8r6tzCTjPQ+h6+HqJ0iRKRy2zS1yBllt/xLVjoIyUc+FnR7g0a5g1SZv2yyDYhTItLbA==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -7017,6 +7306,9 @@ packages:
     peerDependencies:
       vitest: 5.0.5
 
+  '@vitest/expect@5.1.0':
+    resolution: {integrity: sha512-Okx71SHCjnfax7YLaxcJzZINi71BF2S5FezzQipheEQsiBAB0dhRBwuQ7uCJUH0/eGAT6HgAtmVVzrEZo6Qmcw==}
+
   '@vitest/mocker@5.0.5':
     resolution: {integrity: sha512-xLL3lkDegJZw+MGoGaCCsFayDZthGgpAtr3Vziyfc4p7xH89K7KRPcRBBh/kEYm0Aqkt5DtTmkYpBtRV/FrHZg==}
     peerDependencies:
@@ -7028,12 +7320,18 @@ packages:
   '@vitest/pretty-format@5.0.5':
     resolution: {integrity: sha512-24sSdIlMA9DVPXnYiB9siwU0bTd887Y9jX3+vabztCSsvHwo7ipvJ/a2L3Rljw8+2rK1f5fCj3h5U9I/Jsqgbw==}
 
+  '@vitest/pretty-format@5.1.0':
+    resolution: {integrity: sha512-IRx5mc30CrFzyMNni6SZKQ1r53kv049Mcvvk0WbWcD6PUz/bFjG4zYv0KosQAeonPpGp5WxqYBMqdSOfJfvVWw==}
+
   '@vitest/snapshot@5.0.5':
     resolution: {integrity: sha512-dHyFElWMQy0wFBGrIaPPeUWfJFh+jAUrv46ImIJGd8CADdKV3mlrAu3FyD0wesdxELFCs9M807e040Kba/XKtA==}
 
   '@vitest/spy@5.0.5':
     resolution: {integrity: sha512-lwJRExuH417257Q5wv9QYugN9IMJkoxcrKrYxGPQkBzl7wlNpTUxD/5yNX4ESKVUIShKPgkGchYPFMWOOk0wzw==}
 
+  '@vitest/spy@5.1.0':
+    resolution: {integrity: sha512-2DPO5OMHWKrBngC+fCmTQqemNF0gidRhp3lxbBmRhW+M1XJrfgPpqNqWVevXtn2f2ufD5ZaR1B6B641aAlcX5A==}
+
   '@vitest/ui@5.0.5':
     resolution: {integrity: sha512-dCoGUOdgmCaSB2g+WQ/spPCBkytAWdNUkFSXY4z+eYp2d8JEOY8v0uDRaJTG9qf/kTlTVZ4CuYMYMz/f1HS/qQ==}
     peerDependencies:
@@ -7042,6 +7340,9 @@ packages:
   '@vitest/utils@5.0.5':
     resolution: {integrity: sha512-/rBu7gzLDQI/SC79Tn98b5DwOgaHU/Gt4I9OVeP3YofzNaYtbImRCOJQmT1S6vOJg9gEIlWC+r3QxKkjuSa1nQ==}
 
+  '@vitest/utils@5.1.0':
+    resolution: {integrity: sha512-V+qgCwkvVw+s1t1S5TaoBHsLi5Sz/YmohCMoOu0mZ8ZQst2bKhRYARAQucWpVg8D0mv0x5MHcWXY5QdOsoiGBQ==}
+
   '@voidzero-dev/vite-plus-core@1.4.0':
     resolution: {integrity: sha512-LTGXCdZ58qJKfuCOmf0hnZOVA64eOgzDQOqYpI+71tPxk/0cGqPQhYDGQQZoEvNLAn1G2Lo4gKadsQdWxb99WQ==}
     engines: {node: ^20.19.0 || ^22.18.0 || >=24.11.0}
@@ -7390,8 +7691,8 @@ packages:
     engines: {node: '>=18.18'}
     hasBin: true
 
-  agent-device@0.21.32:
-    resolution: {integrity: sha512-gfpNs+qeCHKKLY3mqD/NpC7Et7wh5qxNvM9A2cPOhOpzX21e9UHSkO7zOMBpUK7NGtOOkbtz67jco5SVmZOPog==}
+  agent-device@0.21.36:
+    resolution: {integrity: sha512-aG88WlEHjFc/OEBQC7AJg+2LfNoVT/ogxnnzIUYUEgafdiTvBaA+X6uQ2wNmpp2ZrHLy8QIXoEOyc3NEZgJCpQ==}
     engines: {node: '>=22.12'}
     hasBin: true
     peerDependencies:
@@ -7931,6 +8232,10 @@ packages:
     resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==}
     engines: {node: '>=20'}
 
+  commander@15.0.0:
+    resolution: {integrity: sha512-z67u4ZhzCL/Tydu1lJARtEZYWbWaN7oYLHbsuzocr6y4N6WZAagG3RQ4FW61V1/0+jImpj293XfrcYnd1qxtPg==}
+    engines: {node: '>=22.12.0'}
+
   commander@15.1.0:
     resolution: {integrity: sha512-cgnQ88TRrWcC7pVq46RzJVRMktu3W2RcbnoidnfBsl1bmDCBwJS/udcIZpKoCrbAYYaCqsz1yZCVIgbIaU3ddQ==}
     engines: {node: '>=22.12.0'}
@@ -8420,6 +8725,31 @@ packages:
   duplexer@0.1.2:
     resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
 
+  e2e@0.23.0:
+    resolution: {integrity: sha512-x4wbcLDbwtmB9avyruqQX2j77i8HynAGG74vxA2SVSCJwnD7CaioyfBOxKU3L7J7K7cWIDU0LNz3yR5j29UjNQ==}
+    engines: {node: ^22.22.3 || >=24.8.0}
+    hasBin: true
+    peerDependencies:
+      '@ai-sdk/anthropic': ^4.0.0
+      '@ai-sdk/google': ^4.0.0
+      '@ai-sdk/openai': ^4.0.0
+      '@ai-sdk/openai-compatible': ^3.0.0
+      '@ai-sdk/xai': ^5.0.0
+      ai: ^7.0.0
+    peerDependenciesMeta:
+      '@ai-sdk/anthropic':
+        optional: true
+      '@ai-sdk/google':
+        optional: true
+      '@ai-sdk/openai':
+        optional: true
+      '@ai-sdk/openai-compatible':
+        optional: true
+      '@ai-sdk/xai':
+        optional: true
+      ai:
+        optional: true
+
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
@@ -8980,6 +9310,9 @@ packages:
   fast-json-stable-stringify@2.1.0:
     resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
 
+  fast-png@8.0.0:
+    resolution: {integrity: sha512-gCysNasJ8KEMgfdYIKd/wTDo6ENK1PWT0RJO7O+0pgmuHPw2O6tA1WvdxFRJoLf9V8yFYpG0FA1YgI8X97OhJA==}
+
   fast-safe-stringify@2.1.1:
     resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
 
@@ -9145,11 +9478,6 @@ packages:
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
-  fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-
   fsevents@2.3.3:
     resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -10393,6 +10721,10 @@ packages:
     resolution: {integrity: sha512-syxUKHeUll89RIABQADcI7sikYrwyssvA6gj4phSSIPezKVM8yMaLAiLLSc7fmzVvrwybfFGFbW5zme9sX87rg==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
+  oxc-parser@0.157.0:
+    resolution: {integrity: sha512-2MJ9tZGXUbEIhQT/O2OPLlYCgur75ES26t2Pb1sYrvDQcRjrE7GmubkALgPEB6LzOY6sM81AAHKfl5M/FgnjJg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+
   oxc-resolver@11.24.2:
     resolution: {integrity: sha512-FY91FiDBj7ls5MsFS9jN3tjz2o0/zsdSsymlakySaBwVJZorHhkWyICLZMKxlu1R9vYo+sd3z1jwb4J8x7bNDw==}
 
@@ -10400,6 +10732,10 @@ packages:
     resolution: {integrity: sha512-CAx+SKDU4uSOmQnyn7daMj/v/h8tF3fnaUMi4yImKAARPnXV0BieHe/qw1LTcK4KlnIuAhpfUJfSfNKIBh8HqQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
+  oxc-transform@0.157.0:
+    resolution: {integrity: sha512-2H8XPFEbZQv/uoJ863a8YHdNrWWfETcKJ/fVutW7X1ryA5UhhNqaJsV1ib9y2pHOoHfofBIMzfIBCQmzLOVnTA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+
   oxfmt@0.74.0:
     resolution: {integrity: sha512-G4OP7FgwGYZR5ttRpCOOfJdyRsSyvtn34vSXnjDq6Oqed5Dufg5mB44mank+51nAdHOKuTJ0lj0mksY7L+N61A==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -10592,6 +10928,10 @@ packages:
     resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==}
     engines: {node: '>=12'}
 
+  pixelmatch@8.0.0:
+    resolution: {integrity: sha512-cIqOLfh5k52us715qf3B3+kTOxZv+WDv77HN7xokLScYQGYQHi4m/ynoDIPpvF2LvCyUJGyvzY64i0QCXtzu1g==}
+    hasBin: true
+
   pkce-challenge@5.0.1:
     resolution: {integrity: sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==}
     engines: {node: '>=16.20.0'}
@@ -10604,14 +10944,14 @@ packages:
     resolution: {integrity: sha512-emEcLuomt2j03vxD54giVB4SxTjnsqkU692xZOZXHDVoYyypEm+b3jpiTcc+Cf+myooc+/Ly0z01jqeNHVgJGw==}
     engines: {node: '>=16.0.0'}
 
-  playwright-core@1.60.0:
-    resolution: {integrity: sha512-9bW6zvX/m0lEbgTKJ6YppOKx8H3VOPBMOCFh2irXFOT4BbHgrx5hPjwJYLT40Lu+4qtD36qKc/Hn56StUW57IA==}
-    engines: {node: '>=18'}
+  playwright-core@1.64.1:
+    resolution: {integrity: sha512-BC4s8y6SEVA6Q1rSxZTto8hI1KUI3xXlHGZgvGqP4IqPdI/a6FX9H29IDNz7vKo9l21b6LfYosScPL6M3xxyDQ==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  playwright@1.60.0:
-    resolution: {integrity: sha512-hheHdokM8cdqCb0lcE3s+zT4t4W+vvjpGxsZlDnikarzx8tSzMebh3UiFtgqwFwnTnjYQcsyMF8ei2mCO/tpeA==}
-    engines: {node: '>=18'}
+  playwright@1.64.1:
+    resolution: {integrity: sha512-HCrVhHr5QQuwYoswEUGTb7gGp522yflbv/ST8nF4sFWGuLjQCt17Q/EubpGGSNKYn1tsTCPZxqHhHCfVURu7UA==}
+    engines: {node: '>=20'}
     hasBin: true
 
   plist@3.1.0:
@@ -12346,6 +12686,10 @@ snapshots:
     dependencies:
       json-schema: 0.4.0
 
+  '@ai-sdk/provider@4.0.36':
+    dependencies:
+      json-schema: 0.4.0
+
   '@alchemy.run/acme@2.0.0-beta.85(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)':
     dependencies:
       '@distilled.cloud/acme': 1.0.0-rc.18(effect@4.1.2)
@@ -12471,12 +12815,12 @@ snapshots:
       '@effect/sql-pg': 4.1.2(effect@4.1.2)
       pg: 8.23.0
 
-  '@alchemy.run/test@2.0.0-beta.85(patch_hash=29c0539ea71d9cc372f0b16558640599beb9bc609605feb2a493da268d72713e)(be874ca08ab53e444d5d72e167a81f3f)':
+  '@alchemy.run/test@2.0.0-beta.85(patch_hash=29c0539ea71d9cc372f0b16558640599beb9bc609605feb2a493da268d72713e)(93775fed45909d71c0b8bba962f026cf)':
     dependencies:
       '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
       effect: 4.1.2
     optionalDependencies:
-      '@effect/vitest': 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+      '@effect/vitest': 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
       vitest: 5.0.5(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/browser-preview@5.0.5)(@vitest/ui@5.0.5)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)
     transitivePeerDependencies:
@@ -13513,6 +13857,18 @@ snapshots:
       react: 19.3.0
       tslib: 2.8.1
 
+  '@e2e-dev/mobile@0.12.6(e2e@0.23.0)':
+    dependencies:
+      agent-device: 0.21.36
+      e2e: 0.23.0
+      pngjs: 7.0.0
+      zod: 4.6.7
+
+  '@e2e-dev/web@0.15.5(e2e@0.23.0)':
+    dependencies:
+      e2e: 0.23.0
+      playwright-core: 1.64.1
+
   '@effect/atom-react@4.1.2(effect@4.1.2)(react@19.3.0)(scheduler@0.28.0)':
     dependencies:
       effect: 4.1.2
@@ -13603,10 +13959,10 @@ snapshots:
       '@effect/tsgo-win32-arm64': 0.67.1
       '@effect/tsgo-win32-x64': 0.67.1
 
-  '@effect/vitest@4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)':
+  '@effect/vitest@4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)':
     dependencies:
       effect: 4.1.2
-      vite-plus: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+      vite-plus: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
     transitivePeerDependencies:
       - '@arethetypeswrong/core'
       - '@astrojs/compiler-rs'
@@ -14742,6 +15098,10 @@ snapshots:
 
   '@material/material-color-utilities@0.3.0': {}
 
+  '@modelcontextprotocol/core@2.4.0':
+    dependencies:
+      zod: 4.6.7
+
   '@modelcontextprotocol/sdk@1.32.2(supports-color@8.1.1)(zod@4.6.7)':
     dependencies:
       '@hono/node-server': 2.1.6(hono@4.13.17)
@@ -14764,6 +15124,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@modelcontextprotocol/server@2.4.0':
+    dependencies:
+      '@modelcontextprotocol/core': 2.4.0
+      zod: 4.6.7
+
   '@muse-code/sdk@1.4.6(patch_hash=7b495b607fc5d76b444c7c4d58821e839726a30e6f3c53564f0d59f2d5b42101)(@types/node@24.12.4)':
     optionalDependencies:
       '@types/node': 24.12.4
@@ -14994,116 +15359,175 @@ snapshots:
   '@oxc-parser/binding-android-arm-eabi@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-android-arm-eabi@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-android-arm64@0.147.0':
     optional: true
 
   '@oxc-parser/binding-android-arm64@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-android-arm64@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-darwin-arm64@0.147.0':
     optional: true
 
   '@oxc-parser/binding-darwin-arm64@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-darwin-arm64@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-darwin-x64@0.147.0':
     optional: true
 
   '@oxc-parser/binding-darwin-x64@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-darwin-x64@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-freebsd-x64@0.147.0':
     optional: true
 
   '@oxc-parser/binding-freebsd-x64@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-freebsd-x64@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-linux-arm-gnueabihf@0.147.0':
     optional: true
 
   '@oxc-parser/binding-linux-arm-gnueabihf@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-linux-arm-musleabihf@0.147.0':
     optional: true
 
   '@oxc-parser/binding-linux-arm-musleabihf@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-linux-arm-musleabihf@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-linux-arm64-gnu@0.147.0':
     optional: true
 
   '@oxc-parser/binding-linux-arm64-gnu@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-linux-arm64-gnu@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-linux-arm64-musl@0.147.0':
     optional: true
 
   '@oxc-parser/binding-linux-arm64-musl@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-linux-arm64-musl@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-linux-ppc64-gnu@0.147.0':
     optional: true
 
   '@oxc-parser/binding-linux-ppc64-gnu@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-linux-ppc64-gnu@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-linux-riscv64-gnu@0.147.0':
     optional: true
 
   '@oxc-parser/binding-linux-riscv64-gnu@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-linux-riscv64-gnu@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-linux-riscv64-musl@0.147.0':
     optional: true
 
   '@oxc-parser/binding-linux-riscv64-musl@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-linux-riscv64-musl@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-linux-s390x-gnu@0.147.0':
     optional: true
 
   '@oxc-parser/binding-linux-s390x-gnu@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-linux-s390x-gnu@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-linux-x64-gnu@0.147.0':
     optional: true
 
   '@oxc-parser/binding-linux-x64-gnu@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-linux-x64-gnu@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-linux-x64-musl@0.147.0':
     optional: true
 
   '@oxc-parser/binding-linux-x64-musl@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-linux-x64-musl@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-openharmony-arm64@0.147.0':
     optional: true
 
   '@oxc-parser/binding-openharmony-arm64@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-openharmony-arm64@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-win32-arm64-msvc@0.147.0':
     optional: true
 
   '@oxc-parser/binding-win32-arm64-msvc@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-win32-arm64-msvc@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-win32-ia32-msvc@0.147.0':
     optional: true
 
   '@oxc-parser/binding-win32-ia32-msvc@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-win32-ia32-msvc@0.157.0':
+    optional: true
+
   '@oxc-parser/binding-win32-x64-msvc@0.147.0':
     optional: true
 
   '@oxc-parser/binding-win32-x64-msvc@0.148.0':
     optional: true
 
+  '@oxc-parser/binding-win32-x64-msvc@0.157.0':
+    optional: true
+
   '@oxc-project/runtime@0.155.0': {}
 
+  '@oxc-project/runtime@0.157.0': {}
+
   '@oxc-project/types@0.127.0':
     optional: true
 
@@ -15118,6 +15542,8 @@ snapshots:
 
   '@oxc-project/types@0.155.0': {}
 
+  '@oxc-project/types@0.157.0': {}
+
   '@oxc-resolver/binding-android-arm-eabi@11.24.2':
     optional: true
 
@@ -15236,6 +15662,63 @@ snapshots:
   '@oxc-transform-react/binding-win32-x64-msvc@0.152.0':
     optional: true
 
+  '@oxc-transform/binding-android-arm-eabi@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-android-arm64@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-darwin-arm64@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-darwin-x64@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-freebsd-x64@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-linux-arm-gnueabihf@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-linux-arm-musleabihf@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-linux-arm64-gnu@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-linux-arm64-musl@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-linux-ppc64-gnu@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-linux-riscv64-gnu@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-linux-riscv64-musl@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-linux-s390x-gnu@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-linux-x64-gnu@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-linux-x64-musl@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-openharmony-arm64@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-win32-arm64-msvc@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-win32-ia32-msvc@0.157.0':
+    optional: true
+
+  '@oxc-transform/binding-win32-x64-msvc@0.157.0':
+    optional: true
+
   '@oxfmt/binding-android-arm-eabi@0.74.0':
     optional: true
 
@@ -16477,11 +16960,11 @@ snapshots:
       babel-plugin-react-compiler: 1.0.0
       oxc-transform-react: 0.152.0
 
-  '@vitest/browser-playwright@5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(vitest@5.0.5)(yaml@2.9.0)':
+  '@vitest/browser-playwright@5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(vitest@5.0.5)(yaml@2.9.0)':
     dependencies:
       '@vitest/browser': 5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(vitest@5.0.5)(yaml@2.9.0)
       '@vitest/mocker': 5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)
-      playwright: 1.60.0
+      playwright: 1.64.1
       tinyrainbow: 3.2.0
       vitest: 5.0.5(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/browser-preview@5.0.5)(@vitest/ui@5.0.5)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)
     transitivePeerDependencies:
@@ -16580,6 +17063,15 @@ snapshots:
       - vue-tsc
       - yaml
 
+  '@vitest/expect@5.1.0':
+    dependencies:
+      '@standard-schema/spec': 1.1.0
+      '@types/chai': 5.2.3
+      '@vitest/spy': 5.1.0
+      '@vitest/utils': 5.1.0
+      chai: 6.3.0
+      tinyrainbow: 3.2.0
+
   '@vitest/mocker@5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)':
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
@@ -16614,6 +17106,10 @@ snapshots:
     dependencies:
       tinyrainbow: 3.2.0
 
+  '@vitest/pretty-format@5.1.0':
+    dependencies:
+      tinyrainbow: 3.2.0
+
   '@vitest/snapshot@5.0.5':
     dependencies:
       '@vitest/pretty-format': 5.0.5
@@ -16623,6 +17119,8 @@ snapshots:
 
   '@vitest/spy@5.0.5': {}
 
+  '@vitest/spy@5.1.0': {}
+
   '@vitest/ui@5.0.5(vitest@5.0.5)':
     dependencies:
       '@vitest/utils': 5.0.5
@@ -16639,6 +17137,12 @@ snapshots:
       convert-source-map: 2.0.0
       tinyrainbow: 3.2.0
 
+  '@vitest/utils@5.1.0':
+    dependencies:
+      '@vitest/pretty-format': 5.1.0
+      convert-source-map: 2.0.0
+      tinyrainbow: 3.2.0
+
   '@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)':
     dependencies:
       '@oxc-project/runtime': 0.155.0
@@ -16850,7 +17354,7 @@ snapshots:
 
   agent-cli-detector@0.1.7: {}
 
-  agent-device@0.21.32: {}
+  agent-device@0.21.36: {}
 
   agent-install@0.0.5:
     dependencies:
@@ -17537,6 +18041,8 @@ snapshots:
 
   commander@14.0.3: {}
 
+  commander@15.0.0: {}
+
   commander@15.1.0: {}
 
   commander@2.20.3: {}
@@ -17879,6 +18385,23 @@ snapshots:
 
   duplexer@0.1.2: {}
 
+  e2e@0.23.0:
+    dependencies:
+      '@ai-sdk/provider': 4.0.36
+      '@clack/prompts': 1.8.1
+      '@jridgewell/remapping': 2.3.5
+      '@modelcontextprotocol/server': 2.4.0
+      '@oxc-project/runtime': 0.157.0
+      '@vitest/expect': 5.1.0
+      commander: 15.0.0
+      fast-png: 8.0.0
+      get-tsconfig: 4.14.3
+      oxc-parser: 0.157.0
+      oxc-transform: 0.157.0
+      picocolors: 1.1.1
+      pixelmatch: 8.0.0
+      zod: 4.6.7
+
   ee-first@1.1.1: {}
 
   effect@4.1.2: {}
@@ -18585,6 +19108,11 @@ snapshots:
   fast-json-stable-stringify@2.1.0:
     optional: true
 
+  fast-png@8.0.0:
+    dependencies:
+      fflate: 0.8.3
+      iobuffer: 6.0.1
+
   fast-safe-stringify@2.1.1: {}
 
   fast-sha256@1.3.0: {}
@@ -18770,9 +19298,6 @@ snapshots:
 
   fs.realpath@1.0.0: {}
 
-  fsevents@2.3.2:
-    optional: true
-
   fsevents@2.3.3:
     optional: true
 
@@ -20454,6 +20979,30 @@ snapshots:
       '@oxc-parser/binding-win32-x64-msvc': 0.148.0
     optional: true
 
+  oxc-parser@0.157.0:
+    dependencies:
+      '@oxc-project/types': 0.157.0
+    optionalDependencies:
+      '@oxc-parser/binding-android-arm-eabi': 0.157.0
+      '@oxc-parser/binding-android-arm64': 0.157.0
+      '@oxc-parser/binding-darwin-arm64': 0.157.0
+      '@oxc-parser/binding-darwin-x64': 0.157.0
+      '@oxc-parser/binding-freebsd-x64': 0.157.0
+      '@oxc-parser/binding-linux-arm-gnueabihf': 0.157.0
+      '@oxc-parser/binding-linux-arm-musleabihf': 0.157.0
+      '@oxc-parser/binding-linux-arm64-gnu': 0.157.0
+      '@oxc-parser/binding-linux-arm64-musl': 0.157.0
+      '@oxc-parser/binding-linux-ppc64-gnu': 0.157.0
+      '@oxc-parser/binding-linux-riscv64-gnu': 0.157.0
+      '@oxc-parser/binding-linux-riscv64-musl': 0.157.0
+      '@oxc-parser/binding-linux-s390x-gnu': 0.157.0
+      '@oxc-parser/binding-linux-x64-gnu': 0.157.0
+      '@oxc-parser/binding-linux-x64-musl': 0.157.0
+      '@oxc-parser/binding-openharmony-arm64': 0.157.0
+      '@oxc-parser/binding-win32-arm64-msvc': 0.157.0
+      '@oxc-parser/binding-win32-ia32-msvc': 0.157.0
+      '@oxc-parser/binding-win32-x64-msvc': 0.157.0
+
   oxc-resolver@11.24.2:
     optionalDependencies:
       '@oxc-resolver/binding-android-arm-eabi': 11.24.2
@@ -20498,7 +21047,29 @@ snapshots:
       '@oxc-transform-react/binding-win32-ia32-msvc': 0.152.0
       '@oxc-transform-react/binding-win32-x64-msvc': 0.152.0
 
-  oxfmt@0.74.0(@astrojs/compiler-rs@0.5.1)(vite-plus@1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
+  oxc-transform@0.157.0:
+    optionalDependencies:
+      '@oxc-transform/binding-android-arm-eabi': 0.157.0
+      '@oxc-transform/binding-android-arm64': 0.157.0
+      '@oxc-transform/binding-darwin-arm64': 0.157.0
+      '@oxc-transform/binding-darwin-x64': 0.157.0
+      '@oxc-transform/binding-freebsd-x64': 0.157.0
+      '@oxc-transform/binding-linux-arm-gnueabihf': 0.157.0
+      '@oxc-transform/binding-linux-arm-musleabihf': 0.157.0
+      '@oxc-transform/binding-linux-arm64-gnu': 0.157.0
+      '@oxc-transform/binding-linux-arm64-musl': 0.157.0
+      '@oxc-transform/binding-linux-ppc64-gnu': 0.157.0
+      '@oxc-transform/binding-linux-riscv64-gnu': 0.157.0
+      '@oxc-transform/binding-linux-riscv64-musl': 0.157.0
+      '@oxc-transform/binding-linux-s390x-gnu': 0.157.0
+      '@oxc-transform/binding-linux-x64-gnu': 0.157.0
+      '@oxc-transform/binding-linux-x64-musl': 0.157.0
+      '@oxc-transform/binding-openharmony-arm64': 0.157.0
+      '@oxc-transform/binding-win32-arm64-msvc': 0.157.0
+      '@oxc-transform/binding-win32-ia32-msvc': 0.157.0
+      '@oxc-transform/binding-win32-x64-msvc': 0.157.0
+
+  oxfmt@0.74.0(@astrojs/compiler-rs@0.5.1)(vite-plus@1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
     dependencies:
       tinypool: 2.2.0
     optionalDependencies:
@@ -20522,7 +21093,7 @@ snapshots:
       '@oxfmt/binding-win32-arm64-msvc': 0.74.0
       '@oxfmt/binding-win32-ia32-msvc': 0.74.0
       '@oxfmt/binding-win32-x64-msvc': 0.74.0
-      vite-plus: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+      vite-plus: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   oxlint-tsgolint@7.0.2004:
     optionalDependencies:
@@ -20533,7 +21104,7 @@ snapshots:
       '@oxlint-tsgolint/win32-arm64': 7.0.2004
       '@oxlint-tsgolint/win32-x64': 7.0.2004
 
-  oxlint@1.89.0(oxlint-tsgolint@7.0.2004)(vite-plus@1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
+  oxlint@1.89.0(oxlint-tsgolint@7.0.2004)(vite-plus@1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
     optionalDependencies:
       '@oxlint/binding-android-arm-eabi': 1.89.0
       '@oxlint/binding-android-arm64': 1.89.0
@@ -20555,7 +21126,7 @@ snapshots:
       '@oxlint/binding-win32-ia32-msvc': 1.89.0
       '@oxlint/binding-win32-x64-msvc': 1.89.0
       oxlint-tsgolint: 7.0.2004
-      vite-plus: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+      vite-plus: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   p-cancelable@2.1.1: {}
 
@@ -20701,6 +21272,10 @@ snapshots:
 
   picomatch@4.0.7: {}
 
+  pixelmatch@8.0.0:
+    dependencies:
+      pngjs: 7.0.0
+
   pkce-challenge@5.0.1: {}
 
   pkg-up@3.1.0:
@@ -20716,13 +21291,11 @@ snapshots:
       pvutils: 1.1.5
       tslib: 2.8.1
 
-  playwright-core@1.60.0: {}
+  playwright-core@1.64.1: {}
 
-  playwright@1.60.0:
+  playwright@1.64.1:
     dependencies:
-      playwright-core: 1.60.0
-    optionalDependencies:
-      fsevents: 2.3.2
+      playwright-core: 1.64.1
 
   plist@3.1.0:
     dependencies:
@@ -22183,7 +22756,7 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vite-plus@1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0):
+  vite-plus@1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0):
     dependencies:
       '@oxc-project/runtime': 0.155.0
       '@oxc-project/types': 0.155.0
@@ -22195,13 +22768,13 @@ snapshots:
       '@vitest/snapshot': 5.0.5
       '@vitest/spy': 5.0.5
       '@vitest/utils': 5.0.5
-      oxfmt: 0.74.0(@astrojs/compiler-rs@0.5.1)(vite-plus@1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
-      oxlint: 1.89.0(oxlint-tsgolint@7.0.2004)(vite-plus@1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
+      oxfmt: 0.74.0(@astrojs/compiler-rs@0.5.1)(vite-plus@1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
+      oxlint: 1.89.0(oxlint-tsgolint@7.0.2004)(vite-plus@1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
       oxlint-tsgolint: 7.0.2004
       vite: '@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
       vitest: 5.0.5(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/browser-preview@5.0.5)(@vitest/ui@5.0.5)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)
     optionalDependencies:
-      '@vitest/browser-playwright': 5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(vitest@5.0.5)(yaml@2.9.0)
+      '@vitest/browser-playwright': 5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(vitest@5.0.5)(yaml@2.9.0)
       '@voidzero-dev/vite-plus-darwin-arm64': 1.4.0
       '@voidzero-dev/vite-plus-darwin-x64': 1.4.0
       '@voidzero-dev/vite-plus-linux-arm64-gnu': 1.4.0
@@ -22210,7 +22783,7 @@ snapshots:
       '@voidzero-dev/vite-plus-linux-x64-musl': 1.4.0
       '@voidzero-dev/vite-plus-win32-arm64-msvc': 1.4.0
       '@voidzero-dev/vite-plus-win32-x64-msvc': 1.4.0
-      playwright: 1.60.0
+      playwright: 1.64.1
     transitivePeerDependencies:
       - '@arethetypeswrong/core'
       - '@astrojs/compiler-rs'
@@ -22290,7 +22863,7 @@ snapshots:
       why-is-node-running: 3.2.1
     optionalDependencies:
       '@types/node': 24.12.4
-      '@vitest/browser-playwright': 5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(playwright@1.60.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(vitest@5.0.5)(yaml@2.9.0)
+      '@vitest/browser-playwright': 5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(vitest@5.0.5)(yaml@2.9.0)
       '@vitest/browser-preview': 5.0.5(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(vitest@5.0.5)(yaml@2.9.0)
       '@vitest/ui': 5.0.5(vitest@5.0.5)
       jsdom: 30.1.0(@noble/hashes@1.8.0)
diff --git a/scripts/e2e.config.ts b/scripts/e2e.config.ts
new file mode 100644
index 0000000000000..520fc8338da71
--- /dev/null
+++ b/scripts/e2e.config.ts
@@ -0,0 +1,186 @@
+// Scenarios: e2e tests that run against the real dev stack. See docs/operations/scenarios.md.
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { mobile, type DeviceProvider } from "@e2e-dev/mobile";
+import { web } from "@e2e-dev/web";
+import * as HostProcess from "@t3tools/shared/HostProcess";
+import { createAgentDeviceClient } from "agent-device";
+import type { E2EConfig } from "e2e";
+import * as Effect from "effect/Effect";
+import * as Path from "effect/Path";
+import * as SecureRandom from "effect/crypto/SecureRandom";
+import * as Schedule from "effect/Schedule";
+
+import { run, ScenarioError } from "./scenarios/shell.ts";
+
+// e2e loads this module for its values, so the paths and the host are resolved once, here.
+const resolved = await Effect.gen(function* () {
+  const path = yield* Path.Path;
+  const env = yield* HostProcess.Environment;
+  const scripts = yield* path.fromFileUrl(new URL(".", import.meta.url));
+  const home = path.resolve(scripts, "../.t3/scenarios");
+  // A pooled device reaches this machine over the tailnet, not localhost.
+  const host = yield* run("tailscale", ["ip", "-4"]).pipe(
+    Effect.map((result) => result.stdout.trim().split("\n")[0] ?? ""),
+    Effect.orElseSucceed(() => ""),
+  );
+  return {
+    node: yield* HostProcess.ExecutablePath,
+    scripts,
+    /** The checkout whose app runs. `prove-scenario.ts` points it at a base or head worktree. */
+    appDir: path.resolve(scripts, env.T3_SCENARIO_APP_DIR ?? ".."),
+    home,
+    startApp: path.join(scripts, "scenarios/start-app.ts"),
+    mobile: {
+      host: host || "127.0.0.1",
+      // A mobile target has no `app.url`, so e2e cannot pick these ports.
+      serverPort: Number(env.T3_SCENARIO_SERVER_PORT ?? 13_990),
+      metroPort: Number(env.T3_SCENARIO_METRO_PORT ?? 8_190),
+    },
+  };
+}).pipe(Effect.provide(NodeServices.layer), Effect.runPromise);
+
+export const APP_DIR = resolved.appDir;
+/** T3 homes only scenarios use, recreated on every run. `.t3` is gitignored. */
+export const T3_HOME = resolved.home;
+export const MOBILE_T3_HOME = `${T3_HOME}-mobile`;
+export const MOBILE = resolved.mobile;
+const startApp = resolved.startApp;
+/**
+ * The one address e2e opens the web app at and the app is told to bind. Never `localhost`: the
+ * runner and the app can resolve that name to different addresses.
+ */
+const LOOPBACK = "127.0.0.1";
+
+/**
+ * Leases a device from the Simlock pool, whose gateway speaks agent-device's lease protocol.
+ * `retainOnClose` keeps the device when the engine closes its session between attempts.
+ */
+const simlock = (device: string): DeviceProvider => {
+  const connect = Effect.fn("simlock.connect")(function* (
+    env: Readonly<Record<string, string | undefined>>,
+  ) {
+    const daemonBaseUrl = env.SIMLOCK_AGENT_DEVICE_URL;
+    const daemonAuthToken = env.AGENT_DEVICE_DAEMON_AUTH_TOKEN;
+    if (daemonBaseUrl === undefined || daemonAuthToken === undefined) {
+      return yield* new ScenarioError({
+        message: "SIMLOCK_AGENT_DEVICE_URL and AGENT_DEVICE_DAEMON_AUTH_TOKEN are not set.",
+      });
+    }
+    return { daemonBaseUrl, daemonAuthToken };
+  });
+  const call = <A>(description: string, request: () => Promise<A>) =>
+    Effect.tryPromise({
+      try: request,
+      catch: (cause) => new ScenarioError({ message: `${description}: ${String(cause)}` }),
+    });
+  const acquire = Effect.fn("simlock.acquire")(function* (
+    request: Parameters<DeviceProvider["acquire"]>[0],
+  ) {
+    const daemon = yield* connect(request.env);
+    const client = createAgentDeviceClient(daemon);
+    const platform = request.platform === "android" ? "android" : "ios";
+    const scope = { tenant: "t3-scenarios", runId: `${request.runId}-${request.slot}` };
+    // Simlock takes the lease id from the caller: 32 hex characters.
+    const leaseId = (yield* (yield* SecureRandom.SecureRandom).uuidV4()).replaceAll("-", "");
+    const lease = yield* call(`The pool leased no ${device}`, () =>
+      client.leases.allocate({ ...scope, platform, device, retainOnClose: true, leaseId }),
+    ).pipe(
+      // A busy gateway answers its health probe late, which the client reports as unavailable.
+      Effect.tapError(() => Effect.sync(() => request.log("the pool is busy; asking again"))),
+      Effect.retry({ schedule: Schedule.spaced("10 seconds"), times: 12 }),
+    );
+    const leaseScope = { ...scope, leaseId: lease.leaseId, leaseBackend: lease.backend };
+    // The pool answers `boot` with the leased device; a worker hosts several, so name ours.
+    const leased = yield* call("The pool did not name the leased device", () =>
+      createAgentDeviceClient({ ...daemon, ...leaseScope }).devices.boot({ platform }),
+    ).pipe(
+      // e2e releases only the leases `acquire` returned.
+      Effect.tapError(() =>
+        call("release", () => client.leases.release({ leaseId: lease.leaseId })).pipe(
+          Effect.ignore,
+        ),
+      ),
+    );
+    return {
+      id: lease.leaseId,
+      daemon: { baseUrl: daemon.daemonBaseUrl, authToken: daemon.daemonAuthToken },
+      deviceId: leased.id,
+      client: {
+        ...leaseScope,
+        ...(lease.leaseProvider === undefined ? {} : { leaseProvider: lease.leaseProvider }),
+      },
+    };
+  });
+  return {
+    name: "simlock",
+    acquire: (request) =>
+      acquire(request).pipe(Effect.provide(NodeCrypto.layer), Effect.runPromise),
+    release: (lease, context) =>
+      connect(context.env).pipe(
+        Effect.flatMap((daemon) =>
+          call("release", () =>
+            createAgentDeviceClient(daemon).leases.release({ leaseId: lease.id }),
+          ),
+        ),
+        Effect.asVoid,
+        Effect.runPromise,
+      ),
+  };
+};
+
+export default {
+  tests: "scenarios/**/*.e2e.ts",
+  targets: [
+    {
+      name: "web",
+      engine: web({ viewport: { width: 1280, height: 800 } }),
+      app: {
+        url: `http://${LOOPBACK}:0`,
+        // Vite answers before the server does; this path is proxied to the server.
+        readyUrl: `http://${LOOPBACK}:{port}/.well-known/t3/environment`,
+        command: {
+          executable: resolved.node,
+          args: [startApp, "web", T3_HOME, LOOPBACK, "{port}"],
+          cwd: APP_DIR,
+          startupTimeout: 300_000,
+          log: ".e2e/app.log",
+        },
+      },
+    },
+    {
+      name: "ios",
+      engine: mobile({
+        platform: "ios",
+        device: simlock("iPhone 18 Pro"),
+        session: "t3-scenarios",
+      }),
+      app: {
+        bundleId: "com.t3tools.t3code.dev",
+        // Metro starts after the server listens, so it answering means both are up.
+        readyUrl: `http://127.0.0.1:${MOBILE.metroPort}/status`,
+        command: {
+          executable: resolved.node,
+          args: [
+            startApp,
+            "mobile",
+            MOBILE_T3_HOME,
+            String(MOBILE.serverPort),
+            String(MOBILE.metroPort),
+            MOBILE.host,
+          ],
+          cwd: APP_DIR,
+          startupTimeout: 300_000,
+          log: ".e2e/mobile-app.log",
+        },
+      },
+    },
+  ],
+  // One server holds every test's state, and a dev stack is heavy.
+  workers: 1,
+  timeout: 300_000,
+  assertionTimeout: 15_000,
+  video: "on",
+  trace: "on",
+  reporters: ["list", "markdown"],
+} satisfies E2EConfig;
diff --git a/scripts/package.json b/scripts/package.json
index 02c0caad7f933..716a2edb3762f 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -4,18 +4,22 @@
   "type": "module",
   "scripts": {
     "typecheck": "effect-tsgo tsrs --noEmit",
+    "scenarios": "E2E_TELEMETRY_DISABLED=1 e2e run",
     "test": "vp test run --config ../vite.config.ts --dir ."
   },
   "dependencies": {
+    "@e2e-dev/mobile": "0.12.6",
+    "@e2e-dev/web": "0.15.5",
     "@effect/platform-node": "catalog:",
     "@electron/asar": "^4.3.0",
     "@electron/osx-sign": "2.7.0",
     "@t3tools/contracts": "workspace:*",
     "@t3tools/shared": "workspace:*",
     "@t3tools/tailscale": "workspace:*",
-    "agent-device": "0.21.32",
+    "agent-device": "0.21.36",
+    "e2e": "0.23.0",
     "effect": "catalog:",
-    "playwright-core": "1.60.0",
+    "playwright-core": "1.64.1",
     "plist": "catalog:",
     "pngjs": "7.0.0",
     "sharp": "0.35.5"
diff --git a/scripts/prove-scenario.test.ts b/scripts/prove-scenario.test.ts
new file mode 100644
index 0000000000000..51fc2f3ece7d0
--- /dev/null
+++ b/scripts/prove-scenario.test.ts
@@ -0,0 +1,110 @@
+import { describe, expect, it } from "@effect/vitest";
+
+import { buildProof, readSide } from "./prove-scenario.ts";
+
+const report = (
+  exitCode: number,
+  error?: { code: string; message: string },
+  status = error ? "failed" : "passed",
+) => ({
+  run: {
+    results: [
+      { titlePath: ["Another scenario the run did not select"], attempts: [] },
+      {
+        titlePath: ["Tab reaches the submit button"],
+        attempts: [
+          {
+            status,
+            steps: [
+              { api: "app.open", label: "/pair#token=secret", status: "passed" },
+              { api: "expect.toBeFocused", label: "Continue", status: error ? "failed" : "passed" },
+            ],
+            ...(error === undefined ? {} : { error }),
+            artifacts: [
+              { kind: "screenshot", path: "tab/attempt-1/screenshots/001-after-tab.png" },
+              { kind: "video", path: "tab/attempt-1/video/video.webm" },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+});
+
+const passed = report(0);
+const failed = report(1, { code: "ASSERTION_FAILED", message: "expected: focused" });
+// The control the scenario clicks is missing: the scenario is broken, the bug is not shown.
+const brokenScenario = report(1, { code: "LOCATOR_NOT_FOUND", message: "no node" });
+// A file with two tests: the first passes, so reading only it would hide the second.
+const twoTests = { run: { results: [...passed.run.results, ...failed.run.results] } };
+// e2e exits 0 when the test skips itself at runtime.
+const skipped = report(0, undefined, "skipped");
+
+describe("prove-scenario", () => {
+  it.each([
+    { base: failed, head: passed, failsOnBase: true, passesOnHead: true, verdict: /^Proven/ },
+    // A "fix" for behavior that never happens: the scenario must fail before it can prove.
+    {
+      base: passed,
+      head: passed,
+      failsOnBase: false,
+      passesOnHead: true,
+      verdict: /passes on base/,
+    },
+    { base: failed, head: failed, failsOnBase: true, passesOnHead: false, verdict: /still fails/ },
+    {
+      base: brokenScenario,
+      head: passed,
+      failsOnBase: false,
+      passesOnHead: true,
+      verdict: /could not run on base/,
+    },
+    {
+      base: failed,
+      head: skipped,
+      failsOnBase: true,
+      passesOnHead: false,
+      verdict: /could not run on head/,
+    },
+    {
+      base: failed,
+      head: twoTests,
+      failsOnBase: true,
+      passesOnHead: false,
+      verdict: /could not run on head .*exactly one/,
+    },
+    // e2e writes no report when the app does not start.
+    {
+      base: undefined,
+      head: passed,
+      failsOnBase: false,
+      passesOnHead: true,
+      verdict: /could not run on base/,
+    },
+  ])("reports $verdict", (row) => {
+    const proof = buildProof(
+      readSide("aaaaaaaaaaaa", "/out/base/results", row.base),
+      readSide("bbbbbbbbbbbb", "/out/head/results", row.head),
+      (path) => path,
+    );
+    expect(proof).toMatchObject({ failsOnBase: row.failsOnBase, passesOnHead: row.passesOnHead });
+    expect(proof.verdict).toMatch(row.verdict);
+  });
+
+  it("labels captures with their side and commit and keeps the pairing token out", () => {
+    const proof = buildProof(
+      readSide("aaaaaaaaaaaa", "/out/base/results", failed),
+      readSide("bbbbbbbbbbbb", "/out/head/results", passed),
+      (path) => `https://files.example${path}`,
+    );
+    expect(proof.markdown).toContain("|  | Base `aaaaaaaaaa` | Head `bbbbbbbbbb` |");
+    expect(proof.markdown).toContain(
+      "![Base aaaaaaaaaa: after tab](https://files.example/out/base/results/tab/attempt-1/screenshots/001-after-tab.png)",
+    );
+    expect(proof.videos).toEqual([
+      "/out/base/results/tab/attempt-1/video/video.webm",
+      "/out/head/results/tab/attempt-1/video/video.webm",
+    ]);
+    expect(JSON.stringify(proof)).not.toContain("secret");
+  });
+});
diff --git a/scripts/prove-scenario.ts b/scripts/prove-scenario.ts
new file mode 100644
index 0000000000000..6b0bb9c1a44f6
--- /dev/null
+++ b/scripts/prove-scenario.ts
@@ -0,0 +1,325 @@
+#!/usr/bin/env node
+// Runs one scenario with `e2e run` on a base and a head commit and says whether it fails on
+// base and passes on head. See docs/operations/scenarios.md.
+import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import * as HostProcess from "@t3tools/shared/HostProcess";
+import { fromJsonStringPretty } from "@t3tools/shared/schemaJson";
+import * as Console from "effect/Console";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+import { Argument, Command, Flag } from "effect/cli";
+
+import { run, ScenarioError } from "./scenarios/shell.ts";
+
+/** The parts of e2e's report.json (schema/report-v1.schema.json) a proof reads. */
+const E2EReport = Schema.Struct({
+  run: Schema.Struct({
+    results: Schema.Array(
+      Schema.Struct({
+        titlePath: Schema.Array(Schema.String),
+        attempts: Schema.Array(
+          Schema.Struct({
+            status: Schema.optional(Schema.String),
+            steps: Schema.Array(
+              Schema.Struct({
+                api: Schema.String,
+                label: Schema.optional(Schema.String),
+                status: Schema.String,
+              }),
+            ),
+            error: Schema.optional(Schema.Struct({ code: Schema.String, message: Schema.String })),
+            artifacts: Schema.optional(
+              Schema.Array(
+                Schema.Struct({ kind: Schema.String, path: Schema.optional(Schema.String) }),
+              ),
+            ),
+          }),
+        ),
+      }),
+    ),
+  }),
+});
+type E2EReport = typeof E2EReport.Type;
+const decodeReport = Schema.decodeUnknownEffect(Schema.fromJsonString(E2EReport));
+const encodeProof = Schema.encodeEffect(fromJsonStringPretty(Schema.Unknown));
+
+export interface SideResult {
+  readonly sha: string;
+  /** `error`: the scenario could not run, which says nothing about the behavior. */
+  readonly status: "passed" | "failed" | "error";
+  readonly title: string;
+  readonly message?: string;
+  readonly steps: ReadonlyArray<{ readonly step: string; readonly status: string }>;
+  /** Capture paths under the run's results directory, in the order the scenario took them. */
+  readonly captures: ReadonlyArray<string>;
+  readonly videos: ReadonlyArray<string>;
+}
+
+/** Only a failed expectation shows the bug. A missing control or a dead app shows nothing. */
+export function readSide(
+  sha: string,
+  resultsDir: string,
+  report: E2EReport | undefined,
+): SideResult {
+  // The report also lists the tests the run did not select, with no attempts.
+  const executed = report?.run.results.filter((candidate) => candidate.attempts.length > 0) ?? [];
+  // One scenario is one test: with several, a pass in the first could hide a failure in another.
+  const result = executed.length === 1 ? executed[0] : undefined;
+  const attempt = result?.attempts.at(-1);
+  if (result === undefined || attempt === undefined) {
+    const message =
+      executed.length > 1
+        ? `the scenario file ran ${executed.length} tests; a proof needs exactly one`
+        : "e2e wrote no report: the app did not start, or no test was selected";
+    return { sha, status: "error", title: "", message, steps: [], captures: [], videos: [] };
+  }
+  const files = (kind: string) =>
+    (attempt.artifacts ?? []).flatMap((artifact) =>
+      artifact.kind === kind && artifact.path !== undefined
+        ? [`${resultsDir}/${artifact.path}`]
+        : [],
+    );
+  const error = attempt.error;
+  return {
+    sha,
+    // e2e exits 0 for a skipped test too, and a test that did not run proves nothing.
+    status:
+      attempt.status === "passed"
+        ? "passed"
+        : error?.code === "ASSERTION_FAILED"
+          ? "failed"
+          : "error",
+    title: result.titlePath.join(" > "),
+    ...(error === undefined
+      ? attempt.status === "passed"
+        ? {}
+        : { message: `the test ended ${attempt.status ?? "without a status"}` }
+      : { message: `${error.code}: ${error.message}` }),
+    steps: attempt.steps.map((step) => ({
+      // The sign-in step's label holds the run's pairing token.
+      step: `${step.api} ${step.label?.includes("token=") ? "<pairing link>" : (step.label ?? "")}`,
+      status: step.status,
+    })),
+    captures: files("screenshot"),
+    videos: files("video"),
+  };
+}
+
+const short = (sha: string) => sha.slice(0, 10);
+const captureLabel = (path: string) =>
+  (path.split("/").at(-1) ?? "")
+    .replace(/\.png$/, "")
+    .replace(/^\d+-/, "")
+    .replaceAll("-", " ");
+
+/** `link` maps a capture path to what the Markdown should point at, such as an uploaded URL. */
+export function buildProof(base: SideResult, head: SideResult, link: (path: string) => string) {
+  const baseSha = `\`${short(base.sha)}\``;
+  const headSha = `\`${short(head.sha)}\``;
+  const broken = base.status === "error" ? base : head.status === "error" ? head : undefined;
+  const verdict =
+    broken !== undefined
+      ? `Not proven: the scenario could not run on ${broken === base ? `base ${baseSha}` : `head ${headSha}`} (${broken.message ?? "unknown error"}).`
+      : base.status === "passed"
+        ? head.status === "passed"
+          ? `Not proven: the scenario passes on base ${baseSha} too, so it does not reproduce the bug.`
+          : `Not proven: the scenario passes on base ${baseSha} and fails on head ${headSha}, so head breaks it.`
+        : head.status === "passed"
+          ? `Proven: the scenario fails on base ${baseSha} and passes on head ${headSha}.`
+          : `Not proven: the scenario fails on base ${baseSha} and still fails on head ${headSha}.`;
+
+  const labels = [...new Set([...base.captures, ...head.captures].map(captureLabel))];
+  const cell = (side: string, result: SideResult, label: string) => {
+    const capture = result.captures.find((path) => captureLabel(path) === label);
+    return capture === undefined
+      ? ""
+      : `![${side} ${short(result.sha)}: ${label}](${link(capture)})`;
+  };
+  const outcome = (result: SideResult) =>
+    result.status === "passed"
+      ? "✅ passed"
+      : `${result.status === "failed" ? "❌ failed" : "⚠️ could not run"}<br>${(result.message ?? "").replaceAll("\n", "<br>").replaceAll("|", "\\|").replaceAll("<br><br>", "<br>")}`;
+  const markdown = [
+    `### Scenario: ${head.title || base.title}`,
+    "",
+    `**${verdict}**`,
+    "",
+    `|  | Base ${baseSha} | Head ${headSha} |`,
+    "| --- | --- | --- |",
+    `| Result | ${outcome(base)} | ${outcome(head)} |`,
+    ...labels.map(
+      (label) => `| ${label} | ${cell("Base", base, label)} | ${cell("Head", head, label)} |`,
+    ),
+    "",
+  ].join("\n");
+  return {
+    scenario: head.title || base.title,
+    failsOnBase: base.status === "failed",
+    passesOnHead: head.status === "passed",
+    baseSha: base.sha,
+    headSha: head.sha,
+    verdict,
+    steps: { base: base.steps, head: head.steps },
+    captures: [...base.captures, ...head.captures],
+    videos: [...base.videos, ...head.videos],
+    markdown,
+    base,
+    head,
+  };
+}
+
+const roots = Effect.gen(function* () {
+  const path = yield* Path.Path;
+  const scripts = yield* path.fromFileUrl(new URL(".", import.meta.url));
+  return { scripts, repo: path.dirname(path.resolve(scripts)) };
+});
+
+const git = Effect.fn("prove.git")(function* (args: ReadonlyArray<string>) {
+  return (yield* run("git", args, { cwd: (yield* roots).repo })).stdout.trim();
+});
+
+/** Runs `use` with a checkout of `sha`: this one when it already is that commit, else a worktree. */
+const withCheckout = Effect.fn("prove.withCheckout")(function* <A, E, R>(
+  sha: string,
+  use: (appDir: string) => Effect.Effect<A, E, R>,
+) {
+  const { repo } = yield* roots;
+  const clean = (yield* git(["status", "--porcelain", "--untracked-files=no"])).length === 0;
+  if (clean && (yield* git(["rev-parse", "HEAD"])) === sha) return yield* use(repo);
+  // Beside this checkout, not in the temp directory, so tooling resolves as it does here.
+  const worktree = `${repo}-scenario-${short(sha)}`;
+  return yield* Effect.acquireUseRelease(
+    git(["worktree", "add", "--quiet", "--detach", "--force", worktree, sha]),
+    () => run("vp", ["i"], { cwd: worktree, echo: true }).pipe(Effect.andThen(use(worktree))),
+    () => git(["worktree", "remove", "--force", worktree]).pipe(Effect.ignore),
+  );
+});
+
+/** Runs the scenario with `e2e run` against the app at `sha` and reads the report it wrote. */
+const runSide = Effect.fn("prove.runSide")(function* (
+  side: "base" | "head",
+  rev: string,
+  scenarioPath: string,
+) {
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const { scripts } = yield* roots;
+  const sha = yield* git(["rev-parse", "--verify", `${rev}^{commit}`]);
+  const outDir = path.join(scripts, ".e2e/prove", side);
+  yield* fs.remove(outDir, { recursive: true, force: true });
+  const environment = yield* HostProcess.Environment;
+  yield* withCheckout(sha, (appDir) =>
+    // The scenario and e2e come from this checkout; only the app comes from `appDir`.
+    run(
+      path.join(scripts, "node_modules/.bin/e2e"),
+      ["run", scenarioPath, "--output", path.relative(scripts, outDir)],
+      {
+        cwd: scripts,
+        env: { ...environment, T3_SCENARIO_APP_DIR: appDir, E2E_TELEMETRY_DISABLED: "1" },
+        // The report says how the run went; e2e's exit code only repeats it.
+        allowExit: [0, 1, 2, 3, 4],
+        echo: true,
+      },
+    ),
+  );
+  const report = yield* fs.readFileString(path.join(outDir, "report.json")).pipe(
+    Effect.flatMap(decodeReport),
+    Effect.orElseSucceed(() => undefined),
+  );
+  return readSide(sha, path.join(outDir, "results"), report);
+});
+
+/** Uploads the captures and maps each to its URL; a failed upload leaves the map empty. */
+const upload = Effect.fn("prove.upload")(function* (
+  uploadCommand: string,
+  captures: ReadonlyArray<string>,
+) {
+  const [command = "", ...args] = uploadCommand.split(/\s+/).filter(Boolean);
+  if (captures.length === 0) return new Map<string, string>();
+  return yield* run(command, [...args, ...captures]).pipe(
+    Effect.map((result) => result.stdout.trim().split("\n")),
+    // Lines pair with captures by position, so a different count would mislabel every image.
+    Effect.filterOrFail(
+      (urls) => urls.length === captures.length,
+      () => new ScenarioError({ message: "The upload command printed an unexpected line count." }),
+    ),
+    Effect.map((urls) => new Map(captures.map((capture, index) => [capture, urls[index] ?? ""]))),
+    // Two finished runs are worth more than their links: the proof then names local files.
+    Effect.catch((error) =>
+      Console.error(`Upload failed, linking local captures: ${error.message}`).pipe(
+        Effect.as(new Map<string, string>()),
+      ),
+    ),
+  );
+});
+
+const prove = Effect.fn("prove")(function* (input: {
+  readonly scenario: string;
+  readonly base: string;
+  readonly head: string;
+  readonly uploadCommand: Option.Option<string>;
+}) {
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const { scripts } = yield* roots;
+  const proveDir = path.join(scripts, ".e2e/prove");
+  const scenarioPath = path.resolve(yield* HostProcess.WorkingDirectory, input.scenario);
+  // A proof left by an earlier run must not be read as this one's.
+  yield* fs.remove(proveDir, { recursive: true, force: true });
+  yield* fs.makeDirectory(proveDir, { recursive: true });
+  const base = yield* runSide("base", input.base, scenarioPath);
+  const head = yield* runSide("head", input.head, scenarioPath);
+  const links = Option.isSome(input.uploadCommand)
+    ? yield* upload(input.uploadCommand.value, [...base.captures, ...head.captures])
+    : new Map<string, string>();
+  const proof = buildProof(
+    base,
+    head,
+    (capture) => links.get(capture) ?? path.relative(proveDir, capture),
+  );
+  const json = yield* encodeProof(proof);
+  yield* fs.writeFileString(path.join(proveDir, "proof.md"), proof.markdown);
+  yield* fs.writeFileString(path.join(proveDir, "proof.json"), `${json}\n`);
+  yield* Console.log(json);
+  const couldNotRun = base.status === "error" || head.status === "error";
+  return proof.failsOnBase && proof.passesOnHead ? 0 : couldNotRun ? 2 : 1;
+});
+
+const command = Command.make(
+  "prove-scenario",
+  {
+    scenario: Argument.String("scenario").pipe(
+      Argument.withDescription("Scenario file, such as scripts/scenarios/name.e2e.ts."),
+    ),
+    base: Flag.String("base").pipe(Flag.withDescription("Commit the bug shows on.")),
+    head: Flag.String("head").pipe(
+      Flag.withDescription("Commit with the fix."),
+      Flag.withDefault("HEAD"),
+    ),
+    uploadCommand: Flag.String("upload-command").pipe(
+      Flag.withDescription("Command that takes capture paths and prints one URL per line."),
+      Flag.optional,
+    ),
+  },
+  (input) =>
+    prove(input).pipe(
+      // A bad revision or a failed install is "could not run" (2), not "did not prove" (1).
+      Effect.catch((error) => Console.error(String(error)).pipe(Effect.as(2))),
+      Effect.flatMap((exitCode) =>
+        Effect.sync(() => {
+          process.exitCode = exitCode;
+        }),
+      ),
+    ),
+);
+
+if (import.meta.main) {
+  Command.run(command, { version: "0.0.0" }).pipe(
+    Effect.provide(NodeServices.layer),
+    NodeRuntime.runMain,
+  );
+}
diff --git a/scripts/scenarios/add-project-tab-reaches-submit.e2e.ts b/scripts/scenarios/add-project-tab-reaches-submit.e2e.ts
new file mode 100644
index 0000000000000..b6afb9358cd2b
--- /dev/null
+++ b/scripts/scenarios/add-project-tab-reaches-submit.e2e.ts
@@ -0,0 +1,22 @@
+import { expect } from "e2e";
+
+import { test, WEB } from "./t3.ts";
+
+test(
+  "Tab moves from the add-project Git URL field to its submit button",
+  WEB,
+  async ({ t3, app, screen, browser }) => {
+    await t3.project("demo");
+    await t3.open();
+
+    await screen.getByRole("button", "Add project").tap();
+    await screen.getByText("Git URL").tap();
+    await screen.getByRole("combobox").fill("https://github.com/pingdotgg/t3code.git");
+    const submit = screen.getByRole("button", "Continue (Enter)");
+    await expect(submit).toBeEnabled();
+
+    await browser.keyboard.press("Tab");
+    await app.screenshot("after-tab");
+    await expect(submit).toBeFocused();
+  },
+);
diff --git a/scripts/scenarios/mobile-opens-a-seeded-thread.e2e.ts b/scripts/scenarios/mobile-opens-a-seeded-thread.e2e.ts
new file mode 100644
index 0000000000000..b5f2218df8816
--- /dev/null
+++ b/scripts/scenarios/mobile-opens-a-seeded-thread.e2e.ts
@@ -0,0 +1,21 @@
+import { expect } from "e2e";
+
+import { IOS, test } from "./t3-mobile.ts";
+
+test(
+  "The iOS app lists a seeded thread and opens its history",
+  IOS,
+  async ({ t3, app, screen }) => {
+    const project = await t3.project("demo");
+    await t3.thread({ project, title: "Earlier work", messages: ["first", "second"] });
+    await t3.open();
+
+    const thread = screen.getByText("Earlier work", { exact: false }).first();
+    await expect(thread).toBeVisible({ timeout: 120_000 });
+    await app.screenshot("home");
+
+    await thread.tap();
+    await expect(screen.getByText("second fixture turn complete", { exact: false })).toBeVisible();
+    await app.screenshot("thread");
+  },
+);
diff --git a/scripts/scenarios/replay-turn-streams.e2e.ts b/scripts/scenarios/replay-turn-streams.e2e.ts
new file mode 100644
index 0000000000000..b6756a278179d
--- /dev/null
+++ b/scripts/scenarios/replay-turn-streams.e2e.ts
@@ -0,0 +1,26 @@
+import { expect } from "e2e";
+
+import { test, WEB } from "./t3.ts";
+
+test(
+  "A replayed turn streams a reply, shows its tool calls, and finishes",
+  WEB,
+  async ({ t3, app, screen }) => {
+    await t3.project("demo", { "src/math.ts": "export const sum = 1 + 1;\n" });
+    await t3.open();
+
+    await screen.getByRole("textbox").fill("Give me a short tour");
+    await screen.getByRole("textbox").press("Enter");
+    const stop = screen.getByRole("button", "Stop generation");
+    await expect(
+      screen.getByText("The project has a single math module", { exact: false }),
+    ).toBeVisible();
+    await expect(stop).toBeVisible();
+    await app.screenshot("streaming");
+
+    await expect(screen.getByText("This turn is a replay.", { exact: false })).toBeVisible();
+    await expect(stop).toBeHidden();
+    await expect(screen.getByText("Give me a short tour").first()).toBeVisible();
+    await app.screenshot("finished");
+  },
+);
diff --git a/scripts/scenarios/shell.ts b/scripts/scenarios/shell.ts
new file mode 100644
index 0000000000000..40e3b224fa694
--- /dev/null
+++ b/scripts/scenarios/shell.ts
@@ -0,0 +1,64 @@
+import * as Console from "effect/Console";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
+import { ChildProcess, ChildProcessSpawner } from "effect/process";
+
+export class ScenarioError extends Schema.TaggedError<ScenarioError>()("ScenarioError", {
+  message: Schema.String,
+}) {}
+
+interface RunOptions {
+  readonly cwd?: string;
+  /** Replaces the inherited environment when given. */
+  readonly env?: NodeJS.ProcessEnv;
+  /** Exit codes that are answers, not failures. Defaults to 0 only. */
+  readonly allowExit?: ReadonlyArray<number>;
+  /** Prints the command's output to stderr as it arrives, keeping stdout for results. */
+  readonly echo?: boolean;
+}
+
+const collect = <E>(stream: Stream.Stream<Uint8Array, E>, echo: boolean) =>
+  echo
+    ? stream.pipe(
+        Stream.decodeText(),
+        Stream.splitLines,
+        Stream.tap((line) => Console.error(line)),
+        Stream.runCollect,
+        Effect.map((lines) => [...lines].join("\n")),
+      )
+    : Stream.mkString(Stream.decodeText(stream));
+
+/** Runs a command to its end and returns what it printed. */
+export const run = Effect.fn("scenario.run")(
+  function* (program: string, args: ReadonlyArray<string>, options: RunOptions = {}) {
+    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+    const child = yield* spawner.spawn(
+      ChildProcess.make(program, [...args], {
+        ...(options.cwd === undefined ? {} : { cwd: options.cwd }),
+        ...(options.env === undefined ? {} : { env: options.env, extendEnv: false }),
+        stdin: "ignore",
+        stdout: "pipe",
+        stderr: "pipe",
+      }),
+    );
+    const [stdout, stderr, exitCode] = yield* Effect.all(
+      [
+        collect(child.stdout, options.echo === true),
+        collect(child.stderr, options.echo === true),
+        child.exitCode,
+      ],
+      { concurrency: "unbounded" },
+    );
+    if (!(options.allowExit ?? [0]).includes(exitCode)) {
+      return yield* new ScenarioError({
+        message: `${program} ${args.slice(0, 3).join(" ")} exited with ${exitCode}: ${stderr.trim().slice(-600)}`,
+      });
+    }
+    return { stdout, stderr, exitCode: Number(exitCode) };
+  },
+  Effect.scoped,
+  Effect.mapError((error) =>
+    error._tag === "ScenarioError" ? error : new ScenarioError({ message: String(error) }),
+  ),
+);
diff --git a/scripts/scenarios/start-app.ts b/scripts/scenarios/start-app.ts
new file mode 100644
index 0000000000000..5dee3f26c138c
--- /dev/null
+++ b/scripts/scenarios/start-app.ts
@@ -0,0 +1,266 @@
+#!/usr/bin/env node
+// The app command of e2e.config.ts: starts the dev stack of the checkout it runs in on a fresh
+// T3 home. e2e stops it with a signal, which ends the scope and the processes it started.
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
+import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import * as HostProcess from "@t3tools/shared/HostProcess";
+import * as NetService from "@t3tools/shared/Net";
+import * as Console from "effect/Console";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
+import * as SecureRandom from "effect/crypto/SecureRandom";
+import * as Schedule from "effect/Schedule";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
+import { Argument, Command } from "effect/cli";
+import { ChildProcess, ChildProcessSpawner } from "effect/process";
+
+import { ScenarioError } from "./shell.ts";
+
+// The dev runner's web port is 5733 plus an offset. Mirror of BASE_WEB_PORT in dev-runner.ts.
+const BASE_WEB_PORT = 5733;
+// The replay agent `vp run dev` registers: free, recorded turns through the real adapter.
+const REPLAY = { instanceId: "devReplay", model: "showcase" };
+// Generated text (titles) cannot go to the replay agent: the server swaps an ACP agent for the
+// first enabled real provider, else its default, Codex. So every provider it could fall back to
+// is off and Codex is a command that only fails: no run reaches a paid model.
+// Mirror of TEXT_GENERATION_FALLBACK_DRIVERS in shared/serverSettings.
+const REAL_PROVIDERS = [
+  "codex",
+  "claudeAgent",
+  "cursor",
+  "grok",
+  "muse",
+  "pi",
+  "opencode",
+  "antigravity",
+];
+
+// The server labels its environment with the host's name, probed through these commands.
+// Captures must not depend on, or show, the machine that made them.
+const HOST_LABEL_SHIM = `#!/bin/sh
+case "$*" in
+  "--pretty" | "--get ComputerName") echo "Scenario" ;;
+  *) for real in /usr/bin /usr/sbin /bin; do
+       [ -x "$real/$(basename "$0")" ] && exec "$real/$(basename "$0")" "$@"
+     done
+     exit 127 ;;
+esac
+`;
+
+const encodeSettings = Schema.encodeEffect(Schema.fromJsonString(Schema.Unknown));
+
+const prepareHome = Effect.fn("startApp.prepareHome")(function* (home: string) {
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  yield* fs.remove(home, { recursive: true, force: true });
+  yield* fs.makeDirectory(path.join(home, "userdata"), { recursive: true });
+  yield* fs.makeDirectory(path.join(home, "bin"));
+  for (const command of ["hostnamectl", "scutil"]) {
+    const shim = path.join(home, "bin", command);
+    yield* fs.writeFileString(shim, HOST_LABEL_SHIM);
+    yield* fs.chmod(shim, 0o755);
+  }
+  const noModel = path.join(home, "bin/no-model");
+  yield* fs.writeFileString(noModel, "#!/bin/sh\necho 'scenarios run no model' >&2\nexit 1\n");
+  yield* fs.chmod(noModel, 0o755);
+  yield* fs.writeFileString(
+    path.join(home, "userdata/settings.json"),
+    yield* encodeSettings({
+      defaultModelSelection: REPLAY,
+      providerInstances: Object.fromEntries(
+        REAL_PROVIDERS.map((driver) => [
+          driver,
+          {
+            driver,
+            enabled: false,
+            ...(driver === "codex" ? { config: { binaryPath: noModel } } : {}),
+          },
+        ]),
+      ),
+    }),
+  );
+});
+
+/** Starts a process in the caller's scope and hands each line it prints to `onLine`. */
+const start = Effect.fn("startApp.start")(function* (input: {
+  readonly cwd: string;
+  readonly command: string;
+  readonly args: ReadonlyArray<string>;
+  readonly env: NodeJS.ProcessEnv;
+  readonly onLine: (line: string) => Effect.Effect<void, never, FileSystem.FileSystem>;
+}) {
+  const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+  const child = yield* spawner.spawn(
+    ChildProcess.make(input.command, [...input.args], {
+      cwd: input.cwd,
+      env: input.env,
+      extendEnv: false,
+      stdin: "ignore",
+      stdout: "pipe",
+      stderr: "inherit",
+      forceKillAfter: "5 seconds",
+    }),
+  );
+  yield* child.stdout.pipe(
+    Stream.decodeText(),
+    Stream.splitLines,
+    Stream.runForEach(input.onLine),
+    Effect.ignore,
+    Effect.forkScoped,
+  );
+  return child;
+});
+
+const startApp = Effect.fn("startApp")(function* (input: {
+  readonly surface: "web" | "mobile";
+  readonly home: string;
+  readonly ports: ReadonlyArray<string>;
+}) {
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const net = yield* NetService.NetService;
+  const node = yield* HostProcess.ExecutablePath;
+  const checkout = yield* HostProcess.WorkingDirectory;
+  const hostEnvironment = yield* HostProcess.Environment;
+  yield* prepareHome(input.home);
+  const env = {
+    ...hostEnvironment,
+    PATH: `${path.join(input.home, "bin")}:${hostEnvironment.PATH ?? ""}`,
+    T3CODE_AUTO_BOOTSTRAP_PROJECT_FROM_CWD: "0",
+  };
+  const devRunner = (mode: string, args: ReadonlyArray<string>) => [
+    "scripts/dev-runner.ts",
+    mode,
+    "--home-dir",
+    input.home,
+    "--no-seed",
+    ...args,
+  ];
+
+  if (input.surface === "web") {
+    // e2e opens the app at this host, so the web server is told to bind exactly it. Left to its
+    // default, `localhost`, it binds ::1 alone on machines that resolve the name to IPv6 first.
+    const [host = "", webPort = ""] = input.ports;
+    const origin = `http://${host}:${webPort}`;
+    const serverPort = String(yield* net.reserveLoopbackPort());
+    const token = yield* (yield* SecureRandom.SecureRandom).uuidV4();
+    const ports = ["--port", serverPort, "--dev-url", origin];
+    const webEnv = { ...env, T3CODE_PORT_OFFSET: String(Number(webPort) - BASE_WEB_PORT) };
+    const server = yield* start({
+      cwd: checkout,
+      command: node,
+      args: devRunner("dev:server", ports),
+      env: {
+        ...webEnv,
+        T3CODE_DEV_ALLOWED_ORIGINS: origin,
+        // Makes the startup pairing link reusable, so every test can sign in with it.
+        T3CODE_DEV_AUTH_TOKEN: `${token}${token}`.replaceAll("-", ""),
+      },
+      onLine: (line) => {
+        const url = /pairingUrl:\s*(\S+)/.exec(line)?.[1];
+        if (url === undefined) return Console.log(line);
+        // The link is a credential: it goes to a file the tests read, never to the log.
+        const { pathname, search, hash } = new URL(url);
+        return fs
+          .writeFileString(path.join(input.home, "pairing-path"), `${pathname}${search}${hash}`)
+          .pipe(Effect.ignore);
+      },
+    });
+    const web = yield* start({
+      cwd: checkout,
+      command: node,
+      args: devRunner("dev:web", [...ports, "--", "--host", host]),
+      env: webEnv,
+      onLine: Console.log,
+    });
+    // A web server that came up on another loopback address would leave e2e waiting out its
+    // whole startup timeout; say so at once instead.
+    const boundElsewhere = Effect.gen(function* () {
+      const elsewhere = host === "::1" ? "127.0.0.1" : "::1";
+      if (yield* net.hasListenerOnHost(Number(webPort), host)) return yield* Effect.never;
+      if (!(yield* net.hasListenerOnHost(Number(webPort), elsewhere))) {
+        return yield* new ScenarioError({ message: "The web server is not listening yet." });
+      }
+      yield* Console.error(
+        `The web server listens on ${elsewhere}:${webPort}, not on ${host}: it ignored --host.`,
+      );
+      return 1;
+    }).pipe(
+      Effect.retry({
+        schedule: Schedule.spaced("1 second"),
+        while: (error) => error._tag === "ScenarioError",
+      }),
+    );
+    return yield* Effect.raceAll([server.exitCode, web.exitCode, boundElsewhere]);
+  }
+
+  // The device is another machine: the server listens on every interface, and Metro serves the
+  // dev client its JavaScript. Tests mint their own pairing links, so the startup one is dropped.
+  const [serverPort = "", metroPort = "", host = ""] = input.ports;
+  const server = yield* start({
+    cwd: checkout,
+    command: node,
+    args: devRunner("dev:server", ["--host", "0.0.0.0", "--port", serverPort]),
+    env,
+    onLine: (line) => (line.includes("pairingUrl:") ? Effect.void : Console.log(line)),
+  });
+  yield* net.hasListenerOnHost(Number(serverPort), "127.0.0.1").pipe(
+    Effect.filterOrFail(
+      (listening) => listening,
+      () => new ScenarioError({ message: "The server is not listening yet." }),
+    ),
+    Effect.retry({ schedule: Schedule.spaced("500 millis"), times: 600 }),
+  );
+  const metro = yield* start({
+    cwd: path.join(checkout, "apps/mobile"),
+    command: "npx",
+    args: ["expo", "start", "--dev-client", "--scheme", "t3code-dev", "--lan", "--port", metroPort],
+    env: {
+      ...env,
+      APP_VARIANT: "development",
+      CI: "1",
+      // Lazily fetched chunks sometimes arrive broken on pool devices.
+      EXPO_NO_METRO_LAZY: "1",
+      REACT_NATIVE_PACKAGER_HOSTNAME: host,
+    },
+    onLine: Console.log,
+  });
+  return yield* Effect.raceFirst(server.exitCode, metro.exitCode);
+});
+
+const command = Command.make(
+  "start-app",
+  {
+    surface: Argument.Literals("surface", ["web", "mobile"]).pipe(
+      Argument.withDescription(
+        "web: server and Vite. mobile: server on every interface and Metro.",
+      ),
+    ),
+    home: Argument.String("t3-home").pipe(Argument.withDescription("T3 home to recreate.")),
+    ports: Argument.String("port").pipe(
+      Argument.withDescription(
+        "web: <host> <web-port>. mobile: <server-port> <metro-port> <host>.",
+      ),
+      Argument.variadic(),
+    ),
+  },
+  (input) =>
+    startApp(input).pipe(
+      Effect.flatMap((exitCode) =>
+        Effect.sync(() => {
+          process.exitCode = Number(exitCode) || 1;
+        }),
+      ),
+    ),
+);
+
+if (import.meta.main) {
+  Command.run(command, { version: "0.0.0" }).pipe(
+    Effect.scoped,
+    Effect.provide([NodeServices.layer, NodeCrypto.layer, NetService.layer]),
+    NodeRuntime.runMain,
+  );
+}
diff --git a/scripts/scenarios/t3-mobile.ts b/scripts/scenarios/t3-mobile.ts
new file mode 100644
index 0000000000000..154030dd7abe6
--- /dev/null
+++ b/scripts/scenarios/t3-mobile.ts
@@ -0,0 +1,93 @@
+// `test` for iOS scenarios: e2e's mobile test plus `t3`, which seeds state like the web one and
+// opens the dev client paired with the scenario's server.
+import { test as base } from "@e2e-dev/mobile";
+import * as HostProcess from "@t3tools/shared/HostProcess";
+import { expect } from "e2e";
+import * as Effect from "effect/Effect";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+
+import { APP_DIR, MOBILE, MOBILE_T3_HOME } from "../e2e.config.ts";
+import { run, ScenarioError } from "./shell.ts";
+import { makeState, runPromise, type T3State } from "./t3.ts";
+
+const APP_ID = "com.t3tools.t3code.dev";
+const SCHEME = "t3code-dev";
+
+export interface MobileT3 extends T3State {
+  /** Installs the dev client if the device lacks it, loads it from Metro, and pairs it. */
+  readonly open: () => Promise<void>;
+}
+
+const decodePrepared = Schema.decodeUnknownEffect(
+  Schema.fromJsonString(Schema.Struct({ fingerprint: Schema.String })),
+);
+
+/** The dev client built for this checkout's native code, from the shared cache. */
+const devClientPath = Effect.gen(function* () {
+  const path = yield* Path.Path;
+  const prepared = yield* run(
+    yield* HostProcess.ExecutablePath,
+    ["scripts/mobile-native-client.ts", "ensure", "ios", "--prepare"],
+    { cwd: APP_DIR },
+  );
+  const { fingerprint } = yield* decodePrepared(prepared.stdout.trim().split("\n").at(-1) ?? "");
+  return path.join(
+    yield* HostProcess.HomeDirectory,
+    ".cache/t3code/native-clients/artifacts/ios/development",
+    fingerprint,
+    "T3CodeDev.app",
+  );
+});
+
+// A leased device is wiped when it returns to the pool, so one install and pairing last the run.
+let installed = false;
+let paired = false;
+
+export const test = base.extend<{ t3: MobileT3 }>({
+  t3: async ({ device, screen }, use) => {
+    const { state, cli, cleanup } = makeState(MOBILE_T3_HOME, {
+      T3CODE_PORT: String(MOBILE.serverPort),
+    });
+    const pairingUrl = Effect.gen(function* () {
+      const origin = `http://${MOBILE.host}:${MOBILE.serverPort}`;
+      const pairing = ["auth", "pairing", "create", "--ttl", "15m", "--label", "scenario"];
+      const created = yield* cli([...pairing, "--base-url", origin]);
+      const url = /Pair URL:\s*(\S+)/.exec(`${created.stdout}\n${created.stderr}`)?.[1];
+      return url ?? (yield* new ScenarioError({ message: "The server printed no pairing URL." }));
+    });
+    await use({
+      ...state,
+      open: async () => {
+        if (!installed) {
+          await device.installApp(await runPromise(devClientPath));
+          installed = true;
+        }
+        // iOS asks before a link opens another app.
+        const openLink = async (url: string) => {
+          await device.openLink(url, { app: APP_ID });
+          await device.alert("accept").catch(() => {});
+        };
+        const metro = encodeURIComponent(`http://${MOBILE.host}:${MOBILE.metroPort}`);
+        await openLink(
+          `${SCHEME}://expo-development-client/?url=${metro}&disableOnboarding=1&disableFab=1&disableAutoLaunch=1`,
+        );
+        // The first load bundles the app; the pairing link only works once it is on screen.
+        if (paired) return;
+        await expect(screen.getByRole("button", "Add environment")).toBeVisible({
+          timeout: 240_000,
+        });
+        const query = new URLSearchParams({
+          pairingUrl: await runPromise(pairingUrl),
+          autoConnect: "1",
+        });
+        await openLink(`${SCHEME}://connections/new?${query.toString()}`);
+        paired = true;
+      },
+    });
+    await runPromise(cleanup);
+  },
+});
+
+/** Test option for an iOS scenario: the web target skips it, and no device is leased for it. */
+export const IOS = { platforms: ["ios"] } as const;
diff --git a/scripts/scenarios/t3.ts b/scripts/scenarios/t3.ts
new file mode 100644
index 0000000000000..4df481ace8cf2
--- /dev/null
+++ b/scripts/scenarios/t3.ts
@@ -0,0 +1,140 @@
+// `test` for web scenarios: e2e's web test plus `t3`, which seeds state and opens the signed-in
+// app. `t3-mobile.ts` is the same for the iOS app.
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { test as base } from "@e2e-dev/web";
+import * as HostProcess from "@t3tools/shared/HostProcess";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+
+import { APP_DIR, T3_HOME } from "../e2e.config.ts";
+import { run } from "./shell.ts";
+
+export interface T3State {
+  /** Creates a git repository holding `files` and adds it as a project. Returns its path. */
+  readonly project: (title: string, files?: Readonly<Record<string, string>>) => Promise<string>;
+  /**
+   * Starts a thread in a project and plays one replayed turn per message before returning.
+   * `model` is a dev replay recording: showcase, todo-list, approval, question, multi-turn.
+   */
+  readonly thread: (input: {
+    readonly project: string;
+    readonly title: string;
+    readonly messages: ReadonlyArray<string>;
+    readonly model?: string;
+  }) => Promise<void>;
+}
+
+export interface T3 extends T3State {
+  /** Opens the app, signed in, at `path`. */
+  readonly open: (path?: string) => Promise<void>;
+}
+
+/** e2e's fixtures are promise functions; this is the one place an Effect becomes a promise. */
+export const runPromise = <A, E>(effect: Effect.Effect<A, E, NodeServices.NodeServices>) =>
+  Effect.runPromise(effect.pipe(Effect.provide(NodeServices.layer)));
+
+const decodeLaunched = Schema.decodeUnknownEffect(
+  Schema.fromJsonString(Schema.Struct({ threadId: Schema.String })),
+);
+
+/** State for the server on `home`, made through the app's own CLI: real events, not inserted rows. */
+export function makeState(home: string, env: NodeJS.ProcessEnv = {}) {
+  const cli = Effect.fn("scenario.cli")(function* (
+    args: ReadonlyArray<string>,
+    allowExit: ReadonlyArray<number> = [0],
+  ) {
+    const hostEnvironment = yield* HostProcess.Environment;
+    return yield* run(
+      yield* HostProcess.ExecutablePath,
+      ["apps/server/src/bin.ts", ...args, "--base-dir", home],
+      {
+        cwd: APP_DIR,
+        env: { PATH: hostEnvironment.PATH, HOME: hostEnvironment.HOME, ...env },
+        allowExit,
+      },
+    );
+  });
+  const projects: Array<string> = [];
+
+  const project = Effect.fn("scenario.project")(function* (
+    title: string,
+    files: Readonly<Record<string, string>>,
+  ) {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    // Its own folder per test: the server and this home outlive one test.
+    yield* fs.makeDirectory(path.join(home, "workspaces"), { recursive: true });
+    const parent = yield* fs.makeTempDirectory({
+      directory: path.join(home, "workspaces"),
+      prefix: "w-",
+    });
+    const workspace = path.join(parent, title);
+    for (const [file, content] of Object.entries({ "README.md": "", ...files })) {
+      yield* fs.makeDirectory(path.dirname(path.join(workspace, file)), { recursive: true });
+      yield* fs.writeFileString(path.join(workspace, file), content);
+    }
+    const git = (args: ReadonlyArray<string>) => run("git", args, { cwd: workspace });
+    const author = ["-c", "user.name=Scenario", "-c", "user.email=scenario@example.invalid"];
+    yield* git(["init", "--quiet", "--initial-branch=main"]);
+    yield* git(["add", "--all"]);
+    yield* git([...author, "commit", "--quiet", "--message", "Initial commit"]);
+    yield* cli(["project", "add", workspace, "--title", title]);
+    projects.push(workspace);
+    return workspace;
+  });
+
+  const thread = Effect.fn("scenario.thread")(function* (input: {
+    readonly project: string;
+    readonly title: string;
+    readonly messages: ReadonlyArray<string>;
+    readonly model?: string;
+  }) {
+    // Exit code 2 means the turn waits for an answer, which a scenario may want to start from.
+    const turn = (args: ReadonlyArray<string>) =>
+      cli(["thread", ...args, "--wait", "--json"], [0, 2]);
+    const [first = "Start", ...rest] = input.messages;
+    const replay = ["--provider", "devReplay", "--model", input.model ?? "multi-turn"];
+    const started = yield* turn(["start", input.project, first, "--title", input.title, ...replay]);
+    const { threadId } = yield* decodeLaunched(started.stdout);
+    for (const message of rest) yield* turn(["send", threadId, message]);
+  });
+
+  return {
+    cli,
+    state: {
+      project: (title, files = {}) => runPromise(project(title, files)),
+      thread: (input) => runPromise(thread(input)),
+    } satisfies T3State,
+    // The server outlives the test, so the next one must not see this one's projects.
+    cleanup: Effect.forEach(
+      projects,
+      (workspace) => cli(["project", "remove", workspace, "--force"]),
+      { discard: true },
+    ),
+  };
+}
+
+const readPairingPath = Effect.gen(function* () {
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  return yield* fs.readFileString(path.join(T3_HOME, "pairing-path"));
+});
+
+export const test = base.extend<{ t3: T3 }>({
+  t3: async ({ app }, use) => {
+    const { state, cleanup } = makeState(T3_HOME);
+    await use({
+      ...state,
+      open: async (path = "/") => {
+        await app.open(await runPromise(readPairingPath));
+        if (path !== "/") await app.open(path);
+      },
+    });
+    await runPromise(cleanup);
+  },
+});
+
+/** Test option for a web scenario: the iOS target skips it. */
+export const WEB = { platforms: ["web"] } as const;