openclaw-lark-multi-agent 1.0.10 → 1.0.12

package/dist/openclaw-client.d.ts

@@ -36,6 +36,13 @@ export declare class OpenClawClient {
     /** Session keys whose proactive messages must be dropped by the bridge (e.g. discussion scheduler owns delivery). */
     private mutedProactiveSessions;
     private mutedProactiveSessionCounts;
+    /** Global limiter for chat.send RPC calls; large multi-bot fan-out can
+     * saturate the Gateway before collectReply even starts. The slot is released
+     * as soon as the chat.send RPC returns a runId; collectReply does not hold it.
+     */
+    private chatSendConcurrency;
+    private activeChatSends;
+    private chatSendWaiters;
     constructor(config: OpenClawConfig);
     connect(): Promise<void>;
     private _doConnect;
@@ -52,6 +59,7 @@ export declare class OpenClawClient {
      * 30-minute safety net only for catastrophic WS disconnection.
      */
     private collectReply;
+    private pickBestCollectedText;
     createSession(params: {
         key: string;
         model: string;
@@ -92,6 +100,8 @@ export declare class OpenClawClient {
     private addMutedProactiveKey;
     private releaseMutedProactiveKey;
     muteProactiveDelivery(sessionKey: string): (delayMs?: number) => void;
+    private acquireChatSendSlot;
+    private releaseChatSendSlot;
     chatSend(params: {
         sessionKey: string;
         message: string;

package/dist/openclaw-client.js

@@ -37,6 +37,13 @@ export class OpenClawClient {
     /** Session keys whose proactive messages must be dropped by the bridge (e.g. discussion scheduler owns delivery). */
     mutedProactiveSessions = new Set();
     mutedProactiveSessionCounts = new Map();
+    /** Global limiter for chat.send RPC calls; large multi-bot fan-out can
+     * saturate the Gateway before collectReply even starts. The slot is released
+     * as soon as the chat.send RPC returns a runId; collectReply does not hold it.
+     */
+    chatSendConcurrency = Number(process.env.OPENCLAW_LARK_MULTI_AGENT_CHAT_SEND_CONCURRENCY || 3);
+    activeChatSends = 0;
+    chatSendWaiters = [];
     constructor(config) {
         this.config = config;
     }
@@ -185,7 +192,7 @@ export class OpenClawClient {
                         this.agentEvents.get(rawKey).push({
                             runId: frame.payload.runId,
                             sessionKey: rawKey,
-                            stream: "assistant",
+                            stream: "transcriptAssistant",
                             data: { deltaText: visibleAssistantText, delta: visibleAssistantText, replace: true },
                         });
                     }
@@ -329,6 +336,7 @@ export class OpenClawClient {
             let text = "";
             let chatDeltaText = "";
             let chatFinalText = "";
+            let transcriptAssistantText = "";
             let sessionKey = targetSessionKey ? `agent:main:${targetSessionKey.replace(/^agent:[^:]+:/, "")}` : "";
             let shortSessionKey = targetSessionKey ? targetSessionKey.replace(/^agent:[^:]+:/, "") : "";
             let chatFinalTimer = null;
@@ -367,7 +375,7 @@ export class OpenClawClient {
                     this.abortChat(targetSessionKey || sessionKey, runId).catch((err) => {
                         console.warn(`[OpenClaw] abort after collectReply idle timeout failed:`, err.message);
                     });
-                    const visibleText = text || chatDeltaText || chatFinalText;
+                    const visibleText = this.pickBestCollectedText(chatFinalText, text, chatDeltaText, transcriptAssistantText);
                     if (visibleText) {
                         resolve(visibleText);
                     }
@@ -392,7 +400,7 @@ export class OpenClawClient {
                     }
                     return `运行事件 item${data.kind ? `/${data.kind}` : ""}`;
                 }
-                if (ev.stream === "assistant" || ev.stream === "chatDelta") {
+                if (ev.stream === "assistant" || ev.stream === "chatDelta" || ev.stream === "transcriptAssistant") {
                     const chunk = String(ev.data?.deltaText || ev.data?.delta || "").trim();
                     return chunk ? `模型输出片段: ${chunk.slice(0, 300)}` : "模型输出片段";
                 }
@@ -543,7 +551,7 @@ export class OpenClawClient {
                             lifecycleStartedLogged = true;
                             console.log(`[OpenClaw] lifecycle start for runId=${runId} after ${Date.now() - collectStartedAt}ms`);
                         }
-                        if ((ev.stream === "assistant" || ev.stream === "chatDelta") && (ev.data?.deltaText || ev.data?.delta)) {
+                        if ((ev.stream === "assistant" || ev.stream === "chatDelta" || ev.stream === "transcriptAssistant") && (ev.data?.deltaText || ev.data?.delta)) {
                             const chunk = ev.data.deltaText || ev.data.delta;
                             if (ev.stream === "assistant") {
                                 if (ev.data?.replace) {
@@ -553,7 +561,7 @@ export class OpenClawClient {
                                     text += chunk;
                                 }
                             }
-                            else {
+                            else if (ev.stream === "chatDelta") {
                                 if (ev.data?.replace) {
                                     chatDeltaText = chunk;
                                 }
@@ -561,6 +569,14 @@ export class OpenClawClient {
                                     chatDeltaText += chunk;
                                 }
                             }
+                            else {
+                                if (ev.data?.replace) {
+                                    transcriptAssistantText = chunk;
+                                }
+                                else {
+                                    transcriptAssistantText += chunk;
+                                }
+                            }
                         }
                         if (ev.stream === "chatFinal") {
                             chatFinalText = ev.data?.text || "";
@@ -573,7 +589,7 @@ 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".
-                                    const latestFinalText = chatFinalText || text || chatDeltaText;
+                                    const latestFinalText = this.pickBestCollectedText(chatFinalText, text, chatDeltaText, transcriptAssistantText);
                                     if (latestFinalText) {
                                         finish(latestFinalText);
                                     }
@@ -590,9 +606,9 @@ export class OpenClawClient {
                         if (ev.stream === "lifecycle" && ev.data?.phase === "end") {
                             // Prefer final chat message over accumulated deltas: some providers may
                             // emit only partial deltas (e.g. "N") while final contains "NO_REPLY".
-                            const finalText = chatFinalText || text || chatDeltaText;
+                            const finalText = this.pickBestCollectedText(chatFinalText, text, chatDeltaText, transcriptAssistantText);
                             const finishFromLifecycle = () => {
-                                const latestFinalText = chatFinalText || text || chatDeltaText;
+                                const latestFinalText = this.pickBestCollectedText(chatFinalText, text, chatDeltaText, transcriptAssistantText);
                                 if (!chatFinalText && latestFinalText.trim() === "N") {
                                     // Some providers stream the first character of NO_REPLY ("N") but
                                     // never deliver a final chat message in time. Never surface a lone
@@ -655,6 +671,17 @@ export class OpenClawClient {
             }, 50);
         });
     }
+    pickBestCollectedText(chatFinalText, assistantText, chatDeltaText, transcriptAssistantText) {
+        if (chatFinalText)
+            return chatFinalText;
+        const candidates = [assistantText, chatDeltaText, transcriptAssistantText].filter((value) => value && value.trim());
+        if (candidates.length === 0)
+            return "";
+        // transcriptAssistant is a full transcript mirror. Keep it separate from
+        // streaming deltas to avoid concatenating the same response twice; choose
+        // the richest available non-final text as fallback.
+        return candidates.sort((a, b) => b.length - a.length)[0];
+    }
     // --- Session management ---
     async createSession(params) {
         return this.rpc("sessions.create", params);
@@ -837,6 +864,24 @@ export class OpenClawClient {
                 release();
         };
     }
+    async acquireChatSendSlot() {
+        const limit = Math.max(1, this.chatSendConcurrency || 1);
+        if (this.activeChatSends < limit) {
+            this.activeChatSends++;
+            return () => this.releaseChatSendSlot();
+        }
+        const startedWaitingAt = Date.now();
+        await new Promise((resolve) => this.chatSendWaiters.push(resolve));
+        this.activeChatSends++;
+        console.log(`[OpenClaw] chat.send waited ${Date.now() - startedWaitingAt}ms for concurrency slot (active=${this.activeChatSends}/${limit})`);
+        return () => this.releaseChatSendSlot();
+    }
+    releaseChatSendSlot() {
+        this.activeChatSends = Math.max(0, this.activeChatSends - 1);
+        const next = this.chatSendWaiters.shift();
+        if (next)
+            next();
+    }
     async chatSend(params) {
         const sk = params.sessionKey;
         const fullSessionKey = `agent:main:${sk}`;
@@ -849,14 +894,21 @@ export class OpenClawClient {
             // the next message while still allowing sessionKey matching for internal runIds.
             this.agentEvents.set(fullSessionKey, []);
             this.agentEvents.set(sk, []);
+            const releaseChatSendSlot = await this.acquireChatSendSlot();
+            let result;
             const sendStartedAt = Date.now();
-            const result = await this.rpc("chat.send", {
-                sessionKey: sk,
-                message: params.message,
-                attachments: params.attachments,
-                deliver: params.deliver ?? false,
-                idempotencyKey: randomUUID(),
-            });
+            try {
+                result = await this.rpc("chat.send", {
+                    sessionKey: sk,
+                    message: params.message,
+                    attachments: params.attachments,
+                    deliver: params.deliver ?? false,
+                    idempotencyKey: randomUUID(),
+                });
+            }
+            finally {
+                releaseChatSendSlot();
+            }
             console.log(`[OpenClaw] chat.send runId: ${result.runId} (rpc=${Date.now() - sendStartedAt}ms, attachments=${params.attachments?.length || 0})`);
             return await this.collectReply(result.runId, params.timeoutMs || 1800000, sk, { emptyFinalAsNoReply: params.emptyFinalAsNoReply, expectedUserText: params.message });
         }

package/package.json

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