timbot 2026.3.12 → 2026.3.19

package/dist/src/monitor.js

@@ -2,10 +2,8 @@ import { createHash, timingSafeEqual } from "node:crypto";
 import { getTimbotRuntime } from "./runtime.js";
 import { genTestUserSig } from "./debug/GenerateTestUserSig-es.js";
 import { LOG_PREFIX, logSimple } from "./logger.js";
+import { extractMentionedBotAccounts, extractTextFromMsgBody, matchTimbotWebhookTargetsBySdkAppId, selectTimbotWebhookTarget, } from "./inbound-routing.js";
 import { allowsFinalTextRecovery, buildBotErrorPayload, buildBotStreamPayload, buildCustomMsgBody, buildStreamingMsgBody, buildTimStreamChunk, buildTimStreamMsgBody, buildTextMsgBody, } from "./streaming-policy.js";
-import { isSelfInboundMessage, resolveOutboundFromAccount } from "./sender.js";
-import { createPartialTextAccumulator, mergeStreamingText } from "./stream-text.js";
-import { splitTextByPreferredBreaks } from "./text-splitter.js";
 const webhookTargets = new Map();
 // ============ 日志工具（带 target） ============
 /** 带 target 的日志（有 runtime 回调） */
@@ -104,6 +102,9 @@ function buildTimbotApiUrl(account, service, action) {
     const userSig = generateUserSig(account) ?? "";
     return `https://${domain}/v4/${service}/${action}?sdkappid=${encodeURIComponent(account.sdkAppId ?? "")}&identifier=${encodeURIComponent(identifier)}&usersig=${encodeURIComponent(userSig)}&random=${random}&contenttype=json`;
 }
+function resolveOutboundSenderAccount(account) {
+    return account.botAccount || account.identifier || "administrator";
+}
 const TIMBOT_PARTIAL_STREAM_THROTTLE_MS = 1000;
 const TIMBOT_STREAM_SOFT_LIMIT_BYTES = 11 * 1024;
 const TIMBOT_FINAL_TEXT_CHUNK_LIMIT = 3500;
@@ -116,9 +117,51 @@ function buildReplyRuntimeConfig(config) {
         disableBlockStreaming: true,
     };
 }
+function mergeStreamingText(previousText, nextText) {
+    const previous = typeof previousText === "string" ? previousText : "";
+    const next = typeof nextText === "string" ? nextText : "";
+    if (!next) {
+        return previous;
+    }
+    if (!previous || next === previous) {
+        return next;
+    }
+    if (next.startsWith(previous)) {
+        return next;
+    }
+    if (previous.startsWith(next)) {
+        return previous;
+    }
+    if (next.includes(previous)) {
+        return next;
+    }
+    if (previous.includes(next)) {
+        return previous;
+    }
+    const maxOverlap = Math.min(previous.length, next.length);
+    for (let overlap = maxOverlap; overlap > 0; overlap -= 1) {
+        if (previous.slice(-overlap) === next.slice(0, overlap)) {
+            return `${previous}${next.slice(overlap)}`;
+        }
+    }
+    return `${previous}${next}`;
+}
 function estimateMsgBodyBytes(msgBody) {
     return Buffer.byteLength(JSON.stringify(msgBody), "utf8");
 }
+function splitTextByFixedLength(text, limit) {
+    if (!text) {
+        return [];
+    }
+    if (limit <= 0 || text.length <= limit) {
+        return [text];
+    }
+    const chunks = [];
+    for (let index = 0; index < text.length; index += limit) {
+        chunks.push(text.slice(index, index + limit));
+    }
+    return chunks;
+}
 function isMsgTooLongError(error) {
     return /msg too long/i.test(error ?? "");
 }
@@ -149,6 +192,35 @@ function buildSnapshotStreamingMsgBody(params) {
         typingText: params.typingText,
     });
 }
