fix(feishu): reply inside thread for P2P direct messages

LiaoyuanNing · claude · ttc-xiongwenlin · commit 1bd355587b9e · 2026-03-07T19:10:09.000+08:00
When a user sends a message inside a Feishu thread (话题) in a P2P chat, the bot's reply was incorrectly sent outside the thread as a standalone message. This was caused by PR #33789 which fixed group reply targeting (#32980) but inadvertently broke P2P thread replies by gating all thread-aware logic behind isGroup checks. The fix distinguishes between two P2P scenarios based on the Feishu API contract (thread_id present = thread message, root_id only = quote reply): - P2P thread messages (thread_id present): reply to root_id with reply_in_thread=true so the response stays in the thread. - P2P plain replies (root_id only, no thread_id): reply to the triggering message as before. Group chat behavior is completely unchanged — the new condition (directThreadMessage) requires isDirect=true, which is always false for groups. Changes: - replyInThread: true for P2P thread messages (enables reply_in_thread API flag) - replyTargetMessageId: use root_id for P2P thread messages - threadReply: true for P2P thread messages (drives effectiveReplyInThread in dispatcher) - skipReplyToInMessages: false for P2P thread messages (so send layer uses im.message.reply instead of im.message.create) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
diff --git a/extensions/feishu/src/bot.test.ts b/extensions/feishu/src/bot.test.ts
@@ -1706,6 +1706,79 @@ describe("handleFeishuMessage command authorization", () => {
     );
   });
 
