@qihoo/tuitui-openclaw-channel 1.0.13 → 1.0.15

package/index.ts

@@ -1,5 +1,5 @@
 import type { OpenClawPluginApi } from 'openclaw/plugin-sdk';
-import { emptyPluginConfigSchema } from 'openclaw/plugin-sdk';
+import { emptyPluginConfigSchema } from 'openclaw/plugin-sdk/core';
 import { createTuiTuiChannelPlugin } from './src/channel';
 import { registerTuituiTools } from './src/tools';
 import { CHANNEL_ID, CHANNEL_NAME } from './src/const';
@@ -8,7 +8,7 @@ import { id } from './openclaw.plugin.json';
 const plugin = {
   id, // plugin id not is CHANNEL_ID
   name: CHANNEL_NAME,
-  description: `${CHANNEL_NAME} chat integration for OpenClaw via webhook`,
+  description: `${CHANNEL_NAME} chat integration for OpenClaw via WebSocket`,
   configSchema: emptyPluginConfigSchema(),
   register(api: OpenClawPluginApi) {
     console.log(`[${CHANNEL_ID}] Plugin.register Before.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qihoo/tuitui-openclaw-channel",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "maintainers": [
     {
       "name": "huzunjie",
@@ -17,6 +17,9 @@
   ],
   "description": "TuiTui channel plugin for OpenClaw",
   "type": "module",
+  "peerDependencies": {
+    "openclaw": ">=2026.3.13"
+  },
   "dependencies": {
     "@sinclair/typebox": "^0.34.48",
     "ws": "^8.13.0"

package/src/accounts.ts

@@ -1,9 +1,7 @@
-import { parseAllowFroms } from './utils';
-import { capabilities, configSchema, baseFildsDefault } from './confs';
-import {  CHANNEL_ID,} from "./const";
-import {  DEFAULT_ACCOUNT_ID,} from 'openclaw/plugin-sdk';
-
-const isEnabled = (val: any) => val === undefined || !!val;
+import { parseAllowFroms, isEnabled } from './utils';
+import { baseFildsDefault } from './confs';
+import { CHANNEL_ID } from './const';
+import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk/account-id';
 
 export const resolveAccount = (cfg: any, accountId?: string | null) => {
   const channelConfig = cfg?.channels?.[CHANNEL_ID] || {};
@@ -21,5 +19,6 @@ export const resolveAccount = (cfg: any, accountId?: string | null) => {
     groupAllowFrom: parseAllowFroms(acct?.groupAllowFrom || baseFildsDefault.groupAllowFrom),
     requireMention: isEnabled(acct?.requireMention ?? baseFildsDefault.requireMention),
     channelContext: acct?.channelContext || baseFildsDefault.channelContext,
+    emojiReaction: isEnabled(acct?.emojiReaction ?? baseFildsDefault.emojiReaction),
   };
 };

package/src/channel.ts

@@ -5,11 +5,8 @@
  * Supports single chat (text, image, voice, file) and group chat with @mentions.
  */
 import WebSocket from 'ws';
-import {
-  DEFAULT_ACCOUNT_ID,
-  setAccountEnabledInConfigSection,
-  deleteAccountFromConfigSection,
-} from 'openclaw/plugin-sdk';
+import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk/account-id';
+import { setAccountEnabledInConfigSection, deleteAccountFromConfigSection } from 'openclaw/plugin-sdk/core';
 import { CHANNEL_ID, CHANNEL_NAME } from "./const";
 import {
   checkAccount,
@@ -21,9 +18,8 @@ import {
 import { handleInboundMessage } from './inbound';
 import { capabilities, configSchema, baseFildsDefault } from './confs';
 import { resolveAccount } from "./accounts"
+import { isEnabled } from './utils';
 
-
-const isEnabled = (val: any) => val === undefined || !!val;
 const isConfigured = (account: any)=> !!(account?.appId && account?.appSecret);
 
 const wsReadyStates = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'] as const;

package/src/confs.ts

@@ -39,10 +39,13 @@ const baseFields = {
   },
   channelContext: {
     type: 'string',
-    default: 'channel',
+    default: 'thread',
     enum: ['channel', 'thread']
   },
-
+  emojiReaction: {
+    type: 'boolean',
+    default: true,
+  },
 };
 const baseFieldsKeys = Object.keys(baseFields);
 export const baseFildsDefault = {} as Record<string, any>;
@@ -86,7 +89,7 @@ const fieldsUiHints = {
       advanced: true,
     },
     groupAllowFrom: {
-      help: '群组/团队白名单-群ID和团队ID（仅在 groupPolicy=allowlist 生效）',
+      help: '群组/团队白名单-包含群ID、团队ID或频道ID（仅在 groupPolicy=allowlist 生效）',
       order: 14,
       advanced: true,
     },
@@ -95,9 +98,14 @@ const fieldsUiHints = {
       order: 15,
       advanced: true,
     },
+    emojiReaction: {
+      help: '在收到消息后，大模型给出反应结果前，先对原消息发送一个”收到“的表情回复。',
+      order: 16,
+      advanced: true,
+    },
 };
 
-/* 多账户管理 - 暂不开放，先保留代码逻辑
+/* 多账户管理 */
 const accountsFieldsUiHints = {} as Record<string, any>;
 function isValidObjKey(key: string | number | symbol , object: object): key is keyof typeof object {
   return key in object;
@@ -105,7 +113,6 @@ function isValidObjKey(key: string | number | symbol , object: object): key is k
 for (const k in fieldsUiHints) {
   if (isValidObjKey(k, fieldsUiHints)) accountsFieldsUiHints[`accounts.*.${k}` as string] = fieldsUiHints[k];
 }
-*/
 
 export const configSchema = {
   schema: {
@@ -113,7 +120,7 @@ export const configSchema = {
     additionalProperties: false,
     properties: {
       ...fields,
-      /* 基础配置信息中，准备 accounts 配置支持多账户管理，以备后续允许用户配置多个推推机器人账号
+      /* 基础配置信息中，准备 accounts 配置支持多账户管理 */
       accounts: {
         type: 'object',
         additionalProperties: {
@@ -121,17 +128,17 @@ export const configSchema = {
           additionalProperties: false,
           properties: { ...fields },
         },
-      }, */
+      },
     },
   },
   uiHints: {
     ...fieldsUiHints,
-    /* 基础配置信息中，准备 accounts 配置支持多账户管理，以备后续允许用户配置多个推推机器人账号
+    /* 基础配置信息中，准备 accounts 配置支持多账户管理 */
     accounts: {
       help: 'Accounts（多账户配置）',
       order: 30,
       advanced: true
     },
-    ...accountsFieldsUiHints, */
+    ...accountsFieldsUiHints,
   },
 };

package/src/histories.ts

@@ -0,0 +1,69 @@
+import {
+  DEFAULT_GROUP_HISTORY_LIMIT,
+  recordPendingHistoryEntryIfEnabled,
+  type HistoryEntry,
+} from "openclaw/plugin-sdk/reply-history";
+
+// 每个 accountId 独立的 group history map，防止多账户冲突
+const accountGroupHistories = new Map<string, Map<string, HistoryEntry[]>>();
+
+/**
+ * 记录没有被@，被忽略的群消息到对应 account 的 pending history 中
+ */
+export async function addUnmentionedHistory(apiRuntime, accountId: string, chatId: string, tuituiUserName: any, tuituiAccount: string, text: any, timestamp :any) {
+  const cfg = await apiRuntime.config.loadConfig();
+  const senderDesc = tuituiUserName ? `${tuituiUserName} (${tuituiAccount})` : tuituiAccount;
+
+  const entry: HistoryEntry = {
+    sender: senderDesc,
+    body: text,
+    timestamp: timestamp ? Number(timestamp) : Date.now(),
+ };
+
+  // 为每个 accountId 维护独立的 group history map
+  let groupHistories = accountGroupHistories.get(accountId);
+  if (!groupHistories) {
+    groupHistories = new Map<string, HistoryEntry[]>();
+    accountGroupHistories.set(accountId, groupHistories);
+  }
+
+  const historyLimit = resolveHistoryLimit(cfg);
+
+  // 这个API内部没啥神秘的，只是帮你维护map变量。openclaw本身不持有这些数据。
+  recordPendingHistoryEntryIfEnabled({
+    historyMap: groupHistories,
+    historyKey: chatId,
+    limit: historyLimit,
+    entry: entry,
+  });
+}
+
+/**
+ * 获取指定 account 和群组的 pending history，格式化为 ctx.InboundHistory 所需的格式
+ */
+export function popUnmentionedHistories(accountId: string, chatId: string): {sender: string, body: string, timestamp?: number}[] {
+  const groupHistories = accountGroupHistories.get(accountId);
+  if (!groupHistories) {
+    return [];
+  }
+  const his = groupHistories.get(chatId);
+  if (!his) {
+    return [];
+  }
+
+  groupHistories.delete(chatId);
+
+  return his.map((entry) => ({
+    sender: entry.sender,
+    body: entry.body,
+    timestamp: entry.timestamp,
+  }));
+}
+
+/**
+ * 从配置中解析 history limit
+ * dashboard->messages->groupChat->historyLimit
+ */
+export function resolveHistoryLimit(cfg: any): number {
+  return cfg.messages?.groupChat?.historyLimit ?? DEFAULT_GROUP_HISTORY_LIMIT;
+}

package/src/inbound.ts

@@ -23,6 +23,10 @@ import {
   teamsParseChatId,
 } from "./outbound";
 import { parseAllowFroms } from './utils';
+import {
+  addUnmentionedHistory,
+  popUnmentionedHistories,
+} from "./histories";
 
 /** 子函数共享的可变上下文，子函数直接修改字段，外层读取结果 */
 interface ChatPayload {
@@ -30,12 +34,14 @@ interface ChatPayload {
   chatId:       string | undefined;
   text:         string | undefined;
   groupName:    string | undefined;
+  channelName:  string | undefined;
   mediaUrls:    string[] | undefined;
   replyToId:    string | undefined;  // 引用ID
   msgId?:        string;       // 消息ID
   tuituiAccount:  string;
   tuituiUid:      string | undefined;
   tuituiUserName: string | undefined;
+  timestamp:      Number | undefined;
 }
 
 export interface InboundAccount {
@@ -48,6 +54,7 @@ export interface InboundAccount {
   groupAllowFrom: string[];
   requireMention: boolean;
   channelContext: string;
+  emojiReaction: boolean;
 }
 export interface InboundHandlerOptions {
   json: any
@@ -226,6 +233,7 @@ const parseAndVerifyPayload: Record<string, Function> = {
     payload.chatId   = chatId;
     payload.groupName = msgData.group_name;
     payload.msgId  = msgData.msgid;
+    payload.text = buildMessageBody(msgData);
     log?.debug?.(
       `[${CHANNEL_ID}] AccountId: ${accountId}, inbound group_chat:
       tuituiAccount=${payload.tuituiAccount},
@@ -248,7 +256,8 @@ const parseAndVerifyPayload: Record<string, Function> = {
     }
 
     if (!msgData.at_me && account.requireMention) {
-      log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore group message (not mentioned)`);
+      log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore group message (not mentioned), add to history key: ${chatId}`);
+      await addUnmentionedHistory(apiRuntime, accountId, chatId, payload.tuituiUserName, payload.tuituiAccount, payload.text, payload.timestamp);
       return false;
     }
 
@@ -267,19 +276,20 @@ const parseAndVerifyPayload: Record<string, Function> = {
       return false;
     }
 
-    payload.text = buildMessageBody(msgData);
+    
 
     return true;
   },
   teams_post_create: async (payload: ChatPayload, msgData: any, account: InboundAccount, apiRuntime: any, log: any): Promise<boolean> => {
     const { accountId, groupPolicy, groupAllowFrom } = account;
     payload.chatType  = CHAT_TYPE_CHANNEL;
-    const { team_id, channel_id, parent_id, post_id, content } = msgData;
+    const { team_id, channel_id, parent_id, post_id, content, team_name, channel_name } = 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.channelName = channel_name;
     payload.replyToId = "";
     log?.debug?.(
       `[${CHANNEL_ID}] AccountId: ${accountId}, inbound teams:
@@ -304,11 +314,18 @@ const parseAndVerifyPayload: Record<string, Function> = {
     }
 
     if (!msgData.at_me && account.requireMention) {
-      log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore teams post (not mentioned)`);
+      log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore teams post (not mentioned), add to history key: ${chatId}`);
+      await addUnmentionedHistory(apiRuntime, accountId, chatId, payload.tuituiUserName, payload.tuituiAccount, payload.text, payload.timestamp);
       return false;
     }
 
-    if (!groupAllowFrom.includes(String(team_id))) {
+    if (!groupAllowFrom.includes(String(team_id)) && !groupAllowFrom.includes(String(channel_id)) ) {
+      if (!msgData.at_me) {
+        // 解决这个case：requireMention=false时，团队里发任意帖子都会回复加白，搞得没法用
+        // 要求必须@才触发回复加白
+        log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore teams post (not mentioned)`);
+        return false;
+      }
       if (needPairingThrottle(accountId, chatId)) {
         log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, teams pairing throttled for teamsChatId=${chatId}`);
         return false;
@@ -317,7 +334,7 @@ const parseAndVerifyPayload: Record<string, Function> = {
         account,
         chatId,
         payload.chatType,
-        `当前openclaw（AccountId: ${accountId}）群聊/团队策略为白名单，需要主人在群白名单(Group Allow From)增加当前团队ID：\n${team_id}`,
+        `当前openclaw（AccountId: ${accountId}）群聊/团队策略为白名单，需要主人在群白名单(Group Allow From)增加当前团队ID: ${team_id} 或者频道ID: ${channel_id} 如果配置团队ID指当前团队下所有频道都可以使用，如果配置频道ID则仅此频道可使用`,
         'tuitui.groupPolicy.reply',
       );
       return false;
@@ -349,11 +366,13 @@ export async function handleInboundMessage({ json, account, apiRuntime, log }: I
     chatId:       undefined, 
     text:         undefined,
     groupName:    undefined,
+    channelName:  undefined,
     mediaUrls:    getMediaUrls(msgData),
     replyToId:    ref?.is_me && ref?.msgid ? ref.msgid : undefined,
     tuituiAccount: msg.user_account || "",
     tuituiUid:     msg.uid || "",
     tuituiUserName: msg.user_name || "",
+    timestamp:     msg.timestamp ? parseInt(msg.timestamp, 10)*1000 : undefined
   };
   const wsEvent = json.body.event;
   // 按event类型，标准化并校验基础数据
@@ -369,8 +388,10 @@ export async function handleInboundMessage({ json, account, apiRuntime, log }: I
     return;
   }
 
-  // 因为回复较慢，先回复一个表情
-  await tuituiEmojiReaction(account, payload.chatId, payload.chatType, payload.msgId, '收到');
+  if (account.emojiReaction) {
+    // 因为回复较慢，先回复一个表情
+    await tuituiEmojiReaction(account, payload.chatId, payload.chatType, payload.msgId, '收到');
+  }
 
   // 路由判断
   const routeSenderFrom = payload.tuituiAccount || payload.tuituiUid || 'unknown';
@@ -379,6 +400,14 @@ export async function handleInboundMessage({ json, account, apiRuntime, log }: I
   const sessionKey = getSessionKey(cfg, payload, account, apiRuntime);
   log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, dispatching to agent session=${sessionKey}, chatType: ${payload.chatType}, chatId ${payload.chatId}, routeSenderFrom: ${routeSenderFrom}`);
 
