openclaw-plugin-yuanbao 2.7.1 → 2.7.2

package/dist/index.js

@@ -8,12 +8,20 @@ import { logUploadCommandDefinition } from './src/commands/log-upload.js';
 import { initEnv } from './src/utils/get-env.js';
 import { initBuiltinStickers } from './src/sticker/init-builtin-stickers.js';
 import pluginManifest from './openclaw.plugin.json' with { type: 'json' };
+function patchCommandQueueState() {
+    const key = Symbol.for('openclaw.commandQueueState');
+    const state = globalThis[key];
+    if (state && !state.activeTaskWaiters) {
+        state.activeTaskWaiters = new Set();
+    }
+}
 const plugin = {
     id: pluginManifest.id,
     name: pluginManifest.name,
     description: pluginManifest.description,
     configSchema: emptyPluginConfigSchema(),
     register(api) {
+        patchCommandQueueState();
         initEnv(api);
         initLogger(api);
         setYuanbaoRuntime(api.runtime);

package/dist/openclaw.plugin.json

@@ -2,7 +2,7 @@
     "id": "openclaw-plugin-yuanbao",
     "name": "元宝 Bot",
     "description": "Tencent YuanBao intelligent bot channel plugin",
-    "version": "2.7.1",
+    "version": "2.7.2",
     "channels": [
         "yuanbao"
     ],

package/dist/src/accounts.js

@@ -91,7 +91,7 @@ export function resolveYuanbaoAccount(params) {
         : 100;
     const disableBlockStreaming = merged.disableBlockStreaming !== undefined ? merged.disableBlockStreaming : false;
     const requireMention = merged.requireMention !== undefined ? merged.requireMention : true;
-    const fallbackReply = merged.fallbackReply?.trim() || '暂时无法解答，你可以换个问题问问我哦';
+    const fallbackReply = merged.fallbackReply?.trim();
     const markdownHintEnabled = merged.markdownHintEnabled !== false;
     const configured = Boolean(appKey && appSecret);
     if (!configured && Boolean(yuanbaoConfig)) {

package/dist/src/channel.js

@@ -3,7 +3,7 @@ import { formatPairingApproveHint } from 'openclaw/plugin-sdk/mattermost';
 import { listYuanbaoAccountIds, resolveDefaultYuanbaoAccountId, resolveYuanbaoAccount } from './accounts.js';
 import { yuanbaoConfigSchema } from './config-schema.js';
 import { yuanbaoOnboardingAdapter } from './onboarding.js';
-import { createLog } from './logger.js';
+import { createLog, setDebugBotIds } from './logger.js';
 import { yuanbaoSetupAdapter } from './setup.js';
 import { startYuanbaoWsGateway, getActiveWsClient } from './yuanbao-server/ws/index.js';
 import { getYuanbaoRuntime } from './runtime.js';
@@ -167,7 +167,8 @@ export const yuanbaoPlugin = {
         blockStreamingChunkMaxChars: 3000,
         blockStreamingCoalesceDefaults: {
             minChars: 2800,
-            idleMs: 5000,
+            idleMs: 1000,
+            joiner: '',
         },
     },
     outbound: {
@@ -176,10 +177,10 @@ export const yuanbaoPlugin = {
         textChunkLimit: 3000,
         chunker: (text, limit) => getYuanbaoRuntime()?.channel.text.chunkMarkdownText(text, limit) ?? [text],
         sendText: async (params) => {
-            const slog = createLog('channel.utbound');
             const { cfg, accountId, to: _to, text } = params;
             const to = _to.replace(/^yuanbao:/, '');
             const account = resolveYuanbaoAccount({ cfg, accountId: accountId ?? undefined });
+            const slog = createLog('channel.outbound', undefined, { botId: account.botId });
             slog.info('sendText', { accountId, to });
             const wsClient = getActiveWsClient(account.accountId);
             if (!wsClient) {
@@ -202,10 +203,10 @@ export const yuanbaoPlugin = {
             return toChannelResult(await sendTextToTarget(account, to, text, wsClient));
         },
         sendMedia: async (params) => {
-            const slog = createLog('channel.outbound');
             const { cfg, accountId, to: _to, mediaUrl, text, mediaLocalRoots } = params;
             const to = _to.replace(/^yuanbao:/, '');
             const account = resolveYuanbaoAccount({ cfg, accountId: accountId ?? undefined });
+            const slog = createLog('channel.outbound', undefined, { botId: account.botId });
             const wsClient = getActiveWsClient(account.accountId);
             slog.info('sendMedia', { accountId, to, mediaUrl, text });
             if (!wsClient) {
@@ -269,7 +270,11 @@ export const yuanbaoPlugin = {
     gateway: {
         startAccount: async (ctx) => {
             const { account } = ctx;
-            const slog = createLog('gateway', ctx.log);
+            const yuanbaoTopConfig = ctx.cfg.channels?.yuanbao;
+            if (yuanbaoTopConfig?.debugBotIds?.length) {
+                setDebugBotIds(yuanbaoTopConfig.debugBotIds);
+            }
+            const slog = createLog('gateway', ctx.log, { botId: account.botId });
             slog.debug('启动账号', account);
             if (!account.configured) {
                 slog.warn('yuanbao not configured; skipping');

package/dist/src/config-schema.js

@@ -98,6 +98,13 @@ export const yuanbaoConfigSchema = {
                 description: '开启后在系统提示词中自动注入指令，防止模型用代码块包裹整个 Markdown 回复',
                 default: true,
             },
+            debugBotIds: {
+                type: 'array',
+                items: { type: 'string' },
+                title: '调试白名单 Bot ID',
+                description: '白名单内的 Bot ID 日志输出不做脱敏处理，方便开发调试。填写 bot 的 IM 用户 ID',
+                default: [],
+            },
         },
         additionalProperties: false,
     },

package/dist/src/logger.d.ts

@@ -9,6 +9,8 @@ export interface PluginLogger {
 export declare function initLogger(api: OpenClawPluginApi): void;
 export declare const logger: PluginLogger;
 export declare function isVerbose(): boolean;
+export declare function setDebugBotIds(ids: string[]): void;
+export declare function isDebugBotId(botId?: string): boolean;
 export interface LogSink {
     info?: (msg: string) => void;
     warn?: (msg: string) => void;
@@ -22,8 +24,10 @@ export interface ModuleLog {
     error(msg: string, data?: Record<string, unknown>): void;
     debug(msg: string, data?: Record<string, unknown>): void;
 }
-export declare function formatLog(module: string, msg: string, data?: Record<string, unknown>): string;
-export declare function createLog(module: string, sink?: LogSink): ModuleLog;
+export declare function formatLog(module: string, msg: string, data?: Record<string, unknown>, skipSanitize?: boolean): string;
+export declare function createLog(module: string, sink?: LogSink, options?: {
+    botId?: string;
+}): ModuleLog;
 export declare function sanitize(value: unknown): string;
 export declare function logSimple(level: 'info' | 'warn' | 'error', message: string): void;
 export declare function logDebug(message: string): void;

package/dist/src/logger.js

@@ -55,14 +55,41 @@ export const logger = {
 export function isVerbose() {
     return verboseEnabled;
 }
-export function formatLog(module, msg, data) {
+function parseEnvDebugBotIds() {
+    const raw = process.env.YUANBAO_DEBUG_BOT_IDS;
+    if (!raw)
+        return [];
+    return raw.split(',').map(s => s.trim())
+        .filter(Boolean);
+}
+const debugBotIds = new Set(parseEnvDebugBotIds());
+export function setDebugBotIds(ids) {
+    debugBotIds.clear();
+    for (const id of parseEnvDebugBotIds())
+        debugBotIds.add(id);
+    for (const id of ids) {
+        const trimmed = id.trim();
+        if (trimmed)
+            debugBotIds.add(trimmed);
+    }
+}
+export function isDebugBotId(botId) {
+    if (!botId)
+        return false;
+    return debugBotIds.has(botId);
+}
+export function formatLog(module, msg, data, skipSanitize) {
     const prefix = module ? `${LOG_PREFIX}[${module}]` : LOG_PREFIX;
-    return data !== undefined ? `${prefix} ${msg} ${sanitize(data)}` : `${prefix} ${msg}`;
+    if (data === undefined)
+        return `${prefix} ${msg}`;
+    const serialized = skipSanitize ? JSON.stringify(data) : sanitize(data);
+    return `${prefix} ${msg} ${serialized}`;
 }
-export function createLog(module, sink) {
+export function createLog(module, sink, options) {
     const target = sink ?? logger;
+    const skipSanitize = isDebugBotId(options?.botId);
     function fmt(msg, data) {
-        return formatLog(module, msg, data);
+        return formatLog(module, msg, data, skipSanitize);
     }
     return {
         info: (msg, data) => target.info?.(fmt(msg, data)),

package/dist/src/message-handler/inbound.js

@@ -122,7 +122,7 @@ async function handleC2CMessage(params) {
     const fromAccount = msg.from_account?.trim() || 'unknown';
     const senderNickname = msg.sender_nickname?.trim() || undefined;
     const outboundSender = resolveOutboundSenderAccount(account);
-    const log = createLog('inbound', ctx.log);
+    const log = createLog('inbound', ctx.log, { botId: account.botId });
     if (outboundSender && fromAccount === outboundSender) {
         log.info(`跳过机器人自身消息 <- ${fromAccount}`);
         return;
@@ -336,7 +336,7 @@ async function handleGroupMessage(params) {
     const fromAccount = msg.from_account?.trim() || 'unknown';
     const senderNickname = msg.sender_nickname?.trim() || undefined;
     const outboundSender = resolveOutboundSenderAccount(account);
-    const glog = createLog('inbound', ctx.log);
+    const glog = createLog('inbound', ctx.log, { botId: account.botId });
     setGroupCode(groupCode);
     if (outboundSender && fromAccount === outboundSender) {
         glog.info('跳过机器人自身消息', { groupCode, fromAccount });

package/dist/src/message-handler/outbound.js

@@ -33,8 +33,8 @@ async function shouldAttachReplyRef(params) {
     return true;
 }
 export async function sendYuanbaoMessageBody(params) {
-    const { toAccount, msgBody, fromAccount, ctx } = params;
-    const log = createLog('outbound', ctx?.log);
+    const { account, toAccount, msgBody, fromAccount, ctx } = params;
+    const log = createLog('outbound', ctx?.log, { botId: account.botId });
     if (!ctx?.wsClient) {
         log.error('发送失败: WebSocket 客户端不可用');
         return { ok: false, error: 'wsClient not available' };
@@ -77,7 +77,7 @@ export async function sendYuanbaoMessage(params) {
 }
 export async function sendYuanbaoGroupMessageBody(params) {
     const { account, groupCode, msgBody, fromAccount, refMsgId, refFromAccount, ctx } = params;
-    const log = createLog('outbound', ctx?.log);
+    const log = createLog('outbound', ctx?.log, { botId: account.botId });
     if (!ctx?.wsClient) {
         log.error('发送群消息失败: WebSocket 客户端不可用');
         return { ok: false, error: 'wsClient not available' };
@@ -153,7 +153,7 @@ export async function sendMsgBodyDirect(params) {
 }
 export async function executeReply(params) {
     const { transport, ctx, account, core, replyRuntime, splitFinalText, overflowPolicy, ctxPayload, sessionKey, appendText, } = params;
-    const rlog = createLog('outbound', ctx.log);
+    const rlog = createLog('outbound', ctx.log, { botId: account.botId });
     if (ctx.abortSignal?.aborted) {
         rlog.warn(`[${account.accountId}] 回复已中止，跳过执行`);
         return;
@@ -165,7 +165,6 @@ export async function executeReply(params) {
         : null;
     const collectedTexts = [];
     let hasFinalInfo = false;
-    let prevDeliverKind = null;
     const dispatchReply = () => core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
         ctx: ctxPayload,
         cfg: replyRuntime.config,
@@ -174,17 +173,6 @@ export async function executeReply(params) {
             onAgentRunStart: () => {
                 session?.emitReplyHeartbeat(WS_HEARTBEAT.RUNNING);
             },
-            onAssistantMessageStart: async () => {
-                session?.emitReplyHeartbeat(WS_HEARTBEAT.RUNNING);
-                rlog.info('[OpenClaw] onAssistantMessageStart');
-                try {
-                    if (session)
-                        await session.drainNow();
-                }
-                catch (err) {
-                    rlog.error('[OpenClaw] onAssistantMessageStart drainNow 失败，跳过', { error: String(err) });
-                }
-            },
             onToolStart: async () => {
                 rlog.info('[OpenClaw] onToolStart');
                 try {
@@ -213,13 +201,10 @@ export async function executeReply(params) {
                 if (info.kind === 'final') {
                     hasFinalInfo = true;
                 }
-                const prevKind = prevDeliverKind;
-                prevDeliverKind = info.kind;
                 const text = payload.text ?? '';
                 if (session) {
                     if (text.trim()) {
-                        const isAfterToolCall = info.kind === 'block' && prevKind !== null && prevKind !== 'block';
-                        await session.push({ type: 'text', text: isAfterToolCall ? `\n\n${text}` : text });
+                        await session.push({ type: 'text', text });
                     }
                     const mediaUrls = payload.mediaUrls ?? [];
                     for (const mediaUrl of mediaUrls) {

package/dist/src/outbound-queue.d.ts

@@ -74,6 +74,8 @@ export declare function getOutboundQueue(accountId: string): OutboundQueueManage
 export declare function destroyOutboundQueue(accountId: string): void;
 export declare function endsWithTableRow(text: string): boolean;
 export declare function hasUnclosedFence(text: string): boolean;
+export declare function startsWithBlockElement(text: string): boolean;
+export declare function inferBlockSeparator(buffer: string, incoming: string): string;
 export type AtomicBlock = {
     start: number;
     end: number;

package/dist/src/outbound-queue.js

@@ -303,7 +303,7 @@ function createMergeOnFlushSession(callbacks, msgId, onComplete, log, heartbeatM
             if (aborted)
                 return hasSentContent;
             if (collectedTexts.length > 0) {
-                const merged = stripOuterMarkdownFence(collectedTexts.join('\n\n'));
+                const merged = stripOuterMarkdownFence(collectedTexts.join(''));
                 collectedTexts.length = 0;
                 if (merged.trim()) {
                     const result = await sendText(merged);
@@ -377,6 +377,36 @@ export function hasUnclosedFence(text) {
     }
     return inFence;
 }
+export function startsWithBlockElement(text) {
+    const firstLine = (text.trimStart().split('\n')[0] ?? '').trimStart();
+    return /^#{1,6}\s/.test(firstLine)
+        || firstLine.startsWith('---')
+        || firstLine.startsWith('***')
+        || firstLine.startsWith('___')
+        || firstLine.startsWith('> ')
+        || firstLine.startsWith('```')
+        || /^[*\-+]\s/.test(firstLine)
+        || /^\d+[.)]\s/.test(firstLine)
+        || firstLine.startsWith('|');
+}
+export function inferBlockSeparator(buffer, incoming) {
+    if (hasUnclosedFence(buffer))
+        return '';
+    if (buffer.endsWith('\n\n'))
+        return '';
+    const lastLine = (buffer.trimEnd().split('\n')
+        .at(-1) ?? '').trim();
+    const firstLine = (incoming.trimStart().split('\n')[0] ?? '').trimStart();
+    if (lastLine.startsWith('|') && !firstLine.startsWith('|')
+        && firstLine.endsWith('|')) {
+        return ' ';
+    }
+    if (lastLine.startsWith('|') && firstLine.startsWith('|'))
+        return '\n';
+    if (startsWithBlockElement(incoming))
+        return '\n\n';
+    return '';
+}
 const DIAGRAM_LANGUAGES = new Set([
     'mermaid', 'plantuml', 'sequence', 'flowchart',
     'gantt', 'classdiagram', 'statediagram', 'erdiagram',
@@ -396,7 +426,7 @@ export function extractAtomicBlocks(text) {
     const isTableLine = (line) => line.trim().startsWith('|');
     const isTableSeparator = (line) => /^\|[\s|:-]+\|$/.test(line.trim());
     const flushTable = () => {
-        if (tableStart !== -1 && tableHasSep && tableEnd !== -1) {
+        if (tableStart !== -1 && tableEnd !== -1 && (tableHasSep || tableLineCount >= 2)) {
             blocks.push({ start: tableStart, end: tableEnd, kind: 'table' });
         }
         tableStart = -1;
@@ -582,14 +612,8 @@ function createMergeTextSession(callbacks, msgId, sessionKey, onComplete, log, o
                     if (!item.text.trim())
                         return;
                     if (textBuffer) {
-                        const lines = textBuffer.trimEnd().split('\n');
-                        const lastLineOfBuffer = (lines[lines.length - 1] ?? '').trim();
-                        const incomingStartsWithTableRow = item.text.trimStart().startsWith('|');
-                        const needsSeparator = !hasUnclosedFence(textBuffer)
-                            && incomingStartsWithTableRow
-                            && !textBuffer.endsWith('\n')
-                            && !lastLineOfBuffer.startsWith('|');
-                        textBuffer = mergeBlockStreamingFences(needsSeparator ? `${textBuffer}\n\n` : textBuffer, item.text);
+                        const separator = inferBlockSeparator(textBuffer, item.text);
+                        textBuffer = mergeBlockStreamingFences(separator ? `${textBuffer}${separator}` : textBuffer, item.text);
                     }
                     else {
                         textBuffer = item.text;

package/dist/src/types.d.ts

@@ -32,6 +32,7 @@ export type YuanbaoConfig = YuanbaoAccountConfig & {
     accounts?: Record<string, YuanbaoAccountConfig>;
     defaultAccount?: string;
     routeEnv?: string;
+    debugBotIds?: string[];
 };
 export type ResolvedYuanbaoAccount = {
     accountId: string;

package/dist/src/yuanbao-server/ws/gateway.js

@@ -7,7 +7,7 @@ import { decodeInboundMessage } from './biz-codec.js';
 import { getSignToken, forceRefreshSignToken } from '../api.js';
 export async function startYuanbaoWsGateway(params) {
     const { account, config, abortSignal, log, runtime, statusSink } = params;
-    const gwlog = createLog('ws', log);
+    const gwlog = createLog('ws', log, { botId: account.botId });
     const auth = await resolveWsAuth(account, log);
     const client = new YuanbaoWsClient({
         connection: {
@@ -95,7 +95,7 @@ export async function startYuanbaoWsGateway(params) {
     });
 }
 async function resolveWsAuth(account, log) {
-    const mlog = createLog('ws', log);
+    const mlog = createLog('ws', log, { botId: account.botId });
     mlog.info(`[${account.accountId}] resolveWsAuth 入参：`, {
         botId: account.botId,
         token: account.token,
@@ -231,7 +231,7 @@ export function wsPushToInboundMessage(pushEvent, log) {
 }
 function handleWsDispatchEvent(params) {
     const { account, config, pushEvent, log: gwLog, runtime, client, statusSink, abortSignal } = params;
-    const dlog = createLog('ws', gwLog);
+    const dlog = createLog('ws', gwLog, { botId: account.botId });
     dlog.debug(`[${account.accountId}][dispatch] cmd=${pushEvent.cmd}, module=${pushEvent.module}, msgId=${pushEvent.msgId}`);
     const converted = wsPushToInboundMessage(pushEvent, gwLog);
     if (!converted) {

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "openclaw-plugin-yuanbao",
   "name": "元宝 Bot",
   "description": "Tencent YuanBao intelligent bot channel plugin",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "channels": [
     "yuanbao"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-plugin-yuanbao",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "type": "module",
   "description": "Tencent YuanBao intelligent bot channel plugin",
   "license": "MIT",