rol-websocket-channel 1.8.3 → 1.8.5

package/dist/index.js

@@ -11,6 +11,10 @@ import { registerArtifactsTools } from "./src/admin/tools/artifacts-tools.js";
 // ============================================
 import { getContext, initializeContext } from "./src/shared/context.js";
 let pluginRuntime = null;
+// 记录最近活跃的 session 上下文，便于发信时注入 traceId 和 meta
+const sessionContextMap = new Map();
+// 以 senderId 为键的上下文缓存，供 sendText/sendMedia 反查 sessionKey
+const senderContextMap = new Map();
 function isRecord(value) {
     return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
@@ -274,15 +278,27 @@ const WebSocketChannel = {
         // MQTT 是 topic-based 路由，不依赖 to 做地址解析
         // 使用 "direct" 模式：AI reply 走 deliver 回调；message 工具走 sendText
         deliveryMode: "direct",
-        sendText: async ({ to, text, sessionKey }) => {
+        // sendText：框架传入字段见 ChannelMessageSendTextContext（to = senderId，无 sessionKey/trace_id）
+        sendText: async ({ to, text, accountId }) => {
             const conn = ConnectionManager.getGlobalConnection();
             if (!conn || !conn.ws || !conn.ws.connected) {
                 return { ok: false, error: "No MQTT connection" };
             }
+            // 通过 to（senderId）反查 session 上下文
+            const senderCtx = to ? senderContextMap.get(to) : undefined;
+            const finalTraceId = senderCtx?.traceId;
+            const finalAgentId = accountId || senderCtx?.agentId || "unknown";
+            const finalSessionKey = senderCtx?.sessionKey;
             // 与 deliver 回调保持一致，使用 receiver 格式发布消息
             const message = JSON.stringify({
                 type: "receiver",
+                trace_id: finalTraceId,
                 source: "ai",
+                meta: {
+                    'type': "sendText",
+                    agentId: finalAgentId,
+                    sessionKey: finalSessionKey,
+                },
                 data: { text },
                 timestamp: Date.now(),
             });
@@ -294,14 +310,26 @@ const WebSocketChannel = {
             conn.ws.publish(targetTopic, message, { retain: true });
             return { ok: true };
         },
-        sendMedia: async ({ to, text, mediaUrl }) => {
+        // sendMedia：框架传入字段见 ChannelMessageSendMediaContext（to = senderId，无 sessionKey/trace_id）
+        sendMedia: async ({ to, text, mediaUrl, accountId }) => {
             const conn = ConnectionManager.getGlobalConnection();
             if (!conn || !conn.ws || !conn.ws.connected) {
                 return { ok: false, error: "No MQTT connection" };
             }
+            // 通过 to（senderId）反查 session 上下文
+            const senderCtx = to ? senderContextMap.get(to) : undefined;
+            const finalTraceId = senderCtx?.traceId;
+            const finalAgentId = accountId || senderCtx?.agentId || "unknown";
+            const finalSessionKey = senderCtx?.sessionKey;
             const message = JSON.stringify({
                 type: "receiver",
+                trace_id: finalTraceId,
                 source: "ai",
+                meta: {
+                    'type': "sendMedia",
+                    agentId: finalAgentId,
+                    sessionKey: finalSessionKey,
+                },
                 data: { text, mediaUrl },
                 timestamp: Date.now(),
             });
@@ -345,6 +373,10 @@ const WebSocketChannel = {
             const text = typeof params.message === "string" ? params.message
                 : typeof params.text === "string" ? params.text
                     : "";
+            const sessionKey = ctx.sessionKey;
+            const sessionCtx = sessionKey ? sessionContextMap.get(sessionKey) : undefined;
+            const trace_id = params.trace_id || params.traceId || ctx.traceId || sessionCtx?.traceId || ctx.runId;
+            const agentId = ctx.accountId || ctx.agentId || sessionCtx?.agentId || "unknown";
             const conn = ConnectionManager.getGlobalConnection();
             if (!conn || !conn.ws || !conn.ws.connected) {
                 return {
@@ -354,7 +386,13 @@ const WebSocketChannel = {
             }
             const replyMessage = JSON.stringify({
                 type: "receiver",
+                trace_id: trace_id,
                 source: "ai",
+                meta: {
+                    'type': "handleAction",
+                    agentId: agentId,
+                    sessionKey: sessionKey
+                },
                 data: { text },
                 timestamp: Date.now(),
             });
@@ -536,6 +574,9 @@ async function handleIncomingMessage(payload, account, cfg, runtime, log, mqttTo
         // 用户传参覆盖自动路由结果
         const resolvedAccountId = targetAgentId ?? route.accountId;
         const resolvedSessionKey = targetSessionId ?? route.sessionKey;
+        // 缓存最新请求上下文（双键：sessionKey 和 senderId）
+        sessionContextMap.set(resolvedSessionKey, { traceId, agentId: resolvedAccountId });
+        senderContextMap.set(normalizedMessage.senderId, { sessionKey: resolvedSessionKey, traceId, agentId: resolvedAccountId });
         // 构建消息上下文
         // To 必须设置为 senderId：框架用它确定 message 工具的回复目标
         // From 是发送方；To 是「这条对话的对端」（即 bot 应回复给谁）
@@ -899,6 +940,22 @@ function publishToolEvent(event) {
         console.error("[mqtt] Error publishing tool event:", err);
     }
 }
+function truncateDeep(obj, maxLen = 1000) {
+    if (typeof obj === "string") {
+        return obj.length > maxLen ? obj.slice(0, maxLen) + "...[truncated]" : obj;
+    }
+    if (Array.isArray(obj)) {
+        return obj.map(v => truncateDeep(v, maxLen));
+    }
+    if (obj !== null && typeof obj === "object") {
+        const res = {};
+        for (const k of Object.keys(obj)) {
+            res[k] = truncateDeep(obj[k], maxLen);
+        }
+        return res;
+    }
+    return obj;
+}
 function registerToolEventHooks(api) {
     // before_tool_call：AI 即将调用某个工具时触发
     if (typeof api.on === 'function') {
@@ -937,6 +994,24 @@ function registerToolEventHooks(api) {
                 },
             });
         });
+        // llm_output：大模型生成回复后触发，可获取 thinking 内容
+        api.on("llm_output", (event, ctx) => {
+            publishToolEvent({
+                type: "receiver",
+                source: "thinking",
+                event: "llm_output",
+                timestamp: Date.now(),
+                data: {
+                    runId: event.runId ?? ctx.runId,
+                    sessionKey: ctx.sessionKey ?? event.sessionId,
+                    provider: event.provider,
+                    model: event.model,
+                    assistantTexts: truncateDeep(event.assistantTexts, 1000),
+                    lastAssistant: truncateDeep(event.lastAssistant, 1000),
+                    usage: event.usage,
+                },
+            });
+        });
     }
     else {
         console.error("[mqtt] api.on is not available. Cannot register tool event hooks.");

package/index.ts

@@ -40,6 +40,11 @@ import { getContext, initializeContext } from "./src/shared/context.js";
 
 let pluginRuntime: any = null;
 
+// 记录最近活跃的 session 上下文，便于发信时注入 traceId 和 meta
+const sessionContextMap = new Map<string, { traceId: string; agentId: string; }>();
+// 以 senderId 为键的上下文缓存，供 sendText/sendMedia 反查 sessionKey
+const senderContextMap = new Map<string, { sessionKey: string; traceId: string; agentId: string; }>();
+
 function isRecord(value: unknown): value is Record<string, any> {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
@@ -337,16 +342,29 @@ const WebSocketChannel: any = {
     // 使用 "direct" 模式：AI reply 走 deliver 回调；message 工具走 sendText
     deliveryMode: "direct",
 
-    sendText: async ({ to, text, sessionKey }: any) => {
+    // sendText：框架传入字段见 ChannelMessageSendTextContext（to = senderId，无 sessionKey/trace_id）
+    sendText: async ({ to, text, accountId }: any) => {
       const conn = ConnectionManager.getGlobalConnection();
       if (!conn || !conn.ws || !conn.ws.connected) {
         return { ok: false, error: "No MQTT connection" };
       }
 
+      // 通过 to（senderId）反查 session 上下文
+      const senderCtx = to ? senderContextMap.get(to) : undefined;
+      const finalTraceId = senderCtx?.traceId;
+      const finalAgentId = accountId || senderCtx?.agentId || "unknown";
+      const finalSessionKey = senderCtx?.sessionKey;
+
       // 与 deliver 回调保持一致，使用 receiver 格式发布消息
       const message = JSON.stringify({
         type: "receiver",
+        trace_id: finalTraceId,
         source: "ai",
+        meta: {
+          'type': "sendText",
+          agentId: finalAgentId,
+          sessionKey: finalSessionKey,
+        },
         data: { text },
         timestamp: Date.now(),
       });
@@ -361,15 +379,28 @@ const WebSocketChannel: any = {
       return { ok: true };
     },
 
-    sendMedia: async ({ to, text, mediaUrl }: any) => {
+    // sendMedia：框架传入字段见 ChannelMessageSendMediaContext（to = senderId，无 sessionKey/trace_id）
+    sendMedia: async ({ to, text, mediaUrl, accountId }: any) => {
       const conn = ConnectionManager.getGlobalConnection();
       if (!conn || !conn.ws || !conn.ws.connected) {
         return { ok: false, error: "No MQTT connection" };
       }
 
+      // 通过 to（senderId）反查 session 上下文
+      const senderCtx = to ? senderContextMap.get(to) : undefined;
+      const finalTraceId = senderCtx?.traceId;
+      const finalAgentId = accountId || senderCtx?.agentId || "unknown";
+      const finalSessionKey = senderCtx?.sessionKey;
+
       const message = JSON.stringify({
         type: "receiver",
+        trace_id: finalTraceId,
         source: "ai",
+        meta: {
+          'type': "sendMedia",
+          agentId: finalAgentId,
+          sessionKey: finalSessionKey,
+        },
         data: { text, mediaUrl },
         timestamp: Date.now(),
       });
@@ -419,6 +450,11 @@ const WebSocketChannel: any = {
         : typeof params.text === "string" ? params.text
           : "";
 
+      const sessionKey = ctx.sessionKey;
+      const sessionCtx = sessionKey ? sessionContextMap.get(sessionKey) : undefined;
+      const trace_id = params.trace_id || params.traceId || ctx.traceId || sessionCtx?.traceId || ctx.runId;
+      const agentId = ctx.accountId || ctx.agentId || sessionCtx?.agentId || "unknown";
+
       const conn = ConnectionManager.getGlobalConnection();
       if (!conn || !conn.ws || !conn.ws.connected) {
         return {
@@ -429,7 +465,13 @@ const WebSocketChannel: any = {
 
       const replyMessage = JSON.stringify({
         type: "receiver",
+        trace_id: trace_id,
         source: "ai",
+        meta: {
+          'type': "handleAction",
+          agentId: agentId,
+          sessionKey: sessionKey
+        },
         data: { text },
         timestamp: Date.now(),
       });
@@ -685,6 +727,10 @@ async function handleIncomingMessage(
     const resolvedAccountId = targetAgentId ?? route.accountId;
     const resolvedSessionKey = targetSessionId ?? route.sessionKey;
 
+    // 缓存最新请求上下文（双键：sessionKey 和 senderId）
+    sessionContextMap.set(resolvedSessionKey, { traceId, agentId: resolvedAccountId });
+    senderContextMap.set(normalizedMessage.senderId, { sessionKey: resolvedSessionKey, traceId, agentId: resolvedAccountId });
+
     // 构建消息上下文
     // To 必须设置为 senderId：框架用它确定 message 工具的回复目标
     // From 是发送方；To 是「这条对话的对端」（即 bot 应回复给谁）
@@ -1151,6 +1197,23 @@ function publishToolEvent(event: object): void {
   }
 }
 
+function truncateDeep(obj: any, maxLen = 1000): any {
+  if (typeof obj === "string") {
+    return obj.length > maxLen ? obj.slice(0, maxLen) + "...[truncated]" : obj;
+  }
+  if (Array.isArray(obj)) {
+    return obj.map(v => truncateDeep(v, maxLen));
+  }
+  if (obj !== null && typeof obj === "object") {
+    const res: any = {};
+    for (const k of Object.keys(obj)) {
+      res[k] = truncateDeep(obj[k], maxLen);
+    }
+    return res;
+  }
+  return obj;
+}
+
 function registerToolEventHooks(api: any): void {
   // before_tool_call：AI 即将调用某个工具时触发
   if (typeof api.on === 'function') {
@@ -1190,6 +1253,25 @@ function registerToolEventHooks(api: any): void {
         },
       });
     });
+
+    // llm_output：大模型生成回复后触发，可获取 thinking 内容
+    api.on("llm_output", (event: any, ctx: any) => {
+      publishToolEvent({
+        type: "receiver",
+        source: "thinking",
+        event: "llm_output",
+        timestamp: Date.now(),
+        data: {
+          runId: event.runId ?? ctx.runId,
+          sessionKey: ctx.sessionKey ?? event.sessionId,
+          provider: event.provider,
+          model: event.model,
+          assistantTexts: truncateDeep(event.assistantTexts, 1000),
+          lastAssistant: truncateDeep(event.lastAssistant, 1000),
+          usage: event.usage,
+        },
+      });
+    });
   } else {
     console.error("[mqtt] api.on is not available. Cannot register tool event hooks.");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rol-websocket-channel",
-  "version": "1.8.3",
+  "version": "1.8.5",
   "description": "Unified OpenClaw plugin: MQTT Channel + Admin Bridge for remote management",
   "license": "MIT",
   "author": "nixgnehc",