openclaw-plugin-yuanbao 2.0.1 → 2.1.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.0.1",
+    "version": "2.1.0",
     "channels": [
         "yuanbao"
     ],

package/dist/src/accounts.js

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

package/dist/src/config-schema.js

@@ -59,10 +59,17 @@ export const yuanbaoConfigSchema = {
                 description: '开启后将关闭分块流式发送能力，改为非分块输出',
                 default: false,
             },
+            requireMention: {
+                type: 'boolean',
+                title: '群聊需要 @ 机器人',
+                description: '开启后群聊消息必须 @ 机器人才会触发回复；关闭后机器人回复所有群消息',
+                default: true,
+            },
             fallbackReply: {
                 type: 'string',
                 title: '兜底回复文案',
                 description: '当 AI 未返回有效回复内容时，自动发送给用户的兜底文本',
+                default: '暂时无法解答，你可以换个问题问问我哦',
             },
         },
         additionalProperties: false,

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

@@ -1,4 +1,4 @@
-import type { HistoryEntry } from 'openclaw/plugin-sdk/reply-history';
+import type { HistoryEntry } from 'openclaw/plugin-sdk/mattermost';
 export type GroupHistoryEntry = HistoryEntry & {
     medias?: Array<{
         url: string;

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

@@ -1,4 +1,4 @@
-import { recordPendingHistoryEntryIfEnabled, buildPendingHistoryContextFromMap, clearHistoryEntriesIfEnabled, } from 'openclaw/plugin-sdk/reply-history';
+import { recordPendingHistoryEntryIfEnabled, buildPendingHistoryContextFromMap, clearHistoryEntriesIfEnabled, } from 'openclaw/plugin-sdk/mattermost';
 import { downloadMediasToLocalFiles, downloadAndUploadMedia, guessMimeType, buildImageMsgBody, buildFileMsgBody } from '../media.js';
 import { resolveOutboundSenderAccount, rewriteSlashCommand, YUANBAO_FINAL_TEXT_CHUNK_LIMIT, } from './context.js';
 import { extractTextFromMsgBody } from './extract.js';
@@ -329,7 +329,8 @@ async function handleGroupMessage(params) {
     }
     glog.debug(`开始处理群消息, 账号: ${account.accountId}, group: ${groupCode}`);
     const { historyLimit } = account;
-    if (!isAtBot) {
+    const requireMention = account.requireMention !== false;
+    if (requireMention && !isAtBot) {
         glog.info(`非@机器人消息，已记录到群历史上下文，跳过回复 <- group:${groupCode}, from: ${fromAccount}`);
         if (historyLimit > 0) {
             recordPendingHistoryEntryIfEnabled({
@@ -484,6 +485,7 @@ async function handleGroupMessage(params) {
                 msgBody: contentMsgBody,
                 fromAccount: outboundSender,
                 refMsgId,
+                refFromAccount: fromAccount,
                 ctx,
             });
         },
@@ -495,6 +497,7 @@ async function handleGroupMessage(params) {
                 msgBody: contentMsgBody,
                 fromAccount: outboundSender,
                 refMsgId,
+                refFromAccount: fromAccount,
                 ctx,
             });
         },
@@ -517,14 +520,31 @@ async function handleGroupMessage(params) {
                 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 });
+                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, ctx });
+                return sendYuanbaoGroupMessage({
+                    account,
+                    groupCode,
+                    text: fallback,
+                    fromAccount: outboundSender,
+                    refMsgId,
+                    refFromAccount: fromAccount,
+                    ctx,
+                });
             }
         };
         groupQueueManager.registerSession(outboundGroupSessionKey, {
@@ -534,6 +554,7 @@ async function handleGroupMessage(params) {
             target: groupCode,
             fromAccount: outboundSender,
             refMsgId,
+            refFromAccount: fromAccount,
             ctx,
             sendMediaOverride: groupSendMediaOverride,
             mergeOnFlush: account.disableBlockStreaming,

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

@@ -32,6 +32,7 @@ export declare function sendYuanbaoGroupMessageBody(params: {
     msgBody: YuanbaoMsgBodyElement[];
     fromAccount?: string;
     refMsgId?: string;
+    refFromAccount?: string;
     ctx?: MessageHandlerContext;
 }): Promise<{
     ok: boolean;
@@ -45,6 +46,7 @@ export declare function sendYuanbaoGroupMessage(params: {
     text: string;
     fromAccount?: string;
     refMsgId?: string;
+    refFromAccount?: string;
     ctx?: MessageHandlerContext;
 }): Promise<{
     ok: boolean;
@@ -58,6 +60,7 @@ export declare function sendMsgBodyDirect(params: {
     target: string;
     msgBody: YuanbaoMsgBodyElement[];
     refMsgId?: string;
+    refFromAccount?: string;
     wsClient: YuanbaoWsClient;
     core: PluginRuntime;
 }): Promise<{

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

@@ -8,13 +8,18 @@ const firstReplyRefDb = new InMemoryTtlDb({
     ttlMs: 60 * 1000,
     maxKeys: 100,
 });
-function shouldAttachReplyRef(params) {
-    const { account, refMsgId } = params;
+async function shouldAttachReplyRef(params) {
+    const { account, refMsgId, groupCode, refFromAccount } = params;
     if (!refMsgId)
         return false;
     const mode = account.replyToMode;
     if (mode === 'off')
         return false;
+    if (refFromAccount) {
+        const yuanbaoUserId = await getMember(account.accountId).queryYuanbaoUserId(groupCode);
+        if (yuanbaoUserId && refFromAccount === yuanbaoUserId)
+            return false;
+    }
     if (mode === 'all')
         return true;
     const dedupeKey = `${account.accountId}:${refMsgId}`;
@@ -60,14 +65,14 @@ export async function sendYuanbaoMessage(params) {
     return sendYuanbaoMessageBody({ ...rest, msgBody });
 }
 export async function sendYuanbaoGroupMessageBody(params) {
-    const { account, groupCode, msgBody, fromAccount, refMsgId, ctx } = params;
+    const { account, groupCode, msgBody, fromAccount, refMsgId, refFromAccount, ctx } = params;
     const log = createLog('outbound', ctx?.log);
     if (!ctx?.wsClient) {
         log.error('发送群消息失败: WebSocket 客户端不可用');
         return { ok: false, error: 'wsClient not available' };
     }
     const msgRandom = String(Math.floor(Math.random() * 4294967295));
-    const attachReplyRef = shouldAttachReplyRef({ account, refMsgId });
+    const attachReplyRef = await shouldAttachReplyRef({ account, refMsgId, groupCode, refFromAccount });
     try {
         const result = await ctx.wsClient.sendGroupMessage({
             msg_id: refMsgId,
@@ -97,7 +102,7 @@ export async function sendYuanbaoGroupMessage(params) {
     return sendYuanbaoGroupMessageBody({ ...rest, groupCode, msgBody });
 }
 export async function sendMsgBodyDirect(params) {
-    const { account, config, target, msgBody, wsClient, core, refMsgId } = params;
+    const { account, config, target, msgBody, wsClient, core, refMsgId, refFromAccount } = params;
     if (target?.startsWith('group:')) {
         const groupCode = target.slice('group:'.length);
         return sendYuanbaoGroupMessageBody({
@@ -106,6 +111,7 @@ export async function sendMsgBodyDirect(params) {
             msgBody,
             fromAccount: account.botId,
             refMsgId,
+            refFromAccount,
             ctx: {
                 account,
                 config,
@@ -144,6 +150,7 @@ export async function executeReply(params) {
         : null;
     const collectedTexts = [];
     let hasFinalInfo = false;
+    let hasQueuedContent = false;
     await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
         ctx: ctxPayload,
         cfg: replyRuntime.config,
@@ -165,11 +172,13 @@ export async function executeReply(params) {
                 const text = core.channel.text.convertMarkdownTables(payload.text ?? '', tableMode);
                 if (session) {
                     if (text.trim()) {
+                        hasQueuedContent = true;
                         await session.push({ type: 'text', text });
                     }
                     const mediaUrls = payload.mediaUrls ?? [];
                     for (const mediaUrl of mediaUrls) {
                         if (mediaUrl) {
+                            hasQueuedContent = true;
                             await session.push({ type: 'media', mediaUrl });
                         }
                     }
@@ -191,6 +200,17 @@ export async function executeReply(params) {
     });
     if (session) {
         await session.flush();
+        if (!hasQueuedContent) {
+            const { fallbackReply } = account;
+            if (fallbackReply) {
+                rlog.info(`[${L}] AI 未返回回复内容（队列模式），使用兜底回复`);
+                await sendTextReply({ text: fallbackReply, transport, ctx, overflowPolicy, splitFinalText, L, log: rlog });
+            }
+            else {
+                rlog.warn(`[${L}] AI 未返回任何回复内容（队列模式）`);
+            }
+            return;
+        }
         ctx.statusSink?.({ lastOutboundAt: Date.now() });
         return;
     }

package/dist/src/module/member.d.ts

@@ -49,6 +49,7 @@ export declare class Member {
     readonly accountId: string;
     readonly session: SessionMember;
     readonly group: GroupMember;
+    private yuanbaoUserIdCache;
     constructor(accountId: string);
     recordUser(groupCode: string, userId: string, nickName: string): void;
     queryMembers(groupCode: string, nameFilter?: string): Promise<UserRecord[]>;
@@ -56,6 +57,7 @@ export declare class Member {
     lookupUserByNickName(groupCode: string, nickName: string): UserRecord | undefined;
     queryGroupOwner(groupCode: string): Promise<GroupOwnerInfo | null>;
     queryGroupInfo(groupCode: string): Promise<GroupInfoData | null>;
+    queryYuanbaoUserId(groupCode?: string): Promise<string | null>;
     listGroupCodes(): string[];
     formatRecords(records: UserRecord[]): FormattedUserRecord[];
 }

package/dist/src/module/member.js

@@ -240,6 +240,7 @@ export class Member {
     accountId;
     session = new SessionMember();
     group;
+    yuanbaoUserIdCache = null;
     constructor(accountId) {
         this.accountId = accountId;
         this.group = new GroupMember(accountId, this.session);
@@ -276,6 +277,23 @@ export class Member {
     async queryGroupInfo(groupCode) {
         return this.group.queryGroupInfo(groupCode);
     }
+    async queryYuanbaoUserId(groupCode) {
+        if (this.yuanbaoUserIdCache)
+            return this.yuanbaoUserIdCache;
+        if (!groupCode) {
+            logger.debug?.('[member] queryYuanbaoUserId skipped: no cache and no groupCode');
+            return null;
+        }
+        const members = await this.group.getMembers(groupCode);
+        const yuanbao = members.find(u => u.userType === 2) ?? members.find(u => u.userType === 3);
+        if (!yuanbao?.userId) {
+            logger.warn?.(`[member] queryYuanbaoUserId failed: no yuanbao/bot found in group=${groupCode}`);
+            return null;
+        }
+        this.yuanbaoUserIdCache = yuanbao.userId;
+        logger.info?.(`[member] cached yuanbaoUserId=${yuanbao.userId} from group=${groupCode}`);
+        return this.yuanbaoUserIdCache;
+    }
     listGroupCodes() {
         return this.session.listGroupCodes();
     }

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

@@ -34,6 +34,7 @@ export interface RegisterSessionOptions {
     target: string;
     fromAccount?: string;
     refMsgId?: string;
+    refFromAccount?: string;
     ctx: MessageHandlerContext;
     msgId: string;
     sendMediaOverride?: SendMediaFn;

package/dist/src/outbound-queue.js

@@ -34,11 +34,19 @@ function createManager(config) {
                 existing.abort();
             }
             const onComplete = () => sessions.delete(sessionKey);
-            const { chatType, account, target, fromAccount, refMsgId, ctx, msgId, sendMediaOverride, mergeOnFlush } = options;
+            const { chatType, account, target, fromAccount, refMsgId, refFromAccount, ctx, msgId, sendMediaOverride, mergeOnFlush, } = options;
             const sendText = async (text) => {
                 try {
                     const result = chatType === 'group'
-                        ? await sendYuanbaoGroupMessage({ account, groupCode: target, text, fromAccount, refMsgId, ctx })
+                        ? await sendYuanbaoGroupMessage({
+                            account,
+                            groupCode: target,
+                            text,
+                            fromAccount,
+                            refMsgId,
+                            refFromAccount,
+                            ctx,
+                        })
                         : await sendYuanbaoMessage({ account, toAccount: target, text, fromAccount, ctx });
                     return { ok: result.ok, error: result.error };
                 }

package/dist/src/types.d.ts

@@ -20,6 +20,7 @@ export type YuanbaoAccountConfig = {
     mediaMaxMb?: number;
     historyLimit?: number;
     disableBlockStreaming?: boolean;
+    requireMention?: boolean;
     fallbackReply?: string;
 };
 export type YuanbaoConfig = YuanbaoAccountConfig & {
@@ -46,6 +47,7 @@ export type ResolvedYuanbaoAccount = {
     mediaMaxMb: number;
     historyLimit: number;
     disableBlockStreaming: boolean;
+    requireMention: boolean;
     fallbackReply?: string;
     config: YuanbaoAccountConfig;
 };

package/openclaw.plugin.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-plugin-yuanbao",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "type": "module",
   "description": "Tencent YuanBao intelligent bot channel plugin",
   "license": "MIT",
@@ -21,6 +21,7 @@
     "extensions": [
       "./dist/index.js"
     ],
+    "hooks": [],
     "channel": {
       "id": "yuanbao",
       "label": "元宝 Bot",