From 472a228cd72ce3570a19d87a1b84e3fa2272415f Mon Sep 17 00:00:00 2001
From: Cheng Peng <cheng@block.xyz>
Date: Fri, 6 Nov 2026 01:13:02 -0800
Subject: [PATCH 1/9] fix(mentions): show the mention after a link that ends at
 CJK punctuation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A person mentioned right after a bare link and fullwidth or CJK
punctuation, as in `https://x.com，@Honey`, was notified, but the
timeline showed `@Honey` as plain text. The mention display still ended
a URL only at whitespace, so the name counted as part of the link, while
rendered links end at CJK punctuation since #2404. Bare URLs there now
end with the pattern messageLinkParts uses, moved to
relay/message-content.ts exactly as #2772 moves it. `<url>` and `](url)`
keep CJK punctuation as before.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Cheng Peng <cheng@block.xyz>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/features/messages/MessageMarkdown.test.tsx |  9 +++++++++
 src/features/messages/message-link-parts.ts    | 12 ++++++++----
 src/features/messages/profile-mentions.test.ts | 16 ++++++++++++++++
 src/features/messages/profile-mentions.ts      | 11 ++++++++---
 src/features/relay/message-content.ts          |  6 ++++++
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/features/messages/MessageMarkdown.test.tsx b/src/features/messages/MessageMarkdown.test.tsx
index 994460bebd..3da6cec985 100644
--- a/src/features/messages/MessageMarkdown.test.tsx
+++ b/src/features/messages/MessageMarkdown.test.tsx
@@ -707,6 +707,15 @@ describe("Markdown profile mentions", () => {
     },
   );
 
