openclaw-plugin-yuanbao 2.7.1 → 2.8.0

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.8.0",
     "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

@@ -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');
             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');
             const wsClient = getActiveWsClient(account.accountId);
             slog.info('sendMedia', { accountId, to, mediaUrl, text });
             if (!wsClient) {
@@ -269,7 +270,7 @@ export const yuanbaoPlugin = {
     gateway: {
         startAccount: async (ctx) => {
             const { account } = ctx;
-            const slog = createLog('gateway', ctx.log);
+            const slog = createLog('gateway');
             slog.debug('启动账号', account);
             if (!account.configured) {
                 slog.warn('yuanbao not configured; skipping');
@@ -295,7 +296,6 @@ export const yuanbaoPlugin = {
                 account,
                 config: ctx.cfg,
                 abortSignal: ctx.abortSignal,
-                log: ctx.log,
                 runtime: getYuanbaoRuntime(),
                 statusSink: patch => ctx.setStatus({ accountId: ctx.accountId, ...patch }),
             });

package/dist/src/dm/send-dm.js

@@ -72,7 +72,6 @@ export async function sendDM(to, text, opts) {
             account,
             config: {},
             core: {},
-            log: { info: () => { }, warn: () => { }, error: () => { }, verbose: () => { } },
             wsClient,
         };
         const result = await sendYuanbaoMessage({

package/dist/src/logger.d.ts

@@ -8,7 +8,6 @@ export interface PluginLogger {
 }
 export declare function initLogger(api: OpenClawPluginApi): void;
 export declare const logger: PluginLogger;
-export declare function isVerbose(): boolean;
 export interface LogSink {
     info?: (msg: string) => void;
     warn?: (msg: string) => void;

package/dist/src/logger.js

@@ -2,7 +2,22 @@ import { getPluginVersion } from './utils/get-env.js';
 export const LOG_PREFIX = `[yuanbao:${getPluginVersion()}]`;
 let childLogger = null;
 let initialized = false;
-let verboseEnabled = false;
+let debugMode = false;
+const SANITIZE_RULES = {
+    always: {
+        omit: [],
+        mask: [
+            'token', 'signature', 'app_key', 'appkey',
+            'appsecret', 'app_secret', 'secret', 'password', 'x-token',
+        ],
+    },
+    debug: {
+        omit: ['msg_body'],
+        mask: ['user_input', 'cloud_custom_data', 'model_output'],
+    },
+};
+let OMIT_KEYS = new Set([...SANITIZE_RULES.always.omit, ...SANITIZE_RULES.debug.omit]);
+let SENSITIVE_KEYS = new Set([...SANITIZE_RULES.always.mask, ...SANITIZE_RULES.debug.mask]);
 const fallbackLogger = {
     info(message, meta) {
         console.log(`${LOG_PREFIX} ${message}`, meta ?? '');
@@ -19,8 +34,12 @@ const fallbackLogger = {
 };
 export function initLogger(api) {
     try {
+        debugMode = api.config.channels?.yuanbao?.debug === true;
+        if (debugMode) {
+            OMIT_KEYS = new Set(SANITIZE_RULES.always.omit);
+            SENSITIVE_KEYS = new Set(SANITIZE_RULES.always.mask);
+        }
         childLogger = api.runtime.logging.getChildLogger({ plugin: 'yuanbao' });
-        verboseEnabled = api.runtime.logging.shouldLogVerbose?.() ?? false;
         initialized = true;
     }
     catch (err) {
@@ -52,12 +71,11 @@ export const logger = {
         getActiveLogger().debug(message, meta);
     },
 };
-export function isVerbose() {
-    return verboseEnabled;
-}
 export function formatLog(module, msg, data) {
     const prefix = module ? `${LOG_PREFIX}[${module}]` : LOG_PREFIX;
-    return data !== undefined ? `${prefix} ${msg} ${sanitize(data)}` : `${prefix} ${msg}`;
+    if (data === undefined)
+        return `${prefix} ${msg}`;
+    return `${prefix} ${msg} ${sanitize(data)}`;
 }
 export function createLog(module, sink) {
     const target = sink ?? logger;
@@ -71,21 +89,6 @@ export function createLog(module, sink) {
         debug: (msg, data) => (target.debug ?? target.verbose)?.(fmt(msg, data)),
     };
 }
-const OMIT_KEYS = new Set(['msg_body']);
-const SENSITIVE_KEYS = new Set([
-    'token',
-    'signature',
-    'app_key',
-    'appkey',
-    'appsecret',
-    'app_secret',
-    'secret',
-    'password',
-    'x-token',
-    'user_input',
-    'cloud_custom_data',
-    'model_output',
-]);
 function maskValue(value) {
     if (value.length < 8)
         return '***';

package/dist/src/message-handler/callbacks/recall.js

@@ -13,7 +13,7 @@ function enqueueRecallSystemEvent(params) {
 }
 export function handleGroupRecall(ctx, msg) {
     const { core, account } = ctx;
-    const log = createLog('recall', ctx.log);
+    const log = createLog('recall');
     const groupCode = msg.group_code?.trim() || 'unknown';
     const seqList = msg.recall_msg_seq_list;
     if (!seqList || seqList.length === 0) {
@@ -57,7 +57,7 @@ export function handleGroupRecall(ctx, msg) {
 }
 export function handleC2CRecall(ctx, msg) {
     const { core, account } = ctx;
-    const log = createLog('recall', ctx.log);
+    const log = createLog('recall');
     const fromAccount = msg.from_account?.trim() || 'unknown';
     const seqList = msg.msg_id
         ? [{ msg_id: msg.msg_id, msg_seq: msg.msg_seq }]

package/dist/src/message-handler/context.d.ts

@@ -7,12 +7,6 @@ export type MessageHandlerContext = {
     account: ResolvedYuanbaoAccount;
     config: OpenClawConfig;
     core: PluginRuntime;
-    log: {
-        info: (msg: string) => void;
-        warn: (msg: string) => void;
-        error: (msg: string) => void;
-        verbose: (msg: string) => void;
-    };
     statusSink?: (patch: {
         lastInboundAt?: number;
         lastOutboundAt?: number;

package/dist/src/message-handler/handlers/custom.js

@@ -22,7 +22,7 @@ export const customHandler = {
                 if (!resData.isAtBot) {
                     resData.isAtBot = isAtBotSelf;
                 }
-                createLog('custom', ctx.log).info('@消息', { text: customContent?.text, userId: customContent?.user_id, isAtBot: resData.isAtBot });
+                createLog('custom').info('@消息', { text: customContent?.text, userId: customContent?.user_id, isAtBot: resData.isAtBot });
                 if (!isAtBotSelf && customContent?.user_id) {
                     resData.mentions.push({
                         userId: customContent.user_id,

package/dist/src/message-handler/handlers/index.js

@@ -5,6 +5,7 @@ import { soundHandler } from './sound.js';
 import { fileHandler } from './file.js';
 import { videoHandler } from './video.js';
 import { faceHandler } from './face.js';
+import { sanitizePipeTables } from '../../utils/markdown-table-sanitize.js';
 const handlerList = [
     textHandler,
     customHandler,
@@ -75,15 +76,16 @@ function resolveAtMentions(text, groupCode, memberInst) {
 export function prepareOutboundContent(text, groupCode, memberInst) {
     if (!text)
         return [];
+    const sanitizedText = sanitizePipeTables(text);
     const items = [];
-    if (text.length) {
-        const trailing = text.trim();
+    if (sanitizedText.length) {
+        const trailing = sanitizedText.trim();
         if (trailing) {
             items.push(...resolveAtMentions(trailing, groupCode, memberInst));
         }
     }
-    if (items.length === 0 && text.trim()) {
-        items.push(...resolveAtMentions(text.trim(), groupCode, memberInst));
+    if (items.length === 0 && sanitizedText.trim()) {
+        items.push(...resolveAtMentions(sanitizedText.trim(), groupCode, memberInst));
     }
     return items;
 }

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');
     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');
     setGroupCode(groupCode);
     if (outboundSender && fromAccount === outboundSender) {
         glog.info('跳过机器人自身消息', { groupCode, fromAccount });

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

@@ -34,7 +34,7 @@ async function shouldAttachReplyRef(params) {
 }
 export async function sendYuanbaoMessageBody(params) {
     const { toAccount, msgBody, fromAccount, ctx } = params;
-    const log = createLog('outbound', ctx?.log);
+    const log = createLog('outbound');
     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');
     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');
     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 {
@@ -203,6 +191,10 @@ export async function executeReply(params) {
                     return;
                 }
                 rlog.info('[deliver] 收到回复数据', { kind: info.kind, model_output: payload.text });
+                if (payload.isReasoning) {
+                    rlog.info('[deliver] Reasoning', { text: payload.text });
+                    return;
+                }
                 if (payload.isCompactionNotice) {
                     rlog.info('[deliver] CompactionNotice', { text: payload.text });
                     return;
@@ -213,13 +205,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/message-tool/action-runtime.js

@@ -55,7 +55,6 @@ export async function handleYuanbaoAction(action, params, context) {
                 account: context.account,
                 config: context.config,
                 core: getYuanbaoRuntime(),
-                log: { info: () => { }, warn: () => { }, error: () => { }, verbose: () => { } },
                 wsClient: context.wsClient,
                 groupCode: getGroupCode(),
             };

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;
+    debug?: boolean;
 };
 export type ResolvedYuanbaoAccount = {
     accountId: string;
@@ -134,6 +135,12 @@ export type CloudCustomData = {
     source_group?: string;
     [key: string]: unknown;
 };
+export type YuanbaoBufferedDeliverPayload = {
+    text?: string;
+    mediaUrls?: string[];
+    isCompactionNotice: boolean;
+    isReasoning: boolean;
+};
 export type YuanbaoSendMsgRequest = {
     sync_other_machine?: number;
     from_account?: string;

package/dist/src/utils/markdown-table-sanitize.d.ts

@@ -0,0 +1 @@
+export declare function sanitizePipeTables(text: string): string;

package/dist/src/utils/markdown-table-sanitize.js

@@ -0,0 +1,89 @@
+function findTableRegions(lines) {
+    const regions = [];
+    let groupStart = -1;
+    let lastPipeLine = -1;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        const hasPipe = line.includes('|');
+        const isBlank = line.trim() === '';
+        if (hasPipe) {
+            if (groupStart < 0)
+                groupStart = i;
+            lastPipeLine = i;
+        }
+        else if (isBlank) {
+        }
+        else {
+            if (groupStart >= 0) {
+                regions.push({ startLine: groupStart, endLine: lastPipeLine });
+                groupStart = -1;
+                lastPipeLine = -1;
+            }
+        }
+    }
+    if (groupStart >= 0) {
+        regions.push({ startLine: groupStart, endLine: lastPipeLine });
+    }
+    return regions;
+}
+const SEPARATOR_RE = /\|[\s]*:?-{2,}:?[\s]*(?:\|[\s]*:?-{2,}:?[\s]*)+\|/;
+function findSeparatorInFlat(flat) {
+    const m = SEPARATOR_RE.exec(flat);
+    if (!m)
+        return null;
+    const pipeCount = (m[0].match(/\|/g) || []).length;
+    if (pipeCount < 2)
+        return null;
+    return { numColumns: pipeCount - 1 };
+}
+function healRegion(regionLines) {
+    if (!regionLines.some(l => l.trim() === ''))
+        return null;
+    const flat = regionLines.join('').replace(/\n/g, '');
+    if (!findSeparatorInFlat(flat))
+        return null;
+    const nonBlank = regionLines.filter(l => l.trim() !== '');
+    const result = [];
+    let acc = '';
+    for (const line of nonBlank) {
+        if (!acc) {
+            acc = line;
+        }
+        else if (acc.trimEnd().endsWith('|') && line.trimStart().startsWith('|')) {
+            result.push(acc);
+            acc = line;
+        }
+        else {
+            acc += line;
+        }
+    }
+    if (acc)
+        result.push(acc);
+    return result.join('\n');
+}
+export function sanitizePipeTables(text) {
+    if (!text)
+        return text;
+    if (!text.includes('|'))
+        return text;
+    if (!text.includes('\n'))
+        return text;
+    const pipeCount = (text.match(/\|/g) || []).length;
+    if (pipeCount < 3)
+        return text;
+    const lines = text.split('\n');
+    const regions = findTableRegions(lines);
+    if (regions.length === 0) {
+        return text;
+    }
+    for (let ri = regions.length - 1; ri >= 0; ri--) {
+        const region = regions[ri];
+        const regionLines = lines.slice(region.startLine, region.endLine + 1);
+        const healed = healRegion(regionLines);
+        if (healed !== null) {
+            const healedLines = healed.split('\n');
+            lines.splice(region.startLine, region.endLine - region.startLine + 1, ...healedLines);
+        }
+    }
+    return lines.join('\n');
+}

package/dist/src/yuanbao-server/http/main.d.ts

@@ -1,4 +1,4 @@
 import type { ResolvedYuanbaoAccount } from '../../types.js';
-import type { Log, CosUploadConfig } from './request.js';
-export declare function apiGetUploadInfo(account: ResolvedYuanbaoAccount, fileName: string, fileId: string, log?: Log): Promise<CosUploadConfig>;
-export declare function apiGetDownloadUrl(account: ResolvedYuanbaoAccount, resourceId: string, log?: Log): Promise<string>;
+import type { CosUploadConfig } from './request.js';
+export declare function apiGetUploadInfo(account: ResolvedYuanbaoAccount, fileName: string, fileId: string): Promise<CosUploadConfig>;
+export declare function apiGetDownloadUrl(account: ResolvedYuanbaoAccount, resourceId: string): Promise<string>;

package/dist/src/yuanbao-server/http/main.js

@@ -1,15 +1,15 @@
 import { yuanbaoPost, yuanbaoGet } from './request.js';
 const UPLOAD_INFO_PATH = '/api/resource/genUploadInfo';
 const DOWNLOAD_INFO_PATH = '/api/resource/v1/download';
-export async function apiGetUploadInfo(account, fileName, fileId, log) {
-    const data = await yuanbaoPost(account, UPLOAD_INFO_PATH, { fileName, fileId, docFrom: 'localDoc', docOpenId: '' }, log);
+export async function apiGetUploadInfo(account, fileName, fileId) {
+    const data = await yuanbaoPost(account, UPLOAD_INFO_PATH, { fileName, fileId, docFrom: 'localDoc', docOpenId: '' });
     if (!data.bucketName || !data.location) {
         throw new Error(`[yuanbao-api] genUploadInfo 配置不完整: ${JSON.stringify(data)}`);
     }
     return data;
 }
-export async function apiGetDownloadUrl(account, resourceId, log) {
-    const data = await yuanbaoGet(account, DOWNLOAD_INFO_PATH, { resourceId }, log);
+export async function apiGetDownloadUrl(account, resourceId) {
+    const data = await yuanbaoGet(account, DOWNLOAD_INFO_PATH, { resourceId });
     const downloadUrl = data.url ?? data.realUrl;
     if (!downloadUrl) {
         throw new Error(`[yuanbao-api] resource/v1/download 未返回有效 URL: ${JSON.stringify(data)}`);

package/dist/src/yuanbao-server/http/request.d.ts

@@ -44,8 +44,8 @@ export declare function getTokenStatus(accountId: string): {
 };
 export declare function getCachedBotId(accountId: string): string | undefined;
 export declare function verifySignature(expected: string, actual: string): boolean;
-export declare function getSignToken(account: ResolvedYuanbaoAccount, log?: Log): Promise<SignTokenData>;
-export declare function forceRefreshSignToken(account: ResolvedYuanbaoAccount, log?: Log): Promise<SignTokenData>;
-export declare function getAuthHeaders(account: ResolvedYuanbaoAccount, log?: Log): Promise<AuthHeaders>;
-export declare function yuanbaoPost<T>(account: ResolvedYuanbaoAccount, path: string, body: unknown, log?: Log): Promise<T>;
-export declare function yuanbaoGet<T>(account: ResolvedYuanbaoAccount, path: string, params?: Record<string, string>, log?: Log): Promise<T>;
+export declare function getSignToken(account: ResolvedYuanbaoAccount): Promise<SignTokenData>;
+export declare function forceRefreshSignToken(account: ResolvedYuanbaoAccount): Promise<SignTokenData>;
+export declare function getAuthHeaders(account: ResolvedYuanbaoAccount): Promise<AuthHeaders>;
+export declare function yuanbaoPost<T>(account: ResolvedYuanbaoAccount, path: string, body: unknown): Promise<T>;
+export declare function yuanbaoGet<T>(account: ResolvedYuanbaoAccount, path: string, params?: Record<string, string>): Promise<T>;

package/dist/src/yuanbao-server/http/request.js

@@ -59,8 +59,8 @@ export function verifySignature(expected, actual) {
     }
     return timingSafeEqual(expectedBuf, actualBuf);
 }
-async function doFetchSignToken(account, log) {
-    const mlog = createLog('http', log);
+async function doFetchSignToken(account) {
+    const mlog = createLog('http');
     const { appKey, appSecret, apiDomain } = account;
     if (!appKey || !appSecret)
         throw new Error('签票失败: 缺少 appKey 或 appSecret');
@@ -106,8 +106,8 @@ async function doFetchSignToken(account, log) {
     }
     throw new Error('签票失败: 超过最大重试次数');
 }
-function scheduleTokenRefresh(account, durationSec, log) {
-    const mlog = createLog('http', log);
+function scheduleTokenRefresh(account, durationSec) {
+    const mlog = createLog('http');
     const existing = tokenRefreshTimers.get(account.accountId);
     if (existing) {
         clearTimeout(existing);
@@ -122,7 +122,7 @@ function scheduleTokenRefresh(account, durationSec, log) {
         tokenRefreshTimers.delete(account.accountId);
         try {
             mlog.info(`[${account.accountId}][token-timer]定时刷新触发，开始重新签票`);
-            await forceRefreshSignToken(account, log);
+            await forceRefreshSignToken(account);
             mlog.info(`[${account.accountId}][token-timer]定时刷新完成`);
         }
         catch (err) {
@@ -130,7 +130,7 @@ function scheduleTokenRefresh(account, durationSec, log) {
             const retryTimer = setTimeout(async () => {
                 tokenRefreshTimers.delete(account.accountId);
                 try {
-                    await forceRefreshSignToken(account, log);
+                    await forceRefreshSignToken(account);
                     mlog.info(`[${account.accountId}][token-timer]定时刷新重试成功`);
                 }
                 catch (retryErr) {
@@ -142,7 +142,7 @@ function scheduleTokenRefresh(account, durationSec, log) {
     }, refreshAfterMs);
     tokenRefreshTimers.set(account.accountId, timer);
 }
-export async function getSignToken(account, log) {
+export async function getSignToken(account) {
     if (account.token) {
         return {
             bot_id: account.botId || '',
@@ -152,7 +152,7 @@ export async function getSignToken(account, log) {
             token: account.token,
         };
     }
-    const tlog = createLog('http', log);
+    const tlog = createLog('http');
     const cached = tokenCacheMap.get(account.accountId);
     if (cached && cached.expiresAt > Date.now()) {
         const remainSec = Math.round((cached.expiresAt - Date.now()) / 1000);
@@ -166,11 +166,11 @@ export async function getSignToken(account, log) {
     }
     fetchPromise = (async () => {
         try {
-            const data = await doFetchSignToken(account, log);
+            const data = await doFetchSignToken(account);
             const ttlMs = data.duration > 0 ? data.duration * 1000 : 0;
             if (ttlMs > 0) {
                 tokenCacheMap.set(account.accountId, { data, expiresAt: Date.now() + ttlMs });
-                scheduleTokenRefresh(account, data.duration, log);
+                scheduleTokenRefresh(account, data.duration);
             }
             return data;
         }
@@ -181,15 +181,15 @@ export async function getSignToken(account, log) {
     tokenFetchPromises.set(account.accountId, fetchPromise);
     return fetchPromise;
 }
-export async function forceRefreshSignToken(account, log) {
-    const flog = createLog('http', log);
+export async function forceRefreshSignToken(account) {
+    const flog = createLog('http');
     flog.warn(`[${account.accountId}][force-refresh]清除缓存并重新签票`);
     clearSignTokenCache(account.accountId);
     tokenFetchPromises.delete(account.accountId);
-    return getSignToken(account, log);
+    return getSignToken(account);
 }
-export async function getAuthHeaders(account, log) {
-    const data = await getSignToken(account, log);
+export async function getAuthHeaders(account) {
+    const data = await getSignToken(account);
     if (data.bot_id && !account.botId) {
         account.botId = data.bot_id;
     }
@@ -207,11 +207,11 @@ export async function getAuthHeaders(account, log) {
     }
     return authHeaders;
 }
-export async function yuanbaoPost(account, path, body, log) {
-    const plog = createLog('http', log);
+export async function yuanbaoPost(account, path, body) {
+    const plog = createLog('http');
     const url = `https://${account.apiDomain}${path}`;
     for (let attempt = 0; attempt <= HTTP_AUTH_RETRY_MAX; attempt++) {
-        const authHeaders = await getAuthHeaders(account, log);
+        const authHeaders = await getAuthHeaders(account);
         const response = await fetch(url, {
             method: 'POST',
             headers: {
@@ -222,7 +222,7 @@ export async function yuanbaoPost(account, path, body, log) {
         });
         if (response.status === 401 && attempt < HTTP_AUTH_RETRY_MAX) {
             plog.warn(`[post][${account.accountId}] ${path} 收到 401，刷新 token 后重试 (attempt=${attempt + 1})`);
-            await forceRefreshSignToken(account, log);
+            await forceRefreshSignToken(account);
             continue;
         }
         if (!response.ok) {
@@ -237,11 +237,11 @@ export async function yuanbaoPost(account, path, body, log) {
     }
     throw new Error(`[yuanbao-api][POST] ${path} 401 重试次数已耗尽`);
 }
-export async function yuanbaoGet(account, path, params, log) {
-    const glog = createLog('http', log);
+export async function yuanbaoGet(account, path, params) {
+    const glog = createLog('http');
     const url = `https://${account.apiDomain}${path}${params ? `?${new URLSearchParams(params).toString()}` : ''}`;
     for (let attempt = 0; attempt <= HTTP_AUTH_RETRY_MAX; attempt++) {
-        const authHeaders = await getAuthHeaders(account, log);
+        const authHeaders = await getAuthHeaders(account);
         const response = await fetch(url, {
             method: 'GET',
             headers: {
@@ -251,7 +251,7 @@ export async function yuanbaoGet(account, path, params, log) {
         });
         if (response.status === 401 && attempt < HTTP_AUTH_RETRY_MAX) {
             glog.warn(`[get][${account.accountId}] ${path} 收到 401，刷新 token 后重试 (attempt=${attempt + 1})`);
-            await forceRefreshSignToken(account, log);
+            await forceRefreshSignToken(account);
             continue;
         }
         if (!response.ok) {

package/dist/src/yuanbao-server/ws/client.d.ts

@@ -1,5 +1,4 @@
 import type { WsClientCallbacks, WsClientConfig, WsClientState, WsConnectionConfig, WsSendMessageResponse, WsSendC2CMessageData, WsSendGroupMessageData, WsSendPrivateHeartbeatData, WsSendGroupHeartbeatData, WsHeartbeatResponse, WsQueryGroupInfoData, WsQueryGroupInfoResponse, WsGetGroupMemberListData, WsGetGroupMemberListResponse } from './types.js';
-import type { LogSink } from '../../logger.js';
 export declare const BIZ_CMD: {
     readonly SendC2CMessage: "send_c2c_message";
     readonly SendGroupMessage: "send_group_message";
@@ -30,7 +29,6 @@ export declare class YuanbaoWsClient {
         connection: WsConnectionConfig;
         config?: WsClientConfig;
         callbacks?: WsClientCallbacks;
-        log?: LogSink;
     });
     updateAuth(auth: WsConnectionConfig['auth']): void;
     connect(): void;

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

@@ -57,7 +57,7 @@ export class YuanbaoWsClient {
     disposed = false;
     pendingRequests = new Map();
     constructor(params) {
-        this.log = createLog('ws', params.log);
+        this.log = createLog('ws');
         this.log.info('初始化 WebSocket 客户端', { connection: params.connection, config: params.config });
         this.connectionConfig = params.connection;
         this.clientConfig = {

package/dist/src/yuanbao-server/ws/gateway.d.ts

@@ -1,18 +1,11 @@
 import type { OpenClawConfig, PluginRuntime } from 'openclaw/plugin-sdk';
 import type { ResolvedYuanbaoAccount, YuanbaoInboundMessage } from '../../types.js';
 import type { WsPushEvent } from './types.js';
-type GatewayLog = {
-    info?: (msg: string) => void;
-    warn?: (msg: string) => void;
-    error?: (msg: string) => void;
-    debug?: (msg: string) => void;
-};
 type GatewayStatusPatch = Record<string, unknown>;
 export type StartWsGatewayParams = {
     account: ResolvedYuanbaoAccount;
     config: OpenClawConfig;
     abortSignal: AbortSignal;
-    log?: GatewayLog;
     runtime?: PluginRuntime;
     statusSink?: (patch: GatewayStatusPatch) => void;
 };
@@ -21,5 +14,5 @@ type InboundResult = {
     msg: YuanbaoInboundMessage;
     chatType: 'c2c' | 'group';
 };
-export declare function wsPushToInboundMessage(pushEvent: WsPushEvent, log?: GatewayLog): InboundResult | null;
+export declare function wsPushToInboundMessage(pushEvent: WsPushEvent): InboundResult | null;
 export {};

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

@@ -6,9 +6,9 @@ import { setActiveWsClient } from './runtime.js';
 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 auth = await resolveWsAuth(account, log);
+    const { account, config, abortSignal, runtime, statusSink } = params;
+    const gwlog = createLog('ws');
+    const auth = await resolveWsAuth(account);
     const client = new YuanbaoWsClient({
         connection: {
             gatewayUrl: account.wsGatewayUrl,
@@ -29,7 +29,7 @@ export async function startYuanbaoWsGateway(params) {
             },
             onDispatch: (pushEvent) => {
                 gwlog.debug(`[${account.accountId}] WS 推送: cmd=${pushEvent.cmd}, type=${pushEvent.type}`);
-                handleWsDispatchEvent({ account, config, pushEvent, log, runtime, client, statusSink, abortSignal });
+                handleWsDispatchEvent({ account, config, pushEvent, runtime, client, statusSink, abortSignal });
             },
             onStateChange: (state) => {
                 gwlog.info(`[${account.accountId}] WS 状态: ${state}`);
@@ -52,7 +52,7 @@ export async function startYuanbaoWsGateway(params) {
             },
             onAuthFailed: async (code) => {
                 gwlog.warn(`[${account.accountId}] 收到 onAuthFailed 回调(code=${code})，开始刷新 token`);
-                const tokenData = await forceRefreshSignToken(account, log);
+                const tokenData = await forceRefreshSignToken(account);
                 const uid = tokenData.bot_id || account.botId || '';
                 if (tokenData.bot_id) {
                     account.botId = tokenData.bot_id;
@@ -66,12 +66,6 @@ export async function startYuanbaoWsGateway(params) {
                 };
             },
         },
-        log: {
-            info: msg => log?.info?.(msg),
-            warn: msg => log?.warn?.(msg),
-            error: msg => log?.error?.(msg),
-            debug: msg => log?.debug?.(msg),
-        },
     });
     client.connect();
     setActiveWsClient(account.accountId, client);
@@ -94,8 +88,8 @@ export async function startYuanbaoWsGateway(params) {
         abortSignal.addEventListener('abort', onAbort, { once: true });
     });
 }
-async function resolveWsAuth(account, log) {
-    const mlog = createLog('ws', log);
+async function resolveWsAuth(account) {
+    const mlog = createLog('ws');
     mlog.info(`[${account.accountId}] resolveWsAuth 入参：`, {
         botId: account.botId,
         token: account.token,
@@ -115,7 +109,7 @@ async function resolveWsAuth(account, log) {
             routeEnv: account.config?.routeEnv,
         };
     }
-    const tokenData = await getSignToken(account, log);
+    const tokenData = await getSignToken(account);
     const uid = tokenData.bot_id || account.botId || '';
     if (tokenData.bot_id) {
         account.botId = tokenData.bot_id;
@@ -157,14 +151,14 @@ function inferChatType(msg) {
 function hasValidMsgFields(msg) {
     return Boolean(msg.callback_command || msg.from_account || msg.msg_body);
 }
-function decodeFromProtobuf(rawData, pushType) {
+function decodeFromProtobuf(rawData) {
     const decoded = decodeInboundMessage(rawData);
     if (!decoded || !hasValidMsgFields(decoded))
         return null;
-    createLog('ws').debug(`[${pushType}] WS 推送事件解析`, { ...decoded });
+    createLog('ws').debug('[Protobuf] WS 推送事件解析', { ...decoded });
     return { msg: decoded, chatType: inferChatType(decoded) };
 }
-function decodeFromRawDataJson(rawData, pushType) {
+function decodeFromRawDataJson(rawData) {
     try {
         const rawJson = JSON.parse(new TextDecoder().decode(rawData));
         if (!rawJson || !hasValidMsgFields(rawJson))
@@ -173,7 +167,7 @@ function decodeFromRawDataJson(rawData, pushType) {
         if (!msg.trace_id) {
             msg.trace_id = rawJson.log_ext?.trace_id;
         }
-        createLog('ws').info(`[${pushType}] WS 推送事件解析`, { ...msg });
+        createLog('ws').info('[Json] WS 推送事件解析', { ...msg });
         return { msg, chatType: inferChatType(msg) };
     }
     catch {
@@ -206,34 +200,32 @@ function decodeFromContent(pushEvent) {
         chatType,
     };
 }
-export function wsPushToInboundMessage(pushEvent, log) {
+export function wsPushToInboundMessage(pushEvent) {
     if (pushEvent.connData && pushEvent.connData.length > 0) {
-        createLog('ws', log).debug(`[${pushEvent.type}] WS 推送事件解析 type=connData (connData.length=${pushEvent.connData.length})`);
-        const pushType = String(pushEvent.type ?? '');
-        const result = decodeFromProtobuf(pushEvent.connData, pushType);
+        createLog('ws').debug('[connData] WS 推送事件解析');
+        const result = decodeFromProtobuf(pushEvent.connData);
         if (result)
             return result;
     }
     if (pushEvent.rawData && pushEvent.rawData.length > 0) {
-        const pushType = String(pushEvent.type ?? 'rawData');
-        createLog('ws', log).debug(`[${pushType}] WS 推送事件解析`);
-        const result = decodeFromProtobuf(pushEvent.rawData, pushType)
-            ?? decodeFromRawDataJson(pushEvent.rawData, pushType);
-        if (result)
-            return result;
-        createLog('ws', log).warn(`[${pushType}] WS 推送事件解析失败`);
+        const jsonResult = decodeFromRawDataJson(pushEvent.rawData);
+        if (jsonResult) {
+            createLog('ws').debug('[rawData] WS 推送事件解析', jsonResult);
+            return jsonResult;
+        }
+        createLog('ws').warn('[rawData] WS 推送事件解析失败');
     }
     if (pushEvent.content) {
-        createLog('ws', log).debug(`[${pushEvent.type || 'content'}] WS 推送事件解析, type=content`, { content: pushEvent.content });
+        createLog('ws').debug('[content] WS 推送事件解析, type=content', { content: pushEvent.content });
         return decodeFromContent(pushEvent);
     }
     return null;
 }
 function handleWsDispatchEvent(params) {
-    const { account, config, pushEvent, log: gwLog, runtime, client, statusSink, abortSignal } = params;
-    const dlog = createLog('ws', gwLog);
+    const { account, config, pushEvent, runtime, client, statusSink, abortSignal } = params;
+    const dlog = createLog('ws');
     dlog.debug(`[${account.accountId}][dispatch] cmd=${pushEvent.cmd}, module=${pushEvent.module}, msgId=${pushEvent.msgId}`);
-    const converted = wsPushToInboundMessage(pushEvent, gwLog);
+    const converted = wsPushToInboundMessage(pushEvent);
     if (!converted) {
         dlog.debug(`[${account.accountId}][dispatch] cmd=${pushEvent.cmd} (非消息事件，跳过)`);
         return;
@@ -258,12 +250,6 @@ function handleWsDispatchEvent(params) {
         account,
         config,
         core: runtime,
-        log: {
-            info: (m) => gwLog?.info?.(m),
-            warn: (m) => gwLog?.warn?.(m),
-            error: (m) => gwLog?.error?.(m),
-            verbose: (m) => gwLog?.debug?.(m),
-        },
         statusSink: statusSink,
         wsClient: client,
         traceContext,

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.8.0",
   "channels": [
     "yuanbao"
   ],

package/package.json

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