+  it("replies to topic root in p2p thread message (thread_id present)", async () => {
+    mockShouldComputeCommandAuthorized.mockReturnValue(false);
+
+    const cfg: ClawdbotConfig = {
+      channels: {
+        feishu: {
+          dmPolicy: "open",
+        },
+      },
+    } as ClawdbotConfig;
+
+    const event: FeishuMessageEvent = {
+      sender: { sender_id: { open_id: "ou-dm-thread-user" } },
+      message: {
+        message_id: "om_dm_thread_reply",
+        root_id: "om_dm_thread_root",
+        thread_id: "omt_dm_thread",
+        chat_id: "oc-dm",
+        chat_type: "p2p",
+        message_type: "text",
+        content: JSON.stringify({ text: "hello in p2p thread" }),
+      },
+    };
+
+    await dispatchMessage({ cfg, event });
+
+    expect(mockCreateFeishuReplyDispatcher).toHaveBeenCalledWith(
+      expect.objectContaining({
+        replyToMessageId: "om_dm_thread_root",
+        skipReplyToInMessages: false,
+        rootId: "om_dm_thread_root",
+        replyInThread: true,
+        threadReply: true,
+      }),
+    );
+  });
+
+  it("replies to triggering message in p2p plain reply (root_id only, no thread_id)", async () => {
+    mockShouldComputeCommandAuthorized.mockReturnValue(false);
+
+    const cfg: ClawdbotConfig = {
+      channels: {
+        feishu: {
+          dmPolicy: "open",
+        },
+      },
+    } as ClawdbotConfig;
+
+    const event: FeishuMessageEvent = {
+      sender: { sender_id: { open_id: "ou-dm-reply-user" } },
+      message: {
+        message_id: "om_dm_plain_reply",
+        root_id: "om_dm_original_msg",
+        chat_id: "oc-dm",
+        chat_type: "p2p",
+        message_type: "text",
+        content: JSON.stringify({ text: "just a quote reply in p2p" }),
+      },
+    };
+
+    await dispatchMessage({ cfg, event });
+
+    expect(mockCreateFeishuReplyDispatcher).toHaveBeenCalledWith(
+      expect.objectContaining({
+        replyToMessageId: "om_dm_plain_reply",
+        skipReplyToInMessages: true,
+        rootId: "om_dm_original_msg",
+        replyInThread: false,
+        threadReply: false,
+      }),
+    );
+  });
+
   it("does not dispatch twice for the same image message_id (concurrent dedupe)", async () => {
     mockShouldComputeCommandAuthorized.mockReturnValue(false);
 
diff --git a/extensions/feishu/src/bot.ts b/extensions/feishu/src/bot.ts
@@ -1156,7 +1156,11 @@ export async function handleFeishuMessage(params: {
     const feishuTo = isGroup ? `chat:${ctx.chatId}` : `user:${ctx.senderOpenId}`;
     const peerId = isGroup ? (groupSession?.peerId ?? ctx.chatId) : ctx.senderOpenId;
     const parentPeer = isGroup ? (groupSession?.parentPeer ?? null) : null;
-    const replyInThread = isGroup ? (groupSession?.replyInThread ?? false) : false;
+    // P2P thread messages (thread_id present) need reply_in_thread so the
+    // response stays inside the Feishu thread container, not just as an inline
+    // reply to the root message.
+    const directThreadMessage = isDirect && Boolean(ctx.threadId);
+    const replyInThread = isGroup ? (groupSession?.replyInThread ?? false) : directThreadMessage;
 
     if (isGroup && groupSession) {
       log(
@@ -1338,11 +1342,19 @@ export async function handleFeishuMessage(params: {
     const messageCreateTimeMs = event.message.create_time
       ? parseInt(event.message.create_time, 10)
       : undefined;
-    // Determine reply target based on group session mode:
-    // - Topic-mode groups (group_topic / group_topic_sender): reply to the topic
-    //   root so the bot stays in the same thread.
-    // - Groups with explicit replyInThread config: reply to the root so the bot
-    //   stays in the thread the user expects.
+    // Determine reply target:
+    //
+    // P2P (direct) chats:
+    // - Thread messages (thread_id present): reply to the topic root so
+    //   the bot's reply stays inside the thread.
+    // - Plain reply (root_id only, no thread_id): reply to the triggering
+    //   message; root_id is just a quote reference, not a thread container.
+    //
+    // Group chats:
+    // - Topic-mode groups (group_topic / group_topic_sender): reply to the
+    //   topic root so the bot stays in the same thread.
+    // - Groups with explicit replyInThread config: reply to the root so the
+    //   bot stays in the thread the user expects.
     // - Normal groups (auto-detected threadReply from root_id): reply to the
     //   triggering message itself. Using rootId here would silently push the
     //   reply into a topic thread invisible in the main chat view (#32980).
@@ -1354,8 +1366,10 @@ export async function handleFeishuMessage(params: {
       isGroup &&
       (groupConfig?.replyInThread ?? feishuCfg?.replyInThread ?? "disabled") === "enabled";
     const replyTargetMessageId =
-      isTopicSession || configReplyInThread ? (ctx.rootId ?? ctx.messageId) : ctx.messageId;
-    const threadReply = isGroup ? (groupSession?.threadReply ?? false) : false;
+      directThreadMessage || isTopicSession || configReplyInThread
+        ? (ctx.rootId ?? ctx.messageId)
+        : ctx.messageId;
+    const threadReply = isGroup ? (groupSession?.threadReply ?? false) : directThreadMessage;
 
     if (broadcastAgents) {
       // Cross-account dedup: in multi-account setups, Feishu delivers the same
@@ -1406,7 +1420,7 @@ export async function handleFeishuMessage(params: {
             runtime: runtime as RuntimeEnv,
             chatId: ctx.chatId,
             replyToMessageId: replyTargetMessageId,
-            skipReplyToInMessages: !isGroup,
+            skipReplyToInMessages: !isGroup && !directThreadMessage,
             replyInThread,
             rootId: ctx.rootId,
             threadReply,
@@ -1504,7 +1518,7 @@ export async function handleFeishuMessage(params: {
         runtime: runtime as RuntimeEnv,
         chatId: ctx.chatId,
         replyToMessageId: replyTargetMessageId,
-        skipReplyToInMessages: !isGroup,
+        skipReplyToInMessages: !isGroup && !directThreadMessage,
         replyInThread,
         rootId: ctx.rootId,
         threadReply,
