openclaw-plugin-yuanbao 2.3.1 → 2.4.0

package/dist/openclaw.plugin.json

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

package/dist/src/channel.js

@@ -2,13 +2,13 @@ import { DEFAULT_ACCOUNT_ID, deleteAccountFromConfigSection, setAccountEnabledIn
 import { listYuanbaoAccountIds, resolveDefaultYuanbaoAccountId, resolveYuanbaoAccount } from './accounts.js';
 import { yuanbaoConfigSchema } from './config-schema.js';
 import { yuanbaoOnboardingAdapter } from './onboarding.js';
-import { createLog, logger } from './logger.js';
+import { createLog } from './logger.js';
 import { yuanbaoSetupAdapter } from './setup.js';
 import { startYuanbaoWsGateway, getActiveWsClient } from './yuanbao-server/ws/index.js';
 import { getYuanbaoRuntime } from './runtime.js';
 import { sendYuanbaoMessage, sendYuanbaoGroupMessage } from './message-handler/index.js';
 import { initOutboundQueue, destroyOutboundQueue, getOutboundQueue } from './outbound-queue.js';
-import { parseTarget, sendDM, } from './dm/index.js';
+import { ChatType, getGroupCode, parseTarget } from './targets.js';
 import { buildMessageToolHints, yuanbaoMessageActions } from './message-tool/index.js';
 function toChannelResult(result) {
     return {
@@ -18,6 +18,16 @@ function toChannelResult(result) {
         error: result.error ? new Error(result.error) : undefined,
     };
 }
+function buildMinCtx(account, wsClient) {
+    return {
+        account,
+        config: account.config,
+        core: {},
+        log: { info: () => { }, warn: () => { }, error: () => { }, verbose: () => { } },
+        wsClient,
+        groupCode: getGroupCode(),
+    };
+}
 async function sendTextToTarget(account, target, text, wsClient) {
     const minCtx = wsClient
         ? {
@@ -28,13 +38,11 @@ async function sendTextToTarget(account, target, text, wsClient) {
             wsClient,
         }
         : undefined;
-    if (target.startsWith('group:')) {
-        return sendYuanbaoGroupMessage({ account, groupCode: target.slice('group:'.length), text, fromAccount: account.botId, ctx: minCtx });
+    const { chatType, target: targetId } = parseTarget(target, account.accountId);
+    if (chatType === ChatType.GROUP) {
+        return sendYuanbaoGroupMessage({ account, groupCode: targetId, text, fromAccount: account.botId, ctx: minCtx });
     }
-    if (target.startsWith('direct:')) {
-        return sendYuanbaoMessage({ account, toAccount: target.slice('direct:'.length), text, fromAccount: account.botId, ctx: minCtx });
-    }
-    return sendYuanbaoMessage({ account, toAccount: target, text, fromAccount: account.botId, ctx: minCtx });
+    return sendYuanbaoMessage({ account, toAccount: targetId, text, fromAccount: account.botId, ctx: minCtx });
 }
 const meta = {
     id: 'yuanbao',
@@ -157,8 +165,8 @@ export const yuanbaoPlugin = {
     streaming: {
         blockStreamingChunkMaxChars: 3000,
         blockStreamingCoalesceDefaults: {
-            minChars: 2500,
-            idleMs: 15000,
+            minChars: 2800,
+            idleMs: 5000,
         },
     },
     outbound: {
@@ -166,42 +174,39 @@ export const yuanbaoPlugin = {
         chunkerMode: 'markdown',
         textChunkLimit: 3000,
         chunker: (text, limit) => getYuanbaoRuntime()?.channel.text.chunkMarkdownText(text, limit) ?? [text],
-        sendText: async ({ cfg, to: _to, text, accountId }) => {
+        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 dmTarget = parseTarget(to);
-            if (dmTarget?.kind === 'user') {
-                const dmResult = await sendDM(to, text, { account });
-                return {
-                    channel: 'yuanbao',
-                    ok: dmResult.ok,
-                    messageId: dmResult.messageId ?? '',
-                    error: dmResult.error
-                        ? new Error('detail' in dmResult.error ? dmResult.error.detail : dmResult.error.kind)
-                        : undefined,
-                };
-            }
+            slog.info('sendText', { accountId, to });
             const wsClient = getActiveWsClient(account.accountId);
             if (!wsClient) {
                 return { channel: 'yuanbao', ok: false, messageId: '', error: new Error(`WebSocket client not connected for account ${account.accountId}`) };
             }
             const queueManager = getOutboundQueue(account.accountId);
             if (queueManager) {
-                const safeTo = to.replace(/^user:/, 'direct:');
-                const session = queueManager.getSession(safeTo);
-                if (session) {
-                    await session.push({ type: 'text', text });
-                    return { channel: 'yuanbao', ok: true, messageId: '' };
-                }
-                logger.debug(`sendText: 未找到已有 session， to: ${to}`);
+                const { chatType, target, sessionKey } = parseTarget(to, account.accountId);
+                const session = queueManager.getOrCreateSession(sessionKey, {
+                    chatType,
+                    account,
+                    target,
+                    fromAccount: account.botId,
+                    ctx: buildMinCtx(account, wsClient),
+                });
+                await session.push({ type: 'text', text });
+                await session.flush();
+                return { channel: 'yuanbao', ok: true, messageId: '' };
             }
             return toChannelResult(await sendTextToTarget(account, to, text, wsClient));
         },
-        sendMedia: async ({ cfg, accountId, to: _to, mediaUrl, text, mediaLocalRoots }) => {
+        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 wsClient = getActiveWsClient(account.accountId);
-            logger.info('sendMedia', { to, mediaUrl, text, accountId });
+            slog.info('sendMedia', { accountId, to, mediaUrl, text });
             if (!wsClient) {
                 return { channel: 'yuanbao', ok: false, messageId: '', error: new Error(`WebSocket client not connected for account ${account.accountId}`) };
             }
@@ -210,14 +215,20 @@ export const yuanbaoPlugin = {
             }
             const queueManager = getOutboundQueue(account.accountId);
             if (queueManager) {
-                const safeTo = to.replace(/^user:/, 'direct:');
-                const session = queueManager.getSession(safeTo);
-                if (session) {
+                const { chatType, target, sessionKey } = parseTarget(to, account.accountId);
+                const session = queueManager.getOrCreateSession(sessionKey, {
+                    chatType,
+                    account,
+                    target,
+                    fromAccount: account.botId,
+                    ctx: buildMinCtx(account, wsClient),
+                });
+                if (text?.trim()) {
                     await session.push({ type: 'text', text });
-                    await session.push({ type: 'media', mediaUrl, mediaLocalRoots });
-                    return { channel: 'yuanbao', ok: true, messageId: '' };
                 }
-                logger.debug(`sendMedia: 未找到已有 session， to: ${to}`);
+                await session.push({ type: 'media', mediaUrl, mediaLocalRoots });
+                await session.flush();
+                return { channel: 'yuanbao', ok: true, messageId: '' };
             }
             return { channel: 'yuanbao', ok: false, messageId: '', error: new Error('No session found') };
         },

package/dist/src/config-schema.js

@@ -44,7 +44,7 @@ export const yuanbaoConfigSchema = {
                 title: '消息聚合最小字符数',
                 description: 'merge-text 策略下，缓冲区积累到此字符数后触发发送',
                 minimum: 1,
-                default: 2500,
+                default: 2800,
             },
             maxChars: {
                 type: 'integer',
@@ -58,7 +58,7 @@ export const yuanbaoConfigSchema = {
                 title: '空闲自动发送超时 (ms)',
                 description: 'merge-text 策略下，超过该时长无新内容时自动发送缓冲区',
                 minimum: 0,
-                default: 15000,
+                default: 5000,
             },
             mediaMaxMb: {
                 type: 'number',

package/dist/src/dm/directory-cache.d.ts

@@ -1,7 +1,6 @@
 export interface CachedUserEntry {
-    id: string;
-    name?: string;
-    handle?: string;
+    userId: string;
+    nickName?: string;
 }
 export declare function getCachedMember(key: string): CachedUserEntry | undefined;
 export declare function cacheMember(key: string, entry: CachedUserEntry): void;

package/dist/src/dm/directory.d.ts

@@ -1,9 +1,8 @@
 import type { CachedUserEntry } from './directory-cache.js';
 export interface DirectoryEntry {
     kind: 'user' | 'group';
-    id: string;
-    name?: string;
-    handle?: string;
+    userId: string;
+    nickName: string;
 }
 export declare function resolveUsername(nameOrHandle: string, accountId: string, groupCode?: string): CachedUserEntry | null;
 export declare function listKnownPeers(accountId: string): DirectoryEntry[];

package/dist/src/dm/directory.js

@@ -19,9 +19,8 @@ export function resolveUsername(nameOrHandle, accountId, groupCode = '') {
                 || u.userId.toLowerCase() === query.toLowerCase());
             const best = exactMatch ?? results[0];
             const entry = {
-                id: best.userId,
-                name: best.nickName,
-                handle: best.nickName,
+                userId: best.userId,
+                nickName: best.nickName,
             };
             cacheMember(query, entry);
             cacheMember(best.nickName, entry);
@@ -44,9 +43,8 @@ export function listKnownPeers(accountId) {
                 seen.add(u.userId);
                 entries.push({
                     kind: 'user',
-                    id: u.userId,
-                    name: u.nickName,
-                    handle: u.nickName,
+                    userId: u.userId,
+                    nickName: u.nickName,
                 });
             }
         }

package/dist/src/dm/handle-action.js

@@ -52,7 +52,7 @@ export async function handleAction(ctx) {
         });
     }
     if (target.kind === 'user') {
-        console.log('handleAction DM', ctx);
+        log.info('处理 DM 发送', { to, targetId: target.id, senderId: ctx.requesterSenderId });
         const senderId = ctx.requesterSenderId ?? '';
         const accessResult = enforceDMAccess(senderId, target.id, message.length, DEFAULT_DM_ACCESS_POLICY);
         if (!accessResult.allowed) {

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

@@ -53,7 +53,7 @@ export async function sendDM(to, text, opts) {
                 },
             };
         }
-        userId = resolved.id;
+        userId = resolved.userId;
     }
     const wsClient = opts.ctx?.wsClient ?? getActiveWsClient(account.accountId);
     if (!wsClient) {

package/dist/src/logger.js

@@ -84,6 +84,7 @@ const SENSITIVE_KEYS = new Set([
     'x-token',
     'user_input',
     'cloud_custom_data',
+    'model_output',
 ]);
 function maskValue(value) {
     if (value.length < 8)

package/dist/src/media.d.ts

@@ -43,6 +43,7 @@ export declare function buildFileMsgBody(params: {
     url: string;
     filename: string;
     size?: number;
+    uuid?: string;
 }): Array<{
     msg_type: string;
     msg_content: Record<string, unknown>;

package/dist/src/media.js

@@ -343,7 +343,7 @@ export function buildFileMsgBody(params) {
         {
             msg_type: 'TIMFileElem',
             msg_content: {
-                uuid: params.filename,
+                uuid: params.uuid ?? params.filename,
                 file_name: params.filename,
                 file_size: params.size ?? 0,
                 url: params.url,

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

@@ -1,19 +1,18 @@
 import { recordPendingHistoryEntryIfEnabled, buildPendingHistoryContextFromMap, clearHistoryEntriesIfEnabled, resolveControlCommandGate, } from 'openclaw/plugin-sdk/mattermost';
-import { downloadMediasToLocalFiles, downloadAndUploadMedia, guessMimeType, buildImageMsgBody, buildFileMsgBody } from '../media.js';
+import { downloadMediasToLocalFiles } from '../media.js';
 import { resolveOutboundSenderAccount, rewriteSlashCommand, YUANBAO_FINAL_TEXT_CHUNK_LIMIT, } from './context.js';
 import { extractTextFromMsgBody } from './extract.js';
-import { sendYuanbaoMessage, sendYuanbaoMessageBody, sendYuanbaoGroupMessage, sendYuanbaoGroupMessageBody, sendMsgBodyDirect, executeReply, } from './outbound.js';
+import { sendYuanbaoMessage, sendYuanbaoMessageBody, sendYuanbaoGroupMessageBody, executeReply, } from './outbound.js';
 import { buildOutboundMsgBody, prepareOutboundContent } from './handlers/index.js';
 import { parseQuoteFromCloudCustomData, formatQuoteContext } from './quote.js';
 import { getMember } from '../module/member.js';
-import { createLog, logger } from '../logger.js';
+import { createLog } from '../logger.js';
 import { getOutboundQueue } from '../outbound-queue.js';
 import { UPGRADE_COMMAND_NAMES } from '../commands/upgrade.js';
-import { sendStickerYuanbao } from '../sticker/sticker-sender.js';
-import { getCachedSticker } from '../sticker/sticker-cache.js';
 import { dispatchSystemCallback } from './system-callbacks.js';
 import { chatHistories, chatMediaHistories, recordMediaHistory, } from './chat-history.js';
 import './callbacks/recall.js';
+import { setGroupCode } from '../targets.js';
 const conversationQueues = new Map();
 function enqueueForConversation(key, task) {
     const prev = conversationQueues.get(key) ?? Promise.resolve();
@@ -114,6 +113,7 @@ async function handleC2CMessage(params) {
     const { core, config, account } = ctx;
     if (msg.private_from_group_code) {
         ctx.groupCode = msg.private_from_group_code;
+        setGroupCode(ctx.groupCode);
     }
     const fromAccount = msg.from_account?.trim() || 'unknown';
     const senderNickname = msg.sender_nickname?.trim() || undefined;
@@ -125,7 +125,6 @@ async function handleC2CMessage(params) {
     }
     const { rawBody, medias } = extractTextFromMsgBody(ctx, msg.msg_body);
     log.info(`收到消息 <- ${fromAccount}${senderNickname ? `(${senderNickname})` : ''}, msgKey: ${msg.msg_key}`);
-    log.debug('消息内容', { user_input: rawBody });
     const quoteInfo = parseQuoteFromCloudCustomData(msg.cloud_custom_data);
     if (quoteInfo) {
         log.info(`检测到引用消息, 引用来自: ${quoteInfo.sender_nickname || quoteInfo.sender_id || 'unknown'}`);
@@ -249,11 +248,7 @@ async function handleC2CMessage(params) {
             log.error('failed updating session meta', { error: String(err) });
         },
     });
-    const tableMode = core.channel.text.resolveMarkdownTableMode({
-        cfg: config,
-        channel: 'yuanbao',
-        accountId: account.accountId,
-    });
+    const tableMode = 'off';
     const finalTextChunkLimit = core.channel.text.resolveTextChunkLimit(config, 'yuanbao', account.accountId, {
         fallbackLimit: YUANBAO_FINAL_TEXT_CHUNK_LIMIT,
     });
@@ -285,38 +280,6 @@ async function handleC2CMessage(params) {
     const msgId = msg.msg_id ?? String(msg.msg_seq ?? '');
     const queueManager = getOutboundQueue(account.accountId);
     if (queueManager) {
-        const sendMediaOverride = async (url, fallbackText, mediaType, mediaLocalRoots) => {
-            if (mediaType === 'sticker') {
-                const sticker = getCachedSticker(url);
-                if (!sticker) {
-                    return { ok: false, error: `sticker not found: ${url}` };
-                }
-                return sendStickerYuanbao({
-                    account,
-                    config,
-                    wsClient: ctx.wsClient,
-                    toAccount: fromAccount,
-                    sticker,
-                    core,
-                });
-            }
-            try {
-                logger.info('sendMediaOverride', { url, mediaLocalRoots });
-                const uploadResult = await downloadAndUploadMedia(url, core, account, mediaLocalRoots);
-                const mime = guessMimeType(uploadResult.filename);
-                const msgBody = mime.startsWith('image/')
-                    ? buildImageMsgBody({ url: uploadResult.url, filename: uploadResult.filename, size: uploadResult.size, uuid: uploadResult.uuid, imageInfo: uploadResult.imageInfo })
-                    : buildFileMsgBody({ url: uploadResult.url, filename: uploadResult.filename, size: uploadResult.size });
-                const result = await sendMsgBodyDirect({ account, config, target: fromAccount, msgBody: msgBody, wsClient: ctx.wsClient, core });
-                return { ok: result.ok, error: result.error };
-            }
-            catch (err) {
-                const errMsg = err instanceof Error ? err.message : String(err);
-                log.error(`sendMediaOverride 失败: ${errMsg}`);
-                const fallback = fallbackText ? `${fallbackText}\n${url}` : url;
-                return sendYuanbaoMessage({ account, toAccount: fromAccount, text: fallback, fromAccount: outboundSender, ctx });
-            }
-        };
         queueManager.registerSession(outboundSessionKey, {
             msgId,
             chatType: 'c2c',
@@ -325,7 +288,6 @@ async function handleC2CMessage(params) {
             toAccount: fromAccount,
             fromAccount: outboundSender,
             ctx,
-            sendMediaOverride,
             mergeOnFlush: account.disableBlockStreaming,
         });
         log.debug(`[${outboundSessionKey}] 出站队列 session 已注册，msgId: ${msgId}`);
@@ -356,19 +318,13 @@ async function handleGroupMessage(params) {
     const senderNickname = msg.sender_nickname?.trim() || undefined;
     const outboundSender = resolveOutboundSenderAccount(account);
     const glog = createLog('inbound', ctx.log);
+    setGroupCode(groupCode);
     if (outboundSender && fromAccount === outboundSender) {
         glog.info('跳过机器人自身消息', { groupCode, fromAccount });
         return;
     }
     const { rawBody, isAtBot, medias, mentions } = extractTextFromMsgBody(ctx, msg.msg_body);
-    glog.info('收到群消息', {
-        user_input: rawBody,
-        groupCode,
-        fromAccount,
-        senderNickname,
-        msgSeq: msg.msg_seq,
-        isAtBot,
-    });
+    glog.info(`收到群消息 <- group:${groupCode}, from: ${fromAccount}${senderNickname ? `(${senderNickname})` : ''}, msgSeq: ${msg.msg_seq}, isAtBot: ${isAtBot}`);
     const quoteInfo = parseQuoteFromCloudCustomData(msg.cloud_custom_data);
     if (quoteInfo) {
         glog.info(`群消息检测到引用消息, 引用来自: ${quoteInfo.sender_nickname || quoteInfo.sender_id || 'unknown'}`);
@@ -566,11 +522,7 @@ async function handleGroupMessage(params) {
             glog.error('failed updating group session meta', { error: String(err) });
         },
     });
-    const tableMode = core.channel.text.resolveMarkdownTableMode({
-        cfg: config,
-        channel: 'yuanbao',
-        accountId: account.accountId,
-    });
+    const tableMode = 'off';
     const finalTextChunkLimit = core.channel.text.resolveTextChunkLimit(config, 'yuanbao', account.accountId, {
         fallbackLimit: YUANBAO_FINAL_TEXT_CHUNK_LIMIT,
     });
@@ -609,48 +561,6 @@ async function handleGroupMessage(params) {
     const groupMsgId = msg.msg_id ?? String(msg.msg_seq ?? '');
     const groupQueueManager = getOutboundQueue(account.accountId);
     if (groupQueueManager) {
-        const groupSendMediaOverride = async (url, fallbackText, mediaType, mediaLocalRoots) => {
-            if (mediaType === 'sticker') {
-                const sticker = await getCachedSticker(url);
-                if (!sticker) {
-                    return { ok: false, error: `sticker not found: ${url}` };
-                }
-                return sendStickerYuanbao({ account, config, wsClient: ctx.wsClient, toAccount: `group:${groupCode}`, sticker, refMsgId, core });
-            }
-            try {
-                logger.info('groupSendMediaOverride', { url, mediaLocalRoots });
-                const uploadResult = await downloadAndUploadMedia(url, core, account, mediaLocalRoots);
-                const mime = guessMimeType(uploadResult.filename);
-                const msgBody = mime.startsWith('image/')
-                    ? buildImageMsgBody({ url: uploadResult.url, filename: uploadResult.filename, size: uploadResult.size, uuid: uploadResult.uuid, imageInfo: uploadResult.imageInfo })
-                    : buildFileMsgBody({ url: uploadResult.url, filename: uploadResult.filename, size: uploadResult.size });
-                const result = await sendMsgBodyDirect({
-                    account,
-                    config,
-                    target: `group:${groupCode}`,
-                    msgBody: msgBody,
-                    wsClient: ctx.wsClient,
-                    core,
-                    refMsgId,
-                    refFromAccount: fromAccount,
-                });
-                return { ok: result.ok, error: result.error };
-            }
-            catch (err) {
-                const errMsg = err instanceof Error ? err.message : String(err);
-                glog.error(`群 sendMediaOverride 失败: ${errMsg}`);
-                const fallback = fallbackText ? `${fallbackText}\n${url}` : url;
-                return sendYuanbaoGroupMessage({
-                    account,
-                    groupCode,
-                    text: fallback,
-                    fromAccount: outboundSender,
-                    refMsgId,
-                    refFromAccount: fromAccount,
-                    ctx,
-                });
-            }
-        };
         groupQueueManager.registerSession(outboundGroupSessionKey, {
             msgId: groupMsgId,
             chatType: 'group',
@@ -661,7 +571,6 @@ async function handleGroupMessage(params) {
             refMsgId,
             refFromAccount: fromAccount,
             ctx,
-            sendMediaOverride: groupSendMediaOverride,
             mergeOnFlush: account.disableBlockStreaming,
         });
         glog.debug(`[${outboundGroupSessionKey}] 群出站队列 session 已注册，msgId: ${groupMsgId}`);

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

@@ -5,6 +5,7 @@ import { getMember } from '../module/member.js';
 import { YUANBAO_OVERFLOW_NOTICE_TEXT, } from './context.js';
 import { getOutboundQueue } from '../outbound-queue.js';
 import { InMemoryTtlDb } from '../utils/ttl-db.js';
+import { ChatType, getGroupCode, parseTarget } from '../targets.js';
 const firstReplyRefDb = new InMemoryTtlDb({
     ttlMs: 60 * 1000,
     maxKeys: 100,
@@ -104,37 +105,32 @@ export async function sendYuanbaoGroupMessage(params) {
 }
 export async function sendMsgBodyDirect(params) {
     const { account, config, target, msgBody, wsClient, core, refMsgId, refFromAccount } = params;
-    if (target?.startsWith('group:')) {
-        const groupCode = target.slice('group:'.length);
+    const { chatType, target: targetId } = parseTarget(target, account.accountId);
+    const minCtx = {
+        account,
+        config,
+        core,
+        log: { info: () => { }, warn: () => { }, error: () => { }, verbose: () => { } },
+        wsClient,
+        groupCode: getGroupCode(),
+    };
+    if (chatType === ChatType.GROUP) {
         return sendYuanbaoGroupMessageBody({
             account,
-            groupCode,
+            groupCode: targetId,
             msgBody,
             fromAccount: account.botId,
             refMsgId,
             refFromAccount,
-            ctx: {
-                account,
-                config,
-                core,
-                log: { info: () => { }, warn: () => { }, error: () => { }, verbose: () => { } },
-                wsClient,
-            },
+            ctx: minCtx,
         });
     }
-    const toAccount = target?.startsWith('direct:') ? target.slice('direct:'.length) : target;
     return sendYuanbaoMessageBody({
         account,
-        toAccount,
+        toAccount: targetId,
         msgBody,
         fromAccount: account.botId,
-        ctx: {
-            account,
-            config,
-            core,
-            log: { info: () => { }, warn: () => { }, error: () => { }, verbose: () => { } },
-            wsClient,
-        },
+        ctx: minCtx,
     });
 }
 export async function executeReply(params) {
@@ -151,7 +147,7 @@ export async function executeReply(params) {
         : null;
     const collectedTexts = [];
     let hasFinalInfo = false;
-    let hasQueuedContent = false;
+    let prevDeliverKind = null;
     await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
         ctx: ctxPayload,
         cfg: replyRuntime.config,
@@ -170,22 +166,24 @@ export async function executeReply(params) {
                     rlog.warn(`[${account.accountId}] 回复已中止，停止处理后续回复块`);
                     return;
                 }
+                rlog.info('[OpenClaw] 收到回复数据', { kind: info.kind, model_output: payload.text });
                 if (hasFinalInfo) {
                     rlog.warn(`[${account.accountId}] 出现多次final回复，忽略后续回复 ${payload.text}`);
                 }
                 if (info.kind === 'final') {
                     hasFinalInfo = true;
                 }
+                const prevKind = prevDeliverKind;
+                prevDeliverKind = info.kind;
                 const text = core.channel.text.convertMarkdownTables(payload.text ?? '', tableMode);
                 if (session) {
                     if (text.trim()) {
-                        hasQueuedContent = true;
-                        await session.push({ type: 'text', text });
+                        const isAfterToolCall = info.kind === 'block' && prevKind !== null && prevKind !== 'block';
+                        await session.push({ type: 'text', text: isAfterToolCall ? `\n\n${text}` : text });
                     }
                     const mediaUrls = payload.mediaUrls ?? [];
                     for (const mediaUrl of mediaUrls) {
                         if (mediaUrl) {
-                            hasQueuedContent = true;
                             await session.push({ type: 'media', mediaUrl });
                         }
                     }
@@ -206,8 +204,8 @@ export async function executeReply(params) {
         },
     });
     if (session) {
-        await session.flush();
-        if (!hasQueuedContent) {
+        const hasSentContent = await session.flush();
+        if (!hasSentContent) {
             const { fallbackReply } = account;
             if (fallbackReply) {
                 rlog.info(`[${L}] AI 未返回回复内容（队列模式），使用兜底回复`);

package/dist/src/message-tool/action-runtime.js

@@ -1,6 +1,8 @@
 import { searchStickers } from '../sticker/sticker-cache.js';
 import { getOutboundQueue } from '../outbound-queue.js';
 import { logger } from '../logger.js';
+import { getYuanbaoRuntime } from '../runtime.js';
+import { getGroupCode, parseTarget } from '../targets.js';
 function normalizeStickerSearchQuery(params) {
     const raw = params.query ?? params.keyword ?? params.q ?? params.text ?? params.search;
     if (typeof raw === 'string') {
@@ -47,14 +49,29 @@ export async function handleYuanbaoAction(action, params, context) {
                 return { ok: false, error: 'sticker_id is required' };
             }
             const queueManager = getOutboundQueue(context.account.accountId);
-            const toAccount = typeof params.to === 'string' && params.to.trim() ? params.to.trim() : context.toAccount;
-            const safeToAccount = toAccount.replace(/^user:/, 'direct:');
-            const session = queueManager?.getSession(safeToAccount);
+            const to = typeof params.to === 'string' && params.to.trim() ? params.to.trim() : context.toAccount;
+            const { chatType, target, sessionKey } = parseTarget(to, context.account.accountId);
+            const minCtx = {
+                account: context.account,
+                config: context.config,
+                core: getYuanbaoRuntime(),
+                log: { info: () => { }, warn: () => { }, error: () => { }, verbose: () => { } },
+                wsClient: context.wsClient,
+                groupCode: getGroupCode(),
+            };
+            const session = queueManager?.getOrCreateSession(sessionKey, {
+                chatType,
+                account: context.account,
+                target,
+                fromAccount: context.account.botId,
+                ctx: minCtx,
+            });
             if (!session) {
                 logger.debug(`sendMedia: 未找到已有 session，基于 to 创建新 session 作为 fallback: ${context.toAccount}`);
                 return { ok: false, error: `未找到已有 session，基于 to 创建新 session 作为 fallback: ${context.toAccount}` };
             }
             await session.push({ type: 'sticker', sticker_id: stickerId, text: '' });
+            await session.flush();
             return { ok: true };
         }
         default:

package/dist/src/message-tool/hints.js

@@ -3,5 +3,8 @@ export function buildMessageToolHints() {
         'Sticker/react/贴纸 fully supported, no extra setup. react = sticker = 发贴纸 (NOT a message reaction). Use sticker-search then sticker/react. No bare Unicode emoji.',
         'File/image sending is supported. Use media/mediaUrls with real URLs or absolute paths, not link-only text.',
         'IMPORTANT: When sending files, always use absolute paths (e.g. /tmp/file.md). Never use relative paths like "hello.md" — they will fail.',
+        '- Proactive `send` to another user: `to="<userId>"`.',
+        '- When asked to send a DM, extract the recipient and message from the user\'s request. If either is ambiguous, ask for clarification before calling the tool.',
+        '- To find a user\'s ID, use the query_session_members tool first, then pass the resolved ID to the message tool.',
     ];
 }

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

@@ -24,11 +24,15 @@ export type SendMediaFn = (mediaUrl: string, text?: string, mediaType?: 'image'
     ok: boolean;
     error?: string;
 }>;
+export type SendStickerFn = (stickerId: string, text?: string) => Promise<{
+    ok: boolean;
+    error?: string;
+}>;
 interface OutboundQueueSession {
     readonly strategy: OutboundQueueStrategy;
     readonly msgId: string;
     push(item: OutboundQueueItem): Promise<void>;
-    flush(): Promise<void>;
+    flush(): Promise<boolean>;
     abort(): void;
     emitReplyHeartbeat(heartbeat: WsHeartbeatValue): void;
 }
@@ -42,13 +46,20 @@ interface RegisterSessionOptions {
     ctx: MessageHandlerContext;
     msgId: string;
     toAccount?: string;
-    sendMediaOverride?: SendMediaFn;
     mergeOnFlush?: boolean;
 }
+export interface LightRegisterSessionOptions {
+    chatType: 'c2c' | 'group';
+    account: ResolvedYuanbaoAccount;
+    target: string;
+    fromAccount?: string;
+    ctx: MessageHandlerContext;
+}
 interface OutboundQueueManager {
     readonly strategy: OutboundQueueStrategy;
     registerSession(sessionKey: string, options: RegisterSessionOptions): OutboundQueueSession;
     getSession(sessionKey: string): OutboundQueueSession | null;
+    getOrCreateSession(sessionKey: string, options: LightRegisterSessionOptions): OutboundQueueSession;
     unregisterSession(sessionKey: string): void;
 }
 export interface OutboundQueueConfig {
@@ -60,6 +71,7 @@ export interface OutboundQueueConfig {
 export declare function initOutboundQueue(accountId: string, config: OutboundQueueConfig): OutboundQueueManager;
 export declare function getOutboundQueue(accountId: string): OutboundQueueManager | null;
 export declare function destroyOutboundQueue(accountId: string): void;
+export declare function endsWithTableRow(text: string): boolean;
 export declare function hasUnclosedFence(text: string): boolean;
 export declare function mergeBlockStreamingFences(buffer: string, incoming: string): string;
 export interface MergeTextOptions {
@@ -69,6 +81,7 @@ export interface MergeTextOptions {
 }
 declare function createMergeTextSession(callbacks: {
     sendText: SendTextFn;
+    sendSticker: SendStickerFn;
     sendMedia: SendMediaFn;
 }, msgId: string, sessionKey: string, onComplete: () => void, log: ModuleLog, opts: MergeTextOptions, heartbeatMeta: {
     ctx: MessageHandlerContext;

package/dist/src/outbound-queue.js

@@ -1,5 +1,9 @@
 import { createLog } from './logger.js';
-import { sendYuanbaoMessage, sendYuanbaoGroupMessage } from './message-handler/outbound.js';
+import { sendYuanbaoMessage, sendYuanbaoGroupMessage, sendMsgBodyDirect } from './message-handler/outbound.js';
+import { getCachedSticker } from './sticker/sticker-cache.js';
+import { sendStickerYuanbao } from './sticker/sticker-sender.js';
+import { getYuanbaoRuntime } from './runtime.js';
+import { buildFileMsgBody, buildImageMsgBody, downloadAndUploadMedia, guessMimeType } from './media.js';
 import { createReplyHeartbeatController } from './module/reply-heartbeat.js';
 const activeManagers = new Map();
 export function initOutboundQueue(accountId, config) {
@@ -31,12 +35,13 @@ function defaultChunkText(text, max) {
 function createManager(config) {
     const { strategy } = config;
     const mergeTextOpts = {
-        minChars: config.minChars ?? 2500,
+        minChars: config.minChars ?? 2800,
         maxChars: config.maxChars ?? 3000,
         chunkText: config.chunkText ?? defaultChunkText,
     };
     const sessions = new Map();
     const log = createLog('outbound-queue');
+    const core = getYuanbaoRuntime();
     return {
         strategy,
         registerSession(sessionKey, options) {
@@ -46,10 +51,11 @@ function createManager(config) {
                 existing.abort();
             }
             const onComplete = () => sessions.delete(sessionKey);
-            const { chatType, account, target, fromAccount, refMsgId, refFromAccount, ctx, msgId, sendMediaOverride, mergeOnFlush, toAccount, } = options;
+            const { chatType, account, target, fromAccount, refMsgId, refFromAccount, ctx, msgId, mergeOnFlush, toAccount, } = options;
             const heartbeatTarget = (toAccount ?? (chatType === 'c2c' ? target : '')).trim();
             const heartbeatGroupCode = chatType === 'group' ? target : undefined;
             const sendText = async (text) => {
+                log.info('sendText', { chatType, fromAccount, target });
                 try {
                     const result = chatType === 'group'
                         ? await sendYuanbaoGroupMessage({
@@ -65,16 +71,82 @@ function createManager(config) {
                     return { ok: result.ok, error: result.error };
                 }
                 catch (err) {
-                    return { ok: false, error: err instanceof Error ? err.message : String(err) };
+                    const errMsg = err instanceof Error ? err.message : String(err);
+                    log.error(`sendText failed: ${errMsg}`, { chatType, fromAccount, target });
+                    return { ok: false, error: errMsg };
+                }
+            };
+            const sendSticker = async (id) => {
+                log.info('sendSticker', { chatType, fromAccount, target });
+                try {
+                    const sticker = getCachedSticker(id);
+                    if (!sticker) {
+                        return { ok: false, error: `sticker not found: ${id}` };
+                    }
+                    const result = await sendStickerYuanbao({
+                        account,
+                        config,
+                        wsClient: ctx.wsClient,
+                        toAccount: chatType === 'group' ? `group:${target}` : target,
+                        sticker,
+                        core,
+                        refMsgId,
+                    });
+                    return { ok: result.ok, error: result.error };
+                }
+                catch (e) {
+                    const errMsg = e instanceof Error ? e.message : String(e);
+                    log.error(`sendSticker failed: ${errMsg}`, { chatType, fromAccount, target });
+                    return { ok: false, error: errMsg };
+                }
+            };
+            const sendMedia = async (url, fallbackText) => {
+                log.info('sendMedia', { chatType, fromAccount, target });
+                const isGroup = chatType === 'group';
+                try {
+                    const uploadResult = await downloadAndUploadMedia(url, core, account);
+                    const mime = guessMimeType(uploadResult.filename);
+                    const msgBody = mime.startsWith('image/')
+                        ? buildImageMsgBody({ url: uploadResult.url, filename: uploadResult.filename, size: uploadResult.size, uuid: uploadResult.uuid, imageInfo: uploadResult.imageInfo })
+                        : buildFileMsgBody({ url: uploadResult.url, filename: uploadResult.filename, size: uploadResult.size, uuid: uploadResult.uuid });
+                    const result = await sendMsgBodyDirect({
+                        account,
+                        config,
+                        target: isGroup ? `group:${target}` : target,
+                        msgBody: msgBody,
+                        wsClient: ctx.wsClient,
+                        core,
+                        ...(isGroup ? { refMsgId, refFromAccount } : {}),
+                    });
+                    return { ok: result.ok, error: result.error };
+                }
+                catch (err) {
+                    const errMsg = err instanceof Error ? err.message : String(err);
+                    log.error(`sendMedia failed: ${errMsg}`, { chatType, fromAccount, target });
+                    const fallback = fallbackText ? `${fallbackText}\n${url}` : url;
+                    return isGroup
+                        ? sendYuanbaoGroupMessage({
+                            account,
+                            groupCode: target,
+                            text: fallback,
+                            fromAccount: fromAccount || account.botId,
+                            refMsgId,
+                            refFromAccount,
+                            ctx,
+                        })
+                        : sendYuanbaoMessage({
+                            account,
+                            toAccount: target,
+                            text: fallback,
+                            fromAccount: fromAccount || account.botId,
+                            ...(isGroup ? { refMsgId, refFromAccount } : {}),
+                            ctx,
+                        });
                 }
             };
-            const sendMedia = sendMediaOverride ?? (async (mediaUrl, text) => {
-                const fallbackText = text ? `${text}\n${mediaUrl}` : mediaUrl;
-                return sendText(fallbackText);
-            });
             let session;
             if (mergeOnFlush) {
-                session = createMergeOnFlushSession({ sendText, sendMedia }, msgId, onComplete, log, {
+                session = createMergeOnFlushSession({ sendText, sendSticker, sendMedia }, msgId, onComplete, log, {
                     ctx,
                     account,
                     toAccount: heartbeatTarget,
@@ -84,7 +156,7 @@ function createManager(config) {
             else {
                 switch (strategy) {
                     case 'immediate':
-                        session = createImmediateSession({ sendText, sendMedia }, msgId, onComplete, log, {
+                        session = createImmediateSession({ sendText, sendSticker, sendMedia }, msgId, onComplete, log, {
                             ctx,
                             account,
                             toAccount: heartbeatTarget,
@@ -92,7 +164,7 @@ function createManager(config) {
                         });
                         break;
                     case 'merge-text':
-                        session = createMergeTextSession({ sendText, sendMedia }, msgId, sessionKey, onComplete, log, mergeTextOpts, {
+                        session = createMergeTextSession({ sendText, sendSticker, sendMedia }, msgId, sessionKey, onComplete, log, mergeTextOpts, {
                             ctx,
                             account,
                             toAccount: heartbeatTarget,
@@ -110,15 +182,27 @@ function createManager(config) {
         getSession(sessionKey) {
             return sessions.get(sessionKey) ?? null;
         },
+        getOrCreateSession(sessionKey, options) {
+            log.info(`[${sessionKey}:${options.target}] 获取或创建会话队列`);
+            const existing = sessions.get(sessionKey);
+            if (existing)
+                return existing;
+            log.debug(`[${sessionKey}] 自动创建轻量 session（委托 registerSession）`);
+            return this.registerSession(sessionKey, {
+                ...options,
+                msgId: `auto-${Date.now()}`,
+            });
+        },
         unregisterSession(sessionKey) {
             sessions.delete(sessionKey);
         },
     };
 }
 function createImmediateSession(callbacks, msgId, onComplete, log, heartbeatMeta) {
-    const { sendText, sendMedia } = callbacks;
+    const { sendText, sendSticker, sendMedia } = callbacks;
     let aborted = false;
     let sendChain = Promise.resolve();
+    let hasSentContent = false;
     const replyHeartbeat = createReplyHeartbeatController({ meta: heartbeatMeta });
     return {
         strategy: 'immediate',
@@ -129,23 +213,26 @@ function createImmediateSession(callbacks, msgId, onComplete, log, heartbeatMeta
             sendChain = sendChain.then(async () => {
                 if (aborted)
                     return;
+                let result;
                 if (item.type === 'text') {
                     if (!item.text.trim())
                         return;
-                    const result = await sendText(item.text);
+                    result = await sendText(item.text);
                     if (!result.ok) {
                         log.error(`immediate 发送文本失败: ${result.error}`);
                     }
                     else {
+                        hasSentContent = true;
                         replyHeartbeat.onReplySent();
                     }
                 }
                 else if (item.type === 'sticker') {
-                    const result = await sendMedia(item.sticker_id, item.text, 'sticker');
+                    const result = await sendSticker(item.sticker_id, item.text);
                     if (!result.ok) {
                         log.error(`immediate 发送表情失败: ${result.error}`);
                     }
                     else {
+                        hasSentContent = true;
                         replyHeartbeat.onReplySent();
                     }
                 }
@@ -155,9 +242,11 @@ function createImmediateSession(callbacks, msgId, onComplete, log, heartbeatMeta
                         log.error(`immediate 发送媒体失败: ${result.error}`);
                     }
                     else {
+                        hasSentContent = true;
                         replyHeartbeat.onReplySent();
                     }
                 }
+                return result;
             });
             return sendChain;
         },
@@ -165,6 +254,7 @@ function createImmediateSession(callbacks, msgId, onComplete, log, heartbeatMeta
             await sendChain;
             replyHeartbeat.stop();
             onComplete();
+            return hasSentContent;
         },
         abort() {
             aborted = true;
@@ -177,10 +267,12 @@ function createImmediateSession(callbacks, msgId, onComplete, log, heartbeatMeta
     };
 }
 function createMergeOnFlushSession(callbacks, msgId, onComplete, log, heartbeatMeta) {
-    const { sendText, sendMedia } = callbacks;
+    const { sendText, sendSticker, sendMedia } = callbacks;
     let aborted = false;
     const collectedTexts = [];
+    const collectedStickers = [];
     const collectedMedias = [];
+    let hasSentContent = false;
     const replyHeartbeat = createReplyHeartbeatController({ meta: heartbeatMeta });
     return {
         strategy: 'immediate',
@@ -193,7 +285,7 @@ function createMergeOnFlushSession(callbacks, msgId, onComplete, log, heartbeatM
                     collectedTexts.push(item.text);
             }
             else if (item.type === 'sticker') {
-                collectedMedias.push({ mediaUrl: item.sticker_id, text: item.text, mediaType: 'sticker' });
+                collectedStickers.push({ stickerId: item.sticker_id, text: item.text });
             }
             else {
                 collectedMedias.push({ mediaUrl: item.mediaUrl, text: item.text, mediaLocalRoots: item.mediaLocalRoots });
@@ -202,7 +294,7 @@ function createMergeOnFlushSession(callbacks, msgId, onComplete, log, heartbeatM
         },
         async flush() {
             if (aborted)
-                return;
+                return hasSentContent;
             if (collectedTexts.length > 0) {
                 const merged = collectedTexts.join('\n\n');
                 collectedTexts.length = 0;
@@ -212,10 +304,22 @@ function createMergeOnFlushSession(callbacks, msgId, onComplete, log, heartbeatM
                         log.error(`mergeOnFlush 发送合并文本失败: ${result.error}`);
                     }
                     else {
+                        hasSentContent = true;
                         replyHeartbeat.onReplySent();
                     }
                 }
             }
+            for (const sticker of collectedStickers) {
+                if (aborted)
+                    break;
+                const result = await sendSticker(sticker.stickerId, sticker.text);
+                if (!result.ok) {
+                    log.error(`mergeOnFlush 发送表情失败: ${result.error}`);
+                }
+                else {
+                    hasSentContent = true;
+                }
+            }
             for (const media of collectedMedias) {
                 if (aborted)
                     break;
@@ -224,12 +328,16 @@ function createMergeOnFlushSession(callbacks, msgId, onComplete, log, heartbeatM
                     log.error(`mergeOnFlush 发送媒体失败: ${result.error}`);
                 }
                 else {
+                    hasSentContent = true;
                     replyHeartbeat.onReplySent();
                 }
             }
+            collectedTexts.length = 0;
             collectedMedias.length = 0;
+            collectedStickers.length = 0;
             replyHeartbeat.stop();
             onComplete();
+            return hasSentContent;
         },
         abort() {
             aborted = true;
@@ -243,6 +351,14 @@ function createMergeOnFlushSession(callbacks, msgId, onComplete, log, heartbeatM
         },
     };
 }
+export function endsWithTableRow(text) {
+    const trimmed = text.trimEnd();
+    if (!trimmed)
+        return false;
+    const lastLine = trimmed.split('\n').at(-1) ?? '';
+    const line = lastLine.trim();
+    return line.startsWith('|') && line.endsWith('|');
+}
 export function hasUnclosedFence(text) {
     let inFence = false;
     for (const line of text.split('\n')) {
@@ -264,11 +380,12 @@ export function mergeBlockStreamingFences(buffer, incoming) {
     return `${buffer}${normalized}`;
 }
 function createMergeTextSession(callbacks, msgId, sessionKey, onComplete, log, opts, heartbeatMeta) {
-    const { sendText, sendMedia } = callbacks;
-    const { maxChars, chunkText } = opts;
+    const { sendText, sendSticker, sendMedia } = callbacks;
+    const { minChars, maxChars, chunkText } = opts;
     let aborted = false;
     let textBuffer = '';
     let sendChain = Promise.resolve();
+    let hasSentContent = false;
     const replyHeartbeat = createReplyHeartbeatController({ meta: heartbeatMeta });
     async function drainBuffer(force) {
         if (textBuffer.length === 0)
@@ -280,13 +397,21 @@ function createMergeTextSession(callbacks, msgId, sessionKey, onComplete, log, o
                 log.debug(`[${sessionKey}] drainBuffer: single chunk has unclosed fence, keeping in buffer (bufLen=${textBuffer.length})`);
                 return;
             }
+            if (!force && chunks.length === 1 && endsWithTableRow(chunks[0])) {
+                log.debug(`[${sessionKey}] drainBuffer: single chunk ends with table row, keeping in buffer for continuation (bufLen=${textBuffer.length})`);
+                return;
+            }
+            if (!force && chunks.length === 1 && textBuffer.length < minChars) {
+                log.debug(`[${sessionKey}] drainBuffer: bufLen=${textBuffer.length} < minChars=${minChars}, waiting for more content`);
+                return;
+            }
             textBuffer = '';
             for (const chunk of chunks) {
                 if (aborted)
                     return;
                 if (!chunk.trim())
                     continue;
-                log.debug(`[${sessionKey}] emit chunk(force=${force}): len=${chunk.length} head=${JSON.stringify(chunk.slice(0, 5))} tail=${JSON.stringify(chunk.slice(-5))}`);
+                log.debug(`[${sessionKey}] emit chunk(force=${force}): len=${chunk.length} head=${JSON.stringify(chunk.slice(0, 3))} tail=${JSON.stringify(chunk.slice(-3))}`);
                 const result = await sendText(chunk);
                 if (!result.ok)
                     log.error(`[${sessionKey}] send failed: ${result.error}`);
@@ -301,12 +426,13 @@ function createMergeTextSession(callbacks, msgId, sessionKey, onComplete, log, o
                     return;
                 if (!chunk.trim())
                     continue;
-                log.debug(`[${sessionKey}] emit chunk(split): len=${chunk.length} head=${JSON.stringify(chunk.slice(0, 5))} tail=${JSON.stringify(chunk.slice(-5))}`);
+                log.debug(`[${sessionKey}] emit chunk(split): len=${chunk.length} head=${JSON.stringify(chunk.slice(0, 3))} tail=${JSON.stringify(chunk.slice(-3))}`);
                 const result = await sendText(chunk);
                 if (!result.ok) {
                     log.error(`[${sessionKey}] merge-text send failed: ${result.error}`);
                 }
                 else {
+                    hasSentContent = true;
                     replyHeartbeat.onReplySent();
                 }
             }
@@ -324,9 +450,21 @@ function createMergeTextSession(callbacks, msgId, sessionKey, onComplete, log, o
                 if (item.type === 'text') {
                     if (!item.text.trim())
                         return;
-                    textBuffer = textBuffer ? `${textBuffer}${item.text}` : item.text;
-                    textBuffer = textBuffer.replace(/\n`{6}([^\n]*)\n/g, '\n');
+                    if (textBuffer) {
+                        const incoming = hasUnclosedFence(textBuffer) && item.text.startsWith('\n\n')
+                            ? item.text.slice(2)
+                            : item.text;
+                        const SENTENCE_END_RE = /[。？！：]\s*$/;
+                        const needsSeparator = SENTENCE_END_RE.test(textBuffer)
+                            && !hasUnclosedFence(textBuffer)
+                            && !endsWithTableRow(textBuffer);
+                        textBuffer = mergeBlockStreamingFences(needsSeparator ? `${textBuffer}\n\n` : textBuffer, incoming);
+                    }
+                    else {
+                        textBuffer = item.text;
+                    }
                     log.debug(`[${sessionKey}] merge-text push: bufLen=${textBuffer.length}`);
+                    hasSentContent = true;
                     await drainBuffer(false);
                 }
                 else {
@@ -338,7 +476,7 @@ function createMergeTextSession(callbacks, msgId, sessionKey, onComplete, log, o
                         return;
                     let result;
                     if (item.type === 'sticker') {
-                        result = await sendMedia(item.sticker_id, item.text, 'sticker');
+                        result = await sendSticker(item.sticker_id, item.text);
                     }
                     else {
                         result = await sendMedia(item.mediaUrl, item.text, 'image', item.mediaLocalRoots);
@@ -347,6 +485,7 @@ function createMergeTextSession(callbacks, msgId, sessionKey, onComplete, log, o
                         log.error(`[${sessionKey}] merge-text send failed: ${result.error}`);
                     }
                     else {
+                        hasSentContent = true;
                         replyHeartbeat.onReplySent();
                     }
                 }
@@ -357,10 +496,11 @@ function createMergeTextSession(callbacks, msgId, sessionKey, onComplete, log, o
             log.debug(`[${sessionKey}] merge-text session flush: bufLen=${textBuffer.length}`);
             await sendChain;
             if (aborted)
-                return;
+                return hasSentContent;
             await drainBuffer(true);
             replyHeartbeat.stop();
             onComplete();
+            return hasSentContent;
         },
         abort() {
             const bufLen = textBuffer.length;

package/dist/src/targets.d.ts

@@ -0,0 +1,13 @@
+export declare function setGroupCode(code: string): void;
+export declare function getGroupCode(): string;
+export declare function looksLikeYuanbaoId(raw: string): boolean;
+export declare enum ChatType {
+    C2C = "c2c",
+    GROUP = "group"
+}
+export interface MessagingTarget {
+    chatType: ChatType;
+    target: string;
+    sessionKey: string;
+}
+export declare function parseTarget(to: string, accountId?: string): MessagingTarget;

package/dist/src/targets.js

@@ -0,0 +1,47 @@
+import { resolveUsername } from './dm/directory.js';
+let groupCode = '';
+export function setGroupCode(code) {
+    groupCode = code;
+}
+export function getGroupCode() {
+    if (!groupCode) {
+        throw new Error('GroupCode not initialized');
+    }
+    return groupCode;
+}
+export function looksLikeYuanbaoId(raw) {
+    const trimmed = raw.trim();
+    if (trimmed.length < 16) {
+        return false;
+    }
+    if (trimmed.length % 4 !== 0) {
+        return false;
+    }
+    if (!/^[A-Za-z0-9+/=]+$/.test(trimmed)) {
+        return false;
+    }
+    const equalsIndex = trimmed.indexOf('=');
+    if (equalsIndex !== -1) {
+        if (equalsIndex < trimmed.length - 2 || trimmed.slice(equalsIndex).match(/[^=]/)) {
+            return false;
+        }
+    }
+    return true;
+}
+export var ChatType;
+(function (ChatType) {
+    ChatType["C2C"] = "c2c";
+    ChatType["GROUP"] = "group";
+})(ChatType || (ChatType = {}));
+export function parseTarget(to, accountId = 'default') {
+    to = to.trim().replace(/^yuanbao:/, '');
+    if (to.startsWith('group:')) {
+        return { chatType: ChatType.GROUP, target: to.slice('group:'.length), sessionKey: to };
+    }
+    to = to.replace(/^user:/, '').replace(/^direct:/, '');
+    if (!looksLikeYuanbaoId(to)) {
+        const { userId } = resolveUsername(to, accountId, groupCode) || { userId: to };
+        return { chatType: ChatType.C2C, target: userId, sessionKey: `direct:${userId}` };
+    }
+    return { chatType: ChatType.C2C, target: to, sessionKey: `direct:${to}` };
+}

package/dist/src/tools/member.js

@@ -10,6 +10,7 @@ const USER_TYPE_LABEL = {
 function toMembers(records) {
     return records.map(u => ({
         nickname: u.nickName,
+        userId: u.userId,
         ...(u.userType !== undefined ? { role: USER_TYPE_LABEL[u.userType] ?? `type_${u.userType}` } : {}),
     }));
 }

package/openclaw.plugin.json

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

package/package.json

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