@qihoo/tuitui-openclaw-channel 1.0.11 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qihoo/tuitui-openclaw-channel",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "maintainers": [
     {
       "name": "huzunjie",

package/src/channel.ts

@@ -153,7 +153,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
           allowFrom: policy === 'open' ? ['*'] : (account.allowFrom ?? []),
           policyPath: `${allowFromPath}dmPolicy`,
           allowFromPath,
-          approveHint: `openclaw 配对校验信息，CHANNEL_ID: ${CHANNEL_ID}, AccountId: ${accountId}, code: <code>`,
+          approveHint: `当前 ${CHANNEL_ID} openclaw（AccountId: ${accountId}）需要配对校验, code: <code>`,
           normalizeEntry: (raw: string) => raw.toLowerCase().trim(),
         };
       },
@@ -174,16 +174,18 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
     },
 
     outbound: {
-      deliveryMode: 'gateway' as const,
-      textChunkLimit: 2000,
+      deliveryMode: 'direct' as const,
+      textChunkLimit: 10000,  // API上限制为50k
 
-      sendText: async ({ cfg, to, text, accountId, account }: any) => {
-        account = account || resolveAccount(cfg, accountId);
-        checkAccount(account, 'send text');
+      sendText: async ({ cfg, to, text, accountId, replyToId, threadId }: any) => {
+        const account = resolveAccount(cfg, accountId);
+        checkAccount(account);
         
         const chatId = String(to || '').trim();
-        // Determine if this is a group message based on 'to' being all digits (group) or not (direct)
-        await sendTextMsg(account, chatId, guessChatType(chatId), text);
+        const chatType = guessChatType(chatId);
+        console.log(`[${CHANNEL_ID}] AccountId ${accountId} outbound.sendText() ${chatType} to ${chatId} ${text}`);
+
+        await sendTextMsg(account, chatId, chatType, text);
 
         return { channel: CHANNEL_ID, messageId: `tuitui-text-${Date.now()}`, chatId };
       },
@@ -240,6 +242,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
         wsNumber++;
         const wsId = `${wsNumber}-${Date.now()}`;
         const wsEvtIds = new Set<string>();
+        let wsRetryTimerId = 0;
 
         const wsUrl = `wss://im.live.360.cn:8282/robot/callback/ws?auth=${account.appId}.${account.appSecret}`;
         const defSendMsg = (msg: any) => {
@@ -304,7 +307,8 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
             _sendMsg = defSendMsg;
             if (!abortSignal?.aborted) {
               log?.warn?.(`[${CHANNEL_ID}] WebSocket[${wsId}] Restart`);
-              setTimeout(startWebSocket, 10e3); // 10秒后尝试重启
+              if (wsRetryTimerId) clearTimeout(wsRetryTimerId);
+              wsRetryTimerId = setTimeout(startWebSocket, 10e3); // 10秒后尝试重启
             }
           };
           ws.on('close', () => {

package/src/inbound.ts

@@ -10,7 +10,6 @@
  *     await handleInboundMessage(json, { account, accountId, apiRuntime, log });
  *   });
  */
-import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk';
 import type { TuiTuiInboundMessage, TuiTuiOutboundDeliverOptions } from './types';
 import { CHANNEL_ID } from './const';
 
@@ -60,6 +59,47 @@ export interface InboundHandlerOptions {
   log: any;
 }
 
+function getSessionKey(
+  cfg: any,
+  payload: ChatPayload,
+  account: InboundHandlerOptions['account'],
+  apiRuntime: InboundHandlerOptions['apiRuntime']
+): string | undefined {
+  const { chatId, chatType } = payload;
+  if (!chatId) return undefined;
+  const { accountId, channelContext } = account;
+  // 你自己只需要拼接与定义 peer.id
+  // 关于 sessionKey 格式的解释: https://docs.openclaw.ai/channels/channel-routing#sessionkey-%E5%8F%82%E8%80%83%E6%A0%BC%E5%BC%8F
+  let  id = chatId;
+  if(chatType == CHAT_TYPE_CHANNEL) {
+    const { channel_id, parent_id } = teamsParseChatId(chatId);
+    id = `${channel_id}`;
+    if(channelContext == 'thread' && parent_id) {
+       id += `:thread:${parent_id}`;
+    }
+  }
+
+  // sessionKey 不能自己拼字符串，需要用系统api识别，他会根据 bindings 路由规则处理
+  const { sessionKey } = apiRuntime.channel.routing.resolveAgentRoute({
+    cfg,
+    accountId,
+    channel: CHANNEL_ID,
+    peer: {  kind: chatType, id:    id },
+  });
+  return sessionKey;
+}
+
+function getMediaUrls({ msg_type, images, voice, file }: any): string[] | undefined {
+  if (msg_type === 'image' || msg_type === 'mixed') {
+    if (images?.length) return images;
+  } else if (msg_type === 'voice') {
+    if (voice) return [voice];
+  } else if (msg_type === 'file') {
+    if (file?.url) return [file.url];
+  }
+  return undefined;
+}
+
 /**
  * 处理长链接消息
  * account: 长连接初始化时，对应的Account配置信息
@@ -68,31 +108,27 @@ export interface InboundHandlerOptions {
 export async function handleInboundMessage({ json, account, apiRuntime, log }: InboundHandlerOptions) {
     // Signature / AppId validation
     const { accountId, appId, appSecret } = account;
-    if (appSecret) {
-      const hdAppId    = json.header['X-Tuitui-Robot-Appid'];
-      if (appId && hdAppId !== appId) {
-        log?.info?.(`[${CHANNEL_ID}] Invalid appId`);
-        return;
-      }
+    if (appSecret && appId && json.header['X-Tuitui-Robot-Appid'] !== appId) {
+      log?.info?.(`[${CHANNEL_ID}] Invalid appId`);
+      return;
     }
 
     // Decode message
-    const wsEvent = json.body.event;
-    const msg     = json.body as TuiTuiInboundMessage;
+    const msg = json.body as TuiTuiInboundMessage;
     const msgData = msg.data;
-
+    const { ref } = msgData;
     const payload: ChatPayload = {
       chatType:     CHAT_TYPE_DIRECT,
       chatId:       undefined, 
       text:         undefined,
       groupName:    undefined,
-      mediaUrls:    undefined,
-      replyToId:    undefined,
+      mediaUrls:    getMediaUrls(msgData),
+      replyToId:    ref?.is_me && ref?.msgid ? ref.msgid : undefined,
       tuituiAccount: msg.user_account || "",
       tuituiUid:     msg.uid || "",
-      tuituiUserName:msg.user_name || "",
+      tuituiUserName: msg.user_name || "",
     };
-
+    const wsEvent = json.body.event;
     // Event-type branching
     if (wsEvent === 'single_chat') {
       const valid = await parseSingleChat(payload, msgData, account, apiRuntime, log);
@@ -117,44 +153,20 @@ export async function handleInboundMessage({ json, account, apiRuntime, log }: I
 
     // 路由判断
     const routeSenderFrom = payload.tuituiAccount || payload.tuituiUid || 'unknown';
-    const routeAccountId = String(accountId || DEFAULT_ACCOUNT_ID || 'default');
 
     const cfg = await apiRuntime.config.loadConfig();
-    
-    // 关于 sessionKey 格式的解释
-    // https://docs.openclaw.ai/channels/channel-routing
-    var peer_id = payload.chatId
-    if(payload.chatType == CHAT_TYPE_CHANNEL) {
-      const target = teamsParseChatId(payload.chatId)
-      if(account?.channelContext == "thread" && target.parent_id) {
-        peer_id = `${target.channel_id}:thread:${target.parent_id}`;
-      } else {
-        peer_id = `${target.channel_id}`;
-      }
-    }
+    const sessionKey = getSessionKey(cfg, payload, account, apiRuntime);
 
-    // 你自己只需要拼接与定义peer_id
-    // sessionKey 不能自己拼字符串，需要用系统api识别，他会根据 bindings 路由规则处理
-    const { sessionKey } = apiRuntime.channel.routing.resolveAgentRoute({
-      cfg,
-      channel: CHANNEL_ID,
-      accountId,
-      peer: {
-        kind: payload.chatType,
-        id:   peer_id,
-      },
-    });
-
-    console.log(`[${CHANNEL_ID}] AccountId: ${accountId}, chatType: ${payload.chatType}, chatId ${payload.chatId}, routeSenderFrom: ${routeSenderFrom}, DEFAULT_ACCOUNT_ID: ${DEFAULT_ACCOUNT_ID}, routeAccountId: ${routeAccountId}`);
+    console.log(`[${CHANNEL_ID}] AccountId: ${accountId}, chatType: ${payload.chatType}, chatId ${payload.chatId}, routeSenderFrom: ${routeSenderFrom}`);
     console.log(`[${CHANNEL_ID}] AccountId: ${accountId}, dispatching to agent session=${sessionKey}`);
 
-    const msgCtx: any = {
+    const ctx: any = {
       Body:               payload.text! || ' ',
       From:               String(routeSenderFrom),
       To:                 CHANNEL_ID,
       SessionId:          String(sessionKey).replace(/\//g, '_'),
       SessionKey:         String(sessionKey).replace(/\//g, '_'),
-      AccountId:          routeAccountId,
+      AccountId:          accountId,
       OriginatingChannel: CHANNEL_ID,
       OriginatingTo:      payload.chatId,
       ChatType:           payload.chatType!,
@@ -165,19 +177,18 @@ export async function handleInboundMessage({ json, account, apiRuntime, log }: I
       UserAccount:        payload.tuituiAccount,
       CommandAuthorized:  true,  // 允许 /new 等内置命令
     };
-
     if (payload.chatType == CHAT_TYPE_GROUP && payload.chatId) {
-      msgCtx.GroupSubject = payload.groupName;
-      msgCtx.GroupId      = payload.chatId;
+      ctx.GroupSubject = payload.groupName;
+      ctx.GroupId      = payload.chatId;
     }
-    if (payload.mediaUrls?.length)  msgCtx.MediaUrls  = payload.mediaUrls;
-    if (payload.replyToId)          msgCtx.ReplyToId  = payload.replyToId;
+    if (payload.mediaUrls?.length)  ctx.MediaUrls  = payload.mediaUrls;
+    if (payload.replyToId)          ctx.ReplyToId  = payload.replyToId;
 
     console.log(`[${CHANNEL_ID}] AccountId: ${accountId}, handleInboundMessage payload`, payload);
 
 
     await apiRuntime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
-      ctx: msgCtx,
+      ctx,
       cfg,
       dispatcherOptions: {
         deliver: async (outbound: TuiTuiOutboundDeliverOptions) => {
@@ -216,6 +227,40 @@ export async function handleInboundMessage({ json, account, apiRuntime, log }: I
     });
 }
 
+/***  配对节流映射 - 用于防止短时间内大量重复配对请求消息发出
+ * key: `${accountId}-${chatId}`
+ * val: timestamp */
+const pairingThrottleMap = new Map<string, number>();
+// 暂时控制为 2 分钟内同一个用户只能触发一次配对请求
+const needPairingThrottle = (accountId: string | undefined, chatId: string, throttleMs = 2 * 60 * 1000): boolean => {
+  const key = `${accountId}-${chatId}`;
+  const now = Date.now();
+  const lastTime = pairingThrottleMap.get(key) || 0;
+  if (now - lastTime < throttleMs) {
+    return true;
+  }
+  pairingThrottleMap.set(key, now);
+  return false;
+}
+
+async function sendSingleChatPairingMsg(account: any, payload: any, log: any, apiRuntime: any) {
+  const { accountId } = account;
+  const { chatId, chatType } = payload;
+  if (needPairingThrottle(accountId, chatId)) {
+    return log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, pairing throttled for sender=${chatId}`);
+  }
+  try {
+    log?.debug?.(`[${CHANNEL_ID}] AccountId: ${accountId}, pairing flow: checking if pairing request exists for sender=${chatId}`);
+    const req = await apiRuntime.channel.pairing.upsertPairingRequest({ channel: CHANNEL_ID, accountId, id: chatId });
+    log?.debug?.(`[${CHANNEL_ID}] AccountId: ${accountId}, pairing flow: upsertPairingRequest result=${JSON.stringify(req)}`);
+    // 只要没配对，会每次和机器人聊，都会返回配对信息。
+    const replyText = apiRuntime.channel.pairing.buildPairingReply({ channel: CHANNEL_ID, code: req.code });
+    await sendTextMsg(account, chatId, chatType, replyText, 'tuitui.pairing.reply');
+  } catch (err) {
+    log?.warn?.(`[${CHANNEL_ID}] AccountId: ${accountId}, pairing failed for ${chatId}: ${String(err)}`);
+  }
+}
+
 /**
  * 处理单聊（single_chat）分支，直接修改 payload。
  * 返回 false 表示消息不合法，外层应提前 return；返回 true 表示校验通过，继续执行。
@@ -227,46 +272,32 @@ async function parseSingleChat(
   apiRuntime: any,
   log:        any,
 ): Promise<boolean> {
-  const { accountId } = account;
+  const { accountId, dmPolicy } = account;
+  const chatId     = payload.tuituiAccount ? String(payload.tuituiAccount || '').toLowerCase().trim() : '';
+  if (dmPolicy === 'disabled') {  //['pairing', 'allowlist', 'open', 'disabled'],
+    log?.warn?.(`[${CHANNEL_ID}] AccountId: ${accountId}, DM disabled sender=${chatId}`);
+    return false;
+  }
+
   payload.chatType = CHAT_TYPE_DIRECT;
-  payload.chatId = payload.tuituiAccount;
+  payload.chatId   = chatId;
   payload.text     = buildMessageBody(msgData);
-  payload.msgId  = msgData.msgid;
+  payload.msgId    = msgData.msgid;
   log?.debug?.(
-    `[${CHANNEL_ID}] AccountId: ${accountId}, inbound single_chat user_account=${payload.tuituiAccount} uid=${payload.tuituiUid} user_name=${payload.tuituiUserName}`,
+    `[${CHANNEL_ID}] AccountId: ${accountId}, inbound single_chat user_account=${chatId} uid=${payload.tuituiUid} user_name=${payload.tuituiUserName}`,
   );
 
-  const msgType = msgData.msg_type;
-  if ((msgType === 'image' || msgType === 'mixed') && msgData.images?.length) {
-    payload.mediaUrls = msgData.images;
-  } else if (msgType === 'voice' && msgData.voice) {
-    payload.mediaUrls = [msgData.voice];
-  } else if (msgType === 'file' && msgData.file?.url) {
-    payload.mediaUrls = [msgData.file.url];
-  }
-
-  if (msgData.ref?.is_me && msgData.ref?.msgid) {
-    payload.replyToId = msgData.ref.msgid;
-  }
-
-  if (!payload.tuituiAccount && !payload.tuituiUid) {
+  if (!chatId && !payload.tuituiUid) {
     log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, Missing user_account or uid in single_chat event`);
     return false;
   }
 
-  const dmPolicy            = String(account.dmPolicy ?? 'pairing').toLowerCase();
   const configuredAllowFrom = Array.isArray(account.allowFrom) ? account.allowFrom : [];
   const normalizedAllowFrom = arrLowerCaseTrim(configuredAllowFrom);
-  const senderForPolicy     = payload.tuituiAccount ? String(payload.tuituiAccount).toLowerCase().trim() : '';
   log?.debug?.(
-    `[${CHANNEL_ID}] AccountId: ${accountId}, dmPolicy=${dmPolicy} userAccount=${payload.tuituiAccount} tuituiUid=${payload.tuituiUid} senderForPolicy=${senderForPolicy} allowFrom=${JSON.stringify(normalizedAllowFrom)}`,
+    `[${CHANNEL_ID}] AccountId: ${accountId}, dmPolicy=${dmPolicy} userAccount=${chatId} tuituiUid=${payload.tuituiUid} chatId=${chatId} allowFrom=${JSON.stringify(normalizedAllowFrom)}`,
   );
 
-  if (dmPolicy === 'disabled') {
-    log?.warn?.(`[${CHANNEL_ID}] AccountId: ${accountId}, DM disabled sender=${senderForPolicy}`);
-    return false;
-  }
-
   if (dmPolicy === 'open') {
     return true;
   }
@@ -278,36 +309,16 @@ async function parseSingleChat(
   } catch {}
 
   const allowSet  = new Set([...normalizedAllowFrom, ...storeAllowFrom]);
-  const isAllowed = payload.tuituiAccount ? allowSet.has(senderForPolicy) : false;
+  const isAllowed = chatId ? allowSet.has(chatId) : false;
   if(isAllowed) return true;
 
   if (dmPolicy === 'pairing') {
-    try {
-      log?.debug?.(`[${CHANNEL_ID}] AccountId: ${accountId}, pairing flow: checking if pairing request exists for sender=${senderForPolicy}`);
-      const req = await apiRuntime?.channel?.pairing?.upsertPairingRequest?.({
-        channel:   CHANNEL_ID,
-        accountId,
-        id: senderForPolicy,
-      });
-      log?.debug?.(
-        `[${CHANNEL_ID}] AccountId: ${accountId}, pairing flow: upsertPairingRequest result=${JSON.stringify(req)}`,
-      );
-      // 只要没配对，会每次和机器人聊，都会返回配对信息。
-      const replyText =
-        apiRuntime?.channel?.pairing?.buildPairingReply?.({
-          channel: CHANNEL_ID,
-          code:    req.code,
-        }) ?? '需要进行配对。请让机器人所有者进行批准。';
-
-      await sendTextMsg(account, payload.tuituiAccount, payload.chatType, replyText, 'tuitui.pairing.reply');
-    } catch (err) {
-      log?.warn?.(`[${CHANNEL_ID}] AccountId: ${accountId}, pairing failed for ${senderForPolicy}: ${String(err)}`);
-    }
+    sendSingleChatPairingMsg(account, payload, log, apiRuntime);
     log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, pairing required`);
     return false;
   } else { // allowlist
     log?.warn?.(
-      `[${CHANNEL_ID}] AccountId: ${accountId}, Blocked unauthorized sender (allowlist): sender=${senderForPolicy} allowFrom=${JSON.stringify(normalizedAllowFrom)}`,
+      `[${CHANNEL_ID}] AccountId: ${accountId}, Blocked unauthorized sender (allowlist): sender=${chatId} allowFrom=${JSON.stringify(normalizedAllowFrom)}`,
     );
     return false;
   }
@@ -326,7 +337,8 @@ async function parseGroupChat(
 ): Promise<boolean> {
   const { accountId } = account;
   payload.chatType  = CHAT_TYPE_GROUP;
-  payload.chatId   = msgData.group_id;
+  const chatId     = msgData.group_id ? String(msgData.group_id).toLowerCase().trim() : '';
+  payload.chatId   = chatId;
   payload.groupName = msgData.group_name;
   payload.msgId  = msgData.msgid;
   log?.debug?.(
@@ -337,7 +349,7 @@ async function parseGroupChat(
   const groupAllowFromRaw        = Array.isArray(account.groupAllowFrom) ? account.groupAllowFrom : [];
   const normalizedGroupAllowFrom = arrLowerCaseTrim(groupAllowFromRaw);
   log?.debug?.(
-    `[${CHANNEL_ID}] AccountId: ${accountId}, groupPolicy=${groupPolicy} groupId=${payload.chatId} groupAllowFrom=${JSON.stringify(normalizedGroupAllowFrom)} at_me=${JSON.stringify(msgData.at_me)} at=${JSON.stringify(msgData.at)}`,
+    `[${CHANNEL_ID}] AccountId: ${accountId}, groupPolicy=${groupPolicy} groupId=${chatId} groupAllowFrom=${JSON.stringify(normalizedGroupAllowFrom)} at_me=${JSON.stringify(msgData.at_me)} at=${JSON.stringify(msgData.at)}`,
   );
 
   if (groupPolicy === 'disabled') {
@@ -345,7 +357,7 @@ async function parseGroupChat(
     return false;
   }
 
-  if (!payload.tuituiAccount || !payload.chatId) {
+  if (!payload.tuituiAccount || !chatId) {
     log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, Missing tuituiAccount or chatId in group_chat event`);
     return false;
   }
@@ -357,13 +369,16 @@ async function parseGroupChat(
 
   payload.text = buildMessageBody(msgData);
 
-  const whiteId = payload.chatId;
-  if (!normalizedGroupAllowFrom.includes(String(whiteId))) {
+  if (!normalizedGroupAllowFrom.includes(String(chatId))) {
+    if (needPairingThrottle(accountId, chatId)) {
+      log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, group pairing throttled for groupId=${chatId}`);
+      return false;
+    }
     await sendTextMsg(
       account,
-      payload.chatId,
+      chatId,
       payload.chatType,
-      `当前openclaw群聊策略为白名单，需要主人在群白名单(Group Allow From)增加当前群ID：\n${whiteId}`,
+      `当前openclaw（AccountId: ${accountId}）群聊策略为白名单，需要主人在群白名单(Group Allow From)增加当前群ID：\n${chatId}`,
       'tuitui.groupPolicy.reply',
     );
     return false;
@@ -381,13 +396,15 @@ async function parseTeamsPost(
 ): Promise<boolean> {
   const { accountId } = account;
   payload.chatType  = CHAT_TYPE_CHANNEL;
-  const thread_id = (msgData.parent_id && msgData.parent_id != "0")?msgData.parent_id: msgData.post_id; 
-  payload.chatId   = teamsBuildChatId(msgData.team_id, msgData.channel_id, thread_id);
-  payload.msgId  = msgData.post_id;
-  payload.text = msgData.content;
+  const { team_id, channel_id, parent_id, post_id, content } = msgData;
+  const thread_id   = (parent_id && parent_id != "0")?parent_id: post_id;
+  const chatId      = teamsBuildChatId(team_id, channel_id, thread_id);
+  payload.chatId    = chatId;
+  payload.msgId     = post_id;
+  payload.text      = content;
   payload.replyToId = "";
   log?.debug?.(
-    `[${CHANNEL_ID}] inbound teams tuituiAccount=${payload.tuituiAccount} tuituiUid=${payload.tuituiUid} tuituiUserName=${payload.tuituiUserName} chatId=${payload.chatId}`,
+    `[${CHANNEL_ID}] inbound teams tuituiAccount=${payload.tuituiAccount} tuituiUid=${payload.tuituiUid} tuituiUserName=${payload.tuituiUserName} chatId=${chatId}`,
   );
 
   // 暂时白名单先用这个，后面拆出来
@@ -395,7 +412,7 @@ async function parseTeamsPost(
   const groupAllowFromRaw        = Array.isArray(account.groupAllowFrom) ? account.groupAllowFrom : [];
   const normalizedGroupAllowFrom = arrLowerCaseTrim(groupAllowFromRaw);
   log?.debug?.(
-    `[${CHANNEL_ID}] AccountId: ${accountId} groupPolicy=${groupPolicy} groupId=${payload.chatId} groupAllowFrom=${JSON.stringify(normalizedGroupAllowFrom)} at_me=${JSON.stringify(msgData.at_me)} at=${JSON.stringify(msgData.at)}`,
+    `[${CHANNEL_ID}] AccountId: ${accountId} groupPolicy=${groupPolicy} groupId=${chatId} groupAllowFrom=${JSON.stringify(normalizedGroupAllowFrom)} at_me=${JSON.stringify(msgData.at_me)} at=${JSON.stringify(msgData.at)}`,
   );
 
   if (groupPolicy === 'disabled') {
@@ -403,7 +420,7 @@ async function parseTeamsPost(
     return false;
   }
 
-  if (!payload.tuituiAccount || !payload.chatId) {
+  if (!payload.tuituiAccount || !chatId) {
     log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, Missing tuituiAccount or chatId in event`);
     return false;
   }
@@ -413,13 +430,16 @@ async function parseTeamsPost(
     return false;
   }
 
-  const whiteId = msgData.team_id;
-  if (!normalizedGroupAllowFrom.includes(String(whiteId))) {
+  if (!normalizedGroupAllowFrom.includes(String(team_id))) {
+    if (needPairingThrottle(accountId, chatId)) {
+      log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, teams pairing throttled for teamsChatId=${chatId}`);
+      return false;
+    }
     await sendTextMsg(
       account,
-      payload.chatId,
+      chatId,
       payload.chatType,
-      `当前openclaw群聊/团队策略为白名单，需要主人在群白名单(Group Allow From)增加当前团队ID：\n${whiteId}`,
+      `当前openclaw（AccountId: ${accountId}）群聊/团队策略为白名单，需要主人在群白名单(Group Allow From)增加当前团队ID：\n${team_id}`,
       'tuitui.groupPolicy.reply',
     );
     return false;

package/src/outbound.ts

@@ -115,7 +115,7 @@ export async function postTuituiMsg(account: any, json: any, auditCtx: string):
 }
 
 export function checkAccount(account: any, ctxTips: string = 'send text') {
-  if (!account.appId || !account.appSecret) {
+  if (!account || !account.appId || !account.appSecret) {
     throw new Error(`[${CHANNEL_ID}] appId and appSecret are required for ${ctxTips}`);
   }
 }
@@ -395,6 +395,59 @@ function replaceSingleNewlines(content: string): string {
   return content.replace(/([^\n])\n([^\n])/g, '$1\n\n$2');
 }
 
+/*
+从一个字符串中提取出来 @ 列表，匹配规则是
+@之前的字符，只能是空格、回车、换行
+@之后匹配到空格为止或者文本末尾
+
+例子：
+输入：你好 @张三 @李四 你吃了吗
+输出数组：["张三"，"李四"]
+*/
+
+function getMentionsRegex(): RegExp {
+  // 正则表达式解释：
+  // (?<=^|[\s\r\n\u3000\u3001\u3002\uFF0C\uFF01\uFF1F\u2026])  
+  // - 正向向后查找，确保@前面是：
+  //   ^              - 字符串开头
+  //   [\s\r\n]       - 空格、回车、换行
+  //   \u3000         - 中文全角空格
+  //   \u3001         - 中文顿号（、）
+  //   \u3002         - 中文句号（。）
+  //   \uFF0C         - 中文逗号（，）
+  //   \uFF01         - 中文感叹号（！）
+  //   \uFF1F         - 中文问号（？）
+  //   \u2026         - 中文省略号（…）
+  // @                - 匹配@符号
+  // ([^\s]+)         - 捕获组，匹配一个或多个非空白字符
+  const regex = /(?<=^|[\s\r\n\u3000\u3001\u3002\uFF0C\uFF01\uFF1F\u2026])@([^\s]+)/g;
+  return regex
+}
+
+function extractMentions(text: string): string[] {
+  const mentions: string[] = [];
+  
+  const regex = getMentionsRegex();  
+  let match;
+  while ((match = regex.exec(text)) !== null) {
+    const mention = match[1];
+    if (!mentions.includes(mention)) {
+      mentions.push(mention);
+    }
+  }
+  
+  return mentions;
+}
+
+function replaceMentions(text: string): string {
+  const regex = getMentionsRegex();  
+  return text.replace(regex, (match, mention) => {
+    // match: 完整的匹配字符串（例如 "@username"）
+    // mention: 捕获组中的内容（例如 "username"）
+    return `{{tuitui_at "${mention}"}}`;
+  });
+}
+
 export async function sendTextMsg(
   account: any,
   chatId: string | undefined,
@@ -404,22 +457,30 @@ export async function sendTextMsg(
   atList?: string[],
 ): Promise<void> {
   if (!chatId) return console.error(`[${CHANNEL_ID}] sendTextMsg Error ${auditCtx}: Missing "target"`);
-  // Format message according to TuiTui's required structure
-  const realAtList = chatType == CHAT_TYPE_GROUP? atList : [];
+
+  // 澄清：不再使用 atList 参数；统一从文本中提取 at 目标；
+  // 因为 atList 参数上层固定写死的填写为 发消息人，如果是机器人这样可能导致机器人之间at产生死循环。
   if (chatType == CHAT_TYPE_CHANNEL) {
+    const content_with_newline = replaceSingleNewlines(content);
+    const content_with_mention = replaceMentions(content_with_newline);
+    const has_at = (content_with_mention != content_with_newline);
     const msg: TuiTuiOutboundTeamsMarkdownMessage = {
       ...getTargets(chatId, chatType),
       msgtype: 'richtext/markdown',
-      at: realAtList || [],
-      richtext: { markdown: replaceSingleNewlines(content) },
+      richtext: { 
+        markdown: content_with_mention,
+        delims_left: has_at?"{{":"",
+        delims_right: has_at?"}}":"",
+      },
     };
     console.log(`[${CHANNEL_ID}] sendTeamsPost to ${chatId} ${auditCtx} - `, msg);
     await postTuituiMsg(account, msg, auditCtx);
   } else {
+    const at_from_text = chatType == CHAT_TYPE_GROUP?extractMentions(content):[];
     const msg: TuiTuiOutboundTextMessage = {
       ...getTargets(chatId, chatType),
       msgtype: 'text',
-      at: realAtList || [],
+      at: at_from_text,
       text: { content },
     };
     console.log(`[${CHANNEL_ID}] sendTextMsg to ${chatId} ${auditCtx} - `, msg);

package/src/command.ts

@@ -1,29 +0,0 @@
-import type { OpenClawPluginApi } from 'openclaw/plugin-sdk';
-export default function registerCommand2Api(api: OpenClawPluginApi) {
-  api.registerCommand({
-    name: "mystatus",
-    description: "Show my plugin status",
-    handler: (ctx: any) => {
-        console.log('xxxxx', JSON.stringify(ctx.config.channels[ctx.channel]))
-      return {
-        text: `Status of TuiTui Plugin:
-        Channel: ${ctx.channel},
-        AccountId: ${ctx.accountId},
-        Time: ${new Date().toLocaleString()}`,
-      };
-    },
-  });
-  
-  // 带参数的命令
-  api.registerCommand({
-    name: "setBotName",
-    description: "Set bot name",
-    acceptsArgs: true,
-    requireAuth: true,
-    handler: async (ctx: any) => {
-      const mode = ctx.args?.trim() || "default";
-      ///await saveMode(mode);
-      return { text: `Mode set to: ${mode}` };
-    },
-  });
-}