+  if(payload.text?.startsWith("/new") || payload.text?.endsWith("/new")) {
+    // 清理agent上下文时，同时清空历史
+    popUnmentionedHistories(accountId, payload.chatId);
+  }
+
+  // 字段意义 参考 openclaw 代码
+  // src\auto-reply\reply\inbound-meta.ts
+  // buildInboundUserContextPrefix()
   const ctx: any = {
     Body:               payload.text! || ' ',
     From:               String(routeSenderFrom),
@@ -392,17 +421,24 @@ export async function handleInboundMessage({ json, account, apiRuntime, log }: I
     Surface:            CHANNEL_ID,
     Provider:           CHANNEL_ID,
     SenderName:         payload.tuituiUserName,
-    MsgUname:           payload.tuituiAccount,
+    SenderId:           payload.tuituiAccount,
+    SenderUsername:     payload.tuituiAccount, 
     UserAccount:        payload.tuituiAccount,
+    Timestamp:          payload.timestamp,
     CommandAuthorized:  true,  // 允许 /new 等内置命令
   };
   if (payload.chatType == CHAT_TYPE_GROUP && payload.chatId) {
     ctx.GroupSubject = payload.groupName;
     ctx.GroupId      = payload.chatId;
+    ctx.InboundHistory = popUnmentionedHistories(accountId, payload.chatId);
+  }
+  if (payload.chatType == CHAT_TYPE_CHANNEL) {
+    ctx.GroupChannel = payload.channelName;
+    ctx.InboundHistory = popUnmentionedHistories(accountId, payload.chatId);
   }
   if (payload.mediaUrls?.length)  ctx.MediaUrls  = payload.mediaUrls;
   if (payload.replyToId)          ctx.ReplyToId  = payload.replyToId;
 
-  log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, handleInboundMessage dispatchReply payload:`, JSON.stringify(payload, null, '  '));
+  log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, handleInboundMessage dispatchReply ctx: ${JSON.stringify(ctx, null, '  ')}`);
   dispatchReply(ctx, cfg, account, payload, apiRuntime, log);
 }

