@kirigaya/openclaw-onebot 1.0.3 → 1.0.4

package/dist/connection.js

@@ -1,14 +1,17 @@
 /**
  * OneBot WebSocket 连接与 API 调用
  *
- * 图片消息：网络 URL 会先下载到本地再发送（兼容 Lagrange.Core retcode 1200），
+ * 图片消息：
+ * - 本机回环连接时：网络 URL 会先下载到本地再发送（兼容部分实现的 retcode 1200）
+ * - 跨机器连接时：本地文件会自动转成 base64://，避免把宿主机绝对路径发给远端 OneBot
  * 并定期清理临时文件。
  */
+import Fuse from "fuse.js";
 import WebSocket from "ws";
 import { createServer } from "http";
 import https from "https";
 import http from "http";
-import { writeFileSync, mkdirSync, readdirSync, statSync, unlinkSync } from "fs";
+import { writeFileSync, mkdirSync, readdirSync, readFileSync, statSync, unlinkSync } from "fs";
 import { join } from "path";
 import { tmpdir } from "os";
 import { logSend } from "./send-debug-log.js";
@@ -96,6 +99,48 @@ async function resolveImageToLocalPath(image) {
     }
     return trimmed.replace(/\\/g, "/");
 }
+async function resolveImageToBuffer(image) {
+    const trimmed = image?.trim();
+    if (!trimmed)
+        throw new Error("Empty image");
+    if (/^https?:\/\//i.test(trimmed)) {
+        return downloadUrl(trimmed);
+    }
+    if (trimmed.startsWith("base64://")) {
+        return Buffer.from(trimmed.slice(9), "base64");
+    }
+    if (trimmed.startsWith("file://")) {
+        return readFileSync(trimmed.slice(7));
+    }
+    return readFileSync(trimmed);
+}
+function normalizePeerHost(host) {
+    const trimmed = String(host ?? "").trim().toLowerCase();
+    if (!trimmed)
+        return "";
+    const unwrapped = trimmed.replace(/^\[/, "").replace(/\]$/, "");
+    return unwrapped.startsWith("::ffff:") ? unwrapped.slice(7) : unwrapped;
+}
+function isLoopbackHost(host) {
+    const normalized = normalizePeerHost(host);
+    return normalized === "127.0.0.1" || normalized === "::1" || normalized === "localhost";
+}
+function getSocketPeerHost(socket, getConfig) {
+    const peerHost = socket.__onebotPeerHost;
+    if (peerHost)
+        return peerHost;
+    return getConfig?.()?.host ?? "";
+}
+function shouldEncodeImageAsBase64(socket, getConfig) {
+    const peerHost = getSocketPeerHost(socket, getConfig);
+    return !!peerHost && !isLoopbackHost(peerHost);
+}
+async function resolveImageFileForSend(image, socket, getConfig) {
+    if (shouldEncodeImageAsBase64(socket, getConfig)) {
+        return `base64://${(await resolveImageToBuffer(image)).toString("base64")}`;
+    }
+    return resolveImageToLocalPath(image);
+}
 /** 启动临时图片定期清理（每小时执行一次） */
 export function startImageTempCleanup() {
     stopImageTempCleanup();
@@ -271,7 +316,7 @@ export async function sendGroupImage(groupId, image, log = getLogger(), getConfi
     const socket = getConfig ? await ensureConnection(getConfig) : await waitForConnection();
     log.info?.(`222[onebot] sendGroupImage entry: groupId=${groupId} image=${image?.slice?.(0, 80) ?? ""}`);
     try {
-        const filePath = image.startsWith("[") ? null : await resolveImageToLocalPath(image);
+        const filePath = image.startsWith("[") ? null : await resolveImageFileForSend(image, socket, getConfig);
         const seg = image.startsWith("[")
             ? JSON.parse(image)
             : [{ type: "image", data: { file: filePath } }];
@@ -335,7 +380,7 @@ export async function sendPrivateImage(userId, image, log = getLogger(), getConf
     });
     log.info?.(`[onebot] sendPrivateImage entry: userId=${userId} image=${image?.slice?.(0, 80) ?? ""}`);
     const socket = getConfig ? await ensureConnection(getConfig) : await waitForConnection();
-    const filePath = image.startsWith("[") ? null : await resolveImageToLocalPath(image);
+    const filePath = image.startsWith("[") ? null : await resolveImageFileForSend(image, socket, getConfig);
     const seg = image.startsWith("[")
         ? JSON.parse(image)
         : [{ type: "image", data: { file: filePath } }];
@@ -348,15 +393,23 @@ export async function sendPrivateImage(userId, image, log = getLogger(), getConf
     logSend("connection", "sendPrivateImage", { targetId: userId, messageId: mid, sessionId: getActiveReplyTarget(), replySessionId: getActiveReplySessionId() });
     return mid;
 }
-export async function uploadGroupFile(groupId, file, name) {
-    if (!ws || ws.readyState !== WebSocket.OPEN)
-        throw new Error("OneBot WebSocket not connected");
-    await sendOneBotAction(ws, "upload_group_file", { group_id: groupId, file, name });
+export async function uploadGroupFile(groupId, file, name, getConfig) {
+    const socket = getConfig
+        ? await ensureConnection(getConfig)
+        : await waitForConnection();
+    const res = await sendOneBotAction(socket, "upload_group_file", { group_id: groupId, file, name });
+    if (res?.retcode !== 0) {
+        throw new Error(res?.msg ?? `OneBot upload_group_file failed (retcode=${res?.retcode})`);
+    }
 }
-export async function uploadPrivateFile(userId, file, name) {
-    if (!ws || ws.readyState !== WebSocket.OPEN)
-        throw new Error("OneBot WebSocket not connected");
-    await sendOneBotAction(ws, "upload_private_file", { user_id: userId, file, name });
+export async function uploadPrivateFile(userId, file, name, getConfig) {
+    const socket = getConfig
+        ? await ensureConnection(getConfig)
+        : await waitForConnection();
+    const res = await sendOneBotAction(socket, "upload_private_file", { user_id: userId, file, name });
+    if (res?.retcode !== 0) {
+        throw new Error(res?.msg ?? `OneBot upload_private_file failed (retcode=${res?.retcode})`);
+    }
 }
 /** 撤回消息 */
 export async function deleteMsg(messageId) {
@@ -404,6 +457,49 @@ export async function getGroupMemberInfo(groupId, userId) {
         return null;
     }
 }
+/**
+ * 获取群成员列表（OneBot get_group_member_list）
+ */
+export async function getGroupMemberList(groupId) {
+    if (!ws || ws.readyState !== WebSocket.OPEN)
+        return [];
+    try {
+        const res = await sendOneBotAction(ws, "get_group_member_list", { group_id: groupId });
+        if (res?.retcode !== 0 || !Array.isArray(res?.data))
+            return [];
+        return res.data.map((m) => ({
+            user_id: Number(m.user_id),
+            nickname: String(m.nickname ?? ""),
+            card: String(m.card ?? ""),
+        }));
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * 按名字模糊匹配群成员（匹配群名片 card 与昵称 nickname），返回匹配到的 QQ 与展示名。
+ * 使用 Fuse.js 模糊匹配，结果按相关度排序。
+ */
+export async function searchGroupMemberByName(groupId, name) {
+    const list = await getGroupMemberList(groupId);
+    const keyword = (name || "").trim();
+    if (!keyword)
+        return [];
+    const fuse = new Fuse(list, {
+        keys: ["card", "nickname"],
+        includeScore: true,
+        threshold: 0.4,
+        ignoreLocation: true,
+    });
+    const results = fuse.search(keyword);
+    return results.map(({ item: m }) => ({
+        user_id: m.user_id,
+        nickname: m.nickname,
+        card: m.card,
+        displayName: m.card || m.nickname || String(m.user_id),
+    }));
+}
 /** 获取群信息（含 group_name） */
 export async function getGroupInfo(groupId) {
     if (!ws || ws.readyState !== WebSocket.OPEN)
@@ -437,20 +533,24 @@ export async function getMsg(messageId) {
     }
 }
 /**
- * 获取群聊历史消息（Lagrange.Core 扩展 API，go-cqhttp 等可能不支持）
+ * 获取群聊历史消息（Lagrange.Core 扩展 API，与 Lagrange.onebot context 一致）
+ * 仅使用 message_seq 分页（不传 message_id），与 Tiphareth getLast24HGroupMessages 调用方式一致。
  * @param groupId 群号
- * @param opts message_seq 起始序号；message_id 起始消息 ID；count 数量
+ * @param opts message_seq 起始序号（不传表示从最新一页）；count 本页条数；reverse_order true 表示从旧到新，便于用 batch[0].message_seq 向前翻页
  */
 export async function getGroupMsgHistory(groupId, opts = { count: 20 }) {
     if (!ws || ws.readyState !== WebSocket.OPEN)
         return [];
     try {
-        const res = await sendOneBotAction(ws, "get_group_msg_history", {
+        const params = {
             group_id: groupId,
-            message_seq: opts.message_seq,
-            message_id: opts.message_id,
             count: opts.count ?? 20,
-        });
+            reverse_order: opts.reverse_order !== false,
+        };
+        if (opts.message_seq != null && Number.isFinite(opts.message_seq)) {
+            params.message_seq = opts.message_seq;
+        }
+        const res = await sendOneBotAction(ws, "get_group_msg_history", params);
         if (res?.retcode === 0 && res?.data?.messages)
             return res.data.messages;
         return [];
@@ -459,6 +559,56 @@ export async function getGroupMsgHistory(groupId, opts = { count: 20 }) {
         return [];
     }
 }
+/** 单页请求之间的延迟（毫秒），与 Tiphareth historyMessages 一致 */
+const HISTORY_PAGE_DELAY_MS = 500;
+/**
+ * 按时间范围分页获取群历史消息，严格对齐 Tiphareth getLast24HGroupMessages 算法：
+ * getGroupMsgHistory(groupId, messageSeq, chunkSize, true)，用 batch[0] 的 message_seq 向前翻页，去重与时间截断。
+ * @param groupId 群号
+ * @param opts startTime 仅保留 >= startTime 的消息（Unix 秒）；limit 最多条数；chunkSize 每页条数
+ */
+export async function getGroupMsgHistoryInRange(groupId, opts = {}) {
+    const { startTime = 0, limit = 3000, chunkSize = 100 } = opts;
+    let messageSeq = undefined;
+    const allMessages = [];
+    const seenMessageIds = new Set();
+    let stopLoop = false;
+    let pageCount = 0;
+    while (!stopLoop) {
+        pageCount++;
+        const batch = await getGroupMsgHistory(groupId, {
+            message_seq: messageSeq,
+            count: chunkSize,
+            reverse_order: true,
+        });
+        if (!batch.length) {
+            break;
+        }
+        await new Promise((r) => setTimeout(r, HISTORY_PAGE_DELAY_MS));
+        for (const msg of batch) {
+            if (seenMessageIds.has(msg.message_id))
+                continue;
+            seenMessageIds.add(msg.message_id);
+            if (msg.time < startTime) {
+                stopLoop = true;
+            }
+            else {
+                allMessages.push(msg);
+            }
+        }
+        const oldest = batch[0];
+        const nextSeq = oldest.message_seq ?? oldest.message_id;
+        if (nextSeq == null || nextSeq === messageSeq) {
+            break;
+        }
+        messageSeq = nextSeq;
+        if (allMessages.length >= limit) {
+            break;
+        }
+    }
+    allMessages.sort((a, b) => a.time - b.time);
+    return allMessages;
+}
 export async function connectForward(config) {
     const path = config.path ?? "/onebot/v11/ws";
     const pathNorm = path.startsWith("/") ? path : `/${path}`;
@@ -472,6 +622,7 @@ export async function connectForward(config) {
         w.on("open", () => resolve());
         w.on("error", reject);
     });
+    w.__onebotPeerHost = config.host;
     return w;
 }
 export async function createServerAndWait(config) {
@@ -486,7 +637,8 @@ export async function createServerAndWait(config) {
     server.listen(config.port, host);
     wsServer = wss;
     return new Promise((resolve) => {
-        wss.on("connection", (socket) => {
+        wss.on("connection", (socket, req) => {
+            socket.__onebotPeerHost = req.socket.remoteAddress ?? undefined;
             resolve(socket);
         });
     });

package/dist/handlers/process-inbound.js

@@ -3,7 +3,7 @@
  */
 import { getOneBotConfig } from "../config.js";
 import { getRawText, getTextFromSegments, getReplyMessageId, getTextFromMessageContent, isMentioned, } from "../message.js";
-import { getRenderMarkdownToPlain, getCollapseDoubleNewlines, getWhitelistUserIds } from "../config.js";
+import { getRenderMarkdownToPlain, getCollapseDoubleNewlines, getWhitelistUserIds, getOgImageRenderTheme, getNormalModeFlushIntervalMs, getNormalModeFlushChars, } from "../config.js";
 import { markdownToPlain, collapseDoubleNewlines } from "../markdown.js";
 import { markdownToImage } from "../og-image.js";
 import { sendPrivateMsg, sendGroupMsg, sendPrivateImage, sendGroupImage, sendGroupForwardMsg, sendPrivateForwardMsg, setMsgEmojiLike, getMsg, } from "../connection.js";
@@ -231,6 +231,9 @@ export async function processInboundMessage(api, msg) {
     api.logger?.info?.(`[onebot] dispatching message for session ${sessionId}`);
     const longMessageMode = onebotCfg.longMessageMode ?? "normal";
     const longMessageThreshold = onebotCfg.longMessageThreshold ?? 300;
+    api.logger?.info?.(`[onebot] longMessageMode=${longMessageMode}, threshold=${longMessageThreshold}`);
+    const normalModeFlushIntervalMs = getNormalModeFlushIntervalMs(cfg);
+    const normalModeFlushChars = getNormalModeFlushChars(cfg);
     const replySessionId = `onebot-reply-${Date.now()}-${sessionId}`;
     setActiveReplyTarget(replyTarget);
     setActiveReplySessionId(replySessionId);
@@ -239,8 +242,28 @@ export async function processInboundMessage(api, msg) {
         setForwardSuppressDelivery(true);
     const deliveredChunks = [];
     let chunkIndex = 0;
+    let normalModeBufferedText = "";
+    let normalModeBufferedRawText = "";
+    let normalModeFlushTimer = null;
+    let normalModeFlushChain = Promise.resolve();
     const getConfig = () => getOneBotConfig(api);
     const onReplySessionEnd = onebotCfg.onReplySessionEnd;
+    const normalModePunctuationFlushMinChars = 24;
+    const clearNormalModeFlushTimer = () => {
+        if (normalModeFlushTimer) {
+            clearTimeout(normalModeFlushTimer);
+            normalModeFlushTimer = null;
+        }
+    };
+    const hasBufferedNormalModeText = () => normalModeBufferedText.length > 0 || normalModeBufferedRawText.length > 0;
+    const queueNormalModeFlush = (action) => {
+        normalModeFlushChain = normalModeFlushChain
+            .then(action)
+            .catch((e) => {
+            api.logger?.error?.(`[onebot] normal-mode flush failed: ${e?.message ?? e}`);
+        });
+        return normalModeFlushChain;
+    };
     const doSendChunk = async (effectiveIsGroup, effectiveGroupId, uid, text, mediaUrl) => {
         if (text) {
             if (effectiveIsGroup && effectiveGroupId)
@@ -255,6 +278,50 @@ export async function processInboundMessage(api, msg) {
                 await sendPrivateImage(uid, mediaUrl, api.logger, getConfig);
         }
     };
+    const flushBufferedNormalModeText = async (effectiveIsGroup, effectiveGroupId, uid) => {
+        clearNormalModeFlushTimer();
+        if (!hasBufferedNormalModeText())
+            return;
+        const text = normalModeBufferedText;
+        const rawText = normalModeBufferedRawText;
+        normalModeBufferedText = "";
+        normalModeBufferedRawText = "";
+        await doSendChunk(effectiveIsGroup, effectiveGroupId, uid, text, undefined);
+        deliveredChunks.push({
+            index: chunkIndex++,
+            text: text || undefined,
+            rawText: rawText || undefined,
+        });
+    };
+    const scheduleNormalModeFlush = (effectiveIsGroup, effectiveGroupId, uid) => {
+        if (normalModeFlushTimer)
+            return;
+        normalModeFlushTimer = setTimeout(() => {
+            void queueNormalModeFlush(() => flushBufferedNormalModeText(effectiveIsGroup, effectiveGroupId, uid));
+        }, normalModeFlushIntervalMs);
+    };
+    const shouldFlushNormalModeBuffer = () => {
+        const rawText = normalModeBufferedRawText || normalModeBufferedText;
+        if (!rawText)
+            return false;
+        if (normalModeBufferedText.length >= normalModeFlushChars)
+            return true;
+        if (rawText.length < normalModePunctuationFlushMinChars)
+            return false;
+        return /[.!?。！？]\s*$/.test(rawText);
+    };
+    const appendNormalModeText = (current, next) => {
+        if (!current)
+            return next;
+        if (!next)
+            return current;
+        const lastChar = current[current.length - 1];
+        const firstChar = next[0];
+        if (/[A-Za-z0-9]/.test(lastChar) && /[A-Za-z0-9]/.test(firstChar)) {
+            return `${current} ${next}`;
+        }
+        return `${current}${next}`;
+    };
     try {
         await runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
             ctx: ctxPayload,
@@ -277,13 +344,15 @@ export async function processInboundMessage(api, msg) {
                     let textPlain = usePlain ? markdownToPlain(trimmed) : trimmed;
                     if (getCollapseDoubleNewlines(cfg))
                         textPlain = collapseDoubleNewlines(textPlain);
-                    deliveredChunks.push({
-                        index: chunkIndex++,
-                        text: textPlain || undefined,
-                        rawText: trimmed || undefined,
-                        mediaUrl: mediaUrl || undefined,
-                    });
                     const shouldSendNow = longMessageMode === "normal";
+                    if (!shouldSendNow) {
+                        deliveredChunks.push({
+                            index: chunkIndex++,
+                            text: textPlain || undefined,
+                            rawText: trimmed || undefined,
+                            mediaUrl: mediaUrl || undefined,
+                        });
+                    }
                     // forward 模式且非最后一条：仅暂存，绝不发送，等 final 时再统一处理
                     if (longMessageMode === "forward" && info.kind !== "final") {
                         forwardPendingSessions.set(replySessionId, Date.now());
@@ -294,29 +363,133 @@ export async function processInboundMessage(api, msg) {
                     }
                     try {
                         if (shouldSendNow) {
-                            await doSendChunk(effectiveIsGroup, effectiveGroupId, uid, textPlain, mediaUrl);
+                            if (mediaUrl) {
+                                await queueNormalModeFlush(async () => {
+                                    await flushBufferedNormalModeText(effectiveIsGroup, effectiveGroupId, uid);
+                                    await doSendChunk(effectiveIsGroup, effectiveGroupId, uid, textPlain, mediaUrl);
+                                    deliveredChunks.push({
+                                        index: chunkIndex++,
+                                        text: textPlain || undefined,
+                                        rawText: trimmed || undefined,
+                                        mediaUrl: mediaUrl || undefined,
+                                    });
+                                });
+                            }
+                            else {
+                                normalModeBufferedText = appendNormalModeText(normalModeBufferedText, textPlain);
+                                normalModeBufferedRawText = appendNormalModeText(normalModeBufferedRawText, trimmed);
+                                if (shouldFlushNormalModeBuffer()) {
+                                    await queueNormalModeFlush(() => flushBufferedNormalModeText(effectiveIsGroup, effectiveGroupId, uid));
+                                }
+                                else {
+                                    scheduleNormalModeFlush(effectiveIsGroup, effectiveGroupId, uid);
+                                }
+                            }
                         }
                         if (info.kind === "final") {
+                            if (shouldSendNow) {
+                                await queueNormalModeFlush(() => flushBufferedNormalModeText(effectiveIsGroup, effectiveGroupId, uid));
+                            }
                             const lastSentCount = lastSentChunkCountBySession.get(replySessionId) ?? 0;
                             const chunksToSend = deliveredChunks.slice(lastSentCount);
                             if (chunksToSend.length === 0)
                                 return;
                             const totalLen = deliveredChunks.reduce((s, c) => s + (c.rawText ?? c.text ?? "").length, 0);
+                            const incrementalLen = chunksToSend.reduce((s, c) => s + (c.rawText ?? c.text ?? "").length, 0);
                             const isLong = totalLen > longMessageThreshold;
+                            const isIncrementalLong = incrementalLen > longMessageThreshold;
                             const isIncremental = lastSentCount > 0;
+                            api.logger?.info?.(`[onebot] final check: totalLen=${totalLen}, threshold=${longMessageThreshold}, isLong=${isLong}, isIncremental=${isIncremental}, deliveredChunks=${deliveredChunks.length}`);
                             if (isIncremental) {
                                 setForwardSuppressDelivery(false);
-                                for (const c of chunksToSend) {
-                                    if (c.text || c.mediaUrl)
-                                        await doSendChunk(effectiveIsGroup, effectiveGroupId, uid, c.text ?? "", c.mediaUrl);
+                                // normal 模式下增量 chunk 已在 deliver 中实时发出；这里不能在 final 再补发一次。
+                                if (!shouldSendNow && isIncrementalLong && (longMessageMode === "og_image" || longMessageMode === "forward")) {
+                                    const fullRaw = chunksToSend.map((c) => c.rawText ?? c.text ?? "").join("\n\n");
+                                    if (fullRaw.trim()) {
+                                        if (longMessageMode === "og_image") {
+                                            try {
+                                                const imgUrl = await markdownToImage(fullRaw, { theme: getOgImageRenderTheme(api?.config) });
+                                                if (imgUrl) {
+                                                    if (effectiveIsGroup && effectiveGroupId)
+                                                        await sendGroupImage(effectiveGroupId, imgUrl, api.logger, getConfig);
+                                                    else if (uid)
+                                                        await sendPrivateImage(uid, imgUrl, api.logger, getConfig);
+                                                }
+                                                else {
+                                                    api.logger?.warn?.("[onebot] og_image (incremental): node-html-to-image not installed, falling back to normal send");
+                                                    for (const c of chunksToSend) {
+                                                        if (c.text || c.mediaUrl)
+                                                            await doSendChunk(effectiveIsGroup, effectiveGroupId, uid, c.text ?? "", c.mediaUrl);
+                                                    }
+                                                }
+                                            }
+                                            catch (e) {
+                                                api.logger?.error?.(`[onebot] og_image (incremental) failed: ${e?.message}`);
+                                                for (const c of chunksToSend) {
+                                                    if (c.text || c.mediaUrl)
+                                                        await doSendChunk(effectiveIsGroup, effectiveGroupId, uid, c.text ?? "", c.mediaUrl);
+                                                }
+                                            }
+                                        }
+                                        else {
+                                            try {
+                                                const nodes = [];
+                                                for (const c of chunksToSend) {
+                                                    if (c.mediaUrl) {
+                                                        const mid = await sendPrivateImage(selfId, c.mediaUrl, api.logger, getConfig);
+                                                        if (mid)
+                                                            nodes.push({ type: "node", data: { id: String(mid) } });
+                                                    }
+                                                    else if (c.text) {
+                                                        const mid = await sendPrivateMsg(selfId, c.text, getConfig);
+                                                        if (mid)
+                                                            nodes.push({ type: "node", data: { id: String(mid) } });
+                                                    }
+                                                }
+                                                if (nodes.length > 0) {
+                                                    if (effectiveIsGroup && effectiveGroupId)
+                                                        await sendGroupForwardMsg(effectiveGroupId, nodes, getConfig);
+                                                    else if (uid)
+                                                        await sendPrivateForwardMsg(uid, nodes, getConfig);
+                                                }
+                                                else {
+                                                    for (const c of chunksToSend) {
+                                                        if (c.text || c.mediaUrl)
+                                                            await doSendChunk(effectiveIsGroup, effectiveGroupId, uid, c.text ?? "", c.mediaUrl);
+                                                    }
+                                                }
+                                            }
+                                            catch (e) {
+                                                api.logger?.error?.(`[onebot] forward (incremental) failed: ${e?.message}`);
+                                                for (const c of chunksToSend) {
+                                                    if (c.text || c.mediaUrl)
+                                                        await doSendChunk(effectiveIsGroup, effectiveGroupId, uid, c.text ?? "", c.mediaUrl);
+                                                }
+                                            }
+                                        }
+                                    }
+                                    else {
+                                        for (const c of chunksToSend) {
+                                            if (c.text || c.mediaUrl)
+                                                await doSendChunk(effectiveIsGroup, effectiveGroupId, uid, c.text ?? "", c.mediaUrl);
+                                        }
+                                    }
+                                }
+                                else if (!shouldSendNow) {
+                                    for (const c of chunksToSend) {
+                                        if (c.text || c.mediaUrl)
+                                            await doSendChunk(effectiveIsGroup, effectiveGroupId, uid, c.text ?? "", c.mediaUrl);
+                                    }
                                 }
                             }
                             else if (!shouldSendNow && (longMessageMode === "og_image" || longMessageMode === "forward")) {
+                                api.logger?.info?.(`[onebot] checking og_image: isLong=${isLong}, mode=${longMessageMode}`);
                                 if (isLong && longMessageMode === "og_image") {
+                                    api.logger?.info?.(`[onebot] triggering og_image for ${totalLen} chars`);
                                     const fullRaw = deliveredChunks.map((c) => c.rawText ?? c.text ?? "").join("\n\n");
                                     if (fullRaw.trim()) {
                                         try {
-                                            const imgUrl = await markdownToImage(fullRaw);
+                                            const imgUrl = await markdownToImage(fullRaw, { theme: getOgImageRenderTheme(api?.config) });
                                             if (imgUrl) {
                                                 if (effectiveIsGroup && effectiveGroupId)
                                                     await sendGroupImage(effectiveGroupId, imgUrl, api.logger, getConfig);
@@ -419,7 +592,7 @@ export async function processInboundMessage(api, msg) {
                     await clearEmojiReaction();
                 },
             },
-            replyOptions: { disableBlockStreaming: true },
+            replyOptions: { disableBlockStreaming: longMessageMode !== "normal" },
         });
     }
     catch (err) {
@@ -435,6 +608,7 @@ export async function processInboundMessage(api, msg) {
         catch (_) { }
     }
     finally {
+        clearNormalModeFlushTimer();
         setForwardSuppressDelivery(false);
         setActiveReplySelfId(null);
         lastSentChunkCountBySession.delete(replySessionId);

package/dist/index.js

@@ -12,6 +12,7 @@ import { OneBotChannelPlugin } from "./channel.js";
 import { registerService } from "./service.js";
 import { startImageTempCleanup } from "./connection.js";
 import { startForwardCleanupTimer } from "./handlers/process-inbound.js";
+import { registerOneBotCli } from "./cli-commands.js";
 export default function register(api) {
     globalThis.__onebotApi = api;
     globalThis.__onebotGatewayConfig = api.config;
@@ -22,11 +23,12 @@ export default function register(api) {
         api.registerCli((ctx) => {
             const prog = ctx.program;
             if (prog && typeof prog.command === "function") {
-                const onebot = prog.command("onebot").description("OneBot 渠道配置");
+                const onebot = prog.command("onebot").description("OneBot 渠道配置与工具");
                 onebot.command("setup").description("交互式配置 OneBot 连接参数").action(async () => {
                     const { runOneBotSetup } = await import("./setup.js");
                     await runOneBotSetup();
                 });
+                registerOneBotCli(onebot, api);
             }
         }, { commands: ["onebot"] });
     }

package/dist/markdown-to-html.d.ts

@@ -3,4 +3,8 @@
  * 用于 OG 图片模式下的 Markdown 渲染
  */
 export declare function markdownToHtml(md: string): string;
-export declare function getMarkdownStyles(): string;
+/**
+ * 获取用于 OG 图片的完整样式（基础 + 主题）
+ * @param theme "default" 无额外样式；"dust" 内置 dust 主题；或 custom 时的 CSS 文件绝对路径
+ */
+export declare function getMarkdownStyles(theme?: string): string;