@qihoo/tuitui-openclaw-channel 1.0.30 → 1.0.32

package/openclaw.plugin.json

@@ -43,7 +43,7 @@
             "enum": ["channel", "thread"]
           },
           "emojiReaction": { "type": "boolean", "default": true },
-          "monitorEnabled": { "type": "boolean", "default": false },
+          "monitorEnabled": { "type": "boolean", "default": true },
           "accounts": {
             "type": "object",
             "additionalProperties": {
@@ -79,7 +79,7 @@
                   "enum": ["channel", "thread"]
                 },
                 "emojiReaction": { "type": "boolean", "default": true },
-                "monitorEnabled": { "type": "boolean", "default": false }
+                "monitorEnabled": { "type": "boolean", "default": true }
               }
             }
           }
@@ -131,7 +131,7 @@
           "advanced": true
         },
         "monitorEnabled": {
-          "help": "是否开启agent事件信息上报（默认 false）。",
+          "help": "是否开启频道agent事件上报，用于频道展示agent执行中间步骤（默认 true）",
           "order": 17,
           "advanced": true
         },
@@ -185,7 +185,7 @@
           "advanced": true
         },
         "accounts.*.monitorEnabled": {
-          "help": "是否开启agent事件信息上报（默认 false）。",
+          "help": "是否开启频道agent事件上报，用于频道展示agent执行中间步骤（默认 true）。",
           "order": 311,
           "advanced": true
         }

package/package.json

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

package/src/accounts.ts

@@ -7,7 +7,7 @@ export const dmPolicyDefault = 'pairing';
 export const groupPolicyDefault = 'allowlist';
 export const requireMentionDefault = true;
 export const emojiReactionDefault = true;
