openclaw-lark-multi-agent 0.1.11 → 0.1.13

package/dist/discussion-manager.d.ts

@@ -25,6 +25,7 @@ export type DiscussionParticipant = {
 export declare class DiscussionManager {
     private sessions;
     private seenRoots;
+    private readonly seenRootTtlMs;
     isActive(chatId: string): boolean;
     stop(chatId: string): boolean;
     status(chatId: string): DiscussionSession | null;
@@ -36,6 +37,7 @@ export declare class DiscussionManager {
         participants: DiscussionParticipant[];
         sendSystemMessage?: (text: string) => Promise<void>;
     }): boolean;
+    private pruneSeenRoots;
     private runLoop;
     private buildPrompt;
 }

package/dist/discussion-manager.js

@@ -1,7 +1,8 @@
 import { randomUUID } from "crypto";
 export class DiscussionManager {
     sessions = new Map();
-    seenRoots = new Set();
+    seenRoots = new Map();
+    seenRootTtlMs = 6 * 60 * 60 * 1000;
     isActive(chatId) {
         return this.sessions.get(chatId)?.status === "running";
     }
@@ -18,15 +19,18 @@ export class DiscussionManager {
         return session ? { ...session, completedRounds: [...session.completedRounds] } : null;
     }
     startIfAbsent(params) {
+        this.pruneSeenRoots();
         const key = `${params.chatId}:${params.rootMessageId}`;
         if (this.seenRoots.has(key))
             return false;
-        this.seenRoots.add(key);
+        this.seenRoots.set(key, Date.now());
         if (this.isActive(params.chatId))
             this.stop(params.chatId);
         const participants = params.participants.filter((p, index, arr) => arr.findIndex((x) => x.name === p.name) === index);
-        if (participants.length === 0)
+        if (participants.length === 0) {
+            this.seenRoots.delete(key);
             return false;
+        }
         const session = {
             id: randomUUID(),
             chatId: params.chatId,
@@ -47,6 +51,12 @@ export class DiscussionManager {
         });
         return true;
     }
+    pruneSeenRoots(now = Date.now()) {
+        for (const [key, ts] of this.seenRoots) {
+            if (now - ts > this.seenRootTtlMs)
+                this.seenRoots.delete(key);
+        }
+    }
     async runLoop(sessionId, participants, sendSystemMessage) {
         while (true) {
             const session = Array.from(this.sessions.values()).find((s) => s.id === sessionId);

package/dist/feishu-bot.js

@@ -457,7 +457,7 @@ export class FeishuBot {
                     const next = current === "free" ? "normal" : "free";
                     this.store.setBotMode(this.config.name, chatId, next);
                     if (next === "free") {
-                        await this.replyMessage(messageId, `🔓 ${this.config.name} 已切换到 free 模式\n不需要 @ 也可以参与回复（连续 Bot 回复超过 ${MAX_BOT_STREAK} 轮将暂停，等待人类发言）`);
+                        await this.replyMessage(messageId, `🔓 ${this.config.name} 已切换到 free 模式\n不需要 @ 也可以回复普通人类消息；如果消息明确 @ 了其他 bot 或普通人，我不会抢答。\n如需多轮自动讨论，请使用群级命令 /discuss on。`);
                     }
                     else {
                         await this.replyMessage(messageId, `🔒 ${this.config.name} 已切换到 normal 模式\n只有明确 @ 我才会回复`);
@@ -635,7 +635,7 @@ export class FeishuBot {
                     deliver: false,
                     // Keep bridge UX responsive; long agent/tool loops should surface a clear failure
                     // instead of leaving reactions stuck forever.
-                    timeoutMs: 600000,
+                    timeoutMs: 1_800_000,
                 });
                 console.log(`[${this.config.name}] OpenClaw reply collected for ${chatId.slice(-8)} in ${Date.now() - queueStartedAt}ms`);
                 const parsedReply = this.extractBridgeAttachments(reply);
@@ -921,7 +921,7 @@ export class FeishuBot {
             currentMessage: prompt,
             currentSenderName: "Discussion Scheduler",
             deliver: false,
-            timeoutMs: 600000,
+            timeoutMs: 1_800_000,
         });
         const parsedReply = this.extractBridgeAttachments(reply);
         const visibleReply = parsedReply.text.trim();

package/dist/openclaw-client.js

@@ -266,22 +266,28 @@ export class OpenClawClient {
             let replayInvalidTimer = null;
             const collectStartedAt = Date.now();
             let lifecycleStartedLogged = false;
-            const timer = setTimeout(() => {
-                clearInterval(poller);
-                if (chatFinalTimer)
-                    clearTimeout(chatFinalTimer);
-                if (lifecycleEndTimer)
-                    clearTimeout(lifecycleEndTimer);
-                if (replayInvalidTimer)
-                    clearTimeout(replayInvalidTimer);
-                console.warn(`[OpenClaw] collectReply timeout for runId=${runId} sessionKey=${sessionKey}`);
-                this.abortChat(targetSessionKey || sessionKey, runId).catch((err) => {
-                    console.warn(`[OpenClaw] abort after collectReply timeout failed:`, err.message);
-                });
-                resolve(text || chatFinalText || "(timeout: no reply received)");
-            }, timeoutMs);
+            let idleTimer;
+            const resetIdleTimer = () => {
+                if (idleTimer)
+                    clearTimeout(idleTimer);
+                idleTimer = setTimeout(() => {
+                    clearInterval(poller);
+                    if (chatFinalTimer)
+                        clearTimeout(chatFinalTimer);
+                    if (lifecycleEndTimer)
+                        clearTimeout(lifecycleEndTimer);
+                    if (replayInvalidTimer)
+                        clearTimeout(replayInvalidTimer);
+                    console.warn(`[OpenClaw] collectReply idle timeout for runId=${runId} sessionKey=${sessionKey}`);
+                    this.abortChat(targetSessionKey || sessionKey, runId).catch((err) => {
+                        console.warn(`[OpenClaw] abort after collectReply idle timeout failed:`, err.message);
+                    });
+                    resolve(text || chatFinalText || "(timeout: no reply received)");
+                }, timeoutMs);
+            };
+            resetIdleTimer();
             const finish = (finalText) => {
-                clearTimeout(timer);
+                clearTimeout(idleTimer);
                 clearInterval(poller);
                 if (chatFinalTimer)
                     clearTimeout(chatFinalTimer);
@@ -318,6 +324,10 @@ export class OpenClawClient {
                             continue;
                         }
                         bucket.splice(i, 1);
+                        // Any matching event — including toolCall/toolResult/item/lifecycle —
+                        // means the agent is still alive. Use an idle timeout, not an absolute
+                        // wall-clock timeout, so long tool-heavy tasks are not killed while active.
+                        resetIdleTimer();
                         // If more events arrive after a replay-invalid lifecycle end, that lifecycle
                         // was not terminal for the user-visible run. Keep waiting for the real final.
                         if (replayInvalidTimer) {
@@ -342,7 +352,14 @@ export class OpenClawClient {
                                     });
                                     // Prefer final chat message over accumulated deltas: some providers may
                                     // emit only partial deltas (e.g. "N") while final contains "NO_REPLY".
-                                    finish(chatFinalText || text);
+                                    const latestFinalText = chatFinalText || text;
+                                    if (latestFinalText) {
+                                        finish(latestFinalText);
+                                    }
+                                    else {
+                                        console.warn(`[OpenClaw] collectReply: empty chatFinal fallback ignored; waiting for real text or idle timeout`);
+                                        chatFinalTimer = null;
+                                    }
                                 }, 5000);
                             }
                         }
@@ -359,7 +376,7 @@ export class OpenClawClient {
                                     finish("NO_REPLY");
                                     return;
                                 }
-                                if (!latestFinalText && ev.data?.livenessState !== "working") {
+                                if (!latestFinalText) {
                                     const state = ev.data?.livenessState || "unknown";
                                     const reason = ev.data?.stopReason || "";
                                     const replayInvalid = ev.data?.replayInvalid ? ", replayInvalid" : "";
@@ -369,11 +386,14 @@ export class OpenClawClient {
                                         replayInvalidTimer = setTimeout(() => finish(failureText), 120000);
                                         return;
                                     }
-                                    finish(failureText);
-                                }
-                                else {
-                                    finish(latestFinalText);
+                                    if (ev.data?.livenessState !== "working") {
+                                        finish(failureText);
+                                        return;
+                                    }
+                                    console.warn(`[OpenClaw] empty lifecycle end ignored for runId=${evRunId || runId}; waiting for real text or idle timeout`);
+                                    return;
                                 }
+                                finish(latestFinalText);
                             };
                             // If lifecycle end beats chat final, a short delta like "N" can be a truncated
                             // final reply. Wait for chatFinal before resolving; otherwise suppress lone "N".
@@ -386,7 +406,7 @@ export class OpenClawClient {
                             return;
                         }
                         if (ev.stream === "lifecycle" && ev.data?.phase === "error") {
-                            clearTimeout(timer);
+                            clearTimeout(idleTimer);
                             clearInterval(poller);
                             if (chatFinalTimer)
                                 clearTimeout(chatFinalTimer);

package/package.json

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