+  it("renders a mention after a bare link that ends at CJK punctuation", () => {
+    const html = render("看这个 https://example.test，@Mic");
+    expect([...html.matchAll(/href="([^"]*)"/g)].map((m) => m[1])).toEqual([
+      "https://example.test/",
+    ]);
+    expect(html).toContain('，<button type="button"');
+    expect(html).toContain('aria-label="View Mic profile"');
+  });
+
   it.each<[string, RenderOptions]>([
     ["no opener", { canOpenLink: undefined }],
     ["a refusing opener", { canOpenLink: () => false }],
diff --git a/src/features/messages/message-link-parts.ts b/src/features/messages/message-link-parts.ts
index fe717199d7..c5e7e54524 100644
--- a/src/features/messages/message-link-parts.ts
+++ b/src/features/messages/message-link-parts.ts
@@ -1,4 +1,5 @@
 import { parseBuzzLink } from "../navigation/buzz-links";
+import { BARE_URL_REST } from "../relay/message-content";
 
 type LinkPart = { text: string; url?: string; label?: string };
 
@@ -82,6 +83,12 @@ function closingParenthesis(content: string, start: number, escaped: boolean) {
   return undefined;
 }
 
+const linkPattern = new RegExp(
+  /(?<!\\)\[((?:\\[^\r\n]|[^[\]\\\r\n])+)\]\\?\(|<(?:https?|buzz):\/\/[^\s<>"`]+>|(?:https?|buzz):\/\//
+    .source + BARE_URL_REST,
+  "gi",
+);
+
 /** Display-only link syntax. Message storage and navigation keep the original destination. */
 export function messageLinkParts(
   content: string,
@@ -95,10 +102,7 @@ export function messageLinkParts(
 ): LinkPart[] {
   const parts: LinkPart[] = [];
   let offset = 0;
-  // CJK punctuation ends a bare URL, except 。．｡ before a host label (URLs read them as dots).
-  for (const match of content.matchAll(
-    /(?<!\\)\[((?:\\[^\r\n]|[^[\]\\\r\n])+)\]\\?\(|<(?:https?|buzz):\/\/[^\s<>"`]+>|(?:https?|buzz):\/\/(?:[^\s<>"`:/?#，。、．！？；：＂＇（）［］｛｝「」『』《》【】〈〉〔〕〖〗〝〞〟｡｢｣､“”‘’…～〜]|[。．｡](?=[a-z\d-]+(?![a-z\d-]|:\/\/)))*(?:[:/?#][^\s<>"`，。、．！？；：＂＇（）［］｛｝「」『』《》【】〈〉〔〕〖〗〝〞〟｡｢｣､“”‘’…～〜]*)?/gi,
-  )) {
+  for (const match of content.matchAll(linkPattern)) {
     if (match.index < offset) continue;
     if (match[1] !== undefined) {
       const start = match.index + match[0].length;
diff --git a/src/features/messages/profile-mentions.test.ts b/src/features/messages/profile-mentions.test.ts
index f954f5ecfd..4ff217254f 100644
--- a/src/features/messages/profile-mentions.test.ts
+++ b/src/features/messages/profile-mentions.test.ts
@@ -50,6 +50,22 @@ it.each([
 ])("leaves code/link/non-token context literal: %s", (content) => {
   expect(parts(content)).toEqual([{ text: content }]);
 });
+it("binds a mention after a bare link that ends at CJK punctuation, but not inside links", () => {
+  for (const content of [
+    "https://example.test，@Mic",
+    "看这个 https://example.test/a。@Mic",
+    "(https://example.test，@Mic)",
+  ])
+    expect(parts(content).filter((part) => part.target)).toEqual([
+      { text: "@Mic", target: profileTarget(mic) },
+    ]);
+  for (const content of [
+    "https://example.test/文档?to=@Mic",
+    "<https://example.test/a，@Mic>",
+    "[[a]](https://example.test/a，@Mic)",
+  ])
+    expect(parts(content)).toEqual([{ text: content }]);
+});
 it("recognizes prose after a closed code span even when the span contained HTTPS", () => {
   expect(
     parts("`https://example.test @Mic` then @Mic").filter((p) => p.target),
diff --git a/src/features/messages/profile-mentions.ts b/src/features/messages/profile-mentions.ts
index 40f4248e9c..410bca4e89 100644
--- a/src/features/messages/profile-mentions.ts
+++ b/src/features/messages/profile-mentions.ts
@@ -1,5 +1,6 @@
 import type { AgentLibrary } from "../agents/library";
 import type { ChannelMessage, Profile } from "../relay/contracts";
+import { BARE_URL_REST } from "../relay/message-content";
 import { profileTarget } from "../profiles/target";
 
 /** The names a person's signed prose mention binds by: their shown name and,
@@ -95,6 +96,11 @@ export function profileMentionParts(
   return parts.length ? parts : [{ text }];
 }
 
+const urlScheme = /^(?:[a-z][a-z\d+.-]*:\/\/|mailto:|nostr:)/.source;
+/** Bare URLs end where rendered ones do; `<url>` and `](url)` keep CJK punctuation. */
+const wrappedUrl = new RegExp(urlScheme + /[^\s<>`]+/.source, "i");
+const bareUrl = new RegExp(urlScheme + BARE_URL_REST, "i");
+
 // Evaluate exclusions on the full body BEFORE splitting link/emoji rendering.
 // Deliberately conservative for incomplete code/link syntax; not a Markdown parser.
 function protectedTextEnd(text: string, start: number): number {
@@ -132,8 +138,7 @@ function protectedTextEnd(text: string, start: number): number {
     const link = /^!?\[[^\]\n]*\](?:\([^\n]*?\)|\[[^\]\n]*\])/.exec(rest)?.[0];
     if (link) return start + link.length;
   }
-  const url = /^(?:[a-z][a-z\d+.-]*:\/\/|mailto:|nostr:)[^\s<>`]+/i.exec(
-    rest,
-  )?.[0];
+  const wrapped = text[start - 1] === "<" || text.endsWith("](", start);
+  const url = (wrapped ? wrappedUrl : bareUrl).exec(rest)?.[0];
   return url ? start + url.length : start;
 }
diff --git a/src/features/relay/message-content.ts b/src/features/relay/message-content.ts
index 35d27882e4..18822d779b 100644
--- a/src/features/relay/message-content.ts
+++ b/src/features/relay/message-content.ts
@@ -23,6 +23,12 @@ export function safeMessageUrl(value: string): string | undefined {
   return url?.startsWith("https:") ? url : undefined;
 }
 
+/** A bare URL after `scheme://`, as a case-insensitive pattern. CJK punctuation
+ * ends it, except 。．｡ before a host label (URLs read them as dots). */
+export const BARE_URL_REST =
+  /(?:[^\s<>"`:/?#，。、．！？；：＂＇（）［］｛｝「」『』《》【】〈〉〔〕〖〗〝〞〟｡｢｣､“”‘’…～〜]|[。．｡](?=[a-z\d-]+(?![a-z\d-]|:\/\/)))*(?:[:/?#][^\s<>"`，。、．！？；：＂＇（）［］｛｝「」『』《》【】〈〉〔〕〖〗〝〞〟｡｢｣､“”‘’…～〜]*)?/
+    .source;
+
 type MarkdownNode = {
   type: string;
   value?: string;

From 3b7ff04d4f7f2346dd81f3c0b40e345bd84c8eb2 Mon Sep 17 00:00:00 2001
From: Cheng Peng <cheng@block.xyz>
Date: Fri, 6 Nov 2026 01:42:48 -0800
Subject: [PATCH 2/9] fix(mentions): keep names unbound in spaced and escaped
 link URLs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The first commit kept a URL whole only right after `<` or `](`. A
Markdown destination after a line break or space, as in
`[a](\nhttps://x.com/a，@Honey)` or `[[a]]( https://x.com/a，@Honey)`,
or after a pasted `]\(`, ended at the CJK punctuation instead. Edit then
turned `@Honey` into a mention link inside the URL, which would change
it on save, and Copy did the same for `]\(`. The timeline shows these as
one link, as before. The check now accepts the `]\(` opener and the
whitespace that messageLinkParts accepts, the same lookbehind #2772 uses
in emoji.ts.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Cheng Peng <cheng@block.xyz>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/features/messages/profile-mentions.test.ts | 2 ++
 src/features/messages/profile-mentions.ts      | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/features/messages/profile-mentions.test.ts b/src/features/messages/profile-mentions.test.ts
index 4ff217254f..1565e811e4 100644
--- a/src/features/messages/profile-mentions.test.ts
+++ b/src/features/messages/profile-mentions.test.ts
@@ -63,6 +63,8 @@ it("binds a mention after a bare link that ends at CJK punctuation, but not insi
     "https://example.test/文档?to=@Mic",
     "<https://example.test/a，@Mic>",
     "[[a]](https://example.test/a，@Mic)",
+    "[a](\nhttps://example.test/a，@Mic)",
+    String.raw`[a]\(https://example.test/a，@Mic\)`,
   ])
     expect(parts(content)).toEqual([{ text: content }]);
 });
diff --git a/src/features/messages/profile-mentions.ts b/src/features/messages/profile-mentions.ts
index 410bca4e89..24fba0bda0 100644
--- a/src/features/messages/profile-mentions.ts
+++ b/src/features/messages/profile-mentions.ts
@@ -97,7 +97,9 @@ export function profileMentionParts(
 }
 
 const urlScheme = /^(?:[a-z][a-z\d+.-]*:\/\/|mailto:|nostr:)/.source;
-/** Bare URLs end where rendered ones do; `<url>` and `](url)` keep CJK punctuation. */
+/** Bare URLs end where rendered ones do. A URL after `<`, or after `](` or a
+ * pasted `]\(` and any whitespace, keeps CJK punctuation. */
+const wrapped = /(?<=<|\]\\?\(\s*)/y;
 const wrappedUrl = new RegExp(urlScheme + /[^\s<>`]+/.source, "i");
 const bareUrl = new RegExp(urlScheme + BARE_URL_REST, "i");
 
@@ -138,7 +140,7 @@ function protectedTextEnd(text: string, start: number): number {
     const link = /^!?\[[^\]\n]*\](?:\([^\n]*?\)|\[[^\]\n]*\])/.exec(rest)?.[0];
     if (link) return start + link.length;
   }
-  const wrapped = text[start - 1] === "<" || text.endsWith("](", start);
-  const url = (wrapped ? wrappedUrl : bareUrl).exec(rest)?.[0];
+  wrapped.lastIndex = start;
+  const url = (wrapped.test(text) ? wrappedUrl : bareUrl).exec(rest)?.[0];
   return url ? start + url.length : start;
 }

From 39ca31493aed4772d21885b6d078f334eb9eb3f7 Mon Sep 17 00:00:00 2001
From: Cheng Peng <cheng@block.xyz>
Date: Fri, 6 Nov 2026 02:14:04 -0800
Subject: [PATCH 3/9] fix(mentions): keep a link after CJK punctuation whole,
 in linear time
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two problems in the URL check. A link right after the CJK punctuation
that ends a bare link was not seen as a URL, so in
`https://a.test，https://b.test/?to=@Honey` Edit and Copy turned the
`@Honey` inside the second link into a mention link, and
`https://a.test，nostr:npub1…?to=@Honey` showed a mention inside the
nostr text. A URL can now start after any character a bare URL cannot
contain, which also covers a link right after `：`, `“` or `>`. And the
`<` and `](` lookbehind ran at every whitespace boundary and rescanned
the whole run, so 100,000 spaces took about 5 s. It now runs only where
a URL starts, about 6 ms, as on main. The negative cases move into the
existing table.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Cheng Peng <cheng@block.xyz>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/features/messages/profile-mentions.test.ts | 16 +++++++---------
 src/features/messages/profile-mentions.ts      | 13 +++++++++----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/features/messages/profile-mentions.test.ts b/src/features/messages/profile-mentions.test.ts
index 1565e811e4..51c3b55a57 100644
--- a/src/features/messages/profile-mentions.test.ts
+++ b/src/features/messages/profile-mentions.test.ts
@@ -47,10 +47,16 @@ it.each([
   "\\@Mic",
   "@Mic_foo",
   "@Micé",
+  "https://example.test/文档?to=@Mic",
+  "https://example.test，https://example.test/b?to=@Mic",
+  "<https://example.test/a，@Mic>",
+  "[[a]](https://example.test/a，@Mic)",
+  "[a](\nhttps://example.test/a，@Mic)",
+  String.raw`[a]\(https://example.test/a，@Mic\)`,
 ])("leaves code/link/non-token context literal: %s", (content) => {
   expect(parts(content)).toEqual([{ text: content }]);
 });
-it("binds a mention after a bare link that ends at CJK punctuation, but not inside links", () => {
+it("binds a mention after a bare link that ends at CJK punctuation", () => {
   for (const content of [
     "https://example.test，@Mic",
     "看这个 https://example.test/a。@Mic",
@@ -59,14 +65,6 @@ it("binds a mention after a bare link that ends at CJK punctuation, but not insi
     expect(parts(content).filter((part) => part.target)).toEqual([
       { text: "@Mic", target: profileTarget(mic) },
     ]);
-  for (const content of [
-    "https://example.test/文档?to=@Mic",
-    "<https://example.test/a，@Mic>",
-    "[[a]](https://example.test/a，@Mic)",
-    "[a](\nhttps://example.test/a，@Mic)",
-    String.raw`[a]\(https://example.test/a，@Mic\)`,
-  ])
-    expect(parts(content)).toEqual([{ text: content }]);
 });
 it("recognizes prose after a closed code span even when the span contained HTTPS", () => {
   expect(
diff --git a/src/features/messages/profile-mentions.ts b/src/features/messages/profile-mentions.ts
index 24fba0bda0..57dcd0d8f0 100644
--- a/src/features/messages/profile-mentions.ts
+++ b/src/features/messages/profile-mentions.ts
@@ -97,8 +97,10 @@ export function profileMentionParts(
 }
 
 const urlScheme = /^(?:[a-z][a-z\d+.-]*:\/\/|mailto:|nostr:)/.source;
-/** Bare URLs end where rendered ones do. A URL after `<`, or after `](` or a
- * pasted `]\(` and any whitespace, keeps CJK punctuation. */
+/** Bare URLs end where rendered ones do, and another can start right there. A
+ * URL after `<`, or after `](` or a pasted `]\(` and any whitespace, keeps
+ * CJK punctuation. */
+const urlChar = new RegExp(`^(?:${BARE_URL_REST})$`, "i");
 const wrapped = /(?<=<|\]\\?\(\s*)/y;
 const wrappedUrl = new RegExp(urlScheme + /[^\s<>`]+/.source, "i");
 const bareUrl = new RegExp(urlScheme + BARE_URL_REST, "i");
@@ -128,7 +130,8 @@ function protectedTextEnd(text: string, start: number): number {
       return match ? match.index + match[0].length : text.length;
     }
   }
-  const boundary = start === 0 || /[\s<([]/.test(text[start - 1] ?? "");
+  const prev = text[start - 1] ?? "";
+  const boundary = start === 0 || /[\s<([]/.test(prev) || !urlChar.test(prev);
   if (char !== "`" && char !== "~" && char !== "[" && char !== "!" && !boundary)
     return start;
   const span = /^(?:`+|~{3,})/.exec(rest)?.[0];
@@ -140,7 +143,9 @@ function protectedTextEnd(text: string, start: number): number {
     const link = /^!?\[[^\]\n]*\](?:\([^\n]*?\)|\[[^\]\n]*\])/.exec(rest)?.[0];
     if (link) return start + link.length;
   }
+  const bare = bareUrl.exec(rest)?.[0];
+  // The lookbehind rescans whitespace, so test it only where a URL starts.
   wrapped.lastIndex = start;
-  const url = (wrapped.test(text) ? wrappedUrl : bareUrl).exec(rest)?.[0];
+  const url = bare && wrapped.test(text) ? wrappedUrl.exec(rest)?.[0] : bare;
   return url ? start + url.length : start;
 }

From 56ca07e6edaba478c9f9cd4224b5a81e9ab9cc93 Mon Sep 17 00:00:00 2001
From: Cheng Peng <cheng@block.xyz>
Date: Fri, 6 Nov 2026 02:15:02 -0800
Subject: [PATCH 4/9] refactor(messages): spell out A-Z in the shared bare-URL
 pattern

#2772 now splits emoji text with a case-sensitive regex, so its copy of
BARE_URL_REST spells out A-Z in the host label check instead of relying
on the i flag. This takes the same hunk, so relay/message-content.ts
stays byte for byte the same in both PRs. messageLinkParts and the
mention check both use the i flag, so neither changes what it matches.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Cheng Peng <cheng@block.xyz>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/features/relay/message-content.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/features/relay/message-content.ts b/src/features/relay/message-content.ts
index 18822d779b..f14d3d435e 100644
--- a/src/features/relay/message-content.ts
+++ b/src/features/relay/message-content.ts
@@ -23,10 +23,10 @@ export function safeMessageUrl(value: string): string | undefined {
   return url?.startsWith("https:") ? url : undefined;
 }
 
-/** A bare URL after `scheme://`, as a case-insensitive pattern. CJK punctuation
- * ends it, except 。．｡ before a host label (URLs read them as dots). */
+/** A bare URL after `scheme://`. CJK punctuation ends it, except 。．｡ before
+ * a host label (URLs read them as dots). */
 export const BARE_URL_REST =
-  /(?:[^\s<>"`:/?#，。、．！？；：＂＇（）［］｛｝「」『』《》【】〈〉〔〕〖〗〝〞〟｡｢｣､“”‘’…～〜]|[。．｡](?=[a-z\d-]+(?![a-z\d-]|:\/\/)))*(?:[:/?#][^\s<>"`，。、．！？；：＂＇（）［］｛｝「」『』《》【】〈〉〔〕〖〗〝〞〟｡｢｣､“”‘’…～〜]*)?/
+  /(?:[^\s<>"`:/?#，。、．！？；：＂＇（）［］｛｝「」『』《》【】〈〉〔〕〖〗〝〞〟｡｢｣､“”‘’…～〜]|[。．｡](?=[a-zA-Z\d-]+(?![a-zA-Z\d-]|:\/\/)))*(?:[:/?#][^\s<>"`，。、．！？；：＂＇（）［］｛｝「」『』《》【】〈〉〔〕〖〗〝〞〟｡｢｣､“”‘’…～〜]*)?/
     .source;
 
 type MarkdownNode = {

From 1fe736cc31d868f85d3e342d9b3c4899493a2dd0 Mon Sep 17 00:00:00 2001
From: Cheng Peng <cheng@block.xyz>
Date: Mon, 9 Nov 2026 09:35:27 -0800
Subject: [PATCH 5/9] fix(mentions): keep a reference definition's URL whole on
 Edit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Opening Edit turned a bound name into a profile link. Now that a bare URL
ends at CJK punctuation, `[ref]: https://x.test/a，@Sam` exposed the name,
and saving put the link inside the definition's URL. Edit now skips names
inside reference definitions, which the Markdown parser finds, as the
renderer and Copy already treat definitions as literal.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Cheng Peng <cheng@block.xyz>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/features/messages/message-edit.test.ts | 22 ++++++++++++++
 src/features/messages/message-edit.ts      | 35 ++++++++++++++++------
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/features/messages/message-edit.test.ts b/src/features/messages/message-edit.test.ts
index 422a57bb82..8db67a09e5 100644
--- a/src/features/messages/message-edit.test.ts
+++ b/src/features/messages/message-edit.test.ts
@@ -1,6 +1,7 @@
 import { assert, describe, expect, it } from "vitest";
 import { shareMessageRows } from "../relay/row-identity";
 import { foldMessages } from "../relay/fold";
+import { scanMarkdown } from "../relay/message-content";
 import { profileTarget } from "../profiles/target";
 import { messageEditText, validateMessageEdit } from "./message-edit";
 import type { EventData } from "../relay/events";
@@ -75,6 +76,27 @@ describe("message edit round trips", () => {
     const row = firstRow([{ ...original, tags: [["h", "room"]] }]);
     expect(messageEditText(row, profiles)).toBe(original.content);
   });
+  it("keeps a reference definition's URL when an edit changes only prose", () => {
+    const definition = "[ref]: https://example.test/a，@Sam";
+    const sent = {
+      ...original,
+      content: `https://example.test，@Sam look at [ref].\n\n> ${definition}\n\n${definition}`,
+      tags: [
+        ["h", "room"],
+        ["p", person],
+      ],
+    };
+    const draft = messageEditText(firstRow([sent]), profiles);
+    expect(draft).toBe(
+      sent.content.replace(
+        "@Sam look",
+        `[@Sam](${profileTarget(person)}) look`,
+      ),
+    );
+    expect(
+      scanMarkdown(draft.replace("look", "see")).definitions.get("ref"),
+    ).toBe("https://example.test/a，@Sam");
+  });
 });
 
 it("rejects changed attachment links while allowing text-only edits", () => {
diff --git a/src/features/messages/message-edit.ts b/src/features/messages/message-edit.ts
index d7b9bf891f..3dc2108fff 100644
--- a/src/features/messages/message-edit.ts
+++ b/src/features/messages/message-edit.ts
@@ -1,4 +1,7 @@
-import { projectMarkdownAttachments } from "../relay/message-content";
+import {
+  projectMarkdownAttachments,
+  scanMarkdown,
+} from "../relay/message-content";
 import type { AgentLibrary } from "../agents/library";
 import type { ChannelMessage, Profile } from "../relay/contracts";
 import { npubEncode } from "nostr-tools/nip19";
@@ -27,14 +30,28 @@ export function messageEditText(
   agents: AgentLibrary["identities"] = [],
 ) {
   const { attachmentSeams: _seams, ...source } = row;
-  return profileMentionParts(
-    { ...source, content: row.sourceContent ?? row.content },
-    profiles,
-    agents,
-  )
-    .map(({ text, target }) =>
-      target ? profileMentionLink(text, target) : text,
-    )
+  const content = row.sourceContent ?? row.content;
+  // A link inside a reference definition would become part of its URL.
+  const definitions: { start: number; end: number }[] = [];
+  const pending = [scanMarkdown(content).tree];
+  for (let node = pending.pop(); node; node = pending.pop()) {
+    const start = node.position?.start.offset;
+    const end = node.position?.end.offset;
+    if (node.type === "definition") {
+      if (start !== undefined && end !== undefined)
+        definitions.push({ start, end });
+    } else for (const child of node.children ?? []) pending.push(child);
+  }
+  let offset = 0;
+  return profileMentionParts({ ...source, content }, profiles, agents)
+    .map(({ text, target }) => {
+      const start = offset;
+      offset += text.length;
+      return target &&
+        !definitions.some((range) => start < range.end && offset > range.start)
+        ? profileMentionLink(text, target)
+        : text;
+    })
     .join("");
 }
 

From 104a0bf70c2e66ac38bc29bacae01cf433c74447 Mon Sep 17 00:00:00 2001
From: Cheng Peng <cheng@block.xyz>
Date: Mon, 9 Nov 2026 09:50:43 -0800
Subject: [PATCH 6/9] fix(mentions): skip the Markdown parse on Edit when no
 name is bound

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Cheng Peng <cheng@block.xyz>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/features/messages/message-edit.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/features/messages/message-edit.ts b/src/features/messages/message-edit.ts
index 3dc2108fff..c7a9a9bbc1 100644
--- a/src/features/messages/message-edit.ts
+++ b/src/features/messages/message-edit.ts
@@ -31,6 +31,8 @@ export function messageEditText(
 ) {
   const { attachmentSeams: _seams, ...source } = row;
   const content = row.sourceContent ?? row.content;
+  const parts = profileMentionParts({ ...source, content }, profiles, agents);
+  if (!parts.some((part) => part.target)) return content;
   // A link inside a reference definition would become part of its URL.
   const definitions: { start: number; end: number }[] = [];
   const pending = [scanMarkdown(content).tree];
@@ -43,7 +45,7 @@ export function messageEditText(
     } else for (const child of node.children ?? []) pending.push(child);
   }
   let offset = 0;
-  return profileMentionParts({ ...source, content }, profiles, agents)
+  return parts
     .map(({ text, target }) => {
       const start = offset;
       offset += text.length;

From 506f3c348534fe14334f3a652f66ee0fb908da9c Mon Sep 17 00:00:00 2001
From: Cheng Peng <cheng@block.xyz>
Date: Mon, 9 Nov 2026 09:53:39 -0800
Subject: [PATCH 7/9] refactor(mentions): find Edit's reference definitions
 with definitionRanges

Edit now uses the `definitionRanges` helper that #2772 adds for emoji,
copied byte for byte, instead of walking the Markdown tree itself. The
helper skips the parse when the body has no `]:`, so the separate early
return for bodies without a bound name goes away.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Cheng Peng <cheng@block.xyz>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/features/messages/message-edit.ts | 17 +++--------------
 src/features/relay/message-content.ts | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/features/messages/message-edit.ts b/src/features/messages/message-edit.ts
index c7a9a9bbc1..90cbfcb405 100644
--- a/src/features/messages/message-edit.ts
+++ b/src/features/messages/message-edit.ts
@@ -1,6 +1,6 @@
 import {
+  definitionRanges,
   projectMarkdownAttachments,
-  scanMarkdown,
 } from "../relay/message-content";
 import type { AgentLibrary } from "../agents/library";
 import type { ChannelMessage, Profile } from "../relay/contracts";
@@ -31,21 +31,10 @@ export function messageEditText(
 ) {
   const { attachmentSeams: _seams, ...source } = row;
   const content = row.sourceContent ?? row.content;
-  const parts = profileMentionParts({ ...source, content }, profiles, agents);
-  if (!parts.some((part) => part.target)) return content;
   // A link inside a reference definition would become part of its URL.
-  const definitions: { start: number; end: number }[] = [];
-  const pending = [scanMarkdown(content).tree];
-  for (let node = pending.pop(); node; node = pending.pop()) {
-    const start = node.position?.start.offset;
-    const end = node.position?.end.offset;
-    if (node.type === "definition") {
-      if (start !== undefined && end !== undefined)
-        definitions.push({ start, end });
-    } else for (const child of node.children ?? []) pending.push(child);
-  }
+  const definitions = definitionRanges(content);
   let offset = 0;
-  return parts
+  return profileMentionParts({ ...source, content }, profiles, agents)
     .map(({ text, target }) => {
       const start = offset;
       offset += text.length;
diff --git a/src/features/relay/message-content.ts b/src/features/relay/message-content.ts
index f14d3d435e..d942eac9f6 100644
--- a/src/features/relay/message-content.ts
+++ b/src/features/relay/message-content.ts
@@ -118,6 +118,29 @@ export function scanMarkdown(content: string): MarkdownScan {
   return { tree, tooDeep, definitions, images, links };
 }
 
+/** Source ranges of reference definitions, in order. They render no text. */
+export function definitionRanges(
+  content: string,
+): readonly { start: number; end: number }[] {
+  if (!content.includes("]:") || content.length > MAX_MARKDOWN_LENGTH)
+    return [];
+  const { tree, tooDeep } = scanMarkdown(content);
+  if (tooDeep) return [];
+  const ranges: { start: number; end: number }[] = [];
+  const pending = [tree];
+  for (let node = pending.pop(); node; node = pending.pop()) {
+    const start = node.position?.start.offset;
+    const end = node.position?.end.offset;
+    if (node.type === "definition" && start !== undefined && end !== undefined)
+      ranges.push({ start, end });
+    for (let index = (node.children?.length ?? 0) - 1; index >= 0; index--) {
+      const child = node.children?.[index];
+      if (child) pending.push(child);
+    }
+  }
+  return ranges;
+}
+
 function resolvedNodeUrl(
   node: MarkdownNode,
   definitions: ReadonlyMap<string, string>,

From 0af467bb1cc5178d91546819c88e529adaa868f1 Mon Sep 17 00:00:00 2001
From: Cheng Peng <cheng@block.xyz>
Date: Mon, 9 Nov 2026 13:02:22 -0800
Subject: [PATCH 8/9] fix(mentions): keep a deeply nested reference
 definition's URL on Edit

`definitionRanges` gave up on Markdown nested past the depth limit, so
Edit turned a name inside a definition under 101 quote levels into a
link inside its URL. Take #2772's fix, which walks the whole tree, byte
for byte, and cover that case in the Edit round trip.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Cheng Peng <cheng@block.xyz>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/features/messages/message-edit.test.ts | 2 +-
 src/features/relay/message-content.ts      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/features/messages/message-edit.test.ts b/src/features/messages/message-edit.test.ts
index 8db67a09e5..4c050474e2 100644
--- a/src/features/messages/message-edit.test.ts
+++ b/src/features/messages/message-edit.test.ts
@@ -80,7 +80,7 @@ describe("message edit round trips", () => {
     const definition = "[ref]: https://example.test/a，@Sam";
     const sent = {
       ...original,
-      content: `https://example.test，@Sam look at [ref].\n\n> ${definition}\n\n${definition}`,
+      content: `https://example.test，@Sam look at [ref].\n\n> ${definition}\n\n${definition}\n\n${"> ".repeat(101)}${definition}`,
       tags: [
         ["h", "room"],
         ["p", person],
diff --git a/src/features/relay/message-content.ts b/src/features/relay/message-content.ts
index d942eac9f6..a035acd2f4 100644
--- a/src/features/relay/message-content.ts
+++ b/src/features/relay/message-content.ts
@@ -124,8 +124,7 @@ export function definitionRanges(
 ): readonly { start: number; end: number }[] {
   if (!content.includes("]:") || content.length > MAX_MARKDOWN_LENGTH)
     return [];
-  const { tree, tooDeep } = scanMarkdown(content);
-  if (tooDeep) return [];
+  const { tree } = scanMarkdown(content);
   const ranges: { start: number; end: number }[] = [];
   const pending = [tree];
   for (let node = pending.pop(); node; node = pending.pop()) {

From 0a7f97f4fcca79c879220d67965fd43b2362e467 Mon Sep 17 00:00:00 2001
From: Cheng Peng <cheng@block.xyz>
Date: Tue, 10 Nov 2026 18:55:39 -0800
Subject: [PATCH 9/9] =?UTF-8?q?=F0=9F=A4=96=20Drop=20definitionRanges,=20w?=
 =?UTF-8?q?hich=20this=20branch=20no=20longer=20uses?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After the main merge, messageEditText skips reference definitions
through main's literal ranges.

Signed-off-by: Cheng Peng <cheng@block.xyz>
Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/features/relay/message-content.ts | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/features/relay/message-content.ts b/src/features/relay/message-content.ts
index a035acd2f4..f14d3d435e 100644
--- a/src/features/relay/message-content.ts
+++ b/src/features/relay/message-content.ts
@@ -118,28 +118,6 @@ export function scanMarkdown(content: string): MarkdownScan {
   return { tree, tooDeep, definitions, images, links };
 }
 
-/** Source ranges of reference definitions, in order. They render no text. */
-export function definitionRanges(
-  content: string,
-): readonly { start: number; end: number }[] {
-  if (!content.includes("]:") || content.length > MAX_MARKDOWN_LENGTH)
-    return [];
-  const { tree } = scanMarkdown(content);
-  const ranges: { start: number; end: number }[] = [];
-  const pending = [tree];
-  for (let node = pending.pop(); node; node = pending.pop()) {
-    const start = node.position?.start.offset;
-    const end = node.position?.end.offset;
-    if (node.type === "definition" && start !== undefined && end !== undefined)
-      ranges.push({ start, end });
-    for (let index = (node.children?.length ?? 0) - 1; index >= 0; index--) {
-      const child = node.children?.[index];
-      if (child) pending.push(child);
-    }
-  }
-  return ranges;
-}
-
 function resolvedNodeUrl(
   node: MarkdownNode,
   definitions: ReadonlyMap<string, string>,