From 433041c44e9a9f516365149a7b9f9d4201a23679 Mon Sep 17 00:00:00 2001 From: lbo728 Date: Wed, 18 Mar 2026 20:36:47 +0900 Subject: [PATCH] =?UTF-8?q?fix(feishu):=20@=E6=89=80=E6=9C=89=E4=BA=BA=20(?= =?UTF-8?q?@all)=20no=20longer=20triggers=20every=20bot=20unconditionally?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously checkBotMentioned() returned true for any message containing '@_all', causing ALL bots in a Feishu group to respond simultaneously whenever a user broadcast to @所有人 (#49761). Fix: remove the unconditional @_all -> true early-return from checkBotMentioned(). Opt-in is now controlled by a new respondToAtAll config flag (boolean, default false) that can be set at the account level (channels.feishu.respondToAtAll or channels.feishu.accounts..respondToAtAll) or per-group (channels.feishu.groups..respondToAtAll). The check is applied in handleFeishuMessage after groupConfig is resolved so that per-group and per-account settings are both honoured. Bots that do not opt in remain silent when @所有人 is used, preserving the pre-existing behaviour for single-bot deployments and groups that do not want broadcast responses. Changes: - extensions/feishu/src/bot-content.ts: drop @_all -> true, add comment - extensions/feishu/src/bot.ts: add respondToAtAll opt-in check after groupConfig is resolved, before the requireMention gate - extensions/feishu/src/config-schema.ts: add respondToAtAll?:boolean to FeishuSharedConfigShape (account+global level) and FeishuGroupSchema - extensions/feishu/src/bot.checkBotMentioned.test.ts: two new tests confirming mentionedBot=false for @_all via parseFeishuMessageEvent --- extensions/feishu/src/bot-content.ts | 8 ++++--- .../feishu/src/bot.checkBotMentioned.test.ts | 21 +++++++++++++++++++ extensions/feishu/src/bot.ts | 11 ++++++++++ extensions/feishu/src/config-schema.ts | 2 ++ 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/extensions/feishu/src/bot-content.ts b/extensions/feishu/src/bot-content.ts index d8dcc1c0aa2..7b6fa38ac02 100644 --- a/extensions/feishu/src/bot-content.ts +++ b/extensions/feishu/src/bot-content.ts @@ -248,9 +248,11 @@ export function checkBotMentioned(event: FeishuMessageLike, botOpenId?: string): if (!botOpenId) { return false; } - if ((event.message.content ?? "").includes("@_all")) { - return true; - } + // @_all (@所有人) is intentionally NOT treated as mentioning every bot here. + // Whether to respond to @所有人 is an opt-in decision controlled by the + // respondToAtAll config flag; the check is applied in handleFeishuMessage + // after the group config is resolved so that per-group and per-account + // settings are both honoured. const mentions = event.message.mentions ?? []; if (mentions.length > 0) { return mentions.some((mention) => mention.id.open_id === botOpenId); diff --git a/extensions/feishu/src/bot.checkBotMentioned.test.ts b/extensions/feishu/src/bot.checkBotMentioned.test.ts index a7ea6792275..3d9edc8515d 100644 --- a/extensions/feishu/src/bot.checkBotMentioned.test.ts +++ b/extensions/feishu/src/bot.checkBotMentioned.test.ts @@ -190,4 +190,25 @@ describe("parseFeishuMessageEvent – mentionedBot", () => { const ctx = parseFeishuMessageEvent(event as any, "ou_bot_123"); expect(ctx.content).toBe("[Forwarded message: sc_abc123]"); }); + + // @_all (@所有人) behaviour — opt-in is controlled by respondToAtAll config + // and resolved later in handleFeishuMessage; parseFeishuMessageEvent itself + // no longer unconditionally sets mentionedBot=true for @_all. + it("returns mentionedBot=false for @_all message (respondToAtAll opt-in not yet applied)", () => { + const event = makeEvent("group", [], "@_all hello everyone"); + const ctx = parseFeishuMessageEvent(event as any, BOT_OPEN_ID); + expect(ctx.mentionedBot).toBe(false); + }); + + it("returns mentionedBot=false for @_all even when bot is also in mentions list (opt-in path takes precedence)", () => { + // Explicit bot mention still wins via the mentions array path + const event = makeEvent( + "group", + [{ key: "@_user_1", name: "Bot", id: { open_id: BOT_OPEN_ID } }], + "@_all hello", + ); + const ctx = parseFeishuMessageEvent(event as any, BOT_OPEN_ID); + // Bot IS in the mentions array, so it should still be true via that path + expect(ctx.mentionedBot).toBe(true); + }); }); diff --git a/extensions/feishu/src/bot.ts b/extensions/feishu/src/bot.ts index 63b898a23fb..34a6d169644 100644 --- a/extensions/feishu/src/bot.ts +++ b/extensions/feishu/src/bot.ts @@ -418,6 +418,17 @@ export async function handleFeishuMessage(params: { groupConfig, })); + // @_all (@所有人) opt-in: if the message targets all group members and the + // account or group is explicitly configured with respondToAtAll:true, treat + // it as mentioning this bot. Default is false so bots that do not opt in + // stay silent when a user broadcasts to the whole group. + if (!ctx.mentionedBot && (event.message.content ?? "").includes("@_all")) { + const respondToAtAll = groupConfig?.respondToAtAll ?? feishuCfg?.respondToAtAll ?? false; + if (respondToAtAll) { + ctx = { ...ctx, mentionedBot: true }; + } + } + if (requireMention && !ctx.mentionedBot) { log(`feishu[${account.accountId}]: message in group ${ctx.chatId} did not mention bot`); // Record to pending history for non-broadcast groups only. For broadcast groups, diff --git a/extensions/feishu/src/config-schema.ts b/extensions/feishu/src/config-schema.ts index db1714f173f..26a779d3ae7 100644 --- a/extensions/feishu/src/config-schema.ts +++ b/extensions/feishu/src/config-schema.ts @@ -141,6 +141,7 @@ const ReplyInThreadSchema = z.enum(["disabled", "enabled"]).optional(); export const FeishuGroupSchema = z .object({ requireMention: z.boolean().optional(), + respondToAtAll: z.boolean().optional(), tools: ToolPolicySchema, skills: z.array(z.string()).optional(), enabled: z.boolean().optional(), @@ -164,6 +165,7 @@ const FeishuSharedConfigShape = { groupAllowFrom: z.array(z.union([z.string(), z.number()])).optional(), groupSenderAllowFrom: z.array(z.union([z.string(), z.number()])).optional(), requireMention: z.boolean().optional(), + respondToAtAll: z.boolean().optional(), groups: z.record(z.string(), FeishuGroupSchema.optional()).optional(), historyLimit: z.number().int().min(0).optional(), dmHistoryLimit: z.number().int().min(0).optional(),