openclaw-plugin-yuanbao 2.0.0 → 2.0.1

package/dist/openclaw.plugin.json

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

package/dist/src/channel.js

@@ -8,8 +8,8 @@ import { startYuanbaoWsGateway, getActiveWsClient } from './yuanbao-server/ws/in
 import { getYuanbaoRuntime } from './runtime.js';
 import { sendYuanbaoMessage, sendYuanbaoGroupMessage } from './message-handler/index.js';
 import { initOutboundQueue, destroyOutboundQueue, getOutboundQueue } from './outbound-queue.js';
-import { parseTarget, looksLikeYuanbaoId, sendDM, resolveUsername, } from './dm/index.js';
-import { yuanbaoMessageActions } from './channel-actions.js';
+import { parseTarget, sendDM, } from './dm/index.js';
+import { yuanbaoMessageActions } from './message-tool/index.js';
 function toChannelResult(result) {
     return {
         channel: 'yuanbao',
@@ -31,6 +31,9 @@ async function sendTextToTarget(account, target, text, wsClient) {
     if (target.startsWith('group:')) {
         return sendYuanbaoGroupMessage({ account, groupCode: target.slice('group:'.length), 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 });
 }
 const meta = {
@@ -142,34 +145,8 @@ export const yuanbaoPlugin = {
     messaging: {
         normalizeTarget: normalizeYuanbaoMessagingTarget,
         targetResolver: {
-            looksLikeId: (raw, normalized) => {
-                const trimmed = raw.trim();
-                const norm = normalized?.trim() ?? trimmed;
-                return looksLikeYuanbaoId(trimmed)
-                    || trimmed.startsWith('user:')
-                    || trimmed.startsWith('group:')
-                    || trimmed.startsWith('@')
-                    || looksLikeYuanbaoId(norm)
-                    || norm.startsWith('user:')
-                    || norm.startsWith('group:')
-                    || norm.startsWith('@');
-            },
-            hint: '<user:ID | @username | group:groupId>',
-            async resolveTarget({ input, accountId }) {
-                const target = parseTarget(input);
-                if (!target)
-                    return null;
-                if (target.kind === 'user') {
-                    if (!looksLikeYuanbaoId(target.id)) {
-                        const resolved = resolveUsername(target.id, accountId);
-                        if (!resolved)
-                            return null;
-                        return { to: `user:${resolved.id}`, kind: 'user', display: resolved.name };
-                    }
-                    return { to: `user:${target.id}`, kind: 'user' };
-                }
-                return { to: `group:${target.id}`, kind: target.kind };
-            },
+            looksLikeId: raw => Boolean(raw.trim()),
+            hint: '<userid> or group:<groupcode>',
         },
     },
     outbound: {
@@ -177,7 +154,8 @@ export const yuanbaoPlugin = {
         chunkerMode: 'text',
         textChunkLimit: 3000,
         chunker: (text, limit) => getYuanbaoRuntime()?.channel.text.chunkMarkdownText(text, limit) ?? [text],
-        sendText: async ({ cfg, to, text, accountId }) => {
+        sendText: async ({ cfg, to: _to, text, accountId }) => {
+            const to = _to.replace(/^yuanbao:/, '');
             const account = resolveYuanbaoAccount({ cfg, accountId: accountId ?? undefined });
             const dmTarget = parseTarget(to);
             if (dmTarget?.kind === 'user') {
@@ -197,7 +175,8 @@ export const yuanbaoPlugin = {
             }
             const queueManager = getOutboundQueue(account.accountId);
             if (queueManager) {
-                const session = queueManager.getSession(to);
+                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: '' };
@@ -206,7 +185,8 @@ export const yuanbaoPlugin = {
             }
             return toChannelResult(await sendTextToTarget(account, to, text, wsClient));
         },
-        sendMedia: async ({ cfg, accountId, to, mediaUrl, text }) => {
+        sendMedia: async ({ cfg, accountId, to: _to, mediaUrl, text }) => {
+            const to = _to.replace(/^yuanbao:/, '');
             const account = resolveYuanbaoAccount({ cfg, accountId: accountId ?? undefined });
             const wsClient = getActiveWsClient(account.accountId);
             if (!wsClient) {
@@ -217,7 +197,8 @@ export const yuanbaoPlugin = {
             }
             const queueManager = getOutboundQueue(account.accountId);
             if (queueManager) {
-                const session = queueManager.getSession(to);
+                const safeTo = to.replace(/^user:/, 'direct:');
+                const session = queueManager.getSession(safeTo);
                 if (session) {
                     await session.push({ type: 'text', text });
                     await session.push({ type: 'media', mediaUrl });

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

@@ -23,7 +23,8 @@ export function supportsAction(action) {
     return action === 'send';
 }
 export async function handleAction(ctx) {
-    if (ctx.action !== 'send') {
+    if (ctx.action !== 'send'
+        || !ctx.toolContext?.currentChannelId.includes('group:')) {
         return null;
     }
     const log = createLog('dm:action');
@@ -51,6 +52,7 @@ export async function handleAction(ctx) {
         });
     }
     if (target.kind === 'user') {
+        console.log('handleAction DM', ctx);
         const senderId = ctx.requesterSenderId ?? '';
         const accessResult = enforceDMAccess(senderId, target.id, message.length, DEFAULT_DM_ACCESS_POLICY);
         if (!accessResult.allowed) {

package/dist/src/message-handler/callbacks/recall.d.ts

@@ -0,0 +1,4 @@
+import type { YuanbaoInboundMessage } from '../../types.js';
+import type { MessageHandlerContext } from '../context.js';
+export declare function handleGroupRecall(ctx: MessageHandlerContext, msg: YuanbaoInboundMessage): void;
+export declare function handleC2CRecall(ctx: MessageHandlerContext, msg: YuanbaoInboundMessage): void;

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

@@ -0,0 +1,90 @@
+import { chatHistories } from '../chat-history.js';
+import { createLog } from '../../logger.js';
+function enqueueRecallSystemEvent(params) {
+    const { core, sessionKey, conversationId, messageId } = params;
+    const eventText = [
+        `[yuanbao] One historical user message was recalled; only message_id="${messageId}" is void (not necessarily the latest turn).`,
+        'Do not quote or ground on it; ignore stale transcript for that id. Keep past assistant replies; no tool rollback.',
+    ].join('\n');
+    core.system.enqueueSystemEvent(eventText, {
+        sessionKey,
+        contextKey: `yuanbao:recall:${conversationId}:${messageId}`,
+    });
+}
+export function handleGroupRecall(ctx, msg) {
+    const { core, account } = ctx;
+    const log = createLog('recall', ctx.log);
+    const groupCode = msg.group_code?.trim() || 'unknown';
+    const seqList = msg.recall_msg_seq_list;
+    if (!seqList || seqList.length === 0) {
+        log.warn('[recall] group msg_seq_list 为空，跳过');
+        return;
+    }
+    const route = core.channel.routing.resolveAgentRoute({
+        cfg: ctx.config,
+        channel: 'yuanbao',
+        accountId: account.accountId,
+        peer: { kind: 'group', id: groupCode },
+    });
+    const where = msg.group_name
+        ? `group "${msg.group_name}" (${groupCode})`
+        : `group ${groupCode}`;
+    for (const seq of seqList) {
+        const messageId = seq.msg_id || String(seq.msg_seq ?? '');
+        if (!messageId)
+            continue;
+        const history = chatHistories.get(groupCode);
+        const idx = history
+            ? history.findIndex(e => e.messageId === messageId)
+            : -1;
+        if (history && idx !== -1) {
+            history.splice(idx, 1);
+            log.info(`[recall] 群消息 ${messageId} 已从 history 删除（未被 AI 消费）`, { groupCode });
+        }
+        else {
+            log.info(`[recall] 群消息 ${messageId} 不在 history，注入系统事件`, {
+                groupCode,
+            });
+            enqueueRecallSystemEvent({
+                core,
+                sessionKey: route.sessionKey,
+                conversationId: groupCode,
+                where,
+                messageId,
+            });
+        }
+    }
+}
+export function handleC2CRecall(ctx, msg) {
+    const { core, account } = ctx;
+    const log = createLog('recall', ctx.log);
+    const fromAccount = msg.from_account?.trim() || 'unknown';
+    const seqList = msg.msg_id
+        ? [{ msg_id: msg.msg_id, msg_seq: msg.msg_seq }]
+        : [];
+    if (!seqList || seqList.length === 0) {
+        log.warn('[recall] c2c msg_seq_list 为空，跳过');
+        return;
+    }
+    const route = core.channel.routing.resolveAgentRoute({
+        cfg: ctx.config,
+        channel: 'yuanbao',
+        accountId: account.accountId,
+        peer: { kind: 'direct', id: fromAccount },
+    });
+    for (const seq of seqList) {
+        const messageId = seq.msg_id || String(seq.msg_seq ?? '');
+        if (!messageId)
+            continue;
+        log.info(`[recall] C2C 消息 ${messageId} 被撤回，注入系统事件`, {
+            fromAccount,
+        });
+        enqueueRecallSystemEvent({
+            core,
+            sessionKey: route.sessionKey,
+            conversationId: fromAccount,
+            where: `direct chat with ${fromAccount}`,
+            messageId,
+        });
+    }
+}

package/dist/src/message-handler/chat-history.d.ts

@@ -0,0 +1,19 @@
+import type { HistoryEntry } from 'openclaw/plugin-sdk/reply-history';
+export type GroupHistoryEntry = HistoryEntry & {
+    medias?: Array<{
+        url: string;
+        mediaName?: string;
+    }>;
+};
+export type MediaHistoryEntry = {
+    sender: string;
+    messageId?: string;
+    timestamp: number;
+    medias: Array<{
+        url: string;
+        mediaName?: string;
+    }>;
+};
+export declare const chatHistories: Map<string, GroupHistoryEntry[]>;
+export declare const chatMediaHistories: Map<string, MediaHistoryEntry[]>;
+export declare function recordMediaHistory(groupCode: string, entry: MediaHistoryEntry): void;

package/dist/src/message-handler/chat-history.js

@@ -0,0 +1,16 @@
+export const chatHistories = new Map();
+const MEDIA_HISTORY_MAX_PER_GROUP = 50;
+export const chatMediaHistories = new Map();
+export function recordMediaHistory(groupCode, entry) {
+    if (entry.medias.length === 0)
+        return;
+    let list = chatMediaHistories.get(groupCode);
+    if (!list) {
+        list = [];
+        chatMediaHistories.set(groupCode, list);
+    }
+    list.push(entry);
+    if (list.length > MEDIA_HISTORY_MAX_PER_GROUP) {
+        list.splice(0, list.length - MEDIA_HISTORY_MAX_PER_GROUP);
+    }
+}

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

@@ -32,7 +32,6 @@ export function buildMsgBody(msgType, data) {
     const handler = handlerMap.get(msgType);
     return handler?.buildMsgBody?.(data);
 }
-const INLINE_IMAGE_RE = /!\[([^\]]*)\]\(([^)]+)\)/g;
 const AT_USER_RE = /(?<=\s|^)@(\S+?)(?=\s|$)/g;
 function resolveAtMentions(text, groupCode, memberInst) {
     const items = [];
@@ -77,20 +76,8 @@ export function prepareOutboundContent(text, groupCode, memberInst) {
     if (!text)
         return [];
     const items = [];
-    let lastIndex = 0;
-    for (const match of text.matchAll(INLINE_IMAGE_RE)) {
-        const matchStart = match.index;
-        if (matchStart > lastIndex) {
-            const before = text.slice(lastIndex, matchStart).trim();
-            if (before) {
-                items.push(...resolveAtMentions(before, groupCode, memberInst));
-            }
-        }
-        items.push({ type: 'image', url: match[2] });
-        lastIndex = matchStart + match[0].length;
-    }
-    if (lastIndex < text.length) {
-        const trailing = text.slice(lastIndex).trim();
+    if (text.length) {
+        const trailing = text.trim();
         if (trailing) {
             items.push(...resolveAtMentions(trailing, groupCode, memberInst));
         }

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

@@ -1,5 +1,6 @@
 import type { YuanbaoInboundMessage } from '../types.js';
 import type { MessageHandlerContext } from './context.js';
+import './callbacks/recall.js';
 export declare function handleInboundMessage(params: {
     ctx: MessageHandlerContext;
     msg: YuanbaoInboundMessage;

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

@@ -11,22 +11,9 @@ 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';
-const chatHistories = new Map();
-const MEDIA_HISTORY_MAX_PER_GROUP = 50;
-const chatMediaHistories = new Map();
-function recordMediaHistory(groupCode, entry) {
-    if (entry.medias.length === 0)
-        return;
-    let list = chatMediaHistories.get(groupCode);
-    if (!list) {
-        list = [];
-        chatMediaHistories.set(groupCode, list);
-    }
-    list.push(entry);
-    if (list.length > MEDIA_HISTORY_MAX_PER_GROUP) {
-        list.splice(0, list.length - MEDIA_HISTORY_MAX_PER_GROUP);
-    }
-}
+import { dispatchSystemCallback } from './system-callbacks.js';
+import { chatHistories, chatMediaHistories, recordMediaHistory, } from './chat-history.js';
+import './callbacks/recall.js';
 const conversationQueues = new Map();
 function enqueueForConversation(key, task) {
     const prev = conversationQueues.get(key) ?? Promise.resolve();
@@ -577,6 +564,8 @@ async function handleGroupMessage(params) {
 }
 export async function handleInboundMessage(params) {
     const { ctx, msg, chatType } = params;
+    if (dispatchSystemCallback({ ctx, msg, chatType }))
+        return;
     const convKey = chatType === 'group'
         ? `group:${ctx.account.accountId}:${msg.group_code?.trim() || 'unknown'}`
         : `c2c:${ctx.account.accountId}:${msg.from_account?.trim() || 'unknown'}`;

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

@@ -3,5 +3,7 @@ export { extractTextFromMsgBody } from './extract.js';
 export type { ExtractTextFromMsgBodyResult } from './extract.js';
 export { sendYuanbaoMessage, sendYuanbaoGroupMessage, sendMsgBodyDirect, } from './outbound.js';
 export { handleInboundMessage } from './inbound.js';
+export { registerSystemCallback } from './system-callbacks.js';
+export type { SystemCallbackHandler, SystemCallbackParams } from './system-callbacks.js';
 export { getHandler, getAllHandlers, buildMsgBody, prepareOutboundContent, buildOutboundMsgBody, buildAtUserMsgBodyItem, textHandler, customHandler, imageHandler, soundHandler, fileHandler, videoHandler, } from './handlers/index.js';
 export type { MessageElemHandler, MsgBodyItemType, MediaItem, OutboundContentItem } from './handlers/index.js';

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

@@ -1,4 +1,5 @@
 export { extractTextFromMsgBody } from './extract.js';
 export { sendYuanbaoMessage, sendYuanbaoGroupMessage, sendMsgBodyDirect, } from './outbound.js';
 export { handleInboundMessage } from './inbound.js';
+export { registerSystemCallback } from './system-callbacks.js';
 export { getHandler, getAllHandlers, buildMsgBody, prepareOutboundContent, buildOutboundMsgBody, buildAtUserMsgBodyItem, textHandler, customHandler, imageHandler, soundHandler, fileHandler, videoHandler, } from './handlers/index.js';

package/dist/src/message-handler/system-callbacks.d.ts

@@ -0,0 +1,10 @@
+import type { YuanbaoInboundMessage } from '../types.js';
+import type { MessageHandlerContext } from './context.js';
+export type SystemCallbackParams = {
+    ctx: MessageHandlerContext;
+    msg: YuanbaoInboundMessage;
+    chatType: 'c2c' | 'group';
+};
+export type SystemCallbackHandler = (params: SystemCallbackParams) => void;
+export declare function registerSystemCallback(command: string, handler: SystemCallbackHandler): void;
+export declare function dispatchSystemCallback(params: SystemCallbackParams): boolean;

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

@@ -0,0 +1,17 @@
+import { handleC2CRecall, handleGroupRecall } from './callbacks/recall.js';
+const systemCallbackRegistry = new Map();
+export function registerSystemCallback(command, handler) {
+    systemCallbackRegistry.set(command, handler);
+}
+export function dispatchSystemCallback(params) {
+    const command = params.msg.callback_command;
+    if (!command)
+        return false;
+    const handler = systemCallbackRegistry.get(command);
+    if (!handler)
+        return false;
+    handler(params);
+    return true;
+}
+registerSystemCallback('Group.CallbackAfterRecallMsg', ({ ctx, msg }) => handleGroupRecall(ctx, msg));
+registerSystemCallback('C2C.CallbackAfterMsgWithDraw', ({ ctx, msg }) => handleC2CRecall(ctx, msg));

package/dist/src/{action-runtime.d.ts → message-tool/action-runtime.d.ts}

@@ -1,5 +1,5 @@
-import type { YuanbaoWsClient } from './yuanbao-server/ws/index.js';
-import { ResolvedYuanbaoAccount } from './types.js';
+import type { YuanbaoWsClient } from '../yuanbao-server/ws/index.js';
+import { ResolvedYuanbaoAccount } from '../types.js';
 import { OpenClawConfig } from 'openclaw/plugin-sdk';
 export interface ActionContext {
     wsClient: YuanbaoWsClient;

package/dist/src/{action-runtime.js → message-tool/action-runtime.js}

@@ -1,6 +1,6 @@
-import { searchStickers } from './sticker/sticker-cache.js';
-import { getOutboundQueue } from './outbound-queue.js';
-import { logger } from './logger.js';
+import { searchStickers } from '../sticker/sticker-cache.js';
+import { getOutboundQueue } from '../outbound-queue.js';
+import { logger } from '../logger.js';
 function normalizeStickerSearchQuery(params) {
     const raw = params.query ?? params.keyword ?? params.q ?? params.text ?? params.search;
     if (typeof raw === 'string') {

package/dist/src/message-tool/hints.d.ts

@@ -0,0 +1 @@
+export declare function buildMessageToolHints(): string[];

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

@@ -0,0 +1,6 @@
+export function buildMessageToolHints() {
+    return [
+        'file/image: real URLs/paths; send with media/mediaUrls, not link-only text.',
+        '表情=sticker=贴纸表情 (same). Use sticker-search + sticker; do not use Unicode emoji in text.',
+    ];
+}

package/dist/src/{channel-actions.d.ts → message-tool/index.d.ts}

@@ -1 +1,2 @@
+export { buildMessageToolHints } from './hints.js';
 export declare const yuanbaoMessageActions: Record<string, unknown>;

package/dist/src/{channel-actions.js → message-tool/index.js}

@@ -1,12 +1,12 @@
-import { getActiveWsClient } from './yuanbao-server/ws/index.js';
+import { getActiveWsClient } from '../yuanbao-server/ws/index.js';
 import { handleYuanbaoAction } from './action-runtime.js';
-import { resolveYuanbaoAccount } from './accounts.js';
-import { handleAction as handleSendAction } from './dm/handle-action.js';
+import { resolveYuanbaoAccount } from '../accounts.js';
+import { handleAction as handleSendAction } from '../dm/handle-action.js';
+export { buildMessageToolHints } from './hints.js';
 const SUPPORTED_ACTIONS = [
     'sticker-search',
     'sticker',
     'react',
-    'send',
 ];
 function describeMessageTool() {
     return {

package/dist/src/types.d.ts

@@ -74,6 +74,10 @@ export type YuanbaoMsgBodyElement = {
         [key: string]: unknown;
     };
 };
+export type ImMsgSeq = {
+    msg_seq?: number;
+    msg_id?: string;
+};
 export type YuanbaoInboundMessage = {
     callback_command?: string;
     from_account?: string;
@@ -93,6 +97,7 @@ export type YuanbaoInboundMessage = {
     cloud_custom_data?: string;
     event_time?: number;
     bot_owner_id?: string;
+    recall_msg_seq_list?: ImMsgSeq[];
 };
 export type QuoteInfo = {
     id?: string;

package/dist/src/yuanbao-server/ws/biz-codec.js

@@ -141,6 +141,7 @@ export function decodeInboundMessage(data) {
         cloud_custom_data: decoded.cloudCustomData || undefined,
         event_time: decoded.eventTime || undefined,
         bot_owner_id: decoded.botOwnerId || undefined,
+        recall_msg_seq_list: decoded.recall_msg_seq_list || undefined,
     };
 }
 export function decodeSendC2CMessageRsp(data, msgId) {

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

@@ -146,7 +146,12 @@ function parsePushContentToMsgBody(content) {
     return undefined;
 }
 function inferChatType(msg) {
-    return (msg.group_code || msg.callback_command === 'Group.CallbackAfterSendMsg') ? 'group' : 'c2c';
+    if (msg.group_code)
+        return 'group';
+    const cmd = msg.callback_command;
+    if (cmd === 'Group.CallbackAfterRecallMsg' || cmd === 'Group.CallbackAfterSendMsg')
+        return 'group';
+    return 'c2c';
 }
 function hasValidMsgFields(msg) {
     return Boolean(msg.callback_command || msg.from_account || msg.msg_body);

package/dist/src/yuanbao-server/ws/proto/biz.json

@@ -11,6 +11,18 @@
                             "nested": {
                                 "yuanbao_openclaw_proxy": {
                                     "nested": {
+                                        "ImMsgSeq": {
+                                            "fields": {
+                                                "msgSeq": {
+                                                    "type": "uint64",
+                                                    "id": 1
+                                                },
+                                                "msgId": {
+                                                    "type": "string",
+                                                    "id": 2
+                                                }
+                                            }
+                                        },
                                         "ImImageInfoArray": {
                                             "fields": {
                                                 "type": {
@@ -244,6 +256,11 @@
                                                 "botOwnerId": {
                                                     "type": "string",
                                                     "id": 15
+                                                },
+                                                "msgSeqList": {
+                                                    "rule": "repeated",
+                                                    "type": "ImMsgSeq",
+                                                    "id": 16
                                                 }
                                             }
                                         },

package/openclaw.plugin.json

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

package/package.json

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