@qihoo/tuitui-openclaw-channel 1.0.13 → 1.0.14

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.14",
   "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

@@ -42,7 +42,10 @@ const baseFields = {
     default: 'channel',
     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/inbound.ts

@@ -48,6 +48,7 @@ export interface InboundAccount {
   groupAllowFrom: string[];
   requireMention: boolean;
   channelContext: string;
+  emojiReaction: boolean;
 }
 export interface InboundHandlerOptions {
   json: any
@@ -308,7 +309,13 @@ const parseAndVerifyPayload: Record<string, Function> = {
       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 +324,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;
@@ -369,8 +376,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';
@@ -403,6 +412,6 @@ export async function handleInboundMessage({ json, account, apiRuntime, log }: I
   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 { 

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;