@ynhcj/xiaoyi-channel 0.0.149-beta → 0.0.151-beta

package/dist/src/trigger-handler.js

@@ -15,10 +15,7 @@ import { logger } from "./utils/logger.js";
 export async function handleTriggerEvent(context, cfg, runtime, accountId) {
     try {
         const { event, sessionId, taskId } = context;
-        logger.log(`[TRIGGER_HANDLER] 📌 Received Trigger event`);
-        logger.log(`[TRIGGER_HANDLER]   - sessionId: ${sessionId}`);
-        logger.log(`[TRIGGER_HANDLER]   - taskId: ${taskId}`);
-        logger.log(`[TRIGGER_HANDLER]   - pushDataId: ${event.payload?.dataMap?.pushDataId}`);
+        logger.log(`[TRIGGER_HANDLER] Received Trigger event, sessionId: ${sessionId}, taskId: ${taskId}, pushDataId: ${event.payload?.dataMap?.pushDataId}`);
         // 构造包含 Trigger 事件的 A2A 消息
         // 将原始 event 放入 message.parts 中，让 handleXYMessage 检测并处理
         const a2aMessage = {
@@ -42,7 +39,7 @@ export async function handleTriggerEvent(context, cfg, runtime, accountId) {
                 },
             },
         };
-        logger.log(`[TRIGGER_HANDLER] 🚀 Dispatching to handleXYMessage for processing`);
+        logger.log(`[TRIGGER_HANDLER] Dispatching to handleXYMessage for processing`);
         // 通过 handleXYMessage 处理（复用现有链路）
         await handleXYMessage({
             cfg,
@@ -50,9 +47,9 @@ export async function handleTriggerEvent(context, cfg, runtime, accountId) {
             message: a2aMessage,
             accountId,
         });
-        logger.log(`[TRIGGER_HANDLER] ✅ Trigger event dispatched successfully`);
+        logger.log(`[TRIGGER_HANDLER] Trigger event dispatched successfully`);
     }
     catch (err) {
-        logger.error(`[TRIGGER_HANDLER] ❌ Failed to handle Trigger event:`, err);
+        logger.error(`[TRIGGER_HANDLER] Failed to handle Trigger event:`, err);
     }
 }

package/dist/src/utils/config-manager.js

