openclaw-lark-multi-agent 1.0.20 → 1.0.21

package/dist/feishu-bot.d.ts

@@ -73,6 +73,9 @@ export declare class FeishuBot {
     static getByName(name: string): FeishuBot | undefined;
     static findByOpenId(openId: string): FeishuBot | undefined;
     private handleMessage;
+    private getUnhealthySessionStatus;
+    private recoverFromUnhealthySession;
+    private withSessionHealthMonitor;
     /**
      * Process queued messages for a chat: batch all unsynced messages and send to OpenClaw.
      * Loops until no more unsynced human messages remain.
@@ -106,6 +109,17 @@ export declare class FeishuBot {
     private dispatchPendingDeliveries;
     private hasFreeModeBot;
     private mentionedBotNames;
+    private mentionedBotNamesFromChairmanText;
+    /**
+     * Resolve the target bot name(s) for a /chairman command using every signal
+     * available, in priority order:
+     *   1. Feishu mention metadata (app_id / open_id / name).
+     *   2. Text fallback: "@Bot" or "Bot" written in the message body.
+     *
+     * This keeps /chairman working even when a Feishu client or bridge omits
+     * mention metadata. Returns a de-duplicated, order-preserving list.
+     */
+    private resolveChairmanTargets;
     private isDiscussionCoordinator;
     private getDiscussionParticipants;
     private getChairmanParticipant;

package/dist/feishu-bot.js

@@ -14,6 +14,15 @@ const MAX_MERGED_TRIGGER_MESSAGES = Number(process.env.OPENCLAW_LARK_MULTI_AGENT
 const MAX_MERGED_TRIGGER_BYTES = Number(process.env.OPENCLAW_LARK_MULTI_AGENT_MAX_MERGED_TRIGGER_BYTES || 128 * 1024);
 const BRIDGE_ATTACHMENTS_DIR = getBridgeAttachmentsDir();
 const FEISHU_DOCS_DIR = join(getDataDir(), "feishu-docs");
+const SESSION_HEALTH_POLL_MS = Number(process.env.OPENCLAW_LARK_MULTI_AGENT_SESSION_HEALTH_POLL_MS || 5_000);
+class UnhealthySessionError extends Error {
+    status;
+    constructor(status) {
+        super(`unhealthy session: ${status}`);
+        this.status = status;
+        this.name = "UnhealthySessionError";
+    }
+}
 /**
  * Manages a single Feishu bot instance.
  *
@@ -261,6 +270,10 @@ export class FeishuBot {
      */
     async drainOnStartup() {
         try {
+            const restoredDeliveries = this.store.resetStaleDeliveries(this.config.name, 5 * 60_000, 5);
+            if (restoredDeliveries.restored > 0 || restoredDeliveries.failed > 0) {
+                console.warn(`[${this.config.name}] Startup delivery recovery: restored=${restoredDeliveries.restored}, failed=${restoredDeliveries.failed}`);
+            }
             const chats = this.store.getAllChatInfo();
             const drainTasks = [];
             for (const chat of chats) {
@@ -273,6 +286,12 @@ export class FeishuBot {
                 // Drain only messages that were explicitly marked as reply triggers.
                 // Context-only messages should not start an OpenClaw run after restart.
                 const pendingTriggerIds = this.store.getPendingTriggerIds(this.config.name, chat.chatId);
+                const pendingDeliveries = this.store.getPendingDeliveries(chat.chatId, this.config.name, 1);
+                if (pendingDeliveries.length > 0) {
+                    drainTasks.push(this.dispatchPendingDeliveries(chat.chatId).catch((err) => {
+                        console.warn(`[${this.config.name}] Startup delivery drain failed for ${chat.chatId.slice(-8)}:`, err.message);
+                    }));
+                }
                 if (pendingTriggerIds.size > 0) {
                     console.log(`[${this.config.name}] Startup drain: ${pendingTriggerIds.size} pending trigger(s) in ${chat.chatName || chat.chatId.slice(-8)}`);
                     // Do not let one slow/stuck chat block startup drain for all other chats.
@@ -350,8 +369,9 @@ export class FeishuBot {
             }
             // --- Extract text content based on message type ---
             let cleanText = "";
+            let rawText = "";
             if (messageType === "text") {
-                const rawText = content.text || "";
+                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,
@@ -467,9 +487,12 @@ export class FeishuBot {
                 const isModelCommand = commandName === "/model";
                 const rejectModelAll = chatType !== "p2p" && isModelCommand && routing.isAllMention;
                 if (chatType !== "p2p") {
+                    const groupBotCount = Array.from(FeishuBot.allBots.values()).filter((bot) => bot.store === this.store).length;
+                    const singleBotGroup = groupBotCount === 1;
                     if (isModelCommand) {
                         // Model switching is per-bot. @all is rejected by one coordinator;
-                        // otherwise group /model must explicitly target this bot.
+                        // otherwise group /model must explicitly target this bot. A single-bot
+                        // group treats the sole bot as the implicit target.
                         if (routing.isAllMention) {
                             if (!this.isDiscussionCoordinator())
                                 return;
@@ -478,12 +501,58 @@ export class FeishuBot {
                             if (!routing.isCurrentBotMentioned)
                                 return;
                         }
+                        else if (!singleBotGroup) {
+                            if (!this.isDiscussionCoordinator())
+                                return;
+                        }
+                    }
+                    else if (isChairmanCommand) {
+                        // /chairman @Bot is owned by the mentioned bot itself. This avoids
+                        // requiring a coordinator to parse another bot's mention metadata,
+                        // which can vary across Feishu clients/bridges. Untargeted/status,
+                        // @all, and clear/off remain coordinator-owned group commands.
+                        //
+                        // Target resolution uses both Feishu mention metadata AND a text
+                        // fallback (parsing "@Bot" / "Bot" from the raw message), so a
+                        // /chairman that arrives without mention metadata still routes to
+                        // the intended bot instead of silently failing.
+                        const chairmanArg = this.stripLeadingCommandMentions(this.cleanMentions(rawText)).replace(/^\s*\/chairman\b/i, "").trim().toLowerCase();
+                        const isClearArg = ["off", "clear", "none"].includes(chairmanArg.split(/\s+/)[0] || "");
+                        const hasMentionMeta = (message.mentions || []).some((m) => !this.isAllMentionItem(m));
+                        const targets = this.resolveChairmanTargets(message.mentions || [], cleanText, rawText);
+                        // A pure status query: no clear keyword, no mention metadata, and no
+                        // textual argument at all. Anything else is a set/route attempt.
+                        const isStatusArg = !isClearArg && !hasMentionMeta && chairmanArg.length === 0;
+                        if (isClearArg || isStatusArg) {
+                            // Group-level status/clear: one coordinator handles it.
+                            if (!this.isDiscussionCoordinator())
+                                return;
+                        }
+                        else if (targets.length >= 1) {
+                            // Targets resolved: only the (single) targeted bot acts. If
+                            // multiple distinct targets resolved, the coordinator handles
+                            // the "only one chairman" error once.
+                            const uniqueTargets = Array.from(new Set(targets));
+                            const targetedSelf = uniqueTargets.includes(this.config.name);
+                            if (uniqueTargets.length > 1) {
+                                if (!this.isDiscussionCoordinator())
+                                    return;
+                            }
+                            else if (!targetedSelf) {
+                                return;
+                            }
+                        }
                         else {
-                            return;
+                            // A set attempt whose target could not be resolved at all (missing
+                            // metadata AND no readable name in text): coordinator handles the
+                            // fallback so the user still gets an actionable reply.
+                            if (!this.isDiscussionCoordinator())
+                                return;
                         }
                     }
-                    else if (isChairmanCommand || isLocaleCommand) {
-                        // Group-level settings; one coordinator handles them.
+                    else if (isLocaleCommand && !routing.hasTargetedMention) {
+                        // Untargeted or @all locale is a group-level setting; one coordinator handles it.
+                        // If the user explicitly @s a bot, the targeted bot should execute and answer.
                         if (!this.isDiscussionCoordinator())
                             return;
                     }
@@ -497,8 +566,9 @@ export class FeishuBot {
                         if (!routing.isCurrentBotMentioned)
                             return;
                     }
-                    else if (!routing.isAllMention) {
-                        // Other bridge commands in a group need an explicit target or @all.
+                    else if (!routing.isAllMention && !singleBotGroup) {
+                        // Other bridge commands in a multi-bot group need an explicit target or @all.
+                        // A single-bot group treats the sole bot as the implicit target.
                         return;
                     }
                 }
@@ -583,6 +653,14 @@ export class FeishuBot {
                     return;
                 }
                 if (commandName === "/model") {
+                    if (chatType !== "p2p" && !routing.isAllMention && !routing.hasTargetedMention) {
+                        const groupBotCount = Array.from(FeishuBot.allBots.values()).filter((bot) => bot.store === this.store).length;
+                        if (groupBotCount > 1) {
+                            await this.replyMessage(messageId, "❌ /model 是单 bot 设置，请明确 @ 一个 bot，例如：@Claude /model provider/model-id");
+                            markCommandSynced();
+                            return;
+                        }
+                    }
                     await this.handleModelCommand(chatId, messageId, cleanText.trim());
                     markCommandSynced();
                     return;
@@ -665,7 +743,7 @@ export class FeishuBot {
                     return;
                 }
                 if (commandName === "/chairman") {
-                    await this.handleChairmanCommand(chatId, chatType, messageId, message.mentions || [], cleanText.trim());
+                    await this.handleChairmanCommand(chatId, chatType, messageId, message.mentions || [], cleanText.trim(), rawText);
                     markCommandSynced();
                     return;
                 }
@@ -687,7 +765,8 @@ export class FeishuBot {
                     const chairman = this.getChairmanParticipant(chatId);
                     const participants = this.getDiscussionParticipants(chatId);
                     if (participants.length > 0 || chairman) {
-                        discussionManager.startIfAbsent({
+                        const preempted = discussionManager.status(chatId);
+                        const started = discussionManager.startIfAbsent({
                             chatId,
                             rootMessageId: messageId,
                             topic: cleanText,
@@ -705,6 +784,11 @@ export class FeishuBot {
                                 }
                             },
                         });
+                        if (started && preempted) {
+                            await this.sendMessage(chatId, this.isEn(chatId)
+                                ? `💬 New topic received; stopped the previous Discuss session and started a new one. Previous topic: ${preempted.topic.slice(0, 80)}`
+                                : `💬 收到新话题，已停止上一轮 Discuss 并开启新讨论。上一话题：${preempted.topic.slice(0, 80)}`);
+                        }
                     }
                     else if (this.isDiscussionCoordinator()) {
                         await this.sendMessage(chatId, this.isEn(chatId)
@@ -735,6 +819,11 @@ export class FeishuBot {
             }
             // Track this message for reaction status updates
             const pending = this.pendingAckMessages.get(chatId) || [];
+            const unhealthy = await this.getUnhealthySessionStatus(chatId);
+            if (unhealthy) {
+                await this.recoverFromUnhealthySession(chatId, messageId, insertedId, unhealthy);
+                return;
+            }
             // Anti-loop
             const streak = this.store.getBotStreak(chatId, this.config.name);
             if (streak >= MAX_BOT_STREAK) {
@@ -771,6 +860,65 @@ export class FeishuBot {
             console.error(`[${this.config.name}] Error:`, err);
         }
     }
+    async getUnhealthySessionStatus(chatId) {
+        const sessionKey = this.getSessionKey(chatId);
+        try {
+            const resp = await this.openclawClient.getSessionInfo(sessionKey);
+            const status = String(resp?.session?.status || "").toLowerCase();
+            if (!status)
+                return null;
+            if (["killed", "kill", "dead", "crashed", "crash", "failed", "failure", "error", "errored", "invalid"].some((bad) => status.includes(bad))) {
+                return status;
+            }
+        }
+        catch {
+            // Absence/transient describe failures should not block a new run; chat.send
+            // will create/report the session as usual.
+        }
+        return null;
+    }
+    async recoverFromUnhealthySession(chatId, messageId, insertedId, status) {
+        const sessionKey = this.getSessionKey(chatId);
+        await this.openclawClient.abortChat(sessionKey).catch(() => { });
+        this.busyChats.set(chatId, 0);
+        const cleared = this.store.clearAllPendingTriggers(this.config.name, chatId);
+        if (insertedId > 0)
+            this.store.markMessagesSynced(this.config.name, chatId, [insertedId], `${this.config.name}:${chatId}:${insertedId}:unhealthy-session`);
+        const acks = this.pendingAckMessages.get(chatId) || [];
+        for (const ack of acks) {
+            await this.removeReaction(ack.messageId, ack.emoji).catch(() => { });
+            await this.addReaction(ack.messageId, "FAIL").catch(() => { });
+        }
+        this.pendingAckMessages.set(chatId, []);
+        await this.addReaction(messageId, "FAIL").catch(() => { });
+        await this.replyMessage(messageId, this.isEn(chatId)
+            ? `⚠️ ${this.config.name} session is unhealthy (${status}). Cleared ${cleared} pending message(s) and stopped waiting. Please send /reset and retry.`
+            : `⚠️ ${this.config.name} 的 session 状态异常（${status}）。已停止等待、清掉 ${cleared} 条待处理消息并关闭等待反应。请先发送 /reset 后重试。`);
+        console.warn(`[${this.config.name}] unhealthy session ${sessionKey} status=${status}; cleared ${cleared} pending trigger(s) for ${chatId.slice(-8)}`);
+    }
+    async withSessionHealthMonitor(chatId, messageId, insertedId, work) {
+        let done = false;
+        const monitoredWork = work.finally(() => { done = true; });
+        const monitor = (async () => {
+            while (!done) {
+                await new Promise((resolve) => setTimeout(resolve, SESSION_HEALTH_POLL_MS));
+                if (done)
+                    break;
+                const unhealthy = await this.getUnhealthySessionStatus(chatId);
+                if (unhealthy) {
+                    await this.recoverFromUnhealthySession(chatId, messageId, insertedId, unhealthy);
+                    throw new UnhealthySessionError(unhealthy);
+                }
+            }
+            return undefined;
+        })();
+        try {
+            return await Promise.race([monitoredWork, monitor]);
+        }
+        finally {
+            done = true;
+        }
+    }
     /**
      * Process queued messages for a chat: batch all unsynced messages and send to OpenClaw.
      * Loops until no more unsynced human messages remain.
@@ -798,6 +946,12 @@ export class FeishuBot {
             if (pendingHumanTriggers.length === 0) {
                 break;
             }
+            const unhealthy = await this.getUnhealthySessionStatus(chatId);
+            if (unhealthy) {
+                const latest = pendingHumanTriggers[pendingHumanTriggers.length - 1];
+                await this.recoverFromUnhealthySession(chatId, latest.messageId, latest.id || 0, unhealthy);
+                break;
+            }
             this.busyChats.set(chatId, Date.now());
             // Pick the batch to process this loop. Consecutive plain human messages are
             // merged into a single run; native escaped commands (//x) are processed on
@@ -850,6 +1004,17 @@ export class FeishuBot {
                     console.warn(`[${this.config.name}] Dropped ${droppedMergedTriggers.length} older pending trigger(s) for ${chatId.slice(-8)} due to merge limits (kept=${mergedTriggers.length}, bytes=${bytes}): ${summaries}`);
                 }
             }
+            const deliveredTriggerIds = mergedTriggers
+                .map((m) => m.id || 0)
+                .filter((id) => id > 0 && this.store.hasDeliveredReply(this.config.name, chatId, id));
+            if (deliveredTriggerIds.length > 0) {
+                console.warn(`[${this.config.name}] Clearing ${deliveredTriggerIds.length} stale delivered pending trigger(s) for ${chatId.slice(-8)}: ${deliveredTriggerIds.join(",")}`);
+                for (const id of deliveredTriggerIds)
+                    this.store.clearPendingTrigger(this.config.name, chatId, id);
+                mergedTriggers = mergedTriggers.filter((m) => !m.id || !deliveredTriggerIds.includes(m.id));
+                if (mergedTriggers.length === 0)
+                    continue;
+            }
             const isNativeCommandTrigger = firstIsNative;
             const lastHuman = mergedTriggers[mergedTriggers.length - 1];
             const triggerId = lastHuman.id || 0;
@@ -934,7 +1099,7 @@ export class FeishuBot {
                     }
                 };
                 try {
-                    reply = await this.openclawClient.chatSendWithContext({
+                    reply = await this.withSessionHealthMonitor(chatId, lastHuman.messageId || "", triggerId, this.openclawClient.chatSendWithContext({
                         sessionKey,
                         unsyncedMessages: contextMsgs,
                         currentMessage: mergedContent,
@@ -958,7 +1123,7 @@ export class FeishuBot {
                             // INSERT OR IGNORE in message_sync.
                             markSubmittedBatch(`submitted:${runId}`);
                         },
-                    });
+                    }));
                 }
                 finally {
                     // OpenClaw may emit the final assistant session.message just after
@@ -1088,6 +1253,10 @@ export class FeishuBot {
                 this.pendingAckMessages.set(chatId, remainingAcks);
             }
             catch (err) {
+                if (err instanceof UnhealthySessionError) {
+                    console.warn(`[${this.config.name}] processQueue stopped because session became unhealthy: ${err.status}`);
+                    break;
+                }
                 console.error(`[${this.config.name}] processQueue error:`, err);
                 const errorText = this.formatUserVisibleError(err);
                 if (lastHuman.messageId) {
@@ -1185,7 +1354,7 @@ export class FeishuBot {
         return mentions.some((m) => this.mentionedBotName(m) === this.config.name);
     }
     isAllMention(rawText, mentions = []) {
-        if (rawText && (rawText.includes("@_all") || rawText.includes("@all") || rawText.includes("@所有人")))
+        if (rawText && /(^|\s)@(?:_all|all|所有人)(?=\s|$)/i.test(rawText))
             return true;
         return mentions.some((m) => this.isAllMentionItem(m));
     }
@@ -1227,7 +1396,7 @@ export class FeishuBot {
         return null;
     }
     escapeRegExp(value) {
-        return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+        return value.replace(/[.*+?^${}()|[\]\\-]/g, "\\$&");
     }
     resolveBotName(sender) {
         const openId = sender?.sender_id?.open_id;
@@ -1390,12 +1559,6 @@ export class FeishuBot {
             if (this.store.hasRecentOverlappingDelivery(this.config.name, chatId, text, attachmentsJson, 60_000, 8, [sourceType]))
                 return;
         }
-        else if (sourceType === "assistant_visible") {
-            if (this.store.hasRecentSimilarDelivery(this.config.name, chatId, contentHash, 60_000, ["assistant_visible"]))
-                return;
-            if (this.store.hasRecentOverlappingDelivery(this.config.name, chatId, text, attachmentsJson, 60_000, 30, ["assistant_visible"]))
-                return;
-        }
         const deliveryId = this.store.enqueueDelivery({
             sessionKey: this.deliverySessionKey(chatId),
             chatId,
@@ -1473,6 +1636,49 @@ export class FeishuBot {
             .filter((name) => Boolean(name));
         return Array.from(new Set(names));
     }
+    mentionedBotNamesFromChairmanText(...texts) {
+        const normalizedTexts = texts
+            .filter(Boolean)
+            .map((text) => text.replace(/^\s*\/chairman\b/i, "").trim())
+            .filter(Boolean)
+            .map((text) => text.replace(/^@+/, "").replace(/\s+/g, "").toLowerCase());
+        if (normalizedTexts.length === 0)
+            return [];
+        const names = [];
+        const candidates = [this, ...Array.from(FeishuBot.allBots.values()).filter((bot) => bot !== this && bot.store === this.store)];
+        for (const raw of normalizedTexts) {
+            for (const bot of candidates) {
+                const botName = bot.config.name.trim().replace(/\s+/g, "").toLowerCase();
+                const displayNames = [
+                    botName,
+                    `@${botName}`,
+                    `万万（${botName}）`,
+                    `@万万（${botName}）`,
+                    `万万(${botName})`,
+                    `@万万(${botName})`,
+                ];
+                if (displayNames.includes(raw) || new RegExp(`^@?[^()（）]+[（(]${this.escapeRegExp(botName)}[）)]$`, "i").test(raw)) {
+                    names.push(bot.config.name);
+                }
+            }
+        }
+        return Array.from(new Set(names));
+    }
+    /**
+     * Resolve the target bot name(s) for a /chairman command using every signal
+     * available, in priority order:
+     *   1. Feishu mention metadata (app_id / open_id / name).
+     *   2. Text fallback: "@Bot" or "Bot" written in the message body.
+     *
+     * This keeps /chairman working even when a Feishu client or bridge omits
+     * mention metadata. Returns a de-duplicated, order-preserving list.
+     */
+    resolveChairmanTargets(mentions, text, rawText = "") {
+        const fromMeta = this.mentionedBotNames(mentions);
+        if (fromMeta.length > 0)
+            return fromMeta;
+        return this.mentionedBotNamesFromChairmanText(text, rawText);
+    }
     isDiscussionCoordinator() {
         const bots = Array.from(FeishuBot.allBots.values()).filter((bot) => bot.store === this.store);
         if (bots.length === 0)
@@ -1879,7 +2085,7 @@ export class FeishuBot {
         }
         if (action === "rounds") {
             const n = Number.parseInt(parts[2] || "", 10);
-            if (!Number.isFinite(n)) {
+            if (!Number.isInteger(n) || n < 1 || n > 10) {
                 await this.replyMessage(messageId, "❌ Usage: /discuss rounds <1-10>");
                 return;
             }
@@ -1906,32 +2112,43 @@ export class FeishuBot {
             active ? `运行中：第 ${active.currentRound}/${active.maxRounds} 轮，topic=${active.topic.slice(0, 80)}` : "运行中：无",
         ].join("\n"));
     }
-    async handleChairmanCommand(chatId, chatType, messageId, mentions, text) {
+    async handleChairmanCommand(chatId, chatType, messageId, mentions, text, rawText = "") {
         if (chatType === "p2p") {
             await this.replyMessage(messageId, "❌ Chairman 只在群聊中可用");
             return;
         }
         const parts = text.split(/\s+/).filter(Boolean);
-        const action = (parts[1] || "status").toLowerCase();
+        const action = (parts[1] || "").toLowerCase();
         if (["off", "clear", "none"].includes(action)) {
             const previous = this.store.getChairmanBot(chatId);
             this.store.clearChairmanBot(chatId);
             await this.replyMessage(messageId, previous ? `✅ 已清除当前群 Chairman（原 ${previous}）` : "✅ 当前群没有 Chairman");
             return;
         }
-        const botNames = this.mentionedBotNames(mentions);
-        if (botNames.length === 0) {
-            const current = this.store.getChairmanBot(chatId);
-            await this.replyMessage(messageId, current
-                ? `👑 当前 Chairman：${current}\n作用：普通消息无人 free 时由 TA 回答；Discuss 模式下负责主持、调停和最终总结。`
-                : "👑 当前没有 Chairman\n用法：/chairman @某个Bot");
+        const resolvedBotNames = this.resolveChairmanTargets(mentions, text, rawText);
+        if (resolvedBotNames.length === 0) {
+            // /chairman is intentionally not a status query. Status lives in /status;
+            // this command is only for switching or clearing the Chairman. Keeping the
+            // two meanings separate prevents failed mention parsing from being masked
+            // as a harmless "current status" response.
+            const groupBots = Array.from(FeishuBot.allBots.values())
+                .filter((bot) => bot.store === this.store)
+                .map((bot) => bot.config.name);
+            const uniqueGroupBots = Array.from(new Set(groupBots));
+            const choices = uniqueGroupBots.length > 0
+                ? uniqueGroupBots.map((name) => `/chairman ${name}`).join("\n")
+                : "/chairman @某个Bot";
+            await this.replyMessage(messageId, `❌ /chairman 只用于设置/切换 Chairman，不再用于状态查询。\n` +
+                `查看当前 Chairman 请用 /status。\n` +
+                `切换请 @ 一个 bot，或直接发（可复制）：\n${choices}\n` +
+                `清除请用：/chairman off`);
             return;
         }
-        if (botNames.length > 1) {
+        if (resolvedBotNames.length > 1) {
             await this.replyMessage(messageId, "❌ 一个群只能设置一个 Chairman。请只 @ 一个 bot。");
             return;
         }
-        const next = botNames[0];
+        const next = resolvedBotNames[0];
         const previous = this.store.getChairmanBot(chatId);
         this.store.setChairmanBot(chatId, next);
         const mode = this.store.getBotMode(next, chatId);
@@ -2113,7 +2330,7 @@ export class FeishuBot {
                     chatName: "私聊",
                     members: "",
                     memberNames: "",
-                    ownerBot: this.config.name,
+                    ownerBot: existing?.ownerBot || this.config.name,
                     freeDiscussion: this.store.getChatInfo(chatId)?.freeDiscussion || false,
                     verbose: this.store.getChatInfo(chatId)?.verbose || false,
                     discuss: this.store.getChatInfo(chatId)?.discuss || false,

package/dist/message-store.d.ts

@@ -72,6 +72,10 @@ export declare class MessageStore {
     getPendingDeliveries(chatId?: string, botName?: string, maxCount?: number): DeliveryOutboxItem[];
     hasRecentSimilarDelivery(botName: string, chatId: string, contentHash: string, windowMs: number, sourceTypes?: string[]): boolean;
     hasRecentOverlappingDelivery(botName: string, chatId: string, content: string, attachmentsJson: string, windowMs: number, minShortLength?: number, sourceTypes?: string[]): boolean;
+    resetStaleDeliveries(botName: string, staleMs: number, maxAttempts: number): {
+        restored: number;
+        failed: number;
+    };
     claimDelivery(id: number): boolean;
     markDeliveryDelivered(id: number): void;
     markDeliveryFailed(id: number): void;

package/dist/message-store.js

@@ -436,6 +436,20 @@ export class MessageStore {
         }
         return false;
     }
+    resetStaleDeliveries(botName, staleMs, maxAttempts) {
+        const cutoff = Date.now() - staleMs;
+        const fail = this.db.prepare(`
+      UPDATE delivery_outbox
+      SET status = 'failed', updated_at = ?
+      WHERE bot_name = ? AND status = 'delivering' AND updated_at < ? AND attempts >= ?
+    `).run(Date.now(), botName, cutoff, maxAttempts);
+        const restore = this.db.prepare(`
+      UPDATE delivery_outbox
+      SET status = 'pending', updated_at = ?
+      WHERE bot_name = ? AND status = 'delivering' AND updated_at < ? AND attempts < ?
+    `).run(Date.now(), botName, cutoff, maxAttempts);
+        return { restored: restore.changes, failed: fail.changes };
+    }
     claimDelivery(id) {
         const result = this.db.prepare(`
       UPDATE delivery_outbox SET status = 'delivering', attempts = attempts + 1, updated_at = ? WHERE id = ? AND status = 'pending'

package/package.json

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