@qihoo/tuitui-openclaw-channel 1.0.30 → 1.0.31

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.31",
   "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/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/tools.ts

@@ -4,7 +4,7 @@ import { resolveAccount } from "./accounts"
 import { Type } from "@sinclair/typebox";
 
 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;

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;