-export const monitorEnabledDefault = false;
+export const monitorEnabledDefault = true;
 
 const mergeArrs = (arr1: any, arr2: any) => {
   return [...new Set([...(arr1 || []), ...arr2 || []])];
@@ -20,7 +20,7 @@ export const getAccountInfo = (acct?: any) => ({
   dmPolicy: acct?.dmPolicy || dmPolicyDefault,
   allowFrom: parseAllowFroms(acct?.allowFrom || []),
   // 群组策略与白名单、群组级覆盖
-  groupPolicy: acct?.groupPolic || groupPolicyDefault,
+  groupPolicy: acct?.groupPolicy || groupPolicyDefault,
   groupAllowFrom: parseAllowFroms(acct?.groupAllowFrom || []),
   requireMention: isEnabled(acct?.requireMention ?? requireMentionDefault),
   emojiReaction: isEnabled(acct?.emojiReaction ?? emojiReactionDefault),

package/src/channel.ts

@@ -6,6 +6,7 @@
 import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk/account-id';
 import { setAccountEnabledInConfigSection, deleteAccountFromConfigSection, OpenClawPluginApi } from 'openclaw/plugin-sdk/core';
 import { CHANNEL_ID, CHANNEL_NAME } from "./const";
+import { version } from "../package.json"
 import { handleInboundMessage } from './inbound';
 import { guessChatTypeV2 }  from "./chat_record"
 import {
@@ -55,7 +56,7 @@ function createTuiTuiChannelPlugin(apiRuntime: any) {
       id: CHANNEL_ID,
       label: CHANNEL_NAME,
       selectionLabel: CHANNEL_NAME,
-      detailLabel: CHANNEL_NAME,
+      detailLabel: CHANNEL_NAME + " " + version,
       docsPath: `/channels/${CHANNEL_ID}`,
       blurb: `Connect to ${CHANNEL_NAME} bot via WebSocket`,
       order: 100,

package/src/chat_base.ts

@@ -33,18 +33,38 @@ export function teamsParseChatId(chatId: string): TuiTuiTeamsTarget {
 }
 
 
-export function parseChannelIdBySessionKey(str: string): string {
-  // 检查是否包含必须的格式 "tuitui:channel:"
+export interface TuiTuiSessionKeyInfo {
+  chat_type: ChatType,
+  channel_id: string;
+  thread_id: string;
+}
+
+// 暂时只支持频道(后续可以完善)
+// 格式 agent:coder:tuitui:channel:123:thread:456
+export function parseSessionKey(str: string): TuiTuiSessionKeyInfo {
+  const info: TuiTuiSessionKeyInfo = { chat_type: CHAT_TYPE_DIRECT, channel_id: '', thread_id: '' };
+
   if (!str.includes('tuitui:channel:')) {
-      return "";
+    return info;
   }
-  
+
+  info.chat_type = CHAT_TYPE_CHANNEL;
+
   const parts = str.split(':');
   const channelIndex = parts.findIndex(part => part === 'channel');
-  
   if (channelIndex !== -1 && parts[channelIndex + 1]) {
-      return parts[channelIndex + 1];
+    info.channel_id = parts[channelIndex + 1];
   }
-  
-  return "";
+
+  const threadIndex = parts.findIndex(part => part === 'thread');
+  if (threadIndex !== -1 && parts[threadIndex + 1]) {
+    info.thread_id = parts[threadIndex + 1];
+  }
+
+  return info;
+}
+
+export function parseChannelIdBySessionKey(str: string): string {
+  const info = parseSessionKey(str);
+  return info.channel_id;
 }

package/src/chat_record.ts

@@ -1,6 +1,8 @@
 import { CHANNEL_ID } from "./const";
 import {CHAT_TYPE_DIRECT,CHAT_TYPE_GROUP,CHAT_TYPE_CHANNEL,ChatType, teamsParseChatId, guessChatType, teamsBuildChatId} from "./chat_base"
 import { tuituiRobotApi } from "./robot_api"
+import { parseSessionKey } from "./chat_base"
+import {getChannelInfoByChannelId} from "./robot_helper"
 import type { TuiTuiMessageData} from './types';
 
 export interface TuiTuiChatRecordMessage {
@@ -236,6 +238,7 @@ export async function getChannelInfoById(account: any, channel_id: string): Prom
 }
 
 interface TeamsPostChainItem {
+  from_uid: string;
   post_id: string;
   time: string;
   last_reply_time: string; // 只有主贴有最后回帖时间，所有的回帖更新的都是主贴的属性
@@ -261,6 +264,7 @@ function parsePost(item: any): TeamsPostChainItem[] {
   const posts: TeamsPostChainItem[] = [];
 
   posts.push({
+    from_uid: topic.from_uid ?? '', 
     post_id: topic.post_id ?? '',
     time: topic.create_time ?? '',
     last_reply_time: topic.last_reply_time ?? '',
@@ -271,6 +275,7 @@ function parsePost(item: any): TeamsPostChainItem[] {
 
   for (const post of [...replyList].reverse()) {
     posts.push({
+      from_uid: post.from_uid ?? '', 
       post_id: post.post_id ?? '',
       time: post.create_time ?? '',
       last_reply_time : '',
@@ -365,12 +370,26 @@ async function getPostChain(
 
   const datas = data.datas ?? {};
 
-  const posts = parsePost(datas)  
+  const posts = parsePost(datas)
 
   console.log(`[${CHANNEL_ID}] getPostChain result: ${posts.length} posts`, posts);
   return posts;
 }
 
+export async function getPostChainBySessionKey(
+  account: any,
+  sessionKey: string,
+): Promise<TeamsPostChainItem[]> {
+  const session_info = parseSessionKey(sessionKey);
+
+  const channelInfo = await getChannelInfoByChannelId(account, session_info.channel_id);
+  if (!channelInfo) {
+    throw new Error(`无法获取频道信息`);
+  }
+
+  return await getPostChain(account, channelInfo.team_id, session_info.channel_id, session_info.thread_id);
+}
+
 export async function getPostChainByChatId(
   account: any,
   chatId: string,

package/src/filespace.ts

@@ -1,6 +1,7 @@
 import { CHANNEL_ID } from "./const";
 import { tuituiRobotApi, downloadUrl, tuituiRobotUpload} from "./robot_api"
-import {parseChannelIdBySessionKey} from "./chat_base"
+import {CHAT_TYPE_CHANNEL, parseSessionKey} from "./chat_base"
+import {getChannelInfoByChannelId} from "./robot_helper"
 
 export const NODE_TYPE_DIR  = '1';
 export const NODE_TYPE_FILE = '2';
@@ -51,29 +52,21 @@ export function flattenFileSpaceList(list: any[]): FileSpaceItem[] {
   }));
 }
 
-
-
-async function getChannelInfoBySessionKey(account: any, sessionKey: string) {
-  const channel_id = parseChannelIdBySessionKey(sessionKey);
-  if(!channel_id) {
-    return null;
-  }
-
-  const payload = {channel_id: channel_id};
-  const body = await tuituiRobotApi(account, '/teams/channel/info', payload);
-  return body?.datas?.info;
-}
-
 export async function file_space_list(
   account: any,
   sessionKey: string
 ): Promise<any> {
 
-  const channelInfo = await getChannelInfoBySessionKey(account, sessionKey);
-  if (!channelInfo) {
+  const session_info = parseSessionKey(sessionKey);
+  if(session_info.chat_type != CHAT_TYPE_CHANNEL) {
     throw new Error(`私聊、群聊会话不支持共享空间。仅团队频道支持。`);
   }
 
+  const channelInfo = await getChannelInfoByChannelId(account, session_info.channel_id);
+  if (!channelInfo) {
+    throw new Error(`无法获取频道信息`);
+  }
+
   const payload = {
     space_id: channelInfo.team_id,
     space_type: SPACE_TYPE_TEAM,
@@ -81,6 +74,8 @@ export async function file_space_list(
 
   const data = await tuituiRobotApi(account, '/file_space/node/list', payload);
 
+  //console.log(JSON.stringify(data));
+
   const list = data?.datas?.list;
   const flat_list = flattenFileSpaceList(list);
 
@@ -98,7 +93,8 @@ export async function file_space_list(
 async function ensureFolderPath(
   account: any,
   spaceId: string,
-  folderPath: string
+  folderPath: string,
+  source: string
 ): Promise<string> {
   // 标准化路径
   const normalizedPath = folderPath.startsWith('/') ? folderPath : '/' + folderPath;
@@ -151,6 +147,7 @@ async function ensureFolderPath(
         node_type: NODE_TYPE_DIR,
         name: folderName,
         parent_id: currentParentId,
+        source: source,
       };
 
       const createResult = await tuituiRobotApi(account, '/file_space/node/add', createFolderPayload);
@@ -184,11 +181,18 @@ export async function file_space_add(
   cloud_filepath: string,
   url_or_localpath: string,
 ): Promise<any> {
-  const channelInfo = await getChannelInfoBySessionKey(account, sessionKey);
-  if (!channelInfo) {
+  const session_info = parseSessionKey(sessionKey);
+  if(session_info.chat_type != CHAT_TYPE_CHANNEL) {
     throw new Error(`私聊、群聊会话不支持共享空间。仅团队频道支持。`);
   }
 
+  const channelInfo = await getChannelInfoByChannelId(account, session_info.channel_id);
+  if (!channelInfo) {
+    throw new Error(`无法获取频道信息`);
+  }
+
+  const source = session_info.thread_id;
+
   // 1. 解析云路径，分离目录和文件名
   const normalizedPath = cloud_filepath.startsWith('/')
     ? cloud_filepath
@@ -201,7 +205,7 @@ export async function file_space_add(
     : '';
 
   // 2. 确保目标目录存在，获取 parent_id
-  const parentId = await ensureFolderPath(account, channelInfo.team_id, folderPath);
+  const parentId = await ensureFolderPath(account, channelInfo.team_id, folderPath, source);
 
   // 3. 上传文件获取 fid
   const isImage = /^data:image\//i.test(url_or_localpath) || /\.(jpg|jpeg|png|gif)(?:$|[?#])/i.test(url_or_localpath);
@@ -219,6 +223,7 @@ export async function file_space_add(
     name: filename,
     fid: fid,
     parent_id: parentId,
+    source: source,
   };
 
   const body = await tuituiRobotApi(account, '/file_space/node/add', filePayload);

package/src/inbound.ts

@@ -19,11 +19,13 @@ import {
   sendPageMsg,
   sendMediaMsg,
   get_announcement,
+  get_team_members,
 } from "./outbound";
 import { parseChatMessageBody } from './inbound_body_parse';
 import { parseAllowFroms } from './utils';
 import { addUnmentionedHistory, popUnmentionedHistories } from "./histories";
 import { StringDeduplicator } from "./deduplicator"
+import { getPostChainByChatId } from "./chat_record"
 
 // 会话上下文注入排重
 let _session_ctx_injected = new StringDeduplicator(1000, 3600);
@@ -177,19 +179,52 @@ async function sendSingleChatPairingMsg(account: any, payload: any, log: any, ap
   }
 }
 
-//目标账号是否允许私聊（私聊白名单、配对、或者open）
-async function isAllowAccount(tuituiAccount: any, apiRuntime: any, account: InboundAccount) {
-  if(!tuituiAccount) return false;
+//tuituiAccounts列表中是否存在至少1个允许私聊的用户（私聊白名单、配对、或者open）
+async function isAllowOneOfAccount(tuituiAccounts: string[], apiRuntime: any, account: InboundAccount) {
+  if(!tuituiAccounts) return false;
   const { accountId, allowFrom, dmPolicy } = account;
   if (dmPolicy === 'open') return true;
 
-  let storeAllowFrom: string[] = [];
+  // 是否包含任意一个元素
+  if (tuituiAccounts.some(item => allowFrom.includes(item))) return true;
+
   try {
-    storeAllowFrom = parseAllowFroms(
+    let storeAllowFrom = parseAllowFroms(
       await apiRuntime?.channel?.pairing?.readAllowFromStore?.({ channel: CHANNEL_ID, accountId })
     );
+    if (tuituiAccounts.some(item => storeAllowFrom.includes(item))) return true;
   } catch {}
-  return [...allowFrom, ...storeAllowFrom].includes(tuituiAccount);
+  return false;  
+}
+
+async function isAllowAccount(tuituiAccount: string, apiRuntime: any, account: InboundAccount) {
+  return await isAllowOneOfAccount([tuituiAccount], apiRuntime, account);
+}
+
+async function isChannelCoordAuthorized(tuituiAccount: string, apiRuntime: any, account: InboundAccount, team_id:string, chat_id:string) {
+  // 协调员身份校验
+  if (tuituiAccount != "bot-FiwwCeDw" && tuituiAccount != "bot-sUwUeknd") return false;
+
+  // 当前 thread 中有白名单用户发帖，则协调员继承该权限
+  const [members, posts] = await Promise.all([
+    get_team_members(account, team_id),
+    getPostChainByChatId(account, chat_id),
+  ]);
+  if (!members?.length || !posts?.length) return false;
+
+  const from_uids = posts.map((p: any) => p.from_uid).filter(Boolean);
+  if (!from_uids.length) return false;
+
+  //console.log("from_uids", from_uids);
+
+  // 将 uid 映射到 user_account
+  const from_accounts: string[] = members
+    .filter((m: any) => from_uids.includes(m.uid) && m.account)
+    .map((m: any) => String(m.account));
+  if (!from_accounts.length) return false;
+
+  //console.log("from_accounts", from_accounts);
+  return await isAllowOneOfAccount(from_accounts, apiRuntime, account);
 }
 
 
@@ -386,6 +421,12 @@ async function parse_teams_post(payload: ChatPayload, msgData: any, account: Inb
       log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore teams post (not mentioned)`);
       return false;
     }
+
+    // 频道中允许协调员@自己（且帖子里有白名单用户发帖）
+    if (await isChannelCoordAuthorized(tuituiAccount, apiRuntime, account, team_id, chatId)) {
+      return true;
+    }
+
     if (needPairingThrottle(accountId, chatId)) {
       log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, teams pairing throttled for teamsChatId=${chatId}`);
       return false;

package/src/monitor.ts

@@ -2,10 +2,10 @@
  * TuiTui Monitor — 将 OpenClaw Hook 事件批量上报到监控接口。
  *
  * 每个账户（appId/appSecret）维护独立队列，满足以下任一条件时批量上报：
- *   - 队列积累达 BATCH_MAX_SIZE 条（默认 100）
- *   - 距上次 flush 超过 BATCH_INTERVAL_MS（默认 15s）
+ *   - 队列积累达 BATCH_MAX_SIZE 条
+ *   - 距上次 flush 超过 BATCH_INTERVAL_MS
  *
- * 需在配置中将 monitorEnabled 设为 true 才会上报（默认 false）。
+ * 需在配置中将 monitorEnabled 设为 true 才会上报
  *
  * 配置示例（openclaw.json）：
  *   channels.tuitui.monitorEnabled: true
@@ -14,6 +14,7 @@ import type { OpenClawPluginApi } from 'openclaw/plugin-sdk';
 import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk/account-id';
 import { CHANNEL_ID } from './const';
 import { tuituiRobotApi } from './robot_api';
+import {parseChannelIdBySessionKey} from "./chat_base"
 
 // 批量上报参数
 const BATCH_MAX_SIZE    = 100;       // 达到此条数立即 flush
@@ -272,19 +273,27 @@ function report(
   ctx: unknown,
   data: unknown,
 ): void {
-  let agentId: string | null;
+  let sessionKey = "";
 
   // subagent hook 的 ctx 有 childSessionKey，普通 hook 有 sessionKey
   if (eventType === 'subagent_spawned' || eventType === 'subagent_ended') {
-    agentId = extractAgentId((ctx as any)?.childSessionKey);
+    sessionKey = (ctx as any)?.childSessionKey
   } else {
-    agentId = extractAgentId((ctx as any)?.sessionKey);
+    sessionKey = (ctx as any)?.sessionKey
   }
 
+  const agentId = extractAgentId(sessionKey);
   if (!agentId) return;
 
+  // 仅频道支持；私聊群聊不启用
+  const channelId = parseChannelIdBySessionKey(sessionKey);
+  if(!channelId) return;
+
+  const reportedAccountIds = new Map<string, boolean>();
   for (const target of targets) {
     if (target.agentId !== agentId) continue;
+    if (reportedAccountIds.has(target.accountId)) continue;
+    reportedAccountIds.set(target.accountId, true);
 
     const payload: MonitorPayload = {
       event: eventType,

package/src/outbound.ts

@@ -234,3 +234,12 @@ export async function get_announcement(account: any, id: any, id_is_session: boo
   const announcement = body?.datas?.info?.announcement;
   return announcement;
 }
+
+
+export async function get_team_members(account: any, team_id: string): Promise<any> {
+  const payload = {team_id: team_id};
+  const body = await tuituiRobotApi(account, '/teams/member/list', payload);
+  const members = body?.datas?.members;
+  //console.log("info", members);
+  return members;
+}

package/src/robot_api.ts

@@ -19,6 +19,8 @@ export function checkAccount(account: any, ctxTips: string = 'send text') {
 export async function tuituiRobotApi(account: any, api: string, payload: any, log: boolean = true) {
   checkAccount(account);
 
+  const startTime = Date.now(); // 记录开始时间
+
   if (log) {
     console.log(`[${CHANNEL_ID}] ${api} request`, payload);
   }
@@ -51,6 +53,11 @@ export async function tuituiRobotApi(account: any, api: string, payload: any, lo
     throw err;
   } finally {
     await release();
+    if (log) {
+      const endTime = Date.now(); // 记录结束时间
+      const duration = endTime - startTime; // 计算耗时
+      console.log(`[${CHANNEL_ID}] ${api} response took ${duration}ms`);
+    }
   }
 }
 

package/src/robot_helper.ts

@@ -0,0 +1,7 @@
+import { tuituiRobotApi}  from "./robot_api"
+
+export async function getChannelInfoByChannelId(account: any, channel_id: string) {
+  const payload = {channel_id: channel_id};
+  const body = await tuituiRobotApi(account, '/teams/channel/info', payload);
+  return body?.datas?.info;
+}

package/src/tools.ts

@@ -2,9 +2,9 @@ import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
 import type { OpenClawPluginToolContext } from "openclaw/plugin-sdk/core";
 import { resolveAccount } from "./accounts"
 import { Type } from "@sinclair/typebox";
-
+import { CHANNEL_ID } from './const';
 import {sendTextMsg, get_announcement} from "./outbound"
-import {CHAT_TYPE_DIRECT,CHAT_TYPE_GROUP,CHAT_TYPE_CHANNEL, teamsBuildChatId} from "./chat_base"
+import {CHAT_TYPE_DIRECT,CHAT_TYPE_GROUP,CHAT_TYPE_CHANNEL,guessChatType, teamsBuildChatId} from "./chat_base"
 import {getChatRecord, getChannelInfoById} from "./chat_record"
 import {file_space_list, file_space_add} from "./filespace"
   
@@ -74,9 +74,17 @@ const tuitui_send_channel_post_factory = (ctx: OpenClawPluginToolContext) => {
         return tool_errmsg(`invalid tuitui account ${ctx.agentAccountId}`);
       }
 
-      const channel_info = await getChannelInfoById(account, params?.channel_id);
-      const team_id = channel_info?.team_id;
-      const chatId = teamsBuildChatId(team_id, params?.channel_id, params?.parent_id);
+      let chatId = "";
+      const guessType = guessChatType(params?.channel_id);
+      if(guessType == CHAT_TYPE_CHANNEL) {
+        // 解决badcase: 发个帖子，内容是个笑话
+        // 如果用户没明确说频道ID，大模型在频道调用发帖tool会传sessionKey过来
+        chatId = params?.channel_id;
+      } else {
+        const channel_info = await getChannelInfoById(account, params?.channel_id);
+        const team_id = channel_info?.team_id;
+        chatId = teamsBuildChatId(team_id, params?.channel_id, params?.parent_id);
+      }
 
       const result: Promise<any> = sendTextMsg(account, chatId, CHAT_TYPE_CHANNEL, params?.markdown);
       return result;
@@ -154,6 +162,14 @@ export function registerTuituiTools(api: OpenClawPluginApi) {
     api.logger.debug?.("tuitui: Registered tool: No config available");
     return;
   }
+
+  const channels = api.config.channels || {};
+  const currChannel = channels[CHANNEL_ID] || {};
+  if (!currChannel?.appId && !currChannel?.accounts) {
+    // 无推推配置时，不需要注册工具防止污染上下文
+    // api.logger.info?.(`tuitui: ignore Registered tools`);
+    return
+  }
   
   api.registerTool(tuitui_im_get_messages_factory);
   api.registerTool(tuitui_send_channel_post_factory);

package/src/websocket.ts

@@ -73,6 +73,14 @@ export default function createWebSocket({ account, log, abortSignal, onConnected
         if (firsEvtId) wsEvtIds.delete(firsEvtId);
       }
 
+      // 收到包含心跳在内的任意消息，则重置心跳超时计时器，如果 300 秒内没有收到任何消息（包括心跳），则认为连接已失效
+      _clearTimeoutTimer();
+      _timeoutId = setTimeout(() => {
+        log?.warn?.(`[${CHANNEL_ID}] AccountId: ${accountId}, WebSocket[${wsId}] Heartbeat Timeout`);
+        _closeWS();
+        _restartWS(1e3);
+      }, 3e5); // 300秒心跳超时
+
       const wsEvent = json?.body?.event;
       if (wsEvent === 'keepalive') return;