package/src/outbound.ts

@@ -1,6 +1,6 @@
 import { readFileSync, existsSync, statSync } from 'node:fs';
 import { basename } from 'node:path';
-import { fetchWithSsrFGuard } from 'openclaw/plugin-sdk';
+import { fetchWithSsrFGuard } from 'openclaw/plugin-sdk/tlon';
 import { CHANNEL_ID } from "./const";
 
 import type { 
@@ -491,6 +491,7 @@ export async function sendMediaMsg(
   atList?: string[],
 ): Promise<void> {
   if (!chatId) return console.error(`[${CHANNEL_ID}] sendMediaMsg Error ${auditCtx}: Missing "target"`);
+  console.log(`[${CHANNEL_ID}] sendMediaMsg ${chatType} ${chatId} ${auditCtx} uploading`);
   // Check if mediaUrl looks like an image
   const isImage = /^data:image\//i.test(mediaUrl) || /\.(jpg|jpeg|png|gif)(?:$|[?#])/i.test(mediaUrl);
   const mediaType = isImage ? 'image' : 'file';

package/src/tools.ts

@@ -1,9 +1,8 @@
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
-import type { OpenClawPluginToolContext } from "openclaw/plugin-sdk";
-import {  DEFAULT_ACCOUNT_ID} from 'openclaw/plugin-sdk';
+import type { OpenClawPluginToolContext } from "openclaw/plugin-sdk/core";
 import { CHANNEL_ID} from "./const";
 import { resolveAccount } from "./accounts"
-import { Type, type Static } from "@sinclair/typebox";
+import { Type } from "@sinclair/typebox";
 
 import {CHAT_TYPE_DIRECT,CHAT_TYPE_GROUP,CHAT_TYPE_CHANNEL,ChatType, getChatRecord} from "./outbound"
   
@@ -66,13 +65,13 @@ const tuituiToolFactory = (ctx: OpenClawPluginToolContext) => {
     label: "tuitui IM",
     description: "推推(tuitui) 聊天记录获取，可查询群聊和私聊的聊天记录。\n\n",
     parameters: tuitui_im_get_messages_schema,
-    execute: async (_toolCallId, params) => {
+    execute: async (_toolCallId: any, params: any) => {
       if(messageChannel != CHANNEL_ID) {
         console.log(`tuitui_im_get_messages(): bad channel ${messageChannel}`);
         return
       }
       console.log(`tuitui_im_get_messages(): agentAccountId: ${agentAccountId}, sessionKey: ${sessionKey}`, params);
-      return await tuitui_im_get_messages(config, agentAccountId, params);
+      return await tuitui_im_get_messages(config, String(agentAccountId), params);
     },
   };
 };

package/src/utils.ts

@@ -2,4 +2,6 @@
 export const parseAllowFroms = (allowFrom: any) : string[] => {
   const arr = Array.isArray(allowFrom) ? allowFrom : [];
   return arr.filter((v: any) => !!v).map((v: any) => String(v).toLowerCase().trim());
-}
+}
+
+export const isEnabled = (val: any) => val === undefined || !!val;