openclaw-lark-multi-agent 1.0.1 → 1.0.3

package/dist/feishu-bot.d.ts

@@ -33,6 +33,8 @@ export declare class FeishuBot {
     private delayedFailureTimers;
     /** Last time a real assistant-visible reply was successfully handed to the delivery pipeline. */
     private lastRealDeliveryAt;
+    /** Active chatSend trigger target so final replies and proactive session.message share one delivery key. */
+    private activeDeliveryTargets;
     private adminOpenId;
     private static allBots;
     constructor(config: BotConfig, openclawClient: OpenClawClient, store: MessageStore, adminOpenId?: string);
@@ -84,6 +86,7 @@ export declare class FeishuBot {
     private formatUserVisibleError;
     private isRuntimeFailureText;
     private cancelDelayedFailure;
+    private setActiveDeliveryTarget;
     private scheduleDelayedFailure;
     private deliverySessionKey;
     private stableHash;

package/dist/feishu-bot.js

@@ -1,9 +1,12 @@
 import * as lark from "@larksuiteoapi/node-sdk";
+import { createRequire } from "module";
 import { existsSync, readFileSync, statSync } from "fs";
 import { basename, extname, resolve } from "path";
 import { getBridgeAttachmentAllowedRoots, getBridgeAttachmentsDir } from "./paths.js";
 import { buildFeishuCardElements } from "./markdown.js";
 import { discussionManager } from "./discussion-manager.js";
+const require = createRequire(import.meta.url);
+const LMA_VERSION = require("../package.json").version;
 const MAX_BOT_STREAK = 10;
 const BRIDGE_ATTACHMENTS_DIR = getBridgeAttachmentsDir();
 const BRIDGE_ATTACHMENT_ALLOWED_ROOTS = getBridgeAttachmentAllowedRoots();
@@ -39,6 +42,8 @@ export class FeishuBot {
     delayedFailureTimers = new Map();
     /** Last time a real assistant-visible reply was successfully handed to the delivery pipeline. */
     lastRealDeliveryAt = new Map();
+    /** Active chatSend trigger target so final replies and proactive session.message share one delivery key. */
+    activeDeliveryTargets = new Map();
     adminOpenId;
     static allBots = new Map();
     constructor(config, openclawClient, store, adminOpenId) {
@@ -146,7 +151,8 @@ export class FeishuBot {
                 const parsed = this.extractBridgeAttachments(text);
                 if (parsed.text.trim() || parsed.attachments.length > 0)
                     this.cancelDelayedFailure(chatId);
-                await this.enqueueAndDispatchDelivery(chatId, "assistant_visible", this.deliverySourceId("proactive", `${Date.now()}:${Math.random()}:${parsed.text.trim()}|${JSON.stringify(parsed.attachments)}`), parsed.text.trim(), parsed.attachments);
+                const activeTarget = this.activeDeliveryTargets.get(chatId);
+                await this.enqueueAndDispatchDelivery(chatId, "assistant_visible", this.deliverySourceId("proactive", `${Date.now()}:${Math.random()}:${parsed.text.trim()}|${JSON.stringify(parsed.attachments)}`), parsed.text.trim(), parsed.attachments, activeTarget?.messageId, activeTarget ? `trigger:${activeTarget.triggerId}` : undefined);
             }
             catch (err) {
                 console.error(`[${this.config.name}] Failed to deliver proactive msg:`, err.message);
@@ -279,8 +285,11 @@ export class FeishuBot {
             }
             if (messageType !== "text" && messageType !== "image" && messageType !== "file" && messageType !== "audio" && messageType !== "sticker" && messageType !== "post")
                 return;
-            // --- Dedup: skip if this bot already processed this message ---
-            if (this.store.hasBotProcessed(this.config.name, messageId))
+            // --- Dedup: atomically claim this message for this bot before any await.
+            // Feishu/WebSocket can deliver the same event more than once; a separate
+            // has-then-mark sequence races and can send the same user message into
+            // OpenClaw twice.
+            if (!this.store.tryMarkBotProcessed(this.config.name, messageId))
                 return;
             // --- Cache chat info (lazy, at most once per hour) ---
             await this.fetchAndCacheChatInfo(chatId, chatType);
@@ -385,8 +394,6 @@ export class FeishuBot {
             });
             if (insertedId < 0)
                 insertedId = this.store.getMessageId(messageId) || -1;
-            // Mark as processed only after successful parse + insert
-            this.store.markBotProcessed(this.config.name, messageId);
             // --- Commands: in p2p always respond; in group, check shouldRespond first ---
             // Single slash commands are handled by the bridge. Double slash commands were
             // already unescaped above and should pass through to OpenClaw instead.
@@ -668,16 +675,26 @@ export class FeishuBot {
                 }
             }
             try {
-                const reply = await this.openclawClient.chatSendWithContext({
-                    sessionKey,
-                    unsyncedMessages: contextMsgs,
-                    currentMessage: lastHuman.content,
-                    currentSenderName: lastHuman.senderName,
-                    deliver: false,
-                    // Keep bridge UX responsive; long agent/tool loops should surface a clear failure
-                    // instead of leaving reactions stuck forever.
-                    timeoutMs: 1_800_000,
-                });
+                const releaseActiveDeliveryTarget = lastHuman.messageId ? this.setActiveDeliveryTarget(chatId, triggerId, lastHuman.messageId) : () => { };
+                let reply;
+                try {
+                    reply = await this.openclawClient.chatSendWithContext({
+                        sessionKey,
+                        unsyncedMessages: contextMsgs,
+                        currentMessage: lastHuman.content,
+                        currentSenderName: lastHuman.senderName,
+                        deliver: false,
+                        // Keep bridge UX responsive; long agent/tool loops should surface a clear failure
+                        // instead of leaving reactions stuck forever.
+                        timeoutMs: 1_800_000,
+                    });
+                }
+                finally {
+                    // OpenClaw may emit the final assistant session.message just after
+                    // collectReply returns. Keep the trigger mapping briefly so proactive
+                    // and chat-final paths share the same delivery key.
+                    releaseActiveDeliveryTarget();
+                }
                 console.log(`[${this.config.name}] OpenClaw reply collected for ${chatId.slice(-8)} in ${Date.now() - queueStartedAt}ms`);
                 const parsedReply = this.extractBridgeAttachments(reply);
                 const visibleReply = parsedReply.text;
@@ -933,6 +950,23 @@ export class FeishuBot {
             clearTimeout(timer);
         this.delayedFailureTimers.delete(chatId);
     }
+    setActiveDeliveryTarget(chatId, triggerId, messageId) {
+        const existing = this.activeDeliveryTargets.get(chatId);
+        if (existing?.timer)
+            clearTimeout(existing.timer);
+        const token = Symbol(`${chatId}:${triggerId}`);
+        this.activeDeliveryTargets.set(chatId, { triggerId, messageId, token });
+        return () => {
+            const timer = setTimeout(() => {
+                const current = this.activeDeliveryTargets.get(chatId);
+                if (current?.token === token)
+                    this.activeDeliveryTargets.delete(chatId);
+            }, 60_000);
+            const current = this.activeDeliveryTargets.get(chatId);
+            if (current?.token === token)
+                current.timer = timer;
+        };
+    }
     scheduleDelayedFailure(chatId, replyToMessageId, text, triggerId) {
         const lastRealDelivery = this.lastRealDeliveryAt.get(chatId) || 0;
         if (Date.now() - lastRealDelivery < 90_000) {
@@ -1434,6 +1468,7 @@ export class FeishuBot {
             `📊 ${this.config.name} Bot Status`,
             `━━━━━━━━━━━━━━━━━━`,
             `🤖 Bot: ${this.config.name}`,
+            `🧩 LMA: ${LMA_VERSION}`,
             `🧠 模型: ${model}`,
             `💬 会话: ${chatLabel} (${chatType === "p2p" ? "私聊" : "群聊"})`,
             `📋 Session: ${sessionExists} | ${status}`,

package/dist/message-store.d.ts

@@ -119,5 +119,6 @@ export declare class MessageStore {
      * Mark a message as processed by a specific bot.
      */
     markBotProcessed(botName: string, messageId: string): void;
+    tryMarkBotProcessed(botName: string, messageId: string): boolean;
     close(): void;
 }

package/dist/message-store.js

@@ -625,6 +625,10 @@ export class MessageStore {
     markBotProcessed(botName, messageId) {
         this.db.prepare(`INSERT OR IGNORE INTO processed_events (bot_name, message_id) VALUES (?, ?)`).run(botName, messageId);
     }
+    tryMarkBotProcessed(botName, messageId) {
+        const result = this.db.prepare(`INSERT OR IGNORE INTO processed_events (bot_name, message_id) VALUES (?, ?)`).run(botName, messageId);
+        return result.changes === 1;
+    }
     close() {
         this.db.close();
     }

package/package.json

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