fix(feishu): preserve sender identity and resolve mentions in merge_forward messages

Abel Xiao · claude · xiaoxinpan · commit d353baafbd0f · 2026-05-05T15:15:49.000+08:00
Prepend each sub-message with its sender open_id and resolve @_user_N
mention placeholders back to real names via the mentions array in the
Feishu API response.

- Sort mentions by key length descending to prevent partial-match
  collisions (e.g. @_user_1 matching @_user_10)
- Normalize mention IDs for both string and object shapes, with
  union_id fallback
- Use callback replacement to avoid $ substitution in display names

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/extensions/feishu/src/bot-content.ts b/extensions/feishu/src/bot-content.ts
@@ -214,6 +214,11 @@ export function parseMergeForwardContent(params: { content: string; log?: Feishu
     msg_type?: string;
     body?: { content?: string };
     sender?: { id?: string };
+    mentions?: Array<{
+      key?: string;
+      id?: string | { open_id?: string; user_id?: string; union_id?: string };
+      name?: string;
+    }>;
     upper_message_id?: string;
     create_time?: string;
   }>;
@@ -238,7 +243,27 @@ export function parseMergeForwardContent(params: { content: string; log?: Feishu
 
   const lines = ["[Merged and Forwarded Messages]"];
   for (const item of subMessages.slice(0, maxMessages)) {
-    lines.push(`- ${formatSubMessageContent(item.body?.content || "", item.msg_type || "text")}`);
+    const formatted = formatSubMessageContent(item.body?.content || "", item.msg_type || "text");
+    const senderId = item.sender?.id || "unknown";
+
+    // Resolve @_user_N placeholders using item.mentions from Feishu API
+    let resolved = formatted;
+    if (item.mentions && item.mentions.length > 0) {
+      // Sort by key length descending to avoid @_user_1 matching inside @_user_10
+      const sorted = [...item.mentions].sort((a, b) => (b.key?.length ?? 0) - (a.key?.length ?? 0));
+      for (const m of sorted) {
+        if (m.key) {
+          const mId =
+            typeof m.id === "string"
+              ? m.id
+              : m.id?.open_id || m.id?.user_id || m.id?.union_id || "";
+          const display = m.name && mId ? `${m.name}(${mId})` : m.name || mId || m.key;
+          resolved = resolved.replaceAll(m.key, () => `@${display}`);
+        }
+      }
+    }
+
+    lines.push(`- [${senderId}] ${resolved}`);
   }
   if (subMessages.length > maxMessages) {
     lines.push(`... and ${subMessages.length - maxMessages} more messages`);
diff --git a/extensions/feishu/src/bot.test.ts b/extensions/feishu/src/bot.test.ts
@@ -1898,13 +1898,15 @@ describe("handleFeishuMessage command authorization", () => {
             upper_message_id: "container",
             msg_type: "file",
             body: { content: JSON.stringify({ file_name: "report.pdf" }) },
+            sender: { id: "ou-bob" },
             create_time: "2000",
           },
           {
             message_id: "sub-1",
             upper_message_id: "container",
             msg_type: "text",
             body: { content: JSON.stringify({ text: "alpha" }) },
+            sender: { id: "ou-alice" },
             create_time: "1000",
           },
         ],
@@ -1954,7 +1956,7 @@ describe("handleFeishuMessage command authorization", () => {
     expect(mockFinalizeInboundContext).toHaveBeenCalledWith(
       expect.objectContaining({
         BodyForAgent: expect.stringContaining(
-          "[Merged and Forwarded Messages]\n- alpha\n- [File: report.pdf]",
+          "[Merged and Forwarded Messages]\n- [ou-alice] alpha\n- [ou-bob] [File: report.pdf]",
         ),
       }),
     );
