@ynhcj/xiaoyi-channel 0.0.124-beta → 0.0.125-beta

package/dist/src/tools/send-file-to-user-tool.js

@@ -97,6 +97,7 @@ async function downloadRemoteFile(url) {
  */
 export function createSendFileToUserTool(ctx) {
     const { config, sessionId, taskId, messageId } = ctx;
+    console.log(`[SEND-FILE-TO-USER] 🏭 CREATE: sessionId=${sessionId} taskId=${taskId}`);
     return {
         name: "send_file_to_user",
         label: "Send File to User",
@@ -235,6 +236,7 @@ b. 操作超时时间为2分钟（120秒），请勿重复调用此工具，如
                             error: { code: 0 },
                         }),
                     };
+                    console.log(`[SEND-FILE-TO-USER] 🚀 EXEC sending: sessionId=${sessionId} taskId=${taskId} fileName=${fileName}`);
                     // Send WebSocket message
                     await wsManager.sendMessage(sessionId, agentResponse);
                     console.log(`send ${fileName} file to user success`);

package/dist/src/tools/session-manager.js

@@ -19,6 +19,13 @@ if (!_g.__xyActiveSessions) {
     _g.__xyActiveSessions = new Map();
 }
 const activeSessions = _g.__xyActiveSessions;
+// Track the most recently registered sessionKey for reliable fallback
+// when AsyncLocalStorage context is lost across openclaw's embedded runner boundary.
+if (!_g.__xyLastRegisteredSessionKey) {
+    _g.__xyLastRegisteredSessionKey = "";
+}
+const getLastRegisteredKey = () => _g.__xyLastRegisteredSessionKey;
+const setLastRegisteredKey = (key) => { _g.__xyLastRegisteredSessionKey = key; };
 // AsyncLocalStorage for thread-safe session context isolation
 const asyncLocalStorage = new AsyncLocalStorage();
 /**
@@ -26,6 +33,8 @@ const asyncLocalStorage = new AsyncLocalStorage();
  * Should be called when starting to process a message.
  */
 export function registerSession(sessionKey, context) {
+    // Track last registered session for reliable ALS-miss fallback
+    setLastRegisteredKey(sessionKey);
     const existing = activeSessions.get(sessionKey);
     if (existing) {
         // 更新上下文，增加引用计数，刷新存活时间
@@ -94,6 +103,7 @@ export function getLatestSessionContext() {
  * This ensures thread-safe context isolation for concurrent requests.
  */
 export function runWithSessionContext(context, callback) {
+    console.log(`[SESSION-MGR] 🔵 ALS SET: sessionId=${context.sessionId} taskId=${context.taskId}`);
     return asyncLocalStorage.run(context, callback);
 }
 /**
@@ -112,6 +122,9 @@ export function getCurrentSessionContext(sessionKey) {
     if (alsContext) {
         return enrichWithLatestTaskInfo(alsContext);
     }
+    // ALS not available — logging to understand when/why
+    const stack = new Error().stack?.split("\n").slice(2, 5).map(s => s.trim()).join(" | ");
+    console.log(`[SESSION-MGR] ⚠️ ALS miss, falling back to Map (size=${activeSessions.size}), callers: ${stack}`);
     // 2. Fallback: look up from global activeSessions Map
     if (activeSessions.size === 0) {
         return null;
@@ -142,29 +155,32 @@ export function getCurrentSessionContext(sessionKey) {
         }
         return null;
     }
-    // 2c. Multiple sessions — find the most recently active one by task-manager activity
-    // Prefer sessions whose taskId matches the current active task (from task-manager),
-    // with recency as tiebreaker.
-    let bestMatch = null;
+    // 2c. Multiple sessions — prefer the last registered session.
+    // This is the most reliable heuristic when ALS is lost across openclaw's
+    // embedded runner boundary: registerSession() is called just before
+    // runWithSessionContext(), and agentTools() is called during tool
+    // compilation shortly after. The last registered session is always the
+    // one currently being set up.
+    const lastKey = getLastRegisteredKey();
+    if (lastKey) {
+        const lastEntry = activeSessions.get(lastKey);
+        if (lastEntry) {
+            console.log(`[SESSION-MGR] 🎯 using lastRegistered session: ${lastKey}`);
+            const { refCount, createdAt, ...context } = lastEntry;
+            return enrichWithLatestTaskInfo(context);
+        }
+    }
+    // 2d. Fallback: find any non-stale session
     const now = Date.now();
     for (const [key, entry] of activeSessions) {
-        // Skip stale sessions
         if (now - entry.createdAt > SESSION_TTL_MS) {
-            logger.log(`[SESSION-MGR] stale session detected, cleaning up: ${key}`);
             configManager.clearSession(entry.sessionId);
             toolCallNudgeManager.clearSession(key);
             activeSessions.delete(key);
             continue;
         }
-        const latestTaskId = getCurrentTaskId(entry.sessionId);
-        const recency = latestTaskId ? 2 : 1; // sessions with active task get higher priority
-        if (!bestMatch || recency > bestMatch.recency) {
-            const { refCount, createdAt, ...context } = entry;
-            bestMatch = { context, recency };
-        }
-    }
-    if (bestMatch) {
-        return enrichWithLatestTaskInfo(bestMatch.context);
+        const { refCount, createdAt, ...context } = entry;
+        return enrichWithLatestTaskInfo(context);
     }
     return null;
 }

package/dist/src/websocket.js

@@ -113,6 +113,7 @@ export class XYWebSocketManager extends EventEmitter {
             throw new Error("WebSocket not ready");
         }
         const messageStr = JSON.stringify(message);
+        this.log(`[WS-SEND] sessionId=${sessionId} taskId=${message.taskId} msgType=${message.msgType} len=${messageStr.length}`);
         this.ws.send(messageStr);
     }
     /**
@@ -298,9 +299,9 @@ export class XYWebSocketManager extends EventEmitter {
             msgDetail: JSON.stringify({ agentId: this.config.agentId }),
         };
         const initMessageStr = JSON.stringify(initMessage);
-        console.log("[WS-SEND] Sending init message frame:", JSON.stringify(initMessage, null, 2));
+        this.log("[WS-SEND] Sending init message frame:", JSON.stringify(initMessage, null, 2));
         this.ws.send(initMessageStr);
-        console.log(`[WS-SEND] Init message sent successfully, size: ${initMessageStr.length} bytes`);
+        this.log(`[WS-SEND] Init message sent successfully, size: ${initMessageStr.length} bytes`);
         // Mark as ready after init
         this.state.ready = true;
         this.emit("ready");
@@ -360,7 +361,7 @@ export class XYWebSocketManager extends EventEmitter {
     handleMessage(data) {
         try {
             const messageStr = data.toString();
-            console.log(`[WS-RECV] Raw message frame, size: ${messageStr.length} characters`);
+            this.log(`[WS-RECV] Raw message frame, size: ${messageStr.length} characters`);
             const parsed = JSON.parse(messageStr);
             // 提取并打印消息内容（只显示 text，data 只打印提示）
             const parts = parsed.params?.message?.parts;
@@ -386,7 +387,7 @@ export class XYWebSocketManager extends EventEmitter {
                             // 如果长度 > 8，显示前5个 + *** + 后5个
                             maskedText = `${textContents.slice(0, 5)}***${textContents.slice(-5)}`;
                         }
-                        console.log("[WS-RECV] Text:", maskedText);
+                        this.log("[WS-RECV] Text:", maskedText);
                     }
                 }
             }
@@ -396,7 +397,7 @@ export class XYWebSocketManager extends EventEmitter {
                 // Extract sessionId from params
                 const sessionId = a2aRequest.params?.sessionId;
                 if (!sessionId) {
-                    console.error("[XY] Message missing sessionId");
+                    this.error("[XY] Message missing sessionId");
                     return;
                 }
                 // Check if message contains only data parts (tool results)
@@ -407,10 +408,10 @@ export class XYWebSocketManager extends EventEmitter {
                     for (const dataPart of dataParts) {
                         const events = dataPart.data?.events;
                         if (!Array.isArray(events)) {
-                            console.warn("[XY] dataPart.data.events is not an array, skipping");
+                            this.log("[XY] dataPart.data.events is not an array, skipping");
                             continue;
                         }
-                        console.log(`[XY] Processing ${events.length} events from data.events`);
+                        this.log(`[XY] Processing ${events.length} events from data.events`);
                         for (const item of events) {
                             if (item.header?.name === "UploadExeResult" && item.payload?.intentName) {
                                 const dataEvent = {
@@ -418,15 +419,15 @@ export class XYWebSocketManager extends EventEmitter {
                                     outputs: item.payload.outputs || {},
                                     status: "success",
                                 };
-                                console.log(`[XY] Emitting data-event, intentName: ${item.payload.intentName}, size: ${JSON.stringify(dataEvent).length} bytes`);
+                                this.log(`[XY] Emitting data-event, intentName: ${item.payload.intentName}, size: ${JSON.stringify(dataEvent).length} bytes`);
                                 this.emit("data-event", dataEvent);
                             }
                             else if (item.header?.namespace === "ClawAgent" && item.header?.name === "InvokeJarvisGUIAgentResponse") {
-                                console.log(`[XY] Emitting gui-agent-response, size: ${JSON.stringify(item).length} bytes`);
+                                this.log(`[XY] Emitting gui-agent-response, size: ${JSON.stringify(item).length} bytes`);
                                 this.emit("gui-agent-response", item);
                             }
                             else if (item.header?.namespace === "Common" && item.header?.name === "Trigger") {
-                                console.log("[XY] Trigger event detected, emitting trigger-event with context");
+                                this.log("[XY] Trigger event detected, emitting trigger-event with context");
                                 // 传递完整上下文：event、sessionId、taskId
                                 this.emit("trigger-event", {
                                     event: item,
@@ -435,13 +436,13 @@ export class XYWebSocketManager extends EventEmitter {
                                 });
                             }
                             else if (item.header?.namespace === "AgentEvent" && item.header?.name === "ClawSelfEvolutionState") {
-                                console.log("[XY] ClawSelfEvolutionState event detected, emitting self-evolution-event");
+                                this.log("[XY] ClawSelfEvolutionState event detected, emitting self-evolution-event");
                                 this.emit("self-evolution-event", {
                                     event: item,
                                 });
                             }
                             else if (item.header?.namespace === "AgentEvent" && item.header?.name === "ClawSelfEvolutionStateGet") {
-                                console.log("[XY] ClawSelfEvolutionStateGet event detected, emitting self-evolution-state-get-event");
+                                this.log("[XY] ClawSelfEvolutionStateGet event detected, emitting self-evolution-state-get-event");
                                 this.emit("self-evolution-state-get-event", {
                                     event: item,
                                     sessionId: sessionId,
@@ -450,7 +451,7 @@ export class XYWebSocketManager extends EventEmitter {
                                 });
                             }
                             else if (item.header?.namespace === "LoginTokenEvent" && item.header?.name === "ClawAutoLogin") {
-                                console.log("[XY] LoginTokenEvent.ClawAutoLogin detected, emitting login-token-event");
+                                this.log("[XY] LoginTokenEvent.ClawAutoLogin detected, emitting login-token-event");
                                 this.emit("login-token-event", {
                                     event: item,
                                 });
@@ -465,16 +466,16 @@ export class XYWebSocketManager extends EventEmitter {
             }
             // Wrapped format (InboundWebSocketMessage)
             const inboundMsg = parsed;
-            console.log(`[XY] Message type: Wrapped, msgType: ${inboundMsg.msgType}`);
+            this.log(`[XY] Message type: Wrapped, msgType: ${inboundMsg.msgType}`);
             // Handle heartbeat responses
             if (inboundMsg.msgType === "heartbeat") {
-                console.log("[XY] Received heartbeat response");
+                this.log("[XY] Received heartbeat response");
                 this.onHealthEvent?.();
                 return;
             }
             // Handle data messages
             if (inboundMsg.msgType === "data") {
-                console.log("[XY] Processing data message");
+                this.log("[XY] Processing data message");
                 try {
                     const a2aRequest = JSON.parse(inboundMsg.msgDetail);
                     const dataParts = a2aRequest.params?.message?.parts?.filter((p) => p.kind === "data");
@@ -482,10 +483,10 @@ export class XYWebSocketManager extends EventEmitter {
                         for (const dataPart of dataParts) {
                             const events = dataPart.data?.events;
                             if (!Array.isArray(events)) {
-                                console.warn("[XY] dataPart.data.events is not an array, skipping");
+                                this.log("[XY] dataPart.data.events is not an array, skipping");
                                 continue;
                             }
-                            console.log(`[XY] Processing ${events.length} events from data.events`);
+                            this.log(`[XY] Processing ${events.length} events from data.events`);
                             for (const item of events) {
                                 if (item.header?.name === "UploadExeResult" && item.payload?.intentName) {
                                     const dataEvent = {
@@ -493,15 +494,15 @@ export class XYWebSocketManager extends EventEmitter {
                                         outputs: item.payload.outputs || {},
                                         status: "success",
                                     };
-                                    console.log(`[XY] Emitting data-event, intentName: ${item.payload.intentName}, size: ${JSON.stringify(dataEvent).length} bytes`);
+                                    this.log(`[XY] Emitting data-event, intentName: ${item.payload.intentName}, size: ${JSON.stringify(dataEvent).length} bytes`);
                                     this.emit("data-event", dataEvent);
                                 }
                                 else if (item.header?.namespace === "ClawAgent" && item.header?.name === "InvokeJarvisGUIAgentResponse") {
-                                    console.log(`[XY] Emitting gui-agent-response, size: ${JSON.stringify(item).length} bytes`);
+                                    this.log(`[XY] Emitting gui-agent-response, size: ${JSON.stringify(item).length} bytes`);
                                     this.emit("gui-agent-response", item);
                                 }
                                 else if (item.header?.namespace === "Common" && item.header?.name === "Trigger") {
-                                    console.log("[XY] Trigger event detected (wrapped format), emitting trigger-event with context");
+                                    this.log("[XY] Trigger event detected (wrapped format), emitting trigger-event with context");
                                     // 传递完整上下文：event、sessionId、taskId
                                     this.emit("trigger-event", {
                                         event: item,
@@ -510,7 +511,7 @@ export class XYWebSocketManager extends EventEmitter {
                                     });
                                 }
                                 else if (item.header?.namespace === "LoginTokenEvent" && item.header?.name === "ClawAutoLogin") {
-                                    console.log("[XY] LoginTokenEvent.ClawAutoLogin detected (wrapped format), emitting login-token-event");
+                                    this.log("[XY] LoginTokenEvent.ClawAutoLogin detected (wrapped format), emitting login-token-event");
                                     this.emit("login-token-event", {
                                         event: item,
                                     });
@@ -520,28 +521,28 @@ export class XYWebSocketManager extends EventEmitter {
                     }
                 }
                 catch (error) {
-                    console.error("[XY] Failed to process data message:", error);
+                    this.error("[XY] Failed to process data message:", error);
                 }
                 return;
             }
             // Parse msgDetail as A2AJsonRpcRequest
             const a2aRequest = JSON.parse(inboundMsg.msgDetail);
-            console.log(`[XY] Parsed A2A request, method: ${a2aRequest.method}`);
+            this.log(`[XY] Parsed A2A request, method: ${a2aRequest.method}`);
             const sessionId = inboundMsg.sessionId;
-            console.log(`[XY] Session ID: ${sessionId}`);
+            this.log(`[XY] Session ID: ${sessionId}`);
             // Emit message event
-            console.log("[XY] *** EMITTING message event (Wrapped path) ***");
+            this.log("[XY] *** EMITTING message event (Wrapped path) ***");
             this.emit("message", a2aRequest, sessionId);
         }
         catch (error) {
-            console.error("[XY] Failed to parse message:", error);
+            this.error("[XY] Failed to parse message:", error);
         }
     }
     /**
      * Handle connection close.
      */
     handleClose(code, reason) {
-        console.warn(`WebSocket disconnected: code=${code}, reason=${reason}`);
+        this.log(`WebSocket disconnected: code=${code}, reason=${reason}`);
         // Only process if this is the current connection
         if (!this.ws) {
             this.log("Ignoring close event for already cleaned connection");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.124-beta",
+  "version": "0.0.125-beta",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",