@@ -12,15 +12,12 @@ class ConfigManager {
      */
     updatePushId(sessionId, pushId) {
         if (!pushId) {
-            logger.warn(`[ConfigManager] Attempted to set empty pushId for session ${sessionId}`);
+            logger.warn(`[ConfigManager] Attempted to set empty pushId`);
             return;
         }
         const previous = this.sessionPushIds.get(sessionId);
         if (previous !== pushId) {
-            logger.log(`[ConfigManager] ✨ Updated pushId for session ${sessionId}`);
-            logger.log(`[ConfigManager]   - Previous: ${previous ? previous.substring(0, 20) + '...' : 'none'}`);
-            logger.log(`[ConfigManager]   - New:      ${pushId.substring(0, 20)}...`);
-            logger.log(`[ConfigManager]   - Full new pushId: ${pushId}`);
+            logger.log(`[ConfigManager] Updated pushId: previous=${previous ? previous.substring(0, 20) : 'none'}, new=${pushId.substring(0, 20)}`);
             this.sessionPushIds.set(sessionId, pushId);
             this.globalPushId = pushId; // Also update global for backward compatibility
         }
@@ -42,7 +39,7 @@ class ConfigManager {
      */
     clearSession(sessionId) {
         this.sessionPushIds.delete(sessionId);
-        logger.debug(`[ConfigManager] Cleared pushId for session ${sessionId}`);
+        logger.debug(`[ConfigManager] Cleared pushId`);
     }
     /**
      * Clear all cached push IDs.

package/dist/src/utils/logger.d.ts

@@ -1,6 +1,14 @@
+export interface ScopedLogger {
+    log(message: string, ...args: any[]): void;
+    warn(message: string, ...args: any[]): void;
+    error(message: string, ...args: any[]): void;
+    debug(message: string, ...args: any[]): void;
+}
 export declare const logger: {
     log(message: string, ...args: any[]): void;
     warn(message: string, ...args: any[]): void;
     error(message: string, ...args: any[]): void;
     debug(message: string, ...args: any[]): void;
+    /** Create a scoped logger with explicit sessionId/taskId (bypasses AsyncLocalStorage/globalThis). */
+    withContext(sessionId: string, taskId: string): ScopedLogger;
 };

package/dist/src/utils/logger.js

@@ -1,4 +1,5 @@
-// Pino-based logging utilities for XY channel
+// Logging utilities for XY channel
+// Format: | level | time | sessionId | taskId | msg
 import pino from "pino";
 import { mkdirSync, readdirSync, unlinkSync, statSync } from "fs";
 import { join } from "path";
@@ -6,14 +7,20 @@ import { join } from "path";
 const LOG_DIR = "/tmp/openclaw";
 const LOG_PREFIX = "xiaoyi-channel";
 const MAX_AGE_DAYS = 30;
-// ── Daily log file path ──
+// ── UTC+8 helpers ──
 function getTodayDateStr() {
-    const d = new Date();
-    return [
-        d.getFullYear(),
-        String(d.getMonth() + 1).padStart(2, "0"),
-        String(d.getDate()).padStart(2, "0"),
-    ].join("");
+    const utc8 = new Date(Date.now() + 8 * 60 * 60 * 1000);
+    return `${utc8.getUTCFullYear()}${String(utc8.getUTCMonth() + 1).padStart(2, "0")}${String(utc8.getUTCDate()).padStart(2, "0")}`;
+}
+function formatTimestampUTC8() {
+    const utc8 = new Date(Date.now() + 8 * 60 * 60 * 1000);
+    const y = utc8.getUTCFullYear();
+    const M = String(utc8.getUTCMonth() + 1).padStart(2, "0");
+    const D = String(utc8.getUTCDate()).padStart(2, "0");
+    const h = String(utc8.getUTCHours()).padStart(2, "0");
+    const m = String(utc8.getUTCMinutes()).padStart(2, "0");
+    const s = String(utc8.getUTCSeconds()).padStart(2, "0");
+    return `${y}${M}${D}T${h}${m}${s}`;
 }
 function getLogFilePath(dateStr) {
     return join(LOG_DIR, `${LOG_PREFIX}-${dateStr ?? getTodayDateStr()}.log`);
@@ -46,19 +53,9 @@ cleanupOldLogs();
 // Schedule periodic cleanup every 6 hours
 const cleanupTimer = setInterval(cleanupOldLogs, 6 * 60 * 60 * 1000);
 cleanupTimer.unref?.();
-// ── Pino instance with daily rotation ──
+// ── File destination with daily rotation ──
 let currentDate = getTodayDateStr();
 const dest = pino.destination({ dest: getLogFilePath(currentDate), sync: false, mkdir: true });
-const pinoLogger = pino({
-    level: "debug",
-    base: undefined,
-    timestamp: pino.stdTimeFunctions.isoTime,
-    formatters: {
-        level(label) {
-            return { level: label };
-        },
-    },
-}, dest);
 // ── Rotation check ──
 function checkRotation() {
     const today = getTodayDateStr();
@@ -68,34 +65,72 @@ function checkRotation() {
         cleanupOldLogs();
     }
 }
+// ── Session context from globalThis (avoids circular dep with session-manager) ──
+function getSessionInfo() {
+    try {
+        const g = globalThis;
+        // Try AsyncLocalStorage first (correct for concurrent sessions)
+        const als = g.__xyAsyncLocalStorage;
+        if (als) {
+            const store = als.getStore();
+            if (store?.sessionId)
+                return { sessionId: store.sessionId, taskId: store.taskId ?? "" };
+        }
+        // Fallback to activeSessions map
+        const sessions = g.__xyActiveSessions;
+        if (sessions && sessions.size > 0) {
+            const lastKey = g.__xyLastRegisteredSessionKey;
+            if (lastKey) {
+                const entry = sessions.get(lastKey);
+                if (entry?.sessionId)
+                    return { sessionId: entry.sessionId, taskId: entry.taskId ?? "" };
+            }
+            const entry = sessions.values().next().value;
+            if (entry?.sessionId)
+                return { sessionId: entry.sessionId, taskId: entry.taskId ?? "" };
+        }
+    }
+    catch { }
+    return { sessionId: "", taskId: "" };
+}
 // ── Global error handlers (catch-all) ──
 process.on("uncaughtException", (err) => {
-    pinoLogger.fatal({ err }, "Uncaught exception");
+    writeLog("fatal", "Uncaught exception", [err]);
 });
 process.on("unhandledRejection", (reason) => {
-    pinoLogger.error({ reason }, "Unhandled rejection");
+    writeLog("error", "Unhandled rejection", [reason]);
 });
-// ── Exported logger (same API as before) ──
+// ── Core write function with optional explicit context ──
+function writeLog(level, message, args, explicitSid, explicitTid) {
+    checkRotation();
+    const sessionId = explicitSid !== undefined ? explicitSid : getSessionInfo().sessionId;
+    const taskId = explicitTid !== undefined ? explicitTid : getSessionInfo().taskId;
+    const timestamp = formatTimestampUTC8();
+    const msg = args.length ? formatMessage(message, args) : message;
+    dest.write(`|${level}|${timestamp}|${sessionId}|${taskId}|${msg}\n`);
+}
+// ── Exported logger ──
 export const logger = {
     log(message, ...args) {
-        checkRotation();
-        const msg = formatMessage(message, args);
-        pinoLogger.info(msg);
+        writeLog("info", message, args);
     },
     warn(message, ...args) {
-        checkRotation();
-        const msg = formatMessage(message, args);
-        pinoLogger.warn(msg);
+        writeLog("warn", message, args);
     },
     error(message, ...args) {
-        checkRotation();
-        const msg = formatMessage(message, args);
-        pinoLogger.error(msg);
+        writeLog("error", message, args);
     },
     debug(message, ...args) {
-        checkRotation();
-        const msg = formatMessage(`[DEBUG] ${message}`, args);
-        pinoLogger.debug(msg);
+        writeLog("debug", message, args);
+    },
+    /** Create a scoped logger with explicit sessionId/taskId (bypasses AsyncLocalStorage/globalThis). */
+    withContext(sessionId, taskId) {
+        return {
+            log(message, ...args) { writeLog("info", message, args, sessionId, taskId); },
+            warn(message, ...args) { writeLog("warn", message, args, sessionId, taskId); },
+            error(message, ...args) { writeLog("error", message, args, sessionId, taskId); },
+            debug(message, ...args) { writeLog("debug", message, args, sessionId, taskId); },
+        };
     },
 };
 function formatMessage(message, args) {

package/dist/src/utils/pushdata-manager.js

@@ -88,11 +88,7 @@ export async function savePushData(dataDetail) {
         const list = await readPushDataList();
         list.push(item);
         await writePushDataList(list);
-        logger.log(`[PushDataManager] ✅ Saved pushData`);
-        logger.log(`[PushDataManager]   - pushDataId: ${pushDataId}`);
-        logger.log(`[PushDataManager]   - time: ${time}`);
-        logger.log(`[PushDataManager]   - dataDetail length: ${dataDetail.length} chars`);
-        logger.log(`[PushDataManager]   - Total items: ${list.length}`);
+        logger.log(`[PushDataManager] Saved pushData: id=${pushDataId}, time=${time}, dataLength=${dataDetail.length}, totalItems=${list.length}`);
         return pushDataId;
     }
     catch (error) {

package/dist/src/utils/pushid-manager.js

@@ -69,8 +69,7 @@ export async function addPushId(pushId) {
         // 添加新 pushId
         list.push(pushId);
         await writePushIdList(list);
-        logger.log(`[PushIdManager] ✅ Added new pushId: ${pushId.substring(0, 20)}...`);
-        logger.log(`[PushIdManager]   - Total pushIds: ${list.length}`);
+        logger.log(`[PushIdManager] Added new pushId: ${pushId.substring(0, 20)}, total=${list.length}`);
     }
     catch (error) {
         logger.error(`[PushIdManager] Failed to add pushId:`, error);

package/dist/src/utils/runtime-manager.js

@@ -52,10 +52,7 @@ export async function saveRuntimeInfo(webSocketSessionId, conversationId, taskId
         }
         const result = lines.filter((line) => line.trim() !== "").join("\n") + "\n";
         await fs.writeFile(RUNTIME_FILE, result, "utf-8");
-        logger.log(`[RuntimeManager] ✅ Saved runtime info to .xiaoyiruntime`);
-        logger.log(`[RuntimeManager]   - SESSION_ID: ${webSocketSessionId}`);
-        logger.log(`[RuntimeManager]   - CONVERSATION_ID: ${conversationId}`);
-        logger.log(`[RuntimeManager]   - TASK_ID: ${taskId}`);
+        logger.log(`[RuntimeManager] Saved runtime info: SESSION_ID=${webSocketSessionId}, CONVERSATION_ID=${conversationId}, TASK_ID=${taskId}`);
     }
     catch (error) {
         logger.error(`[RuntimeManager] Failed to save runtime info:`, error);

package/dist/src/websocket.js

@@ -137,7 +137,8 @@ export class XYWebSocketManager extends EventEmitter {
             this.listenerCount('error') +
             this.listenerCount('ready') +
             this.listenerCount('data-event') +
-            this.listenerCount('gui-agent-response');
+            this.listenerCount('gui-agent-response') +
+            this.listenerCount('agent-as-skill-response');
         return {
             cacheKey,
             connection: connectionDiag,
@@ -364,8 +365,14 @@ export class XYWebSocketManager extends EventEmitter {
     handleMessage(data) {
         try {
             const messageStr = data.toString();
-            this.log(`[WS-RECV] Raw message frame, size: ${messageStr.length} characters`);
             const parsed = JSON.parse(messageStr);
+            // Extract sessionId/taskId early for scoped logging
+            const sessionId = parsed.params?.sessionId || parsed.sessionId;
+            const taskId = parsed.params?.id || parsed.taskId || "";
+            const log = sessionId
+                ? logger.withContext(sessionId, taskId)
+                : { log: (msg, ...args) => logger.log(msg, ...args) };
+            log.log(`[WS-RECV] Raw message frame, size: ${messageStr.length} characters`);
             // 提取并打印消息内容（只显示 text，data 只打印提示）
             const parts = parsed.params?.message?.parts;
             if (parts && Array.isArray(parts) && parts.length > 0) {
@@ -390,7 +397,7 @@ export class XYWebSocketManager extends EventEmitter {
                             // 如果长度 > 8，显示前5个 + *** + 后5个
                             maskedText = `${textContents.slice(0, 5)}***${textContents.slice(-5)}`;
                         }
-                        this.log("[WS-RECV] Text:", maskedText);
+                        log.log(`[WS-RECV] Text: ${maskedText}`);
                     }
                 }
             }
@@ -398,7 +405,6 @@ export class XYWebSocketManager extends EventEmitter {
             if (parsed.jsonrpc === "2.0") {
                 const a2aRequest = parsed;
                 // Extract sessionId from params
-                const sessionId = a2aRequest.params?.sessionId;
                 if (!sessionId) {
                     this.error("[XY] Message missing sessionId");
                     return;
@@ -411,10 +417,10 @@ export class XYWebSocketManager extends EventEmitter {
                     for (const dataPart of dataParts) {
                         const events = dataPart.data?.events;
                         if (!Array.isArray(events)) {
-                            this.log("[XY] dataPart.data.events is not an array, skipping");
+                            log.log("[XY] dataPart.data.events is not an array, skipping");
                             continue;
                         }
-                        this.log(`[XY] Processing ${events.length} events from data.events`);
+                        log.log(`[XY] Processing ${events.length} events from data.events`);
                         for (const item of events) {
                             if (item.header?.name === "UploadExeResult" && item.payload?.intentName) {
                                 const dataEvent = {
@@ -422,15 +428,15 @@ export class XYWebSocketManager extends EventEmitter {
                                     outputs: item.payload.outputs || {},
                                     status: "success",
                                 };
-                                this.log(`[XY] Emitting data-event, intentName: ${item.payload.intentName}, size: ${JSON.stringify(dataEvent).length} bytes`);
+                                log.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") {
-                                this.log(`[XY] Emitting gui-agent-response, size: ${JSON.stringify(item).length} bytes`);
+                                log.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") {
-                                this.log("[XY] Trigger event detected, emitting trigger-event with context");
+                                log.log("[XY] Trigger event detected, emitting trigger-event with context");
                                 // 传递完整上下文：event、sessionId、taskId
                                 this.emit("trigger-event", {
                                     event: item,
@@ -439,13 +445,13 @@ export class XYWebSocketManager extends EventEmitter {
                                 });
                             }
                             else if (item.header?.namespace === "AgentEvent" && item.header?.name === "ClawSelfEvolutionState") {
-                                this.log("[XY] ClawSelfEvolutionState event detected, emitting self-evolution-event");
+                                log.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") {
-                                this.log("[XY] ClawSelfEvolutionStateGet event detected, emitting self-evolution-state-get-event");
+                                log.log("[XY] ClawSelfEvolutionStateGet event detected, emitting self-evolution-state-get-event");
                                 this.emit("self-evolution-state-get-event", {
                                     event: item,
                                     sessionId: sessionId,
@@ -454,11 +460,15 @@ export class XYWebSocketManager extends EventEmitter {
                                 });
                             }
                             else if (item.header?.namespace === "LoginTokenEvent" && item.header?.name === "ClawAutoLogin") {
-                                this.log("[XY] LoginTokenEvent.ClawAutoLogin detected, emitting login-token-event");
+                                log.log("[XY] LoginTokenEvent.ClawAutoLogin detected, emitting login-token-event");
                                 this.emit("login-token-event", {
                                     event: item,
                                 });
                             }
+                            else if (item.header?.namespace === "System" && item.header?.name === "ExecuteAgentAsSkillResponse") {
+                                log.log("[XY] ExecuteAgentAsSkillResponse detected, emitting agent-as-skill-response");
+                                this.emit("agent-as-skill-response", item);
+                            }
                         }
                     }
                     return;
@@ -469,16 +479,16 @@ export class XYWebSocketManager extends EventEmitter {
             }
             // Wrapped format (InboundWebSocketMessage)
             const inboundMsg = parsed;
-            this.log(`[XY] Message type: Wrapped, msgType: ${inboundMsg.msgType}`);
+            log.log(`[XY] Message type: Wrapped, msgType: ${inboundMsg.msgType}`);
             // Handle heartbeat responses
             if (inboundMsg.msgType === "heartbeat") {
-                this.log("[XY] Received heartbeat response");
+                log.log("[XY] Received heartbeat response");
                 this.onHealthEvent?.();
                 return;
             }
             // Handle data messages
             if (inboundMsg.msgType === "data") {
-                this.log("[XY] Processing data message");
+                log.log("[XY] Processing data message");
                 try {
                     const a2aRequest = JSON.parse(inboundMsg.msgDetail);
                     const dataParts = a2aRequest.params?.message?.parts?.filter((p) => p.kind === "data");
@@ -486,10 +496,10 @@ export class XYWebSocketManager extends EventEmitter {
                         for (const dataPart of dataParts) {
                             const events = dataPart.data?.events;
                             if (!Array.isArray(events)) {
-                                this.log("[XY] dataPart.data.events is not an array, skipping");
+                                log.log("[XY] dataPart.data.events is not an array, skipping");
                                 continue;
                             }
-                            this.log(`[XY] Processing ${events.length} events from data.events`);
+                            log.log(`[XY] Processing ${events.length} events from data.events`);
                             for (const item of events) {
                                 if (item.header?.name === "UploadExeResult" && item.payload?.intentName) {
                                     const dataEvent = {
@@ -497,15 +507,15 @@ export class XYWebSocketManager extends EventEmitter {
                                         outputs: item.payload.outputs || {},
                                         status: "success",
                                     };
-                                    this.log(`[XY] Emitting data-event, intentName: ${item.payload.intentName}, size: ${JSON.stringify(dataEvent).length} bytes`);
+                                    log.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") {
-                                    this.log(`[XY] Emitting gui-agent-response, size: ${JSON.stringify(item).length} bytes`);
+                                    log.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") {
-                                    this.log("[XY] Trigger event detected (wrapped format), emitting trigger-event with context");
+                                    log.log("[XY] Trigger event detected (wrapped format), emitting trigger-event with context");
                                     // 传递完整上下文：event、sessionId、taskId
                                     this.emit("trigger-event", {
                                         event: item,
@@ -514,11 +524,15 @@ export class XYWebSocketManager extends EventEmitter {
                                     });
                                 }
                                 else if (item.header?.namespace === "LoginTokenEvent" && item.header?.name === "ClawAutoLogin") {
-                                    this.log("[XY] LoginTokenEvent.ClawAutoLogin detected (wrapped format), emitting login-token-event");
+                                    log.log("[XY] LoginTokenEvent.ClawAutoLogin detected (wrapped format), emitting login-token-event");
                                     this.emit("login-token-event", {
                                         event: item,
                                     });
                                 }
+                                else if (item.header?.namespace === "System" && item.header?.name === "ExecuteAgentAsSkillResponse") {
+                                    log.log("[XY] ExecuteAgentAsSkillResponse detected (wrapped format), emitting agent-as-skill-response");
+                                    this.emit("agent-as-skill-response", item);
+                                }
                             }
                         }
                     }
@@ -530,11 +544,9 @@ export class XYWebSocketManager extends EventEmitter {
             }
             // Parse msgDetail as A2AJsonRpcRequest
             const a2aRequest = JSON.parse(inboundMsg.msgDetail);
-            this.log(`[XY] Parsed A2A request, method: ${a2aRequest.method}`);
-            const sessionId = inboundMsg.sessionId;
-            this.log(`[XY] Session ID: ${sessionId}`);
+            log.log(`[XY] Parsed A2A request, method: ${a2aRequest.method}`);
             // Emit message event
-            this.log("[XY] *** EMITTING message event (Wrapped path) ***");
+            log.log("[XY] Emitting message event (Wrapped path)");
             this.emit("message", a2aRequest, sessionId);
         }
         catch (error) {

package/package.json

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