@qihoo/tuitui-openclaw-channel 1.0.29 → 1.0.30

package/openclaw.plugin.json

@@ -131,7 +131,7 @@
           "advanced": true
         },
         "monitorEnabled": {
-          "help": "是否开启agent事件信息上报（默认 false）。修改后必须重启网关才能生效。",
+          "help": "是否开启agent事件信息上报（默认 false）。",
           "order": 17,
           "advanced": true
         },
@@ -185,7 +185,7 @@
           "advanced": true
         },
         "accounts.*.monitorEnabled": {
-          "help": "是否开启agent事件信息上报（默认 false）。修改后必须重启网关才能生效。",
+          "help": "是否开启agent事件信息上报（默认 false）。",
           "order": 311,
           "advanced": true
         }

package/package.json

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

package/src/monitor.ts

@@ -34,7 +34,9 @@ export type MonitorEventType =
   | 'after_tool_call'
   | 'session_start'
   | 'session_end'
-  | 'agent_end';
+  | 'agent_end'
+  | 'subagent_spawned'
+  | 'subagent_ended';
 
 export interface MonitorPayload {
   event: MonitorEventType;
@@ -176,26 +178,22 @@ function resolveMonitorTargets(cfg: any): MonitorTarget[] {
 // ─────────────────────────────────────────────────────────────
 
 /**
- * 从 ctx.sessionKey 中解析出 agentId。
- * sessionKey 格式：agent:<agentId>:tuitui:<accountId>:<chatType>:<chatId>
+ * 从 sessionKey 字符串中解析出 agentId。
+ * sessionKey 格式：agent:<agentId>:...
  */
-function extractAgentIdFromCtx(ctx: unknown): string | null {
-  const c = ctx as any;
-  if (typeof c?.sessionKey === 'string') {
-    const parts = c.sessionKey.split(':');
-    const agentIdx = parts.indexOf('agent');
-    if (agentIdx !== -1 && agentIdx + 1 < parts.length && parts[agentIdx + 1]) {
-      return parts[agentIdx + 1];
-    }
-  }
-  return null;
+function extractAgentId(sessionKey: unknown): string | null {
+  if (typeof sessionKey !== 'string') return null;
+  const parts = sessionKey.split(':');
+  const idx = parts.indexOf('agent');
+  if (idx === -1 || !parts[idx + 1]) return null;
+  return parts[idx + 1];
 }
 
 // ─────────────────────────────────────────────────────────────
 // 大字段裁剪
 // ─────────────────────────────────────────────────────────────
 
-const TRUNCATE_LIMIT = 500;
+const TRUNCATE_LIMIT = 64 * 1024; // 64 KB
 
 function truncate(s: unknown): unknown {
   if (typeof s !== 'string' || s.length <= TRUNCATE_LIMIT) return s;
@@ -265,7 +263,7 @@ function trimData(eventType: MonitorEventType, data: unknown): unknown {
 }
 
 // ─────────────────────────────────────────────────────────────
-// 主入口：收到 hook 事件后入队（targets 由注册时闭包捕获）
+// 主入口：收到 hook 事件后入队
 // ─────────────────────────────────────────────────────────────
 
 function report(
@@ -274,7 +272,15 @@ function report(
   ctx: unknown,
   data: unknown,
 ): void {
-  const agentId = extractAgentIdFromCtx(ctx);
+  let agentId: string | null;
+
+  // subagent hook 的 ctx 有 childSessionKey，普通 hook 有 sessionKey
+  if (eventType === 'subagent_spawned' || eventType === 'subagent_ended') {
+    agentId = extractAgentId((ctx as any)?.childSessionKey);
+  } else {
+    agentId = extractAgentId((ctx as any)?.sessionKey);
+  }
+
   if (!agentId) return;
 
   for (const target of targets) {
@@ -295,16 +301,17 @@ function report(
 }
 
 // ─────────────────────────────────────────────────────────────
-// 注册全量 Hook（启动时一次性读配置，无启用账户则静默跳过）
+// 注册全量 Hook
 // ─────────────────────────────────────────────────────────────
 
 export function registerMonitorHooks(api: OpenClawPluginApi) {
-  const targets = resolveMonitorTargets(api.config);
-  if (targets.length === 0) return;
-
-  // targets 通过闭包捕获，所有 hook 共享，零运行时开销
   const on = (eventType: MonitorEventType) =>
-    api.on(eventType, (event, ctx) => { report(targets, eventType, ctx, event); });
+    api.on(eventType as any, (event: unknown, ctx: unknown) => {
+      const targets = resolveMonitorTargets(api.runtime.config.loadConfig());
+      if (targets.length > 0) {
+        report(targets, eventType, ctx, event);
+      }
+    });
 
   // ── Agent run 阶段 ────────────────────────────────────────
   on('llm_input');
@@ -327,5 +334,7 @@ export function registerMonitorHooks(api: OpenClawPluginApi) {
   on('session_start');
   on('session_end');
 
-  console.log(`[${CHANNEL_ID}][monitor] Monitor hooks registered for ${targets.length} account(s): ${targets.map(t => t.accountId).join(', ')} (batch_size=${BATCH_MAX_SIZE} interval=${BATCH_INTERVAL_MS}ms).`);
+  // ── Subagent 阶段 ─────────────────────────────────────────
+  on('subagent_spawned');
+  on('subagent_ended');
 }