openclaw-lark-multi-agent 1.0.11 → 1.0.13

package/dist/feishu-bot.d.ts

@@ -45,6 +45,8 @@ export declare class FeishuBot {
      * Format: lma-<botname>-<chatId>
      */
     getSessionKey(chatId: string): string;
+    private lmaBridgePolicy;
+    private injectBridgePolicy;
     /**
      * Ensure the session for a given chatId exists with the correct model.
      * Lazy: only creates on first message in that chat.

package/dist/feishu-bot.js

@@ -100,6 +100,23 @@ export class FeishuBot {
     getSessionKey(chatId) {
         return `lma-${this.config.name.toLowerCase()}-${chatId}`;
     }
+    lmaBridgePolicy() {
+        return [
+            "[LMA bridge policy]",
+            "你正在 OpenClaw Lark Multi-Agent bridge 会话中。",
+            "不要调用 message、sessions_send、feishu_im_user_message 或任何主动向飞书/外部聊天发送消息的工具。",
+            "直接在当前回复中作答；LMA bridge 会负责把最终回复投递回原始飞书群。",
+        ].join("\n");
+    }
+    async injectBridgePolicy(sessionKey) {
+        await this.openclawClient.injectAssistantMessage({
+            sessionKey,
+            message: this.lmaBridgePolicy(),
+            label: "LMA bridge policy",
+        }).catch((err) => {
+            console.warn(`[${this.config.name}] bridge policy inject failed:`, err.message);
+        });
+    }
     /**
      * Ensure the session for a given chatId exists with the correct model.
      * Lazy: only creates on first message in that chat.
@@ -136,6 +153,7 @@ export class FeishuBot {
                 });
                 // Always patch model after create to ensure it takes effect
                 await this.openclawClient.patchSession({ key: sessionKey, model: this.config.model });
+                await this.injectBridgePolicy(sessionKey);
                 console.log(`[${this.config.name}] Session created: ${sessionKey} (model: ${this.config.model})`);
             }
         }

package/dist/openclaw-client.d.ts

@@ -43,6 +43,10 @@ export declare class OpenClawClient {
     private chatSendConcurrency;
     private activeChatSends;
     private chatSendWaiters;
+    /** Maintenance RPCs like sessions.compact are heavy and should not fan out. */
+    private maintenanceConcurrency;
+    private activeMaintenanceRpcs;
+    private maintenanceWaiters;
     constructor(config: OpenClawConfig);
     connect(): Promise<void>;
     private _doConnect;
@@ -59,6 +63,7 @@ export declare class OpenClawClient {
      * 30-minute safety net only for catastrophic WS disconnection.
      */
     private collectReply;
+    private pickBestCollectedText;
     createSession(params: {
         key: string;
         model: string;
@@ -70,6 +75,11 @@ export declare class OpenClawClient {
         label?: string;
     }): Promise<any>;
     getSessionStatus(key: string): Promise<any>;
+    injectAssistantMessage(params: {
+        sessionKey: string;
+        message: string;
+        label?: string;
+    }): Promise<any>;
     /**
      * Get session info (model, tokens, etc.) for status display.
      */
@@ -101,6 +111,8 @@ export declare class OpenClawClient {
     muteProactiveDelivery(sessionKey: string): (delayMs?: number) => void;
     private acquireChatSendSlot;
     private releaseChatSendSlot;
+    private acquireMaintenanceSlot;
+    private releaseMaintenanceSlot;
     chatSend(params: {
         sessionKey: string;
         message: string;

package/dist/openclaw-client.js

@@ -44,6 +44,10 @@ export class OpenClawClient {
     chatSendConcurrency = Number(process.env.OPENCLAW_LARK_MULTI_AGENT_CHAT_SEND_CONCURRENCY || 3);
     activeChatSends = 0;
     chatSendWaiters = [];
+    /** Maintenance RPCs like sessions.compact are heavy and should not fan out. */
+    maintenanceConcurrency = Number(process.env.OPENCLAW_LARK_MULTI_AGENT_MAINTENANCE_CONCURRENCY || 1);
+    activeMaintenanceRpcs = 0;
+    maintenanceWaiters = [];
     constructor(config) {
         this.config = config;
     }
@@ -192,7 +196,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 },
                         });
                     }
@@ -336,6 +340,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;
@@ -374,7 +379,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);
                     }
@@ -399,7 +404,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)}` : "模型输出片段";
                 }
@@ -550,7 +555,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) {
@@ -560,7 +565,7 @@ export class OpenClawClient {
                                     text += chunk;
                                 }
                             }
-                            else {
+                            else if (ev.stream === "chatDelta") {
                                 if (ev.data?.replace) {
                                     chatDeltaText = chunk;
                                 }
@@ -568,6 +573,14 @@ export class OpenClawClient {
                                     chatDeltaText += chunk;
                                 }
                             }
+                            else {
+                                if (ev.data?.replace) {
+                                    transcriptAssistantText = chunk;
+                                }
+                                else {
+                                    transcriptAssistantText += chunk;
+                                }
+                            }
                         }
                         if (ev.stream === "chatFinal") {
                             chatFinalText = ev.data?.text || "";
@@ -580,7 +593,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);
                                     }
@@ -597,9 +610,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
@@ -662,6 +675,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);
@@ -672,6 +696,9 @@ export class OpenClawClient {
     async getSessionStatus(key) {
         return this.rpc("sessions.describe", { key });
     }
+    async injectAssistantMessage(params) {
+        return this.rpc("chat.inject", params, 10000);
+    }
     /**
      * Get session info (model, tokens, etc.) for status display.
      */
@@ -704,7 +731,15 @@ export class OpenClawClient {
         return this.rpc("sessions.reset", { key }, 5000).catch(() => { });
     }
     async compactSession(key) {
-        return this.rpc("sessions.compact", { key });
+        const release = await this.acquireMaintenanceSlot("sessions.compact");
+        const startedAt = Date.now();
+        try {
+            return await this.rpc("sessions.compact", { key }, 10 * 60 * 1000);
+        }
+        finally {
+            console.log(`[OpenClaw] sessions.compact finished for ${key} in ${Date.now() - startedAt}ms`);
+            release();
+        }
     }
     // --- Chat ---
     /**
@@ -862,6 +897,24 @@ export class OpenClawClient {
         if (next)
             next();
     }
+    async acquireMaintenanceSlot(kind) {
+        const limit = Math.max(1, this.maintenanceConcurrency || 1);
+        if (this.activeMaintenanceRpcs < limit) {
+            this.activeMaintenanceRpcs++;
+            return () => this.releaseMaintenanceSlot();
+        }
+        const startedWaitingAt = Date.now();
+        await new Promise((resolve) => this.maintenanceWaiters.push(resolve));
+        this.activeMaintenanceRpcs++;
+        console.log(`[OpenClaw] ${kind} waited ${Date.now() - startedWaitingAt}ms for maintenance slot (active=${this.activeMaintenanceRpcs}/${limit})`);
+        return () => this.releaseMaintenanceSlot();
+    }
+    releaseMaintenanceSlot() {
+        this.activeMaintenanceRpcs = Math.max(0, this.activeMaintenanceRpcs - 1);
+        const next = this.maintenanceWaiters.shift();
+        if (next)
+            next();
+    }
     async chatSend(params) {
         const sk = params.sessionKey;
         const fullSessionKey = `agent:main:${sk}`;

package/package.json

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