+function createPartialTextAccumulator() {
+    const committedSegments = [];
+    let currentPartialText = "";
+    const commitCurrentPartial = () => {
+        if (!currentPartialText) {
+            return;
+        }
+        if (committedSegments.at(-1) !== currentPartialText) {
+            committedSegments.push(currentPartialText);
+        }
+        currentPartialText = "";
+    };
+    const getVisibleText = () => {
+        const segments = currentPartialText
+            ? [...committedSegments, currentPartialText]
+            : [...committedSegments];
+        return segments.filter(Boolean).join("\n\n");
+    };
+    return {
+        noteAssistantMessageStart: () => {
+            commitCurrentPartial();
+        },
+        absorbPartial: (text) => {
+            currentPartialText = mergeStreamingText(currentPartialText, text);
+            return getVisibleText();
+        },
+        getVisibleText,
+    };
+}
 function createLatestTextThrottleLoop(params) {
     let lastSentAt = 0;
     let pendingText = "";
@@ -509,10 +581,6 @@ async function modifyC2CMsg(params) {
     const { account, fromAccount, toAccount, msgKey, msgBody, target } = params;
     const error = (msg) => target ? log(target, "error", msg) : logSimple("error", msg);
     const verbose = (msg) => target ? logVerbose(target, msg) : undefined;
-    if (!fromAccount) {
-        error("C2C 消息修改失败: 缺少机器人账号，无法确定 From_Account");
-        return { ok: false, error: "missing outbound sender account for c2c modify" };
-    }
     const url = buildTimbotApiUrl(account, "openim", "modify_c2c_msg");
     const body = {
         From_Account: fromAccount,
@@ -604,12 +672,6 @@ async function executeStreamingReply(params) {
     let streamFailed = !useStreaming;
     let streamFailureReason;
     let streamOverflowed = false;
-    let overflowSplitActive = false;
-    let overflowVisibleText = "";
-    let overflowBufferedText = "";
-    let overflowFirstChunkCommitted = false;
-    let overflowTailMsgRef;
-    let overflowTailText = "";
     let lastSentVisibleText = "";
     const partialTextAccumulator = createPartialTextAccumulator();
     const streamFallbackTexts = [];
@@ -708,193 +770,6 @@ async function executeStreamingReply(params) {
         }
         return true;
     };
-    const syncOverflowSplitState = async (forceFlush) => {
-        const chunks = splitFinalText(overflowBufferedText).filter((chunk) => chunk.length > 0);
-        if (chunks.length === 0) {
-            overflowTailMsgRef = undefined;
-            overflowTailText = "";
-            return true;
-        }
-        const readyChunks = forceFlush ? chunks : chunks.slice(0, -1);
-        for (const chunk of readyChunks) {
-            if (!overflowFirstChunkCommitted && !useTimStream && streamMsgRef) {
-                const firstResult = await transport.modifyMsg({
-                    ref: streamMsgRef,
-                    msgBody: buildTextMsgBody(chunk),
-                });
-                if (firstResult.ok) {
-                    overflowFirstChunkCommitted = true;
-                    lastSentVisibleText = chunk;
-                    target.statusSink?.({ lastOutboundAt: Date.now() });
-                    continue;
-                }
-                log(target, "warn", `${L}超限续发首段覆盖占位消息失败，改为新消息发送: ${firstResult.error}`);
-            }
-            if (overflowTailMsgRef) {
-                const sealTailResult = await transport.modifyMsg({
-                    ref: overflowTailMsgRef,
-                    msgBody: buildTextMsgBody(chunk),
-                });
-                if (sealTailResult.ok) {
-                    overflowTailMsgRef = undefined;
-                    overflowTailText = "";
-                    target.statusSink?.({ lastOutboundAt: Date.now() });
-                    continue;
-                }
-                log(target, "warn", `${L}超限续发尾段封板失败，改为新消息发送: ${sealTailResult.error}`);
-                overflowTailMsgRef = undefined;
-                overflowTailText = "";
-            }
-            const result = await transport.sendText({ text: chunk });
-            if (!result.ok) {
-                streamFailureReason = result.error || streamFailureReason || `${L}超限续发失败`;
-                streamFailed = true;
-                return false;
-            }
-            target.statusSink?.({ lastOutboundAt: Date.now() });
-        }
-        const liveTail = forceFlush ? "" : (chunks.at(-1) ?? "");
-        overflowBufferedText = liveTail;
-        if (forceFlush) {
-            overflowTailMsgRef = undefined;
-            overflowTailText = "";
-            return true;
-        }
-        if (!liveTail) {
-            overflowTailMsgRef = undefined;
-            overflowTailText = "";
-            return true;
-        }
-        if (overflowTailMsgRef) {
-            if (overflowTailText === liveTail) {
-                return true;
-            }
-            const tailResult = await transport.modifyMsg({
-                ref: overflowTailMsgRef,
-                msgBody: buildTextMsgBody(liveTail),
-            });
-            if (tailResult.ok) {
-                overflowTailText = liveTail;
-                target.statusSink?.({ lastOutboundAt: Date.now() });
-                return true;
-            }
-            log(target, "warn", `${L}超限续发尾段更新失败，改为新尾消息: ${tailResult.error}`);
-            overflowTailMsgRef = undefined;
-            overflowTailText = "";
-        }
-        const createTailResult = await transport.sendMsgBody({
-            msgBody: buildTextMsgBody(liveTail),
-        });
-        if (createTailResult.ok && createTailResult.ref) {
-            overflowTailMsgRef = createTailResult.ref;
-            overflowTailText = liveTail;
-            target.statusSink?.({ lastOutboundAt: Date.now() });
-            return true;
-        }
-        log(target, "warn", `${L}超限续发尾段创建失败: ${createTailResult.error || "未返回消息引用"}`);
-        overflowTailMsgRef = undefined;
-        overflowTailText = "";
-        return true;
-    };
-    const absorbOverflowVisibleText = async (visibleText, forceFlush) => {
-        const mergedVisibleText = mergeStreamingText(overflowVisibleText, visibleText);
-        if (!forceFlush && mergedVisibleText === overflowVisibleText) {
-            return true;
-        }
-        // Only append newly observed text so sealed chunks never re-enter the splitter.
-        const appendedText = mergedVisibleText.startsWith(overflowVisibleText)
-            ? mergedVisibleText.slice(overflowVisibleText.length)
-            : mergedVisibleText;
-        overflowVisibleText = mergedVisibleText;
-        overflowBufferedText += appendedText;
-        return syncOverflowSplitState(forceFlush);
-    };
-    const activateOverflowSplit = async (visibleText, reason) => {
-        streamOverflowed = true;
-        if (overflowPolicy !== "split") {
-            streamFailureReason = reason;
-            log(target, "warn", reason);
-            streamFailed = true;
-            return false;
-        }
-        if (!overflowSplitActive) {
-            overflowSplitActive = true;
-            overflowVisibleText = "";
-            overflowBufferedText = "";
-            overflowFirstChunkCommitted = false;
-            overflowTailMsgRef = undefined;
-            overflowTailText = "";
-            log(target, "warn", `${reason}，切换为分段续发`);
-            if (useTimStream && timStreamMsgId) {
-                const closed = await closeTimStream(lastSentVisibleText || typingText);
-                if (closed) {
-                    target.statusSink?.({ lastOutboundAt: Date.now() });
-                }
-                else {
-                    log(target, "warn", `${L}超限切换分段续发时流式收尾失败`);
-                }
-            }
-            else if (useCustomStreaming && streamMsgRef && lastSentVisibleText) {
-                const finalizeResult = await transport.modifyMsg({
-                    ref: streamMsgRef,
-                    msgBody: buildSnapshotStreamingMsgBody({
-                        useCustomStreaming: true,
-                        text: lastSentVisibleText,
-                        isFinished: 1,
-                        typingText,
-                    }),
-                });
-                if (finalizeResult.ok) {
-                    target.statusSink?.({ lastOutboundAt: Date.now() });
-                }
-                else {
-                    log(target, "warn", `${L}超限切换分段续发时 custom_modify 收尾失败: ${finalizeResult.error}`);
-                }
-            }
-        }
-        return absorbOverflowVisibleText(visibleText, false);
-    };
-    const activateProgressiveSplit = async (visibleText, reason) => {
-        if (overflowPolicy !== "split") {
-            return true;
-        }
-        if (!overflowSplitActive) {
-            overflowSplitActive = true;
-            overflowVisibleText = "";
-            overflowBufferedText = "";
-            overflowFirstChunkCommitted = false;
-            overflowTailMsgRef = undefined;
-            overflowTailText = "";
-            logVerbose(target, `${reason} (visibleLen=${visibleText.length})`);
-            if (useTimStream && timStreamMsgId) {
-                const closed = await closeTimStream(lastSentVisibleText || typingText);
-                if (closed) {
-                    target.statusSink?.({ lastOutboundAt: Date.now() });
-                }
-                else {
-                    log(target, "warn", `${L}滚动续发切换时流式收尾失败`);
-                }
-            }
-            else if (useCustomStreaming && streamMsgRef && lastSentVisibleText) {
-                const finalizeResult = await transport.modifyMsg({
-                    ref: streamMsgRef,
-                    msgBody: buildSnapshotStreamingMsgBody({
-                        useCustomStreaming: true,
-                        text: lastSentVisibleText,
-                        isFinished: 1,
-                        typingText,
-                    }),
-                });
-                if (finalizeResult.ok) {
-                    target.statusSink?.({ lastOutboundAt: Date.now() });
-                }
-                else {
-                    log(target, "warn", `${L}滚动续发切换时 custom_modify 收尾失败: ${finalizeResult.error}`);
-                }
-            }
-        }
-        return absorbOverflowVisibleText(visibleText, false);
-    };
     const sendOverflowNotice = async () => {
         if (useTimStream && timStreamMsgId) {
             const closed = await closeTimStream(lastSentVisibleText || typingText);
@@ -949,15 +824,6 @@ async function executeStreamingReply(params) {
                 if (!visibleText.trim() || visibleText === lastSentVisibleText) {
                     return true;
                 }
-                if (!overflowSplitActive && overflowPolicy === "split") {
-                    const splitChunks = splitFinalText(visibleText).filter((chunk) => chunk.length > 0);
-                    if (splitChunks.length > 1) {
-                        return activateProgressiveSplit(visibleText, `${L}流式文本达到分段阈值，开始滚动续发`);
-                    }
-                }
-                if (overflowSplitActive) {
-                    return absorbOverflowVisibleText(visibleText, false);
-                }
                 if (useTimStream) {
                     if (lastSentVisibleText && !visibleText.startsWith(lastSentVisibleText)) {
                         streamFailureReason = `${L}流式快照与已发送文本不连续，停止 TIM stream 增量更新`;
@@ -982,7 +848,11 @@ async function executeStreamingReply(params) {
                         streamMsgId: timStreamMsgId,
                     });
                     if (estimatedBytes > TIMBOT_STREAM_SOFT_LIMIT_BYTES) {
-                        return activateOverflowSplit(visibleText, `${L}流式消息接近长度上限，停止增量更新 (bytes=${estimatedBytes})`);
+                        streamOverflowed = true;
+                        streamFailureReason = `${L}流式消息接近长度上限，停止增量更新并改为最终分段发送 (bytes=${estimatedBytes})`;
+                        log(target, "warn", streamFailureReason);
+                        streamFailed = true;
+                        return false;
                     }
                     const result = await sendTimStreamChunk({
                         markdown: deltaText,
@@ -999,7 +869,7 @@ async function executeStreamingReply(params) {
                             || streamFailureReason
                             || (timStreamMsgId ? `${L}流式消息更新失败` : `${L}流式消息未返回 StreamMsgID`);
                     if (isMsgTooLongError(result.error)) {
-                        return activateOverflowSplit(visibleText, `${L}流式消息更新超限，停止增量更新 (${result.error})`);
+                        streamOverflowed = true;
                     }
                     log(target, "warn", `${L}流式消息发送失败，等待最终收尾: ${streamFailureReason}`);
                     streamFailed = true;
@@ -1013,7 +883,11 @@ async function executeStreamingReply(params) {
                 });
                 const estimatedBytes = estimateMsgBodyBytes(msgBody);
                 if (estimatedBytes > TIMBOT_STREAM_SOFT_LIMIT_BYTES) {
-                    return activateOverflowSplit(visibleText, `${L}流式消息接近长度上限，停止 modify (bytes=${estimatedBytes})`);
+                    streamOverflowed = true;
+                    streamFailureReason = `${L}流式消息接近长度上限，停止 modify 并改为最终分段发送 (bytes=${estimatedBytes})`;
+                    log(target, "warn", streamFailureReason);
+                    streamFailed = true;
+                    return false;
                 }
                 if (streamMsgRef) {
                     const result = await transport.modifyMsg({
@@ -1027,7 +901,7 @@ async function executeStreamingReply(params) {
                     }
                     streamFailureReason = result.error || streamFailureReason || `${L}流式消息更新失败`;
                     if (isMsgTooLongError(result.error)) {
-                        return activateOverflowSplit(visibleText, `${L}流式消息 modify 超限，停止更新 (${result.error})`);
+                        streamOverflowed = true;
                     }
                     log(target, "warn", `${L}流式消息更新失败，等待最终收尾: ${streamFailureReason}`);
                     streamFailed = true;
@@ -1042,7 +916,7 @@ async function executeStreamingReply(params) {
                 }
                 streamFailureReason = result.error || streamFailureReason || `${L}流式消息创建失败`;
                 if (isMsgTooLongError(result.error)) {
-                    return activateOverflowSplit(visibleText, `${L}流式消息创建超限，切换分段续发 (${result.error})`);
+                    streamOverflowed = true;
                 }
                 log(target, "warn", `${L}流式消息创建失败，等待最终收尾: ${streamFailureReason}`);
                 streamFailed = true;
@@ -1157,7 +1031,7 @@ async function executeStreamingReply(params) {
         ? Math.max(0, firstPartialReplyAt - assistantMessageStartAt)
         : undefined;
     if (useStreaming) {
-        logVerbose(target, `[partialStream] ${L}summary: assistantStarts=${assistantMessageStartCount}, partialCount=${partialReplyCount}, firstPartialLatencyMs=${firstPartialLatencyMs ?? "n/a"}, visibleLen=${streamVisibleText.length}, fallbackLen=${streamFallbackText.length}, streamFailed=${streamFailed}, overflowed=${streamOverflowed}, splitActive=${overflowSplitActive}, bufferedLen=${overflowBufferedText.length}, t=${Date.now()}`);
+        logVerbose(target, `[partialStream] ${L}summary: assistantStarts=${assistantMessageStartCount}, partialCount=${partialReplyCount}, firstPartialLatencyMs=${firstPartialLatencyMs ?? "n/a"}, visibleLen=${streamVisibleText.length}, fallbackLen=${streamFallbackText.length}, streamFailed=${streamFailed}, overflowed=${streamOverflowed}, t=${Date.now()}`);
     }
     if (useStreaming
         && ((useTimStream && (timStreamMsgId || streamVisibleText || streamFallbackText))
@@ -1168,10 +1042,6 @@ async function executeStreamingReply(params) {
         }
         let finalized = false;
         let overflowStopHandled = false;
-        if (overflowSplitActive) {
-            overflowStopHandled = true;
-            finalized = await absorbOverflowVisibleText(fullText, true);
-        }
         const handleOverflow = async () => {
             if (overflowPolicy === "split" && fullText) {
                 return sendChunkedFinalText(fullText);
@@ -1372,42 +1242,6 @@ async function executeStreamingReply(params) {
         target.statusSink?.({ lastOutboundAt: Date.now() });
     }
 }
-// 从 MsgBody 提取文本内容
-function extractTextFromMsgBody(msgBody) {
-    if (!msgBody || !Array.isArray(msgBody))
-        return "";
-    const texts = [];
-    for (const elem of msgBody) {
-        if (elem.MsgType === "TIMTextElem" && elem.MsgContent?.Text) {
-            texts.push(elem.MsgContent.Text);
-        }
-        else if (elem.MsgType === "TIMCustomElem") {
-            texts.push("[custom]");
-        }
-        else if (elem.MsgType === "TIMImageElem") {
-            texts.push("[image]");
-        }
-        else if (elem.MsgType === "TIMSoundElem") {
-            texts.push("[voice]");
-        }
-        else if (elem.MsgType === "TIMFileElem") {
-            texts.push("[file]");
-        }
-        else if (elem.MsgType === "TIMVideoFileElem") {
-            texts.push("[video]");
-        }
-        else if (elem.MsgType === "TIMFaceElem") {
-            texts.push("[face]");
-        }
-        else if (elem.MsgType === "TIMLocationElem") {
-            texts.push("[location]");
-        }
-        else if (elem.MsgType === "TIMStreamElem") {
-            texts.push("[stream]");
-        }
-    }
-    return texts.join("\n");
-}
 // 处理消息并回复
 async function processAndReply(params) {
     const { target, msg } = params;
@@ -1415,9 +1249,8 @@ async function processAndReply(params) {
     const config = target.config;
     const account = target.account;
     const fromAccount = msg.From_Account?.trim() || "unknown";
-    const inboundBotAccount = msg.To_Account?.trim() || undefined;
-    const outboundFromAccount = resolveOutboundFromAccount(account, inboundBotAccount);
-    if (isSelfInboundMessage(account, fromAccount, inboundBotAccount ? [inboundBotAccount] : [])) {
+    const outboundSender = resolveOutboundSenderAccount(account);
+    if (fromAccount === outboundSender) {
         log(target, "info", `跳过机器人自身消息 <- ${fromAccount}`);
         return;
     }
@@ -1491,7 +1324,7 @@ async function processAndReply(params) {
     const finalTextChunkLimit = core.channel.text.resolveTextChunkLimit(config, "timbot", account.accountId, {
         fallbackLimit: TIMBOT_FINAL_TEXT_CHUNK_LIMIT,
     });
-    const splitFinalText = (text) => splitTextByPreferredBreaks(text, finalTextChunkLimit);
+    const splitFinalText = (text) => splitTextByFixedLength(text, finalTextChunkLimit);
     logVerbose(target, `开始生成回复 -> ${fromAccount}`);
     logVerbose(target, `转发给 OpenClaw: RawBody=${rawBody.slice(0, 100)}, SessionKey=${ctxPayload.SessionKey}, From=${ctxPayload.From}`);
     // C2C 传输适配器
@@ -1500,7 +1333,7 @@ async function processAndReply(params) {
         sendStreamMsg: (p) => sendTimbotC2CStreamMessage({
             account,
             toAccount: fromAccount,
-            fromAccount: outboundFromAccount,
+            fromAccount: outboundSender,
             target,
             ...p,
         }),
@@ -1508,7 +1341,7 @@ async function processAndReply(params) {
             const ref = p.ref;
             return modifyC2CMsg({
                 account,
-                fromAccount: outboundFromAccount,
+                fromAccount: outboundSender,
                 toAccount: fromAccount,
                 msgKey: ref.msgKey,
                 msgBody: p.msgBody,
@@ -1520,7 +1353,7 @@ async function processAndReply(params) {
                 account,
                 toAccount: fromAccount,
                 msgBody: p.msgBody,
-                fromAccount: outboundFromAccount,
+                fromAccount: outboundSender,
                 target,
             });
             return {
@@ -1533,7 +1366,7 @@ async function processAndReply(params) {
             account,
             toAccount: fromAccount,
             text: p.text,
-            fromAccount: outboundFromAccount,
+            fromAccount: outboundSender,
             target,
         }),
     };
@@ -1569,9 +1402,8 @@ async function processGroupAndReply(params) {
     const account = target.account;
     const groupId = msg.GroupId?.trim() || "unknown";
     const fromAccount = msg.From_Account?.trim() || "unknown";
-    const inboundBotAccount = msg.To_Account?.trim() || undefined;
-    const outboundFromAccount = resolveOutboundFromAccount(account, inboundBotAccount);
-    if (isSelfInboundMessage(account, fromAccount, inboundBotAccount ? [inboundBotAccount] : [])) {
+    const outboundSender = resolveOutboundSenderAccount(account);
+    if (fromAccount === outboundSender) {
         log(target, "info", `跳过机器人自身消息 <- group:${groupId}, from: ${fromAccount}`);
         return;
     }
@@ -1631,6 +1463,7 @@ async function processGroupAndReply(params) {
         MessageSid: msg.MsgKey ?? String(msg.MsgSeq ?? ""),
         OriginatingChannel: "timbot",
         OriginatingTo: `timbot:group:${groupId}`,
+        WasMentioned: true,
     });
     await core.channel.session.recordInboundSession({
         storePath,
@@ -1648,7 +1481,7 @@ async function processGroupAndReply(params) {
     const finalTextChunkLimit = core.channel.text.resolveTextChunkLimit(config, "timbot", account.accountId, {
         fallbackLimit: TIMBOT_FINAL_TEXT_CHUNK_LIMIT,
     });
-    const splitFinalText = (text) => splitTextByPreferredBreaks(text, finalTextChunkLimit);
+    const splitFinalText = (text) => splitTextByFixedLength(text, finalTextChunkLimit);
     logVerbose(target, `开始生成群回复 -> group:${groupId}`);
     // Group 传输适配器
     const transport = {
@@ -1656,7 +1489,7 @@ async function processGroupAndReply(params) {
         sendStreamMsg: (p) => sendTimbotGroupStreamMessage({
             account,
             groupId,
-            fromAccount: outboundFromAccount,
+            fromAccount: outboundSender,
             target,
             ...p,
         }),
@@ -1675,7 +1508,7 @@ async function processGroupAndReply(params) {
                 account,
                 groupId,
                 msgBody: p.msgBody,
-                fromAccount: outboundFromAccount,
+                fromAccount: outboundSender,
                 target,
             });
             return {
@@ -1688,7 +1521,7 @@ async function processGroupAndReply(params) {
             account,
             groupId,
             text: p.text,
-            fromAccount: outboundFromAccount,
+            fromAccount: outboundSender,
             target,
         }),
     };
@@ -1735,7 +1568,6 @@ export async function handleTimbotWebhookRequest(req, res) {
     const targets = webhookTargets.get(path);
     if (!targets || targets.length === 0)
         return false;
-    const firstTarget = targets[0];
     // 只处理 POST 请求
     if (req.method !== "POST") {
         logSimple("warn", `收到非 POST 请求: ${req.method} ${path}`);
@@ -1758,27 +1590,16 @@ export async function handleTimbotWebhookRequest(req, res) {
         return true;
     }
     const msg = bodyResult.value;
-    // 根据 SdkAppid 或 To_Account 匹配目标账号
-    const target = targets.find((candidate) => {
-        if (!candidate.account.configured)
-            return false;
-        // 如果 URL 带了 SdkAppid，校验是否匹配
-        if (sdkAppId && candidate.account.sdkAppId !== sdkAppId)
-            return false;
-        // 如果配置了 botAccount，校验 To_Account 是否匹配
-        if (candidate.account.botAccount && msg.To_Account) {
-            return candidate.account.botAccount === msg.To_Account;
-        }
-        return true;
-    }) ?? firstTarget;
-    if (!target.account.configured) {
-        logSimple("warn", `账号 ${target.account.accountId} 未配置，跳过处理`);
-        // 即使未配置也返回成功，避免腾讯 IM 重试
-        jsonOk(res, { ActionStatus: "OK", ErrorCode: 0, ErrorInfo: "" });
-        return true;
+    logSimple("info", `webhook 消息详情: callback=${msg.CallbackCommand || "-"}, To_Account=${msg.To_Account || "-"}, AtRobots_Account=${JSON.stringify(msg.AtRobots_Account ?? [])}, From_Account=${msg.From_Account || "-"}, GroupId=${msg.GroupId || "-"}`);
+    const sdkMatchedTargets = matchTimbotWebhookTargetsBySdkAppId(targets, sdkAppId);
+    let target = selectTimbotWebhookTarget({ targets: sdkMatchedTargets, msg });
+    if (!target && sdkMatchedTargets.length === 1) {
+        target = sdkMatchedTargets[0];
     }
     // 签名验证
-    if (target.account.token) {
+    const signatureTargets = (target ? [target] : sdkMatchedTargets)
+        .filter((candidate) => candidate.account.configured && candidate.account.token);
+    if (signatureTargets.length > 0) {
         // 1. 超时校验：RequestTime 与当前时间相差超过 60 秒则拒绝
         const requestTimestamp = parseInt(requestTime, 10);
         const nowTimestamp = Math.floor(Date.now() / 1000);
@@ -1790,18 +1611,41 @@ export async function handleTimbotWebhookRequest(req, res) {
             return true;
         }
         // 2. 签名校验：sha256(token + requestTime)
-        const expectedSign = createHash("sha256")
-            .update(target.account.token + requestTime)
-            .digest("hex");
-        if (sign.length !== expectedSign.length
-            || !timingSafeEqual(Buffer.from(sign), Buffer.from(expectedSign))) {
+        const verifiedTargets = signatureTargets.filter((candidate) => {
+            const expectedSign = createHash("sha256")
+                .update(candidate.account.token + requestTime)
+                .digest("hex");
+            return (sign.length === expectedSign.length
+                && timingSafeEqual(Buffer.from(sign), Buffer.from(expectedSign)));
+        });
+        if (verifiedTargets.length === 0) {
+            const expectedSign = createHash("sha256")
+                .update(signatureTargets[0].account.token + requestTime)
+                .digest("hex");
             logSimple("error", `签名验证失败: 收到=${sign.slice(0, 16)}..., 预期=${expectedSign.slice(0, 16)}...`);
             res.statusCode = 403;
             res.end("Signature verification failed");
             return true;
         }
+        if (!target && verifiedTargets.length === 1) {
+            target = verifiedTargets[0];
+        }
+    }
+    if (!target) {
+        const callbackCommand = msg.CallbackCommand ?? "";
+        const mentions = extractMentionedBotAccounts(extractTextFromMsgBody(msg.MsgBody));
+        logSimple("warn", `未能唯一匹配 webhook 账号，跳过处理: callback=${callbackCommand || "-"}, sdkAppId=${sdkAppId || "-"}, to=${msg.To_Account?.trim() || "-"}, group=${msg.GroupId?.trim() || "-"}, mentions=${mentions.join(",") || "-"}`);
+        jsonOk(res, { ActionStatus: "OK", ErrorCode: 0, ErrorInfo: "" });
+        return true;
+    }
+    if (!target.account.configured) {
+        logSimple("warn", `账号 ${target.account.accountId} 未配置，跳过处理`);
+        // 即使未配置也返回成功，避免腾讯 IM 重试
+        jsonOk(res, { ActionStatus: "OK", ErrorCode: 0, ErrorInfo: "" });
+        return true;
     }
     target.statusSink?.({ lastInboundAt: Date.now() });
+    logSimple("info", `匹配到账号: ${target.account.accountId}, botAccount=${target.account.botAccount || "-"}`);
     const callbackCommand = msg.CallbackCommand ?? "";
     // 立即返回成功响应给腾讯 IM
     jsonOk(res, { ActionStatus: "OK", ErrorCode: 0, ErrorInfo: "" });