@ynhcj/xiaoyi-channel 0.0.139-next → 0.0.140-next

package/dist/src/formatter.js

@@ -42,6 +42,7 @@ function buildTextPreview(text) {
  */
 export async function sendA2AResponse(params) {
     const { config, sessionId, taskId, messageId, text, append, final, files, errorCode, errorMessage } = params;
+    const log = logger.withContext(sessionId, taskId);
     // 审批桥接：将 OpenClaw 的审批提示翻译成用户友好的确认文案
     const bridgedText = text === undefined ? text : rewriteOutboundApprovalText(sessionId, text);
     // Build artifact update event
@@ -84,7 +85,7 @@ export async function sendA2AResponse(params) {
             code: errorCode,
             message: errorMessage ?? "任务执行异常，请重试",
         };
-        logger.log(`[A2A_RESPONSE] Including error code: ${errorCode}`);
+        log.log(`[A2A_RESPONSE] Including error code: ${errorCode}`);
     }
     // Send via WebSocket
     const wsManager = getXYWebSocketManager(config);
@@ -97,9 +98,9 @@ export async function sendA2AResponse(params) {
     };
     // Log complete response body
     const redactedText = redactSensitiveText(bridgedText ?? "");
-    logger.log(`[A2A_RESPONSE] Sending artifact-update, append=${append}, final=${final}, text=${buildTextPreview(redactedText)}, files=${files?.length ?? 0}, sensitive=${containsSensitiveInfo(bridgedText ?? "")}`);
+    log.log(`[A2A_RESPONSE] Sending artifact-update, append=${append}, final=${final}, text=${buildTextPreview(redactedText)}, files=${files?.length ?? 0}, sensitive=${containsSensitiveInfo(bridgedText ?? "")}`);
     await wsManager.sendMessage(sessionId, outboundMessage);
-    logger.log(`[A2A_RESPONSE] Message sent successfully`);
+    log.log(`[A2A_RESPONSE] Message sent successfully`);
 }
 /**
  * Send an A2A artifact-update with reasoningText part.
@@ -108,6 +109,7 @@ export async function sendA2AResponse(params) {
  */
 export async function sendReasoningTextUpdate(params) {
     const { config, sessionId, taskId, messageId, text, append = true } = params;
+    const log = logger.withContext(sessionId, taskId);
     // 审批桥接
     const bridgedText = rewriteOutboundApprovalText(sessionId, text);
     const artifact = {
@@ -153,6 +155,7 @@ export async function sendStatusUpdate(params) {
     // fall back to closure-captured values
     const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
     const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
+    const log = logger.withContext(sessionId, currentTaskId);
     // 审批桥接和脱敏
     const bridgedText = rewriteOutboundApprovalText(sessionId, text);
     const redactedText = redactSensitiveText(bridgedText);
@@ -191,7 +194,7 @@ export async function sendStatusUpdate(params) {
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     // Log complete response body
-    logger.log(`[A2A_STATUS] Sending status-update, taskId=${currentTaskId}, text="${redactedText}"`);
+    log.log(`[A2A_STATUS] Sending status-update, text="${redactedText}"`);
     await wsManager.sendMessage(sessionId, outboundMessage);
 }
 /**
@@ -203,6 +206,7 @@ export async function sendCommand(params) {
     // fall back to closure-captured values
     const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
     const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
+    const log = logger.withContext(sessionId, currentTaskId);
     // Build artifact update with command as data
     // Wrap command in commands array as per protocol requirement
     const artifact = {
@@ -241,15 +245,16 @@ export async function sendCommand(params) {
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     // Log complete response body
-    logger.log(`[A2A_COMMAND] Sending command`);
+    log.log(`[A2A_COMMAND] Sending command`);
     await wsManager.sendMessage(sessionId, outboundMessage);
-    logger.log(`[A2A_COMMAND] Command sent successfully`);
+    log.log(`[A2A_COMMAND] Command sent successfully`);
 }
 /**
  * Send a clearContext response.
  */
 export async function sendClearContextResponse(params) {
     const { config, sessionId, messageId } = params;
+    const log = logger.withContext(sessionId, "");
     // Build JSON-RPC response for clearContext
     const jsonRpcResponse = {
         jsonrpc: "2.0",
@@ -275,13 +280,14 @@ export async function sendClearContextResponse(params) {
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     await wsManager.sendMessage(sessionId, outboundMessage);
-    logger.log(`[CLEAR_CONTEXT] Sent clearContext response`);
+    log.log(`[CLEAR_CONTEXT] Sent clearContext response`);
 }
 /**
  * Send a tasks/cancel response.
  */
 export async function sendTasksCancelResponse(params) {
     const { config, sessionId, taskId, messageId } = params;
+    const log = logger.withContext(sessionId, taskId);
     // Build JSON-RPC response for tasks/cancel
     // Note: Using any to bypass type check as the response format differs from standard A2A types
     const jsonRpcResponse = {
@@ -308,13 +314,14 @@ export async function sendTasksCancelResponse(params) {
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     await wsManager.sendMessage(sessionId, outboundMessage);
-    logger.log(`[TASKS_CANCEL] Sent tasks/cancel response`);
+    log.log(`[TASKS_CANCEL] Sent tasks/cancel response`);
 }
 /**
  * Send a Trigger response with pushData content.
  */
 export async function sendTriggerResponse(params) {
     const { config, sessionId, taskId, messageId, content } = params;
+    const log = logger.withContext(sessionId, taskId);
     // 审批桥接和脱敏
     const bridgedContent = rewriteOutboundApprovalText(sessionId, content);
     const redactedContent = redactSensitiveText(bridgedContent);
@@ -354,7 +361,7 @@ export async function sendTriggerResponse(params) {
         taskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
-    logger.log(`[TRIGGER_RESPONSE] Sending Trigger response, text=${buildTextPreview(redactedContent)}`);
+    log.log(`[TRIGGER_RESPONSE] Sending Trigger response, text=${buildTextPreview(redactedContent)}`);
     await wsManager.sendMessage(sessionId, outboundMessage);
-    logger.log(`[TRIGGER_RESPONSE] Trigger response sent successfully`);
+    log.log(`[TRIGGER_RESPONSE] Trigger response sent successfully`);
 }

package/dist/src/reply-dispatcher.js

@@ -46,7 +46,10 @@ export async function cleanupStaleTempFiles(tempDir = "/tmp/xy_channel") {
  */
 export function createXYReplyDispatcher(params) {
     const { cfg, runtime, sessionId, taskId, messageId, accountId, steerState } = params;
-    logger.log(`[DISPATCHER-CREATE] Creating dispatcher, taskId=${taskId}`);
+    // Create a scoped logger that always uses this session's sessionId
+    // and dynamically resolves the latest taskId
+    const scopedLog = () => logger.withContext(sessionId, getActiveTaskId());
+    scopedLog().log(`[DISPATCHER-CREATE] Creating dispatcher`);
     // 初始taskId和messageId（作为fallback）
     const initialTaskId = taskId;
     const initialMessageId = messageId;
@@ -76,12 +79,12 @@ export function createXYReplyDispatcher(params) {
      * Start the status update interval
      */
     const startStatusInterval = () => {
-        logger.log(`[STATUS-INTERVAL] Starting interval`);
+        scopedLog().log(`[STATUS-INTERVAL] Starting interval`);
         statusUpdateInterval = setInterval(() => {
             // 🔑 使用动态taskId
             const currentTaskId = getActiveTaskId();
             const currentMessageId = getActiveMessageId();
-            logger.log(`[STATUS-INTERVAL] Triggering status update, taskId=${currentTaskId}`);
+            scopedLog().log(`[STATUS-INTERVAL] Triggering status update, taskId=${currentTaskId}`);
             void sendStatusUpdate({
                 config,
                 sessionId,
@@ -90,13 +93,13 @@ export function createXYReplyDispatcher(params) {
                 text: "任务正在处理中，请稍候~",
                 state: "working",
             }).catch((err) => {
-                logger.error(`Failed to send status update:`, err);
+                scopedLog().error(`Failed to send status update:`, err);
             });
         }, 30000); // 30 seconds
     };
     const stopStatusInterval = () => {
         if (statusUpdateInterval) {
-            logger.log(`[STATUS-INTERVAL] Stopping interval`);
+            scopedLog().log(`[STATUS-INTERVAL] Stopping interval`);
             clearInterval(statusUpdateInterval);
             statusUpdateInterval = null;
         }
@@ -107,26 +110,26 @@ export function createXYReplyDispatcher(params) {
         humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, accountId),
         onReplyStart: () => {
             const currentTaskId = getActiveTaskId();
-            logger.log(`[REPLY-START] Reply started, taskId=${currentTaskId}, steered=${steerState.steered}`);
+            scopedLog().log(`[REPLY-START] Reply started, taskId=${currentTaskId}, steered=${steerState.steered}`);
         },
         deliver: async (payload, info) => {
             // 🔑 steered dispatch不发送内容（让主dispatcher处理）
             if (steerState.steered) {
-                logger.log(`[DELIVER] Steered dispatch, skipping, kind=${info?.kind}`);
+                scopedLog().log(`[DELIVER] Steered dispatch, skipping, kind=${info?.kind}`);
                 return;
             }
             const text = payload.text ?? "";
             const currentTaskId = getActiveTaskId();
             const currentMessageId = getActiveMessageId();
-            logger.log(`[DELIVER] kind=${info?.kind}, text.length=${text.length}`);
+            scopedLog().log(`[DELIVER] kind=${info?.kind}, text.length=${text.length}`);
             try {
                 if (!text.trim()) {
-                    logger.log(`[DELIVER SKIP] Empty text, skipping`);
+                    scopedLog().log(`[DELIVER SKIP] Empty text, skipping`);
                     return;
                 }
                 accumulatedText += text;
                 hasSentResponse = true;
-                logger.log(`[DELIVER] Accumulated text, length=${accumulatedText.length}`);
+                scopedLog().log(`[DELIVER] Accumulated text, length=${accumulatedText.length}`);
                 // 🔑 使用动态taskId发送reasoningText更新
                 await sendReasoningTextUpdate({
                     config,
@@ -135,10 +138,10 @@ export function createXYReplyDispatcher(params) {
                     messageId: currentMessageId,
                     text,
                 });
-                logger.log(`[DELIVER] Sent deliver text as reasoningText update`);
+                scopedLog().log(`[DELIVER] Sent deliver text as reasoningText update`);
             }
             catch (deliverError) {
-                logger.error(`Failed to deliver message:`, deliverError);
+                scopedLog().error(`Failed to deliver message:`, deliverError);
             }
         },
         onError: async (err, info) => {
@@ -146,7 +149,7 @@ export function createXYReplyDispatcher(params) {
             stopStatusInterval();
             // 🔑 steered dispatcher不发送错误状态（让主dispatcher处理）
             if (steerState.steered) {
-                logger.log(`[ON-ERROR] Steered dispatch, skipping error response`);
+                scopedLog().log(`[ON-ERROR] Steered dispatch, skipping error response`);
                 return;
             }
             if (!hasSentResponse) {
@@ -163,23 +166,23 @@ export function createXYReplyDispatcher(params) {
                     });
                 }
                 catch (statusError) {
-                    logger.error(`Failed to send error status:`, statusError);
+                    scopedLog().error(`Failed to send error status:`, statusError);
                 }
             }
         },
         onIdle: async () => {
             const currentTaskId = getActiveTaskId();
             const currentMessageId = getActiveMessageId();
-            logger.log(`[ON-IDLE] Reply idle, steered=${steerState.steered}, hasSentResponse=${hasSentResponse}, finalSent=${finalSent}`);
+            scopedLog().log(`[ON-IDLE] Reply idle, steered=${steerState.steered}, hasSentResponse=${hasSentResponse}, finalSent=${finalSent}`);
             // 🔑 steered dispatch不发送final响应（核心已注入到活跃 Pi run）
             if (steerState.steered) {
-                logger.log(`[ON-IDLE] Steered dispatch, skipping final response`);
+                scopedLog().log(`[ON-IDLE] Steered dispatch, skipping final response`);
                 stopStatusInterval();
                 return; // ← 直接返回，不发送任何东西！
             }
             // 正常模式（或未被steer的dispatch）
             if (hasSentResponse && !finalSent) {
-                logger.log(`[ON-IDLE] Sending accumulated text, length=${accumulatedText.length}`);
+                scopedLog().log(`[ON-IDLE] Sending accumulated text, length=${accumulatedText.length}`);
                 try {
                     // 🔑 使用动态taskId发送完成状态
                     await sendStatusUpdate({
@@ -190,7 +193,7 @@ export function createXYReplyDispatcher(params) {
                         text: "任务处理已完成~",
                         state: "completed",
                     });
-                    logger.log(`[ON-IDLE] Sent completion status update`);
+                    scopedLog().log(`[ON-IDLE] Sent completion status update`);
                     // 🔑 使用动态taskId发送最终响应
                     await sendA2AResponse({
                         config,
@@ -202,15 +205,15 @@ export function createXYReplyDispatcher(params) {
                         final: true,
                     });
                     finalSent = true;
-                    logger.log(`[ON-IDLE] Sent final response`);
+                    scopedLog().log(`[ON-IDLE] Sent final response`);
                 }
                 catch (err) {
-                    logger.error(`[ON-IDLE] Failed to send final response:`, err);
+                    scopedLog().error(`[ON-IDLE] Failed to send final response:`, err);
                 }
             }
             else {
                 // 正常失败场景（非steered）
-                logger.log(`[ON-IDLE] Skipping final message: hasSentResponse=${hasSentResponse}, finalSent=${finalSent}`);
+                scopedLog().log(`[ON-IDLE] Skipping final message: hasSentResponse=${hasSentResponse}, finalSent=${finalSent}`);
                 try {
                     await sendStatusUpdate({
                         config,
@@ -220,7 +223,7 @@ export function createXYReplyDispatcher(params) {
                         text: "任务处理中断了~",
                         state: "failed",
                     });
-                    logger.log(`[ON-IDLE] Sent failure status update`);
+                    scopedLog().log(`[ON-IDLE] Sent failure status update`);
                     await sendA2AResponse({
                         config,
                         sessionId,
@@ -233,17 +236,17 @@ export function createXYReplyDispatcher(params) {
                         errorMessage: "任务执行异常，请重试",
                     });
                     finalSent = true;
-                    logger.log(`[ON-IDLE] Sent error response, code=99921111`);
+                    scopedLog().log(`[ON-IDLE] Sent error response, code=99921111`);
                 }
                 catch (err) {
-                    logger.error(`[ON-IDLE] Failed to send error response:`, err);
+                    scopedLog().error(`[ON-IDLE] Failed to send error response:`, err);
                 }
             }
             stopStatusInterval();
         },
         onCleanup: () => {
             const currentTaskId = getActiveTaskId();
-            logger.log(`[ON-CLEANUP] Reply cleanup, steered=${steerState.steered}`);
+            scopedLog().log(`[ON-CLEANUP] Reply cleanup, steered=${steerState.steered}`);
         },
     });
     return {
@@ -258,13 +261,13 @@ export function createXYReplyDispatcher(params) {
                 }
                 const currentTaskId = getActiveTaskId();
                 const currentMessageId = getActiveMessageId();
-                logger.log(`[TOOL-START] Tool: ${name}, phase: ${phase}`);
+                scopedLog().log(`[TOOL-START] Tool: ${name}, phase: ${phase}`);
                 if (phase === "start") {
                     const toolName = name || "unknown";
                     // call_device_tool 由自身 execute() 内部发送具体子工具名的状态更新
                     // get_xxx_tool_schema 是给 LLM 查 schema 用的，无需向用户展示
                     if (toolName === "call_device_tool" || toolName.endsWith("_tool_schema") || toolName === "huawei_id_tool") {
-                        logger.log(`[TOOL-START] Skipping generic status for ${toolName}`);
+                        scopedLog().log(`[TOOL-START] Skipping generic status for ${toolName}`);
                         return;
                     }
                     try {
@@ -276,10 +279,10 @@ export function createXYReplyDispatcher(params) {
                             text: `正在使用工具: ${toolName}...`,
                             state: "working",
                         });
-                        logger.log(`[TOOL-START] Sent status update for tool start: ${toolName}`);
+                        scopedLog().log(`[TOOL-START] Sent status update for tool start: ${toolName}`);
                     }
                     catch (err) {
-                        logger.error(`[TOOL-START] Failed to send tool start status:`, err);
+                        scopedLog().error(`[TOOL-START] Failed to send tool start status:`, err);
                     }
                 }
             },
@@ -292,7 +295,7 @@ export function createXYReplyDispatcher(params) {
                 const currentMessageId = getActiveMessageId();
                 const text = payload.text ?? "";
                 const hasMedia = Boolean(payload.mediaUrl || (payload.mediaUrls?.length ?? 0) > 0);
-                logger.log(`[TOOL-RESULT] Tool result, text.length: ${text.length}`);
+                scopedLog().log(`[TOOL-RESULT] Tool result, text.length: ${text.length}`);
                 try {
                     if (text.length > 0 || hasMedia) {
                         const resultText = text.length > 0 ? text : "工具执行完成";
@@ -304,11 +307,11 @@ export function createXYReplyDispatcher(params) {
                             text: resultText,
                             state: "working",
                         });
-                        logger.log(`[TOOL-RESULT] Sent tool result as status update`);
+                        scopedLog().log(`[TOOL-RESULT] Sent tool result as status update`);
                     }
                 }
                 catch (err) {
-                    logger.error(`[TOOL-RESULT] Failed to send tool result status:`, err);
+                    scopedLog().error(`[TOOL-RESULT] Failed to send tool result status:`, err);
                 }
             },
             onReasoningStream: async (payload) => {
@@ -317,7 +320,7 @@ export function createXYReplyDispatcher(params) {
                     return;
                 }
                 const text = payload.text ?? "";
-                logger.log(`[REASONING-STREAM] Reasoning chunk received, text.length: ${text.length}`);
+                scopedLog().log(`[REASONING-STREAM] Reasoning chunk received, text.length: ${text.length}`);
                 // Reasoning stream 目前被注释掉
                 // 如果需要可以启用
             },
@@ -342,7 +345,7 @@ export function createXYReplyDispatcher(params) {
                     }
                 }
                 catch (err) {
-                    logger.error(`[PARTIAL REPLY] Failed to send partial reply:`, err);
+                    scopedLog().error(`[PARTIAL REPLY] Failed to send partial reply:`, err);
                 }
             },
         },

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

@@ -93,14 +93,6 @@ function getSessionInfo() {
     catch { }
     return { sessionId: "", taskId: "" };
 }
-// ── Core write function ──
-function writeLog(level, message, args) {
-    checkRotation();
-    const { sessionId, taskId } = getSessionInfo();
-    const timestamp = formatTimestampUTC8();
-    const msg = args.length ? formatMessage(message, args) : message;
-    dest.write(`| ${level} | ${timestamp} | ${sessionId} | ${taskId} | ${msg}\n`);
-}
 // ── Global error handlers (catch-all) ──
 process.on("uncaughtException", (err) => {
     writeLog("fatal", "Uncaught exception", [err]);
@@ -108,6 +100,15 @@ process.on("uncaughtException", (err) => {
 process.on("unhandledRejection", (reason) => {
     writeLog("error", "Unhandled rejection", [reason]);
 });
+// ── 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) {
@@ -122,6 +123,15 @@ export const logger = {
     debug(message, ...args) {
         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) {
     if (!args.length)

package/dist/src/websocket.js

@@ -365,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) {
@@ -391,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}`);
                     }
                 }
             }
@@ -399,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;
@@ -412,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 = {
@@ -423,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,
@@ -440,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,
@@ -455,13 +460,13 @@ 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") {
-                                this.log("[XY] ExecuteAgentAsSkillResponse detected, emitting agent-as-skill-response");
+                                log.log("[XY] ExecuteAgentAsSkillResponse detected, emitting agent-as-skill-response");
                                 this.emit("agent-as-skill-response", item);
                             }
                         }
@@ -474,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");
@@ -491,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 = {
@@ -502,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,
@@ -519,13 +524,13 @@ 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") {
-                                    this.log("[XY] ExecuteAgentAsSkillResponse detected (wrapped format), emitting agent-as-skill-response");
+                                    log.log("[XY] ExecuteAgentAsSkillResponse detected (wrapped format), emitting agent-as-skill-response");
                                     this.emit("agent-as-skill-response", item);
                                 }
                             }
@@ -539,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.139-next",
+  "version": "0.0.140-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",