openclaw-lark-multi-agent 0.1.9 → 0.1.10

package/dist/feishu-bot.d.ts

@@ -68,6 +68,7 @@ export declare class FeishuBot {
     private shouldRespond;
     private isMentioned;
     private isAllMention;
+    private isAllMentionItem;
     private mentionedBotName;
     private resolveBotName;
     private resolveHumanName;

package/dist/feishu-bot.js

@@ -264,6 +264,12 @@ export class FeishuBot {
             if (messageType === "text") {
                 const rawText = content.text || "";
                 cleanText = this.cleanMentions(rawText);
+                // A mention-only text message is still a valid routing trigger. Feishu may
+                // expose mentions as display text like "@万万（Claude）" rather than @_user_xxx,
+                // so decide emptiness after stripping leading routing mentions.
+                if ((this.isMentioned(message.mentions || []) || this.isAllMention(rawText, message.mentions || [])) && !this.stripLeadingCommandMentions(cleanText).trim()) {
+                    cleanText = "请回复上面最近一条用户消息。";
+                }
             }
             else if (messageType === "image") {
                 // Download image and pass local path
@@ -495,7 +501,7 @@ export class FeishuBot {
             // Track this message for reaction status updates
             const pending = this.pendingAckMessages.get(chatId) || [];
             // Anti-loop
-            const streak = this.store.getBotStreak(chatId);
+            const streak = this.store.getBotStreak(chatId, this.config.name);
             if (streak >= MAX_BOT_STREAK) {
                 console.log(`[${this.config.name}] Anti-loop: ${streak} consecutive bot msgs`);
                 return;
@@ -694,9 +700,11 @@ export class FeishuBot {
         // Check if this bot is explicitly mentioned
         if (this.isMentioned(mentions))
             return true;
-        // Check if any other bot is mentioned (not us) — don't respond
-        const anyBotMentioned = mentions.some((m) => this.mentionedBotName(m) !== null);
-        if (anyBotMentioned && !this.isMentioned(mentions))
+        // Targeted mentions are exclusive. If a human mentions another person or
+        // another bot, free-mode bots must not steal that message. Free mode only
+        // applies to plain human messages with no targeted mentions.
+        const hasTargetedMention = mentions.some((m) => !this.isAllMentionItem(m));
+        if (hasTargetedMention)
             return false;
         // No bot mentioned: check current per-bot mode
         if (chatId) {
@@ -712,10 +720,13 @@ export class FeishuBot {
     isAllMention(rawText, mentions = []) {
         if (rawText && (rawText.includes("@_all") || rawText.includes("@all") || rawText.includes("@所有人")))
             return true;
-        return mentions.some((m) => m.key === "all" || m.key === "@_all" || m.id?.user_id === "all" || m.id?.open_id === "all" || m.name === "所有人");
+        return mentions.some((m) => this.isAllMentionItem(m));
+    }
+    isAllMentionItem(mention) {
+        return mention.key === "all" || mention.key === "@_all" || mention.id?.user_id === "all" || mention.id?.open_id === "all" || mention.name === "所有人";
     }
     mentionedBotName(mention) {
-        if (mention.key === "all" || mention.key === "@_all" || mention.id?.user_id === "all" || mention.id?.open_id === "all" || mention.name === "所有人")
+        if (this.isAllMentionItem(mention))
             return null;
         const candidates = [this, ...Array.from(FeishuBot.allBots.values()).filter((bot) => bot !== this)];
         for (const bot of candidates) {

package/dist/message-store.d.ts

@@ -51,9 +51,13 @@ export declare class MessageStore {
      */
     getRecent(chatId: string, maxCount?: number): ChatMessage[];
     /**
-     * Count consecutive bot messages at the tail of a chat.
+     * Count consecutive messages from one bot at the tail of a chat.
+     *
+     * Other bots do not consume this bot's anti-loop budget. Human messages reset
+     * the streak. This lets multiple bots free-discuss without a global bot-streak
+     * guard shutting everyone down after N total bot messages.
      */
-    getBotStreak(chatId: string): number;
+    getBotStreak(chatId: string, botName: string): number;
     upsertChatInfo(info: ChatInfo): void;
     setFreeDiscussion(chatId: string, on: boolean): void;
     setVerbose(chatId: string, verbose: boolean): void;

package/dist/message-store.js

@@ -233,21 +233,25 @@ export class MessageStore {
         }));
     }
     /**
-     * Count consecutive bot messages at the tail of a chat.
+     * Count consecutive messages from one bot at the tail of a chat.
+     *
+     * Other bots do not consume this bot's anti-loop budget. Human messages reset
+     * the streak. This lets multiple bots free-discuss without a global bot-streak
+     * guard shutting everyone down after N total bot messages.
      */
-    getBotStreak(chatId) {
+    getBotStreak(chatId, botName) {
         const rows = this.db.prepare(`
-      SELECT sender_type FROM messages
+      SELECT sender_type, sender_name FROM messages
       WHERE chat_id = ?
       ORDER BY timestamp DESC
-      LIMIT 20
+      LIMIT 50
     `).all(chatId);
         let count = 0;
         for (const r of rows) {
-            if (r.sender_type === "bot")
-                count++;
-            else
+            if (r.sender_type === "human")
                 break;
+            if (r.sender_type === "bot" && r.sender_name === botName)
+                count++;
         }
         return count;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-lark-multi-agent",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Multi-bot Lark/Feishu bridge for OpenClaw, with per-bot model routing and isolated sessions",
   "type": "module",
   "scripts": {